diff --git a/16x9/Animations.xml b/16x9/Animations.xml
index b24a413b..9f188a88 100644
--- a/16x9/Animations.xml
+++ b/16x9/Animations.xml
@@ -262,9 +262,12 @@
 	</include>
 
 	<!-- Conditionals/scenarios -->
-	<include name="Focus_Zoom_Animation" reversible="true">
+	<include name="Focus_Zoom_Animation" >
 		<animation effect="zoom" center="auto" start="103" end="100" time="Default_Transition_0.75x" tween="back" easing="in" condition="$EXP[GridView_IsVisible]" reversible="false">Focus</animation>
 	</include>
+	<include name="Multiart_Focus_Fade_Animation">
+		<animation effect="fade" start="0" end="100" time="Default_Transition_0.75x" delay="3000" tween="sine" easing="inout" reversible="false">Focus</animation>
+	</include>
 
 	<include name="Grid_Details_Overlay_Fade_Animation">
 		<include content="fade_animation">
diff --git a/16x9/Components_Buttons.xml b/16x9/Components_Buttons.xml
index 6ce2ff98..901ec550 100644
--- a/16x9/Components_Buttons.xml
+++ b/16x9/Components_Buttons.xml
@@ -1131,6 +1131,36 @@
 		</definition>
 	</include>
 
+	<include name="Like_unfocused">
+		<param name="visible" default="true" />
+		<param name="color" default="$VAR[Breadcrumb_Label_Color]" />
+		<param name="width" default="120" />
+		<definition>
+			<include content="Texture_Button_Template">
+				<param name="visible" value="$PARAM[visible]" />
+				<param name="texture" value="icons/icon_like_unfocused_$PARAM[width].png" />
+				<param name="width" value="$PARAM[width]" />
+				<param name="color" value="$PARAM[color]" />
+				<nested />
+			</include>
+		</definition>
+	</include>
+
+	<include name="Like_focused">
+		<param name="visible" default="true" />
+		<param name="color" default="$VAR[Breadcrumb_Label_Color]" />
+		<param name="width" default="120" />
+		<definition>
+			<include content="Texture_Button_Template">
+				<param name="visible" value="$PARAM[visible]" />
+				<param name="texture" value="icons/icon_like_focused_$PARAM[width].png" />
+				<param name="width" value="$PARAM[width]" />
+				<param name="color" value="$PARAM[color]" />
+				<nested />
+			</include>
+		</definition>
+	</include>
+
 	<include name="List_unfocused">
 		<param name="visible" default="true" />
 		<param name="color" default="$VAR[Breadcrumb_Label_Color]" />
diff --git a/16x9/Components_Home.xml b/16x9/Components_Home.xml
index ee1b8910..e3e3251f 100644
--- a/16x9/Components_Home.xml
+++ b/16x9/Components_Home.xml
@@ -342,15 +342,18 @@
 		<param name="visible" default="![$EXP[Music_Player_IsVisible] | $EXP[Music_Player_HasFocus] | $EXP[Infoscreen_IsVisible] | $EXP[globalsearch_IsVisible] | Control.HasFocus(4300) | Window.IsVisible(volumebar) | Window.IsVisible(notification) | Window.IsVisible(extendedprogressdialog) | Window.IsVisible(shutdownmenu)]" />
 		<param name="textcolor" default="$VAR[Time_Widget_Label_Color]" />
 		<definition>
-			<include content="Clock" condition="!Skin.String(Time_Widget,Date) + !Skin.String(Time_Widget,Weather)">
-				<param name="visible" value="$PARAM[visible]" />
-				<param name="textcolor" value="$PARAM[textcolor]" />
-			</include>
-			<include content="Time_Widget" condition="Skin.String(Time_Widget,Date) | Skin.String(Time_Widget,Weather)">
-				<param name="visible" value="$PARAM[visible]" />
-				<param name="include_weather" value="Skin.String(Time_Widget,Weather)" />
-				<param name="textcolor" value="$PARAM[textcolor]" />
-			</include>
+			<control type="group">
+				<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
+				<include content="Clock" condition="!Skin.String(Time_Widget,Date) + !Skin.String(Time_Widget,Weather)">
+					<param name="visible" value="$PARAM[visible]" />
+					<param name="textcolor" value="$PARAM[textcolor]" />
+				</include>
+				<include content="Time_Widget" condition="Skin.String(Time_Widget,Date) | Skin.String(Time_Widget,Weather)">
+					<param name="visible" value="$PARAM[visible]" />
+					<param name="include_weather" value="Skin.String(Time_Widget,Weather)" />
+					<param name="textcolor" value="$PARAM[textcolor]" />
+				</include>
+			</control>
 		</definition>
 	</include>
 
diff --git a/16x9/Components_Infoscreens.xml b/16x9/Components_Infoscreens.xml
index 75c57bc9..5370ef31 100644
--- a/16x9/Components_Infoscreens.xml
+++ b/16x9/Components_Infoscreens.xml
@@ -54,23 +54,23 @@
 			<align>center</align>
 			<itemgap>0</itemgap>
 			<include content="Flag_Icon">
-				<param name="id" value="6303" />
+				<param name="visible" value="!String.IsEqual(Control.GetLabel(6303),flags/blank.png)" />
 				<param name="texture" value="$VAR[Studio_Flag]" />
 			</include>
 			<include content="Flag_Icon">
-				<param name="id" value="6304" />
+				<param name="visible" value="!String.IsEqual(Control.GetLabel(6304),flags/blank.png)" />
 				<param name="texture" value="$VAR[MPAA_Flag]" />
 			</include>
 			<include content="Flag_Icon" condition="$PARAM[VideoSource_condition]">
-				<param name="id" value="6305" />
+				<param name="visible" value="!String.IsEqual(Control.GetLabel(6305),flags/blank.png)" />
 				<param name="texture" value="$VAR[VideoSource_Flag]" />
 			</include>
 			<include content="Flag_Icon" condition="$PARAM[VideoCodec_condition]">
-				<param name="id" value="6306" />
+				<param name="visible" value="!String.IsEqual(Control.GetLabel(6306),flags/blank.png)" />
 				<param name="texture" value="$VAR[VideoCodec_Flag]" />
 			</include>
 			<include content="Flag_Icon" condition="$PARAM[AudioCodec_condition]">
-				<param name="id" value="6307" />
+				<param name="visible" value="!String.IsEqual(Control.GetLabel(6307),flags/blank.png)" />
 				<param name="texture" value="$VAR[AudioCodec_Flag]" />
 			</include>
 		</control>
diff --git a/16x9/Components_Viewtype_500_DetailedList.xml b/16x9/Components_Viewtype_500_DetailedList.xml
new file mode 100644
index 00000000..4941a14f
--- /dev/null
+++ b/16x9/Components_Viewtype_500_DetailedList.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<includes>
+
+	<include name="DetailedListView_Art">
+		<include content="Artwork_Transition_Fade">
+			<param name="target_id" value="$PARAM[target_id]" />
+			<param name="art_icon" value="$PARAM[art_icon]" />
+			<param name="kenburns" value="Skin.HasSetting(Billboard_Ken_Burns_Effect)" />
+		</include>
+	</include>
+
+	<include name="DetailedListView_Layout">
+		<param name="texture" default="$VAR[DetailedList(0)Content]" />
+		<param name="multiart" default="false" />
+		<param name="multiart_texture" default="$VAR[DetailedList_Focused(0)Content]" />
+		<definition>
+			<control type="group">
+				<left>90</left>
+				<width>320</width>
+				<top>24</top>
+				<height>196</height>
+				<include content="Music_Rating" condition="Window.Is(music)">
+					<param name="slide" value="-175" />
+				</include>
+				<include content="Simple_ListIcon">
+					<param name="texture" value="$PARAM[texture]" />
+					<param name="height" value="180" />
+					<param name="align" value="center" />
+					<param name="aligny" value="center" />
+					<param name="aspectratio" value="keep" />
+					<param name="fadetime" value="0" />
+				</include>
+				<include content="Simple_ListIcon" condition="$PARAM[multiart]">
+					<param name="texture" value="$PARAM[multiart_texture]" />
+					<param name="height" value="180" />
+					<param name="align" value="center" />
+					<param name="aligny" value="center" />
+					<param name="aspectratio" value="keep" />
+					<param name="fadetime" value="360" />
+					<include content="Multiart_Focus_Fade_Animation" />
+				</include>
+				<include content="Now_Playing_Icon">
+					<param name="visible" value="String.IsEqual(VideoPlayer.ChannelName,ListItem.Label)" />
+					<param name="color" value="$VAR[Light_Color]" />
+					<animation effect="slide" end="0,5" time="0" condition="Player.Paused">Conditional</animation>
+				</include>
+				<include name="Progress">
+					<param name="id" value="500	" />
+					<param name="bottom" value="0" />
+				</include>
+			</control>
+			<control type="group">
+				<animation effect="slide" end="0,52" time="0" condition="String.IsEmpty(Control.GetLabel(6003))">Conditional</animation>
+				<top>30</top>
+				<bottom>30</bottom>
+				<left>440</left>
+				<right>30</right>
+				<control type="label">
+					<height>40</height>
+					<width>100%</width>
+					<label>$VAR[Title_Label]</label>
+					<font>Grid_Title_Medium</font>
+					<textcolor>$VAR[Light_Color]</textcolor>
+					<selectedcolor>$VAR[Light_Color]</selectedcolor>
+					<scroll>false</scroll>
+				</control>
+				<control type="label">
+					<top>45</top>
+					<height>30</height>
+					<width>100%</width>
+					<label>$VAR[Info_Label] - $INFO[ListItem.]</label>
+					<font>PVR_Info</font>
+					<textcolor>$VAR[Light_Color]</textcolor>
+					<selectedcolor>$VAR[Light_Color]</selectedcolor>
+				</control>
+				<control type="textbox">
+					<visible>!String.IsEmpty(Control.GetLabel(6003))</visible>
+					<bottom>10</bottom>
+					<height>85</height>
+					<width>100%</width>
+					<label>$VAR[Plot_Label]</label>
+					<aligny>top</aligny>
+					<font>PVR_Description</font>
+					<autoscroll>false</autoscroll>
+					<textcolor>$VAR[Light_Color]</textcolor>
+					<selectedcolor>$VAR[Light_Color]</selectedcolor>
+				</control>
+			</control>
+			<control type="group">
+				<top>15</top>
+				<right>30</right>
+				<width>210</width>
+				<include content="Flag_Icon">
+					<param name="visible" value="true" />
+					<param name="texture" value="$VAR[Studio_Flag]" />
+					<param name="width" value="90" />
+					<param name="icon_width" value="75" />
+					<param name="icon_height" value="50" />
+				</include>
+				<include content="Flag_Icon">
+					<param name="visible" value="true" />
+					<param name="texture" value="$VAR[MPAA_Flag]" />
+					<param name="width" value="90" />
+					<param name="icon_width" value="75" />
+					<param name="icon_height" value="50" />
+					<animation effect="slide" end="120" time="0" condition="true">Conditional</animation>
+				</include>
+			</control>
+		</definition>
+	</include>
+
+</includes>
\ No newline at end of file
diff --git a/16x9/Components_Viewtype_501_Billboard.xml b/16x9/Components_Viewtype_501_Billboard.xml
deleted file mode 100644
index 6a3db4cd..00000000
--- a/16x9/Components_Viewtype_501_Billboard.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<includes>
-	<include name="BillboardView_Art_Fanart">
-		<include content="Artwork_Transition_Fade">
-			<param name="target_id" value="$PARAM[target_id]" />
-			<param name="art_icon" value="$PARAM[art_icon]" />
-			<param name="kenburns" value="Skin.HasSetting(Billboard_Ken_Burns_Effect)" />
-		</include>
-	</include>
-</includes>
\ No newline at end of file
diff --git a/16x9/Components_Viewtype_505_Grid.xml b/16x9/Components_Viewtype_505_Grid.xml
index bbc5297e..e63c0500 100644
--- a/16x9/Components_Viewtype_505_Grid.xml
+++ b/16x9/Components_Viewtype_505_Grid.xml
@@ -756,67 +756,73 @@
 	</include>
 
 	<include name="GridView_ListIcon_Static_Focused">
