diff --git a/1080i/Home.xml b/1080i/Home.xml
index c941f60..ff67da8 100644
--- a/1080i/Home.xml
+++ b/1080i/Home.xml
@@ -79,7 +79,7 @@
         <!--main menu-->
 		<control type="panel" id="9000">
             <posx>col-1-begin</posx>
-            <posy>row-4-begin</posy>
+            <posy>row-13-begin</posy>
             <width>24-col</width>
             <height>149</height>
 			<onup>9001</onup>
diff --git a/1080i/Includes_animations.xml b/1080i/Includes_animations.xml
index 2c10e10..7898131 100644
--- a/1080i/Includes_animations.xml
+++ b/1080i/Includes_animations.xml
@@ -67,8 +67,7 @@
     </include>
     <include name="modalDialogContentShift">
         <animation type="Conditional" condition="controlgroup(9000).hasfocus | controlgroup(9002).hasfocus | controlgroup(100).hasfocus">
-            <effect type="zoom" end="150" time="200" center="auto" tween="linear" easing="out"/>
-            <effect type="fade" start="100" end="30" time="200"/>
+            <effect type="zoom" end="170" time="200" center="auto" tween="linear" easing="out"/>
         </animation>
     </include>
 </includes>
diff --git a/1080i/Includes_hubMenu.xml b/1080i/Includes_hubMenu.xml
index 4d706db..1ff2958 100644
--- a/1080i/Includes_hubMenu.xml
+++ b/1080i/Includes_hubMenu.xml
@@ -2,6 +2,18 @@
 <includes>
     <!--main hub menu-->
     <include name="hubMenu">
+		<control type="image">
+            <include>dimensionsFullscreen</include>
+            <texture>colors/black.png</texture>
+            <colordiffuse>ccFFFFFF</colordiffuse>
+            <aspectratio>stretch</aspectratio>
+			<animation type="Conditional" condition="controlgroup(9000).hasfocus">
+                <effect type="fade" start="0" end="100" time="200"/>
+            </animation>
+            <animation type="Conditional" condition="!controlgroup(9000).hasfocus">
+                <effect type="fade" start="100" end="0" time="100"/>
+            </animation>
+        </control>
         <control type="group" id="9000">
             <animation type="windowopen">
                 <effect type="slide" start="-384" end="0" tween="sine" delay="500" time="400"/>
diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml
index cd9d939..469466f 100644
--- a/1080i/MyVideoNav.xml
+++ b/1080i/MyVideoNav.xml
@@ -29,8 +29,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/View_Albums.xml b/1080i/View_Albums.xml
index 02d503a..22a194f 100644
--- a/1080i/View_Albums.xml
+++ b/1080i/View_Albums.xml
@@ -13,7 +13,7 @@
 			<!--quick link selector-->
 			<control type="list" id="9123">
                 <posx>col-1-begin</posx>
-                <posy>row-4-begin</posy>
+                <posy>row-5-begin</posy>
                 <width>24-col</width>
                 <height>2-row</height>
                 <onleft>9000</onleft>
@@ -47,44 +47,17 @@
                     </control>
                 </focusedlayout>
                 <content>
-                    <item id="1">
-                        <visible>String.IsEqual(skin.string(recentitems),video) + Library.HasContent(movies)</visible>
-                        <label>special://skin/extras/playlists/recentMovies.xsp</label>
-                        <property name="textTitle">31176</property>
-                        <onclick>noop</onclick>
-                    </item>
-                    <item id="2">
-                        <visible>String.IsEqual(skin.string(recentitems),video) + Library.HasContent(tvshows)</visible>
-                        <label>special://skin/extras/playlists/recentEpisodes.xsp</label>
-                        <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>
+                    <item>
                         <label>special://skin/extras/playlists/recentAlbums.xsp</label>
                         <property name="textTitle">31180</property>
                         <onclick>noop</onclick>
                     </item>
-                    <item id="4">
-                        <visible>String.IsEqual(skin.string(recentitems),music) + Library.HasContent(music)</visible>
+                    <item>
                         <label>special://skin/extras/playlists/topAlbums.xsp</label>
                         <property name="textTitle">31187</property>
                         <onclick>noop</onclick>
                     </item>
-                    <item id="5">
-                        <visible>String.IsEqual(skin.string(recentitems),music) + Library.HasContent(music)</visible>
+                    <item>
                         <label>special://skin/extras/playlists/randomAlbums.xsp</label>
                         <property name="textTitle">31181</property>
                         <onclick>noop</onclick>
@@ -94,7 +67,7 @@
 			<!--quick links-->			
 			<control type="panel" id="9998">
                 <posx>col-1-begin</posx>
-                <posy>row-6-begin</posy>
+                <posy>row-7-begin</posy>
                 <width>24-col</width>
                 <height>11-row</height>
 				<onup>9123</onup>
@@ -112,9 +85,19 @@
                         <height>5-col-gutter</height>
                         <aspectratio>stretch</aspectratio>
                         <texture border="6">colors/white.png</texture>
-                        <bordertexture border="6" colordiffuse="11FFFFFF">colors/black.png</bordertexture>
+                        <bordertexture border="6" colordiffuse="22FFFFFF">colors/black.png</bordertexture>
                         <bordersize>6</bordersize>
                         <colordiffuse>highlight</colordiffuse>
+                    </control>
+					<control type="image">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>5-col-gutter</width>
+                        <height>5-col-gutter</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture>$INFO[ListItem.Art(thumb)]</texture>
+                        <bordersize>6</bordersize>
+                        <colordiffuse>ffffffff</colordiffuse>
                     </control>
                     <control type="label">
                         <visible>!controlgroup(9000).hasfocus</visible>
@@ -126,18 +109,7 @@
                         <font>thumbTitle</font>
                         <textcolor>textActive</textcolor>
                         <label>[B]$INFO[ListItem.Title][/B][CR][COLOR textDisabled]$INFO[ListItem.artist][/COLOR] $INFO[listitem.year]</label>
-                    </control>
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>5-col-gutter</width>
-                        <height>5-col-gutter</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture border="6">$INFO[ListItem.Art(thumb)]</texture>
-                        <bordertexture border="6" colordiffuse="11FFFFFF">colors/black.png</bordertexture>
-                        <bordersize>6</bordersize>
-                        <colordiffuse>ffffffff</colordiffuse>
-                    </control>
+                    </control>      
                 </itemlayout>
                 <focusedlayout width="348" height="5-col-gutter">
                     <control type="group">
@@ -152,6 +124,16 @@
                             <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>5-col-gutter</width>
+                            <height>5-col-gutter</height>
+                            <aspectratio>stretch</aspectratio>
+                            <texture>$INFO[ListItem.Art(thumb)]</texture>
+                            <bordersize>6</bordersize>
+                            <colordiffuse>ffffffff</colordiffuse>
                         </control>
                         <control type="label">
 	                        <visible>!controlgroup(9000).hasfocus</visible>
