diff --git a/1080i/AddonBrowser.xml b/1080i/AddonBrowser.xml
index 1905704..dd2f510 100644
--- a/1080i/AddonBrowser.xml
+++ b/1080i/AddonBrowser.xml
@@ -7,14 +7,14 @@
         <!--background-->
         <include>globalBackground</include>
         <control type="group" id="9001">
-            <posx>col-1-begin</posx>
+            <posx>col-2-begin</posx>
             <posy>row-3-begin</posy>
             <!--animations-->
             <include>modalDialogInOutVertical</include>
             <control type="image">
                 <posx>0</posx>
                 <posy>0</posy>
-                <width>24-col</width>
+                <width>22-col</width>
                 <height>2-row</height>
                 <texture>colors/white.png</texture>
                 <colordiffuse>highlight</colordiffuse>
@@ -34,7 +34,7 @@
             <control type="image">
                 <posx>0</posx>
                 <posy>2-row</posy>
-                <width>24-col</width>
+                <width>22-col</width>
                 <height>22-row</height>
                 <texture>colors/black.png</texture>
                 <colordiffuse>overlay</colordiffuse>
@@ -79,6 +79,12 @@
                     <label>24063</label>
                     <onright>9999</onright>
                 </control>
+                <control type="button" id="9">
+                    <width>6-col</width>
+                    <texturenofocus>-</texturenofocus>
+                    <label>24034</label>
+                    <onright>9999</onright>
+                </control>
             </control>
             <!--Info panel-->
             <control type="group">
@@ -87,8 +93,8 @@
                 <control type="image">
                     <posx>0</posx>
                     <posy>0</posy>
-                    <width>18-col</width>
-                    <height>10-row</height>
+                    <width>16-col</width>
+                    <height>9-row</height>
                     <aspectratio aligny="center">scale</aspectratio>
                     <texture>$INFO[ListItem.art(fanart)]</texture>
                     <colordiffuse>22ffffff</colordiffuse>
@@ -96,14 +102,14 @@
                 <control type="image">
                     <posx>0</posx>
                     <posy>0</posy>
-                    <width>18-col</width>
-                    <height>10-row</height>
+                    <width>16-col</width>
+                    <height>9-row</height>
                     <aspectratio aligny="center">scale</aspectratio>
                     <texture>vignette.png</texture>
                 </control>
                 <control type="image">
                     <posx>1-col</posx>
-                    <posy>1-row</posy>
+                    <posy>18</posy>
                     <width>4-col</width>
                     <height>4-col</height>
                     <aspectratio scalediffuse="false" align="center" aligny="center">keep</aspectratio>
@@ -115,27 +121,19 @@
                 <control type="label">
                     <description>Addon Title</description>
                     <visible>!isempty(ListItem.Property(Addon.Creator))</visible>
-                    <posx>6-col-indent</posx>
-                    <posy>1-row</posy>
-                    <width>12-col-gutter</width>
+                    <posx>6-col</posx>
+                    <posy>36</posy>
+                    <width>10-col-gutter</width>
                     <height>2-row</height>
                     <aligny>center</aligny>
                     <font>mediumStrong</font>
                     <label>$INFO[ListItem.label]</label>
                 </control>
-                <control type="label">
-                    <posx>6-col-indent</posx>
-                    <posy>104</posy>
-                    <width>12-col-gutter</width>
-                    <font>itemSubTitle</font>
-                    <textcolor>textActive</textcolor>
-                    <label>[COLOR highlight]$INFO[ListItem.Property(Addon.Status),[,] ][/COLOR]$INFO[ListItem.Property(Addon.Creator)]</label>
-                </control>
                 <control type="textbox" id="400">
-                    <posx>6-col-indent</posx>
-                    <posy>4-row</posy>
+                    <posx>6-col</posx>
+                    <posy>3-row</posy>
                     <font>textbox</font>
-                    <width>12-col-gutter</width>
+                    <width>10-col-gutter</width>
                     <height>160</height>
                     <label>$INFO[ListItem.Property(Addon.Description)]</label>
                     <autoscroll delay="5000" time="1000" repeat="10000"/>
@@ -145,30 +143,30 @@
             <!--content listing-->
             <control type="group" id="9999">
                 <posx>6-col</posx>
-                <posy>12-row</posy>
+                <posy>11-row</posy>
                 <control type="panel" id="50">
-                    <posx>12</posx>
-                    <posy>12</posy>
-                    <width>18-col</width>
-                    <height>11-row</height>
+                    <posx>6</posx>
+                    <posy>6</posy>
+                    <width>16-col</width>
+                    <height>457</height>
                     <onleft>9000</onleft>
                     <onright>60</onright>
                     <ondown>50</ondown>
                     <onup>50</onup>
                     <pagecontrol>60</pagecontrol>
-                    <itemlayout height="2-row" width="9-col">
+                    <itemlayout height="75" width="8-col">
                         <control type="image">
                             <posx>0</posx>
-                            <posy>3</posy>
-                            <width>66</width>
-                            <height>66</height>
+                            <posy>0</posy>
+                            <width>69</width>
+                            <height>69</height>
                             <aspectratio scalediffuse="false">stretch</aspectratio>
-                            <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                            <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.thumb]</texture>
                         </control>
                         <control type="label">
                             <posx>1-col-indent</posx>
                             <posy>0</posy>
-                            <width>8-col-gutter</width>
+                            <width>7-col-gutter</width>
                             <height>2-row</height>
                             <aligny>center</aligny>
                             <font>itemTitle</font>
@@ -177,14 +175,14 @@
                             <label>$INFO[ListItem.Label]</label>
                         </control>
                     </itemlayout>
-                    <focusedlayout height="2-row" width="9-col">
+                    <focusedlayout height="75" width="8-col">
                         <control type="image">
                             <posx>0</posx>
-                            <posy>3</posy>
-                            <width>66</width>
-                            <height>66</height>
+                            <posy>0</posy>
+                            <width>69</width>
+                            <height>69</height>
                             <aspectratio scalediffuse="false">stretch</aspectratio>
-                            <texture fallback="colors/white.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                            <texture fallback="colors/white.png" border="0">$INFO[Listitem.thumb]</texture>
                             <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"/>
@@ -193,8 +191,8 @@
                         <control type="image">
                             <posx>1-col</posx>
                             <posy>0</posy>
-                            <width>564</width>
-                            <height>2-row</height>
+                            <width>490</width>
+                            <height>69</height>
                             <aspectratio>stretch</aspectratio>
                             <texture>colors/white.png</texture>
                             <bordersize>0</bordersize>
@@ -203,7 +201,7 @@
                         <control type="label">
                             <posx>1-col-indent</posx>
                             <posy>0</posy>
-                            <width>8-col-gutter</width>
+                            <width>7-col-gutter</width>
                             <height>2-row</height>
                             <aligny>center</aligny>
                             <font>itemTitle</font>
@@ -220,9 +218,9 @@
                 <visible>Control.IsVisible(60)</visible>
                 <animation effect="fade" start="100" end="70" time="100" condition="!controlgroup(8000).hasfocus">conditional</animation>
                 <control type="scrollbar" id="60">
-                    <right>1-col</right>
-                    <posy>12-row</posy>
-                    <height>12-row</height>
+                    <right>2-col</right>
+                    <posy>11-row</posy>
+                    <height>13-row</height>
                     <onleft>9999</onleft>
                 </control>
             </control>
diff --git a/1080i/DialogKaraokeSongSelector.xml b/1080i/DialogKaraokeSongSelector.xml
deleted file mode 100644
index d6f39ed..0000000
--- a/1080i/DialogKaraokeSongSelector.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window type="dialog">
-    <controls>
-        <!--removed: not used-->
-    </controls>
-</window>
diff --git a/1080i/DialogKaraokeSongSelectorLarge.xml b/1080i/DialogKaraokeSongSelectorLarge.xml
deleted file mode 100644
index d6f39ed..0000000
--- a/1080i/DialogKaraokeSongSelectorLarge.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window type="dialog">
-    <controls>
-        <!--removed: not used-->
-    </controls>
-</window>
diff --git a/1080i/DialogOk.xml b/1080i/DialogOk.xml
index 2256392..95fd84e 100644
--- a/1080i/DialogOk.xml
+++ b/1080i/DialogOk.xml
@@ -6,7 +6,7 @@
     <controls>
         <include>modalDialog</include>
         <control type="group">
-            <posx>col-8-begin</posx>
+            <posx>col-9-begin</posx>
             <posy>row-9-begin</posy>
             <!--animations-->
             <include>modalDialogInOut</include>
@@ -15,14 +15,14 @@
                 <description>heading</description>
                 <posx>0</posx>
                 <posy>0</posy>
-                <width>10-col</width>
+                <width>8-col</width>
                 <font>pageTitle</font>
                 <textcolor>highlight</textcolor>
             </control>
             <control type="textbox" id="9">
                 <posx>0</posx>
                 <posy>2-row</posy>
-                <width>10-col</width>
+                <width>8-col</width>
                 <height>4-row</height>
                 <font>textbox</font>
                 <textcolor>textActive</textcolor>
@@ -31,7 +31,7 @@
             <control type="panel" id="9001">
                 <posx>0</posx>
                 <posy>7-row</posy>
-                <width>5-col</width>
+                <width>4-col</width>
                 <height>5-row</height>
                 <itemgap>3</itemgap>
                 <orientation>vertical</orientation>
