diff --git a/1080i/Home.xml b/1080i/Home.xml
index 7ebe03b..25a7e08 100644
--- a/1080i/Home.xml
+++ b/1080i/Home.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window id="0">
 	<defaultcontrol always="true">9000</defaultcontrol>
+	<include>fadeInOut</include>
 	<onload>RunScript(script.skinshortcuts,type=buildxml&amp;mainmenuID=9001&amp;group=mainmenu|videosubmenu|musicsubmenu|picturessubmenu)</onload>
 	<onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload>
 	<controls>
diff --git a/1080i/Includes.xml b/1080i/Includes.xml
index 91ecbb8..f1819d2 100644
--- a/1080i/Includes.xml
+++ b/1080i/Includes.xml
@@ -62,7 +62,7 @@
             <visible>Integer.IsGreater(container(99999).numitems,0) + !Skin.HasSetting(disableExtendedFanart)</visible>
             <include>dimensionsFullscreen</include>
             <texture>$INFO[container(99999).listitem.filenameandpath,,]</texture>
-            <colordiffuse>ffffffff</colordiffuse>
+            <colordiffuse>44ffffff</colordiffuse>
             <fadetime>500</fadetime>
             <aspectratio>stretch</aspectratio>
             <include>kenBurnsey</include>
@@ -73,7 +73,7 @@
             <posy>0</posy>
             <include>dimensionsFullscreen</include>
             <texture>$INFO[container.Art(fanart)]</texture>
-            <colordiffuse>ffffffff</colordiffuse>
+            <colordiffuse>44ffffff</colordiffuse>
             <aspectratio>stretch</aspectratio>
             <include>kenBurnsey</include>
         </control>
diff --git a/1080i/Includes_hubMenu.xml b/1080i/Includes_hubMenu.xml
index 1ff2958..848e1d3 100644
--- a/1080i/Includes_hubMenu.xml
+++ b/1080i/Includes_hubMenu.xml
@@ -17,6 +17,9 @@
         <control type="group" id="9000">
             <animation type="windowopen">
                 <effect type="slide" start="-384" end="0" tween="sine" delay="500" time="400"/>
+            </animation>
+			<animation type="windowclose">
+                <effect type="fade" start="100" end="0" time="0"/>
             </animation>
             <animation type="Conditional" condition="controlgroup(9000).hasfocus">
                 <effect type="slide" start="-384" end="0" tween="sine" time="400"/>
diff --git a/1080i/MyMusicNav.xml b/1080i/MyMusicNav.xml
index 58e0644..6345221 100644
--- a/1080i/MyMusicNav.xml
+++ b/1080i/MyMusicNav.xml
@@ -5,6 +5,21 @@
     <onload>Skin.SetString(recentitems,music)</onload>
     <controls>
         <include>globalBackground</include>
+		<control type="group">
+            <visible>$EXP[isMusicSong]</visible>
+            <control type="image">
+                <include>dimensionsFullscreen</include>
+                <aspectratio scalediffuse="false">stretch</aspectratio>
+                <texture background="true" fallback="colors/offblack.png" border="0">$INFO[Container.Art(artist.fanart)]</texture>
+				<fadetime>500</fadetime>
+                <colordiffuse>77ffffff</colordiffuse>
+            </control>
+            <control type="image">
+                <texture>vignette.png</texture>
+                <colordiffuse>ffffffff</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
+        </control>
         <!--page container group-->
         <control type="group">
             <!--shift page for certain modal dialogs-->
diff --git a/1080i/View_Albums.xml b/1080i/View_Albums.xml
index c11b83b..7d9435c 100644
--- a/1080i/View_Albums.xml
+++ b/1080i/View_Albums.xml
@@ -66,12 +66,12 @@
             </control>
 			<!--quick links-->			
 			<control type="panel" id="9998">
-                <posx>col-1-begin</posx>
-                <posy>row-7-begin</posy>
+                <posx>90</posx>
+                <posy>276</posy>
                 <width>24-col</width>
                 <height>11-row</height>
 				<onup>9123</onup>
-                <ondown>Control.SetFocus(50,0)</ondown>
+                <ondown>50</ondown>
                 <onleft>9000</onleft>
                 <onback>9000</onback>
                 <orientation>horizontal</orientation>
