diff --git a/1080i/DialogPVRInfo.xml b/1080i/DialogPVRInfo.xml
index 709d139..d9dd569 100644
--- a/1080i/DialogPVRInfo.xml
+++ b/1080i/DialogPVRInfo.xml
@@ -88,7 +88,7 @@
                 <!--synopsis-->
                 <control type="textbox">
                     <posx>0</posx>
-                    <posy>8-row</posy>
+                    <posy>292</posy>
                     <font>textbox</font>
                     <width>12-col</width>
                     <align>left</align>
diff --git a/1080i/Font.xml b/1080i/Font.xml
index f153af2..8f1206d 100644
--- a/1080i/Font.xml
+++ b/1080i/Font.xml
@@ -165,7 +165,7 @@
         </font>
         <font>
             <name>playlistSubTitle</name>
-            <filename>roboto_slab/bold.ttf</filename>
+            <filename>roboto/bold.ttf</filename>
             <size>24</size>
             <linespacing>1.0</linespacing>
         </font>
@@ -186,12 +186,24 @@
             <filename>roboto_slab/bold.ttf</filename>
             <size>27</size>
             <linespacing>1.0</linespacing>
+        </font>
+		<font>
+            <name>menuTitle3</name>
+            <filename>roboto_slab/bold.ttf</filename>
+            <size>38</size>
+            <linespacing>1.0</linespacing>
         </font>
         <font>
             <name>buttonTitle</name>
             <filename>roboto/medium.ttf</filename>
             <size>28</size>
             <linespacing>1.0</linespacing>
+        </font>
+		<font>
+            <name>buttonTitle2</name>
+            <filename>roboto/black.ttf</filename>
+            <size>22</size>
+            <linespacing>1.0</linespacing>
         </font>
 		<font>
             <name>settingsCategory</name>
@@ -207,7 +219,7 @@
         </font>
         <font>
             <name>thumbTitle</name>
-            <filename>roboto_slab/regular.ttf</filename>
+            <filename>roboto/bold.ttf</filename>
             <size>21</size>
             <linespacing>1.0</linespacing>
         </font>
diff --git a/1080i/Includes_hubOptionsItems.xml b/1080i/Includes_hubOptionsItems.xml
index 96f4c12..73fb885 100644
--- a/1080i/Includes_hubOptionsItems.xml
+++ b/1080i/Includes_hubOptionsItems.xml
@@ -93,7 +93,15 @@
     </include>
     <!--music submenu items-->
     <include name="musicSideMenu">
-        <control type="button" id="506">
+        <control type="button" id="553">
+            <description>Playlist</description>
+            <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+            <focusedcolor>textActive</focusedcolor>
+            <width>12-col</width>
+            <label>31123</label>
+            <onclick>activateWindow(musicplaylist)</onclick>
+        </control>
+		<control type="button" id="506">
             <description>Search</description>
             <visible>System.HasAddon(script.globalsearch)</visible>
             <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
diff --git a/1080i/MyPlaylist.xml b/1080i/MyPlaylist.xml
index 8bc8605..f95960d 100644
--- a/1080i/MyPlaylist.xml
+++ b/1080i/MyPlaylist.xml
@@ -20,7 +20,6 @@
                 <colordiffuse>ffffffff</colordiffuse>
                 <aspectratio>stretch</aspectratio>
             </control>
-            <include>kenBurnsey</include>
         </control>
         <!--page container group-->
         <control type="group">
diff --git a/1080i/View_AddonPosters.xml b/1080i/View_AddonPosters.xml
index 0b109b5..3145921 100644
--- a/1080i/View_AddonPosters.xml
+++ b/1080i/View_AddonPosters.xml
@@ -30,7 +30,7 @@
 						<height>342</height>
 						<aspectratio>stretch</aspectratio>
 						<texture>colors/black.png</texture>
-						<bordersize>12</bordersize>
+						<bordersize>6</bordersize>
 						<colordiffuse>overlay</colordiffuse>
 					</control>
 					<control type="image">
@@ -40,7 +40,7 @@
 						<height>342</height>
 						<aspectratio>stretch</aspectratio>
 						<texture>$INFO[ListItem.Art(poster)]</texture>
-						<bordersize>12</bordersize>
+						<bordersize>6</bordersize>
 						<colordiffuse>BBffffff</colordiffuse>
 					</control>
 					<control type="label">
diff --git a/1080i/View_Albums.xml b/1080i/View_Albums.xml
index 66fb1bd..85f7d79 100644
--- a/1080i/View_Albums.xml
+++ b/1080i/View_Albums.xml
@@ -11,14 +11,6 @@
 	            <colordiffuse>FF555555</colordiffuse>
 	            <aspectratio>scale</aspectratio>
 				<fadetime>250</fadetime>
-	        </control>
-			<control type="image">
-				<visible>!control.hasfocus(9998) + !control.hasfocus(9123)</visible>
-	            <include>dimensionsFullscreen</include>
-	            <texture fallback="colors/black.png">$INFO[container.listitem.art(fanart)]</texture>
-	            <colordiffuse>FF555555</colordiffuse>
-	            <aspectratio>scale</aspectratio>
-				<fadetime>250</fadetime>
 	        </control>
         	<control type="group" id="9125">
 				<visible>$EXP[isMusicAlbum] + !$EXP[isMusicArtistCatalogue] + !Skin.HasSetting(disableRecentAlbums)</visible>
@@ -194,11 +186,10 @@
 	                <height>23-row</height>
 	                <onleft>9000</onleft>
 	                <onright>60</onright>
-	                <ondown>54</ondown>
-	                <onup>54</onup>
-	                <onback>9000</onback>
+	                <onup>9998</onup>
+	                <onback>9998</onback>
 	                <pagecontrol>60</pagecontrol>
-	                <scrolltime tween="cubic" easing="out">600</scrolltime>
+	                <scrolltime tween="sine">250</scrolltime>
 	                <itemlayout width="293" height="360">
 	                    <control type="image">
 	                        <posx>0</posx>
diff --git a/1080i/View_ArtistAlbums.xml b/1080i/View_ArtistAlbums.xml
index 0c997a3..db7920a 100644
--- a/1080i/View_ArtistAlbums.xml
+++ b/1080i/View_ArtistAlbums.xml
@@ -5,18 +5,27 @@
 		<!--fanart-->
 		<control type="group">
 			<visible>$EXP[isMusicArtistCatalogue]</visible>
-			<control type="image">
-				<include>dimensionsFullscreen</include>
-				<aspectratio scalediffuse="false">stretch</aspectratio>
-				<texture border="0">$INFO[Container(52).Art(fanart)]</texture>
-				<fadetime>0</fadetime>
-				<colordiffuse>66ffffff</colordiffuse>
-			</control>
-			<control type="image">
-				<include>dimensionsFullscreen</include>
-				<texture>vignette.png</texture>
-				<colordiffuse>ffffffff</colordiffuse>
-				<aspectratio>stretch</aspectratio>
+			<control type="group">
+				<animation type="conditional" condition="!control.isvisible(52)">
+	                <effect type="fade" start="100" end="0" time="0"/>
+	            </animation>
+				<animation type="conditional" condition="control.isvisible(52)">
+	                <effect type="fade" start="0" end="100" time="500" delay="500"/>
+	            </animation>
+				<include>kenBurnsey</include>
+				<control type="image">
+					<include>dimensionsFullscreen</include>
+					<aspectratio scalediffuse="false">stretch</aspectratio>
+					<texture border="0">$INFO[Container(52).Art(fanart)]</texture>
+					<fadetime>0</fadetime>
+					<colordiffuse>66ffffff</colordiffuse>
+				</control>
+				<control type="image">
+					<include>dimensionsFullscreen</include>
+					<texture>vignette.png</texture>
+					<colordiffuse>ffffffff</colordiffuse>
+					<aspectratio>stretch</aspectratio>
+				</control>
 			</control>
 			<control type="group">
 				<animation type="Conditional" condition="controlgroup(9000).hasfocus | controlgroup(9002).hasfocus | controlgroup(100).hasfocus">
