diff --git a/1080i/Home.xml b/1080i/Home.xml
index 5f28b04..7ebe03b 100644
--- a/1080i/Home.xml
+++ b/1080i/Home.xml
@@ -16,6 +16,7 @@
 				<randomize>true</randomize>
 				<loop>yes</loop>
 				<aspectratio>scale</aspectratio>
+				<colordiffuse>99ffffff</colordiffuse>
 			</control>
 			<control type="image">
 				<include>dimensionsFullscreen</include>
@@ -44,10 +45,10 @@
 					<colordiffuse>overlay</colordiffuse>
 					<aspectratio>stretch</aspectratio>
 				</control>
-				<control type="label">
-					<posx>0</posx>
+				<control type="textbox">
+					<posx>12</posx>
 					<posy>0</posy>
-					<width>4-col-gutter</width>
+					<width>252</width>
 					<height>3-row</height>
 					<font>dialogTitle</font>
 					<wrapmultiline>true</wrapmultiline>
@@ -68,15 +69,15 @@
 					<colordiffuse>highlight</colordiffuse>
 					<aspectratio>stretch</aspectratio>
 				</control>
-				<control type="label">
-					<posx>0</posx>
+				<control type="textbox">
+					<posx>12</posx>
 					<posy>0</posy>
-					<width>4-col-gutter</width>
+					<width>252</width>
 					<height>3-row</height>
 					<font>dialogTitle</font>
 					<wrapmultiline>true</wrapmultiline>
-					<align>center</align>
 					<aligny>center</aligny>
+					<align>center</align>
 					<textcolor>textActive</textcolor>
 					<shadowcolor>-</shadowcolor>
 					<label>[CAPITALIZE]$INFO[ListItem.label][/CAPITALIZE]</label>
@@ -152,12 +153,13 @@
             <posy>row-8-begin</posy>
             <control type="label">
                 <posx>0</posx>
-                <posy>-24</posy>
+                <posy>-36</posy>
                 <width>24-col</width>
                 <height>2-row</height>
                 <align>center</align>
-                <font>largeStrong</font>
+                <font>veryLarge</font>
                 <textcolor>textActive</textcolor>
+				<shadowcolor>44000000</shadowcolor>
                 <label>$INFO[System.Time]</label>
             </control>
             <control type="label">
@@ -168,6 +170,7 @@
                 <font>regular</font>
                 <align>center</align>
                 <textcolor>textActive</textcolor>
+				<shadowcolor>44000000</shadowcolor>
                 <label>$INFO[System.Date(DDD)] [B]$INFO[System.Date(dd)][/B] $INFO[System.Date(MMM)]</label>
             </control>
         </control>
diff --git a/1080i/Includes.xml b/1080i/Includes.xml
index 3d3ca5c..91ecbb8 100644
--- a/1080i/Includes.xml
+++ b/1080i/Includes.xml
@@ -68,11 +68,11 @@
             <include>kenBurnsey</include>
         </control>
         <control type="image">
-            <visible>!Integer.IsGreater(container(99999).numitems,0) | Skin.HasSetting(disableExtendedFanart)</visible>
+            <visible>!Integer.IsGreater(container(99999).numitems,0) | Skin.HasSetting(disableExtendedFanart) | ListItem.IsParentFolder</visible>
             <posx>0</posx>
             <posy>0</posy>
             <include>dimensionsFullscreen</include>
-            <texture>$INFO[ListItem.Art(fanart)]</texture>
+            <texture>$INFO[container.Art(fanart)]</texture>
             <colordiffuse>ffffffff</colordiffuse>
             <aspectratio>stretch</aspectratio>
             <include>kenBurnsey</include>
@@ -158,7 +158,7 @@
             <aspectratio>stretch</aspectratio>
         </control>
     </include>
-	<!--page heaser-->
+	<!--page header-->
 	<include name="pageHeader">
 		<control type="group">
 			<posx>col-1-begin</posx>
diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml
index 62bcde3..8d0b504 100644
--- a/1080i/Includes_variables.xml
+++ b/1080i/Includes_variables.xml
@@ -3,7 +3,6 @@
 <includes>
     <!--folder titles-->
     <variable name="listTitle">
-        <value condition="Window.isactive(1106)">$LOCALIZE[31012]</value>
         <value condition="Window.isactive(Videos) + Container.Content(musicvideos)">$LOCALIZE[20389] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE]</value>
         <value condition="Window.isactive(Videos) + [Container.Content(movies) | container.content(tvshows)] + Substring(Container.folderpath,special://profile/playlists/video)">[CAPITALIZE]$INFO[container.foldername][/CAPITALIZE] [LOWERCASE][COLOR highlight]$LOCALIZE[31054] $INFO[container.sortmethod] $INFO[Container.SortOrder,(,)][/COLOR][/LOWERCASE]</value>
         <value condition="Window.isactive(Videos) + Substring(Container.folderpath,plugin)">$INFO[container.foldername] $INFO[ListItem.TVShowTitle,- ,] $INFO[ListItem.season,$LOCALIZE[31011] ,]</value>