-		<include content="ListIcon_Static_Focused">
-			<param name="visible" value="$PARAM[visible]" />
-			<param name="position" value="$PARAM[position]" />
-			<param name="left" value="$PARAM[left]" />
-			<param name="top" value="$PARAM[top]" />
-			<param name="width" value="$PARAM[width]" />
-			<param name="height" value="$PARAM[height]" />
-			<param name="art_icon" value="$PARAM[art_icon]" />
-			<param name="art_diffuse" value="$PARAM[art_diffuse]" />
-			<param name="now_playing" value="$EXP[ListItem($PARAM[position])_NowPlaying]" />
-			<param name="fallback" value="$PARAM[fallback]" />
-			<!-- Multiart -->
-			<include content="Icon_Component_Multiart_Static" condition="Skin.HasSetting(Multiart_Slideshow) + !Window.Is(movieinformation) + !Window.Is(musicinformation) + !Window.Is(songinformation)">
+		<param name="border_protrusion" default="10" />
+		<definition>
+			<include content="ListIcon_Static_Focused">
+				<param name="visible" value="$PARAM[visible]" />
+				<param name="position" value="$PARAM[position]" />
+				<param name="left" value="$PARAM[left]" />
+				<param name="top" value="$PARAM[top]" />
+				<param name="width" value="$PARAM[width]" />
+				<param name="height" value="$PARAM[height]" />
+				<param name="art_icon" value="$PARAM[art_icon]" />
 				<param name="art_diffuse" value="$PARAM[art_diffuse]" />
 				<param name="now_playing" value="$EXP[ListItem($PARAM[position])_NowPlaying]" />
+				<param name="fallback" value="$PARAM[fallback]" />
+				<!-- Multiart -->
+				<include content="Icon_Component_Multiart_Static" condition="Skin.HasSetting(Multiart_Slideshow) + !Window.Is(movieinformation) + !Window.Is(musicinformation) + !Window.Is(songinformation)">
+					<param name="art_diffuse" value="$PARAM[art_diffuse]" />
+					<param name="now_playing" value="$EXP[ListItem($PARAM[position])_NowPlaying]" />
+				</include>
+				<!-- Progress overlay -->
+				<include content="Icon_Component_Progress_Overlay" condition="Window.Is(home) | Window.Is(videos) | Window.Is(movieinformation)">
+					<param name="visible" value="!String.IsEmpty(Container($PARAM[target_id]).ListItemNoWrap($PARAM[position]).Label) + ![Window.Is(movieinformation) + Control.HasFocus(50)]" />
+				</include>
+				<!-- Border -->
+				<include content="Icon_Component_Border">
+					<param name="visible" value="$PARAM[border_visible]" />
+					<param name="protrusion" value="$PARAM[border_protrusion]" />
+					<param name="size" value="$PARAM[border_size]" />
+					<param name="color" value="$PARAM[border_color]" />
+					<param name="texture" value="$PARAM[border_texture]" />
+				</include>
 			</include>
-			<!-- Progress overlay -->
-			<include content="Icon_Component_Progress_Overlay" condition="Window.Is(home) | Window.Is(videos) | Window.Is(movieinformation)">
-				<param name="visible" value="!String.IsEmpty(Container($PARAM[target_id]).ListItemNoWrap($PARAM[position]).Label) + ![Window.Is(movieinformation) + Control.HasFocus(50)]" />
-			</include>
-			<!-- Border -->
-			<include content="Icon_Component_Border">
-				<param name="visible" value="$PARAM[border_visible]" />
-				<param name="protrusion" value="10" />
-				<param name="size" value="$PARAM[border_size]" />
-				<param name="color" value="$PARAM[border_color]" />
-				<param name="texture" value="$PARAM[border_texture]" />
-			</include>
-		</include>
+		</definition>
 	</include>
 
 	<include name="GridView_ListIcon_Animated">
-		<include content="ListIcon_Animated">
-			<param name="visible" value="$PARAM[visible]" />
-			<param name="position" value="$PARAM[position]" />
-			<param name="left" value="$PARAM[left]" />
-			<param name="top" value="$PARAM[top]" />
-			<param name="width" value="$PARAM[width]" />
-			<param name="height" value="$PARAM[height]" />
-			<param name="art_icon" value="$PARAM[art_icon]" />
-			<param name="art_diffuse" value="false" />
-			<param name="art_diffuse_fadein" value="$PARAM[art_diffuse_fadein]" />
-			<param name="now_playing" value="$EXP[ListItem($PARAM[position])_NowPlaying]" />
-			<param name="fallback" value="$PARAM[fallback]" />
-			<param name="animationtype" value="$PARAM[animationtype]" />
-			<param name="animationeffect" value="$PARAM[animationeffect]" />
-			<param name="animationend" value="$PARAM[animationend]" />
-			<param name="animationcondition" value="$PARAM[animationcondition]" />
-			<!-- Progress overlay -->
-			<include content="Icon_Component_Progress_Overlay" condition="Window.Is(home) | Window.Is(videos) | Window.Is(movieinformation)">
-				<param name="visible" value="!String.IsEmpty(Container($PARAM[target_id]).ListItemNoWrap($PARAM[position]).Label) + ![Window.Is(movieinformation) + Control.HasFocus(50)]" />
-			</include>
-			<!-- Border -->
-			<include content="Icon_Component_Border">
-				<param name="visible" value="$PARAM[border_visible]" />
-				<param name="protrusion" value="10" />
-				<param name="size" value="$PARAM[border_size]" />
-				<param name="color" value="$PARAM[border_color]" />
-				<param name="texture" value="$PARAM[border_texture]" />
+		<param name="border_protrusion" default="10" />
+		<definition>
+			<include content="ListIcon_Animated">
+				<param name="visible" value="$PARAM[visible]" />
+				<param name="position" value="$PARAM[position]" />
+				<param name="left" value="$PARAM[left]" />
+				<param name="top" value="$PARAM[top]" />
+				<param name="width" value="$PARAM[width]" />
+				<param name="height" value="$PARAM[height]" />
+				<param name="art_icon" value="$PARAM[art_icon]" />
+				<param name="art_diffuse" value="false" />
+				<param name="art_diffuse_fadein" value="$PARAM[art_diffuse_fadein]" />
+				<param name="now_playing" value="$EXP[ListItem($PARAM[position])_NowPlaying]" />
+				<param name="fallback" value="$PARAM[fallback]" />
+				<param name="animationtype" value="$PARAM[animationtype]" />
+				<param name="animationeffect" value="$PARAM[animationeffect]" />
+				<param name="animationend" value="$PARAM[animationend]" />
+				<param name="animationcondition" value="$PARAM[animationcondition]" />
+				<!-- Progress overlay -->
+				<include content="Icon_Component_Progress_Overlay" condition="Window.Is(home) | Window.Is(videos) | Window.Is(movieinformation)">
+					<param name="visible" value="!String.IsEmpty(Container($PARAM[target_id]).ListItemNoWrap($PARAM[position]).Label) + ![Window.Is(movieinformation) + Control.HasFocus(50)]" />
+				</include>
+				<!-- Border -->
+				<include content="Icon_Component_Border">
+					<param name="visible" value="$PARAM[border_visible]" />
+					<param name="protrusion" value="$PARAM[border_protrusion]" />
+					<param name="size" value="$PARAM[border_size]" />
+					<param name="color" value="$PARAM[border_color]" />
+					<param name="texture" value="$PARAM[border_texture]" />
+				</include>
 			</include>
-		</include>
+		</definition>
 	</include>
 
 	<include name="GridView_Multiart_Animated">
@@ -879,7 +885,7 @@
 		<param name="art_diffuse" />
 		<param name="fallback" />
 		<param name="focus_border_visible" />
-		<param name="focus_border_edge" />
+		<param name="focus_border_protrusion" />
 		<param name="focus_border_size" />
 		<param name="focus_border_color" />
 		<param name="focus_border_texture" />
@@ -1049,6 +1055,7 @@
 						<param name="animationeffect" value="slide" />
 						<param name="animationend" value="$PARAM[item_width],0" />
 						<param name="border_visible" value="$PARAM[focus_border_visible]" />