@@ -164,23 +146,12 @@
 	                        <textcolor>textActive</textcolor>
 	                        <label>[B]$INFO[ListItem.Title][/B][CR][COLOR textDisabled]$INFO[ListItem.artist][/COLOR] $INFO[listitem.year]</label>
 	                    </control>
-                        <control type="image">
-                            <posx>0</posx>
-                            <posy>0</posy>
-                            <width>5-col-gutter</width>
-                            <height>5-col-gutter</height>
-                            <aspectratio>stretch</aspectratio>
-                            <texture border="6">$INFO[ListItem.Art(thumb)]</texture>
-                            <bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
-                            <bordersize>6</bordersize>
-                            <colordiffuse>ffffffff</colordiffuse>
-                        </control>
                     </control>
                 </focusedlayout>
 				<content>$INFO[control.getlabel(9123)]</content>
             </control>
 		</control>
-			<!--all albums-->
+		<!--all albums-->
 		<control type="group" id="9124">
 			<animation type="Conditional" condition="controlgroup(9124).hasfocus | controlgroup(8000).hasfocus | controlgroup(9000).hasfocus">
                 <effect type="slide" start="0,0" end="0,-504" tween="sine" time="400"/>
@@ -188,18 +159,18 @@
 			<control type="label">
                 <visible>!controlgroup(9000).hasfocus + $EXP[isMusicAlbum] + !$EXP[isMusicArtistCatalogue]</visible>
                 <posx>col-1-begin</posx>
-                <posy>row-18-begin</posy>
+                <posy>row-19-begin</posy>
                 <width>12-col</width>
                 <height>2-row</height>
                 <aligny>center</aligny>
                 <font>itemTitle</font>
                 <textcolor>textActive</textcolor>
-                <label>All Albums</label>
+                <label>$LOCALIZE[31223]</label>
             </control>
             <control type="panel" id="50">
                 <visible>$EXP[isMusicAlbum]</visible>
                 <posx>col-1-begin</posx>
-                <posy>row-20-begin</posy>
+                <posy>row-21-begin</posy>
                 <width>1800</width>
                 <height>24-row</height>
                 <onleft>9000</onleft>
@@ -217,9 +188,19 @@
                         <height>4-col-gutter</height>
                         <aspectratio>stretch</aspectratio>
                         <texture border="6">colors/white.png</texture>
-                        <bordertexture border="6" colordiffuse="44FFFFFF">colors/black.png</bordertexture>
+                        <bordertexture border="6" colordiffuse="22FFFFFF">colors/black.png</bordertexture>
                         <bordersize>6</bordersize>
                         <colordiffuse>highlight</colordiffuse>
+                    </control>
+					<control type="image">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>4-col-gutter</width>
+                        <height>4-col-gutter</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture>$INFO[ListItem.Art(thumb)]</texture>
+                        <bordersize>6</bordersize>
+                        <colordiffuse>ffFFFFFF</colordiffuse>
                     </control>
                     <control type="textbox">
                         <visible>isempty(listitem.title)</visible>
@@ -243,17 +224,6 @@
                         <textcolor>textActive</textcolor>
                         <label>[B]$INFO[ListItem.Title][/B][CR][COLOR textDisabled]$INFO[ListItem.artist][/COLOR] $INFO[listitem.year]</label>
                     </control>
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>4-col-gutter</width>
-                        <height>4-col-gutter</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture border="6">$INFO[ListItem.Art(thumb)]</texture>
-                        <bordertexture border="6" colordiffuse="11FFFFFF">colors/black.png</bordertexture>
-                        <bordersize>6</bordersize>
-                        <colordiffuse>ffFFFFFF</colordiffuse>
-                    </control>
                 </itemlayout>
                 <focusedlayout width="4-col" height="348">
                     <control type="group">
@@ -265,10 +235,19 @@
 	                        <height>4-col-gutter</height>
 	                        <aspectratio>stretch</aspectratio>
 	                        <texture border="6">colors/white.png</texture>
-	                        <bordertexture border="6" colordiffuse="44FFFFFF">colors/black.png</bordertexture>
+	                        <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>4-col-gutter</height>
+                            <aspectratio>stretch</aspectratio>
+                            <texture>$INFO[ListItem.Art(thumb)]</texture>
+                            <bordersize>6</bordersize>
+                        </control>
 	                    <control type="textbox">
 	                        <visible>isempty(listitem.title)</visible>
 	                        <posx>24</posx>
@@ -280,16 +259,6 @@
 	                        <textcolor>textActive</textcolor>
 	                        <label>$INFO[ListItem.label]</label>
 	                    </control>
-                        <control type="image">
-                            <posx>0</posx>
-                            <posy>0</posy>
-                            <width>4-col-gutter</width>
-                            <height>4-col-gutter</height>
-                            <aspectratio>stretch</aspectratio>
-                            <texture border="6">$INFO[ListItem.Art(thumb)]</texture>
-                            <bordertexture border="6" colordiffuse="FFFFFFFF">colors/white.png</bordertexture>
-                            <bordersize>6</bordersize>
-                        </control>
                         <control type="label">
 	                        <visible>!controlgroup(9000).hasfocus</visible>
 	                        <posx>12</posx>
diff --git a/1080i/View_ArtistAlbums.xml b/1080i/View_ArtistAlbums.xml
index 0478197..29198fe 100644
--- a/1080i/View_ArtistAlbums.xml
+++ b/1080i/View_ArtistAlbums.xml
@@ -1,170 +1,168 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <includes>
-    <!--Artist Album browser-->
-    <include name="musicartistcatalogue">
-        <!--fanart-->
-        <control type="group">
-            <visible>$EXP[isMusicArtistCatalogue]</visible>
+	<!--Artist Album browser-->
+	<include name="musicartistcatalogue">
+		<!--fanart-->
+		<control type="group">
+			<visible>$EXP[isMusicArtistCatalogue]</visible>
 			<control type="image">
-                <include>dimensionsFullscreen</include>
-                <aspectratio scalediffuse="false">stretch</aspectratio>
-                <texture background="true" border="0">$INFO[container.Art(artist.fanart)]</texture>
-                <fadetime>0</fadetime>
-                <colordiffuse>77ffffff</colordiffuse>
-            </control>
+				<include>dimensionsFullscreen</include>
+				<aspectratio scalediffuse="false">stretch</aspectratio>
+				<texture background="true" border="0">$INFO[container.Art(artist.fanart)]</texture>
+				<fadetime>0</fadetime>
+				<colordiffuse>44ffffff</colordiffuse>
+			</control>
 			<control type="image">
