From 0292f4b8b0184039655a37f4652469faa7d374b0 Mon Sep 17 00:00:00 2001
From: Chris Bevan <bevan.chris@gmail.com>
Date: Sun, 10 May 2015 20:59:54 +0100
Subject: [PATCH] various

---
 1080i/DialogMediaSource.xml                  |  39 ++---
 1080i/DialogOk.xml                           |  95 ++++++------
 1080i/DialogSeekBar.xml                      |   2 +-
 1080i/DialogVideoInfo.xml                    | 146 ++++++++++++-------
 1080i/DialogYesNo.xml                        | 112 +++++++++-----
 1080i/Home.xml                               |   8 +-
 1080i/Includes.xml                           |   2 +-
 1080i/Includes_animations.xml                |   2 +-
 1080i/Includes_variables.xml                 |   2 +-
 1080i/MyPVRChannels.xml                      |   2 +-
 1080i/MyWeather.xml                          | 114 +++------------
 1080i/SettingsCategory.xml                   |   2 +-
 1080i/VideoOSD.xml                           |  30 ++--
 1080i/VideoOSDBookmarks.xml                  | 137 ++++++++---------
 1080i/VideoOSDSettings.xml                   |   2 +-
 1080i/View_Episodes.xml                      |   1 -
 1080i/View_Files.xml                         |  16 +-
 1080i/View_MusicFiles.xml                    |  16 +-
 1080i/View_Songs.xml                         |   2 +-
 1080i/View_TVShows.xml                       |   4 +
 1080i/custom_musicPlayerFullscreen.xml       |  31 ++--
 1080i/script-RCB-gameinfo.xml                |  12 +-
 1080i/script-Rom_Collection_Browser-main.xml |  32 ++--
 language/English/strings.po                  |   8 +
 24 files changed, 403 insertions(+), 414 deletions(-)

diff --git a/1080i/DialogMediaSource.xml b/1080i/DialogMediaSource.xml
index 8d0e409..b24d2a4 100644
--- a/1080i/DialogMediaSource.xml
+++ b/1080i/DialogMediaSource.xml
@@ -159,33 +159,43 @@
 
                 <!--path list-->
                 <control type="panel" id="10">
-                    <posx>4-col</posx>
-                    <posy>2-row</posy>
-                    <width>12-col-textbox</width>
+                    <posx>0</posx>
+                    <posy>4-row</posy>
+                    <width>8-col-textbox</width>
                     <height>6-row</height>
                     <onright>8000</onright>
                     <ondown>12</ondown>
                     <pagecontrol>-</pagecontrol>
                     <scrolltime>200</scrolltime>
-                    <itemlayout width="12-col" height="2-row">
+                    <itemlayout width="8-col" height="2-row">
+                        <control type="image">
+                            <posx>0</posx>
+                            <posy>0</posy>
+                            <width>8-col</width>
+                            <height>2-row</height>
+                            <aspectratio>stretch</aspectratio>
+                            <texture>colors/black.png</texture>
+                            <bordersize>0</bordersize>
+                            <colordiffuse>textboxInactive</colordiffuse>
+                        </control>
                         <control type="label">
                             <posx>12</posx>
                             <posy>0</posy>
-                            <width>12-col</width>
+                            <width>8-col-gutter</width>
                             <height>2-row</height>
                             <aligny>center</aligny>
                             <font>itemTitle</font>
                             <textcolor>textActive</textcolor>
                             <selectedcolor>selected</selectedcolor>
-                            <info>ListItem.Label</info>
+                            <label>$LOCALIZE[31198] $INFO[ListItem.Label]</label>
                             <shadowcolor>-</shadowcolor>
                         </control>
                     </itemlayout>
-                    <focusedlayout width="12-col" height="2-row">
+                    <focusedlayout width="8-col" height="2-row">
                         <control type="image">
                             <posx>0</posx>
                             <posy>0</posy>
-                            <width>12-col</width>
+                            <width>8-col-textbox</width>
                             <height>2-row</height>
                             <aspectratio>stretch</aspectratio>
                             <texture>colors/white.png</texture>
@@ -195,13 +205,13 @@
                         <control type="label">
                             <posx>12</posx>
                             <posy>0</posy>
-                            <width>12-col</width>
+                            <width>8-col-gutter</width>
                             <height>2-row</height>
                             <aligny>center</aligny>
                             <font>itemTitle</font>
                             <textcolor>black</textcolor>
                             <selectedcolor>black</selectedcolor>
-                            <info>ListItem.Label</info>
+                            <label>$LOCALIZE[31198] $INFO[ListItem.Label]</label>
                             <shadowcolor>-</shadowcolor>
                         </control>
                     </focusedlayout>
@@ -212,15 +222,6 @@
             <control type="group">
                 <posx>0</posx>
                 <posy>7-row</posy>
-                <control type="image">
-                    <posx>0</posx>
-                    <posy>0</posy>
-                    <width>8-col-textbox</width>
-                    <height>2-row</height>
-                    <aspectratio>stretch</aspectratio>
-                    <texture>colors/black.png</texture>
-                    <colordiffuse>overlay</colordiffuse>
-                </control>
                 <control type="panel" id="8001">
                     <posx>8-col</posx>
                     <posy>0</posy>
diff --git a/1080i/DialogOk.xml b/1080i/DialogOk.xml
index 1519669..2256392 100644
--- a/1080i/DialogOk.xml
+++ b/1080i/DialogOk.xml
@@ -5,25 +5,9 @@
     <include>fadeInOut</include>
     <controls>
         <include>modalDialog</include>
-        <!--error message fields (placeholders)-->
-        <control type="group">
-            <visible>false</visible>
-            <control type="label" id="2">
-                <description>Line 1</description>
-            </control>
-            <control type="label" id="3">
-                <description>Line 2</description>
-            </control>
-            <control type="label" id="4">
-                <description>Line 3</description>
-            </control>
-            <control type="button" id="10">
-                <description>OK</description>
-            </control>
-        </control>
         <control type="group">
             <posx>col-8-begin</posx>
-            <posy>row-7-begin</posy>
+            <posy>row-9-begin</posy>
             <!--animations-->
             <include>modalDialogInOut</include>
             <!--text-->
@@ -33,77 +17,102 @@
                 <posy>0</posy>
                 <width>10-col</width>
                 <font>pageTitle</font>
-                <textcolor>textActive</textcolor>
+                <textcolor>highlight</textcolor>
             </control>
-            <control type="textbox">
+            <control type="textbox" id="9">
                 <posx>0</posx>
-                <posy>1-row</posy>
+                <posy>2-row</posy>
                 <width>10-col</width>
-                <height>128</height>
-                <font>regular</font>
+                <height>4-row</height>
+                <font>textbox</font>
                 <textcolor>textActive</textcolor>
-                <label>$INFO[control.getlabel(2)] $INFO[control.getlabel(3)] $INFO[control.getlabel(4)]</label>
             </control>
             <!--OK-->
             <control type="panel" id="9001">
                 <posx>0</posx>