@@ -84,10 +84,10 @@
                         <width>5-col-gutter</width>
                         <height>5-col-gutter</height>
                         <aspectratio>stretch</aspectratio>
-                        <texture border="6">colors/white.png</texture>
+                        <texture border="6">colors/black.png</texture>
                         <bordertexture border="6" colordiffuse="22FFFFFF">colors/black.png</bordertexture>
                         <bordersize>6</bordersize>
-                        <colordiffuse>highlight</colordiffuse>
+                        <colordiffuse>overlay</colordiffuse>
                     </control>
 					<control type="image">
                         <posx>0</posx>
@@ -120,10 +120,10 @@
                             <width>5-col-gutter</width>
                             <height>5-col-gutter</height>
                             <aspectratio>stretch</aspectratio>
-                            <texture border="6">colors/white.png</texture>
+                            <texture border="6">colors/black.png</texture>
                             <bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
                             <bordersize>6</bordersize>
-                            <colordiffuse>highlight</colordiffuse>
+                            <colordiffuse>FF000000</colordiffuse>
                         </control>
 						<control type="image">
                             <posx>0</posx>
@@ -159,7 +159,7 @@
 			<control type="label">
                 <visible>!controlgroup(9000).hasfocus + $EXP[isMusicAlbum] + !$EXP[isMusicArtistCatalogue]</visible>
                 <posx>col-1-begin</posx>
-                <posy>row-19-begin</posy>
+                <posy>696</posy>
                 <width>12-col</width>
                 <height>2-row</height>
                 <aligny>center</aligny>
@@ -177,7 +177,7 @@
                 <onright>60</onright>
                 <ondown>50</ondown>
                 <onup>9998</onup>
-                <onback>9000</onback>
+                <onback>9998</onback>
                 <pagecontrol>60</pagecontrol>
                 <scrolltime tween="cubic" easing="out">600</scrolltime>
                 <itemlayout width="293" height="348">
@@ -187,10 +187,10 @@
                         <width>4-col-gutter</width>
                         <height>4-col-gutter</height>
                         <aspectratio>stretch</aspectratio>
-                        <texture border="6">colors/white.png</texture>
+                        <texture border="6">colors/black.png</texture>
                         <bordertexture border="6" colordiffuse="22FFFFFF">colors/black.png</bordertexture>
                         <bordersize>6</bordersize>
-                        <colordiffuse>highlight</colordiffuse>
+                        <colordiffuse>overlay</colordiffuse>
                     </control>
 					<control type="image">
                         <posx>0</posx>
@@ -234,10 +234,10 @@
 	                        <width>4-col-gutter</width>
 	                        <height>4-col-gutter</height>
 	                        <aspectratio>stretch</aspectratio>
-	                        <texture border="6">colors/white.png</texture>
+	                        <texture border="6">colors/black.png</texture>
 	                        <bordertexture border="6" colordiffuse="FFFFFFFF">colors/white.png</bordertexture>
 	                        <bordersize>6</bordersize>
-	                        <colordiffuse>highlight</colordiffuse>
+	                        <colordiffuse>FF000000</colordiffuse>
 	                    </control>
 						<control type="image">
                             <posx>0</posx>
diff --git a/1080i/View_ArtistAlbums.xml b/1080i/View_ArtistAlbums.xml
index d84b097..d74dcbe 100644
--- a/1080i/View_ArtistAlbums.xml
+++ b/1080i/View_ArtistAlbums.xml
@@ -56,10 +56,10 @@
 							<width>4-col-gutter</width>
 							<height>4-col-gutter</height>
 							<aspectratio>stretch</aspectratio>
-							<texture border="6">colors/white.png</texture>
+							<texture border="6">colors/black.png</texture>
 							<bordertexture border="6" colordiffuse="22FFFFFF">colors/black.png</bordertexture>
 							<bordersize>6</bordersize>
-							<colordiffuse>highlight</colordiffuse>
+							<colordiffuse>overlay</colordiffuse>
 						</control>
 						<control type="image">
 							<posx>0</posx>
