Updated: [Confluence] All the dialogs to a easier to understand standard layout

36 files changed, 1437 insertions, 1825 deletions

diff --git a/addons/skin.confluence/720p/DialogAddonInfo.xml b/addons/skin.confluence/720p/DialogAddonInfo.xml
index 86d2f2e913..0182ae13c6 100644
--- a/addons/skin.confluence/720p/DialogAddonInfo.xml
+++ b/addons/skin.confluence/720p/DialogAddonInfo.xml
@@ -20,24 +20,30 @@
 				<texture border="40">DialogBack.png</texture>
 			</control>
 			<control type="image">
-				<posx>260</posx>
-				<posy>10</posy>
-				<width>620</width>
-				<height>578</height>
-				<texture border="5">black-back2.png</texture>
+				<description>Dialog Header image</description>
+				<posx>40</posx>
+				<posy>16</posy>
+				<width>840</width>
+				<height>40</height>
+				<texture>dialogheader.png</texture>
 			</control>
-			<control type="image">
-				<posx>260</posx>
-				<posy>10</posy>
-				<width>610</width>
-				<height>100</height>
-				<aspectratio>stretch</aspectratio>
-				<texture>GlassTitleBar.png</texture>
+			<control type="label">
+				<description>header label</description>
+				<posx>40</posx>
+				<posy>20</posy>
+				<width>840</width>
+				<height>30</height>
+				<font>font13_title</font>
+				<label>$LOCALIZE[24003]</label>
+				<align>center</align>
+				<aligny>center</aligny>
+				<textcolor>selected</textcolor>
+				<shadowcolor>black</shadowcolor>
 			</control>
 			<control type="button">
 				<description>Close Window button</description>
-				<posx>810</posx>
-				<posy>9</posy>
+				<posx>830</posx>
+				<posy>15</posy>
 				<width>64</width>
 				<height>32</height>
 				<label>-</label>
@@ -51,26 +57,15 @@
 				<ondown>3</ondown>
 				<visible>system.getbool(input.enablemouse)</visible>
 			</control>
-			<control type="label">
-				<description>header label</description>
-				<posx>280</posx>
-				<posy>20</posy>
-				<width>580</width>
-				<height>30</height>
-				<font>font30_title</font>
-				<label>24003</label>
-				<align>left</align>
-				<aligny>center</aligny>
-				<textcolor>white</textcolor>
-				<shadowcolor>black</shadowcolor>
-			</control>
 			<control type="image">
-				<posx>35</posx>
-				<posy>40</posy>
-				<width>200</width>
-				<height>200</height>
+				<posx>30</posx>
+				<posy>70</posy>
+				<width>220</width>
+				<height>220</height>
 				<aspectratio>keep</aspectratio>
 				<texture>$INFO[ListItem.Icon]</texture>
+				<bordertexture border="8">ThumbShadow.png</bordertexture>
+				<bordersize>8</bordersize>
 			</control>
 			<control type="label">
 				<description>Addon Title value</description>
@@ -97,7 +92,7 @@
 					<label>$LOCALIZE[146]</label>
 					<align>right</align>
 					<aligny>center</aligny>
-					<font>font13_title</font>
+					<font>font13</font>
 					<textcolor>blue</textcolor>
 				</control>
 				<control type="label">
@@ -121,7 +116,7 @@
 					<label>$LOCALIZE[21863]:</label>
 					<align>right</align>
 					<aligny>center</aligny>
-					<font>font13_title</font>
+					<font>font13</font>
 					<textcolor>blue</textcolor>
 				</control>
 				<control type="label">
@@ -145,7 +140,7 @@
 					<label>$LOCALIZE[24051]</label>
 					<align>right</align>
 					<aligny>center</aligny>
-					<font>font13_title</font>
+					<font>font13</font>
 					<textcolor>blue</textcolor>
 				</control>
 				<control type="label">
@@ -169,7 +164,7 @@
 					<label>$LOCALIZE[563]:</label>
 					<align>right</align>
 					<aligny>center</aligny>
-					<font>font13_title</font>
+					<font>font13</font>
 					<textcolor>blue</textcolor>
 				</control>
 				<control type="image">
@@ -190,7 +185,7 @@
 					<label>$LOCALIZE[20037]:</label>
 					<align>right</align>
 					<aligny>center</aligny>
-					<font>font13_title</font>
+					<font>font13</font>
 					<textcolor>blue</textcolor>
 				</control>
 				<control type="fadelabel">
@@ -229,7 +224,7 @@
 					<visible>!IsEmpty(ListItem.Property(Addon.Disclaimer))</visible>
 					<control type="label">
 						<description>Description Page Count</description>
-						<posx>600</posx>
+						<posx>610</posx>
 						<posy>170</posy>
 						<width>300</width>
 						<height>25</height>
@@ -243,10 +238,10 @@
 						<description>Description</description>
 						<posx>10</posx>
 						<posy>195</posy>
-						<width>580</width>
+						<width>600</width>
 						<height>160</height>
 						<font>font12</font>
-						<align>-</align>
+						<align>justify</align>
 						<textcolor>white</textcolor>
 						<label>$INFO[ListItem.Property(Addon.Description)]</label>
 						<pagecontrol>60</pagecontrol>
@@ -282,10 +277,10 @@
 						<description>Disclaimer</description>
 						<posx>10</posx>
 						<posy>395</posy>
-						<width>580</width>
+						<width>600</width>
 						<height>40</height>
 						<font>font12</font>
-						<align>-</align>
+						<align>justify</align>
 						<textcolor>white</textcolor>
 						<label>$INFO[ListItem.Property(Addon.Disclaimer)]</label>
 						<autoscroll time="2000" delay="3000" repeat="5000">true</autoscroll>
@@ -295,7 +290,7 @@
 					<visible>IsEmpty(ListItem.Property(Addon.Disclaimer))</visible>
 					<control type="label">
 						<description>Description Page Count</description>
-						<posx>600</posx>
+						<posx>610</posx>
 						<posy>170</posy>
 						<width>300</width>
 						<height>25</height>
@@ -309,10 +304,10 @@
 						<description>Description</description>
 						<posx>10</posx>
 						<posy>195</posy>
-						<width>580</width>
+						<width>600</width>
 						<height>250</height>
 						<font>font12</font>
-						<align>-</align>
+						<align>justify</align>
 						<textcolor>white</textcolor>
 						<label>$INFO[ListItem.Property(Addon.Description)]</label>
 						<pagecontrol>61</pagecontrol>
@@ -335,20 +330,17 @@
 				</control>
 			</control>
 			<control type="group" id="9000">
-				<posx>10</posx>
-				<posy>280</posy>
+				<posx>30</posx>
+				<posy>310</posy>
 				<control type="button" id ="6">
 					<description>Enable Addon button</description>
 					<posx>0</posx>
 					<posy>0</posy>
-					<width>255</width>
-					<height>51</height>
-					<textoffsetx>20</textoffsetx>
+					<width>220</width>
+					<height>45</height>
 					<label>24022</label>
-					<font>font13_title</font>
-					<align>right</align>
-					<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-					<texturefocus border="5">MenuItemFO.png</texturefocus>
+					<align>center</align>
+					<font>font12_title</font>
 					<onleft>60</onleft>
 					<onright>60</onright>
 					<onup>10</onup>
@@ -358,14 +350,11 @@
 					<description>Disable Addon button</description>
 					<posx>0</posx>
 					<posy>50</posy>
-					<width>255</width>
-					<height>51</height>
-					<textoffsetx>20</textoffsetx>
+					<width>220</width>
+					<height>45</height>
 					<label>24021</label>
-					<font>font13_title</font>
-					<align>right</align>
-					<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-					<texturefocus border="5">MenuItemFO.png</texturefocus>
+					<align>center</align>
+					<font>font12_title</font>
 					<onleft>60</onleft>
 					<onright>60</onright>
 					<onup>6</onup>
@@ -375,14 +364,11 @@
 					<description>Addon Settings</description>
 					<posx>0</posx>
 					<posy>100</posy>
-					<width>255</width>
-					<height>51</height>
-					<textoffsetx>20</textoffsetx>
+					<width>220</width>
+					<height>45</height>
 					<label>24020</label>
-					<font>font13_title</font>
-					<align>right</align>
-					<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-					<texturefocus border="5">MenuItemFO.png</texturefocus>
+					<align>center</align>
+					<font>font12_title</font>
 					<onleft>60</onleft>
 					<onright>60</onright>
 					<onup>7</onup>
@@ -392,14 +378,11 @@
 					<description>Update Addon button</description>
 					<posx>0</posx>
 					<posy>150</posy>
-					<width>255</width>
-					<height>51</height>
-					<textoffsetx>20</textoffsetx>
+					<width>220</width>
+					<height>45</height>
 					<label>24069</label>
-					<font>font13_title</font>
-					<align>right</align>
-					<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-					<texturefocus border="5">MenuItemFO.png</texturefocus>
+					<align>center</align>
+					<font>font12_title</font>
 					<onleft>60</onleft>
 					<onright>60</onright>
 					<onup>9</onup>
@@ -409,14 +392,11 @@
 					<description>Changelog button</description>
 					<posx>0</posx>
 					<posy>200</posy>
-					<width>255</width>
-					<height>51</height>
-					<textoffsetx>20</textoffsetx>
+					<width>220</width>
+					<height>45</height>
 					<label>24036</label>
-					<font>font13_title</font>
-					<align>right</align>
-					<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-					<texturefocus border="5">MenuItemFO.png</texturefocus>
+					<align>center</align>
+					<font>font12_title</font>
 					<onleft>60</onleft>
 					<onright>60</onright>
 					<onup>8</onup>
@@ -437,10 +417,10 @@
 				</control>
 				<control type="image">
 					<description>Icon image</description>
-					<posx>18</posx>
-					<posy>18</posy>
-					<width>64</width>
-					<height>64</height>
+					<posx>20</posx>
+					<posy>20</posy>
+					<width>60</width>
+					<height>60</height>
 					<texture>DefaultIconError.png</texture>
 				</control>
 				<control type="label">
@@ -449,7 +429,7 @@
 					<posy>15</posy>
 					<width>800</width>
 					<height>25</height>
-					<font>font13_title</font>
+					<font>font12_title</font>
 					<label>24096</label>
 					<align>left</align>
 					<aligny>center</aligny>
diff --git a/addons/skin.confluence/720p/DialogAddonSettings.xml b/addons/skin.confluence/720p/DialogAddonSettings.xml
index c3e09e4106..bf8e59e3b6 100644
--- a/addons/skin.confluence/720p/DialogAddonSettings.xml
+++ b/addons/skin.confluence/720p/DialogAddonSettings.xml
@@ -2,8 +2,8 @@
 	<defaultcontrol always="true">9</defaultcontrol>
 	<coordinates>
 		<system>1</system>
-		<posx>160</posx>
-		<posy>55</posy>
+		<posx>240</posx>
+		<posy>60</posy>
 	</coordinates>
 	<include>dialogeffect</include>
 	<controls>
@@ -11,59 +11,45 @@
 			<description>background image</description>
 			<posx>0</posx>
 			<posy>0</posy>
-			<width>960</width>
-			<height>610</height>
+			<width>800</width>
+			<height>600</height>
 			<texture border="40">DialogBack.png</texture>
+			<visible>![Window.IsVisible(FullscreenVideo) | Window.IsVisible(Visualisation)]</visible>
 		</control>
 		<control type="image">
-			<description>LOGO</description>
-			<posx>30</posx>
-			<posy>15</posy>
-			<width>220</width>
-			<height>80</height>
-			<aspectratio>keep</aspectratio>
-			<texture>Confluence_Logo.png</texture>
-		</control>
-		<control type="image">
-			<posx>268</posx>
-			<posy>10</posy>
-			<width>650</width>
-			<height>588</height>
-			<texture border="5">black-back2.png</texture>
-		</control>
-		<control type="image">
-			<description>separator image</description>
-			<posx>268</posx>
-			<posy>538</posy>
-			<width>650</width>
-			<height>1</height>
-			<texture>separator2.png</texture>
+			<description>background image</description>
+			<posx>0</posx>
+			<posy>0</posy>
+			<width>800</width>
+			<height>600</height>
+			<texture border="40">DialogBack2.png</texture>
+			<visible>Window.IsVisible(FullscreenVideo) | Window.IsVisible(Visualisation)</visible>
 		</control>
 		<control type="image">
-			<posx>268</posx>
-			<posy>10</posy>
-			<width>634</width>
-			<height>70</height>
-			<aspectratio>stretch</aspectratio>
-			<texture>GlassTitleBar.png</texture>
+			<description>Dialog Header image</description>
+			<posx>40</posx>
+			<posy>16</posy>
+			<width>720</width>
+			<height>40</height>
+			<texture>dialogheader.png</texture>
 		</control>
 		<control type="label" id="20">
 			<description>header label</description>
-			<posx>300</posx>
+			<posx>40</posx>
 			<posy>20</posy>
-			<width>640</width>
+			<width>720</width>
 			<height>30</height>
-			<font>font16caps</font>
+			<font>font13_title</font>
 			<label>-</label>
-			<align>left</align>
+			<align>center</align>
 			<aligny>center</aligny>
-			<textcolor>white</textcolor>
+			<textcolor>selected</textcolor>
 			<shadowcolor>black</shadowcolor>
 		</control>
 		<control type="button">
 			<description>Close Window button</description>
-			<posx>850</posx>
-			<posy>9</posy>
+			<posx>710</posx>
+			<posy>15</posy>
 			<width>64</width>
 			<height>32</height>
 			<label>-</label>
@@ -71,42 +57,62 @@
 			<onclick>PreviousMenu</onclick>
 			<texturefocus>DialogCloseButton-focus.png</texturefocus>
 			<texturenofocus>DialogCloseButton.png</texturenofocus>
-			<onleft>2</onleft>
-			<onright>2</onright>
-			<onup>2</onup>
-			<ondown>2</ondown>
+			<onleft>3</onleft>
+			<onright>3</onright>
+			<onup>3</onup>
+			<ondown>3</ondown>
 			<visible>system.getbool(input.enablemouse)</visible>
 		</control>
 		<control type="grouplist" id="9">
 			<description>button area</description>
-			<posx>10</posx>
-			<posy>90</posy>
-			<width>258</width>
-			<height>481</height>
-			<itemgap>-1</itemgap>
-			<onleft>30</onleft>
-			<onright>2</onright>
-			<onup>9</onup>
-			<ondown>9</ondown>
+			<posx>45</posx>
+			<posy>70</posy>
+			<width>710</width>
+			<height>40</height>
+			<itemgap>5</itemgap>
+			<align>center</align>
+			<orientation>horizontal</orientation>
+			<onleft>9</onleft>
+			<onright>9</onright>
+			<onup>2</onup>
+			<ondown>2</ondown>
+		</control>
+		<control type="image">
+			<description>Has Previous</description>
+			<posx>25</posx>
+			<posy>80</posy>
+			<width>20</width>
+			<height>20</height>
+			<texture>scroll-left-focus.png</texture>
+			<visible>Container(9).HasPrevious</visible>
+		</control>
+		<control type="image">
+			<description>Has Next</description>
+			<posx>755</posx>
+			<posy>80</posy>
+			<width>20</width>
+			<height>20</height>
+			<texture>scroll-right-focus.png</texture>
+			<visible>Container(9).HasNext</visible>
 		</control>
 		<control type="grouplist" id="2">
 			<description>control area</description>
-			<posx>280</posx>
-			<posy>70</posy>
-			<width>630</width>
-			<height>460</height>
-			<itemgap>-1</itemgap>
+			<posx>40</posx>
+			<posy>120</posy>
+			<width>720</width>
+			<height>380</height>
+			<itemgap>5</itemgap>
 			<pagecontrol>30</pagecontrol>
-			<onup>9001</onup>
+			<onup>9</onup>
 			<ondown>9001</ondown>
-			<onleft>9</onleft>
+			<onleft>2</onleft>
 			<onright>30</onright>
 		</control>
 		<control type="scrollbar" id="30">
-			<posx>920</posx>
-			<posy>70</posy>
+			<posx>765</posx>
+			<posy>120</posy>
 			<width>25</width>
-			<height>470</height>
+			<height>380</height>
 			<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
 			<texturesliderbar border="2,16,2,16">ScrollBarV_bar.png</texturesliderbar>
 			<texturesliderbarfocus border="2,16,2,16">ScrollBarV_bar_focus.png</texturesliderbarfocus>
@@ -118,8 +124,8 @@
 			<orientation>vertical</orientation>
 		</control>
 		<control type="group" id="9001">
-			<posy>545</posy>
-			<posx>280</posx>
+			<posy>535</posy>
+			<posx>90</posx>
 			<control type="button" id="10">
 				<description>OK Button</description>
 				<posx>0</posx>
@@ -128,14 +134,12 @@
 				<height>40</height>
 				<align>center</align>
 				<aligny>center</aligny>
-				<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-				<texturefocus border="5">button-focus.png</texturefocus>
 				<font>font12_title</font>
 				<label>186</label>
 				<onleft>12</onleft>
 				<onright>11</onright>
 				<onup>2</onup>
-				<ondown>2</ondown>
+				<ondown>9</ondown>
 			</control>
 			<control type="button" id="11">
 				<description>Cancel Button</description>
@@ -145,14 +149,12 @@
 				<height>40</height>
 				<align>center</align>
 				<aligny>center</aligny>
-				<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-				<texturefocus border="5">button-focus.png</texturefocus>
 				<font>font12_title</font>
 				<label>222</label>
 				<onleft>10</onleft>
 				<onright>12</onright>
 				<onup>2</onup>
-				<ondown>2</ondown>
+				<ondown>9</ondown>
 			</control>
 			<control type="button" id="12">
 				<description>Defaults Button</description>
@@ -162,29 +164,23 @@
 				<height>40</height>
 				<align>center</align>
 				<aligny>center</aligny>
-				<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-				<texturefocus border="5">button-focus.png</texturefocus>
 				<font>font12_title</font>
 				<label>409</label>
 				<onleft>11</onleft>
 				<onright>10</onright>
 				<onup>2</onup>
-				<ondown>2</ondown>
+				<ondown>9</ondown>
 			</control>
 		</control>
 
 		<control type="button" id="13">
 			<description>Default Category Button</description>
-			<height>60</height>
-			<width>258</width>
-			<textoffsetx>20</textoffsetx>
-			<align>right</align>
+			<height>40</height>
+			<width>173</width>
+			<align>center</align>
 			<aligny>center</aligny>
-			<font>font13_title</font>
-			<textcolor>grey2</textcolor>
-			<focusedcolor>white</focusedcolor>
-			<texturefocus border="5">MenuItemFO.png</texturefocus>
-			<texturenofocus border="5">MenuItemNF.png</texturenofocus>
+			<font>font12_title</font>
+			<textcolor>white</textcolor>
 			<pulseonselect>false</pulseonselect>
 		</control>
 		<control type="button" id="3">
@@ -193,8 +189,7 @@
 			<font>font13</font>
 			<textcolor>grey2</textcolor>
 			<focusedcolor>white</focusedcolor>
-			<texturefocus border="0,2,0,2">MenuItemFO.png</texturefocus>
-			<texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
+			<texturefocus border="5">button-focus2.png</texturefocus>
 		</control>
 		<control type="radiobutton" id="4">
 			<description>Default RadioButton</description>
@@ -202,22 +197,21 @@
 			<font>font13</font>
 			<textcolor>grey2</textcolor>
 			<focusedcolor>white</focusedcolor>
-			<texturefocus border="0,2,0,2">MenuItemFO.png</texturefocus>
-			<texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
+			<texturefocus border="5">button-focus2.png</texturefocus>
 		</control>
 		<control type="spincontrolex" id="5">
 			<description>Default spincontrolex</description>
 			<height>40</height>
 			<textcolor>grey2</textcolor>
 			<focusedcolor>white</focusedcolor>
-			<texturefocus border="0,2,0,2">MenuItemFO.png</texturefocus>
-			<texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
+			<texturenofocus border="5">button-nofocus.png</texturenofocus>
+			<texturefocus border="5">button-focus2.png</texturefocus>
 			<font>font13</font>
 			<aligny>center</aligny>
 			<reverse>yes</reverse>
 		</control>
 		<control type="label" id="7">
-			<height>45</height>
+			<height>35</height>
 			<font>font13_title</font>
 			<label>-</label>
 			<textcolor>blue</textcolor>
@@ -236,8 +230,7 @@
 			<font>font13</font>
 			<textcolor>grey2</textcolor>
 			<focusedcolor>white</focusedcolor>
-			<texturefocus border="0,2,0,2">MenuItemFO.png</texturefocus>
-			<texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
+			<texturefocus border="5">button-focus2.png</texturefocus>
 		</control>
 	</controls>
 </window>
diff --git a/addons/skin.confluence/720p/DialogContentSettings.xml b/addons/skin.confluence/720p/DialogContentSettings.xml
index 6fe334c484..2278633d49 100644
--- a/addons/skin.confluence/720p/DialogContentSettings.xml
+++ b/addons/skin.confluence/720p/DialogContentSettings.xml
@@ -18,30 +18,30 @@
 				<texture border="40">DialogBack.png</texture>
 			</control>
 			<control type="image">
-				<posx>80</posx>
-				<posy>10</posy>
-				<width>640</width>
-				<height>90</height>
-				<aspectratio>stretch</aspectratio>
-				<texture>GlassTitleBar.png</texture>
+				<description>Dialog Header image</description>
+				<posx>40</posx>
+				<posy>16</posy>
+				<width>720</width>
+				<height>40</height>
+				<texture>dialogheader.png</texture>
 			</control>
 			<control type="label" id="1">
 				<description>header label</description>
-				<posx>20</posx>
-				<posy>18</posy>
-				<width>760</width>
+				<posx>40</posx>
+				<posy>20</posy>
+				<width>720</width>
 				<height>30</height>
 				<font>font13_title</font>
 				<label>$LOCALIZE[20333]</label>
 				<align>center</align>
 				<aligny>center</aligny>
-				<textcolor>white</textcolor>
+				<textcolor>selected</textcolor>
 				<shadowcolor>black</shadowcolor>
 			</control>
 			<control type="button">
 				<description>Close Window button</description>
 				<posx>710</posx>
-				<posy>9</posy>
+				<posy>15</posy>
 				<width>64</width>
 				<height>32</height>
 				<label>-</label>
@@ -49,10 +49,10 @@
 				<onclick>PreviousMenu</onclick>
 				<texturefocus>DialogCloseButton-focus.png</texturefocus>
 				<texturenofocus>DialogCloseButton.png</texturenofocus>
-				<onleft>3</onleft>
-				<onright>3</onright>
-				<onup>3</onup>
-				<ondown>3</ondown>
+				<onleft>10</onleft>
+				<onright>10</onright>
+				<onup>10</onup>
+				<ondown>10</ondown>
 				<visible>system.getbool(input.enablemouse)</visible>
 			</control>
 			<control type="label">
@@ -61,7 +61,7 @@
 				<posy>60</posy>
 				<width>320</width>
 				<height>40</height>
-				<font>font12caps</font>
+				<font>font12</font>
 				<label>$LOCALIZE[20344]</label>
 				<align>center</align>
 				<aligny>center</aligny>
@@ -75,7 +75,7 @@
 				<width>320</width>
 				<height>40</height>
 				<texturefocus border="5">button-focus.png</texturefocus>
-				<texturenofocus border="5">MenuItemNF.png</texturenofocus>
+				<texturenofocus border="5">button-nofocus.png</texturenofocus>
 				<font>-</font>
 				<label>-</label>
 				<reverse>yes</reverse>
@@ -103,7 +103,7 @@
 				<posy>150</posy>
 				<width>320</width>
 				<height>20</height>
-				<font>font12caps</font>
+				<font>font12</font>
 				<label>$LOCALIZE[31312]</label>
 				<align>center</align>
 				<aligny>center</aligny>
@@ -144,9 +144,9 @@
 				<description>Scraper List Header</description>
 				<posx>400</posx>
 				<posy>60</posy>
-				<width>370</width>
+				<width>360</width>
 				<height>40</height>
-				<font>font12caps</font>
+				<font>font12</font>
 				<label>$LOCALIZE[31313]</label>
 				<align>center</align>
 				<aligny>center</aligny>
@@ -156,7 +156,7 @@
 			<control type="list" id="4">
 				<posx>400</posx>
 				<posy>100</posy>
-				<width>340</width>
+				<width>360</width>
 				<height>241</height>
 				<onup>4</onup>
 				<onleft>3</onleft>
@@ -164,13 +164,13 @@
 				<ondown>4</ondown>
 				<pagecontrol>60</pagecontrol>
 				<scrolltime>200</scrolltime>
