diff --git a/720p/DialogButtonMenu.xml b/720p/DialogButtonMenu.xml
index 6497588..48219c4 100644
--- a/720p/DialogButtonMenu.xml
+++ b/720p/DialogButtonMenu.xml
@@ -76,6 +76,7 @@
 				<pulseonselect>no</pulseonselect>
 				<font>-</font>
 				<label>$LOCALIZE[13012] XBMC</label>
+				<visible>System.ShowExitButton</visible>
 			</control>
 			<control type="group" id="14">
 				<width>80</width>
@@ -264,7 +265,7 @@
 				<pulseonselect>no</pulseonselect>
 				<font>-</font>
 				<label>$LOCALIZE[13391] $LOCALIZE[155]</label>
-				<visible>System.Loggedon</visible>
+				<visible>System.Loggedon + System.HasMediaDVD</visible>
 			</control>
 		</control>
 		<control type="image" id="0">
diff --git a/720p/DialogFullScreenInfo.xml b/720p/DialogFullScreenInfo.xml
index 303a6dd..62b7c80 100644
--- a/720p/DialogFullScreenInfo.xml
+++ b/720p/DialogFullScreenInfo.xml
@@ -101,6 +101,16 @@
 				<font>font12</font>
 				<visible>Player.ChapterCount</visible>
 			</control>
+			<control type="progress">
+				<description>Cache Progressbar</description>
+				<posx>230</posx>
+				<posy>130</posy>
+				<width>1020</width>
+				<height>8</height>
+				<info>Player.ProgressCache</info>
+				<texturebg border="4,0,4,0">ProgressBack.png</texturebg>
+				<midtexture border="4,0,4,0">ProgressCache.png</midtexture>
+			</control>
 			<control type="progress">
 				<description>Progressbar</description>
 				<posx>230</posx>
@@ -108,6 +118,7 @@
 				<width>1020</width>
 				<height>8</height>
 				<info>Player.Progress</info>
+				<texturebg border="4,0,4,0">ProgressBack2.png</texturebg>
 			</control>
 			<control type="label">
 				<posx>1250</posx>
@@ -266,6 +277,16 @@
 					<font>font12</font>
 					<visible>Player.ChapterCount</visible>
 				</control>
+				<control type="progress">
+					<description>Cache Progressbar</description>
+					<posx>255</posx>
+					<posy>130</posy>
+					<width>995</width>
+					<height>8</height>
+					<info>Player.ProgressCache</info>
+					<texturebg border="4,0,4,0">ProgressBack.png</texturebg>
+					<midtexture border="4,0,4,0">ProgressCache.png</midtexture>
+				</control>
 				<control type="progress">
 					<description>Progressbar</description>
 					<posx>255</posx>
@@ -273,6 +294,7 @@
 					<width>995</width>
 					<height>8</height>
 					<info>Player.Progress</info>
+					<texturebg border="4,0,4,0">ProgressBack2.png</texturebg>
 				</control>
 				<control type="label">
 					<posx>1250</posx>
@@ -473,6 +495,16 @@
 					<font>font12</font>
 					<visible>Player.ChapterCount</visible>
 				</control>
+				<control type="progress">
+					<description>Cache Progressbar</description>
+					<posx>355</posx>
+					<posy>130</posy>
+					<width>895</width>
+					<height>8</height>
+					<info>Player.ProgressCache</info>
+					<texturebg border="4,0,4,0">ProgressBack.png</texturebg>
+					<midtexture border="4,0,4,0">ProgressCache.png</midtexture>
+				</control>
 				<control type="progress">
 					<description>Progressbar</description>
 					<posx>355</posx>
@@ -480,6 +512,7 @@
 					<width>895</width>
 					<height>8</height>
 					<info>Player.Progress</info>
+					<texturebg border="4,0,4,0">ProgressBack2.png</texturebg>
 				</control>
 				<control type="label">
 					<posx>1250</posx>
@@ -622,6 +655,16 @@
 				<font>font12</font>
 				<textcolor>white</textcolor>
 			</control>
+			<control type="progress">
+				<description>Cache Progressbar</description>
+				<posx>230</posx>
+				<posy>130</posy>
+				<width>1020</width>
+				<height>8</height>
+				<info>Player.ProgressCache</info>
+				<texturebg border="4,0,4,0">ProgressBack.png</texturebg>
+				<midtexture border="4,0,4,0">ProgressCache.png</midtexture>
+			</control>
 			<control type="progress">
 				<description>Progressbar</description>
 				<posx>230</posx>
@@ -629,6 +672,7 @@
 				<width>1020</width>
 				<height>8</height>
 				<info>Player.Progress</info>
+				<texturebg border="4,0,4,0">ProgressBack2.png</texturebg>
 			</control>
 			<control type="label">
 				<posx>1250</posx>
@@ -786,6 +830,16 @@
 					<font>font14</font>
 					<textcolor>white</textcolor>
 				</control>
+				<control type="progress">
+					<description>Cache Progressbar</description>
+					<posx>230</posx>
+					<posy>130</posy>
+					<width>1020</width>
+					<height>8</height>
+					<info>Player.ProgressCache</info>
+					<texturebg border="4,0,4,0">ProgressBack.png</texturebg>
+					<midtexture border="4,0,4,0">ProgressCache.png</midtexture>
+				</control>
 				<control type="progress">
 					<description>Progressbar</description>
 					<posx>230</posx>
@@ -793,6 +847,7 @@
 					<width>1020</width>
 					<height>8</height>
 					<info>Player.Progress</info>
+					<texturebg border="4,0,4,0">ProgressBack2.png</texturebg>
 				</control>
 				<control type="label">
 					<posx>230</posx>