@@ -114,10 +114,10 @@
 								<width>4-col-gutter</width>
 								<height>4-col-gutter</height>
 								<aspectratio>stretch</aspectratio>
-								<texture border="6">colors/white.png</texture>
+								<texture border="6">colors/black.png</texture>
 								<bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
 								<bordersize>6</bordersize>
-								<colordiffuse>highlight</colordiffuse>
+								<colordiffuse>FF000000</colordiffuse>
 							</control>
 							<control type="image">
 								<posx>0</posx>
diff --git a/1080i/View_Episodes.xml b/1080i/View_Episodes.xml
index 9c07b3f..7c16b69 100644
--- a/1080i/View_Episodes.xml
+++ b/1080i/View_Episodes.xml
@@ -14,7 +14,7 @@
                 <height>1440</height>
                 <aspectratio scalediffuse="false">stretch</aspectratio>
                 <texture background="true" border="0">$INFO[container.art(season.poster)]</texture>
-                <colordiffuse>ffffffff</colordiffuse>
+                <colordiffuse>55ffffff</colordiffuse>
                 <animation type="conditional" condition="!controlgroup(9000).hasfocus + !Skin.HasSetting(lowPowerMode)" loop="true" reversible="false">
                     <effect type="fade" start="0" end="100" time="2000"/>
                     <effect type="slide" start="0,0" end="0,-360" time="15000"/>
diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml
index c3ab8f5..94c21aa 100644
--- a/1080i/View_Movies.xml
+++ b/1080i/View_Movies.xml
@@ -62,31 +62,31 @@
 				<!--quick links-->			
 				<control type="panel" id="9103">
 	                <posx>90</posx>
-	                <posy>row-7-begin</posy>
-	                <width>1734</width>
+	                <posy>276</posy>
+	                <width>1740</width>
 	                <height>11-row</height>
 					<onup>9102</onup>
-	                <ondown>Control.SetFocus(50,0)</ondown>
+	                <ondown>50</ondown>
 	                <onleft>9000</onleft>
 	                <onback>9000</onback>
 	                <orientation>horizontal</orientation>
-	                <itemlayout width="598" height="5-col-gutter">
+	                <itemlayout width="586" height="5-col-gutter">
 	                    <control type="image">
 	                        <posx>0</posx>
 	                        <posy>0</posy>
-	                        <width>597</width>
-	                        <height>5-col-gutter</height>
+	                        <width>566</width>
+	                        <height>318</height>
 	                        <aspectratio>stretch</aspectratio>
-	                        <texture border="6">colors/white.png</texture>
+	                        <texture border="6">colors/black.png</texture>
 	                        <bordertexture border="6" colordiffuse="22FFFFFF">colors/black.png</bordertexture>
 	                        <bordersize>6</bordersize>
-	                        <colordiffuse>highlight</colordiffuse>
+	                        <colordiffuse>overlay</colordiffuse>
 	                    </control>
 						<control type="image">
 	                        <posx>0</posx>
 	                        <posy>0</posy>
-	                        <width>597</width>
-	                        <height>5-col-gutter</height>
+	                        <width>566</width>
+	                        <height>318</height>
 	                        <aspectratio>stretch</aspectratio>
 	                        <texture>$INFO[ListItem.Art(fanart)]</texture>
 	                        <bordersize>6</bordersize>
@@ -95,34 +95,45 @@
 	                    <control type="label">
 	                        <visible>!controlgroup(9000).hasfocus</visible>
 	                        <posx>12</posx>
-	                        <posy>9-row</posy>
+	                        <posy>312</posy>
 	                        <width>584</width>
 	                        <height>2-row</height>
 	                        <aligny>center</aligny>
 	                        <font>thumbTitle</font>
 	                        <textcolor>textActive</textcolor>
 	                        <label>[B]$INFO[ListItem.Title][/B][CR][COLOR textDisabled]$INFO[ListItem.year][/COLOR]</label>
-	                    </control>      
+	                    </control>
+	      				<control type="progress">
+							<visible>ListItem.IsResumable</visible>
+			                <description>Progress Bar</description>
+			                <posx>12</posx>
+			                <posy>294</posy>
+			                <width>542</width>
+			                <height>12</height>
+			                <texturebg colordiffuse="textboxInactive">colors/offblack.png</texturebg>
+			                <midtexture colordiffuse="highlight">colors/white.png</midtexture>
+			                <info>ListItem.PercentPlayed</info>
+			            </control>
 	                </itemlayout>
