diff --git a/16x9/Components_Settings.xml b/16x9/Components_Settings.xml
index acc0fd72..bba61d09 100644
--- a/16x9/Components_Settings.xml
+++ b/16x9/Components_Settings.xml
@@ -752,7 +752,7 @@
 				<param name="category" value="12" />
 				<param name="previous" value="12$PARAM[widget_position]21" />
 				<param name="id" value="12$PARAM[widget_position]30" />
-				<param name="next" value="12$PARAM[next_widget_position]11" />
+				<param name="next" value="12$PARAM[widget_position]45" />
 				<param name="next_condition" value="!Skin.HasSetting(Widget$PARAM[widget_position]_Content_Custom)" />
 				<param name="alt_next" value="12$PARAM[widget_position]40" />
 				<param name="alt_next_condition" value="Skin.HasSetting(Widget$PARAM[widget_position]_Content_Custom)" />
@@ -765,7 +765,7 @@
 				<param name="category" value="12" />
 				<param name="previous" value="12$PARAM[widget_position]21" />
 				<param name="id" value="12$PARAM[widget_position]30" />
-				<param name="next" value="12$PARAM[next_widget_position]11" />
+				<param name="next" value="12$PARAM[widget_position]45" />
 				<param name="next_condition" value="!Skin.HasSetting(Widget$PARAM[widget_position]_Content_Custom)" />
 				<param name="alt_next" value="12$PARAM[widget_position]40" />
 				<param name="alt_next_condition" value="Skin.HasSetting(Widget$PARAM[widget_position]_Content_Custom)" />
@@ -818,8 +818,36 @@
 				<onclick>Skin.SetNumeric(Widget$PARAM[widget_position]_Custom_Limit)</onclick>
 			</control>
 			<control type="radiobutton" id="12$PARAM[widget_position]45">
+				<description>Spotlight content with auto-scroll</description>
+				<visible>ControlGroup(9).HasFocus(12) + Control.IsVisible(12$PARAM[widget_position]20)</visible>
+				<label>    - $LOCALIZE[31496]</label>
+				<onclick>Skin.ToggleSetting(Widget$PARAM[widget_position]_AutoScroll)</onclick>
+				<selected>Skin.HasSetting(Widget$PARAM[widget_position]_AutoScroll)</selected>
+			</control>
+			<control type="radiobutton" id="12$PARAM[widget_position]46">
+				<description>Enable trailers to autoplay</description>
+				<visible>ControlGroup(9).HasFocus(12) + Control.IsVisible(12$PARAM[widget_position]20) + Skin.HasSetting(Trailer_Autoplay)</visible>
+				<label>    - $LOCALIZE[31467]</label>
+				<onclick>Skin.ToggleSetting(Widget$PARAM[widget_position]_Trailer_Autoplay)</onclick>
+				<selected>Skin.HasSetting(Widget$PARAM[widget_position]_Trailer_Autoplay)</selected>
+			</control>
+			<control type="radiobutton" id="12$PARAM[widget_position]47">
+				<description>Prefer keyart for poster views</description>
+				<visible>ControlGroup(9).HasFocus(12) + Control.IsVisible(12$PARAM[widget_position]20) + Skin.String(Widget$PARAM[widget_position]_Display,Posters)</visible>
+				<label>    - $LOCALIZE[31498]</label>
+				<onclick>Skin.ToggleSetting(Widget$PARAM[widget_position]_Prefer_Keyart)</onclick>
+				<selected>Skin.HasSetting(Widget$PARAM[widget_position]_Prefer_Keyart)</selected>
+			</control>
+			<control type="radiobutton" id="12$PARAM[widget_position]48">
+				<description>Prefer landscape art for fanart views</description>
+				<visible>ControlGroup(9).HasFocus(12) + Control.IsVisible(12$PARAM[widget_position]20) + [Skin.String(Widget$PARAM[widget_position]_Display,Fanart) | Skin.String(Widget$PARAM[widget_position]_Display,Spotlight)]</visible>
+				<label>    - $LOCALIZE[31499]</label>
+				<onclick>Skin.ToggleSetting(Widget$PARAM[widget_position]_Prefer_Landscape)</onclick>
+				<selected>Skin.HasSetting(Widget$PARAM[widget_position]_Prefer_Landscape)</selected>
+			</control>
+			<control type="radiobutton" id="12$PARAM[widget_position]49">
 				<description>Prefer thumbnails for episodes instead of show fanart</description>
-				<visible>ControlGroup(9).HasFocus(12) + Control.IsVisible(12$PARAM[widget_position]20) + Skin.HasSetting(Widget$PARAM[widget_position]_Content_Custom)</visible>
+				<visible>ControlGroup(9).HasFocus(12) + Control.IsVisible(12$PARAM[widget_position]20) + Skin.HasSetting(Widget$PARAM[widget_position]_Content_Custom) + [Skin.String(Widget$PARAM[widget_position]_Display,Fanart) | Skin.String(Widget$PARAM[widget_position]_Display,Spotlight)]</visible>
 				<label>    - $LOCALIZE[31477]</label>
 				<onclick>Skin.ToggleSetting(Widget$PARAM[widget_position]_Episode_Thumbs)</onclick>
 				<selected>Skin.HasSetting(Widget$PARAM[widget_position]_Episode_Thumbs)</selected>
diff --git a/16x9/Components_Viewtype_505_Grid.xml b/16x9/Components_Viewtype_505_Grid.xml
index a275355c..c8ab3093 100644
--- a/16x9/Components_Viewtype_505_Grid.xml
+++ b/16x9/Components_Viewtype_505_Grid.xml
@@ -376,6 +376,41 @@
 		</definition>
 	</include>
 
+	<include name="GridView_Widget_Overlay">
+		<definition>
+			<control type="label" id="6004">
+				<include content="Hidden_Control" />
+				<label>$VAR[Info_Label]</label>
+			</control>
+			<control type="grouplist">
+				<visible>!$EXP[Content_Switching]</visible>
+				<include content="Visible_Fade_Delayed_Animation" />
+				<left>95</left>
+				<width>322</width>
+				<top>872</top>
+				<height>198</height>
+				<orientation>vertical</orientation>
+				<align>center</align>
+				<itemgap>0</itemgap>
+				<control type="textbox">
+					<height max="135">auto</height>
+					<font>Spotlight_Title</font>
+					<textcolor>$VAR[Light_Color]</textcolor>
+					<label>$VAR[Title_Label]</label>
+					<align>center</align>
+				</control>
+				<control type="label">
+					<visible>!String.IsEmpty(Control.GetLabel(6004))</visible>
+					<height>35</height>
+					<font>Grid_Info</font>
+					<textcolor>$VAR[Light_Color]</textcolor>
+					<label>$INFO[Control.GetLabel(6004)]</label>
+					<align>center</align>
+				</control>
+			</control>
+		</definition>
+	</include>
+
 	<!-- Widget -->
 	<include name="GridView_ListIcon_Static_Unfocused">
 		<include content="ListIcon_Static_Unfocused">
@@ -1083,6 +1118,7 @@
 				<param name="5x_item_width" value="1800" />
 				<param name="6x_item_width" value="2160" />
 				<param name="art_icon" value="$PARAM[art_icon]" />
+				<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
 			</include>
 		</definition>
 	</include>
@@ -1106,6 +1142,7 @@
 				<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>
 		</definition>
@@ -1119,19 +1156,20 @@
 				<param name="target_id" value="$PARAM[target_id]" />
 				<param name="displaytype_label" value="Spotlight" />
 				<param name="displaytype_isfanart" value="false" />
-				<param name="top" value="803" />
-				<param name="item_height" value="252" />
-				<param name="item_width_minus_dropshadow_width" value="328" />
-				<param name="item_width" value="448" />
-				<param name="item_width_plus_dropshadow_width" value="568" />
-				<param name="2x_item_width" value="896" />
-				<param name="3x_item_width" value="1344" />
-				<param name="4x_item_width" value="1792" />
-				<param name="5x_item_width" value="2240" />
-				<param name="6x_item_width" value="2688" />
+				<param name="top" value="872" />
+				<param name="item_height" value="198" />
+				<param name="item_width_minus_dropshadow_width" value="232" />
+				<param name="item_width" value="352" />
+				<param name="item_width_plus_dropshadow_width" value="472" />
+				<param name="2x_item_width" value="704" />
+				<param name="3x_item_width" value="1056" />
+				<param name="4x_item_width" value="1408" />
+				<param name="5x_item_width" value="1760" />
+				<param name="6x_item_width" value="2112" />
 				<param name="art_icon" value="$PARAM[art_icon]" />
 				<param name="art_diffuse" value="true" />
 				<param name="focus_border_visible" value="$PARAM[focus_border_visible]" />
+				<animation effect="slide" start="0,0" end="20,0" time="0" condition="true">Conditional</animation>
 				<nested />
 			</include>
 		</definition>
@@ -1156,6 +1194,7 @@
 				<param name="5x_item_width" value="1800" />
 				<param name="6x_item_width" value="2160" />
 				<param name="art_icon" value="$PARAM[art_icon]" />
+				<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
 			</include>
 		</definition>
 	</include>
@@ -1178,8 +1217,9 @@
 		<definition>
 			<include content="Progress_Grid">
 				<param name="id" value="$PARAM[id]" />
-				<param name="left" value="104" />
-				<param name="bottom" value="40" />
+				<param name="left" value="136" />
+				<param name="width" value="240" />
+				<param name="bottom" value="25" />
 				<param name="progress_indicator_background" value="$VAR[Accent_Color]" />
 				<param name="slides" value="Default" />
 			</include>
diff --git a/16x9/Content_Settings.xml b/16x9/Content_Settings.xml
index 83d2435c..3fa6b0ed 100644
--- a/16x9/Content_Settings.xml
+++ b/16x9/Content_Settings.xml
@@ -607,13 +607,6 @@
 			<onclick>Skin.ToggleSetting(BillboardView_Enabled_Addons)</onclick>
 			<selected>Skin.HasSetting(BillboardView_Enabled_Addons)</selected>
 		</control>
-		<!-- <control type="radiobutton" id="1304">
-			<description>Billboard - Favourites</description>
-			<visible>ControlGroup(9).HasFocus(13)</visible>
-			<label>$LOCALIZE[31496]</label>
-			<onclick>Skin.ToggleSetting(BillboardView_Enabled_favouritesbrowser)</onclick>
-			<selected>Skin.HasSetting(BillboardView_Enabled_favouritesbrowser)</selected>
-		</control> -->
 		<control type="radiobutton" id="1305">
 			<description>Add movement</description>
 			<label>$LOCALIZE[31441]</label>