-	            <include>dimensionsFullscreen</include>
-	            <texture>vignette.png</texture>
-	            <colordiffuse>ffffffff</colordiffuse>
-	            <aspectratio>stretch</aspectratio>
-	        </control>
-            <control type="group">
-                <animation type="Conditional" condition="controlgroup(9000).hasfocus | controlgroup(9002).hasfocus | controlgroup(100).hasfocus">
-                    <effect type="fade" start="100" end="0" time="200"/>
-                </animation>
-                <!--titles-->
-                <control type="group">
-                    <posx>col-1-begin</posx>
-                    <posy>row-6-begin</posy>
-                    <control type="label">
-                        <posx>0</posx>
-                        <posy>-12</posy>
-                        <width>16-col</width>
-                        <height>3-row</height>
-                        <font>veryLarge</font>
-                        <textcolor>66ffffff</textcolor>
-<wrapmultiline>true</wrapmultiline>
-                        <shadowcolor>-</shadowcolor>
-                        <label>$INFO[container.foldername]</label>
-                    </control>
-                </control>
-                <control type="panel" id="50">
-                    <visible>$EXP[isMusicArtistCatalogue]</visible>
-                    <posx>col-1-begin</posx>
-                    <posy>row-11-begin</posy>
-                    <width>24-col</width>
-                    <height>19-row</height>
-                    <onleft>9000</onleft>
-                    <ondown>50</ondown>
-                    <onup>50</onup>
-                    <pagecontrol>60</pagecontrol>
+				<include>dimensionsFullscreen</include>
+				<texture>vignette.png</texture>
+				<colordiffuse>ffffffff</colordiffuse>
+				<aspectratio>stretch</aspectratio>
+			</control>
+			<control type="group">
+				<animation type="Conditional" condition="controlgroup(9000).hasfocus | controlgroup(9002).hasfocus | controlgroup(100).hasfocus">
+					<effect type="fade" start="100" end="0" time="200"/>
+				</animation>
+				<!--titles-->
+				<control type="group">
+					<posx>col-1-begin</posx>
+					<posy>row-6-begin</posy>
+					<control type="label">
+						<posx>0</posx>
+						<posy>-12</posy>
+						<width>16-col</width>
+						<height>3-row</height>
+						<font>veryLarge</font>
+						<textcolor>66ffffff</textcolor>
+						<wrapmultiline>true</wrapmultiline>
+						<shadowcolor>-</shadowcolor>
+						<label>$INFO[container.foldername]</label>
+					</control>
+				</control>
+				<control type="panel" id="50">
+					<visible>$EXP[isMusicArtistCatalogue]</visible>
+					<posx>col-1-begin</posx>
+					<posy>row-11-begin</posy>
+					<width>24-col</width>
+					<height>19-row</height>
+					<onleft>9000</onleft>
+					<ondown>50</ondown>
+					<onup>50</onup>
+					<pagecontrol>60</pagecontrol>
 					<scrolltime tween="cubic" easing="out">600</scrolltime>
-	                <itemlayout width="300" height="348">
-	                    <control type="image">
-	                        <posx>0</posx>
-	                        <posy>0</posy>
-	                        <width>4-col-gutter</width>
-	                        <height>4-col-gutter</height>
-	                        <aspectratio>stretch</aspectratio>
-	                        <texture border="6">colors/white.png</texture>
-	                        <bordertexture border="6" colordiffuse="44FFFFFF">colors/black.png</bordertexture>
-	                        <bordersize>6</bordersize>
-	                        <colordiffuse>highlight</colordiffuse>
-	                    </control>
-	                    <control type="textbox">
-	                        <visible>isempty(listitem.title)</visible>
-	                        <posx>24</posx>
-	                        <posy>3-row</posy>
-	                        <width>228</width>
-	                        <height>6-row</height>
-	                        <font>largeStrong</font>
+					<itemlayout width="300" height="348">
+						<control type="image">
+							<posx>0</posx>
+							<posy>0</posy>
+							<width>4-col-gutter</width>
+							<height>4-col-gutter</height>
+							<aspectratio>stretch</aspectratio>
+							<texture border="6">colors/white.png</texture>
+							<bordertexture border="6" colordiffuse="22FFFFFF">colors/black.png</bordertexture>
+							<bordersize>6</bordersize>
+							<colordiffuse>highlight</colordiffuse>
+						</control>
+						<control type="image">
+							<posx>0</posx>
+							<posy>0</posy>
+							<width>4-col-gutter</width>
+							<height>4-col-gutter</height>
+							<aspectratio>stretch</aspectratio>
+							<texture>$INFO[ListItem.Art(thumb)]</texture>
+							<bordersize>6</bordersize>
+							<colordiffuse>ffFFFFFF</colordiffuse>
+						</control>
+						<control type="textbox">
+							<visible>isempty(listitem.title)</visible>
+							<posx>24</posx>
+							<posy>3-row</posy>
+							<width>228</width>
+							<height>6-row</height>
+							<font>largeStrong</font>
 							<wrapmultiline>true</wrapmultiline>
