diff --git a/1080i/Defaults.xml b/1080i/Defaults.xml
index d67e2b3..83d36b3 100644
--- a/1080i/Defaults.xml
+++ b/1080i/Defaults.xml
@@ -203,8 +203,8 @@
         <align>center</align>
         <aligny>center</aligny>
         <shadowcolor>-</shadowcolor>
-        <texturefocus>colors/keyselected.png</texturefocus>
-        <texturenofocus>colors/offblack.png</texturenofocus>
+        <texturefocus colordiffuse="textboxInactive">colors/black.png</texturefocus>
+        <texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus>
         <pulseonselect>false</pulseonselect>
     </default>
 </includes>
diff --git a/1080i/DialogContentSettings.xml b/1080i/DialogContentSettings.xml
index 164bffa..5631dc4 100644
--- a/1080i/DialogContentSettings.xml
+++ b/1080i/DialogContentSettings.xml
@@ -5,44 +5,48 @@
     <controls>
         <!--background-->
         <include>globalBackground</include>
-        <control type="image">
-            <include>dimensionsFullscreen</include>
-            <texture>colors/black.png</texture>
-            <aspectratio>stretch</aspectratio>
-            <colordiffuse>99ffffff</colordiffuse>
-        </control>
+
         <control type="group">
             <posx>col-5-begin</posx>
             <posy>row-2-begin</posy>
             <!--animations-->
             <include>modalDialogInOutVertical</include>
             <control type="image">
-                <posx>-384</posx>
-                <posy>44</posy>
-                <width>fullscreenWidth</width>
-                <height>1-row</height>
+                <posx>0</posx>
+                <posy>0</posy>
+                <width>16-col</width>
+                <height>2-row</height>
                 <texture>colors/white.png</texture>
-                <colordiffuse>ffffffff</colordiffuse>
+                <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
             <control type="image">
-                <posx>-3</posx>
-                <posy>44</posy>
-                <width>3</width>
-                <height>1-row</height>
+                <posx>0</posx>
+                <posy>2-row</posy>
+                <width>16-col</width>
+                <height>22-row</height>
                 <texture>colors/black.png</texture>
-                <colordiffuse>ffffffff</colordiffuse>
+                <colordiffuse>overlay</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
+            <control type="image">
+                <posx>12-col</posx>
+                <posy>2-row</posy>
+                <width>4-col</width>
+                <height>22-row</height>
+                <texture>colors/black.png</texture>
+                <colordiffuse>overlay</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
             <control type="label">
-                <description>header label</description>
-                <posx>12</posx>
-                <posy>44</posy>
+                <posx>24</posx>
+                <posy>0</posy>
                 <width>16-col</width>
+                <height>2-row</height>
+                <aligny>center</aligny>
                 <font>dialogTitle</font>
+                <textcolor>textActive</textcolor>
                 <label>31033</label>
-                <textcolor>black</textcolor>
-                <shadowcolor>-</shadowcolor>
             </control>
             <!--dialog options-->
             <control type="spincontrolex" id="20">
@@ -59,6 +63,8 @@
                 <posx>12</posx>
                 <posy>2-row</posy>
                 <width>12-col</width>
+                <height>2-row</height>
+                <aligny>center</aligny>
                 <label>31031</label>
                 <font>itemTitle</font>
                 <textcolor>textActive</textcolor>
@@ -70,6 +76,8 @@
                 <posx>12</posx>
                 <posy>2-row</posy>
                 <width>12-col</width>
+                <height>2-row</height>
+                <aligny>center</aligny>
                 <label>31031</label>
                 <font>itemTitle</font>
                 <textcolor>black</textcolor>
@@ -78,105 +86,92 @@
             <!--scraper selection-->
             <control type="label">
                 <posx>12</posx>
-                <posy>199</posy>
+                <posy>5-row</posy>
                 <width>6-col</width>
                 <label>31137</label>
-                <font>itemSubTitleCondensed</font>
+                <font>itemSubTitle</font>
                 <textcolor>textActive</textcolor>
                 <shadowcolor>-</shadowcolor>
             </control>
-            <control type="image">
-                <posx>12</posx>
-                <posy>256</posy>
-                <width>12-col</width>
-                <height>4-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>77ffffff</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
             <control type="panel" id="21">
                 <posx>12</posx>
-                <posy>256</posy>
+                <posy>6-row</posy>
                 <width>12-col</width>