@@ -654,13 +647,6 @@
 			<onclick>Skin.ToggleSetting(ShowcaseView_Enabled_Addons)</onclick>
 			<selected>Skin.HasSetting(ShowcaseView_Enabled_Addons)</selected>
 		</control>
-		<!-- <control type="radiobutton" id="1315">
-			<description>Showcase - Favourites</description>
-			<visible>ControlGroup(9).HasFocus(13)</visible>
-			<label>$LOCALIZE[31496]</label>
-			<onclick>Skin.ToggleSetting(ShowcaseView_Enabled_favouritesbrowser)</onclick>
-			<selected>Skin.HasSetting(ShowcaseView_Enabled_favouritesbrowser)</selected>
-		</control> -->
 		<control type="label" id="1320">
 			<description>Strip</description>
 			<visible>ControlGroup(9).HasFocus(13)</visible>
@@ -694,13 +680,6 @@
 			<onclick>Skin.ToggleSetting(StripView_Enabled_Addons)</onclick>
 			<selected>Skin.HasSetting(StripView_Enabled_Addons)</selected>
 		</control>
-		<!-- <control type="radiobutton" id="1325">
-			<description>Strip - Favourites</description>
-			<visible>ControlGroup(9).HasFocus(13)</visible>
-			<label>$LOCALIZE[31496]</label>
-			<onclick>Skin.ToggleSetting(StripView_Enabled_favouritesbrowser)</onclick>
-			<selected>Skin.HasSetting(StripView_Enabled_favouritesbrowser)</selected>
-		</control> -->
 		<control type="label" id="1330">
 			<description>Grid</description>
 			<visible>ControlGroup(9).HasFocus(13)</visible>
@@ -754,13 +733,6 @@
 			<onclick>Skin.ToggleSetting(GridView_Enabled_Addons)</onclick>
 			<selected>Skin.HasSetting(GridView_Enabled_Addons)</selected>
 		</control>
-		<!-- <control type="radiobutton" id="1338">
-			<description>Grid - Favourites</description>
-			<visible>ControlGroup(9).HasFocus(13)</visible>
-			<label>$LOCALIZE[31496]</label>
-			<onclick>Skin.ToggleSetting(GridView_Enabled_favouritesbrowser)</onclick>
-			<selected>Skin.HasSetting(GridView_Enabled_favouritesbrowser)</selected>
-		</control> -->
 
 		<!-- Customisations -->
 		<control type="label" id="1400">
@@ -1011,16 +983,8 @@
 			<param name="category" value="15" />
 			<param name="previous" value="1531" />
 			<param name="id" value="1532" />
-			<param name="next" value="1533" />
+			<param name="next" value="1534" />
 		</include>
-		<control type="radiobutton" id="1533">
-			<description>Home</description>
-			<label>- $LOCALIZE[31467]</label>
-			<selected>Skin.String(Trailer_Autoplay_Home_Enabled,true)</selected>
-			<onclick condition="Skin.String(Trailer_Autoplay_Home_Enabled,true)">Skin.SetString(Trailer_Autoplay_Home_Enabled,false)</onclick>
-			<onclick condition="!Skin.String(Trailer_Autoplay_Home_Enabled,true)">Skin.SetString(Trailer_Autoplay_Home_Enabled,true)</onclick>
-			<visible>ControlGroup(9).HasFocus(15) + Skin.HasSetting(Trailer_Autoplay)</visible>
-		</control>
 		<control type="radiobutton" id="1534">
 			<description>Videos / Movies</description>
 			<label>- $LOCALIZE[31468]</label>
diff --git a/16x9/Content_Settings_Sliders.xml b/16x9/Content_Settings_Sliders.xml
index dc8f6810..ee6c8b61 100644
--- a/16x9/Content_Settings_Sliders.xml
+++ b/16x9/Content_Settings_Sliders.xml
@@ -229,7 +229,7 @@
 		<onleft condition="Skin.String(Background_Slideshow,Custom) + !Library.HasContent(music) + !Library.HasContent(tvshows) + Library.HasContent(movies)">Skin.SetString(Background_Slideshow,Movies)</onleft>
 		<onleft condition="Skin.String(Background_Slideshow,Artists) + Library.HasContent(tvshows)">Skin.SetString(Background_Slideshow,TVShows)</onleft>
 		<onleft condition="Skin.String(Background_Slideshow,Artists) + !Library.HasContent(tvshows) + Library.HasContent(movies)">Skin.SetString(Background_Slideshow,Movies)</onleft>
-		<onleft condition="Skin.String(Background_Slideshow,TVShows + Library.HasContent(movies)">Skin.SetString(Background_Slideshow,Movies)</onleft>
+		<onleft condition="Skin.String(Background_Slideshow,TVShows) + Library.HasContent(movies)">Skin.SetString(Background_Slideshow,Movies)</onleft>
 		<onleft condition="Skin.String(Background_Slideshow,Movies)">Skin.SetString(Background_Slideshow,Videos)</onleft>
 		<onleft condition="Skin.String(Background_Slideshow,Videos)">Skin.SetString(Background_Slideshow,Global)</onleft>
 		<onright condition="[Skin.String(Background_Slideshow,Global) | !Skin.String(Background_Slideshow)] + Library.HasContent(video)">Skin.SetString(Background_Slideshow,Videos)</onright>
diff --git a/16x9/Content_Viewtype_Options.xml b/16x9/Content_Viewtype_Options.xml
index dd49cb2d..9371af4f 100644
--- a/16x9/Content_Viewtype_Options.xml
+++ b/16x9/Content_Viewtype_Options.xml
@@ -326,7 +326,7 @@
 			<label2>$LOCALIZE[31014] $VAR[Copacetic_Divider_Bold] $LOCALIZE[16100]$INFO[Container.NumItems, (,)]</label2>
 			<property name="ActionLeft">SendClick(14)</property>
 			<property name="ActionRight">SendClick(14)</property>
-			<visible>Window.Is(videos) + Control.IsEnabled(14) + !System.Setting(hidewatched) + !Container.Content(actors) + !Container.Content(sets) + Integer.IsGreater(Container.NumItems,1)</visible>
+			<visible>Window.Is(videos) + Control.IsEnabled(14) + !System.Setting(hidewatched) + !Container.Content(actors) + !Container.Content(sets)</visible>
 		</item>
 		<item id="2">
 			<onclick>SetFocus(50)</onclick>
@@ -334,7 +334,7 @@
 			<label2>$LOCALIZE[31014] $VAR[Copacetic_Divider_Bold] $LOCALIZE[16101]$INFO[Container.TotalUnWatched, (,)]</label2>
 			<property name="ActionLeft">SendClick(14)</property>
 			<property name="ActionRight">SendClick(14)</property>
-			<visible>Window.Is(videos) + Control.IsEnabled(14) + System.Setting(hidewatched) + !Container.Content(actors) + !Container.Content(sets) + Integer.IsGreater(Container.NumItems,1)</visible>
+			<visible>Window.Is(videos) + Control.IsEnabled(14) + System.Setting(hidewatched) + !Container.Content(actors) + !Container.Content(sets)</visible>
 		</item>
 		<!-- Current playlist -->
 		<item>
diff --git a/16x9/Custom_1199_Test_Label.xml b/16x9/Custom_1199_Test_Label.xml
index 020e6e2c..d57d8498 100644
--- a/16x9/Custom_1199_Test_Label.xml
+++ b/16x9/Custom_1199_Test_Label.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window type="dialog" id="1199">
-	<visible>false</visible>
+	<visible>true</visible>
 	<zorder>3</zorder>
 	<controls>
 		<control type="image">
@@ -12,7 +12,7 @@
 		</control>
 		<control type="label">
 			<align>right</align>
-			<label>$INFO[Window(home).Property(Trailer_Autoplay)]</label>
+			<label>$INFO[Window(home).Property(Autoscroll_Trailers)]</label>
 			<height>200</height>
 		</control>
 	</controls>
diff --git a/16x9/Font.xml b/16x9/Font.xml
index 6b38e174..183c47ed 100644
--- a/16x9/Font.xml
+++ b/16x9/Font.xml
@@ -113,6 +113,18 @@
 			<size>25</size>
 			<linespacing>0.9</linespacing>
 		</font>
+		<font>
+			<name>Spotlight_Title</name>
+			<filename>Inter/Inter-Black.ttf</filename>
+			<size>30</size>
+			<linespacing>0.9</linespacing>
+		</font>
+		<font>
+			<name>Spotlight_Title</name>
+			<filename>Inter/Inter-Black.ttf</filename>
+			<size>30</size>
+			<linespacing>0.9</linespacing>
+		</font>
 		<font>
 			<name>Body</name>
 			<filename>Inter/Inter-Light.ttf</filename>
@@ -691,6 +703,12 @@
 			<size>25</size>
 			<linespacing>0.9</linespacing>
 		</font>
+		<font>
+			<name>Spotlight_Title</name>
+			<filename>resource://resource.fonts.copacetic/Inter-NotoSansSC-Black.ttf</filename>
+			<size>30</size>
+			<linespacing>0.9</linespacing>
+		</font>
 		<font>
 			<name>Body</name>
 			<filename>resource://resource.fonts.copacetic/Inter-NotoSansSC-Light.ttf</filename>
diff --git a/16x9/Home.xml b/16x9/Home.xml
index c2613a84..1b7c7f73 100644
--- a/16x9/Home.xml
+++ b/16x9/Home.xml
@@ -50,11 +50,11 @@
 		<!-- Content -->
 		<control type="group">
 			<include content="WindowOpenClose_Fade_Delayed_Long_Animation" />
-			<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
 			<control type="group">
 				<visible>Control.HasFocus(3000) | $EXP[Music_Player_HasFocus] | Control.HasFocus(4201)</visible>
 				<visible>!$EXP[TransparentDialog_IsVisible] + !$EXP[Infoscreen_IsVisible] + !$EXP[globalsearch_IsVisible]</visible>
 				<include content="Visible_Fade_Delayed_Animation" />
+				<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
 				<include content="Horizontal_List">
 					<param name="hidden_id" value="3000" />
 					<param name="focused_color" value="$VAR[Light_Color]" />