-	                        <textcolor>textActive</textcolor>
-	                        <label>$INFO[ListItem.label]</label>
-	                    </control>
-	                    <control type="label">
-	                        <visible>!controlgroup(9000).hasfocus</visible>
-	                        <posx>12</posx>
-	                        <posy>262</posy>
-	                        <width>240</width>
-	                        <height>1-row</height>
-	                        <aligny>center</aligny>
-	                        <font>thumbTitle</font>
-	                        <textcolor>textActive</textcolor>
-	                        <label>[B]$INFO[ListItem.Title][/B]</label>
-	                    </control>
-	                    <control type="label">
-	                        <visible>!controlgroup(9000).hasfocus</visible>
-	                        <posx>12</posx>
-	                        <posy>286</posy>
-	                        <width>240</width>
-	                        <height>1-row</height>
-	                        <aligny>center</aligny>
-	                        <font>thumbTitle</font>
-	                        <textcolor>textActive</textcolor>
-	                        <label>$INFO[ListItem.year]</label>
-	                    </control>
-	                    <control type="image">
-	                        <posx>0</posx>
-	                        <posy>0</posy>
-	                        <width>4-col-gutter</width>
-	                        <height>4-col-gutter</height>
-	                        <aspectratio>stretch</aspectratio>
-	                        <texture border="6">$INFO[ListItem.Art(thumb)]</texture>
-	                        <bordertexture border="6" colordiffuse="11FFFFFF">colors/black.png</bordertexture>
-	                        <bordersize>6</bordersize>
-	                        <colordiffuse>ffFFFFFF</colordiffuse>
-	                    </control>
-	                </itemlayout>
-	                <focusedlayout width="4-col" height="348">
-	                    <control type="group">
-	                        <include>focusThumb</include>
-	                        <control type="image">
-	                            <posx>0</posx>
-	                            <posy>0</posy>
-	                            <width>4-col-gutter</width>
-	                            <height>4-col-gutter</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>4-col-gutter</height>
-	                            <aspectratio>stretch</aspectratio>
-	                            <texture border="6">$INFO[ListItem.Art(thumb)]</texture>
-	                            <bordertexture border="6" colordiffuse="FFFFFFFF">colors/white.png</bordertexture>
-	                            <bordersize>6</bordersize>
-	                        </control>
-	                        <control type="textbox">
-		                        <visible>isempty(listitem.title)</visible>
-		                        <posx>24</posx>
-		                        <posy>3-row</posy>
-		                        <width>228</width>
-		                        <height>6-row</height>
-		                        <font>largeStrong</font>
+							<textcolor>textActive</textcolor>
+							<label>$INFO[ListItem.label]</label>
+						</control>
+						<control type="label">
+							<visible>!controlgroup(9000).hasfocus</visible>
+							<posx>12</posx>
+							<posy>262</posy>
+							<width>240</width>
+							<height>1-row</height>
+							<aligny>center</aligny>
+							<font>thumbTitle</font>
+							<textcolor>textActive</textcolor>
+							<label>[B]$INFO[ListItem.Title][/B]</label>
+						</control>
+						<control type="label">
+							<visible>!controlgroup(9000).hasfocus</visible>
+							<posx>12</posx>
+							<posy>286</posy>
+							<width>240</width>
+							<height>1-row</height>
+							<aligny>center</aligny>
+							<font>thumbTitle</font>
+							<textcolor>textActive</textcolor>
+							<label>$INFO[ListItem.year]</label>
+						</control>
+					</itemlayout>
+					<focusedlayout width="4-col" height="348">
+						<control type="group">
+							<include>focusThumb</include>
+							<control type="image">
+								<posx>0</posx>
+								<posy>0</posy>
+								<width>4-col-gutter</width>
+								<height>4-col-gutter</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>4-col-gutter</height>
+								<aspectratio>stretch</aspectratio>
+								<texture>$INFO[ListItem.Art(thumb)]</texture>
+								<bordersize>6</bordersize>
+							</control>
+							<control type="textbox">
+								<visible>isempty(listitem.title)</visible>
+								<posx>24</posx>
+								<posy>3-row</posy>
+								<width>228</width>
+								<height>6-row</height>
+								<font>largeStrong</font>
 								<wrapmultiline>true</wrapmultiline>
-		                        <textcolor>textActive</textcolor>
-		                        <label>$INFO[ListItem.label]</label>
-		                    </control>
-	                        <control type="label">
-	                            <posx>12</posx>
-	                            <posy>262</posy>
-	                            <width>240</width>
-	                            <height>1-row</height>
-	                            <aligny>center</aligny>
-	                            <font>thumbTitle</font>
-	                            <textcolor>textActive</textcolor>
-	                            <label>[B]$INFO[ListItem.Title][/B]</label>
-	                        </control>
-	                        <control type="label">
-	                            <posx>12</posx>
-	                            <posy>286</posy>
-	                            <width>240</width>
-	                            <height>1-row</height>
-	                            <aligny>center</aligny>
-	                            <font>thumbTitle</font>
-	                            <textcolor>textActive</textcolor>
-	                            <label>$INFO[ListItem.year]</label>
-	                        </control>
-	                    </control>
-	                </focusedlayout>
-                </control>
-            </control>
-        </control>
-    </include>
-</includes>
\ No newline at end of file
+								<textcolor>textActive</textcolor>
+								<label>$INFO[ListItem.label]</label>
+							</control>
+							<control type="label">
+								<posx>12</posx>
+								<posy>262</posy>
+								<width>240</width>
+								<height>1-row</height>
+								<aligny>center</aligny>
+								<font>thumbTitle</font>
+								<textcolor>textActive</textcolor>
+								<label>[B]$INFO[ListItem.Title][/B]</label>
+							</control>
+							<control type="label">
+								<posx>12</posx>
+								<posy>286</posy>
+								<width>240</width>
+								<height>1-row</height>
+								<aligny>center</aligny>
+								<font>thumbTitle</font>
+								<textcolor>textActive</textcolor>
+								<label>$INFO[ListItem.year]</label>
+							</control>
+						</control>
+					</focusedlayout>
+				</control>
+			</control>
+		</control>
+	</include>
+</includes>
diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml
index ab3f425..c10bceb 100644
--- a/1080i/View_Movies.xml
+++ b/1080i/View_Movies.xml
@@ -2,79 +2,178 @@
 <includes>
 	<include name="movies">
 		<control type="group">
-			<control type="panel" id="50">
+			<control type="group" id="9125">
 				<visible>$EXP[isMovie]</visible>