-                <height>4-row</height>
+                <height>4-col</height>
                 <onup>20</onup>
                 <ondown>22</ondown>
                 <onright>9001</onright>
-                <itemlayout width="12-col" height="1-row">
+                <itemlayout width="3-col" height="3-col">
                     <control type="image">
                         <posx>0</posx>
-                        <posy>2</posy>
-                        <width>12-col</width>
-                        <height>53</height>
+                        <posy>0</posy>
+                        <width>3-col-gutter</width>
+                        <height>3-col-gutter</height>
                         <aspectratio>stretch</aspectratio>
-                        <texture>colors/offblack.png</texture>
-                        <colordiffuse>99FFFFFF</colordiffuse>
+                        <texture border="3">colors/black.png</texture>
+                        <bordertexture colordiffuse="33FFFFFF">colors/white.png</bordertexture>
+                        <bordersize>3</bordersize>
+                        <colordiffuse>textboxInactive</colordiffuse>
+                    </control>
+                    <control type="label">
+                        <posx>12</posx>
+                        <posy>1-row</posy>
+                        <width>162</width>
+                        <height>3-row</height>
+                        <align>center</align>
+                        <aligny>center</aligny>
+                        <font>itemSubTitle</font>
+                        <wrapmultiline>true</wrapmultiline>
+                        <textcolor>disabled</textcolor>
+                        <label>$INFO[ListItem.label]</label>
                     </control>
                     <control type="image">
-                        <posx>1</posx>
-                        <posy>4</posy>
-                        <width>50</width>
-                        <height>50</height>
-                        <aspectratio>scale</aspectratio>
-                        <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.icon]</texture>
-                    </control>
-                    <control type="label">
-                        <posx>1-col</posx>
+                        <posx>0</posx>
                         <posy>0</posy>
-                        <width>10-col-gutter</width>
-                        <label>$INFO[ListItem.Label]</label>
-                        <font>itemTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <shadowcolor>-</shadowcolor>
-                    </control>
-                    <control type="label">
-                        <visible>ListItem.IsSelected</visible>
-                        <posx>48r</posx>
-                        <posy>1</posy>
-                        <width>40</width>
-                        <font>symbol</font>
-                        <textcolor>textActive</textcolor>
-                        <shadowcolor>-</shadowcolor>
-                        <label></label>
+                        <width>3-col-gutter</width>
+                        <height>3-col-gutter</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture border="0">$INFO[Listitem.thumb]</texture>
+                        <bordertexture border="3" colordiffuse="33FFFFFF">colors/white.png</bordertexture>
+                        <bordersize>3</bordersize>
+                        <colordiffuse>ffFFFFFF</colordiffuse>
                     </control>
                 </itemlayout>
-                <focusedlayout width="12-col" height="1-row">
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>2</posy>
-                        <width>12-col</width>
-                        <height>53</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture>colors/white.png</texture>
-                    </control>
-                    <control type="image">
-                        <posx>1</posx>
-                        <posy>4</posy>
-                        <width>50</width>
-                        <height>50</height>
-                        <aspectratio>scale</aspectratio>
-                        <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.icon]</texture>
-                    </control>
-                    <control type="label">
-                        <posx>1-col</posx>
-                        <posy>0</posy>
-                        <width>10-col-gutter</width>
-                        <label>$INFO[ListItem.Label]</label>
-                        <font>itemTitle</font>
-                        <textcolor>black</textcolor>
-                        <selectedcolor>black</selectedcolor>
-                        <shadowcolor>-</shadowcolor>
-                    </control>
-                    <control type="label">
-                        <visible>ListItem.IsSelected</visible>
-                        <posx>48r</posx>
-                        <posy>1</posy>
-                        <width>40</width>
-                        <font>symbol</font>
-                        <textcolor>black</textcolor>
-                        <selectedcolor>black</selectedcolor>
-                        <shadowcolor>-</shadowcolor>
-                        <label></label>
+                <focusedlayout width="3-col" height="3-col">
+                    <control type="group">
+                        <include>spinFocusPoster</include>
+                        <control type="image">
+                            <posx>0</posx>
+                            <posy>0</posy>
+                            <width>3-col-gutter</width>
+                            <height>3-col-gutter</height>
+                            <aspectratio>stretch</aspectratio>
+                            <texture border="0">colors/offblack.png</texture>
+                            <bordertexture border="3" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
+                            <bordersize>3</bordersize>
+                            <colordiffuse>ffFFFFFF</colordiffuse>
+                        </control>
+                        <control type="image">
+                            <posx>3</posx>
+                            <posy>3</posy>
+                            <width>186</width>
+                            <height>186</height>
+                            <aspectratio>stretch</aspectratio>
+                            <texture border="0">colors/black.png</texture>
+                            <colordiffuse>ccFFFFFF</colordiffuse>
+                        </control>
+                        <control type="label">
+                            <posx>12</posx>
+                            <posy>1-row</posy>
+                            <width>162</width>
+                            <height>3-row</height>
+                            <align>center</align>
+                            <aligny>center</aligny>
+                            <font>itemSubTitle</font>
+                            <wrapmultiline>true</wrapmultiline>
+                            <textcolor>textActive</textcolor>
+                            <label>$INFO[ListItem.label]</label>
+                        </control>
                     </control>
                 </focusedlayout>
             </control>
