From 7d096bfa335cfe76be2ef6df734a417b703d36e9 Mon Sep 17 00:00:00 2001
From: Chris Bevan <bevan.chris@gmail.com>
Date: Mon, 21 Nov 2016 20:36:06 +0000
Subject: [PATCH] various

---
 1080i/DialogGameControllers.xml            | 146 +++++++++++++++++++++
 1080i/Home.xml                             |   3 +-
 1080i/Includes_animations.xml              |   6 +
 1080i/Includes_variables.xml               |   5 +
 1080i/MyMusicNav.xml                       |   6 +-
 1080i/MyPVRChannels.xml                    |   5 +-
 1080i/MyPVRGuide.xml                       |   5 +-
 1080i/MyPVRRecordings.xml                  |   5 +-
 1080i/MyPVRTimers.xml                      |   5 +-
 1080i/MyPics.xml                           |   5 +-
 1080i/MyPlaylist.xml                       |   5 +-
 1080i/MyPrograms.xml                       |   5 +-
 1080i/MyVideoNav.xml                       |   8 +-
 1080i/SkinSettings.xml                     |  17 +++
 1080i/View_VideoFiles.xml                  |   5 +-
 1080i/custom_menuSelector.xml              |   7 +
 1080i/custom_musicPlayerFullscreen.xml     |   4 +-
 1080i/custom_recentContent.xml             |  37 +++++-
 1080i/custom_subtitleMenu.xml              |   1 -
 1080i/script-skinshortcuts.xml             |   2 +-
 changelog.txt                              |  20 +--
 extras/playlists/collage_RandomContent.xsp |   9 --
 extras/playlists/inprogressMovies.xsp      |   7 +
 extras/playlists/inprogressTVShows.xsp     |   7 +
 language/English/strings.po                |  16 ++-
 25 files changed, 266 insertions(+), 75 deletions(-)
 create mode 100644 1080i/DialogGameControllers.xml
 create mode 100644 1080i/custom_menuSelector.xml
 delete mode 100644 extras/playlists/collage_RandomContent.xsp
 create mode 100644 extras/playlists/inprogressMovies.xsp
 create mode 100644 extras/playlists/inprogressTVShows.xsp