-				<posx>90</posx>
-				<posy>row-5-begin</posy>
-				<width>1800</width>
-				<height>25-row</height>
-				<onleft>9000</onleft>
-				<onright>60</onright>
-				<ondown>50</ondown>
-				<onup>50</onup>
-				<onback>9000</onback>
-				<pagecontrol>60</pagecontrol>
-				<scrolltime tween="cubic" easing="out">600</scrolltime>
-				<itemlayout width="252" height="426">
-					<control type="image">
-						<posx>0</posx>
-						<posy>0</posy>
-						<width>228</width>
-						<height>342</height>
-						<aspectratio>stretch</aspectratio>
-						<texture border="6">colors/white.png</texture>
-						<bordertexture border="6" colordiffuse="11FFFFFF">colors/black.png</bordertexture>
-						<bordersize>6</bordersize>
-						<colordiffuse>highlight</colordiffuse>
-					</control>
-					<control type="textbox">
-						<visible>isempty(listitem.title)</visible>
-						<posx>24</posx>
-						<posy>3-row</posy>
-						<width>228</width>
-						<height>6-row</height>
-						<font>largeStrong</font>
-						<wrapmultiline>true</wrapmultiline>
-						<textcolor>textActive</textcolor>
-						<label>$INFO[ListItem.label]</label>
-					</control>
-					<control type="label">
-						<visible>!controlgroup(9000).hasfocus</visible>
-						<posx>12</posx>
-						<posy>338</posy>
-						<width>204</width>
-						<height>1-row</height>
-						<aligny>center</aligny>
-						<font>thumbTitle</font>
-						<textcolor>textActive</textcolor>
-						<label>[B]$INFO[ListItem.title][/B]</label>
-					</control>
-					<control type="label">
-						<visible>!controlgroup(9000).hasfocus</visible>
-						<posx>12</posx>
-						<posy>362</posy>
-						<width>204</width>
-						<height>1-row</height>
-						<aligny>center</aligny>
-						<font>thumbTitle</font>
-						<textcolor>textDisabled</textcolor>
-						<label>$INFO[ListItem.year]</label>
-					</control>
-					<control type="image">
-						<posx>0</posx>
-						<posy>0</posy>
-						<width>228</width>
-						<height>342</height>
-						<aspectratio>stretch</aspectratio>
-						<texture border="0">$INFO[ListItem.Art(poster)]</texture>
-						<bordertexture border="6" colordiffuse="11FFFFFF">colors/black.png</bordertexture>
-						<bordersize>6</bordersize>
-						<colordiffuse>ffffffff</colordiffuse>
-					</control>
-				</itemlayout>
-				<focusedlayout width="252" height="426">
-					<control type="group">
-						<include>focusThumb</include>
+				<animation type="Conditional" condition="!controlgroup(9125).hasfocus">
+	                <effect type="fade" start="100" end="0" time="100"/>
+	            </animation>
+				<animation type="Conditional" condition="controlgroup(9125).hasfocus">
+	                <effect type="fade" start="0" end="100" time="300" delay="300"/>
+	            </animation>
+				<!--quick link selector-->
+				<control type="list" id="9123">
+	                <posx>col-1-begin</posx>
+	                <posy>row-5-begin</posy>
+	                <width>24-col</width>
+	                <height>2-row</height>
+	                <onleft>9000</onleft>
+	                <ondown>9998</ondown>
+	                <onback>9000</onback>
+	                <orientation>horizontal</orientation>
+	                <itemlayout width="228" height="2-row">
+	                    <control type="label">
+	                        <posx>0</posx>
+	                        <posy>0</posy>
+	                        <width>228</width>
+	                        <height>2-row</height>
+	                        <font>itemTitle</font>
+	                        <aligny>center</aligny>
+	                        <textcolor>textDisabled</textcolor>
+	                        <shadowcolor>-</shadowcolor>
+	                        <label>$INFO[ListItem.property(textTitle)]</label>
+	                    </control>
+	                </itemlayout>
+	                <focusedlayout width="228" height="2-row">
+	                    <control type="label">
+	                        <posx>0</posx>
+	                        <posy>0</posy>
+	                        <width>228</width>
+	                        <height>2-row</height>
+	                        <font>itemTitle</font>
+	                        <aligny>center</aligny>
+	                        <textcolor>textActive</textcolor>
+	                        <shadowcolor>-</shadowcolor>
+	                        <label>$INFO[ListItem.property(textTitle)]</label>
+	                    </control>
+	                </focusedlayout>
+	                <content>
+	                    <item>
+	                        <label>special://skin/extras/playlists/recentMovies.xsp</label>
+	                        <property name="textTitle">31176</property>
+	                        <onclick>noop</onclick>
+	                    </item>
+	                    <item>
+	                        <label>special://skin/extras/playlists/inprogressMovies.xsp</label>
+	                        <property name="textTitle">31132</property>
+	                        <onclick>noop</onclick>
+	                    </item>
+	                </content>
+	            </control>
+				<!--quick links-->			
+				<control type="panel" id="9998">
+	                <posx>col-1-begin</posx>
+	                <posy>row-7-begin</posy>
+	                <width>24-col</width>
+	                <height>11-row</height>
+					<onup>9123</onup>
+	                <ondown>50</ondown>
+	                <onleft>9000</onleft>
+	                <onback>9000</onback>
+	                <orientation>horizontal</orientation>
+	                <itemlayout width="597" height="5-col-gutter">
+	                    <control type="image">
+	                        <posx>0</posx>
+	                        <posy>0</posy>
+	                        <width>597</width>
+	                        <height>5-col-gutter</height>
+	                        <aspectratio>stretch</aspectratio>
+	                        <texture border="6">colors/white.png</texture>
+	                        <bordertexture border="6" colordiffuse="22FFFFFF">colors/black.png</bordertexture>
+	                        <bordersize>6</bordersize>
+	                        <colordiffuse>highlight</colordiffuse>
+	                    </control>
+						<control type="image">
+	                        <posx>0</posx>
+	                        <posy>0</posy>
+	                        <width>597</width>
+	                        <height>5-col-gutter</height>
+	                        <aspectratio>stretch</aspectratio>
+	                        <texture>$INFO[ListItem.Art(fanart)]</texture>
+	                        <bordersize>6</bordersize>
+	                        <colordiffuse>ffffffff</colordiffuse>
+	                    </control>
+	                    <control type="label">
+	                        <visible>!controlgroup(9000).hasfocus</visible>
+	                        <posx>12</posx>
+	                        <posy>9-row</posy>
+	                        <width>312</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>      
+	                </itemlayout>
+	                <focusedlayout width="597" 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>
+	                            <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>597</width>
+	                            <height>5-col-gutter</height>
+	                            <aspectratio>stretch</aspectratio>
+	                            <texture>$INFO[ListItem.Art(fanart)]</texture>
+	                            <bordersize>6</bordersize>
+	                            <colordiffuse>ffffffff</colordiffuse>
+	                        </control>
+	                        <control type="label">
+		                        <visible>!controlgroup(9000).hasfocus</visible>
+		                        <posx>12</posx>
+		                        <posy>9-row</posy>
+		                        <width>312</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>
+	                </focusedlayout>
+					<content>$INFO[control.getlabel(9123)]</content>
+	            </control>
+			</control>
+			<!--all movies-->
+			<control type="group" id="9124">
+				<animation type="Conditional" condition="controlgroup(9124).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>
+	                <posx>col-1-begin</posx>
+	                <posy>row-19-begin</posy>
+	                <width>12-col</width>
+	                <height>2-row</height>
+	                <aligny>center</aligny>
+	                <font>itemTitle</font>
+	                <textcolor>textActive</textcolor>
+	                <label>$LOCALIZE[31224]</label>
+	            </control>
+				<control type="panel" id="50">
+					<visible>$EXP[isMovie]</visible>
+					<posx>90</posx>
+					<posy>row-21-begin</posy>
+					<width>1800</width>
+					<height>25-row</height>
+					<onleft>9000</onleft>
+					<onright>60</onright>
+					<ondown>50</ondown>
+					<onup>9125</onup>
+					<onback>9000</onback>
+					<pagecontrol>60</pagecontrol>
+					<scrolltime tween="cubic" easing="out">600</scrolltime>
+					<itemlayout width="252" height="426">
 						<control type="image">
 							<posx>0</posx>
 							<posy>0</posy>
@@ -82,10 +181,20 @@
 							<height>342</height>
 							<aspectratio>stretch</aspectratio>
 							<texture border="6">colors/white.png</texture>
-							<bordertexture border="6" colordiffuse="FFFFFFFF">colors/white.png</bordertexture>
+							<bordertexture border="6" colordiffuse="22FFFFFF">colors/black.png</bordertexture>
 							<bordersize>6</bordersize>
 							<colordiffuse>highlight</colordiffuse>
 						</control>
