diff --git a/720p/Includes_MediaFlags.xml b/720p/Includes_MediaFlags.xml
index 6c96504b..5b8c31e6 100644
--- a/720p/Includes_MediaFlags.xml
+++ b/720p/Includes_MediaFlags.xml
@@ -165,92 +165,50 @@
Furniture_MovieInfoFlagSound
flags/info/dd51.png
- substring(listitem.studio,6ch) + substring(listitem.studio,ac-3)
+ substring(ListItem.AudioChannels,6) + substring(ListItem.AudioCodec,ac3)
Furniture_MovieInfoFlagSound
flags/info/dd71.png
- substring(listitem.studio,8ch) + substring(listitem.studio,ac-3)
+ substring(ListItem.AudioChannels,8) + substring(ListItem.AudioCodec,ac3)
Furniture_MovieInfoFlagSound
flags/info/dts51.png
- substring(listitem.studio,6ch) + substring(listitem.studio,dts)
+ substring(ListItem.AudioChannels,6) + substring(ListItem.AudioCodec,dca)
Furniture_MovieInfoFlagSound
flags/info/dts71.png
- substring(listitem.studio,8ch) + substring(listitem.studio,dts)
+ substring(ListItem.AudioChannels,8) + substring(ListItem.AudioCodec,dca)
Furniture_MovieInfoFlagSound
flags/info/dolby20.png
- substring(listitem.studio,2ch)
+ substring(ListItem.AudioChannels,2)
Furniture_MovieInfoFlagSound
flags/info/mono.png
- substring(listitem.studio,mono)
+ substring(ListItem.AudioChannels,1)
Furniture_MovieInfoFlagSubs
flags/info/cc.png
- substring(listitem.studio,sub)
+ !IsEmpty(ListItem.SubtitleLanguage)
Furniture_MovieInfoFlagRes
- flags/info/480i.png
- substring(listitem.studio,480i)
+ $INFO[ListItem.VideoResolution,flags/info/,.png]
-
-
- Furniture_MovieInfoFlagRes
- flags/info/576i.png
- substring(listitem.studio,576i)
-
-
-
- Furniture_MovieInfoFlagRes
- flags/info/720i.png
- substring(listitem.studio,720i)
-
-
-
- Furniture_MovieInfoFlagRes
- flags/info/1080i.png
- substring(listitem.studio,1080i)
-
-
-
- Furniture_MovieInfoFlagRes
- flags/info/480p.png
- substring(listitem.studio,480p)
-
-
-
- Furniture_MovieInfoFlagRes
- flags/info/576p.png
- substring(listitem.studio,576p)
-
-
-
- Furniture_MovieInfoFlagRes
- flags/info/720p.png
- substring(listitem.studio,720p)
-
-
-
- Furniture_MovieInfoFlagRes
- flags/info/1080p.png
- substring(listitem.studio,1080p)
-
+
@@ -265,49 +223,8 @@
Furniture_ListMediaFlagsVars
- flags/sd.png
- substring(listitem.studio,sd)
-
-
- Furniture_ListMediaFlagsVars
- flags/480p.png
- substring(listitem.studio,480p)
-
-
- Furniture_ListMediaFlagsVars
- flags/576p.png
- substring(listitem.studio,576p)
-
-
- Furniture_ListMediaFlagsVars
- flags/720p.png
- substring(listitem.studio,720p)
-
-
- Furniture_ListMediaFlagsVars
- flags/1080p.png
- substring(listitem.studio,1080p)
+ $INFO[ListItem.VideoResolution,flags/,.png]
-
- Furniture_ListMediaFlagsVars
- flags/480i.png
- substring(listitem.studio,480i)
-
-
- Furniture_ListMediaFlagsVars
- flags/576i.png
- substring(listitem.studio,576i)
-
-
- Furniture_ListMediaFlagsVars
- flags/720i.png
- substring(listitem.studio,720i)
-
-
- Furniture_ListMediaFlagsVars
- flags/1080i.png
- substring(listitem.studio,1080i)
-
981
@@ -319,17 +236,17 @@
Furniture_ListMediaFlagsVars
flags/dts.png
- substring(listitem.studio,dts) + !substring(listitem.studio,ac-3)
+ substring(ListItem.AudioCodec,dca)
Furniture_ListMediaFlagsVars
flags/dolbydigital.png
- substring(listitem.studio,ac-3)
+ substring(ListItem.AudioCodec,ac3)
Furniture_ListMediaFlagsVars
flags/mp3.png
- substring(listitem.studio,mp3) | substring(listitem.studio,MPEG Audio)
+ substring(ListItem.AudioCodec,mp3)
@@ -540,49 +457,8 @@
Furniture_ShowcaseMediaFlagsVars
- flags/sd.png
- substring(listitem.studio,sd)
-
-
- Furniture_ShowcaseMediaFlagsVars
- flags/480p.png
- substring(listitem.studio,480p)
-
-
- Furniture_ShowcaseMediaFlagsVars
- flags/576p.png
- substring(listitem.studio,576p)
-
-
- Furniture_ShowcaseMediaFlagsVars
- flags/720p.png
- substring(listitem.studio,720p)
-
-
- Furniture_ShowcaseMediaFlagsVars
- flags/1080p.png
- substring(listitem.studio,1080p)
+ $INFO[ListItem.VideoResolution,flags/,.png]
-
- Furniture_ShowcaseMediaFlagsVars
- flags/480i.png
- substring(listitem.studio,480i)
-
-
- Furniture_ShowcaseMediaFlagsVars
- flags/576i.png
- substring(listitem.studio,576i)
-
-
- Furniture_ShowcaseMediaFlagsVars
- flags/720i.png
- substring(listitem.studio,720i)
-
-
- Furniture_ShowcaseMediaFlagsVars
- flags/1080i.png
- substring(listitem.studio,1080i)
-
1085
@@ -594,17 +470,17 @@
Furniture_ShowcaseMediaFlagsVars
flags/dts.png
- substring(listitem.studio,dts) + !substring(listitem.studio,ac-3)
+ substring(ListItem.AudioCodec,dca)
Furniture_ShowcaseMediaFlagsVars
flags/dolbydigital.png
- substring(listitem.studio,ac-3)
+ substring(ListItem.AudioCodec,ac3)
Furniture_ShowcaseMediaFlagsVars
flags/mp3.png
- substring(listitem.studio,mp3) | substring(listitem.studio,MPEG Audio)
+ substring(ListItem.AudioCodec,mp3)
@@ -795,49 +671,9 @@
Furniture_PanelMediaFlagsVars
- flags/sd.png
+ $INFO[ListItem.VideoResolution,flags/,.png]
substring(listitem.studio,sd)
-
- Furniture_PanelMediaFlagsVars
- flags/480p.png
- substring(listitem.studio,480p)
-
-
- Furniture_PanelMediaFlagsVars
- flags/576p.png
- substring(listitem.studio,576p)
-
-
- Furniture_PanelMediaFlagsVars
- flags/720p.png
- substring(listitem.studio,720p)
-
-
- Furniture_PanelMediaFlagsVars
- flags/1080p.png
- substring(listitem.studio,1080p)
-
-
- Furniture_PanelMediaFlagsVars
- flags/480i.png
- substring(listitem.studio,480i)
-
-
- Furniture_PanelMediaFlagsVars
- flags/576i.png
- substring(listitem.studio,576i)
-
-
- Furniture_PanelMediaFlagsVars
- flags/720i.png
- substring(listitem.studio,720i)
-
-
- Furniture_PanelMediaFlagsVars
- flags/1080i.png
- substring(listitem.studio,1080i)
-
1115
@@ -849,12 +685,12 @@
Furniture_PanelMediaFlagsVars
flags/dts.png
- substring(listitem.studio,dts) + !substring(listitem.studio,ac-3)
+ substring(ListItem.AudioCodec,dca)
Furniture_PanelMediaFlagsVars
flags/dolbydigital.png
- substring(listitem.studio,ac-3)
+ substring(ListItem.AudioCodec,ac3)
diff --git a/media/flags/1080p.png b/media/flags/1080.png
similarity index 100%
rename from media/flags/1080p.png
rename to media/flags/1080.png
diff --git a/media/flags/540p.png b/media/flags/540.png
similarity index 100%
rename from media/flags/540p.png
rename to media/flags/540.png
diff --git a/media/flags/576p.png b/media/flags/576.png
similarity index 100%
rename from media/flags/576p.png
rename to media/flags/576.png
diff --git a/media/flags/720p.png b/media/flags/720.png
similarity index 100%
rename from media/flags/720p.png
rename to media/flags/720.png