diff --git a/1080i/DialogGameControllers.xml b/1080i/DialogGameControllers.xml
new file mode 100644
index 0000000..9ba45d9
--- /dev/null
+++ b/1080i/DialogGameControllers.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<window>
+    <defaultcontrol>3</defaultcontrol>
+    <controls>
+
+        <control type="label">
+            <description>Controller types heading</description>
+            <posx>0</posx>
+            <posy>0</posy>
+            <width>220</width>
+            <height>25</height>
+            <font>font12</font>
+            <label>35050</label>
+            <align>center</align>
+            <aligny>center</aligny>
+            <textcolor>blue</textcolor>
+            <shadowcolor>black</shadowcolor>
+        </control>
+
+        <control type="scrollbar" id="30">
+            <posx>0</posx>
+            <posy>0</posy>
+            <width>25</width>
+            <height>405</height>
+            <onleft>50</onleft>
+            <onright>3</onright>
+            <ondown>3</ondown>
+            <onup>3</onup>
+            <showonepage>false</showonepage>
+            <orientation>vertical</orientation>
+        </control>
+
+        <control type="grouplist" id="3">
+            <description>Controller types grouplist</description>
+            <posx>0</posx>
+            <posy>0</posy>
+            <width>220</width>
+            <height>405</height>
+            <onleft>30</onleft>
+            <onright>5</onright>
+            <onup>9001</onup>
+            <ondown>9001</ondown>
+            <pagecontrol>30</pagecontrol>
+        </control>
+
+        <control type="button" id="10">
+            <description>Default controller types button</description>
+            <posx>0</posx>
+            <posy>0</posy>
+            <height>40</height>
+            <width>220</width>
+            <align>center</align>
+            <aligny>center</aligny>
+            <font>font12_title</font>
+            <textcolor>white</textcolor>
+        </control>
+
+        <control type="gamecontroller" id="31">
+            <posx>0</posx>
+            <posy>0</posy>
+            <width>480</width>
+            <height>286</height>
+        </control>
+
+        <control type="label">
+            <description>Feature types heading</description>
+            <posx>0</posx>
+            <posy>0</posy>
+            <width>220</width>
+            <height>25</height>
+            <font>font12</font>
+            <label>35059</label>
+            <align>center</align>
+            <aligny>center</aligny>
+            <textcolor>blue</textcolor>
+            <shadowcolor>black</shadowcolor>
+        </control>
+
+        <control type="scrollbar" id="50">
+            <posx>0</posx>
+            <posy>0</posy>
+            <width>25</width>
+            <height>405</height>
+            <onleft>5</onleft>
+            <onright>30</onright>
+            <ondown>5</ondown>
+            <onup>5</onup>
+            <showonepage>false</showonepage>
+            <orientation>vertical</orientation>
+        </control>
+
+        <control type="grouplist" id="5">
+            <description>Feature types grouplist</description>
+            <posx>0</posx>
+            <posy>0</posy>
+            <width>220</width>
+            <height>405</height>
+            <onleft>3</onleft>
+            <onright>50</onright>
+            <onup>9001</onup>
+            <ondown>9001</ondown>
+            <pagecontrol>50</pagecontrol>
+        </control>
+
+        <control type="button" id="7">
+            <description>Default feature types button</description>
+            <posx>0</posx>
+            <posy>0</posy>
+            <height>40</height>
+            <width>220</width>
+            <align>center</align>
+            <aligny>center</aligny>
+            <font>font12_title</font>
+            <textcolor>white</textcolor>
+            <pulseonselect>false</pulseonselect>
+        </control>
+
+        <!--dialog buttons-->
+        <control type="group">
+            <control type="button" id="18">
+                <description>Ok Button</description>
+                <label>186</label>
+            </control>
+            <control type="button" id="19">
+                <description>Reset Button</description>
+                <label>10035</label>
+            </control>
+            <control type="button" id="20">
+                <description>Link to install more controllers</description>
+                <label>$LOCALIZE[21452]</label>
+            </control>
+            <control type="button" id="17">
+                <description>Help button</description>
+                <label>$LOCALIZE[10043]</label>
+            </control>
+        </control>
+
+
+        <!--debugging-->
+        <include>DebugGrid</include>
+        <control type="label">
+            <include>DialogID</include>
+            <label>DialogGameControllers.xml</label>
+        </control>
+    </controls>
+</window>
\ No newline at end of file
diff --git a/1080i/Home.xml b/1080i/Home.xml
index f730000..f7f37eb 100644
--- a/1080i/Home.xml
+++ b/1080i/Home.xml
@@ -7,14 +7,13 @@
     <controls>
         <include>globalBackground</include>
         <control type="group">
-            <visible>!isempty(skin.string(homeBackground))</visible>
             <animation type="windowOpen" condition="!Skin.HasSetting(lowPowerMode)">
                 <effect type="zoom" center="auto" start="105" tween="sine" end="100" time="1500"/>
             </animation>
             <include>modalDialogContentShift</include>
             <control type="multiimage">
                   <include>dimensionsFullscreen</include>
-                  <imagepath>special://skin/extras/homeBackgrounds</imagepath>
+                  <imagepath>$VAR[homeBackgroundLocation]</imagepath>
                   <timeperimage>45000</timeperimage>
                   <fadetime>1000</fadetime>
                   <pauseatend>10000</pauseatend>
diff --git a/1080i/Includes_animations.xml b/1080i/Includes_animations.xml
index 60c2dd0..611e900 100644
--- a/1080i/Includes_animations.xml
+++ b/1080i/Includes_animations.xml
@@ -17,6 +17,12 @@
         <effect type="fade" start="0" end="100" time="300" delay="600"/>
         <effect type="slide" start="3-col" end="0" center="auto" tween="cubic" easing="out" time="400" delay="500"/>
     </include>
+    <include name="contentOpen">
+        <animation type="windowopen">
+            <effect type="fade" start="0" end="100" time="500"/>
+            <effect type="zoom" center="auto" start="120" end="100" time="300"/>
+        </animation>
+    </include>
     <!--ken burnsey style effect for fanart images-->
     <include name="kenBurnsey">
         <animation type="conditional" condition="!Skin.HasSetting(lowPowerMode)" loop="true">
diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml
index 0648c1c..7ffd01b 100644
--- a/1080i/Includes_variables.xml
+++ b/1080i/Includes_variables.xml
@@ -82,4 +82,9 @@
         <value condition="SubString(MusicPlayer.Rating,5)"></value>
         <value></value>
     </variable>
+    <!--home background location-->
+    <variable name="homeBackgroundLocation">
+        <value condition="!isempty(Skin.String(homeBackground))">$INFO[Skin.String(homeBackground)]</value>
+        <value>special://skin/extras/homeBackgrounds</value>
+    </variable>
 </includes>
diff --git a/1080i/MyMusicNav.xml b/1080i/MyMusicNav.xml
index 50ca4b0..cdb8cf5 100644
--- a/1080i/MyMusicNav.xml
+++ b/1080i/MyMusicNav.xml
@@ -2,6 +2,7 @@
 <window>
     <defaultcontrol always="true">9999</defaultcontrol>
     <include>fadeInOut</include>
+    <previouswindow>home</previouswindow>
     <controls>
         <include>globalBackground</include>
         <!--page container group-->
@@ -10,10 +11,7 @@
             <include>modalDialogContentShift</include>
             <!--Main content listing-->
             <control type="group" id="9999">
-                <animation type="windowopen">
-                    <effect type="fade" start="0" end="100" time="500"/>
-                    <effect type="zoom" center="auto" start="120" end="100" time="300"/>
-                </animation>
+                <include>contentOpen</include>
                 <!--source content-->
                 <control type="group" id="9500">
                     <include>artist</include>
diff --git a/1080i/MyPVRChannels.xml b/1080i/MyPVRChannels.xml
index ae8b2c2..a380036 100644
--- a/1080i/MyPVRChannels.xml
+++ b/1080i/MyPVRChannels.xml
@@ -19,10 +19,7 @@
             <!--Main content listing-->
             <control type="group" id="9999">
                 <!--initial animation-->
-                <animation type="windowopen">
-                    <effect type="fade" start="0" end="100" time="500"/>
-                    <effect type="zoom" center="auto" start="120" end="100" time="300"/>
-                </animation>
+                <include>contentOpen</include>
                 <include>liveTVChannels</include>
             </control>
 
diff --git a/1080i/MyPVRGuide.xml b/1080i/MyPVRGuide.xml
index b77c875..d918b64 100644
--- a/1080i/MyPVRGuide.xml
+++ b/1080i/MyPVRGuide.xml
@@ -14,10 +14,7 @@
             <!--Main content listing-->
             <control type="group" id="9999">
                 <!--initial animation-->
-                <animation type="windowopen">
-                    <effect type="fade" start="0" end="100" time="500"/>
-                    <effect type="zoom" center="auto" start="120" end="100" time="300"/>
-                </animation>
+                <include>contentOpen</include>
                 <control type="epggrid" id="10">
                     <description>EPG Grid</description>
                     <posx>col-1-begin</posx>
diff --git a/1080i/MyPVRRecordings.xml b/1080i/MyPVRRecordings.xml
index 3d87926..454111d 100644
--- a/1080i/MyPVRRecordings.xml
+++ b/1080i/MyPVRRecordings.xml
@@ -14,10 +14,7 @@
             <include>modalDialogContentShift</include>
             <!--Main content listing-->
             <control type="group" id="9999">
-                <animation type="windowopen">
-                    <effect type="fade" start="0" end="100" time="500"/>
-                    <effect type="zoom" center="auto" start="120" end="100" time="300"/>
-                </animation>
+                <include>contentOpen</include>
                 <posx>col-1-begin</posx>
                 <posy>row-5-begin</posy>
                 <control type="panel" id="50">
diff --git a/1080i/MyPVRTimers.xml b/1080i/MyPVRTimers.xml
index 554b28c..a019004 100644
--- a/1080i/MyPVRTimers.xml
+++ b/1080i/MyPVRTimers.xml
@@ -10,10 +10,7 @@
             <include>modalDialogContentShift</include>
             <!--Main content listing-->
             <control type="group" id="9999">