-	                <focusedlayout width="598" height="5-col-gutter">
+	                <focusedlayout width="586" height="5-col-gutter">
 	                    <control type="group">
 	                        <include>focusThumb</include>
 	                        <control type="image">
 	                            <posx>0</posx>
 	                            <posy>0</posy>
-	                            <width>597</width>
-	                            <height>5-col-gutter</height>
+	                            <width>566</width>
+	                            <height>318</height>
 	                            <aspectratio>stretch</aspectratio>
-	                            <texture border="6">colors/white.png</texture>
+	                            <texture border="6">colors/black.png</texture>
 	                            <bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
 	                            <bordersize>6</bordersize>
-	                            <colordiffuse>highlight</colordiffuse>
+	                            <colordiffuse>FF000000</colordiffuse>
 	                        </control>
 							<control type="image">
 	                            <posx>0</posx>
 	                            <posy>0</posy>
-	                            <width>597</width>
-	                            <height>5-col-gutter</height>
+	                            <width>566</width>
+	                            <height>318</height>
 	                            <aspectratio>stretch</aspectratio>
 	                            <texture>$INFO[ListItem.Art(fanart)]</texture>
 	                            <bordersize>6</bordersize>
@@ -131,7 +142,7 @@
 	                        <control type="label">
 		                        <visible>!controlgroup(9000).hasfocus</visible>
 		                        <posx>12</posx>
-		                        <posy>9-row</posy>
+		                        <posy>312</posy>
 		                        <width>584</width>
 		                        <height>2-row</height>
 		                        <aligny>center</aligny>
@@ -139,6 +150,17 @@
 		                        <textcolor>textActive</textcolor>
 		                        <label>[B]$INFO[ListItem.Title][/B][CR][COLOR textDisabled]$INFO[ListItem.year][/COLOR]</label>
 		                    </control>
+		      				<control type="progress">
+								<visible>ListItem.IsResumable</visible>
+				                <description>Progress Bar</description>
+				                <posx>12</posx>
+				                <posy>294</posy>
+				                <width>542</width>
+				                <height>12</height>
+				                <texturebg colordiffuse="textboxInactive">colors/offblack.png</texturebg>
+				                <midtexture colordiffuse="highlight">colors/white.png</midtexture>
+				                <info>ListItem.PercentPlayed</info>
+				            </control>
 	                    </control>
 	                </focusedlayout>
 					<content>$INFO[control.getlabel(9102)]</content>
@@ -152,7 +174,7 @@
 				<control type="label">
 					<visible>!controlgroup(9000).hasfocus + !$EXP[isTVShow] + $EXP[isMovie]</visible>
 	                <posx>col-1-begin</posx>
-	                <posy>row-19-begin</posy>
+	                <posy>696</posy>
 	                <width>12-col</width>
 	                <height>2-row</height>
 	                <aligny>center</aligny>
@@ -170,7 +192,7 @@
 					<onright>60</onright>
 					<ondown>50</ondown>
 					<onup>9103</onup>
-					<onback>9000</onback>
+					<onback>9103</onback>
 					<pagecontrol>60</pagecontrol>
 					<scrolltime tween="cubic" easing="out">600</scrolltime>
 					<itemlayout width="252" height="426">
@@ -180,9 +202,19 @@
 							<width>228</width>
 							<height>342</height>
 							<aspectratio>stretch</aspectratio>
-							<texture border="6">colors/white.png</texture>
+							<texture border="6">colors/black.png</texture>
 							<bordertexture border="6" colordiffuse="22FFFFFF">colors/black.png</bordertexture>
 							<bordersize>6</bordersize>
+							<colordiffuse>overlay</colordiffuse>
+						</control>
+						<control type="image">
+							<visible>String.IsEmpty(ListItem.PlayCount)</visible>
+							<posx>6</posx>
+							<posy>0</posy>
+							<width>216</width>
+							<height>6</height>
+							<aspectratio>stretch</aspectratio>
+							<texture border="6">colors/white.png</texture>
 							<colordiffuse>highlight</colordiffuse>
 						</control>
 						<control type="image">