-                <posy>4-row</posy>
+                <posy>7-row</posy>
                 <width>5-col</width>
                 <height>5-row</height>
                 <itemgap>3</itemgap>
                 <orientation>vertical</orientation>
                 <onleft>2</onleft>
-                <itemlayout width="5-col" height="1-row">
+                <itemlayout width="5-col" height="2-row">
                     <control type="image">
                         <posx>0</posx>
-                        <posy>2</posy>
-                        <width>5-col</width>
-                        <height>53</height>
+                        <posy>0</posy>
+                        <width>1-col-textbox</width>
+                        <height>2-row</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture>colors/black.png</texture>
+                    </control>
+                    <control type="image">
+                        <posx>1-col</posx>
+                        <posy>0</posy>
+                        <width>3-col-textbox</width>
+                        <height>2-row</height>
                         <aspectratio>stretch</aspectratio>
                         <texture>colors/black.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>textActive</textcolor>
                         <label>$INFO[ListItem.label2]</label>
-                        <shadowcolor>-</shadowcolor>
                     </control>
                     <control type="label">
-                        <posx>1-col</posx>
+                        <posx>1-col-indent</posx>
                         <posy>-1</posy>
-                        <width>3-col</width>
-                        <font>menuTitle</font>
+                        <width>3-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="5-col" height="1-row">
+                <focusedlayout width="5-col" height="2-row">
                     <control type="image">
                         <posx>0</posx>
-                        <posy>2</posy>
-                        <width>5-col</width>
-                        <height>53</height>
+                        <posy>0</posy>
+                        <width>1-col-textbox</width>
+                        <height>2-row</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture>colors/white.png</texture>
+                        <colordiffuse>highlight</colordiffuse>
+                        <include>spinFocusIcon</include>
+                    </control>
+                    <control type="image">
+                        <posx>1-col</posx>
+                        <posy>0</posy>
+                        <width>4-col</width>
+                        <height>2-row</height>
                         <aspectratio>stretch</aspectratio>
                         <texture>colors/white.png</texture>
                     </control>
                     <control type="label">
-                        <posx>24</posx>
+                        <posx>0</posx>
                         <posy>0</posy>
                         <width>1-col</width>
+                        <height>2-row</height>
+                        <align>center</align>
+                        <aligny>center</aligny>
                         <font>symbol</font>
-                        <textcolor>black</textcolor>
+                        <textcolor>textActive</textcolor>
                         <label>$INFO[ListItem.label2]</label>
                         <shadowcolor>-</shadowcolor>
                     </control>
                     <control type="label">
-                        <posx>1-col</posx>
+                        <posx>1-col-indent</posx>
                         <posy>-1</posy>
-                        <width>3-col</width>
-                        <font>menuTitle</font>
+                        <width>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/DialogSeekBar.xml b/1080i/DialogSeekBar.xml
index a20a932..2cd30a2 100644
--- a/1080i/DialogSeekBar.xml
+++ b/1080i/DialogSeekBar.xml
@@ -64,7 +64,7 @@
                 <align>center</align>
                 <font>small</font>
                 <textcolor>textActive</textcolor>
-                <label>$INFO[Player.title]</label>
+                <label>$INFO[VideoPlayer.TVShowTitle,, - ]$INFO[Player.title]</label>
                 <shadowcolor>-</shadowcolor>
             </control>
             <control type="label">
diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml
index 0a62cbb..f634743 100644
--- a/1080i/DialogVideoInfo.xml
+++ b/1080i/DialogVideoInfo.xml
@@ -53,7 +53,7 @@
                 <effect type="slide" start="800" end="0" tween="cubic" easing="out" time="400" delay="300"/>
             </animation>
             <animation type="conditional" condition="skin.string(showcast,true)">
-                <effect type="slide" start="0" end="-578" tween="cubic" easing="out" time="400" delay="0"/>
+                <effect type="slide" start="0" end="0,-1080" tween="cubic" easing="out" time="400" delay="0"/>
             </animation>
             <!--overlay-->
             <control type="image">
@@ -256,7 +256,7 @@
                         <align>center</align>
                         <aligny>center</aligny>
                         <font>symbol</font>
-                        <textcolor>black</textcolor>
+                        <textcolor>textActive</textcolor>
                         <label>$INFO[ListItem.label2]</label>
                         <shadowcolor>-</shadowcolor>
                     </control>
@@ -483,102 +483,140 @@
         <!--cast and crew toggle-->
         <control type="group">
             <visible>skin.string(showcast,true)</visible>
-            <posx>1263</posx>
+            <posx>col-15-begin</posx>
             <posy>0</posy>
             <animation type="conditional" condition="skin.string(showcast,true)">
                 <effect type="slide" start="800" end="0" tween="cubic" easing="out" time="400" delay="100"/>
             </animation>
             <!--overlay-->
             <control type="image">
-                <posx>84</posx>
+                <posx>0</posx>
                 <posy>0</posy>
-                <width>573</width>
-                <height>198</height>
-                <texture>colors/white.png</texture>
-                <colordiffuse>ffffffff</colordiffuse>
+                <width>10-col</width>
+                <height>fullscreenHeight</height>
+                <texture>colors/black.png</texture>
+                <colordiffuse>cc111111</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
             <control type="image">
-                <posx>84</posx>
-                <posy>198</posy>
-                <width>573</width>
-                <height>16-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>ccffffff</colordiffuse>
+                <posx>0</posx>
+                <posy>0</posy>
+                <width>10-col</width>
+                <height>row-5-begin</height>
+                <texture>colors/white.png</texture>
+                <colordiffuse>highlight</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
+            <control type="image">
+                <posx>0</posx>
+                <posy>row-5-begin</posy>
+                <width>10-col</width>
+                <height>1-row</height>
+                <texture>colors/white.png</texture>
                 <aspectratio>stretch</aspectratio>
             </control>
             <!--content-->
             <control type="group">
-                <posx>col-1-begin</posx>
-                <posy>row-2-begin</posy>
+                <posx>12</posx>
+                <posy>row-1-begin</posy>
                 <control type="label">
                     <posx>0</posx>
-                    <posy>42</posy>
-                    <width>8-col-gutter</width>
+                    <posy>0</posy>
+                    <width>10-col-gutter</width>
+                    <align>left</align>
+                    <height>3-row</height>
+                    <aligny>center</aligny>
+                    <font>pageTitle</font>
+                    <textcolor>textActive</textcolor>
+                    <label>$INFO[listitem.title]</label>
+                    <wrapmultiline>true</wrapmultiline>
+                </control>
+                <control type="label">
+                    <posx>0</posx>
+                    <posy>4-row</posy>
+                    <width>10-col-gutter</width>
                     <align>left</align>
                     <font>itemSubTitle</font>
                     <textcolor>black</textcolor>
                     <label>$LOCALIZE[31074]</label>
-                    <shadowcolor>-</shadowcolor>
                 </control>
             </control>
             <control type="list" id="50">