-				<itemlayout height="40">
+				<itemlayout height="45">
 					<control type="image">
 						<posx>0</posx>
 						<posy>0</posy>
-						<width>340</width>
-						<height>41</height>
-						<texture>MenuItemNF.png</texture>
+						<width>360</width>
+						<height>40</height>
+						<texture border="5">button-nofocus.png</texture>
 					</control>
 					<control type="image">
 						<posx>5</posx>
@@ -192,22 +192,22 @@
 						<info>ListItem.Label</info>
 					</control>
 				</itemlayout>
-				<focusedlayout height="40">
+				<focusedlayout height="45">
 					<control type="image">
 						<posx>0</posx>
 						<posy>0</posy>
-						<width>340</width>
-						<height>41</height>
+						<width>360</width>
+						<height>40</height>
 						<visible>!Control.HasFocus(4)</visible>
-						<texture>MenuItemNF.png</texture>
+						<texture border="5">button-nofocus.png</texture>
 					</control>
 					<control type="image">
 						<posx>0</posx>
 						<posy>0</posy>
-						<width>340</width>
-						<height>41</height>
+						<width>360</width>
+						<height>40</height>
 						<visible>Control.HasFocus(4)</visible>
-						<texture>MenuItemFO.png</texture>
+						<texture border="5">button-focus2.png</texture>
 					</control>
 					<control type="image">
 						<posx>5</posx>
@@ -231,7 +231,7 @@
 				</focusedlayout>
 			</control>
 			<control type="scrollbar" id="60">
-				<posx>745</posx>
+				<posx>760</posx>
 				<posy>100</posy>
 				<width>25</width>
 				<height>240</height>
@@ -242,16 +242,16 @@
 				<textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
 				<onleft>4</onleft>
 				<onright>3</onright>
-				<showonepage>false</showonepage>
+				<showonepage>true</showonepage>
 				<orientation>vertical</orientation>
 			</control>
 			<control type="label">
 				<description>Scanning Options Header</description>
 				<posx>30</posx>
-				<posy>355</posy>
+				<posy>350</posy>
 				<width>740</width>
-				<height>30</height>
-				<font>font12caps</font>
+				<height>20</height>
+				<font>font12</font>
 				<label>$LOCALIZE[31314]</label>
 				<align>center</align>
 				<aligny>center</aligny>
@@ -261,10 +261,10 @@
 			<control type="grouplist" id="5">
 				<description>control area</description>
 				<posx>30</posx>
-				<posy>390</posy>
+				<posy>380</posy>
 				<width>740</width>
-				<height>200</height>
-				<itemgap>-1</itemgap>
+				<height>220</height>
+				<itemgap>4</itemgap>
 				<onup>3</onup>
 				<ondown>28</ondown>
 				<onleft>5</onleft>
@@ -276,8 +276,7 @@
 				<posy>0</posy>
 				<height>40</height>
 				<font>font13</font>
-				<texturefocus>MenuItemFO.png</texturefocus>
-				<texturenofocus>MenuItemNF.png</texturenofocus>
+				<texturefocus border="5">button-focus2.png</texturefocus>
 			</control>
 			<control type="radiobutton" id="8">
 				<description>Default RadioButton</description>
@@ -285,8 +284,7 @@
 				<posy>0</posy>
 				<height>40</height>
 				<font>font13</font>
-				<texturefocus>MenuItemFO.png</texturefocus>
-				<texturenofocus>MenuItemNF.png</texturenofocus>
+				<texturefocus border="5">button-focus2.png</texturefocus>
 			</control>
 			<control type="group" id="9001">
 				<posy>615</posy>
@@ -298,8 +296,6 @@
 					<height>40</height>
 					<align>center</align>
 					<aligny>center</aligny>
-					<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-					<texturefocus border="5">button-focus.png</texturefocus>
 					<font>font12_title</font>
 					<label>186</label>
 					<onleft>6</onleft>
@@ -315,8 +311,6 @@
 					<height>40</height>
 					<align>center</align>
 					<aligny>center</aligny>
-					<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-					<texturefocus border="5">button-focus.png</texturefocus>
 					<font>font12_title</font>
 					<label>222</label>
 					<onleft>28</onleft>
@@ -332,8 +326,6 @@
 					<height>40</height>
 					<align>center</align>
 					<aligny>center</aligny>
-					<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-					<texturefocus border="5">button-focus.png</texturefocus>
 					<font>font12_title</font>
 					<label>5</label>
 					<onleft>29</onleft>
diff --git a/addons/skin.confluence/720p/DialogContextMenu.xml b/addons/skin.confluence/720p/DialogContextMenu.xml
index 2cabc54b79..cd3a9438d1 100644
--- a/addons/skin.confluence/720p/DialogContextMenu.xml
+++ b/addons/skin.confluence/720p/DialogContextMenu.xml
@@ -10,15 +10,15 @@
 		<control type="image" id="997">
 			<description>background top image</description>
 			<posx>0</posx>
-			<posy>-54</posy>
-			<width>370</width>
-			<height>54</height>
-			<texture border="45,45,45,0">DialogContextTop.png</texture>
+			<posy>-30</posy>
+			<width>340</width>
+			<height>30</height>
+			<texture border="20,19,20,0">DialogContextTop.png</texture>
 		</control>
 		<control type="button">
 			<description>Close Window button</description>
 			<posx>260</posx>
-			<posy>-24</posy>
+			<posy>-25</posy>
 			<width>64</width>
 			<height>32</height>
 			<label>-</label>
@@ -26,45 +26,36 @@
 			<onclick>PreviousMenu</onclick>
 			<texturefocus>DialogCloseButton-focus.png</texturefocus>
 			<texturenofocus>DialogCloseButton.png</texturenofocus>
-			<onleft>1000</onleft>
-			<onright>1000</onright>
-			<onup>1000</onup>
-			<ondown>1000</ondown>
-			<visible>system.getbool(input.enablemouse)</visible>
-		</control>
-		<control type="image">
-			<posx>34</posx>
-			<posy>-6</posy>
-			<width>297</width>
-			<height>4</height>
-			<texture>separator.png</texture>
+			<onleft>2</onleft>
+			<onright>2</onright>
+			<onup>2</onup>
+			<ondown>2</ondown>
 		</control>
 		<control type="image" id="999">
 			<description>background image</description>
 			<posx>0</posx>
 			<posy>0</posy>
-			<width>370</width>
-			<texture border="45,0,45,0">DialogContextMiddle.png</texture>
+			<width>340</width>
+			<texture border="20,0,20,0">DialogContextMiddle.png</texture>
 		</control>
 		<control type="image" id="998">
 			<description>background bottom image</description>
 			<posx>0</posx>
-			<width>370</width>
-			<height>50</height>
-			<texture border="45,0,45,49">DialogContextBottom.png</texture>
+			<width>340</width>
+			<height>25</height>
+			<texture border="20,0,19,20">DialogContextBottom.png</texture>
 		</control>
 		<control type="button" id="1000">
 			<description>button template</description>
-			<posx>34</posx>
+			<posx>20</posx>
 			<posy>-</posy>
-			<width>297</width>
+			<width>300</width>
 			<height>38</height>
 			<font>fontContextMenu</font>
 			<align>center</align>
 			<textcolor>grey2</textcolor>
 			<focusedcolor>white</focusedcolor>
 			<texturefocus border="5">button-focus.png</texturefocus>
-			<texturenofocus>-</texturenofocus>
 		</control>
 	</controls>
 </window>
\ No newline at end of file
diff --git a/addons/skin.confluence/720p/DialogGamepad.xml b/addons/skin.confluence/720p/DialogGamepad.xml
index 410b14eda1..f86d690cc7 100644
--- a/addons/skin.confluence/720p/DialogGamepad.xml
+++ b/addons/skin.confluence/720p/DialogGamepad.xml
@@ -2,7 +2,7 @@
 	<defaultcontrol always="true">1</defaultcontrol>
 	<coordinates>
 		<system>1</system>
-		<posx>340</posx>
+		<posx>335</posx>
 		<posy>235</posy>
 	</coordinates>
 	<include>dialogeffect</include>
@@ -10,35 +10,53 @@
 		<control type="image">
 			<posx>0</posx>
 			<posy>0</posy>
-			<width>600</width>
+			<width>610</width>
 			<height>230</height>
-			<texture border="20">OverlayDialogBackground.png</texture>
+			<texture border="40">DialogBack.png</texture>
 		</control>
 		<control type="image">
-			<posx>0</posx>
-			<posy>0</posy>
-			<width>600</width>
-			<height>230</height>
-			<texture border="20">OverlayDialogBackground.png</texture>
+			<description>Dialog Header image</description>
+			<posx>40</posx>
+			<posy>16</posy>
+			<width>530</width>
+			<height>40</height>
+			<texture>dialogheader.png</texture>
 		</control>
 		<control type="label" id="1">
 			<description>header label</description>
-			<posx>20</posx>
-			<posy>18</posy>
-			<width>560</width>
+			<posx>40</posx>
+			<posy>20</posy>
+			<width>530</width>
 			<height>30</height>
 			<font>font13_title</font>
-			<label>13406</label>
-			<align>left</align>
+			<label>$LOCALIZE[13406]</label>
+			<align>center</align>
 			<aligny>center</aligny>
-			<textcolor>white</textcolor>
+			<textcolor>selected</textcolor>
 			<shadowcolor>black</shadowcolor>
 		</control>
+		<control type="button">
+			<description>Close Window button</description>
+			<posx>520</posx>
+			<posy>15</posy>
+			<width>64</width>
+			<height>32</height>
+			<label>-</label>
+			<font>-</font>
+			<onclick>PreviousMenu</onclick>
+			<texturefocus>DialogCloseButton-focus.png</texturefocus>
+			<texturenofocus>DialogCloseButton.png</texturenofocus>
+			<onleft>10</onleft>
+			<onright>10</onright>
+			<onup>10</onup>
+			<ondown>10</ondown>
+			<visible>system.getbool(input.enablemouse)</visible>
+		</control>
 		<control type="label" id="2">
 			<description>dialog line 1</description>
-			<posx>20</posx>
-			<posy>60</posy>
-			<width>560</width>
+			<posx>30</posx>
+			<posy>70</posy>
+			<width>550</width>
 			<height>30</height>
 			<align>left</align>
 			<aligny>center</aligny>
@@ -47,9 +65,9 @@
 		</control>
 		<control type="label" id="3">
 			<description>dialog line 2</description>
-			<posx>20</posx>
-			<posy>85</posy>
-			<width>560</width>
+			<posx>30</posx>
+			<posy>95</posy>
+			<width>550</width>
 			<height>30</height>
 			<align>left</align>
 			<aligny>center</aligny>
@@ -58,9 +76,9 @@
 		</control>
 		<control type="label" id="4">
 			<description>dialog line 3</description>
-			<posx>20</posx>
-			<posy>120</posy>
-			<width>560</width>
+			<posx>30</posx>
+			<posy>130</posy>
+			<width>550</width>
 			<height>30</height>
 			<align>left</align>
 			<aligny>center</aligny>
diff --git a/addons/skin.confluence/720p/DialogKaraokeSongSelectorLarge.xml b/addons/skin.confluence/720p/DialogKaraokeSongSelectorLarge.xml
index da569cdbc9..144a91ca66 100644
--- a/addons/skin.confluence/720p/DialogKaraokeSongSelectorLarge.xml
+++ b/addons/skin.confluence/720p/DialogKaraokeSongSelectorLarge.xml
@@ -3,7 +3,7 @@
 	<coordinates>
 		<system>1</system>
 		<posx>415</posx>
-		<posy>225</posy>
+		<posy>275</posy>
 	</coordinates>
 	<controls>
 		<control type="group">
@@ -11,38 +11,63 @@
 				<posx>0</posx>
 				<posy>0</posy>
 				<width>450</width>
-				<height>150</height>
-				<texture border="20">OverlayDialogBackground.png</texture>
+				<height>170</height>
+				<texture border="40">DialogBack.png</texture>
+			</control>
+			<control type="image">
+				<description>Dialog Header image</description>
+				<posx>40</posx>
+				<posy>16</posy>
+				<width>370</width>
+				<height>40</height>
+				<texture>dialogheader.png</texture>
 			</control>
 			<control type="label" id="1">
 				<description>header label</description>
-				<posx>20</posx>
-				<posy>18</posy>
-				<width>410</width>
+				<posx>40</posx>
+				<posy>20</posy>
+				<width>370</width>
 				<height>30</height>
 				<font>font13_title</font>
-				<label>31321</label>
+				<label>$LOCALIZE[31321]</label>
 				<align>center</align>
 				<aligny>center</aligny>
-				<textcolor>white</textcolor>
+				<textcolor>selected</textcolor>
 				<shadowcolor>black</shadowcolor>
 			</control>
+			<control type="button">
+				<description>Close Window button</description>
+				<posx>360</posx>
+				<posy>15</posy>
+				<width>64</width>
+				<height>32</height>
+				<label>-</label>
+				<font>-</font>
+				<onclick>PreviousMenu</onclick>
+				<texturefocus>DialogCloseButton-focus.png</texturefocus>
+				<texturenofocus>DialogCloseButton.png</texturenofocus>
+				<onleft>10</onleft>
+				<onright>10</onright>
+				<onup>10</onup>
+				<ondown>10</ondown>
+				<visible>system.getbool(input.enablemouse)</visible>
+			</control>
 			<control type="label" id="401">
 				<description>Song Number Label</description>
-				<posx>20</posx>
-				<posy>65</posy>
-				<width>410</width>
+				<posx>30</posx>
+				<posy>70</posy>
+				<width>390</width>
 				<height>30</height>
 				<font>font28_title</font>
-				<textcolor>selected</textcolor>
+				<textcolor>white</textcolor>
 				<align>center</align>
 				<aligny>center</aligny>
 			</control>
 			<control type="label" id="402">
 				<description>Song Name Label</description>
-				<posx>20</posx>
-				<posy>105</posy>
-				<width>410</width>
+				<posx>30</posx>
+				<posy>120</posy>
+				<width>390</width>
 				<height>20</height>
 				<font>font24</font>
 				<align>center</align>
diff --git a/addons/skin.confluence/720p/DialogKeyboard.xml b/addons/skin.confluence/720p/DialogKeyboard.xml
index 4b6b873b2d..a5e27a1d1a 100644
--- a/addons/skin.confluence/720p/DialogKeyboard.xml
+++ b/addons/skin.confluence/720p/DialogKeyboard.xml
@@ -18,17 +18,29 @@
 				<texture border="40">DialogBack.png</texture>
 			</control>
 			<control type="image">
-				<posx>80</posx>
-				<posy>10</posy>
-				<width>600</width>
-				<height>70</height>
-				<aspectratio>stretch</aspectratio>
-				<texture>GlassTitleBar.png</texture>
+				<description>Dialog Header image</description>
+				<posx>40</posx>
+				<posy>16</posy>
+				<width>680</width>
+				<height>40</height>
+				<texture>dialogheader.png</texture>
+			</control>
+			<control type="label" id="311">
+				<description>header label</description>
+				<posx>40</posx>
+				<posy>20</posy>
+				<width>720</width>
+				<height>30</height>
+				<font>font13_title</font>
+				<align>center</align>
+				<aligny>center</aligny>
+				<textcolor>selected</textcolor>
+				<shadowcolor>black</shadowcolor>
 			</control>
 			<control type="button">
 				<description>Close Window button</description>
 				<posx>670</posx>
-				<posy>9</posy>
+				<posy>15</posy>
 				<width>64</width>
 				<height>32</height>
 				<label>-</label>
@@ -66,32 +78,11 @@
 				<width>500</width>
 				<height>30</height>
 				<aspectratio>stretch</aspectratio>
-				<texture>GlassTitleBar.png</texture>
-			</control>
-			<control type="image">
-				<posx>80</posx>
-				<posy>380</posy>
-				<width>600</width>
-				<height>40</height>
-				<aspectratio>stretch</aspectratio>
-				<colordiffuse>AAFFFFFF</colordiffuse>
-				<texture flipy="true">GlassTitleBar.png</texture>
-			</control>
-			<control type="label" id="311">
-				<description>dialog Heading</description>
-				<posx>10</posx>
-				<posy>20</posy>
-				<width>740</width>
-				<height>30</height>
-				<font>font13_title</font>
-				<textcolor>white</textcolor>
-				<shadowcolor>black</shadowcolor>
-				<align>center</align>
-				<aligny>center</aligny>
+				<texture>DialogHeader.png</texture>
 			</control>
 			<control type="group">
 				<posx>30</posx>
-				<posy>135</posy>
+				<posy>140</posy>
 				<control type="button" id="300">
 					<description>DONE button</description>
 					<posx>0</posx>
diff --git a/addons/skin.confluence/720p/DialogMediaSource.xml b/addons/skin.confluence/720p/DialogMediaSource.xml
index 31fe6ae804..5985eb448f 100644
--- a/addons/skin.confluence/720p/DialogMediaSource.xml
+++ b/addons/skin.confluence/720p/DialogMediaSource.xml
@@ -16,17 +16,30 @@
 			<texture border="40">DialogBack.png</texture>
 		</control>
 		<control type="image">
-			<posx>80</posx>
-			<posy>10</posy>
-			<width>640</width>
-			<height>90</height>
-			<aspectratio>stretch</aspectratio>
-			<texture>GlassTitleBar.png</texture>
+			<description>Dialog Header image</description>
+			<posx>40</posx>
+			<posy>16</posy>
+			<width>720</width>
+			<height>40</height>
+			<texture>dialogheader.png</texture>
+		</control>
+		<control type="label" id="2">
+			<description>header label</description>
+			<posx>40</posx>
+			<posy>20</posy>
+			<width>720</width>
+			<height>30</height>
+			<font>font13_title</font>
+			<label>$LOCALIZE[13406]</label>
+			<align>center</align>
+			<aligny>center</aligny>
+			<textcolor>selected</textcolor>
+			<shadowcolor>black</shadowcolor>
 		</control>
 		<control type="button">
 			<description>Close Window button</description>
 			<posx>710</posx>
-			<posy>9</posy>
+			<posy>15</posy>
 			<width>64</width>
 			<height>32</height>
 			<label>-</label>
@@ -40,28 +53,15 @@
 			<ondown>10</ondown>
 			<visible>system.getbool(input.enablemouse)</visible>
 		</control>
-		<control type="label" id="2">
-			<description>header label</description>
-			<posx>20</posx>
-			<posy>18</posy>
-			<width>760</width>
-			<height>30</height>
-			<font>font13_title</font>
-			<label>$LOCALIZE[13406]</label>
-			<align>center</align>
-			<aligny>center</aligny>
-			<textcolor>white</textcolor>
-			<shadowcolor>black</shadowcolor>
-		</control>
 		<control type="label">
 			<description>path label</description>
 			<posx>20</posx>
-			<posy>60</posy>
+			<posy>65</posy>
 			<width>760</width>
 			<height>30</height>
 			<align>center</align>
 			<aligny>center</aligny>
-			<font>font12caps</font>
+			<font>font12</font>
 			<label>1021</label>
 			<textcolor>blue</textcolor>
 			<shadowcolor>black</shadowcolor>
@@ -69,21 +69,21 @@
 		<control type="list" id="10">
 			<posx>30</posx>
 			<posy>105</posy>
-			<width>500</width>
-			<height>201</height>
+			<width>525</width>
+			<height>225</height>
 			<onup>9001</onup>
 			<onleft>9000</onleft>
 			<onright>60</onright>
 			<ondown>12</ondown>
 			<pagecontrol>60</pagecontrol>
 			<scrolltime>200</scrolltime>
-			<itemlayout height="40">
+			<itemlayout height="45">
 				<control type="image">
 					<posx>0</posx>
 					<posy>0</posy>
-					<width>500</width>
-					<height>41</height>
-					<texture>MenuItemNF.png</texture>
+					<width>525</width>
+					<height>40</height>
+					<texture border="5">button-nofocus.png</texture>
 				</control>
 				<control type="label">
 					<posx>10</posx>
@@ -98,22 +98,22 @@
 					<info>ListItem.Label</info>
 				</control>
 			</itemlayout>
-			<focusedlayout height="40">
+			<focusedlayout height="45">
 				<control type="image">
 					<posx>0</posx>
 					<posy>0</posy>
-					<width>500</width>
-					<height>41</height>
+					<width>525</width>
+					<height>40</height>
 					<visible>!Control.HasFocus(10)</visible>
-					<texture>MenuItemNF.png</texture>
+					<texture border="5">button-nofocus.png</texture>
 				</control>
 				<control type="image">
 					<posx>0</posx>
 					<posy>0</posy>
-					<width>500</width>
+					<width>525</width>
 					<height>41</height>
 					<visible>Control.HasFocus(10)</visible>
-					<texture>MenuItemFO.png</texture>
+					<texture border="5">button-focus2.png</texture>
 				</control>
 				<control type="label">
 					<posx>10</posx>
@@ -132,7 +132,7 @@
 			<posx>555</posx>
 			<posy>105</posy>
 			<width>25</width>
-			<height>200</height>
+			<height>225</height>
 			<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
 			<texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
 			<texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
@@ -150,13 +150,13 @@
 				<description>Browse Button</description>
 				<posx>0</posx>
 				<posy>0</posy>
-				<width>200</width>
-				<height>41</height>
+				<width>190</width>
+				<height>40</height>
 				<label>1024</label>
 				<font>font12_title</font>
 				<align>center</align>
 				<aligny>center</aligny>
-				<texturenofocus border="5">MenuItemNF.png</texturenofocus>
+				<texturenofocus border="5">button-nofocus.png</texturenofocus>
 				<texturefocus border="5">button-focus.png</texturefocus>
 				<onup>18</onup>
 				<onleft>60</onleft>
@@ -166,14 +166,14 @@
 			<control type="button" id="13">
 				<description>Add Path Button</description>
 				<posx>0</posx>
-				<posy>40</posy>
-				<width>200</width>
-				<height>41</height>
+				<posy>45</posy>
+				<width>190</width>
+				<height>40</height>
 				<label>15019</label>
 				<font>font12_title</font>
 				<align>center</align>
 				<aligny>center</aligny>
-				<texturenofocus border="5">MenuItemNF.png</texturenofocus>
+				<texturenofocus border="5">button-nofocus.png</texturenofocus>
 				<texturefocus border="5">button-focus.png</texturefocus>
 				<onup>11</onup>
 				<onleft>60</onleft>
@@ -183,14 +183,14 @@
 			<control type="button" id="14">
 				<description>Remove Path Button</description>
 				<posx>0</posx>
-				<posy>80</posy>
-				<width>200</width>
-				<height>41</height>
+				<posy>90</posy>
+				<width>190</width>
+				<height>40</height>
 				<label>1210</label>
 				<font>font12_title</font>
 				<align>center</align>
 				<aligny>center</aligny>
-				<texturenofocus border="5">MenuItemNF.png</texturenofocus>
+				<texturenofocus border="5">button-nofocus.png</texturenofocus>
 				<texturefocus border="5">button-focus.png</texturefocus>
 				<onup>13</onup>
 				<onleft>60</onleft>
@@ -200,85 +200,68 @@
 		</control>
 		<control type="label">
 			<description>Name label</description>
-			<posx>20</posx>
+			<posx>30</posx>
 			<posy>335</posy>
-			<width>760</width>
+			<width>740</width>
 			<height>30</height>
 			<align>center</align>
 			<aligny>center</aligny>
-			<font>font12caps</font>
+			<font>font12</font>
 			<label>1022</label>
 			<textcolor>blue</textcolor>
 			<shadowcolor>black</shadowcolor>
 		</control>
 		<control type="button" id="12">
 			<description>Name Button</description>
-			<posx>20</posx>
+			<posx>30</posx>
 			<posy>370</posy>
-			<width>760</width>
+			<width>740</width>
 			<height>40</height>
 			<align>center</align>
 			<aligny>center</aligny>
 			<label>-</label>
 			<font>font13</font>
-			<texturefocus>MenuItemFO.png</texturefocus>
-			<texturenofocus>MenuItemNF.png</texturenofocus>
+			<texturefocus border="5">button-focus2.png</texturefocus>
+			<texturenofocus border="5">button-nofocus.png</texturenofocus>
 			<onup>10</onup>
 			<onleft>12</onleft>
 			<onright>19</onright>
 			<ondown>9001</ondown>
 		</control>
 		<control type="group" id="9001">
+			<posx>190</posx>
+			<posy>435</posy>
 			<control type="button" id="18">
 				<description>Ok Button</description>