+						<param name="border_protrusion" value="$PARAM[focus_border_protrusion]" />
 						<param name="border_size" value="$PARAM[focus_border_size]" />
 						<param name="border_color" value="$PARAM[focus_border_color]" />
 						<param name="border_texture" value="$PARAM[focus_border_texture]" />
@@ -1215,6 +1222,7 @@
 						<param name="animationeffect" value="slide" />
 						<param name="animationend" value="-$PARAM[item_width],0" />
 						<param name="border_visible" value="$PARAM[focus_border_visible]" />
+						<param name="border_protrusion" value="$PARAM[focus_border_protrusion]" />
 						<param name="border_size" value="$PARAM[focus_border_size]" />
 						<param name="border_color" value="$PARAM[focus_border_color]" />
 						<param name="border_texture" value="$PARAM[focus_border_texture]" />
@@ -1370,6 +1378,8 @@
 		<param name="5x_item_width" />
 		<param name="6x_item_width" />
 		<param name="focus_border_visible" default="true" />
+		<param name="focus_border_protrusion" default="10" />
+		<param name="focus_border_size" default="11" />
 		<definition>
 			<control type="group">
 				<animation effect="slide" start="0,0" end="60,0" time="0" condition="true">Conditional</animation>
@@ -1393,8 +1403,8 @@
 					<param name="art_diffuse" value="$PARAM[art_diffuse]" />
 					<param name="fallback" value="$PARAM[fallback]" />
 					<param name="focus_border_visible" value="$PARAM[focus_border_visible]" />
-					<param name="focus_border_protrusion" value="10" />
-					<param name="focus_border_size" value="11" />
+					<param name="focus_border_protrusion" value="$PARAM[focus_border_protrusion]" />
+					<param name="focus_border_size" value="$PARAM[focus_border_size]" />
 					<param name="focus_border_color" value="$VAR[Accent_Color]" />
 					<param name="focus_border_texture" value="views/border_10px.png" />
 				</include>
@@ -1414,8 +1424,8 @@
 					<param name="art_diffuse" value="$PARAM[art_diffuse]" />
 					<param name="fallback" value="$PARAM[fallback]" />
 					<param name="focus_border_visible" value="$PARAM[focus_border_visible]" />
-					<param name="focus_border_protrusion" value="10" />
-					<param name="focus_border_size" value="11" />
+					<param name="focus_border_protrusion" value="$PARAM[focus_border_protrusion]" />
+					<param name="focus_border_size" value="$PARAM[focus_border_size]" />
 					<param name="focus_border_color" value="$VAR[Accent_Color]" />
 					<param name="focus_border_texture" value="views/border_10px.png" />
 				</include>
@@ -1465,7 +1475,6 @@
 				<param name="4x_item_width" value="2368" />
 				<param name="5x_item_width" value="2960" />
 				<param name="art_icon" value="$PARAM[art_icon]" />
-				<param name="focus_border_visible" value="$PARAM[focus_border_visible]" />
 				<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
 				<nested />
 			</include>
@@ -1493,7 +1502,8 @@
 				<param name="6x_item_width" value="2112" />
 				<param name="art_icon" value="$PARAM[art_icon]" />
 				<param name="art_diffuse" value="$PARAM[art_diffuse]" />
-				<param name="focus_border_visible" value="$PARAM[focus_border_visible]" />
+				<param name="focus_border_protrusion" value="6" />
+				<param name="focus_border_size" value="7" />
 				<animation effect="slide" start="0,0" end="20,0" time="0" condition="true">Conditional</animation>
 				<nested />
 			</include>
diff --git a/16x9/Components_Viewtypes.xml b/16x9/Components_Viewtypes.xml
index b15eca6a..b85499bf 100644
--- a/16x9/Components_Viewtypes.xml
+++ b/16x9/Components_Viewtypes.xml
@@ -198,11 +198,13 @@
 
 	<include name="Music_Rating">
 		<param name="visible" default="!String.IsEmpty(ListItem.UserRating) + Integer.IsGreaterOrEqual(ListItem.UserRating,Skin.Numeric(Music_Rating_Like_Threshold))" />
+		<param name="slide" />
 		<definition>
-			<include content="$PARAM[like_texture]" condition="Skin.String(Music_Rating_Like_Threshold)">
+			<include content="Like_focused" condition="Skin.String(Music_Rating_Like_Threshold)">
 				<param name="visible" value="String.IsEqual(ListItem.DBType,song) + $PARAM[visible]" />
-				<param name="color" value="$PARAM[color]" />
-				<animation effect="slide" end="$PARAM[slide],8" time="0" condition="true">Conditional</animation>
+				<param name="color" value="$VAR[Accent_Color]" />
+				<animation effect="slide" end="$PARAM[slide]" time="0" condition="true">Conditional</animation>
+				<animation effect="slide" end="0,8" time="0" condition="$EXP[ListView_IsVisible]">Conditional</animation>
 			</include>
 		</definition>
 	</include>
@@ -239,8 +241,6 @@
 		<param name="now_playing_icon" default="true" />
 		<param name="list_icon" default="String.IsEqual(ListItem.Overlay,OverlayWatched.png) + !$EXP[ListItem(0)_NowPlaying]" />
 		<param name="list_icon_texture" default="Check_unfocused" />
-		<param name="music_rating_like_texture" default="Like_unfocused" />
-		<param name="music_rating_color" default="$VAR[Accent_Color]" />
 		<param name="font" default="List_Unfocused" />
 		<param name="textcolor" default="$VAR[Light_Color]" />
 		<param name="selectedcolor" default="$VAR[Light_Color]" />
@@ -268,8 +268,6 @@
 					<param name="selectedcolor" value="$PARAM[selectedcolor]" />
 				</include>
 				<include content="Music_Rating" condition="Window.Is(music) | Window.Is(musicinformation)">
-					<param name="like_texture" value="$PARAM[music_rating_like_texture]" />
-					<param name="color" value="$PARAM[music_rating_color]" />
 					<param name="slide" value="$PARAM[music_rating_slide]" />
 				</include>
 				<include content="Simple_List_Layout" condition="!Skin.HasSetting(List_Prefer_Scrolling)">
@@ -299,7 +297,6 @@
 		<param name="list_icon" default="String.IsEqual(ListItem.Overlay,OverlayWatched.png) + !$EXP[ListItem(0)_NowPlaying]" />
 		<param name="list_icon_texture" default="Check_unfocused" />
 		<param name="music_rating_slide" default="525" />
-		<param name="music_rating_color" default="$VAR[Accent_Color]" />
 		<param name="label_left" default="90" />
 		<param name="label_maxwidth" default="840" />
 		<param name="selectedcolor" default="$VAR[Light_Color]" />
@@ -309,8 +306,6 @@
 				<param name="icon_slide" value="$PARAM[icon_slide]" />
 				<param name="list_icon" value="$PARAM[list_icon]" />
 				<param name="list_icon_texture" value="$PARAM[list_icon_texture]" />
-				<param name="music_rating_like_texture" value="Like_focused" />
-				<param name="music_rating_color" value="$PARAM[music_rating_color]" />
 				<param name="music_rating_slide" value="$PARAM[music_rating_slide]" />
 				<param name="label" value="$VAR[Title_Unfocused_Label]" />
 				<param name="label_left" value="$PARAM[label_left]" />
@@ -325,7 +320,6 @@
 		<param name="list_icon" default="String.IsEqual(ListItem.Overlay,OverlayWatched.png) + !$EXP[ListItem(0)_NowPlaying]" />
 		<param name="list_icon_texture" default="Check_focused" />
 		<param name="music_rating_slide" default="525" />
-		<param name="music_rating_color" default="$VAR[Accent_Color]" />
 		<param name="label_left" default="90" />
 		<param name="label_maxwidth" default="990" />
 		<param name="selectedcolor" default="$VAR[Light_Color]" />
@@ -337,8 +331,6 @@
 				<param name="icon_slide" value="$PARAM[icon_slide]" />
 				<param name="list_icon" value="$PARAM[list_icon]" />
 				<param name="list_icon_texture" value="$PARAM[list_icon_texture]" />
-				<param name="music_rating_like_texture" value="Like_focused" />
-				<param name="music_rating_color" value="$PARAM[music_rating_color]" />
 				<param name="music_rating_slide" value="$PARAM[music_rating_slide]" />
 				<param name="track_number_color" value="$VAR[Light_Color]" />
 				<param name="label" value="$VAR[Title_Label]" />
@@ -692,6 +684,23 @@
 		<param name="font_medium" default="Title_Breadcrumb_Label" />
 		<param name="font_small" default="MusicPlayer_Title" />
 		<definition>
+			<control type="grouplist">
+				<top>-150</top>
+				<height>150</height>
+				<width>$PARAM[width]</width>
+				<height>$PARAM[height]</height>
+				<control type="textbox" id="6005">
+					<font>$PARAM[font_large]</font>
+					<label>$PARAM[label]</label>
+					<autoscroll>false</autoscroll>
+					<height>75</height>
+				</control>
+				<control type="textbox" id="6006">
+					<font>$PARAM[font_medium]</font>
+					<label>$PARAM[label]</label>
+					<height>75</height>
+				</control>
+			</control>
 			<control type="group">
 				<visible>$PARAM[visible]</visible>
 				<width>$PARAM[width]</width>
@@ -699,7 +708,7 @@
 				<height>$PARAM[height]</height>
 				<bottom>$PARAM[bottom]</bottom>
 				<nested />
-				<control type="textbox" id="6005">
+				<control type="textbox">
 					<visible>$PARAM[visible_large]</visible>
 					<font>$PARAM[font_large]</font>
 					<textcolor>$PARAM[textcolor]</textcolor>
@@ -707,8 +716,9 @@
 					<align>$PARAM[align]</align>
 					<aligny>center</aligny>
 					<autoscroll>false</autoscroll>
+					<height>70</height>
 				</control>
-				<control type="textbox" id="6006">
+				<control type="textbox">
 					<visible>$PARAM[visible_medium]</visible>
 					<font>$PARAM[font_medium]</font>
 					<textcolor>$PARAM[textcolor]</textcolor>