-                <posx>84</posx>
-                <posy>202</posy>
-                <width>8-col</width>
-                <height>14-row</height>
-                <itemgap>3</itemgap>
-                <itemlayout width="8-col" height="2-row">
+                <posx>0</posx>
+                <posy>236</posy>
+                <width>10-col</width>
+                <height>24-row</height>
+                <itemlayout width="10-col" height="2-col">
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>111</width>
-                        <height>111</height>
+                        <width>2-col-textbox</width>
+                        <height>2-col-textbox</height>
                         <aspectratio scalediffuse="false">scale</aspectratio>
                         <texture border="0" fallback="colors/offblack.png">$INFO[listitem.thumb]</texture>
                         <bordersize>0</bordersize>
                         <colordiffuse>ffFFFFFF</colordiffuse>
                     </control>
-                    <control type="textbox">
-                        <posx>134</posx>
-                        <posy>18</posy>
-                        <width>5-col-gutter</width>
-                        <height>68</height>
-                        <font>itemSubTitle</font>
+                    <control type="label">
+                        <posx>2-col-indent</posx>
+                        <posy>0</posy>
+                        <width>8-col-gutter</width>
+                        <height>2-row</height>
+                        <font>itemTitle</font>
                         <textcolor>textActive</textcolor>
                         <label>$INFO[ListItem.label]</label>
-                        <shadowcolor>-</shadowcolor>
+                    </control>
+                    <control type="label">
+                        <posx>2-col-indent</posx>
+                        <posy>1-row</posy>
+                        <width>8-col-gutter</width>
+                        <height>2-row</height>
+                        <font>itemSubTitle</font>
+                        <textcolor>textActive</textcolor>
+                        <label>$INFO[ListItem.label2]</label>
                     </control>
                 </itemlayout>
-                <focusedlayout width="8-col" height="2-row">
+                <focusedlayout width="10-col" height="2-col">
                     <control type="image">
-                        <posx>114</posx>
+                        <posx>0</posx>
                         <posy>0</posy>
-                        <width>7-col</width>
-                        <height>111</height>
+                        <width>2-col-textbox</width>
+                        <height>2-col-textbox</height>
+                        <aspectratio scalediffuse="false">scale</aspectratio>
+                        <texture border="0" fallback="colors/offblack.png">$INFO[listitem.thumb]</texture>
+                        <bordersize>0</bordersize>
+                        <colordiffuse>ffFFFFFF</colordiffuse>
+                        <animation type="focus" loop="false" reversible="false">
+                            <effect type="rotatey" start="0" end="-15" center="70" tween="back" easing="out" time="300"/>
+                            <effect type="rotatey" start="0" end="15" center="70" tween="back" easing="out" delay="300" time="300"/>
+                        </animation>
+                    </control>
+                    <control type="image">
+                        <posx>2-col</posx>
+                        <posy>0</posy>
+                        <width>8-col</width>
+                        <height>2-col</height>
                         <aspectratio>stretch</aspectratio>
                         <texture>colors/white.png</texture>
                         <colordiffuse>ffFFFFFF</colordiffuse>
                     </control>
-                    <control type="image">
-                        <posx>0</posx>
+                    <control type="label">
+                        <posx>2-col-indent</posx>
                         <posy>0</posy>
-                        <width>111</width>
-                        <height>111</height>
-                        <aspectratio scalediffuse="false">scale</aspectratio>
-                        <texture border="0" fallback="colors/offblack.png">$INFO[listitem.thumb]</texture>
-                        <bordersize>0</bordersize>
-                        <colordiffuse>ffFFFFFF</colordiffuse>
-                    </control>
-                    <control type="textbox">
-                        <posx>134</posx>
-                        <posy>18</posy>
-                        <width>5-col-gutter</width>
-                        <height>68</height>
-                        <font>itemSubTitle</font>
+                        <width>8-col-gutter</width>
+                        <height>2-row</height>
+                        <font>itemTitle</font>
                         <textcolor>black</textcolor>
                         <label>$INFO[ListItem.label]</label>
-                        <shadowcolor>-</shadowcolor>
+                    </control>
+                    <control type="label">
+                        <posx>2-col-indent</posx>
+                        <posy>1-row</posy>
+                        <width>8-col-gutter</width>
+                        <height>2-row</height>
+                        <font>itemSubTitle</font>
+                        <textcolor>black</textcolor>
+                        <label>$INFO[ListItem.label2]</label>
                     </control>
                 </focusedlayout>
             </control>
diff --git a/1080i/DialogYesNo.xml b/1080i/DialogYesNo.xml
index 6e30f7a..009b02c 100644
--- a/1080i/DialogYesNo.xml
+++ b/1080i/DialogYesNo.xml
@@ -7,49 +7,96 @@
         <include>modalDialog</include>
         <control type="group">
             <posx>0</posx>
-            <posy>row-10-begin</posy>
+            <posy>row-9-begin</posy>
             <!--animations-->
             <include>modalDialogInOut</include>
             <!--text-->
             <control type="group">
                 <posx>col-9-begin</posx>
                 <posy>0</posy>
-                 <control type="image">
-                    <posx>-36</posx>
-                    <posy>-36</posy>
-                    <width>9-col</width>
-                    <height>8-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" id="1">
                     <description>heading</description>
                     <posx>0</posx>
                     <posy>0</posy>
                     <width>9-col</width>
-                    <font>dialogTitle</font>
-                    <textcolor>textActive</textcolor>
+                    <font>pageTitle</font>
+                    <textcolor>highlight</textcolor>
                 </control>
-                <control type="textbox">
+                <control type="textbox" id="9">
                     <posx>0</posx>
-                    <posy>44</posy>
+                    <posy>2-row</posy>
                     <width>8-col</width>
                     <height>2-row</height>
                     <font>textbox</font>
                     <textcolor>textActive</textcolor>
-                    <label>$INFO[control.getlabel(2)] $INFO[control.getlabel(3)] $INFO[control.getlabel(4)]</label>
                </control>
             </control>
             <!--Yes / No-->
-            <control type="grouplist" id="9001">
+            <control type="image">
                 <posx>col-9-begin</posx>
-                <posy>4-row</posy>
+                <posy>5-row</posy>
+                <width>1-col-textbox</width>
+                <height>2-row</height>
+                <aspectratio>stretch</aspectratio>
+                <texture>colors/black.png</texture>
+            </control>
+            <control type="image">
+                <visible>control.hasfocus(10)</visible>
+                <posx>col-9-begin</posx>
+                <posy>5-row</posy>
+                <width>1-col-textbox</width>
+                <height>2-row</height>
+                <aspectratio>stretch</aspectratio>
+                <texture>colors/white.png</texture>
+                <colordiffuse>highlight</colordiffuse>
+            </control>
+            <control type="label">
+                <posx>col-9-begin</posx>
+                <posy>5-row</posy>
+                <width>1-col</width>
+                <height>2-row</height>
+                <align>center</align>
+                <aligny>center</aligny>
+                <font>symbol</font>
+                <textcolor>textActive</textcolor>
+                <label>×</label>
+            </control>
+            <control type="image">
+                <posx>col-13-begin</posx>
+                <posy>5-row</posy>
+                <width>1-col-textbox</width>
+                <height>2-row</height>
+                <aspectratio>stretch</aspectratio>
+                <texture>colors/black.png</texture>
+            </control>
+            <control type="image">
+                <visible>control.hasfocus(11)</visible>
+                <posx>col-13-begin</posx>
+                <posy>5-row</posy>
+                <width>1-col-textbox</width>
+                <height>2-row</height>
+                <aspectratio>stretch</aspectratio>
+                <texture>colors/white.png</texture>
+                <colordiffuse>highlight</colordiffuse>
+                <include>spinFocusIcon</include>
+            </control>
+            <control type="label">
+                <posx>col-13-begin</posx>
+                <posy>5-row</posy>
+                <width>1-col</width>
+                <height>2-row</height>
+                <align>center</align>
+                <aligny>center</aligny>
+                <font>symbol</font>
+                <textcolor>textActive</textcolor>
+                <label>✓</label>
+            </control>
+            <control type="grouplist" id="9001">
+                <posx>col-10-begin</posx>
+                <posy>5-row</posy>
                 <width>8-col</width>
                 <height>2-row</height>