@@ -238,10 +270,10 @@
 								<width>228</width>
 								<height>342</height>
 								<aspectratio>stretch</aspectratio>
-								<texture border="6">colors/white.png</texture>
+								<texture border="6">colors/black.png</texture>
 								<bordertexture border="6" colordiffuse="FFFFFFFF">colors/white.png</bordertexture>
 								<bordersize>6</bordersize>
-								<colordiffuse>highlight</colordiffuse>
+								<colordiffuse>FF000000</colordiffuse>
 							</control>
 							<control type="image">
 								<posx>0</posx>
diff --git a/1080i/View_Seasons.xml b/1080i/View_Seasons.xml
index 7883550..fccfe3e 100644
--- a/1080i/View_Seasons.xml
+++ b/1080i/View_Seasons.xml
@@ -23,18 +23,17 @@
                 <control type="group">
                     <visible>!Substring(Container.folderpath,plugin)</visible>
                     <posx>col-1-begin</posx>
-                    <posy>row-8-begin</posy>
+                    <posy>row-9-begin</posy>
 					<control type="label">
-                        <posx>24-col</posx>
+                        <posx>0</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.foldername][/B]</label>
+                        <label>$INFO[container.foldername]</label>
                     </control>
                 </control>
                 <!--overlay-->
@@ -70,10 +69,10 @@
                             <width>4-col-gutter</width>
                             <height>396</height>
                             <aspectratio>stretch</aspectratio>
-                            <texture border="6">colors/white.png</texture>
+                            <texture border="6">colors/black.png</texture>
                             <bordertexture border="6" colordiffuse="22FFFFFF">colors/black.png</bordertexture>
                             <bordersize>6</bordersize>
-                            <colordiffuse>highlight</colordiffuse>
+                            <colordiffuse>overlay</colordiffuse>
                         </control>
 						<control type="image">
                             <posx>0</posx>
@@ -118,10 +117,10 @@
 		                        <width>4-col-gutter</width>
 		                        <height>396</height>
 		                        <aspectratio>stretch</aspectratio>
-		                        <texture border="6">colors/white.png</texture>
+		                        <texture border="6">colors/black.png</texture>
 		                        <bordertexture border="6" colordiffuse="FFFFFFFF">colors/white.png</bordertexture>
 		                        <bordersize>6</bordersize>
-		                        <colordiffuse>highlight</colordiffuse>
+		                        <colordiffuse>FF000000</colordiffuse>
 		                    </control>
                             <control type="image">
                                 <posx>0</posx>
diff --git a/1080i/View_Songs.xml b/1080i/View_Songs.xml
index 7fe7902..41e91a7 100644
--- a/1080i/View_Songs.xml
+++ b/1080i/View_Songs.xml
@@ -2,20 +2,6 @@
 <includes>
     <!--Song browser-->
     <include name="musicsongs">
-        <control type="group">
-            <visible>$EXP[isMusicSong]</visible>
-            <control type="image">
-                <include>dimensionsFullscreen</include>
-                <aspectratio scalediffuse="false">stretch</aspectratio>
-                <texture background="true" fallback="colors/offblack.png" border="0">$INFO[Container.Art(artist.fanart)]</texture>
-                <colordiffuse>77ffffff</colordiffuse>
-            </control>
-            <control type="image">
-                <texture>vignette.png</texture>
-                <colordiffuse>ffffffff</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
-        </control>
         <control type="group">
             <visible>$EXP[isMusicSong]</visible>
             <posx>col-1-begin</posx>
diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml
index 5f3cfcb..7ad485a 100644
--- a/1080i/View_TVShows.xml
+++ b/1080i/View_TVShows.xml
@@ -61,32 +61,32 @@
 	            </control>
 				<!--quick links-->			
 				<control type="panel" id="9203">
-	                <posx>90</posx>
-	                <posy>row-7-begin</posy>
-	                <width>1734</width>
+					<posx>90</posx>
+	                <posy>276</posy>
+	                <width>1740</width>
 	                <height>11-row</height>
 					<onup>9202</onup>