@@ -717,7 +727,7 @@
 					<aligny>center</aligny>
 					<autoscroll>false</autoscroll>
 				</control>
-				<control type="label">
+				<control type="label" id="6007">
 					<visible>$PARAM[visible_small]</visible>
 					<font>$PARAM[font_small]</font>
 					<textcolor>$PARAM[textcolor]</textcolor>
@@ -1079,24 +1089,25 @@
 	</include>
 
 	<include name="Flag_Icon">
-		<param name="visible" default="true" />
-		<param name="id" />
+		<param name="visible" default="false" />
 		<param name="texture" />
+		<param name="width" default="180" />
+		<param name="icon_width" default="90" />
+		<param name="icon_height" default="60" />
 		<param name="colordiffuse" default="$VAR[Light_Color]" />
 		<param name="fadetime" default="0" />
 		<definition>
 			<control type="group">
 				<visible>$PARAM[visible]</visible>
-				<visible>!String.IsEqual(Control.GetLabel($PARAM[id]),flags/blank.png)</visible>
 				<animation effect="slide" end="-60" time="0" condition="[Window.Is(videos) | Window.Is(videoplaylist)] + $EXP[ListView_Display_IsThumbnails]">Conditional</animation>
+				<width>$PARAM[width]</width>
+				<height>$PARAM[width]</height>
 				<nested />
-				<width>180</width>
-				<height>180</height>
 				<control type="image">
 					<centerleft>50%</centerleft>
 					<centertop>50%</centertop>
-					<width>90</width>
-					<height>60</height>
+					<width>$PARAM[icon_width]</width>
+					<height>$PARAM[icon_height]</height>
 					<aspectratio>keep</aspectratio>
 					<texture fallback="flags/blank.png" colordiffuse="$PARAM[colordiffuse]">$PARAM[texture]</texture>
 					<fadetime>$PARAM[fadetime]</fadetime>
diff --git a/16x9/Content_Viewtype_500_DetailedList.xml b/16x9/Content_Viewtype_500_DetailedList.xml
new file mode 100644
index 00000000..9d9e6013
--- /dev/null
+++ b/16x9/Content_Viewtype_500_DetailedList.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<includes>
+	<include name="DetailedListView_Menu_Options">
+		<param name="visible" default="Control.IsVisible(500)" />
+		<definition>
+			<item id="1">
+				<description>Layout / Detailed List</description>
+				<onclick>SetFocus(50)</onclick>
+				<label>$VAR[Copacetic_Chevron_Left] $LOCALIZE[31034] $VAR[Copacetic_Chevron_Right]</label>
+				<label2>$LOCALIZE[31005] $VAR[Copacetic_Divider_Bold] $LOCALIZE[31034]</label2>
+				<property name="ActionLeft">Container.PreviousViewMode</property>
+				<property name="ActionRight">Container.NextViewMode</property>
+				<visible>$PARAM[visible] + Integer.IsGreater(Container.ViewCount,1)</visible>
+			</item>
+		</definition>
+	</include>
+</includes>
\ No newline at end of file
diff --git a/16x9/Expressions.xml b/16x9/Expressions.xml
index 2d1c2e1f..a8683d68 100644
--- a/16x9/Expressions.xml
+++ b/16x9/Expressions.xml
@@ -1008,7 +1008,7 @@
 	<expression name="GridView_Display_IsFanart_Widget9_Home">String.IsEqual(Window(home).Property(Home_Widget),3209) + Skin.String(Widget9_View,Grid) + Skin.String(Widget9_Display,Fanart)</expression>
 	<expression name="GridView_Display_IsFanart_Widget_Infoscreen">$EXP[Infoscreen_IsVisible] + [Control.HasFocus(50) + String.IsEqual(Control.GetLabel(62001),Grid) + String.IsEqual(Control.GetLabel(62002),Fanart)] | [String.IsEqual(Window(home).Property(Infoscreen_Widget),3201) + String.IsEqual(Control.GetLabel(62011),Grid) + String.IsEqual(Control.GetLabel(62012),Fanart)] | [String.IsEqual(Window(home).Property(Infoscreen_Widget),3202) + String.IsEqual(Control.GetLabel(62021),Grid) + String.IsEqual(Control.GetLabel(62022),Fanart)] | [String.IsEqual(Window(home).Property(Infoscreen_Widget),3203) + String.IsEqual(Control.GetLabel(62031),Grid) + String.IsEqual(Control.GetLabel(62032),Fanart)] | [String.IsEqual(Window(home).Property(Infoscreen_Widget),3204) + String.IsEqual(Control.GetLabel(62041),Grid) + String.IsEqual(Control.GetLabel(62042),Fanart)] | [String.IsEqual(Window(home).Property(Infoscreen_Widget),3205) + String.IsEqual(Control.GetLabel(62051),Grid) + String.IsEqual(Control.GetLabel(62052),Fanart)] | [String.IsEqual(Window(home).Property(Infoscreen_Widget),3206) + String.IsEqual(Control.GetLabel(62061),Grid) + String.IsEqual(Control.GetLabel(62062),Fanart)] | [String.IsEqual(Window(home).Property(Infoscreen_Widget),3207) + String.IsEqual(Control.GetLabel(62071),Grid) + String.IsEqual(Control.GetLabel(62072),Fanart)] | [String.IsEqual(Window(home).Property(Infoscreen_Widget),3208) + String.IsEqual(Control.GetLabel(62081),Grid) + String.IsEqual(Control.GetLabel(62082),Fanart)] | [String.IsEqual(Window(home).Property(Infoscreen_Widget),3209) + String.IsEqual(Control.GetLabel(62091),Grid) + String.IsEqual(Control.GetLabel(62092),Fanart)]</expression>
 	<!-- Display: Square -->
-	<expression name="GridView_Display_IsSquare">[$EXP[GridView_Media_IsVisible] + [$EXP[GridView_Display_IsSquare_Artists] | $EXP[GridView_Display_IsSquare_Programs_Folders] | $EXP[GridView_Display_IsSquare_Programs_Files] | Container.Content(albums) | Container.Content(songs) | Container.Content(addons) | $EXP[GridView_Display_IsSquare_Images] | $EXP[Container_Plugin_Empty] | [Container.Content(files) + String.Contains(Container.PluginName,YouTube)]]] | $EXP[GridView_Display_IsSquare_Widget] | Container.Content()</expression>
+	<expression name="GridView_Display_IsSquare">[$EXP[GridView_Media_IsVisible] + [$EXP[GridView_Display_IsSquare_Artists] | $EXP[GridView_Display_IsSquare_Programs_Folders] | $EXP[GridView_Display_IsSquare_Programs_Files] | Container.Content(albums) | Container.Content(songs) | Container.Content(addons) | $EXP[GridView_Display_IsSquare_Images] | $EXP[Container_Plugin_Empty] | [Container.Content(files) + String.Contains(Container.PluginName,YouTube)] | Container.Content()]] | $EXP[GridView_Display_IsSquare_Widget]</expression>
 	<expression name="GridView_Display_IsSquare_Artists">Container.Content(artists) + Skin.String(GridView_Display_Artists,Square)</expression>
 	<expression name="GridView_Display_IsSquare_Images">Container.Content(images) + [!Skin.HasSetting(Experiment_GridView_Fanart_Pictures) | Skin.String(GridView_Display_Images,Square) | !Skin.String(GridView_Display_Images)]</expression>
 	<expression name="GridView_Display_IsSquare_Programs_Folders">$EXP[Container_Programs_IsFolders] + Skin.String(GridView_Display_Programs_Folders,Square)</expression>
diff --git a/16x9/Home.xml b/16x9/Home.xml
index 3c510a30..34e86633 100644
--- a/16x9/Home.xml
+++ b/16x9/Home.xml
@@ -51,7 +51,6 @@
 		</include>
 		<!-- Content -->
 		<control type="group">
-			<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
 			<include content="WindowOpenClose_Fade_Delayed_Long_Animation" />
 			<control type="group">
 				<visible>Control.HasFocus(3000) | $EXP[Music_Player_HasFocus] | Control.HasFocus(4201)</visible>
@@ -72,6 +71,7 @@
 			<include content="Music_Player_Widget" condition="Skin.HasSetting(Music_Player_Enabled)">
 				<param name="left_label_visible" value="true" />
 				<param name="background_visible" value="false" />
+				<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
 			</include>
 		</control>
 	</controls>
diff --git a/16x9/Includes.xml b/16x9/Includes.xml
index a343b967..f9b94cd8 100644
--- a/16x9/Includes.xml
+++ b/16x9/Includes.xml
@@ -14,7 +14,7 @@
 	<include file="Components_PVR.xml" />
 	<include file="Components_Settings.xml" />
 	<include file="Components_Viewtype_50_List.xml" />
-	<include file="Components_Viewtype_501_Billboard.xml" />
+	<include file="Components_Viewtype_500_DetailedList.xml" />
 	<include file="Components_Viewtype_502_Showcase.xml" />
 	<include file="Components_Viewtype_504_Strip.xml" />
 	<include file="Components_Viewtype_505_Grid.xml" />
@@ -27,6 +27,7 @@
 	<include file="Content_Settings.xml" />
 	<include file="Content_Settings_Sliders.xml" />
 	<include file="Content_Viewtype_50_List.xml" />
+	<include file="Content_Viewtype_500_DetailedList.xml" />
 	<include file="Content_Viewtype_501_Billboard.xml" />
 	<include file="Content_Viewtype_502_Showcase.xml" />
 	<include file="Content_Viewtype_504_Strip.xml" />
diff --git a/16x9/MyMusicNav.xml b/16x9/MyMusicNav.xml
index 25ae4899..b53faa0a 100644
--- a/16x9/MyMusicNav.xml
+++ b/16x9/MyMusicNav.xml
@@ -6,7 +6,7 @@
 	<onunload>ClearProperty(Scrollbars,home)</onunload>
 	<defaultcontrol always="true">50</defaultcontrol>
 	<menucontrol>3000</menucontrol>
-	<views>50,501,502,504,505</views>
+	<views>50,500,501,502,504,505</views>
 	<backgroundcolor>$VAR[Dark_Color]</backgroundcolor>
 	<controls>
 		<include content="music_Controls" />