-                <animation type="windowopen">
-                    <effect type="fade" start="0" end="100" time="500"/>
-                    <effect type="zoom" center="auto" start="120" end="100" time="300"/>
-                </animation>
+                <include>contentOpen</include>
                 <posx>col-1-begin</posx>
                 <posy>row-5-begin</posy>
                 <control type="panel" id="50">
diff --git a/1080i/MyPics.xml b/1080i/MyPics.xml
index 5ed0b47..69a6973 100644
--- a/1080i/MyPics.xml
+++ b/1080i/MyPics.xml
@@ -10,10 +10,7 @@
             <include>modalDialogContentShift</include>
             <!--Main content listing-->
             <control type="group" id="9999">
-                <animation type="windowopen">
-                    <effect type="fade" start="0" end="100" time="500"/>
-                    <effect type="zoom" center="auto" start="120" end="100" time="300"/>
-                </animation>
+                <include>contentOpen</include>
                 <onleft>9000</onleft>
                 <include>photos</include>
             </control>
diff --git a/1080i/MyPlaylist.xml b/1080i/MyPlaylist.xml
index 5fed307..0067ca0 100644
--- a/1080i/MyPlaylist.xml
+++ b/1080i/MyPlaylist.xml
@@ -26,10 +26,7 @@
             <include>modalDialogContentShift</include>
             <!--Main content listing-->
             <control type="group" id="9999">
-                <animation type="windowopen">
-                    <effect type="fade" start="0" end="100" time="500"/>
-                    <effect type="zoom" center="auto" start="120" end="100" time="300"/>
-                </animation>
+                <include>contentOpen</include>
                 <include>viewMusicPlayList</include>
             </control>
             <!--page scrollbar-->
diff --git a/1080i/MyPrograms.xml b/1080i/MyPrograms.xml
index 5bb6aa5..689ea23 100644
--- a/1080i/MyPrograms.xml
+++ b/1080i/MyPrograms.xml
@@ -14,10 +14,7 @@
             <control type="group" id="9999">
                 <!--source content-->
                 <control type="group">
-                    <animation type="windowopen">
-                        <effect type="fade" start="0" end="100" time="500"/>
-                        <effect type="zoom" center="auto" start="120" end="100" time="300"/>
-                    </animation>
+                    <include>contentOpen</include>
                     <control type="panel" id="50">
                         <posx>78</posx>
                         <posy>row-5-begin</posy>
diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml
index 94c08d8..ac208ed 100644
--- a/1080i/MyVideoNav.xml
+++ b/1080i/MyVideoNav.xml
@@ -2,6 +2,7 @@
 <window>
     <defaultcontrol always="true">9999</defaultcontrol>
     <include>fadeInOut</include>
+    <previouswindow>home</previouswindow>
     <controls>
         <include>globalBackground</include>
         <!--page container group-->
@@ -10,10 +11,7 @@
             <include>modalDialogContentShift</include>
             <!--Main content listing-->
             <control type="group" id="9999">
-                <animation type="windowopen">
-                    <effect type="fade" start="0" end="100" time="500"/>
-                    <effect type="zoom" center="auto" start="120" end="100" time="300"/>
-                </animation>
+                <include>contentOpen</include>
                 <!--source content-->
                 <control type="group" id="9500">
                     <include>movies</include>
@@ -73,7 +71,7 @@
         <include>DebugGrid</include>
         <control type="label">
             <include>WindowID</include>
-            <label>MyVideoNav.xml</label>
+            <label>MyVideoNav.xml $INFO[container.folderpath]</label>
         </control>
     </controls>
 </window>
diff --git a/1080i/SkinSettings.xml b/1080i/SkinSettings.xml
index 441e499..edb1cb5 100644
--- a/1080i/SkinSettings.xml
+++ b/1080i/SkinSettings.xml
@@ -129,6 +129,23 @@
                 <onleft>8000</onleft>
                 <itemgap>0</itemgap>
                 <orientation>vertical</orientation>