-				<posx>300</posx>
-				<posy>435</posy>
+				<posx>0</posx>
+				<posy>0</posy>
 				<width>200</width>
 				<height>40</height>
 				<align>center</align>
 				<aligny>center</aligny>
-				<texturenofocus border="5">MenuItemNF.png</texturenofocus>
+				<texturenofocus border="5">button-nofocus.png</texturenofocus>
 				<texturefocus border="5">button-focus.png</texturefocus>
 				<label>186</label>
 				<font>font12_title</font>
 				<onup>12</onup>
-				<onleft>20</onleft>
+				<onleft>19</onleft>
 				<onright>19</onright>
 				<ondown>10</ondown>
-				<animation effect="slide" start="0,0" end="-102,0" time="0" condition="!Control.IsVisible(20)">Conditional</animation>
 			</control>
 			<control type="button" id="19">
 				<description>Cancel Button</description>
-				<posx>510</posx>
-				<posy>435</posy>
+				<posx>210</posx>
+				<posy>0</posy>
 				<width>200</width>
 				<height>40</height>
 				<align>center</align>
 				<aligny>center</aligny>
-				<texturenofocus border="5">MenuItemNF.png</texturenofocus>
+				<texturenofocus border="5">button-nofocus.png</texturenofocus>
 				<texturefocus border="5">button-focus.png</texturefocus>
 				<label>222</label>
 				<font>font12_title</font>
 				<onup>12</onup>
 				<onleft>18</onleft>
-				<onright>20</onright>
-				<ondown>10</ondown>
-				<animation effect="slide" start="0,0" end="-102,0" time="0" condition="!Control.IsVisible(20)">Conditional</animation>
-			</control>
-			<control type="button" id="20">
-				<description>Set Content Button</description>
-				<posx>90</posx>
-				<posy>435</posy>
-				<width>200</width>
-				<height>40</height>
-				<align>center</align>
-				<aligny>center</aligny>
-				<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-				<texturefocus border="5">button-focus.png</texturefocus>
-				<label>20333</label>
-				<font>font12_title</font>
-				<onup>12</onup>
-				<onleft>19</onleft>
 				<onright>18</onright>
 				<ondown>10</ondown>
 			</control>
diff --git a/addons/skin.confluence/720p/DialogNetworkSetup.xml b/addons/skin.confluence/720p/DialogNetworkSetup.xml
index 0551b5e789..90d79340f6 100644
--- a/addons/skin.confluence/720p/DialogNetworkSetup.xml
+++ b/addons/skin.confluence/720p/DialogNetworkSetup.xml
@@ -3,7 +3,7 @@
 	<coordinates>
 		<system>1</system>
 		<posx>240</posx>
-		<posy>155</posy>
+		<posy>135</posy>
 	</coordinates>
 	<include>dialogeffect</include>
 	<controls>
@@ -12,21 +12,34 @@
 			<posx>0</posx>
 			<posy>0</posy>
 			<width>800</width>
-			<height>410</height>
+			<height>440</height>
 			<texture border="40">DialogBack.png</texture>
 		</control>
 		<control type="image">
-			<posx>80</posx>
-			<posy>10</posy>
-			<width>640</width>
-			<height>90</height>
-			<aspectratio>stretch</aspectratio>
-			<texture>GlassTitleBar.png</texture>
+			<description>Dialog Header image</description>
+			<posx>40</posx>
+			<posy>16</posy>
+			<width>720</width>
+			<height>40</height>
+			<texture>dialogheader.png</texture>
+		</control>
+		<control type="label" id="2">
+			<description>header label</description>
+			<posx>40</posx>
+			<posy>20</posy>
+			<width>720</width>
+			<height>30</height>
+			<font>font13_title</font>
+			<label>$LOCALIZE[1007]</label>
+			<align>center</align>
+			<aligny>center</aligny>
+			<textcolor>selected</textcolor>
+			<shadowcolor>black</shadowcolor>
 		</control>
 		<control type="button">
 			<description>Close Window button</description>
 			<posx>710</posx>
-			<posy>9</posy>
+			<posy>15</posy>
 			<width>64</width>
 			<height>32</height>
 			<label>-</label>
@@ -40,27 +53,14 @@
 			<ondown>10</ondown>
 			<visible>system.getbool(input.enablemouse)</visible>
 		</control>
-		<control type="label" id="2">
-			<description>header label</description>
-			<posx>20</posx>
-			<posy>18</posy>
-			<width>760</width>
-			<height>30</height>
-			<font>font13_title</font>
-			<label>$LOCALIZE[1007]</label>
-			<align>center</align>
-			<aligny>center</aligny>
-			<textcolor>white</textcolor>
-			<shadowcolor>black</shadowcolor>
-		</control>
 		<control type="spincontrolex" id="10">
 			<description>Protocol SpinControl</description>
-			<posx>20</posx>
+			<posx>30</posx>
 			<posy>70</posy>
-			<height>41</height>
-			<width>760</width>
-			<texturefocus border="5">MenuItemFO.png</texturefocus>
-			<texturenofocus border="5">MenuItemNF.png</texturenofocus>
+			<height>40</height>
+			<width>740</width>
+			<texturefocus border="5">button-focus2.png</texturefocus>
+			<texturenofocus border="5">button-nofocus.png</texturenofocus>
 			<textcolor>white</textcolor>
 			<disabledcolor>grey3</disabledcolor>
 			<textoffsetx>12</textoffsetx>
@@ -75,14 +75,13 @@
 		</control>
 		<control type="button" id="11">
 			<description>Server Address Button</description>
-			<posx>20</posx>
-			<posy>110</posy>
-			<width>585</width>
-			<height>41</height>
+			<posx>30</posx>
+			<posy>115</posy>
+			<width>565</width>
+			<height>40</height>
 			<textoffsetx>12</textoffsetx>
 			<aligny>center</aligny>
-			<texturefocus border="5">MenuItemFO.png</texturefocus>
-			<texturenofocus border="5">MenuItemNF.png</texturenofocus>
+			<texturefocus border="5">button-focus2.png</texturefocus>
 			<font>font13</font>
 			<label>-</label>
 			<onup>10</onup>
@@ -92,17 +91,15 @@
 		</control>
 		<control type="button" id="12">
 			<description>Server Browse Button</description>
-			<posx>610</posx>
-			<posy>110</posy>
+			<posx>600</posx>
+			<posy>115</posy>
 			<width>170</width>
-			<height>41</height>
+			<height>40</height>
 			<textoffsetx>12</textoffsetx>
 			<font>font12_title</font>
 			<label>1024</label>
 			<align>center</align>
 			<aligny>center</aligny>
-			<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-			<texturefocus border="5">button-focus.png</texturefocus>\n
 			<onup>10</onup>
 			<onleft>11</onleft>
 			<onright>11</onright>
@@ -110,14 +107,13 @@
 		</control>
 		<control type="button" id="16">
 			<description>Remote path Button</description>
-			<posx>20</posx>
-			<posy>150</posy>
-			<width>760</width>
-			<height>41</height>
+			<posx>30</posx>
+			<posy>160</posy>
+			<width>740</width>
+			<height>40</height>
 			<textoffsetx>12</textoffsetx>
 			<aligny>center</aligny>
-			<texturefocus border="5">MenuItemFO.png</texturefocus>
-			<texturenofocus border="5">MenuItemNF.png</texturenofocus>
+			<texturefocus border="5">button-focus2.png</texturefocus>
 			<font>font13</font>
 			<label>-</label>
 			<onup>11</onup>
@@ -127,14 +123,13 @@
 		</control>
 		<control type="button" id="13">
 			<description>Port Button</description>
-			<posx>20</posx>
-			<posy>190</posy>
-			<width>760</width>
-			<height>41</height>
+			<posx>30</posx>
+			<posy>205</posy>
+			<width>740</width>
+			<height>40</height>
 			<textoffsetx>12</textoffsetx>
 			<aligny>center</aligny>
-			<texturefocus border="5">MenuItemFO.png</texturefocus>
-			<texturenofocus border="5">MenuItemNF.png</texturenofocus>
+			<texturefocus border="5">button-focus2.png</texturefocus>
 			<font>font13</font>
 			<label>1013</label>
 			<onup>16</onup>
@@ -144,14 +139,13 @@
 		</control>
 		<control type="button" id="14">
 			<description>Username Button</description>
-			<posx>20</posx>
-			<posy>230</posy>
-			<width>760</width>
-			<height>41</height>
+			<posx>30</posx>
+			<posy>250</posy>
+			<width>740</width>
+			<height>40</height>
 			<textoffsetx>12</textoffsetx>
 			<aligny>center</aligny>
-			<texturefocus border="5">MenuItemFO.png</texturefocus>
-			<texturenofocus border="5">MenuItemNF.png</texturenofocus>
+			<texturefocus border="5">button-focus2.png</texturefocus>
 			<font>font13</font>
 			<label>1014</label>
 			<onup>13</onup>
@@ -161,14 +155,13 @@
 		</control>
 		<control type="button" id="15">
 			<description>Password Button</description>
-			<posx>20</posx>
-			<posy>270</posy>
-			<width>760</width>
-			<height>41</height>
+			<posx>30</posx>
+			<posy>295</posy>
+			<width>740</width>
+			<height>40</height>
 			<textoffsetx>12</textoffsetx>
 			<aligny>center</aligny>
-			<texturefocus border="5">MenuItemFO.png</texturefocus>
-			<texturenofocus border="5">MenuItemNF.png</texturenofocus>
+			<texturefocus border="5">button-focus2.png</texturefocus>
 			<font>font13</font>
 			<label>15052</label>
 			<onup>14</onup>
@@ -179,13 +172,11 @@
 		<control type="button" id="18">
 			<description>Ok Button</description>
 			<posx>195</posx>
-			<posy>340</posy>
+			<posy>375</posy>
 			<width>200</width>
 			<height>40</height>
 			<align>center</align>
 			<aligny>center</aligny>
-			<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-			<texturefocus border="3">button-focus.png</texturefocus>\n
 			<font>font12_title</font>
 			<label>186</label>
 			<onup>15</onup>
@@ -196,13 +187,11 @@
 		<control type="button" id="19">
 			<description>Cancel Button</description>
 			<posx>405</posx>
-			<posy>340</posy>
+			<posy>375</posy>
 			<width>200</width>
 			<height>40</height>
 			<align>center</align>
 			<aligny>center</aligny>
-			<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-			<texturefocus border="3">button-focus.png</texturefocus>\n
 			<font>font12_title</font>
 			<label>222</label>
 			<onup>15</onup>
diff --git a/addons/skin.confluence/720p/DialogNumeric.xml b/addons/skin.confluence/720p/DialogNumeric.xml
index 80d16e36f1..c268f19f61 100644
--- a/addons/skin.confluence/720p/DialogNumeric.xml
+++ b/addons/skin.confluence/720p/DialogNumeric.xml
@@ -15,12 +15,12 @@
 			<texture border="40">DialogBack.png</texture>
 		</control>
 		<control type="image">
-			<posx>10</posx>
-			<posy>10</posy>
-			<width>300</width>
-			<height>70</height>
-			<aspectratio>stretch</aspectratio>
-			<texture>GlassTitleBar.png</texture>
+			<description>Dialog Header image</description>
+			<posx>40</posx>
+			<posy>16</posy>
+			<width>240</width>
+			<height>40</height>
+			<texture>dialogheader.png</texture>
 		</control>
 		<control type="image">
 			<posx>30</posx>
@@ -48,33 +48,24 @@
 			<width>240</width>
 			<height>30</height>
 			<aspectratio>stretch</aspectratio>
-			<texture>GlassTitleBar.png</texture>
+			<texture>dialogheader.png</texture>
 		</control>
 		<control type="label" id="1">
 			<description>dialog Heading</description>
 			<posx>20</posx>
 			<posy>20</posy>
 			<width>280</width>
-			<height>40</height>
-			<font>font13_title</font>
-			<textcolor>white</textcolor>
+			<height>35</height>
+			<font>font12_title</font>
+			<textcolor>selected</textcolor>
 			<shadowcolor>black</shadowcolor>
 			<align>center</align>
 			<aligny>center</aligny>
 			<wrapmultiline>true</wrapmultiline>
 		</control>
-		<control type="image">
-			<posx>40</posx>
-			<posy>380</posy>
-			<width>240</width>
-			<height>40</height>
-			<aspectratio>stretch</aspectratio>
-			<colordiffuse>AAFFFFFF</colordiffuse>
-			<texture flipy="true">GlassTitleBar.png</texture>
-		</control>
 		<control type="group">
 			<posx>40</posx>
-			<posy>150</posy>
+			<posy>155</posy>
 			<control type="button" id="11">
 				<description>1 button</description>
 				<posx>0</posx>
diff --git a/addons/skin.confluence/720p/DialogOK.xml b/addons/skin.confluence/720p/DialogOK.xml
index c0839486be..f02d46a776 100644
--- a/addons/skin.confluence/720p/DialogOK.xml
+++ b/addons/skin.confluence/720p/DialogOK.xml
@@ -2,35 +2,43 @@
 	<defaultcontrol always="true">10</defaultcontrol>
 	<coordinates>
 		<system>1</system>
-		<posx>340</posx>
-		<posy>235</posy>
+		<posx>335</posx>
+		<posy>230</posy>
 	</coordinates>
 	<include>dialogeffect</include>
 	<controls>
 		<control type="image">
 			<posx>0</posx>
 			<posy>0</posy>
-			<width>600</width>
-			<height>230</height>
-			<texture border="20">OverlayDialogBackground.png</texture>
+			<width>610</width>
+			<height>240</height>
+			<texture border="40">DialogBack.png</texture>
+		</control>
+		<control type="image">
+			<description>Dialog Header image</description>
+			<posx>40</posx>
+			<posy>16</posy>
+			<width>530</width>
+			<height>40</height>
+			<texture>dialogheader.png</texture>
 		</control>
 		<control type="label" id="1">
 			<description>header label</description>
-			<posx>20</posx>
-			<posy>18</posy>
-			<width>560</width>
+			<posx>40</posx>
+			<posy>20</posy>
+			<width>530</width>
 			<height>30</height>
 			<font>font13_title</font>
-			<label>13406</label>
-			<align>left</align>
+			<label>$LOCALIZE[13406]</label>
+			<align>center</align>
 			<aligny>center</aligny>
-			<textcolor>white</textcolor>
+			<textcolor>selected</textcolor>
 			<shadowcolor>black</shadowcolor>
 		</control>
 		<control type="button">
 			<description>Close Window button</description>
-			<posx>510</posx>
-			<posy>5</posy>
+			<posx>520</posx>
+			<posy>15</posy>
 			<width>64</width>
 			<height>32</height>
 			<label>-</label>
@@ -38,17 +46,17 @@
 			<onclick>PreviousMenu</onclick>
 			<texturefocus>DialogCloseButton-focus.png</texturefocus>
 			<texturenofocus>DialogCloseButton.png</texturenofocus>
-			<onleft>3</onleft>
-			<onright>3</onright>
-			<onup>3</onup>
-			<ondown>3</ondown>
+			<onleft>10</onleft>
+			<onright>10</onright>
+			<onup>10</onup>
+			<ondown>10</ondown>
 			<visible>system.getbool(input.enablemouse)</visible>
 		</control>
 		<control type="label" id="2">
 			<description>dialog line 1</description>
-			<posx>20</posx>
+			<posx>30</posx>
 			<posy>60</posy>
-			<width>560</width>
+			<width>550</width>
 			<height>30</height>
 			<align>left</align>
 			<aligny>center</aligny>
@@ -57,9 +65,9 @@
 		</control>
 		<control type="label" id="3">
 			<description>dialog line 2</description>
-			<posx>20</posx>
+			<posx>30</posx>
 			<posy>85</posy>
-			<width>560</width>
+			<width>550</width>
 			<height>30</height>
 			<align>left</align>
 			<aligny>center</aligny>
@@ -68,9 +76,9 @@
 		</control>
 		<control type="label" id="4">
 			<description>dialog line 3</description>
-			<posx>20</posx>
+			<posx>30</posx>
 			<posy>110</posy>
-			<width>560</width>
+			<width>550</width>
 			<height>30</height>
 			<align>left</align>
 			<aligny>center</aligny>
@@ -79,8 +87,8 @@
 		</control>
 		<control type="button" id="10">
 			<description>OK button</description>
-			<posx>200</posx>
-			<posy>170</posy>
+			<posx>205</posx>
+			<posy>175</posy>
 			<width>200</width>
 			<height>40</height>
 			<label>186</label>
@@ -88,8 +96,6 @@
 			<textcolor>white</textcolor>
 			<focusedcolor>white</focusedcolor>
 			<align>center</align>
-			<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-			<texturefocus border="5">button-focus.png</texturefocus>
 			<onleft>10</onleft>
 			<onright>10</onright>
 			<onup>10</onup>
diff --git a/addons/skin.confluence/720p/DialogPictureInfo.xml b/addons/skin.confluence/720p/DialogPictureInfo.xml
index 98ce3c296c..9cbdad5c4e 100644
--- a/addons/skin.confluence/720p/DialogPictureInfo.xml
+++ b/addons/skin.confluence/720p/DialogPictureInfo.xml
@@ -1,20 +1,56 @@
 <window id="139">
 	<defaultcontrol always="true">5</defaultcontrol>
+	<coordinates>
+		<system>1</system>
+		<posx>240</posx>
+		<posy>45</posy>
+	</coordinates>
+	<include>dialogeffect</include>
 	<controls>
 		<control type="group">
-			<animation effect="slide" start="640,0" end="0,0" time="400" tween="quadratic" easing="out">WindowOpen</animation>
-			<animation effect="slide" start="0,0" end="640,0" time="400" tween="quadratic" easing="out">WindowClose</animation>
 			<control type="image">
-				<posx>640</posx>
+				<description>background image</description>
+				<posx>0</posx>
 				<posy>0</posy>
-				<width>640</width>
-				<height>720</height>
-				<texture border="15,0,0,0" flipx="true">MediaBladeSub.png</texture>
+				<width>800</width>
+				<height>630</height>
+				<texture border="40">DialogBack.png</texture>
+				<visible>!Window.IsVisible(Slideshow)</visible>
+			</control>
+			<control type="image">
+				<description>background image</description>
+				<posx>0</posx>
+				<posy>0</posy>
+				<width>800</width>
+				<height>630</height>
+				<texture border="40">DialogBack2.png</texture>
+				<visible>Window.IsVisible(Slideshow)</visible>
+			</control>
+			<control type="image">
+				<description>Dialog Header image</description>
+				<posx>40</posx>
+				<posy>16</posy>
+				<width>720</width>
+				<height>40</height>
+				<texture>dialogheader.png</texture>
+			</control>
+			<control type="label">
+				<description>header label</description>
+				<posx>40</posx>
+				<posy>20</posy>
+				<width>720</width>
+				<height>30</height>
+				<font>font13_title</font>
+				<label>$LOCALIZE[13406]</label>
+				<align>center</align>
+				<aligny>center</aligny>
+				<textcolor>selected</textcolor>
+				<shadowcolor>black</shadowcolor>
 			</control>
 			<control type="button">
 				<description>Close Window button</description>
-				<posx>660</posx>
-				<posy>0</posy>
+				<posx>710</posx>
+				<posy>15</posy>
 				<width>64</width>
 				<height>32</height>
 				<label>-</label>
@@ -22,30 +58,17 @@
 				<onclick>PreviousMenu</onclick>
 				<texturefocus>DialogCloseButton-focus.png</texturefocus>
 				<texturenofocus>DialogCloseButton.png</texturenofocus>
-				<onleft>5</onleft>
-				<onright>5</onright>
-				<onup>5</onup>
-				<ondown>5</ondown>
+				<onleft>2</onleft>
+				<onright>2</onright>
+				<onup>2</onup>
+				<ondown>2</ondown>
 				<visible>system.getbool(input.enablemouse)</visible>
 			</control>
-			<control type="label">
-				<description>header label</description>
-				<posx>35r</posx>
-				<posy>40</posy>
-				<width>710</width>
-				<height>30</height>
-				<font>font30_title</font>
-				<label>$LOCALIZE[13406]</label>
-				<align>right</align>
-				<aligny>center</aligny>
-				<textcolor>white</textcolor>
-				<shadowcolor>black</shadowcolor>
-			</control>
 			<control type="scrollbar" id="60">
-				<posx>1235</posx>
-				<posy>90</posy>
+				<posx>755</posx>
+				<posy>70</posy>
 				<width>25</width>
-				<height>600</height>
+				<height>495</height>
 				<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
 				<texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
 				<texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
@@ -57,95 +80,110 @@
 				<orientation>vertical</orientation>
 			</control>
 			<control type="list" id="5">
-				<posx>670</posx>
-				<posy>90</posy>
-				<width>560</width>
-				<height>601</height>
+				<animation effect="slide" start="0,0" end="10,0" time="0" condition="!Control.IsVisible(60)">Conditional</animation>
+				<posx>30</posx>
+				<posy>70</posy>
+				<width>720</width>
+				<height>495</height>
 				<onleft>60</onleft>
 				<onright>60</onright>
 				<onup>5</onup>
 				<ondown>5</ondown>
 				<pagecontrol>60</pagecontrol>
 				<scrolltime>200</scrolltime>
-				<itemlayout height="40">
+				<itemlayout height="45">
 					<control type="image">
 						<posx>0</posx>
 						<posy>0</posy>
-						<width>560</width>
-						<height>41</height>
-						<texture border="5">MenuItemNF.png</texture>
+						<width>720</width>
+						<height>40</height>
+						<texture border="5">button-nofocus.png</texture>
 					</control>
 					<control type="label">
-						<posx>170</posx>
+						<posx>10</posx>
 						<posy>0</posy>
-						<width>160</width>
-						<height>35</height>
-						<font>font12_title</font>
+						<width>500</width>
+						<height>40</height>
+						<font>font13</font>
 						<aligny>center</aligny>
-						<textcolor>blue</textcolor>
+						<textcolor>white</textcolor>
 						<shadowcolor>black</shadowcolor>
 						<selectedcolor>selected</selectedcolor>
-						<align>right</align>
-						<label>$INFO[ListItem.Label][COLOR=grey2] : [/COLOR]</label>
+						<align>left</align>
+						<label>$INFO[ListItem.Label]</label>
 					</control>
 					<control type="label">
-						<posx>170</posx>
+						<posx>710</posx>
 						<posy>0</posy>
-						<width>390</width>
-						<height>35</height>
-						<font>font12</font>
+						<width>650</width>
+						<height>40</height>
+						<font>font13</font>
 						<aligny>center</aligny>
+						<textcolor>grey2</textcolor>
 						<shadowcolor>black</shadowcolor>
 						<selectedcolor>selected</selectedcolor>
-						<align>left</align>
+						<align>right</align>
 						<info>ListItem.Label2</info>
 					</control>
 				</itemlayout>
-				<focusedlayout height="40">
+				<focusedlayout height="45">
 					<control type="image">
 						<posx>0</posx>
 						<posy>0</posy>
-						<width>560</width>
-						<height>41</height>
+						<width>720</width>
+						<height>40</height>
 						<visible>!Control.HasFocus(5)</visible>
-						<texture border="5">MenuItemNF.png</texture>
+						<texture border="5">button-nofocus.png</texture>
 					</control>
 					<control type="image">
 						<posx>0</posx>
 						<posy>0</posy>
-						<width>560</width>
-						<height>41</height>
+						<width>720</width>
+						<height>40</height>
+						<texture border="5">button-focus2.png</texture>
 						<visible>Control.HasFocus(5)</visible>
-						<texture border="5">MenuItemFO.png</texture>
 					</control>
 					<control type="label">
-						<posx>170</posx>
+						<posx>10</posx>
 						<posy>0</posy>
-						<width>160</width>
-						<height>35</height>
-						<font>font12_title</font>
+						<width>500</width>
+						<height>40</height>
+						<font>font13</font>
 						<aligny>center</aligny>
-						<textcolor>blue</textcolor>
+						<textcolor>white</textcolor>
 						<shadowcolor>black</shadowcolor>
 						<selectedcolor>selected</selectedcolor>
-						<align>right</align>
-						<label>$INFO[ListItem.Label][COLOR=grey2] : [/COLOR]</label>
+						<align>left</align>
+						<label>$INFO[ListItem.Label]</label>
 					</control>
 					<control type="label">
-						<posx>170</posx>
+						<posx>710</posx>
 						<posy>0</posy>
-						<width>390</width>
-						<height>35</height>
-						<font>font12</font>
+						<width>650</width>
+						<height>40</height>
+						<font>font13</font>
 						<aligny>center</aligny>
