From 953f19c0bf2a6d77d4877d0fcb91a14f5b6ffbfe Mon Sep 17 00:00:00 2001
From: Chris Bevan <bevan.chris@gmail.com>
Date: Fri, 3 Jul 2015 18:35:36 +0100
Subject: [PATCH] Various

---
 1080i/Includes_animations.xml          |   2 +-
 1080i/Includes_hubMenuItems.xml        |  36 +-
 1080i/Includes_hubMenuSubItems.xml     |  50 ---
 1080i/MyVideoNav.xml                   |   2 +-
 1080i/View_Addons.xml                  |   2 +
 1080i/View_Albums.xml                  |   2 +
 1080i/View_Movies.xml                  |   2 +
 1080i/View_MusicRecentItems.xml        |   6 +
 1080i/View_Photos.xml                  |   1 +
 1080i/View_Songs.xml                   |   2 +-
 1080i/View_TVShows.xml                 |   2 +-
 1080i/View_VideoRecentItems.xml        | 497 +++++++++++++------------
 1080i/custom_musicPlayerFullscreen.xml |   8 -
 language/English/strings.po            |  10 +-
 14 files changed, 301 insertions(+), 321 deletions(-)

diff --git a/1080i/Includes_animations.xml b/1080i/Includes_animations.xml
index c77aae8..4887407 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="250" time="200" center="auto" tween="linear" easing="out"/>
+            <effect type="zoom" end="275" time="200" center="auto" tween="linear" easing="out"/>
             <effect type="fade" start="100" end="30" time="200"/>
         </animation>
     </include>
diff --git a/1080i/Includes_hubMenuItems.xml b/1080i/Includes_hubMenuItems.xml
index e2bc42f..7997ed7 100644
--- a/1080i/Includes_hubMenuItems.xml
+++ b/1080i/Includes_hubMenuItems.xml
@@ -3,13 +3,6 @@
     <!--main hub video menu items-->
     <include name="videoMenu">
         <content>
-            <!--Now Playing-->
-            <item>
-                <visible>Player.HasVideo</visible>
-                <label>31136</label>
-                <label2/>
-                <onclick>action(fullscreen)</onclick>
-            </item>
             <!--CD / DVD handling-->
             <item>
                 <visible>System.HasMediaDVD</visible>
@@ -23,6 +16,16 @@
                 <label2/>
                 <onclick>EjectTray()</onclick>
             </item>
+            <!--search-->
+            <item>
+                <visible>System.HasAddon(script.globalsearch)</visible>
+                <label>137</label>
+                <label2/>
+                <onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
+                <onclick>activateWindow(videos,movietitles)</onclick>
+                <onclick>RunScript(script.globalsearch,movies=true&amp;tvshows=true&amp;episodes=true)</onclick>
+                <onclick>right</onclick>
+            </item>
             <!--latest items-->
             <item>
                 <label>31005</label>
@@ -30,7 +33,7 @@
                 <onclick>reloadskin()</onclick>
                 <onclick>activateWindow(VideoLibrary)</onclick>
                 <onclick>Skin.SetString(showRecentVideoItems,true)</onclick>
-                <onclick>Control.SetFocus(9000)</onclick>
+                <onclick>Control.SetFocus(9998)</onclick>
             </item>
             <item>
                 <visible>System.GetBool(pvrmanager.enabled)</visible>
@@ -72,14 +75,6 @@
                 <onclick>control.setfocus(50)</onclick>
                 <onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
             </item>
-            <item>
-                <visible/>
-                <label>136</label>
-                <label2/>
-                <onclick>activateWindow(Videos,playlists,return)</onclick>
-                <onclick>control.setfocus(50)</onclick>
-                <onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
-            </item>
             <!--custom video addons-->
             <item>
                 <visible>!isempty(Skin.String(customVideoAddon1))</visible>
@@ -198,6 +193,15 @@
                 <label2/>
                 <onclick>EjectTray()</onclick>
             </item>
+            <!--search-->
+            <item>
+                <visible>System.HasAddon(script.globalsearch)</visible>
+                <label>137</label>
+                <label2/>
+                <onclick>RunScript(script.globalsearch,artists=true&amp;albums=true)</onclick>
+                <onclick>Skin.SetString(showRecentMusicItems,false)</onclick>
+                <onclick>right</onclick>
+            </item>
             <!--latest items-->
             <item>
                 <label>31005</label>
diff --git a/1080i/Includes_hubMenuSubItems.xml b/1080i/Includes_hubMenuSubItems.xml
index ac0a985..91ff455 100644
--- a/1080i/Includes_hubMenuSubItems.xml
+++ b/1080i/Includes_hubMenuSubItems.xml
@@ -2,24 +2,6 @@
 <includes>
     <!--video submenu items-->
     <include name="videoSideMenu">