diff --git a/1080i/DialogPVRChannelsOSD.xml b/1080i/DialogPVRChannelsOSD.xml
deleted file mode 100644
index cbc88d8..0000000
--- a/1080i/DialogPVRChannelsOSD.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window>
-    <defaultcontrol always="true">11</defaultcontrol>
-    <include>fadeInOut</include>
-    <controls>
-        <control type="group">
-            <posx>0</posx>
-            <posy>0</posy>
-            <control type="image">
-                <posx>0</posx>
-                <posy>0</posy>
-                <width>col-9-begin</width>
-                <height>fullscreenHeight</height>
-                <aspectratio>stretch</aspectratio>
-                <texture>colors/black.png</texture>
-                <bordersize>0</bordersize>
-                <colordiffuse>99FFFFFF</colordiffuse>
-            </control>
-            <control type="list" id="11">
-                <posx>6</posx>
-                <posy>42</posy>
-                <width>9-col</width>
-                <height>18-row</height>
-                <onright>60</onright>
-                <ondown>11</ondown>
-                <onleft>dialog.close(all,true)</onleft>
-                <onup>11</onup>
-                <pagecontrol>60</pagecontrol>
-                <scrolltime tween="sine" easing="inout">300</scrolltime>
-                <itemlayout width="9-col" height="2-row">
-                    <control type="image">
-                        <posx>20</posx>
-                        <posy>32</posy>
-                        <width>1-row</width>
-                        <height>1-row</height>
-                        <aspectratio scalediffuse="false">scale</aspectratio>
-                        <texture fallback="colors/offblack.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
-                    </control>
-                    <control type="label">
-                        <posx>108</posx>
-                        <posy>12</posy>
-                        <width>8-col-gutter</width>
-                        <font>itemTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <shadowcolor>-</shadowcolor>
-                        <label>$INFO[ListItem.Label]: $INFO[ListItem.Title]</label>
-                    </control>
-                    <control type="label">
-                        <posx>108</posx>
-                        <posy>69</posy>
-                        <width>8-col-gutter</width>
-                        <font>smallStrong</font>
-                        <align>left</align>
-                        <height>24</height>
-                        <textcolor>textActive</textcolor>
-                        <shadowcolor>-</shadowcolor>
-                        <label>[B]$LOCALIZE[19031]: $INFO[ListItem.nextstarttime][/B] - $INFO[ListItem.nextTitle]</label>
-                    </control>
-                </itemlayout>
-                <focusedlayout width="9-col" height="2-row">
-                    <control type="image">
-                        <posx>col-1-begin</posx>
-                        <posy>0</posy>
-                        <width>588</width>
-                        <height>2-row</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture>colors/white.png</texture>
-                        <bordersize>0</bordersize>
-                        <colordiffuse>ffFFFFFF</colordiffuse>
-                    </control>
-                    <control type="image">
-                        <posx>20</posx>
-                        <posy>32</posy>
-                        <width>1-row</width>
-                        <height>1-row</height>
-                        <aspectratio scalediffuse="false">scale</aspectratio>
-                        <texture fallback="colors/offblack.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
-                    </control>
-                    <control type="label">
-                        <posx>108</posx>
-                        <posy>12</posy>
-                        <width>528</width>
-                        <font>itemTitle</font>
-                        <textcolor>black</textcolor>
-                        <selectedcolor>black</selectedcolor>
-                        <shadowcolor>-</shadowcolor>
-                        <label>$INFO[ListItem.Label]: $INFO[ListItem.Title]</label>
-                    </control>
-                    <control type="label">
-                        <posx>108</posx>
-                        <posy>69</posy>
-                        <width>528</width>
-                        <font>smallStrong</font>
-                        <align>left</align>
-                        <height>24</height>
-                        <textcolor>black</textcolor>
-                        <selectedcolor>black</selectedcolor>
-                        <shadowcolor>-</shadowcolor>
-                        <label>[B]$LOCALIZE[19031]: $INFO[ListItem.nextstarttime][/B] - $INFO[ListItem.nextTitle]</label>
-                    </control>
-                </focusedlayout>
-            </control>
-            <!--page scrollbar-->
-            <control type="group" id="8000">
-                <visible>Control.IsVisible(60)</visible>
-                <animation effect="fade" start="100" end="70" time="100" condition="!controlgroup(8000).hasfocus">conditional</animation>
-                <control type="scrollbar" id="60">
-                    <posx>672</posx>
-                    <posy>0</posy>
-                    <height>fullscreenHeight</height>
-                    <onleft>11</onleft>
-                </control>
-            </control>
-        </control>
-        <!--debugging-->
-        <include>DebugGrid</include>
-        <control type="label">
-            <include>WindowID</include>
-            <label>DialogPVRChannelsOSD.xml</label>
-        </control>
-    </controls>
-</window>
diff --git a/1080i/DialogSeekBar.xml b/1080i/DialogSeekBar.xml
index 2cd30a2..2eca960 100644
--- a/1080i/DialogSeekBar.xml
+++ b/1080i/DialogSeekBar.xml
@@ -58,6 +58,18 @@
                 <info>Player.Progress</info>
             </control>
             <control type="label">
+                <visible>stringcompare(VideoPlayer.TVShowTitle,Player.title)</visible>
+                <posx>0</posx>
+                <posy>1-row</posy>
+                <width>18-col</width>
+                <align>center</align>
+                <font>small</font>
+                <textcolor>textActive</textcolor>
+                <label>$INFO[Player.title]</label>
+                <shadowcolor>-</shadowcolor>
+            </control>
+            <control type="label">
+                <visible>!stringcompare(VideoPlayer.TVShowTitle,Player.title)</visible>
                 <posx>0</posx>
                 <posy>1-row</posy>
                 <width>18-col</width>
diff --git a/1080i/DialogSelect.xml b/1080i/DialogSelect.xml
index 9452e8d..3d79240 100644
--- a/1080i/DialogSelect.xml
+++ b/1080i/DialogSelect.xml
@@ -102,21 +102,21 @@
                         </control>
                     </control>
 
-                    <!--What is this one?? NOT skin selection-->
+                    <!--Used in search from cast listing etc-->
                     <control type="panel" id="3">
-                        <posx>6-col</posx>
-                        <posy>450</posy>
+                        <posx>6-col-indent</posx>
+                        <posy>442</posy>
                         <width>12-col</width>
-                        <height>11-row</height>
+                        <height>410</height>
                         <onleft>9999</onleft>
-                        <itemlayout height="2-row" width="12-col">
+                        <itemlayout height="75" width="12-col">
                             <control type="image">
                                 <posx>0</posx>
-                                <posy>3</posy>
-                                <width>66</width>
-                                <height>66</height>
+                                <posy>0</posy>
+                                <width>69</width>
+                                <height>69</height>
                                 <aspectratio scalediffuse="false">stretch</aspectratio>
-                                <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.icon]</texture>
+                                <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.icon]</texture>
                             </control>
                             <control type="label">
                                 <visible>ListItem.IsSelected</visible>
@@ -143,14 +143,14 @@
                                 <label>$INFO[ListItem.Label]</label>
                             </control>
                         </itemlayout>
-                        <focusedlayout height="2-row" width="12-col">
+                        <focusedlayout height="75" width="12-col">
                             <control type="image">
                                 <posx>0</posx>
-                                <posy>3</posy>
-                                <width>66</width>
-                                <height>66</height>
+                                <posy>0</posy>
+                                <width>69</width>
+                                <height>69</height>
                                 <aspectratio scalediffuse="false">stretch</aspectratio>
-                                <texture fallback="colors/white.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.icon]</texture>
+                                <texture fallback="colors/white.png" border="0">$INFO[Listitem.icon]</texture>
                                 <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"/>
@@ -159,8 +159,8 @@
                             <control type="image">
                                 <posx>1-col</posx>
                                 <posy>0</posy>
-                                <width>11-col</width>
-                                <height>2-row</height>
+                                <width>768</width>
+                                <height>69</height>
                                 <aspectratio>stretch</aspectratio>
                                 <texture>colors/white.png</texture>
                                 <bordersize>0</bordersize>
@@ -197,18 +197,18 @@
                     <!--skin selection etc-->
                     <control type="panel" id="6">
                         <posx>6-col-indent</posx>
-                        <posy>450</posy>
+                        <posy>442</posy>
                         <width>12-col</width>
-                        <height>11-row</height>
+                        <height>410</height>
                         <onleft>9999</onleft>
-                        <itemlayout height="2-row" width="6-col">
+                        <itemlayout height="75" width="6-col">
                             <control type="image">
                                 <posx>0</posx>
-                                <posy>3</posy>
-                                <width>66</width>
-                                <height>66</height>
+                                <posy>0</posy>
+                                <width>69</width>
+                                <height>69</height>
                                 <aspectratio scalediffuse="false">stretch</aspectratio>
-                                <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                                <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.thumb]</texture>
                             </control>
                             <control type="label">
                                 <posx>1-col-indent</posx>
@@ -222,14 +222,14 @@
                                 <label>$INFO[ListItem.Label]</label>
                             </control>
                         </itemlayout>
-                        <focusedlayout height="2-row" width="6-col">
+                        <focusedlayout height="75" width="6-col">
                             <control type="image">
                                 <posx>0</posx>
-                                <posy>3</posy>
-                                <width>66</width>
-                                <height>66</height>
+                                <posy>0</posy>
+                                <width>69</width>
+                                <height>69</height>
                                 <aspectratio scalediffuse="false">stretch</aspectratio>
-                                <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                                <texture fallback="colors/white.png" border="0">$INFO[Listitem.thumb]</texture>
                                 <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"/>
@@ -239,7 +239,7 @@
                                 <posx>1-col</posx>
                                 <posy>0</posy>
                                 <width>348</width>
-                                <height>2-row</height>
+                                <height>69</height>
                                 <aspectratio>stretch</aspectratio>
                                 <texture>colors/white.png</texture>
                                 <bordersize>0</bordersize>
diff --git a/1080i/DialogSubtitles.xml b/1080i/DialogSubtitles.xml
index 4d22f0d..5959eee 100644
--- a/1080i/DialogSubtitles.xml
+++ b/1080i/DialogSubtitles.xml
@@ -34,9 +34,8 @@
                 <width>20-col-gutter</width>
                 <height>2-row</height>
                 <font>dialogTitle</font>
-                <label>$LOCALIZE[31154] - $INFO[Player.Filename]</label>
+                <label>$LOCALIZE[31154]</label>
                 <textcolor>textActive</textcolor>
-                <shadowcolor>-</shadowcolor>
             </control>
             <!--dialog background-->
             <control type="image">
@@ -48,15 +47,6 @@
                 <colordiffuse></colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