-	                <ondown>Control.SetFocus(50,0)</ondown>
+	                <ondown>50</ondown>
 	                <onleft>9000</onleft>
 	                <onback>9000</onback>
 	                <orientation>horizontal</orientation>
-	                <itemlayout width="598" height="5-col-gutter">
+	                <itemlayout width="586" height="5-col-gutter">
 	                    <control type="image">
 	                        <posx>0</posx>
 	                        <posy>0</posy>
-	                        <width>597</width>
-	                        <height>5-col-gutter</height>
+	                        <width>566</width>
+	                        <height>318</height>
 	                        <aspectratio>stretch</aspectratio>
-	                        <texture border="6">colors/white.png</texture>
+	                        <texture border="6">colors/black.png</texture>
 	                        <bordertexture border="6" colordiffuse="22FFFFFF">colors/black.png</bordertexture>
 	                        <bordersize>6</bordersize>
-	                        <colordiffuse>highlight</colordiffuse>
+	                        <colordiffuse>overlay</colordiffuse>
 	                    </control>
 						<control type="image">
 	                        <posx>0</posx>
 	                        <posy>0</posy>
-	                        <width>597</width>
-	                        <height>5-col-gutter</height>
+	                        <width>566</width>
+	                        <height>318</height>
 	                        <aspectratio>stretch</aspectratio>
 	                        <texture>$INFO[ListItem.Art(fanart)]</texture>
 	                        <bordersize>6</bordersize>
@@ -95,34 +95,45 @@
 	                    <control type="label">
 	                        <visible>!controlgroup(9000).hasfocus</visible>
 	                        <posx>12</posx>
-	                        <posy>9-row</posy>
+	                        <posy>312</posy>
 	                        <width>584</width>
 	                        <height>2-row</height>
 	                        <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]</label>
-	                    </control>      
+	                        <label>[B]$INFO[ListItem.Title][/B][CR][COLOR textDisabled]$INFO[ListItem.Season,$LOCALIZE[31011] , ]$INFO[ListItem.Episode,$LOCALIZE[31204] ,][/COLOR]</label>
+	                    </control>
+	      				<control type="progress">
+							<visible>ListItem.IsResumable</visible>
+			                <description>Progress Bar</description>
+			                <posx>12</posx>
+			                <posy>294</posy>
+			                <width>542</width>
+			                <height>12</height>
+			                <texturebg colordiffuse="textboxInactive">colors/offblack.png</texturebg>
+			                <midtexture colordiffuse="highlight">colors/white.png</midtexture>
+			                <info>ListItem.PercentPlayed</info>
+			            </control>
 	                </itemlayout>
-	                <focusedlayout width="598" height="5-col-gutter">
+	                <focusedlayout width="586" height="5-col-gutter">
 	                    <control type="group">
 	                        <include>focusThumb</include>
 	                        <control type="image">
 	                            <posx>0</posx>
 	                            <posy>0</posy>
-	                            <width>597</width>
-	                            <height>5-col-gutter</height>
+	                            <width>566</width>
+	                            <height>318</height>
 	                            <aspectratio>stretch</aspectratio>
-	                            <texture border="6">colors/white.png</texture>
+	                            <texture border="6">colors/black.png</texture>
 	                            <bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
 	                            <bordersize>6</bordersize>
-	                            <colordiffuse>highlight</colordiffuse>
+	                            <colordiffuse>FF000000</colordiffuse>
 	                        </control>
 							<control type="image">
 	                            <posx>0</posx>
 	                            <posy>0</posy>
-	                            <width>597</width>
-	                            <height>5-col-gutter</height>
+	                            <width>566</width>
+	                            <height>318</height>
 	                            <aspectratio>stretch</aspectratio>
 	                            <texture>$INFO[ListItem.Art(fanart)]</texture>
 	                            <bordersize>6</bordersize>
@@ -131,14 +142,25 @@
 	                        <control type="label">
 		                        <visible>!controlgroup(9000).hasfocus</visible>
 		                        <posx>12</posx>
-		                        <posy>9-row</posy>
+		                        <posy>312</posy>
 		                        <width>584</width>
 		                        <height>2-row</height>
 		                        <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]</label>