-        <control type="button" id="502">
-            <description>Search (videos)</description>
-            <visible>[window.isactive(videolibrary) | window.isactive(videoplaylist) | window.isactive(pvr)] + System.HasAddon(script.globalsearch)</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>137</label>
-            <onclick>Skin.SetString(showRecentVideoItems,false)</onclick>
-            <onclick>activateWindow(videos,movietitles)</onclick>
-            <onclick>RunScript(script.globalsearch,movies=true&amp;tvshows=true&amp;episodes=true)</onclick>
-            <onclick>right</onclick>
-        </control>
         <control type="button" id="3">
             <description>Sort by</description>
             <height>2-row</height>
@@ -133,23 +115,6 @@
 
     <!--music submenu items-->
     <include name="musicSideMenu">
-        <control type="button" id="502">
-            <description>Search (music)</description>
-            <visible>System.HasAddon(script.globalsearch)</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>137</label>
-            <onclick>RunScript(script.globalsearch,artists=true&amp;albums=true)</onclick>
-            <onclick>Skin.SetString(showRecentMusicItems,false)</onclick>
-            <onclick>right</onclick>
-        </control>
         <control type="button" id="3">
             <description>Sort by</description>
             <height>2-row</height>
@@ -193,21 +158,6 @@
             <onclick>Skin.SetString(menuItemTypeFilter,audio)</onclick>
             <onclick>ActivateWindow(5000)</onclick>
         </control>
-        <control type="button" id="505">
-            <description>Set recent content</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>31175</label>
-            <onclick>Skin.SetString(menuItemTypeFilter,audio)</onclick>
-            <onclick>ActivateWindow(5900)</onclick>
-        </control>
         <control type="button" id="504">
             <height>2-row</height>
             <width>col-7-begin</width>
diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml
index 52a9654..7ee3b15 100644
--- a/1080i/MyVideoNav.xml
+++ b/1080i/MyVideoNav.xml
@@ -34,11 +34,11 @@
                 <control type="group" id="9500">
                     <visible>[SubString(skin.string(showRecentVideoItems),false) | !skin.string(showRecentVideoItems)]</visible>
                     <include>movies</include>
-                    <include>files</include>
                     <include>tvshows</include>
                     <include>seasons</include>
                     <include>episodes</include>
                     <include>addons</include>
+                    <include>files</include>
                 </control>
             </control>
 
diff --git a/1080i/View_Addons.xml b/1080i/View_Addons.xml
index 1fded3b..2560e7b 100644
--- a/1080i/View_Addons.xml
+++ b/1080i/View_Addons.xml
@@ -29,6 +29,7 @@
                         <colordiffuse>textboxInactive</colordiffuse>
                     </control>
                     <control type="label">
+                        <visible>!controlgroup(9000).hasfocus</visible>
                         <posx>12</posx>
                         <posy>2-row</posy>
                         <width>240</width>
@@ -40,6 +41,7 @@
                         <label>$INFO[ListItem.label]</label>
                     </control>
                     <control type="label">
+                        <visible>!controlgroup(9000).hasfocus</visible>
                         <posx>12</posx>
                         <posy>3-row</posy>
                         <width>240</width>
diff --git a/1080i/View_Albums.xml b/1080i/View_Albums.xml
index b8ace35..95a27b2 100644
--- a/1080i/View_Albums.xml
+++ b/1080i/View_Albums.xml
@@ -44,6 +44,7 @@
                     <colordiffuse>textboxInactive</colordiffuse>
                 </control>
                 <control type="label">
+                    <visible>!controlgroup(9000).hasfocus</visible>
                     <posx>12</posx>
                     <posy>2-row</posy>
                     <width>240</width>
@@ -55,6 +56,7 @@
                     <label>$INFO[ListItem.Title]</label>
                 </control>
                 <control type="label">
+                    <visible>!controlgroup(9000).hasfocus</visible>
                     <posx>12</posx>
                     <posy>3-row</posy>
                     <width>240</width>
diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml
index 44afe98..d696999 100644
--- a/1080i/View_Movies.xml
+++ b/1080i/View_Movies.xml
@@ -46,6 +46,7 @@
                         <colordiffuse>textboxInactive</colordiffuse>
                     </control>
                     <control type="label">
+                        <visible>!controlgroup(9000).hasfocus</visible>
                         <posx>12</posx>
                         <posy>4-row</posy>
                         <width>240</width>