@@ -22,11 +21,17 @@
         <value condition="Window.isactive(Music) + !container.content(genres) + SubString(container.folderpath,musicdb://genres)">$LOCALIZE[31199] [COLOR highlight]$INFO[container.foldername][/COLOR]</value>
         <value condition="Window.isactive(Music) + !isEmpty(container.foldername)">$INFO[container.foldername]</value>
         <value condition="Window.isactive(Music) + isEmpty(container.foldername)">$LOCALIZE[31053]</value>
-    </variable>
+    	<value condition="Window.isactive(Weather)">$LOCALIZE[31197]</value>
+		<value condition="Window.isactive(TVchannels) | Window.isactive(TVGuide)">$LOCALIZE[31006] [COLOR highlight]$LOCALIZE[31078][/COLOR]</value>
+		<value condition="Window.isactive(RadioChannels)">$LOCALIZE[31164] [COLOR highlight]$LOCALIZE[31078][/COLOR]</value>
+		<value condition="Window.isactive(TVRecordings)">$LOCALIZE[31006] [COLOR highlight]$LOCALIZE[31165][/COLOR]</value>
+	</variable>
     <variable name="listSubTitle">
         <value condition="Window.isactive(Videos)">$INFO[container.Numitems,, $LOCALIZE[31014]] $VAR[unwatchedOnly]</value>
-        <value condition="Window.isactive(1106)">$INFO[Window(Home).Property(Movies.Count),, $LOCALIZE[20342] • ]$INFO[Window(Home).Property(TVShows.Count),, $LOCALIZE[20343] • ]$INFO[Window(Home).Property(Music.AlbumsCount),, $LOCALIZE[132]]</value>
         <value condition="Window.isactive(Music)">$INFO[container.Numitems,, $LOCALIZE[31014]]</value>
+		<value condition="Window.isactive(Weather)">$LOCALIZE[31212] $INFO[Window.Property(WeatherProvider)]</value>
+		<value condition="Window.isactive(TVchannels) | Window.isactive(RadioChannels) | Window.isactive(TVGuide)">$INFO[Pvr.BackendChannels] $LOCALIZE[31017] ($INFO[control.getlabel(29)])</value>
+		<value condition="Window.isactive(TVRecordings)">$INFO[container.numitems] $LOCALIZE[31165]</value>
     </variable>
     <!--list view item detail / subheader-->
     <variable name="itemDetail">
diff --git a/1080i/MyMusicNav.xml b/1080i/MyMusicNav.xml
index a39a8dc..58e0644 100644
--- a/1080i/MyMusicNav.xml
+++ b/1080i/MyMusicNav.xml
@@ -28,8 +28,8 @@
                 <visible>Control.IsVisible(60)</visible>
                 <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(8000).hasfocus">conditional</animation>
                 <control type="scrollbar" id="60">
-                    <posx>52r</posx>
-                    <posy>row-6-begin</posy>
+                    <posx>54r</posx>
+                    <posy>row-8-begin</posy>
                     <height>20-row</height>
                     <onleft>9999</onleft>
                     <onback>9999</onback>
diff --git a/1080i/MyPVRChannels.xml b/1080i/MyPVRChannels.xml
index 800aa96..2ee2838 100644
--- a/1080i/MyPVRChannels.xml
+++ b/1080i/MyPVRChannels.xml
@@ -38,6 +38,9 @@
             <!--page header-->
             <control type="group">
 				<include>pageHeader</include>    
+            </control>
+			<control type="label" id="29">
+			     <visible>false</visible>
             </control>
         </control>
         <!--mini window-->
diff --git a/1080i/MyPVRGuide.xml b/1080i/MyPVRGuide.xml
index 9a41512..51b8710 100644
--- a/1080i/MyPVRGuide.xml
+++ b/1080i/MyPVRGuide.xml
@@ -145,6 +145,9 @@
             <!--page header-->
             <control type="group">
 				<include>pageHeader</include>    
+            </control>
+			<control type="label" id="29">
+			     <visible>false</visible>
             </control>
         </control>
         <!--mini window-->
diff --git a/1080i/MyWeather.xml b/1080i/MyWeather.xml
index 156ae0d..c43ab82 100644
--- a/1080i/MyWeather.xml
+++ b/1080i/MyWeather.xml
@@ -19,32 +19,10 @@
             <colordiffuse>ffffffff</colordiffuse>
             <aspectratio>stretch</aspectratio>
         </control>
-        <!--Folder titles-->
+		<!--page header-->
         <control type="group">
-            <posx>0</posx>
-            <posy>0</posy>
-            <!--source title-->
-            <control type="label">
-                <posx>col-1-begin</posx>
-                <posy>row-1-begin</posy>
-                <width>14-col</width>
-                <font>pageTitle</font>
-                <label>31197</label>
-                <textcolor>textActive</textcolor>
-            </control>
-            <!--source subtitle-->
-            <control type="label">
-                <posx>col-1-begin</posx>
-                <posy>96</posy>
-                <width>auto</width>
-                <font>pageSubTitle</font>
-                <label>$LOCALIZE[31212] $INFO[Window.Property(WeatherProvider)]</label>
-                <textcolor>textActive</textcolor>
-            </control>
-            <!--dateTime-->
-            <include>dateTime</include>
+			<include>pageHeader</include>    
         </control>