+						<textcolor>grey2</textcolor>
 						<shadowcolor>black</shadowcolor>
 						<selectedcolor>selected</selectedcolor>
-						<align>left</align>
+						<align>right</align>
 						<info>ListItem.Label2</info>
 					</control>
 				</focusedlayout>
 			</control>
+			<control type="label">
+				<description>number of files/pages in list text label</description>
+				<posx>760</posx>
+				<posy>570</posy>
+				<width>300</width>
+				<height>35</height>
+				<font>font12</font>
+				<align>right</align>
+				<aligny>center</aligny>
+				<scroll>true</scroll>
+				<textcolor>grey</textcolor>
+				<label>([COLOR=blue]$INFO[Container(5).NumItems][/COLOR]) $LOCALIZE[31025] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(5).CurrentPage]/$INFO[Container(5).NumPages][/COLOR])</label>
+			</control>
 		</control>
-		<include>Clock</include>
 	</controls>
 </window>
\ No newline at end of file
diff --git a/addons/skin.confluence/720p/DialogProgress.xml b/addons/skin.confluence/720p/DialogProgress.xml
index 0a4ad24486..58c24ddb88 100644
--- a/addons/skin.confluence/720p/DialogProgress.xml
+++ b/addons/skin.confluence/720p/DialogProgress.xml
@@ -2,20 +2,28 @@
 	<defaultcontrol always="true">10</defaultcontrol>
 	<coordinates>
 		<system>1</system>
-		<posx>340</posx>
-		<posy>235</posy>
+		<posx>335</posx>
+		<posy>230</posy>
 	</coordinates>
 	<include>dialogeffect</include>
 	<controls>
 		<control type="image">
 			<posx>0</posx>
 			<posy>0</posy>
-			<width>600</width>
-			<height>230</height>
-			<texture border="20">OverlayDialogBackground.png</texture>
+			<width>610</width>
+			<height>240</height>
+			<texture border="40">DialogBack.png</texture>
+		</control>
+		<control type="image">
+			<description>Dialog Header image</description>
+			<posx>40</posx>
+			<posy>16</posy>
+			<width>530</width>
+			<height>40</height>
+			<texture>dialogheader.png</texture>
 		</control>
 		<control type="label" id="1">
-			<description>heading label</description>
+			<description>fake heading label</description>
 			<posx>0</posx>
 			<posy>0</posy>
 			<width>0</width>
@@ -25,22 +33,39 @@
 		</control>
 		<control type="label">
 			<description>header label</description>
-			<posx>20</posx>
-			<posy>18</posy>
-			<width>560</width>
+			<posx>40</posx>
+			<posy>20</posy>
+			<width>530</width>
 			<height>30</height>
 			<font>font13_title</font>
 			<label>$INFO[Control.GetLabel(1)] $INFO[System.Progressbar,- ,%]</label>
-			<align>left</align>
+			<align>center</align>
 			<aligny>center</aligny>
-			<textcolor>white</textcolor>
+			<textcolor>selected</textcolor>
 			<shadowcolor>black</shadowcolor>
 		</control>
+		<control type="button">
+			<description>Close Window button</description>
+			<posx>520</posx>
+			<posy>15</posy>
+			<width>64</width>
+			<height>32</height>
+			<label>-</label>
+			<font>-</font>
+			<onclick>PreviousMenu</onclick>
+			<texturefocus>DialogCloseButton-focus.png</texturefocus>
+			<texturenofocus>DialogCloseButton.png</texturenofocus>
+			<onleft>10</onleft>
+			<onright>10</onright>
+			<onup>10</onup>
+			<ondown>10</ondown>
+			<visible>system.getbool(input.enablemouse)</visible>
+		</control>
 		<control type="label" id="2">
 			<description>dialog line 1</description>
-			<posx>20</posx>
+			<posx>30</posx>
 			<posy>60</posy>
-			<width>560</width>
+			<width>550</width>
 			<height>30</height>
 			<align>left</align>
 			<aligny>center</aligny>
@@ -50,9 +75,9 @@
 		</control>
 		<control type="label" id="3">
 			<description>dialog line 2</description>
-			<posx>20</posx>
+			<posx>30</posx>
 			<posy>85</posy>
-			<width>560</width>
+			<width>550</width>
 			<height>30</height>
 			<align>left</align>
 			<aligny>center</aligny>
@@ -62,9 +87,9 @@
 		</control>
 		<control type="label" id="4">
 			<description>dialog line 3</description>
-			<posx>20</posx>
+			<posx>30</posx>
 			<posy>110</posy>
-			<width>560</width>
+			<width>550</width>
 			<height>30</height>
 			<align>left</align>
 			<aligny>center</aligny>
@@ -74,16 +99,16 @@
 		</control>
 		<control type="progress">
 			<description>Progressbar</description>
-			<posx>20</posx>
-			<posy>142</posy>
-			<width>560</width>
+			<posx>30</posx>
+			<posy>148</posy>
+			<width>550</width>
 			<height>16</height>
 			<info>System.Progressbar</info>
 		</control>
 		<control type="button" id="10">
 			<description>Cancel button</description>
-			<posx>200</posx>
-			<posy>170</posy>
+			<posx>205</posx>
+			<posy>175</posy>
 			<width>200</width>
 			<height>40</height>
 			<label>222</label>
@@ -91,8 +116,6 @@
 			<textcolor>white</textcolor>
 			<focusedcolor>white</focusedcolor>
 			<align>center</align>
-			<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-			<texturefocus border="5">button-focus.png</texturefocus>
 			<onleft>10</onleft>
 			<onright>10</onright>
 			<onup>10</onup>
diff --git a/addons/skin.confluence/720p/DialogSelect.xml b/addons/skin.confluence/720p/DialogSelect.xml
index fdbb93ce92..f2cf9ca4e4 100644
--- a/addons/skin.confluence/720p/DialogSelect.xml
+++ b/addons/skin.confluence/720p/DialogSelect.xml
@@ -14,19 +14,42 @@
 			<width>610</width>
 			<height>650</height>
 			<texture border="40">DialogBack.png</texture>
+			<visible>![Window.IsVisible(FullscreenVideo) | Window.IsVisible(Visualisation)]</visible>
 		</control>
 		<control type="image">
+			<description>background image</description>
+			<posx>0</posx>
+			<posy>0</posy>
+			<width>610</width>
+			<height>650</height>
+			<texture border="40">DialogBack2.png</texture>
+			<visible>Window.IsVisible(FullscreenVideo) | Window.IsVisible(Visualisation)</visible>
+		</control>
+		<control type="image">
+			<description>Dialog Header image</description>
 			<posx>40</posx>
-			<posy>10</posy>
+			<posy>16</posy>
 			<width>530</width>
-			<height>90</height>
-			<aspectratio>stretch</aspectratio>
-			<texture>GlassTitleBar.png</texture>
+			<height>40</height>
+			<texture>dialogheader.png</texture>
+		</control>
+		<control type="label" id="1">
+			<description>header label</description>
+			<posx>40</posx>
+			<posy>20</posy>
+			<width>530</width>
+			<height>30</height>
+			<font>font13_title</font>
+			<label>$LOCALIZE[13406]</label>
+			<align>center</align>
+			<aligny>center</aligny>
+			<textcolor>selected</textcolor>
+			<shadowcolor>black</shadowcolor>
 		</control>
 		<control type="button">
 			<description>Close Window button</description>
 			<posx>520</posx>
-			<posy>9</posy>
+			<posy>15</posy>
 			<width>64</width>
 			<height>32</height>
 			<label>-</label>
@@ -40,24 +63,11 @@
 			<ondown>10</ondown>
 			<visible>system.getbool(input.enablemouse)</visible>
 		</control>
-		<control type="label" id="1">
-			<description>header label</description>
-			<posx>20</posx>
-			<posy>18</posy>
-			<width>570</width>
-			<height>30</height>
-			<font>font13_title</font>
-			<label>$LOCALIZE[13406]</label>
-			<align>center</align>
-			<aligny>center</aligny>
-			<textcolor>white</textcolor>
-			<shadowcolor>black</shadowcolor>
-		</control>
 		<control type="list" id="3">
 			<posx>20</posx>
-			<posy>60</posy>
+			<posy>67</posy>
 			<width>550</width>
-			<height>520</height>
+			<height>506</height>
 			<onup>3</onup>
 			<ondown>3</ondown>
 			<onleft>5</onleft>
@@ -65,13 +75,13 @@
 			<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="40" width="550">
+			<itemlayout height="46" width="550">
 				<control type="image">
 					<posx>0</posx>
 					<posy>0</posy>
 					<width>550</width>
-					<height>41</height>
-					<texture border="0,2,0,2">MenuItemNF.png</texture>
+					<height>40</height>
+					<texture border="5">button-nofocus.png</texture>
 				</control>
 				<control type="label">
 					<posx>20</posx>
@@ -86,13 +96,13 @@
 					<label>$INFO[ListItem.Label]</label>
 				</control>
 			</itemlayout>
-			<focusedlayout height="40" width="550">
+			<focusedlayout height="46" width="550">
 				<control type="image">
 					<posx>0</posx>
 					<posy>0</posy>
 					<width>550</width>
-					<height>41</height>
-					<texture border="0,2,0,2">MenuItemNF.png</texture>
+					<height>40</height>
+					<texture border="5">button-nofocus.png</texture>
 					<visible>!Control.HasFocus(3)</visible>
 					<include>VisibleFadeEffect</include>
 				</control>
@@ -100,8 +110,8 @@
 					<posx>0</posx>
 					<posy>0</posy>
 					<width>550</width>
-					<height>41</height>
-					<texture border="0,2,0,2">MenuItemFO.png</texture>
+					<height>40</height>
+					<texture border="5">button-focus2.png</texture>
 					<visible>Control.HasFocus(3)</visible>
 					<include>VisibleFadeEffect</include>
 				</control>
@@ -121,9 +131,9 @@
 		</control>
 		<control type="list" id="6">
 			<posx>20</posx>
-			<posy>60</posy>
+			<posy>65</posy>
 			<width>550</width>
-			<height>520</height>
+			<height>510</height>
 			<onup>6</onup>
 			<ondown>6</ondown>
 			<onleft>5</onleft>
@@ -131,27 +141,27 @@
 			<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="80" width="550">
+			<itemlayout height="85" width="550">
 				<control type="image">
 					<posx>0</posx>
 					<posy>0</posy>
 					<width>550</width>
-					<height>81</height>
-					<texture border="0,2,0,2">MenuItemNF.png</texture>
+					<height>80</height>
+					<texture border="5">button-nofocus.png</texture>
 				</control>
 				<control type="image">
-					<posx>0</posx>
+					<posx>2</posx>
 					<posy>2</posy>
-					<width>120</width>
+					<width>80</width>
 					<height>76</height>
 					<texture>$INFO[Listitem.Icon]</texture>
 					<bordertexture border="3">black-back2.png</bordertexture>
 					<bordersize>2</bordersize>
 				</control>
 				<control type="label">
-					<posx>130</posx>
+					<posx>90</posx>
 					<posy>0</posy>
-					<width>410</width>
+					<width>450</width>
 					<height>30</height>
 					<font>font13</font>
 					<textcolor>grey</textcolor>
@@ -161,9 +171,9 @@
 					<label>[B]$INFO[ListItem.Label][/B]</label>
 				</control>
 				<control type="textbox">
-					<posx>130</posx>
+					<posx>90</posx>
 					<posy>30</posy>
-					<width>410</width>
+					<width>450</width>
 					<height>50</height>
 					<font>font12</font>
 					<textcolor>grey</textcolor>
@@ -172,13 +182,13 @@
 					<label>$INFO[ListItem.Property(Addon.Summary)]</label>
 				</control>
 			</itemlayout>
-			<focusedlayout height="80" width="550">
+			<focusedlayout height="85" width="550">
 				<control type="image">
 					<posx>0</posx>
 					<posy>0</posy>
 					<width>550</width>
-					<height>81</height>
-					<texture border="0,2,0,2">MenuItemNF.png</texture>
+					<height>80</height>
+					<texture border="5">button-nofocus.png</texture>
 					<visible>!Control.HasFocus(6)</visible>
 					<include>VisibleFadeEffect</include>
 				</control>
@@ -186,24 +196,24 @@
 					<posx>0</posx>
 					<posy>0</posy>
 					<width>550</width>
-					<height>81</height>
-					<texture border="0,2,0,2">MenuItemFO.png</texture>
+					<height>80</height>
+					<texture border="5">button-focus2.png</texture>
 					<visible>Control.HasFocus(6)</visible>
 					<include>VisibleFadeEffect</include>
 				</control>
 				<control type="image">
-					<posx>0</posx>
+					<posx>2</posx>
 					<posy>2</posy>
-					<width>120</width>
+					<width>80</width>
 					<height>76</height>
 					<texture>$INFO[Listitem.Icon]</texture>
 					<bordertexture border="3">black-back2.png</bordertexture>
 					<bordersize>2</bordersize>
 				</control>
 				<control type="label">
-					<posx>130</posx>
+					<posx>90</posx>
 					<posy>0</posy>
-					<width>410</width>
+					<width>450</width>
 					<height>30</height>
 					<font>font13</font>
 					<textcolor>white</textcolor>
@@ -213,9 +223,9 @@
 					<label>[B]$INFO[ListItem.Label][/B]</label>
 				</control>
 				<control type="textbox">
-					<posx>130</posx>
+					<posx>90</posx>
 					<posy>30</posy>
-					<width>410</width>
+					<width>450</width>
 					<height>50</height>
 					<font>font12</font>
 					<textcolor>grey</textcolor>
@@ -227,9 +237,9 @@
 		</control>
 		<control type="scrollbar" id="61">
 			<posx>570</posx>
-			<posy>60</posy>
+			<posy>65</posy>
 			<width>25</width>
-			<height>520</height>
+			<height>510</height>
 			<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
 			<texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
 			<texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
@@ -245,7 +255,7 @@
 		<control type="label">
 			<description>number of files/pages in list text label</description>
 			<posx>580</posx>
-			<posy>592</posy>
+			<posy>585</posy>
 			<width>300</width>
 			<height>35</height>
 			<font>font12</font>
@@ -259,7 +269,7 @@
 		<control type="label">
 			<description>number of files/pages in list text label</description>
 			<posx>580</posx>
-			<posy>592</posy>
+			<posy>587</posy>
 			<width>300</width>
 			<height>35</height>
 			<font>font12</font>
@@ -273,7 +283,7 @@
 		<control type="button" id="5">
 			<description>Manual button</description>
 			<posx>20</posx>
-			<posy>590</posy>
+			<posy>585</posy>
 			<width>200</width>
 			<height>40</height>
 			<label>186</label>
@@ -281,8 +291,6 @@
 			<textcolor>white</textcolor>
 			<focusedcolor>white</focusedcolor>
 			<align>center</align>
-			<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-			<texturefocus border="5">button-focus.png</texturefocus>
 			<onleft>61</onleft>
 			<onright>3</onright>
 			<onup>3</onup>
diff --git a/addons/skin.confluence/720p/DialogSongInfo.xml b/addons/skin.confluence/720p/DialogSongInfo.xml
index 45bf39be71..5bd3735b2d 100644
--- a/addons/skin.confluence/720p/DialogSongInfo.xml
+++ b/addons/skin.confluence/720p/DialogSongInfo.xml
@@ -3,7 +3,7 @@
 	<coordinates>
 		<system>1</system>
 		<posx>185</posx>
-		<posy>125</posy>
+		<posy>105</posy>
 	</coordinates>
 	<include>dialogeffect</include>
 	<controls>
@@ -15,28 +15,34 @@
 				<posx>0</posx>
 				<posy>0</posy>
 				<width>910</width>
-				<height>470</height>
+				<height>510</height>
 				<texture border="40">DialogBack.png</texture>
 			</control>
 			<control type="image">
-				<posx>260</posx>
-				<posy>10</posy>
-				<width>620</width>
-				<height>448</height>
-				<texture border="5">black-back2.png</texture>
+				<description>Dialog Header image</description>
+				<posx>40</posx>
+				<posy>16</posy>
+				<width>830</width>
+				<height>40</height>
+				<texture>dialogheader.png</texture>
 			</control>
-			<control type="image">
-				<posx>260</posx>
-				<posy>10</posy>
-				<width>610</width>
-				<height>100</height>
-				<aspectratio>stretch</aspectratio>
-				<texture>GlassTitleBar.png</texture>
+			<control type="label">
+				<description>header label</description>
+				<posx>40</posx>
+				<posy>20</posy>
+				<width>830</width>
+				<height>30</height>
+				<font>font13_title</font>
+				<label>$LOCALIZE[658]</label>
+				<align>center</align>
+				<aligny>center</aligny>
+				<textcolor>selected</textcolor>
+				<shadowcolor>black</shadowcolor>
 			</control>
 			<control type="button">
 				<description>Close Window button</description>
-				<posx>810</posx>
-				<posy>9</posy>
+				<posx>820</posx>
+				<posy>14</posy>
 				<width>64</width>
 				<height>32</height>
 				<label>-</label>
@@ -51,308 +57,297 @@
 				<visible>system.getbool(input.enablemouse)</visible>
 			</control>
 			<control type="label">
-				<description>header label</description>
-				<posx>280</posx>
-				<posy>20</posy>
-				<width>580</width>
+				<description>Song Title value</description>
+				<posx>40</posx>
+				<posy>60</posy>
+				<width>830</width>
 				<height>30</height>
-				<font>font30_title</font>
-				<label>$LOCALIZE[658]</label>
-				<align>left</align>
+				<align>center</align>
 				<aligny>center</aligny>
+				<font>font13</font>
+				<label>[B]$INFO[ListItem.Title][/B]</label>
 				<textcolor>white</textcolor>
-				<shadowcolor>black</shadowcolor>
+				<scroll>true</scroll>
 			</control>
 			<control type="image">
-				<posx>35</posx>
-				<posy>40</posy>
+				<posx>40</posx>
+				<posy>120</posy>
 				<width>200</width>
 				<height>200</height>
 				<aspectratio aligny="bottom">keep</aspectratio>
 				<texture>$INFO[ListItem.Icon]</texture>
 			</control>
 			<control type="image">
-				<posx>35</posx>
-				<posy>240</posy>
+				<posx>40</posx>
+				<posy>320</posy>
 				<width>200</width>
 				<height>200</height>
 				<aspectratio aligny="top">keep</aspectratio>
 				<texture flipy="true" diffuse="diffuse_mirror2.png">$INFO[ListItem.Icon]</texture>
 			</control>
-			<control type="label">
-				<description>Song Title value</description>
-				<posx>280</posx>
-				<posy>80</posy>
-				<width>580</width>
-				<height>30</height>
-				<align>left</align>
-				<aligny>center</aligny>
-				<font>font13caps</font>
-				<label>[B]$INFO[ListItem.Title][/B]</label>
-				<textcolor>white</textcolor>
-				<scroll>true</scroll>
-			</control>
-			<control type="label">
-				<description>Artist Title</description>
-				<posx>400</posx>
-				<posy>140</posy>
-				<width>130</width>
-				<height>25</height>
-				<align>right</align>
-				<aligny>center</aligny>
-				<font>font13_title</font>
-				<textcolor>blue</textcolor>
-				<label>$LOCALIZE[557]:</label>
-			</control>
-			<control type="fadelabel">
-				<description>Artist Value</description>
-				<posx>410</posx>
-				<posy>140</posy>
-				<width>460</width>
-				<height>25</height>
-				<align>left</align>
-				<aligny>center</aligny>
-				<font>font13</font>
-				<textcolor>white</textcolor>
-				<label fallback="161">$INFO[ListItem.Artist]</label>
-			</control>
-			<control type="label">
-				<description>Album Title</description>
-				<posx>400</posx>
-				<posy>175</posy>
-				<width>130</width>
-				<height>25</height>
-				<align>right</align>
-				<aligny>center</aligny>
-				<font>font13_title</font>
-				<textcolor>blue</textcolor>
-				<label>$LOCALIZE[558]:</label>
-			</control>
-			<control type="fadelabel">
-				<description>Album Value</description>
-				<posx>410</posx>
-				<posy>175</posy>
-				<width>460</width>
-				<height>25</height>
-				<align>left</align>
-				<aligny>center</aligny>
-				<font>font13</font>
-				<textcolor>white</textcolor>
-				<label fallback="161">$INFO[ListItem.Album]$INFO[listitem.discnumber, - $LOCALIZE[427] ]</label>
-			</control>
-			<control type="label">
-				<description>Genre Title</description>
-				<posx>400</posx>
-				<posy>210</posy>
-				<width>130</width>
-				<height>25</height>
-				<align>right</align>
-				<aligny>center</aligny>
-				<font>font13_title</font>
-				<textcolor>blue</textcolor>
-				<label>$LOCALIZE[515]:</label>
-			</control>
-			<control type="fadelabel">
-				<description>Genre Value</description>
-				<posx>410</posx>
-				<posy>210</posy>
-				<width>460</width>
-				<height>25</height>
-				<align>left</align>
-				<aligny>center</aligny>
-				<font>font13</font>
-				<textcolor>white</textcolor>
-				<label fallback="161">$INFO[ListItem.Genre]</label>
-			</control>
-			<control type="label">
-				<description>Year Title</description>
-				<posx>400</posx>
-				<posy>245</posy>
-				<width>130</width>
-				<height>25</height>
-				<align>right</align>
-				<aligny>center</aligny>
-				<font>font13_title</font>
-				<textcolor>blue</textcolor>
-				<label>$LOCALIZE[562]:</label>
-			</control>
-			<control type="fadelabel">
-				<description>Year Value</description>
-				<posx>410</posx>
-				<posy>245</posy>
-				<width>460</width>
-				<height>25</height>
-				<align>left</align>
-				<aligny>center</aligny>
-				<font>font13</font>
-				<textcolor>white</textcolor>
-				<label fallback="161">$INFO[ListItem.Year]</label>
-			</control>
-			<control type="label">
-				<description>Track Number Title</description>
-				<posx>400</posx>
-				<posy>280</posy>
-				<width>130</width>
-				<height>25</height>
-				<align>right</align>
-				<aligny>center</aligny>
-				<font>font13_title</font>
-				<textcolor>blue</textcolor>
-				<label>$LOCALIZE[554]:</label>
-			</control>
-			<control type="fadelabel">
-				<description>Track Number Value</description>
-				<posx>410</posx>
-				<posy>280</posy>
-				<width>460</width>
-				<height>25</height>
-				<align>left</align>
-				<aligny>center</aligny>
-				<font>font13</font>
-				<textcolor>white</textcolor>
-				<label fallback="161">$INFO[ListItem.TrackNumber]</label>
-			</control>
-			<control type="label">
-				<description>Rating Title</description>
-				<posx>400</posx>
-				<posy>315</posy>
-				<width>130</width>
-				<height>25</height>
-				<align>right</align>
-				<aligny>center</aligny>
-				<font>font13_title</font>
-				<textcolor>blue</textcolor>
-				<label>$LOCALIZE[563]:</label>
-			</control>
 			<control type="group">
-				<posx>410</posx>
-				<posy>313</posy>
-				<control type="image">
-					<description>Rating value</description>
-					<posx>0</posx>
+				<posx>250</posx>
+				<posy>120</posy>
+				<control type="label">
+					<description>Artist Title</description>
+					<posx>150</posx>
 					<posy>0</posy>
-					<width>160</width>
-					<height>32</height>
-					<aspectratio align="left">keep</aspectratio>
-					<texture>LeftRating/$INFO[ListItem.StarRating]</texture>
+					<width>150</width>
+					<height>25</height>
+					<align>right</align>
+					<aligny>center</aligny>
+					<font>font13</font>
+					<textcolor>blue</textcolor>
+					<label>$LOCALIZE[557]:</label>
 				</control>
-				<control type="button" id="14">
-					<description>Decrease Rating</description>
-					<posx>170</posx>
-					<posy>5</posy>
-					<width>33</width>
-					<height>22</height>
-					<onclick>DecreaseRating</onclick>
-					<texturenofocus>scroll-down-2.png</texturenofocus>
-					<texturefocus>scroll-down-focus-2.png</texturefocus>
-					<onleft>9000</onleft>
-					<onright>15</onright>
-					<ondown>14</ondown>
-					<onup>14</onup>
+				<control type="fadelabel">
+					<description>Artist Value</description>
+					<posx>160</posx>
+					<posy>0</posy>
+					<width>460</width>
+					<height>25</height>
+					<align>left</align>
+					<aligny>center</aligny>
+					<font>font13</font>
+					<textcolor>white</textcolor>
+					<label fallback="161">$INFO[ListItem.Artist]</label>
+					<scrollout>false</scrollout>
+					<pauseatend>2000</pauseatend>
 				</control>