-            <control type="label" id="140">
-                <posx>300</posx>
-                <posy>86</posy>
-                <width>12-col</width>
-                <height>2-row</height>
-                <font>itemTitle</font>
-                <textcolor>highlight</textcolor>
-                <wrapmultiline>true</wrapmultiline>
-            </control>
             <!-- ** Required ** Do not change <id>or<type>-->
             <control type="group">
                 <!--options-->
@@ -69,12 +59,22 @@
                     <colordiffuse>overlay</colordiffuse>
                     <aspectratio>stretch</aspectratio>
                 </control>
+                <control type="label" id="140">
+                    <posx>col-4-begin</posx>
+                    <posy>2-row</posy>
+                    <width>12-col</width>
+                    <height>2-row</height>
+                    <aligny>center</aligny>
+                    <font>itemTitle</font>
+                    <textcolor>highlight</textcolor>
+                    <wrapmultiline>true</wrapmultiline>
+                </control>
                 <!--subtitle file selection-->
                 <control type="panel" id="120">
                     <posx>4-col</posx>
-                    <posy>2-row</posy>
+                    <posy>4-row</posy>
                     <width>16-col</width>
-                    <height>13-row</height>
+                    <height>19-row</height>
                     <onleft>150</onleft>
                     <onright>60</onright>
                     <scrolltime>200</scrolltime>
@@ -82,9 +82,11 @@
                     <itemlayout width="16-col" height="2-row">
                         <!--filename-->
                         <control type="label">
-                            <posx>12</posx>
+                            <posx>24</posx>
                             <posy>0</posy>
                             <width>12-col-gutter</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
                             <font>itemTitle</font>
                             <textcolor>textActive</textcolor>
                             <selectedcolor>selected</selectedcolor>
@@ -93,46 +95,24 @@
                         </control>
                         <!--language / rating / sync / CC-->
                         <control type="label">
-                            <posx>12-col</posx>
+                            <posx>13-col</posx>
                             <posy>0</posy>
-                            <width>4-col-gutter</width>
-                            <font>smallStrong</font>
+                            <width>3-col-gutter</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
+                            <font>itemSubTitle</font>
                             <textcolor>textActive</textcolor>
                             <selectedcolor>selected</selectedcolor>
                             <shadowcolor>-</shadowcolor>
                             <label>$INFO[ListItem.Label] - $INFO[ListItem.ActualIcon]*</label>
                         </control>
-                        <!--closed caption-->
-                        <control type="label">
-                            <visible>ListItem.property(hearing_imp)</visible>
-                            <posx>14-col</posx>
-                            <posy>0</posy>
-                            <width>1-col</width>
-                            <font>smallStrong</font>
-                            <textcolor>textActive</textcolor>
-                            <selectedcolor>selected</selectedcolor>
-                            <shadowcolor>-</shadowcolor>
-                            <label>31121</label>
-                        </control>
-                        <!--sync icon-->
-                        <control type="label">
-                            <visible>ListItem.property(sync)</visible>
-                            <posx>15-col</posx>
-                            <posy>0</posy>
-                            <width>1-col</width>
-                            <font>smallStrong</font>
-                            <textcolor>textActive</textcolor>
-                            <selectedcolor>selected</selectedcolor>
-                            <shadowcolor>-</shadowcolor>
-                            <label>31122</label>
-                        </control>
                     </itemlayout>
                     <focusedlayout width="16-col" height="2-row">
                         <control type="image">
                             <posx>0</posx>
                             <posy>0</posy>
                             <width>16-col</width>
-                            <height>54</height>
+                            <height>2-row</height>
                             <aspectratio>stretch</aspectratio>
                             <texture>colors/white.png</texture>
                             <bordersize>0</bordersize>
@@ -140,9 +120,11 @@
                         </control>
                         <!--filename-->
                         <control type="label">
-                            <posx>12</posx>
+                            <posx>24</posx>
                             <posy>0</posy>
                             <width>12-col-gutter</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
                             <font>itemTitle</font>
                             <textcolor>black</textcolor>
                             <selectedcolor>black</selectedcolor>
@@ -151,39 +133,17 @@
                         </control>
                         <!--language / rating / sync / CC-->
                         <control type="label">
-                            <posx>12-col</posx>
+                            <posx>13-col</posx>
                             <posy>0</posy>
-                            <width>4-col-gutter</width>
-                            <font>smallStrong</font>
+                            <width>3-col-gutter</width>
+                            <height>2-row</height>
+                            <aligny>center</aligny>
+                            <font>itemSubTitle</font>
                             <textcolor>black</textcolor>
                             <selectedcolor>black</selectedcolor>
                             <shadowcolor>-</shadowcolor>
                             <label>$INFO[ListItem.Label] - $INFO[ListItem.ActualIcon]*</label>
                         </control>
-                        <!--closed caption-->
-                        <control type="label">
-                            <visible>ListItem.property(hearing_imp)</visible>
-                            <posx>14-col</posx>
-                            <posy>0</posy>
-                            <width>1-col</width>
-                            <font>smallStrong</font>
-                            <textcolor>black</textcolor>
-                            <selectedcolor>black</selectedcolor>
-                            <shadowcolor>-</shadowcolor>
-                            <label>31121</label>
-                        </control>
-                        <!--sync icon-->
-                        <control type="label">
-                            <visible>ListItem.property(sync)</visible>
-                            <posx>15-col</posx>
-                            <posy>0</posy>
-                            <width>1-col</width>
-                            <font>smallStrong</font>
-                            <textcolor>black</textcolor>
-                            <selectedcolor>black</selectedcolor>
-                            <shadowcolor>-</shadowcolor>
-                            <label>31122</label>
-                        </control>
                     </focusedlayout>
                 </control>
                 <!--page scrollbar-->
@@ -191,9 +151,9 @@
                     <visible>Control.IsVisible(60)</visible>
                     <animation effect="fade" start="100" end="70" time="100" condition="!controlgroup(8000).hasfocus">conditional</animation>
                     <control type="scrollbar" id="60">
-                        <posx>col-20-begin</posx>
-                        <posy>120</posy>
-                        <height>13-row</height>
+                        <right>3-col</right>
+                        <posy>2-row</posy>
+                        <height>21-row</height>
                         <onleft>120</onleft>
                     </control>
                 </control>
diff --git a/1080i/FileBrowser.xml b/1080i/FileBrowser.xml
index 9919a35..e249c0a 100644
--- a/1080i/FileBrowser.xml
+++ b/1080i/FileBrowser.xml
@@ -34,12 +34,6 @@
             <aspectratio>keep</aspectratio>
             <fadetime>400</fadetime>
         </control>
-        <control type="image">
-            <include>dimensionsFullscreen</include>
-            <texture>colors/black.png</texture>
-            <aspectratio>stretch</aspectratio>
-            <colordiffuse>99ffffff</colordiffuse>
-        </control>
 
         <!--file list-->
         <control type="group">
@@ -56,15 +50,6 @@
                 <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
-            <control type="image">
-                <posx>0</posx>
-                <posy>2-row</posy>
-                <width>16-col</width>
-                <height>21-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>overlay</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
             <control type="label" id="411">
                 <posx>24</posx>
                 <posy>0</posy>
@@ -79,26 +64,35 @@
             <control type="image">
                 <posx>0</posx>
                 <posy>2-row</posy>
-                <width>12-col</width>
-                <height>21-row</height>
+                <width>16-col</width>
+                <height>732</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>732</height>
                 <texture>colors/black.png</texture>
                 <colordiffuse>overlay</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
             <control type="panel" id="450">
-                <posx>0</posx>
-                <posy>2-row</posy>
+                <posx>6</posx>
+                <posy>78</posy>
                 <width>12-col</width>
-                <height>21-row</height>
+                <height>20-row</height>
                 <onright>9000</onright>
-                <itemlayout height="2-row" width="12-col">
+                <itemlayout height="75" width="12-col">
                     <control type="image">
                         <posx>0</posx>
-                        <posy>3</posy>
-                        <width>66</width>
-                        <height>66</height>
+                        <posy>0</posy>
+                        <width>69</width>
+                        <height>69</height>
                         <aspectratio scalediffuse="false">stretch</aspectratio>
-                        <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                        <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.thumb]</texture>
                     </control>
                     <control type="label">
                         <posx>1-col-indent</posx>
@@ -112,12 +106,12 @@
                         <label>$INFO[ListItem.Label]</label>
                     </control>
                 </itemlayout>
-                <focusedlayout height="2-row" width="12-col">
+                <focusedlayout height="75" width="12-col">
                     <control type="image">
                         <posx>1-col</posx>
                         <posy>0</posy>
-                        <width>11-col</width>
-                        <height>2-row</height>
+                        <width>780</width>
+                        <height>69</height>
                         <aspectratio>stretch</aspectratio>
                         <texture>colors/white.png</texture>
                         <bordersize>0</bordersize>
@@ -125,11 +119,11 @@
                     </control>
                     <control type="image">
                         <posx>0</posx>
-                        <posy>3</posy>
-                        <width>66</width>
-                        <height>66</height>
+                        <posy>0</posy>
+                        <width>69</width>
+                        <height>69</height>
                         <aspectratio scalediffuse="false">stretch</aspectratio>
-                        <texture fallback="colors/white.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                        <texture fallback="colors/white.png" border="0">$INFO[Listitem.thumb]</texture>
                         <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"/>
@@ -168,15 +162,6 @@
                 <orientation>vertical</orientation>
                 <onleft>450</onleft>
                 <itemlayout width="4-col" height="2-row">
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>1-col-textbox</width>
-                        <height>2-row</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture>colors/black.png</texture>
-                        <colordiffuse>overlay</colordiffuse>
-                    </control>
                     <control type="label">
                         <posx>0</posx>
                         <posy>0</posy>
@@ -189,15 +174,6 @@
                         <label>$INFO[ListItem.label2]</label>
                         <shadowcolor>-</shadowcolor>
                     </control>