diff --git a/16x9/Scrollbars.xml b/16x9/Scrollbars.xml
index 1c2c6250..7971a10b 100644
--- a/16x9/Scrollbars.xml
+++ b/16x9/Scrollbars.xml
@@ -90,8 +90,8 @@
 	<include name="SortLetter">
 		<definition>
 			<control type="group">
-				<animation effect="slide" end="-12" time="0" condition="$EXP[ListView_IsVisible] | [$EXP[GridView_IsVisible] + !Skin.String(GridView_Size,Horizontal)]">Conditional</animation>
-				<animation effect="slide" end="0,-12" time="0" condition="!$EXP[ListView_IsVisible] + ![$EXP[GridView_IsVisible] + !Skin.String(GridView_Size,Horizontal)]">Conditional</animation>
+				<animation effect="slide" end="-12" time="0" condition="$EXP[ListView_IsVisible] | $EXP[DetailedListView_IsVisible] | [$EXP[GridView_IsVisible] + !Skin.String(GridView_Size,Horizontal)]">Conditional</animation>
+				<animation effect="slide" end="0,-12" time="0" condition="!$EXP[ListView_IsVisible] + !$EXP[DetailedListView_IsVisible] + ![$EXP[GridView_IsVisible] + !Skin.String(GridView_Size,Horizontal)]">Conditional</animation>
 				<include content="Jump_Icon_Slides_$PARAM[scrollbartype]_$PARAM[orientation]" />
 				<visible>Container.Scrolling | Control.HasFocus(60) | Control.HasFocus(62)</visible>
 				<visible>$EXP[SortLetter_Enabled] + !String.IsEmpty(ListItem.SortLetter) + Integer.IsGreater(Container.NumItems,33)</visible>
@@ -396,7 +396,7 @@
 			<include content="Visible_Fade_Animation" />
 			<!-- Vertical -->
 			<include content="Scrollbar_Template">
-				<param name="visible" value="[$EXP[ListView_IsVisible] + Integer.IsGreater(Container.NumItems,22)] | [$EXP[GridView_IsVisible] + !Skin.String(GridView_Size,Horizontal) + Integer.IsGreater(Container.NumItems,9)]" />
+				<param name="visible" value="[$EXP[ListView_IsVisible] + Integer.IsGreater(Container.NumItems,22)] | [$EXP[DetailedListView_IsVisible] + Integer.IsGreater(Container.NumItems,3)] | [$EXP[GridView_IsVisible] + !Skin.String(GridView_Size,Horizontal) + Integer.IsGreater(Container.NumItems,9)]" />
 				<param name="right" value="27" />
 				<param name="bottom" value="180" />
 				<param name="width" value="6" />
@@ -408,6 +408,7 @@
 				<param name="ondown" value="60" />
 				<param name="ondown_fallback" value="60" />
 				<param name="orientation" value="vertical" />
+				<animation effect="slide" end="0,60" time="0" condition="$EXP[DetailedListView_IsVisible]">Conditional</animation>
 			</include>
 			<!-- Horizontal (Main) -->
 			<include content="Scrollbar_Template" condition="$EXP[BillboardView_Enabled] | $EXP[ShowcaseView_Enabled] | $EXP[StripView_Enabled]">
@@ -714,10 +715,10 @@
 
 	<include name="DialogVideoInfo_Scrollbar">
 		<include content="Widget_Scrollbar_Template">
-			<param name="visible" value="!Window.IsVisible(shutdownmenu) + !Control.HasFocus(60) + !String.IsEqual(ListItem.DBType,video)" />
+			<param name="visible" value="!Window.IsVisible(shutdownmenu) + !Control.HasFocus(60) + !Control.HasFocus(4020) + !String.IsEqual(ListItem.DBType,video)" />
 			<param name="pos0_enabled" value="true" />
 			<param name="pos0_visible" value="Control.IsVisible(3000)" />
-			<param name="pos0_active" value="[ControlGroup(3000).HasFocus + !Window.IsVisible(1104)] | Control.HasFocus(60) | Control.HasFocus(4020) | Control.HasFocus(4021) | Control.HasFocus(4022) | $EXP[Music_Player_HasFocus]" />
+			<param name="pos0_active" value="[ControlGroup(3000).HasFocus + !Window.IsVisible(1104)] | Control.HasFocus(60) | Control.HasFocus(4021) | Control.HasFocus(4022) | $EXP[Music_Player_HasFocus]" />
 			<param name="pos1_enabled" value="true" />
 			<param name="pos1_visible" value="Control.IsVisible(3201)" />
 			<param name="pos1_active" value="Control.HasFocus(3201)" />
diff --git a/16x9/Templates_MyWindows.xml b/16x9/Templates_MyWindows.xml
index 3fe1bf76..8bda17d5 100644
--- a/16x9/Templates_MyWindows.xml
+++ b/16x9/Templates_MyWindows.xml
@@ -236,6 +236,7 @@
 				<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
 				<include content="Secondary_List_Array" condition="Skin.HasSetting(Secondary_List_Enabled)" />
 				<include content="ListView_Display" />
+				<include content="DetailedListView_Display" />
 				<include content="BillboardView_Container" condition="$EXP[BillboardView_Enabled]" />
 				<include content="BillboardView_Display" condition="$EXP[BillboardView_Enabled]" />
 				<include content="ShowcaseView_Container" condition="$EXP[ShowcaseView_Enabled]" />
@@ -253,6 +254,7 @@
 				<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
 				<include content="ListView_Container" />
 				<include content="ListView_Details" />
+				<include content="DetailedListView_Container" />
 				<include content="BillboardView_Details" condition="$EXP[BillboardView_Enabled]" />
 				<include content="ShowcaseView_Details" condition="$EXP[ShowcaseView_Enabled]" />
 				<include content="StripView_Details" condition="$EXP[StripView_Enabled]" />
@@ -543,6 +545,7 @@
 					</focusedlayout>
 					<content>
 						<include content="ListView_Menu_Options" condition="!Skin.HasSetting(Kiosk_Mode)" />
+						<include content="DetailedListView_Menu_Options" condition="!Skin.HasSetting(Kiosk_Mode)" />
 						<include content="BillboardView_Menu_Options" condition="$EXP[BillboardView_Enabled] + !Skin.HasSetting(Kiosk_Mode)" />
 						<include content="ShowcaseView_Menu_Options" condition="$EXP[ShowcaseView_Enabled] + !Skin.HasSetting(Kiosk_Mode)" />
 						<include content="StripView_Menu_Options" condition="$EXP[StripView_Enabled] + !Skin.HasSetting(Kiosk_Mode)" />
diff --git a/16x9/Templates_Viewtypes.xml b/16x9/Templates_Viewtypes.xml
index f36bd2ac..1abc93af 100644
--- a/16x9/Templates_Viewtypes.xml
+++ b/16x9/Templates_Viewtypes.xml
@@ -21,14 +21,12 @@
 			<itemgap>0</itemgap>
 			<include content="Flag_Icon">
 				<animation effect="slide" start="0,0" end="-1560,0" time="0" condition="$EXP[StripView_Flags_Rating_IsVisible] + [$EXP[StripView_Details_Title] | $EXP[StripView_Details_Off]] + !$EXP[StripView_Logo_On] + !String.IsEqual(Control.GetLabel(6304),flags/blank.png)">Conditional</animation>
-				<param name="visible" value="$EXP[ListView_Flags_Studio_IsVisible] | $EXP[BillboardView_Flags_Studio_IsVisible] | $EXP[ShowcaseView_Flags_Studio_IsVisible] | $EXP[StripView_Flags_Studio_IsVisible]" />
-				<param name="id" value="6303" />
+				<param name="visible" value="!String.IsEqual(Control.GetLabel(6303),flags/blank.png) + [$EXP[ListView_Flags_Studio_IsVisible] | $EXP[BillboardView_Flags_Studio_IsVisible] | $EXP[ShowcaseView_Flags_Studio_IsVisible] | $EXP[StripView_Flags_Studio_IsVisible]]" />
 				<param name="texture" value="$VAR[Studio_Flag]" />
 				<param name="colordiffuse" value="$VAR[Flag_Color]" />
 			</include>
 			<include content="Flag_Icon">
-				<param name="visible" value="$EXP[ListView_Flags_Rating_IsVisible] | $EXP[BillboardView_Flags_Rating_IsVisible] | $EXP[ShowcaseView_Flags_Rating_IsVisible] | $EXP[StripView_Flags_Rating_IsVisible]" />
-				<param name="id" value="6304" />
+				<param name="visible" value="!String.IsEqual(Control.GetLabel(6304),flags/blank.png) + [$EXP[ListView_Flags_Rating_IsVisible] | $EXP[BillboardView_Flags_Rating_IsVisible] | $EXP[ShowcaseView_Flags_Rating_IsVisible] | $EXP[StripView_Flags_Rating_IsVisible]]" />
 				<param name="texture" value="$VAR[MPAA_Flag]" />
 				<param name="colordiffuse" value="$VAR[Flag_Color]" />
 			</include>
@@ -96,12 +94,13 @@
 	</include>
 
 	<include name="Viewtype_Display_Template">
-		<param name="visible" default="!$EXP[Container_Switching] + !$EXP[Options_Switching]" />
+		<param name="visible" default="true" />
 		<param name="viewtype_label" />
 		<param name="media_view" default="false" />
 		<definition>
 			<control type="group">
-				<visible>$EXP[$PARAM[viewtype_label]View_IsVisible] + $PARAM[visible]</visible>
+				<visible>$EXP[$PARAM[viewtype_label]View_IsVisible] + !$EXP[Container_Switching] + !$EXP[Options_Switching]</visible>
+				<visible>$PARAM[visible]</visible>
 				<include content="Visible_Fade_Animation" condition="$PARAM[media_view]" />
 				<nested />
 			</control>
@@ -126,7 +125,7 @@
 		<param name="viewtype_label" />
 		<definition>
 			<control type="group">