-				<control type="button" id="15">
-					<description>Increase Rating</description>
-					<posx>203</posx>
-					<posy>5</posy>
-					<width>33</width>
-					<height>22</height>
-					<onclick>IncreaseRating</onclick>
-					<texturenofocus>scroll-up-2.png</texturenofocus>
-					<texturefocus>scroll-up-focus-2.png</texturefocus>
-					<onleft>14</onleft>
-					<onright>15</onright>
-					<ondown>15</ondown>
-					<onup>15</onup>
+				<control type="label">
+					<description>Album Title</description>
+					<posx>150</posx>
+					<posy>30</posy>
+					<width>150</width>
+					<height>25</height>
+					<align>right</align>
+					<aligny>center</aligny>
+					<font>font13</font>
+					<textcolor>blue</textcolor>
+					<label>$LOCALIZE[558]:</label>
+				</control>
+				<control type="fadelabel">
+					<description>Album Value</description>
+					<posx>160</posx>
+					<posy>30</posy>
+					<width>460</width>
+					<height>25</height>
+					<align>left</align>
+					<aligny>center</aligny>
+					<font>font13</font>
+					<textcolor>white</textcolor>
+					<label fallback="161">$INFO[ListItem.Album]$INFO[listitem.discnumber, - $LOCALIZE[427] ]</label>
+					<scrollout>false</scrollout>
+					<pauseatend>2000</pauseatend>
+				</control>
+				<control type="label">
+					<description>Genre Title</description>
+					<posx>150</posx>
+					<posy>60</posy>
+					<width>150</width>
+					<height>25</height>
+					<align>right</align>
+					<aligny>center</aligny>
+					<font>font13</font>
+					<textcolor>blue</textcolor>
+					<label>$LOCALIZE[515]:</label>
+					<scrollout>false</scrollout>
+					<pauseatend>2000</pauseatend>
+				</control>
+				<control type="fadelabel">
+					<description>Genre Value</description>
+					<posx>160</posx>
+					<posy>60</posy>
+					<width>460</width>
+					<height>25</height>
+					<align>left</align>
+					<aligny>center</aligny>
+					<font>font13</font>
+					<textcolor>white</textcolor>
+					<label fallback="161">$INFO[ListItem.Genre]</label>
+				</control>
+				<control type="label">
+					<description>Year Title</description>
+					<posx>150</posx>
+					<posy>90</posy>
+					<width>150</width>
+					<height>25</height>
+					<align>right</align>
+					<aligny>center</aligny>
+					<font>font13</font>
+					<textcolor>blue</textcolor>
+					<label>$LOCALIZE[562]:</label>
+				</control>
+				<control type="fadelabel">
+					<description>Year Value</description>
+					<posx>160</posx>
+					<posy>90</posy>
+					<width>460</width>
+					<height>25</height>
+					<align>left</align>
+					<aligny>center</aligny>
+					<font>font13</font>
+					<textcolor>white</textcolor>
+					<label fallback="161">$INFO[ListItem.Year]</label>
+				</control>
+				<control type="label">
+					<description>Track Number Title</description>
+					<posx>150</posx>
+					<posy>120</posy>
+					<width>150</width>
+					<height>25</height>
+					<align>right</align>
+					<aligny>center</aligny>
+					<font>font13</font>
+					<textcolor>blue</textcolor>
+					<label>$LOCALIZE[554]:</label>
+				</control>
+				<control type="fadelabel">
+					<description>Track Number Value</description>
+					<posx>160</posx>
+					<posy>120</posy>
+					<width>460</width>
+					<height>25</height>
+					<align>left</align>
+					<aligny>center</aligny>
+					<font>font13</font>
+					<textcolor>white</textcolor>
+					<label fallback="161">$INFO[ListItem.TrackNumber]</label>
+				</control>
+				<control type="label">
+					<description>Rating Title</description>
+					<posx>150</posx>
+					<posy>150</posy>
+					<width>150</width>
+					<height>25</height>
+					<align>right</align>
+					<aligny>center</aligny>
+					<font>font13</font>
+					<textcolor>blue</textcolor>
+					<label>$LOCALIZE[563]:</label>
+				</control>
+				<control type="group">
+					<posx>160</posx>
+					<posy>148</posy>
+					<control type="image">
+						<description>Rating value</description>
+						<posx>0</posx>
+						<posy>0</posy>
+						<width>150</width>
+						<height>32</height>
+						<aspectratio align="left">keep</aspectratio>
+						<texture>LeftRating/$INFO[ListItem.StarRating]</texture>
+					</control>
+					<control type="button" id="14">
+						<description>Decrease Rating</description>
+						<posx>160</posx>
+						<posy>5</posy>
+						<width>33</width>
+						<height>22</height>
+						<onclick>DecreaseRating</onclick>
+						<texturenofocus>scroll-down-2.png</texturenofocus>
+						<texturefocus>scroll-down-focus-2.png</texturefocus>
+						<onleft>15</onleft>
+						<onright>15</onright>
+						<ondown>9000</ondown>
+						<onup>9000</onup>
+					</control>
+					<control type="button" id="15">
+						<description>Increase Rating</description>
+						<posx>193</posx>
+						<posy>5</posy>
+						<width>33</width>
+						<height>22</height>
+						<onclick>IncreaseRating</onclick>
+						<texturenofocus>scroll-up-2.png</texturenofocus>
+						<texturefocus>scroll-up-focus-2.png</texturefocus>
+						<onleft>14</onleft>
+						<onright>14</onright>
+						<ondown>9000</ondown>
+						<onup>9000</onup>
+					</control>
+				</control>
+				<control type="label">
+					<description>Comment Title</description>
+					<posx>150</posx>
+					<posy>180</posy>
+					<width>150</width>
+					<height>25</height>
+					<align>right</align>
+					<aligny>center</aligny>
+					<font>font13</font>
+					<textcolor>blue</textcolor>
+					<label>$LOCALIZE[569]:</label>
+				</control>
+				<control type="textbox">
+					<description>Comment value</description>
+					<posx>160</posx>
+					<posy>177</posy>
+					<width>460</width>
+					<height>140</height>
+					<font>font13</font>
+					<pagecontrol>-</pagecontrol>
+					<label fallback="161">$INFO[ListItem.Comment]</label>
 				</control>
-			</control>
-			<control type="label">
-				<description>Comment Title</description>
-				<posx>400</posx>
-				<posy>350</posy>
-				<width>130</width>
-				<height>25</height>
-				<align>right</align>
-				<aligny>center</aligny>
-				<font>font13_title</font>
-				<textcolor>blue</textcolor>
-				<label>$LOCALIZE[569]:</label>
-			</control>
-			<control type="textbox">
-				<description>Comment value</description>
-				<posx>410</posx>
-				<posy>345</posy>
-				<width>460</width>
-				<height>100</height>
-				<font>font13</font>
-				<pagecontrol>-</pagecontrol>
-				<label fallback="161">$INFO[ListItem.Comment]</label>
 			</control>
 			<control type="group" id="9000">
-				<posx>10</posx>
-				<posy>280</posy>
+				<posx>40</posx>
+				<posy>445</posy>
 				<control type="button" id ="10">
 					<description>Ok button</description>
 					<posx>0</posx>
 					<posy>0</posy>
-					<width>240</width>
-					<height>41</height>
+					<width>200</width>
+					<height>40</height>
 					<label>186</label>
-					<font>font13_title</font>
-					<align>right</align>
-					<texturenofocus>MenuItemNF.png</texturenofocus>
-					<texturefocus>MenuItemFO.png</texturefocus>
-					<onleft>10</onleft>
-					<onright>14</onright>
-					<onup>13</onup>
-					<ondown>11</ondown>
+					<font>font12_title</font>
+					<align>center</align>
+					<onleft>13</onleft>
+					<onright>11</onright>
+					<onup>14</onup>
+					<ondown>14</ondown>
 				</control>
 				<control type="button" id="11">
 					<description>Cancel button</description>
-					<posx>0</posx>
-					<posy>40</posy>
-					<width>240</width>
-					<height>41</height>
+					<posx>210</posx>
+					<posy>0</posy>
+					<width>200</width>
+					<height>40</height>
 					<label>222</label>
-					<font>font13_title</font>
-					<align>right</align>
-					<texturenofocus>MenuItemNF.png</texturenofocus>
-					<texturefocus>MenuItemFO.png</texturefocus>
-					<onleft>11</onleft>
-					<onright>14</onright>
-					<onup>10</onup>
-					<ondown>12</ondown>
+					<font>font12_title</font>
+					<align>center</align>
+					<onleft>10</onleft>
+					<onright>12</onright>
+					<onup>14</onup>
+					<ondown>14</ondown>
 				</control>
 				<control type="button" id="12">
 					<description>Album Info button</description>
-					<posx>0</posx>
-					<posy>80</posy>
-					<width>240</width>
-					<height>41</height>
+					<posx>420</posx>
+					<posy>0</posy>
+					<width>200</width>
+					<height>40</height>
 					<label>10523</label>
-					<font>font13_title</font>
-					<align>right</align>
-					<texturenofocus>MenuItemNF.png</texturenofocus>
-					<texturefocus>MenuItemFO.png</texturefocus>
-					<onleft>12</onleft>
-					<onright>14</onright>
-					<onup>11</onup>
-					<ondown>13</ondown>
+					<font>font12_title</font>
+					<align>center</align>
+					<onleft>11</onleft>
+					<onright>13</onright>
+					<onup>14</onup>
+					<ondown>14</ondown>
 				</control>
 				<control type="button" id ="13">
 					<description>Get Thumb button</description>
-					<posx>0</posx>
-					<posy>120</posy>
-					<width>240</width>
-					<height>41</height>
+					<posx>630</posx>
+					<posy>0</posy>
+					<width>200</width>
+					<height>40</height>
 					<label>13405</label>
-					<font>font13_title</font>
-					<align>right</align>
-					<texturenofocus>MenuItemNF.png</texturenofocus>
-					<texturefocus>MenuItemFO.png</texturefocus>
-					<onleft>13</onleft>
-					<onright>14</onright>
-					<onup>12</onup>
-					<ondown>10</ondown>
+					<font>font12_title</font>
+					<align>center</align>
+					<onleft>12</onleft>
+					<onright>10</onright>
+					<onup>14</onup>
+					<ondown>14</ondown>
 				</control>
 			</control>
 		</control>
diff --git a/addons/skin.confluence/720p/DialogTextViewer.xml b/addons/skin.confluence/720p/DialogTextViewer.xml
index d3f8c86e7d..b591ba03dd 100644
--- a/addons/skin.confluence/720p/DialogTextViewer.xml
+++ b/addons/skin.confluence/720p/DialogTextViewer.xml
@@ -34,13 +34,13 @@
 				<control type="label" id="1">
 					<description>header label</description>
 					<posx>210</posx>
-					<posy>50</posy>
+					<posy>40</posy>
 					<width>1030</width>
 					<height>30</height>
-					<font>font35_title</font>
+					<font>font13_title</font>
 					<align>center</align>
 					<aligny>center</aligny>
-					<textcolor>white</textcolor>
+					<textcolor>selected</textcolor>
 					<shadowcolor>black</shadowcolor>
 				</control>
 				<control type="textbox" id="5">
@@ -57,7 +57,7 @@
 					<pagecontrol>61</pagecontrol>
 				</control>
 				<control type="scrollbar" id="61">
-					<posx>1215</posx>
+					<posx>1220</posx>
 					<posy>90</posy>
 					<width>25</width>
 					<height>600</height>
diff --git a/addons/skin.confluence/720p/DialogYesNo.xml b/addons/skin.confluence/720p/DialogYesNo.xml
index 7e9545949e..fba0b8d172 100644
--- a/addons/skin.confluence/720p/DialogYesNo.xml
+++ b/addons/skin.confluence/720p/DialogYesNo.xml
@@ -2,35 +2,43 @@
 	<defaultcontrol always="true">10</defaultcontrol>
 	<coordinates>
 		<system>1</system>
-		<posx>340</posx>
-		<posy>235</posy>
+		<posx>335</posx>
+		<posy>230</posy>
 	</coordinates>
 	<include>dialogeffect</include>
 	<controls>
 		<control type="image">
 			<posx>0</posx>
 			<posy>0</posy>
-			<width>600</width>
-			<height>230</height>
-			<texture border="20">OverlayDialogBackground.png</texture>
+			<width>610</width>
+			<height>240</height>
+			<texture border="40">DialogBack.png</texture>
+		</control>
+		<control type="image">
+			<description>Dialog Header image</description>
+			<posx>40</posx>
+			<posy>16</posy>
+			<width>530</width>
+			<height>40</height>
+			<texture>dialogheader.png</texture>
 		</control>
 		<control type="label" id="1">
 			<description>header label</description>
-			<posx>20</posx>
-			<posy>18</posy>
-			<width>560</width>
+			<posx>40</posx>
+			<posy>20</posy>
+			<width>530</width>
 			<height>30</height>
 			<font>font13_title</font>
 			<label>$LOCALIZE[13406]</label>
-			<align>left</align>
+			<align>center</align>
 			<aligny>center</aligny>
-			<textcolor>white</textcolor>
+			<textcolor>selected</textcolor>
 			<shadowcolor>black</shadowcolor>
 		</control>
 		<control type="button">
 			<description>Close Window button</description>
-			<posx>510</posx>
-			<posy>5</posy>
+			<posx>520</posx>
+			<posy>15</posy>
 			<width>64</width>
 			<height>32</height>
 			<label>-</label>
@@ -38,17 +46,17 @@
 			<onclick>PreviousMenu</onclick>
 			<texturefocus>DialogCloseButton-focus.png</texturefocus>
 			<texturenofocus>DialogCloseButton.png</texturenofocus>
-			<onleft>3</onleft>
-			<onright>3</onright>
-			<onup>3</onup>
-			<ondown>3</ondown>
+			<onleft>10</onleft>
+			<onright>10</onright>
+			<onup>10</onup>
+			<ondown>10</ondown>
 			<visible>system.getbool(input.enablemouse)</visible>
 		</control>
 		<control type="label" id="2">
 			<description>dialog line 1</description>
-			<posx>20</posx>
+			<posx>30</posx>
 			<posy>60</posy>
-			<width>560</width>
+			<width>550</width>
 			<height>30</height>
 			<align>left</align>
 			<aligny>center</aligny>
@@ -57,9 +65,9 @@
 		</control>
 		<control type="label" id="3">
 			<description>dialog line 2</description>
-			<posx>20</posx>
+			<posx>30</posx>
 			<posy>85</posy>
-			<width>560</width>
+			<width>550</width>
 			<height>30</height>
 			<align>left</align>
 			<aligny>center</aligny>
@@ -68,9 +76,9 @@
 		</control>
 		<control type="label" id="4">
 			<description>dialog line 3</description>
-			<posx>20</posx>
+			<posx>30</posx>
 			<posy>110</posy>
-			<width>560</width>
+			<width>550</width>
 			<height>30</height>
 			<align>left</align>
 			<aligny>center</aligny>
@@ -79,8 +87,8 @@
 		</control>
 		<control type="button" id="11">
 			<description>Yes button</description>
-			<posx>75</posx>
-			<posy>170</posy>
+			<posx>95</posx>
+			<posy>175</posy>
 			<width>200</width>
 			<height>40</height>
 			<label>107</label>
@@ -88,8 +96,6 @@
 			<textcolor>white</textcolor>
 			<focusedcolor>white</focusedcolor>
 			<align>center</align>
-			<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-			<texturefocus border="5">button-focus.png</texturefocus>
 			<onleft>10</onleft>
 			<onright>10</onright>
 			<onup>11</onup>
@@ -97,8 +103,8 @@
 		</control>
 		<control type="button" id="10">
 			<description>No button</description>
-			<posx>325</posx>
-			<posy>170</posy>
+			<posx>305</posx>
+			<posy>175</posy>
 			<width>200</width>
 			<height>40</height>
 			<label>106</label>
@@ -106,8 +112,6 @@
 			<textcolor>white</textcolor>
 			<focusedcolor>white</focusedcolor>
 			<align>center</align>
-			<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-			<texturefocus border="5">button-focus.png</texturefocus>
 			<onleft>11</onleft>
 			<onright>11</onright>
 			<onup>10</onup>
diff --git a/addons/skin.confluence/720p/FileBrowser.xml b/addons/skin.confluence/720p/FileBrowser.xml
index cce7b08f62..e658b6da09 100644
--- a/addons/skin.confluence/720p/FileBrowser.xml
+++ b/addons/skin.confluence/720p/FileBrowser.xml
@@ -46,11 +46,11 @@
 					<posy>40</posy>
 					<width>630</width>
 					<height>30</height>
-					<font>font30_title</font>
+					<font>font13_title</font>
 					<label>1023</label>
 					<align>right</align>
 					<aligny>center</aligny>
-					<textcolor>white</textcolor>
+					<textcolor>selected</textcolor>
 					<shadowcolor>black</shadowcolor>
 				</control>
 				<control type="label" id="412">
@@ -59,7 +59,7 @@
 					<posy>70</posy>
 					<width>630</width>
 					<height>30</height>
-					<font>font13caps</font>
+					<font>font13</font>
 					<haspath>true</haspath>
 					<align>right</align>
 					<aligny>center</aligny>
@@ -71,7 +71,7 @@
 					<posy>460</posy>
 					<width>221</width>
 					<height>225</height>
-					<itemgap>-1</itemgap>
+					<itemgap>5</itemgap>
 					<orientation>vertical</orientation>
 					<onleft>450</onleft>
 					<onright>450</onright>
@@ -79,33 +79,29 @@
 					<ondown>9000</ondown>
 					<control type="button" id="413">
 						<description>OK button</description>
-						<height>52</height>
+						<height>48</height>
 						<align>center</align>
-						<texturenofocus border="5">MenuItemNF.png</texturenofocus>
 						<include>ButtonMediaSubCommonValues</include>
 						<label>186</label>
 					</control>
 					<control type="button" id="414">
 						<description>Cancel button</description>
-						<height>52</height>
+						<height>48</height>
 						<align>center</align>
-						<texturenofocus border="5">MenuItemNF.png</texturenofocus>
 						<include>ButtonMediaSubCommonValues</include>
 						<label>222</label>
 					</control>
 					<control type="button" id="415">
 						<description>Create folder button</description>
-						<height>52</height>
+						<height>48</height>
 						<align>center</align>
-						<texturenofocus border="5">MenuItemNF.png</texturenofocus>
 						<include>ButtonMediaSubCommonValues</include>
 						<label>119</label>
 					</control>
 					<control type="radiobutton" id="416">
 						<description>Flip Image button</description>
-						<height>52</height>
+						<height>48</height>
 						<align>center</align>
-						<texturenofocus border="5">MenuItemNF.png</texturenofocus>
 						<include>ButtonMediaSubCommonValues</include>
 						<label>749</label>
 					</control>
diff --git a/addons/skin.confluence/720p/LockSettings.xml b/addons/skin.confluence/720p/LockSettings.xml
index 2e1ba29b24..e934ec15d5 100644
--- a/addons/skin.confluence/720p/LockSettings.xml
+++ b/addons/skin.confluence/720p/LockSettings.xml
@@ -16,17 +16,30 @@
 			<texture border="40">DialogBack.png</texture>
 		</control>
 		<control type="image">
-			<posx>80</posx>
-			<posy>10</posy>
-			<width>450</width>
-			<height>90</height>
-			<aspectratio>stretch</aspectratio>
-			<texture>GlassTitleBar.png</texture>
+			<description>Dialog Header image</description>
+			<posx>40</posx>
+			<posy>16</posy>
+			<width>620</width>
+			<height>40</height>
+			<texture>dialogheader.png</texture>
+		</control>
+		<control type="label">
+			<description>header label</description>
+			<posx>40</posx>
+			<posy>20</posy>
+			<width>620</width>
+			<height>30</height>
+			<font>font13_title</font>
+			<label>$LOCALIZE[20043]</label>
+			<align>center</align>
+			<aligny>center</aligny>
+			<textcolor>selected</textcolor>
+			<shadowcolor>black</shadowcolor>
 		</control>
 		<control type="button">
 			<description>Close Window button</description>
 			<posx>610</posx>
-			<posy>9</posy>
+			<posy>15</posy>
 			<width>64</width>
 			<height>32</height>
 			<label>-</label>
@@ -40,26 +53,13 @@
 			<ondown>5</ondown>
 			<visible>system.getbool(input.enablemouse)</visible>
 		</control>
-		<control type="label">
-			<description>header label</description>
-			<posx>20</posx>
-			<posy>18</posy>
-			<width>660</width>
-			<height>30</height>
-			<font>font13_title</font>
-			<label>$LOCALIZE[20043]</label>
-			<align>center</align>
-			<aligny>center</aligny>
-			<textcolor>white</textcolor>
-			<shadowcolor>black</shadowcolor>
-		</control>
 		<control type="grouplist" id="5">
 			<description>control area</description>
-			<posx>20</posx>
-			<posy>80</posy>
-			<width>660</width>
-			<height>400</height>
-			<itemgap>-1</itemgap>
+			<posx>30</posx>
+			<posy>70</posy>
+			<width>640</width>
+			<height>410</height>
+			<itemgap>5</itemgap>
 			<pagecontrol>60</pagecontrol>
 			<onleft>28</onleft>
 			<onright>60</onright>
@@ -74,8 +74,7 @@
 			<font>font13</font>
 			<textcolor>grey2</textcolor>
 			<focusedcolor>white</focusedcolor>
-			<texturefocus>MenuItemFO.png</texturefocus>
-			<texturenofocus>MenuItemNF.png</texturenofocus>
+			<texturefocus border="5">button-focus2.png</texturefocus>
 		</control>
 		<control type="radiobutton" id="8">
 			<description>Default RadioButton</description>
@@ -85,8 +84,7 @@
 			<font>font13</font>
 			<textcolor>grey2</textcolor>
 			<focusedcolor>white</focusedcolor>
-			<texturefocus>MenuItemFO.png</texturefocus>
-			<texturenofocus>MenuItemNF.png</texturenofocus>
+			<texturefocus border="5">button-focus2.png</texturefocus>
 		</control>
 		<control type="spincontrolex" id="9">
 			<description>Default SpinControlex</description>
@@ -96,8 +94,8 @@
 			<font>font13</font>
 			<textcolor>grey2</textcolor>
 			<focusedcolor>white</focusedcolor>
-			<texturefocus>MenuItemFO.png</texturefocus>
-			<texturenofocus>MenuItemNF.png</texturenofocus>
+			<texturefocus border="5">button-focus2.png</texturefocus>
+			<texturenofocus border="5">button-nofocus.png</texturenofocus>
 			<aligny>center</aligny>
 			<reverse>yes</reverse>
 		</control>
@@ -109,13 +107,11 @@
 		<control type="button" id="28">
 			<description>Ok Button</description>
 			<posx>145</posx>
-			<posy>500</posy>
+			<posy>505</posy>
 			<width>200</width>
 			<height>40</height>
 			<align>center</align>
 			<aligny>center</aligny>
-			<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-			<texturefocus border="5">button-focus.png</texturefocus>
 			<font>font12_title</font>
 			<label>186</label>
 			<onleft>29</onleft>
@@ -126,13 +122,11 @@
 		<control type="button" id="29">
 			<description>Cancel Button</description>
 			<posx>355</posx>
-			<posy>500</posy>
+			<posy>505</posy>
 			<width>200</width>
 			<height>40</height>
 			<align>center</align>
 			<aligny>center</aligny>
-			<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-			<texturefocus border="5">button-focus.png</texturefocus>
 			<font>font12_title</font>
 			<label>222</label>
 			<onleft>28</onleft>
diff --git a/addons/skin.confluence/720p/ProfileSettings.xml b/addons/skin.confluence/720p/ProfileSettings.xml
index f6db126ce7..8d86e40126 100644
--- a/addons/skin.confluence/720p/ProfileSettings.xml
+++ b/addons/skin.confluence/720p/ProfileSettings.xml
@@ -16,17 +16,30 @@
 			<texture border="40">DialogBack.png</texture>
 		</control>
 		<control type="image">
-			<posx>80</posx>
-			<posy>10</posy>
-			<width>450</width>
-			<height>90</height>
-			<aspectratio>stretch</aspectratio>
-			<texture>GlassTitleBar.png</texture>
+			<description>Dialog Header image</description>
+			<posx>40</posx>
+			<posy>16</posy>
+			<width>620</width>
+			<height>40</height>
+			<texture>dialogheader.png</texture>
+		</control>
+		<control type="label">
+			<description>header label</description>
+			<posx>40</posx>
+			<posy>20</posy>
+			<width>620</width>
+			<height>30</height>
+			<font>font13_title</font>
+			<label>$INFO[Window.Property(heading)]</label>
+			<align>center</align>
+			<aligny>center</aligny>
+			<textcolor>selected</textcolor>
+			<shadowcolor>black</shadowcolor>
 		</control>
 		<control type="button">
 			<description>Close Window button</description>
 			<posx>610</posx>