diff --git a/720p/DialogPeripheralManager.xml b/720p/DialogPeripheralManager.xml
new file mode 100644
index 0000000..4583656
--- /dev/null
+++ b/720p/DialogPeripheralManager.xml
@@ -0,0 +1,220 @@
+<window id="10140">
+	<defaultcontrol always="true">20</defaultcontrol>
+	<coordinates>
+		<system>1</system>
+		<posx>290</posx>
+		<posy>30</posy>
+	</coordinates>
+	<include>dialogeffect</include>
+	<controls>
+		<control type="group">
+			<visible>!Window.IsVisible(PeripheralSettings)</visible>
+			<include>VisibleFadeEffect</include>
+			<control type="image">
+				<description>background image</description>
+				<posx>0</posx>
+				<posy>0</posy>
+				<width>700</width>
+				<height>660</height>
+				<texture border="40">DialogBack.png</texture>
+			</control>
+			<control type="image">
+				<description>background image</description>
+				<posx>0</posx>
+				<posy>0</posy>
+				<width>700</width>
+				<height>660</height>
+				<texture border="40">DialogFront.png</texture>
+			</control>
+			<control type="label" id="1">
+				<description>heading label</description>
+				<posx>40</posx>
+				<posy>40</posy>
+				<width>620</width>
+				<height>30</height>
+				<align>center</align>
+				<aligny>center</aligny>
+				<font>font18</font>
+				<label>$LOCALIZE[35000]</label>
+				<textcolor>dialogheader</textcolor>
+			</control>
+			<control type="button">
+				<description>Close Window button</description>
+				<posx>630</posx>
+				<posy>35</posy>
+				<include>WindowCloseButtonCommons</include>
+			</control>
+			<control type="image">
+				<posx>40</posx>
+				<posy>78</posy>
+				<width>620</width>
+				<height>2</height>
+				<texture>separator.png</texture>
+			</control>
+
+			<control type="list" id="20">
+				<posx>40</posx>
+				<posy>90</posy>
+				<width>600</width>
+				<height>470</height>
+				<onup>20</onup>
+				<ondown>20</ondown>
+				<onleft>10</onleft>
+				<onright>61</onright>
+				<pagecontrol>61</pagecontrol>
+				<scrolltime>200</scrolltime>
+				<animation effect="slide" start="0,0" end="10,0" time="0" condition="!Control.IsVisible(61)">Conditional</animation>
+				<itemlayout height="85" width="600">
+					<control type="image">
+						<posx>0</posx>
+						<posy>0</posy>
+						<width>600</width>
+						<height>80</height>
+						<texture border="5">button-nofocus.png</texture>
+					</control>
+					<control type="label">
+						<description>Name</description>
+						<posx>10</posx>
+						<posy>5</posy>
+						<width>580</width>
+						<height>20</height>
+						<label>$INFO[ListItem.Label]</label>
+						<align>left</align>
+						<aligny>center</aligny>
+						<font>font12</font>
+						<textcolor>white</textcolor>
+					</control>
+					<control type="label">
+						<description>Product ID Vendor ID</description>
+						<posx>10</posx>
+						<posy>30</posy>
+						<width>580</width>
+						<height>20</height>
+						<label>$LOCALIZE[35504]:  [COLOR=grey2]$INFO[ListItem.Property(Product)][/COLOR]    $LOCALIZE[35503]:  [COLOR=grey2]$INFO[ListItem.Property(Vendor)][/COLOR]</label>
+						<align>left</align>
+						<aligny>center</aligny>
+						<font>font11</font>
+						<textcolor>green</textcolor>
+					</control>
+					<control type="label">
+						<description>class</description>
+						<posx>10</posx>
+						<posy>50</posy>
+						<width>580</width>
+						<height>20</height>
+						<label>$LOCALIZE[35501]:  [COLOR=grey2]$INFO[ListItem.Property(Class)][/COLOR]</label>
+						<align>left</align>
+						<aligny>center</aligny>
+						<font>font11</font>
+						<textcolor>green</textcolor>
+					</control>
+				</itemlayout>
+				<focusedlayout height="85" width="600">
+					<control type="image">
+						<posx>0</posx>
+						<posy>0</posy>
+						<width>600</width>
+						<height>80</height>
+						<texture border="5">button-nofocus.png</texture>
+						<visible>!Control.HasFocus(20)</visible>
+						<include>VisibleFadeEffect</include>
+					</control>
+					<control type="image">
+						<posx>0</posx>
+						<posy>0</posy>
+						<width>600</width>
+						<height>80</height>
+						<texture border="5">button-focus.png</texture>
+						<visible>Control.HasFocus(20)</visible>
+						<include>VisibleFadeEffect</include>
+					</control>
+					<control type="label">
+						<description>Name</description>
+						<posx>10</posx>
+						<posy>5</posy>
+						<width>580</width>
+						<height>20</height>
+						<label>$INFO[ListItem.Label]</label>
+						<align>left</align>
+						<aligny>center</aligny>
+						<font>font12</font>
+						<textcolor>white</textcolor>
+					</control>
+					<control type="label">
+						<description>Product ID Vendor ID</description>
+						<posx>10</posx>
+						<posy>30</posy>
+						<width>580</width>
+						<height>20</height>
+						<label>$LOCALIZE[35504]:  [COLOR=grey2]$INFO[ListItem.Property(Product)][/COLOR]    $LOCALIZE[35503]:  [COLOR=grey2]$INFO[ListItem.Property(Vendor)][/COLOR]</label>
+						<align>left</align>
+						<aligny>center</aligny>
+						<font>font11</font>
+						<textcolor>green</textcolor>
+					</control>
+					<control type="label">
+						<description>class</description>
+						<posx>10</posx>
+						<posy>50</posy>
+						<width>580</width>
+						<height>20</height>
+						<label>$LOCALIZE[35501]:  [COLOR=grey2]$INFO[ListItem.Property(Class)][/COLOR]</label>
+						<align>left</align>
+						<aligny>center</aligny>
+						<font>font11</font>
+						<textcolor>green</textcolor>
+					</control>
+				</focusedlayout>
+			</control>
+
+			<control type="scrollbar" id="61">
+				<posx>641</posx>
+				<posy>90</posy>
+				<width>20</width>
+				<height>470</height>
+				<texturesliderbackground border="2,2,2,2">scrollbar_bar_back2.png</texturesliderbackground>
+				<texturesliderbar border="2,16,2,16">scrollbar_bar.png</texturesliderbar>
+				<texturesliderbarfocus border="2,16,2,16">scrollbar_bar_focus.png</texturesliderbarfocus>
+				<textureslidernib>scrollbar_nib.png</textureslidernib>
+				<textureslidernibfocus>scrollbar_nib.png</textureslidernibfocus>
+				<onleft>20</onleft>
+				<onright>10</onright>
+				<ondown>61</ondown>
+				<onup>61</onup>
+				<showonepage>false</showonepage>
+				<orientation>vertical</orientation>
+			</control>
+			<control type="label">
+				<description>number of files/pages in list text label</description>
+				<posx>640</posx>
+				<posy>575</posy>
+				<width>300</width>
+				<height>35</height>
+				<font>font12b</font>
+				<align>right</align>
+				<aligny>center</aligny>
+				<scroll>true</scroll>
+				<textcolor>white</textcolor>
+				<label>($INFO[Container(20).NumItems]) $LOCALIZE[31025] - $LOCALIZE[31024] ($INFO[Container(20).CurrentPage]/$INFO[Container(20).NumPages])</label>
+			</control>
+			<control type="button" id="10">
+				<description>OK button</description>
+				<posx>40</posx>
+				<posy>570</posy>
+				<width>200</width>
+				<height>40</height>
+				<label>186</label>
+				<font>font12</font>
+				<textcolor>grey2</textcolor>
+				<focusedcolor>white</focusedcolor>
+				<texturenofocus border="3">button-nofocus.png</texturenofocus>
+				<texturefocus border="3">button-focus2.png</texturefocus>
+				<align>center</align>
+				<onleft>61</onleft>
+				<onright>20</onright>
+				<onup>20</onup>
+				<ondown>20</ondown>
+			</control>
+		</control>
+	</controls>
+</window>
diff --git a/720p/DialogPeripheralSettings.xml b/720p/DialogPeripheralSettings.xml
new file mode 100644
index 0000000..29f43e9
--- /dev/null
+++ b/720p/DialogPeripheralSettings.xml
@@ -0,0 +1,198 @@
+<window id="123">
+	<defaultcontrol>5</defaultcontrol>
+	<coordinates>
+		<system>1</system>
+		<posx>290</posx>
+		<posy>30</posy>
+	</coordinates>
+	<include>dialogeffect</include>
+	<controls>
+		<control type="image">
+			<description>background image</description>
+			<posx>0</posx>
+			<posy>0</posy>
+			<width>700</width>
+			<height>660</height>
+			<texture border="40">DialogBack.png</texture>
+		</control>
+		<control type="image">
+			<description>background image</description>
+			<posx>0</posx>
+			<posy>0</posy>
+			<width>700</width>
+			<height>660</height>
+			<texture border="40">DialogFront.png</texture>
+		</control>
+		<control type="label" id="1">
+			<description>heading label</description>
+			<posx>40</posx>
+			<posy>40</posy>
+			<width>620</width>
+			<height>30</height>
+			<align>center</align>
+			<aligny>center</aligny>
+			<font>font18</font>
+			<label>$LOCALIZE[5]</label>
+			<textcolor>dialogheader</textcolor>
+		</control>
+		<control type="button">
+			<description>Close Window button</description>
+			<posx>630</posx>
+			<posy>35</posy>
+			<include>WindowCloseButtonCommons</include>
+		</control>
+		<control type="image">
+			<posx>40</posx>
+			<posy>78</posy>
+			<width>620</width>
+			<height>2</height>
+			<texture>separator.png</texture>
+		</control>
+
+		<control type="label" id="3">
+			<description>No Settings Label</description>
+			<posx>40</posx>
+			<posy>180</posy>
+			<width>620</width>
+			<align>center</align>
+			<label>35004</label>
+			<font>font13caps</font>
+		</control>
+		<control type="grouplist" id="5">
+			<animation effect="slide" start="0,0" end="10,0" time="0" condition="!Control.IsVisible(60)">Conditional</animation>
+			<description>control area</description>
+			<posx>40</posx>
+			<posy>90</posy>
+			<width>600</width>
+			<height>470</height>
+			<itemgap>5</itemgap>
+			<pagecontrol>60</pagecontrol>
+			<onleft>28</onleft>
+			<onright>60</onright>
+			<onup>28</onup>
+			<ondown>28</ondown>
+		</control>
+		<control type="scrollbar" id="60">
+			<posx>641</posx>
+			<posy>90</posy>
+			<width>20</width>
+			<height>470</height>
+			<texturesliderbackground border="2,2,2,2">scrollbar_bar_back2.png</texturesliderbackground>
+			<texturesliderbar border="2,16,2,16">scrollbar_bar.png</texturesliderbar>
+			<texturesliderbarfocus border="2,16,2,16">scrollbar_bar_focus.png</texturesliderbarfocus>
+			<textureslidernib>scrollbar_nib.png</textureslidernib>
+			<textureslidernibfocus>scrollbar_nib.png</textureslidernibfocus>
+			<onleft>3</onleft>
+			<onright>3</onright>
+			<ondown>60</ondown>
+			<onup>60</onup>
+			<showonepage>false</showonepage>
+			<orientation>vertical</orientation>
+		</control>
+		<control type="button" id="7">
+			<description>Default Button</description>
+			<posx>0</posx>
+			<posy>0</posy>
+			<height>40</height>
+			<font>font12</font>
+			<textcolor>grey2</textcolor>
+			<focusedcolor>white</focusedcolor>
+			<texturenofocus border="5">button-nofocus.png</texturenofocus>
+			<texturefocus border="5">button-focus.png</texturefocus>
+		</control>
+		<control type="radiobutton" id="8">
+			<description>Default RadioButton</description>
+			<posx>0</posx>
+			<posy>0</posy>
+			<height>40</height>
+			<font>font12</font>
+			<textcolor>grey2</textcolor>
+			<focusedcolor>white</focusedcolor>
+			<texturenofocus border="5">button-nofocus.png</texturenofocus>
+			<texturefocus border="5">button-focus.png</texturefocus>
+		</control>
+		<control type="spincontrolex" id="9">
+			<description>Default SpinControlex</description>
+			<posx>0</posx>
+			<posy>0</posy>
+			<height>40</height>
+			<font>font12</font>
+			<textcolor>grey2</textcolor>
+			<focusedcolor>white</focusedcolor>
+			<texturenofocus border="5">button-nofocus.png</texturenofocus>
+			<texturefocus border="5">button-focus.png</texturefocus>
+			<aligny>center</aligny>
+			<reverse>yes</reverse>
+		</control>
+		<control type="sliderex" id="10">
+			<description>Default Slider</description>
+			<height>40</height>
+			<texturenofocus border="5">button-nofocus.png</texturenofocus>
+			<texturefocus border="5">button-focus.png</texturefocus>
+			<font>font12</font>
+			<textcolor>grey2</textcolor>
+			<focusedcolor>white</focusedcolor>
+		</control>
+		<control type="image" id="11">
+			<description>separator image</description>
+			<height>2</height>
+			<texture>separator2.png</texture>
+		</control>
+
+		<control type="group" id="9000">
+			<posx>38</posx>
+			<posy>570</posy>
+			<control type="button" id="29">
+				<description>Cancel Button</description>
+				<posy>0</posy>
+				<posx>0</posx>
+				<width>200</width>
+				<height>40</height>
+				<align>center</align>
+				<aligny>center</aligny>
+				<font>font12</font>
+				<label>222</label>
+				<texturenofocus border="5">button-nofocus.png</texturenofocus>
+				<texturefocus border="5">button-focus2.png</texturefocus>
+				<onleft>50</onleft>
+				<onright>28</onright>
+				<onup>5</onup>
+				<ondown>5</ondown>
+			</control>
+			<control type="button" id="28">
+				<description>OK Button</description>
+				<posy>0</posy>
+				<posx>210</posx>
+				<width>200</width>
+				<height>40</height>
+				<align>center</align>
+				<aligny>center</aligny>
+				<font>font12</font>
+				<label>186</label>
+				<texturenofocus border="5">button-nofocus.png</texturenofocus>
+				<texturefocus border="5">button-focus2.png</texturefocus>
+				<onleft>29</onleft>
+				<onright>50</onright>
+				<onup>5</onup>
+				<ondown>5</ondown>
+			</control>
+			<control type="button" id="50">
+				<description>Defaults Button</description>
+				<posy>0</posy>
+				<posx>420</posx>
+				<width>200</width>
+				<height>40</height>
+				<align>center</align>
+				<aligny>center</aligny>
+				<font>font12</font>
+				<label>409</label>
+				<texturenofocus border="5">button-nofocus.png</texturenofocus>
+				<texturefocus border="5">button-focus2.png</texturefocus>
+				<onleft>28</onleft>
+				<onright>29</onright>
+				<onup>5</onup>
+				<ondown>5</ondown>
+			</control>
+		</control>
+	</controls>
+</window>
diff --git a/720p/DialogSeekBar.xml b/720p/DialogSeekBar.xml
index ea9119f..357e159 100644
--- a/720p/DialogSeekBar.xml
+++ b/720p/DialogSeekBar.xml
@@ -49,188 +49,16 @@
 				<bordersize>4</bordersize>
 			</control>
 			<control type="label">