-				<visible>$EXP[$PARAM[viewtype_label]View_IsVisible] + !$EXP[Container_Switching] + !$EXP[TransparentDialog_IsVisible] + !Window.IsVisible(pictureinfo) + !$EXP[Scrollbar_HasFocus]</visible>
+				<visible>$EXP[$PARAM[viewtype_label]View_IsVisible] + !$EXP[Container_Switching] + !$EXP[TransparentDialog_IsVisible] + !Window.IsVisible(pictureinfo)</visible>
 				<visible>$PARAM[visible]</visible>
 				<include content="Visible_Fade_Delayed_Animation" />
 				<nested />
diff --git a/16x9/Templates_Widgets.xml b/16x9/Templates_Widgets.xml
index 22ad6e3a..1356fec1 100644
--- a/16x9/Templates_Widgets.xml
+++ b/16x9/Templates_Widgets.xml
@@ -602,6 +602,7 @@
 			<param name="widget_display" value="Posters" />
 			<param name="id" value="3202" />
 			<param name="widget_position" value="2" />
+			<param name="min_items" value="2" />
 			<param name="target" value="videos" />
 			<param name="sortby" value="season" />
 			<param name="sortorder" value="ascending" />
diff --git a/16x9/Templates_script-upnext.xml b/16x9/Templates_script-upnext.xml
index 720eedb0..a221b974 100644
--- a/16x9/Templates_script-upnext.xml
+++ b/16x9/Templates_script-upnext.xml
@@ -54,40 +54,44 @@
 		<param name="show_thumb" default="true" />
 		<param name="use_alt_button" default="false" />
 		<definition>
-			<include content="script-upnext_layout" condition="$PARAM[show_thumb] + !Skin.String(script-upnext_Artwork,Square) + !Skin.String(script-upnext_Artwork,Posters)">
-				<param name="title_label" value="$PARAM[title_label]" />
-				<param name="info_label_visible" value="$PARAM[info_label_visible]" />
-			</include>
-			<include content="script-upnext_layout" condition="$PARAM[show_thumb] + Skin.String(script-upnext_Artwork,Square)">
-				<param name="height" value="320" />
-				<param name="title_label" value="$PARAM[title_label]" />
-				<param name="info_label_visible" value="$PARAM[info_label_visible]" />
-			</include>
-			<include content="script-upnext_layout" condition="$PARAM[show_thumb] + Skin.String(script-upnext_Artwork,Posters)">
-				<param name="height" value="480" />
-				<param name="title_label" value="$PARAM[title_label]" />
-				<param name="info_label_visible" value="$PARAM[info_label_visible]" />
-			</include>
-			<include content="script-upnext_layout" condition="!$PARAM[show_thumb]">
-				<param name="title_label" value="$PARAM[title_label]" />
-				<param name="info_label_visible" value="$PARAM[info_label_visible]" />
-				<param name="show_thumb" default="false" />
-			</include>
-			<include content="Button_Group_Template">
-				<param name="right" value="40" />
-				<param name="bottom" value="0" />
-				<param name="button1" value="true" />
-				<param name="button1_id" value="3012" />
-				<param name="button1_texture" value="Play" />
-				<param name="button1_toggle_button" value="true" />
-				<param name="button1_alt_texture" value="Check" />
-				<param name="button1_use_alt_texture" value="$PARAM[use_alt_button]" />
-				<param name="button2" value="true" />
-				<param name="button2_id" value="3013" />
-				<param name="button2_texture" value="Cross" />
-				<param name="color" value="$VAR[Light_Color]" />
-				<param name="unfocused_color" value="$VAR[Light_Color]" />
-			</include>
+			<control type="group">
+				<visible>!Player.Paused</visible>
+				<include content="Visible_Fade_Delayed_Animation" />
+				<include content="script-upnext_layout" condition="$PARAM[show_thumb] + !Skin.String(script-upnext_Artwork,Square) + !Skin.String(script-upnext_Artwork,Posters)">
+					<param name="title_label" value="$PARAM[title_label]" />
+					<param name="info_label_visible" value="$PARAM[info_label_visible]" />
+				</include>
+				<include content="script-upnext_layout" condition="$PARAM[show_thumb] + Skin.String(script-upnext_Artwork,Square)">
+					<param name="height" value="320" />
+					<param name="title_label" value="$PARAM[title_label]" />
+					<param name="info_label_visible" value="$PARAM[info_label_visible]" />
+				</include>
+				<include content="script-upnext_layout" condition="$PARAM[show_thumb] + Skin.String(script-upnext_Artwork,Posters)">
+					<param name="height" value="480" />
+					<param name="title_label" value="$PARAM[title_label]" />
+					<param name="info_label_visible" value="$PARAM[info_label_visible]" />
+				</include>
+				<include content="script-upnext_layout" condition="!$PARAM[show_thumb]">
+					<param name="title_label" value="$PARAM[title_label]" />
+					<param name="info_label_visible" value="$PARAM[info_label_visible]" />
+					<param name="show_thumb" default="false" />
+				</include>
+				<include content="Button_Group_Template">
+					<param name="right" value="40" />
+					<param name="bottom" value="0" />
+					<param name="button1" value="true" />
+					<param name="button1_id" value="3012" />
+					<param name="button1_texture" value="Play" />
+					<param name="button1_toggle_button" value="true" />
+					<param name="button1_alt_texture" value="Check" />
+					<param name="button1_use_alt_texture" value="$PARAM[use_alt_button]" />
+					<param name="button2" value="true" />
+					<param name="button2_id" value="3013" />
+					<param name="button2_texture" value="Cross" />
+					<param name="color" value="$VAR[Light_Color]" />
+					<param name="unfocused_color" value="$VAR[Light_Color]" />
+				</include>
+			</control>
 		</definition>
 	</include>
 </includes>
\ No newline at end of file
diff --git a/16x9/Timers.xml b/16x9/Timers.xml
index 4ef65f1c..156fb1ab 100644
--- a/16x9/Timers.xml
+++ b/16x9/Timers.xml
@@ -57,7 +57,7 @@
   </timer>
   <timer>
     <name>trailer_autoplay_home</name>
-    <start reset="true">Window.Is(home) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(home_visible),3) + Skin.HasSetting(Trailer_Autoplay) + !String.IsEmpty(window(home).property(Home_Widget)) + Window.IsVisible(1160) + !Player.HasMedia</start>
+    <start reset="true">Window.Is(home) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(home_visible),3) + Skin.HasSetting(Trailer_Autoplay) + !String.IsEmpty(window(home).property(Home_Widget)) + Window.IsVisible(1160) + !Player.HasMedia + ![[Control.HasFocus(3201) + Window.IsVisible(1131)] | [Control.HasFocus(3202) + Window.IsVisible(1132)] | [Control.HasFocus(3203) + Window.IsVisible(1133)] | [Control.HasFocus(3204) + Window.IsVisible(1134)] | [Control.HasFocus(3205) + Window.IsVisible(1135)] | [Control.HasFocus(3206) + Window.IsVisible(1136)] | [Control.HasFocus(3207) + Window.IsVisible(1137)] | [Control.HasFocus(3208) + Window.IsVisible(1138)] | [Control.HasFocus(3209) + Window.IsVisible(1139)]]</start>
     <reset>Player.HasVideo | Window.IsVisible(movieinformation) | Window.IsVisible(shutdownmenu) | Window.IsVisible(busydialog)</reset>
     <stop>!String.IsEmpty(ListItem.Trailer) + String.IsEmpty(Window(home).Property(Trailer_Autoplay)) + !Player.HasVideo</stop>
     <onstart condition="Control.HasFocus(3201) + Skin.HasSetting(Widget1_Trailer_Autoplay) + !String.IsEmpty(ListItem.Trailer)">SetProperty(Trailer_Autoplay,true,home)</onstart>
diff --git a/16x9/Variables_Labels_Media.xml b/16x9/Variables_Labels_Media.xml
index 969a5c04..8242cc0c 100644
--- a/16x9/Variables_Labels_Media.xml
+++ b/16x9/Variables_Labels_Media.xml
@@ -602,12 +602,12 @@
 		<value condition="Control.HasFocus(3100) + !String.IsEmpty(Container(3100).ListItem.Property(Artist_Description))">$INFO[Container(3100).ListItem.Property(Artist_Description)]</value>
 		<value condition="Control.HasFocus(3100) + !String.IsEmpty(Container(3100).ListItem.PlotOutline)">$INFO[Container(3100).ListItem.PlotOutline]</value>
 		<value condition="Control.HasFocus(3100) + !String.IsEmpty(Container(3100).ListItem.Plot)">$INFO[Container(3100).ListItem.Plot]</value>
+		<value condition="!String.IsEmpty(ListItem.AddonDescription)">$INFO[ListItem.AddonDescription]</value>
+		<value condition="!String.IsEmpty(ListItem.AddonSummary)">$INFO[ListItem.AddonSummary]</value>
 		<value condition="!String.IsEmpty(ListItem.Property(Album_Description))">$INFO[ListItem.Property(Album_Description)]</value>
 		<value condition="!String.IsEmpty(ListItem.Property(Artist_Description))">$INFO[ListItem.Property(Artist_Description)]</value>
 		<value condition="!String.IsEmpty(ListItem.PlotOutline)">$INFO[ListItem.Plot]</value>
 		<value condition="!String.IsEmpty(ListItem.Plot)">$INFO[ListItem.Plot]</value>
-		<value condition="!String.IsEmpty(ListItem.AddonDescription)">$INFO[ListItem.AddonDescription]</value>
-		<value condition="!String.IsEmpty(ListItem.AddonSummary)">$INFO[ListItem.AddonSummary]</value>
 	</variable>
 
 	<variable name="PlotType_Label">
diff --git a/16x9/Variables_Textures_Artwork_Media.xml b/16x9/Variables_Textures_Artwork_Media.xml
index 4eec01bb..be084127 100644
--- a/16x9/Variables_Textures_Artwork_Media.xml
+++ b/16x9/Variables_Textures_Artwork_Media.xml
@@ -103,7 +103,7 @@
 		<value condition="!String.IsEmpty(ListItem(0).Art(tvshow.landscape)) + !$EXP[ListView_Display_IsThumbnails] + Skin.HasSetting(Experiment_ListView_Prefer_Landscape)">$INFO[ListItem(0).Art(tvshow.landscape)]</value>
 		<value condition="!String.IsEmpty(ListItem(0).Art(tvshow.fanart)) + !$EXP[ListView_Display_IsThumbnails]">$INFO[ListItem(0).Art(tvshow.fanart)]</value>
 		<value condition="!String.IsEmpty(ListItem(0).Art(artist.fanart)) + !$EXP[ListView_Display_IsThumbnails]">$INFO[ListItem(0).Art(artist.fanart)]</value>