@@ -57,6 +58,7 @@
                         <label>$INFO[ListItem.title]</label>
                     </control>
                     <control type="label">
+                        <visible>!controlgroup(9000).hasfocus</visible>
                         <posx>12</posx>
                         <posy>5-row</posy>
                         <width>240</width>
diff --git a/1080i/View_MusicRecentItems.xml b/1080i/View_MusicRecentItems.xml
index 71c8460..16e3776 100644
--- a/1080i/View_MusicRecentItems.xml
+++ b/1080i/View_MusicRecentItems.xml
@@ -50,6 +50,7 @@
                             <colordiffuse>textboxInactive</colordiffuse>
                         </control>
                         <control type="label">
+                            <visible>!controlgroup(9000).hasfocus</visible>
                             <posx>12</posx>
                             <posy>2-row</posy>
                             <width>240</width>
@@ -61,6 +62,7 @@
                             <label>$INFO[ListItem.Title]</label>
                         </control>
                         <control type="label">
+                            <visible>!controlgroup(9000).hasfocus</visible>
                             <posx>12</posx>
                             <posy>3-row</posy>
                             <width>240</width>
@@ -222,6 +224,7 @@
                             <colordiffuse>textboxInactive</colordiffuse>
                         </control>
                         <control type="label">
+                            <visible>!controlgroup(9000).hasfocus</visible>
                             <posx>12</posx>
                             <posy>2-row</posy>
                             <width>240</width>
@@ -233,6 +236,7 @@
                             <label>$INFO[ListItem.Title]</label>
                         </control>
                         <control type="label">
+                            <visible>!controlgroup(9000).hasfocus</visible>
                             <posx>12</posx>
                             <posy>3-row</posy>
                             <width>240</width>
@@ -390,6 +394,7 @@
                             <colordiffuse>textboxInactive</colordiffuse>
                         </control>
                         <control type="label">
+                            <visible>!controlgroup(9000).hasfocus</visible>
                             <posx>12</posx>
                             <posy>2-row</posy>
                             <width>240</width>
@@ -401,6 +406,7 @@
                             <label>$INFO[ListItem.Title]</label>
                         </control>
                         <control type="label">
+                            <visible>!controlgroup(9000).hasfocus</visible>
                             <posx>12</posx>
                             <posy>3-row</posy>
                             <width>240</width>
diff --git a/1080i/View_Photos.xml b/1080i/View_Photos.xml
index 9375c9e..60df69d 100644
--- a/1080i/View_Photos.xml
+++ b/1080i/View_Photos.xml
@@ -25,6 +25,7 @@
                     <colordiffuse>ffFFFFFF</colordiffuse>
                 </control>
                 <control type="label">
+                    <visible>!controlgroup(9000).hasfocus</visible>
                     <posx>12</posx>
                     <posy>3-row</posy>
                     <width>384</width>
diff --git a/1080i/View_Songs.xml b/1080i/View_Songs.xml
index c8ea5e4..20e39a2 100644
--- a/1080i/View_Songs.xml
+++ b/1080i/View_Songs.xml
@@ -72,7 +72,7 @@
             <posx>col-10-begin</posx>
             <posy>row-9-begin</posy>
             <width>15-col</width>
-            <height>18-row</height>
+            <height>19-row</height>
             <onleft>9000</onleft>
             <onright>60</onright>
             <ondown>56</ondown>
diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml
index ff90eff..2efeae4 100644
--- a/1080i/View_TVShows.xml
+++ b/1080i/View_TVShows.xml
@@ -7,7 +7,7 @@
 
             <!--fanart-->
             <control type="group">
-                <visible>container.content(tvshows)</visible>
+                <visible>container.content(tvshows) | Substring(Container.folderpath,plugin)</visible>
                 <control type="image">
                     <include>dimensionsFullscreen</include>
                     <aspectratio scalediffuse="false">stretch</aspectratio>
diff --git a/1080i/View_VideoRecentItems.xml b/1080i/View_VideoRecentItems.xml
index 014677e..12bacf1 100644
--- a/1080i/View_VideoRecentItems.xml
+++ b/1080i/View_VideoRecentItems.xml
@@ -1,58 +1,234 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <includes>
     <include name="videoRecentItems">