+						<control type="image">
+							<posx>0</posx>
+							<posy>0</posy>
+							<width>228</width>
+							<height>342</height>
+							<aspectratio>stretch</aspectratio>
+							<texture>$INFO[ListItem.Art(poster)]</texture>
+							<bordersize>6</bordersize>
+							<colordiffuse>ffffffff</colordiffuse>
+						</control>
 						<control type="textbox">
 							<visible>isempty(listitem.title)</visible>
 							<posx>24</posx>
@@ -97,17 +206,8 @@
 							<textcolor>textActive</textcolor>
 							<label>$INFO[ListItem.label]</label>
 						</control>
-						<control type="image">
-							<posx>0</posx>
-							<posy>0</posy>
-							<width>228</width>
-							<height>342</height>
-							<aspectratio>stretch</aspectratio>
-							<texture border="0">$INFO[ListItem.Art(poster)]</texture>
-							<bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
-							<bordersize>6</bordersize>
-						</control>
 						<control type="label">
+							<visible>!controlgroup(9000).hasfocus</visible>
 							<posx>12</posx>
 							<posy>338</posy>
 							<width>204</width>
@@ -118,17 +218,74 @@
 							<label>[B]$INFO[ListItem.title][/B]</label>
 						</control>
 						<control type="label">
+							<visible>!controlgroup(9000).hasfocus</visible>
 							<posx>12</posx>
 							<posy>362</posy>
 							<width>204</width>
 							<height>1-row</height>
 							<aligny>center</aligny>
 							<font>thumbTitle</font>
-							<textcolor>textActive</textcolor>
+							<textcolor>textDisabled</textcolor>
 							<label>$INFO[ListItem.year]</label>
 						</control>
-					</control>
-				</focusedlayout>
+					</itemlayout>
+					<focusedlayout width="252" height="426">
+						<control type="group">
+							<include>focusThumb</include>
+							<control type="image">
+								<posx>0</posx>
+								<posy>0</posy>
+								<width>228</width>
+								<height>342</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>228</width>
+								<height>342</height>
+								<aspectratio>stretch</aspectratio>
+								<texture>$INFO[ListItem.Art(poster)]</texture>
+								<bordersize>6</bordersize>
+							</control>
+							<control type="textbox">
+								<visible>isempty(listitem.title)</visible>
+								<posx>24</posx>
+								<posy>3-row</posy>
+								<width>228</width>
+								<height>6-row</height>
+								<font>largeStrong</font>
+								<wrapmultiline>true</wrapmultiline>
+								<textcolor>textActive</textcolor>
+								<label>$INFO[ListItem.label]</label>
+							</control>
+							<control type="label">
+								<posx>12</posx>
+								<posy>338</posy>
+								<width>204</width>
+								<height>1-row</height>
+								<aligny>center</aligny>
+								<font>thumbTitle</font>
+								<textcolor>textActive</textcolor>
+								<label>[B]$INFO[ListItem.title][/B]</label>
+							</control>
+							<control type="label">
+								<posx>12</posx>
+								<posy>362</posy>
+								<width>204</width>
+								<height>1-row</height>
+								<aligny>center</aligny>
+								<font>thumbTitle</font>
+								<textcolor>textActive</textcolor>
+								<label>$INFO[ListItem.year]</label>
+							</control>
+						</control>
+					</focusedlayout>
+				</control>
 			</control>
 		</control>
 	</include>
diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml
index eae55f9..3b1b7d5 100644
--- a/1080i/View_TVShows.xml
+++ b/1080i/View_TVShows.xml
@@ -1,158 +1,315 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <includes>
-    <include name="tvshows">
-        <control type="group">
-            <control type="panel" id="50">
-                <visible>$EXP[isTVShow]</visible>
-                <posx>90</posx>
-                <posy>row-5-begin</posy>
-                <width>1800</width>
-                <height>25-row</height>
-                <onleft>9000</onleft>
-                <onright>60</onright>
-                <ondown>50</ondown>
-                <onup>50</onup>
-                <onback>9000</onback>
-                <pagecontrol>60</pagecontrol>
-                <scrolltime tween="cubic" easing="out">600</scrolltime>
-                <itemlayout width="252" height="426">
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>228</width>
-                        <height>342</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture border="6">colors/white.png</texture>
-                        <bordertexture border="6" colordiffuse="11FFFFFF">colors/black.png</bordertexture>
-                        <bordersize>6</bordersize>
-                        <colordiffuse>highlight</colordiffuse>
-                    </control>
-                    <control type="textbox">
-                        <visible>isempty(listitem.title)</visible>
-                        <posx>24</posx>
-                        <posy>3-row</posy>
-                        <width>228</width>
-                        <height>6-row</height>
-                        <font>largeStrong</font>
-						<wrapmultiline>true</wrapmultiline>
-                        <textcolor>textActive</textcolor>
-                        <label>$INFO[ListItem.label]</label>
-                    </control>
-                    <control type="label">
-	<visible>!controlgroup(9000).hasfocus</visible>
-                        <posx>12</posx>
-                        <posy>338</posy>
-                        <width>204</width>
-                        <height>1-row</height>
-                        <aligny>center</aligny>
-                        <font>thumbTitle</font>
-                        <textcolor>textActive</textcolor>
-                        <label>[B]$INFO[ListItem.title][/B]</label>
-                    </control>
-                    <control type="label">
-                        <visible>!System.Setting(hidewatched) + !controlgroup(9000).hasfocus</visible>
-                        <posx>12</posx>
-                        <posy>362</posy>
-                        <width>204</width>
-                        <height>1-row</height>
-                        <aligny>center</aligny>
-                        <font>thumbTitle</font>
-                        <textcolor>textDisabled</textcolor>
-                        <label>$INFO[ListItem.Property(TotalEpisodes),, $LOCALIZE[31189]]</label>
-                    </control>
-                    <control type="label">
-                        <visible>System.Setting(hidewatched) + !controlgroup(9000).hasfocus</visible>
-                        <posx>12</posx>
-                        <posy>362</posy>
-                        <width>204</width>
-                        <height>1-row</height>
-                        <aligny>center</aligny>
-                        <font>thumbTitle</font>
-                        <textcolor>textDisabled</textcolor>
-                        <label>$INFO[ListItem.Property(UnWatchedEpisodes),, $LOCALIZE[31189]]</label>
-                    </control>
-                    <control type="image">
-                        <posx>0</posx>
-                        <posy>0</posy>
-                        <width>228</width>
-                        <height>342</height>
-                        <aspectratio>stretch</aspectratio>
-                        <texture border="0">$INFO[ListItem.Art(poster)]</texture>
-                        <bordertexture border="6" colordiffuse="11FFFFFF">colors/black.png</bordertexture>
-                        <bordersize>6</bordersize>
-                        <colordiffuse>ffffffff</colordiffuse>
-                    </control>
-                </itemlayout>
-                <focusedlayout width="252" height="426">
-                    <control type="group">
-                        <include>focusThumb</include>
-						<control type="image">
+	<include name="tvshows">
+		<control type="group">
+			<control type="group" id="9125">
+				<visible>$EXP[isTVShow]</visible>
+				<animation type="Conditional" condition="!controlgroup(9125).hasfocus">
+	                <effect type="fade" start="100" end="0" time="100"/>
+	            </animation>
+				<animation type="Conditional" condition="controlgroup(9125).hasfocus">
+	                <effect type="fade" start="0" end="100" time="300" delay="300"/>
+	            </animation>
+				<!--quick link selector-->
+				<control type="list" id="9126">
+	                <posx>col-1-begin</posx>
+	                <posy>row-5-begin</posy>
+	                <width>24-col</width>
+	                <height>2-row</height>
+	                <onleft>9000</onleft>
+	                <ondown>9998</ondown>
+	                <onback>9000</onback>
+	                <orientation>horizontal</orientation>
+	                <itemlayout width="228" height="2-row">
+	                    <control type="label">
 	                        <posx>0</posx>
 	                        <posy>0</posy>
 	                        <width>228</width>
