diff --git a/16x9/Components_Viewtypes.xml b/16x9/Components_Viewtypes.xml
index 2faededa..8dc59fa8 100644
--- a/16x9/Components_Viewtypes.xml
+++ b/16x9/Components_Viewtypes.xml
@@ -59,6 +59,8 @@
 				<onfocus condition="Skin.HasSetting(Multiart_Slideshow) + String.IsEqual(Control.GetLabel(6400),tvshow.fanart) + !String.IsEmpty(ListItem.Art(tvshow.fanart))">SetProperty(Multiart_0,$ESCINFO[Container.ListItem.Art(tvshow.fanart)],home)</onfocus>
 				<onfocus condition="Skin.HasSetting(Multiart_Slideshow) + String.IsEqual(Control.GetLabel(6400),tvshow.square) + !String.IsEmpty(ListItem.Art(tvshow.square))">SetProperty(Multiart_0,$ESCINFO[Container.ListItem.Art(tvshow.square)],home)</onfocus>
 				<!-- Trailer Autoplay -->
+				<onunfocus condition="Skin.TimerIsRunning(trailer_autoplay)">Skin.TimerStop(trailer_autoplay)</onunfocus>
+				<onunfocus condition="Skin.TimerIsRunning(trailer_autoplay_home)">Skin.TimerStop(trailer_autoplay_home)</onunfocus>
 				<onunfocus condition="String.IsEqual(Window(home).Property(Trailer_Autoplay),true) + Player.HasVideo">PlayerControl(Stop)</onunfocus>
 				<onunfocus condition="String.IsEqual(Window(home).Property(Trailer_Autoplay),true)">ClearProperty(Trailer_Autoplay,home)</onunfocus>
 				<!-- Settings transition from addonbrowser -->
diff --git a/16x9/Custom_1102_Window_IsVideos.xml b/16x9/Custom_1102_Window_IsVideos.xml
deleted file mode 100644
index 2e20c0d0..00000000
--- a/16x9/Custom_1102_Window_IsVideos.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<window type="dialog" id="1102">
-	<visible>!Window.IsVisible(videos)</visible>
-	<animation effect="fade" start="100" end="0" time="4000">WindowClose</animation>
-	<zorder>0</zorder>
-	<controls/>
-</window>
diff --git a/16x9/Home.xml b/16x9/Home.xml
index dc168ac0..2f845eec 100644
--- a/16x9/Home.xml
+++ b/16x9/Home.xml
@@ -82,5 +82,12 @@
 				<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
 			</include>
 		</control>
+		<control type="image">
+			<texture>views/white_100.png</texture>
+			<right>0</right>
+			<height>90</height>
+			<width>90</width>
+			<visible>[[!Skin.HasSetting(Widget1_Trailer_Autoplay) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight),8) + System.IdleTime(8)] | [Skin.HasSetting(Widget1_Trailer_Autoplay) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight),2) + Skin.TimerIsRunning(trailer_autoplay_home) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(trailer_autoplay_home),2)]] + !Player.HasVideo + !Window.IsVisible(movieinformation) + !Window.IsVisible(shutdownmenu) + !Window.IsVisible(busydialog)</visible>
+		</control>
 	</controls>
 </window>
\ No newline at end of file
diff --git a/16x9/Timers.xml b/16x9/Timers.xml
index fe7b91f8..08d0640b 100644
--- a/16x9/Timers.xml
+++ b/16x9/Timers.xml
@@ -39,8 +39,9 @@
   </timer>
   <timer>
     <name>trailer_autoplay</name>
-    <start reset="true">Window.Is(videos) + Skin.HasSetting(Trailer_Autoplay) + [[Skin.String(Trailer_Autoplay_Movies_Enabled,true) + Container.Content(movies)] | [Skin.String(Trailer_Autoplay_TVShows_Enabled,true) + !Container.Content(movies)]]  + !Window.IsVisible(1102) + String.IsEmpty(Window(home).Property(Trailer_Autoplay)) + !Player.HasMedia + Window.IsVisible(1160)</start>
-    <stop>String.IsEmpty(Window(home).Property(Trailer_Autoplay)) + !Player.HasVideo</stop>
+    <start reset="true">Window.Is(videos) + Skin.HasSetting(Trailer_Autoplay) + [[Skin.String(Trailer_Autoplay_Movies_Enabled,true) + Container.Content(movies)] | [Skin.String(Trailer_Autoplay_TVShows_Enabled,true) + !Container.Content(tvshows)]] + Window.IsVisible(1160) + !Player.HasMedia</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(50) | Control.HasFocus(501) | Control.HasFocus(502) | Control.HasFocus(504)] + !String.IsEmpty(ListItem.Trailer)">SetProperty(Trailer_Autoplay,true,home)</onstart>
     <onstart condition="[Control.HasFocus(50) | Control.HasFocus(501) | Control.HasFocus(502) | Control.HasFocus(504)] + !String.IsEmpty(ListItem.Trailer)">PlayMedia($ESCINFO[ListItem.Trailer],1,noresume)</onstart>
     <onstart condition="Control.HasFocus(3100) + !String.IsEmpty(Container(3100).ListItem.Trailer)">SetProperty(Trailer_Autoplay,true,home)</onstart>