-                    <control type="image">
-                        <posx>1-col</posx>
-                        <posy>0</posy>
-                        <width>5-col</width>
-                        <height>2-row</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture>colors/black.png</texture>
-                        <colordiffuse>overlay</colordiffuse>
-                    </control>
                     <control type="label">
                         <posx>1-col-indent</posx>
                         <posy>0</posy>
diff --git a/1080i/Includes_homeBackground.xml b/1080i/Includes_homeBackground.xml
index bdcca1e..adb386e 100644
--- a/1080i/Includes_homeBackground.xml
+++ b/1080i/Includes_homeBackground.xml
@@ -44,6 +44,9 @@
                 <texture>special://skin/extras/backgrounds/weather.jpg</texture>
                 <colordiffuse>44ffffff</colordiffuse>
                 <aspectratio>stretch</aspectratio>
+                <animation type="windowopen">
+                    <effect type="fade" end="100" time="1000" delay="800"/>
+                </animation>
             </control>
             <!--games-->
             <control type="image">
@@ -52,6 +55,9 @@
                 <texture>special://skin/extras/backgrounds/games.jpg</texture>
                 <colordiffuse>44ffffff</colordiffuse>
                 <aspectratio>stretch</aspectratio>
+                <animation type="windowopen">
+                    <effect type="fade" end="100" time="1000" delay="800"/>
+                </animation>
             </control>
             <!--photos-->
             <control type="image">
@@ -60,6 +66,9 @@
                 <texture>special://skin/extras/backgrounds/photos.jpg</texture>
                 <colordiffuse>44ffffff</colordiffuse>
                 <aspectratio>stretch</aspectratio>
+                <animation type="windowopen">
+                    <effect type="fade" end="100" time="1000" delay="800"/>
+                </animation>
             </control>
             <!--search-->
             <control type="image">
@@ -68,6 +77,9 @@
                 <texture>special://skin/extras/backgrounds/search.jpg</texture>
                 <colordiffuse>44ffffff</colordiffuse>
                 <aspectratio>stretch</aspectratio>
+                <animation type="windowopen">
+                    <effect type="fade" end="100" time="1000" delay="800"/>
+                </animation>
             </control>
             <!--settings-->
             <control type="image">
@@ -76,6 +88,9 @@
                 <texture>special://skin/extras/backgrounds/settings.jpg</texture>
                 <colordiffuse>44ffffff</colordiffuse>
                 <aspectratio>stretch</aspectratio>
+                <animation type="windowopen">
+                    <effect type="fade" end="100" time="1000" delay="800"/>
+                </animation>
             </control>
             <!--power-->
             <control type="image">
@@ -84,12 +99,15 @@
                 <texture>special://skin/extras/backgrounds/power.jpg</texture>
                 <colordiffuse>44ffffff</colordiffuse>
                 <aspectratio>stretch</aspectratio>
+                <animation type="windowopen">
+                    <effect type="fade" end="100" time="1000" delay="800"/>
+                </animation>
             </control>
         </control>
         <!--overlay-->
         <control type="image">
             <animation type="windowopen">
-                <effect type="fade" start="0" end="100" time="500" delay="500" tween="linear"/>
+                <effect type="fade" start="0" end="100" time="200" delay="500" tween="linear"/>
             </animation>
             <include>dimensionsFullscreen</include>
             <texture>logoOverlay.png</texture>
diff --git a/1080i/Includes_hubMenuSubItems.xml b/1080i/Includes_hubMenuSubItems.xml
index f751fba..99d8198 100644
--- a/1080i/Includes_hubMenuSubItems.xml
+++ b/1080i/Includes_hubMenuSubItems.xml
@@ -2,22 +2,6 @@
 <includes>
     <!--video submenu items-->
     <include name="videoSideMenu">
-        <control type="button" id="501">
-            <description>Video Playlist</description>
-            <visible>[window.isactive(videolibrary) | window.isactive(videoplaylist)] + IntegerGreaterThan(Playlist.Length(video),0)</visible>
-            <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>
-            <texturenofocus>-</texturenofocus>
-            <textoffsetx>col-1-begin</textoffsetx>
-            <label>31123</label>
-            <onclick>right</onclick>
-            <onclick>ActivateWindow(videoplaylist)</onclick>
-        </control>
         <control type="button" id="502">
             <description>Search (videos)</description>
             <visible>[window.isactive(videolibrary) | window.isactive(videoplaylist) | window.isactive(pvr)] + System.HasAddon(script.globalsearch)</visible>
@@ -65,21 +49,6 @@
             <texturenofocus>-</texturenofocus>
             <textoffsetx>col-1-begin</textoffsetx>
         </control>
-        <control type="button" id="504">
-            <description>Timers / scheduler</description>
-            <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>
-            <texturenofocus>-</texturenofocus>
-            <textoffsetx>col-1-begin</textoffsetx>
-            <label>31119</label>
-            <onclick>ActivateWindow(tvtimers)</onclick>
-            <onclick>Control.SetFocus(50)</onclick>
-        </control>
         <control type="button" id="505">
             <description>Menu shortcuts (video)</description>
             <visible/>
diff --git a/1080i/LoginScreen.xml b/1080i/LoginScreen.xml
index 2e2b127..b96d296 100644
--- a/1080i/LoginScreen.xml
+++ b/1080i/LoginScreen.xml
@@ -4,9 +4,18 @@
     <allowoverlay>yes</allowoverlay>
     <controls>
         <include>globalBackground</include>
+        <control type="image">
+            <animation type="windowopen">
+                <effect type="fade" start="0" end="100" time="500" delay="500" tween="linear"/>
+            </animation>
+            <include>dimensionsFullscreen</include>
+            <texture>logoOverlay.png</texture>
+            <colordiffuse>ffffffff</colordiffuse>
+            <aspectratio>stretch</aspectratio>
+        </control>
         <control type="group">
-            <posx>col-10-begin</posx>
-            <posy>row-8-begin</posy>
+            <posx>0</posx>
+            <posy>0</posy>
             <!--animations-->
             <include>modalDialogInOutVertical</include>
             <control type="image">
diff --git a/1080i/MyPVRChannels.xml b/1080i/MyPVRChannels.xml
index 147dff1..f7824f7 100644
--- a/1080i/MyPVRChannels.xml
+++ b/1080i/MyPVRChannels.xml
@@ -2,7 +2,7 @@
 <window>
     <defaultcontrol always="false">9999</defaultcontrol>
     <allowoverlay>no</allowoverlay>
-    <onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload>
+    <onload condition="!Player.HasAudio">PlayerControl(stop)</onload>
     <onunload>Skin.SetString(showRecentVideoItems,true)</onunload>
     <controls>
         <include>globalBackground</include>
diff --git a/1080i/MyPVRGuide.xml b/1080i/MyPVRGuide.xml
index 8ebfe37..caa0ad8 100644
--- a/1080i/MyPVRGuide.xml
+++ b/1080i/MyPVRGuide.xml
@@ -3,7 +3,7 @@
     <views>10</views>
     <defaultcontrol always="false">9999</defaultcontrol>
     <allowoverlay>no</allowoverlay>
-    <onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload>
+    <onload condition="!Player.HasAudio">PlayerControl(stop)</onload>
     <onunload>Skin.SetString(showRecentVideoItems,true)</onunload>
     <controls>
         <include>globalBackground</include>
diff --git a/1080i/MyPVRRecordings.xml b/1080i/MyPVRRecordings.xml
index ddfc361..18afd2b 100644
--- a/1080i/MyPVRRecordings.xml
+++ b/1080i/MyPVRRecordings.xml
@@ -2,7 +2,7 @@
 <window>
     <defaultcontrol always="false">9999</defaultcontrol>
     <allowoverlay>no</allowoverlay>
-    <onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload>
+    <onload condition="!Player.HasAudio">PlayerControl(stop)</onload>
     <onunload>Skin.SetString(showRecentVideoItems,true)</onunload>
     <controls>
         <include>globalBackground</include>
@@ -85,7 +85,7 @@
                             <font>itemTitle</font>
                             <textcolor>textActive</textcolor>
                             <shadowcolor>-</shadowcolor>
-                            <label>$INFO[ListItem.Date,, • ]$INFO[ListItem.Duration]</label>
+                            <label>$INFO[ListItem.Date]$INFO[ListItem.Duration, • ,]</label>
                         </control>
                     </itemlayout>
                     <focusedlayout width="24-col" height="2-row">
@@ -144,134 +144,11 @@
                             <font>itemTitle</font>
                             <textcolor>textActive</textcolor>
                             <shadowcolor>-</shadowcolor>
-                            <label>$INFO[ListItem.Date,, • ]$INFO[ListItem.Duration]</label>
+                            <label>$INFO[ListItem.Date]$INFO[ListItem.Duration, • ,]</label>
                         </control>
                     </focusedlayout>
                 </control>
 