-        <control type="group" id="9300">
-            <animation type="windowopen">
-                <effect type="fade" start="0" end="100" time="500"/>
-            </animation>
-            <animation type="Conditional" condition="controlgroup(9301).hasfocus">
-                <effect type="fade" start="100" end="5" time="200"/>
-                <effect type="slide" start="0,0" end="0,-100" time="200"/>
-            </animation>
-            <control type="label">
-                <posx>col-1-begin</posx>
-                <posy>210</posy>
-                <width>24-col</width>
-                <height>1-row</height>
-                <align></align>
-                <font>regularStrong</font>
-                <textcolor>textActive</textcolor>
-                <label>$LOCALIZE[31176]</label>
+        <control type="group">
+            <include>fadeInOut</include>
+
+            <!--fanart-->
+            <control type="group">
+                <control type="image">
+                    <posx>0</posx>
+                    <posy>0</posy>
+                    <width>fullscreenWidth</width>
+                    <height>fullscreenHeight</height>
+                    <aspectratio scalediffuse="false" align="center">stretch</aspectratio>
+                    <texture background="true" fallback="colors/offblack.png" border="0">$INFO[container(9998).listitem.art(fanart)]</texture>
+                    <fadetime>500</fadetime>
+                    <colordiffuse>66ffffff</colordiffuse>
+                    <include>kenBurnsey</include>
+                </control>
+                <control type="image">
+                    <include>dimensionsFullscreen</include>
+                    <texture>vignette.png</texture>
+                    <colordiffuse>ffffffff</colordiffuse>
+                    <aspectratio>stretch</aspectratio>
+                </control>
             </control>
-            <control type="panel" id="9998">
-                <visible>!stringcompare(Window(Home).Property(Movies.UnWatched),0)</visible>
+
+            <control type="image">
+                <posx>0</posx>
+                <posy>row-20-begin</posy>
+                <width>fullscreenWidth</width>
+                <height>15-row</height>
+                <aspectratio scalediffuse="false">stretch</aspectratio>
+                <texture border="0">colors/black.png</texture>
+                <colordiffuse>ccffffff</colordiffuse>
+            </control>
+            <control type="image">
+                <posx>0</posx>
+                <posy>row-20-begin</posy>
+                <width>fullscreenWidth</width>
+                <height>6</height>
+                <aspectratio scalediffuse="false">stretch</aspectratio>
+                <texture border="0">colors/white.png</texture>
+                <colordiffuse>highlight</colordiffuse>
+            </control>
+
+            <!--titles-->
+            <control type="group">
+                <animation type="conditional" condition="!control.hasfocus(9998)">
+                    <effect type="fade" start="100" end="0" time="200"/>
+                </animation>
+                <animation type="conditional" condition="control.hasfocus(9998)">
+                    <effect type="slide" start="800" end="0" tween="cubic" easing="out" delay="600" time="400"/>
+                    <effect type="fade" start="0" end="100" delay="600" time="200"/>
+                </animation>
+
+                <visible>!controlgroup(9000).hasfocus</visible>
+                <posx>col-17-begin</posx>
+                <posy>row-5-begin</posy>
+
+                <control type="label">
+                    <visible>Container(9123).HasFocus(1)</visible>
+                    <posx>0</posx>
+                    <posy>0</posy>
+                    <width>8-col</width>
+                    <height>2-row</height>
+                    <font>largeStrong</font>
+                    <textcolor>textActive</textcolor>
+                    <shadowcolor>-</shadowcolor>
+                    <label>$INFO[container(9998).listitem.title]</label>
+                </control>
+                <control type="label">
+                    <visible>Container(9123).HasFocus(2)</visible>
+                    <posx>0</posx>
+                    <posy>0</posy>
+                    <width>8-col</width>
+                    <height>2-row</height>
+                    <font>largeStrong</font>
+                    <textcolor>textActive</textcolor>
+                    <shadowcolor>-</shadowcolor>
+                    <label>$INFO[container(9998).listitem.tvshowtitle]</label>
+                </control>
+
+                <control type="label">
+                    <visible>Container(9123).HasFocus(1)</visible>
+                    <posx>0</posx>
+                    <posy>2-row</posy>
+                    <width>8-col</width>
+                    <height>1-row</height>
+                    <font>itemTitle</font>
+                    <textcolor>textActive</textcolor>
+                    <shadowcolor>-</shadowcolor>
+                    <label>[COLOR highlight]$INFO[container(9998).listitem.year] $INFO[container(9998).listitem.genre,• , ][/COLOR]</label>
+                </control>
+                <control type="label">
+                    <visible>Container(9123).HasFocus(2)</visible>
+                    <posx>0</posx>
+                    <posy>2-row</posy>
+                    <width>8-col</width>
+                    <height>1-row</height>
+                    <font>itemTitle</font>
+                    <textcolor>textActive</textcolor>
+                    <shadowcolor>-</shadowcolor>
+                    <label>[COLOR highlight]$INFO[container(9998).listitem.season,$LOCALIZE[31011] , ] $INFO[container(9998).listitem.property(episodecount),(, $LOCALIZE[31198])][/COLOR]</label>
+                </control>
+
+                <control type="textbox">
+                    <visible>Container(9123).HasFocus(1)</visible>
+                    <posx>0</posx>
+                    <posy>3-row</posy>
+                    <font>textbox</font>
+                    <width>8-col-gutter</width>
+                    <align>left</align>
+                    <textcolor>textActive</textcolor>
+                    <height>268</height>
+                    <label>$INFO[container(9998).ListItem.plot]</label>
+                    <autoscroll delay="5000" time="1500" repeat="10000"/>
+                </control>
+                <control type="textbox">
+                    <visible>Container(9123).HasFocus(2)</visible>
+                    <posx>0</posx>
+                    <posy>3-row</posy>
+                    <font>textbox</font>
+                    <width>8-col-gutter</width>
+                    <align>left</align>
+                    <textcolor>textActive</textcolor>
+                    <height>268</height>
+                    <label>$INFO[container(9998).ListItem.title]</label>
+                    <autoscroll delay="5000" time="1500" repeat="10000"/>
+                </control>
+            </control>
+
+            <!--content selector-->
+            <control type="list" id="9123">
+                <animation type="Conditional" condition="controlgroup(9000).hasfocus | controlgroup(9002).hasfocus | controlgroup(100).hasfocus">
+                    <effect type="fade" start="100" end="0" time="200"/>
+                </animation>
                 <posx>col-1-begin</posx>