+                <control type="button" id="2">
+                    <visible>Container(8000).Hasfocus(1)</visible>
+                    <description>Set home background image directory</description>
+                    <width>14-col</width>
+                    <label>31116</label>
+                    <label2>$INFO[Skin.String(homeBackground)]</label2>
+                    <onclick>Skin.SetPath(homeBackground)</onclick>
+                    <textwidth>8-col</textwidth>
+                </control>
+                <control type="button" id="3">
+                    <visible>Container(8000).Hasfocus(1)</visible>
+                    <description>Reset home background image directory</description>
+                    <width>14-col</width>
+                    <label>31122</label>
+                    <onclick>Skin.Reset(homeBackground)</onclick>
+                    <textwidth>8-col</textwidth>
+                </control>
                 <control type="radiobutton" id="1">
                     <visible>Container(8000).Hasfocus(1)</visible>
                     <description>Reverse power down options</description>
diff --git a/1080i/View_VideoFiles.xml b/1080i/View_VideoFiles.xml
index 4bdd186..72f4943 100644
--- a/1080i/View_VideoFiles.xml
+++ b/1080i/View_VideoFiles.xml
@@ -12,6 +12,7 @@
             <ondown>50</ondown>
             <onup>50</onup>
             <pagecontrol>60</pagecontrol>
+            <onback>home</onback>
             <itemlayout width="24-col" height="2-row">
                 <control type="image">
                     <posx>0</posx>
@@ -31,7 +32,7 @@
                     <colordiffuse>textboxInactive</colordiffuse>
                 </control>
                 <control type="label">
-				    <posx>1-col-indent</posx>
+                    <posx>1-col-indent</posx>
                     <posy>0</posy>
                     <width>22-col-gutter</width>
                     <height>2-row</height>
@@ -78,7 +79,7 @@
                     <colordiffuse>highlight</colordiffuse>
                 </control>
                 <control type="label">
-				    <posx>1-col-indent</posx>
+                    <posx>1-col-indent</posx>
                     <posy>0</posy>
                     <width>22-col-gutter</width>
                     <height>2-row</height>
diff --git a/1080i/custom_menuSelector.xml b/1080i/custom_menuSelector.xml
new file mode 100644
index 0000000..39c3e28
--- /dev/null
+++ b/1080i/custom_menuSelector.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<window type="dialog" id="1107">
+    <onload>Dialog.Close(all,true)</onload>
+    <onload>control.setfocus(9000)</onload>
+    <visible>[Window.IsActive(videos) | window.IsActive(music)] + isempty(container.folderpath)</visible>
+    <controls></controls>
+</window>
\ No newline at end of file
diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml
index 6e7288c..18731df 100644
--- a/1080i/custom_musicPlayerFullscreen.xml
+++ b/1080i/custom_musicPlayerFullscreen.xml
@@ -2,7 +2,7 @@
 <window type="dialog" id="1103">
     <defaultcontrol always="true">9876</defaultcontrol>
     <onunload>activateWindow(music)</onunload>
-    <onunload>control.setfocus(9000)</onunload>
+    <onunload>control.setfocus(50)</onunload>
     <controls>
         <include>globalBackground</include>
         <control type="group">
@@ -13,7 +13,7 @@
                     <posx>0</posx>
                     <posy>0</posy>
                     <include>dimensionsFullscreen</include>
-                    <texture border="0">$INFO[player.art(fanart)]</texture>
+                    <texture fallback="special://skin/extras/backgrounds/music.jpg" border="0">$INFO[player.art(fanart)]</texture>
                     <aspectratio>stretch</aspectratio>
                     <include>kenBurnsey</include>
                     <colordiffuse>44ffffff</colordiffuse>
diff --git a/1080i/custom_recentContent.xml b/1080i/custom_recentContent.xml
index f16eded..56588d9 100644
--- a/1080i/custom_recentContent.xml
+++ b/1080i/custom_recentContent.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window id="1106">
-    <defaultcontrol always="false">9123</defaultcontrol>
+    <defaultcontrol always="true">9000</defaultcontrol>
     <controls>
         <control type="group" id="9999">
             <include>fadeInOut</include>
@@ -52,6 +52,9 @@
                     </control>
                     <include>globalBackground</include>
                     <control type="image">
+                        <animation type="conditional" condition="control.hasfocus(9001)">
+                            <effect type="fade" start="100" end="0" time="200"/>
+                        </animation>
                         <posx>0</posx>
                         <posy>-48</posy>
                         <width>fullscreenWidth</width>