@@ -49,39 +50,97 @@
   <timer>
     <name>trailer_autoplay_home</name>
     <start reset="true">Window.Is(home) + Skin.HasSetting(Trailer_Autoplay) + !String.IsEmpty(window(home).property(Home_Widget)) + Window.IsVisible(1160) + !Player.HasMedia</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) + !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">[Skin.HasSetting(Widget1_AutoScroll) + Control.HasFocus(3201)] | [Skin.HasSetting(Widget2_AutoScroll) + Control.HasFocus(3202)] | [Skin.HasSetting(Widget3_AutoScroll) + Control.HasFocus(3203)] | [Skin.HasSetting(Widget4_AutoScroll) + Control.HasFocus(3204)] | [Skin.HasSetting(Widget5_AutoScroll) + Control.HasFocus(3205)] | [Skin.HasSetting(Widget6_AutoScroll) + Control.HasFocus(3206)] | [Skin.HasSetting(Widget7_AutoScroll) + Control.HasFocus(3207)] | [Skin.HasSetting(Widget8_AutoScroll) + Control.HasFocus(3208)] | [Skin.HasSetting(Widget9_AutoScroll) + Control.HasFocus(3209)]</start>
+    <onstart condition="Control.HasFocus(3201) + Skin.HasSetting(Widget1_Trailer_Autoplay) + !String.IsEmpty(ListItem.Trailer)">SetProperty(Trailer_Autoplay,true,home)</onstart>
+    <onstart condition="Control.HasFocus(3201) + Skin.HasSetting(Widget1_Trailer_Autoplay) + !String.IsEmpty(ListItem.Trailer)">PlayMedia($ESCINFO[ListItem.Trailer],1,noresume)</onstart>
+    <onstart condition="Control.HasFocus(3202) + Skin.HasSetting(Widget2_Trailer_Autoplay) + !String.IsEmpty(ListItem.Trailer)">SetProperty(Trailer_Autoplay,true,home)</onstart>
+    <onstart condition="Control.HasFocus(3202) + Skin.HasSetting(Widget2_Trailer_Autoplay) + !String.IsEmpty(ListItem.Trailer)">PlayMedia($ESCINFO[ListItem.Trailer],1,noresume)</onstart>
+    <onstart condition="Control.HasFocus(3203) + Skin.HasSetting(Widget3_Trailer_Autoplay) + !String.IsEmpty(ListItem.Trailer)">SetProperty(Trailer_Autoplay,true,home)</onstart>
+    <onstart condition="Control.HasFocus(3203) + Skin.HasSetting(Widget3_Trailer_Autoplay) + !String.IsEmpty(ListItem.Trailer)">PlayMedia($ESCINFO[ListItem.Trailer],1,noresume)</onstart>
+    <onstart condition="Control.HasFocus(3204) + Skin.HasSetting(Widget4_Trailer_Autoplay) + !String.IsEmpty(ListItem.Trailer)">SetProperty(Trailer_Autoplay,true,home)</onstart>
+    <onstart condition="Control.HasFocus(3204) + Skin.HasSetting(Widget4_Trailer_Autoplay) + !String.IsEmpty(ListItem.Trailer)">PlayMedia($ESCINFO[ListItem.Trailer],1,noresume)</onstart>
+    <onstart condition="Control.HasFocus(3205) + Skin.HasSetting(Widget5_Trailer_Autoplay) + !String.IsEmpty(ListItem.Trailer)">SetProperty(Trailer_Autoplay,true,home)</onstart>
+    <onstart condition="Control.HasFocus(3205) + Skin.HasSetting(Widget5_Trailer_Autoplay) + !String.IsEmpty(ListItem.Trailer)">PlayMedia($ESCINFO[ListItem.Trailer],1,noresume)</onstart>
+    <onstart condition="Control.HasFocus(3206) + Skin.HasSetting(Widget6_Trailer_Autoplay) + !String.IsEmpty(ListItem.Trailer)">SetProperty(Trailer_Autoplay,true,home)</onstart>
+    <onstart condition="Control.HasFocus(3206) + Skin.HasSetting(Widget6_Trailer_Autoplay) + !String.IsEmpty(ListItem.Trailer)">PlayMedia($ESCINFO[ListItem.Trailer],1,noresume)</onstart>
+    <onstart condition="Control.HasFocus(3207) + Skin.HasSetting(Widget7_Trailer_Autoplay) + !String.IsEmpty(ListItem.Trailer)">SetProperty(Trailer_Autoplay,true,home)</onstart>
+    <onstart condition="Control.HasFocus(3207) + Skin.HasSetting(Widget7_Trailer_Autoplay) + !String.IsEmpty(ListItem.Trailer)">PlayMedia($ESCINFO[ListItem.Trailer],1,noresume)</onstart>
+    <onstart condition="Control.HasFocus(3208) + Skin.HasSetting(Widget8_Trailer_Autoplay) + !String.IsEmpty(ListItem.Trailer)">SetProperty(Trailer_Autoplay,true,home)</onstart>
+    <onstart condition="Control.HasFocus(3208) + Skin.HasSetting(Widget8_Trailer_Autoplay) + !String.IsEmpty(ListItem.Trailer)">PlayMedia($ESCINFO[ListItem.Trailer],1,noresume)</onstart>
+    <onstart condition="Control.HasFocus(3209) + Skin.HasSetting(Widget9_Trailer_Autoplay) + !String.IsEmpty(ListItem.Trailer)">SetProperty(Trailer_Autoplay,true,home)</onstart>
+    <onstart condition="Control.HasFocus(3209) + Skin.HasSetting(Widget9_Trailer_Autoplay) + !String.IsEmpty(ListItem.Trailer)">PlayMedia($ESCINFO[ListItem.Trailer],1,noresume)</onstart>
+  </timer>
+  <timer>
+    <name>widget_spotlight_3201</name>
+    <start reset="true">Window.Is(home) + Skin.HasSetting(Widget1_AutoScroll) + Control.HasFocus(3201)</start>
     <reset>Player.HasVideo | Window.IsVisible(movieinformation) | Window.IsVisible(shutdownmenu) | Window.IsVisible(busydialog)</reset>