-				<description>Playing Label</description>
+				<description>Playback State Label</description>
 				<posx>120</posx>
 				<posy>8</posy>
 				<height>20</height>
-				<width>130</width>
+				<width>160</width>
 				<align>center</align>
 				<aligny>center</aligny>
 				<font>font10</font>
 				<textcolor>grey2</textcolor>
-				<label>31042</label>
-				<visible>Player.Playing + !Player.Seeking</visible>
-			</control>
-			<control type="label">
-				<description>Paused Label</description>
-				<posx>120</posx>
-				<posy>8</posy>
-				<height>20</height>
-				<width>130</width>
-				<align>center</align>
-				<aligny>center</aligny>
-				<font>font10</font>
-				<textcolor>grey2</textcolor>
-				<label>31043</label>
-				<visible>[Player.Paused + !Player.Caching] + !Player.Seeking</visible>
-			</control>
-			<control type="label">
-				<description>Cache Label</description>
-				<posx>120</posx>
-				<posy>8</posy>
-				<height>20</height>
-				<width>130</width>
-				<align>center</align>
-				<aligny>center</aligny>
-				<font>font10</font>
-				<textcolor>grey2</textcolor>
-				<label>$LOCALIZE[15107] $INFO[Player.CacheLevel]%</label>
-				<visible>[Player.Paused + Player.Caching] + !Player.Seeking</visible>
-			</control>
-			<control type="label">
-				<description>Seeking Label</description>
-				<posx>120</posx>
-				<posy>8</posy>
-				<height>20</height>
-				<width>130</width>
-				<align>center</align>
-				<aligny>center</aligny>
-				<font>font10</font>
-				<textcolor>grey2</textcolor>
-				<label>[UPPERCASE]$LOCALIZE[773][/UPPERCASE]</label>
-				<visible>Player.Seeking</visible>
-			</control>
-
-			<control type="label">
-				<description>RW x2 Label</description>
-				<posx>120</posx>
-				<posy>8</posy>
-				<height>20</height>
-				<width>130</width>
-				<align>center</align>
-				<aligny>center</aligny>
-				<font>font10</font>
-				<textcolor>grey2</textcolor>
-				<label>$LOCALIZE[31045] x2</label>
-				<visible>Player.Rewinding2x + !Player.Seeking</visible>
-			</control>
-			<control type="label">
-				<description>RW x4 Label</description>
-				<posx>120</posx>
-				<posy>8</posy>
-				<height>20</height>
-				<width>130</width>
-				<align>center</align>
-				<aligny>center</aligny>
-				<font>font10</font>
-				<textcolor>grey2</textcolor>
-				<label>$LOCALIZE[31045] x4</label>
-				<visible>Player.Rewinding4x + !Player.Seeking</visible>
-			</control>
-			<control type="label">
-				<description>RW x8 Label</description>
-				<posx>120</posx>
-				<posy>8</posy>
-				<height>20</height>
-				<width>130</width>
-				<align>center</align>
-				<aligny>center</aligny>
-				<font>font10</font>
-				<textcolor>grey2</textcolor>
-				<label>$LOCALIZE[31045] x8</label>
-				<visible>Player.Rewinding8x + !Player.Seeking</visible>
-			</control>
-			<control type="label">
-				<description>RW x16 Label</description>
-				<posx>120</posx>
-				<posy>8</posy>
-				<height>20</height>
-				<width>130</width>
-				<align>center</align>
-				<aligny>center</aligny>
-				<font>font10</font>
-				<textcolor>grey2</textcolor>
-				<label>$LOCALIZE[31045] x16</label>
-				<visible>Player.Rewinding16x</visible>
-			</control>
-			<control type="label">
-				<description>RW x32 Label</description>
-				<posx>120</posx>
-				<posy>8</posy>
-				<height>20</height>
-				<width>130</width>
-				<align>center</align>
-				<aligny>center</aligny>
-				<font>font10</font>
-				<textcolor>grey2</textcolor>
-				<label>$LOCALIZE[31045] x32</label>
-				<visible>Player.Rewinding32x + !Player.Seeking</visible>
-			</control>
-
-			<control type="label">
-				<description>FF x2 Label</description>
-				<posx>120</posx>
-				<posy>8</posy>
-				<height>20</height>
-				<width>130</width>
-				<align>center</align>
-				<aligny>center</aligny>
-				<font>font10</font>
-				<textcolor>grey2</textcolor>
-				<label>$LOCALIZE[31044] x2</label>
-				<visible>Player.Forwarding2x + !Player.Seeking</visible>
-			</control>
-			<control type="label">
-				<description>FF x4 Label</description>
-				<posx>120</posx>
-				<posy>8</posy>
-				<height>20</height>
-				<width>130</width>
-				<align>center</align>
-				<aligny>center</aligny>
-				<font>font10</font>
-				<textcolor>grey2</textcolor>
-				<label>$LOCALIZE[31044] x4</label>
-				<visible>Player.Forwarding4x + !Player.Seeking</visible>
-			</control>
-			<control type="label">
-				<description>FF x8 Label</description>
-				<posx>120</posx>
-				<posy>8</posy>
-				<height>20</height>
-				<width>130</width>
-				<align>center</align>
-				<aligny>center</aligny>
-				<font>font10</font>
-				<textcolor>grey2</textcolor>
-				<label>$LOCALIZE[31044] x8</label>
-				<visible>Player.Forwarding8x</visible>
-			</control>
-			<control type="label">
-				<description>FF x16 Label</description>
-				<posx>120</posx>
-				<posy>8</posy>
-				<height>20</height>
-				<width>130</width>
-				<align>center</align>
-				<aligny>center</aligny>
-				<font>font10</font>
-				<textcolor>grey2</textcolor>
-				<label>$LOCALIZE[31044] x16</label>
-				<visible>Player.Forwarding16x + !Player.Seeking</visible>
-			</control>
-			<control type="label">
-				<description>FF x32 Label</description>
-				<posx>120</posx>
-				<posy>8</posy>
-				<height>20</height>
-				<width>130</width>
-				<align>center</align>
-				<aligny>center</aligny>
-				<font>font10</font>
-				<textcolor>grey2</textcolor>
-				<label>$LOCALIZE[31044] x32</label>
-				<visible>Player.Forwarding32x + !Player.Seeking</visible>
+				<label>$VAR[PlaybackStateLabel]</label>
 			</control>
 
 			<!-- progressbar dialog -->
@@ -238,7 +66,7 @@
 				<description>Elapsed Time Label</description>
 				<posx>10</posx>
 				<posy>7</posy>
-				<width>110</width>
+				<width>100</width>
 				<height>20</height>
 				<font>font11</font>
 				<textcolor>white</textcolor>
@@ -251,7 +79,7 @@
 				<description>Seek Time Label</description>
 				<posx>10</posx>
 				<posy>7</posy>
-				<width>110</width>
+				<width>100</width>
 				<height>20</height>
 				<font>font11</font>
 				<textcolor>white</textcolor>
@@ -262,9 +90,9 @@
 			</control>
 			<control type="label" id="0">
 				<description>Duration Label</description>
-				<posx>380</posx>
+				<posx>390</posx>
 				<posy>7</posy>