@@ -67,8 +67,6 @@
 					<top>30</top>
 					<texturenofocus colordiffuse="$VAR[Light_Color]">icons/icon_browse_unfocused_120.png</texturenofocus>
 					<texturefocus colordiffuse="$VAR[Light_Color]">icons/icon_browse_focused_120.png</texturefocus>
-					<!-- <onclick>Skin.SetString(globalsearch)</onclick> -->
-					<!-- <onclick>ActivateWindow(1180)</onclick> -->
 					<onclick>RunScript(script.copacetic.helper,action=globalsearch_input)</onclick>
 					<onclick>SetFocus(3000)</onclick>
 					<include content="globalsearch_home_Navigation" />
@@ -81,6 +79,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/Templates_Widgets.xml b/16x9/Templates_Widgets.xml
index 3acf7dbc..00937f2f 100644
--- a/16x9/Templates_Widgets.xml
+++ b/16x9/Templates_Widgets.xml
@@ -127,6 +127,7 @@
 			<control type="group">
 				<visible>!$EXP[TransparentDialog_IsVisible]</visible>
 				<include content="Visible_Fade_Delayed_Animation" />
+				<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay) + ![Skin.String(Widget$PARAM[widget_position]_View,Grid) + Skin.String(Widget$PARAM[widget_position]_Display,Spotlight)]" />
 				<control type="group">
 					<visible>Control.HasFocus(320$PARAM[widget_position])</visible>
 					<include content="Visible_Fade_Delayed_Animation" />
@@ -153,11 +154,12 @@
 					<param name="info_label_visible" value="true" />
 					<param name="info_label" value="$VAR[Copacetic_Divider_Bold,, ]$INFO[Container(320$PARAM[widget_position]).CurrentItem]$INFO[Container(320$PARAM[widget_position]).NumItems,/]" />
 					<param name="textcolor" value="$VAR[Breadcrumb_Label_Color]" />
+					<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay) + Skin.String(Widget$PARAM[widget_position]_View,Grid) + Skin.String(Widget$PARAM[widget_position]_Display,Spotlight)" />
 				</include>
 				<nested />
 				<!-- Busy spinner -->
 				<include content="Busy_Spinner">
-					<param name="visible" value="Control.HasFocus(320$PARAM[widget_position]) + Container(320$PARAM[widget_position]).IsUpdating + !Window.IsVisible(busydialog) + !Skin.String(Trailer_Autoplay_Home_Enabled,true)" />
+					<param name="visible" value="Control.HasFocus(320$PARAM[widget_position]) + Container(320$PARAM[widget_position]).IsUpdating + !Window.IsVisible(busydialog) + !Skin.HasSetting(Widget$PARAM[widget_position]_Trailer_Autoplay)" />
 					<param name="color" value="$VAR[Volume_Focused_Color]" />
 					<include content="Trailer_Autoplay_Fade_Delayed_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
 				</include>
diff --git a/16x9/Timers.xml b/16x9/Timers.xml
index 47ecab95..ee60014f 100644
--- a/16x9/Timers.xml
+++ b/16x9/Timers.xml
@@ -48,24 +48,50 @@
   </timer>
   <timer>
     <name>trailer_autoplay_home</name>
-    <start reset="true">Window.Is(home) + !Window.IsVisible(1101) + Skin.HasSetting(Trailer_Autoplay) + Skin.String(Trailer_Autoplay_Home_Enabled,true) + String.IsEmpty(Window(home).Property(Trailer_Autoplay)) + !Player.HasMedia + !String.IsEmpty(window(home).property(Home_Widget)) + Window.IsVisible(1160)</start>
+    <start reset="true">Window.Is(home) + Skin.HasSetting(Trailer_Autoplay) + !String.IsEmpty(window(home).property(Home_Widget)) + Window.IsVisible(1160) + !Player.HasMedia</start>
     <stop>String.IsEmpty(Window(home).Property(Trailer_Autoplay)) + !Player.HasVideo</stop>
-    <onstart condition="![[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)]] + !String.IsEmpty(ListItem.Trailer)">SetProperty(Trailer_Autoplay,true,home)</onstart>
-    <onstart condition="![[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)]] + !String.IsEmpty(ListItem.Trailer)">PlayMedia($ESCINFO[ListItem.Trailer],1,noresume)</onstart>
+    <onstart condition="Control.HasFocus(3201) + !Window.IsVisible(1131) + Skin.HasSetting(Widget1_Trailer_Autoplay) + String.IsEmpty(Window(home).Property(Trailer_Autoplay)) + !String.IsEmpty(ListItem.Trailer)">SetProperty(Trailer_Autoplay,true,home)</onstart>
+    <onstart condition="Control.HasFocus(3201) + !Window.IsVisible(1131) + Skin.HasSetting(Widget1_Trailer_Autoplay) + String.IsEmpty(Window(home).Property(Trailer_Autoplay)) + !String.IsEmpty(ListItem.Trailer)">PlayMedia($ESCINFO[ListItem.Trailer],1,noresume)</onstart>
+    <onstart condition="Control.HasFocus(3202) + !Window.IsVisible(1132) + Skin.HasSetting(Widget2_Trailer_Autoplay) + String.IsEmpty(Window(home).Property(Trailer_Autoplay)) + !String.IsEmpty(ListItem.Trailer)">SetProperty(Trailer_Autoplay,true,home)</onstart>
+    <onstart condition="Control.HasFocus(3202) + !Window.IsVisible(1132) + Skin.HasSetting(Widget2_Trailer_Autoplay) + String.IsEmpty(Window(home).Property(Trailer_Autoplay)) + !String.IsEmpty(ListItem.Trailer)">PlayMedia($ESCINFO[ListItem.Trailer],1,noresume)</onstart>
+    <onstart condition="Control.HasFocus(3203) + !Window.IsVisible(1133) + Skin.HasSetting(Widget3_Trailer_Autoplay) + String.IsEmpty(Window(home).Property(Trailer_Autoplay)) + !String.IsEmpty(ListItem.Trailer)">SetProperty(Trailer_Autoplay,true,home)</onstart>
+    <onstart condition="Control.HasFocus(3203) + !Window.IsVisible(1133) + Skin.HasSetting(Widget3_Trailer_Autoplay) + String.IsEmpty(Window(home).Property(Trailer_Autoplay)) + !String.IsEmpty(ListItem.Trailer)">PlayMedia($ESCINFO[ListItem.Trailer],1,noresume)</onstart>
+    <onstart condition="Control.HasFocus(3204) + !Window.IsVisible(1134) + Skin.HasSetting(Widget4_Trailer_Autoplay) + String.IsEmpty(Window(home).Property(Trailer_Autoplay)) + !String.IsEmpty(ListItem.Trailer)">SetProperty(Trailer_Autoplay,true,home)</onstart>
+    <onstart condition="Control.HasFocus(3204) + !Window.IsVisible(1134) + Skin.HasSetting(Widget4_Trailer_Autoplay) + String.IsEmpty(Window(home).Property(Trailer_Autoplay)) + !String.IsEmpty(ListItem.Trailer)">PlayMedia($ESCINFO[ListItem.Trailer],1,noresume)</onstart>
+    <onstart condition="Control.HasFocus(3205) + !Window.IsVisible(1135) + Skin.HasSetting(Widget5_Trailer_Autoplay) + String.IsEmpty(Window(home).Property(Trailer_Autoplay)) + !String.IsEmpty(ListItem.Trailer)">SetProperty(Trailer_Autoplay,true,home)</onstart>
+    <onstart condition="Control.HasFocus(3205) + !Window.IsVisible(1135) + Skin.HasSetting(Widget5_Trailer_Autoplay) + String.IsEmpty(Window(home).Property(Trailer_Autoplay)) + !String.IsEmpty(ListItem.Trailer)">PlayMedia($ESCINFO[ListItem.Trailer],1,noresume)</onstart>
+    <onstart condition="Control.HasFocus(3206) + !Window.IsVisible(1136) + Skin.HasSetting(Widget6_Trailer_Autoplay) + String.IsEmpty(Window(home).Property(Trailer_Autoplay)) + !String.IsEmpty(ListItem.Trailer)">SetProperty(Trailer_Autoplay,true,home)</onstart>
+    <onstart condition="Control.HasFocus(3206) + !Window.IsVisible(1136) + Skin.HasSetting(Widget6_Trailer_Autoplay) + String.IsEmpty(Window(home).Property(Trailer_Autoplay)) + !String.IsEmpty(ListItem.Trailer)">PlayMedia($ESCINFO[ListItem.Trailer],1,noresume)</onstart>
+    <onstart condition="Control.HasFocus(3207) + !Window.IsVisible(1137) + Skin.HasSetting(Widget7_Trailer_Autoplay) + String.IsEmpty(Window(home).Property(Trailer_Autoplay)) + !String.IsEmpty(ListItem.Trailer)">SetProperty(Trailer_Autoplay,true,home)</onstart>
+    <onstart condition="Control.HasFocus(3207) + !Window.IsVisible(1137) + Skin.HasSetting(Widget7_Trailer_Autoplay) + String.IsEmpty(Window(home).Property(Trailer_Autoplay)) + !String.IsEmpty(ListItem.Trailer)">PlayMedia($ESCINFO[ListItem.Trailer],1,noresume)</onstart>
+    <onstart condition="Control.HasFocus(3208) + !Window.IsVisible(1138) + Skin.HasSetting(Widget8_Trailer_Autoplay) + String.IsEmpty(Window(home).Property(Trailer_Autoplay)) + !String.IsEmpty(ListItem.Trailer)">SetProperty(Trailer_Autoplay,true,home)</onstart>
+    <onstart condition="Control.HasFocus(3208) + !Window.IsVisible(1138) + Skin.HasSetting(Widget8_Trailer_Autoplay) + String.IsEmpty(Window(home).Property(Trailer_Autoplay)) + !String.IsEmpty(ListItem.Trailer)">PlayMedia($ESCINFO[ListItem.Trailer],1,noresume)</onstart>
+    <onstart condition="Control.HasFocus(3209) + !Window.IsVisible(1139) + Skin.HasSetting(Widget9_Trailer_Autoplay) + String.IsEmpty(Window(home).Property(Trailer_Autoplay)) + !String.IsEmpty(ListItem.Trailer)">SetProperty(Trailer_Autoplay,true,home)</onstart>
+    <onstart condition="Control.HasFocus(3209) + !Window.IsVisible(1139) + Skin.HasSetting(Widget9_Trailer_Autoplay) + String.IsEmpty(Window(home).Property(Trailer_Autoplay)) + !String.IsEmpty(ListItem.Trailer)">PlayMedia($ESCINFO[ListItem.Trailer],1,noresume)</onstart>
   </timer>
   <timer>
     <name>widget_spotlight</name>
     <start reset="true">Control.HasFocus(3201) | Control.HasFocus(3202) | Control.HasFocus(3203) | Control.HasFocus(3204) | Control.HasFocus(3205) | Control.HasFocus(3206) | Control.HasFocus(3207) | Control.HasFocus(3208) | Control.HasFocus(3209)</start>