@@ -184,17 +179,9 @@
             <control type="button" id="22">
                 <description>Specific media type settings</description>
                 <posx>0</posx>
-                <posy>9-row</posy>
+                <posy>14-row</posy>
                 <label>31042</label>
-                <font>itemTitle</font>
                 <width>12-col</width>
-                <height>54</height>
-                <align>left</align>
-                <textcolor>textActive</textcolor>
-                <focusedcolor>black</focusedcolor>
-                <texturefocus>colors/white.png</texturefocus>
-                <texturenofocus>-</texturenofocus>
-                <textoffsetx>12</textoffsetx>
                 <onup>21</onup>
                 <ondown>5</ondown>
                 <onright>9001</onright>
@@ -203,9 +190,9 @@
             <control type="grouplist" id="5">
                 <description>Control Area</description>
                 <posx>0</posx>
-                <posy>10-row</posy>
+                <posy>16-row</posy>
                 <width>12-col</width>
-                <height>6-row</height>
+                <height>8-row</height>
                 <itemgap>0</itemgap>
                 <onup>22</onup>
                 <onright>9001</onright>
@@ -219,64 +206,74 @@
             </control>
             <!--OK / Cancel-->
             <control type="panel" id="9001">
-                <posx>876</posx>
-                <posy>110</posy>
+                <posx>12-col</posx>
+                <posy>2-row</posy>
                 <width>4-col</width>
                 <height>5-row</height>
                 <itemgap>0</itemgap>
                 <orientation>vertical</orientation>
                 <onleft>20</onleft>
-                <itemlayout width="4-col" height="1-row">
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>2</posy>
-                        <width>4-col</width>
-                        <height>53</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture>colors/black.png</texture>
-                    </control>
+                <itemlayout width="4-col" height="2-row">
                     <control type="label">
-                        <posx>24</posx>
+                        <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>
                     <control type="label">
-                        <posx>1-col</posx>
+                        <posx>1-col-indent</posx>
                         <posy>-1</posy>
-                        <width>3-col</width>
-                        <font>menuTitle</font>
+                        <width>4-col-gutter</width>
+                        <height>2-row</height>
+                        <aligny>center</aligny>
+                        <font>buttonTitle</font>
                         <textcolor>textActive</textcolor>
                         <label>$INFO[ListItem.label]</label>
-                        <shadowcolor>-</shadowcolor>
                     </control>
                 </itemlayout>
-                <focusedlayout width="4-col" height="1-row">
+                <focusedlayout width="4-col" height="2-row">
                     <control type="image">
                         <posx>0</posx>
-                        <posy>2</posy>
+                        <posy>0</posy>
+                        <width>1-col</width>
+                        <height>2-row</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture>colors/white.png</texture>
+                        <colordiffuse>highlight</colordiffuse>
+                        <include>spinFocusIcon</include>
+                    </control>
+                    <control type="image">
+                        <posx>1-col</posx>
+                        <posy>0</posy>
                         <width>4-col</width>
-                        <height>53</height>
+                        <height>2-row</height>
                         <aspectratio>stretch</aspectratio>
                         <texture>colors/white.png</texture>
                     </control>
                     <control type="label">
-                        <posx>24</posx>
+                        <posx>0</posx>
                         <posy>0</posy>
                         <width>1-col</width>
+                        <height>2-row</height>
+                        <align>center</align>
+                        <aligny>center</aligny>
                         <font>symbol</font>
-                        <textcolor>black</textcolor>
+                        <textcolor>textActive</textcolor>
                         <label>$INFO[ListItem.label2]</label>
                         <shadowcolor>-</shadowcolor>
                     </control>
                     <control type="label">