-                <itemgap>0</itemgap>
+                <itemgap>1-col</itemgap>
                 <onleft>50</onleft>
                 <onright>50</onright>
                 <onup>9999</onup>
@@ -58,35 +105,22 @@
                 <!--selection buttons-->
                 <control type="button" id="10">
                     <description>No</description>
-                    <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                    <texturefocus>colors/white.png</texturefocus>
                     <texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus>
-                    <focusedcolor>textActive</focusedcolor>
-                    <align>center</align>
+                    <focusedcolor>black</focusedcolor>
+                    <width>3-col</width>
                     <label>106</label>
                 </control>
                 <control type="button" id="11">
                     <description>Yes</description>
-                    <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+                    <texturefocus>colors/white.png</texturefocus>
                     <texturenofocus colordiffuse="overlay">colors/black.png</texturenofocus>
-                    <focusedcolor>textActive</focusedcolor>
-                    <align>center</align>
+                    <focusedcolor>black</focusedcolor>
+                    <width>3-col</width>
                     <label>107</label>
                 </control>
             </control>
         </control>
-        <!--error message fields (placeholders)-->
-        <control type="group">
-            <visible>false</visible>
-            <control type="label" id="2">
-                <description>Line 1</description>
-            </control>
-            <control type="label" id="3">
-                <description>Line 2</description>
-            </control>
-            <control type="label" id="4">
-                <description>Line 3</description>
-            </control>
-        </control>
         <!--debugging-->
         <include>DebugGrid</include>
         <control type="label">
diff --git a/1080i/Home.xml b/1080i/Home.xml
index 4cb2c4e..7a1cfd1 100644
--- a/1080i/Home.xml
+++ b/1080i/Home.xml
@@ -124,10 +124,16 @@
                         <thumb>-</thumb>
                         <onclick>RunScript(script.games.rom.collection.browser,)</onclick>
                     </item>
+                    <item id="9">
+                        <label>31197</label>
+                        <label2></label2>
+                        <thumb>-</thumb>
+                        <onclick>ActivateWindow(weather)</onclick>
+                    </item>
                     <item id="5">
                         <visible>!Skin.HasSetting(hidePrograms)</visible>
                         <label>0</label>
-                        <label2></label2>
+                        <label2></label2>
                         <thumb>-</thumb>
                         <onclick>ActivateWindow(programs,addons,return)</onclick>
                     </item>
diff --git a/1080i/Includes.xml b/1080i/Includes.xml
index 3bfd351..4823e49 100644
--- a/1080i/Includes.xml
+++ b/1080i/Includes.xml
@@ -30,7 +30,7 @@
         <control type="image">
             <include>dimensionsFullscreen</include>
             <texture>colors/black.png</texture>
-            <colordiffuse>eeFFFFFF</colordiffuse>
+            <colordiffuse>e9FFFFFF</colordiffuse>
             <aspectratio>stretch</aspectratio>
         </control>
         <control type="image">
diff --git a/1080i/Includes_animations.xml b/1080i/Includes_animations.xml
index 0faf27b..c77aae8 100644
--- a/1080i/Includes_animations.xml
+++ b/1080i/Includes_animations.xml
@@ -62,7 +62,7 @@
     </include>
     <include name="modalDialogContentShift">
         <animation type="Conditional" condition="controlgroup(9000).hasfocus | controlgroup(9002).hasfocus | controlgroup(100).hasfocus">
-            <effect type="zoom" end="300" time="200" center="auto" tween="linear" easing="out"/>
+            <effect type="zoom" end="250" time="200" center="auto" tween="linear" easing="out"/>
             <effect type="fade" start="100" end="30" time="200"/>
         </animation>
     </include>
diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml
index 8aa89a1..a799ae6 100644
--- a/1080i/Includes_variables.xml
+++ b/1080i/Includes_variables.xml
@@ -39,7 +39,7 @@
     <!--list view item detail / subheader-->
     <variable name="itemDetail">
         <value condition="Container.Content(movies)">$INFO[Listitem.duration,, $LOCALIZE[31018]]</value>
-        <value condition="Container.Content(tvshows)">[B]$INFO[ListItem.Property(TotalSeasons)][/B] $LOCALIZE[31188] • [B]$INFO[ListItem.Property(NumEpisodes)][/B] $LOCALIZE[31189]</value>
+        <value condition="Container.Content(tvshows) + !isempty(listitem.property(totalseasons))">[B]$INFO[ListItem.Property(TotalSeasons)][/B] $LOCALIZE[31188] • [B]$INFO[ListItem.Property(NumEpisodes)][/B] $LOCALIZE[31189]</value>
         <value condition="Container.Content(seasons)">$INFO[ListItem.Property(UnWatchedEpisodes),, $LOCALIZE[16101]]</value>
         <value condition="Container.Content(artists)">$INFO[ListItem.Property(Artist_Genre)]</value>
         <value/>
diff --git a/1080i/MyPVRChannels.xml b/1080i/MyPVRChannels.xml
index ba80711..f95cbbb 100644
--- a/1080i/MyPVRChannels.xml
+++ b/1080i/MyPVRChannels.xml
@@ -20,7 +20,7 @@
 
             <!--initial animation-->
             <animation type="Windowopen">
-                <effect type="zoom" start="120" time="100" center="auto" tween="linear" easing="out"/>
+                <effect type="zoom" start="150" time="100" center="auto" tween="linear" easing="out"/>
                 <effect type="fade" start="30" end="100" time="100"/>
             </animation>
 
diff --git a/1080i/MyWeather.xml b/1080i/MyWeather.xml
index 549b776..ee10275 100644
--- a/1080i/MyWeather.xml
+++ b/1080i/MyWeather.xml
@@ -5,74 +5,36 @@
     <controls>
         <!--background-->
         <include>globalBackground</include>
+
         <control type="group">
             <posx>col-1-begin</posx>
-            <posy>row-4-begin</posy>
+            <posy>row-3-begin</posy>
             <!--animations-->
             <include>modalDialogInOutVertical</include>