-
         <control type="group">
             <posx>col-1-begin</posx>
             <posy>row-5-begin</posy>
diff --git a/1080i/View_Albums.xml b/1080i/View_Albums.xml
index 22a194f..c11b83b 100644
--- a/1080i/View_Albums.xml
+++ b/1080i/View_Albums.xml
@@ -20,26 +20,26 @@
                 <ondown>9998</ondown>
                 <onback>9000</onback>
                 <orientation>horizontal</orientation>
-                <itemlayout width="228" height="2-row">
+                <itemlayout width="234" height="2-row">
                     <control type="label">
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>228</width>
+                        <width>234</width>
                         <height>2-row</height>
-                        <font>itemTitle</font>
+                        <font>pageSubtitle</font>
                         <aligny>center</aligny>
                         <textcolor>textDisabled</textcolor>
                         <shadowcolor>-</shadowcolor>
                         <label>$INFO[ListItem.property(textTitle)]</label>
                     </control>
                 </itemlayout>
-                <focusedlayout width="228" height="2-row">
+                <focusedlayout width="234" height="2-row">
                     <control type="label">
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>228</width>
+                        <width>234</width>
                         <height>2-row</height>
-                        <font>itemTitle</font>
+                        <font>pageSubtitle</font>
                         <aligny>center</aligny>
                         <textcolor>textActive</textcolor>
                         <shadowcolor>-</shadowcolor>
@@ -71,7 +71,7 @@
                 <width>24-col</width>
                 <height>11-row</height>
 				<onup>9123</onup>
-                <ondown>50</ondown>
+                <ondown>Control.SetFocus(50,0)</ondown>
                 <onleft>9000</onleft>
                 <onback>9000</onback>
                 <orientation>horizontal</orientation>
@@ -163,7 +163,7 @@
                 <width>12-col</width>
                 <height>2-row</height>
                 <aligny>center</aligny>
-                <font>itemTitle</font>
+                <font>pageSubtitle</font>
                 <textcolor>textActive</textcolor>
                 <label>$LOCALIZE[31223]</label>
             </control>
diff --git a/1080i/View_ArtistAlbums.xml b/1080i/View_ArtistAlbums.xml
index 29198fe..d84b097 100644
--- a/1080i/View_ArtistAlbums.xml
+++ b/1080i/View_ArtistAlbums.xml
@@ -31,7 +31,7 @@
 						<posy>-12</posy>
 						<width>16-col</width>
 						<height>3-row</height>
-						<font>veryLarge</font>
+						<font>veryLargeLight</font>
 						<textcolor>66ffffff</textcolor>
 						<wrapmultiline>true</wrapmultiline>
 						<shadowcolor>-</shadowcolor>
@@ -77,7 +77,7 @@
 							<posy>3-row</posy>
 							<width>228</width>
 							<height>6-row</height>
-							<font>largeStrong</font>
+							<font>largeLight</font>
 							<wrapmultiline>true</wrapmultiline>
 							<textcolor>textActive</textcolor>
 							<label>$INFO[ListItem.label]</label>
@@ -134,7 +134,7 @@
 								<posy>3-row</posy>
 								<width>228</width>
 								<height>6-row</height>
-								<font>largeStrong</font>
+								<font>largeLight</font>
 								<wrapmultiline>true</wrapmultiline>
 								<textcolor>textActive</textcolor>
 								<label>$INFO[ListItem.label]</label>
diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml
index 629cb1e..c3ab8f5 100644
--- a/1080i/View_Movies.xml
+++ b/1080i/View_Movies.xml
@@ -2,29 +2,29 @@
 <includes>
 	<include name="movies">
 		<control type="group">
-			<control type="group" id="9125">
+			<control type="group" id="9101">
 				<visible>$EXP[isMovie]</visible>
-				<animation type="Conditional" condition="!controlgroup(9125).hasfocus">
+				<animation type="Conditional" condition="!controlgroup(9101).hasfocus">
 	                <effect type="fade" start="100" end="0" time="100"/>
 	            </animation>
-				<animation type="Conditional" condition="controlgroup(9125).hasfocus">
+				<animation type="Conditional" condition="controlgroup(9101).hasfocus">
 	                <effect type="fade" start="0" end="100" time="300" delay="300"/>
 	            </animation>
 				<!--quick link selector-->
-				<control type="list" id="9123">
+				<control type="list" id="9102">
 	                <posx>col-1-begin</posx>
 	                <posy>row-5-begin</posy>
 	                <width>24-col</width>
 	                <height>2-row</height>
 	                <onleft>9000</onleft>
-	                <ondown>9998</ondown>
+	                <ondown>9103</ondown>
 	                <onback>9000</onback>
 	                <orientation>horizontal</orientation>
-	                <itemlayout width="228" height="2-row">
+	                <itemlayout width="4-col-gutter" height="2-row">
 	                    <control type="label">
 	                        <posx>0</posx>
 	                        <posy>0</posy>
-	                        <width>228</width>
+	                        <width>4-col-gutter</width>
 	                        <height>2-row</height>
 	                        <font>itemTitle</font>
 	                        <aligny>center</aligny>