-				<width>130</width>
+				<width>100</width>
 				<height>20</height>
 				<label>$INFO[Player.Duration]</label>
 				<font>font11</font>
@@ -272,6 +100,16 @@
 				<align>right</align>
 				<aligny>center</aligny>
 			</control>
+			<control type="progress">
+				<description>Cache Progressbar</description>
+				<posx>10</posx>
+				<posy>31</posy>
+				<width>380</width>
+				<height>8</height>
+				<info>Player.ProgressCache</info>
+				<texturebg border="4,0,4,0">ProgressBack.png</texturebg>
+				<midtexture border="4,0,4,0">ProgressCache.png</midtexture>
+			</control>
 			<control type="progress" id="23">
 				<description>Progressbar</description>
 				<posx>10</posx>
@@ -279,7 +117,7 @@
 				<width>380</width>
 				<height>8</height>
 				<info>Player.Progress</info>
-				<visible>true</visible>
+				<texturebg border="4,0,4,0">ProgressBack2.png</texturebg>
 			</control>
 			<control type="progress">
 				<description>Player Caching Progress Bar</description>
diff --git a/720p/Home.xml b/720p/Home.xml
index 9413ca8..c912fd2 100644
--- a/720p/Home.xml
+++ b/720p/Home.xml
@@ -38,7 +38,7 @@
 		<control type="group">
 			<posx>600r</posx>
 			<posy>450</posy>
-			<visible>Container(9000).HasFocus(5) + Weather.IsFetched + !Skin.HasSetting(homepageWeatherinfo)</visible>
+			<visible>Container(9000).HasFocus(5) + Weather.IsFetched + !Skin.HasSetting(homepageWeatherinfo) + !IsEmpty(Weather.Plugin)</visible>
 			<include>homestatsinfo</include>
 			<control type="image">
 				<description>gradient</description>
@@ -82,7 +82,7 @@
 				<posy>37</posy>
 				<height>30</height>
 				<width>500</width>
-				<label>$INFO[Weather.Location]</label>
+				<label>$INFO[Window(Weather).Property(Location)]</label>
 				<align>right</align>
 				<aligny>center</aligny>
 				<font>font18</font>
@@ -94,7 +94,7 @@
 				<posy>70</posy>
 				<height>30</height>
 				<width>500</width>
-				<label>$INFO[Weather.Conditions]</label>
+				<label>$INFO[Window(Weather).Property(Current.Condition)]</label>
 				<align>right</align>
 				<aligny>center</aligny>
 				<font>font12</font>
@@ -106,11 +106,12 @@
 				<posy>95</posy>
 				<height>30</height>
 				<width>500</width>
-				<label>$LOCALIZE[143] $INFO[Weather.Temperature]</label>
+				<label>$LOCALIZE[143] $INFO[Window(Weather).Property(Current.Temperature)]$INFO[System.TemperatureUnits]</label>
 				<align>right</align>
 				<aligny>center</aligny>
 				<font>font12</font>
 				<shadowcolor>black</shadowcolor>
+				<visible>!IsEmpty(Window(Weather).Property(Current.Temperature))</visible>
 			</control>
 		</control>
 		<!-- Music Info -->
@@ -644,7 +645,7 @@
 						<onclick>ActivateWindow(Weather)</onclick>
 						<icon>special://skin/backgrounds/weather.jpg</icon>
 						<thumb>$INFO[Skin.String(Home_Custom_Back_Weather_Folder)]</thumb>
-						<visible>!Skin.HasSetting(homepageHideWeatherButton)</visible>
+						<visible>!Skin.HasSetting(homepageHideWeatherButton) + !IsEmpty(Weather.Plugin)</visible>
 					</item>
 					<item id="7">
 						<label>5</label>
@@ -665,8 +666,8 @@
 		<control type="image">
 			<posx>40</posx>
 			<posy>30</posy>
-			<width>460</width>
-			<height>65</height>
+			<width>440</width>
+			<height>60</height>
 			<texture>xbmc-logo.png</texture>
 			<include>Window_OpenClose_Animation</include>
 		</control>
diff --git a/720p/MyWeather.xml b/720p/MyWeather.xml
index 741f710..9d303c5 100644
--- a/720p/MyWeather.xml
+++ b/720p/MyWeather.xml
@@ -48,6 +48,19 @@
 					<colordiffuse>66FFFFFF</colordiffuse>
 					<texture>black-back.png</texture>
 				</control>
+				<control type="label">
+					<description>Provider Text</description>
+					<posx>20</posx>
+					<posy>40</posy>
+					<width>440</width>
+					<height>25</height>
+					<font>font11</font>
+					<textcolor>white</textcolor>
+					<scroll>true</scroll>
+					<align>center</align>
+					<aligny>center</aligny>
+					<label>$LOCALIZE[31007] : [COLOR=green]$INFO[Window.Property(WeatherProvider)][/COLOR]</label>
+				</control>
 				<control type="label">
 					<description>current temp Value</description>
 					<posx>20</posx>
@@ -718,7 +731,7 @@
 			<scroll>false</scroll>
 			<align>right</align>
 			<aligny>center</aligny>
-			<info>Weather.Location</info>
+			<label>$INFO[Window(Weather).Property(Location)]</label>
 			<include>Window_OpenClose_Animation</include>
 		</control>
 		<include>WindowTitleButtons</include>
diff --git a/720p/ViewsAddonBrowser.xml b/720p/ViewsAddonBrowser.xml
index e42ab6d..cf6912b 100644
--- a/720p/ViewsAddonBrowser.xml
+++ b/720p/ViewsAddonBrowser.xml
@@ -9,7 +9,7 @@
 			<onright>60</onright>
 			<onup>550</onup>
 			<ondown>550</ondown>
-			<viewtype label="544">list</viewtype>
+			<viewtype label="544">info</viewtype>
 			<pagecontrol>60</pagecontrol>
 			<scrolltime>200</scrolltime>
 			<visible>Window.IsVisible(AddonBrowser) | Container.Content(addons)</visible>
diff --git a/720p/ViewsVideoLibrary.xml b/720p/ViewsVideoLibrary.xml
index e7d0ef8..0345af3 100644
--- a/720p/ViewsVideoLibrary.xml
+++ b/720p/ViewsVideoLibrary.xml
@@ -192,7 +192,7 @@
 			<ondown>61</ondown>
 			<usecontrolcoords>true</usecontrolcoords>
 			<control type="fixedlist" id="57">
-				<visible>!Container.Content(Episodes) + !Container.Content(MusicVideos) + !Container.Content(TVShows)</visible>
+				<visible>!Container.Content(Episodes) + !Container.Content(MusicVideos) + !Container.Content(TVShows) + !Container.Content(Addons)</visible>
 				<posx>-60</posx>
 				<posy>0</posy>
 				<width>1090</width>
diff --git a/720p/custom_SkinSetting_1111.xml b/720p/custom_SkinSetting_1111.xml
index 1eacdbc..34e4f8a 100644
--- a/720p/custom_SkinSetting_1111.xml
+++ b/720p/custom_SkinSetting_1111.xml
@@ -546,6 +546,7 @@
 						<content>
 							<item id="1">
 								<label>3</label>
+								<label2>Home_Custom_Back_Video_Folder</label2>
 								<onclick>-</onclick>
 								<icon>special://skin/backgrounds/videos.jpg</icon>
 								<thumb>$INFO[Skin.String(Home_Custom_Back_Video_Folder)]</thumb>
@@ -560,6 +561,7 @@
 							</item>
 							<item id="9">
 								<label>20342</label>
+								<label2>Home_Custom_Back_Movies_Folder</label2>
 								<onclick>-</onclick>
 								<icon>special://skin/backgrounds/movies.jpg</icon>
 								<thumb>$INFO[Skin.String(Home_Custom_Back_Movies_Folder)]</thumb>
@@ -568,6 +570,7 @@
 							</item>
 							<item id="10">
 								<label>20343</label>
+								<label2>Home_Custom_Back_TVShow_Folder</label2>
 								<onclick>-</onclick>
 								<icon>special://skin/backgrounds/tvshow.jpg</icon>
 								<thumb>$INFO[Skin.String(Home_Custom_Back_TVShow_Folder)]</thumb>
@@ -576,6 +579,7 @@
 							</item>
 							<item id="2">
 								<label>2</label>
+								<label2>Home_Custom_Back_Music_Folder</label2>
 								<onclick>-</onclick>
 								<icon>special://skin/backgrounds/music.jpg</icon>
 								<thumb>$INFO[Skin.String(Home_Custom_Back_Music_Folder)]</thumb>
@@ -583,6 +587,7 @@
 							</item>
 							<item id="3">
 								<label>1</label>
+								<label2>Home_Custom_Back_Pictures_Folder</label2>
 								<onclick>-</onclick>
 								<icon>special://skin/backgrounds/pictures.jpg</icon>
 								<thumb>$INFO[Skin.String(Home_Custom_Back_Pictures_Folder)]</thumb>
@@ -590,6 +595,7 @@
 							</item>
 							<item id="4">
 								<label>0</label>
+								<label2>Home_Custom_Back_Programs_Folder</label2>
 								<onclick>-</onclick>
 								<icon>special://skin/backgrounds/programs.jpg</icon>
 								<thumb>$INFO[Skin.String(Home_Custom_Back_Programs_Folder)]</thumb>
@@ -597,6 +603,7 @@
 							</item>
 							<item id="5">
 								<label>8</label>