-            <!--general info-->
-            <control type="image">
-                <posx>-384</posx>
-                <posy>44</posy>
-                <width>2500</width>
-                <height>1-row</height>
-                <texture>colors/white.png</texture>
-                <colordiffuse>ffffffff</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
-            <control type="image">
-                <posx>-3</posx>
-                <posy>44</posy>
-                <width>3</width>
-                <height>1-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>ffffffff</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
-            <!--location selector-->
-            <control type="spincontrolex" id="3">
-                <description>Location Select</description>
-                <posx>12</posx>
-                <posy>47</posy>
-                <label>-</label>
-                <label2>-</label2>
-                <font>dialogTitle</font>
-                <textcolor>textActive</textcolor>
-                <width>1-col</width>
-                <align>right</align>
-                <onup>activateWindow(home)</onup>
-            </control>
+
             <!--location title-->
             <control type="label">
                 <visible>true</visible>
-                <posx>84</posx>
-                <posy>44</posy>
-                <width>18-col</width>
-                <font>dialogTitle</font>
+                <posx>0</posx>
+                <posy>2-row</posy>
+                <width>24-col</width>
+                <align>center</align>
+                <font>veryLarge</font>
                 <label>$INFO[Window.Property(Location)]</label>
-                <textcolor>black</textcolor>
+                <textcolor>textActive</textcolor>
                 <shadowcolor>-</shadowcolor>
             </control>
-            <!--overlay-->
-            <control type="image">
-                <posx>-96</posx>
-                <posy>2-row</posy>
-                <width>fullscreenWidth</width>
-                <height>8-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>88ffffff</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
+
             <!--content begins-->
             <control type="panel" id="9000">
-                <posx>0</posx>
-                <posy>130</posy>
+                <posx>-24</posx>
+                <posy>7-row</posy>
                 <width>24-col</width>
                 <height>18-row</height>
                 <itemlayout width="5-col-gutter" height="6-col">
                     <control type="label">
                         <posx>46</posx>
-                        <posy>72</posy>
+                        <posy>56</posy>
                         <width>5-col-gutter</width>
                         <font>symbolWeather</font>
                         <textcolor>textActive</textcolor>
@@ -80,18 +42,18 @@
                     </control>
                     <control type="label">
                         <posx>0</posx>
-                        <posy>4-row</posy>
+                        <posy>6-row</posy>
                         <width>6-col-gutter</width>
                         <align>center</align>
                         <font>largeStrong</font>
-                        <textcolor>textActive</textcolor>
+                        <textcolor>highlight</textcolor>
                         <label>$INFO[ListItem.Label]</label>
                     </control>
                     <control type="textbox">
                         <posx>36</posx>
-                        <posy>5-row</posy>
+                        <posy>8-row</posy>
                         <width>5-col-gutter</width>
-                        <height>1-row</height>
+                        <height>2-row</height>
                         <align>center</align>
                         <font>itemTitle</font>
                         <textcolor>textActive</textcolor>
@@ -100,7 +62,7 @@
                     </control>
                     <control type="textbox">
                         <posx>36</posx>
-                        <posy>6-row</posy>
+                        <posy>11-row</posy>
                         <width>5-col-gutter</width>
                         <height>1-row</height>
                         <align>center</align>
@@ -109,45 +71,7 @@
                         <label>$LOCALIZE[13508] [B]$INFO[ListItem.Property(HighTemp)] $INFO[ListItem.Property(TempUnits)][/B]  $LOCALIZE[418] [B]$INFO[ListItem.Property(LowTemp)] $INFO[ListItem.Property(TempUnits)][/B]</label>
                     </control>
                 </itemlayout>
-                <focusedlayout width="6-col" height="6-col">
-                    <control type="label">
-                        <posx>46</posx>
-                        <posy>72</posy>
-                        <width>5-col-gutter</width>
-                        <font>symbolWeather</font>
-                        <textcolor>textActive</textcolor>
-                        <label>$VAR[weatherIcon]</label>
-                    </control>
-                    <control type="label">
-                        <posx>0</posx>
-                        <posy>4-row</posy>
-                        <width>6-col-gutter</width>
-                        <align>center</align>
-                        <font>largeStrong</font>
-                        <textcolor>textActive</textcolor>
-                        <label>$INFO[ListItem.Label]</label>
-                    </control>
-                    <control type="textbox">
-                        <posx>36</posx>
-                        <posy>5-row</posy>
-                        <width>5-col-gutter</width>
-                        <height>1-row</height>
-                        <align>center</align>
-                        <font>itemTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <label>$INFO[ListItem.Property(Outlook)]</label>
-                    </control>
-                    <control type="textbox">
-                        <posx>36</posx>
-                        <posy>6-row</posy>
-                        <width>5-col-gutter</width>
-                        <height>1-row</height>
-                        <align>center</align>
-                        <font>itemSubTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <label>$LOCALIZE[13508] [B]$INFO[ListItem.Property(HighTemp)] $INFO[ListItem.Property(TempUnits)][/B]  $LOCALIZE[418] [B]$INFO[ListItem.Property(LowTemp)] $INFO[ListItem.Property(TempUnits)][/B]</label>
-                    </control>
-                </focusedlayout>
+                <focusedlayout/>
                 <content>
                     <item id="1">
                         <description>Day 0</description>
diff --git a/1080i/SettingsCategory.xml b/1080i/SettingsCategory.xml
index 5dea174..d65ee27 100644
--- a/1080i/SettingsCategory.xml
+++ b/1080i/SettingsCategory.xml
@@ -86,7 +86,7 @@
                 <posy>2-row</posy>
                 <width>-</width>
                 <itemgap>0</itemgap>
-                <height>14-row</height>
+                <height>18-row</height>
                 <onleft>9000</onleft>
                 <onright>5</onright>
                 <onup>20</onup>
diff --git a/1080i/VideoOSD.xml b/1080i/VideoOSD.xml
index 13020c2..c9d35ad 100644
--- a/1080i/VideoOSD.xml
+++ b/1080i/VideoOSD.xml
@@ -65,32 +65,24 @@
                 <label>$INFO[videoplayer.plot]</label>
                 <autoscroll delay="10000" time="1000" repeat="10000"/>
             </control>
-
             <!--subtitles etc-->
+            <control type="image">
+                <posx>0</posx>
+                <posy>0</posy>
+                <width>fullscreenWidth</width>
+                <height>2-row</height>
+                <aspectratio>stretch</aspectratio>
+                <texture>colors/black.png</texture>
+                <colordiffuse>textboxInactive</colordiffuse>
+            </control>
             <control type="list" id="8001">
-                <posx>col-5-begin</posx>
+                <posx>col-1-begin</posx>
                 <posy>0</posy>
                 <width>24-col</width>
-                <height>2-row</height>
+                <height>8-row</height>
                 <itemgap>0</itemgap>
                 <orientation>horizontal</orientation>
                 <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>
-                    </control>
-                    <control type="image">
-                        <posx>1-col</posx>
-                        <posy>0</posy>
-                        <width>3-col-textbox</width>
-                        <height>2-row</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture>colors/black.png</texture>
-                    </control>
                     <control type="label">
                         <posx>0</posx>
                         <posy>0</posy>