-    <stop>[[!Skin.HasSetting(Widget1_Trailer_Autoplay) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight),8) + System.IdleTime(8)] | [Skin.HasSetting(Widget1_Trailer_Autoplay) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight),2) + System.IdleTime(2) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(trailer_autoplay_home),2)]] + !Window.IsVisible(movieinformation) + !Player.HasVideo + !Window.IsVisible(shutdownmenu) + !Window.IsVisible(busydialog)</stop>
+    <stop>[[!Skin.HasSetting(Widget1_Trailer_Autoplay) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight_3201),8) + System.IdleTime(8)] | [Skin.HasSetting(Widget1_Trailer_Autoplay) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight_3201),2) + Skin.TimerIsRunning(trailer_autoplay_home) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(trailer_autoplay_home),2)]] + !Player.HasVideo + !Window.IsVisible(movieinformation) + !Window.IsVisible(shutdownmenu) + !Window.IsVisible(busydialog)</stop>
     <onstop condition="Skin.HasSetting(Widget1_Trailer_Autoplay) + String.IsEqual(Window(home).Property(Trailer_Autoplay),true)">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>Control.Move(3201,1)</onstop>
+  </timer>
+  <timer>
+    <name>widget_spotlight_3202</name>
+    <start reset="true">Window.Is(home) + Skin.HasSetting(Widget2_AutoScroll) + Control.HasFocus(3202)</start>
+    <reset>Player.HasVideo | Window.IsVisible(movieinformation) | Window.IsVisible(shutdownmenu) | Window.IsVisible(busydialog)</reset>
+    <stop>[[!Skin.HasSetting(Widget2_Trailer_Autoplay) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight_3202),8) + System.IdleTime(8)] | [Skin.HasSetting(Widget2_Trailer_Autoplay) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight_3202),2) + Skin.TimerIsRunning(trailer_autoplay_home) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(trailer_autoplay_home),2)]] + !Player.HasVideo + !Window.IsVisible(movieinformation) + !Window.IsVisible(shutdownmenu) + !Window.IsVisible(busydialog)</stop>
+    <onstop condition="Skin.HasSetting(Widget2_Trailer_Autoplay) + String.IsEqual(Window(home).Property(Trailer_Autoplay),true)">ClearProperty(Trailer_Autoplay,home)</onstop>
+    <onstop>Control.Move(3202,1)</onstop>
+  </timer>
+  <timer>
+    <name>widget_spotlight_3203</name>
+    <start reset="true">Window.Is(home) + Skin.HasSetting(Widget3_AutoScroll) + Control.HasFocus(3203)</start>
+    <reset>Player.HasVideo | Window.IsVisible(movieinformation) | Window.IsVisible(shutdownmenu) | Window.IsVisible(busydialog)</reset>
+    <stop>[[!Skin.HasSetting(Widget3_Trailer_Autoplay) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight_3203),8) + System.IdleTime(8)] | [Skin.HasSetting(Widget3_Trailer_Autoplay) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight_3203),2) + Skin.TimerIsRunning(trailer_autoplay_home) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(trailer_autoplay_home),2)]] + !Player.HasVideo + !Window.IsVisible(movieinformation) + !Window.IsVisible(shutdownmenu) + !Window.IsVisible(busydialog)</stop>
+    <onstop condition="Skin.HasSetting(Widget3_Trailer_Autoplay) + String.IsEqual(Window(home).Property(Trailer_Autoplay),true)">ClearProperty(Trailer_Autoplay,home)</onstop>
+    <onstop>Control.Move(3203,1)</onstop>
+  </timer>
+  <timer>
+    <name>widget_spotlight_3204</name>
+    <start reset="true">Window.Is(home) + Skin.HasSetting(Widget4_AutoScroll) + Control.HasFocus(3204)</start>
+    <reset>Player.HasVideo | Window.IsVisible(movieinformation) | Window.IsVisible(shutdownmenu) | Window.IsVisible(busydialog)</reset>
+    <stop>[[!Skin.HasSetting(Widget4_Trailer_Autoplay) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight_3204),8) + System.IdleTime(8)] | [Skin.HasSetting(Widget4_Trailer_Autoplay) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight_3204),2) + Skin.TimerIsRunning(trailer_autoplay_home) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(trailer_autoplay_home),2)]] + !Player.HasVideo + !Window.IsVisible(movieinformation) + !Window.IsVisible(shutdownmenu) + !Window.IsVisible(busydialog)</stop>
+    <onstop condition="Skin.HasSetting(Widget4_Trailer_Autoplay) + String.IsEqual(Window(home).Property(Trailer_Autoplay),true)">ClearProperty(Trailer_Autoplay,home)</onstop>
+    <onstop>Control.Move(3204,1)</onstop>
+  </timer>
+  <timer>
+    <name>widget_spotlight_3205</name>
+    <start reset="true">Window.Is(home) + Skin.HasSetting(Widget5_AutoScroll) + Control.HasFocus(3205)</start>
+    <reset>Player.HasVideo | Window.IsVisible(movieinformation) | Window.IsVisible(shutdownmenu) | Window.IsVisible(busydialog)</reset>
+    <stop>[[!Skin.HasSetting(Widget5_Trailer_Autoplay) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight_3205),8) + System.IdleTime(8)] | [Skin.HasSetting(Widget5_Trailer_Autoplay) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight_3205),2) + Skin.TimerIsRunning(trailer_autoplay_home) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(trailer_autoplay_home),2)]] + !Player.HasVideo + !Window.IsVisible(movieinformation) + !Window.IsVisible(shutdownmenu) + !Window.IsVisible(busydialog)</stop>
+    <onstop condition="Skin.HasSetting(Widget5_Trailer_Autoplay) + String.IsEqual(Window(home).Property(Trailer_Autoplay),true)">ClearProperty(Trailer_Autoplay,home)</onstop>
+    <onstop>Control.Move(3205,1)</onstop>
+  </timer>
+  <timer>
+    <name>widget_spotlight_3206</name>
+    <start reset="true">Window.Is(home) + Skin.HasSetting(Widget6_AutoScroll) + Control.HasFocus(3206)</start>
+    <reset>Player.HasVideo | Window.IsVisible(movieinformation) | Window.IsVisible(shutdownmenu) | Window.IsVisible(busydialog)</reset>
+    <stop>[[!Skin.HasSetting(Widget6_Trailer_Autoplay) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight_3206),8) + System.IdleTime(8)] | [Skin.HasSetting(Widget6_Trailer_Autoplay) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight_3206),2) + Skin.TimerIsRunning(trailer_autoplay_home) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(trailer_autoplay_home),2)]] + !Player.HasVideo + !Window.IsVisible(movieinformation) + !Window.IsVisible(shutdownmenu) + !Window.IsVisible(busydialog)</stop>
+    <onstop condition="Skin.HasSetting(Widget6_Trailer_Autoplay) + String.IsEqual(Window(home).Property(Trailer_Autoplay),true)">ClearProperty(Trailer_Autoplay,home)</onstop>
+    <onstop>Control.Move(3206,1)</onstop>
+  </timer>
+  <timer>
+    <name>widget_spotlight_3207</name>
+    <start reset="true">Window.Is(home) + Skin.HasSetting(Widget7_AutoScroll) + Control.HasFocus(3207)</start>
+    <reset>Player.HasVideo | Window.IsVisible(movieinformation) | Window.IsVisible(shutdownmenu) | Window.IsVisible(busydialog)</reset>
+    <stop>[[!Skin.HasSetting(Widget7_Trailer_Autoplay) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight_3207),8) + System.IdleTime(8)] | [Skin.HasSetting(Widget7_Trailer_Autoplay) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight_3207),2) + Skin.TimerIsRunning(trailer_autoplay_home) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(trailer_autoplay_home),2)]] + !Player.HasVideo + !Window.IsVisible(movieinformation) + !Window.IsVisible(shutdownmenu) + !Window.IsVisible(busydialog)</stop>
+    <onstop condition="Skin.HasSetting(Widget7_Trailer_Autoplay) + String.IsEqual(Window(home).Property(Trailer_Autoplay),true)">ClearProperty(Trailer_Autoplay,home)</onstop>
+    <onstop>Control.Move(3207,1)</onstop>
+  </timer>
+  <timer>
+    <name>widget_spotlight_3208</name>
+    <start reset="true">Window.Is(home) + Skin.HasSetting(Widget8_AutoScroll) + Control.HasFocus(3208)</start>
+    <reset>Player.HasVideo | Window.IsVisible(movieinformation) | Window.IsVisible(shutdownmenu) | Window.IsVisible(busydialog)</reset>
+    <stop>[[!Skin.HasSetting(Widget8_Trailer_Autoplay) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight_3208),8) + System.IdleTime(8)] | [Skin.HasSetting(Widget8_Trailer_Autoplay) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight_3208),2) + Skin.TimerIsRunning(trailer_autoplay_home) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(trailer_autoplay_home),2)]] + !Player.HasVideo + !Window.IsVisible(movieinformation) + !Window.IsVisible(shutdownmenu) + !Window.IsVisible(busydialog)</stop>
+    <onstop condition="Skin.HasSetting(Widget8_Trailer_Autoplay) + String.IsEqual(Window(home).Property(Trailer_Autoplay),true)">ClearProperty(Trailer_Autoplay,home)</onstop>
+    <onstop>Control.Move(3208,1)</onstop>
+  </timer>
+  <timer>
+    <name>widget_spotlight_3209</name>
+    <start reset="true">Window.Is(home) + Skin.HasSetting(Widget9_AutoScroll) + Control.HasFocus(3209)</start>
+    <reset>Player.HasVideo | Window.IsVisible(movieinformation) | Window.IsVisible(shutdownmenu) | Window.IsVisible(busydialog)</reset>
+    <stop>[[!Skin.HasSetting(Widget9_Trailer_Autoplay) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight_3209),8) + System.IdleTime(8)] | [Skin.HasSetting(Widget9_Trailer_Autoplay) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight_3209),2) + Skin.TimerIsRunning(trailer_autoplay_home) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(trailer_autoplay_home),2)]] + !Player.HasVideo + !Window.IsVisible(movieinformation) + !Window.IsVisible(shutdownmenu) + !Window.IsVisible(busydialog)</stop>
+    <onstop condition="Skin.HasSetting(Widget9_Trailer_Autoplay) + String.IsEqual(Window(home).Property(Trailer_Autoplay),true)">ClearProperty(Trailer_Autoplay,home)</onstop>
+    <onstop>Control.Move(3209,1)</onstop>
   </timer>
 </timers>
diff --git a/README.md b/README.md
index a8ce5b27..5abdab81 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,9 @@ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisc
 
 ### Changelog
 ---
+**1.3.7**
+- Further refinement of auto scroll/play timers
+
 **1.3.6**
 - Fix for preventing widgets from auto-playing trailers when auto-scroll also enabled
 
diff --git a/addon.xml b/addon.xml
index 652a25ba..34fa727d 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.copacetic" version="1.3.6" name="Copacetic" provider-name="realcopacetic">
+<addon id="skin.copacetic" version="1.3.7" name="Copacetic" provider-name="realcopacetic">
 	<requires>
 		<import addon="xbmc.gui" version="5.17.0" />
 		<import addon="script.copacetic.helper" version="1.0.12" />