-                <posy>row-7-begin</posy>
+                <posy>row-18-begin</posy>
                 <width>24-col</width>
-                <height>11-row</height>
+                <height>2-row</height>
                 <onleft>9000</onleft>
-                <onup>9997</onup>
-                <ondown>9997</ondown>
-                <onback>activateWindow(home)</onback>
+                <ondown>9998</ondown>
                 <orientation>horizontal</orientation>
-                <animation type="windowopen">
-                    <include>listSlideIn</include>
-                </animation>
-                <animation type="windowclose">
-                    <effect type="fade" start="100" end="0" time="300"/>
-                </animation>
-                <content>plugin://script.thedeadman.functions?type=recentmovies</content>
-                <itemlayout width="4-col" height="396">
+                <itemlayout width="6-col" height="2-row">
+                    <control type="image">
+                        <visible>!controlgroup(9000).hasfocus</visible>
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>6-col</width>
+                        <height>2-row</height>
+                        <texture>colors/black.png</texture>
+                        <colordiffuse>ccffffff</colordiffuse>
+                        <aspectratio>stretch</aspectratio>
+                    </control>
+                    <control type="label">
+                        <posx>12</posx>
+                        <posy>0</posy>
+                        <width>6-col-gutter</width>
+                        <height>2-row</height>
+                        <font>buttonTitle</font>
+                        <aligny>center</aligny>
+                        <textcolor>textActive</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label>$INFO[ListItem.property(textTitle)]</label>
+                    </control>
+                </itemlayout>
+                <focusedlayout width="6-col" height="2-row">
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>4-col-gutter</width>
-                        <height>396</height>
+                        <width>6-col</width>
+                        <height>2-row</height>
+                        <texture>colors/white.png</texture>
+                        <colordiffuse>highlight</colordiffuse>
+                        <aspectratio>stretch</aspectratio>
+                    </control>
+                    <control type="label">
+                        <posx>12</posx>
+                        <posy>0</posy>
+                        <width>6-col-gutter</width>
+                        <height>2-row</height>
+                        <font>buttonTitle</font>
+                        <aligny>center</aligny>
+                        <textcolor>textActive</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <label>$INFO[ListItem.property(textTitle)]</label>
+                    </control>
+                </focusedlayout>
+                <content>
+                    <item id="1">
+                        <label>recentmovies</label>
+                        <property name="textTitle">31176</property>
+                        <onclick>noop</onclick>
+                    </item>
+                    <item id="2">
+                        <label>recentepisodes</label>
+                        <property name="textTitle">31178</property>
+                        <onclick>noop</onclick>
+                    </item>
+                </content>
+            </control>
+
+            <!--content listing-->
+            <control type="panel" id="9998">
+                <posx>col-1-begin</posx>
+                <posy>row-21-begin</posy>
+                <width>24-col</width>
+                <height>9-row</height>
+                <onup>9123</onup>
+                <onleft>9000</onleft>
+                <onback>activateWindow(home)</onback>
+                <orientation>horizontal</orientation>
+                <content>plugin://script.thedeadman.functions?type=$INFO[control.getlabel(9123)]</content>
+                <itemlayout width="3-col" height="312">
+                    <control type="image">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>3-col-gutter</width>
+                        <height>288</height>
                         <aspectratio>stretch</aspectratio>
                         <texture border="3">colors/black.png</texture>