-		<value condition="!String.IsEmpty(ListItem(0).Art(artist.fanart)) + !$EXP[ListView_Display_IsThumbnails] + Skin.HasSetting(Experiment_ListView_Prefer_Landscape)">$INFO[ListItem(0).Art(artist.landscape)]</value>
+		<value condition="!String.IsEmpty(ListItem(0).Art(artist.landscape)) + !$EXP[ListView_Display_IsThumbnails] + Skin.HasSetting(Experiment_ListView_Prefer_Landscape)">$INFO[ListItem(0).Art(artist.landscape)]</value>
 		<value condition="!String.IsEmpty(ListItem(0).Art(keyart)) + $EXP[ListView_Display_IsThumbnails] + $EXP[Prefer_Keyart_List]">$INFO[ListItem(0).Art(keyart)]</value>
 		<value condition="!String.IsEmpty(ListItem(0).Art(poster)) + $EXP[ListView_Display_IsThumbnails]">$INFO[ListItem(0).Art(poster)]</value>
 		<value condition="!String.IsEmpty(ListItem(0).Art(boxfront)) + $EXP[ListView_Display_IsThumbnails]">$INFO[ListItem(0).Art(boxfront)]</value>
@@ -115,6 +115,28 @@
 		<value condition="!String.IsEmpty(ListItem(0).Icon)">$INFO[ListItem(0).Icon]</value>
 	</variable>
 
+	<variable name="DetailedList_Focused(0)Content">
+		<value condition="[Window.Is(videos) | Window.Is(music)] + Skin.HasSetting(Multiart_Slideshow) + !String.IsEmpty(Window(home).Property(Multiart_Fadeout))">$INFO[Control.GetLabel(3400)]</value>
+		<value>$VAR[DetailedList(0)Content]</value>
+	</variable>
+
+	<variable name="DetailedList(0)Content">
+		<value condition="!String.IsEmpty(ListItem(0).Art(thumb)) + String.IsEqual(ListItem(0).DBType,episode) | String.IsEqual(ListItem(0).DBType,album) | String.IsEqual(ListItem(0).DBType,song) | [Container.Content(songs) + !String.IsEmpty(Container.PluginName)] | Container.Content(addons) | Container.Content(videos)">$INFO[ListItem(0).Art(thumb)]</value>
+		<value condition="!String.IsEmpty(ListItem(0).Art(album.fanart))]">$INFO[ListItem(0).Art(album.fanart)]</value>
+		<value condition="!String.IsEmpty(ListItem(0).Art(landscape)) + Skin.HasSetting(Experiment_ListView_Prefer_Landscape)">$INFO[ListItem(0).Art(landscape)]</value>
+		<value condition="!String.IsEmpty(ListItem(0).Art(fanart))">$INFO[ListItem(0).Art(fanart)]</value>
+		<value condition="!String.IsEmpty(ListItem(0).Art(tvshow.landscape)) + Skin.HasSetting(Experiment_ListView_Prefer_Landscape)">$INFO[ListItem(0).Art(tvshow.landscape)]</value>
+		<value condition="!String.IsEmpty(ListItem(0).Art(tvshow.fanart))">$INFO[ListItem(0).Art(tvshow.fanart)]</value>
+		<value condition="!String.IsEmpty(ListItem(0).Art(artist.fanart))">$INFO[ListItem(0).Art(artist.fanart)]</value>
+		<value condition="!String.IsEmpty(ListItem(0).Art(artist.landscape)) + Skin.HasSetting(Experiment_ListView_Prefer_Landscape)">$INFO[ListItem(0).Art(artist.landscape)]</value>
+		<value condition="!String.IsEmpty(ListItem(0).Art(keyart)) + $EXP[ListView_Display_IsThumbnails] + $EXP[Prefer_Keyart_List]">$INFO[ListItem(0).Art(keyart)]</value>
+		<value condition="!String.IsEmpty(ListItem(0).Art(poster)) + $EXP[ListView_Display_IsThumbnails]">$INFO[ListItem(0).Art(poster)]</value>
+		<value condition="!String.IsEmpty(ListItem(0).Art(boxfront)) + $EXP[ListView_Display_IsThumbnails]">$INFO[ListItem(0).Art(boxfront)]</value>
+		<value condition="!String.IsEmpty(ListItem(0).Art(artist.thumb))">$INFO[ListItem(0).Art(artist.thumb)]</value>
+		<value condition="!String.IsEmpty(ListItem(0).Art(landscape)) + !Container.Content(files) + Skin.HasSetting(Experiment_ListView_Prefer_Landscape)">$INFO[ListItem(0).Art(landscape)]</value>
+		<value condition="!String.IsEmpty(ListItem(0).Icon)">$INFO[ListItem(0).Icon]</value>
+	</variable>
+
 	<variable name="Grid(0)Content">
 		<value condition="!String.IsEmpty(ListItem(0).Art(square)) + $EXP[GridView_Display_IsSquare]">$INFO[ListItem(0).Art(square)]</value>
 		<value condition="!String.IsEmpty(ListItem(0).Art(snap)) + $EXP[GridView_Display_IsSquare]">$INFO[ListItem(0).Art(snap)]</value>
@@ -125,6 +147,8 @@
 		<value condition="!String.IsEmpty(ListItem(0).Art(tvshow.landscape)) + !$EXP[GridView_Display_IsPosters] + $EXP[Prefer_Landscape_Grid]">$INFO[ListItem(0).Art(tvshow.landscape)]</value>
 		<value condition="!String.IsEmpty(ListItem(0).Art(tvshow.fanart)) + !$EXP[GridView_Display_IsPosters]">$INFO[ListItem(0).Art(tvshow.fanart)]</value>
 		<value condition="!String.IsEmpty(ListItem(0).Art(tvshow.square)) + !$EXP[GridView_Display_IsPosters]">$INFO[ListItem(0).Art(tvshow.square)]</value>
+		<value condition="!String.IsEmpty(ListItem(0).Art(artist.fanart))">$INFO[ListItem(0).Art(artist.fanart)]</value>
+		<value condition="!String.IsEmpty(ListItem(0).Art(artist.landscape)) + $EXP[Prefer_Landscape_Grid]">$INFO[ListItem(0).Art(artist.landscape)]</value>
 		<value condition="!String.IsEmpty(ListItem(0).Art(keyart)) + [$EXP[GridView_Details_On] | $EXP[Prefer_Keyart]]">$INFO[ListItem(0).Art(keyart)]</value>
 		<value condition="!String.IsEmpty(ListItem(0).Art(poster))">$INFO[ListItem(0).Art(poster)]</value>
 		<value condition="!String.IsEmpty(ListItem(0).Art(boxfront))">$INFO[ListItem(0).Art(boxfront)]</value>
@@ -452,8 +476,8 @@
 		<value condition="$EXP[ListView_Display_IsThumbnails] + String.IsEqual(ListItem.DBType,artist) + !String.IsEmpty(ListItem.Art(thumb1))">thumb</value>
 		<value condition="$EXP[ListView_Display_IsThumbnails] + $EXP[Prefer_Keyart_List] + !String.IsEmpty(ListItem.Art(keyart1))">keyart</value>
 		<value condition="$EXP[ListView_Display_IsThumbnails] + [!$EXP[Prefer_Keyart_List] | String.IsEmpty(ListItem.Art(keyart))] + !String.IsEmpty(ListItem.Art(poster1))">poster</value>
-		<value condition="![String.Contains(ListItem.Path,themoviedb.helper) + !Window.Is(home)] + [$EXP[ListView_Display_IsBackground] | $EXP[BillboardView_IsVisible]] + !String.IsEmpty(ListItem.Art(landscape1)) + Skin.HasSetting(Experiment_ListView_Prefer_Landscape)">landscape</value>
-		<value condition="![String.Contains(ListItem.Path,themoviedb.helper) + !Window.Is(home)] + [$EXP[ListView_Display_IsBackground] | $EXP[BillboardView_IsVisible]] + !String.IsEmpty(ListItem.Art(fanart1)) + !Skin.HasSetting(Experiment_ListView_Prefer_Landscape)">fanart</value>
+		<value condition="![String.Contains(ListItem.Path,themoviedb.helper) + !Window.Is(home)] + [$EXP[ListView_Display_IsBackground] | $EXP[DetailedListView_IsVisible] | $EXP[BillboardView_IsVisible]] + !String.IsEmpty(ListItem.Art(landscape1)) + Skin.HasSetting(Experiment_ListView_Prefer_Landscape)">landscape</value>
+		<value condition="![String.Contains(ListItem.Path,themoviedb.helper) + !Window.Is(home)] + [$EXP[ListView_Display_IsBackground] | $EXP[DetailedListView_IsVisible] | $EXP[BillboardView_IsVisible]] + !String.IsEmpty(ListItem.Art(fanart1)) + !Skin.HasSetting(Experiment_ListView_Prefer_Landscape)">fanart</value>
 		<value condition="$EXP[ShowcaseView_Display_IsPosters] + $EXP[ShowcaseView_Details_Overlay_IsVisible] + !String.IsEmpty(ListItem.Art(keyart1))">keyart</value>
 		<value condition="$EXP[ShowcaseView_Display_IsPosters] + $EXP[ShowcaseView_Logo_On] + !String.IsEmpty(ListItem.Art(clearlogo)) + !String.IsEmpty(ListItem.Art(keyart1))">keyart</value>
 		<value condition="$EXP[ShowcaseView_Display_IsPosters] + $EXP[Prefer_Keyart] + !String.IsEmpty(ListItem.Art(keyart1))">keyart</value>
diff --git a/16x9/Viewtype_500_DetailedList.xml b/16x9/Viewtype_500_DetailedList.xml
index 352eed95..eb978377 100644
--- a/16x9/Viewtype_500_DetailedList.xml
+++ b/16x9/Viewtype_500_DetailedList.xml
@@ -1,42 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <includes>
 