+								<label2>Home_Custom_Back_Weather_Folder</label2>
 								<onclick>-</onclick>
 								<icon>special://skin/backgrounds/weather.jpg</icon>
 								<thumb>$INFO[Skin.String(Home_Custom_Back_Weather_Folder)]</thumb>
@@ -604,6 +611,7 @@
 							</item>
 							<item id="7">
 								<label>5</label>
+								<label2>Home_Custom_Back_Settings_Folder</label2>
 								<onclick>-</onclick>
 								<icon>special://skin/backgrounds/settings.jpg</icon>
 								<thumb>$INFO[Skin.String(Home_Custom_Back_Settings_Folder)]</thumb>
@@ -637,14 +645,13 @@
 				<control type="group">
 					<posx>650</posx>
 					<posy>598</posy>
-					<visible>Container(9003).HasFocus(1)</visible>
 					<control type="button" id="300">
 						<description>Single Image button</description>
 						<posx>5</posx>
 						<posy>0</posy>
 						<include>ButtonSetBackgroundCommonValues</include>
 						<label>31113</label>
-						<onclick>Skin.SetImage(Home_Custom_Back_Video_Folder)</onclick>
+						<onclick>Skin.SetImage($INFO[Container(9003).ListItem.Label2])</onclick>
 						<onleft>9003</onleft>
 						<onright>301</onright>
 						<onup>300</onup>
@@ -656,7 +663,7 @@
 						<posy>0</posy>
 						<include>ButtonSetBackgroundCommonValues</include>
 						<label>31114</label>
-						<onclick>Skin.SetPath(Home_Custom_Back_Video_Folder)</onclick>
+						<onclick>Skin.SetPath($INFO[Container(9003).ListItem.Label2])</onclick>
 						<onleft>300</onleft>
 						<onright>302</onright>
 						<onup>301</onup>
@@ -668,294 +675,7 @@
 						<posy>0</posy>
 						<include>ButtonSetBackgroundCommonValues</include>
 						<label>571</label>
-						<onclick>Skin.Reset(Home_Custom_Back_Video_Folder)</onclick>
-						<onleft>301</onleft>
-						<onright>9000</onright>
-						<onup>302</onup>
-						<ondown>302</ondown>
-					</control>
-				</control>
-				<control type="group">
-					<posx>650</posx>
-					<posy>598</posy>
-					<visible>Container(9003).HasFocus(9)</visible>
-					<control type="button" id="300">
-						<description>Single Image button</description>
-						<posx>5</posx>
-						<posy>0</posy>
-						<include>ButtonSetBackgroundCommonValues</include>
-						<label>31113</label>
-						<onclick>Skin.SetImage(Home_Custom_Back_Movie_Folder)</onclick>
-						<onleft>9003</onleft>
-						<onright>301</onright>
-						<onup>300</onup>
-						<ondown>300</ondown>
-					</control>
-					<control type="button" id="301">
-						<description>Multi Image button</description>
-						<posx>190</posx>
-						<posy>0</posy>
-						<include>ButtonSetBackgroundCommonValues</include>
-						<label>31114</label>
-						<onclick>Skin.SetPath(Home_Custom_Back_Movie_Folder)</onclick>
-						<onleft>300</onleft>
-						<onright>302</onright>
-						<onup>301</onup>
-						<ondown>301</ondown>
-					</control>
-					<control type="button" id="302">
-						<description>Default Image button</description>
-						<posx>375</posx>
-						<posy>0</posy>
-						<include>ButtonSetBackgroundCommonValues</include>
-						<label>571</label>
-						<onclick>Skin.Reset(Home_Custom_Back_Movie_Folder)</onclick>
-						<onleft>301</onleft>
-						<onright>9000</onright>
-						<onup>302</onup>
-						<ondown>302</ondown>
-					</control>
-				</control>
-				<control type="group">
-					<posx>650</posx>
-					<posy>598</posy>
-					<visible>Container(9003).HasFocus(10)</visible>
-					<control type="button" id="300">
-						<description>Single Image button</description>
-						<posx>5</posx>
-						<posy>0</posy>
-						<include>ButtonSetBackgroundCommonValues</include>
-						<label>31113</label>
-						<onclick>Skin.SetImage(Home_Custom_Back_TVShow_Folder)</onclick>
-						<onleft>9003</onleft>
-						<onright>301</onright>
-						<onup>300</onup>
-						<ondown>300</ondown>
-					</control>
-					<control type="button" id="301">
-						<description>Multi Image button</description>
-						<posx>190</posx>
-						<posy>0</posy>
-						<include>ButtonSetBackgroundCommonValues</include>
-						<label>31114</label>
-						<onclick>Skin.SetPath(Home_Custom_Back_TVShow_Folder)</onclick>
-						<onleft>300</onleft>
-						<onright>302</onright>
-						<onup>301</onup>
-						<ondown>301</ondown>
-					</control>
-					<control type="button" id="302">
-						<description>Default Image button</description>
-						<posx>375</posx>
-						<posy>0</posy>
-						<include>ButtonSetBackgroundCommonValues</include>
-						<label>571</label>
-						<onclick>Skin.Reset(Home_Custom_Back_TVShow_Folder)</onclick>
-						<onleft>301</onleft>
-						<onright>9000</onright>
-						<onup>302</onup>
-						<ondown>302</ondown>
-					</control>
-				</control>
-				<control type="group">
-					<posx>650</posx>
-					<posy>598</posy>
-					<visible>Container(9003).HasFocus(2)</visible>
-					<control type="button" id="300">
-						<description>Single Image button</description>
-						<posx>5</posx>
-						<posy>0</posy>
-						<include>ButtonSetBackgroundCommonValues</include>
-						<label>31113</label>
-						<onclick>Skin.SetImage(Home_Custom_Back_Music_Folder)</onclick>
-						<onleft>9003</onleft>
-						<onright>301</onright>
-						<onup>300</onup>
-						<ondown>300</ondown>
-					</control>
-					<control type="button" id="301">
-						<description>Multi Image button</description>
-						<posx>190</posx>
-						<posy>0</posy>
-						<include>ButtonSetBackgroundCommonValues</include>
-						<label>31114</label>
-						<onclick>Skin.SetPath(Home_Custom_Back_Music_Folder)</onclick>
-						<onleft>300</onleft>
-						<onright>302</onright>
-						<onup>301</onup>
-						<ondown>301</ondown>
-					</control>
-					<control type="button" id="302">
-						<description>Default Image button</description>
-						<posx>375</posx>
-						<posy>0</posy>
-						<include>ButtonSetBackgroundCommonValues</include>
-						<label>571</label>
-						<onclick>Skin.Reset(Home_Custom_Back_Music_Folder)</onclick>
-						<onleft>301</onleft>
-						<onright>9000</onright>
-						<onup>302</onup>
-						<ondown>302</ondown>
-					</control>
-				</control>
-				<control type="group">
-					<posx>650</posx>
-					<posy>598</posy>
-					<visible>Container(9003).HasFocus(3)</visible>
-					<control type="button" id="300">
-						<description>Single Image button</description>
-						<posx>5</posx>
-						<posy>0</posy>
-						<include>ButtonSetBackgroundCommonValues</include>
-						<label>31113</label>
-						<onclick>Skin.SetImage(Home_Custom_Back_Pictures_Folder)</onclick>
-						<onleft>9003</onleft>
-						<onright>301</onright>
-						<onup>300</onup>
-						<ondown>300</ondown>
-					</control>
-					<control type="button" id="301">
-						<description>Multi Image button</description>
-						<posx>190</posx>
-						<posy>0</posy>
-						<include>ButtonSetBackgroundCommonValues</include>
-						<label>31114</label>
-						<onclick>Skin.SetPath(Home_Custom_Back_Pictures_Folder)</onclick>
-						<onleft>300</onleft>
-						<onright>302</onright>
-						<onup>301</onup>
-						<ondown>301</ondown>
-					</control>
-					<control type="button" id="302">
-						<description>Default Image button</description>
-						<posx>375</posx>
-						<posy>0</posy>
-						<include>ButtonSetBackgroundCommonValues</include>
-						<label>571</label>
-						<onclick>Skin.Reset(Home_Custom_Back_Pictures_Folder)</onclick>
-						<onleft>301</onleft>
-						<onright>9000</onright>
-						<onup>302</onup>
-						<ondown>302</ondown>
-					</control>
-				</control>
-				<control type="group">
-					<posx>650</posx>
-					<posy>598</posy>
-					<visible>Container(9003).HasFocus(4)</visible>
-					<control type="button" id="300">
-						<description>Single Image button</description>
-						<posx>5</posx>
-						<posy>0</posy>
-						<include>ButtonSetBackgroundCommonValues</include>
-						<label>31113</label>
-						<onclick>Skin.SetImage(Home_Custom_Back_Programs_Folder)</onclick>
-						<onleft>9003</onleft>
-						<onright>301</onright>
-						<onup>300</onup>
-						<ondown>300</ondown>
-					</control>
-					<control type="button" id="301">
-						<description>Multi Image button</description>
-						<posx>190</posx>
-						<posy>0</posy>
-						<include>ButtonSetBackgroundCommonValues</include>
-						<label>31114</label>
-						<onclick>Skin.SetPath(Home_Custom_Back_Programs_Folder)</onclick>
-						<onleft>300</onleft>
-						<onright>302</onright>
-						<onup>301</onup>
-						<ondown>301</ondown>
-					</control>
-					<control type="button" id="302">
-						<description>Default Image button</description>
-						<posx>375</posx>
-						<posy>0</posy>
-						<include>ButtonSetBackgroundCommonValues</include>
-						<label>571</label>
-						<onclick>Skin.Reset(Home_Custom_Back_Programs_Folder)</onclick>
-						<onleft>301</onleft>
-						<onright>9000</onright>
-						<onup>302</onup>
-						<ondown>302</ondown>
-					</control>
-				</control>
-				<control type="group">
-					<posx>650</posx>
-					<posy>598</posy>
-					<visible>Container(9003).HasFocus(5)</visible>
-					<control type="button" id="300">
-						<description>Single Image button</description>
-						<posx>5</posx>
-						<posy>0</posy>
-						<include>ButtonSetBackgroundCommonValues</include>
-						<label>31113</label>
-						<onclick>Skin.SetImage(Home_Custom_Back_Weather_Folder)</onclick>
-						<onleft>9003</onleft>
-						<onright>301</onright>
-						<onup>300</onup>
-						<ondown>300</ondown>
-					</control>
-					<control type="button" id="301">
-						<description>Multi Image button</description>
-						<posx>190</posx>
-						<posy>0</posy>
-						<include>ButtonSetBackgroundCommonValues</include>
-						<label>31114</label>
-						<onclick>Skin.SetPath(Home_Custom_Back_Weather_Folder)</onclick>
-						<onleft>300</onleft>
-						<onright>302</onright>
-						<onup>301</onup>
-						<ondown>301</ondown>
-					</control>
-					<control type="button" id="302">
-						<description>Default Image button</description>
-						<posx>375</posx>
-						<posy>0</posy>
-						<include>ButtonSetBackgroundCommonValues</include>
-						<label>571</label>
-						<onclick>Skin.Reset(Home_Custom_Back_Weather_Folder)</onclick>
-						<onleft>301</onleft>
-						<onright>9000</onright>
-						<onup>302</onup>
-						<ondown>302</ondown>
-					</control>
-				</control>
-				<control type="group">
-					<posx>650</posx>
-					<posy>598</posy>
-					<visible>Container(9003).HasFocus(7)</visible>
-					<control type="button" id="300">
-						<description>Single Image button</description>
-						<posx>5</posx>
-						<posy>0</posy>
-						<include>ButtonSetBackgroundCommonValues</include>
-						<label>31113</label>
-						<onclick>Skin.SetImage(Home_Custom_Back_Settings_Folder)</onclick>
-						<onleft>9003</onleft>
-						<onright>301</onright>
-						<onup>300</onup>
-						<ondown>300</ondown>
-					</control>
-					<control type="button" id="301">
-						<description>Multi Image button</description>
-						<posx>190</posx>
-						<posy>0</posy>
-						<include>ButtonSetBackgroundCommonValues</include>
-						<label>31114</label>
-						<onclick>Skin.SetPath(Home_Custom_Back_Settings_Folder)</onclick>
-						<onleft>300</onleft>
-						<onright>302</onright>
-						<onup>301</onup>
-						<ondown>301</ondown>
-					</control>
-					<control type="button" id="302">
-						<description>Default Image button</description>
-						<posx>375</posx>
-						<posy>0</posy>
-						<include>ButtonSetBackgroundCommonValues</include>
-						<label>571</label>
-						<onclick>Skin.Reset(Home_Custom_Back_Settings_Folder)</onclick>
+						<onclick>Skin.Reset($INFO[Container(9003).ListItem.Label2])</onclick>
 						<onleft>301</onleft>
 						<onright>9000</onright>
 						<onup>302</onup>