-    <stop>[Integer.IsGreater(Skin.TimerElapsedSecs(widget_spotlight),10) + System.IdleTime(10) + Skin.String(Trailer_Autoplay_Home_Enabled,true) + !String.IsEmpty(Window(home).Property(Trialer_Autoplay)) + !Player.HasVideo] | [Integer.IsGreater(Skin.TimerElapsedSecs(widget_spotlight),10) + System.IdleTime(10) + [!Skin.String(Trailer_Autoplay_Home_Enabled,true) | String.IsEmpty(Window(home).Property(Trialer_Autoplay))] + !Player.HasVideo]</stop>
+    <onstart condition="Control.HasFocus(3201) + Skin.HasSetting(Widget1_Trailer_Autoplay)">SetProperty(Autoscroll_Trailers,true,home)</onstart>
+    <onstart condition="Control.HasFocus(3202) + Skin.HasSetting(Widget2_Trailer_Autoplay)">SetProperty(Autoscroll_Trailers,true,home)</onstart>
+    <onstart condition="Control.HasFocus(3203) + Skin.HasSetting(Widget3_Trailer_Autoplay)">SetProperty(Autoscroll_Trailers,true,home)</onstart>
+    <onstart condition="Control.HasFocus(3204) + Skin.HasSetting(Widget4_Trailer_Autoplay)">SetProperty(Autoscroll_Trailers,true,home)</onstart>
+    <onstart condition="Control.HasFocus(3205) + Skin.HasSetting(Widget5_Trailer_Autoplay)">SetProperty(Autoscroll_Trailers,true,home)</onstart>
+    <onstart condition="Control.HasFocus(3206) + Skin.HasSetting(Widget6_Trailer_Autoplay)">SetProperty(Autoscroll_Trailers,true,home)</onstart>
+    <onstart condition="Control.HasFocus(3207) + Skin.HasSetting(Widget7_Trailer_Autoplay)">SetProperty(Autoscroll_Trailers,true,home)</onstart>
+    <onstart condition="Control.HasFocus(3208) + Skin.HasSetting(Widget8_Trailer_Autoplay)">SetProperty(Autoscroll_Trailers,true,home)</onstart>
+    <onstart condition="Control.HasFocus(3209) + Skin.HasSetting(Widget9_Trailer_Autoplay)">SetProperty(Autoscroll_Trailers,true,home)</onstart>
+    <stop>[[Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight),15) + System.IdleTime(15) + String.IsEmpty(Window(home).Property(Autoscroll_Trailers))] | [Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight),3) + System.IdleTime(3) + String.IsEqual(Window(home).Property(Autoscroll_Trailers),true)]] + !Window.IsVisible(movieinformation) + !Player.HasVideo</stop>
     <onstop condition="!String.IsEmpty(Window(home).Property(Trailer_Autoplay))">ClearProperty(Trailer_Autoplay,home)</onstop>
-    <onstop condition="Control.HasFocus(3201)">Control.Move(3201,1)</onstop>
-    <onstop condition="Control.HasFocus(3202)">Control.Move(3202,1)</onstop>
-    <onstop condition="Control.HasFocus(3203)">Control.Move(3203,1)</onstop>
-    <onstop condition="Control.HasFocus(3204)">Control.Move(3204,1)</onstop>
-    <onstop condition="Control.HasFocus(3205)">Control.Move(3205,1)</onstop>
-    <onstop condition="Control.HasFocus(3206)">Control.Move(3206,1)</onstop>
-    <onstop condition="Control.HasFocus(3207)">Control.Move(3207,1)</onstop>
-    <onstop condition="Control.HasFocus(3208)">Control.Move(3208,1)</onstop>
-    <onstop condition="Control.HasFocus(3209)">Control.Move(3209,1)</onstop>
+    <onstop condition="!String.IsEmpty(Window(home).Property(Autoscroll_Trailers))">ClearProperty(Autoscroll_Trailers,home)</onstop>
+    <onstop condition="Control.HasFocus(3201) + Skin.HasSetting(Widget1_AutoScroll)">Control.Move(3201,1)</onstop>
+    <onstop condition="Control.HasFocus(3202) + Skin.HasSetting(Widget2_AutoScroll)">Control.Move(3202,1)</onstop>
+    <onstop condition="Control.HasFocus(3203) + Skin.HasSetting(Widget3_AutoScroll)">Control.Move(3203,1)</onstop>
+    <onstop condition="Control.HasFocus(3204) + Skin.HasSetting(Widget4_AutoScroll)">Control.Move(3204,1)</onstop>
+    <onstop condition="Control.HasFocus(3205) + Skin.HasSetting(Widget5_AutoScroll)">Control.Move(3205,1)</onstop>
+    <onstop condition="Control.HasFocus(3206) + Skin.HasSetting(Widget6_AutoScroll)">Control.Move(3206,1)</onstop>
+    <onstop condition="Control.HasFocus(3207) + Skin.HasSetting(Widget7_AutoScroll)">Control.Move(3207,1)</onstop>
+    <onstop condition="Control.HasFocus(3208) + Skin.HasSetting(Widget8_AutoScroll)">Control.Move(3208,1)</onstop>
+    <onstop condition="Control.HasFocus(3209) + Skin.HasSetting(Widget9_AutoScroll)">Control.Move(3209,1)</onstop>
   </timer>
 </timers>
diff --git a/16x9/Variables_Labels_Windows.xml b/16x9/Variables_Labels_Windows.xml
index dd39e408..01d7629f 100644
--- a/16x9/Variables_Labels_Windows.xml
+++ b/16x9/Variables_Labels_Windows.xml
@@ -24,12 +24,12 @@
 		<value>$LOCALIZE[39140]</value>
 	</variable>
 	<variable name="defaultsettings_videolibrary.movieartwhitelist_Label2">
-		<value condition="Skin.HasSetting(videolibrary.movieartwhitelist)">keyart, square, clearlogo, clearlogo-alt, clearlogo-billboard</value>
+		<value condition="Skin.HasSetting(videolibrary.movieartwhitelist)">keyart, landscape, square, clearlogo, clearlogo-alt, clearlogo-billboard</value>
 		<value condition="!String.IsEmpty(Window(home).Property(videolibrary.movieartwhitelist))">$INFO[Window(home).Property(videolibrary.movieartwhitelist)]</value>
 		<value>$LOCALIZE[231]</value>
 	</variable>
 	<variable name="defaultsettings_videolibrary.tvshowartwhitelist_Label2">
-		<value condition="Skin.HasSetting(videolibrary.tvshowartwhitelist)">keyart, square, clearlogo, clearlogo-alt, clearlogo-billboard</value>
+		<value condition="Skin.HasSetting(videolibrary.tvshowartwhitelist)">keyart, landscape, square, clearlogo, clearlogo-alt, clearlogo-billboard</value>
 		<value condition="!String.IsEmpty(Window(home).Property(videolibrary.tvshowartwhitelist))">$INFO[Window(home).Property(videolibrary.tvshowartwhitelist)]</value>
 		<value>$LOCALIZE[231]</value>
 	</variable>
@@ -190,7 +190,11 @@
 		<value condition="Control.HasFocus(1110)">$LOCALIZE[31542]</value>
 		<value condition="Control.HasFocus(1111)">$LOCALIZE[31543]</value>
 		<!-- Widgets -->
-		<value condition="ControlGroup(9).HasFocus(12)">$LOCALIZE[31545]</value>
+		<value condition="Control.HasFocus(12111) | Control.HasFocus(12211) | Control.HasFocus(12311) | Control.HasFocus(12411) | Control.HasFocus(12511) | Control.HasFocus(12611) | Control.HasFocus(12711) | Control.HasFocus(12811) | Control.HasFocus(12911)">$LOCALIZE[31545]</value>
+		<value condition="Control.HasFocus(12145) | Control.HasFocus(12245) | Control.HasFocus(12345) | Control.HasFocus(12445) | Control.HasFocus(12545) | Control.HasFocus(12645) | Control.HasFocus(12745) | Control.HasFocus(12845) | Control.HasFocus(12945)">$LOCALIZE[31596]</value>
+		<value condition="Control.HasFocus(12146) | Control.HasFocus(12246) | Control.HasFocus(12346) | Control.HasFocus(12446) | Control.HasFocus(12546) | Control.HasFocus(12646) | Control.HasFocus(12746) | Control.HasFocus(12846) | Control.HasFocus(12946)">$LOCALIZE[31567]</value>
+		<value condition="Control.HasFocus(12147) | Control.HasFocus(12247) | Control.HasFocus(12347) | Control.HasFocus(12447) | Control.HasFocus(12547) | Control.HasFocus(12647) | Control.HasFocus(12747) | Control.HasFocus(12847) | Control.HasFocus(12947)">$LOCALIZE[31598]</value>
+		<value condition="Control.HasFocus(12148) | Control.HasFocus(12248) | Control.HasFocus(12348) | Control.HasFocus(12448) | Control.HasFocus(12548) | Control.HasFocus(12648) | Control.HasFocus(12748) | Control.HasFocus(12848) | Control.HasFocus(12948)">$LOCALIZE[31599]</value>
 		<!-- Views -->
 		<value condition="Control.HasFocus(1305) | Control.HasFocus(1355)">$LOCALIZE[31541]</value>
 		<value condition="Control.HasFocus(1351)">$LOCALIZE[31575]</value>