@@ -73,7 +76,7 @@
                     <posx>col-1-begin</posx>
                     <posy>row-8-begin</posy>
                     <control type="label">
-                        <visible>Container(9123).HasFocus(1)</visible>
+                        <visible>Container(9123).HasFocus(1) | Container(9123).HasFocus(6)</visible>
                         <posx>24-col</posx>
                         <posy>0</posy>
                         <width>24-col</width>
@@ -96,6 +99,19 @@
                         <textcolor>66ffffff</textcolor>
                         <shadowcolor>-</shadowcolor>
                         <wrapmultiline>true</wrapmultiline>
+                        <label>[B]$INFO[container(9998).listitem.tvshowtitle][/B][CR]$INFO[container(9998).ListItem.Season,$LOCALIZE[31011], ]$INFO[container(9998).ListItem.Episode,$LOCALIZE[31204], ]</label>
+                    </control>
+                    <control type="label">
+                        <visible>Container(9123).HasFocus(7)</visible>
+                        <posx>24-col</posx>
+                        <posy>0</posy>
+                        <width>24-col</width>
+                        <height>8-row</height>
+                        <align>right</align>
+                        <font>veryLargeLight</font>
+                        <textcolor>66ffffff</textcolor>
+                        <shadowcolor>-</shadowcolor>
+                        <wrapmultiline>true</wrapmultiline>
                         <label>[B]$INFO[container(9998).listitem.tvshowtitle][/B][CR]$INFO[container(9998).ListItem.Property(UnWatchedEpisodes),, $LOCALIZE[31045],]</label>
                     </control>
                     <control type="label">
@@ -115,7 +131,7 @@
             </control>
             <!--content listing-->
             <control type="panel" id="9998">
-                <visible>container(9123).hasfocus(1) | container(9123).hasfocus(2)</visible>
+                <visible>container(9123).hasfocus(1) | container(9123).hasfocus(2) | container(9123).hasfocus(6) | container(9123).hasfocus(7)</visible>
                 <posx>72</posx>
                 <posy>row-20-begin</posy>
                 <width>1848</width>
@@ -392,6 +408,9 @@
                 </focusedlayout>
             </control>
             <control type="list" id="9123">
+                <animation type="conditional" condition="control.hasfocus(9001)">
+                    <effect type="fade" start="100" end="0" time="200"/>
+                </animation>
                 <posx>63</posx>
                 <posy>654</posy>
                 <width>24-col</width>
@@ -449,6 +468,18 @@
                         <property name="textTitle">31178</property>
                         <onclick>noop</onclick>
                     </item>
+                    <item id="6">
+                        <visible>String.IsEqual(skin.string(recentitems),video) + Library.HasContent(movies)</visible>
+                        <label>special://skin/extras/playlists/inprogressMovies.xsp</label>
+                        <property name="textTitle">31132</property>
+                        <onclick>noop</onclick>
+                    </item>
+                    <item id="7">
+                        <visible>String.IsEqual(skin.string(recentitems),video) + Library.HasContent(tvshows)</visible>
+                        <label>special://skin/extras/playlists/inprogressTVShows.xsp</label>
+                        <property name="textTitle">31127</property>
+                        <onclick>noop</onclick>
+                    </item>
                     <item id="3">
                         <visible>String.IsEqual(skin.string(recentitems),music) + Library.HasContent(music)</visible>
                         <label>special://skin/extras/playlists/recentAlbums.xsp</label>
diff --git a/1080i/custom_subtitleMenu.xml b/1080i/custom_subtitleMenu.xml
index b557d7d..06a9ea3 100644
--- a/1080i/custom_subtitleMenu.xml
+++ b/1080i/custom_subtitleMenu.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window type="dialog" id="1104">
     <defaultcontrol always="true">5000</defaultcontrol>
-
     <controls>
         <include>fadeInOut</include>
         <control type="group">
diff --git a/1080i/script-skinshortcuts.xml b/1080i/script-skinshortcuts.xml
index f60ad71..4b55295 100644
--- a/1080i/script-skinshortcuts.xml
+++ b/1080i/script-skinshortcuts.xml
@@ -13,7 +13,7 @@
             </animation>
             <control type="multiimage">
                   <include>dimensionsFullscreen</include>