diff --git a/720p/includes.xml b/720p/includes.xml
index 05c651c..22cac4d 100644
--- a/720p/includes.xml
+++ b/720p/includes.xml
@@ -10,6 +10,23 @@
 	<constant name="FanartCrossfadeTime">400</constant>
 	<constant name="IconCrossfadeTime">400</constant>
 
+	<variable name="PlaybackStateLabel">
+		<value condition="Player.Playing + !Player.Seeking">$LOCALIZE[31042]</value>
+		<value condition="[Player.Paused + !Player.Caching] + !Player.Seeking">$LOCALIZE[31043]</value>
+		<value condition="[Player.Paused + Player.Caching] + !Player.Seeking">$LOCALIZE[15107] $INFO[Player.CacheLevel]%</value>
+		<value condition="Player.Seeking">[UPPERCASE]$LOCALIZE[773][/UPPERCASE]</value>
+		<value condition="Player.Rewinding2x + !Player.Seeking">$LOCALIZE[31045] x2</value>
+		<value condition="Player.Rewinding4x + !Player.Seeking">$LOCALIZE[31045] x4</value>
+		<value condition="Player.Rewinding8x + !Player.Seeking">$LOCALIZE[31045] x8</value>
+		<value condition="Player.Rewinding16x + !Player.Seeking">$LOCALIZE[31045] x16</value>
+		<value condition="Player.Rewinding32x + !Player.Seeking">$LOCALIZE[31045] x32</value>
+		<value condition="Player.Forwarding2x + !Player.Seeking">$LOCALIZE[31044] x2</value>
+		<value condition="Player.Forwarding4x + !Player.Seeking">$LOCALIZE[31044] x4</value>
+		<value condition="Player.Forwarding8x + !Player.Seeking">$LOCALIZE[31044] x8</value>
+		<value condition="Player.Forwarding16x + !Player.Seeking">$LOCALIZE[31044] x16</value>
+		<value condition="Player.Forwarding32x + !Player.Seeking">$LOCALIZE[31044] x32</value>
+	</variable>
+
 	<include name="CommonBackground">
 		<control type="image">
 			<posx>0</posx>
@@ -75,7 +92,7 @@
 			<texture>black-back.png</texture>
 			<animation effect="fade" time="400">Visible</animation>
 			<animation effect="fade" time="200">Hidden</animation>
-			<visible>Window.IsActive(MovieInformation) | Window.IsActive(MusicInformation) | Window.IsActive(SongInformation) | Window.IsActive(Favourites) | Window.IsActive(ShutdownMenu) | Window.IsActive(FileBrowser) | Window.IsActive(TextViewer) | Window.IsActive(AddonSettings) | Window.IsActive(ContentSettings) | Window.IsActive(SelectDialog) | Window.IsActive(FileStackingDialog) | Window.IsActive(MediaSource) | Window.IsActive(PictureInfo) | Window.IsActive(PlayerControls) | Window.IsActive(VirtualKeyboard) | Window.IsActive(NumericInput) | Window.IsActive(ProfileSettings) | Window.IsActive(LockSettings) | Window.IsActive(SmartPlaylistEditor) | Window.IsActive(SmartPlaylistRule) | Window.IsActive(script-XBMC_Lyrics-settings.xml) | Window.IsActive(script-RSS_Editor-rssEditor.xml) | Window.IsActive(script-RSS_Editor-setEditor.xml) | Window.IsActive(AddonInformation)</visible>
+			<visible>Window.IsActive(MovieInformation) | Window.IsActive(MusicInformation) | Window.IsActive(SongInformation) | Window.IsActive(Favourites) | Window.IsActive(ShutdownMenu) | Window.IsActive(FileBrowser) | Window.IsActive(TextViewer) | Window.IsActive(AddonSettings) | Window.IsActive(ContentSettings) | Window.IsActive(SelectDialog) | Window.IsActive(FileStackingDialog) | Window.IsActive(MediaSource) | Window.IsActive(PictureInfo) | Window.IsActive(PlayerControls) | Window.IsActive(VirtualKeyboard) | Window.IsActive(NumericInput) | Window.IsActive(ProfileSettings) | Window.IsActive(LockSettings) | Window.IsActive(SmartPlaylistEditor) | Window.IsActive(SmartPlaylistRule) | Window.IsActive(script-XBMC_Lyrics-settings.xml) | Window.IsActive(script-RSS_Editor-rssEditor.xml) | Window.IsActive(script-RSS_Editor-setEditor.xml) | Window.IsActive(AddonInformation) | Window.IsActive(Peripherals) | Window.IsActive(PeripheralSettings)</visible>
 		</control>
 	</include>
 	<include name="CommonNowPlaying_Controls">
diff --git a/720p/script-XBMC-Subtitles-main.xml b/720p/script-XBMC-Subtitles-main.xml
index fa09172..7ab2adb 100644
--- a/720p/script-XBMC-Subtitles-main.xml
+++ b/720p/script-XBMC-Subtitles-main.xml
@@ -96,13 +96,33 @@
 				<aspectratio align="left">keep</aspectratio>
 			</control>		
 		</control>
+		<control type="button" id="5">
+			<description>Subtitle Source button</description>
+			<posx>45</posx>
+			<posy>555</posy>
+			<width>200</width>
+			<height>35</height>
+			<label>33063</label>
+			<font>font12</font>
+			<textcolor>grey2</textcolor>
+			<focusedcolor>white</focusedcolor>
+			<align>center</align>
+			<texturefocus border="3">button-focus2.png</texturefocus>
+			<texturenofocus border="3">button-nofocus.png</texturenofocus>
+			<onleft>121</onleft>
+			<onright>120</onright>
+			<onup>120</onup>
+			<ondown>120</ondown>
+			<onclick>Skin.ToggleSetting(SubtitleSourceChooserVisible)</onclick>
+			<onclick>SetFocus(150)</onclick>
+		</control>
 		<!-- ** Required ** Do not change <id>or<type>-->
 		<control type="list" id="120">
 			<posx>45</posx>
 			<posy>130</posy>
 			<width>685</width>
 			<height>420</height>