diff --git a/16x9/Variables_Textures_Artwork_Widgets.xml b/16x9/Variables_Textures_Artwork_Widgets.xml
index 150a6a19..3948c719 100644
--- a/16x9/Variables_Textures_Artwork_Widgets.xml
+++ b/16x9/Variables_Textures_Artwork_Widgets.xml
@@ -75,6 +75,7 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(3).Icon)">$INFO[ListItem(3).Icon]</value>
 	</variable>
 	<variable name="Widget1_Thumbnail(4)Content">
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(thumb)) + Skin.HasSetting(Widget1_Content_Custom) + [Skin.String(Widget1_Display,Fanart) | Skin.String(Widget1_Display,Spotlight)] + [String.IsEqual(Container.ListItemNoWrap(4).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(4).DBType,episode)] + Skin.HasSetting(Widget1_Episode_Thumbs)">$INFO[ListItem(4).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(tvshow.square)) + Skin.String(Widget1_Display,Square)">$INFO[ListItem(4).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(square)) + Skin.String(Widget1_Display,Square)">$INFO[ListItem(4).Art(square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(tvshow.fanart)) + !Skin.String(Widget1_Display,Posters)">$INFO[ListItem(4).Art(tvshow.fanart)]</value>
@@ -86,8 +87,11 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Icon)">$INFO[ListItem(4).Icon]</value>
 	</variable>
 	<variable name="Widget1_Thumbnail(5)Content">
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(thumb)) + Skin.HasSetting(Widget1_Content_Custom) + [Skin.String(Widget1_Display,Fanart) | Skin.String(Widget1_Display,Spotlight)] + [String.IsEqual(Container.ListItemNoWrap(5).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(5).DBType,episode)] + Skin.HasSetting(Widget1_Episode_Thumbs)">$INFO[ListItem(5).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.square)) + Skin.String(Widget1_Display,Square)">$INFO[ListItem(5).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(square)) + Skin.String(Widget1_Display,Square)">$INFO[ListItem(5).Art(square)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.fanart)) + !Skin.String(Widget1_Display,Posters)">$INFO[ListItem(5).Art(tvshow.fanart)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(fanart)) + !Skin.String(Widget1_Display,Posters) + !String.IsEqual(ListItem(5).DBType,album) + !String.IsEqual(ListItem(5).DBType,song)">$INFO[ListItem(5).Art(fanart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.keyart)) + Skin.String(Widget1_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(5).Art(tvshow.keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(keyart)) + Skin.String(Widget1_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(5).Art(keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.poster)) + Skin.String(Widget1_Display,Posters)">$INFO[ListItem(5).Art(tvshow.poster)]</value>
@@ -95,8 +99,11 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Icon)">$INFO[ListItem(5).Icon]</value>
 	</variable>
 	<variable name="Widget1_Thumbnail(6)Content">
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(thumb)) + Skin.HasSetting(Widget1_Content_Custom) + [Skin.String(Widget1_Display,Fanart) | Skin.String(Widget1_Display,Spotlight)] + [String.IsEqual(Container.ListItemNoWrap(6).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(6).DBType,episode)] + Skin.HasSetting(Widget1_Episode_Thumbs)">$INFO[ListItem(6).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.square)) + Skin.String(Widget1_Display,Square)">$INFO[ListItem(6).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(square)) + Skin.String(Widget1_Display,Square)">$INFO[ListItem(6).Art(square)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.fanart)) + !Skin.String(Widget1_Display,Posters)">$INFO[ListItem(6).Art(tvshow.fanart)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(fanart)) + !Skin.String(Widget1_Display,Posters) + !String.IsEqual(ListItem(6).DBType,album) + !String.IsEqual(ListItem(6).DBType,song)">$INFO[ListItem(6).Art(fanart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.keyart)) + Skin.String(Widget1_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(6).Art(tvshow.keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(keyart)) + Skin.String(Widget1_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(6).Art(keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.poster)) + Skin.String(Widget1_Display,Posters)">$INFO[ListItem(6).Art(tvshow.poster)]</value>
@@ -178,6 +185,7 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(3).Icon)">$INFO[ListItem(3).Icon]</value>
 	</variable>
 	<variable name="Widget2_Thumbnail(4)Content">
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(thumb)) + Skin.HasSetting(Widget2_Content_Custom) + [Skin.String(Widget2_Display,Fanart) | Skin.String(Widget2_Display,Spotlight)] + [String.IsEqual(Container.ListItemNoWrap(4).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(4).DBType,episode)] + Skin.HasSetting(Widget2_Episode_Thumbs)">$INFO[ListItem(4).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(tvshow.square)) + Skin.String(Widget2_Display,Square)">$INFO[ListItem(4).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(square)) + Skin.String(Widget2_Display,Square)">$INFO[ListItem(4).Art(square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(tvshow.fanart)) + !Skin.String(Widget2_Display,Posters)">$INFO[ListItem(4).Art(tvshow.fanart)]</value>
@@ -189,8 +197,11 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Icon)">$INFO[ListItem(4).Icon]</value>
 	</variable>
 	<variable name="Widget2_Thumbnail(5)Content">
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(thumb)) + Skin.HasSetting(Widget2_Content_Custom) + [Skin.String(Widget2_Display,Fanart) | Skin.String(Widget2_Display,Spotlight)] + [String.IsEqual(Container.ListItemNoWrap(5).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(5).DBType,episode)] + Skin.HasSetting(Widget2_Episode_Thumbs)">$INFO[ListItem(5).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.square)) + Skin.String(Widget2_Display,Square)">$INFO[ListItem(5).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(square)) + Skin.String(Widget2_Display,Square)">$INFO[ListItem(5).Art(square)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.fanart)) + !Skin.String(Widget2_Display,Posters)">$INFO[ListItem(5).Art(tvshow.fanart)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(fanart)) + !Skin.String(Widget2_Display,Posters) + !String.IsEqual(ListItem(5).DBType,album) + !String.IsEqual(ListItem(5).DBType,song)">$INFO[ListItem(5).Art(fanart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.keyart)) + Skin.String(Widget2_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(5).Art(tvshow.keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(keyart)) + Skin.String(Widget2_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(5).Art(keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.poster)) + Skin.String(Widget2_Display,Posters)">$INFO[ListItem(5).Art(tvshow.poster)]</value>
@@ -198,8 +209,11 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Icon)">$INFO[ListItem(5).Icon]</value>
 	</variable>
 	<variable name="Widget2_Thumbnail(6)Content">
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(thumb)) + Skin.HasSetting(Widget2_Content_Custom) + [Skin.String(Widget2_Display,Fanart) | Skin.String(Widget2_Display,Spotlight)] + [String.IsEqual(Container.ListItemNoWrap(6).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(6).DBType,episode)] + Skin.HasSetting(Widget2_Episode_Thumbs)">$INFO[ListItem(6).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.square)) + Skin.String(Widget2_Display,Square)">$INFO[ListItem(6).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(square)) + Skin.String(Widget2_Display,Square)">$INFO[ListItem(6).Art(square)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.fanart)) + !Skin.String(Widget2_Display,Posters)">$INFO[ListItem(6).Art(tvshow.fanart)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(fanart)) + !Skin.String(Widget2_Display,Posters) + !String.IsEqual(ListItem(6).DBType,album) + !String.IsEqual(ListItem(6).DBType,song)">$INFO[ListItem(6).Art(fanart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.keyart)) + Skin.String(Widget2_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(6).Art(tvshow.keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(keyart)) + Skin.String(Widget2_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(6).Art(keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.poster)) + Skin.String(Widget2_Display,Posters)">$INFO[ListItem(6).Art(tvshow.poster)]</value>
@@ -281,6 +295,7 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(3).Icon)">$INFO[ListItem(3).Icon]</value>
 	</variable>
 	<variable name="Widget3_Thumbnail(4)Content">
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(thumb)) + Skin.HasSetting(Widget4_Content_Custom) + [Skin.String(Widget3_Display,Fanart) | Skin.String(Widget3_Display,Spotlight)] + [String.IsEqual(Container.ListItemNoWrap(4).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(4).DBType,episode)] + Skin.HasSetting(Widget3_Episode_Thumbs)">$INFO[ListItem(4).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(tvshow.square)) + Skin.String(Widget3_Display,Square)">$INFO[ListItem(4).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(square)) + Skin.String(Widget3_Display,Square)">$INFO[ListItem(4).Art(square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(tvshow.fanart)) + !Skin.String(Widget3_Display,Posters)">$INFO[ListItem(4).Art(tvshow.fanart)]</value>
@@ -292,8 +307,11 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Icon)">$INFO[ListItem(4).Icon]</value>
 	</variable>
 	<variable name="Widget3_Thumbnail(5)Content">
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(thumb)) + Skin.HasSetting(Widget3_Content_Custom) + [Skin.String(Widget3_Display,Fanart) | Skin.String(Widget3_Display,Spotlight)] + [String.IsEqual(Container.ListItemNoWrap(5).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(5).DBType,episode)] + Skin.HasSetting(Widget3_Episode_Thumbs)">$INFO[ListItem(5).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.square)) + Skin.String(Widget3_Display,Square)">$INFO[ListItem(5).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(square)) + Skin.String(Widget3_Display,Square)">$INFO[ListItem(5).Art(square)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.fanart)) + !Skin.String(Widget3_Display,Posters)">$INFO[ListItem(5).Art(tvshow.fanart)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(fanart)) + !Skin.String(Widget3_Display,Posters) + !String.IsEqual(ListItem(5).DBType,album) + !String.IsEqual(ListItem(5).DBType,song)">$INFO[ListItem(5).Art(fanart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.keyart)) + Skin.String(Widget3_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(5).Art(tvshow.keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(keyart)) + Skin.String(Widget3_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(5).Art(keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.poster)) + Skin.String(Widget3_Display,Posters)">$INFO[ListItem(5).Art(tvshow.poster)]</value>
@@ -301,8 +319,11 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Icon)">$INFO[ListItem(5).Icon]</value>
 	</variable>
 	<variable name="Widget3_Thumbnail(6)Content">
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(thumb)) + Skin.HasSetting(Widget3_Content_Custom) + [Skin.String(Widget3_Display,Fanart) | Skin.String(Widget3_Display,Spotlight)] + [String.IsEqual(Container.ListItemNoWrap(6).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(6).DBType,episode)] + Skin.HasSetting(Widget3_Episode_Thumbs)">$INFO[ListItem(6).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.square)) + Skin.String(Widget3_Display,Square)">$INFO[ListItem(6).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(square)) + Skin.String(Widget3_Display,Square)">$INFO[ListItem(6).Art(square)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.fanart)) + !Skin.String(Widget3_Display,Posters)">$INFO[ListItem(6).Art(tvshow.fanart)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(fanart)) + !Skin.String(Widget3_Display,Posters) + !String.IsEqual(ListItem(6).DBType,album) + !String.IsEqual(ListItem(6).DBType,song)">$INFO[ListItem(6).Art(fanart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.keyart)) + Skin.String(Widget3_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(6).Art(tvshow.keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(keyart)) + Skin.String(Widget3_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(6).Art(keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.poster)) + Skin.String(Widget3_Display,Posters)">$INFO[ListItem(6).Art(tvshow.poster)]</value>
@@ -384,6 +405,7 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(3).Icon)">$INFO[ListItem(3).Icon]</value>
 	</variable>
 	<variable name="Widget4_Thumbnail(4)Content">
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(thumb)) + Skin.HasSetting(Widget4_Content_Custom) + [Skin.String(Widget4_Display,Fanart) | Skin.String(Widget4_Display,Spotlight)] + [String.IsEqual(Container.ListItemNoWrap(4).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(4).DBType,episode)] + Skin.HasSetting(Widget4_Episode_Thumbs)">$INFO[ListItem(4).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(tvshow.square)) + Skin.String(Widget4_Display,Square)">$INFO[ListItem(4).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(square)) + Skin.String(Widget4_Display,Square)">$INFO[ListItem(4).Art(square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(tvshow.fanart)) + !Skin.String(Widget4_Display,Posters)">$INFO[ListItem(4).Art(tvshow.fanart)]</value>
@@ -395,8 +417,11 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Icon)">$INFO[ListItem(4).Icon]</value>
 	</variable>
 	<variable name="Widget4_Thumbnail(5)Content">
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(thumb)) + Skin.HasSetting(Widget4_Content_Custom) + [Skin.String(Widget4_Display,Fanart) | Skin.String(Widget4_Display,Spotlight)] + [String.IsEqual(Container.ListItemNoWrap(5).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(5).DBType,episode)] + Skin.HasSetting(Widget4_Episode_Thumbs)">$INFO[ListItem(5).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.square)) + Skin.String(Widget4_Display,Square)">$INFO[ListItem(5).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(square)) + Skin.String(Widget4_Display,Square)">$INFO[ListItem(5).Art(square)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.fanart)) + !Skin.String(Widget4_Display,Posters)">$INFO[ListItem(5).Art(tvshow.fanart)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(fanart)) + !Skin.String(Widget4_Display,Posters) + !String.IsEqual(ListItem(5).DBType,album) + !String.IsEqual(ListItem(5).DBType,song)">$INFO[ListItem(5).Art(fanart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.keyart)) + Skin.String(Widget4_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(5).Art(tvshow.keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(keyart)) + Skin.String(Widget4_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(5).Art(keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.poster)) + Skin.String(Widget4_Display,Posters)">$INFO[ListItem(5).Art(tvshow.poster)]</value>
@@ -404,8 +429,11 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Icon)">$INFO[ListItem(5).Icon]</value>
 	</variable>
 	<variable name="Widget4_Thumbnail(6)Content">
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(thumb)) + Skin.HasSetting(Widget4_Content_Custom) + [Skin.String(Widget4_Display,Fanart) | Skin.String(Widget4_Display,Spotlight)] + [String.IsEqual(Container.ListItemNoWrap(6).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(6).DBType,episode)] + Skin.HasSetting(Widget4_Episode_Thumbs)">$INFO[ListItem(6).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.square)) + Skin.String(Widget4_Display,Square)">$INFO[ListItem(6).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(square)) + Skin.String(Widget4_Display,Square)">$INFO[ListItem(6).Art(square)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.fanart)) + !Skin.String(Widget4_Display,Posters)">$INFO[ListItem(6).Art(tvshow.fanart)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(fanart)) + !Skin.String(Widget4_Display,Posters) + !String.IsEqual(ListItem(6).DBType,album) + !String.IsEqual(ListItem(6).DBType,song)">$INFO[ListItem(6).Art(fanart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.keyart)) + Skin.String(Widget4_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(6).Art(tvshow.keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(keyart)) + Skin.String(Widget4_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(6).Art(keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.poster)) + Skin.String(Widget4_Display,Posters)">$INFO[ListItem(6).Art(tvshow.poster)]</value>
@@ -487,6 +515,7 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(3).Icon)">$INFO[ListItem(3).Icon]</value>
 	</variable>
 	<variable name="Widget5_Thumbnail(4)Content">
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(thumb)) + Skin.HasSetting(Widget5_Content_Custom) + [Skin.String(Widget5_Display,Fanart) | Skin.String(Widget5_Display,Spotlight)] + [String.IsEqual(Container.ListItemNoWrap(4).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(4).DBType,video)] + Skin.HasSetting(Widget5_Episode_Thumbs)">$INFO[ListItem(4).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(tvshow.square)) + Skin.String(Widget5_Display,Square)">$INFO[ListItem(4).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(square)) + Skin.String(Widget5_Display,Square)">$INFO[ListItem(4).Art(square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(tvshow.fanart)) + !Skin.String(Widget5_Display,Posters)">$INFO[ListItem(4).Art(tvshow.fanart)]</value>
@@ -498,8 +527,11 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Icon)">$INFO[ListItem(4).Icon]</value>
 	</variable>
 	<variable name="Widget5_Thumbnail(5)Content">
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(thumb)) + Skin.HasSetting(Widget5_Content_Custom) + [Skin.String(Widget5_Display,Fanart) | Skin.String(Widget5_Display,Spotlight)] + [String.IsEqual(Container.ListItemNoWrap(5).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(5).DBType,video)] + Skin.HasSetting(Widget5_Episode_Thumbs)">$INFO[ListItem(5).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.square)) + Skin.String(Widget5_Display,Square)">$INFO[ListItem(5).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(square)) + Skin.String(Widget5_Display,Square)">$INFO[ListItem(5).Art(square)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.fanart)) + !Skin.String(Widget5_Display,Posters)">$INFO[ListItem(5).Art(tvshow.fanart)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(fanart)) + !Skin.String(Widget5_Display,Posters) + !String.IsEqual(ListItem(5).DBType,album) + !String.IsEqual(ListItem(5).DBType,song)">$INFO[ListItem(5).Art(fanart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.keyart)) + Skin.String(Widget5_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(5).Art(tvshow.keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(keyart)) + Skin.String(Widget5_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(5).Art(keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.poster)) + Skin.String(Widget5_Display,Posters)">$INFO[ListItem(5).Art(tvshow.poster)]</value>
@@ -507,8 +539,11 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Icon)">$INFO[ListItem(5).Icon]</value>
 	</variable>
 	<variable name="Widget5_Thumbnail(6)Content">
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(thumb)) + Skin.HasSetting(Widget5_Content_Custom) + [Skin.String(Widget5_Display,Fanart) | Skin.String(Widget5_Display,Spotlight)] + [String.IsEqual(Container.ListItemNoWrap(6).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(6).DBType,video)] + Skin.HasSetting(Widget5_Episode_Thumbs)">$INFO[ListItem(6).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.square)) + Skin.String(Widget5_Display,Square)">$INFO[ListItem(6).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(square)) + Skin.String(Widget5_Display,Square)">$INFO[ListItem(6).Art(square)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.fanart)) + !Skin.String(Widget5_Display,Posters)">$INFO[ListItem(6).Art(tvshow.fanart)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(fanart)) + !Skin.String(Widget5_Display,Posters) + !String.IsEqual(ListItem(6).DBType,album) + !String.IsEqual(ListItem(6).DBType,song)">$INFO[ListItem(6).Art(fanart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.keyart)) + Skin.String(Widget5_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(6).Art(tvshow.keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(keyart)) + Skin.String(Widget5_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(6).Art(keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.poster)) + Skin.String(Widget5_Display,Posters)">$INFO[ListItem(6).Art(tvshow.poster)]</value>
@@ -590,6 +625,7 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(3).Icon)">$INFO[ListItem(3).Icon]</value>
 	</variable>
 	<variable name="Widget6_Thumbnail(4)Content">
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(thumb)) + Skin.HasSetting(Widget6_Content_Custom) + [Skin.String(Widget6_Display,Fanart) | Skin.String(Widget6_Display,Spotlight)] + [String.IsEqual(Container.ListItemNoWrap(4).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(4).DBType,episode)] + Skin.HasSetting(Widget6_Episode_Thumbs)">$INFO[ListItem(4).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(tvshow.square)) + Skin.String(Widget6_Display,Square)">$INFO[ListItem(4).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(square)) + Skin.String(Widget6_Display,Square)">$INFO[ListItem(4).Art(square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(tvshow.fanart)) + !Skin.String(Widget6_Display,Posters)">$INFO[ListItem(4).Art(tvshow.fanart)]</value>
@@ -601,8 +637,11 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Icon)">$INFO[ListItem(4).Icon]</value>
 	</variable>
 	<variable name="Widget6_Thumbnail(5)Content">
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(thumb)) + Skin.HasSetting(Widget6_Content_Custom) + [Skin.String(Widget6_Display,Fanart) | Skin.String(Widget6_Display,Spotlight)] + [String.IsEqual(Container.ListItemNoWrap(5).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(5).DBType,episode)] + Skin.HasSetting(Widget6_Episode_Thumbs)">$INFO[ListItem(5).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.square)) + Skin.String(Widget6_Display,Square)">$INFO[ListItem(5).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(square)) + Skin.String(Widget6_Display,Square)">$INFO[ListItem(5).Art(square)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.fanart)) + !Skin.String(Widget6_Display,Posters)">$INFO[ListItem(5).Art(tvshow.fanart)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(fanart)) + !Skin.String(Widget6_Display,Posters) + !String.IsEqual(ListItem(5).DBType,album) + !String.IsEqual(ListItem(5).DBType,song)">$INFO[ListItem(5).Art(fanart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.keyart)) + Skin.String(Widget6_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(5).Art(tvshow.keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(keyart)) + Skin.String(Widget6_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(5).Art(keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.poster)) + Skin.String(Widget6_Display,Posters)">$INFO[ListItem(5).Art(tvshow.poster)]</value>
@@ -610,8 +649,11 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Icon)">$INFO[ListItem(5).Icon]</value>
 	</variable>
 	<variable name="Widget6_Thumbnail(6)Content">
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(thumb)) + Skin.HasSetting(Widget6_Content_Custom) + [Skin.String(Widget6_Display,Fanart) | Skin.String(Widget6_Display,Spotlight)] + [String.IsEqual(Container.ListItemNoWrap(6).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(6).DBType,episode)] + Skin.HasSetting(Widget6_Episode_Thumbs)">$INFO[ListItem(6).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.square)) + Skin.String(Widget6_Display,Square)">$INFO[ListItem(6).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(square)) + Skin.String(Widget6_Display,Square)">$INFO[ListItem(6).Art(square)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.fanart)) + !Skin.String(Widget6_Display,Posters)">$INFO[ListItem(6).Art(tvshow.fanart)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(fanart)) + !Skin.String(Widget6_Display,Posters) + !String.IsEqual(ListItem(6).DBType,album) + !String.IsEqual(ListItem(6).DBType,song)">$INFO[ListItem(6).Art(fanart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.keyart)) + Skin.String(Widget6_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(6).Art(tvshow.keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(keyart)) + Skin.String(Widget6_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(6).Art(keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.poster)) + Skin.String(Widget6_Display,Posters)">$INFO[ListItem(6).Art(tvshow.poster)]</value>
@@ -693,6 +735,7 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(3).Icon)">$INFO[ListItem(3).Icon]</value>
 	</variable>
 	<variable name="Widget7_Thumbnail(4)Content">
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(thumb)) + Skin.HasSetting(Widget7_Content_Custom) + [Skin.String(Widget7_Display,Fanart) | Skin.String(Widget7_Display,Spotlight)] + [String.IsEqual(Container.ListItemNoWrap(4).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(4).DBType,episode)] + Skin.HasSetting(Widget7_Episode_Thumbs)">$INFO[ListItem(4).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(tvshow.square)) + Skin.String(Widget7_Display,Square)">$INFO[ListItem(4).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(square)) + Skin.String(Widget7_Display,Square)">$INFO[ListItem(4).Art(square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(tvshow.fanart)) + !Skin.String(Widget7_Display,Posters)">$INFO[ListItem(4).Art(tvshow.fanart)]</value>
@@ -704,8 +747,11 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Icon)">$INFO[ListItem(4).Icon]</value>
 	</variable>
 	<variable name="Widget7_Thumbnail(5)Content">
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(thumb)) + Skin.HasSetting(Widget7_Content_Custom) + [Skin.String(Widget7_Display,Fanart) | Skin.String(Widget7_Display,Spotlight)] + [String.IsEqual(Container.ListItemNoWrap(5).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(5).DBType,episode)] + Skin.HasSetting(Widget7_Episode_Thumbs)">$INFO[ListItem(5).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.square)) + Skin.String(Widget7_Display,Square)">$INFO[ListItem(5).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(square)) + Skin.String(Widget7_Display,Square)">$INFO[ListItem(5).Art(square)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.fanart)) + !Skin.String(Widget7_Display,Posters)">$INFO[ListItem(5).Art(tvshow.fanart)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(fanart)) + !Skin.String(Widget7_Display,Posters) + !String.IsEqual(ListItem(5).DBType,album) + !String.IsEqual(ListItem(5).DBType,song)">$INFO[ListItem(5).Art(fanart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.keyart)) + Skin.String(Widget7_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(5).Art(tvshow.keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(keyart)) + Skin.String(Widget7_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(5).Art(keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.poster)) + Skin.String(Widget7_Display,Posters)">$INFO[ListItem(5).Art(tvshow.poster)]</value>
@@ -713,8 +759,11 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Icon)">$INFO[ListItem(5).Icon]</value>
 	</variable>
 	<variable name="Widget7_Thumbnail(6)Content">
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(thumb)) + Skin.HasSetting(Widget7_Content_Custom) + [Skin.String(Widget7_Display,Fanart) | Skin.String(Widget7_Display,Spotlight)] + [String.IsEqual(Container.ListItemNoWrap(6).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(6).DBType,episode)] + Skin.HasSetting(Widget7_Episode_Thumbs)">$INFO[ListItem(6).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.square)) + Skin.String(Widget7_Display,Square)">$INFO[ListItem(6).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(square)) + Skin.String(Widget7_Display,Square)">$INFO[ListItem(6).Art(square)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.fanart)) + !Skin.String(Widget7_Display,Posters)">$INFO[ListItem(6).Art(tvshow.fanart)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(fanart)) + !Skin.String(Widget7_Display,Posters) + !String.IsEqual(ListItem(6).DBType,album) + !String.IsEqual(ListItem(6).DBType,song)">$INFO[ListItem(6).Art(fanart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.keyart)) + Skin.String(Widget7_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(6).Art(tvshow.keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(keyart)) + Skin.String(Widget7_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(6).Art(keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.poster)) + Skin.String(Widget7_Display,Posters)">$INFO[ListItem(6).Art(tvshow.poster)]</value>
@@ -796,6 +845,7 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(3).Icon)">$INFO[ListItem(3).Icon]</value>
 	</variable>
 	<variable name="Widget8_Thumbnail(4)Content">
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(thumb)) + Skin.HasSetting(Widget8_Content_Custom) + [Skin.String(Widget8_Display,Fanart) | Skin.String(Widget8_Display,Spotlight)] + [String.IsEqual(Container.ListItemNoWrap(4).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(4).DBType,episode)] + Skin.HasSetting(Widget8_Episode_Thumbs)">$INFO[ListItem(4).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(tvshow.square)) + Skin.String(Widget8_Display,Square)">$INFO[ListItem(4).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(square)) + Skin.String(Widget8_Display,Square)">$INFO[ListItem(4).Art(square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(tvshow.fanart)) + !Skin.String(Widget8_Display,Posters)">$INFO[ListItem(4).Art(tvshow.fanart)]</value>
@@ -807,8 +857,11 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Icon)">$INFO[ListItem(4).Icon]</value>
 	</variable>
 	<variable name="Widget8_Thumbnail(5)Content">
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(thumb)) + Skin.HasSetting(Widget8_Content_Custom) + [Skin.String(Widget8_Display,Fanart) | Skin.String(Widget8_Display,Spotlight)] + [String.IsEqual(Container.ListItemNoWrap(5).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(5).DBType,episode)] + Skin.HasSetting(Widget8_Episode_Thumbs)">$INFO[ListItem(5).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.square)) + Skin.String(Widget8_Display,Square)">$INFO[ListItem(5).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(square)) + Skin.String(Widget8_Display,Square)">$INFO[ListItem(5).Art(square)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.fanart)) + !Skin.String(Widget8_Display,Posters)">$INFO[ListItem(5).Art(tvshow.fanart)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(fanart)) + !Skin.String(Widget8_Display,Posters) + !String.IsEqual(ListItem(5).DBType,album) + !String.IsEqual(ListItem(5).DBType,song)">$INFO[ListItem(5).Art(fanart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.keyart)) + Skin.String(Widget8_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(5).Art(tvshow.keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(keyart)) + Skin.String(Widget8_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(5).Art(keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.poster)) + Skin.String(Widget8_Display,Posters)">$INFO[ListItem(5).Art(tvshow.poster)]</value>
@@ -816,8 +869,11 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Icon)">$INFO[ListItem(5).Icon]</value>
 	</variable>
 	<variable name="Widget8_Thumbnail(6)Content">
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(thumb)) + Skin.HasSetting(Widget8_Content_Custom) + [Skin.String(Widget8_Display,Fanart) | Skin.String(Widget8_Display,Spotlight)] + [String.IsEqual(Container.ListItemNoWrap(6).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(6).DBType,episode)] + Skin.HasSetting(Widget8_Episode_Thumbs)">$INFO[ListItem(6).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.square)) + Skin.String(Widget8_Display,Square)">$INFO[ListItem(6).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(square)) + Skin.String(Widget8_Display,Square)">$INFO[ListItem(6).Art(square)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.fanart)) + !Skin.String(Widget8_Display,Posters)">$INFO[ListItem(6).Art(tvshow.fanart)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(fanart)) + !Skin.String(Widget8_Display,Posters) + !String.IsEqual(ListItem(6).DBType,album) + !String.IsEqual(ListItem(6).DBType,song)">$INFO[ListItem(6).Art(fanart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.keyart)) + Skin.String(Widget8_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(6).Art(tvshow.keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(keyart)) + Skin.String(Widget8_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(6).Art(keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.poster)) + Skin.String(Widget8_Display,Posters)">$INFO[ListItem(6).Art(tvshow.poster)]</value>
@@ -899,6 +955,7 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(3).Icon)">$INFO[ListItem(3).Icon]</value>
 	</variable>
 	<variable name="Widget9_Thumbnail(4)Content">
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(thumb)) + Skin.HasSetting(Widget9_Content_Custom) + [Skin.String(Widget9_Display,Fanart) | Skin.String(Widget9_Display,Spotlight)] + [String.IsEqual(Container.ListItemNoWrap(4).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(4).DBType,episode)] + Skin.HasSetting(Widget9_Episode_Thumbs)">$INFO[ListItem(4).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(tvshow.square)) + Skin.String(Widget9_Display,Square)">$INFO[ListItem(4).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(square)) + Skin.String(Widget9_Display,Square)">$INFO[ListItem(4).Art(square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Art(tvshow.fanart)) + !Skin.String(Widget9_Display,Posters)">$INFO[ListItem(4).Art(tvshow.fanart)]</value>
@@ -910,8 +967,11 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(4).Icon)">$INFO[ListItem(4).Icon]</value>
 	</variable>
 	<variable name="Widget9_Thumbnail(5)Content">
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(thumb)) + Skin.HasSetting(Widget9_Content_Custom) + [Skin.String(Widget9_Display,Fanart) | Skin.String(Widget9_Display,Spotlight)] + [String.IsEqual(Container.ListItemNoWrap(5).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(5).DBType,episode)] + Skin.HasSetting(Widget9_Episode_Thumbs)">$INFO[ListItem(5).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.square)) + Skin.String(Widget9_Display,Square)">$INFO[ListItem(5).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(square)) + Skin.String(Widget9_Display,Square)">$INFO[ListItem(5).Art(square)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.fanart)) + !Skin.String(Widget9_Display,Posters)">$INFO[ListItem(5).Art(tvshow.fanart)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(fanart)) + !Skin.String(Widget9_Display,Posters) + !String.IsEqual(ListItem(5).DBType,album) + !String.IsEqual(ListItem(5).DBType,song)">$INFO[ListItem(5).Art(fanart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.keyart)) + Skin.String(Widget9_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(5).Art(tvshow.keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(keyart)) + Skin.String(Widget9_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(5).Art(keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Art(tvshow.poster)) + Skin.String(Widget9_Display,Posters)">$INFO[ListItem(5).Art(tvshow.poster)]</value>
@@ -919,8 +979,11 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(5).Icon)">$INFO[ListItem(5).Icon]</value>
 	</variable>
 	<variable name="Widget9_Thumbnail(6)Content">
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(thumb)) + Skin.HasSetting(Widget9_Content_Custom) + [Skin.String(Widget9_Display,Fanart) | Skin.String(Widget9_Display,Spotlight)] + [String.IsEqual(Container.ListItemNoWrap(6).DBType,episode) | String.IsEqual(Container.ListItemNoWrap(6).DBType,episode)] + Skin.HasSetting(Widget9_Episode_Thumbs)">$INFO[ListItem(6).Art(thumb)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.square)) + Skin.String(Widget9_Display,Square)">$INFO[ListItem(6).Art(tvshow.square)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(square)) + Skin.String(Widget9_Display,Square)">$INFO[ListItem(6).Art(square)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.fanart)) + !Skin.String(Widget9_Display,Posters)">$INFO[ListItem(6).Art(tvshow.fanart)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(fanart)) + !Skin.String(Widget9_Display,Posters) + !String.IsEqual(ListItem(6).DBType,album) + !String.IsEqual(ListItem(6).DBType,song)">$INFO[ListItem(6).Art(fanart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.keyart)) + Skin.String(Widget9_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(6).Art(tvshow.keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(keyart)) + Skin.String(Widget9_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(6).Art(keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(6).Art(tvshow.poster)) + Skin.String(Widget9_Display,Posters)">$INFO[ListItem(6).Art(tvshow.poster)]</value>
diff --git a/16x9/Viewtype_501_Billboard.xml b/16x9/Viewtype_501_Billboard.xml
index 4b654e8b..9e974b29 100644
--- a/16x9/Viewtype_501_Billboard.xml
+++ b/16x9/Viewtype_501_Billboard.xml
@@ -24,6 +24,7 @@
 			<include content="Viewtype_Display_Template">
 				<param name="viewtype_label" value="Billboard" />
 				<param name="media_view" value="$PARAM[media_view]" />