-                <!--test-->
-                <control type="panel" id="5678">
-                    <posx>0</posx>
-                    <posy>12-row</posy>
-                    <width>24-col</width>
-                    <height>8-row</height>
-                    <onleft>9000</onleft>
-                    <onright>60</onright>
-                    <pagecontrol>60</pagecontrol>
-                    <itemlayout width="24-col" height="2-row">
-                        <control type="image">
-                            <posx>1-col</posx>
-                            <posy>0</posy>
-                            <width>23-col</width>
-                            <height>69</height>
-                            <aspectratio>stretch</aspectratio>
-                            <texture border="0">colors/black.png</texture>
-                            <colordiffuse>overlay</colordiffuse>
-                        </control>
-                        <control type="image">
-                            <posx>0</posx>
-                            <posy>3</posy>
-                            <width>66</width>
-                            <height>66</height>
-                            <aspectratio scalediffuse="false">stretch</aspectratio>
-                            <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
-                        </control>
-                        <control type="label">
-                            <visible>!isempty(ListItem.playcount) + !ListItem.IsResumable</visible>
-                            <posx>16</posx>
-                            <posy>2</posy>
-                            <width>66</width>
-                            <height>66</height>
-                            <font>symbolLarge</font>
-                            <textcolor>textActive</textcolor>
-                            <shadowcolor>-</shadowcolor>
-                            <label>✓</label>
-                        </control>
-                        <control type="label">
-                            <posx>1-col-indent</posx>
-                            <posy>0</posy>
-                            <width>11-col-gutter</width>
-                            <height>2-row</height>
-                            <aligny>center</aligny>
-                            <font>itemTitle</font>
-                            <textcolor>textActive</textcolor>
-                            <shadowcolor>-</shadowcolor>
-                            <label>$INFO[ListItem.Label]</label>
-                        </control>
-                        <control type="label">
-                            <right>12</right>
-                            <posy>0</posy>
-                            <width>6-col-gutter</width>
-                            <height>2-row</height>
-                            <aligny>center</aligny>
-                            <font>itemTitle</font>
-                            <textcolor>textActive</textcolor>
-                            <shadowcolor>-</shadowcolor>
-                            <label>$INFO[ListItem.Date,, • ]$INFO[ListItem.Duration]</label>
-                        </control>
-                    </itemlayout>
-                    <focusedlayout width="24-col" height="2-row">
-                        <control type="image">
-                            <posx>1-col</posx>
-                            <posy>0</posy>
-                            <width>23-col</width>
-                            <height>2-row</height>
-                            <aspectratio>stretch</aspectratio>
-                            <texture border="0">colors/white.png</texture>
-                            <colordiffuse>highlight</colordiffuse>
-                        </control>
-                        <control type="group">
-                            <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"/>
-                            </animation>
-                            <control type="image">
-                                <posx>0</posx>
-                                <posy>3</posy>
-                                <width>66</width>
-                                <height>66</height>
-                                <aspectratio scalediffuse="false">stretch</aspectratio>
-                                <texture fallback="colors/white.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
-                            </control>
-                            <control type="label">
-                                <visible>!isempty(ListItem.playcount) + !ListItem.IsResumable</visible>
-                                <posx>16</posx>
-                                <posy>2</posy>
-                                <width>66</width>
-                                <height>66</height>
-                                <font>symbolLarge</font>
-                                <textcolor>black</textcolor>
-                                <shadowcolor>-</shadowcolor>
-                                <label>✓</label>
-                            </control>
-                        </control>
-                        <control type="label">
-                            <posx>1-col-indent</posx>
-                            <posy>0</posy>
-                            <width>11-col-gutter</width>
-                            <height>2-row</height>
-                            <aligny>center</aligny>
-                            <font>itemTitle</font>
-                            <textcolor>textActive</textcolor>
-                            <selectedcolor>textActive</selectedcolor>
-                            <shadowcolor>-</shadowcolor>
-                            <label>$INFO[ListItem.Label]</label>
-                        </control>
-                        <control type="label">
-                            <right>12</right>
-                            <posy>0</posy>
-                            <width>6-col-gutter</width>
-                            <height>2-row</height>
-                            <aligny>center</aligny>
-                            <font>itemTitle</font>
-                            <textcolor>textActive</textcolor>
-                            <shadowcolor>-</shadowcolor>
-                            <label>$INFO[ListItem.Date,, • ]$INFO[ListItem.Duration]</label>
-                        </control>
-                    </focusedlayout>
-                    <content>plugin://script.maximinimalism.functions?type=recentalbums</content>
-                </control>
-
                 <!--Additional info-->
                 <control type="group">
                     <posx>0</posx>
diff --git a/1080i/MyPVRTimers.xml b/1080i/MyPVRTimers.xml
deleted file mode 100644
index 9031cba..0000000
--- a/1080i/MyPVRTimers.xml
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window>
-    <defaultcontrol always="false">9999</defaultcontrol>
-    <allowoverlay>no</allowoverlay>
-    <onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload>
-    <onunload>Skin.SetString(showRecentVideoItems,true)</onunload>
-    <controls>
-        <include>globalBackground</include>
-        <!--page container group-->
-        <control type="group">
-            <!--window fader-->
-            <animation type="conditional" condition="window.next(0) | window.next(1)">
-                <effect type="fade" start="100" end="0" time="300"/>
-            </animation>
-            <!--shift page for certain modal dialogs-->
-            <include>modalDialogContentShift</include>
-            <!--content provider-->
-            <control type="group">
-                <posx>0</posx>
-                <posy>0</posy>
-                <!--main menu-->
-                <control type="group" id="8000">
-                    <posx>col-1-begin</posx>
-                    <posy>row-2-begin</posy>
-                    <include>dateTime</include>
-                    <include>hubMenu</include>
-                </control>
-                <!--Folder titles-->
-                <control type="group">
-                    <posx>col-4-begin</posx>
-                    <posy>row-2-begin</posy>
-                    <!--source title-->
-                    <control type="label">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>14-col</width>
-                        <font>pageTitle</font>
-                        <label>31119</label>
-                        <textcolor>textActive</textcolor>
-                    </control>
-                    <control type="label">
-                        <posx>0</posx>
-                        <posy>45</posy>
-                        <width>14-col</width>
-                        <font>regular</font>
-                        <label>$INFO[container.numitems] $LOCALIZE[31145]</label>
-                        <textcolor>textActive</textcolor>
-                    </control>
-                </control>
-                <!--Main content listing-->
-                <control type="group" id="9999">
-                    <posx>col-4-begin</posx>
-                    <posy>270</posy>
-                    <!--animations-->
-                    <animation type="windowopen">
-                        <include>listSlideIn</include>
-                    </animation>
-                    <control type="panel" id="50">
-                        <posx>-12</posx>
-                        <posy>-12</posy>
-                        <width>20-col</width>
-                        <height>11-row</height>
-                        <onleft>9000</onleft>
-                        <onright>60</onright>
-                        <pagecontrol>60</pagecontrol>
-                        <itemlayout width="20-col" height="1-row">
-                            <control type="image">
-                                <posx>0</posx>
-                                <posy>2</posy>
-                                <width>20-col</width>
-                                <height>53</height>
-                                <aspectratio>stretch</aspectratio>
-                                <texture border="24,0,24,0">UIControls/listitemNF.png</texture>
-                                <bordersize>0</bordersize>
-                                <colordiffuse>99FFFFFF</colordiffuse>
-                            </control>
-                            <control type="image">
-                                <posx>4</posx>
-                                <posy>4</posy>
-                                <width>48</width>
-                                <height>48</height>
-                                <aspectratio scalediffuse="false">scale</aspectratio>
-                                <texture diffuse="masks/circle.png" border="0">colors/offblack.png</texture>
-                            </control>
-                            <control type="label">
-                                <visible>ListItem.HasTimer</visible>
-                                <posx>11</posx>
-                                <posy>-2</posy>
-                                <width>38</width>
-                                <font>symbolLarge</font>
-                                <textcolor>textActive</textcolor>
-                                <shadowcolor>-</shadowcolor>
-                                <label></label>
-                            </control>
-                            <control type="label">
-                                <posx>1-col</posx>
-                                <posy>0</posy>
-                                <width>6-col-gutter</width>
-                                <font>itemTitle</font>
-                                <textcolor>textActive</textcolor>
-                                <shadowcolor>-</shadowcolor>
-                                <label>$INFO[ListItem.Label]</label>
-                            </control>
-                            <control type="label">
-                                <posx>8-col</posx>
-                                <posy>0</posy>
-                                <width>8-col-gutter</width>
-                                <font>itemTitle</font>
-                                <textcolor>textActive</textcolor>
-                                <shadowcolor>-</shadowcolor>
-                                <label>$INFO[ListItem.Date]</label>
-                            </control>
-                            <control type="label">
-                                <posx>16-col</posx>
-                                <posy>0</posy>
-                                <width>4-col-gutter</width>
-                                <font>itemTitle</font>
-                                <textcolor>textActive</textcolor>
-                                <shadowcolor>-</shadowcolor>
-                                <label>$INFO[ListItem.Comment]</label>
-                            </control>
-                        </itemlayout>
-                        <focusedlayout width="20-col" height="1-row">
-                            <control type="image">
-                                <posx>0</posx>
-                                <posy>2</posy>
-                                <width>20-col</width>
-                                <height>53</height>
-                                <aspectratio>stretch</aspectratio>
-                                <texture border="24,0,24,0">UIControls/listitemFO.png</texture>
-                                <bordersize>0</bordersize>
-                                <colordiffuse>FFFFFFFF</colordiffuse>
-                            </control>
-                            <control type="image">
-                                <posx>4</posx>
-                                <posy>4</posy>
-                                <width>48</width>
-                                <height>48</height>
-                                <aspectratio scalediffuse="false">scale</aspectratio>
-                                <texture diffuse="masks/circle.png" border="0">colors/offblack.png</texture>
-                            </control>
-                            <control type="label">
-                                <visible>!isempty(ListItem.playcount) + !ListItem.IsResumable</visible>
-                                <posx>11</posx>
-                                <posy>-2</posy>
-                                <width>38</width>
-                                <font>symbolLarge</font>
-                                <textcolor>textActive</textcolor>
-                                <shadowcolor>-</shadowcolor>
-                                <label></label>
-                            </control>
-                            <control type="label">
-                                <posx>1-col</posx>
-                                <posy>0</posy>
-                                <width>6-col-gutter</width>
-                                <font>itemTitle</font>
-                                <textcolor>black</textcolor>
-                                <selectedcolor>black</selectedcolor>
-                                <shadowcolor>-</shadowcolor>
-                                <label>$INFO[ListItem.Label]</label>
-                            </control>
-                            <control type="label">
-                                <posx>8-col</posx>
-                                <posy>0</posy>
-                                <width>8-col-gutter</width>
-                                <font>itemTitle</font>
-                                <textcolor>black</textcolor>
-                                <selectedcolor>black</selectedcolor>
-                                <shadowcolor>-</shadowcolor>
-                                <label>$INFO[ListItem.Date]</label>
-                            </control>
-                            <control type="label">
-                                <posx>16-col</posx>
-                                <posy>0</posy>
-                                <width>4-col-gutter</width>
-                                <font>itemTitle</font>
-                                <textcolor>black</textcolor>
-                                <selectedcolor>black</selectedcolor>
-                                <shadowcolor>-</shadowcolor>
-                                <label>$INFO[ListItem.Comment]</label>
-                            </control>
-                        </focusedlayout>
-                    </control>
-                    <!--Additional info-->
-                    <control type="group">
-                        <posx>0</posx>
-                        <posy>672</posy>
-                        <control type="label">
-                            <posx>0</posx>
-                            <posy>0</posy>
-                            <width>12-col-gutter</width>
-                            <font>itemTitle</font>
-                            <textcolor>textActive</textcolor>
-                            <selectedcolor>selected</selectedcolor>
-                            <shadowcolor>-</shadowcolor>
-                            <label>$INFO[Pvr.BackendDiskSpace]</label>
-                        </control>
-                    </control>
-                </control>
-                <!--page scrollbar-->
-                <control type="group" id="9400">
-                    <visible>Control.IsVisible(60) + !control.isvisible(10)</visible>
-                    <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(9400).hasfocus">conditional</animation>
-                    <control type="scrollbar" id="60">
-                        <posx>108r</posx>
-                        <posy>276</posy>
-                        <height>672</height>
-                        <onleft>9999</onleft>
-                    </control>
-                </control>
-            </control>
-        </control>
-        <!--sorting and misc controls-->
-        <control type="group" id="61">
-            <!--Options-->
-            <control type="group">
-                <posx>24</posx>
-                <posy>111</posy>
-                <animation type="Conditional" condition="controlgroup(62).hasfocus">
-                    <effect type="fade" start="0" end="100" time="300"/>
-                    <effect type="slide" start="-200" end="0" tween="sine" easing="out" time="400"/>
-                </animation>
-                <animation type="Conditional" condition="!controlgroup(62).hasfocus | Window.IsActive(5000) | Window.IsActive(5900)">
-                    <effect type="fade" start="100" end="0" time="400"/>
-                    <effect type="slide" start="0" end="-200" tween="sine" easing="out" time="400"/>
-                </animation>
-                <!--menu-->
-                <include>sideBarMenuItems</include>
-            </control>
-        </control>
-        <!--debugging-->
-        <include>DebugGrid</include>
-        <control type="label">
-            <include>DialogID</include>
-            <label>MyPVRTimers.xml</label>
-        </control>
-    </controls>
-</window>
diff --git a/1080i/MyPics.xml b/1080i/MyPics.xml
index b9de8a9..e4c1cd1 100644
--- a/1080i/MyPics.xml
+++ b/1080i/MyPics.xml
@@ -2,7 +2,7 @@
 <window>
     <defaultcontrol always="true">9000</defaultcontrol>
     <allowoverlay>yes</allowoverlay>