@@ -33,11 +33,11 @@
 	                        <label>$INFO[ListItem.property(textTitle)]</label>
 	                    </control>
 	                </itemlayout>
-	                <focusedlayout width="228" height="2-row">
+	                <focusedlayout width="4-col-gutter" height="2-row">
 	                    <control type="label">
 	                        <posx>0</posx>
 	                        <posy>0</posy>
-	                        <width>228</width>
+	                        <width>4-col-gutter</width>
 	                        <height>2-row</height>
 	                        <font>itemTitle</font>
 	                        <aligny>center</aligny>
@@ -60,17 +60,17 @@
 	                </content>
 	            </control>
 				<!--quick links-->			
-				<control type="panel" id="9998">
-	                <posx>col-1-begin</posx>
+				<control type="panel" id="9103">
+	                <posx>90</posx>
 	                <posy>row-7-begin</posy>
-	                <width>24-col</width>
+	                <width>1734</width>
 	                <height>11-row</height>
-					<onup>9123</onup>
-	                <ondown>50</ondown>
+					<onup>9102</onup>
+	                <ondown>Control.SetFocus(50,0)</ondown>
 	                <onleft>9000</onleft>
 	                <onback>9000</onback>
 	                <orientation>horizontal</orientation>
-	                <itemlayout width="597" height="5-col-gutter">
+	                <itemlayout width="598" height="5-col-gutter">
 	                    <control type="image">
 	                        <posx>0</posx>
 	                        <posy>0</posy>
@@ -104,7 +104,7 @@
 	                        <label>[B]$INFO[ListItem.Title][/B][CR][COLOR textDisabled]$INFO[ListItem.year][/COLOR]</label>
 	                    </control>      
 	                </itemlayout>
-	                <focusedlayout width="597" height="5-col-gutter">
+	                <focusedlayout width="598" height="5-col-gutter">
 	                    <control type="group">
 	                        <include>focusThumb</include>
 	                        <control type="image">
@@ -141,16 +141,16 @@
 		                    </control>
 	                    </control>
 	                </focusedlayout>
-					<content>$INFO[control.getlabel(9123)]</content>
+					<content>$INFO[control.getlabel(9102)]</content>
 	            </control>
 			</control>
 			<!--all movies-->
-			<control type="group" id="9124">
-				<animation type="Conditional" condition="controlgroup(9124).hasfocus | controlgroup(8000).hasfocus | controlgroup(9000).hasfocus">
+			<control type="group" id="9104">
+				<animation type="Conditional" condition="controlgroup(9104).hasfocus | controlgroup(8000).hasfocus | controlgroup(9000).hasfocus">
 	                <effect type="slide" start="0,0" end="0,-504" tween="sine" time="400"/>
 	            </animation>
 				<control type="label">
-	                <visible>!controlgroup(9000).hasfocus + !$EXP[isTVEpisode]</visible>
+					<visible>!controlgroup(9000).hasfocus + !$EXP[isTVShow] + $EXP[isMovie]</visible>
 	                <posx>col-1-begin</posx>
 	                <posy>row-19-begin</posy>
 	                <width>12-col</width>
@@ -165,11 +165,11 @@
 					<posx>90</posx>
 					<posy>row-21-begin</posy>
 					<width>1800</width>
-					<height>25-row</height>
+					<height>22-row</height>
 					<onleft>9000</onleft>
 					<onright>60</onright>
 					<ondown>50</ondown>
-					<onup>9125</onup>
+					<onup>9103</onup>
 					<onback>9000</onback>
 					<pagecontrol>60</pagecontrol>
 					<scrolltime tween="cubic" easing="out">600</scrolltime>
diff --git a/1080i/View_Seasons.xml b/1080i/View_Seasons.xml
index 78fa3e3..7883550 100644
--- a/1080i/View_Seasons.xml
+++ b/1080i/View_Seasons.xml
@@ -23,16 +23,18 @@
                 <control type="group">
                     <visible>!Substring(Container.folderpath,plugin)</visible>
                     <posx>col-1-begin</posx>
-                    <posy>row-2-begin</posy>
-                    <control type="label">
-                        <posx>0</posx>
-                        <posy>11-row</posy>
+                    <posy>row-8-begin</posy>
+					<control type="label">
+                        <posx>24-col</posx>
+                        <posy>0</posy>
                         <width>24-col</width>
-                        <height>2-row</height>
-                        <font>large</font>
-                        <textcolor>textActive</textcolor>
+                        <height>8-row</height>
+                        <align>right</align>
+                        <font>veryLargeLight</font>
+                        <textcolor>66ffffff</textcolor>
                         <shadowcolor>-</shadowcolor>
-                        <label>[B]$INFO[container.foldername][/B] [COLOR highlight]$INFO[listitem.genre][/COLOR]</label>
+                        <wrapmultiline>true</wrapmultiline>
+                        <label>[B]$INFO[container.foldername][/B]</label>
                     </control>
                 </control>
                 <!--overlay-->
@@ -55,9 +57,9 @@
                 <control type="panel" id="58">
                     <visible>$EXP[isSeason]</visible>
                     <posx>col-1-begin</posx>