@@ -26,6 +35,12 @@
                 <control type="group">
                     <posx>col-1-begin</posx>
                     <posy>row-10-begin</posy>
+					<animation type="conditional" condition="!control.isvisible(52)">
+		                <effect type="fade" start="100" end="0" time="0"/>
+		            </animation>
+					<animation type="conditional" condition="control.isvisible(52)">
+		                <effect type="fade" start="0" end="100" time="250" delay="500"/>
+		            </animation>
 					<control type="label">
                         <posx>0</posx>
                         <posy>4-row</posy>
@@ -50,6 +65,12 @@
 		            </control>
                 </control>
 				<control type="panel" id="52">
+					<animation type="conditional" condition="!control.isvisible(52)">
+		                <effect type="fade" start="100" end="0" time="0"/>
+		            </animation>
+					<animation type="conditional" condition="control.isvisible(52)">
+		                <effect type="fade" start="0" end="100" time="500" delay="1000"/>
+		            </animation>
 					<visible>$EXP[isMusicArtistCatalogue]</visible>
 					<posx>84</posx>
 					<posy>696</posy>
diff --git a/1080i/View_Artists.xml b/1080i/View_Artists.xml
index 1b28dc9..6015102 100644
--- a/1080i/View_Artists.xml
+++ b/1080i/View_Artists.xml
@@ -4,13 +4,6 @@
     <include name="musicartist">
         <control type="group">
 			<visible>$EXP[isMusicArtist]</visible>
-			<control type="image">
-	            <include>dimensionsFullscreen</include>
-	            <texture fallback="colors/black.png">$INFO[container.listitem.art(fanart)]</texture>
-	            <colordiffuse>FF555555</colordiffuse>
-	            <aspectratio>scale</aspectratio>
-				<fadetime>250</fadetime>
-	        </control>
             <!--content-->
             <control type="panel" id="51">
                 <visible>$EXP[isMusicArtist]</visible>
@@ -22,7 +15,7 @@
 	            <onright>60</onright>
 	            <ondown>51</ondown>
 	            <onup>51</onup>
-	            <scrolltime tween="cubic" easing="out">600</scrolltime>
+	            <scrolltime tween="sine">250</scrolltime>
 	            <pagecontrol>60</pagecontrol>
 	            <itemlayout width="444" height="288">
 	                <control type="image">
diff --git a/1080i/View_Episodes.xml b/1080i/View_Episodes.xml
index 290b338..b25039b 100644
--- a/1080i/View_Episodes.xml
+++ b/1080i/View_Episodes.xml
@@ -3,38 +3,32 @@
     <include name="episodes">
         <!--fanart-->
         <control type="group">
