diff --git a/1080i/DialogVideoInfo.xml b/1080i/DialogVideoInfo.xml
index f76b8dc..ef98736 100644
--- a/1080i/DialogVideoInfo.xml
+++ b/1080i/DialogVideoInfo.xml
@@ -251,10 +251,8 @@
                     <posy>0</posy>
                     <width>12-col</width>
                     <height>486</height>
-                    <aspectratio scalediffuse="false" aligny="top">scale</aspectratio>
-                    <texture fallback="colors/black.png">$INFO[Listitem.thumb]</texture>
-                    <bordertexture colordiffuse="11ffffff">colors/white.png</bordertexture>
-                    <bordersize>6</bordersize>
+                    <aspectratio aligny="top">stretch</aspectratio>
+                    <texture fallback="colors/black.png" diffuse="masks/episodeThumb.png">$INFO[Listitem.thumb]</texture>
                 </control>
             </control>
             <!--content-->
@@ -295,7 +293,7 @@
                         <aligny>center</aligny>
                         <font>itemTitle</font>
                         <textcolor>textActive</textcolor>
-                        <label fallback="13205">$INFO[listitem.duration]    [COLOR textboxInactive]$INFO[listitem.filename][/COLOR]</label>
+                        <label fallback="13205">$INFO[ListItem.duration(H)]hr $INFO[ListItem.duration(MM)]min    [COLOR textboxInactive]$INFO[listitem.filename][/COLOR]</label>
                     </control>
                 </control>
                 <!--synopsis-->
diff --git a/1080i/Includes_mediaShowcase.xml b/1080i/Includes_mediaShowcase.xml
index f147873..899eee7 100644
--- a/1080i/Includes_mediaShowcase.xml
+++ b/1080i/Includes_mediaShowcase.xml
@@ -73,22 +73,18 @@
                 <posx>0</posx>
                 <width>504</width>
                 <height>756</height>
-                <texture>$INFO[listitem.art(poster)]</texture>
+                <texture diffuse="masks/showcasePoster.png">$INFO[listitem.art(poster)]</texture>
                 <colordiffuse>ffffffff</colordiffuse>
                 <aspectratio>stretch</aspectratio>
-                <bordertexture border="3">colors/white.png</bordertexture>
-                <bordersize>3</bordersize>
             </control>
             <control type="image">
                 <posx>2-col</posx>
                 <visible>!String.IsEmpty(ListItem.art(fanart))</visible>
                 <width>1344</width>
                 <height>756</height>
-                <texture>$INFO[listitem.art(fanart)]</texture>
+                <texture diffuse="masks/showcaseFanart.png">$INFO[listitem.art(fanart)]</texture>
                 <colordiffuse>ffffffff</colordiffuse>
                 <aspectratio>stretch</aspectratio>
-                <bordertexture border="3">colors/white.png</bordertexture>
-                <bordersize>3</bordersize>
             </control>
             <control type="panel" id="50">
                 <posx>180</posx>
@@ -103,9 +99,7 @@
                         <width>300</width>
                         <height>300</height>
                         <aspectratio scalediffuse="false">scale</aspectratio>
-                        <texture border="0" fallback="colors/offblack.png">$INFO[listitem.thumb]</texture>
-                        <bordertexture border="3">colors/white.png</bordertexture>
-                        <bordersize>3</bordersize>
+                        <texture fallback="colors/offblack.png" diffuse="masks/showcaseCast.png">$INFO[listitem.thumb]</texture>
                         <colordiffuse>ffFFFFFF</colordiffuse>
                     </control>
                     <control type="group">
@@ -137,18 +131,16 @@
                 <visible>!String.IsEmpty(container(99999).ListItemNoWrap(0).filenameandpath) + !Skin.HasSetting(disableExtendedFanart)</visible>
                 <width>1344</width>
                 <height>756</height>
-                <texture>$INFO[container(99999).ListItemNoWrap(0).filenameandpath,,]</texture>
+                <texture diffuse="masks/showcaseFanart.png">$INFO[container(99999).ListItemNoWrap(0).filenameandpath,,]</texture>
                 <colordiffuse>ffffffff</colordiffuse>
                 <aspectratio>stretch</aspectratio>
-                <bordertexture border="3">colors/white.png</bordertexture>
-                <bordersize>3</bordersize>
             </control>
             <control type="image">
                 <posx>2-col</posx>
                 <visible>!String.IsEmpty(listitem.art(discart))</visible>
                 <width>756</width>
                 <height>756</height>
-                <texture>$INFO[listitem.art(discart)]</texture>
+                <texture diffuse="masks/showcaseDiscart.png">$INFO[listitem.art(discart)]</texture>
                 <colordiffuse>ffffffff</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
@@ -157,44 +149,36 @@
                 <visible>!String.IsEmpty(container(99999).ListItemNoWrap(1).filenameandpath) + !Skin.HasSetting(disableExtendedFanart)</visible>
                 <width>1344</width>
                 <height>756</height>
-                <texture>$INFO[container(99999).ListItemNoWrap(1).filenameandpath,,]</texture>
+                <texture diffuse="masks/showcaseFanart.png">$INFO[container(99999).ListItemNoWrap(1).filenameandpath,,]</texture>
                 <colordiffuse>ffffffff</colordiffuse>
                 <aspectratio>stretch</aspectratio>
-                <bordertexture border="3">colors/white.png</bordertexture>
-                <bordersize>3</bordersize>
             </control>
             <control type="image">
                 <posx>2-col</posx>
                 <visible>!String.IsEmpty(container(99999).ListItemNoWrap(2).filenameandpath) + !Skin.HasSetting(disableExtendedFanart)</visible>
                 <width>1344</width>
                 <height>756</height>
-                <texture>$INFO[container(99999).ListItemNoWrap(2).filenameandpath,,]</texture>
+                <texture diffuse="masks/showcaseFanart.png">$INFO[container(99999).ListItemNoWrap(2).filenameandpath,,]</texture>
                 <colordiffuse>ffffffff</colordiffuse>
                 <aspectratio>stretch</aspectratio>
-                <bordertexture border="3">colors/white.png</bordertexture>
-                <bordersize>3</bordersize>
             </control>
             <control type="image">
                 <posx>2-col</posx>
                 <visible>!String.IsEmpty(container(99999).ListItemNoWrap(3).filenameandpath) + !Skin.HasSetting(disableExtendedFanart)</visible>
                 <width>1344</width>
                 <height>756</height>
-                <texture>$INFO[container(99999).ListItemNoWrap(3).filenameandpath,,]</texture>
+                <texture diffuse="masks/showcaseFanart.png">$INFO[container(99999).ListItemNoWrap(3).filenameandpath,,]</texture>
                 <colordiffuse>ffffffff</colordiffuse>
                 <aspectratio>stretch</aspectratio>
-                <bordertexture border="3">colors/white.png</bordertexture>
-                <bordersize>3</bordersize>
             </control>
             <control type="image">
                 <posx>2-col</posx>
                 <visible>!String.IsEmpty(container(99999).ListItemNoWrap(4).filenameandpath) + !Skin.HasSetting(disableExtendedFanart)</visible>
                 <width>1344</width>
                 <height>756</height>
-                <texture>$INFO[container(99999).ListItemNoWrap(4).filenameandpath,,]</texture>
+                <texture diffuse="masks/showcaseFanart.png">$INFO[container(99999).ListItemNoWrap(4).filenameandpath,,]</texture>
                 <colordiffuse>ffffffff</colordiffuse>
                 <aspectratio>stretch</aspectratio>
-                <bordertexture border="3">colors/white.png</bordertexture>
-                <bordersize>3</bordersize>
             </control>
         </control>
 
diff --git a/1080i/MyMusicNav.xml b/1080i/MyMusicNav.xml
index 645b017..9482135 100644
--- a/1080i/MyMusicNav.xml
+++ b/1080i/MyMusicNav.xml
@@ -3,6 +3,7 @@
     <defaultcontrol always="true">9999</defaultcontrol>
     <include>fadeInOut</include>
     <onload>Skin.SetString(recentitems,music)</onload>