-			<posy>9</posy>
+			<posy>15</posy>
 			<width>64</width>
 			<height>32</height>
 			<label>-</label>
@@ -40,30 +53,17 @@
 			<ondown>1</ondown>
 			<visible>system.getbool(input.enablemouse)</visible>
 		</control>
-		<control type="label">
-			<description>header label</description>
-			<posx>20</posx>
-			<posy>18</posy>
-			<width>660</width>
-			<height>30</height>
-			<font>font13_title</font>
-			<label>$INFO[Window.Property(heading)]</label>
-			<align>center</align>
-			<aligny>center</aligny>
-			<textcolor>white</textcolor>
-			<shadowcolor>black</shadowcolor>
-		</control>
 		<control type="image" id="2">
 			<description>profile image</description>
-			<posx>20</posx>
+			<posx>30</posx>
 			<posy>70</posy>
 			<width>150</width>
 			<height>150</height>
 			<align>left</align>
 			<aspectratio>stretch</aspectratio>
 			<texture>unknown-user.png</texture>
-			<bordertexture border="12">ThumbBorder.png</bordertexture>
-			<bordersize>10</bordersize>
+			<bordertexture border="8">ThumbBorder.png</bordertexture>
+			<bordersize>8</bordersize>
 		</control>
 		<control type="label">
 			<description>profile name label</description>
@@ -105,11 +105,11 @@
 		</control>
 		<control type="grouplist" id="5">
 			<description>control area</description>
-			<posx>20</posx>
-			<posy>240</posy>
-			<width>660</width>
-			<height>240</height>
-			<itemgap>-1</itemgap>
+			<posx>30</posx>
+			<posy>230</posy>
+			<width>640</width>
+			<height>265</height>
+			<itemgap>5</itemgap>
 			<pagecontrol>60</pagecontrol>
 			<onleft>28</onleft>
 			<onright>60</onright>
@@ -124,8 +124,7 @@
 			<font>font13</font>
 			<textcolor>grey2</textcolor>
 			<focusedcolor>white</focusedcolor>
-			<texturefocus>MenuItemFO.png</texturefocus>
-			<texturenofocus>MenuItemNF.png</texturenofocus>
+			<texturefocus border="5">button-focus2.png</texturefocus>
 		</control>
 		<control type="radiobutton" id="8">
 			<description>Default RadioButton</description>
@@ -135,8 +134,7 @@
 			<font>font13</font>
 			<textcolor>grey2</textcolor>
 			<focusedcolor>white</focusedcolor>
-			<texturefocus>MenuItemFO.png</texturefocus>
-			<texturenofocus>MenuItemNF.png</texturenofocus>
+			<texturefocus border="5">button-focus2.png</texturefocus>
 		</control>
 		<control type="spincontrolex" id="9">
 			<description>Default SpinControlex</description>
@@ -146,8 +144,8 @@
 			<font>font13</font>
 			<textcolor>grey2</textcolor>
 			<focusedcolor>white</focusedcolor>
-			<texturefocus>MenuItemFO.png</texturefocus>
-			<texturenofocus>MenuItemNF.png</texturenofocus>
+			<texturefocus border="5">button-focus2.png</texturefocus>
+			<texturenofocus border="5">button-nofocus.png</texturenofocus>
 			<aligny>center</aligny>
 			<reverse>yes</reverse>
 		</control>
@@ -159,13 +157,11 @@
 		<control type="button" id="28">
 			<description>Ok Button</description>
 			<posx>145</posx>
-			<posy>500</posy>
+			<posy>505</posy>
 			<width>200</width>
 			<height>40</height>
 			<align>center</align>
 			<aligny>center</aligny>
-			<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-			<texturefocus border="5">button-focus.png</texturefocus>
 			<font>font12_title</font>
 			<label>186</label>
 			<onleft>29</onleft>
@@ -176,13 +172,11 @@
 		<control type="button" id="29">
 			<description>Cancel Button</description>
 			<posx>355</posx>
-			<posy>500</posy>
+			<posy>505</posy>
 			<width>200</width>
 			<height>40</height>
 			<align>center</align>
 			<aligny>center</aligny>
-			<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-			<texturefocus border="5">button-focus.png</texturefocus>
 			<font>font12_title</font>
 			<label>222</label>
 			<onleft>28</onleft>
diff --git a/addons/skin.confluence/720p/SmartPlaylistEditor.xml b/addons/skin.confluence/720p/SmartPlaylistEditor.xml
index ccc7a2c5e6..eab8f62682 100644
--- a/addons/skin.confluence/720p/SmartPlaylistEditor.xml
+++ b/addons/skin.confluence/720p/SmartPlaylistEditor.xml
@@ -20,12 +20,25 @@
 				<texture border="40">DialogBack.png</texture>
 			</control>
 			<control type="image">
-				<posx>80</posx>
-				<posy>10</posy>
-				<width>640</width>
-				<height>90</height>
-				<aspectratio>stretch</aspectratio>
-				<texture>GlassTitleBar.png</texture>
+				<description>Dialog Header image</description>
+				<posx>40</posx>
+				<posy>16</posy>
+				<width>720</width>
+				<height>40</height>
+				<texture>dialogheader.png</texture>
+			</control>
+			<control type="label" id="2">
+				<description>header label</description>
+				<posx>40</posx>
+				<posy>20</posy>
+				<width>720</width>
+				<height>30</height>
+				<font>font13_title</font>
+				<label>$LOCALIZE[21432]</label>
+				<align>center</align>
+				<aligny>center</aligny>
+				<textcolor>selected</textcolor>
+				<shadowcolor>black</shadowcolor>
 			</control>
 			<control type="button">
 				<description>Close Window button</description>
@@ -44,29 +57,16 @@
 				<ondown>22</ondown>
 				<visible>system.getbool(input.enablemouse)</visible>
 			</control>
-			<control type="label" id="2">
-				<description>header label</description>
-				<posx>20</posx>
-				<posy>18</posy>
-				<width>760</width>
-				<height>30</height>
-				<font>font13_title</font>
-				<label>$LOCALIZE[21432]</label>
-				<align>center</align>
-				<aligny>center</aligny>
-				<textcolor>white</textcolor>
-				<shadowcolor>black</shadowcolor>
-			</control>
 			<control type="spincontrolex" id="22">
 				<description>Set Playlist type</description>
-				<posx>20</posx>
+				<posx>30</posx>
 				<posy>70</posy>
-				<width>760</width>
+				<width>740</width>
 				<height>40</height>
 				<label>467</label>
 				<font>font13</font>
-				<texturefocus>MenuItemFO.png</texturefocus>
-				<texturenofocus>MenuItemNF.png</texturenofocus>
+				<texturefocus border="5">button-focus2.png</texturefocus>
+				<texturenofocus border="5">button-nofocus.png</texturenofocus>
 				<onright>22</onright>
 				<onleft>22</onleft>
 				<onup>9001</onup>
@@ -75,25 +75,24 @@
 			<control type="label">
 				<description>Name Label</description>
 				<posx>30</posx>
-				<posy>125</posy>
+				<posy>120</posy>
 				<width>740</width>
 				<label>21433</label>
-				<font>font12caps</font>
+				<font>font12</font>
 				<textcolor>blue</textcolor>
 				<shadowcolor>black</shadowcolor>
 			</control>
 			<control type="edit" id="12">
 				<description>Name Button</description>
-				<posx>20</posx>
-				<posy>155</posy>
-				<width>760</width>
+				<posx>30</posx>
+				<posy>145</posy>
+				<width>740</width>
 				<height>40</height>
 				<textoffsetx>10</textoffsetx>
 				<textwidth>750</textwidth>
 				<font>font13</font>
 				<align>center</align>
-				<texturefocus>MenuItemFO.png</texturefocus>
-				<texturenofocus>MenuItemNF.png</texturenofocus>
+				<texturefocus border="5">button-focus2.png</texturefocus>
 				<label>-</label>
 				<onup>22</onup>
 				<onleft>12</onleft>
@@ -103,36 +102,36 @@
 			<control type="label">
 				<description>rules label</description>
 				<posx>30</posx>
-				<posy>210</posy>
+				<posy>200</posy>
 				<width>740</width>
 				<align>left</align>
 				<label>21434</label>
-				<font>font12caps</font>
+				<font>font12</font>
 				<textcolor>blue</textcolor>
 				<shadowcolor>black</shadowcolor>
 			</control>
 			<control type="list" id="10">
 				<description>Rules List Control</description>
-				<posx>20</posx>
-				<posy>245</posy>
-				<width>560</width>
-				<height>121</height>
+				<posx>30</posx>
+				<posy>225</posy>
+				<width>550</width>
+				<height>135</height>
 				<onup>12</onup>
 				<onleft>9000</onleft>
 				<onright>9000</onright>
 				<ondown>16</ondown>
-				<itemlayout width="560" height="40">
+				<itemlayout width="560" height="45">
 					<control type="image">
 						<posx>0</posx>
 						<posy>0</posy>
-						<width>560</width>
-						<height>41</height>
-						<texture>MenuItemNF.png</texture>
+						<width>550</width>
+						<height>40</height>
+						<texture border="5">button-nofocus.png</texture>
 					</control>
 					<control type="label">
 						<posx>10</posx>
 						<posy>0</posy>
-						<width>545</width>
+						<width>530</width>
 						<height>40</height>
 						<aligny>center</aligny>
 						<info>ListItem.Label</info>
@@ -140,27 +139,27 @@
 						<font>font13</font>
 					</control>
 				</itemlayout>
-				<focusedlayout width="560" height="40">
+				<focusedlayout width="560" height="45">
 					<control type="image">
 						<posx>0</posx>
 						<posy>0</posy>
-						<width>560</width>
-						<height>41</height>
-						<texture>MenuItemFO.png</texture>
+						<width>550</width>
+						<height>40</height>
+						<texture border="5">button-focus2.png</texture>
 						<visible>Control.HasFocus(10)</visible>
 					</control>
 					<control type="image">
 						<posx>0</posx>
 						<posy>0</posy>
-						<width>560</width>
-						<height>41</height>
-						<texture>MenuItemNF.png</texture>
+						<width>550</width>
+						<height>40</height>
+						<texture border="5">button-nofocus.png</texture>
 						<visible>!Control.HasFocus(10)</visible>
 					</control>
 					<control type="label">
 						<posx>10</posx>
 						<posy>0</posy>
-						<width>540</width>
+						<width>530</width>
 						<height>40</height>
 						<aligny>center</aligny>
 						<info>ListItem.Label</info>
@@ -170,18 +169,18 @@
 				</focusedlayout>
 			</control>
 			<control type="group" id="9000">
+				<posx>590</posx>
+				<posy>225</posy>
 				<control type="button" id="13">
 					<description>Add Rule Button</description>
-					<posx>600</posx>
-					<posy>245</posy>
+					<posx>0</posx>
+					<posy>0</posy>
 					<width>180</width>
-					<height>41</height>
+					<height>40</height>
 					<label>15019</label>
 					<font>font12_title</font>
 					<align>center</align>
 					<aligny>center</aligny>
-					<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-					<texturefocus border="5">button-focus.png</texturefocus>
 					<onup>17</onup>
 					<onleft>10</onleft>
 					<onright>10</onright>
@@ -189,16 +188,14 @@
 				</control>
 				<control type="button" id="14">
 					<description>Remove Rule Button</description>
-					<posx>600</posx>
-					<posy>285</posy>
-					<height>41</height>
+					<posx>0</posx>
+					<posy>45</posy>
+					<height>40</height>
 					<width>180</width>
 					<label>1210</label>
 					<font>font12_title</font>
 					<align>center</align>
 					<aligny>center</aligny>
-					<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-					<texturefocus border="5">button-focus.png</texturefocus>
 					<onup>13</onup>
 					<onleft>10</onleft>
 					<onright>10</onright>
@@ -206,16 +203,14 @@
 				</control>
 				<control type="button" id="15">
 					<description>Edit Rule Button</description>
-					<posx>600</posx>
-					<posy>325</posy>
-					<height>41</height>
+					<posx>0</posx>
+					<posy>90</posy>
+					<height>40</height>
 					<width>180</width>
 					<label>21435</label>
 					<font>font12_title</font>
 					<align>center</align>
 					<aligny>center</aligny>
-					<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-					<texturefocus border="5">button-focus.png</texturefocus>
 					<onup>14</onup>
 					<onleft>10</onleft>
 					<onright>10</onright>
@@ -226,22 +221,22 @@
 			<control type="label">
 				<description>Name Label</description>
 				<posx>30</posx>
-				<posy>380</posy>
+				<posy>370</posy>
 				<width>740</width>
 				<label>31325</label>
-				<font>font12caps</font>
+				<font>font12</font>
 				<textcolor>blue</textcolor>
 				<shadowcolor>black</shadowcolor>
 			</control>
 			<control type="spincontrolex" id="16">
-				<posx>20</posx>
-				<posy>415</posy>
-				<width>760</width>
-				<height>41</height>
+				<posx>30</posx>
+				<posy>395</posy>
+				<width>740</width>
+				<height>40</height>
 				<label>21424</label>
 				<font>font13</font>
-				<texturefocus>MenuItemFO.png</texturefocus>
-				<texturenofocus>MenuItemNF.png</texturenofocus>
+				<texturefocus border="5">button-focus2.png</texturefocus>
+				<texturenofocus border="5">button-nofocus.png</texturenofocus>
 				<onright>16</onright>
 				<onleft>16</onleft>
 				<onup>10</onup>
@@ -249,14 +244,14 @@
 			</control>
 
 			<control type="spincontrolex" id="17">
-				<posx>20</posx>
-				<posy>455</posy>
-				<width>760</width>
-				<height>41</height>
+				<posx>30</posx>
+				<posy>440</posy>
+				<width>740</width>
+				<height>40</height>
 				<label>21427</label>
 				<font>font13</font>
-				<texturefocus>MenuItemFO.png</texturefocus>
-				<texturenofocus>MenuItemNF.png</texturenofocus>
+				<texturefocus border="5">button-focus2.png</texturefocus>
+				<texturenofocus border="5">button-nofocus.png</texturenofocus>
 				<onright>17</onright>
 				<onleft>17</onleft>
 				<onup>16</onup>
@@ -264,14 +259,14 @@
 			</control>
 
 			<control type="spincontrolex" id="18">
-				<posx>20</posx>
-				<posy>495</posy>
-				<width>560</width>
-				<height>41</height>
+				<posx>30</posx>
+				<posy>485</posy>
+				<width>550</width>
+				<height>40</height>
 				<label>21429</label>
 				<font>font13</font>
-				<texturefocus>MenuItemFO.png</texturefocus>
-				<texturenofocus>MenuItemNF.png</texturenofocus>
+				<texturefocus border="5">button-focus2.png</texturefocus>
+				<texturenofocus border="5">button-nofocus.png</texturenofocus>
 				<onright>19</onright>
 				<onleft>19</onleft>
 				<onup>17</onup>
@@ -279,16 +274,16 @@
 			</control>
 
 			<control type="togglebutton" id="19">
-				<posx>600</posx>
-				<posy>495</posy>
+				<posx>590</posx>
+				<posy>485</posy>
 				<width>180</width>
 				<height>40</height>
 				<font>font12_title</font>
 				<align>center</align>
 				<aligny>center</aligny>
-				<texturenofocus border="5">MenuItemNF.png</texturenofocus>
+				<texturenofocus border="5">button-nofocus.png</texturenofocus>
 				<texturefocus border="5">button-focus.png</texturefocus>
-				<alttexturenofocus border="5">MenuItemNF.png</alttexturenofocus>
+				<alttexturenofocus border="5">button-nofocus.png</alttexturenofocus>
 				<alttexturefocus border="5">button-focus.png</alttexturefocus>
 				<label>21431</label>
 				<altlabel>21430</altlabel>
@@ -306,8 +301,6 @@
 					<height>40</height>
 					<align>center</align>
 					<aligny>center</aligny>
-					<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-					<texturefocus border="5">button-focus.png</texturefocus>
 					<label>186</label>
 					<font>font12_title</font>
 					<onup>18</onup>
@@ -323,8 +316,6 @@
 					<height>40</height>
 					<align>center</align>
 					<aligny>center</aligny>
-					<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-					<texturefocus border="5">button-focus.png</texturefocus>
 					<label>222</label>
 					<font>font12_title</font>
 					<onup>18</onup>
diff --git a/addons/skin.confluence/720p/SmartPlaylistRule.xml b/addons/skin.confluence/720p/SmartPlaylistRule.xml
index e2b8fdde6f..fbe4efa5d6 100644
--- a/addons/skin.confluence/720p/SmartPlaylistRule.xml
+++ b/addons/skin.confluence/720p/SmartPlaylistRule.xml
@@ -17,17 +17,30 @@
 			<texture border="40">DialogBack.png</texture>
 		</control>
 		<control type="image">
-			<posx>80</posx>
-			<posy>10</posy>
-			<width>640</width>
-			<height>90</height>
-			<aspectratio>stretch</aspectratio>
-			<texture>GlassTitleBar.png</texture>
+			<description>Dialog Header image</description>
+			<posx>40</posx>
+			<posy>16</posy>
+			<width>720</width>
+			<height>40</height>
+			<texture>dialogheader.png</texture>
+		</control>
+		<control type="label">
+			<description>header label</description>
+			<posx>40</posx>
+			<posy>20</posy>
+			<width>720</width>
+			<height>30</height>
+			<font>font13_title</font>
+			<label>$LOCALIZE[21421]</label>
+			<align>center</align>
+			<aligny>center</aligny>
+			<textcolor>selected</textcolor>
+			<shadowcolor>black</shadowcolor>
 		</control>
 		<control type="button">
 			<description>Close Window button</description>
 			<posx>710</posx>
-			<posy>9</posy>
+			<posy>15</posy>
 			<width>64</width>
 			<height>32</height>
 			<label>-</label>
@@ -42,19 +55,6 @@
 			<visible>system.getbool(input.enablemouse)</visible>
 		</control>
 		<control type="label">
-			<description>header label</description>
-			<posx>20</posx>
-			<posy>18</posy>
-			<width>760</width>
-			<height>30</height>
-			<font>font13_title</font>
-			<label>$LOCALIZE[21421]</label>
-			<align>center</align>
-			<aligny>center</aligny>
-			<textcolor>white</textcolor>
-			<shadowcolor>black</shadowcolor>
-		</control>
-		<control type="label">
 			<description>Rule match label</description>
 			<posx>40</posx>
 			<posy>60</posy>
@@ -62,7 +62,7 @@
 			<height>35</height>
 			<align>center</align>
 			<aligny>center</aligny>
-			<font>font12caps</font>
+			<font>font12</font>
 			<textcolor>blue</textcolor>
 			<shadowcolor>black</shadowcolor>
 			<label>21422</label>
@@ -70,12 +70,12 @@
 		<control type="group" id="9001">
 			<control type="spincontrolex" id="15">
 				<description>Rule Field</description>
-				<posx>20</posx>
+				<posx>30</posx>
 				<posy>100</posy>
-				<width>375</width>
+				<width>365</width>
 				<height>40</height>
 				<font>-</font>
-				<texturefocus border="3">button-focus.png</texturefocus>
+				<texturefocus border="3">button-focus2.png</texturefocus>
 				<texturenofocus border="3">button-nofocus.png</texturenofocus>
 				<onright>16</onright>
 				<onleft>16</onleft>
@@ -84,7 +84,7 @@
 			</control>
 			<control type="label">
 				<description>Rule Field label</description>
-				<posx>25</posx>
+				<posx>35</posx>
 				<posy>100</posy>
 				<width>300</width>
 				<height>40</height>
@@ -99,10 +99,10 @@
 				<description>Rule operator</description>
 				<posx>405</posx>
 				<posy>100</posy>
-				<width>375</width>
+				<width>365</width>
 				<height>40</height>
 				<font>-</font>
-				<texturefocus border="3">button-focus.png</texturefocus>
+				<texturefocus border="3">button-focus2.png</texturefocus>
 				<texturenofocus border="3">button-nofocus.png</texturenofocus>
 				<onright>15</onright>
 				<onleft>15</onleft>
@@ -125,13 +125,13 @@
 		</control>
 		<control type="button" id="17">
 			<description>Value Button</description>
-			<posx>20</posx>
+			<posx>30</posx>
 			<posy>145</posy>
-			<width>585</width>
+			<width>565</width>
 			<height>40</height>
 			<font>font13</font>
 			<aligny>center</aligny>
-			<texturefocus border="3">button-focus.png</texturefocus>
+			<texturefocus border="3">button-focus2.png</texturefocus>
 			<texturenofocus border="3">button-nofocus.png</texturenofocus>
 			<label>-</label>
 			<onup>9001</onup>
@@ -141,7 +141,7 @@
 		</control>
 		<control type="button" id="20">
 			<description>Browse Button</description>
-			<posx>610</posx>
+			<posx>600</posx>
 			<posy>145</posy>
 			<width>170</width>
 			<height>40</height>
@@ -166,8 +166,6 @@
 				<align>center</align>
 				<aligny>center</aligny>
 				<font>font12_title</font>
-				<texturefocus border="3">button-focus.png</texturefocus>
-				<texturenofocus border="3">MenuItemNF.png</texturenofocus>
 				<label>186</label>
 				<onup>17</onup>
 				<onleft>19</onleft>
@@ -183,8 +181,6 @@
 				<align>center</align>
 				<aligny>center</aligny>
 				<font>font12_title</font>
-				<texturefocus border="3">button-focus.png</texturefocus>
-				<texturenofocus border="3">MenuItemNF.png</texturenofocus>
 				<label>222</label>
 				<onup>17</onup>
 				<onleft>18</onleft>
diff --git a/addons/skin.confluence/720p/VideoOSDBookmarks.xml b/addons/skin.confluence/720p/VideoOSDBookmarks.xml
index 6ecc257bf3..a213a1bf79 100644
--- a/addons/skin.confluence/720p/VideoOSDBookmarks.xml
+++ b/addons/skin.confluence/720p/VideoOSDBookmarks.xml
@@ -3,7 +3,7 @@
 	<coordinates>
 		<system>1</system>
 		<posx>240</posx>
-		<posy>115</posy>
+		<posy>60</posy>
 	</coordinates>
 	<include>dialogeffect</include>
 	<controls>
@@ -12,22 +12,34 @@
 			<posx>0</posx>
 			<posy>0</posy>
 			<width>800</width>
-			<height>490</height>
-			<colordiffuse>DDFFFFFF</colordiffuse>
-			<texture border="40">DialogBack.png</texture>
+			<height>600</height>
+			<texture border="40">DialogBack2.png</texture>
 		</control>
 		<control type="image">
-			<posx>80</posx>
-			<posy>10</posy>
-			<width>640</width>
-			<height>90</height>
-			<aspectratio>stretch</aspectratio>
-			<texture>GlassTitleBar.png</texture>
+			<description>Dialog Header image</description>
+			<posx>40</posx>
+			<posy>16</posy>
+			<width>720</width>
+			<height>40</height>
+			<texture>dialogheader.png</texture>
+		</control>
+		<control type="label">
+			<description>header label</description>
+			<posx>40</posx>
+			<posy>20</posy>
+			<width>720</width>
+			<height>30</height>
+			<font>font13_title</font>
+			<label>$LOCALIZE[298]</label>
+			<align>center</align>
+			<aligny>center</aligny>
+			<textcolor>selected</textcolor>
+			<shadowcolor>black</shadowcolor>
 		</control>
 		<control type="button">
 			<description>Close Window button</description>
 			<posx>710</posx>
-			<posy>9</posy>
+			<posy>15</posy>
 			<width>64</width>
 			<height>32</height>
 			<label>-</label>
@@ -35,30 +47,30 @@
 			<onclick>PreviousMenu</onclick>
 			<texturefocus>DialogCloseButton-focus.png</texturefocus>
 			<texturenofocus>DialogCloseButton.png</texturenofocus>
-			<onleft>2</onleft>
-			<onright>2</onright>
-			<onup>2</onup>
-			<ondown>2</ondown>
+			<onleft>3</onleft>
+			<onright>3</onright>
+			<onup>3</onup>
+			<ondown>3</ondown>
 			<visible>system.getbool(input.enablemouse)</visible>
 		</control>
 		<control type="label">