-                        <posx>1-col</posx>
+                        <posx>1-col-indent</posx>
                         <posy>-1</posy>
-                        <width>3-col</width>
-                        <font>menuTitle</font>
+                        <width>4-col-gutter</width>
+                        <height>2-row</height>
+                        <aligny>center</aligny>
+                        <font>buttonTitle</font>
                         <textcolor>black</textcolor>
                         <label>$INFO[ListItem.label]</label>
                         <shadowcolor>-</shadowcolor>
diff --git a/1080i/DialogMediaSource.xml b/1080i/DialogMediaSource.xml
index 0bb56af..0595c07 100644
--- a/1080i/DialogMediaSource.xml
+++ b/1080i/DialogMediaSource.xml
@@ -10,14 +10,14 @@
         <!--background-->
         <include>globalBackground</include>
         <control type="group" id="9001">
-            <posx>col-4-begin</posx>
+            <posx>col-5-begin</posx>
             <posy>row-3-begin</posy>
             <!--animations-->
             <include>modalDialogInOutVertical</include>
             <control type="image">
                 <posx>0</posx>
                 <posy>0</posy>
-                <width>18-col</width>
+                <width>16-col</width>
                 <height>2-row</height>
                 <texture>colors/white.png</texture>
                 <colordiffuse>highlight</colordiffuse>
@@ -26,8 +26,17 @@
             <control type="image">
                 <posx>0</posx>
                 <posy>2-row</posy>
-                <width>18-col</width>
-                <height>18-row</height>
+                <width>16-col</width>
+                <height>16-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>16-row</height>
                 <texture>colors/black.png</texture>
                 <colordiffuse>overlay</colordiffuse>
                 <aspectratio>stretch</aspectratio>
@@ -52,15 +61,15 @@
                     <posx>24</posx>
                     <posy>0</posy>
                     <width>16-col</width>
-                    <font>itemSubTitleCondensed</font>
+                    <font>itemSubTitle</font>
                     <label>1021</label>
                     <textcolor>textActive</textcolor>
                     <shadowcolor>-</shadowcolor>
                 </control>
                 <control type="image">
-                    <posx>0</posx>
-                    <posy>3-row</posy>
-                    <width>12-col-gutter</width>
+                    <posx>24</posx>
+                    <posy>2-row</posy>
+                    <width>11-col</width>
                     <height>5-row</height>
                     <texture>colors/black.png</texture>
                     <colordiffuse>77ffffff</colordiffuse>
@@ -68,9 +77,9 @@
                 </control>
                 <!--path list-->
                 <control type="panel" id="10">
-                    <posx>0</posx>
-                    <posy>3-row</posy>
-                    <width>12-col-gutter</width>
+                    <posx>24</posx>
+                    <posy>2-row</posy>
+                    <width>11-col</width>
                     <height>4-row</height>
                     <onright>8000</onright>
                     <ondown>12</ondown>
@@ -81,17 +90,18 @@
                             <posx>0</posx>
                             <posy>0</posy>
                             <width>12-col</width>
-                            <height>53</height>
+                            <height>2-row</height>
                             <aspectratio>stretch</aspectratio>
-                            <texture>colors/offblack.png</texture>
+                            <texture>colors/black.png</texture>
                             <bordersize>0</bordersize>
-                            <colordiffuse>99FFFFFF</colordiffuse>
+                            <colordiffuse>overlay</colordiffuse>
                         </control>
                         <control type="label">
                             <posx>12</posx>
-                            <posy>-1</posy>
+                            <posy>0</posy>
                             <width>12-col</width>
-                            <height>1-row</height>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
                             <font>itemTitle</font>
                             <textcolor>textActive</textcolor>
                             <selectedcolor>selected</selectedcolor>
@@ -104,7 +114,7 @@
                             <posx>0</posx>
                             <posy>0</posy>
                             <width>12-col</width>
-                            <height>53</height>
+                            <height>2-row</height>
                             <aspectratio>stretch</aspectratio>
                             <texture>colors/white.png</texture>
                             <bordersize>0</bordersize>
@@ -112,9 +122,10 @@
                         </control>
                         <control type="label">
                             <posx>12</posx>
-                            <posy>-1</posy>
+                            <posy>0</posy>
                             <width>12-col</width>
-                            <height>1-row</height>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
                             <font>itemTitle</font>
                             <textcolor>black</textcolor>
                             <selectedcolor>black</selectedcolor>