+    <onload>Skin.SetString(musicQuickLinkValue,special://skin/extras/playlists/recentAlbums.xsp)</onload>
 	<views>50,51,52,53,54,55,56,57,59</views>
     <controls>
         <include>globalBackground</include>
diff --git a/1080i/MyPVRRecordings.xml b/1080i/MyPVRRecordings.xml
index c641daf..e7e58bf 100644
--- a/1080i/MyPVRRecordings.xml
+++ b/1080i/MyPVRRecordings.xml
@@ -62,7 +62,7 @@
                             <label>✓</label>
                         </control>
                         <control type="label">
-                            <posx>1-col-indent</posx>
+                            <posx>108</posx>
                             <posy>0</posy>
                             <width>15-col</width>
                             <height>2-row</height>
@@ -121,7 +121,7 @@
                             </control>
                         </control>
                         <control type="label">
-                            <posx>1-col-indent</posx>
+                            <posx>108</posx>
                             <posy>0</posy>
                             <width>15-col</width>
                             <height>2-row</height>
diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml
index 27cc3e5..ef00024 100644
--- a/1080i/MyVideoNav.xml
+++ b/1080i/MyVideoNav.xml
@@ -3,6 +3,8 @@
     <defaultcontrol always="true">9999</defaultcontrol>
     <onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload>
     <onload>Skin.SetString(recentitems,video)</onload>
+    <onload>Sin.SetString(tvQuickLinkValue,Skin.SetString(tvQuickLinkValue,special://skin/extras/playlists/recentEpisodes.xsp))</onload>
+    <onload>Skin.SetString(movieQuickLinkValue,special://skin/extras/playlists/recentMovies.xsp)</onload>
 	<onload condition="String.Contains(container.folderpath,plugin://)">Container.SetViewMode(54)</onload>
     <include>fadeInOut</include>
 	<views>50,51,52,53,54,55,58,59</views>
diff --git a/1080i/View_Albums.xml b/1080i/View_Albums.xml
index c206adf..e9e8bde 100644
--- a/1080i/View_Albums.xml
+++ b/1080i/View_Albums.xml
@@ -23,68 +23,91 @@
 	                <effect type="fade" start="0" end="100" time="300" delay="350"/>
 	            </animation>
 				<!--quick link selector-->
-				<control type="list" id="9123">
-	                <posx>col-1-begin</posx>
-	                <posy>180</posy>
-	                <width>24-col</width>
-	                <height>2-row</height>
-	                <onleft>9000</onleft>
-	                <ondown>9998</ondown>
-	                <onback>9000</onback>
-	                <orientation>horizontal</orientation>
-	                <itemlayout width="246" height="2-row">
-	                    <control type="label">
-	                        <posx>0</posx>
-	                        <posy>0</posy>
-	                        <width>246</width>
-	                        <height>2-row</height>
-	                        <font>menuTitle</font>
-	                        <aligny>center</aligny>
-	                        <textcolor>textDisabled</textcolor>
-	                        <shadowcolor></shadowcolor>
-	                        <label>$INFO[ListItem.property(textTitle)]</label>
-	                    </control>
-	                </itemlayout>
-	                <focusedlayout width="246" height="2-row">
-	                    <control type="label">
-	                        <posx>0</posx>
-	                        <posy>0</posy>
-	                        <width>246</width>
-	                        <height>2-row</height>
-	                        <font>menuTitle</font>
-	                        <aligny>center</aligny>
-	                        <textcolor>textActive</textcolor>
-	                        <shadowcolor></shadowcolor>
-	                        <label>$INFO[ListItem.property(textTitle)]</label>
-							<animation type="conditional" condition="control.hasfocus(9123)" loop="true">
-	                            <effect type="fade" start="100" end="50" time="1000"/>
-	                        </animation>
-	                    </control>
-	                </focusedlayout>
-	                <content>
-	                    <item>
-	                        <label>special://skin/extras/playlists/recentAlbums.xsp</label>
-	                        <property name="textTitle">31180</property>
-	                    </item>
-	                    <item>
-	                        <label>special://skin/extras/playlists/topAlbums.xsp</label>
-	                        <property name="textTitle">31187</property>
-	                    </item>
-	                    <item>
-	                        <label>special://skin/extras/playlists/randomAlbums.xsp</label>
-	                        <property name="textTitle">31181</property>
-	                    </item>
-	                </content>
-	            </control>
+                <control type="group">
+	                <posx>col-4-begin</posx>
+	                <posy>170</posy>
+    				<control type="image">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>18-col</width>
+                        <height>2-row</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture>masks/menuBar.png</texture>
+                        <colordiffuse>77000000</colordiffuse>
+                    </control>
+                    <control type="grouplist" id="9202">
+    	                <posx>0</posx>
+    	                <posy>0</posy>
+                        <orientation>horizontal</orientation>
+                        <itemgap>0</itemgap>
+    	                <onleft>9000</onleft>
+    	                <ondown>9998</ondown>
+    	                <onback>9000</onback>
+                		<control type="button" id="506">
+                            <description>Search</description>
+                            <visible>System.HasAddon(script.globalsearch)</visible>
+                            <width>1-col</width>
+                            <texturenofocus></texturenofocus>
+                            <texturefocus>masks/circle.png</texturefocus>
+                            <focusedcolor>black</focusedcolor>
+                            <font>symbolLarge</font>
+                            <label></label>
+                            <onclick>RunScript(script.globalsearch,artists=true&amp;albums=true&amp;songs=true&amp;musicvideos=true)</onclick>
+                        </control>            
+                        <control type="button" id="4000">
+                            <label>31180</label>
+                            <texturenofocus></texturenofocus>
+                            <onfocus>Skin.SetString(musicQuickLinkValue,special://skin/extras/playlists/recentAlbums.xsp)</onfocus>
+                            <ondown>control.setfocus(9998,0)</ondown>
+                        </control> 
+                        <control type="button" id="4001">
+                            <label>31187</label>
+                            <texturenofocus></texturenofocus>
+                            <onfocus>Skin.SetString(musicQuickLinkValue,special://skin/extras/playlists/topAlbums.xsp)</onfocus>
+                            <ondown>control.setfocus(9998,0)</ondown>
+                        </control>
+                        <control type="button" id="4002">
+                            <label>31181</label>
+                            <texturenofocus></texturenofocus>
+                            <onfocus>Skin.SetString(musicQuickLinkValue,special://skin/extras/playlists/randomAlbums.xsp)</onfocus>
+                            <ondown>control.setfocus(9998,0)</ondown>
+                        </control>
+                        <control type="button" id="3222">
+                            <description>Sort by</description>
+                            <texturenofocus></texturenofocus>
+                            <label>$LOCALIZE[31008]: $INFO[Container.SortMethod]</label>
+                            <onclick>Container.NextSortMethod</onclick>
+                            <onclick>Control.setfocus(54,0,absolute)</onclick>
+                            <onclick>Control.setfocus(3222)</onclick>
+                        </control>
+                        <control type="togglebutton" id="3223">
+                            <description>Sort direction</description>
+                            <focusedcolor>black</focusedcolor>
+                            <color>textActive</color>
+                            <texturenofocus></texturenofocus>
+                            <texturefocus colordiffuse="ffffffff">masks/circle.png</texturefocus>
+                            <alttexturefocus colordiffuse="FFFFFFFF">masks/circle.png</alttexturefocus>
+                            <alttexturenofocus></alttexturenofocus>
+                            <textoffsetx>0</textoffsetx>
+                            <width>1-col</width>
+                            <font>symbolLarge</font>
+                            <label></label>
+                            <altlabel></altlabel>
+                            <onclick>Container.SetSortDirection</onclick>
+                            <onclick>Control.setfocus(54,0,absolute)</onclick>
+                            <onclick>Control.setfocus(3223)</onclick>
+                        </control>   
+                    </control>
+                </control>
 				<!--quick links-->			
 				<control type="panel" id="9998">
 	                <posx>90</posx>
 	                <posy>288</posy>
 	                <width>24-col</width>
 	                <height>11-row</height>
-					<onup>9123</onup>
+					<onup>9202</onup>
 	                <ondown>54</ondown>
-	                <onleft>9000</onleft>
+	                <onleft>9998</onleft>
 	                <onback>9000</onback>
 	                <orientation>horizontal</orientation>
 	                <onclick>activatewindow(music,musicdb://albums/$INFO[listitem.DBID]/,return)</onclick>
@@ -96,8 +119,7 @@
 	                        <width>324</width>
 	                        <height>324</height>
 	                        <aspectratio>stretch</aspectratio>
-	                        <texture>colors/black.png</texture>
-	                        <bordersize>12</bordersize>
+	                        <texture diffuse="masks/albumThumb_2.png">colors/black.png</texture>
 	                    </control>
 						<control type="image">
 	                        <posx>0</posx>
@@ -105,20 +127,19 @@
 	                        <width>324</width>
 	                        <height>324</height>
 	                        <aspectratio>stretch</aspectratio>
-	                        <texture fallback="noAlbumCover.jpg">$INFO[ListItem.Art(thumb)]</texture>
-	                        <bordersize>12</bordersize>
-	                        <colordiffuse>99ffffff</colordiffuse>
+	                        <texture diffuse="masks/albumThumb_2.png" fallback="colors/black.png">$INFO[ListItem.Art(thumb)]</texture>
+	                        <colordiffuse>88ffffff</colordiffuse>
 	                    </control>
 	                    <control type="label">
 	                        <visible>!controlgroup(9000).hasfocus</visible>
 	                        <posx>12</posx>
-	                        <posy>308</posy>
-	                        <width>276</width>
+	                        <posy>322</posy>
+	                        <width>300</width>
 	                        <height>2-row</height>
 	                        <aligny>center</aligny>
 	                        <font>thumbTitle</font>
 	                        <textcolor>textActive</textcolor>
-	                        <label>[B]$INFO[ListItem.Title][/B][CR]$INFO[ListItem.artist] - $INFO[listitem.year]</label>
+	                        <label>[B]$INFO[ListItem.Title][/B][CR]$INFO[ListItem.artist]</label>
 	                    </control>      
 	                </itemlayout>
 	                <focusedlayout width="352" height="5-col-gutter">
@@ -130,10 +151,7 @@
 	                            <width>324</width>
 		                        <height>324</height>
 	                            <aspectratio>stretch</aspectratio>
-	                            <texture>colors/black.png</texture>
-	                            <bordertexture colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
-	                            <bordersize>6</bordersize>
-	                            <colordiffuse>FF000000</colordiffuse>
+	                            <texture diffuse="masks/albumThumb_2.png">colors/black.png</texture>
 	                        </control>
 							<control type="image">
 	                            <posx>0</posx>
@@ -141,8 +159,9 @@
 	                            <width>324</width>
 		                        <height>324</height>
 	                            <aspectratio>stretch</aspectratio>
-	                            <texture fallback="noAlbumCover.jpg">$INFO[ListItem.Art(thumb)]</texture>
-	                            <bordersize>6</bordersize>
+	                            <texture diffuse="masks/albumThumb_2.png" fallback="colors/black.png">$INFO[ListItem.Art(thumb)]</texture>
+                                <bordertexture infill="false" diffuse="masks/albumThumb_2.png">colors/white.png</bordertexture>
+		                        <bordersize>6</bordersize>
 	                            <colordiffuse>ffffffff</colordiffuse>
 	                        </control>
 	                        <control type="label">
@@ -158,7 +177,7 @@
 		                    </control>
 	                    </control>
 	                </focusedlayout>
-					<content>$INFO[control.getlabel(9123)]</content>
+					<content>$INFO[skin.string(musicQuickLinkValue)]</content>
 	            </control>
 			</control>
 			<!--all albums-->
@@ -190,16 +209,6 @@
 	                <pagecontrol>60</pagecontrol>
 	                <scrolltime tween="sine">250</scrolltime>
 	                <itemlayout width="293" height="360">
-	                    <control type="image">
-	                        <posx>-6</posx>
-	                        <posy>-6</posy>
-	                        <width>276</width>
-	                        <height>276</height>
-	                        <aspectratio>stretch</aspectratio>
-	                        <texture>colors/black.png</texture>
-	                        <bordersize>12</bordersize>
-							<colordiffuse>11FFFFFF</colordiffuse>
-	                    </control>
 						<control type="image">
 							<visible>!ListItem.IsParentFolder</visible>
 	                        <posx>0</posx>
@@ -207,9 +216,18 @@
 	                        <width>4-col-gutter</width>
 	                        <height>4-col-gutter</height>
 	                        <aspectratio>stretch</aspectratio>
-	                        <texture fallback="noAlbumCover.jpg">$INFO[ListItem.Art(thumb)]</texture>
-	                        <bordersize>12</bordersize>
-	                        <colordiffuse>99FFFFFF</colordiffuse>
+	                        <texture diffuse="masks/albumThumb.png">colors/black.png</texture>
+	                        <colordiffuse>FFFFFFFF</colordiffuse>
+	                    </control>
+                        <control type="image">
+							<visible>!ListItem.IsParentFolder</visible>
+	                        <posx>0</posx>
+	                        <posy>0</posy>
+	                        <width>4-col-gutter</width>
+	                        <height>4-col-gutter</height>
+	                        <aspectratio>stretch</aspectratio>
+	                        <texture fallback="colors/black.png" diffuse="masks/albumThumb.png">$INFO[ListItem.Art(thumb)]</texture>
+	                        <colordiffuse>88FFFFFF</colordiffuse>
 	                    </control>
 	                    <control type="textbox">
 	                        <visible>String.IsEmpty(listitem.title)</visible>
@@ -222,42 +240,34 @@
 	                        <textcolor>textActive</textcolor>
 	                        <label>$INFO[ListItem.label]</label>
 	                    </control>
-	                    <control type="label">
+	                    <control type="textbox">
 	                        <visible>!controlgroup(9000).hasfocus</visible>
-	                        <posx>12</posx>
-	                        <posy>258</posy>
-	                        <width>226</width>
-	                        <height>2-row</height>
-	                        <aligny>center</aligny>
+	                        <posx></posx>
+	                        <posy>270</posy>
+	                        <width>264</width>
+	                        <height>60</height>
+                            <align>center</align>
+	                        <aligny>top</aligny>
 	                        <font>thumbTitle</font>
 	                        <textcolor>textActive</textcolor>
-	                        <label>[B]$INFO[ListItem.Title][/B][CR]$INFO[ListItem.artist] - $INFO[listitem.year]</label>
+	                        <label>[B]$INFO[ListItem.Title][/B][CR]$INFO[ListItem.artist]</label>
 	                    </control>
 	                </itemlayout>
 	                <focusedlayout width="4-col" height="360">
 	                    <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>colors/black.png</texture>
-		                        <bordertexture colordiffuse="FFFFFFFF">colors/white.png</bordertexture>
-		                        <bordersize>6</bordersize>
-		                        <colordiffuse>FF000000</colordiffuse>
-		                    </control>
-							<control type="image">
-								<visible>!ListItem.IsParentFolder</visible>
+                            <control type="image">
+                                <visible>!ListItem.IsParentFolder</visible>
 	                            <posx>0</posx>
 	                            <posy>0</posy>
 	                            <width>4-col-gutter</width>
 	                            <height>4-col-gutter</height>
-	                            <aspectratio>stretch</aspectratio>
-	                            <texture fallback="noAlbumCover.jpg">$INFO[ListItem.Art(thumb)]</texture>
-	                            <bordersize>6</bordersize>
-	                        </control>
+    							<aspectratio>stretch</aspectratio>
+    							<texture fallback="colors/black.png" diffuse="masks/albumThumb.png">$INFO[ListItem.Art(thumb)]</texture>
+    	                        <bordertexture infill="false" diffuse="masks/albumThumb.png">colors/white.png</bordertexture>
+    	                        <bordersize>6</bordersize>
+    							<colordiffuse>ffffffff</colordiffuse>
+    						</control>
 		                    <control type="textbox">
 		                        <visible>String.IsEmpty(listitem.title)</visible>
 		                        <posx>24</posx>
@@ -269,17 +279,18 @@
 		                        <textcolor>textActive</textcolor>
 		                        <label>$INFO[ListItem.label]</label>
 		                    </control>
-	                        <control type="label">
-		                        <visible>!controlgroup(9000).hasfocus</visible>
-		                        <posx>12</posx>
-		                        <posy>262</posy>
-		                        <width>226</width>
-		                        <height>2-row</height>
-		                        <aligny>center</aligny>
-		                        <font>thumbTitle</font>
-		                        <textcolor>textActive</textcolor>
-		                        <label>[B]$INFO[ListItem.Title][/B][CR]$INFO[ListItem.artist] - $INFO[listitem.year]</label>
-		                    </control>
+    	                    <control type="textbox">
+    	                        <visible>!controlgroup(9000).hasfocus</visible>
+    	                        <posx></posx>
+    	                        <posy>270</posy>
+    	                        <width>264</width>
+    	                        <height>60</height>
+                                <align>center</align>
+    	                        <aligny>top</aligny>
+    	                        <font>thumbTitle</font>
+    	                        <textcolor>textActive</textcolor>
+    	                        <label>[B]$INFO[ListItem.Title][/B][CR]$INFO[ListItem.artist]</label>
+    	                    </control>
 	                    </control>
 	                </focusedlayout>
 	            </control>
diff --git a/1080i/View_Artists.xml b/1080i/View_Artists.xml
index c92a887..265d448 100644
--- a/1080i/View_Artists.xml
+++ b/1080i/View_Artists.xml
@@ -4,39 +4,96 @@
     <include name="musicartist">
         <control type="group">
 			<visible>$EXP[isMusicArtist]</visible>
+			<!--quick link selector-->
+            <control type="group">
+                <posx>col-4-begin</posx>
+                <posy>170</posy>
+				<control type="image">
+                    <posx>0</posx>
+                    <posy>0</posy>
+                    <width>18-col</width>
+                    <height>2-row</height>
+                    <aspectratio>stretch</aspectratio>
+                    <texture>masks/menuBar.png</texture>
+                    <colordiffuse>77000000</colordiffuse>
+                </control>
+                <control type="grouplist" id="9202">
+	                <posx>0</posx>
+	                <posy>0</posy>
+                    <orientation>horizontal</orientation>
+                    <itemgap>0</itemgap>
+	                <onleft>9000</onleft>
+	                <ondown>9998</ondown>
+	                <onback>9000</onback>
+            		<control type="button" id="506">
+                        <description>Search</description>
+                        <visible>System.HasAddon(script.globalsearch)</visible>
+                        <width>1-col</width>
+                        <texturenofocus></texturenofocus>
+                        <texturefocus>masks/circle.png</texturefocus>
+                        <focusedcolor>black</focusedcolor>
+                        <font>symbolLarge</font>
+                        <label></label>
+                        <onclick>RunScript(script.globalsearch,artists=true&amp;albums=true&amp;songs=true&amp;musicvideos=true)</onclick>
+                    </control>            
+                    <control type="button" id="3222">
+                        <description>Sort by</description>
+                        <texturenofocus></texturenofocus>
+                        <label>$LOCALIZE[31008]: $INFO[Container.SortMethod]</label>
+                        <onclick>Container.NextSortMethod</onclick>
+                        <onclick>Control.setfocus(51,0,absolute)</onclick>
+                        <onclick>Control.setfocus(3222)</onclick>
+                    </control>
+                    <control type="togglebutton" id="3223">
+                        <description>Sort direction</description>
+                        <focusedcolor>black</focusedcolor>
+                        <color>textActive</color>
+                        <texturenofocus></texturenofocus>
+                        <texturefocus colordiffuse="ffffffff">masks/circle.png</texturefocus>
+                        <alttexturefocus colordiffuse="FFFFFFFF">masks/circle.png</alttexturefocus>
+                        <alttexturenofocus></alttexturenofocus>
+                        <textoffsetx>0</textoffsetx>
+                        <width>1-col</width>
+                        <font>symbolLarge</font>
+                        <label></label>
+                        <altlabel></altlabel>
+                        <onclick>Container.SetSortDirection</onclick>
+                        <onclick>Control.setfocus(51,0,absolute)</onclick>
+                        <onclick>Control.setfocus(3223)</onclick>
+                    </control>   
+                </control>
+            </control>
             <!--content-->
             <control type="panel" id="51">
                 <visible>$EXP[isMusicArtist]</visible>
                 <posx>90</posx>
-	            <posy>row-5-begin</posy>
+	            <posy>row-7-begin</posy>
 	            <width>1800</width>
 	            <height>25-row</height>
 	            <onleft>9000</onleft>
 	            <onright>60</onright>
 	            <ondown>51</ondown>
 	            <onup>51</onup>
+                <onback>9202</onback>
 	            <scrolltime tween="sine">250</scrolltime>
 	            <pagecontrol>60</pagecontrol>
-	            <itemlayout width="444" height="288">
+	            <itemlayout width="444" height="266">
 	                <control type="image">
 	                    <posx>0</posx>
 	                    <posy>0</posy>
-	                    <width>6-col-gutter</width>
-	                    <height>4-col-gutter</height>
-	                    <aspectratio>scale</aspectratio>
-	                    <texture>colors/black.png</texture>
-	                    <bordersize>12</bordersize>
-	                    <colordiffuse>overlay</colordiffuse>
+	                    <width>408</width>
+	                    <height>230</height>
+	                    <aspectratio>stretch</aspectratio>
+	                    <texture diffuse="masks/artistThumb.png">colors/black.png</texture>
 	                </control>
 	                <control type="image">
 	                    <posx>0</posx>
 	                    <posy>0</posy>
-	                    <width>6-col-gutter</width>
-	                    <height>4-col-gutter</height>
-	                    <aspectratio align="center" aligny="top">scale</aspectratio>
-	                    <texture>$INFO[Listitem.art(thumb)]</texture>
-	                    <bordersize>12</bordersize>
-						<colordiffuse>99FFFFFF</colordiffuse>
+	                    <width>408</width>
+	                    <height>230</height>
+	                    <aspectratio align="center" aligny="top">stretch</aspectratio>
+	                    <texture diffuse="masks/artistThumb.png">$INFO[Listitem.art(fanart)]</texture>
+						<colordiffuse>88FFFFFF</colordiffuse>
 	                </control>
 	                <control type="textbox">
 	                    <posx>24</posx>
@@ -51,27 +108,25 @@
 						<shadowcolor>bb000000</shadowcolor>
 	                </control>
 	            </itemlayout>
-	            <focusedlayout width="444" height="264">
+	            <focusedlayout width="444" height="266">
 	                <control type="group">
 	                    <include>focusThumb</include>
 						<control type="image">
 	                        <posx>0</posx>
 	                        <posy>0</posy>
-	                        <width>6-col-gutter</width>
-	                        <height>4-col-gutter</height>
-	                        <aspectratio>scale</aspectratio>
-	                        <texture border="6">colors/black.png</texture>
-	                        <bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
-	                        <bordersize>6</bordersize>
-	                        <colordiffuse>FF000000</colordiffuse>
+    	                    <width>408</width>
+    	                    <height>230</height>
+	                        <aspectratio>stretch</aspectratio>
+	                        <texture diffuse="masks/artistThumb.png">colors/black.png</texture>
 	                    </control>
 	                    <control type="image">
 	                        <posx>0</posx>
 	                        <posy>0</posy>
-	                        <width>6-col-gutter</width>
-	                        <height>4-col-gutter</height>
-	                        <aspectratio align="center" aligny="top">scale</aspectratio>
-	                        <texture>$INFO[Listitem.art(thumb)]</texture>
+    	                    <width>408</width>
+    	                    <height>230</height>
+	                        <aspectratio align="center" aligny="top">stretch</aspectratio>
+	                        <texture diffuse="masks/artistThumb.png">$INFO[Listitem.art(fanart)]</texture>
+                            <bordertexture infill="false" diffuse="masks/albumThumb_2.png">colors/white.png</bordertexture>
 	                        <bordersize>6</bordersize>
 	                    </control>
 	                    <control type="textbox">
diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml
index d9852c1..6c20049 100644
--- a/1080i/View_Movies.xml
+++ b/1080i/View_Movies.xml
@@ -65,11 +65,13 @@
                             <label>31176</label>
                             <texturenofocus></texturenofocus>
                             <onfocus>Skin.SetString(movieQuickLinkValue,special://skin/extras/playlists/recentMovies.xsp)</onfocus>
+                            <ondown>control.setfocus(9103,0)</ondown>
                         </control> 
                         <control type="button" id="4001">
                             <label>31127</label>
                             <texturenofocus></texturenofocus>
                             <onfocus>Skin.SetString(movieQuickLinkValue,special://skin/extras/playlists/inprogressMovies.xsp)</onfocus>
+                            <ondown>control.setfocus(9103,0)</ondown>
                         </control>
                         <control type="radiobutton" id="14">
                             <description>Watched Toggle</description>
@@ -160,9 +162,9 @@
 	      				<control type="progress">
 							<visible>ListItem.IsResumable</visible>
 			                <description>Progress Bar</description>
-			                <posx>12</posx>
-			                <posy>294</posy>
-			                <width>542</width>
+			                <posx>24</posx>
+			                <posy>278</posy>
+			                <width>504</width>
 			                <height>12</height>
 			                <texturebg colordiffuse="textboxInactive">colors/offblack.png</texturebg>
 			                <midtexture colordiffuse="highlight">colors/white.png</midtexture>
@@ -211,9 +213,9 @@
     	      				<control type="progress">
     							<visible>ListItem.IsResumable</visible>
     			                <description>Progress Bar</description>
-    			                <posx>12</posx>
-    			                <posy>294</posy>
-    			                <width>542</width>
+    			                <posx>24</posx>
+    			                <posy>278</posy>
+    			                <width>504</width>
     			                <height>12</height>
     			                <texturebg colordiffuse="textboxInactive">colors/offblack.png</texturebg>
     			                <midtexture colordiffuse="highlight">colors/white.png</midtexture>
diff --git a/1080i/View_MusicGenres.xml b/1080i/View_MusicGenres.xml
index 2fce28a..8e2b028 100644
--- a/1080i/View_MusicGenres.xml
+++ b/1080i/View_MusicGenres.xml
@@ -13,21 +13,21 @@
             <ondown>55</ondown>
             <onup>55</onup>
             <pagecontrol>60</pagecontrol>
-            <itemlayout width="8-col" height="2-row">
+            <itemlayout width="8-col" height="84">
                 <control type="image">
                     <posx>0</posx>
-                    <posy>3</posy>
-                    <width>66</width>
-                    <height>66</height>
-                    <aspectratio scalediffuse="false">stretch</aspectratio>
-                    <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
-					<colordiffuse>overlay</colordiffuse>
+                    <posy>0</posy>
+                    <width>552</width>
+                    <height>72</height>
+                    <aspectratio>stretch</aspectratio>
+                    <texture diffuse="masks/genre.png">colors/white.png</texture>
+                    <colordiffuse>d0000000</colordiffuse>
                 </control>
                 <control type="label">
-                    <posx>1-col-indent</posx>
+                    <posx>48</posx>
                     <posy>0</posy>
-                    <width>6-col</width>
-                    <height>2-row</height>
+                    <width>432</width>
+                    <height>72</height>
                     <aligny>center</aligny>
                     <font>itemTitle</font>
                     <textcolor>textActive</textcolor>
@@ -35,33 +35,21 @@
                     <label>$INFO[ListItem.Label]</label>
                 </control>
             </itemlayout>
-            <focusedlayout width="8-col" height="2-row">
-                <control type="image">
-                    <posx>1-col</posx>
-                    <posy>0</posy>
-                    <width>7-col-gutter</width>
-                    <height>2-row</height>
-                    <aspectratio>stretch</aspectratio>
-                    <texture>colors/white.png</texture>
-                    <colordiffuse>highlight</colordiffuse>
-                </control>
+            <focusedlayout width="8-col" height="84">
                 <control type="image">
                     <posx>0</posx>
-                    <posy>3</posy>
-                    <width>66</width>
-                    <height>66</height>
-                    <aspectratio scalediffuse="false">stretch</aspectratio>
-                    <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
-                    <animation type="focus" loop="false" reversible="false">
-                        <effect type="fade" time="500"/>
-                        <effect type="rotatey" end="360" center="33" tween="back" easing="out" time="1000"/>
-                    </animation>
+                    <posy>0</posy>
+                    <width>552</width>
+                    <height>72</height>
+                    <aspectratio>stretch</aspectratio>
+                    <texture diffuse="masks/genre.png">colors/white.png</texture>
+                    <colordiffuse>highlight</colordiffuse>
                 </control>
                 <control type="label">
-                    <posx>1-col-indent</posx>
+                    <posx>48</posx>
                     <posy>0</posy>
-                    <width>6-col</width>
-                    <height>2-row</height>
+                    <width>432</width>
+                    <height>72</height>
                     <aligny>center</aligny>
                     <font>itemTitle</font>
                     <textcolor>textActive</textcolor>
diff --git a/1080i/View_Seasons.xml b/1080i/View_Seasons.xml
index 04b1a52..78987ae 100644
--- a/1080i/View_Seasons.xml
+++ b/1080i/View_Seasons.xml
@@ -45,12 +45,12 @@
 					<control type="label">
 		                <posx>0</posx>
 		                <posy>5-row</posy>
-		                <width>12-col</width>
+		                <width>14-col</width>
 		                <height>2-row</height>
 		                <align></align>
 		                <font>itemTitle</font>
 		                <textcolor>menuUnselected</textcolor>
-		                <label>$INFO[Container(58).ListItemAbsolute(2).genre]</label>
+		                <label>$INFO[Container(58).ListItemAbsolute(1).year,,.] $INFO[Container(58).ListItemAbsolute(2).genre,,.]</label>
 		            </control>
                 </control>
                 <!--content-->
diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml
index 861d4f2..dd46dc3 100644
--- a/1080i/View_TVShows.xml
+++ b/1080i/View_TVShows.xml
@@ -3,14 +3,22 @@
 	<include name="tvshows">
 		<control type="group">
 			<visible>$EXP[isTVShow] + !string.contains(container.folderpath,playlists)</visible>
-			<control type="image">
-				<visible>control.hasfocus(9203) | control.hasfocus(9202)</visible>
-	            <include>dimensionsFullscreen</include>
-	            <texture fallback="colors/black.png">$INFO[container(9203).listitem.art(fanart)]</texture>
-	            <colordiffuse>FF555555</colordiffuse>
-	            <aspectratio>scale</aspectratio>
-				<fadetime>250</fadetime>
-	        </control>
+			<control type="group">
+                <visible>control.hasfocus(9203) | control.hasfocus(9202)</visible>
+                <control type="image">
+    	            <include>dimensionsFullscreen</include>
+    	            <texture fallback="colors/black.png">$INFO[container(9203).listitem.art(fanart)]</texture>
+    	            <colordiffuse>FF555555</colordiffuse>
+    	            <aspectratio>scale</aspectratio>
+    				<fadetime>250</fadetime>
+    	        </control>
+                <control type="image">
+    	            <include>dimensionsFullscreen</include>
+    	            <texture>vignette.png</texture>
+    	            <colordiffuse></colordiffuse>
+    	            <aspectratio>stretch</aspectratio>
+    	        </control>
+            </control>
 			<control type="group" id="9201">
 				<visible>$EXP[isTVShow] + !string.contains(container.folderpath,playlists) + !Skin.HasSetting(disableRecentTVShows)</visible>
 				<animation type="Conditional" condition="!controlgroup(9201).hasfocus">
@@ -22,115 +30,141 @@
 	                <effect type="fade" start="0" end="100" time="300" delay="350"/>
 	            </animation>
 				<!--quick link selector-->
-				<control type="list" id="9202">
-	                <posx>col-1-begin</posx>
-	                <posy>180</posy>
-	                <width>24-col</width>
-	                <height>2-row</height>
-	                <onleft>9000</onleft>
-	                <ondown>9203</ondown>
-	                <onback>9000</onback>
-	                <orientation>horizontal</orientation>
-	                <itemlayout width="4-col" height="2-row">
-	                    <control type="label">
-	                        <posx>0</posx>
-	                        <posy>0</posy>
-	                        <width>4-col</width>
-	                        <height>2-row</height>
-	                        <font>menuTitle</font>
-	                        <aligny>center</aligny>
-	                        <textcolor>textDisabled</textcolor>
-	                        <shadowcolor></shadowcolor>
-	                        <label>$INFO[ListItem.property(textTitle)]</label>
-	                    </control>
-	                </itemlayout>
-	                <focusedlayout width="4-col" height="2-row">
-	                    <control type="label">
-	                        <posx>0</posx>
-	                        <posy>0</posy>
-	                        <width>4-col</width>
-	                        <height>2-row</height>
-	                        <font>menuTitle</font>
-	                        <aligny>center</aligny>
-	                        <textcolor>textActive</textcolor>
-	                        <shadowcolor></shadowcolor>
-	                        <label>$INFO[ListItem.property(textTitle)]</label>
-							<animation type="conditional" condition="control.hasfocus(9202)" loop="true">
-	                            <effect type="fade" start="100" end="50" time="1000"/>
-	                        </animation>
-	                    </control>
-	                </focusedlayout>
-	                <content>
-						<item id="1">
-	                        <label>special://skin/extras/playlists/recentEpisodes.xsp</label>
-	                        <property name="textTitle">31178</property>
-	                    </item>
-	                    <item id="2">
-	                        <label>special://skin/extras/playlists/inprogressTVShows.xsp</label>
-	                        <property name="textTitle">31127</property>
-	                    </item>
-	                </content>
-	            </control>
+                <control type="group">
+	                <posx>col-4-begin</posx>
+	                <posy>170</posy>
+    				<control type="image">
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>18-col</width>
+                        <height>2-row</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture>masks/menuBar.png</texture>
+                        <colordiffuse>77000000</colordiffuse>
+                    </control>
+                    <control type="grouplist" id="9202">
+    	                <posx>0</posx>
+    	                <posy>0</posy>
+                        <orientation>horizontal</orientation>
+                        <itemgap>0</itemgap>
+    	                <onleft>9000</onleft>
+    	                <ondown>9203</ondown>
+    	                <onback>9000</onback>
+                		<control type="button" id="506">
+                            <description>Search</description>
+                            <visible>System.HasAddon(script.globalsearch)</visible>
+                            <width>1-col</width>
+                            <texturenofocus></texturenofocus>
+                            <texturefocus>masks/circle.png</texturefocus>
+                            <focusedcolor>black</focusedcolor>
+                            <font>symbolLarge</font>
+                            <label></label>
+                            <onclick>RunScript(script.globalsearch,tvshows=true&amp;episodes=true&amp;)</onclick>
+                        </control>            
+                        <control type="button" id="4000">
+                            <label>31178</label>
+                            <texturenofocus></texturenofocus>
+                            <onfocus>Skin.SetString(tvQuickLinkValue,special://skin/extras/playlists/recentEpisodes.xsp)</onfocus>
+                            <ondown>control.setfocus(9203,0)</ondown>
+                        </control> 
+                        <control type="button" id="4001">
+                            <label>31127</label>
+                            <texturenofocus></texturenofocus>
+                            <onfocus>Skin.SetString(tvQuickLinkValue,special://skin/extras/playlists/inprogressTVShows.xsp)</onfocus>
+                            <ondown>control.setfocus(9203,0)</ondown>
+                        </control>
+                        <control type="radiobutton" id="14">
+                            <description>Watched Toggle</description>
+                            <label>31195</label>
+                            <width>4-col</width>
+                            <texturenofocus></texturenofocus>
+                            <focusedcolor>textActive</focusedcolor>
+                        </control>
+                        <control type="button" id="3222">
+                            <description>Sort by</description>
+                            <texturenofocus></texturenofocus>
+                            <label>$LOCALIZE[31008]: $INFO[Container.SortMethod]</label>
+                            <onclick>Container.NextSortMethod</onclick>
+                            <onclick>Control.setfocus(52,0,absolute)</onclick>
+                            <onclick>Control.setfocus(3222)</onclick>
+                        </control>
+                        <control type="togglebutton" id="3223">
+                            <description>Sort direction</description>
+                            <focusedcolor>black</focusedcolor>
+                            <color>textActive</color>
+                            <texturenofocus></texturenofocus>
+                            <texturefocus colordiffuse="ffffffff">masks/circle.png</texturefocus>
+                            <alttexturefocus colordiffuse="FFFFFFFF">masks/circle.png</alttexturefocus>
+                            <alttexturenofocus></alttexturenofocus>
+                            <textoffsetx>0</textoffsetx>
+                            <width>1-col</width>
+                            <font>symbolLarge</font>
+                            <label></label>
+                            <altlabel></altlabel>
+                            <onclick>Container.SetSortDirection</onclick>
+                            <onclick>Control.setfocus(52,0,absolute)</onclick>
+                            <onclick>Control.setfocus(3223)</onclick>
+                        </control>   
+                    </control>
+                </control>
 				<!--quick links-->			
 				<control type="panel" id="9203">
-					<posx>90</posx>
+	                <posx>96</posx>
 	                <posy>288</posy>
 	                <width>1740</width>
 	                <height>11-row</height>
 					<onup>9202</onup>
 	                <ondown>52</ondown>
-	                <onleft>9000</onleft>
+	                <onleft>9203</onleft>
 	                <onback>9000</onback>
 	                <orientation>horizontal</orientation>
-					<onclick condition="container(9202).hasfocus(1)">activatewindow(Videos,videodb://tvshows/titles/$INFO[listitem.dbid]/)</onclick>
+					<onclick condition="String.IsEqual(skin.string(tvQuickLinkValue),special://skin/extras/playlists/recentEpisodes.xsp)">activatewindow(Videos,videodb://tvshows/titles/$INFO[listitem.dbid]/)</onclick>
 	                <itemlayout width="586" height="5-col-gutter">
-	                    <control type="image">
+						<control type="image">
 	                        <posx>0</posx>
 	                        <posy>0</posy>
-	                        <width>566</width>
-	                        <height>318</height>
+	                        <width>552</width>
+	                        <height>311</height>
 	                        <aspectratio>stretch</aspectratio>
-	                        <texture>colors/black.png</texture>
-	                        <bordersize>12</bordersize>
+	                        <texture scalediffuse="true" diffuse="masks/latestLandscape.png">colors/black.png</texture>
+	                        <colordiffuse>FFFFFFFF</colordiffuse>
 	                    </control>
-						<control type="image">
+                        <control type="image">
 							<visible>!string.isempty(ListItem.Art(fanart))</visible>
 	                        <posx>0</posx>
 	                        <posy>0</posy>
-	                        <width>566</width>
-	                        <height>318</height>
+	                        <width>552</width>
+	                        <height>311</height>
 	                        <aspectratio>stretch</aspectratio>
-	                        <texture>$INFO[ListItem.Art(fanart)]</texture>
-	                        <bordersize>12</bordersize>
+	                        <texture diffuse="masks/latestLandscape.png">$INFO[ListItem.Art(fanart)]</texture>
 	                        <colordiffuse>99FFFFFF</colordiffuse>
-	                    </control>
+	                    </control> 
 						<control type="image">
 							<visible>string.isempty(ListItem.Art(fanart))</visible>
 	                        <posx>0</posx>
 	                        <posy>0</posy>
-	                        <width>566</width>
-	                        <height>318</height>
+	                        <width>552</width>
+	                        <height>311</height>
 	                        <aspectratio>scale</aspectratio>
-	                        <texture>$INFO[ListItem.Art(thumb)]</texture>
-	                        <bordersize>6</bordersize>
-	                        <colordiffuse>99FFFFFF</colordiffuse>
+	                        <texture diffuse="masks/latestLandscape.png">$INFO[ListItem.Art(thumb)]</texture>
+	                        <colordiffuse>99ffffff</colordiffuse>
 	                    </control>
 	                    <control type="label">
-	                        <visible>!controlgroup(9000).hasfocus + container(9202).hasfocus(1)</visible>
+	                        <visible>!controlgroup(9000).hasfocus + String.IsEqual(skin.string(tvQuickLinkValue),special://skin/extras/playlists/recentEpisodes.xsp)</visible>
 	                        <posx>12</posx>
 	                        <posy>306</posy>
-	                        <width>584</width>
+	                        <width>524</width>
 	                        <height>2-row</height>
 	                        <aligny>center</aligny>
 	                        <font>thumbTitle</font>
 	                        <textcolor>textActive</textcolor>
-	                        <label>[B]$INFO[ListItem.Title][/B][CR]$INFO[ListItem.Property(UnWatchedEpisodes),, $LOCALIZE[31189]]</label>
+	                        <label>[B]$INFO[ListItem.Title][/B][CR]$INFO[ListItem.Property(UnWatchedEpisodes),, new $LOCALIZE[31189]]</label>
 	                    </control>
-						<control type="label">
-	                        <visible>!controlgroup(9000).hasfocus + container(9202).hasfocus(2)</visible>
+	                    <control type="label">
+	                        <visible>!controlgroup(9000).hasfocus + String.IsEqual(skin.string(tvQuickLinkValue),special://skin/extras/playlists/inprogressTVShows.xsp)</visible>
 	                        <posx>12</posx>
 	                        <posy>306</posy>
-	                        <width>584</width>
+	                        <width>524</width>
 	                        <height>2-row</height>
 	                        <aligny>center</aligny>
 	                        <font>thumbTitle</font>
@@ -140,9 +174,9 @@
 	      				<control type="progress">
 							<visible>ListItem.IsResumable</visible>
 			                <description>Progress Bar</description>
-			                <posx>12</posx>
-			                <posy>294</posy>
-			                <width>542</width>
+			                <posx>24</posx>
+			                <posy>278</posy>
+			                <width>504</width>
 			                <height>12</height>
 			                <texturebg colordiffuse="textboxInactive">colors/offblack.png</texturebg>
 			                <midtexture colordiffuse="highlight">colors/white.png</midtexture>
@@ -152,75 +186,66 @@
 	                <focusedlayout width="586" height="5-col-gutter">
 	                    <control type="group">
 	                        <include>focusThumb</include>
-	                        <control type="image">
-	                            <posx>0</posx>
-	                            <posy>0</posy>
-	                            <width>566</width>
-	                            <height>318</height>
-	                            <aspectratio>stretch</aspectratio>
-	                            <texture border="6">colors/black.png</texture>
-	                            <bordertexture colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
-	                            <bordersize>6</bordersize>
-	                            <colordiffuse>FF000000</colordiffuse>
-	                        </control>
 							<control type="image">
 								<visible>!string.isempty(ListItem.Art(fanart))</visible>
 		                        <posx>0</posx>
 		                        <posy>0</posy>
-		                        <width>566</width>
-		                        <height>318</height>
+		                        <width>552</width>
+		                        <height>311</height>
 		                        <aspectratio>stretch</aspectratio>
-		                        <texture>$INFO[ListItem.Art(fanart)]</texture>
+		                        <texture diffuse="masks/latestLandscape.png">$INFO[ListItem.Art(fanart)]</texture>
+                                <bordertexture infill="false" diffuse="masks/latestLandscape.png">colors/white.png</bordertexture>
 		                        <bordersize>6</bordersize>
-		                        <colordiffuse>BBffffff</colordiffuse>
+		                        <colordiffuse>ffffffff</colordiffuse>
 		                    </control>
 							<control type="image">
 								<visible>string.isempty(ListItem.Art(fanart))</visible>
 		                        <posx>0</posx>
 		                        <posy>0</posy>
-		                        <width>566</width>
-		                        <height>318</height>
-		                        <aspectratio>scale</aspectratio>
-		                        <texture>$INFO[ListItem.Art(thumb)]</texture>
+		                        <width>552</width>
+		                        <height>311</height>
+		                        <aspectratio>stretch</aspectratio>
+		                        <texture diffuse="masks/latestLandscape.png">$INFO[ListItem.Art(thumb)]</texture>
+                                <bordertexture infill="false" diffuse="masks/latestLandscape.png">colors/white.png</bordertexture>
 		                        <bordersize>6</bordersize>
-		                        <colordiffuse>BBffffff</colordiffuse>
+		                        <colordiffuse>FFffffff</colordiffuse>
 		                    </control>
-	                        <control type="label">
-		                        <visible>!controlgroup(9000).hasfocus + container(9202).hasfocus(1)</visible>
-		                        <posx>12</posx>
-		                        <posy>316</posy>
-		                        <width>584</width>
-		                        <height>2-row</height>
-		                        <aligny>center</aligny>
-		                        <font>thumbTitle</font>
-		                        <textcolor>textActive</textcolor>
-		                        <label>[B]$INFO[ListItem.Title][/B][CR]$INFO[ListItem.Property(UnWatchedEpisodes),, $LOCALIZE[31189]]</label>
-		                    </control>
-							<control type="label">
-		                        <visible>!controlgroup(9000).hasfocus + container(9202).hasfocus(2)</visible>
-		                        <posx>12</posx>
-		                        <posy>316</posy>
-		                        <width>584</width>
-		                        <height>2-row</height>
-		                        <aligny>center</aligny>
-		                        <font>thumbTitle</font>
-		                        <textcolor>textActive</textcolor>
-		                        <label>[B]$INFO[ListItem.tvshowtitle][/B][CR]$INFO[ListItem.label]</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>
+    	                    <control type="label">
+    	                        <visible>!controlgroup(9000).hasfocus + String.IsEqual(skin.string(tvQuickLinkValue),special://skin/extras/playlists/recentEpisodes.xsp)</visible>
+    	                        <posx>12</posx>
+    	                        <posy>306</posy>
+    	                        <width>524</width>
+    	                        <height>2-row</height>
+    	                        <aligny>center</aligny>
+    	                        <font>thumbTitle</font>
+    	                        <textcolor>textActive</textcolor>
+    	                        <label>[B]$INFO[ListItem.Title][/B][CR]$INFO[ListItem.Property(UnWatchedEpisodes),, $LOCALIZE[31189]]</label>
+    	                    </control>
+    	                    <control type="label">
+    	                        <visible>!controlgroup(9000).hasfocus + String.IsEqual(skin.string(tvQuickLinkValue),special://skin/extras/playlists/inprogressTVShows.xsp)</visible>
+    	                        <posx>12</posx>
+    	                        <posy>306</posy>
+    	                        <width>524</width>
+    	                        <height>2-row</height>
+    	                        <aligny>center</aligny>
+    	                        <font>thumbTitle</font>
+    	                        <textcolor>textActive</textcolor>
+    	                        <label>[B]$INFO[ListItem.tvshowtitle][/B][CR]$INFO[ListItem.label]</label>
+    	                    </control>
+    	      				<control type="progress">
+    							<visible>ListItem.IsResumable</visible>
+    			                <description>Progress Bar</description>
+    			                <posx>24</posx>
+    			                <posy>278</posy>
+    			                <width>504</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>
+					<content>$INFO[skin.string(tvQuickLinkValue)]</content>
 	            </control>
 			</control>
 		</control>
@@ -243,174 +268,72 @@
 			<control type="panel" id="52">
 				<visible>$EXP[isTVShow] + !$EXP[isMovie]</visible>
 				<posx>90</posx>
-				<posy>828</posy>
+				<posy>820</posy>
 				<width>1800</width>
-				<height>23-row</height>
+				<height>836</height>
 				<onleft>9000</onleft>
 				<onright>60</onright>
 				<onup>9203</onup>
 				<onback>9203</onback>
 				<pagecontrol>60</pagecontrol>
 				<scrolltime tween="sine">250</scrolltime>
-				<itemlayout width="252" height="438">
-					<control type="image">
-						<posx>-6</posx>
-						<posy>-6</posy>
-						<width>240</width>
-						<height>354</height>
-						<aspectratio>stretch</aspectratio>
-						<texture>colors/black.png</texture>
-						<bordersize>6</bordersize>
-						<colordiffuse>11FFFFFF</colordiffuse>
-					</control>
+				<itemlayout width="296" height="486">
 					<control type="image">
 						<posx>0</posx>
 						<posy>0</posy>
-						<width>228</width>
-						<height>342</height>
+						<width>252</width>
+						<height>378</height>
 						<aspectratio>stretch</aspectratio>
-						<texture>$INFO[ListItem.Art(poster)]</texture>
-						<bordersize>6</bordersize>
-						<colordiffuse>99FFFFFF</colordiffuse>
+						<texture diffuse="masks/poster.png">colors/black.png</texture>
+						<colordiffuse>FFFFFFFF</colordiffuse>
+					</control>
+                    <control type="image">
+						<posx>0</posx>
+						<posy>0</posy>
+						<width>252</width>
+						<height>378</height>
+						<aspectratio>stretch</aspectratio>
+						<texture diffuse="masks/poster.png">$INFO[ListItem.Art(poster)]</texture>
+						<colordiffuse>88FFFFFF</colordiffuse>
 					</control>
 					<control type="textbox">
-						<visible>String.IsEmpty(listitem.title)</visible>
-						<posx>24</posx>
-						<posy>3-row</posy>
+						<visible>!controlgroup(9000).hasfocus</visible>
+						<posx>12</posx>
+						<posy>382</posy>
 						<width>228</width>
-						<height>6-row</height>
-						<font>largeTitle</font>
-						<wrapmultiline>true</wrapmultiline>
-						<textcolor>textActive</textcolor>
-						<label>$INFO[ListItem.label]</label>
-					</control>
-					<control type="label">
-						<visible>!System.Setting(hidewatched) + !controlgroup(9000).hasfocus</visible>
-						<posx>12</posx>
-						<posy>350</posy>
-						<width>204</width>
-						<height>1-row</height>
-						<aligny>center</aligny>
+						<height>60</height>
+                        <align>center</align>
+						<aligny>top</aligny>
 						<font>thumbTitle</font>
 						<textcolor>textActive</textcolor>
-						<label>[B]$INFO[ListItem.title][/B][CR]$INFO[ListItem.Property(TotalEpisodes),, $LOCALIZE[31189]]</label>
-					</control>
-					<control type="label">
-						<visible>System.Setting(hidewatched) + !controlgroup(9000).hasfocus</visible>
-						<posx>12</posx>
-						<posy>350</posy>
-						<width>204</width>
-						<height>1-row</height>
-						<aligny>center</aligny>
-						<font>thumbTitle</font>
-						<textcolor>textActive</textcolor>
-						<label>[B]$INFO[ListItem.title][/B][CR]$INFO[ListItem.Property(UnWatchedEpisodes),, $LOCALIZE[31189]]</label>
-					</control>
-					<control type="group">
-						<visible>Integer.IsGreater(ListItem.Property(UnWatchedEpisodes),0)</visible>
-						<animation condition="true" effect="fade" end="70" time="0">conditional</animation>
-						<posx>167</posx>
-						<posy>6</posy>
-						<control type="image">
-							<posx>0</posx>
-							<posy>0</posy>
-							<width>56</width>
-							<height>56</height>
-							<aspectratio>stretch</aspectratio>
-							<texture>masks/newContent.png</texture>
-							<colordiffuse>highlight</colordiffuse>
-						</control>
-						<control type="label">
-							<posx>28</posx>
-							<posy>-4</posy>
-							<width>36</width>
-							<height>36</height>
-							<aligny>center</aligny>
-							<font>symbol</font>
-							<textcolor>textActive</textcolor>
-							<label></label>
-						</control>
+						<label>$INFO[ListItem.title]</label>
 					</control>
 				</itemlayout>
-				<focusedlayout width="252" height="438">
+				<focusedlayout width="300" height="462">
 					<control type="group">
 						<include>focusThumb</include>
-						<control type="image">
+                        <control type="image">
 							<posx>0</posx>
 							<posy>0</posy>
-							<width>228</width>
-							<height>342</height>
+							<width>252</width>
+							<height>378</height>
 							<aspectratio>stretch</aspectratio>
-							<texture border="6">colors/black.png</texture>
-							<bordertexture border="6" colordiffuse="FFFFFFFF">colors/white.png</bordertexture>
-							<bordersize>6</bordersize>
-							<colordiffuse>FF000000</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>
+							<texture diffuse="masks/poster.png">$INFO[ListItem.Art(poster)]</texture>
+	                        <bordertexture infill="false" diffuse="masks/poster.png">colors/white.png</bordertexture>
+	                        <bordersize>6</bordersize>
+							<colordiffuse>ffffffff</colordiffuse>
 						</control>
 						<control type="textbox">
-							<visible>String.IsEmpty(listitem.title)</visible>
-							<posx>24</posx>
-							<posy>3-row</posy>
+                            <visible>!controlgroup(9000).hasfocus</visible>
+							<posx>12</posx>
+							<posy>378</posy>
 							<width>228</width>
-							<height>6-row</height>
-							<font>largeTitle</font>
-							<wrapmultiline>true</wrapmultiline>
-							<textcolor>textActive</textcolor>
-							<label>$INFO[ListItem.label]</label>
-						</control>
-						<control type="label">
-							<visible>!System.Setting(hidewatched) + !controlgroup(9000).hasfocus</visible>
-							<posx>12</posx>
-							<posy>354</posy>
-							<width>204</width>
-							<height>1-row</height>
-							<aligny>center</aligny>
+							<height>60</height>
+                            <align>center</align>
+							<aligny>top</aligny>
 							<font>thumbTitle</font>
 							<textcolor>textActive</textcolor>
-							<label>[B]$INFO[ListItem.title][/B][CR]$INFO[ListItem.Property(TotalEpisodes),, $LOCALIZE[31189]]</label>
-						</control>
-						<control type="label">
-							<visible>System.Setting(hidewatched) + !controlgroup(9000).hasfocus</visible>
-							<posx>12</posx>
-							<posy>354</posy>
-							<width>204</width>
-							<height>1-row</height>
-							<aligny>center</aligny>
-							<font>thumbTitle</font>
-							<textcolor>textActive</textcolor>
-							<label>[B]$INFO[ListItem.title][/B][CR]$INFO[ListItem.Property(UnWatchedEpisodes),, $LOCALIZE[31189]]</label>
-						</control>
-						<control type="group">
-							<visible>Integer.IsGreater(ListItem.Property(UnWatchedEpisodes),0)</visible>
-							<posx>166</posx>
-							<posy>6</posy>
-							<control type="image">
-								<posx>0</posx>
-								<posy>0</posy>
-								<width>56</width>
-								<height>56</height>
-								<aspectratio>stretch</aspectratio>
-								<texture>masks/newContent.png</texture>
-								<colordiffuse>highlight</colordiffuse>
-							</control>
-							<control type="label">
-								<posx>28</posx>
-								<posy>-4</posy>
-								<width>36</width>
-								<height>36</height>
-								<aligny>center</aligny>
-								<font>symbol</font>
-								<textcolor>textActive</textcolor>
-								<label></label>
-							</control>
+							<label>$INFO[ListItem.title]</label>
 						</control>
 					</control>
 				</focusedlayout>
diff --git a/1080i/View_VideoFiles.xml b/1080i/View_VideoFiles.xml
index a20aa17..cc9d7b7 100644
--- a/1080i/View_VideoFiles.xml
+++ b/1080i/View_VideoFiles.xml
@@ -39,11 +39,11 @@
                     <width>23-col</width>
                     <height>69</height>
                     <aspectratio>stretch</aspectratio>
-                    <texture border="0">colors/black.png</texture>
-                    <colordiffuse>overlay</colordiffuse>
+                    <texture>masks/tvChannel.png</texture>
+                    <colordiffuse>d0000000</colordiffuse>
                 </control>
                 <control type="label">
-                    <posx>1-col-indent</posx>
+                    <posx>108</posx>
                     <posy>0</posy>
                     <width>22-col-gutter</width>
                     <height>2-row</height>
@@ -86,11 +86,11 @@
                     <width>23-col</width>
                     <height>2-row</height>
                     <aspectratio>stretch</aspectratio>
-                    <texture border="0">colors/white.png</texture>
-                    <colordiffuse>highlight</colordiffuse>
+					<texture border="0">masks/tvChannel.png</texture>
+					<colordiffuse>highlight</colordiffuse>
                 </control>
                 <control type="label">
-                    <posx>1-col-indent</posx>
+                    <posx>108</posx>
                     <posy>0</posy>
                     <width>22-col-gutter</width>
                     <height>2-row</height>
diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
index bf17b58..7118ad4 100644
--- a/language/resource.language.en_gb/strings.po
+++ b/language/resource.language.en_gb/strings.po
@@ -381,7 +381,7 @@ msgid "All Episodes"
 msgstr ""
 
 msgctxt "#31195"
-msgid "Unwatched Only"
+msgid "Hide Watched"
 msgstr ""
 
 msgctxt "#31199"
diff --git a/media/masks/albumThumb.png b/media/masks/albumThumb.png
new file mode 100644
index 0000000..f4dd587
Binary files /dev/null and b/media/masks/albumThumb.png differ
diff --git a/media/masks/albumThumb_2.png b/media/masks/albumThumb_2.png
new file mode 100644
index 0000000..b34fd07
Binary files /dev/null and b/media/masks/albumThumb_2.png differ
diff --git a/media/masks/artistThumb.png b/media/masks/artistThumb.png
new file mode 100644
index 0000000..cdec2e8
Binary files /dev/null and b/media/masks/artistThumb.png differ
diff --git a/media/masks/episodeThumb.png b/media/masks/episodeThumb.png
new file mode 100644
index 0000000..1ca13fb
Binary files /dev/null and b/media/masks/episodeThumb.png differ
diff --git a/media/masks/genre.png b/media/masks/genre.png
new file mode 100644
index 0000000..d964afe
Binary files /dev/null and b/media/masks/genre.png differ
diff --git a/media/masks/showcaseCast.png b/media/masks/showcaseCast.png
new file mode 100644
index 0000000..e3576b0
Binary files /dev/null and b/media/masks/showcaseCast.png differ
diff --git a/media/masks/showcaseDiscart.png b/media/masks/showcaseDiscart.png
new file mode 100644
index 0000000..17bb981
Binary files /dev/null and b/media/masks/showcaseDiscart.png differ
diff --git a/media/masks/showcaseFanart.png b/media/masks/showcaseFanart.png
new file mode 100644
index 0000000..f9866f5
Binary files /dev/null and b/media/masks/showcaseFanart.png differ
diff --git a/media/masks/showcasePoster.png b/media/masks/showcasePoster.png
new file mode 100644
index 0000000..094bb0f
Binary files /dev/null and b/media/masks/showcasePoster.png differ