-                        <bordertexture colordiffuse="33FFFFFF">colors/white.png</bordertexture>
+                        <bordertexture colordiffuse="ffFFFFFF">colors/offblack.png</bordertexture>
                         <bordersize>3</bordersize>
                         <colordiffuse>textboxInactive</colordiffuse>
                     </control>
                     <control type="label">
+                        <visible>!controlgroup(9000).hasfocus</visible>
                         <posx>12</posx>
-                        <posy>4-row</posy>
-                        <width>240</width>
+                        <posy>2-row</posy>
+                        <width>168</width>
                         <height>2-row</height>
                         <align>center</align>
                         <aligny>center</aligny>
@@ -61,9 +237,10 @@
                         <label>$INFO[ListItem.title]</label>
                     </control>
                     <control type="label">
+                        <visible>!controlgroup(9000).hasfocus</visible>
                         <posx>12</posx>
-                        <posy>5-row</posy>
-                        <width>240</width>
+                        <posy>3-row</posy>
+                        <width>168</width>
                         <height>2-row</height>
                         <align>center</align>
                         <aligny>center</aligny>
@@ -74,16 +251,27 @@
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>4-col-gutter</width>
-                        <height>396</height>
+                        <width>3-col-gutter</width>
+                        <height>288</height>
                         <aspectratio>stretch</aspectratio>
                         <texture border="0">$INFO[ListItem.Art(poster)]</texture>
                         <bordertexture border="3" colordiffuse="33FFFFFF">colors/white.png</bordertexture>
                         <bordersize>3</bordersize>
                         <colordiffuse>ffffffff</colordiffuse>
                     </control>
+                    <control type="image">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>3-col-gutter</width>
+                        <height>288</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture border="0">$INFO[ListItem.property(season_poster)]</texture>
+                        <bordertexture border="3" colordiffuse="33FFFFFF">colors/white.png</bordertexture>
+                        <bordersize>3</bordersize>
+                        <colordiffuse>ffffffff</colordiffuse>
+                    </control>
                 </itemlayout>
-                <focusedlayout width="4-col" height="396">
+                <focusedlayout width="3-col" height="312">
                     <control type="group">
                         <animation type="focus" loop="false" reversible="false">
                             <effect type="rotatey" start="0" end="-15" center="132" tween="back" easing="out" time="300"/>
@@ -93,18 +281,19 @@
                         <control type="image">
                             <posx>0</posx>
                             <posy>0</posy>
-                            <width>4-col-gutter</width>
-                            <height>396</height>
+                            <width>3-col-gutter</width>
+                            <height>288</height>
                             <aspectratio>stretch</aspectratio>
-                            <texture fallback="colors/black.png" border="0">$INFO[ListItem.Art(poster)]</texture>
-                            <bordertexture border="3" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
+                            <texture border="3">colors/black.png</texture>
+                            <bordertexture colordiffuse="ffFFFFFF">colors/offblack.png</bordertexture>
                             <bordersize>3</bordersize>
-                            <colordiffuse>ff666666</colordiffuse>
+                            <colordiffuse>textboxInactive</colordiffuse>
                         </control>
                         <control type="label">
+                            <visible>!controlgroup(9000).hasfocus</visible>
                             <posx>12</posx>
-                            <posy>4-row</posy>
-                            <width>240</width>
+                            <posy>2-row</posy>
+                            <width>168</width>
                             <height>2-row</height>
                             <align>center</align>
                             <aligny>center</aligny>
@@ -113,9 +302,10 @@
                             <label>$INFO[ListItem.title]</label>
                         </control>
                         <control type="label">
+                            <visible>!controlgroup(9000).hasfocus</visible>
                             <posx>12</posx>
-                            <posy>5-row</posy>
-                            <width>240</width>
+                            <posy>3-row</posy>
+                            <width>168</width>
                             <height>2-row</height>
                             <align>center</align>
                             <aligny>center</aligny>
@@ -123,204 +313,27 @@
                             <textcolor>textActive</textcolor>
                             <label>$INFO[ListItem.year]</label>
                         </control>