-			<onleft>121</onleft>
+			<onleft>5</onleft>
 			<onright>121</onright>
 			<onup>120</onup>
 			<ondown>120</ondown>
@@ -173,9 +193,10 @@
 				</control>
 				<control type="image">
 					<posx>550</posx>
-					<posy>27</posy>
+					<posy>28</posy>
 					<width>125</width>
-					<height>25</height>
+					<height>22</height>
+					<aspectratio align="right">keep</aspectratio>
 					<texture>xbmc_subtitles/ratings/$INFO[ListItem.ActualIcon].png</texture>
 				</control>
 			</itemlayout>
@@ -250,9 +271,10 @@
 				</control>
 				<control type="image">
 					<posx>550</posx>
-					<posy>27</posy>
+					<posy>28</posy>
 					<width>125</width>
-					<height>25</height>
+					<height>22</height>
+					<aspectratio align="right">keep</aspectratio>
 					<texture>xbmc_subtitles/ratings/$INFO[ListItem.ActualIcon].png</texture>
 				</control>
 			</focusedlayout>
@@ -268,9 +290,118 @@
 			<textureslidernib>scrollbar_nib.png</textureslidernib>
 			<textureslidernibfocus>scrollbar_nib.png</textureslidernibfocus>
 			<onleft>120</onleft>
-			<onright>120</onright>
+			<onright>5</onright>
 			<showonepage>false</showonepage>
 			<orientation>vertical</orientation>
 		</control>
+		<control type="group">
+			<visible>Skin.HasSetting(SubtitleSourceChooserVisible)</visible>
+			<include>VisibleFadeEffect</include>
+			<control type="button">
+				<description>Hidden button to close the sort when its focused</description>
+				<posx>-400</posx>
+				<posy>-45</posy>
+				<width>1280</width>
+				<height>720</height>
+				<texturenofocus>-</texturenofocus>
+				<texturefocus>-</texturefocus>
+				<onclick>Skin.Reset(SubtitleSourceChooserVisible)</onclick>
+			</control>
+			<control type="group">
+				<posx>200</posx>
+				<posy>150</posy>
+				<control type="image" id="997">
+					<description>background top image</description>
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>400</width>
+					<height>50</height>
+					<texture border="40,40,40,0">ContextMenu_Top.png</texture>
+				</control>
+				<control type="image" id="999">
+					<description>background image</description>
+					<posx>0</posx>
+					<posy>50</posy>
+					<width>400</width>
+					<height>250</height>
+					<texture border="40,0,40,0">ContextMenu_Middle.png</texture>
+				</control>
+				<control type="image" id="998">
+					<description>background bottom image</description>
+					<posx>0</posx>
+					<posy>300</posy>
+					<width>400</width>
+					<height>50</height>
+					<texture border="40,0,40,40">ContextMenu_Bottom.png</texture>
+				</control>
+				<control type="label">
+					<description>Available sources label</description>
+					<posx>10</posx>
+					<posy>37</posy>
+					<width>380</width>
+					<height>25</height>
+					<label>$LOCALIZE[SCRIPT760]</label>
+					<font>font12</font>
+					<align>center</align>
+					<aligny>top</aligny>
+					<textcolor>green</textcolor>
+				</control>
+				<control type="panel" id="150">
+					<posx>40</posx>
+					<posy>65</posy>
+					<width>320</width>
+					<height>240</height>
+					<onleft>5</onleft>
+					<onleft>Skin.Reset(SubtitleSourceChooserVisible)</onleft>
+					<onright>150</onright>
+					<onup>150</onup>
+					<ondown>150</ondown>
+					<viewtype label="535">list</viewtype>
+					<scrolltime>200</scrolltime>
+					<itemlayout width="320" height="40">
+						<control type="image">
+							<posx>0</posx>
+							<posy>0</posy>
+							<width>320</width>
+							<height>38</height>
+							<texture border="3">button-nofocus.png</texture>
+						</control>
+						<control type="label">
+							<posx>160</posx>
+							<posy>0</posy>
+							<width>300</width>
+							<height>38</height>
+							<font>font12</font>
+							<aligny>center</aligny>
+							<textcolor>white</textcolor>
+							<selectedcolor>selected</selectedcolor>
+							<align>center</align>
+							<info>ListItem.Label</info>
+						</control>
+					</itemlayout>
+					<focusedlayout width="320" height="40">
+						<control type="image">
+							<posx>0</posx>
+							<posy>0</posy>
+							<width>320</width>
+							<height>38</height>
+							<texture border="3">button-focus2.png</texture>
+						</control>
+						<control type="label">
+							<posx>160</posx>
+							<posy>0</posy>
+							<width>300</width>
+							<height>38</height>
+							<font>font12</font>
+							<aligny>center</aligny>
+							<textcolor>white</textcolor>
+							<selectedcolor>selected</selectedcolor>
+							<align>center</align>
+							<info>ListItem.Label</info>
+						</control>
+					</focusedlayout>
+				</control>
+			</control>
+		</control>
 	</controls>
 </window>