-                    <posy>624</posy>
-                    <width>1836</width>
-                    <height>11-row</height>
+                    <posy>row-16-begin</posy>
+                    <width>1860</width>
+                    <height>13-row</height>
                     <onleft>9000</onleft>
                     <onright>58</onright>
                     <orientation>horizontal</orientation>
@@ -68,10 +70,20 @@
                             <width>4-col-gutter</width>
                             <height>396</height>
                             <aspectratio>stretch</aspectratio>
-                            <texture border="6">DefaultPoster.png</texture>
-                            <bordertexture border="6" colordiffuse="overlay">colors/black.png</bordertexture>
+                            <texture border="6">colors/white.png</texture>
+                            <bordertexture border="6" colordiffuse="22FFFFFF">colors/black.png</bordertexture>
                             <bordersize>6</bordersize>
-                            <colordiffuse>ff777777</colordiffuse>
+                            <colordiffuse>highlight</colordiffuse>
+                        </control>
+						<control type="image">
+                            <posx>0</posx>
+                            <posy>0</posy>
+                            <width>4-col-gutter</width>
+                            <height>396</height>
+                            <aspectratio>stretch</aspectratio>
+                            <texture>$INFO[ListItem.art(poster)]</texture>
+                            <bordersize>6</bordersize>
+                            <colordiffuse>ffffffff</colordiffuse>
                         </control>
                         <control type="label">
                             <visible>ListItem.IsParentFolder</visible>
@@ -81,59 +93,44 @@
                             <height>2-row</height>
                             <align>center</align>
                             <aligny>center</aligny>
-                            <font>regularStrong</font>
-                            <textcolor>textDisabled</textcolor>
+                            <font>largeStrong</font>
+                            <textcolor>textActive</textcolor>
                             <label>..</label>
                         </control>
                         <control type="label">
                             <visible>!controlgroup(9000).hasfocus + !ListItem.IsParentFolder</visible>
                             <posx>12</posx>
-                            <posy>4-row</posy>
+                            <posy>384</posy>
                             <width>240</width>
                             <height>2-row</height>
-                            <align>center</align>
                             <aligny>center</aligny>
-                            <font>regularStrong</font>
-                            <textcolor>textDisabled</textcolor>
-                            <label fallback="31190">$INFO[ListItem.season,$LOCALIZE[31011] ]</label>
-                        </control>
-                        <control type="label">
-                            <visible>!controlgroup(9000).hasfocus</visible>
-                            <posx>12</posx>
-                            <posy>5-row</posy>
-                            <width>240</width>
-                            <height>2-row</height>
-                            <align>center</align>
-                            <aligny>center</aligny>
-                            <font>buttonTitle</font>
-                            <textcolor>textDisabled</textcolor>
-                            <label>$VAR[itemDetail]</label>
-                        </control>
-                        <control type="image">
-                            <posx>0</posx>
-                            <posy>0</posy>
-                            <width>4-col-gutter</width>
-                            <height>396</height>
-                            <aspectratio>stretch</aspectratio>
-                            <texture border="6">$INFO[ListItem.thumb]</texture>
-                            <bordertexture border="6" colordiffuse="11FFFFFF">colors/black.png</bordertexture>
-                            <bordersize>6</bordersize>
-                            <colordiffuse>ffffffff</colordiffuse>
+                            <font>thumbTitle</font>
+                            <textcolor>textActive</textcolor>
+                            <label fallback="31190">[B]$INFO[ListItem.label][/B][CR][COLOR textInactive]$VAR[itemDetail][/COLOR]</label>
                         </control>
                     </itemlayout>
                     <focusedlayout width="4-col" height="391">
                         <control type="group">
                             <include>focusThumb</include>
+							<control type="image">
+		                        <posx>0</posx>
+		                        <posy>0</posy>
+		                        <width>4-col-gutter</width>
+		                        <height>396</height>
+		                        <aspectratio>stretch</aspectratio>
+		                        <texture border="6">colors/white.png</texture>
+		                        <bordertexture border="6" colordiffuse="FFFFFFFF">colors/white.png</bordertexture>
+		                        <bordersize>6</bordersize>
+		                        <colordiffuse>highlight</colordiffuse>
+		                    </control>
                             <control type="image">
                                 <posx>0</posx>
                                 <posy>0</posy>
                                 <width>4-col-gutter</width>
                                 <height>396</height>
                                 <aspectratio aligny="top">scale</aspectratio>
-                                <texture fallback="DefaultPoster.png" border="6">$INFO[ListItem.thumb]</texture>
-                                <bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
+                                <texture>$INFO[ListItem.art(poster)]</texture>
                                 <bordersize>6</bordersize>
-                                <colordiffuse>ff666666</colordiffuse>
                             </control>
                             <control type="label">
                                 <visible>ListItem.IsParentFolder</visible>
@@ -143,33 +140,21 @@
                                 <height>2-row</height>
                                 <align>center</align>
                                 <aligny>center</aligny>
-                                <font>regularStrong</font>
+                                <font>largeStrong</font>
                                 <textcolor>textActive</textcolor>
                                 <label>..</label>
                             </control>
                             <control type="label">