-    <onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload>
+    <onload condition="!Player.HasAudio">PlayerControl(stop)</onload>
     <previouswindow>home</previouswindow>
     <controls>
         <include>globalBackground</include>
diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml
index 2911986..9a1b042 100644
--- a/1080i/MyVideoNav.xml
+++ b/1080i/MyVideoNav.xml
@@ -2,7 +2,7 @@
 <window>
     <defaultcontrol always="false">9000</defaultcontrol>
     <allowoverlay>yes</allowoverlay>
-    <onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload>
+    <onload condition="!Player.HasAudio">PlayerControl(stop)</onload>
     <onload condition="window.previous(0)">setfocus(9000)</onload>
     <previouswindow>home</previouswindow>
     <controls>
diff --git a/1080i/ProfileSettings.xml b/1080i/ProfileSettings.xml
index 1a0acb9..6d5b45c 100644
--- a/1080i/ProfileSettings.xml
+++ b/1080i/ProfileSettings.xml
@@ -6,11 +6,14 @@
         <!--background-->
         <control type="group">
             <posx>col-9-begin</posx>
-            <posy>row-1-begin</posy>
+            <posy>row-2-begin</posy>
             <!--animations-->
             <animation type="windowopen">
-                <effect type="fade" start="0" end="100" delay="400" time="300"/>
-                <effect type="slide" start="0,-300" end="0,0" tween="cubic" easing="out" delay="400" time="400"/>
+                <effect type="rotatey" start="-90" end="0" center="960" tween="cubic" easing="out" delay="400" time="500"/>
+            </animation>
+            <animation type="windowclose">
+                <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>0</posx>
@@ -23,13 +26,11 @@
             </control>
             <!--title-->
             <control type="label" id="102">
-                <posx>0</posx>
+                <posx>24</posx>
                 <posy>0</posy>
                 <width>8-col</width>
                 <height>2-row</height>
-                <align>center</align>
                 <font>dialogTitle</font>
-                <label>31103</label>
                 <textcolor>textActive</textcolor>
             </control>
             <control type="image">
@@ -53,26 +54,6 @@
                 <posx>0</posx>
                 <posy>10-row</posy>
                 <width>8-col</width>
-                <height>2-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>textboxInactive</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
-            <control type="label" id="103">
-                <description>Profile Directory</description>
-                <posx>0</posx>
-                <posy>10-row</posy>
-                <width>8-col</width>
-                <height>2-row</height>
-                <align>center</align>
-                <aligny>center</aligny>
-                <font>itemSubTitle</font>
-                <textcolor>highlight</textcolor>
-            </control>
-            <control type="image">
-                <posx>0</posx>
-                <posy>12-row</posy>
-                <width>8-col</width>
                 <height>15-row</height>
                 <texture>colors/black.png</texture>
                 <colordiffuse>overlay</colordiffuse>
@@ -80,20 +61,20 @@
             </control>
             <control type="button" id="6000">
                 <description>Profile switch</description>
-                <visible>!StringCompare(System.ProfileName,control.getlabel(1000))</visible>
+                <visible>!StringCompare(System.ProfileName,control.getlabel(102))</visible>
                 <posx>0</posx>
-                <posy>12-row</posy>
+                <posy>10-row</posy>
                 <width>8-col</width>
                 <font>buttonTitle</font>
                 <textoffsetx>24</textoffsetx>
                 <label>31131</label>
-                <onclick>LoadProfile($INFO[control.getlabel(1000)])</onclick>
+                <onclick>LoadProfile($INFO[control.getlabel(102)])</onclick>
                 <ondown>5</ondown>
             </control>
             <control type="grouplist" id="5">
                 <description>Control Area</description>
                 <posx>0</posx>
-                <posy>14-row</posy>
+                <posy>12-row</posy>
                 <width>8-col</width>
                 <height>13-row</height>
                 <itemgap>3</itemgap>
diff --git a/1080i/SettingsProfile.xml b/1080i/SettingsProfile.xml
index 8d80f28..ac82723 100644
--- a/1080i/SettingsProfile.xml
+++ b/1080i/SettingsProfile.xml
@@ -7,12 +7,12 @@
         <include>globalBackground</include>
         <control type="group">
             <posx>col-9-begin</posx>
-            <posy>row-1-begin</posy>
+            <posy>row-2-begin</posy>
             <!--animations-->
             <include>modalDialogInOutVertical</include>
             <animation type="conditional" condition="window.isactive(profilesettings)">
                 <effect type="fade" start="100" end="0" time="300"/>
-                <effect type="slide" start="0" end="0,300" tween="cubic" easing="out" time="400"/>
+                <effect type="rotatey" start="0" end="90" center="960" tween="cubic" easing="out" time="500"/>
             </animation>
             <control type="image">
                 <posx>0</posx>
@@ -27,17 +27,16 @@
                 <posx>0</posx>
                 <posy>2-row</posy>
                 <width>8-col</width>
-                <height>25-row</height>
+                <height>23-row</height>
                 <texture>colors/black.png</texture>
-                <colordiffuse>overlay</colordiffuse>
+                <colordiffuse>44ffffff</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
             <control type="label">
-                <posx></posx>
+                <posx>24</posx>
                 <posy>0</posy>
                 <width>8-col</width>
                 <height>2-row</height>
-                <align>center</align>
                 <aligny>center</aligny>
                 <font>dialogTitle</font>
                 <label>31103</label>
@@ -75,8 +74,8 @@
                 <posy>10-row</posy>
                 <width>8-col</width>
                 <height>2-row</height>
-                <aligny>center</aligny>
                 <align>center</align>
+                <aligny>center</aligny>
                 <font>itemSubTitle</font>
                 <label>$LOCALIZE[31107]: [COLOR highlight]$INFO[System.ProfileName][/COLOR]</label>
                 <textcolor>textActive</textcolor>
@@ -89,18 +88,39 @@
                 <posy>12-row</posy>
                 <width>8-col</width>
                 <label>20096</label>
+                <texturenofocus>colors/black.png</texturenofocus>
                 <align>left</align>
                 <ondown>2</ondown>
             </control>
             <control type="panel" id="2">
-                <posx>0</posx>
-                <posy>14-row</posy>
-                <width>8-col</width>
-                <height>14-row</height>
+                <posx>12</posx>
+                <posy>516</posy>
+                <width>8-col-gutter</width>
+                <height>8-row</height>
                 <onup>4</onup>
                 <itemlayout width="8-col" height="2-row">
+                    <control type="image">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>69</width>
+                        <height>69</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture fallback="colors/offblack.png">$INFO[listitem.icon]</texture>
+                        <bordersize>0</bordersize>
+                        <colordiffuse>ffffffff</colordiffuse>
+                    </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>24</posx>
+                        <posx>1-col-indent</posx>
                         <posy>0</posy>
                         <width>7-col</width>
                         <height>2-row</height>
@@ -112,17 +132,27 @@
                 </itemlayout>
                 <focusedlayout width="8-col" height="2-row">
                     <control type="image">
-                        <posx>0</posx>
+                        <posx>1-col</posx>
                         <posy>0</posy>
-                        <width>8-col</width>
-                        <height>2-row</height>
+                        <width>7-col</width>
+                        <height>69</height>
                         <aspectratio>stretch</aspectratio>
                         <texture>colors/white.png</texture>
                         <bordersize>0</bordersize>
                         <colordiffuse>ffffffff</colordiffuse>
                     </control>