-                        <control type="grouplist">
-                            <posx>42</posx>
-                            <posy>9-row</posy>
-                            <width>4-col-gutter</width>
-                            <orientation>horizontal</orientation>
-                            <control type="label">
-                                <width>24</width>
-                                <height>2-row</height>
-                                <aligny>center</aligny>
-                                <font>symbol</font>
-                                <textcolor>textActive</textcolor>
-                                <label></label>
-                            </control>
-                            <control type="label">
-                                <width>1-col</width>
-                                <height>2-row</height>
-                                <aligny>center</aligny>
-                                <font>smallStrong</font>
-                                <textcolor>textActive</textcolor>
-                                <label>$LOCALIZE[31183]</label>
-                            </control>
-                            <control type="label">
-                                <width>24</width>
-                                <height>2-row</height>
-                                <aligny>center</aligny>
-                                <font>symbol</font>
-                                <textcolor>textActive</textcolor>
-                                <label></label>
-                            </control>
-                            <control type="label">
-                                <width>1-col</width>
-                                <height>2-row</height>
-                                <aligny>center</aligny>
-                                <font>smallStrong</font>
-                                <textcolor>textActive</textcolor>
-                                <label>$LOCALIZE[31184]</label>
-                            </control>
-                        </control>
-                    </control>
-                </focusedlayout>
-            </control>
-        </control>
-
-        <control type="group" id="9301">
-            <animation type="Conditional" condition="controlgroup(9301).hasfocus">
-                <effect type="slide" start="0,0" end="0,-400" time="200"/>
-            </animation>
-            <control type="label">
-                <posx>col-1-begin</posx>
-                <posy>714</posy>
-                <width>24-col</width>
-                <height>1-row</height>
-                <align></align>
-                <font>regularStrong</font>
-                <textcolor>textActive</textcolor>
-                <label>$LOCALIZE[31178]</label>
-            </control>
-            <control type="panel" id="9997">
-                <visible>!stringcompare(Window(Home).Property(Episodes.UnWatched),0)</visible>
-                <posx>col-1-begin</posx>
-                <posy>row-21-begin</posy>
-                <width>24-col</width>
-                <height>12-row</height>
-                <onleft>9000</onleft>
-                <ondown>9998</ondown>
-                <onup>9998</onup>
-                <onback>activateWindow(home)</onback>
-                <orientation>horizontal</orientation>
-                <animation type="windowopen">
-                    <include>listSlideIn</include>
-                </animation>
-                <animation type="windowclose">
-                    <effect type="fade" start="100" end="0" time="300"/>
-                </animation>
-                <content>plugin://script.thedeadman.functions?type=recentepisodes</content>
-                <itemlayout width="4-col" height="396">
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>4-col-gutter</width>
-                        <height>396</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture border="3">colors/black.png</texture>
-                        <bordertexture colordiffuse="33FFFFFF">colors/white.png</bordertexture>
-                        <bordersize>3</bordersize>
-                        <colordiffuse>textboxInactive</colordiffuse>
-                    </control>
-                    <control type="label">
-                        <posx>12</posx>
-                        <posy>4-row</posy>
-                        <width>240</width>
-                        <height>2-row</height>
-                        <align>center</align>
-                        <aligny>center</aligny>
-                        <font>regularStrong</font>
-                        <textcolor>disabled</textcolor>
-                        <label>$INFO[ListItem.TVshowTitle]</label>
-                    </control>
-                    <control type="label">
-                        <posx>12</posx>
-                        <posy>5-row</posy>
-                        <width>240</width>
-                        <height>2-row</height>
-                        <align>center</align>
-                        <aligny>center</aligny>
-                        <font>buttonTitle</font>
-                        <textcolor>disabled</textcolor>
-                        <label>$INFO[ListItem.season,$LOCALIZE[31011] ,]</label>
-                    </control>
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>4-col-gutter</width>
-                        <height>396</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture border="0">$INFO[ListItem.property(season_poster)]</texture>
-                        <bordertexture border="3" colordiffuse="33FFFFFF">colors/white.png</bordertexture>
-                        <bordersize>3</bordersize>
-                        <colordiffuse>ffffffff</colordiffuse>
-                    </control>
-                </itemlayout>
-                <focusedlayout width="4-col" height="396">
-                    <control type="group">
-                        <animation type="focus" loop="false" reversible="false">
-                            <effect type="rotatey" start="0" end="-15" center="132" tween="back" easing="out" time="300"/>
-                            <effect type="rotatey" start="0" end="15" center="132" tween="back" easing="out" delay="300" time="300"/>
-                            <effect type="zoom" start="95" end="110" center="auto" tween="back" easing="out" time="300"/>
-                        </animation>
                         <control type="image">
                             <posx>0</posx>
                             <posy>0</posy>
-                            <width>4-col-gutter</width>
-                            <height>396</height>
+                            <width>3-col-gutter</width>
+                            <height>288</height>
                             <aspectratio>stretch</aspectratio>