-                                <visible>!controlgroup(9000).hasfocus + !ListItem.IsParentFolder</visible>
-                                <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 fallback="31190">$INFO[ListItem.season,$LOCALIZE[31011] ]</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>$VAR[itemDetail]</label>
-                            </control>
+	                            <visible>!controlgroup(9000).hasfocus + !ListItem.IsParentFolder</visible>
+	                            <posx>12</posx>
+	                            <posy>384</posy>
+	                            <width>240</width>
+	                            <height>2-row</height>
+	                            <aligny>center</aligny>
+	                            <font>thumbTitle</font>
+	                            <textcolor>textActive</textcolor>
+	                            <label fallback="31190">[B]$INFO[ListItem.label][/B][CR][COLOR textInactive]$VAR[itemDetail][/COLOR]</label>
+	                        </control>
                         </control>
                     </focusedlayout>
                 </control>
diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml
index e868261..5f3cfcb 100644
--- a/1080i/View_TVShows.xml
+++ b/1080i/View_TVShows.xml
@@ -2,29 +2,29 @@
 <includes>
 	<include name="tvshows">
 		<control type="group">
-			<control type="group" id="9125">
+			<control type="group" id="9201">
 				<visible>$EXP[isTVShow]</visible>
-				<animation type="Conditional" condition="!controlgroup(9125).hasfocus">
+				<animation type="Conditional" condition="!controlgroup(9201).hasfocus">
 	                <effect type="fade" start="100" end="0" time="100"/>
 	            </animation>
-				<animation type="Conditional" condition="controlgroup(9125).hasfocus">
+				<animation type="Conditional" condition="controlgroup(9201).hasfocus">
 	                <effect type="fade" start="0" end="100" time="300" delay="300"/>
 	            </animation>
 				<!--quick link selector-->
-				<control type="list" id="9126">
+				<control type="list" id="9202">
 	                <posx>col-1-begin</posx>
 	                <posy>row-5-begin</posy>
 	                <width>24-col</width>
 	                <height>2-row</height>
 	                <onleft>9000</onleft>
-	                <ondown>9998</ondown>
+	                <ondown>9203</ondown>
 	                <onback>9000</onback>
 	                <orientation>horizontal</orientation>
-	                <itemlayout width="228" height="2-row">
+	                <itemlayout width="4-col-gutter" height="2-row">
 	                    <control type="label">
 	                        <posx>0</posx>
 	                        <posy>0</posy>
-	                        <width>228</width>
+	                        <width>4-col-gutter</width>
 	                        <height>2-row</height>
 	                        <font>itemTitle</font>
 	                        <aligny>center</aligny>
@@ -33,11 +33,11 @@
 	                        <label>$INFO[ListItem.property(textTitle)]</label>
 	                    </control>
 	                </itemlayout>
-	                <focusedlayout width="228" height="2-row">
+	                <focusedlayout width="4-col-gutter" height="2-row">
 	                    <control type="label">
 	                        <posx>0</posx>
 	                        <posy>0</posy>
-	                        <width>228</width>
+	                        <width>4-col-gutter</width>
 	                        <height>2-row</height>
 	                        <font>itemTitle</font>
 	                        <aligny>center</aligny>
@@ -60,17 +60,17 @@
 	                </content>
 	            </control>
 				<!--quick links-->			
-				<control type="panel" id="9998">
-	                <posx>col-1-begin</posx>
+				<control type="panel" id="9203">
+	                <posx>90</posx>
 	                <posy>row-7-begin</posy>
-	                <width>24-col</width>
+	                <width>1734</width>
 	                <height>11-row</height>
-					<onup>9126</onup>
-	                <ondown>50</ondown>
+					<onup>9202</onup>
+	                <ondown>Control.SetFocus(50,0)</ondown>
 	                <onleft>9000</onleft>
 	                <onback>9000</onback>
 	                <orientation>horizontal</orientation>
-	                <itemlayout width="597" height="5-col-gutter">
+	                <itemlayout width="598" height="5-col-gutter">
 	                    <control type="image">
 	                        <posx>0</posx>
 	                        <posy>0</posy>
@@ -101,10 +101,10 @@
 	                        <aligny>center</aligny>
 	                        <font>thumbTitle</font>
 	                        <textcolor>textActive</textcolor>
-	                        <label>[B]$INFO[ListItem.Title][/B][CR][COLOR textDisabled]$INFO[ListItem.Season,$LOCALIZE[31011] , ]$INFO[ListItem.Episode,$LOCALIZE[31204] ,:][/COLOR] $INFO[ListItem.label]</label>
+	                        <label>[B]$INFO[ListItem.Title][/B][CR][COLOR textDisabled]$INFO[ListItem.Season,$LOCALIZE[31011] , ]$INFO[ListItem.Episode,$LOCALIZE[31204] ,:][/COLOR]</label>
 	                    </control>      
 	                </itemlayout>
-	                <focusedlayout width="597" height="5-col-gutter">
+	                <focusedlayout width="598" height="5-col-gutter">
 	                    <control type="group">
 	                        <include>focusThumb</include>
 	                        <control type="image">
@@ -137,21 +137,21 @@
 		                        <aligny>center</aligny>
 		                        <font>thumbTitle</font>
 		                        <textcolor>textActive</textcolor>