-			<description>header label</description>
-			<posx>20</posx>
-			<posy>18</posy>
-			<width>760</width>
-			<height>30</height>
-			<font>font13_title</font>
-			<label>[UPPERCASE]$LOCALIZE[298][/UPPERCASE] - ($INFO[Container(11).NumItems]) $LOCALIZE[31025] - $LOCALIZE[31024] ($INFO[Container(11).CurrentPage]/$INFO[Container(11).NumPages])</label>
-			<align>center</align>
+			<description>number of files/pages in list text label</description>
+			<posx>760</posx>
+			<posy>495</posy>
+			<width>300</width>
+			<height>35</height>
+			<font>font12</font>
+			<align>right</align>
 			<aligny>center</aligny>
-			<textcolor>white</textcolor>
-			<shadowcolor>black</shadowcolor>
+			<scroll>true</scroll>
+			<textcolor>grey</textcolor>
+			<label>([COLOR=blue]$INFO[Container(11).NumItems][/COLOR]) $LOCALIZE[31025] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(11).CurrentPage]/$INFO[Container(11).NumPages][/COLOR])</label>
 		</control>
 		<control type="panel" id="11">
 			<posx>40</posx>
 			<posy>65</posy>
 			<width>720</width>
-			<height>350</height>
+			<height>430</height>
 			<onleft>2</onleft>
 			<onright>3</onright>
 			<ondown>2</ondown>
@@ -66,25 +78,26 @@
 			<scrolltime>200</scrolltime>
 			<viewtype label="536">icon</viewtype>
 			<pagecontrol>-</pagecontrol>
-			<orientation>horizontal</orientation>
-			<itemlayout height="175" width="240">
+			<orientation>vertical</orientation>
+			<itemlayout height="215" width="240">
 				<control type="image">
 					<posx>2</posx>
 					<posy>2</posy>
 					<width>235</width>
-					<height>170</height>
+					<height>211</height>
 					<texture border="3">button-nofocus.png</texture>
 				</control>
 				<control type="image">
 					<posx>7</posx>
-					<posy>7</posy>
+					<posy>20</posy>
 					<width>220</width>
-					<height>140</height>
+					<height>150</height>
+					<aspectratio>scale</aspectratio>
 					<info>ListItem.Icon</info>
 				</control>
 				<control type="label">
 					<posx>112</posx>
-					<posy>150</posy>
+					<posy>185</posy>
 					<width>225</width>
 					<height>15</height>
 					<font>font12</font>
@@ -94,24 +107,25 @@
 					<info>ListItem.Label</info>
 				</control>
 			</itemlayout>
-			<focusedlayout height="175" width="240">
+			<focusedlayout height="215" width="240">
 				<control type="image">
 					<posx>2</posx>
 					<posy>2</posy>
 					<width>235</width>
-					<height>170</height>
+					<height>211</height>
 					<texture border="3">folder-focus.png</texture>
 				</control>
 				<control type="image">
 					<posx>7</posx>
-					<posy>7</posy>
+					<posy>20</posy>
 					<width>220</width>
-					<height>140</height>
+					<height>150</height>
+					<aspectratio>scale</aspectratio>
 					<info>ListItem.Icon</info>
 				</control>
 				<control type="label">
 					<posx>112</posx>
-					<posy>150</posy>
+					<posy>185</posy>
 					<width>225</width>
 					<height>15</height>
 					<font>font12</font>
@@ -124,10 +138,10 @@
 		</control>
 		<control type="grouplist" id="9000">
 			<posx>20</posx>
-			<posy>425</posy>
+			<posy>535</posy>
 			<width>760</width>
 			<height>40</height>
-			<itemgap>2</itemgap>
+			<itemgap>5</itemgap>
 			<align>center</align>
 			<orientation>horizontal</orientation>
 			<onleft>9000</onleft>
@@ -137,19 +151,19 @@
 			<control type="button" id="2">
 				<description>Create Bookmark button</description>
 				<label>294</label>
-				<width>250</width>
+				<width>240</width>
 				<include>ButtonInfoDialogsCommonValues</include>
 			</control>
 			<control type="button" id="3">
 				<description>Clear Bookmark button</description>
 				<label>296</label>
-				<width>250</width>
+				<width>240</width>
 				<include>ButtonInfoDialogsCommonValues</include>
 			</control>
 			<control type="button" id="4">
 				<description>Clear Bookmark button</description>
 				<label>20406</label>
-				<width>250</width>
+				<width>240</width>
 				<include>ButtonInfoDialogsCommonValues</include>
 				<visible>videoplayer.content(episodes)</visible>
 			</control>
diff --git a/addons/skin.confluence/720p/VideoOSDSettings.xml b/addons/skin.confluence/720p/VideoOSDSettings.xml
index c782b312f5..3a4edb9008 100644
--- a/addons/skin.confluence/720p/VideoOSDSettings.xml
+++ b/addons/skin.confluence/720p/VideoOSDSettings.xml
@@ -3,7 +3,7 @@
 	<coordinates>
 		<system>1</system>
 		<posx>240</posx>
-		<posy>115</posy>
+		<posy>60</posy>
 	</coordinates>
 	<include>dialogeffect</include>
 	<controls>
@@ -14,63 +14,62 @@
 				<posx>0</posx>
 				<posy>0</posy>
 				<width>800</width>
-				<height>490</height>
-				<colordiffuse>DDFFFFFF</colordiffuse>
-				<texture border="40">DialogBack.png</texture>
+				<height>600</height>
+				<texture border="40">DialogBack2.png</texture>
 			</control>
 			<control type="image">
-				<posx>80</posx>
-				<posy>10</posy>
-				<width>640</width>
-				<height>90</height>
-				<aspectratio>stretch</aspectratio>
-				<texture>GlassTitleBar.png</texture>
-			</control>
-			<control type="button">
-				<description>Close Window button</description>
-				<posx>710</posx>
-				<posy>9</posy>
-				<width>64</width>
-				<height>32</height>
-				<label>-</label>
-				<font>-</font>
-				<onclick>PreviousMenu</onclick>
-				<texturefocus>DialogCloseButton-focus.png</texturefocus>
-				<texturenofocus>DialogCloseButton.png</texturenofocus>
-				<onleft>2</onleft>
-				<onright>2</onright>
-				<onup>2</onup>
-				<ondown>2</ondown>
-				<visible>system.getbool(input.enablemouse)</visible>
+				<description>Dialog Header image</description>
+				<posx>40</posx>
+				<posy>16</posy>
+				<width>720</width>
+				<height>40</height>
+				<texture>dialogheader.png</texture>
 			</control>
 			<control type="label">
 				<description>header label</description>
-				<posx>20</posx>
-				<posy>18</posy>
-				<width>760</width>
+				<posx>40</posx>
+				<posy>20</posy>
+				<width>720</width>
 				<height>30</height>
 				<font>font13_title</font>
 				<label>$LOCALIZE[3] - $LOCALIZE[5]</label>
 				<align>center</align>
 				<aligny>center</aligny>
-				<textcolor>white</textcolor>
+				<textcolor>selected</textcolor>
 				<shadowcolor>black</shadowcolor>
 				<visible>Window.IsVisible(123)</visible>
 			</control>
 			<control type="label">
 				<description>header label</description>
-				<posx>20</posx>
-				<posy>18</posy>
-				<width>760</width>
+				<posx>40</posx>
+				<posy>20</posy>
+				<width>720</width>
 				<height>30</height>
 				<font>font13_title</font>
 				<label>$LOCALIZE[292] - $LOCALIZE[5]</label>
 				<align>center</align>
 				<aligny>center</aligny>
-				<textcolor>white</textcolor>
+				<textcolor>selected</textcolor>
 				<shadowcolor>black</shadowcolor>
 				<visible>Window.IsVisible(124)</visible>
 			</control>
+			<control type="button">
+				<description>Close Window button</description>
+				<posx>710</posx>
+				<posy>15</posy>
+				<width>64</width>
+				<height>32</height>
+				<label>-</label>
+				<font>-</font>
+				<onclick>PreviousMenu</onclick>
+				<texturefocus>DialogCloseButton-focus.png</texturefocus>
+				<texturenofocus>DialogCloseButton.png</texturenofocus>
+				<onleft>2</onleft>
+				<onright>2</onright>
+				<onup>2</onup>
+				<ondown>2</ondown>
+				<visible>system.getbool(input.enablemouse)</visible>
+			</control>
 			<control type="label" id="3">
 				<description>No Settings Label</description>
 				<posx>20</posx>
@@ -85,8 +84,8 @@
 				<posx>40</posx>
 				<posy>65</posy>
 				<width>720</width>
-				<height>395</height>
-				<itemgap>-1</itemgap>
+				<height>490</height>
+				<itemgap>5</itemgap>
 				<pagecontrol>60</pagecontrol>
 				<onleft>60</onleft>
 				<onright>60</onright>
@@ -97,7 +96,7 @@
 				<posx>760</posx>
 				<posy>65</posy>
 				<width>25</width>
-				<height>390</height>
+				<height>490</height>
 				<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
 				<texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
 				<texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
@@ -114,8 +113,8 @@
 		<control type="sliderex" id="10">
 			<description>Default Slider</description>
 			<height>40</height>
-			<texturefocus border="0,2,0,2">MenuItemFO.png</texturefocus>
-			<texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
+			<texturenofocus border="5">button-nofocus.png</texturenofocus>
+			<texturefocus border="5">button-focus2.png</texturefocus>
 			<font>font13</font>
 			<textcolor>grey2</textcolor>
 			<focusedcolor>white</focusedcolor>
@@ -128,8 +127,7 @@
 			<font>font13</font>
 			<textcolor>grey2</textcolor>
 			<focusedcolor>white</focusedcolor>
-			<texturefocus border="0,2,0,2">MenuItemFO.png</texturefocus>
-			<texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
+			<texturefocus border="5">button-focus2.png</texturefocus>
 		</control>
 		<control type="radiobutton" id="8">
 			<description>Default RadioButton</description>
@@ -139,8 +137,7 @@
 			<font>font13</font>
 			<textcolor>grey2</textcolor>
 			<focusedcolor>white</focusedcolor>
-			<texturefocus border="0,2,0,2">MenuItemFO.png</texturefocus>
-			<texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
+			<texturefocus border="5">button-focus2.png</texturefocus>
 		</control>
 		<control type="spincontrolex" id="9">
 			<description>Default SpinControlex</description>
@@ -150,8 +147,8 @@
 			<font>font13</font>
 			<textcolor>grey2</textcolor>
 			<focusedcolor>white</focusedcolor>
-			<texturefocus border="0,2,0,2">MenuItemFO.png</texturefocus>
-			<texturenofocus border="0,2,0,2">MenuItemNF.png</texturenofocus>
+			<texturenofocus border="5">button-nofocus.png</texturenofocus>
+			<texturefocus border="5">button-focus2.png</texturefocus>
 			<aligny>center</aligny>
 			<reverse>yes</reverse>
 		</control>
diff --git a/addons/skin.confluence/720p/VisualisationPresetList.xml b/addons/skin.confluence/720p/VisualisationPresetList.xml
index 07f0220ce7..04c1d5b6d3 100644
--- a/addons/skin.confluence/720p/VisualisationPresetList.xml
+++ b/addons/skin.confluence/720p/VisualisationPresetList.xml
@@ -3,7 +3,7 @@
 	<coordinates>
 		<system>1</system>
 		<posx>240</posx>
-		<posy>115</posy>
+		<posy>60</posy>
 	</coordinates>
 	<include>dialogeffect</include>
 	<controls>
@@ -13,22 +13,34 @@
 				<posx>0</posx>
 				<posy>0</posy>
 				<width>800</width>
-				<height>490</height>
-				<colordiffuse>DDFFFFFF</colordiffuse>
-				<texture border="40">DialogBack.png</texture>
+				<height>600</height>
+				<texture border="40">DialogBack2.png</texture>
 			</control>
 			<control type="image">
-				<posx>80</posx>
-				<posy>10</posy>
-				<width>640</width>
-				<height>90</height>
-				<aspectratio>stretch</aspectratio>
-				<texture>GlassTitleBar.png</texture>
+				<description>Dialog Header image</description>
+				<posx>40</posx>
+				<posy>16</posy>
+				<width>720</width>
+				<height>40</height>
+				<texture>dialogheader.png</texture>
+			</control>
+			<control type="label">
+				<description>header label</description>
+				<posx>40</posx>
+				<posy>20</posy>
+				<width>720</width>
+				<height>30</height>
+				<font>font13_title</font>
+				<label>$LOCALIZE[31048]</label>
+				<align>center</align>
+				<aligny>center</aligny>
+				<textcolor>selected</textcolor>
+				<shadowcolor>black</shadowcolor>
 			</control>
 			<control type="button">
 				<description>Close Window button</description>
 				<posx>710</posx>
-				<posy>9</posy>
+				<posy>15</posy>
 				<width>64</width>
 				<height>32</height>
 				<label>-</label>
@@ -42,19 +54,6 @@
 				<ondown>2</ondown>
 				<visible>system.getbool(input.enablemouse)</visible>
 			</control>
-			<control type="label">
-				<description>header label</description>
-				<posx>20</posx>
-				<posy>18</posy>
-				<width>760</width>
-				<height>30</height>
-				<font>font13_title</font>
-				<label>31048</label>
-				<align>center</align>
-				<aligny>center</aligny>
-				<textcolor>white</textcolor>
-				<shadowcolor>black</shadowcolor>
-			</control>
 			<control type="label" id="4">
 				<description>No Settings Label</description>
 				<posx>20</posx>
@@ -66,27 +65,27 @@
 			</control>
 			<control type="list" id="2">
 				<posx>40</posx>
-				<posy>65</posy>
+				<posy>60</posy>
 				<width>720</width>
-				<height>395</height>
+				<height>495</height>
 				<onleft>60</onleft>
 				<onright>60</onright>
 				<onup>2</onup>
 				<ondown>2</ondown>
 				<pagecontrol>60</pagecontrol>
 				<scrolltime>200</scrolltime>
-				<itemlayout height="40" width="720">
+				<itemlayout height="45" width="720">
 					<control type="image">
 						<posx>0</posx>
 						<posy>0</posy>
 						<width>720</width>
-						<height>41</height>
-						<texture border="0,2,0,2">MenuItemNF.png</texture>
+						<height>40</height>
+						<texture border="5">button-nofocus.png</texture>
 					</control>
 					<control type="label">
-						<posx>0</posx>
+						<posx>10</posx>
 						<posy>0</posy>
-						<width>720</width>
+						<width>700</width>
 						<height>40</height>
 						<font>font13</font>
 						<textcolor>grey2</textcolor>
@@ -96,13 +95,13 @@
 						<label>$INFO[ListItem.Label]</label>
 					</control>
 				</itemlayout>
-				<focusedlayout height="40" width="720">
+				<focusedlayout height="45" width="720">
 					<control type="image">
 						<posx>0</posx>
 						<posy>0</posy>
 						<width>720</width>
-						<height>41</height>
-						<texture border="0,2,0,2">MenuItemNF.png</texture>
+						<height>40</height>
+						<texture border="5">button-nofocus.png</texture>
 						<visible>!Control.HasFocus(2)</visible>
 						<include>VisibleFadeEffect</include>
 					</control>
@@ -110,15 +109,15 @@
 						<posx>0</posx>
 						<posy>0</posy>
 						<width>720</width>
-						<height>41</height>
-						<texture border="0,2,0,2">MenuItemFO.png</texture>
+						<height>40</height>
+						<texture border="5">button-focus2.png</texture>
 						<visible>Control.HasFocus(2)</visible>
 						<include>VisibleFadeEffect</include>
 					</control>
 					<control type="label">
-						<posx>0</posx>
+						<posx>10</posx>
 						<posy>0</posy>
-						<width>720</width>
+						<width>700</width>
 						<height>40</height>
 						<font>font13</font>
 						<textcolor>white</textcolor>
@@ -131,9 +130,9 @@
 			</control>
 			<control type="scrollbar" id="60">
 				<posx>760</posx>
-				<posy>65</posy>
+				<posy>60</posy>
 				<width>25</width>
-				<height>390</height>
+				<height>495</height>
 				<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
 				<texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
 				<texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
@@ -146,6 +145,19 @@
 				<showonepage>false</showonepage>
 				<orientation>vertical</orientation>
 			</control>
+			<control type="label">
+				<description>number of files/pages in list text label</description>
+				<posx>760</posx>
+				<posy>548</posy>
+				<width>300</width>
+				<height>35</height>
+				<font>font12</font>
+				<align>right</align>
+				<aligny>center</aligny>
+				<scroll>true</scroll>
+				<textcolor>grey</textcolor>
+				<label>([COLOR=blue]$INFO[Container(2).NumItems][/COLOR]) $LOCALIZE[31025] - $LOCALIZE[31024] ([COLOR=blue]$INFO[Container(2).CurrentPage]/$INFO[Container(2).NumPages][/COLOR])</label>
+			</control>
 		</control>
 	</controls>
 </window>
diff --git a/addons/skin.confluence/720p/defaults.xml b/addons/skin.confluence/720p/defaults.xml
index 09d7da67c6..ed1111de50 100644
--- a/addons/skin.confluence/720p/defaults.xml
+++ b/addons/skin.confluence/720p/defaults.xml
@@ -23,8 +23,8 @@
 		<posy>200</posy>
 		<width>300</width>
 		<height>42</height>
-		<texturefocus>button-focus.png</texturefocus>
-		<texturenofocus>button-nofocus.png</texturenofocus>
+		<texturefocus border="5">button-focus.png</texturefocus>
+		<texturenofocus border="5">button-nofocus.png</texturenofocus>
 		<font>font13</font>
 		<textcolor>white</textcolor>
 		<disabledcolor>grey3</disabledcolor>
@@ -115,8 +115,8 @@
 		<radioheight>24</radioheight>
 		<textureradiofocus>radiobutton-focus.png</textureradiofocus>
 		<textureradionofocus>radiobutton-nofocus.png</textureradionofocus>
-		<texturefocus>button-focus.png</texturefocus>
-		<texturenofocus>button-nofocus.png</texturenofocus>
+		<texturefocus border="5">button-focus.png</texturefocus>
+		<texturenofocus border="5">button-nofocus.png</texturenofocus>
 		<label>215</label>
 		<font>font13</font>
 		<textcolor>white</textcolor>
@@ -165,22 +165,22 @@
 	<default type="mover">
 		<posx>60</posx>
 		<posy>192</posy>
-		<texturefocus>button-focus.png</texturefocus>
-		<texturenofocus>button-nofocus.png</texturenofocus>
+		<texturefocus border="5">button-focus.png</texturefocus>
+		<texturenofocus border="5">button-nofocus.png</texturenofocus>
 	</default>
 	<default type="resize">
 		<posx>60</posx>
 		<posy>192</posy>
-		<texturefocus>button-focus.png</texturefocus>
-		<texturenofocus>button-nofocus.png</texturenofocus>
+		<texturefocus border="5">button-focus.png</texturefocus>
+		<texturenofocus border="5">button-nofocus.png</texturenofocus>
 	</default>
 	<default type="edit">
 		<posx>300</posx>
 		<posy>200</posy>
 		<width>300</width>
 		<height>42</height>
-		<texturefocus>button-focus.png</texturefocus>
-		<texturenofocus>button-nofocus.png</texturenofocus>
+		<texturefocus border="5">button-focus.png</texturefocus>
+		<texturenofocus border="5">button-nofocus.png</texturenofocus>
 		<font>font13</font>
 		<textcolor>white</textcolor>
 		<disabledcolor>grey3</disabledcolor>
diff --git a/addons/skin.confluence/720p/script-RSS_Editor-rssEditor.xml b/addons/skin.confluence/720p/script-RSS_Editor-rssEditor.xml
index 5d2cf229f6..dd562f8680 100644
--- a/addons/skin.confluence/720p/script-RSS_Editor-rssEditor.xml
+++ b/addons/skin.confluence/720p/script-RSS_Editor-rssEditor.xml
@@ -16,17 +16,29 @@
 			<texture border="40">DialogBack.png</texture>
 		</control>
 		<control type="image">
-			<posx>80</posx>
-			<posy>10</posy>
-			<width>640</width>
-			<height>90</height>
-			<aspectratio>stretch</aspectratio>
-			<texture>GlassTitleBar.png</texture>
+			<description>Dialog Header image</description>
+			<posx>40</posx>
+			<posy>16</posy>
+			<width>720</width>
+			<height>40</height>
+			<texture>dialogheader.png</texture>
+		</control>
+		<control type="label" id="2">
+			<description>header label</description>
+			<posx>40</posx>
+			<posy>20</posy>
+			<width>720</width>
+			<height>30</height>
+			<font>font13_title</font>
+			<align>center</align>
+			<aligny>center</aligny>
+			<textcolor>selected</textcolor>
+			<shadowcolor>black</shadowcolor>
 		</control>
 		<control type="button">
 			<description>Close Window button</description>
 			<posx>710</posx>
-			<posy>9</posy>
+			<posy>15</posy>
 			<width>64</width>
 			<height>32</height>
 			<label>-</label>
@@ -40,53 +52,41 @@
 			<ondown>10</ondown>
 			<visible>system.getbool(input.enablemouse)</visible>
 		</control>
-		<control type="label" id="2">
-			<description>header label</description>
-			<posx>20</posx>
-			<posy>18</posy>
-			<width>760</width>
-			<height>30</height>
-			<font>font13_title</font>
-			<align>center</align>
-			<aligny>center</aligny>
-			<textcolor>white</textcolor>
-			<shadowcolor>black</shadowcolor>
-		</control>
 		<control type="label" id="3">
 			<description>List label</description>
 			<posx>20</posx>
-			<posy>60</posy>
+			<posy>65</posy>
 			<width>760</width>
 			<height>30</height>
 			<align>center</align>
 			<aligny>center</aligny>
-			<font>font12caps</font>
+			<font>font12</font>
 			<textcolor>blue</textcolor>
 			<shadowcolor>black</shadowcolor>
 		</control>
 		<control type="list" id="10">
 			<posx>30</posx>
 			<posy>105</posy>
-			<width>500</width>
-			<height>201</height>
+			<width>520</width>
+			<height>225</height>
 			<onup>9001</onup>
 			<onleft>9000</onleft>
 			<onright>60</onright>
 			<ondown>9001</ondown>
 			<pagecontrol>60</pagecontrol>
 			<scrolltime>200</scrolltime>
-			<itemlayout height="40">
+			<itemlayout height="45">
 				<control type="image">
 					<posx>0</posx>
 					<posy>0</posy>
-					<width>500</width>
-					<height>41</height>
-					<texture>MenuItemNF.png</texture>
+					<width>520</width>
+					<height>40</height>
+					<texture border="5">button-nofocus.png</texture>
 				</control>
 				<control type="label">
 					<posx>10</posx>
 					<posy>0</posy>
-					<width>490</width>
+					<width>500</width>
 					<height>40</height>
 					<font>font13</font>
 					<align>left</align>
@@ -96,27 +96,27 @@
 					<info>ListItem.Label</info>
 				</control>
 			</itemlayout>
-			<focusedlayout height="40">
+			<focusedlayout height="45">
 				<control type="image">
 					<posx>0</posx>
 					<posy>0</posy>
-					<width>500</width>
-					<height>41</height>
+					<width>520</width>
+					<height>40</height>
 					<visible>!Control.HasFocus(10)</visible>
-					<texture>MenuItemNF.png</texture>
+					<texture border="5">button-nofocus.png</texture>
 				</control>
 				<control type="image">
 					<posx>0</posx>
 					<posy>0</posy>
-					<width>500</width>
-					<height>41</height>
+					<width>520</width>
+					<height>40</height>
 					<visible>Control.hasfocus(14) | Control.HasFocus(10)</visible>
-					<texture>MenuItemFO.png</texture>
+					<texture border="5">button-focus2.png</texture>
 				</control>
 				<control type="label">
 					<posx>10</posx>
 					<posy>0</posy>
-					<width>490</width>
+					<width>500</width>
 					<height>40</height>
 					<font>font13</font>
 					<align>left</align>
@@ -127,10 +127,10 @@
 			</focusedlayout>
 		</control>
 		<control type="scrollbar" id="60">
-			<posx>555</posx>
+			<posx>552</posx>
 			<posy>105</posy>
 			<width>25</width>
-			<height>200</height>
+			<height>225</height>
 			<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
 			<texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
 			<texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
@@ -149,12 +149,10 @@
 				<posx>0</posx>
 				<posy>0</posy>
 				<width>200</width>