diff --git a/1080i/VideoOSDBookmarks.xml b/1080i/VideoOSDBookmarks.xml
index 2cfb50f..3b7d23b 100644
--- a/1080i/VideoOSDBookmarks.xml
+++ b/1080i/VideoOSDBookmarks.xml
@@ -18,93 +18,99 @@
             <posy>row-1-begin</posy>
             <!--animations-->
             <include>modalDialogInOutVertical</include>
-            <control type="image">
-                <posx>-96</posx>
-                <posy>44</posy>
-                <width>fullscreenWidth</width>
-                <height>1-row</height>
-                <texture>colors/white.png</texture>
-                <colordiffuse>ffffffff</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
-            <control type="image">
-                <posx>-3</posx>
-                <posy>44</posy>
-                <width>3</width>
-                <height>1-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>ffffffff</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
             <control type="label">
-                <posx>12</posx>
-                <posy>44</posy>
+                <posx>0</posx>
+                <posy>0</posy>
                 <width>12-col</width>
-                <font>dialogTitle</font>
-                <textcolor>black</textcolor>
-                <shadowcolor>-</shadowcolor>
+                <font>pageTitle</font>
+                <textcolor>textActive</textcolor>
                 <label>$LOCALIZE[298]</label>
             </control>
             <!--add / clear bookmarks-->
             <control type="panel" id="9000">
                 <posx>0</posx>
-                <posy>120</posy>
+                <posy>2-row</posy>
                 <width>12-col</width>
-                <height>1-row</height>
-                <itemgap>3</itemgap>
+                <height>2-row</height>
                 <orientation>horizontal</orientation>
                 <ondown>11</ondown>
-                <itemlayout width="6-col" height="1-row">
+                <itemlayout width="6-col" height="2-row">
                     <control type="image">
                         <posx>0</posx>
-                        <posy>2</posy>
-                        <width>6-col</width>
-                        <height>53</height>
+                        <posy>0</posy>
+                        <width>1-col-textbox</width>
+                        <height>2-row</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture>colors/black.png</texture>
+                    </control>
+                    <control type="image">
+                        <posx>1-col</posx>
+                        <posy>0</posy>
+                        <width>5-col-textbox</width>
+                        <height>2-row</height>
                         <aspectratio>stretch</aspectratio>
                         <texture>colors/black.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>textActive</textcolor>
                         <label>$INFO[ListItem.label2]</label>
-                        <shadowcolor>-</shadowcolor>
                     </control>
                     <control type="label">
-                        <posx>1-col</posx>
-                        <posy>2</posy>
+                        <posx>1-col-indent</posx>
+                        <posy>-1</posy>
                         <width>5-col-gutter</width>
-                        <font>menuTitle</font>
+                        <height>2-row</height>
+                        <aligny>center</aligny>
+                        <font>buttonTitle</font>
                         <textcolor>textActive</textcolor>
                         <label>$INFO[ListItem.label]</label>
-                        <shadowcolor>-</shadowcolor>
                     </control>
                 </itemlayout>
-                <focusedlayout width="6-col" height="1-row">
+                <focusedlayout width="6-col" height="2-row">
                     <control type="image">
                         <posx>0</posx>
-                        <posy>2</posy>
-                        <width>6-col</width>
-                        <height>53</height>
+                        <posy>0</posy>
+                        <width>1-col-textbox</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-textbox</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>
+                        <posx>1-col-indent</posx>
+                        <posy>-1</posy>
                         <width>5-col-gutter</width>
-                        <font>menuTitle</font>
+                        <height>2-row</height>
+                        <aligny>center</aligny>
+                        <font>buttonTitle</font>
                         <textcolor>black</textcolor>
                         <label>$INFO[ListItem.label]</label>
                         <shadowcolor>-</shadowcolor>
@@ -138,7 +144,7 @@
             <!--bookmark browser: thumbs-->
             <control type="panel" id="11">
                 <posx>0</posx>
-                <posy>216</posy>
+                <posy>5-row</posy>
                 <width>24-col</width>
                 <height>11-row</height>
                 <orientation>horizontal</orientation>
@@ -151,18 +157,10 @@
                         <height>230</height>
                         <aspectratio>scale</aspectratio>
                         <texture fallback="colors/black.png" border="0">$INFO[Listitem.icon]</texture>
-                        <bordertexture border="0">-</bordertexture>
+                        <bordertexture colordiffuse="33FFFFFF">colors/white.png</bordertexture>
+                        <bordersize>3</bordersize>
                         <colordiffuse>ffFFFFFF</colordiffuse>
                     </control>
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>6-col-gutter</width>
-                        <height>230</height>
-                        <texture>backgrounds/vignette.png</texture>
-                        <colordiffuse>ffffffff</colordiffuse>
-                        <aspectratio>stretch</aspectratio>
-                    </control>
                     <control type="label">
                         <posx>12</posx>
                         <posy>233</posy>
@@ -180,37 +178,18 @@
                         <height>230</height>
                         <aspectratio>scale</aspectratio>
                         <texture fallback="colors/black.png" border="0">$INFO[Listitem.icon]</texture>
-                        <bordertexture border="0">-</bordertexture>
-                        <colordiffuse>ffFFFFFF</colordiffuse>
-                    </control>
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>6-col-gutter</width>
-                        <height>230</height>
-                        <texture>backgrounds/vignette.png</texture>
-                        <colordiffuse>ffffffff</colordiffuse>
-                        <aspectratio>stretch</aspectratio>
-                        <animation effect="fade" start="0" end="100" time="500" reversible="false">focus</animation>
-                    </control>
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>233</posy>
-                        <width>6-col-gutter</width>
-                        <height>1-row</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture>colors/white.png</texture>
-                        <bordersize>0</bordersize>
+                        <bordertexture border="3" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
+                        <bordersize>3</bordersize>
                         <colordiffuse>ffFFFFFF</colordiffuse>
+                         <include>spinFocusPoster</include>
                     </control>
                     <control type="label">
                         <posx>12</posx>
                         <posy>233</posy>
                         <width>6-col-gutter</width>
                         <font>itemTitle</font>
-                        <textcolor>black</textcolor>
+                        <textcolor>textActive</textcolor>
                         <label>$INFO[ListItem.Label]</label>
-                        <shadowcolor>-</shadowcolor>
                     </control>
                 </focusedlayout>
             </control>
diff --git a/1080i/VideoOSDSettings.xml b/1080i/VideoOSDSettings.xml
index 082b104..2075934 100644
--- a/1080i/VideoOSDSettings.xml
+++ b/1080i/VideoOSDSettings.xml
@@ -22,7 +22,7 @@
                 <height>25-row</height>
                 <texture>colors/black.png</texture>
                 <aspectratio>stretch</aspectratio>
-                <colordiffuse>aaFFFFFF</colordiffuse>
+                <colordiffuse>ccFFFFFF</colordiffuse>
             </control>
             <control type="image">
                 <posx>0</posx>
diff --git a/1080i/View_Episodes.xml b/1080i/View_Episodes.xml
index 6a2a112..cdd4f19 100644
--- a/1080i/View_Episodes.xml
+++ b/1080i/View_Episodes.xml
@@ -191,7 +191,6 @@
                     </control>
                 </focusedlayout>
             </control>
