From cdc7997b495cb1ad281b36eacf15dfd98e154a1a Mon Sep 17 00:00:00 2001
From: theDeadMan <chrisbevan@users.noreply.github.com>
Date: Sun, 7 Mar 2021 15:09:28 +0000
Subject: [PATCH] various prep for Matrix release

---
 1080i/AddonBrowser.xml                 | 134 +++---
 1080i/DialogAddonInfo.xml              |  77 ++--
 1080i/DialogConfirm.xml                |   3 +
 1080i/DialogSelect.xml                 |  61 ++-
 1080i/DialogSettings.xml               |  37 +-
 1080i/DialogVideoInfo.xml              |   3 +-
 1080i/FileBrowser.xml                  |  38 +-
 1080i/FileManager.xml                  |  39 +-
 1080i/Home.xml                         | 565 +++++++++++++++----------
 1080i/Includes_variables.xml           |   4 +-
 1080i/LoginScreen.xml                  |  18 +-
 1080i/MyPVRGuide.xml                   |  12 +-
 1080i/MyPVRRecordings.xml              |   1 +
 1080i/MyPrograms.xml                   |   5 +-
 1080i/Settings.xml                     |  22 +-
 1080i/SettingsCategory.xml             |  47 +-
 1080i/SettingsProfile.xml              |  56 +--
 1080i/SettingsSystemInfo.xml           |  65 +--
 1080i/SkinSettings.xml                 |  34 +-
 1080i/VideoOSD.xml                     |   4 +-
 1080i/View_Albums.xml                  |   9 +-
 1080i/View_ArtistAlbums.xml            |  20 +-
 1080i/View_Episodes.xml                |  18 +-
 1080i/View_Games.xml                   |   3 +-
 1080i/View_LiveTVChannels.xml          |   5 +-
 1080i/View_Movies.xml                  |   9 +-
 1080i/View_MusicFiles.xml              |   3 +-
 1080i/View_MusicGenres.xml             |   1 +
 1080i/View_MusicPlaylist.xml           |  10 +-
 1080i/View_Photos.xml                  |   2 +-
 1080i/View_Seasons.xml                 |  12 +-
 1080i/View_TVShows.xml                 |   9 +-
 1080i/View_VideoFiles.xml              |   3 +-
 1080i/custom_musicPlayerFullscreen.xml |  73 +---
 1080i/script-skinshortcuts.xml         |  33 +-
 35 files changed, 687 insertions(+), 748 deletions(-)

diff --git a/1080i/AddonBrowser.xml b/1080i/AddonBrowser.xml
index 1244ff6..6e5409e 100644
--- a/1080i/AddonBrowser.xml
+++ b/1080i/AddonBrowser.xml
@@ -9,11 +9,20 @@
         <control type="group" id="9999">
             <control type="group">
                 <posx>col-9-begin</posx>