-				<height>41</height>
+				<height>40</height>
 				<font>font12_title</font>
 				<align>center</align>
 				<aligny>center</aligny>
-				<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-				<texturefocus border="5">button-focus.png</texturefocus>
 				<onup>18</onup>
 				<onleft>60</onleft>
 				<onright>10</onright>
@@ -163,15 +161,13 @@
 			<control type="button" id="13">
 				<description>Add Button</description>
 				<posx>0</posx>
-				<posy>40</posy>
+				<posy>45</posy>
 				<width>200</width>
-				<height>41</height>
+				<height>40</height>
 				<font>font12_title</font>
 				<label>15019</label>
 				<align>center</align>
 				<aligny>center</aligny>
-				<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-				<texturefocus border="5">button-focus.png</texturefocus>
 				<onup>11</onup>
 				<onleft>60</onleft>
 				<onright>10</onright>
@@ -180,15 +176,13 @@
 			<control type="button" id="14">
 				<description>Remove Button</description>
 				<posx>0</posx>
-				<posy>80</posy>
+				<posy>90</posy>
 				<width>200</width>
-				<height>41</height>
+				<height>40</height>
 				<font>font12_title</font>
 				<label>1210</label>
 				<align>center</align>
 				<aligny>center</aligny>
-				<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-				<texturefocus border="5">button-focus.png</texturefocus>
 				<onup>13</onup>
 				<onleft>60</onleft>
 				<onright>10</onright>
@@ -204,8 +198,6 @@
 				<height>40</height>
 				<align>center</align>
 				<aligny>center</aligny>
-				<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-				<texturefocus border="5">button-focus.png</texturefocus>
 				<label>186</label>
 				<font>font12_title</font>
 				<onup>9000</onup>
@@ -221,8 +213,6 @@
 				<height>40</height>
 				<align>center</align>
 				<aligny>center</aligny>
-				<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-				<texturefocus border="5">button-focus.png</texturefocus>
 				<label>222</label>
 				<font>font12_title</font>
 				<onup>9000</onup>
diff --git a/addons/skin.confluence/720p/script-RSS_Editor-setEditor.xml b/addons/skin.confluence/720p/script-RSS_Editor-setEditor.xml
index b07a01737d..dd562f8680 100644
--- a/addons/skin.confluence/720p/script-RSS_Editor-setEditor.xml
+++ b/addons/skin.confluence/720p/script-RSS_Editor-setEditor.xml
@@ -16,17 +16,29 @@
 			<texture border="40">DialogBack.png</texture>
 		</control>
 		<control type="image">
-			<posx>80</posx>
-			<posy>10</posy>
-			<width>640</width>
-			<height>90</height>
-			<aspectratio>stretch</aspectratio>
-			<texture>GlassTitleBar.png</texture>
+			<description>Dialog Header image</description>
+			<posx>40</posx>
+			<posy>16</posy>
+			<width>720</width>
+			<height>40</height>
+			<texture>dialogheader.png</texture>
+		</control>
+		<control type="label" id="2">
+			<description>header label</description>
+			<posx>40</posx>
+			<posy>20</posy>
+			<width>720</width>
+			<height>30</height>
+			<font>font13_title</font>
+			<align>center</align>
+			<aligny>center</aligny>
+			<textcolor>selected</textcolor>
+			<shadowcolor>black</shadowcolor>
 		</control>
 		<control type="button">
 			<description>Close Window button</description>
 			<posx>710</posx>
-			<posy>9</posy>
+			<posy>15</posy>
 			<width>64</width>
 			<height>32</height>
 			<label>-</label>
@@ -40,53 +52,41 @@
 			<ondown>10</ondown>
 			<visible>system.getbool(input.enablemouse)</visible>
 		</control>
-		<control type="label" id="2">
-			<description>header label</description>
-			<posx>20</posx>
-			<posy>18</posy>
-			<width>760</width>
-			<height>30</height>
-			<font>font13_title</font>
-			<align>center</align>
-			<aligny>center</aligny>
-			<textcolor>white</textcolor>
-			<shadowcolor>black</shadowcolor>
-		</control>
 		<control type="label" id="3">
 			<description>List label</description>
 			<posx>20</posx>
-			<posy>60</posy>
+			<posy>65</posy>
 			<width>760</width>
 			<height>30</height>
 			<align>center</align>
 			<aligny>center</aligny>
-			<font>font12caps</font>
+			<font>font12</font>
 			<textcolor>blue</textcolor>
 			<shadowcolor>black</shadowcolor>
 		</control>
 		<control type="list" id="10">
 			<posx>30</posx>
 			<posy>105</posy>
-			<width>500</width>
-			<height>201</height>
+			<width>520</width>
+			<height>225</height>
 			<onup>9001</onup>
 			<onleft>9000</onleft>
 			<onright>60</onright>
 			<ondown>9001</ondown>
 			<pagecontrol>60</pagecontrol>
 			<scrolltime>200</scrolltime>
-			<itemlayout height="40">
+			<itemlayout height="45">
 				<control type="image">
 					<posx>0</posx>
 					<posy>0</posy>
-					<width>500</width>
-					<height>41</height>
-					<texture>MenuItemNF.png</texture>
+					<width>520</width>
+					<height>40</height>
+					<texture border="5">button-nofocus.png</texture>
 				</control>
 				<control type="label">
 					<posx>10</posx>
 					<posy>0</posy>
-					<width>490</width>
+					<width>500</width>
 					<height>40</height>
 					<font>font13</font>
 					<align>left</align>
@@ -96,27 +96,27 @@
 					<info>ListItem.Label</info>
 				</control>
 			</itemlayout>
-			<focusedlayout height="40">
+			<focusedlayout height="45">
 				<control type="image">
 					<posx>0</posx>
 					<posy>0</posy>
-					<width>500</width>
-					<height>41</height>
+					<width>520</width>
+					<height>40</height>
 					<visible>!Control.HasFocus(10)</visible>
-					<texture>MenuItemNF.png</texture>
+					<texture border="5">button-nofocus.png</texture>
 				</control>
 				<control type="image">
 					<posx>0</posx>
 					<posy>0</posy>
-					<width>500</width>
-					<height>41</height>
-					<visible>Control.hasfocus(14) | Control.HasFocus(10) | Control.HasFocus(11)</visible>
-					<texture>MenuItemFO.png</texture>
+					<width>520</width>
+					<height>40</height>
+					<visible>Control.hasfocus(14) | Control.HasFocus(10)</visible>
+					<texture border="5">button-focus2.png</texture>
 				</control>
 				<control type="label">
 					<posx>10</posx>
 					<posy>0</posy>
-					<width>490</width>
+					<width>500</width>
 					<height>40</height>
 					<font>font13</font>
 					<align>left</align>
@@ -127,10 +127,10 @@
 			</focusedlayout>
 		</control>
 		<control type="scrollbar" id="60">
-			<posx>555</posx>
+			<posx>552</posx>
 			<posy>105</posy>
 			<width>25</width>
-			<height>200</height>
+			<height>225</height>
 			<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
 			<texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
 			<texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
@@ -149,12 +149,10 @@
 				<posx>0</posx>
 				<posy>0</posy>
 				<width>200</width>
-				<height>41</height>
+				<height>40</height>
 				<font>font12_title</font>
 				<align>center</align>
 				<aligny>center</aligny>
-				<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-				<texturefocus border="5">button-focus.png</texturefocus>
 				<onup>18</onup>
 				<onleft>60</onleft>
 				<onright>10</onright>
@@ -163,15 +161,13 @@
 			<control type="button" id="13">
 				<description>Add Button</description>
 				<posx>0</posx>
-				<posy>40</posy>
+				<posy>45</posy>
 				<width>200</width>
-				<height>41</height>
+				<height>40</height>
 				<font>font12_title</font>
 				<label>15019</label>
 				<align>center</align>
 				<aligny>center</aligny>
-				<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-				<texturefocus border="5">button-focus.png</texturefocus>
 				<onup>11</onup>
 				<onleft>60</onleft>
 				<onright>10</onright>
@@ -180,15 +176,13 @@
 			<control type="button" id="14">
 				<description>Remove Button</description>
 				<posx>0</posx>
-				<posy>80</posy>
+				<posy>90</posy>
 				<width>200</width>
-				<height>41</height>
+				<height>40</height>
 				<font>font12_title</font>
 				<label>1210</label>
 				<align>center</align>
 				<aligny>center</aligny>
-				<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-				<texturefocus border="5">button-focus.png</texturefocus>
 				<onup>13</onup>
 				<onleft>60</onleft>
 				<onright>10</onright>
@@ -204,8 +198,6 @@
 				<height>40</height>
 				<align>center</align>
 				<aligny>center</aligny>
-				<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-				<texturefocus border="5">button-focus.png</texturefocus>
 				<label>186</label>
 				<font>font12_title</font>
 				<onup>9000</onup>
@@ -221,8 +213,6 @@
 				<height>40</height>
 				<align>center</align>
 				<aligny>center</aligny>
-				<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-				<texturefocus border="5">button-focus.png</texturefocus>
 				<label>222</label>
 				<font>font12_title</font>
 				<onup>9000</onup>
diff --git a/addons/skin.confluence/720p/script-XBMC_Lyrics-settings.xml b/addons/skin.confluence/720p/script-XBMC_Lyrics-settings.xml
deleted file mode 100644
index e0274c3975..0000000000
--- a/addons/skin.confluence/720p/script-XBMC_Lyrics-settings.xml
+++ /dev/null
@@ -1,389 +0,0 @@
-<window type="dialog">
-	<defaultcontrol>201</defaultcontrol>
-	<coordinates>
-		<system>1</system>
-		<posx>220</posx>
-		<posy>85</posy>
-	</coordinates>
-	<include>dialogeffect</include>
-	<controls>
-		<control type="image">
-			<posx>-220</posx>
-			<posy>-85</posy>
-			<width>1280</width>
-			<height>720</height>
-			<texture>black-back.png</texture>
-			<animation effect="fade" time="400">Visible</animation>
-			<animation effect="fade" time="200">Hidden</animation>
-			<visible>Window.IsVisible(Visualisation)</visible>
-		</control>
-		<control type="group">
-			<visible>!Window.IsVisible(script-Apple_Movie_Trailers-chooser.xml)</visible>
-			<include>VisibleFadeEffect</include>
-			<control type="image">
-				<description>background image</description>
-				<posx>0</posx>
-				<posy>0</posy>
-				<width>840</width>
-				<height>550</height>
-				<texture border="40">DialogBack.png</texture>
-			</control>
-			<control type="image">
-				<posx>230</posx>
-				<posy>10</posy>
-				<width>570</width>
-				<height>528</height>
-				<texture border="5">black-back2.png</texture>
-			</control>
-			<control type="image">
-				<posx>230</posx>
-				<posy>10</posy>
-				<width>570</width>
-				<height>100</height>
-				<aspectratio>stretch</aspectratio>
-				<texture>GlassTitleBar.png</texture>
-			</control>
-			<control type="button">
-				<description>Close Window button</description>
-				<posx>730</posx>
-				<posy>9</posy>
-				<width>64</width>
-				<height>32</height>
-				<label>-</label>
-				<font>-</font>
-				<onclick>PreviousMenu</onclick>
-				<texturefocus>DialogCloseButton-focus.png</texturefocus>
-				<texturenofocus>DialogCloseButton.png</texturenofocus>
-				<onleft>201</onleft>
-				<onright>201</onright>
-				<onup>201</onup>
-				<ondown>201</ondown>
-				<visible>system.getbool(input.enablemouse)</visible>
-			</control>
-			<control type="label">
-				<description>header label</description>
-				<posx>240</posx>
-				<posy>20</posy>
-				<width>550</width>
-				<height>30</height>
-				<font>font24_title</font>
-				<label>$LOCALIZE[SCRIPT0]</label>
-				<align>left</align>
-				<aligny>center</aligny>
-				<textcolor>white</textcolor>
-				<shadowcolor>black</shadowcolor>
-			</control>
-			<control type="label" id="30">
-				<description>Version label</description>
-				<posx>790</posx>
-				<posy>23</posy>
-				<width>300</width>
-				<height>30</height>
-				<font>font10</font>
-				<label>-</label>
-				<align>right</align>
-				<aligny>center</aligny>
-				<textcolor>grey2</textcolor>
-				<shadowcolor>black</shadowcolor>
-			</control>
-			<!-- ** Required ** Do not change id's or type's -->
-			<control type="scrollbar" id="60">
-				<posx>803</posx>
-				<posy>70</posy>
-				<width>25</width>
-				<height>440</height>
-				<texturesliderbackground border="0,14,0,14">ScrollBarV.png</texturesliderbackground>
-				<texturesliderbar border="0,14,0,14">ScrollBarV_bar.png</texturesliderbar>
-				<texturesliderbarfocus border="0,14,0,14">ScrollBarV_bar_focus.png</texturesliderbarfocus>
-				<textureslidernib>ScrollBarNib.png</textureslidernib>
-				<textureslidernibfocus>ScrollBarNib.png</textureslidernibfocus>
-				<onleft>2000</onleft>
-				<onright>9000</onright>
-				<showonepage>false</showonepage>
-				<orientation>vertical</orientation>
-			</control>
-			<control type="grouplist" id="9000">
-				<posx>230</posx>
-				<posy>70</posy>
-				<width>570</width>
-				<height>440</height>
-				<itemgap>-1</itemgap>
-				<pagecontrol>60</pagecontrol>
-				<onleft>2000</onleft>
-				<onright>60</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>40</height>
-					<font>font13</font>
-					<textcolor>grey2</textcolor>
-					<focusedcolor>white</focusedcolor>
-					<texturefocus>MenuItemFO.png</texturefocus>
-					<texturenofocus>MenuItemNF.png</texturenofocus>
-					<label>$LOCALIZE[SCRIPT201]</label>
-				</control>
-				<control type="image" id="1">
-					<description>separator image</description>
-					<width>570</width>
-					<height>2</height>
-					<texture>separator2.png</texture>
-				</control>
-				<control type="radiobutton" id="202">
-					<description>Setting2 Button</description>
-					<width>570</width>
-					<height>40</height>
-					<label>$LOCALIZE[SCRIPT202]</label>
-					<pulseonselect>no</pulseonselect>
-					<font>font13</font>
-					<textcolor>grey2</textcolor>
-					<focusedcolor>white</focusedcolor>
-					<texturefocus>MenuItemFO.png</texturefocus>
-					<texturenofocus>MenuItemNF.png</texturenofocus>
-				</control>
-				<control type="button" id="203">
-					<description>Setting2 Button</description>
-					<posx>0</posx>
-					<posy>0</posy>
-					<width>570</width>
-					<height>40</height>
-					<label>$LOCALIZE[SCRIPT203]</label>
-					<font>font13</font>
-					<textcolor>grey2</textcolor>
-					<focusedcolor>white</focusedcolor>
-					<texturefocus>MenuItemFO.png</texturefocus>
-					<texturenofocus>MenuItemNF.png</texturenofocus>
-				</control>
-				<control type="radiobutton" id="210">
-					<description>Setting10 Button</description>
-					<width>570</width>
-					<height>40</height>
-					<label>$LOCALIZE[SCRIPT210]</label>
-					<pulseonselect>no</pulseonselect>
-					<font>font13</font>
-					<textcolor>grey2</textcolor>
-					<focusedcolor>white</focusedcolor>
-					<texturefocus>MenuItemFO.png</texturefocus>
-					<texturenofocus>MenuItemNF.png</texturenofocus>
-				</control>
-				<control type="radiobutton" id="211">
-					<description>Setting11 Button</description>
-					<width>570</width>
-					<height>40</height>
-					<label>$LOCALIZE[SCRIPT211]</label>
-					<pulseonselect>no</pulseonselect>
-					<font>font13</font>
-					<textcolor>grey2</textcolor>
-					<focusedcolor>white</focusedcolor>
-					<texturefocus>MenuItemFO.png</texturefocus>
-					<texturenofocus>MenuItemNF.png</texturenofocus>
-				</control>
-				<control type="image" id="2">
-					<description>separator image</description>
-					<width>570</width>
-					<height>2</height>
-					<texture>separator2.png</texture>
-				</control>
-				<control type="radiobutton" id="204">
-					<description>Setting4 Button</description>
-					<width>570</width>
-					<height>40</height>
-					<label>$LOCALIZE[SCRIPT204]</label>
-					<pulseonselect>no</pulseonselect>
-					<font>font13</font>
-					<textcolor>grey2</textcolor>
-					<focusedcolor>white</focusedcolor>
-					<texturefocus>MenuItemFO.png</texturefocus>
-					<texturenofocus>MenuItemNF.png</texturenofocus>
-				</control>
-				<control type="radiobutton" id="205">
-					<description>Setting5 Button</description>
-					<width>570</width>
-					<height>40</height>
-					<label>$LOCALIZE[SCRIPT205]</label>
-					<pulseonselect>no</pulseonselect>
-					<font>font13</font>
-					<textcolor>grey2</textcolor>
-					<focusedcolor>white</focusedcolor>
-					<texturefocus>MenuItemFO.png</texturefocus>
-					<texturenofocus>MenuItemNF.png</texturenofocus>
-				</control>
-				<control type="image" id="3">
-					<description>separator image</description>
-					<width>570</width>
-					<height>2</height>
-					<texture>separator2.png</texture>
-				</control>
-				<control type="radiobutton" id="206">
-					<description>Setting6 Button</description>
-					<width>570</width>
-					<height>40</height>
-					<label>$LOCALIZE[SCRIPT206]</label>
-					<pulseonselect>no</pulseonselect>
-					<font>font13</font>
-					<textcolor>grey2</textcolor>
-					<focusedcolor>white</focusedcolor>
-					<texturefocus>MenuItemFO.png</texturefocus>
-					<texturenofocus>MenuItemNF.png</texturenofocus>
-				</control>
-				<control type="button" id="207">
-					<description>Setting7 Button</description>
-					<posx>0</posx>
-					<posy>0</posy>
-					<width>570</width>
-					<height>40</height>
-					<label>$LOCALIZE[SCRIPT207]</label>
-					<font>font13</font>
-					<textcolor>grey2</textcolor>
-					<focusedcolor>white</focusedcolor>
-					<texturefocus>MenuItemFO.png</texturefocus>
-					<texturenofocus>MenuItemNF.png</texturenofocus>
-				</control>
-				<control type="image" id="4">
-					<description>separator image</description>
-					<width>570</width>
-					<height>2</height>
-					<texture>separator2.png</texture>
-				</control>
-				<control type="button" id="208">
-					<description>Setting8 Button</description>
-					<posx>0</posx>
-					<posy>0</posy>
-					<width>570</width>
-					<height>40</height>
-					<label>$LOCALIZE[SCRIPT208]</label>
-					<font>font13</font>
-					<textcolor>grey2</textcolor>
-					<focusedcolor>white</focusedcolor>
-					<texturefocus>MenuItemFO.png</texturefocus>
-					<texturenofocus>MenuItemNF.png</texturenofocus>
-				</control>
-				<control type="radiobutton" id="209">
-					<description>Setting9 Button</description>
-					<width>570</width>
-					<height>40</height>
-					<label>$LOCALIZE[SCRIPT209]</label>
-					<pulseonselect>no</pulseonselect>
-					<font>font13</font>
-					<textcolor>grey2</textcolor>
-					<focusedcolor>white</focusedcolor>
-					<texturefocus>MenuItemFO.png</texturefocus>
-					<texturenofocus>MenuItemNF.png</texturenofocus>
-				</control>
-			</control>
-			<!-- ** Required ** Do not change id's or type's -->
-			<control type="group" id="2000">
-				<posx>10</posx>
-				<posy>20</posy>
-				<control type="image">
-					<description>LOGO</description>
-					<posx>0</posx>
-					<posy>10</posy>
-					<width>220</width>
-					<height>80</height>
-					<aspectratio>keep</aspectratio>
-					<texture>Confluence_Logo.png</texture>
-				</control>
-				<control type="button" id="250">
-					<description>OK button</description>
-					<posx>0</posx>
-					<posy>90</posy>
-					<width>215</width>
-					<height>51</height>
-					<label>$LOCALIZE[SCRIPT250]</label>
-					<font>font13_title</font>
-					<align>right</align>
-					<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-					<texturefocus border="5">MenuItemFO.png</texturefocus>
-					<onleft>9000</onleft>
-					<onright>9000</onright>
-					<onup>253</onup>
-					<ondown>251</ondown>
-				</control>
-				<control type="button" id="251">
-					<description>Cancel button</description>
-					<posx>0</posx>
-					<posy>140</posy>
-					<width>215</width>
-					<height>51</height>
-					<label>$LOCALIZE[SCRIPT251]</label>
-					<font>font13_title</font>
-					<align>right</align>
-					<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-					<texturefocus border="5">MenuItemFO.png</texturefocus>
-					<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>190</posy>
-					<width>215</width>
-					<height>51</height>
-					<label>$LOCALIZE[SCRIPT252]</label>
-					<font>font13_title</font>
-					<align>right</align>
-					<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-					<texturefocus border="5">MenuItemFO.png</texturefocus>
-					<onleft>9000</onleft>
-					<onright>9000</onright>
-					<onup>251</onup>
-					<ondown>254</ondown>
-				</control>
-				<control type="button" id="254">
-					<description>Play button</description>
-					<posx>0</posx>
-					<posy>240</posy>
-					<width>215</width>
-					<height>51</height>
-					<label>$LOCALIZE[SCRIPT254]</label>
-					<font>font13_title</font>
-					<align>right</align>
-					<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-					<texturefocus border="5">MenuItemFO.png</texturefocus>
-					<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>290</posy>
-					<width>215</width>
-					<height>51</height>
-					<label>$LOCALIZE[SCRIPT255]</label>
-					<font>font13_title</font>
-					<align>right</align>
-					<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-					<texturefocus border="5">MenuItemFO.png</texturefocus>
-					<onleft>9000</onleft>
-					<onright>9000</onright>
-					<onup>254</onup>
-					<ondown>253</ondown>
-				</control>
-				<control type="button" id="253">
-					<description>Credits button</description>
-					<posx>0</posx>
-					<posy>340</posy>
-					<width>215</width>
-					<height>51</height>
-					<label>$LOCALIZE[SCRIPT253]</label>
-					<font>font13_title</font>
-					<align>right</align>
-					<texturenofocus border="5">MenuItemNF.png</texturenofocus>
-					<texturefocus border="5">MenuItemFO.png</texturefocus>
-					<onleft>9000</onleft>
-					<onright>9000</onright>
-					<onup>255</onup>
-					<ondown>250</ondown>
-				</control>
-			</control>
-		</control>
-	</controls>
-</window>
\ No newline at end of file
diff --git a/addons/skin.confluence/media/DialogBack.png b/addons/skin.confluence/media/DialogBack.png
index fd30853d45..812801af5c 100644
--- a/addons/skin.confluence/media/DialogBack.png
+++ b/addons/skin.confluence/media/DialogBack.png
diff --git a/addons/skin.confluence/media/DialogBack2.png b/addons/skin.confluence/media/DialogBack2.png
new file mode 100644
index 0000000000..8f599269b4
--- /dev/null
+++ b/addons/skin.confluence/media/DialogBack2.png
diff --git a/addons/skin.confluence/media/DialogContextBottom.png b/addons/skin.confluence/media/DialogContextBottom.png
index 57992aee0e..bde25d3d37 100644
--- a/addons/skin.confluence/media/DialogContextBottom.png
+++ b/addons/skin.confluence/media/DialogContextBottom.png
diff --git a/addons/skin.confluence/media/DialogContextMiddle.png b/addons/skin.confluence/media/DialogContextMiddle.png
index 38db4dff2e..b2bf0ca530 100644
--- a/addons/skin.confluence/media/DialogContextMiddle.png
+++ b/addons/skin.confluence/media/DialogContextMiddle.png
diff --git a/addons/skin.confluence/media/DialogContextTop.png b/addons/skin.confluence/media/DialogContextTop.png
index 8108f082bc..e7f764a5a5 100644
--- a/addons/skin.confluence/media/DialogContextTop.png
+++ b/addons/skin.confluence/media/DialogContextTop.png
diff --git a/addons/skin.confluence/media/button-focus2.png b/addons/skin.confluence/media/button-focus2.png
new file mode 100644
index 0000000000..9d692ced2b
--- /dev/null
+++ b/addons/skin.confluence/media/button-focus2.png
diff --git a/addons/skin.confluence/media/dialogheader.png b/addons/skin.confluence/media/dialogheader.png
new file mode 100644
index 0000000000..af7ba85beb
--- /dev/null
+++ b/addons/skin.confluence/media/dialogheader.png