+			<animation type="conditional" condition="control.isvisible(53)">
+                <effect type="fade" start="0" end="100" time="1500"/>
+				<effect type="slide" start="-100,0" end="0,0" time="300"/>
+            </animation>
             <visible>String.Contains(container.folderpath,videodb://) + !String.IsEmpty(container.folderpath) + container.content(episodes) + !String.Contains(Container.folderpath,plugin)</visible>
             <posy>0</posy>
             <posx>0</posx>
             <control type="image">
+                <visible>String.IsEmpty(container.art(season.poster))</visible>
+                <posx>0</posx>
+                <posy>0</posy>
+                <width>960</width>
+                <height>1080</height>
+                <aspectratio scalediffuse="false" aligny="bottom">scale</aspectratio>
+                <texture fallback="colors/black.png" border="0">$INFO[fanart.image]</texture>
+                <colordiffuse>ffffffff</colordiffuse>
+            </control>
+			<control type="image">
                 <visible>!String.IsEmpty(container.art(season.poster))</visible>
                 <posx>0</posx>
                 <posy>0</posy>
                 <width>960</width>
-                <height>1440</height>
-                <aspectratio scalediffuse="false">stretch</aspectratio>
-                <texture background="true" border="0">$INFO[container.art(season.poster)]</texture>
-                <colordiffuse>ccffffff</colordiffuse>
-				<animation type="conditional" condition="!controlgroup(9000).hasfocus + !Skin.HasSetting(lowPowerMode)" loop="true" reversible="false">
-				    <effect type="fade" start="0" end="100" time="2000"/>
-                    <effect type="slide" start="0,0" end="0,-280" time="15000"/>
-                    <effect type="fade" start="100" end="0" time="1000" delay="14000"/>
-                </animation>
-            </control>
-            <control type="image">
-                <visible>String.IsEmpty(container.art(season.poster))</visible>
-                <posx>-966</posx>
-                <posy>0</posy>
-                <width>1920</width>
                 <height>1080</height>
-                <aspectratio scalediffuse="false">stretch</aspectratio>
-                <texture background="true" fallback="colors/black.png" border="0">$INFO[container.art(fanart)]</texture>
-                <colordiffuse>ffffffff</colordiffuse>
-                <animation type="conditional" condition="!controlgroup(9000).hasfocus + !Skin.HasSetting(lowPowerMode)" loop="false" reversible="false">
-                    <effect type="fade" start="0" end="100" time="2000"/>
-                    <effect type="zoom" center="auto" start="120" end="100" time="15000"/>
-                    <effect type="fade" start="100" end="0" time="1000" delay="14000"/>
-                </animation>
+                <aspectratio scalediffuse="false">scale</aspectratio>
+                <texture border="0">$INFO[container.art(season.poster)]</texture>
+                <colordiffuse>ccffffff</colordiffuse>
             </control>
             <!--display clearart if available-->
             <control type="image">
@@ -95,6 +89,12 @@
         <control type="group">
             <!--tvhsow library-sourced episode list-->
             <control type="panel" id="53">
+				<animation type="conditional" condition="!control.isvisible(53)">
+	                <effect type="fade" start="100" end="0" time="0"/>
+	            </animation>
+				<animation type="conditional" condition="control.isvisible(53)">
+	                <effect type="fade" start="0" end="100" time="250" delay="150"/>
+	            </animation>
                 <visible>$EXP[isEpisode] + !String.Contains(container.folderpath,smb://) + String.Contains(container.folderpath,videodb://)</visible>
                 <posx>978</posx>
                 <posy>row-9-begin</posy>
diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml
index 1de3132..862e5bd 100644
--- a/1080i/View_Movies.xml
+++ b/1080i/View_Movies.xml
@@ -10,14 +10,6 @@
 	            <colordiffuse>FF555555</colordiffuse>
 	            <aspectratio>scale</aspectratio>
 				<fadetime>250</fadetime>
-	        </control>
-			<control type="image">
-				<visible>!control.hasfocus(9103) + !control.hasfocus(9102)</visible>
-	            <include>dimensionsFullscreen</include>
-	            <texture fallback="colors/black.png">$INFO[container.listitem.art(fanart)]</texture>
-	            <colordiffuse>FF555555</colordiffuse>
-	            <aspectratio>scale</aspectratio>
-				<fadetime>250</fadetime>
 	        </control>
 			<control type="group" id="9101">
 				<visible>$EXP[isMovie] + !string.contains(container.folderpath,playlists) + !Skin.HasSetting(disableRecentMovies)</visible>
@@ -219,7 +211,7 @@
 				<control type="label">
 					<visible>!controlgroup(9000).hasfocus + !$EXP[isTVShow] + $EXP[isMovie] + !string.contains(container.folderpath,playlists)</visible>
 	                <posx>col-1-begin</posx>
-	                <posy>760</posy>
+	                <posy>736</posy>
 	                <width>12-col</width>
 	                <height>2-row</height>
 	                <aligny>center</aligny>
@@ -230,7 +222,7 @@
 				<control type="label">
 					<visible>!controlgroup(9000).hasfocus + !$EXP[isTVShow] + $EXP[isMovie] + string.contains(container.folderpath,playlists)</visible>
 	                <posx>col-1-begin</posx>
-	                <posy>760</posy>
+	                <posy>736</posy>
 	                <width>12-col</width>
 	                <height>2-row</height>
 	                <aligny>center</aligny>
@@ -241,16 +233,15 @@
 				<control type="panel" id="51">
 					<visible>$EXP[isMovie]</visible>
 					<posx>90</posx>
-					<posy>864</posy>
+					<posy>828</posy>
 					<width>1800</width>
 					<height>23-row</height>
 					<onleft>9000</onleft>
 					<onright>60</onright>
-					<ondown>51</ondown>
-					<onup>51</onup>
-					<onback>9000</onback>
+					<onup>9103</onup>
+					<onback>9103</onback>
 					<pagecontrol>60</pagecontrol>
-					<scrolltime tween="cubic" easing="out">600</scrolltime>
+					<scrolltime tween="sine">250</scrolltime>
 					<itemlayout width="252" height="438">
 						<control type="image">
 							<posx>0</posx>
@@ -259,7 +250,7 @@
 							<height>342</height>
 							<aspectratio>stretch</aspectratio>
 							<texture>colors/black.png</texture>
-							<bordersize>12</bordersize>
+							<bordersize>6</bordersize>
 							<colordiffuse>overlay</colordiffuse>
 						</control>
 						<control type="image">
@@ -269,7 +260,7 @@
 							<height>342</height>
 							<aspectratio>stretch</aspectratio>
 							<texture>$INFO[ListItem.Art(poster)]</texture>
-							<bordersize>12</bordersize>
+							<bordersize>6</bordersize>
 							<colordiffuse>BBffffff</colordiffuse>
 						</control>
 						<control type="textbox">
@@ -307,8 +298,8 @@
 						</control>
 						<control type="group">
 							<visible>String.IsEmpty(ListItem.PlayCount)</visible>
-							<posx>160</posx>
-							<posy>12</posy>
+							<posx>166</posx>
+							<posy>6</posy>
 							<control type="image">
 								<posx>0</posx>
 								<posy>0</posy>
diff --git a/1080i/View_MusicPlaylist.xml b/1080i/View_MusicPlaylist.xml
index 83c5ceb..e9ea60c 100644
--- a/1080i/View_MusicPlaylist.xml
+++ b/1080i/View_MusicPlaylist.xml
@@ -17,14 +17,63 @@
                 <pagecontrol>60</pagecontrol>
                 <scrolltime tween="sine" easing="inout">200</scrolltime>
                 <itemlayout width="23-col" height="3-row">
-                    <control type="image">
+					<control type="image">
+						<visible>!listitem.isplaying</visible>
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>24-col</width>
+                        <width>105</width>
                         <height>105</height>
                         <aspectratio>stretch</aspectratio>
                         <texture border="0">colors/black.png</texture>
                         <colordiffuse>overlay</colordiffuse>
+                    </control>
+					<control type="image">
+						<visible>!listitem.isplaying</visible>
+                        <posx>108</posx>
+                        <posy>0</posy>
+                        <width>1620</width>
+                        <height>105</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture border="0">colors/black.png</texture>
+                        <colordiffuse>overlay</colordiffuse>
+                    </control>
+					<control type="image">
+						<animation type="conditional" condition="player.paused">
+							<effect type="fade" start="100" end="50" time="0"/>
+						</animation>
+						<visible>ListItem.IsPlaying</visible>
+                        <posx>0</posx>
+                        <posy>0</posy>
+                        <width>105</width>
+                        <height>105</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture border="0">colors/white.png</texture>
+                        <colordiffuse>highlight</colordiffuse>
+                    </control>
+					<control type="image">
+						<animation type="conditional" condition="player.paused">
+							<effect type="fade" start="100" end="50" time="0"/>
+						</animation>
+						<visible>ListItem.IsPlaying</visible>
+                        <posx>108</posx>
+                        <posy>0</posy>
+                        <width>1620</width>
+                        <height>105</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture border="0">colors/white.png</texture>
+                        <colordiffuse>highlight</colordiffuse>
+                    </control>
+					<control type="image">
+                        <visible>ListItem.IsPlaying + !player.paused + !System.Platform.Linux.RaspberryPi</visible>
+                        <posx>18</posx>
+                        <posy>0</posy>
+                        <width>72</width>
+                        <height>72</height>
+                        <texture>equaliser.gif</texture>
+                        <animation type="focus" loop="false" reversible="false">
+                            <effect type="fade" time="500"/>
+                            <effect type="rotatey" end="360" center="44" tween="back" easing="out" time="1000"/>
+                        </animation>
                     </control>
                     <control type="label">
 						<visible>ListItem.IsPlaying + !player.paused + [System.Platform.Linux.RaspberryPi | Skin.HasSetting(lowPowerMode)]</visible>
@@ -98,10 +147,25 @@
                     </control>
                 </itemlayout>
                 <focusedlayout width="23-col" height="3-row">
-                    <control type="image">
+					<control type="image">
+						<animation type="focus">
+							<effect type="fade" start="100" end="33" time="0"/>
+						</animation>
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>24-col</width>
+                        <width>105</width>
+                        <height>105</height>
+                        <aspectratio>stretch</aspectratio>
+                        <texture border="0">colors/white.png</texture>
+                        <colordiffuse>highlight</colordiffuse>
+                    </control>
+					<control type="image">
+						<animation type="conditional" condition="player.playing">
+							<effect type="fade" start="100" end="50" time="0"/>
+						</animation>
+                        <posx>108</posx>
+                        <posy>0</posy>
+                        <width>1620</width>
                         <height>105</height>
                         <aspectratio>stretch</aspectratio>
                         <texture border="0">colors/white.png</texture>
diff --git a/1080i/View_Photos.xml b/1080i/View_Photos.xml
index 83c72e3..402f3a7 100644
--- a/1080i/View_Photos.xml
+++ b/1080i/View_Photos.xml
@@ -19,7 +19,7 @@
 	        </control>
 			<control type="label">
                 <posx>col-1-begin</posx>
-                <posy>20-row</posy>
+                <posy>22-row</posy>
                 <width>18-col</width>
                 <height>1-row</height>
                 <font>largeTitle</font>
@@ -32,23 +32,21 @@
 		</control>
         <control type="panel" id="50">
 			<visible>$EXP[isPhotoAlbum]</visible>
-            <posx>72</posx>
-            <posy>row-23-begin</posy>
+            <posx>96</posx>
+            <posy>row-24-begin</posy>
             <width>1764</width>
             <height>10-row</height>
             <onleft>9000</onleft>
-            <onright>60</onright>
-            <ondown>50</ondown>
-            <onup>50</onup>
+            <onright>50</onright>
 			<orientation>horizontal</orientation>
             <scrolltime tween="cubic" easing="out">600</scrolltime>
             <pagecontrol>60</pagecontrol>
-            <itemlayout width="3-col" height="6-row">
+            <itemlayout width="4-col" height="6-row">
                 <control type="image">
                     <posx>0</posx>
                     <posy>0</posy>
-                    <width>204</width>
-                    <height>122</height>
+                    <width>4-col-textbox</width>
+                    <height>160</height>
                     <aspectratio>scale</aspectratio>
                     <texture>colors/black.png</texture>
                     <bordersize>6</bordersize>
@@ -57,31 +55,22 @@
                 <control type="image">
                     <posx>0</posx>
                     <posy>0</posy>
-                    <width>204</width>
-                    <height>122</height>
+                    <width>4-col-textbox</width>
+                    <height>160</height>
                     <aspectratio>scale</aspectratio>
                     <texture>$INFO[Listitem.thumb]</texture>
                     <bordersize>6</bordersize>
 					<colordiffuse>BBffffff</colordiffuse>
                 </control>
-                <control type="textbox">
-                    <posx>12</posx>
-                    <posy>122</posy>
-                    <width>180</width>
-                    <height>3-row</height>
-                    <font>thumbTitle</font>
-                    <textcolor>textActive</textcolor>
-                    <label>[B]$INFO[ListItem.label][/B]</label>
-                </control>
             </itemlayout>
-            <focusedlayout width="3-col" height="6-row">
+            <focusedlayout width="4-col" height="6-row">
                 <control type="group">
                     <include>focusThumb</include>
 					<control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>204</width>
-	                    <height>122</height>
+                        <width>4-col-textbox</width>
+	                    <height>160</height>
                         <aspectratio>scale</aspectratio>
                         <texture border="6">colors/black.png</texture>
                         <bordertexture border="6" colordiffuse="ffFFFFFF">colors/white.png</bordertexture>
@@ -91,21 +80,12 @@
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
-                        <width>204</width>
-	                    <height>122</height>
+                        <width>4-col-textbox</width>
+	                    <height>160</height>
                         <aspectratio>scale</aspectratio>
                         <texture>$INFO[Listitem.thumb]</texture>
                         <bordersize>6</bordersize>
                     </control>
-                    <control type="textbox">
-	                    <posx>12</posx>
-	                    <posy>122</posy>
-	                    <width>180</width>
-	                    <height>3-row</height>
-	                    <font>thumbTitle</font>
-	                    <textcolor>textActive</textcolor>
-	                    <label>[B]$INFO[ListItem.label][/B]</label>
-	                </control>
                 </control>
             </focusedlayout>
         </control>
diff --git a/1080i/View_Seasons.xml b/1080i/View_Seasons.xml
index 15bdd44..c4016dc 100644
--- a/1080i/View_Seasons.xml
+++ b/1080i/View_Seasons.xml
@@ -21,6 +21,12 @@
                 </animation>
                 <!--title-->
                 <control type="group">
+					<animation type="conditional" condition="!control.isvisible(58)">
+		                <effect type="fade" start="100" end="0" time="0"/>
+		            </animation>
+					<animation type="conditional" condition="control.isvisible(58)">
+		                <effect type="fade" start="0" end="100" time="250" delay="500"/>
+		            </animation>
                     <visible>!String.Contains(Container.folderpath,plugin)</visible>
                     <posx>col-1-begin</posx>
                     <posy>row-8-begin</posy>
@@ -49,6 +55,12 @@
                 </control>
                 <!--content-->
                 <control type="panel" id="58">
+					<animation type="conditional" condition="!control.isvisible(58)">
+		                <effect type="fade" start="100" end="0" time="0"/>
+		            </animation>
+					<animation type="conditional" condition="control.isvisible(58)">
+		                <effect type="fade" start="0" end="100" time="500" delay="1000"/>
+		            </animation>
                     <visible>$EXP[isSeason] + !String.Contains(container.folderpath,smb://)</visible>
                     <posx>84</posx>
                     <posy>row-16-begin</posy>
diff --git a/1080i/View_Songs.xml b/1080i/View_Songs.xml
index caa1380..5af9d07 100644
--- a/1080i/View_Songs.xml
+++ b/1080i/View_Songs.xml
@@ -1,314 +1,354 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <includes>
-    <!--Song browser-->
-    <include name="musicsongs">
-        <control type="group">
-            <visible>$EXP[isMusicSong]</visible>
-            <posx>col-1-begin</posx>
-            <posy>row-5-begin</posy>
-            <animation type="visible">
-                <include>listSlideIn</include>
-            </animation>
-            <animation type="hidden">
-                <effect type="fade" start="100" end="0" time="0"/>
-            </animation>
-            <!--album thumb and info-->
-            <control type="image">
-                <posx>0</posx>
-                <posy>8</posy>
-                <width>8-col</width>
-                <height>8-col</height>
-                <aspectratio>stretch</aspectratio>
-                <texture fallback="DefaultAlbumCover.png" diffuse="masks/discSurface.png" >$VAR[songViewThumb]</texture>
-                <bordertexture colordiffuse="overlay">colors/black.png</bordertexture>
-                <bordersize>6</bordersize>
-                <fadetime>500</fadetime>
-            </control>
-        </control>
-        <control type="group">
-            <visible>$EXP[isMusicSong]</visible>
-            <control type="label">
-                <posx>col-10-begin</posx>
-                <posy>row-5-begin</posy>
-                <width>15-col</width>
-                <height>2-row</height>
-                <font>largeTitle</font>
+	<!--Song browser-->
+	<include name="musicsongs">
+		<control type="group">
+			<visible>$EXP[isMusicSong]</visible>
+			<posx>col-1-begin</posx>
+			<posy>row-5-begin</posy>
+			<animation type="visible">
+				<include>listSlideIn</include>
+			</animation>
+			<animation type="hidden">
+				<effect type="fade" start="100" end="0" time="0"/>
+			</animation>
+			<!--album thumb and info-->
+			<control type="image">
+				<posx>0</posx>
+				<posy>8</posy>
+				<width>8-col</width>
+				<height>8-col</height>
+				<aspectratio>stretch</aspectratio>
+				<texture fallback="DefaultAlbumCover.png" diffuse="masks/discSurface.png">$VAR[songViewThumb]</texture>
+				<bordertexture colordiffuse="overlay">colors/black.png</bordertexture>
+				<bordersize>6</bordersize>
+			</control>
+		</control>
+		<control type="group">
+			<visible>$EXP[isMusicSong]</visible>
+			<control type="label">
+				<posx>col-10-begin</posx>
+				<posy>row-5-begin</posy>
+				<width>15-col</width>
+				<height>2-row</height>
+				<font>largeTitle</font>
 				<aligny>center</aligny>
-                <textcolor>textActive</textcolor>
-                <shadowcolor></shadowcolor>
-                <label>$VAR[songViewAlbum]</label>
-            </control>
-            <control type="label">
-                <posx>col-10-begin</posx>
-                <posy>row-6-begin</posy>
-                <width>15-col</width>
-                <height>3-row</height>
-                <font>menuTitle</font>
+				<textcolor>textActive</textcolor>
+				<shadowcolor/>
+				<label>$VAR[songViewAlbum]</label>
+			</control>
+			<control type="label">
+				<posx>col-10-begin</posx>
+				<posy>208</posy>
+				<width>15-col</width>
+				<height>5-row</height>
+				<font>menuTitle</font>
 				<aligny>center</aligny>
-                <textcolor>textActive</textcolor>
-                <shadowcolor></shadowcolor>
-                <label>$VAR[songViewArtist]</label>
-            </control>
-        </control>
-        <control type="panel" id="53">
-            <visible>$EXP[isMusicSong]</visible>
-            <posx>col-10-begin</posx>
-            <posy>row-9-begin</posy>
-            <width>15-col</width>
-            <height>19-row</height>
-            <onleft>9000</onleft>
-            <onright>60</onright>
-            <ondown>53</ondown>
-            <onup>53</onup>
-            <pagecontrol>60</pagecontrol>
-            <itemlayout width="15-col" height="2-row">
-                <control type="image">
-                    <posx>0</posx>
-                    <posy>0</posy>
-                    <width>1-col-textbox</width>
-                    <height>69</height>
-                    <aspectratio>stretch</aspectratio>
-                    <texture>colors/black.png</texture>
-                    <bordersize>0</bordersize>
-                    <colordiffuse>textboxInactive</colordiffuse>
-                </control>
-                 <control type="image">
-	                    <visible>ListItem.IsPlaying + !player.paused  + !System.Platform.Linux.RaspberryPi</visible>
-	                    <posx>12</posx>
-	                    <posy>0</posy>
-	                    <width>1-col-gutter</width>
-	                    <height>1-col-gutter</height>
-	                    <texture>equaliser.gif</texture>
-	                </control>
-	                <control type="label">
-	                    <visible>ListItem.IsPlaying + !player.paused  + System.Platform.Linux.RaspberryPi</visible>
-	                    <posx>0</posx>
-	                    <posy>0</posy>
-	                    <width>1-col-textbox</width>
-	                    <height>2-row</height>
-	                    <align>center</align>
-	                    <aligny>center</aligny>
-	                    <font>symbolLarge</font>
-	                    <textcolor>textActive</textcolor>
-	                    <shadowcolor></shadowcolor>
-	                    <label></label>
-	                </control>
-                <control type="label">
-                    <visible>ListItem.IsPlaying + player.paused</visible>
-                    <posx>0</posx>
-                    <posy>0</posy>
-                    <width>1-col-textbox</width>
-                    <height>2-row</height>
-                    <align>center</align>
-                    <aligny>center</aligny>
-                    <font>symbolLarge</font>
-                    <textcolor>textActive</textcolor>
-                    <shadowcolor></shadowcolor>
-                    <label></label>
-                </control>
-                <control type="label">
-                    <visible>!ListItem.IsPlaying</visible>
-                    <posx>0</posx>
-                    <posy>0</posy>
-                    <width>1-col-textbox</width>
-                    <height>2-row</height>
-                    <align>center</align>
-                    <aligny>center</aligny>
-                    <font>itemTitle</font>
-                    <textcolor>textActive</textcolor>
-                    <shadowcolor></shadowcolor>
-                    <label>$INFO[ListItem.TrackNumber]</label>
-                </control>
-                <control type="image">
-                    <posx>1-col</posx>
-                    <posy>0</posy>
-                    <width>12-col-textbox</width>
-                    <height>69</height>
-                    <aspectratio>stretch</aspectratio>
-                    <texture>colors/black.png</texture>
-                    <bordersize>0</bordersize>
-                    <colordiffuse>textboxInactive</colordiffuse>
-                </control>
-                <control type="image">
-                    <posx>13-col</posx>
-                    <posy>0</posy>
-                    <width>2-col-textbox</width>
-                    <height>69</height>
-                    <aspectratio>stretch</aspectratio>
-                    <texture>colors/black.png</texture>
-                    <bordersize>0</bordersize>
-                    <colordiffuse>textboxInactive</colordiffuse>
-                </control>
-                <control type="label">
-                    <visible>ListItem.IsParentFolder</visible>
-                    <posx>1-col-indent</posx>
-                    <posy>0</posy>
-                    <width>11-col-gutter</width>
-                    <height>2-row</height>
-                    <aligny>center</aligny>
-                    <font>itemTitle</font>
-                    <textcolor>textActive</textcolor>
-                    <shadowcolor></shadowcolor>
-                    <label>..</label>
-                </control>
-                <control type="label">
-                    <posx>1-col-indent</posx>
-                    <posy>0</posy>
-                    <width>11-col-gutter</width>
-                    <height>2-row</height>
-                    <aligny>center</aligny>
-                    <font>itemTitle</font>
-                    <textcolor>textActive</textcolor>
-                    <shadowcolor></shadowcolor>
-                    <label>$INFO[ListItem.Title]</label>
-                </control>
-                <control type="label">
-                    <visible>!ListItem.IsParentFolder</visible>
-                    <posx>12-col-gutter</posx>
-                    <posy>0</posy>
-                    <width>1-col</width>
-                    <height>2-row</height>
-                    <aligny>center</aligny>
-                    <align>right</align>
-                    <font>itemTitle</font>
-                    <textcolor>textActive</textcolor>
-                    <shadowcolor></shadowcolor>
-                    <label fallback="•••">$INFO[ListItem.UserRating,,*]</label>
-                </control>
-                <control type="label">
-                    <posx>13-col-indent</posx>
-                    <posy>0</posy>
-                    <width>2-col-gutter</width>
-                    <height>2-row</height>
-                    <aligny>center</aligny>
-                    <align>center</align>
-                    <font>itemTitle</font>
-                    <textcolor>textActive</textcolor>
-                    <shadowcolor></shadowcolor>
-                    <label>$INFO[ListItem.duration]</label>
-                </control>
-            </itemlayout>
-            <focusedlayout width="15-col" height="2-row">
-                <control type="image">
+				<textcolor>textActive</textcolor>
+				<shadowcolor/>
+				<label>$VAR[songViewArtist]</label>
+			</control>
+		</control>
+		<control type="panel" id="53">
+			<animation type="conditional" condition="!control.isvisible(53)">
+				<effect type="fade" start="100" end="0" time="0"/>
+			</animation>
+			<animation type="conditional" condition="control.isvisible(53)">
+				<effect type="fade" start="0" end="100" time="500" delay="250"/>
+			</animation>
+			<visible>$EXP[isMusicSong]</visible>
+			<posx>col-10-begin</posx>
+			<posy>row-9-begin</posy>
+			<width>15-col</width>
+			<height>19-row</height>
+			<onleft>9000</onleft>
+			<onright>60</onright>
+			<ondown>53</ondown>
+			<onup>53</onup>
+			<pagecontrol>60</pagecontrol>
+			<itemlayout width="15-col" height="2-row">
+				<control type="image">
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>1-col-textbox</width>
+					<height>69</height>
+					<aspectratio>stretch</aspectratio>
+					<texture>colors/black.png</texture>
+					<bordersize>0</bordersize>
+					<colordiffuse>textboxInactive</colordiffuse>
+				</control>
+				<control type="image">
 					<animation type="focus">
-			            <effect type="fade" start="100" end="50" time="0"/>
-			        </animation>
-                    <posx>0</posx>
-                    <posy>0</posy>
-                    <width>1-col-textbox</width>
-                    <height>2-row</height>
-                    <aspectratio>stretch</aspectratio>
-                    <texture>colors/white.png</texture>
-                    <bordersize>0</bordersize>
-                    <colordiffuse>highlight</colordiffuse>
-                    <include>spinFocusIcon</include>
-                </control>
-                <control type="image">
-                    <visible>ListItem.IsPlaying + !player.paused  + !System.Platform.Linux.RaspberryPi</visible>
-                    <posx>12</posx>
-                    <posy>0</posy>
-                    <width>1-col-gutter</width>
-                    <height>1-col-gutter</height>
-                    <texture>equaliser.gif</texture>
-                </control>
-                <control type="label">
-                    <visible>ListItem.IsPlaying + !player.paused  + System.Platform.Linux.RaspberryPi</visible>
-                    <posx>0</posx>
-                    <posy>0</posy>
-                    <width>1-col-textbox</width>
-                    <height>2-row</height>
-                    <align>center</align>
-                    <aligny>center</aligny>
-                    <font>symbolLarge</font>
-                    <textcolor>textActive</textcolor>
-                    <shadowcolor></shadowcolor>
-                    <label></label>
-                </control>
-                <control type="label">
-                    <visible>ListItem.IsPlaying + player.paused</visible>
-                    <posx>0</posx>
-                    <posy>0</posy>
-                    <width>1-col-textbox</width>
-                    <height>2-row</height>
-                    <align>center</align>
-                    <aligny>center</aligny>
-                    <font>symbolLarge</font>
-                    <textcolor>textActive</textcolor>
-                    <shadowcolor></shadowcolor>
-                    <label></label>
-                </control>
-                <control type="label">
-                    <visible>!ListItem.IsPlaying</visible>
-                    <posx>0</posx>
-                    <posy>0</posy>
-                    <width>1-col-textbox</width>
-                    <height>2-row</height>
-                    <align>center</align>
-                    <aligny>center</aligny>
-                    <font>itemTitle</font>
-                    <textcolor>textActive</textcolor>
-                    <shadowcolor></shadowcolor>
-                    <label>$INFO[ListItem.TrackNumber]</label>
-                </control>
-                <control type="image">
-                    <posx>1-col</posx>
-                    <posy>0</posy>
-                    <width>15-col</width>
-                    <height>2-row</height>
-                    <aspectratio>stretch</aspectratio>
-                    <texture>colors/white.png</texture>
-                    <bordersize>0</bordersize>
-                    <colordiffuse>highlight</colordiffuse>
-                </control>
-                <control type="label">
-                    <visible>ListItem.IsParentFolder</visible>
-                    <posx>1-col-indent</posx>
-                    <posy>0</posy>
-                    <width>11-col-gutter</width>
-                    <height>2-row</height>
-                    <aligny>center</aligny>
-                    <font>itemTitle</font>
-                    <textcolor>textActive</textcolor>
-                    <shadowcolor></shadowcolor>
-                    <label>..</label>
-                </control>
-                <control type="label">
-                    <posx>1-col-indent</posx>
-                    <posy>0</posy>
-                    <width>11-col-gutter</width>
-                    <height>2-row</height>
-                    <aligny>center</aligny>
-                    <font>itemTitle</font>
-                    <textcolor>textActive</textcolor>
-                    <shadowcolor></shadowcolor>
-                    <label>$INFO[ListItem.Title]</label>
-                </control>
-                <control type="label">
-                    <visible>!ListItem.IsParentFolder</visible>
-                    <posx>12-col-gutter</posx>
-                    <posy>0</posy>
-                    <width>1-col</width>
-                    <height>2-row</height>
-                    <aligny>center</aligny>
-                    <align>right</align>
-                    <font>itemTitle</font>
-                    <textcolor>textActive</textcolor>
-                    <shadowcolor></shadowcolor>
-                    <label fallback="•••">$INFO[ListItem.UserRating,,*]</label>
-                </control>
-                <control type="label">
-                    <posx>13-col-indent</posx>
-                    <posy>0</posy>
-                    <width>2-col-gutter</width>
-                    <height>2-row</height>
-                    <aligny>center</aligny>
-                    <align>center</align>
-                    <font>itemTitle</font>
-                    <textcolor>textActive</textcolor>
-                    <shadowcolor></shadowcolor>
-                    <label>$INFO[ListItem.duration]</label>
-                </control>
-            </focusedlayout>
-        </control>
-    </include>
-</includes>
\ No newline at end of file
+						<effect type="fade" start="100" end="50" time="0"/>
+					</animation>
+					<animation type="conditional" condition="player.paused">
+						<effect type="fade" start="100" end="50" time="0"/>
+					</animation>
+					<visible>ListItem.IsPlaying</visible>
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>1-col-textbox</width>
+					<height>2-row</height>
+					<aspectratio>stretch</aspectratio>
+					<texture>colors/white.png</texture>
+					<bordersize>0</bordersize>
+					<colordiffuse>highlight</colordiffuse>
+				</control>
+				<control type="image">
+					<visible>ListItem.IsPlaying + !player.paused  + !System.Platform.Linux.RaspberryPi</visible>
+					<posx>12</posx>
+					<posy>0</posy>
+					<width>1-col-gutter</width>
+					<height>1-col-gutter</height>
+					<texture>equaliser.gif</texture>
+				</control>
+				<control type="label">
+					<visible>ListItem.IsPlaying + !player.paused  + System.Platform.Linux.RaspberryPi</visible>
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>1-col-textbox</width>
+					<height>2-row</height>
+					<align>center</align>
+					<aligny>center</aligny>
+					<font>symbolLarge</font>
+					<textcolor>textActive</textcolor>
+					<shadowcolor/>
+					<label></label>
+				</control>
+				<control type="label">
+					<visible>ListItem.IsPlaying + player.paused</visible>
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>1-col-textbox</width>
+					<height>2-row</height>
+					<align>center</align>
+					<aligny>center</aligny>
+					<font>symbolLarge</font>
+					<textcolor>textActive</textcolor>
+					<shadowcolor/>
+					<label></label>
+				</control>
+				<control type="label">
+					<visible>!ListItem.IsPlaying</visible>
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>1-col-textbox</width>
+					<height>2-row</height>
+					<align>center</align>
+					<aligny>center</aligny>
+					<font>itemTitle</font>
+					<textcolor>textActive</textcolor>
+					<shadowcolor/>
+					<label>$INFO[ListItem.TrackNumber]</label>
+				</control>
+				<control type="image">
+					<posx>1-col</posx>
+					<posy>0</posy>
+					<width>12-col-textbox</width>
+					<height>69</height>
+					<aspectratio>stretch</aspectratio>
+					<texture>colors/black.png</texture>
+					<bordersize>0</bordersize>
+					<colordiffuse>textboxInactive</colordiffuse>
+				</control>
+				<control type="image">
+					<animation type="conditional" condition="player.paused">
+						<effect type="fade" start="100" end="50" time="0"/>
+					</animation>
+					<visible>ListItem.IsPlaying</visible>
+					<posx>1-col</posx>
+					<posy>0</posy>
+					<width>15-col</width>
+					<height>2-row</height>
+					<aspectratio>stretch</aspectratio>
+					<texture>colors/white.png</texture>
+					<bordersize>0</bordersize>
+					<colordiffuse>highlight</colordiffuse>
+				</control>
+				<control type="image">
+					<visible>!ListItem.IsPlaying</visible>
+					<posx>13-col</posx>
+					<posy>0</posy>
+					<width>2-col-textbox</width>
+					<height>69</height>
+					<aspectratio>stretch</aspectratio>
+					<texture>colors/black.png</texture>
+					<bordersize>0</bordersize>
+					<colordiffuse>textboxInactive</colordiffuse>
+				</control>
+				<control type="label">
+					<visible>ListItem.IsParentFolder</visible>
+					<posx>1-col-indent</posx>
+					<posy>0</posy>
+					<width>11-col-gutter</width>
+					<height>2-row</height>
+					<aligny>center</aligny>
+					<font>itemTitle</font>
+					<textcolor>textActive</textcolor>
+					<shadowcolor/>
+					<label>..</label>
+				</control>
+				<control type="label">
+					<posx>1-col-indent</posx>
+					<posy>0</posy>
+					<width>11-col-gutter</width>
+					<height>2-row</height>
+					<aligny>center</aligny>
+					<font>itemTitle</font>
+					<textcolor>textActive</textcolor>
+					<shadowcolor/>
+					<label>$INFO[ListItem.Title]</label>
+				</control>
+				<control type="label">
+					<visible>!ListItem.IsParentFolder</visible>
+					<posx>12-col-gutter</posx>
+					<posy>0</posy>
+					<width>1-col</width>
+					<height>2-row</height>
+					<aligny>center</aligny>
+					<align>right</align>
+					<font>itemTitle</font>
+					<textcolor>textActive</textcolor>
+					<shadowcolor/>
+					<label fallback="•••">$INFO[ListItem.UserRating,,*]</label>
+				</control>
+				<control type="label">
+					<posx>13-col-indent</posx>
+					<posy>0</posy>
+					<width>2-col-gutter</width>
+					<height>2-row</height>
+					<aligny>center</aligny>
+					<align>center</align>
+					<font>itemTitle</font>
+					<textcolor>textActive</textcolor>
+					<shadowcolor/>
+					<label>$INFO[ListItem.duration]</label>
+				</control>
+			</itemlayout>
+			<focusedlayout width="15-col" height="2-row">
+				<control type="image">
+					<animation type="focus">
+						<effect type="fade" start="100" end="50" time="0"/>
+					</animation>
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>1-col-textbox</width>
+					<height>2-row</height>
+					<aspectratio>stretch</aspectratio>
+					<texture>colors/white.png</texture>
+					<bordersize>0</bordersize>
+					<colordiffuse>highlight</colordiffuse>
+					<include>spinFocusIcon</include>
+				</control>
+				<control type="image">
+					<visible>ListItem.IsPlaying + !player.paused  + !System.Platform.Linux.RaspberryPi</visible>
+					<posx>12</posx>
+					<posy>0</posy>
+					<width>1-col-gutter</width>
+					<height>1-col-gutter</height>
+					<texture>equaliser.gif</texture>
+				</control>
+				<control type="label">
+					<visible>ListItem.IsPlaying + !player.paused  + System.Platform.Linux.RaspberryPi</visible>
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>1-col-textbox</width>
+					<height>2-row</height>
+					<align>center</align>
+					<aligny>center</aligny>
+					<font>symbolLarge</font>
+					<textcolor>textActive</textcolor>
+					<shadowcolor/>
+					<label></label>
+				</control>
+				<control type="label">
+					<visible>ListItem.IsPlaying + player.paused</visible>
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>1-col-textbox</width>
+					<height>2-row</height>
+					<align>center</align>
+					<aligny>center</aligny>
+					<font>symbolLarge</font>
+					<textcolor>textActive</textcolor>
+					<shadowcolor/>
+					<label></label>
+				</control>
+				<control type="label">
+					<visible>!ListItem.IsPlaying</visible>
+					<posx>0</posx>
+					<posy>0</posy>
+					<width>1-col-textbox</width>
+					<height>2-row</height>
+					<align>center</align>
+					<aligny>center</aligny>
+					<font>itemTitle</font>
+					<textcolor>textActive</textcolor>
+					<shadowcolor/>
+					<label>$INFO[ListItem.TrackNumber]</label>
+				</control>
+				<control type="image">
+					<animation type="condition" condition="player.playing">
+						<effect type="fade" start="100" end="33" time="0"/>
+					</animation>
+					<posx>1-col</posx>
+					<posy>0</posy>
+					<width>15-col</width>
+					<height>2-row</height>
+					<aspectratio>stretch</aspectratio>
+					<texture>colors/white.png</texture>
+					<bordersize>0</bordersize>
+					<colordiffuse>highlight</colordiffuse>
+				</control>
+				<control type="label">
+					<visible>ListItem.IsParentFolder</visible>
+					<posx>1-col-indent</posx>
+					<posy>0</posy>
+					<width>11-col-gutter</width>
+					<height>2-row</height>
+					<aligny>center</aligny>
+					<font>itemTitle</font>
+					<textcolor>textActive</textcolor>
+					<shadowcolor/>
+					<label>..</label>
+				</control>
+				<control type="label">
+					<posx>1-col-indent</posx>
+					<posy>0</posy>
+					<width>11-col-gutter</width>
+					<height>2-row</height>
+					<aligny>center</aligny>
+					<font>itemTitle</font>
+					<textcolor>textActive</textcolor>
+					<shadowcolor/>
+					<label>$INFO[ListItem.Title]</label>
+				</control>
+				<control type="label">
+					<visible>!ListItem.IsParentFolder</visible>
+					<posx>12-col-gutter</posx>
+					<posy>0</posy>
+					<width>1-col</width>
+					<height>2-row</height>
+					<aligny>center</aligny>
+					<align>right</align>
+					<font>itemTitle</font>
+					<textcolor>textActive</textcolor>
+					<shadowcolor/>
+					<label fallback="•••">$INFO[ListItem.UserRating,,*]</label>
+				</control>
+				<control type="label">
+					<posx>13-col-indent</posx>
+					<posy>0</posy>
+					<width>2-col-gutter</width>
+					<height>2-row</height>
+					<aligny>center</aligny>
+					<align>center</align>
+					<font>itemTitle</font>
+					<textcolor>textActive</textcolor>
+					<shadowcolor/>
+					<label>$INFO[ListItem.duration]</label>
+				</control>
+			</focusedlayout>
+		</control>
+	</include>
+</includes>
diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml
index ec0cdf8..f24272d 100644
--- a/1080i/View_TVShows.xml
+++ b/1080i/View_TVShows.xml
@@ -10,14 +10,6 @@
 	            <colordiffuse>FF555555</colordiffuse>
 	            <aspectratio>scale</aspectratio>
 				<fadetime>250</fadetime>
-	        </control>
-			<control type="image">
-				<visible>!control.hasfocus(9203) + !control.hasfocus(9202)</visible>
-	            <include>dimensionsFullscreen</include>
-	            <texture fallback="colors/black.png">$INFO[container.listitem.art(fanart)]</texture>
-	            <colordiffuse>FF555555</colordiffuse>
-	            <aspectratio>scale</aspectratio>
-				<fadetime>250</fadetime>
 	        </control>
 			<control type="group" id="9201">
 				<visible>$EXP[isTVShow] + !string.contains(container.folderpath,playlists) + !Skin.HasSetting(disableRecentTVShows)</visible>
@@ -125,7 +117,7 @@
 	                        <colordiffuse>BBffffff</colordiffuse>
 	                    </control>
 	                    <control type="label">
-	                        <visible>!controlgroup(9000).hasfocus</visible>
+	                        <visible>!controlgroup(9000).hasfocus + container(9202).hasfocus(1)</visible>
 	                        <posx>12</posx>
 	                        <posy>318</posy>
 	                        <width>584</width>
@@ -134,6 +126,17 @@
 	                        <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>318</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>
@@ -184,7 +187,7 @@
 		                        <colordiffuse>BBffffff</colordiffuse>
 		                    </control>
 	                        <control type="label">
-		                        <visible>!controlgroup(9000).hasfocus</visible>
+		                        <visible>!controlgroup(9000).hasfocus + container(9202).hasfocus(1)</visible>
 		                        <posx>12</posx>
 		                        <posy>318</posy>
 		                        <width>584</width>
@@ -193,6 +196,17 @@
 		                        <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>318</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>
@@ -219,7 +233,7 @@
 			<control type="label">
                 <visible>!controlgroup(9000).hasfocus + $EXP[isTVShow] + !$EXP[isMovie]</visible>
                 <posx>col-1-begin</posx>
-                <posy>760</posy>
+                <posy>736</posy>
                 <width>12-col</width>
                 <height>2-row</height>
                 <aligny>center</aligny>
@@ -230,16 +244,15 @@
 			<control type="panel" id="52">
 				<visible>$EXP[isTVShow] + !$EXP[isMovie]</visible>
 				<posx>90</posx>
-				<posy>864</posy>
+				<posy>828</posy>
 				<width>1800</width>
 				<height>23-row</height>
 				<onleft>9000</onleft>
 				<onright>60</onright>
-				<ondown>52</ondown>
-				<onup>52</onup>
-				<onback>9000</onback>
+				<onup>9203</onup>
+				<onback>9203</onback>
 				<pagecontrol>60</pagecontrol>
-				<scrolltime tween="cubic" easing="out">600</scrolltime>
+				<scrolltime tween="sine">250</scrolltime>
 				<itemlayout width="252" height="438">
 					<control type="image">
 						<posx>0</posx>
@@ -248,7 +261,7 @@
 						<height>342</height>
 						<aspectratio>stretch</aspectratio>
 						<texture>colors/black.png</texture>
-						<bordersize>12</bordersize>
+						<bordersize>6</bordersize>
 						<colordiffuse>overlay</colordiffuse>
 					</control>
 					<control type="image">
@@ -258,7 +271,7 @@
 						<height>342</height>
 						<aspectratio>stretch</aspectratio>
 						<texture>$INFO[ListItem.Art(poster)]</texture>
-						<bordersize>12</bordersize>
+						<bordersize>6</bordersize>
 						<colordiffuse>BBffffff</colordiffuse>
 					</control>
 					<control type="textbox">
@@ -307,8 +320,8 @@
 					</control>
 					<control type="group">
 						<visible>Integer.IsGreater(ListItem.Property(UnWatchedEpisodes),0)</visible>
-						<posx>162</posx>
-						<posy>12</posy>
+						<posx>167</posx>
+						<posy>6</posy>
 						<control type="image">
 							<posx>0</posx>
 							<posy>0</posy>
diff --git a/1080i/custom_musicOverlay.xml b/1080i/custom_musicOverlay.xml
index 1cede2d..b5585e6 100644
--- a/1080i/custom_musicOverlay.xml
+++ b/1080i/custom_musicOverlay.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window type="dialog" id="1102">
-    <visible>player.hasaudio + !Window.IsActive(visualisation) + !window.isactive(home) + !container.content(songs)</visible>
+    <visible>player.hasaudio + !Window.IsActive(visualisation) + !window.isactive(home)</visible>
     <controls>
         <control type="group">
             <posx>col-12-begin</posx>
@@ -10,9 +10,20 @@
                 <effect type="fade" start="0" end="100" time="500" delay="500"/>
             </animation>
             <control type="image">
+				<animation type="conditional" condition="true">
+					<effect type="fade" start="100" end="33" time="0"/>
+				</animation>
                 <posx>0</posx>
                 <posy>0</posy>
-                <width>8-col</width>
+                <width>1-col-textbox</width>
+                <height>54</height>
+                <texture>colors/white.png</texture>
+                <colordiffuse>highlight</colordiffuse>
+            </control>
+			<control type="image">
+                <posx>1-col</posx>
+                <posy>0</posy>
+                <width>7-col</width>
                 <height>54</height>
                 <texture>colors/white.png</texture>
                 <colordiffuse>highlight</colordiffuse>
@@ -57,7 +68,7 @@
             </control>
             <control type="label">
                 <description>Artist</description>
-                <posx>1-col</posx>
+                <posx>1-col-indent</posx>
                 <posy>0</posy>
                 <font>itemSubTitle</font>
                 <width>7-col-gutter</width>
diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml
index 5026bde..3d1bb79 100644
--- a/1080i/custom_musicPlayerFullscreen.xml
+++ b/1080i/custom_musicPlayerFullscreen.xml
@@ -37,7 +37,7 @@
 	                <texture fallback="noAlbumCover.jpg">$INFO[MusicPlayer.Cover]</texture>
                     <bordertexture colordiffuse="overlay">colors/black.png</bordertexture>
                     <bordersize>6</bordersize>
-                    <colordiffuse>BBffffff</colordiffuse>
+                    <colordiffuse>ffffffff</colordiffuse>
 	            </control>
 				<!--visualisation-->
 				<control type="visualisation" id="2">
@@ -64,11 +64,11 @@
 					<posy>0</posy>			
 					<control type="label">
 						<posx>5-col</posx>
-						<posy>56</posy>
+						<posy>86</posy>
 						<width>14-col</width>
 						<height>2-row</height>
 						<align>center</align>
-						<font>mediumTitle</font>
+						<font>menuTitle3</font>
 						<textcolor>textActive</textcolor>
 						<scroll>true</scroll>
 						<label>$INFO[MusicPlayer.Title]</label>
@@ -76,11 +76,11 @@
 					</control>
 					<control type="label">
 						<posx>4-col</posx>
-						<posy>3-row</posy>
+						<posy>124</posy>
 						<width>16-col</width>
 						<height>3-row</height>
 						<align>center</align>
-						<font>menuTitle</font>
+						<font>buttonTitle</font>
 						<textcolor>textActive</textcolor>
 						<scroll>true</scroll>
 						<label>[B]$INFO[MusicPlayer.artist][/B][CR]$INFO[MusicPlayer.Album,, ]$INFO[MusicPlayer.year,(,)]</label>
@@ -97,22 +97,22 @@
 		                <info>player.progress</info>
 		            </control>
 					<control type="label">
-						<posx>624</posx>
+						<posx>628</posx>
 						<posy>6-row</posy>
 						<width>4-col</width>
 						<align>right</align>
-						<font>itemTitle</font>
+						<font>buttonTitle2</font>
 						<textcolor>textActive</textcolor>
 						<scroll>true</scroll>
 						<label>$INFO[musicplayer.Playlistposition]$INFO[musicplayer.Playlistlength, / ]</label>
 						<shadowcolor>99000000</shadowcolor>
 					</control>
 					<control type="label">
-						<posx>1104</posx>
+						<posx>1100</posx>
 						<posy>6-row</posy>
 						<width>4-col</width>
 						<align>left</align>
-						<font>itemTitle</font>
+						<font>buttonTitle2</font>
 						<textcolor>textActive</textcolor>
 						<scroll>true</scroll>
 						<label>$INFO[MusicPlayer.timeremaining]</label>
diff --git a/shortcuts/overrides.xml b/shortcuts/overrides.xml
index 568bc4a..6a3273e 100644
--- a/shortcuts/overrides.xml
+++ b/shortcuts/overrides.xml
@@ -10,7 +10,7 @@
 		<condition>system.hasaddon(script.globalsearch)</condition>
 		<action>::ACTION::</action>
 	</override>
-	
+
 	<override action="ActivateWindow(Videos,videodb://movies/titles/)" group="mainmenu">
 		<condition>!Skin.HasSetting(disableRecentMovies)</condition>
 		<action>::ACTION::</action>
@@ -74,6 +74,7 @@
 	<override action="ActivateWindow(Music,musicdb://artists/)" group="musicsubmenu">
 		<condition>window.isactive(music)</condition>
 		<action>Container.Update(musicdb://artists/)</action>
+		<action>control.setfocus(51,0,absolute)</action>
 	</override>
 	<override action="ActivateWindow(Music,musicdb://artists/)" group="musicsubmenu">
 		<condition>!window.isactive(music)</condition>