@@ -127,18 +138,19 @@
                 <control type="label">
                     <description>Name label</description>
                     <posx>24</posx>
-                    <posy>11-row</posy>
-                    <width>12-col-gutter</width>
-                    <font>itemTitle</font>
+                    <posy>8-row</posy>
+                    <width>11-col</width>
+                    <font>itemSubtitle</font>
                     <label>31045</label>
                     <textcolor>textActive</textcolor>
                     <shadowcolor>-</shadowcolor>
                 </control>
                 <control type="edit" id="12">
                     <description>Name Button</description>
-                    <posx>0</posx>
-                    <posy>13-row</posy>
-                    <width>9-col-gutter</width>
+                    <posx>24</posx>
+                    <posy>10-row</posy>
+                    <width>11-col</width>
+                    <align>left</align>
                     <label>-</label>
                     <onup>10</onup>
                     <onright>8000</onright>
@@ -147,7 +159,7 @@
             </control>
             <!--dialog controls-->
             <control type="group">
-                <posx>14-col</posx>
+                <posx>12-col</posx>
                 <posy>3-row</posy>
                 <control type="panel" id="8000">
                     <posx>0</posx>
diff --git a/1080i/Home.xml b/1080i/Home.xml
index 1247f7f..54a77f1 100644
--- a/1080i/Home.xml
+++ b/1080i/Home.xml
@@ -6,11 +6,6 @@
     <onload>Skin.Reset(keepMusicMenuActive)</onload>
     <animation effect="fade" start="100" end="0" time="250">WindowClose</animation>
     <animation effect="fade" start="0" end="100" time="500" reversible="true">WindowOpen</animation>
-
-    <onload>alarmClock(bg1,Control.Move(9450,1),00:10,silent,loop)</onload>
-    <onload>alarmClock(bg2,Control.Move(9451,-1),00:10,silent,loop)</onload>
-    <onload>alarmClock(bg3,Control.Move(9452,1),00:10,silent,loop)</onload>
-
     <controls>
         <include>globalBackground</include>
         <include>homeBackground</include>
@@ -95,7 +90,7 @@
                     </control>
                 </focusedlayout>
                 <content>
-                    <item>
+                    <item id="1">
                         <visible>!Skin.HasSetting(hideVideo)</visible>
                         <label>31000</label>
                         <label2></label2>