-
             <!--Plugin-sourced Episode list-->
             <control type="panel" id="52">
                 <visible>Substring(Container.folderpath,plugin)</visible>
diff --git a/1080i/View_Files.xml b/1080i/View_Files.xml
index 0867afe..a03082c 100644
--- a/1080i/View_Files.xml
+++ b/1080i/View_Files.xml
@@ -5,14 +5,14 @@
             <visible>StringCompare(container.foldername,files) | StringCompare(container.foldername,Video Playlists)</visible>
             <posx>col-1-begin</posx>
             <posy>row-5-begin</posy>
-            <width>12-col</width>
+            <width>24-col</width>
             <height>25-row</height>
             <onleft>9000</onleft>
             <onright>60</onright>
             <ondown>50</ondown>
             <onup>50</onup>
             <pagecontrol>60</pagecontrol>
-            <itemlayout width="12-col" height="2-row">
+            <itemlayout width="24-col" height="2-row">
                 <control type="image">
                     <posx>0</posx>
                     <posy>3</posy>
@@ -24,8 +24,8 @@
                 <control type="image">
                     <posx>1-col</posx>
                     <posy>0</posy>
-                    <width>11-col</width>
-                    <height>2-row</height>
+                    <width>23-col</width>
+                    <height>69</height>
                     <aspectratio>stretch</aspectratio>
                     <texture border="0">colors/black.png</texture>
                     <colordiffuse>textboxInactive</colordiffuse>
@@ -33,7 +33,7 @@
                 <control type="label">
                     <posx>1-col-indent</posx>
                     <posy>0</posy>
-                    <width>11-col-gutter</width>
+                    <width>23-col-gutter</width>
                     <height>2-row</height>
                     <aligny>center</aligny>
                     <font>itemTitle</font>
@@ -42,7 +42,7 @@
                     <label>$INFO[ListItem.Label]</label>
                 </control>
             </itemlayout>
-            <focusedlayout width="12-col" height="2-row">
+            <focusedlayout width="24-col" height="2-row">
                 <control type="image">
                     <posx>0</posx>
                     <posy>3</posy>
@@ -58,7 +58,7 @@
                 <control type="image">
                     <posx>1-col</posx>
                     <posy>0</posy>
-                    <width>11-col</width>
+                    <width>23-col</width>
                     <height>2-row</height>
                     <aspectratio>stretch</aspectratio>
                     <texture border="0">colors/white.png</texture>
@@ -67,7 +67,7 @@
                 <control type="label">
                     <posx>1-col-indent</posx>
                     <posy>0</posy>
-                    <width>11-col-gutter</width>
+                    <width>23-col-gutter</width>
                     <height>2-row</height>
                     <aligny>center</aligny>
                     <font>itemTitle</font>
diff --git a/1080i/View_MusicFiles.xml b/1080i/View_MusicFiles.xml
index 8b83fc6..14ae571 100644
--- a/1080i/View_MusicFiles.xml
+++ b/1080i/View_MusicFiles.xml
@@ -9,14 +9,14 @@
                 <visible>!control.isvisible(9998) + !container.content(artists) + !container.content(genres) + !container.content(albums) + !container.content(songs) + !container.content(addons)</visible>
                 <posx>0</posx>
                 <posy>0</posy>
-                <width>12-col</width>
+                <width>24-col</width>
                 <height>22-row</height>
                 <onleft>9000</onleft>
                 <onright>60</onright>
                 <ondown>51</ondown>
                 <onup>51</onup>
                 <pagecontrol>60</pagecontrol>
-                <itemlayout width="12-col" height="2-row">
+                <itemlayout width="24-col" height="2-row">
                     <control type="image">
                         <posx>0</posx>
                         <posy>3</posy>
@@ -28,8 +28,8 @@
                     <control type="image">
                         <posx>1-col</posx>
                         <posy>0</posy>
-                        <width>11-col</width>
-                        <height>2-row</height>
+                        <width>23-col</width>
+                        <height>69</height>
                         <aspectratio>stretch</aspectratio>
                         <texture border="0">colors/black.png</texture>
                         <colordiffuse>textboxInactive</colordiffuse>
@@ -37,7 +37,7 @@
                     <control type="label">
                         <posx>1-col-indent</posx>
                         <posy>0</posy>
-                        <width>11-col-gutter</width>
+                        <width>23-col-gutter</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
                         <font>itemTitle</font>
@@ -46,7 +46,7 @@
                         <label>$INFO[ListItem.Label]</label>
                     </control>
                 </itemlayout>
-                <focusedlayout width="12-col" height="2-row">
+                <focusedlayout width="24-col" height="2-row">
                     <control type="image">
                         <posx>0</posx>
                         <posy>3</posy>
@@ -62,7 +62,7 @@
                     <control type="image">
                         <posx>1-col</posx>
                         <posy>0</posy>
-                        <width>11-col</width>
+                        <width>23-col</width>
                         <height>2-row</height>
                         <aspectratio>stretch</aspectratio>
                         <texture border="0">colors/white.png</texture>
@@ -71,7 +71,7 @@
                     <control type="label">
                         <posx>1-col-indent</posx>
                         <posy>0</posy>
-                        <width>11-col-gutter</width>
+                        <width>23-col-gutter</width>
                         <height>2-row</height>
                         <aligny>center</aligny>
                         <font>itemTitle</font>
diff --git a/1080i/View_Songs.xml b/1080i/View_Songs.xml
index 3fb2caa..10adbf9 100644
--- a/1080i/View_Songs.xml
+++ b/1080i/View_Songs.xml
@@ -7,7 +7,7 @@
             <control type="image">
                 <include>dimensionsFullscreen</include>
                 <aspectratio scalediffuse="false">stretch</aspectratio>
-                <texture background="true" fallback="colors/offblack.png" border="0">$INFO[Listitem.art(fanart)]</texture>
+                <texture background="true" fallback="colors/offblack.png" border="0">$INFO[Container.Art(artist.fanart)]</texture>
                 <colordiffuse>44ffffff</colordiffuse>
                 <fadetime>1500</fadetime>
             </control>
diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml
index 7e777b3..5c74c2f 100644
--- a/1080i/View_TVShows.xml
+++ b/1080i/View_TVShows.xml
@@ -96,6 +96,10 @@
                         <height>3-row</height>
                         <aspectratio scalediffuse="false" align="right">scale</aspectratio>
                         <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.thumb]</texture>
+                        <animation type="focus" loop="false" reversible="false">
+                            <effect type="rotatey" start="0" end="-15" center="36" tween="back" easing="out" time="300"/>
+                            <effect type="rotatey" start="0" end="15" center="36" tween="back" easing="out" delay="300" time="300"/>
+                        </animation>
                     </control>
                     <control type="image">
                         <posx>1-col</posx>
diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml
index feedbdc..80ad84f 100644
--- a/1080i/custom_musicPlayerFullscreen.xml
+++ b/1080i/custom_musicPlayerFullscreen.xml
@@ -63,11 +63,9 @@
                         <effect type="fade" start="100" end="0" time="300"/>
                     </animation>
                     <!--Screen burn protection-->