+				<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
 				<include content="BillboardView_Art_Fanart">
 					<param name="target_id" value="$PARAM[id]" />
 					<param name="art_icon" value="$PARAM[art_icon]" />
diff --git a/16x9/Viewtype_502_Showcase.xml b/16x9/Viewtype_502_Showcase.xml
index 6c76b1e9..bc3de800 100644
--- a/16x9/Viewtype_502_Showcase.xml
+++ b/16x9/Viewtype_502_Showcase.xml
@@ -27,6 +27,7 @@
 				<param name="visible" value="!Window.IsVisible(selectvideoversion)" />
 				<param name="media_view" value="$PARAM[media_view]" />
 				<animation effect="slide" start="0,0" end="360,0" time="0" reversible="true" condition="$PARAM[media_view] + $EXP[ShowcaseView_Display_IsPosters] + !$EXP[ShowcaseView_Details_Off] + $EXP[Music_Player_IsVisible]">Conditional</animation>
+				<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
 				<include content="ShowcaseView_Art_Posters" condition="[$PARAM[media_view] + !Window.Is(addonbrowser)] | [$PARAM[widget_view] + !Skin.String(Widget$PARAM[widget_position]_Display,Square)]">
 					<param name="target_id" value="$PARAM[id]" />
 					<param name="art_icon" value="$PARAM[art_icon]" />