-		                        <label>[B]$INFO[ListItem.Title][/B][CR][COLOR textDisabled]$INFO[ListItem.Season,$LOCALIZE[31011] , ]$INFO[ListItem.Episode,$LOCALIZE[31204] ,:][/COLOR] $INFO[ListItem.label]</label>
+		                        <label>[B]$INFO[ListItem.Title][/B][CR][COLOR textDisabled]$INFO[ListItem.Season,$LOCALIZE[31011] , ]$INFO[ListItem.Episode,$LOCALIZE[31204] ,:][/COLOR]</label>
 		                    </control>
 	                    </control>
 	                </focusedlayout>
-					<content>$INFO[control.getlabel(9126)]</content>
+					<content>$INFO[control.getlabel(9202)]</content>
 	            </control>
 			</control>
 		</control>
 		<!--all TVShows-->
-		<control type="group" id="9124">
-			<animation type="Conditional" condition="controlgroup(9124).hasfocus | controlgroup(8000).hasfocus | controlgroup(9000).hasfocus">
+		<control type="group" id="9204">
+			<animation type="Conditional" condition="controlgroup(9204).hasfocus | controlgroup(8000).hasfocus | controlgroup(9000).hasfocus">
                 <effect type="slide" start="0,0" end="0,-504" tween="sine" time="400"/>
             </animation>
 			<control type="label">
-                <visible>!controlgroup(9000).hasfocus + $EXP[isTVShow]</visible>
+                <visible>!controlgroup(9000).hasfocus + $EXP[isTVShow] + !$EXP[isMovie]</visible>
                 <posx>col-1-begin</posx>
                 <posy>row-19-begin</posy>
                 <width>12-col</width>
@@ -162,15 +162,15 @@
                 <label>$LOCALIZE[31225]</label>
             </control>
 			<control type="panel" id="50">
-				<visible>$EXP[isTVShow]</visible>
+				<visible>$EXP[isTVShow] + !$EXP[isMovie]</visible>
 				<posx>90</posx>
 				<posy>row-21-begin</posy>
 				<width>1800</width>
-				<height>25-row</height>
+				<height>22-row</height>
 				<onleft>9000</onleft>
 				<onright>60</onright>
 				<ondown>50</ondown>
-				<onup>9125</onup>
+				<onup>9203</onup>
 				<onback>9000</onback>
 				<pagecontrol>60</pagecontrol>
 				<scrolltime tween="cubic" easing="out">600</scrolltime>
diff --git a/changelog.txt b/changelog.txt
index d4d060f..199b28f 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,6 +1,10 @@
 **Changelog**
 
 ***TESTING BRANCH***
+DONE - set ondown in movie view etc to select first item in grid
+- recent tvshow episode listing not working 
+
+- Add progress bar to resumable content
 
 [V1.2.4]
 - [UPDATED] French language file
diff --git a/extras/homeBackgrounds/18225015035_f4e965f4b7_k.jpg b/extras/homeBackgrounds/18225015035_f4e965f4b7_k.jpg
deleted file mode 100644
index 038e6a6..0000000
Binary files a/extras/homeBackgrounds/18225015035_f4e965f4b7_k.jpg and /dev/null differ
diff --git a/extras/homeBackgrounds/1k5qq4yqm0g-mark-basarab.jpg b/extras/homeBackgrounds/1k5qq4yqm0g-mark-basarab.jpg
deleted file mode 100644
index a819a37..0000000
Binary files a/extras/homeBackgrounds/1k5qq4yqm0g-mark-basarab.jpg and /dev/null differ
diff --git a/extras/homeBackgrounds/cb1myaiclhy-jason-chen.jpg b/extras/homeBackgrounds/cb1myaiclhy-jason-chen.jpg
deleted file mode 100644
index 37a9b80..0000000
Binary files a/extras/homeBackgrounds/cb1myaiclhy-jason-chen.jpg and /dev/null differ
diff --git a/language/English/strings.po b/language/English/strings.po
index 380a774..cc4e56d 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -534,7 +534,7 @@ msgid "Settings level"
 msgstr ""
 
 msgctxt "#31127"
-msgid "Resume TV"
+msgid "Continue Watching"
 msgstr ""
 
 msgctxt "#31128"
@@ -554,7 +554,7 @@ msgid "Switch to this profile now"
 msgstr ""
 
 msgctxt "#31132"
-msgid "Resume Movie"
+msgid "Continue Watching"
 msgstr ""
 
 msgctxt "#31133"
diff --git a/shortcuts/musicsubmenu.DATA.xml b/shortcuts/musicsubmenu.DATA.xml
index 70a9d71..a7e3c4f 100644
--- a/shortcuts/musicsubmenu.DATA.xml
+++ b/shortcuts/musicsubmenu.DATA.xml
@@ -8,13 +8,6 @@
         <thumb />
         <action>activateWindow(1103)</action>
     </shortcut>
-    <shortcut>
-        <label>31147</label>
-        <label2>32034</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>RunScript(script.globalsearch)</action>
-    </shortcut>
     <shortcut>
         <visible>Library.HasContent(Music)</visible>
         <label>31031</label>