-                  <imagepath>special://skin/extras/homeBackgrounds</imagepath>
+                  <imagepath>$VAR[homeBackgroundLocation]</imagepath>
                   <timeperimage>45000</timeperimage>
                   <fadetime>1000</fadetime>
                   <pauseatend>10000</pauseatend>
diff --git a/changelog.txt b/changelog.txt
index e9e6b37..9469ccb 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -24,29 +24,17 @@
 
 
 [TODO]
-Video files node onback not working correctly
+Gamepad setup
+
+Add user option: Revise player stop on return
 
 Recent items video: Add in progress videos node
+- check recent episodes
 
 Check all XMLS are present
 
-Fix stop from fullscreen music view & Check that the fanart is working
-
-Music menu: Radio recordings??
-
-Menu overrides: select correct content list
-Make sure default view is a pagewidth single list. Change all views to 50 (except episodes / songs / seasons etc)
-
 Lose .DS_Store (need to do this on the windows box)
 
-Gamepad setup
-
-Pictures section refresh
-
-
-
-Add user option: Revise player stop on return
-
 check all active strings
 
 Screenshots etc
diff --git a/extras/playlists/collage_RandomContent.xsp b/extras/playlists/collage_RandomContent.xsp
deleted file mode 100644
index 36327a1..0000000
--- a/extras/playlists/collage_RandomContent.xsp
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<smartplaylist type="mixed">
-    <name>collage_RandomContent</name>
-    <match>all</match>
-	<rule field="playlist" operator="is">randomAlbums</rule>
-	<rule field="playlist" operator="is">recentMovies</rule>
-    <limit>50</limit>
-    <order direction="ascending">random</order>
-</smartplaylist>
diff --git a/extras/playlists/inprogressMovies.xsp b/extras/playlists/inprogressMovies.xsp
new file mode 100644
index 0000000..281f79d
--- /dev/null
+++ b/extras/playlists/inprogressMovies.xsp
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="movies">
+    <name>In progress movies</name>
+    <match>all</match>
+    <rule field="inprogress" operator="true" />
+    <order direction="descending">lastplayed</order>
+</smartplaylist>
\ No newline at end of file
diff --git a/extras/playlists/inprogressTVShows.xsp b/extras/playlists/inprogressTVShows.xsp
new file mode 100644
index 0000000..5aebef6
--- /dev/null
+++ b/extras/playlists/inprogressTVShows.xsp
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<smartplaylist type="episodes">
+    <name>In progress episodes</name>
+    <match>all</match>
+    <rule field="inprogress" operator="true" />
+    <order direction="descending">lastplayed</order>
+</smartplaylist>
\ No newline at end of file
diff --git a/language/English/strings.po b/language/English/strings.po
index e77ba40..fbff4ec 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -482,7 +482,7 @@ msgid "Video decoder"
 msgstr ""
 
 msgctxt "#31116"
-msgid "Set Homescreen Background"
+msgid "Set Homescreen Background directory"
 msgstr ""
 
 msgctxt "#31117"
@@ -505,6 +505,10 @@ msgctxt "#31121"
 msgid "My Kodi"
 msgstr ""
 
+msgctxt "#31122"
+msgid "Reset home backgrounds to default"
+msgstr ""
+
 msgctxt "#31123"
 msgid "Current Playlist"
 msgstr ""
@@ -517,10 +521,18 @@ msgctxt "#31126"
 msgid "Settings level"
 msgstr ""
 
+msgctxt "#31127"
+msgid "Resume TV"
+msgstr ""
+
 msgctxt "#31131"
 msgid "Switch to this profile now"
 msgstr ""
 
+msgctxt "#31132"
+msgid "Resume Movie"
+msgstr ""
+
 msgctxt "#31133"
 msgid "Playlist shuffled"
 msgstr ""
@@ -622,7 +634,7 @@ msgid "Options"
 msgstr ""
 
 msgctxt "#31180"
-msgid "Recent Albums"
+msgid "New Albums"
 msgstr ""
 
 msgctxt "#31181"