-	                        <height>342</height>
+	                        <height>2-row</height>
+	                        <font>itemTitle</font>
+	                        <aligny>center</aligny>
+	                        <textcolor>textDisabled</textcolor>
+	                        <shadowcolor>-</shadowcolor>
+	                        <label>$INFO[ListItem.property(textTitle)]</label>
+	                    </control>
+	                </itemlayout>
+	                <focusedlayout width="228" height="2-row">
+	                    <control type="label">
+	                        <posx>0</posx>
+	                        <posy>0</posy>
+	                        <width>228</width>
+	                        <height>2-row</height>
+	                        <font>itemTitle</font>
+	                        <aligny>center</aligny>
+	                        <textcolor>textActive</textcolor>
+	                        <shadowcolor>-</shadowcolor>
+	                        <label>$INFO[ListItem.property(textTitle)]</label>
+	                    </control>
+	                </focusedlayout>
+	                <content>
+						<item>
+	                        <label>special://skin/extras/playlists/recentEpisodes.xsp</label>
+	                        <property name="textTitle">31178</property>
+	                        <onclick>noop</onclick>
+	                    </item>
+	                    <item>
+	                        <label>special://skin/extras/playlists/inprogressTVShows.xsp</label>
+	                        <property name="textTitle">31127</property>
+	                        <onclick>noop</onclick>
+	                    </item>
+	                </content>
+	            </control>
+				<!--quick links-->			
+				<control type="panel" id="9998">
+	                <posx>col-1-begin</posx>
+	                <posy>row-7-begin</posy>
+	                <width>24-col</width>
+	                <height>11-row</height>
+					<onup>9126</onup>
+	                <ondown>50</ondown>
+	                <onleft>9000</onleft>
+	                <onback>9000</onback>
+	                <orientation>horizontal</orientation>
+	                <itemlayout width="597" height="5-col-gutter">
+	                    <control type="image">
+	                        <posx>0</posx>
+	                        <posy>0</posy>
+	                        <width>597</width>
+	                        <height>5-col-gutter</height>
 	                        <aspectratio>stretch</aspectratio>
 	                        <texture border="6">colors/white.png</texture>
-	                        <bordertexture border="6" colordiffuse="11FFFFFF">colors/black.png</bordertexture>
+	                        <bordertexture border="6" colordiffuse="22FFFFFF">colors/black.png</bordertexture>
 	                        <bordersize>6</bordersize>
 	                        <colordiffuse>highlight</colordiffuse>
 	                    </control>
-	                    <control type="textbox">
-	                        <visible>isempty(listitem.title)</visible>
-	                        <posx>24</posx>
-	                        <posy>3-row</posy>
-	                        <width>228</width>
-	                        <height>6-row</height>
-	                        <font>largeStrong</font>
-							<wrapmultiline>true</wrapmultiline>
-	                        <textcolor>textActive</textcolor>
-	                        <label>$INFO[ListItem.label]</label>
+						<control type="image">
+	                        <posx>0</posx>
+	                        <posy>0</posy>
+	                        <width>597</width>
+	                        <height>5-col-gutter</height>
+	                        <aspectratio>stretch</aspectratio>
+	                        <texture>$INFO[ListItem.Art(fanart)]</texture>
+	                        <bordersize>6</bordersize>
+	                        <colordiffuse>ffffffff</colordiffuse>
 	                    </control>
-                        <control type="image">
-                            <posx>0</posx>
-                            <posy>0</posy>
-                            <width>228</width>
-                            <height>342</height>
-                            <aspectratio>stretch</aspectratio>
-                            <texture border="0">$INFO[ListItem.Art(poster)]</texture>
-                            <bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
-                            <bordersize>6</bordersize>
-                        </control>
-                        <control type="label">
-                            <posx>12</posx>
-                            <posy>338</posy>
-                            <width>204</width>
-                            <height>1-row</height>
-                            <aligny>center</aligny>
-                            <font>thumbTitle</font>
-                            <textcolor>textActive</textcolor>
-                            <label>[B]$INFO[ListItem.title][/B]</label>
-                        </control>
-                        <control type="label">
-                            <visible>!System.Setting(hidewatched)</visible>
-                            <posx>12</posx>
-                            <posy>362</posy>
-                            <width>204</width>
-                            <height>1-row</height>
-                            <aligny>center</aligny>
-                            <font>thumbTitle</font>
-                            <textcolor>textDisabled</textcolor>
-                            <label>$INFO[ListItem.Property(TotalEpisodes),, $LOCALIZE[31189]]</label>
-                        </control>
-                        <control type="label">
-                            <visible>System.Setting(hidewatched)</visible>
-                            <posx>12</posx>
-                            <posy>362</posy>
-                            <width>204</width>
-                            <height>1-row</height>
-                            <aligny>center</aligny>
-                            <font>thumbTitle</font>
-                            <textcolor>textDisabled</textcolor>
-                            <label>$INFO[ListItem.Property(UnWatchedEpisodes),, $LOCALIZE[31189]]</label>
-                        </control>
-                    </control>
-                </focusedlayout>
+	                    <control type="label">
+	                        <visible>!controlgroup(9000).hasfocus</visible>
+	                        <posx>12</posx>
+	                        <posy>9-row</posy>
+	                        <width>312</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>      
+	                </itemlayout>
+	                <focusedlayout width="597" 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>
+	                            <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>597</width>
+	                            <height>5-col-gutter</height>
+	                            <aspectratio>stretch</aspectratio>
+	                            <texture>$INFO[ListItem.Art(fanart)]</texture>
+	                            <bordersize>6</bordersize>
+	                            <colordiffuse>ffffffff</colordiffuse>
+	                        </control>
+	                        <control type="label">
+		                        <visible>!controlgroup(9000).hasfocus</visible>
+		                        <posx>12</posx>
+		                        <posy>9-row</posy>
+		                        <width>312</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>
+	                    </control>
+	                </focusedlayout>
+					<content>$INFO[control.getlabel(9126)]</content>
+	            </control>
+			</control>
+		</control>
+		<!--all TVShows-->
+		<control type="group" id="9124">
+			<animation type="Conditional" condition="controlgroup(9124).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</visible>
+                <posx>col-1-begin</posx>
+                <posy>row-19-begin</posy>
+                <width>12-col</width>
+                <height>2-row</height>
+                <aligny>center</aligny>
+                <font>itemTitle</font>
+                <textcolor>textActive</textcolor>
+                <label>$LOCALIZE[31225]</label>
             </control>