-                <posy>row-7-begin</posy>
+                <posy>row-6-begin</posy>
                 <visible>String.IsEqual(container.folderpath,addons://)</visible>
                 <!--animations-->
                 <include>modalDialogInOutVertical</include>
                 <!--Initial menu-->
+                <control type="image">
+                    <posx>-12</posx>
+                    <posy>-12</posy>
+                    <width>600</width>
+                    <height>600</height>
+                    <texture>colors/black.png</texture>
+                    <colordiffuse>overlay</colordiffuse>
+                    <aspectratio>stretch</aspectratio>
+                </control>
                 <control type="image">
                     <posx>0</posx>
                     <posy>0</posy>
@@ -37,23 +46,22 @@
                 <control type="panel" id="50">
                     <visible>String.IsEqual(container.folderpath,addons://)</visible>
                     <posx>0</posx>
-                    <posy>73</posy>
+                    <posy>84</posy>
                     <width>8-col</width>
                     <height>20-row</height>
                     <onleft>activateWindow(contextmenu)</onleft>
                     <ondown>50</ondown>
                     <onup>50</onup>
                     <itemgap>0</itemgap>
-                    <itemlayout width="8-col" height="2-row">
-                        <control type="image">
-                            <posx>0</posx>
-                            <posy>0</posy>
-                            <width>8-col</width>
-                            <height>2-row</height>
-                            <texture>colors/black.png</texture>
-                            <colordiffuse>overlay</colordiffuse>
-                            <aspectratio>stretch</aspectratio>
-                        </control>
+                    <itemlayout width="8-col" height="84">
+	                    <control type="image">
+	                        <posx>0</posx>
+	                        <posy>0</posy>
+	                        <width>69</width>
+	                        <height>69</height>
+	                        <aspectratio scalediffuse="false">stretch</aspectratio>
+	                        <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.thumb]</texture>
+	                    </control>
                         <control type="image">
                             <posx>0</posx>
                             <posy>0</posy>
@@ -73,9 +81,12 @@
                             <label>$INFO[ListItem.label]</label>
                         </control>
                     </itemlayout>
-                    <focusedlayout width="8-col" height="2-row">
+                    <focusedlayout width="8-col" height="84">
                         <control type="group">
                             <control type="image">
+								<animation type="focus">
+						            <effect type="fade" start="100" end="50" time="0"/>
+						        </animation>
                                 <posx>0</posx>
                                 <posy>0</posy>
                                 <width>1-col</width>
@@ -135,13 +146,23 @@
                     <effect type="fade" start="0" end="100" time="300"/>
                     <effect type="slide" start="0,-200" end="0" tween="cubic" easing="out" time="400"/>
                 </animation>
-                <posx>col-4-begin</posx>
+                <posx>col-7-begin</posx>
                 <posy>row-4-begin</posy>
                 <visible>!String.IsEqual(container.folderpath,addons://)</visible>
+                <!--dialog background-->
                 <control type="image">
+                    <posx>-12</posx>
+                    <posy>-12</posy>
+                    <width>888</width>
+                    <height>792</height>
+                    <texture>colors/black.png</texture>
+                    <colordiffuse>overlay</colordiffuse>
+                    <aspectratio>stretch</aspectratio>
+                </control>
+				<control type="image">
                     <posx>0</posx>
                     <posy>0</posy>
-                    <width>18-col</width>
+                    <width>12-col</width>
                     <height>71</height>
                     <texture>colors/white.png</texture>
                     <colordiffuse>highlight</colordiffuse>
@@ -151,44 +172,33 @@
                 <control type="label">
                     <posx>24</posx>
                     <posy>0</posy>
-                    <width>17-col</width>
+                    <width>11-col</width>
                     <height>2-row</height>
                     <font>dialogTitle</font>
                     <label>$INFO[container.foldername] $INFO[container.numitems,(,)]</label>
                     <textcolor>textActive</textcolor>
                     <shadowcolor></shadowcolor>
                 </control>
-                <!--dialog background-->
-                <control type="image">
-                    <posx>0</posx>
-                    <posy>2-row</posy>
-                    <width>18-col</width>
-                    <height>19-row</height>
-                    <texture>colors/black.png</texture>
-                    <colordiffuse>overlay</colordiffuse>
-                    <aspectratio>stretch</aspectratio>
-                </control>
-                <control type="image">
-                    <posx>10-col</posx>
-                    <posy>2-row</posy>
-                    <width>8-col</width>
-                    <height>19-row</height>
-                    <texture>colors/black.png</texture>
-                    <colordiffuse>overlay</colordiffuse>
-                    <aspectratio>stretch</aspectratio>
-                </control>
                 <control type="panel" id="51">
                     <visible>!String.IsEqual(container.folderpath,addons://)</visible>
                     <posx>0</posx>
-                    <posy>2-row</posy>
-                    <width>10-col</width>
+                    <posy>84</posy>
+                    <width>12-col</width>
                     <height>19-row</height>
                     <onleft>activateWindow(contextmenu)</onleft>
                     <onright>60</onright>
                     <ondown>51</ondown>
                     <onup>51</onup>
                     <pagecontrol>60</pagecontrol>
-                    <itemlayout width="10-col" height="2-row">
+                    <itemlayout width="12-col" height="84">
+	                    <control type="image">
+	                        <posx>0</posx>
+	                        <posy>0</posy>
+	                        <width>69</width>
+	                        <height>69</height>
+	                        <aspectratio scalediffuse="false">stretch</aspectratio>
+	                        <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.thumb]</texture>
+	                    </control>
                         <control type="label">
                             <visible>ListItem.AddonLifecycleDesc</visible>
                             <posx>0</posx>
@@ -218,7 +228,7 @@
                         <control type="label">
                             <posx>1-col-indent</posx>
                             <posy>0</posy>
-                            <width>9-col-gutter</width>
+                            <width>10-col-gutter</width>
                             <height>2-row</height>
                             <aligny>center</aligny>
                             <font>itemTitle</font>
@@ -227,10 +237,13 @@
                             <label>$INFO[ListItem.Label]</label>
                         </control>
                     </itemlayout>
-                    <focusedlayout width="10-col" height="2-row">
+                    <focusedlayout width="14-col" height="84">
                         <control type="group">
                             <include>spinFocusIcon</include>
                             <control type="image">
+								<animation type="focus">
+						            <effect type="fade" start="100" end="50" time="0"/>
+						        </animation>
                                 <posx>0</posx>
                                 <posy>0</posy>
                                 <width>1-col</width>
@@ -269,7 +282,7 @@
                         <control type="image">
                             <posx>1-col</posx>
                             <posy>0</posy>
-                            <width>9-col-textbox</width>
+                            <width>11-col-textbox</width>
                             <height>2-row</height>
                             <aspectratio>stretch</aspectratio>
                             <texture border="0">colors/white.png</texture>
@@ -286,44 +299,7 @@
                             <label>$INFO[ListItem.Label]</label>
                         </control>
                     </focusedlayout>
-                </control>
-                <!--icon and description-->
-                <control type="group">
-                    <posx>10-col</posx>
-                    <posy>1-row</posy>
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>1-row</posy>
-                        <width>8-col</width>
-                        <height>19-row</height>
-                        <fadetime>500</fadetime>
-                        <aspectratio scalediffuse="false">scale</aspectratio>
-                        <texture fallback="defaultAddon.png" border="0">$INFO[listitem.thumb]</texture>
-                        <colordiffuse></colordiffuse>
-                    </control>
-                    <control type="image">
-                        <visible>!String.IsEmpty(ListItem.AddonSummary)</visible>
-                        <posx>0</posx>
-                        <posy>577</posy>
-                        <width>8-col</width>
-                        <height>143</height>
-                        <texture>colors/black.png</texture>
-                        <aspectratio>stretch</aspectratio>
-                        <colordiffuse>overlay</colordiffuse>
-                    </control>
-                    <control type="label">
-                        <posx>24</posx>
-                        <posy>612</posy>
-                        <width>7-col</width>
-                        <height>2-row</height>
-                        <align>left</align>
-                        <aligny>center</aligny>
-                        <font>buttonTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <wrapmultiline>true</wrapmultiline>
-                        <label>$INFO[ListItem.AddonSummary]</label>
-                    </control>
-                </control>
+                </control>                
             </control>
             <control type="group">
                 <!--page scrollbar-->
diff --git a/1080i/DialogAddonInfo.xml b/1080i/DialogAddonInfo.xml
index 9677aeb..69c95c4 100644
--- a/1080i/DialogAddonInfo.xml
+++ b/1080i/DialogAddonInfo.xml
@@ -11,6 +11,16 @@
             <posy>row-4-begin</posy>
             <!--animations-->
             <include>modalDialogInOutVertical</include>
+            <!--dialog background-->
+            <control type="image">
+                <posx>-12</posx>
+                <posy>-12</posy>
+                <width>1320</width>
+                <height>22-row</height>
+                <texture>colors/black.png</texture>
+                <colordiffuse>overlay</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
             <control type="image">
                 <posx>0</posx>
                 <posy>0</posy>
@@ -31,16 +41,6 @@
                 <textcolor>textActive</textcolor>
                 <shadowcolor></shadowcolor>
             </control>
-            <!--dialog background-->
-            <control type="image">
-                <posx>0</posx>
-                <posy>2-row</posy>
-                <width>18-col</width>
-                <height>20-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>overlay</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
             <!--addon details-->
             <control type="image">
                 <posx>0</posx>
@@ -92,20 +92,11 @@
             </control>
             <control type="group">
                 <posx>6-col</posx>
-                <posy>10-row</posy>
-                <control type="image">
-                    <posx>0</posx>
-                    <posy>0</posy>
-                    <width>12-col</width>
-                    <height>12-row</height>
-                    <texture>colors/black.png</texture>
-                    <colordiffuse>overlay</colordiffuse>
-                    <aspectratio>stretch</aspectratio>
-                </control>
+                <posy>372</posy>
                 <control type="label">
                     <description>Addon Title</description>
-                    <posx>12</posx>
-                    <posy>12</posy>
+                    <posx>24</posx>
+                    <posy>0</posy>
                     <width>10-col-gutter</width>
                     <height>2-row</height>
                     <aligny>center</aligny>
@@ -113,25 +104,25 @@
                     <label>[B]$INFO[ListItem.addonname]$INFO[ListItem.addonversion, (,)][/B]</label>
                 </control>
                 <control type="label">
-                    <posx>12</posx>
-                    <posy>72</posy>
+                    <posx>24</posx>
+                    <posy>68</posy>
                     <width>9-col</width>
                     <font>menuTitle</font>
                     <textcolor>menuUnselected</textcolor>
                     <label>$INFO[ListItem.AddonCreator,$LOCALIZE[31082] ,]</label>
                 </control>
                 <control type="textbox" id="400">
-                    <posx>12</posx>
-                    <posy>4-row</posy>
+                    <posx>24</posx>
+                    <posy>132</posy>
                     <font>textbox</font>
-                    <width>12-col-gutter</width>
-                    <height>7-row</height>
+                    <width>11-col-gutter</width>
+                    <height>256</height>
                     <label fallback="31205">$INFO[ListItem.AddonDescription]</label>
                     <autoscroll>false</autoscroll>
                     <pagecontrol>61</pagecontrol>
                 </control>
                 <control type="scrollbar" id="61">
-                     <posx>870</posx>
+                     <posx>882</posx>
                      <posy>4-row</posy>
                      <height>7-row</height>
                      <onleft>8000</onleft>
@@ -144,7 +135,7 @@
                 <posy>10-row</posy>
                 <control type="list" id="8000">
                     <posx>0</posx>
-                    <posy>0</posy>
+                    <posy>12</posy>
                     <width>6-col</width>
                     <height>14-row</height>
                     <itemgap>3</itemgap>
@@ -176,6 +167,9 @@
                     </itemlayout>
                     <focusedlayout width="6-col" height="2-row">
                         <control type="image">
+							<animation type="focus">
+					            <effect type="fade" start="100" end="50" time="0"/>
+					        </animation>
                             <posx>0</posx>
                             <posy>0</posy>
                             <width>1-col</width>
@@ -219,7 +213,6 @@
                     </focusedlayout>
                     <content>
                         <item>
-                            <visible>Control.IsEnabled(12)</visible>
                             <label>31117</label>
                             <label2></label2>
                             <thumb></thumb>
@@ -232,28 +225,26 @@
                             <onclick>SendClick(146,6)</onclick>
                         </item>
                         <item>
-                            <visible>Control.IsEnabled(9)</visible>
                             <label>$INFO[Control.GetLabel(9)]</label>
                             <label2></label2>
                             <thumb></thumb>
                             <onclick>SendClick(146,9)</onclick>
                         </item>
                         <item>
-                            <visible>Control.IsEnabled(8)</visible>
                             <label>$INFO[Control.GetLabel(8)]</label>
                             <label2></label2>
                             <thumb></thumb>
                             <onclick>SendClick(146,8)</onclick>
                         </item>
                         <item>
-                            <visible>Control.IsEnabled(7) + String.IsEqual(Control.GetLabel(7),enable)</visible>
+                            <visible>String.IsEqual(Control.GetLabel(7),enable)</visible>
                             <label>$LOCALIZE[31218]</label>
                             <label2></label2>
                             <thumb></thumb>
                             <onclick>SendClick(146,7)</onclick>
                         </item>
                         <item>
-                            <visible>Control.IsEnabled(7) + String.IsEqual(Control.GetLabel(7),disable)</visible>
+                            <visible>String.IsEqual(Control.GetLabel(7),disable)</visible>
                             <label>$LOCALIZE[31104]</label>
                             <label2></label2>
                             <thumb></thumb>
@@ -270,20 +261,30 @@
                 <description>Install / Uninstall addon</description>
                 <label>24022</label>
             </control>
+            <control type="button" id="7">
+                <description>Disable Addon button</description>
+            </control>
             <control type="button" id="8">
                 <description>Update Addon button</description>
                 <label>24069</label>
             </control>
-            <control type="button" id="7">
-                <description>Disable Addon button</description>
-            </control>
             <control type="button" id="9">
                 <description>Addon Settings</description>
                 <label>24020</label>
             </control>
+            <control type="button" id="10">
+                <description>Addon Dependencies</description>
+            </control>
             <control type="button" id="12">
                 <description>Launch addon</description>
             </control>
+            <control type="radiobutton" id="13">
+                <description>Launch addon</description>
+            </control>
+            <control type="button" id="14">
+                <description>Version</description>
+				<label>24069</label>
+            </control>
         </control>
         <!--debugging-->
         <include>DebugGrid</include>
diff --git a/1080i/DialogConfirm.xml b/1080i/DialogConfirm.xml
index 7ed07ed..36bb68b 100644
--- a/1080i/DialogConfirm.xml
+++ b/1080i/DialogConfirm.xml
@@ -80,6 +80,9 @@
                        <texture>colors/white.png</texture>
                        <colordiffuse>highlight</colordiffuse>
                        <include>spinFocusIcon</include>
+		   				<animation type="conditional" condition="true">
+		   					<effect type="fade" start="100" end="50" time="0"/>
+		   				</animation>
                    </control>
                    <control type="image">
                        <posx>1-col</posx>
diff --git a/1080i/DialogSelect.xml b/1080i/DialogSelect.xml
index 88b9494..4267422 100644
--- a/1080i/DialogSelect.xml
+++ b/1080i/DialogSelect.xml
@@ -12,6 +12,25 @@
                 <!--animations-->
                 <include condition="!Player.hasVideo">modalDialogInOutVertical</include>
                 <control type="image">
+                    <visible>player.hasvideo</visible>
+                    <posx>-12</posx>
+                    <posy>-12</posy>
+                    <width>1176</width>
+                    <height>21-row</height>
+                    <texture>colors/black.png</texture>
+                    <colordiffuse>99FFFFFF</colordiffuse>
+                    <aspectratio>stretch</aspectratio>
+                </control>
+                <control type="image">
+                    <posx>-12</posx>
+                    <posy>-12</posy>
+                    <width>1176</width>
+                    <height>780</height>
+                    <texture>colors/black.png</texture>
+                    <colordiffuse>overlay</colordiffuse>
+                    <aspectratio>stretch</aspectratio>
+                </control>
+				<control type="image">
                     <posx>0</posx>
                     <posy>0</posy>
                     <width>16-col</width>
@@ -29,34 +48,6 @@
                     <font>dialogTitle</font>
                     <textcolor>textActive</textcolor>
                     <shadowcolor></shadowcolor>
-                </control>
-                <control type="image">
-                    <visible>player.hasvideo</visible>
-                    <posx>0</posx>
-                    <posy>2-row</posy>
-                    <width>16-col</width>
-                    <height>19-row</height>
-                    <texture>colors/black.png</texture>
-                    <colordiffuse>99FFFFFF</colordiffuse>
-                    <aspectratio>stretch</aspectratio>
-                </control>
-                <control type="image">
-                    <posx>0</posx>
-                    <posy>2-row</posy>
-                    <width>16-col</width>
-                    <height>19-row</height>
-                    <texture>colors/black.png</texture>
-                    <colordiffuse>overlay</colordiffuse>
-                    <aspectratio>stretch</aspectratio>
-                </control>
-                <control type="image">
-                    <posx>12-col</posx>
-                    <posy>2-row</posy>
-                    <width>4-col</width>
-                    <height>19-row</height>
-                    <texture>colors/black.png</texture>
-                    <colordiffuse>overlay</colordiffuse>
-                    <aspectratio>stretch</aspectratio>
                 </control>
 				<!--page scrollbar-->
 	            <control type="group" id="8001">
@@ -73,13 +64,13 @@
                     <!--Used in search from cast listing etc-->
                     <control type="panel" id="3">
                         <posx>0</posx>
-                        <posy>73</posy>
+                        <posy>84</posy>
                         <width>12-col</width>
                         <height>681</height>
                         <onright>9999</onright>
 						<onleft>60</onleft>
 						<pagecontrol>60</pagecontrol>
-                        <itemlayout height="72" width="12-col">
+                        <itemlayout height="84" width="12-col">
                             <control type="image">
 								<visible>!ListItem.IsSelected</visible>
                                 <posx>0</posx>
@@ -114,7 +105,7 @@
                                 <label>$INFO[ListItem.Label]</label>
                             </control>
                         </itemlayout>
-                        <focusedlayout height="72" width="12-col">
+                        <focusedlayout height="84" width="12-col">
                             <control type="image">
 								<visible>!ListItem.IsSelected</visible>
                                 <posx>0</posx>
@@ -168,12 +159,12 @@
                     <!--skin selection etc-->
                     <control type="panel" id="6">
                         <posx>0</posx>
-                        <posy>73</posy>
+                        <posy>84</posy>
                         <width>12-col</width>
                         <height>19-row</height>
                         <onright>9999</onright>
 						<onleft>60</onleft>
-                        <itemlayout height="72" width="12-col">
+                        <itemlayout height="84" width="12-col">
                             <control type="image">
                                 <posx>0</posx>
                                 <posy>0</posy>
@@ -194,7 +185,7 @@
                                 <label>$INFO[ListItem.Label]</label>
                             </control>
                         </itemlayout>
-                        <focusedlayout height="72" width="12-col">
+                        <focusedlayout height="84" width="12-col">
                             <control type="image">
                                 <posx>0</posx>
                                 <posy>0</posy>
@@ -234,7 +225,7 @@
                 <!--OK / Cancel-->
                 <control type="panel" id="9999">
                     <posx>12-col</posx>
-                    <posy>73</posy>
+                    <posy>84</posy>
                     <width>4-col</width>
                     <height>6-row</height>
                     <orientation>vertical</orientation>
diff --git a/1080i/DialogSettings.xml b/1080i/DialogSettings.xml
index 731194c..080c550 100644
--- a/1080i/DialogSettings.xml
+++ b/1080i/DialogSettings.xml
@@ -14,22 +14,22 @@
             <!--animations-->
             <include>modalDialogInOutVertical</include>
             <control type="image">
-                <posx>0</posx>
-                <posy>0</posy>
-                <width>16-col</width>
-                <height>20-row</height>
+                <posx>-12</posx>
+                <posy>-12</posy>
+                <width>1176</width>
+                <height>768</height>
                 <texture>colors/black.png</texture>
                 <colordiffuse>overlay</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
-			<control type="image">
-                <visible>player.hasvideo</visible>
-                <posx>0</posx>
-                <posy>0</posy>
-                <width>16-col</width>
-                <height>20-row</height>
+            <control type="image">
+				<visible>player.hasvideo</visible>
+                <posx>-12</posx>
+                <posy>-12</posy>
+                <width>1176</width>
+                <height>768</height>
                 <texture>colors/black.png</texture>
-                <colordiffuse>99FFFFFF</colordiffuse>
+                <colordiffuse>overlay</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
 			<control type="image">
@@ -41,15 +41,6 @@
                 <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
-            <control type="image">
-                <posx>0</posx>
-                <posy>2-row</posy>
-                <width>12-col</width>
-                <height>18-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>overlay</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
             <control type="label" id="2">
                 <posx>24</posx>
                 <posy>0</posy>
@@ -63,9 +54,9 @@
             <control type="grouplist" id="5">
                 <description>control area</description>
                 <posx>0</posx>
-                <posy>2-row</posy>
+                <posy>84</posy>
                 <width>12-col</width>
-                <height>18-row</height>
+                <height>654</height>
                 <onright>9000</onright>
                 <onup>5</onup>
                 <ondown>5</ondown>
@@ -105,7 +96,7 @@
             <!--dialog control buttons-->
             <control type="panel" id="9000">
                 <posx>12-col</posx>
-                <posy>2-row</posy>
+                <posy>84</posy>
                 <width>4-col</width>
                 <height>6-row</height>
                 <orientation>vertical</orientation>
diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml
index f3748f0..956f431 100644
--- a/1080i/DialogVideoInfo.xml
+++ b/1080i/DialogVideoInfo.xml
@@ -198,7 +198,7 @@
             <!--dialog controls-->
             <control type="panel" id="8000">
                 <posx>12</posx>
-                <posy>23-row</posy>
+                <posy>25-row</posy>
                 <width>10-col</width>
                 <height>6-row</height>
                 <itemgap>3</itemgap>
@@ -308,6 +308,7 @@
                         <onclick>SendClick(2003,10)</onclick>
                     </item>
                     <item>
+						<visible>false</visible>
                         <label>31169</label>
                         <label2></label2>
                         <thumb></thumb>
diff --git a/1080i/FileBrowser.xml b/1080i/FileBrowser.xml
index 46f4503..153a071 100644
--- a/1080i/FileBrowser.xml
+++ b/1080i/FileBrowser.xml
@@ -41,6 +41,15 @@
             <posy>row-3-begin</posy>
             <!--animations-->
             <include>modalDialogInOutVertical</include>
+            <control type="image">
+                <posx>-12</posx>
+                <posy>-12</posy>
+                <width>1178</width>
+                <height>792</height>
+                <texture>colors/black.png</texture>
+                <colordiffuse>overlay</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
             <control type="image">
                 <posx>0</posx>
                 <posy>0</posy>
@@ -60,24 +69,6 @@
                 <label>10126</label>
                 <textcolor>textActive</textcolor>
                 <shadowcolor></shadowcolor>
-            </control>
-            <control type="image">
-                <posx>0</posx>
-                <posy>2-row</posy>
-                <width>16-col</width>
-                <height>722</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>overlay</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
-            <control type="image">
-                <posx>12-col</posx>
-                <posy>2-row</posy>
-                <width>4-col</width>
-                <height>722</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>overlay</colordiffuse>
-                <aspectratio>stretch</aspectratio>
             </control>
 			<!--page scrollbar-->
             <control type="group" id="8000">
@@ -93,13 +84,13 @@
             </control>
             <control type="panel" id="450">
                 <posx>0</posx>
-                <posy>75</posy>
+                <posy>86</posy>
                 <width>12-col</width>
-                <height>20-row</height>
+                <height>19-row</height>
                 <onright>9000</onright>
 				<onleft>60</onleft>
 				<pagecontrol>60</pagecontrol>
-                <itemlayout height="72" width="12-col">
+                <itemlayout height="84" width="12-col">
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
@@ -120,7 +111,7 @@
                         <label>$INFO[ListItem.Label]</label>
                     </control>
                 </itemlayout>
-                <focusedlayout height="75" width="12-col">
+                <focusedlayout height="84" width="12-col">
                     <control type="image">
                         <posx>1-col</posx>
                         <posy>0</posy>
@@ -138,6 +129,7 @@
                         <height>69</height>
                         <aspectratio scalediffuse="false">stretch</aspectratio>
                         <texture fallback="colors/white.png" border="0">$INFO[Listitem.thumb]</texture>
+						<colordiffuse>highlight</colordiffuse>
                         <animation type="focus" loop="false" reversible="false">
                             <effect type="fade" time="500"/>
                             <effect type="rotatey" end="360" center="33" tween="back" easing="out" time="1000"/>
@@ -170,7 +162,7 @@
             <!--OK / Cancel / New folder buttons-->
             <control type="panel" id="9000">
                 <posx>12-col</posx>
-                <posy>2-row</posy>
+                <posy>86</posy>
                 <width>4-col</width>
                 <height>6-row</height>
                 <orientation>vertical</orientation>
diff --git a/1080i/FileManager.xml b/1080i/FileManager.xml
index 75ee549..d5083e2 100644
--- a/1080i/FileManager.xml
+++ b/1080i/FileManager.xml
@@ -14,6 +14,15 @@
             <control type="group">
                 <posx>col-4-begin</posx>
                 <posy>row-5-begin</posy>
+                <control type="image">
+                    <posx>-12</posx>
+                    <posy>-12</posy>
+                    <width>1320</width>
+                    <height>720</height>
+                    <texture>colors/black.png</texture>
+                    <colordiffuse>overlay</colordiffuse>
+                    <aspectratio>stretch</aspectratio>
+                </control>
                 <control type="image">
                     <posx>0</posx>
                     <posy>0</posy>
@@ -34,28 +43,10 @@
                     <textcolor>textActive</textcolor>
                     <shadowcolor></shadowcolor>
                 </control>
-                <control type="image">
+				<control type="image">
                     <posx>0</posx>
                     <posy>2-row</posy>
                     <width>18-col</width>
-                    <height>660</height>
-                    <texture>colors/black.png</texture>
-                    <colordiffuse>overlay</colordiffuse>
-                    <aspectratio>stretch</aspectratio>
-                </control>
-				<control type="image">
-                    <posx>0</posx>
-                    <posy>2-row</posy>
-                    <width>9-col-textbox</width>
-                    <height>71</height>
-                    <texture>colors/black.png</texture>
-					<colordiffuse>overlay</colordiffuse>
-                    <aspectratio>stretch</aspectratio>
-                </control>
-				<control type="image">
-                    <posx>9-col</posx>
-                    <posy>2-row</posy>
-                    <width>9-col</width>
                     <height>71</height>
                     <texture>colors/black.png</texture>
 					<colordiffuse>overlay</colordiffuse>
@@ -65,13 +56,13 @@
             <!--left panel-->
             <control type="group">
                 <posx>col-4-begin</posx>
-                <posy>row-7-begin</posy>
+                <posy>270</posy>
                 <control type="label" id="101">
                     <description>Header Label</description>
                     <posx>24</posx>
                     <posy>0</posy>
                     <height>2-row</height>
-                    <width>8-col-gutter</width>
+                    <width>636</width>
                     <label></label>
                     <font>itemTitle</font>
                     <textcolor>textActive</textcolor>
@@ -91,8 +82,8 @@
                 <!--left file list-->
                 <control type="list" id="20">
                     <posx>0</posx>
-                    <posy>2-row</posy>
-                    <width>9-col</width>
+                    <posy>84</posy>
+                    <width>636</width>
                     <height>15-row</height>
                     <onright>21</onright>
 					<onleft>60</onleft>
@@ -162,7 +153,7 @@
                 </control>
                 <control type="list" id="21">
                     <posx>0</posx>
-                    <posy>2-row</posy>
+                    <posy>84</posy>
                     <width>9-col</width>
                     <height>15-row</height>
                     <onleft>20</onleft>
diff --git a/1080i/Home.xml b/1080i/Home.xml
index 21fc866..f4c7c28 100644
--- a/1080i/Home.xml
+++ b/1080i/Home.xml
@@ -9,271 +9,376 @@
 	<controls>
 		<include>globalBackground</include>
 		<control type="group">
-			<control type="multiimage">
-				<animation effect="fade" start="0" end="100" time="1000">WindowOpen</animation>
-				<include>dimensionsFullscreen</include>
-				<imagepath>$VAR[homeBackgroundLocation]</imagepath>
-				<timeperimage>45000</timeperimage>
-				<fadetime>200</fadetime>
-				<pauseatend>10000</pauseatend>
-				<randomize>true</randomize>
-				<loop>yes</loop>
-				<aspectratio>scale</aspectratio>
-				<colordiffuse>99ffffff</colordiffuse>
-			</control>
-			<control type="image">
-				<include>dimensionsFullscreen</include>
-				<texture>vignette.png</texture>
-				<colordiffuse>ffffffff</colordiffuse>
-				<aspectratio>stretch</aspectratio>
-			</control>
-		</control>
-		<!--mini window-->
-		<include>miniVideoPlayer</include>
-		<!--main menu-->
-		<control type="panel" id="9000">
-			<animation type="conditional" condition="control.hasfocus(9999)" reversible="true">
-				<effect type="fade" start="100" end="0" time="500" delay="0"/>
+			<animation type="conditional" condition="control.hasfocus(8001) | control.hasfocus(8002)">
+				<effect type="slide" start="0,0" end="0,-80" tween="sine" time="400"/>
 			</animation>
-			<posx>col-5-begin</posx>
-			<animation condition="string.isEqual(Container(9000).NumItems,1)" effect="slide" end="432,0" time="0">conditional</animation>
-			<animation condition="string.isEqual(Container(9000).NumItems,2)" effect="slide" end="288,0" time="0">conditional</animation>
-			<animation condition="string.isEqual(Container(9000).NumItems,3)" effect="slide" end="144,0" time="0">conditional</animation>			
-			<posy>row-12-begin</posy>
-			<width>18-col</width>
-			<height>12-row</height>
-			<ondown>setfocus(9001,1)</ondown>
-			<orientation>vertical</orientation>
-			<itemlayout width="4-col" height="3-row">
-				<control type="image">
-					<posx>0</posx>
-					<posy>0</posy>
-					<width>4-col-textbox</width>
-					<height>105</height>
-					<texture>colors/black.png</texture>
-					<colordiffuse>77000000</colordiffuse>
-					<aspectratio>stretch</aspectratio>
-				</control>
-				<control type="textbox">
-					<posx>12</posx>
-					<posy>0</posy>
-					<width>252</width>
-					<height>3-row</height>
-					<font>dialogTitle</font>
-					<wrapmultiline>true</wrapmultiline>
-					<aligny>center</aligny>
-					<align>center</align>
-					<textcolor>textActive</textcolor>
-					<shadowcolor></shadowcolor>
-					<label>[CAPITALIZE]$INFO[ListItem.label][/CAPITALIZE]</label>
-				</control>
-			</itemlayout>
-			<focusedlayout width="4-col" height="3-row">
-				<control type="image">
-					<posx>0</posx>
-					<posy>0</posy>
-					<width>4-col-textbox</width>
-					<height>105</height>
-					<texture>colors/white.png</texture>
-					<colordiffuse>highlight</colordiffuse>
-					<aspectratio>stretch</aspectratio>
-				</control>
-				<control type="textbox">
-					<posx>12</posx>
-					<posy>0</posy>
-					<width>252</width>
-					<height>3-row</height>
-					<font>dialogTitle</font>
-					<wrapmultiline>true</wrapmultiline>
-					<aligny>center</aligny>
-					<align>center</align>
-					<textcolor>textActive</textcolor>
-					<shadowcolor></shadowcolor>
-					<label>[CAPITALIZE]$INFO[ListItem.label][/CAPITALIZE]</label>
-				</control>
-			</focusedlayout>
-			<content>
-				<include>skinshortcuts-mainmenu</include>
-			</content>
-		</control>
-		<!--power / settings-->
-		<control type="group">
-			<posx>851</posx>
-			<posy>row-26-begin</posy>
-			<control type="panel" id="9001">
+			<!--player controls and options-->
+			<control type="group">
 				<posx>0</posx>
-				<posy>18</posy>
-				<width>4-col</width>
-				<height>1-col</height>
-				<orientation>horizontal</orientation>
-				<onup>9000</onup>
-				<itemlayout width="1-col" height="1-col">
-					<control type="label">
-						<posx>0.5</posx>
-						<posy>-1</posy>
-						<width>1-col</width>
-						<height>1-col</height>
-						<font>symbolLarge</font>
-						<align>center</align>
-						<aligny>center</aligny>
-						<textcolor>textActive</textcolor>
-						<shadowcolor></shadowcolor>
-						<label>$INFO[ListItem.label]</label>
-					</control>
-				</itemlayout>
-				<focusedlayout width="1-col" height="1-col">
+				<posy>1080</posy>
+				<control type="image">
+	                <posx></posx>
+	                <posy>0</posy>
+	                <width>fullscreenWidth</width>
+	                <height>3-row</height>
+	                <texture>colors/black.png</texture>
+	                <colordiffuse>ffffffff</colordiffuse>
+	                <aspectratio>stretch</aspectratio>
+	            </control>
+				<!--player controls-->
+				<control type="panel" id="8001">
+					<posx>col-1-begin</posx>
+	                <posy>6</posy>
+	                <width>7-col</width>
+	                <height>2-row</height>
+	                <itemgap>0</itemgap>
+	                <onleft>8001</onleft>
+					<onright>8001</onright>
+	                <onup>9001</onup>
+	                <orientation>horizontal</orientation>
+	                <itemlayout width="1-col" height="2-row">
+	                    <control type="label">
+	                        <posx>0</posx>
+	                        <posy>0</posy>
+	                        <width>1-col</width>
+	                        <height>2-row</height>
+	                        <align>center</align>
+	                        <aligny>center</aligny>
+	                        <font>symbol</font>
+	                        <textcolor>textActive</textcolor>
+	                        <label>$INFO[ListItem.label2]</label>
+	                    </control>
+	                </itemlayout>
+	                <focusedlayout width="1-col" height="2-row">
+	                    <control type="image">
+	                        <posx>0</posx>
+	                        <posy>0</posy>
+	                        <width>1-col</width>
+	                        <height>69</height>
+	                        <aspectratio>stretch</aspectratio>
+	                        <texture>colors/white.png</texture>
+							<colordiffuse>highlight</colordiffuse>
+	                    </control>
+	                    <control type="label">
+	                        <posx>0</posx>
+	                        <posy>0</posy>
+	                        <width>1-col</width>
+	                        <height>2-row</height>
+	                        <align>center</align>
+	                        <aligny>center</aligny>
+	                        <font>symbol</font>
+	                        <textcolor>textActive</textcolor>
+	                        <label>$INFO[ListItem.label2]</label>
+	                        <shadowcolor></shadowcolor>
+	                    </control>
+	                </focusedlayout>
+	                <content>
+	                    <item>
+	                        <description>Playlist</description>
+	                        <label2></label2>
+	                        <thumb></thumb>
+	                        <onclick>activateWindow(musicplaylist)</onclick>
+	                    </item>
+	                    <item>
+	                        <description>Previous</description>
+	                        <label2></label2>
+	                        <thumb></thumb>
+	                        <onclick>PlayerControl(previous)</onclick>
+	                    </item>
+	                    <item>
+	                        <description>Stop</description>
+	                        <label2></label2>
+	                        <thumb></thumb>
+	                        <onclick>PlayerControl(stop)</onclick>
+	                        <onclick>Dialog.Close(1103)</onclick>
+	                    </item>
+	                    <item>
+	                        <visible>Player.Playing | player.forwarding | player.rewinding</visible>
+	                        <description>Play/Pause</description>
+	                        <label2></label2>
+	                        <thumb></thumb>
+	                        <onclick>PlayerControl(play)</onclick>
+	                    </item>
+	                    <item>
+	                        <visible>Player.Paused</visible>
+	                        <description>Pause</description>
+	                        <label2></label2>
+	                        <thumb></thumb>
+	                        <onclick>PlayerControl(play)</onclick>
+	                    </item>
+	                    <item>
+	                        <description>Next Chapter</description>
+	                        <label2></label2>
+	                        <thumb></thumb>
+	                        <onclick>PlayerControl(next)</onclick>
+	                    </item>
+	                </content>
+	            </control>            
+			</control>
+			<control type="group">
+				<control type="image">
+				   <include>dimensionsFullscreen</include>
+		           <texture>colors/black.png</texture>
+		           <colordiffuse>ffFFFFFF</colordiffuse>
+		           <aspectratio>stretch</aspectratio>
+		       </control>
+				<control type="multiimage">
+					<animation effect="fade" start="0" end="100" time="1000">WindowOpen</animation>
+					<include>dimensionsFullscreen</include>
+					<imagepath>$VAR[homeBackgroundLocation]</imagepath>
+					<timeperimage>45000</timeperimage>
+					<fadetime>200</fadetime>
+					<pauseatend>10000</pauseatend>
+					<randomize>true</randomize>
+					<loop>yes</loop>
+					<aspectratio>scale</aspectratio>
+					<colordiffuse>99ffffff</colordiffuse>
+				</control>
+				<control type="image">
+					<include>dimensionsFullscreen</include>
+					<texture>vignette.png</texture>
+					<colordiffuse>ffffffff</colordiffuse>
+					<aspectratio>stretch</aspectratio>
+				</control>
+			</control>
+			<!--mini window-->
+			<include>miniVideoPlayer</include>
+			<!--main menu-->
+			<control type="panel" id="9000">
+				<animation type="conditional" condition="control.hasfocus(9999)" reversible="true">
+					<effect type="fade" start="100" end="0" time="500" delay="0"/>
+				</animation>
+				<posx>col-5-begin</posx>
+				<animation condition="string.isEqual(Container(9000).NumItems,1)" effect="slide" end="432,0" time="0">conditional</animation>
+				<animation condition="string.isEqual(Container(9000).NumItems,2)" effect="slide" end="288,0" time="0">conditional</animation>
+				<animation condition="string.isEqual(Container(9000).NumItems,3)" effect="slide" end="144,0" time="0">conditional</animation>			
+				<posy>row-12-begin</posy>
+				<width>18-col</width>
+				<height>12-row</height>
+				<ondown>setfocus(9001,1)</ondown>
+				<orientation>vertical</orientation>
+				<itemlayout width="4-col" height="3-row">
 					<control type="image">
 						<posx>0</posx>
 						<posy>0</posy>
-						<width>1-col</width>
-						<height>1-col</height>
+						<width>4-col-textbox</width>
+						<height>105</height>
+						<texture>colors/black.png</texture>
+						<colordiffuse>77000000</colordiffuse>
 						<aspectratio>stretch</aspectratio>
-						<texture diffuse="masks/circle.png">colors/white.png</texture>
-						<colordiffuse>highlight</colordiffuse>
 					</control>
-					<control type="label">
-						<posx>0.5</posx>
-						<posy>-1</posy>
-						<width>1-col</width>
-						<height>1-col</height>
-						<font>symbolLarge</font>
-						<align>center</align>
+					<control type="textbox">
+						<posx>12</posx>
+						<posy>0</posy>
+						<width>252</width>
+						<height>3-row</height>
+						<font>dialogTitle</font>
+						<wrapmultiline>true</wrapmultiline>
 						<aligny>center</aligny>
+						<align>center</align>
 						<textcolor>textActive</textcolor>
 						<shadowcolor></shadowcolor>
-						<label>$INFO[ListItem.label]</label>
+						<label>[CAPITALIZE]$INFO[ListItem.label][/CAPITALIZE]</label>
+					</control>
+				</itemlayout>
+				<focusedlayout width="4-col" height="3-row">
+					<control type="image">
+						<posx>0</posx>
+						<posy>0</posy>
+						<width>4-col-textbox</width>
+						<height>105</height>
+						<texture>colors/white.png</texture>
+						<colordiffuse>highlight</colordiffuse>
+						<aspectratio>stretch</aspectratio>
+					</control>
+					<control type="textbox">
+						<posx>12</posx>
+						<posy>0</posy>
+						<width>252</width>
+						<height>3-row</height>
+						<font>dialogTitle</font>
+						<wrapmultiline>true</wrapmultiline>
+						<aligny>center</aligny>
+						<align>center</align>
+						<textcolor>textActive</textcolor>
+						<shadowcolor></shadowcolor>
+						<label>[CAPITALIZE]$INFO[ListItem.label][/CAPITALIZE]</label>
 					</control>
 				</focusedlayout>
 				<content>
-					<item>
-						<label></label>
-						<onclick>ActivateWindow(Settings)</onclick>
-					</item>
-					<item>
-						<visible>control.hasfocus(9999)</visible>
-						<label></label>
-						<onclick>setfocus(9000,0)</onclick>
-					</item>
-					<item>
-						<visible>!control.hasfocus(9999)</visible>
-						<label></label>
-						<onclick>setfocus(9999)</onclick>
-					</item>
-					<item>
-						<label></label>
-						<onclick>ActivateWindow(shutdownmenu)</onclick>
-					</item>
+					<include>skinshortcuts-mainmenu</include>
 				</content>
 			</control>
-		</control>
-		<!--Date / time and weather-->
-		<control type="group">
-			<posx>col-1-begin</posx>
-			<posy>row-8-begin</posy>
-			<animation type="conditional" condition="control.hasfocus(9999) + !player.hasaudio" reversible="true">
-				<effect type="slide" start="0,0" end="0,538" time="200" delay="0"/>
-			</animation>
-			<animation type="conditional" condition="control.hasfocus(9999) + player.hasaudio" reversible="true">
-				<effect type="slide" start="0,0" end="0,484" time="200" delay="0"/>
-			</animation>
-			<control type="label">
-				<posx>0</posx>
-				<posy>-48</posy>
-				<width>24-col</width>
-				<height>2-row</height>
-				<align>center</align>
-				<font>veryLarge</font>
-				<textcolor>textActive</textcolor>
-				<shadowcolor>44000000</shadowcolor>
-				<label>$INFO[System.Time]</label>
-			</control>
-			<control type="label">
-				<visible>$EXP[hasWeather]</visible>
-				<posx>0</posx>
-				<posy>1-row</posy>
-				<width>24-col</width>
-				<height>2-row</height>
-				<font>regular</font>
-				<align>center</align>
-				<textcolor>textActive</textcolor>
-				<shadowcolor>44000000</shadowcolor>
-				<label>$INFO[System.Date(DDD)] [B]$INFO[System.Date(dd)][/B] $INFO[System.Date(MMM)] [B]$INFO[weather.temperature][/B] [CAPITALIZE]$INFO[weather.conditions][/CAPITALIZE]</label>
-			</control>
-			<control type="label">
-				<visible>!$EXP[hasWeather]</visible>
-				<posx>0</posx>
-				<posy>1-row</posy>
-				<width>24-col</width>
-				<height>2-row</height>
-				<font>regular</font>
-				<align>center</align>
-				<textcolor>textActive</textcolor>
-				<shadowcolor>44000000</shadowcolor>
-				<label>$INFO[System.Date(DDD)] [B]$INFO[System.Date(dd)][/B] $INFO[System.Date(MMM)]</label>
-			</control>
-		</control>
-		<!--now playing music-->
-		<control type="group">
-			<visible>player.hasaudio</visible>
-			<posx>col-1-begin</posx>
-			<posy>row-24-begin</posy>
-			<control type="grouplist">
-				<posx>0</posx>
-				<posy>8</posy>
-				<width>24-col</width>
-				<align>center</align>
-				<itemgap>18</itemgap>
-				<orientation>horizontal</orientation>
-				<control type="image">
-					<visible>!player.paused + !Skin.HasSetting(lowPowerMode)</visible>
-					<posx>0</posx>
-					<posy>0</posy>
-					<width>1-col-gutter</width>
-					<height>1-col-gutter</height>
-					<texture>equaliser.gif</texture>
+			<!--power / settings-->
+			<control type="group">
+				<posx>851</posx>
+				<posy>row-26-begin</posy>
+				<control type="panel" id="9001">
+					<posx>38</posx>
+					<posy>18</posy>
+					<width>4-col</width>
+					<height>1-col</height>
+					<orientation>horizontal</orientation>
+					<onup>9000</onup>
+					<ondown>8001</ondown>
+					<itemlayout width="1-col" height="1-col">
+						<control type="label">
+							<posx>0.5</posx>
+							<posy>-1</posy>
+							<width>1-col</width>
+							<height>1-col</height>
+							<font>symbolLarge</font>
+							<align>center</align>
+							<aligny>center</aligny>
+							<textcolor>textActive</textcolor>
+							<shadowcolor></shadowcolor>
+							<label>$INFO[ListItem.label]</label>
+						</control>
+					</itemlayout>
+					<focusedlayout width="1-col" height="1-col">
+						<control type="image">
+							<posx>0</posx>
+							<posy>0</posy>
+							<width>1-col</width>
+							<height>1-col</height>
+							<aspectratio>stretch</aspectratio>
+							<texture diffuse="masks/circle.png">colors/white.png</texture>
+							<colordiffuse>highlight</colordiffuse>
+						</control>
+						<control type="label">
+							<posx>0.5</posx>
+							<posy>-1</posy>
+							<width>1-col</width>
+							<height>1-col</height>
+							<font>symbolLarge</font>
+							<align>center</align>
+							<aligny>center</aligny>
+							<textcolor>textActive</textcolor>
+							<shadowcolor></shadowcolor>
+							<label>$INFO[ListItem.label]</label>
+						</control>
+					</focusedlayout>
+					<content>
+						<item>
+							<label></label>
+							<onclick>ActivateWindow(Settings)</onclick>
+						</item>					
+						<item>
+							<label></label>
+							<onclick>ActivateWindow(shutdownmenu)</onclick>
+						</item>
+					</content>
 				</control>
+			</control>
+			<!--Date / time and weather-->
+			<control type="group">
+				<posx>col-1-begin</posx>
+				<posy>row-8-begin</posy>
+				<animation type="conditional" condition="control.hasfocus(9999) + !player.hasaudio" reversible="true">
+					<effect type="slide" start="0,0" end="0,538" time="200" delay="0"/>
+				</animation>
+				<animation type="conditional" condition="control.hasfocus(9999) + player.hasaudio" reversible="true">
+					<effect type="slide" start="0,0" end="0,484" time="200" delay="0"/>
+				</animation>
 				<control type="label">
-					<visible>!player.paused + Skin.HasSetting(lowPowerMode)</visible>
 					<posx>0</posx>
-					<posy>0</posy>
-					<width>1-col-gutter</width>
+					<posy>-48</posy>
+					<width>24-col</width>
 					<height>2-row</height>
 					<align>center</align>
-					<aligny>center</aligny>
-					<font>symbolLarge</font>
+					<font>veryLarge</font>
 					<textcolor>textActive</textcolor>
-					<shadowcolor></shadowcolor>
-					<label></label>
+					<shadowcolor>44000000</shadowcolor>
+					<label>$INFO[System.Time]</label>
 				</control>
 				<control type="label">
-					<visible>player.paused</visible>
+					<visible>$EXP[hasWeather]</visible>
 					<posx>0</posx>
-					<posy>0</posy>
-					<width>1-col-gutter</width>
+					<posy>1-row</posy>
+					<width>24-col</width>
 					<height>2-row</height>
+					<font>regular</font>
 					<align>center</align>
-					<aligny>center</aligny>
-					<font>symbolLarge</font>
 					<textcolor>textActive</textcolor>
-					<shadowcolor></shadowcolor>
-					<label></label>
+					<shadowcolor>44000000</shadowcolor>
+					<label>$INFO[System.Date(DDD)] [B]$INFO[System.Date(dd)][/B] $INFO[System.Date(MMM)] [B]$INFO[weather.temperature][/B] [CAPITALIZE]$INFO[weather.conditions][/CAPITALIZE]</label>
 				</control>
 				<control type="label">
-					<description>Artist</description>
+					<visible>!$EXP[hasWeather]</visible>
 					<posx>0</posx>
-					<posy>0</posy>
-					<font>small</font>
-					<width>auto</width>
+					<posy>1-row</posy>
+					<width>24-col</width>
 					<height>2-row</height>
+					<font>regular</font>
 					<align>center</align>
-					<aligny>center</aligny>
-					<label>$INFO[MusicPlayer.TimeRemaining,, ][B]$INFO[musicplayer.Artist,, ][/B]$INFO[MusicPlayer.Title]</label>
-					<scroll>true</scroll>
 					<textcolor>textActive</textcolor>
-					<wrapmultiline>false</wrapmultiline>
+					<shadowcolor>44000000</shadowcolor>
+					<label>$INFO[System.Date(DDD)] [B]$INFO[System.Date(dd)][/B] $INFO[System.Date(MMM)]</label>
 				</control>
 			</control>
-		</control>
+			<!--now playing music-->
+			<control type="group">
+				<visible>player.hasaudio</visible>
+				<posx>col-1-begin</posx>
+				<posy>row-24-begin</posy>
+				<control type="grouplist">
+					<posx>0</posx>
+					<posy>8</posy>
+					<width>24-col</width>
+					<align>center</align>
+					<itemgap>18</itemgap>
+					<orientation>horizontal</orientation>
+					<control type="image">
+						<visible>!player.paused + !Skin.HasSetting(lowPowerMode)</visible>
+						<posx>0</posx>
+						<posy>0</posy>
+						<width>1-col-gutter</width>
+						<height>1-col-gutter</height>
+						<texture>equaliser.gif</texture>
+					</control>
+					<control type="label">
+						<visible>!player.paused + Skin.HasSetting(lowPowerMode)</visible>
+						<posx>0</posx>
+						<posy>0</posy>
+						<width>1-col-gutter</width>
+						<height>2-row</height>
+						<align>center</align>
+						<aligny>center</aligny>
+						<font>symbolLarge</font>
+						<textcolor>textActive</textcolor>
+						<shadowcolor></shadowcolor>
+						<label></label>
+					</control>
+					<control type="label">
+						<visible>player.paused</visible>
+						<posx>0</posx>
+						<posy>0</posy>
+						<width>1-col-gutter</width>
+						<height>2-row</height>
+						<align>center</align>
+						<aligny>center</aligny>
+						<font>symbolLarge</font>
+						<textcolor>textActive</textcolor>
+						<shadowcolor></shadowcolor>
+						<label></label>
+					</control>
+					<control type="label">
+						<description>Artist</description>
+						<posx>0</posx>
+						<posy>0</posy>
+						<font>small</font>
+						<width>auto</width>
+						<height>2-row</height>
+						<align>center</align>
+						<aligny>center</aligny>
+						<label>$INFO[MusicPlayer.TimeRemaining,, ][B]$INFO[musicplayer.Artist,, ][/B]$INFO[MusicPlayer.Title]</label>
+						<scroll>true</scroll>
+						<textcolor>textActive</textcolor>
+						<wrapmultiline>false</wrapmultiline>
+					</control>
+				</control>
+			</control>
+		</control>	
 		<control type="button" id="9999">
             <posx>-500</posx>
             <posy>0</posy>
diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml
index 626a296..6cf158c 100644
--- a/1080i/Includes_variables.xml
+++ b/1080i/Includes_variables.xml
@@ -54,8 +54,8 @@
     </variable>
     <!--Music player shuffle state-->
     <variable name="shuffleState">
-        <value condition="Playlist.IsRandom">$LOCALIZE[191]: $LOCALIZE[16041]</value>
-        <value condition="!Playlist.IsRandom">$LOCALIZE[191]: $LOCALIZE[16039]</value>
+        <value condition="Playlist.IsRandom">$LOCALIZE[16041]</value>
+        <value condition="!Playlist.IsRandom">$LOCALIZE[16039]</value>
     </variable>
     <!--offset song view, show artist / album if parent view is active-->
     <variable name="songViewArtist">
diff --git a/1080i/LoginScreen.xml b/1080i/LoginScreen.xml
index 8b6bf35..6451cf0 100644
--- a/1080i/LoginScreen.xml
+++ b/1080i/LoginScreen.xml
@@ -9,6 +9,16 @@
             <!--animations-->
             <include>modalDialogInOutVertical</include>
             <control type="image">
+                <posx>-12</posx>
+                <posy>-12</posy>
+                <width>456</width>
+                <height>408</height>
+                <aspectratio>stretch</aspectratio>
+                <texture>colors/black.png</texture>
+                <bordersize>0</bordersize>
+                <colordiffuse>overlay</colordiffuse>
+            </control>
+			<control type="image">
                 <posx>0</posx>
                 <posy>0</posy>
                 <width>6-col</width>
@@ -29,17 +39,17 @@
             </control>
             <control type="list" id="52">
                 <posx>0</posx>
-                <posy>6-row</posy>
+                <posy>228</posy>
                 <width>6-col</width>
                 <height>7-row</height>
-                <itemlayout width="6-col" height="2-row">
+                <itemlayout width="6-col" height="84">
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
                         <width>69</width>
                         <height>2-row</height>
                         <aspectratio>stretch</aspectratio>
-                        <texture fallback="colors/black.png" border="0">$INFO[Listitem.thumb]</texture>
+                        <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.thumb]</texture>
                     </control>
                     <control type="image">
                         <posx>1-col</posx>
@@ -62,7 +72,7 @@
                         <label>$INFO[ListItem.label]</label>
                     </control>
                 </itemlayout>
-                <focusedlayout width="6-col" height="2-row">
+                <focusedlayout width="6-col" height="84">
                       <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
diff --git a/1080i/MyPVRGuide.xml b/1080i/MyPVRGuide.xml
index 5ecdd4d..e645957 100644
--- a/1080i/MyPVRGuide.xml
+++ b/1080i/MyPVRGuide.xml
@@ -57,12 +57,13 @@
 							<posy>3</posy>
 							<width>66</width>
 							<height>66</height>
-							<aspectratio scalediffuse="false">keep</aspectratio>
+							<aspectratio>keep</aspectratio>
 							<texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+							<colordiffuse>overlay</colordiffuse>
 						</control>
 						<control type="label">
 							<posx>1-col-indent</posx>
-							<width>4-col-gutter</width>
+							<width>198</width>
 							<height>2-row</height>
 							<font>itemTitle</font>
 							<textcolor>textActive</textcolor>
@@ -84,7 +85,7 @@
 							<posy>3</posy>
 							<width>66</width>
 							<height>66</height>
-							<aspectratio scalediffuse="false">keep</aspectratio>
+							<aspectratio>keep</aspectratio>
 							<texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
 							<animation type="focus" loop="false" reversible="false">
 								<effect type="fade" time="500"/>
@@ -93,7 +94,7 @@
 						</control>
 						<control type="label">
 							<posx>1-col-indent</posx>
-							<width>4-col-gutter</width>
+							<width>198</width>
 							<height>2-row</height>
 							<font>itemTitle</font>
 							<textcolor>textActive</textcolor>
@@ -109,8 +110,9 @@
 							<height>69</height>
 							<aspectratio>stretch</aspectratio>
 							<texture border="0">colors/black.png</texture>
-							<bordertexture colordiffuse="highlight">colors/white.png</bordertexture>
+							<bordertexture colordiffuse="">colors/black.png</bordertexture>
 							<bordersize>3,0,0,0</bordersize>
+							<colordiffuse>overlay</colordiffuse>
 						</control>
 						<control type="label" id="1">
 							<width>204</width>
diff --git a/1080i/MyPVRRecordings.xml b/1080i/MyPVRRecordings.xml
index f7c287a..876590f 100644
--- a/1080i/MyPVRRecordings.xml
+++ b/1080i/MyPVRRecordings.xml
@@ -48,6 +48,7 @@
                             <height>66</height>
                             <aspectratio scalediffuse="false">stretch</aspectratio>
                             <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+							<colordiffuse>overlay</colordiffuse>
                         </control>
                         <control type="label">
                             <visible>!String.IsEmpty(ListItem.playcount) + !ListItem.IsResumable</visible>
diff --git a/1080i/MyPrograms.xml b/1080i/MyPrograms.xml
index 9bebab2..6a5385c 100644
--- a/1080i/MyPrograms.xml
+++ b/1080i/MyPrograms.xml
@@ -34,7 +34,8 @@
 			                    <height>66</height>
 			                    <aspectratio scalediffuse="false">stretch</aspectratio>
 			                    <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
-			                </control>
+			                	<colordiffuse>overlay</colordiffuse>
+							</control>
 			                <control type="image">
 			                    <posx>1-col</posx>
 			                    <posy>0</posy>
@@ -42,7 +43,7 @@
 			                    <height>69</height>
 			                    <aspectratio>stretch</aspectratio>
 			                    <texture border="0">colors/black.png</texture>
-			                    <colordiffuse>textboxInactive</colordiffuse>
+			                    <colordiffuse>overlay</colordiffuse>
 			                </control>
 			                <control type="label">
 			                    <posx>1-col-indent</posx>
diff --git a/1080i/Settings.xml b/1080i/Settings.xml
index 9af7f2f..dc7eca3 100644
--- a/1080i/Settings.xml
+++ b/1080i/Settings.xml
@@ -12,6 +12,15 @@
             <posy>row-7-begin</posy>
             <!--animations-->
             <include>modalDialogInOutVertical</include>
+            <control type="image">
+                <posx>-12</posx>
+                <posy>-12</posy>
+                <width>1324</width>
+                <height>504</height>
+                <texture>colors/black.png</texture>
+                <colordiffuse>overlay</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
             <control type="image">
                 <posx>0</posx>
                 <posy>0</posy>
@@ -21,15 +30,6 @@
                 <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
-            <control type="image">
-                <posx>0</posx>
-                <posy>2-row</posy>
-                <width>18-col</width>
-                <height>12-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>overlay</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
             <control type="label">
                 <posx>24</posx>
                 <posy>0</posy>
@@ -43,8 +43,8 @@
             </control>
             <!--menu-->
             <control type="Panel" id="9000">
-                <posx>12</posx>
-                <posy>2-row</posy>
+                <posx>0</posx>
+                <posy>66</posy>
                 <width>18-col</width>
                 <height>12-col</height>
                 <ondown>9001</ondown>
diff --git a/1080i/SettingsCategory.xml b/1080i/SettingsCategory.xml
index 7999927..ffbfe0d 100644
--- a/1080i/SettingsCategory.xml
+++ b/1080i/SettingsCategory.xml
@@ -22,6 +22,15 @@
             <posy>row-5-begin</posy>
             <!--animations-->
             <include>modalDialogInOutVertical</include>
+            <control type="image">
+                <posx>-12</posx>
+                <posy>-12</posy>
+                <width>1320</width>
+                <height>720</height>
+                <texture>colors/black.png</texture>
+                <colordiffuse>overlay</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
             <control type="image">
                 <posx>0</posx>
                 <posy>0</posy>
@@ -31,23 +40,6 @@
                 <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
-            <control type="image">
-                <posx>0</posx>
-                <posy>71</posy>
-                <width>18-col</width>
-                <height>1</height>
-                <texture>colors/black.png</texture>
-                <aspectratio>stretch</aspectratio>
-            </control>
-            <control type="image">
-                <posx>0</posx>
-                <posy>2-row</posy>
-                <width>18-col</width>
-                <height>17-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>overlay</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
             <control type="label">
                 <posx>24</posx>
                 <posy>0</posy>
@@ -62,21 +54,21 @@
             <!--Category submenu-->
             <control type="button" id="1234">
                 <posx>0</posx>
-                <posy>17-row</posy>
+                <posy>624</posy>
                 <font>smallStrong</font>
                 <texturenofocus colordiffuse="11FFFFFF">colors/black.png</texturenofocus>
                 <label>[B][COLOR highlight]$LOCALIZE[21417]:[/COLOR][/B] $INFO[control.getlabel(20)]</label>
                 <onclick>SettingsLevelChange</onclick>
                 <onup>3</onup>
                 <onright>5</onright>
-				<width>286</width>
+				<width>276</width>
             </control>
             <control type="grouplist" id="3">
 				<animation type="conditional" condition="control.hasfocus(1234)">
 		            <effect type="fade" start="100" end="80" time="100"/>
 		        </animation>
                 <posx>0</posx>
-                <posy>2-row</posy>
+                <posy>84</posy>
                 <width></width>
                 <itemgap>0</itemgap>
                 <height>538</height>
@@ -87,20 +79,11 @@
                 <orientation>vertical</orientation>
             </control>
             <!--options-->
-            <control type="image">
-                <posx>4-col</posx>
-                <posy>2-row</posy>
-                <width>14-col</width>
-                <height>17-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>overlay</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
             <control type="grouplist" id="5">
                 <posx>4-col</posx>
-                <posy>2-row</posy>
+                <posy>84</posy>
                 <width>14-col</width>
-                <height>17-row</height>
+                <height>606</height>
                 <onleft>3</onleft>
                 <onright>3</onright>
                 <onup>5</onup>
@@ -138,7 +121,7 @@
             <!--subcat menu buttons-->
             <control type="togglebutton" id="10">
                 <description>Default Category Button</description>
-                <width>287</width>
+                <width>276</width>
                 <font>buttonTitle</font>
                 <texturefocus>colors/white.png</texturefocus>
                 <texturenofocus></texturenofocus>
diff --git a/1080i/SettingsProfile.xml b/1080i/SettingsProfile.xml
index 77dca82..4ab8645 100644
--- a/1080i/SettingsProfile.xml
+++ b/1080i/SettingsProfile.xml
@@ -13,6 +13,15 @@
                 <effect type="fade" start="100" end="0" time="300"/>
                 <effect type="rotatey" start="0" end="90" center="960" tween="cubic" easing="out" time="500"/>
             </animation>
+			<control type="image">
+                <posx>-12</posx>
+                <posy>-12</posy>
+                <width>600</width>
+                <height>768</height>
+                <texture>colors/black.png</texture>
+                <colordiffuse>overlay</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
             <control type="image">
                 <posx>0</posx>
                 <posy>0</posy>
@@ -33,18 +42,10 @@
                 <textcolor>textActive</textcolor>
                 <shadowcolor></shadowcolor>
             </control>
-            <control type="image">
-                <posx>0</posx>
-                <posy>2-row</posy>
-                <width>8-col</width>
-                <height>4-col</height>
-                <aspectratio aligny="center">scale</aspectratio>
-                <texture>vignette.png</texture>
-            </control>
             <control type="image">
                 <description>profile image</description>
                 <posx>0</posx>
-                <posy>73</posy>
+                <posy>84</posy>
                 <width>8-col</width>
                 <height>10-row</height>
                 <texture fallback="colors/black.png" border="0">$INFO[System.ProfileThumb]</texture>
@@ -52,25 +53,16 @@
             </control>
             <control type="image">
                 <posx>0</posx>
-                <posy>10-row</posy>
+                <posy>372</posy>
                 <width>8-col</width>
                 <height>73</height>
                 <texture>colors/black.png</texture>
                 <colordiffuse>textboxInactive</colordiffuse>
                 <aspectratio>stretch</aspectratio>
-            </control>
-			<control type="image">
-                <posx>0</posx>
-                <posy>12-row</posy>
-                <width>8-col</width>
-                <height>10-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>overlay</colordiffuse>
-                <aspectratio>stretch</aspectratio>
             </control>
              <control type="label">
                 <posx>0</posx>
-                <posy>10-row</posy>
+                <posy>372</posy>
                 <width>8-col</width>
                 <height>2-row</height>
                 <align>center</align>
@@ -84,7 +76,7 @@
             <control type="radiobutton" id="4">
                 <description>Enable Login Screen</description>
                 <posx>0</posx>
-                <posy>12-row</posy>
+                <posy>456</posy>
                 <width>8-col</width>
                 <label>20096</label>
                 <texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus>
@@ -93,30 +85,22 @@
             </control>
             <control type="panel" id="2">
                 <posx>0</posx>
-                <posy>507</posy>
+                <posy>540</posy>
                 <width>8-col</width>
-                <height>8-row</height>
+                <height>204</height>
                 <onup>4</onup>
-                <itemlayout width="8-col" height="2-row">
+                <itemlayout width="8-col" height="84">
+                    
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
                         <width>69</width>
                         <height>69</height>
                         <aspectratio>stretch</aspectratio>
-                        <texture fallback="colors/black.png">$INFO[listitem.icon]</texture>
+                        <texture fallback="colors/offblack.png">$INFO[listitem.icon]</texture>
                         <bordersize>0</bordersize>
                     </control>
-                    <control type="image">
-                        <posx>1-col</posx>
-                        <posy>0</posy>
-                        <width>7-col</width>
-                        <height>69</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture>colors/black.png</texture>
-                        <bordersize>0</bordersize>
-                        <colordiffuse>overlay</colordiffuse>
-                    </control>
+                 
                     <control type="label">
                         <posx>1-col-indent</posx>
                         <posy>0</posy>
@@ -128,7 +112,7 @@
                         <label>$INFO[ListItem.label]</label>
                     </control>
                 </itemlayout>
-                <focusedlayout width="8-col" height="2-row">
+                <focusedlayout width="8-col" height="84">
                     <control type="image">
                         <posx>1-col</posx>
                         <posy>0</posy>
diff --git a/1080i/SettingsSystemInfo.xml b/1080i/SettingsSystemInfo.xml
index 7a1ba6c..c7eaae6 100644
--- a/1080i/SettingsSystemInfo.xml
+++ b/1080i/SettingsSystemInfo.xml
@@ -91,7 +91,7 @@
             <include>modalDialogInOutVertical</include>
             <control type="panel">
                 <visible>container(95).hasfocus(1)</visible>
-                <posx>12</posx>
+                <posx>0</posx>
                 <posy>0</posy>
                 <width>24-col</width>
                 <height>21-row</height>
@@ -99,7 +99,7 @@
                 <itemlayout width="6-col" height="10-row">
                     <control type="image">
                         <posx>0</posx>
-                        <posy>12</posy>
+                        <posy>0</posy>
                         <width>6-col-gutter</width>
                         <height>9-row</height>
                         <aspectratio>stretch</aspectratio>
@@ -108,9 +108,9 @@
                         <colordiffuse>overlay</colordiffuse>
                     </control>
                     <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>6-col-gutter</width>
+                        <posx>12</posx>
+                        <posy>12</posy>
+                        <width>384</width>
                         <height>2-row</height>
                         <texture>colors/white.png</texture>
                         <colordiffuse>highlight</colordiffuse>
@@ -118,7 +118,7 @@
                     </control>
                     <control type="label">
                         <posx>0</posx>
-                        <posy>0</posy>
+                        <posy>12</posy>
                         <width>6-col-gutter</width>
                         <height>2-row</height>
                         <align>center</align>
@@ -148,58 +148,7 @@
                         <label>$INFO[ListItem.Label2]</label>
                     </control>
                 </itemlayout>
-                <focusedlayout>
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>12</posy>
-                        <width>6-col-gutter</width>
-                        <height>9-row</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture>colors/black.png</texture>
-                        <bordersize>0</bordersize>
-                        <colordiffuse>overlay</colordiffuse>
-                    </control>
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>6-col-gutter</width>
-                        <height>2-row</height>
-                        <texture>colors/white.png</texture>
-                        <colordiffuse>highlight</colordiffuse>
-                        <aspectratio>stretch</aspectratio>
-                    </control>
-                    <control type="label">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>6-col-gutter</width>
-                        <height>2-row</height>
-                        <align>center</align>
-                        <aligny>center</aligny>
-                        <font>dialogTitle</font>
-                        <label>$INFO[ListItem.Label]</label>
-                        <textcolor>textActive</textcolor>
-                        <shadowcolor></shadowcolor>
-                    </control>
-                    <control type="label">
-                        <posx>0</posx>
-                        <posy>row-3-begin</posy>
-                        <width>384</width>
-                        <align>center</align>
-                        <font>symbolVeryLarge</font>
-                        <textcolor>textActive</textcolor>
-                        <label>$INFO[ListItem.property(itemIcon)]</label>
-                    </control>
-                    <control type="textbox">
-                        <posx>12</posx>
-                        <posy>6-row</posy>
-                        <width>384</width>
-                        <align>center</align>
-                        <height>3-row</height>
-                        <font>itemSubTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <label>$INFO[ListItem.Label2]</label>
-                    </control>
-                </focusedlayout>
+				<focusedlayout />
                 <content>
                     <item id="1">
                         <description>XBMC Version</description>
diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml
index 35c5332..db950ec 100644
--- a/1080i/SkinSettings.xml
+++ b/1080i/SkinSettings.xml
@@ -10,6 +10,15 @@
             <posy>row-5-begin</posy>
             <!--animations-->
             <include>modalDialogInOutVertical</include>
+            <control type="image">
+                <posx>-12</posx>
+                <posy>-12</posy>
+                <width>1320</width>
+                <height>720</height>
+                <texture>colors/black.png</texture>
+                <colordiffuse>overlay</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
             <control type="image">
                 <posx>0</posx>
                 <posy>0</posy>
@@ -19,14 +28,6 @@
                 <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
-            <control type="image">
-                <posx>0</posx>
-                <posy>71</posy>
-                <width>18-col</width>
-                <height>1</height>
-                <texture>colors/black.png</texture>
-                <aspectratio>stretch</aspectratio>
-            </control>
             <!--title-->
             <control type="label">
                 <posx>24</posx>
@@ -38,15 +39,6 @@
                 <textcolor>textActive</textcolor>
                 <shadowcolor></shadowcolor>
             </control>
-            <control type="image">
-                <posx>0</posx>
-                <posy>2-row</posy>
-                <width>18-col</width>
-                <height>17-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>overlay</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
             <!--sub menu-->
             <control type="group">
                 <posx>0</posx>
@@ -54,8 +46,8 @@
                 <!-- Category buttons -->
                 <control type="list" id="8000">
                     <posx>0</posx>
-                    <posy>0</posy>
-                    <width>4-col</width>
+                    <posy>12</posy>
+                    <width>276</width>
                     <height>18-row</height>
                     <onright>200</onright>
                     <itemlayout height="2-row" width="4-col">
@@ -110,14 +102,14 @@
                 <posx>4-col</posx>
                 <posy>2-row</posy>
                 <width>14-col</width>
-                <height>17-row</height>
+                <height>624</height>
                 <texture>colors/black.png</texture>
                 <colordiffuse>overlay</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
             <control type="grouplist" id="200">
                 <posx>4-col</posx>
-                <posy>2-row</posy>
+                <posy>84</posy>
                 <width>14-col</width>
                 <height>17-row</height>
                 <onleft>8000</onleft>
diff --git a/1080i/VideoOSD.xml b/1080i/VideoOSD.xml
index 10c984d..fa90813 100644
--- a/1080i/VideoOSD.xml
+++ b/1080i/VideoOSD.xml
@@ -184,7 +184,7 @@
             <!--player controls-->
             <control type="panel" id="8001">
                 <posx>36</posx>
-                <posy>row-20-begin</posy>
+                <posy>row-21-begin</posy>
                 <width>10-col</width>
                 <height>2-row</height>
                 <itemgap>0</itemgap>
@@ -293,7 +293,7 @@
             <!--menu items-->
             <control type="panel" id="8002">
                 <posx>24</posx>
-                <posy>row-23-begin</posy>
+                <posy>row-24-begin</posy>
                 <width>9-col</width>
                 <height>12-row</height>
                 <itemgap>0</itemgap>
diff --git a/1080i/View_Albums.xml b/1080i/View_Albums.xml
index 76a4d52..c206adf 100644
--- a/1080i/View_Albums.xml
+++ b/1080i/View_Albums.xml
@@ -191,13 +191,14 @@
 	                <scrolltime tween="sine">250</scrolltime>
 	                <itemlayout width="293" height="360">
 	                    <control type="image">
-	                        <posx>0</posx>
-	                        <posy>0</posy>
-	                        <width>4-col-gutter</width>
-	                        <height>4-col-gutter</height>
+	                        <posx>-6</posx>
+	                        <posy>-6</posy>
+	                        <width>276</width>
+	                        <height>276</height>
 	                        <aspectratio>stretch</aspectratio>
 	                        <texture>colors/black.png</texture>
 	                        <bordersize>12</bordersize>
+							<colordiffuse>11FFFFFF</colordiffuse>
 	                    </control>
 						<control type="image">
 							<visible>!ListItem.IsParentFolder</visible>
diff --git a/1080i/View_ArtistAlbums.xml b/1080i/View_ArtistAlbums.xml
index 7ff9617..6521923 100644
--- a/1080i/View_ArtistAlbums.xml
+++ b/1080i/View_ArtistAlbums.xml
@@ -21,6 +21,7 @@
 					<colordiffuse>66ffffff</colordiffuse>
 				</control>
 				<control type="image">
+					<visible>!string.isempty(Container(52).Art(fanart))</visible>
 					<include>dimensionsFullscreen</include>
 					<texture>vignette.png</texture>
 					<colordiffuse>ffffffff</colordiffuse>
@@ -83,15 +84,16 @@
 					<orientation>horizontal</orientation>
 					<scrolltime tween="cubic" easing="out">600</scrolltime>
 					<itemlayout width="300" height="348">
-						<control type="image">
-							<posx>0</posx>
-							<posy>0</posy>
-							<width>4-col-gutter</width>
-							<height>4-col-gutter</height>
-							<aspectratio>stretch</aspectratio>
-							<texture>colors/black.png</texture>
-							<bordersize>12</bordersize>
-						</control>
+	                    <control type="image">
+	                        <posx>-6</posx>
+	                        <posy>-6</posy>
+	                        <width>276</width>
+	                        <height>276</height>
+	                        <aspectratio>stretch</aspectratio>
+	                        <texture>colors/black.png</texture>
+	                        <bordersize>12</bordersize>
+							<colordiffuse>11FFFFFF</colordiffuse>
+	                    </control>
 						<control type="image">
 							<posx>0</posx>
 							<posy>0</posy>
diff --git a/1080i/View_Episodes.xml b/1080i/View_Episodes.xml
index 7f7b040..4bf0b26 100644
--- a/1080i/View_Episodes.xml
+++ b/1080i/View_Episodes.xml
@@ -10,13 +10,19 @@
             <visible>String.Contains(container.folderpath,videodb://) + !String.IsEmpty(container.folderpath) + container.content(episodes) + !String.Contains(Container.folderpath,plugin)</visible>
             <posy>0</posy>
             <posx>0</posx>
+            <control type="image">
+                <include>dimensionsFullscreen</include>
+                <texture>colors/black.png</texture>
+                <colordiffuse>ffffffff</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
             <control type="image">
                 <visible>String.IsEmpty(container.art(season.poster))</visible>
                 <posx>0</posx>
                 <posy>0</posy>
                 <width>960</width>
                 <height>1080</height>
-                <aspectratio scalediffuse="false" aligny="bottom">scale</aspectratio>
+                <aspectratio aligny="bottom">scale</aspectratio>
                 <texture fallback="colors/black.png" border="0">$INFO[fanart.image]</texture>
                 <colordiffuse>ffffffff</colordiffuse>
             </control>
@@ -26,7 +32,7 @@
                 <posy>0</posy>
                 <width>960</width>
                 <height>1080</height>
-                <aspectratio scalediffuse="false">scale</aspectratio>
+                <aspectratio>scale</aspectratio>
                 <texture border="0">$INFO[container.art(season.poster)]</texture>
                 <colordiffuse>ccffffff</colordiffuse>
             </control>
@@ -36,15 +42,9 @@
                 <posy>row-25-begin</posy>
                 <width>4-col</width>
                 <height>2-col</height>
-                <texture>$INFO[ListItem.Art(tvshow.clearlogo)]</texture>
+                <texture>$INFO[ListItem.Art(clearlogo)]</texture>
                 <aspectratio align="left">keep</aspectratio>
             </control>
-            <control type="image">
-                <include>dimensionsFullscreen</include>
-                <texture>vignette.png</texture>
-                <colordiffuse>ffffffff</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
         </control>
         <!--overlay-->
         <control type="group">
diff --git a/1080i/View_Games.xml b/1080i/View_Games.xml
index 46bde23..5c29953 100644
--- a/1080i/View_Games.xml
+++ b/1080i/View_Games.xml
@@ -105,6 +105,7 @@
                     <height>66</height>
                     <aspectratio scalediffuse="false">stretch</aspectratio>
                     <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+					<colordiffuse>overlay</colordiffuse>
                 </control>
                 <control type="image">
                     <posx>1-col</posx>
@@ -113,7 +114,7 @@
                     <height>69</height>
                     <aspectratio>stretch</aspectratio>
                     <texture border="0">colors/black.png</texture>
-                    <colordiffuse>textboxInactive</colordiffuse>
+                    <colordiffuse>overlay</colordiffuse>
                 </control>
                 <control type="label">
                     <posx>1-col-indent</posx>
diff --git a/1080i/View_LiveTVChannels.xml b/1080i/View_LiveTVChannels.xml
index 00bbcdf..8c0c0ae 100644
--- a/1080i/View_LiveTVChannels.xml
+++ b/1080i/View_LiveTVChannels.xml
@@ -29,8 +29,9 @@
 						<posy>3</posy>
 						<width>66</width>
 						<height>66</height>
-						<aspectratio scalediffuse="false">keep</aspectratio>
+						<aspectratio>keep</aspectratio>
 						<texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+						<colordiffuse>overlay</colordiffuse>
 					</control>
 					<control type="label">
 						<posx>1-col-indent</posx>
@@ -104,7 +105,7 @@
 						<posy>3</posy>
 						<width>66</width>
 						<height>66</height>
-						<aspectratio scalediffuse="false">keep</aspectratio>
+						<aspectratio>keep</aspectratio>
 						<texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
 						<animation type="focus" loop="false" reversible="false">
 							<effect type="fade" time="500"/>
diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml
index 2f89dda..17674db 100644
--- a/1080i/View_Movies.xml
+++ b/1080i/View_Movies.xml
@@ -243,13 +243,14 @@
 					<scrolltime tween="sine">250</scrolltime>
 					<itemlayout width="252" height="438">
 						<control type="image">
-							<posx>0</posx>
-							<posy>0</posy>
-							<width>228</width>
-							<height>342</height>
+							<posx>-6</posx>
+							<posy>-6</posy>
+							<width>240</width>
+							<height>354</height>
 							<aspectratio>stretch</aspectratio>
 							<texture>colors/black.png</texture>
 							<bordersize>6</bordersize>
+							<colordiffuse>11FFFFFF</colordiffuse>
 						</control>
 						<control type="image">
 							<posx>0</posx>
diff --git a/1080i/View_MusicFiles.xml b/1080i/View_MusicFiles.xml
index 56306fd..230acf9 100644
--- a/1080i/View_MusicFiles.xml
+++ b/1080i/View_MusicFiles.xml
@@ -24,6 +24,7 @@
                         <height>66</height>
                         <aspectratio scalediffuse="false">stretch</aspectratio>
                         <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+						<colordiffuse>overlay</colordiffuse>
                     </control>
                     <control type="image">
                         <posx>1-col</posx>
@@ -32,7 +33,7 @@
                         <height>69</height>
                         <aspectratio>stretch</aspectratio>
                         <texture border="0">colors/black.png</texture>
-                        <colordiffuse>textboxInactive</colordiffuse>
+                        <colordiffuse>overlay</colordiffuse>
                     </control>
                     <control type="label">
                         <posx>1-col-indent</posx>
diff --git a/1080i/View_MusicGenres.xml b/1080i/View_MusicGenres.xml
index 73650c8..2fce28a 100644
--- a/1080i/View_MusicGenres.xml
+++ b/1080i/View_MusicGenres.xml
@@ -21,6 +21,7 @@
                     <height>66</height>
                     <aspectratio scalediffuse="false">stretch</aspectratio>
                     <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+					<colordiffuse>overlay</colordiffuse>
                 </control>
                 <control type="label">
                     <posx>1-col-indent</posx>
diff --git a/1080i/View_MusicPlaylist.xml b/1080i/View_MusicPlaylist.xml
index 624753f..289f80e 100644
--- a/1080i/View_MusicPlaylist.xml
+++ b/1080i/View_MusicPlaylist.xml
@@ -38,7 +38,7 @@
                         <colordiffuse>overlay</colordiffuse>
                     </control>
 					<control type="image">
-						<animation type="conditional" condition="player.paused">
+						<animation type="conditional" condition="true">
 							<effect type="fade" start="100" end="50" time="0"/>
 						</animation>
 						<visible>ListItem.IsPlaying</visible>
@@ -107,8 +107,8 @@
                         <posy>0</posy>
                         <width>105</width>
                         <height>105</height>
-                        <aspectratio scalediffuse="false">stretch</aspectratio>
-						<bordersize>6</bordersize>
+                        <aspectratio>scale</aspectratio>
+						<bordersize>1</bordersize>
                         <texture fallback="colors/black.png" border="0">$INFO[Listitem.thumb]</texture>
                     </control>
                     <control type="label">
@@ -206,8 +206,8 @@
                         <posy>0</posy>
                         <width>105</width>
                         <height>105</height>
-						<bordersize>6</bordersize>
-                        <aspectratio scalediffuse="false">stretch</aspectratio>
+						<bordersize>1</bordersize>
+                        <aspectratio>scale</aspectratio>
                         <texture fallback="colors/black.png" border="0">$INFO[Listitem.thumb]</texture>
                         <animation type="focus" loop="false" reversible="false">
                             <effect type="fade" time="500"/>
diff --git a/1080i/View_Photos.xml b/1080i/View_Photos.xml
index 1393506..bfe3fcb 100644
--- a/1080i/View_Photos.xml
+++ b/1080i/View_Photos.xml
@@ -207,7 +207,7 @@
                     <height>69</height>
                     <aspectratio>stretch</aspectratio>
                     <texture border="0">colors/black.png</texture>
-                    <colordiffuse>textboxInactive</colordiffuse>
+                    <colordiffuse>overlay</colordiffuse>
                 </control>
                 <control type="label">
                     <posx>1-col-indent</posx>
diff --git a/1080i/View_Seasons.xml b/1080i/View_Seasons.xml
index d11005c..2ac8009 100644
--- a/1080i/View_Seasons.xml
+++ b/1080i/View_Seasons.xml
@@ -70,7 +70,17 @@
                     <onright>58</onright>
                     <orientation>horizontal</orientation>
                     <itemlayout width="4-col" height="391">
-                        <control type="image">
+						<control type="image">
+							<posx>-3</posx>
+							<posy>-3</posy>
+							<width>258</width>
+							<height>384</height>
+							<aspectratio>stretch</aspectratio>
+							<texture>colors/black.png</texture>
+							<bordersize>6</bordersize>
+							<colordiffuse>overlay</colordiffuse>
+						</control>
+						<control type="image">
                             <posx>0</posx>
                             <posy>0</posy>
                             <width>252</width>
diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml
index e668585..861d4f2 100644
--- a/1080i/View_TVShows.xml
+++ b/1080i/View_TVShows.xml
@@ -254,13 +254,14 @@
 				<scrolltime tween="sine">250</scrolltime>
 				<itemlayout width="252" height="438">
 					<control type="image">
-						<posx>0</posx>
-						<posy>0</posy>
-						<width>228</width>
-						<height>342</height>
+						<posx>-6</posx>
+						<posy>-6</posy>
+						<width>240</width>
+						<height>354</height>
 						<aspectratio>stretch</aspectratio>
 						<texture>colors/black.png</texture>
 						<bordersize>6</bordersize>
+						<colordiffuse>11FFFFFF</colordiffuse>
 					</control>
 					<control type="image">
 						<posx>0</posx>
diff --git a/1080i/View_VideoFiles.xml b/1080i/View_VideoFiles.xml
index 77c0f18..a20aa17 100644
--- a/1080i/View_VideoFiles.xml
+++ b/1080i/View_VideoFiles.xml
@@ -31,6 +31,7 @@
                     <height>66</height>
                     <aspectratio scalediffuse="false">stretch</aspectratio>
                     <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+					<colordiffuse>overlay</colordiffuse>
                 </control>
                 <control type="image">
                     <posx>1-col</posx>
@@ -39,7 +40,7 @@
                     <height>69</height>
                     <aspectratio>stretch</aspectratio>
                     <texture border="0">colors/black.png</texture>
-                    <colordiffuse>textboxInactive</colordiffuse>
+                    <colordiffuse>overlay</colordiffuse>
                 </control>
                 <control type="label">
                     <posx>1-col-indent</posx>
diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml
index 90aebad..f008331 100644
--- a/1080i/custom_musicPlayerFullscreen.xml
+++ b/1080i/custom_musicPlayerFullscreen.xml
@@ -183,6 +183,12 @@
 		                    </control>
 		                </focusedlayout>
 		                <content>
+		                    <item>
+		                        <description>Playlist</description>
+		                        <label2></label2>
+		                        <thumb></thumb>
+		                        <onclick>activateWindow(musicplaylist)</onclick>
+		                    </item>
 		                    <item>
 		                        <description>Previous</description>
 		                        <label2></label2>
@@ -220,14 +226,14 @@
 		            </control>
 		            <!--final options-->
 		            <control type="panel" id="8002">
-		                <posx>6-col</posx>
+		                <posx>23-col</posx>
 		                <posy>6</posy>
 		                <width>20-col</width>
 		                <height>2-row</height>
 		                <orientation>horizontal</orientation>
 		                <onup>Control.SetFocus(9876)</onup>
 		                <onleft>Control.SetFocus(8001,4)</onleft>
-		                <itemlayout width="4-col" height="2-row">
+		                <itemlayout width="1-col" height="2-row">
 		                    <control type="label">
 		                        <posx>0</posx>
 		                        <posy>0</posy>
@@ -235,39 +241,20 @@
 		                        <height>2-row</height>
 		                        <align>center</align>
 		                        <aligny>center</aligny>
-		                        <font>symbolLarge</font>
+		                        <font>symbol</font>
 		                        <textcolor>textActive</textcolor>
 		                        <label>$INFO[ListItem.label2]</label>
 		                    </control>
-		                    <control type="label">
-		                        <posx>1-col-indent</posx>
-		                        <posy>0</posy>
-		                        <width>3-col-gutter</width>
-		                        <height>2-row</height>
-		                        <aligny>center</aligny>
-		                        <font>thumbTitle</font>
-		                        <textcolor>textActive</textcolor>
-		                        <label>$INFO[ListItem.label]</label>
-		                    </control>
 		                </itemlayout>
-		                <focusedlayout width="4-col" height="2-row">
+		                <focusedlayout width="1-col" height="2-row">
 		                    <control type="image">
 		                        <posx>0</posx>
 		                        <posy>0</posy>
 		                        <width>1-col</width>
-		                        <height>2-row</height>
+		                        <height>69</height>
 		                        <aspectratio>stretch</aspectratio>
 		                        <texture>colors/white.png</texture>
-		                        <colordiffuse>highlight</colordiffuse>
-		                    </control>
-		                    <control type="image">
-		                        <posx>1-col</posx>
-		                        <posy>0</posy>
-		                        <width>3-col-gutter</width>
-		                        <height>2-row</height>
-		                        <aspectratio>stretch</aspectratio>
-		                        <texture>colors/white.png</texture>
-		                        <colordiffuse>eeffffff</colordiffuse>
+								<colordiffuse>highlight</colordiffuse>
 		                    </control>
 		                    <control type="label">
 		                        <posx>0</posx>
@@ -276,46 +263,13 @@
 		                        <height>2-row</height>
 		                        <align>center</align>
 		                        <aligny>center</aligny>
-		                        <font>symbolLarge</font>
+		                        <font>symbol</font>
 		                        <textcolor>textActive</textcolor>
 		                        <label>$INFO[ListItem.label2]</label>
 		                        <shadowcolor></shadowcolor>
 		                    </control>
-		                    <control type="label">
-		                        <posx>1-col-indent</posx>
-		                        <posy>0</posy>
-		                        <width>3-col-gutter</width>
-		                        <height>2-row</height>
-		                        <aligny>center</aligny>
-		                        <font>thumbTitle</font>
-		                        <textcolor>black</textcolor>
-		                        <label>$INFO[ListItem.label]</label>
-		                    </control>
 		                </focusedlayout>
 		                <content>
-		                    <item>
-		                        <description>Playlist</description>
-		                        <label>31123</label>
-		                        <label2></label2>
-		                        <thumb></thumb>
-		                        <onclick>Dialog.Close(all,true)</onclick>
-		                        <onclick>activateWindow(musicplaylist)</onclick>
-		                    </item>
-		                    <item>
-		                        <description>Repeat</description>
-		                        <label>$VAR[repeatState]</label>
-		                        <label2></label2>
-		                        <thumb></thumb>
-		                        <onclick>PlayerControl(Repeat)</onclick>
-		                    </item>
-		                    <item>
-		                        <description>Shuffle</description>
-		                        <label>$VAR[shuffleState]</label>
-		                        <label2></label2>
-		                        <thumb></thumb>
-		                        <onclick condition="!Playlist.IsRandom">PlayerControl(RandomOn)</onclick>
-		                        <onclick condition="Playlist.IsRandom">PlayerControl(RandomOff)</onclick>
-		                    </item>
 		                    <item>
 		                        <description>Visualisation</description>
 		                        <label>250</label>
@@ -343,6 +297,7 @@
 			<height>1-col</height>
 			<width>1-col</width>
 			<onclick>control.setfocus(8001)</onclick>
+			<ondown>control.setfocus(8001)</ondown>
 			<oninfo>control.setfocus(8001)</oninfo>
 		</control>
 		<!--debugging-->
diff --git a/1080i/script-skinshortcuts.xml b/1080i/script-skinshortcuts.xml
index 086414c..7e89f5d 100644
--- a/1080i/script-skinshortcuts.xml
+++ b/1080i/script-skinshortcuts.xml
@@ -11,6 +11,15 @@
             <posy>row-5-begin</posy>
             <!--animations-->
             <include>modalDialogInOutVertical</include>
+            <control type="image">
+                <posx>-12</posx>
+                <posy>-12</posy>
+                <width>1320</width>
+                <height>708</height>
+                <texture>colors/black.png</texture>
+                <colordiffuse>overlay</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
             <control type="image">
                 <posx>0</posx>
                 <posy>0</posy>
@@ -38,21 +47,12 @@
                 <label>$LOCALIZE[31228]</label>
                 <textcolor>textActive</textcolor>
                 <shadowcolor></shadowcolor>
-            </control>
-            <control type="image">
-                <posx>0</posx>
-                <posy>2-row</posy>
-                <width>18-col</width>
-                <height>17-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>overlay</colordiffuse>
-                <aspectratio>stretch</aspectratio>
             </control>
 			<!--options-->
             <control type="grouplist" id="300">
                 <posx>0</posx>
-                <posy>2-row</posy>
-                <width>4-col</width>
+                <posy>84</posy>
+                <width>276</width>
 				<height>17-row</height>
 				<itemgap>0</itemgap>
                 <control type="button" id="301">
@@ -100,18 +100,9 @@
             </control>
 			<!-- id 211 - Current shortcuts -->
 			<!--options-->
-            <control type="image">
-                <posx>4-col</posx>
-                <posy>2-row</posy>
-                <width>14-col</width>
-                <height>17-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>overlay</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
             <control type="list" id="211">
                 <posx>4-col</posx>
-                <posy>2-row</posy>
+                <posy>84</posy>
                 <width>14-col</width>
                 <height>17-row</height>
                 <onleft>300</onleft>