diff --git a/720p/script-XBMC_Lyrics-settings.xml b/720p/script-XBMC_Lyrics-settings.xml
deleted file mode 100644
index bbf27ab..0000000
--- a/720p/script-XBMC_Lyrics-settings.xml
+++ /dev/null
@@ -1,311 +0,0 @@
-<window>
-	<defaultcontrol>201</defaultcontrol>
-	<coordinates>
-		<system>1</system>
-		<posx>240</posx>
-		<posy>85</posy>
-	</coordinates>
-	<include>dialogeffect</include>
-	<controls>
-		<control type="image">
-			<description>background image</description>
-			<posx>0</posx>
-			<posy>0</posy>
-			<width>810</width>
-			<height>550</height>
-			<texture border="40">DialogBack.png</texture>
-		</control>
-		<control type="image">
-			<description>background image</description>
-			<posx>0</posx>
-			<posy>0</posy>
-			<width>810</width>
-			<height>550</height>
-			<texture border="40">DialogFront.png</texture>
-		</control>
-		<!-- ** Required ** Do not change id or type -->
-		<control type="label">
-			<description>heading label</description>
-			<posx>40</posx>
-			<posy>40</posy>
-			<width>720</width>
-			<height>35</height>
-			<align>center</align>
-			<aligny>center</aligny>
-			<font>font18</font>
-			<label>[UPPERCASE]$LOCALIZE[SCRIPT0][/UPPERCASE] - ( $INFO[Control.GetLabel(30)] )</label>
-			<textcolor>white</textcolor>
-		</control>
-		<control type="label" id="30">
-			<description>Version label</description>
-			<label>-</label>
-			<visible>false</visible>
-		</control>
-		<control type="image">
-			<posx>40</posx>
-			<posy>78</posy>
-			<width>720</width>
-			<height>2</height>
-			<texture>separator.png</texture>
-		</control>
-		<!-- ** Required ** Do not change id's or type's -->
-		<control type="grouplist" id="9000">
-			<posx>40</posx>
-			<posy>90</posy>
-			<width>570</width>
-			<height>410</height>
-			<itemgap>5</itemgap>
-			<pagecontrol>-</pagecontrol>
-			<onleft>2000</onleft>
-			<onright>2000</onright>
-			<onup>9000</onup>
-			<ondown>9000</ondown>
-			<control type="button" id="201">
-				<description>Setting1 Button</description>
-				<posx>0</posx>
-				<posy>0</posy>
-				<width>570</width>
-				<height>35</height>
-				<font>font12</font>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-				<label>$LOCALIZE[SCRIPT201]</label>
-			</control>
-			<control type="image" id="1">
-				<description>separator image</description>
-				<width>570</width>
-				<height>2</height>
-				<texture>separator.png</texture>
-			</control>
-			<control type="radiobutton" id="202">
-				<description>Setting2 Button</description>
-				<width>570</width>
-				<height>35</height>
-				<label>$LOCALIZE[SCRIPT202]</label>
-				<pulseonselect>no</pulseonselect>
-				<font>font12</font>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			</control>
-			<control type="button" id="203">
-				<description>Setting2 Button</description>
-				<posx>0</posx>
-				<posy>0</posy>
-				<width>570</width>
-				<height>35</height>
-				<label>$LOCALIZE[SCRIPT203]</label>
-				<font>font12</font>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			</control>
-			<control type="radiobutton" id="210">
-				<description>Setting10 Button</description>
-				<width>570</width>
-				<height>35</height>
-				<label>$LOCALIZE[SCRIPT210]</label>
-				<pulseonselect>no</pulseonselect>
-				<font>font12</font>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			</control>
-			<control type="radiobutton" id="211">
-				<description>Setting11 Button</description>
-				<width>570</width>
-				<height>35</height>
-				<label>$LOCALIZE[SCRIPT211]</label>
-				<pulseonselect>no</pulseonselect>
-				<font>font12</font>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			</control>
-			<control type="image" id="2">
-				<description>separator image</description>
-				<width>570</width>
-				<height>2</height>
-				<texture>separator.png</texture>
-			</control>
-			<control type="radiobutton" id="280">
-				<description>Custom Button</description>
-				<width>570</width>
-				<height>35</height>
-				<label>31111</label>
-				<pulseonselect>no</pulseonselect>
-				<onclick>Skin.ToggleSetting(Music_Info_In_Lyrics)</onclick>
-				<selected>!Skin.HasSetting(Music_Info_In_Lyrics)</selected>
-				<font>font12</font>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			</control>
-			<control type="radiobutton" id="204">
-				<description>Setting4 Button</description>
-				<width>570</width>
-				<height>35</height>
-				<label>$LOCALIZE[SCRIPT204]</label>
-				<pulseonselect>no</pulseonselect>
-				<font>font12</font>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			</control>
-			<control type="radiobutton" id="205">
-				<description>Setting5 Button</description>
-				<width>570</width>
-				<height>35</height>
-				<label>$LOCALIZE[SCRIPT205]</label>
-				<pulseonselect>no</pulseonselect>
-				<font>font12</font>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			</control>
-			<control type="image" id="3">
-				<description>separator image</description>
-				<width>570</width>
-				<height>2</height>
-				<texture>separator.png</texture>
-			</control>
-			<control type="radiobutton" id="206">
-				<description>Setting6 Button</description>
-				<width>570</width>
-				<height>35</height>
-				<label>$LOCALIZE[SCRIPT206]</label>
-				<pulseonselect>no</pulseonselect>
-				<font>font12</font>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			</control>
-			<control type="button" id="207">
-				<description>Setting7 Button</description>
-				<posx>0</posx>
-				<posy>0</posy>
-				<width>570</width>
-				<height>35</height>
-				<label>$LOCALIZE[SCRIPT207]</label>
-				<font>font12</font>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			</control>
-			<control type="image" id="4">
-				<description>separator image</description>
-				<width>570</width>
-				<height>2</height>
-				<texture>separator.png</texture>
-			</control>
-			<control type="button" id="208">
-				<description>Setting8 Button</description>
-				<posx>0</posx>
-				<posy>0</posy>
-				<width>570</width>
-				<height>35</height>
-				<label>$LOCALIZE[SCRIPT208]</label>
-				<font>font12</font>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			</control>
-			<control type="radiobutton" id="209">
-				<description>Setting9 Button</description>
-				<width>570</width>
-				<height>35</height>
-				<label>$LOCALIZE[SCRIPT209]</label>
-				<pulseonselect>no</pulseonselect>
-				<font>font12</font>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<texturenofocus border="5">button-nofocus.png</texturenofocus>
-			</control>
-		</control>
-		<!-- ** Required ** Do not change id's or type's -->
-		<control type="group" id="2000">
-			<posx>620</posx>
-			<posy>90</posy>
-			<control type="button" id="250">
-				<description>OK button</description>
-				<posx>0</posx>
-				<posy>0</posy>
-				<width>150</width>
-				<height>35</height>
-				<align>center</align>
-				<label>$LOCALIZE[SCRIPT250]</label>
-				<texturefocus border="3">button-focus2.png</texturefocus>
-				<texturenofocus border="3">button-nofocus.png</texturenofocus>
-				<onleft>9000</onleft>
-				<onright>9000</onright>
-				<onup>254</onup>
-				<ondown>251</ondown>
-			</control>
-			<control type="button" id="251">
-				<description>Cancel button</description>
-				<posx>0</posx>
-				<posy>40</posy>
-				<width>150</width>
-				<height>35</height>
-				<align>center</align>
-				<label>$LOCALIZE[SCRIPT251]</label>
-				<texturefocus border="3">button-focus2.png</texturefocus>
-				<texturenofocus border="3">button-nofocus.png</texturenofocus>
-				<onleft>9000</onleft>
-				<onright>9000</onright>
-				<onup>250</onup>
-				<ondown>252</ondown>
-			</control>
-			<control type="button" id="252">
-				<description>Update button</description>
-				<posx>0</posx>
-				<posy>80</posy>
-				<width>150</width>
-				<height>35</height>
-				<align>center</align>
-				<label>$LOCALIZE[SCRIPT252]</label>
-				<texturefocus border="3">button-focus2.png</texturefocus>
-				<texturenofocus border="3">button-nofocus.png</texturenofocus>
-				<onleft>9000</onleft>
-				<onright>9000</onright>
-				<onup>251</onup>
-				<ondown>253</ondown>
-			</control>
-			<control type="button" id="253">
-				<description>Credits button</description>
-				<posx>0</posx>
-				<posy>120</posy>
-				<width>150</width>
-				<height>35</height>
-				<align>center</align>
-				<label>$LOCALIZE[SCRIPT253]</label>
-				<texturefocus border="3">button-focus2.png</texturefocus>
-				<texturenofocus border="3">button-nofocus.png</texturenofocus>
-				<onleft>9000</onleft>
-				<onright>9000</onright>
-				<onup>252</onup>
-				<ondown>255</ondown>
-			</control>
-			<control type="button" id="255">
-				<description>Defaults button</description>
-				<posx>0</posx>
-				<posy>160</posy>
-				<width>150</width>
-				<height>35</height>
-				<align>center</align>
-				<label>$LOCALIZE[SCRIPT255]</label>
-				<texturefocus border="3">button-focus2.png</texturefocus>
-				<texturenofocus border="3">button-nofocus.png</texturenofocus>
-				<onleft>9000</onleft>
-				<onright>9000</onright>
-				<onup>253</onup>
-				<ondown>254</ondown>
-			</control>
-			<control type="button" id="254">
-				<description>Play button</description>
-				<posx>0</posx>
-				<posy>200</posy>
-				<width>150</width>
-				<height>35</height>
-				<align>center</align>
-				<font>font12</font>
-				<label>$LOCALIZE[SCRIPT254]</label>
-				<texturefocus border="3">button-focus2.png</texturefocus>
-				<texturenofocus border="3">button-nofocus.png</texturenofocus>
-				<onleft>9000</onleft>
-				<onright>9000</onright>
-				<onup>255</onup>
-				<ondown>250</ondown>
-			</control>
-		</control>
-	</controls>
-</window>
\ No newline at end of file
diff --git a/addon.xml b/addon.xml
index 5e68390..537584e 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="skin.pm3-hd-pvr"
-  version="1.3.1"
+  version="2.1.0"
   name="PM3.HD for PVR"
   provider-name="Jezz_X, Team XBMC">
   <requires>
-    <import addon="xbmc.gui" version="2.11"/>
+    <import addon="xbmc.gui" version="3.00"/>
   </requires>
   <extension
     point="xbmc.gui.skin"
diff --git a/changelog.txt b/changelog.txt
index 7744bc9..afc6cfd 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,8 @@
+[B]Version 2.0.0[/B]
+
+- Removed all the old stuff that is not compatible with eden XBMC and changed the bits that needed changing for eden
+- Added Cache level to the Progress bars
+
 [B]Version 1.3.1[/B]
 
 - Added a couple more codec flagging images that were missing
diff --git a/language/English/strings.xml b/language/English/strings.xml
index 58e2507..925ad8f 100644
--- a/language/English/strings.xml
+++ b/language/English/strings.xml
@@ -7,7 +7,7 @@
   <string id="31004">Home</string>
   <string id="31005">Memory Used:</string>
   <string id="31006">End Time:</string>
-  <string id="31007"></string>
+  <string id="31007">Data Provider</string>
   <string id="31008"></string>
   <string id="31009"></string>
   <string id="31010">FANART[CR]IMAGE[CR]NOT[CR]AVAILABLE</string>
diff --git a/media/ProgressBack2.png b/media/ProgressBack2.png
new file mode 100644
index 0000000..93cb717
Binary files /dev/null and b/media/ProgressBack2.png differ
diff --git a/media/ProgressCache.png b/media/ProgressCache.png
new file mode 100644
index 0000000..4935e08
Binary files /dev/null and b/media/ProgressCache.png differ
diff --git a/media/flagging/audio/10.png b/media/flagging/audio/10.png
new file mode 100644
index 0000000..a751d5c
Binary files /dev/null and b/media/flagging/audio/10.png differ
diff --git a/media/flagging/audio/3.png b/media/flagging/audio/3.png
new file mode 100644
index 0000000..f66a213
Binary files /dev/null and b/media/flagging/audio/3.png differ
diff --git a/media/flagging/audio/4.png b/media/flagging/audio/4.png
new file mode 100644
index 0000000..a2962b1
Binary files /dev/null and b/media/flagging/audio/4.png differ
diff --git a/media/flagging/audio/5.png b/media/flagging/audio/5.png
new file mode 100644
index 0000000..3aac8a1
Binary files /dev/null and b/media/flagging/audio/5.png differ
diff --git a/media/flagging/audio/7.png b/media/flagging/audio/7.png
new file mode 100644
index 0000000..71667c2
Binary files /dev/null and b/media/flagging/audio/7.png differ
diff --git a/media/flagging/audio/alac.png b/media/flagging/audio/alac.png
new file mode 100644
index 0000000..69e61e8
Binary files /dev/null and b/media/flagging/audio/alac.png differ
diff --git a/media/flagging/audio/pcm_bluray.png b/media/flagging/audio/pcm_bluray.png
new file mode 100644
index 0000000..e06b684
Binary files /dev/null and b/media/flagging/audio/pcm_bluray.png differ
diff --git a/media/flagging/audio/wav.png b/media/flagging/audio/wav.png
new file mode 100644
index 0000000..9ab42d0
Binary files /dev/null and b/media/flagging/audio/wav.png differ
diff --git a/media/flagging/video/vp8.png b/media/flagging/video/vp8.png
new file mode 100644
index 0000000..9291b57
Binary files /dev/null and b/media/flagging/video/vp8.png differ