+	<include name="DetailedListView_Display">
+		<param name="id" default="500" />
+		<param name="art_icon" default="Thumbnail" />
+		<param name="media_view" default="true" />
+		<param name="widget_view" default="false" />
+		<param name="widget_position" />
+		<definition>
+			<include content="Viewtype_Display_Template">
+				<param name="viewtype_label" value="DetailedList" />
+				<param name="media_view" value="$PARAM[media_view]" />
+				<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
+				<include content="DetailedListView_Art">
+					<param name="target_id" value="$PARAM[id]" />
+					<param name="art_icon" value="$PARAM[art_icon]" />
+				</include>
+			</include>
+		</definition>
+	</include>
+
 	<include name="DetailedListView_Container">
 		<param name="visible" default="true" />
 		<definition>
-
-			<include content="Viewtype_Details_Template">
-				<param name="visible" value="true" />
+			<include content="Viewtype_Details_Including_Content_Switching_Template">
 				<param name="viewtype_label" value="DetailedList" />
-				<control type="fixedlist" id="500">
-					<viewtype label="DetailedList">list</viewtype>
-					<left>120</left>
-					<right>120</right>
-					<top>240</top>
-					<bottom>0</bottom>
-					<focusposition>1</focusposition>
-					<movement>1</movement>
-					<preloaditems>2</preloaditems>
-					<pagecontrol>60</pagecontrol>
-					<orientation>vertical</orientation>
-					<onleft>SetFocus(3000,0,absolute)</onleft>
-					<onright condition="Integer.IsGreater(Container($PARAM[id]).NumItems,3)">60</onright>
-					<include content="Default_Scrolltime" condition="!Skin.HasSetting(Quick_Transitions)" />
-					<include content="Quick_Scrolltime" condition="Skin.HasSetting(Quick_Transitions)" />
-					<itemlayout width="1680" height="240" infoupdate="5000">
-						<control type="label">
-							<label>$INFO[ListItem.Label]</label>
-						</control>
-					</itemlayout>
-					<focusedlayout width="1680" height="240" infoupdate="5000">
-						<control type="image">
-							<texture border="10" colordiffuse="$VAR[PVR_DetailedListView_Focus_Color]">views/white_100_rounded10.png</texture>
-						</control>
-						<control type="label">
-							<label>$INFO[ListItem.Label]</label>
-						</control>
-					</focusedlayout>
-				</control>
+				<include content="Default_Dialog_Panel_Layout">
+					<param name="panel_edge_bottom" value="0" />
+					<control type="fixedlist" id="500">
+						<viewtype label="DetailedList">list</viewtype>
+						<left>120</left>
+						<right>120</right>
+						<top>240</top>
+						<bottom>0</bottom>
+						<focusposition>1</focusposition>
+						<movement>1</movement>
+						<preloaditems>2</preloaditems>
+						<pagecontrol>60</pagecontrol>
+						<orientation>vertical</orientation>
+						<onleft>SetFocus(3000,0,absolute)</onleft>
+						<onright>60</onright>
+						<include content="Default_Scrolltime" condition="!Skin.HasSetting(Quick_Transitions)" />
+						<include content="Quick_Scrolltime" condition="Skin.HasSetting(Quick_Transitions)" />
+						<itemlayout width="1680" height="240">
+							<include content="DetailedListView_Layout" />
+						</itemlayout>
+						<focusedlayout width="1680" height="240" infoupdate="500">
+							<include content="HiddenFocusButton" />
+							<include content="Multiart_Resetter" condition="Skin.HasSetting(Multiart_Slideshow)" />
+							<include content="Multiart_Setter" condition="Skin.HasSetting(Multiart_Slideshow)" />
+							<control type="image">
+								<texture border="10" colordiffuse="$VAR[PVR_DetailedListView_Focus_Color]">views/white_100_rounded10.png</texture>
+							</control>
+							<include content="DetailedListView_Layout">
+								<param name="multiart" value="true" />
+							</include>
+						</focusedlayout>
+					</control>
+				</include>
 			</include>
 		</definition>
 	</include>
diff --git a/16x9/Viewtype_501_Billboard.xml b/16x9/Viewtype_501_Billboard.xml
index 865d4469..f99f5efe 100644
--- a/16x9/Viewtype_501_Billboard.xml
+++ b/16x9/Viewtype_501_Billboard.xml
@@ -14,6 +14,14 @@
 		</control>
 	</include>
 
+	<include name="BillboardView_Art_Fanart">
+		<include content="Artwork_Transition_Fade">
+			<param name="target_id" value="$PARAM[target_id]" />
+			<param name="art_icon" value="$PARAM[art_icon]" />
+			<param name="kenburns" value="Skin.HasSetting(Billboard_Ken_Burns_Effect)" />
+		</include>
+	</include>
+
 	<include name="BillboardView_Display">
 		<param name="id" default="501" />
 		<param name="art_icon" default="Thumbnail" />
diff --git a/16x9/Viewtype_50_List.xml b/16x9/Viewtype_50_List.xml
index c28902a0..6b968026 100644
--- a/16x9/Viewtype_50_List.xml
+++ b/16x9/Viewtype_50_List.xml
@@ -38,7 +38,7 @@
 		<param name="art_icon" default="Thumbnail" />
 		<definition>
 			<include content="Viewtype_Display_Template">
-				<param name="visible" value="!$EXP[Container_Switching] + !$EXP[Options_Switching] + ![$EXP[ListView_Display_IsThumbnails] + Window.IsVisible(selectvideoversion)]" />
+				<param name="visible" value="![$EXP[ListView_Display_IsThumbnails] + Window.IsVisible(selectvideoversion)]" />
 				<param name="viewtype_label" value="List" />
 				<param name="media_view" value="true" />
 				<include content="Transparent_Dialog_Panel">
@@ -114,6 +114,7 @@
 			</include>
 			<include content="Viewtype_Details_Including_Content_Switching_Template">
 				<param name="viewtype_label" value="List" />
+				<param name="visible" value="!$EXP[Scrollbar_HasFocus]" />
 				<include content="Breadcrumb_Label">
 					<param name="visible" value="!Container.Content(sets) + !Container.Content(movies) + !Container.Content(tvshows) + ![Container.Content(seasons) + $EXP[ListView_Details_Info_Seasons]] + ![Container.Content(actors) + String.IsEmpty(ListItem.Appearances)] + ![Container.Content(files) + !Window.Is(videoplaylist) + !String.IsEmpty(ListItem.Art(poster))] + ![$EXP[ListView_Display_IsBackground] + $EXP[Notification_Widget_IsVisible]]" />
 					<param name="animation" value="VisibleHidden_Fade_Delayed_Animation" />
diff --git a/README.md b/README.md
index 797f2152..93766357 100644
--- a/README.md
+++ b/README.md
@@ -20,11 +20,22 @@ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisc
 
 ### Changelog
 ---
-**2.6.5**
-- Skydance flags updated
-
+**2.6.6**
 To do:
-- detailed list as new view for Media?
+- pvr switching from windows to fullscreen there's a transition animation but it should be instant
+- detailed list
+   - progress bar
+   - collection icon
+   - navigation
+   - secondary list
+   - view options (flags, details)
+   - variable length textbox depending on how big the plot is
+   - better differentiation between itemlayout and focuslayout
+   - now playing
+   - track number / heart icon
+   - musicplayer
+- PVR seek like estuary
+- pvr icons from studio flags folder?
 - does label need to fade out and in when home screen > music player controls?
 - Views break after coming out of a playlist (next episode)
 - disable grid on certain list only views
@@ -40,6 +51,17 @@ To do:
 = <!-- temp fix to account for fact that DecreaseRating won't go lower than 1 for VideoPlayer.UserRating -->
 - https://github.com/jurialmunkey/plugin.video.themoviedb.helper/wiki/Replacing-Extended-Info#direct-call-auto
 
+
+**2.6.5**
+- Skydance, Epix flags updated
+- Fixed missing like icon when a song when song's user rating exceeds the value set in (Settings > Copacetic > Customisations > Liked song rating threshold)
+- Fixed issue where gridview spotlight widget was hiding during trailer autoplay
+- Fixed bug causing widget multiart to fallback to square on other layout types if expected multiart type was not present
+- Fixed bug in Variable length title label that was causing it to switch between different sizes erroneously
+- Changed seasons infoscreen widget to only appear if more than one season is present
+- Added delay to auto trailer playback for widgets when switching between widgets
+- Changed visibility condition so that infoscreen widget scrollbar doesn't momentarily appear when pressing back to exit infoscreen
+
 **2.6.4**
 - Added a workaround for the focus glitch on homescreen when globalsearch icon is clicked and focus temporarily returns to home menu before keyboard loads. This is required to ensure that after keyboard or global search is exited, the homescreen is properly focused on the main menu. Added a window property to hide main menu during this transition.
 - All windows should now have background/content hidden if global search is opened on top
diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
index 2701a2d0..4990a305 100644
--- a/language/resource.language.en_gb/strings.po
+++ b/language/resource.language.en_gb/strings.po
@@ -106,6 +106,12 @@ msgctxt "#31033"
 msgid "Detailed"
 msgstr ""
 
+#: NEW
+#Common
+msgctxt "#31034"
+msgid "Detailed list"
+msgstr ""
+
 
 
 
diff --git a/media/flags/studios/AMC.png b/media/flags/studios/AMC.png
index 0a090e2c..e075adc6 100644
Binary files a/media/flags/studios/AMC.png and b/media/flags/studios/AMC.png differ
diff --git a/media/flags/studios/Epix.png b/media/flags/studios/Epix.png
new file mode 100644
index 00000000..c985732c
Binary files /dev/null and b/media/flags/studios/Epix.png differ
diff --git a/media/icons/icon_like_focused_120.png b/media/icons/icon_like_focused_120.png
new file mode 100644
index 00000000..a8267df0
Binary files /dev/null and b/media/icons/icon_like_focused_120.png differ
diff --git a/media/icons/icon_like_unfocused_120.png b/media/icons/icon_like_unfocused_120.png
new file mode 100644
index 00000000..741bffdb
Binary files /dev/null and b/media/icons/icon_like_unfocused_120.png differ