@@ -105,7 +100,7 @@
                         <onclick condition="Library.HasContent(Video)">ActivateWindow(Videos,videodb://)</onclick>
                         <onclick condition="Library.HasContent(Video)">Skin.SetString(showRecentVideoItems,true)</onclick>
                     </item>
-                    <item>
+                    <item id="2">
                         <visible>!Skin.HasSetting(hideMusic)</visible>
                         <label>31001</label>
                         <label2></label2>
@@ -115,28 +110,28 @@
                         <onclick condition="Library.HasContent(Music)">ActivateWindow(musiclibrary)</onclick>
                         <onclick condition="Library.HasContent(Music)">Skin.SetString(showRecentMusicItems,true)</onclick>
                     </item>
-                    <item>
+                    <item id="3">
                         <visible>!Skin.HasSetting(hidePictures)</visible>
                         <label>31002</label>
                         <label2></label2>
                         <thumb>-</thumb>
                         <onclick>ActivateWindow(pictures)</onclick>
                     </item>
-                    <item>
+                    <item id="4">
                         <visible>!Skin.HasSetting(hideGames) + System.HasAddon(script.games.rom.collection.browser)</visible>
                         <label>31156</label>
                         <label2></label2>
                         <thumb>-</thumb>
                         <onclick>RunScript(script.games.rom.collection.browser,)</onclick>
                     </item>
-                    <item>
+                    <item id="5">
                         <visible>!Skin.HasSetting(hidePrograms)</visible>
                         <label>0</label>
                         <label2></label2>
                         <thumb>-</thumb>
                         <onclick>ActivateWindow(programs,addons,return)</onclick>
                     </item>
-                    <item>
+                    <item id="6">
                         <visible>!Skin.HasSetting(hideSearch)</visible>
                         <label>137</label>
                         <label2></label2>
@@ -145,20 +140,20 @@
                         <onclick>Skin.SetString(showRecentMusicItems,false)</onclick>
                         <onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
                     </item>
-                    <item>
+                    <item id="7">
                         <visible>!Skin.HasSetting(hideFavourites)</visible>
                         <label>1036</label>
                         <label2></label2>
                         <thumb>-</thumb>
                         <onclick>ReplaceWindow(favourites)</onclick>
                     </item>
-                    <item>
+                    <item id="8">
                         <label>5</label>
                         <label2></label2>
                         <thumb>-</thumb>
                         <onclick>ActivateWindow(settings)</onclick>
                     </item>
-                    <item>
+                    <item id="9">
                         <label>31004</label>
                         <label2></label2>
                         <thumb>-</thumb>
diff --git a/1080i/Includes_homeBackground.xml b/1080i/Includes_homeBackground.xml
index c5772a2..74fc51d 100644
--- a/1080i/Includes_homeBackground.xml
+++ b/1080i/Includes_homeBackground.xml
@@ -2,114 +2,52 @@
 <includes>
     <include name="homeBackground">
         <control type="group">
-            <animation type="windowopen">
-                <effect type="zoom" end="115" time="0"/>
+            <animation type="conditional" condition="true" loop="true">
+                <effect type="fade" start="0" end="100" time="5000"/>
+                <effect type="zoom" start="80" end="130" time="10000" tween="sine" easing="out"/>
+
+                <effect type="slide" start="0,0" end="-450,0" center="0" delay="0" time="20000" tween="sine" easing="in"/>
+                <effect type="zoom" start="130" end="100" delay="12000" time="8000" tween="sine" easing="in"/>
+                <effect type="fade" start="100" end="0" time="3000" delay="16000"/>
             </animation>
-            <!--movies-->
-            <control type="wraplist" id="9450">
-                <posx>0</posx>
-                <posy>00</posy>
-                <width>2100</width>
-                <height>fullscreenHeight</height>
-                <orientation>horizontal</orientation>
-                <scrolltime tween="linear" easing="in">10000</scrolltime>
-                <animation type="windowopen">
-                    <effect type="fade" start="0" end="10" time="0"/>
-                    <effect type="zoom" end="115" time="0"/>
-                </animation>
-                <animation type="windowclose">
-                    <effect type="fade" end="0" time="0"/>
-                </animation>
-                <itemlayout width="4-col" height="4-col">
-                    <control type="image">
-                        <posx>-144</posx>
-                        <posy>0</posy>
-                        <width>4-col-gutter</width>
-                        <height>4-col-gutter</height>
-                        <aspectratio>scale</aspectratio>
-                        <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.thumb]</texture>
-                        <bordertexture border="3" colordiffuse="33FFFFFF">colors/white.png</bordertexture>
-                        <bordersize>3</bordersize>
-                        <colordiffuse>ffFFFFFF</colordiffuse>
-                        <animation type="conditional" condition="true" loop="true">
-                            <effect type="rotatey" start="0" end="5" center="0" delay="0" time="1500" tween="sine" easing="in"/>
-                            <effect type="rotatey" start="0" end="-5" center="0" delay="1500" time="1500" tween="sine" easing="in"/>
-                        </animation>
-                    </control>
-                </itemlayout>
-                <focusedlayout/>
-                <content>videodb://movies/titles/</content>
-            </control>
             <!--albums-->
-            <control type="wraplist" id="9451">
+            <control type="panel" id="9451">
                 <posx>0</posx>
-                <posy>9-row</posy>
+                <posy>0</posy>
                 <width>fullscreenWidth</width>
                 <height>fullscreenHeight</height>
                 <orientation>horizontal</orientation>
                 <scrolltime tween="linear" easing="in">10000</scrolltime>
                 <animation type="windowopen">
-                    <effect type="fade" start="0" end="10" time="0"/>
-                    <effect type="zoom" end="115" time="0"/>
+                    <effect type="fade" end="100" time="1000" delay="1000"/>
                 </animation>
                 <animation type="windowclose">
                     <effect type="fade" end="0" time="0"/>
                 </animation>
-                <itemlayout width="4-col" height="4-col">
+                <itemlayout width="3-col" height="3-col">
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>4-col-gutter</width>
-                        <height>4-col-gutter</height>
+                        <width>3-col-textbox</width>
+                        <height>3-col-textbox</height>
                         <aspectratio>scale</aspectratio>