+                    <control type="image">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>69</width>
+                        <height>69</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture fallback="colors/offblack.png">$INFO[listitem.icon]</texture>
+                        <bordersize>0</bordersize>
+                        <colordiffuse>ffffffff</colordiffuse>
+                    </control>
                     <control type="label">
-                        <posx>24</posx>
+                        <posx>1-col-indent</posx>
                         <posy>0</posy>
                         <width>6-col</width>
                         <height>2-row</height>
diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml
index c13ac70..791cf51 100644
--- a/1080i/SkinSettings.xml
+++ b/1080i/SkinSettings.xml
@@ -5,16 +5,15 @@
     <controls>
         <!--background-->
         <include>globalBackground</include>
-
         <control type="group">
-            <posx>col-3-begin</posx>
-            <posy>row-4-begin</posy>
+            <posx>col-4-begin</posx>
+            <posy>row-5-begin</posy>
             <!--animations-->
             <include>modalDialogInOutVertical</include>
             <control type="image">
                 <posx>0</posx>
                 <posy>0</posy>
-                <width>20-col</width>
+                <width>18-col</width>
                 <height>2-row</height>
                 <texture>colors/white.png</texture>
                 <colordiffuse>highlight</colordiffuse>
@@ -24,7 +23,7 @@
             <control type="label">
                 <posx>24</posx>
                 <posy>0</posy>
-                <width>20-col-gutter</width>
+                <width>18-col-gutter</width>
                 <height>2-row</height>
                 <font>dialogTitle</font>
                 <label>$LOCALIZE[20077]</label>
@@ -34,8 +33,8 @@
             <control type="image">
                 <posx>0</posx>
                 <posy>2-row</posy>
-                <width>20-col</width>
-                <height>20-row</height>
+                <width>18-col</width>
+                <height>18-row</height>
                 <texture>colors/black.png</texture>
                 <colordiffuse>overlay</colordiffuse>
                 <aspectratio>stretch</aspectratio>
@@ -49,7 +48,7 @@
                     <posx>0</posx>
                     <posy>0</posy>
                     <width>4-col</width>
-                    <height>19-row</height>
+                    <height>18-row</height>
                     <onright>200</onright>
                     <pagecontrol>-</pagecontrol>
                     <itemlayout height="2-row" width="4-col">
@@ -117,8 +116,8 @@
             <control type="image">
                 <posx>4-col</posx>
                 <posy>2-row</posy>
-                <width>16-col</width>
-                <height>20-row</height>
+                <width>14-col</width>
+                <height>18-row</height>
                 <texture>colors/black.png</texture>
                 <colordiffuse>overlay</colordiffuse>
                 <aspectratio>stretch</aspectratio>
@@ -126,23 +125,15 @@
             <control type="grouplist" id="200">
                 <posx>4-col</posx>
                 <posy>2-row</posy>
-                <width>16-col</width>
+                <width>14-col</width>
                 <height>20-row</height>
                 <onleft>8000</onleft>
                 <itemgap>0</itemgap>
                 <orientation>vertical</orientation>
-                <control type="radiobutton" id="6">
-                    <visible>Container(8000).Hasfocus(1)</visible>
-                    <description>Stop video on return to menu</description>
-                    <width>16-col</width>
-                    <label>31143</label>
-                    <onclick>Skin.ToggleSetting(stopVideoOnMenu)</onclick>
-                    <selected>Skin.HasSetting(stopVideoOnMenu)</selected>
-                </control>
                 <control type="radiobutton" id="7">
                     <visible>Container(8000).Hasfocus(1)</visible>
                     <description>Reverse power down options</description>
-                    <width>16-col</width>
+                    <width>14-col</width>
                     <label>31142</label>
                     <onclick>Skin.ToggleSetting(exitFirst)</onclick>
                     <selected>Skin.HasSetting(exitFirst)</selected>
@@ -150,7 +141,7 @@
                 <control type="radiobutton" id="8">
                     <visible>Container(8000).Hasfocus(2)</visible>
                     <description>Hide Video</description>
-                    <width>16-col</width>
+                    <width>14-col</width>
                     <label>31147</label>
                     <onclick>Skin.ToggleSetting(hideVideo)</onclick>
                     <selected>Skin.HasSetting(hideVideo)</selected>
@@ -158,7 +149,7 @@
                 <control type="radiobutton" id="9">
                     <visible>Container(8000).Hasfocus(2)</visible>
                     <description>Hide Music</description>
-                    <width>16-col</width>
+                    <width>14-col</width>
                     <label>31148</label>
                     <onclick>Skin.ToggleSetting(hideMusic)</onclick>
                     <selected>Skin.HasSetting(hideMusic)</selected>
@@ -166,7 +157,7 @@
                 <control type="radiobutton" id="10">
                     <visible>Container(8000).Hasfocus(2)</visible>
                     <description>Hide Pictures</description>
-                    <width>16-col</width>
+                    <width>14-col</width>
                     <label>31149</label>
                     <onclick>Skin.ToggleSetting(hidePictures)</onclick>
                     <selected>Skin.HasSetting(hidePictures)</selected>
@@ -174,7 +165,7 @@
                 <control type="radiobutton" id="11">
                     <visible>Container(8000).Hasfocus(2)</visible>
                     <description>Hide Games</description>
-                    <width>16-col</width>
+                    <width>14-col</width>
                     <label>31157</label>
                     <onclick>Skin.ToggleSetting(hideGames)</onclick>
                     <selected>Skin.HasSetting(hideGames)</selected>
@@ -182,7 +173,7 @@
                 <control type="radiobutton" id="12">
                     <visible>Container(8000).Hasfocus(2)</visible>
                     <description>Hide Search</description>
-                    <width>16-col</width>
+                    <width>14-col</width>
                     <label>31150</label>
                     <onclick>Skin.ToggleSetting(hideSearch)</onclick>
                     <selected>Skin.HasSetting(hideSearch)</selected>
@@ -190,7 +181,7 @@
                 <control type="radiobutton" id="15">
                     <visible>Container(8000).Hasfocus(3)</visible>
                     <description>Enable Debug Grid</description>
-                    <width>16-col</width>
+                    <width>14-col</width>
                     <label>31034</label>
                     <onclick>Skin.ToggleSetting(DebugGrid)</onclick>
                     <selected>Skin.HasSetting(DebugGrid)</selected>
@@ -198,7 +189,7 @@
                 <control type="radiobutton" id="16">
                     <visible>Container(8000).Hasfocus(3)</visible>
                     <description>Disable Debug Info</description>
-                    <width>16-col</width>
+                    <width>14-col</width>
                     <label>31035</label>
                     <onclick>Skin.ToggleSetting(DebugInfo)</onclick>
                     <selected>Skin.HasSetting(DebugInfo)</selected>
@@ -206,7 +197,7 @@
                 <control type="radiobutton" id="19">
                     <visible>Container(8000).Hasfocus(1)</visible>
                     <description>Autostart music visualisation on playback</description>
-                    <width>16-col</width>
+                    <width>14-col</width>
                     <label>31171</label>
                     <onclick>Skin.ToggleSetting(startVisualiserOnPlayback)</onclick>
                     <selected>Skin.HasSetting(startVisualiserOnPlayback)</selected>
diff --git a/1080i/SmartPlaylistEditor.xml b/1080i/SmartPlaylistEditor.xml
index eb9ecca..a1eca30 100644
--- a/1080i/SmartPlaylistEditor.xml
+++ b/1080i/SmartPlaylistEditor.xml
@@ -3,49 +3,41 @@
     <defaultcontrol always="true">9002</defaultcontrol>
     <allowoverlay>no</allowoverlay>
     <controls>
-        <!--background-->
-        <control type="image">
-            <posx>0</posx>
-            <posy>0</posy>
-            <include>dimensionsFullscreen</include>
-            <texture>colors/black.png</texture>
-            <colordiffuse>eeffffff</colordiffuse>
-            <aspectratio>stretch</aspectratio>
-        </control>
+        <include>globalBackground</include>
         <control type="group">
             <!--animations-->
             <include>modalDialogInOutVertical</include>
             <visible>!Window.IsVisible(smartplaylistrule)</visible>
             <control type="group">
-                <posx>col-5-begin</posx>
+                <posx>col-4-begin</posx>
                 <posy>row-3-begin</posy>
                 <control type="image">
-                    <posx>-384</posx>
-                    <posy>44</posy>
-                    <width>fullscreenWidth</width>
-                    <height>1-row</height>
+                    <posx>0</posx>
+                    <posy>0</posy>
+                    <width>18-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>1155</width>
-                    <height>1-row</height>
-                    <texture>colors/white.png</texture>
-                    <bordertexture border="0">colors/black.png</bordertexture>
-                    <bordersize>3,0,0,0</bordersize>
-                    <colordiffuse>ffffffff</colordiffuse>
+                    <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>12</posx>
-                    <posy>44</posy>
-                    <width>16-col</width>
+                    <posy>0</posy>
+                    <width>8-col</width>
+                    <height>2-row</height>
+                    <aligny>center</aligny>
                     <font>dialogTitle</font>
-                    <label>21432</label>
-                    <textcolor>black</textcolor>
+                    <label>31203</label>
+                    <textcolor>textActive</textcolor>
                     <shadowcolor>-</shadowcolor>
                 </control>
                 <!--set playlist type-->
@@ -53,32 +45,36 @@
                     <description>Set Playlist type</description>
                     <posx>0</posx>
                     <posy>2-row</posy>
-                    <width>12-col-gutter</width>
+                    <width>14-col</width>
                     <label>467</label>
                     <onright>9002</onright>
                     <ondown>12</ondown>
                 </control>
-                <control type="label">
-                    <description>Playlist Name Label</description>
-                    <posx>12</posx>
-                    <posy>3-row</posy>
-                    <width>12-col-gutter</width>
-                    <label>21433</label>
-                    <textcolor>textActive</textcolor>
-                    <font>itemTitle</font>
-                </control>
+
                 <control type="edit" id="12">
                     <description>Name Button</description>
                     <posx>4-col</posx>