-                            <texture fallback="colors/black.png" border="0">$INFO[ListItem.property(season_poster)]</texture>
+                            <texture border="0">$INFO[ListItem.Art(poster)]</texture>
                             <bordertexture border="3" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
                             <bordersize>3</bordersize>
-                            <colordiffuse>ff666666</colordiffuse>
+                            <colordiffuse>ffffffff</colordiffuse>
                         </control>
-                        <control type="label">
-                            <posx>12</posx>
-                            <posy>4-row</posy>
-                            <width>240</width>
-                            <height>2-row</height>
-                            <align>center</align>
-                            <aligny>center</aligny>
-                            <font>regularStrong</font>
-                            <textcolor>textActive</textcolor>
-                            <label>$INFO[ListItem.TVshowTitle]</label>
-                        </control>
-                        <control type="label">
-                            <posx>12</posx>
-                            <posy>5-row</posy>
-                            <width>240</width>
-                            <height>2-row</height>
-                            <align>center</align>
-                            <aligny>center</aligny>
-                            <font>buttonTitle</font>
-                            <textcolor>textActive</textcolor>
-                            <label>$INFO[ListItem.season,$LOCALIZE[31011] ,]</label>
-                        </control>
-                        <control type="grouplist">
-                            <posx>42</posx>
-                            <posy>9-row</posy>
-                            <width>4-col-gutter</width>
-                            <orientation>horizontal</orientation>
-                            <control type="label">
-                                <width>24</width>
-                                <height>2-row</height>
-                                <aligny>center</aligny>
-                                <font>symbol</font>
-                                <textcolor>textActive</textcolor>
-                                <label></label>
-                            </control>
-                            <control type="label">
-                                <width>1-col</width>
-                                <height>2-row</height>
-                                <aligny>center</aligny>
-                                <font>smallStrong</font>
-                                <textcolor>textActive</textcolor>
-                                <label>$LOCALIZE[31183]</label>
-                            </control>
-                            <control type="label">
-                                <width>24</width>
-                                <height>2-row</height>
-                                <aligny>center</aligny>
-                                <font>symbol</font>
-                                <textcolor>textActive</textcolor>
-                                <label></label>
-                            </control>
-                            <control type="label">
-                                <width>1-col</width>
-                                <height>2-row</height>
-                                <aligny>center</aligny>
-                                <font>smallStrong</font>
-                                <textcolor>textActive</textcolor>
-                                <label>$LOCALIZE[31184]</label>
-                            </control>
+                        <control type="image">
+                            <posx>0</posx>
+                            <posy>0</posy>
+                            <width>3-col-gutter</width>
+                            <height>288</height>
+                            <aspectratio>stretch</aspectratio>
+                            <texture border="0">$INFO[ListItem.property(season_poster)]</texture>
+                            <bordertexture border="3" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
+                            <bordersize>3</bordersize>
+                            <colordiffuse>ffffffff</colordiffuse>
                         </control>
                     </control>
                 </focusedlayout>
diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml
index b506680..57b0f82 100644
--- a/1080i/custom_musicPlayerFullscreen.xml
+++ b/1080i/custom_musicPlayerFullscreen.xml
@@ -255,14 +255,6 @@
                                 <thumb>-</thumb>
                                 <onclick>PlayerControl(Random)</onclick>
                             </item>
-                            <item>
-                                <description>Playlist</description>
-                                <label>31097</label>
-                                <label2></label2>
-                                <thumb>-</thumb>
-                                <onclick>activateWindow(500)</onclick>
-                                <onclick>dialog.close(5001)</onclick>
-                            </item>
                             <item>
                                 <description>Visualisation</description>
                                 <label>31032</label>
diff --git a/language/English/strings.po b/language/English/strings.po
index 43dde89..e103447 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -46,7 +46,7 @@ msgid "Power Off"
 msgstr ""
 
 msgctxt "#31005"
-msgid "Latest"
+msgid "What's New"
 msgstr ""
 
 msgctxt "#31006"
@@ -513,6 +513,10 @@ msgctxt "#31197"
 msgid "Weather Forecasts"
 msgstr ""
 
+msgctxt "#31198"
+msgid "unwatched"
+msgstr ""
+
 msgctxt "#31201"
 msgid "Record Show"
 msgstr ""
@@ -525,6 +529,10 @@ msgctxt "#31203"
 msgid "Smart Playlist"
 msgstr ""
 
+msgctxt "#31204"
+msgid "Episode"
+msgstr ""
+
 msgctxt "#31205"
 msgid "No further details available."
 msgstr ""