diff --git a/16x9/Viewtype_504_Strip.xml b/16x9/Viewtype_504_Strip.xml
index dce59ac8..78fd25ae 100644
--- a/16x9/Viewtype_504_Strip.xml
+++ b/16x9/Viewtype_504_Strip.xml
@@ -26,6 +26,7 @@
 				<param name="viewtype_label" value="Strip" />
 				<param name="visible" value="!Window.IsVisible(selectvideoversion)" />
 				<param name="media_view" value="$PARAM[media_view]" />
+				<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
 				<include content="StripView_Art_Posters" condition="[$PARAM[media_view] + !Window.Is(addonbrowser)] | [$PARAM[widget_view] + !Skin.String(Widget$PARAM[widget_position]_Display,Fanart) + !Skin.String(Widget$PARAM[widget_position]_Display,Square)]">
 					<param name="target_id" value="$PARAM[id]" />
 					<param name="art_icon" value="$PARAM[art_icon]" />
diff --git a/16x9/Viewtype_505_Grid.xml b/16x9/Viewtype_505_Grid.xml
index 3764fab1..863c28cf 100644
--- a/16x9/Viewtype_505_Grid.xml
+++ b/16x9/Viewtype_505_Grid.xml
@@ -170,7 +170,7 @@
 					<animation effect="slide" start="0" end="0,690" time="0" condition="String.IsEqual(Control.GetLabel(620$PARAM[widget_position]2),Square)">Conditional</animation>
 					<animation effect="slide" start="0" end="0,690" time="0" condition="Window.Is(home) + Skin.String(Widget$PARAM[widget_position]_Display,Square)">Conditional</animation>
 				</include>