-                        <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.thumb]</texture>
-                        <bordertexture border="3" colordiffuse="33FFFFFF">colors/white.png</bordertexture>
-                        <bordersize>3</bordersize>
-                        <colordiffuse>ffFFFFFF</colordiffuse>
-                        <animation type="conditional" condition="true" loop="true">
-                            <effect type="rotatey" start="0" end="-5" center="0" delay="0" time="1500" tween="sine" easing="in"/>
-                            <effect type="rotatey" start="0" end="5" center="0" delay="1500" time="1500" tween="sine" easing="in"/>
-                        </animation>
+                        <texture fallback="colors/black.png" border="0">$INFO[Listitem.thumb]</texture>
+                        <colordiffuse>44FFFFFF</colordiffuse>
                     </control>
                 </itemlayout>
                 <focusedlayout/>
-                <content>musicdb://albums/</content>
-            </control>
-            <!--albums-->
-            <control type="wraplist" id="9452">
-                <posx>-72</posx>
-                <posy>18-row</posy>
-                <width>2000</width>
-                <height>fullscreenHeight</height>
-                <orientation>horizontal</orientation>
-                <scrolltime tween="linear" easing="in">10000</scrolltime>
-                <animation type="windowopen">
-                    <effect type="fade" start="0" end="10" time="0"/>
-                    <effect type="zoom" end="115" time="0"/>
-                </animation>
-                <animation type="windowclose">
-                    <effect type="fade" end="0" time="0"/>
-                </animation>
-                <itemlayout width="4-col" height="4-col">
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>4-col-gutter</width>
-                        <height>4-col-gutter</height>
-                        <aspectratio>scale</aspectratio>
-                        <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.thumb]</texture>
-                        <bordertexture border="3" colordiffuse="33FFFFFF">colors/white.png</bordertexture>
-                        <bordersize>3</bordersize>
-                        <colordiffuse>ffFFFFFF</colordiffuse>
-                        <animation type="conditional" condition="true" loop="true">
-                            <effect type="rotatey" start="0" end="5" center="0" delay="0" time="1500" tween="sine" easing="in" />
-                            <effect type="rotatey" start="0" end="-5" center="0" delay="1500" time="1500" tween="sine" easing="in"/>
-                        </animation>
-                    </control>
-                </itemlayout>
-                <focusedlayout/>
-                <content>videodb://tvshows/titles/</content>
+                <content>$VAR[homescreenCollage]</content>
             </control>
         </control>
+        <!--overlay-->
+        <control type="image">
+            <animation type="windowopen">
+                <effect type="fade" end="100" time="1000" delay="0"/>
+            </animation>
+            <include>dimensionsFullscreen</include>
+            <texture>logoOverlay.png</texture>
+            <colordiffuse>ffffffff</colordiffuse>
+            <aspectratio>stretch</aspectratio>
+        </control>
     </include>
 </includes>
\ No newline at end of file
diff --git a/1080i/Includes_hubMenuSubItems.xml b/1080i/Includes_hubMenuSubItems.xml
index 1dbb097..d815934 100644
--- a/1080i/Includes_hubMenuSubItems.xml
+++ b/1080i/Includes_hubMenuSubItems.xml
@@ -127,8 +127,9 @@
             <onclick>right</onclick>
         </control>
         <control type="radiobutton" id="14">
-            <description>Watched Toggle</description>
-            <label>20367</label>
+            <description>Watched Toggle off</description>
+            <visible>!System.Setting(hidewatched)</visible>
+            <label>31195</label>
             <height>2-row</height>
             <width>col-7-begin</width>
             <font>menuTitle</font>
@@ -136,7 +137,23 @@
             <focusedcolor>highlight</focusedcolor>
             <disabledcolor>menuDisabled</disabledcolor>
             <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
-            <textureradiooffnofocus>colors/white.png</textureradiooffnofocus>
+            <textureradiofocus>-</textureradiofocus>
+            <textureradionofocus>-</textureradionofocus>
+            <textoffsetx>col-1-begin</textoffsetx>
+        </control>
+        <control type="radiobutton" id="14">
+            <description>Watched Toggle on</description>
+            <visible>System.Setting(hidewatched)</visible>
+            <label>31196</label>
+            <height>2-row</height>
+            <width>col-7-begin</width>
+            <font>menuTitle</font>
+            <textcolor>textActive</textcolor>
+            <focusedcolor>highlight</focusedcolor>
+            <disabledcolor>menuDisabled</disabledcolor>
+            <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
+            <textureradiofocus>-</textureradiofocus>
+            <textureradionofocus>-</textureradionofocus>
             <textoffsetx>col-1-begin</textoffsetx>
         </control>
         <control type="radiobutton" id="508">