+		                        <label>[B]$INFO[ListItem.Title][/B][CR][COLOR textDisabled]$INFO[ListItem.Season,$LOCALIZE[31011] , ]$INFO[ListItem.Episode,$LOCALIZE[31204] ,][/COLOR]</label>
 		                    </control>
+		      				<control type="progress">
+								<visible>ListItem.IsResumable</visible>
+				                <description>Progress Bar</description>
+				                <posx>12</posx>
+				                <posy>294</posy>
+				                <width>542</width>
+				                <height>12</height>
+				                <texturebg colordiffuse="textboxInactive">colors/offblack.png</texturebg>
+				                <midtexture colordiffuse="highlight">colors/white.png</midtexture>
+				                <info>ListItem.PercentPlayed</info>
+				            </control>
 	                    </control>
 	                </focusedlayout>
 					<content>$INFO[control.getlabel(9202)]</content>
@@ -153,7 +175,7 @@
 			<control type="label">
                 <visible>!controlgroup(9000).hasfocus + $EXP[isTVShow] + !$EXP[isMovie]</visible>
                 <posx>col-1-begin</posx>
-                <posy>row-19-begin</posy>
+                <posy>696</posy>
                 <width>12-col</width>
                 <height>2-row</height>
                 <aligny>center</aligny>
@@ -171,7 +193,7 @@
 				<onright>60</onright>
 				<ondown>50</ondown>
 				<onup>9203</onup>
-				<onback>9000</onback>
+				<onback>9203</onback>
 				<pagecontrol>60</pagecontrol>
 				<scrolltime tween="cubic" easing="out">600</scrolltime>
 				<itemlayout width="252" height="426">
@@ -181,9 +203,19 @@
 						<width>228</width>
 						<height>342</height>
 						<aspectratio>stretch</aspectratio>
-						<texture border="6">colors/white.png</texture>
+						<texture border="6">colors/black.png</texture>
 						<bordertexture border="6" colordiffuse="22FFFFFF">colors/black.png</bordertexture>
 						<bordersize>6</bordersize>
+						<colordiffuse>overlay</colordiffuse>
+					</control>
+					<control type="image">
+						<visible>Integer.IsGreater(ListItem.Property(UnWatchedEpisodes),0)</visible>
+						<posx>6</posx>
+						<posy>0</posy>
+						<width>216</width>
+						<height>6</height>
+						<aspectratio>stretch</aspectratio>
+						<texture border="6">colors/white.png</texture>
 						<colordiffuse>highlight</colordiffuse>
 					</control>
 					<control type="image">
@@ -250,10 +282,10 @@
 							<width>228</width>
 							<height>342</height>
 							<aspectratio>stretch</aspectratio>
-							<texture border="6">colors/white.png</texture>
+							<texture border="6">colors/black.png</texture>
 							<bordertexture border="6" colordiffuse="FFFFFFFF">colors/white.png</bordertexture>
 							<bordersize>6</bordersize>
-							<colordiffuse>highlight</colordiffuse>
+							<colordiffuse>FF000000</colordiffuse>
 						</control>
 						<control type="image">
 							<posx>0</posx>
diff --git a/extras/homeBackgrounds/eopewngf68w-tim-swaan.jpg b/extras/homeBackgrounds/eopewngf68w-tim-swaan.jpg
deleted file mode 100644
index 0029053..0000000
Binary files a/extras/homeBackgrounds/eopewngf68w-tim-swaan.jpg and /dev/null differ
diff --git a/shortcuts/overrides.xml b/shortcuts/overrides.xml
index 08ffb65..da985c9 100644
--- a/shortcuts/overrides.xml
+++ b/shortcuts/overrides.xml
@@ -14,20 +14,32 @@
 		<action>::ACTION::</action>
 		<action>control.setfocus(9103)</action>
 	</override>
+	<override action="ActivateWindow(Videos,videodb://movies/titles/)" group="videosubmenu">
+		<condition>!window.isactive(videos)</condition>
+		<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>::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>
@@ -36,15 +48,22 @@
 		<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>::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>
@@ -53,6 +72,7 @@
 		<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>
@@ -61,6 +81,7 @@
 		<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>