-        </control>
-    </include>
-</includes>
\ No newline at end of file
+			<control type="panel" id="50">
+				<visible>$EXP[isTVShow]</visible>
+				<posx>90</posx>
+				<posy>row-21-begin</posy>
+				<width>1800</width>
+				<height>25-row</height>
+				<onleft>9000</onleft>
+				<onright>60</onright>
+				<ondown>50</ondown>
+				<onup>9125</onup>
+				<onback>9000</onback>
+				<pagecontrol>60</pagecontrol>
+				<scrolltime tween="cubic" easing="out">600</scrolltime>
+				<itemlayout width="252" height="426">
+					<control type="image">
+						<posx>0</posx>
+						<posy>0</posy>
+						<width>228</width>
+						<height>342</height>
+						<aspectratio>stretch</aspectratio>
+						<texture border="6">colors/white.png</texture>
+						<bordertexture border="6" colordiffuse="22FFFFFF">colors/black.png</bordertexture>
+						<bordersize>6</bordersize>
+						<colordiffuse>highlight</colordiffuse>
+					</control>
+					<control type="image">
+						<posx>0</posx>
+						<posy>0</posy>
+						<width>228</width>
+						<height>342</height>
+						<aspectratio>stretch</aspectratio>
+						<texture>$INFO[ListItem.Art(poster)]</texture>
+						<bordersize>6</bordersize>
+						<colordiffuse>ffffffff</colordiffuse>
+					</control>
+					<control type="textbox">
+						<visible>isempty(listitem.title)</visible>
+						<posx>24</posx>
+						<posy>3-row</posy>
+						<width>228</width>
+						<height>6-row</height>
+						<font>largeStrong</font>
+						<wrapmultiline>true</wrapmultiline>
+						<textcolor>textActive</textcolor>
+						<label>$INFO[ListItem.label]</label>
+					</control>
+					<control type="label">
+						<visible>!controlgroup(9000).hasfocus</visible>
+						<posx>12</posx>
+						<posy>338</posy>
+						<width>204</width>
+						<height>1-row</height>
+						<aligny>center</aligny>
+						<font>thumbTitle</font>
+						<textcolor>textActive</textcolor>
+						<label>[B]$INFO[ListItem.title][/B]</label>
+					</control>
+					<control type="label">
+						<visible>!System.Setting(hidewatched) + !controlgroup(9000).hasfocus</visible>
+						<posx>12</posx>
+						<posy>362</posy>
+						<width>204</width>
+						<height>1-row</height>
+						<aligny>center</aligny>
+						<font>thumbTitle</font>
+						<textcolor>textDisabled</textcolor>
+						<label>$INFO[ListItem.Property(TotalEpisodes),, $LOCALIZE[31189]]</label>
+					</control>
+					<control type="label">
+						<visible>System.Setting(hidewatched) + !controlgroup(9000).hasfocus</visible>
+						<posx>12</posx>
+						<posy>362</posy>
+						<width>204</width>
+						<height>1-row</height>
+						<aligny>center</aligny>
+						<font>thumbTitle</font>
+						<textcolor>textDisabled</textcolor>
+						<label>$INFO[ListItem.Property(UnWatchedEpisodes),, $LOCALIZE[31189]]</label>
+					</control>
+				</itemlayout>
+				<focusedlayout width="252" height="426">
+					<control type="group">
+						<include>focusThumb</include>
+						<control type="image">
+							<posx>0</posx>
+							<posy>0</posy>
+							<width>228</width>
+							<height>342</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>228</width>
+							<height>342</height>
+							<aspectratio>stretch</aspectratio>
+							<texture>$INFO[ListItem.Art(poster)]</texture>
+							<bordersize>6</bordersize>
+						</control>
+						<control type="textbox">
+							<visible>isempty(listitem.title)</visible>
+							<posx>24</posx>
+							<posy>3-row</posy>
+							<width>228</width>
+							<height>6-row</height>
+							<font>largeStrong</font>
+							<wrapmultiline>true</wrapmultiline>
+							<textcolor>textActive</textcolor>
+							<label>$INFO[ListItem.label]</label>
+						</control>
+						<control type="label">
+							<posx>12</posx>
+							<posy>338</posy>
+							<width>204</width>
+							<height>1-row</height>
+							<aligny>center</aligny>
+							<font>thumbTitle</font>
+							<textcolor>textActive</textcolor>
+							<label>[B]$INFO[ListItem.title][/B]</label>
+						</control>
+						<control type="label">
+							<visible>!System.Setting(hidewatched)</visible>
+							<posx>12</posx>
+							<posy>362</posy>
+							<width>204</width>
+							<height>1-row</height>
+							<aligny>center</aligny>
+							<font>thumbTitle</font>
+							<textcolor>textDisabled</textcolor>
+							<label>$INFO[ListItem.Property(TotalEpisodes),, $LOCALIZE[31189]]</label>
+						</control>
+						<control type="label">
+							<visible>System.Setting(hidewatched)</visible>
+							<posx>12</posx>
+							<posy>362</posy>
+							<width>204</width>
+							<height>1-row</height>
+							<aligny>center</aligny>
+							<font>thumbTitle</font>
+							<textcolor>textDisabled</textcolor>
+							<label>$INFO[ListItem.Property(UnWatchedEpisodes),, $LOCALIZE[31189]]</label>
+						</control>
+					</control>
+				</focusedlayout>
+			</control>
+		</control>
+	</include>
+</includes>
diff --git a/language/English/strings.po b/language/English/strings.po
index 49ff085..380a774 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -917,3 +917,14 @@ msgctxt "#31222"
 msgid "Change Channel Group"
 msgstr ""
 
+msgctxt "#31223"
+msgid "All Albums"
+msgstr ""
+
+msgctxt "#31224"
+msgid "All Movies"
+msgstr ""
+
+msgctxt "#31225"
+msgid "All TV Shows"
+msgstr ""