@@ -152,6 +169,8 @@
             <disabledcolor>menuDisabled</disabledcolor>
             <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
             <texturenofocus>-</texturenofocus>
+            <textureradiofocus>-</textureradiofocus>
+            <textureradionofocus>-</textureradionofocus>
             <onclick>right</onclick>
             <onclick>Filter</onclick>
         </control>
@@ -167,6 +186,8 @@
             <disabledcolor>menuDisabled</disabledcolor>
             <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
             <texturenofocus>-</texturenofocus>
+            <textureradiofocus>-</textureradiofocus>
+            <textureradionofocus>-</textureradionofocus>
             <onclick>right</onclick>
             <onclick>xbmc.mastermode</onclick>
             <selected>system.ismaster</selected>
@@ -291,6 +312,8 @@
             <disabledcolor>menuDisabled</disabledcolor>
             <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
             <texturenofocus>-</texturenofocus>
+            <textureradiofocus>-</textureradiofocus>
+            <textureradionofocus>-</textureradionofocus>
             <textoffsetx>col-1-begin</textoffsetx>
             <label>191</label>
         </control>
@@ -304,6 +327,8 @@
             <disabledcolor>menuDisabled</disabledcolor>
             <texturefocus colordiffuse="textActive">colors/white.png</texturefocus>
             <texturenofocus>-</texturenofocus>
+            <textureradiofocus>-</textureradiofocus>
+            <textureradionofocus>-</textureradionofocus>
             <textoffsetx>col-1-begin</textoffsetx>
             <label>589</label>
         </control>
diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml
index e05b773..c14b97e 100644
--- a/1080i/Includes_variables.xml
+++ b/1080i/Includes_variables.xml
@@ -66,6 +66,11 @@
         <value condition="window.isactive(infodialog) + window.isactive(extendedprogressdialog)">323</value>
         <value>95</value>
     </variable>
+    <!--homescreen background image content-->
+    <variable name="homescreenCollage">
+        <value condition="Container(9000).HasFocus(1)">special://skin/extras/playlists/randomVideos.xsp</value>
+        <value condition="Container(9000).HasFocus(2)">special://skin/extras/playlists/randomAlbums.xsp</value>
+    </variable>
     <!--Star rating for music tracks-->
     <variable name="starRating">
         <value condition="SubString(MusicPlayer.Rating,1)"></value>
diff --git a/1080i/View_Albums.xml b/1080i/View_Albums.xml
index 753225b..7dec3c8 100644
--- a/1080i/View_Albums.xml
+++ b/1080i/View_Albums.xml
@@ -87,7 +87,7 @@
                         <height>4-col-gutter</height>
                         <aspectratio>stretch</aspectratio>
                         <texture border="0">colors/offblack.png</texture>
-                        <bordertexture border="3" colordiffuse="33FFFFFF">colors/white.png</bordertexture>
+                        <bordertexture border="3" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
                         <bordersize>3</bordersize>
                         <colordiffuse>ffFFFFFF</colordiffuse>
                     </control>
diff --git a/extras/playlists/randomAlbums.xsp b/extras/playlists/randomAlbums.xsp
new file mode 100644
index 0000000..9868de8
--- /dev/null
+++ b/extras/playlists/randomAlbums.xsp
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="albums">
+    <name>randomAlbums</name>
+    <match>all</match>
+    <limit>50</limit>
+    <order direction="ascending">random</order>
+</smartplaylist>
\ No newline at end of file
diff --git a/extras/playlists/randomVideos.xsp b/extras/playlists/randomVideos.xsp
new file mode 100644
index 0000000..04874ad
--- /dev/null
+++ b/extras/playlists/randomVideos.xsp
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="movies">
+    <name>randomVideos</name>
+    <match>all</match>
+    <limit>50</limit>
+    <order direction="ascending">random</order>
+</smartplaylist>
diff --git a/language/English/strings.po b/language/English/strings.po
index acae829..5942d90 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -720,3 +720,11 @@ msgstr ""
 msgctxt "#31194"
 msgid "Subtitles"
 msgstr ""
+
+msgctxt "#31195"
+msgid "Show watched items"
+msgstr ""
+
+msgctxt "#31196"
+msgid "Hide watched items"
+msgstr ""
diff --git a/media/logoOverlay.png b/media/logoOverlay.png
new file mode 100644
index 0000000..d0378d6
Binary files /dev/null and b/media/logoOverlay.png differ