-				<nested />
+				<include content="GridView_Widget_Overlay" condition="Window.Is(home) + Skin.String(Widget$PARAM[widget_position]_Display,Spotlight)" />
 			</include>
 		</definition>
 	</include>
diff --git a/README.md b/README.md
index d3d1b649..ead7ad99 100644
--- a/README.md
+++ b/README.md
@@ -26,6 +26,12 @@ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisc
 - Improved tvguide window
 - Fixed issue with path tracer when navigating from one infoscreen widget to a new infoscreen. On pressing back, instead of going to the back to the previous infoscreen, Copacetic was closing all dialogs and the main lists were remaining hidden.
 - Staying idle on global search home button will now trigger screensaver if it is active
+- Added landscape to movieartwhitelist/tvshowartwhitelist recommended settings
+- Added support for landscape artwork across all fanart views and widgets
+- Added ability to prefer keyart and lanscape art on a per view / per widget basis
+- Added ability to enable trailer autoplay on a per widget basis
+- Added optional autoscroll to each widget, which can be combined with trailer autoplay to create a playlist of trailers
+- 
 
 **1.3.4**
 - fix for globalsearch scrollbar colour
diff --git a/addon.xml b/addon.xml
index fad94f36..6edf5771 100644
--- a/addon.xml
+++ b/addon.xml
@@ -7,7 +7,7 @@
 		<import addon="script.skinshortcuts" version="1.1.5" />
 		<import addon="service.upnext" version="1.1.9+MATRIX.1" />
 	</requires>
-	<extension point="xbmc.gui.skin" defaultthemename="Textures.xbt" effectslowdown="0.7" debugging="false">
+	<extension point="xbmc.gui.skin" defaultthemename="Textures.xbt" effectslowdown="0.7" debugging="true">
 		<res width="1920" height="1080" aspect="16:9" default="true" folder="16x9" />
 	</extension>
 	<extension point="xbmc.addon.metadata">
diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
index 9cbd9fb9..4d875156 100644
--- a/language/resource.language.en_gb/strings.po
+++ b/language/resource.language.en_gb/strings.po
@@ -961,10 +961,46 @@ msgctxt "#31489"
 msgid "Configure widgets"
 msgstr ""
 
+#: NEW
+#/16x9/Content_Settings.xml
+msgctxt "#31496"
+msgid "Spotlight content with auto scroll"
+msgstr ""
+
+#: NEW
+#/16x9/Content_Settings.xml
+msgctxt "#31596"
+msgid "Widget will move forward one place every 10 seconds while system is idle. When combined with trailer autoplay option below to allow for each item's trailer to be played automatically as soon as the previous trailer is finished while system is idle."
+msgstr ""
+
+#: NEW
+#/16x9/Content_Settings.xml
+msgctxt "#31498"
+msgid "Prefer keyart for poster views"
+msgstr ""
+
+#: NEW
+#/16x9/Content_Settings.xml
+msgctxt "#31598"
+msgid "'Keyart' is a custom art type. To ensure it is fetched locally or remotely by scrapers, make sure 'keyart' is included in your art type whitelists for movies and / or tv shows. You can do this by choosing 'Recommended Kodi Settings' under Copacetic > General, or by navigating to Settings > Media > Videos > Artwork."
+msgstr ""
+
+#: NEW
+#/16x9/Content_Settings.xml
+msgctxt "#31499"
+msgid "Prefer landscape art for fanart views"
+msgstr ""
+
+#: NEW
+#/16x9/Content_Settings.xml
+msgctxt "#31599"
+msgid "'Landscape' is a custom art type. To ensure it is fetched locally or remotely by scrapers, make sure 'landscape' is included in your art type whitelists for movies and / or tv shows. You can do this by choosing 'Recommended Kodi Settings' under Copacetic > General, or by navigating to Settings > Media > Videos > Artwork."
+msgstr ""
+
 #: NEW
 #/16x9/Content_Settings.xml
 msgctxt "#31477"
-msgid "Prefer thumbnails for episodes instead of show fanart"
+msgid "Prefer thumbnails for episodes instead of tv show fanart"
 msgstr ""
 
 
@@ -1246,12 +1282,12 @@ msgstr ""
 
 #/16x9/Content_Settings.xml
 msgctxt "#31467"
-msgid "Play trailers for home widget movies and tv shows"
+msgid "Automatically play trailers for movies or tv shows in this widget"
 msgstr ""
 
 #/16x9/Content_Settings.xml
 msgctxt "#31567"
-msgid "Trailers will be played back automatically from any widgets showing movies or tv shows. Trailers cannot be played back from episodes currently."
+msgid "Trailers will be played back automatically from any widgets showing movies or tv shows. Enable 'Spotlight content with auto scroll' option above to create a dynamic playlist of trailers for all items in the widget. Set delay in seconds before trailer playback starts under Extras > Trailer autoplay"
 msgstr ""
 
 #/16x9/Content_Settings.xml