-                    <posy>3-row</posy>
-                    <width>8-col-gutter</width>
+                    <posy>4-row</posy>
+                    <width>14-col-gutter</width>
                     <label>-</label>
                     <onup>22</onup>
                     <onright>9002</onright>
                     <ondown>10</ondown>
                 </control>
-                <control type="group">
+                <control type="label">
+                    <description>Playlist Name Label</description>
+                    <posx>12</posx>
                     <posy>4-row</posy>
+                    <width>14-col-gutter</width>
+                    <height>2-row</height>
+                    <font>mediumStrong</font>
+                    <label>21433</label>
+                    <textcolor>disabled</textcolor>
+                    <font>itemTitle</font>
+                </control>
+
+                <control type="group">
+                    <posy>6-row</posy>
                     <!--add / remove edit rules-->
                     <control type="group">
                         <control type="panel" id="9001">
@@ -148,13 +144,6 @@
                                 </control>
                             </focusedlayout>
                             <content>
-                                <item id="1">
-                                    <description>Add Rule</description>
-                                    <label>15019</label>
-                                    <label2></label2>
-                                    <thumb>-</thumb>
-                                    <onclick>SendClick(129,13)</onclick>
-                                </item>
                                 <item id="2">
                                     <description>Remove Rule</description>
                                     <label>1210</label>
@@ -231,7 +220,7 @@
                 </control>
                 <control type="spincontrolex" id="16">
                     <posx>0</posx>
-                    <posy>9-row</posy>
+                    <posy>14-row</posy>
                     <width>12-col-gutter</width>
                     <label>21424</label>
                     <onright>9002</onright>
@@ -240,7 +229,7 @@
                 </control>
                 <control type="spincontrolex" id="17">
                     <posx>0</posx>
-                    <posy>10-row</posy>
+                    <posy>15-row</posy>
                     <width>12-col-gutter</width>
                     <label>21427</label>
                     <onright>9002</onright>
@@ -249,7 +238,7 @@
                 </control>
                 <control type="spincontrolex" id="18">
                     <posx>0</posx>
-                    <posy>11-row</posy>
+                    <posy>16-row</posy>
                     <width>12-col-gutter</width>
                     <label>21429</label>
                     <onright>9002</onright>
@@ -258,7 +247,7 @@
                 </control>
                 <control type="label">
                     <posx>12</posx>
-                    <posy>12-row</posy>
+                    <posy>17-row</posy>
                     <width>8-col</width>
                     <height>1-row</height>
                     <font>itemTitle</font>
@@ -268,7 +257,7 @@
                 </control>
                 <control type="togglebutton" id="19">
                     <posx>0</posx>
-                    <posy>12-row</posy>
+                    <posy>17-row</posy>
                     <width>12-col-gutter</width>
                     <label>21431</label>
                     <altlabel>21430</altlabel>
@@ -284,7 +273,7 @@
                 <control type="label">
                     <visible>control.hasfocus(19)</visible>
                     <posx>12</posx>
-                    <posy>12-row</posy>
+                    <posy>18-row</posy>
                     <width>8-col</width>
                     <height>1-row</height>
                     <font>itemTitle</font>
@@ -295,7 +284,7 @@
                 <control type="label">
                     <visible>control.hasfocus(19)</visible>
                     <posx>828</posx>
-                    <posy>12-row</posy>
+                    <posy>19-row</posy>
                     <width>12-col-gutter</width>
                     <align>right</align>
                     <height>1-row</height>
@@ -306,64 +295,74 @@
                 </control>
                 <!--OK / Cancel-->
                 <control type="panel" id="9002">
-                    <posx>12-col</posx>
+                    <posx>14-col</posx>
                     <posy>2-row</posy>
                     <width>4-col</width>
                     <height>5-row</height>
                     <itemgap>3</itemgap>
                     <orientation>vertical</orientation>
                     <onleft>22</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>
-                            <posy>2</posy>
-                            <width>3-col</width>
-                            <font>menuTitle</font>
+                            <posx>1-col-indent</posx>
+                            <posy>-1</posy>
+                            <width>5-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>
-                            <width>4-col</width>
-                            <height>53</height>
+                            <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>5-col</width>
+                            <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>
-                            <posy>2</posy>
-                            <width>3-col</width>
-                            <font>menuTitle</font>
+                            <posx>1-col-indent</posx>
+                            <posy>-1</posy>
+                            <width>5-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/VideoOSD.xml b/1080i/VideoOSD.xml
index c9d35ad..133bde1 100644
--- a/1080i/VideoOSD.xml
+++ b/1080i/VideoOSD.xml
@@ -149,6 +149,13 @@
                     </control>
                 </focusedlayout>
                 <content>
+                    <item>
+                        <enable>System.GetBool(pvrmanager.enabled) + Player.CanRecord</enable>
+                        <label>31201</label>
+                        <label2></label2>
+                        <thumb>-</thumb>
+                        <onclick>PlayerControl(record)</onclick>
+                    </item>
                     <item>
                         <description>Subtitles</description>
                         <label>24012</label>
diff --git a/1080i/VideoOSDSettings.xml b/1080i/VideoOSDSettings.xml
index 2075934..62f0be5 100644
--- a/1080i/VideoOSDSettings.xml
+++ b/1080i/VideoOSDSettings.xml
@@ -2,6 +2,7 @@
 <window>
     <defaultcontrol always="true">5</defaultcontrol>
     <allowoverlay>yes</allowoverlay>
+    <include>fadeInOut</include>
     <controls>
         <control type="image">
             <include>dimensionsFullscreen</include>
diff --git a/1080i/custom_subtitleMenu.xml b/1080i/custom_subtitleMenu.xml
index f137a4c..7bc3d4c 100644
--- a/1080i/custom_subtitleMenu.xml
+++ b/1080i/custom_subtitleMenu.xml
@@ -22,40 +22,31 @@
                 <aspectratio>stretch</aspectratio>
             </control>
             <control type="group">
-                <posx>col-9-begin</posx>
+                <posx>col-10-begin</posx>
                 <posy>row-9-begin</posy>
                 <!--animations-->
                 <include>modalDialogInOutVertical</include>
                 <!--subtitle menu-->
-                <control type="image">
-                    <posx>-36</posx>
-                    <posy>-36</posy>
-                    <width>9-col</width>
-                    <height>10-row</height>
-                    <texture>colors/black.png</texture>
-                    <aspectratio>stretch</aspectratio>
-                    <bordertexture border="3" colordiffuse="33FFFFFF">colors/white.png</bordertexture>
-                    <bordersize>3</bordersize>
-                    <colordiffuse>ffffffff</colordiffuse>
-                </control>
-                <control type="label">
-                    <description>heading</description>
-                    <posx>0</posx>
-                    <posy>0</posy>
-                    <width>9-col</width>
-                    <font>dialogTitle</font>
-                    <textcolor>textActive</textcolor>
-                    <label>$LOCALIZE[31194]</label>
-                </control>
                 <control type="grouplist" id="5000">
                     <posx>0</posx>
-                    <posy>2-row</posy>
-                    <width>8-col</width>
+                    <posy>0</posy>
+                    <width>6-col</width>
                     <height>11-row</height>
                     <itemgap>0</itemgap>
+                    <control type="button" id="4">
+                        <description>Download Subtitle</description>
+                        <width>8-col</width>
+                        <label>31154</label>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <focusedcolor>textActive</focusedcolor>
+                        <onclick>Dialog.Close(VideoOSD)</onclick>
+                        <onclick>ActivateWindow(SubtitleSearch)</onclick>
+                    </control>
                     <control type="radiobutton" id="1">
                         <description>Enable subtitles</description>
                         <enable>VideoPlayer.HasSubtitles</enable>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <focusedcolor>textActive</focusedcolor>
                         <label>449</label>
                         <onclick>ShowSubtitles</onclick>
                         <selected>VideoPlayer.SubtitlesEnabled</selected>
@@ -63,16 +54,13 @@
                     <control type="button" id="3">
                         <description>Adjust Subtitle Offset</description>
                         <visible>VideoPlayer.HasSubtitles + VideoPlayer.SubtitlesEnabled</visible>
-                        <label>22006</label>
+                        <label>31202</label>
+                        <width>8-col</width>
+                        <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                        <focusedcolor>textActive</focusedcolor>
                         <onclick>SubtitleDelay</onclick>
                     </control>
-                    <control type="button" id="4">
-                        <description>Download Subtitle</description>
-                        <width>8-col</width>
-                        <label>31154</label>
-                        <onclick>Dialog.Close(VideoOSD)</onclick>
-                        <onclick>ActivateWindow(SubtitleSearch)</onclick>
-                    </control>
+
                 </control>
             </control>
         </control>
diff --git a/extras/backgrounds/power.jpg b/extras/backgrounds/power.jpg
index c7853db..3b5a587 100644
Binary files a/extras/backgrounds/power.jpg and b/extras/backgrounds/power.jpg differ
diff --git a/extras/backgrounds/weather.jpg b/extras/backgrounds/weather.jpg
index 1d3e5b2..84dabcb 100644
Binary files a/extras/backgrounds/weather.jpg and b/extras/backgrounds/weather.jpg differ
diff --git a/language/English/strings.po b/language/English/strings.po
index 331ef0a..501c21d 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -386,7 +386,7 @@ msgid "Users"
 msgstr ""
 
 msgctxt "#31107"
-msgid "Active profile"
+msgid "Current profile"
 msgstr ""
 
 msgctxt "#31108"
@@ -740,3 +740,19 @@ msgstr ""
 msgctxt "#31199"
 msgid "Details"
 msgstr ""
+
+msgctxt "#31200"
+msgid "Available Profiles"
+msgstr ""
+
+msgctxt "#31201"
+msgid "Record Show"
+msgstr ""
+
+msgctxt "#31202"
+msgid "Adjust Subtitle Offset"
+msgstr ""
+
+msgctxt "#31203"
+msgid "Smart Playlist"
+msgstr ""