diff --git a/shortcuts/overrides.xml b/shortcuts/overrides.xml
index e429906..08ffb65 100644
--- a/shortcuts/overrides.xml
+++ b/shortcuts/overrides.xml
@@ -1,20 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <overrides>
-    <doNotShareMenu />
-
-    <override action="RunScript(script.globalsearch)">
-        <condition>!system.hasaddon(script.globalsearch)</condition>
-        <action>InstallAddon(script.globalsearch)</action>
-        <action>InstallAddon(plugin.program.autocompletion)</action>
-    </override>
-
-    <override action="RunScript(script.globalsearch)">
-        <condition>system.hasaddon(script.globalsearch)</condition>
-        <action>::ACTION::</action>
-    </override>
-
-    <groupoverride group="videosubmenu" condition="true">control.setfocus(9999)</groupoverride>
-    <groupoverride group="musicsubmenu" condition="true">control.setfocus(9999)</groupoverride>
-    <groupoverride group="picturessubmenu" condition="true">control.setfocus(9999)</groupoverride>
-
+	<doNotShareMenu/>
+	<override action="RunScript(script.globalsearch)">
+		<condition>!system.hasaddon(script.globalsearch)</condition>
+		<action>InstallAddon(script.globalsearch)</action>
+		<action>InstallAddon(plugin.program.autocompletion)</action>
+	</override>
+	<override action="RunScript(script.globalsearch)">
+		<condition>system.hasaddon(script.globalsearch)</condition>
+		<action>::ACTION::</action>
+	</override>
+	<override action="ActivateWindow(Videos,videodb://movies/titles/)" group="mainmenu">
+		<action>::ACTION::</action>
+		<action>control.setfocus(9103)</action>
+	</override>
+	<override action="ActivateWindow(Videos,videodb://movies/titles/)" group="videosubmenu">
+		<condition>window.isactive(videos)</condition>
+		<action>Container.Update(videodb://movies/titles/)</action>
+		<action>control.setfocus(9103)</action>
+	</override>
+	<override action="ActivateWindow(Videos,videodb://tvshows/titles/)" group="mainmenu">
+		<action>::ACTION::</action>
+		<action>control.setfocus(9203)</action>
+	</override>
+	<override action="ActivateWindow(Videos,videodb://tvshows/titles/)" group="videosubmenu">
+		<condition>window.isactive(videos)</condition>
+		<action>Container.Update(videodb://tvshows/titles/)</action>
+		<action>control.setfocus(9203)</action>
+	</override>
+	<override action="ActivateWindow(Music,musicdb://artists/)" group="musicsubmenu">
+		<condition>window.isactive(music)</condition>
+		<action>Container.Update(musicdb://artists/)</action>
+	</override>
+	<override action="ActivateWindow(Music,musicdb://artists/)" group="musicsubmenu">
+		<condition>!window.isactive(music)</condition>
+		<action>::ACTION::</action>
+	</override>
+	<override action="ActivateWindow(Music,musicdb://albums/)" group="mainmenu">
+		<action>::ACTION::</action>
+		<action>control.setfocus(9998)</action>
+	</override>
+	<override action="ActivateWindow(Music,musicdb://albums/)" group="musicsubmenu">
+		<condition>window.isactive(music)</condition>
+		<action>Container.Update(musicdb://albums/)</action>
+		<action>control.setfocus(9998)</action>
+	</override>
+	<override action="ActivateWindow(Music,musicdb://genres/)" group="musicsubmenu">
+		<condition>window.isactive(music)</condition>
+		<action>Container.Update(musicdb://genres/)</action>
+	</override>
+	<override action="ActivateWindow(Music,musicdb://genres/)" group="musicsubmenu">
+		<condition>!window.isactive(music)</condition>
+		<action>::ACTION::</action>
+	</override>
+	<override action="ActivateWindow(Videos,videodb://musicvideos/titles/)" group="musicsubmenu">
+		<condition>window.isactive(music)</condition>
+		<action>Container.Update(videodb://musicvideos/titles/)</action>
+	</override>
+	<override action="ActivateWindow(Videos,videodb://musicvideos/titles/)" group="musicsubmenu">
+		<condition>!window.isactive(music)</condition>
+		<action>::ACTION::</action>
+	</override>
+	<groupoverride group="videosubmenu" condition="true">control.setfocus(9999)</groupoverride>
+	<groupoverride group="musicsubmenu" condition="true">control.setfocus(9999)</groupoverride>
+	<groupoverride group="picturessubmenu" condition="true">control.setfocus(9999)</groupoverride>
 </overrides>
diff --git a/shortcuts/videosubmenu.DATA.xml b/shortcuts/videosubmenu.DATA.xml
index 641a99d..53f23a3 100644
--- a/shortcuts/videosubmenu.DATA.xml
+++ b/shortcuts/videosubmenu.DATA.xml
@@ -8,13 +8,6 @@
         <thumb />
         <action>action(FullScreen)</action>
     </shortcut>
-    <shortcut>
-        <label>31147</label>
-        <label2>32034</label2>
-        <icon>DefaultAddon.png</icon>
-        <thumb />
-        <action>RunScript(script.globalsearch)</action>
-    </shortcut>
     <shortcut>
         <visible>PVR.HasTVChannels</visible>
         <label>31215</label>