-                    <!--
                     <animation type="conditional" condition="true" pulse="true">
                         <effect type="fade" start="100" end="0" time="2500" delay="20000"/>
                     </animation>
-                    -->
                     <posx>col-1-begin</posx>
                     <posy>row-22-begin</posy>
                     <control type="image">
@@ -148,7 +146,7 @@
                 </control>
                 <!--dialog controls-->
                 <control type="group" id="8765">
-                    <posx>col-3-begin</posx>
+                    <posx>0</posx>
                     <posy>0</posy>
                     <animation type="conditional" condition="!Controlgroup(8765).HasFocus">
                         <effect type="slide" start="0,0" end="0,-50" tween="cubic" easing="out" delay="500" time="300"/>
@@ -157,9 +155,18 @@
                     <animation type="windowClose">
                         <effect type="fade" start="100" end="0" time="300"/>
                     </animation>
+                    <control type="image">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>fullscreenWidth</width>
+                        <height>2-row</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture>colors/black.png</texture>
+                        <colordiffuse>textboxInactive</colordiffuse>
+                    </control>
                     <!--shuffle and repeat / vis options-->
                     <control type="list" id="8002">
-                        <posx>0</posx>
+                        <posx>col-1-begin</posx>
                         <posy>0</posy>
                         <width>24-col</width>
                         <height>2-row</height>
@@ -168,22 +175,6 @@
                         <onup>9876</onup>
                         <ondown>9876</ondown>
                         <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>
-                            </control>
-                            <control type="image">
-                                <posx>1-col</posx>
-                                <posy>0</posy>
-                                <width>3-col-textbox</width>
-                                <height>2-row</height>
-                                <aspectratio>stretch</aspectratio>
-                                <texture>colors/black.png</texture>
-                            </control>
                             <control type="label">
                                 <posx>0</posx>
                                 <posy>0</posy>
diff --git a/1080i/script-RCB-gameinfo.xml b/1080i/script-RCB-gameinfo.xml
index e50a6c6..8c1ec1d 100644
--- a/1080i/script-RCB-gameinfo.xml
+++ b/1080i/script-RCB-gameinfo.xml
@@ -5,15 +5,7 @@
     <include>fadeInOut</include>
     <controls>
         <control type="group">
-            <!--background / fanart-->
-            <control type="image">
-                <posx>0</posx>
-                <posy>0</posy>
-                <include>dimensionsFullscreen</include>
-                <texture>colors/black.png</texture>
-                <colordiffuse>ddffffff</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
+            <include>globalBackground</include>
             <control type="image">
                 <include>dimensionsFullscreen</include>
                 <texture>vignette.png</texture>
@@ -34,7 +26,7 @@
                     <posy>12</posy>
                     <width>12-col</width>
                     <height>486</height>
-                    <aspectratio scalediffuse="false">scale</aspectratio>
+                    <aspectratio scalediffuse="false" align="left">keep</aspectratio>
                     <texture background="true" fallback="colors/black.png" border="0">$INFO[Listitem.thumb]</texture>
                     <bordertexture border="3" colordiffuse="33FFFFFF">colors/white.png</bordertexture>
                     <bordersize>3</bordersize>
diff --git a/1080i/script-Rom_Collection_Browser-main.xml b/1080i/script-Rom_Collection_Browser-main.xml
index f92058c..f8cf02c 100644
--- a/1080i/script-Rom_Collection_Browser-main.xml
+++ b/1080i/script-Rom_Collection_Browser-main.xml
@@ -21,14 +21,14 @@
                     </animation>
                     <posx>col-1-begin</posx>
                     <posy>row-5-begin</posy>
-                    <width>16-col</width>
-                    <height>12-row</height>
+                    <width>12-col</width>
+                    <height>22-row</height>
                     <onleft>500</onleft>
                     <onright>60</onright>
                     <ondown>50</ondown>
                     <onup>50</onup>
                     <pagecontrol>60</pagecontrol>
-                    <itemlayout width="24-col" height="2-row">
+                    <itemlayout width="12-col" height="2-row">
                         <control type="image">
                             <posx>0</posx>
                             <posy>3</posy>
@@ -40,7 +40,7 @@
                         <control type="image">
                             <posx>1-col</posx>
                             <posy>0</posy>
-                            <width>23-col</width>
+                            <width>11-col</width>
                             <height>69</height>
                             <aspectratio>stretch</aspectratio>
                             <texture border="0">colors/black.png</texture>
@@ -49,7 +49,7 @@
                         <control type="label">
                             <posx>1-col-indent</posx>
                             <posy>0</posy>
-                            <width>23-col-gutter</width>
+                            <width>11-col-gutter</width>
                             <height>2-row</height>
                             <aligny>center</aligny>
                             <font>itemTitle</font>
@@ -58,7 +58,7 @@
                             <label>$INFO[ListItem.Label]</label>
                         </control>
                     </itemlayout>
-                    <focusedlayout width="24-col" height="2-row">
+                    <focusedlayout width="12-col" height="2-row">
                         <control type="image">
                             <posx>0</posx>
                             <posy>3</posy>
@@ -74,7 +74,7 @@
                         <control type="image">
                             <posx>1-col</posx>
                             <posy>0</posy>
-                            <width>23-col</width>
+                            <width>11-col</width>
                             <height>2-row</height>
                             <aspectratio>stretch</aspectratio>
                             <texture border="0">colors/white.png</texture>
@@ -83,7 +83,7 @@
                         <control type="label">
                             <posx>1-col-indent</posx>
                             <posy>0</posy>
-                            <width>23-col-gutter</width>
+                            <width>11-col-gutter</width>
                             <height>2-row</height>
                             <aligny>center</aligny>
                             <font>itemTitle</font>
@@ -94,14 +94,26 @@
                     </focusedlayout>
                 </control>
 
+                <!--coverart-->
+                <control type="image">
+                    <posx>col-14-begin</posx>
+                    <posy>row-5-begin</posy>
+                    <width>11-col</width>
+                    <height>486</height>
+                    <aspectratio scalediffuse="false" align="left">scale</aspectratio>
+                    <texture fallback="colors/offblack.png" border="0">$INFO[Listitem.thumb]</texture>
+                    <bordertexture border="3" colordiffuse="33FFFFFF">colors/white.png</bordertexture>
+                    <bordersize>3</bordersize>
+                </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>84r</posx>
-                        <posy>0</posy>
-                        <height>672</height>
+                        <posy>row-5-begin</posy>
+                        <height>789</height>
                         <onleft>50</onleft>
                     </control>
                 </control>
diff --git a/language/English/strings.po b/language/English/strings.po
index 5942d90..13503a5 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -728,3 +728,11 @@ msgstr ""
 msgctxt "#31196"
 msgid "Hide watched items"
 msgstr ""
+
+msgctxt "#31197"
+msgid "Weather Forecasts"
+msgstr ""
+
+msgctxt "#31198"
+msgid "Adding Directory:"
+msgstr ""