diff --git a/16x9/Custom_1140_Widget_Settings.xml b/16x9/Custom_1140_Widget_Settings.xml
index dacb4767..573fc27c 100644
--- a/16x9/Custom_1140_Widget_Settings.xml
+++ b/16x9/Custom_1140_Widget_Settings.xml
@@ -3,7 +3,7 @@
 <window type="dialog" id="1140">
 	<defaultcontrol always="true">3200</defaultcontrol>
 	<controls>
-		<include content="Default_Settings_Panel_Layout">
+		<include content="Default_Dialog_Panel_Layout">
 			<param name="visible" value="!Window.IsVisible(shutdownmenu) + !Window.IsVisible(selectdialog) + !String.Contains(Window(home).Property(SelectDialog),Active) + !Window.IsVisible(virtualkeyboard)" />
 			<param name="left_list_id" value="3200" />
 			<param name="right_list_id" value="3201" />
diff --git a/16x9/Expressions.xml b/16x9/Expressions.xml
index 9cf16cda..0ced86b1 100644
--- a/16x9/Expressions.xml
+++ b/16x9/Expressions.xml
@@ -30,7 +30,7 @@
 	<expression name="Background_FadeOut_Exceptions_musicplaylist">[$EXP[Background_FadeOut_Exceptions] + Skin.String(Background_Slideshow,Artists)] | Window.Next(music)</expression>
 	<!-- children -->
 	<expression name="Window.Previous(addonbrowser)">Window.Previous(addonbrowser) + String.IsEmpty(Window(home).Property(Container_Addons_NonRepo))</expression>
-	<expression name="Window.Previous(all_settings_windows)">[Window.Previous(skinsettings) + !Window.IsVisible(1140)] | Window.Previous(interfacesettings) | Window.Previous(mediasettings) | Window.Previous(playersettings) | Window.Previous(systemsettings) | Window.Previous(servicesettings) | Window.Previous(gamesettings) | Window.Previous(pvrsettings) | Window.Previous(profiles) | Window.Previous(systeminfo) | Window.Previous(filemanager)</expression>
+	<expression name="Window.Previous(all_settings_windows)">Window.Previous(skinsettings) | Window.Previous(interfacesettings) | Window.Previous(mediasettings) | Window.Previous(playersettings) | Window.Previous(systemsettings) | Window.Previous(servicesettings) | Window.Previous(gamesettings) | Window.Previous(pvrsettings) | Window.Previous(profiles) | Window.Previous(systeminfo) | Window.Previous(filemanager)</expression>
 	<expression name="Window.Previous(home)">Window.Previous(home) + Skin.HasSetting(Home_Background_Override_Enabled) + String.IsEmpty(window(home).property(Home_Widget))</expression>
 	<expression name="Window.Previous(music)">Window.Previous(music) + Container.Content(playlists) + Skin.String(Background_Slideshow,Artists)</expression>
 	<expression name="Window.Previous(musicplaylisteditor)">Window.Previous(musicplaylisteditor) + Skin.String(Background_Slideshow,Artists)</expression>
diff --git a/16x9/Home.xml b/16x9/Home.xml
index 61bb9a36..dc168ac0 100644
--- a/16x9/Home.xml
+++ b/16x9/Home.xml
@@ -2,7 +2,7 @@
 <window>
 	<!-- home -->
 	<onload>RunScript(script.skinshortcuts,type=buildxml&amp;mainmenuID=3000&amp;group=mainmenu|shutdownmenu)</onload>
-	<onunload condition="String.IsEqual(Window(home).Property(Trailer_Autoplay),true)">PlayerControl(Stop)</onunload>
+	<onunload condition="String.IsEqual(Window(home).Property(Trailer_Autoplay),true) + Player.HasVideo">PlayerControl(Stop)</onunload>
 	<onunload condition="String.IsEqual(Window(home).Property(Trailer_Autoplay),true)">ClearProperty(Trailer_Autoplay,home)</onunload>
 	<defaultcontrol always="true">4010</defaultcontrol>
 	<backgroundcolor>$VAR[Dark_Color]</backgroundcolor>
@@ -82,9 +82,5 @@
 				<include content="Trailer_Autoplay_Fade_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
 			</include>
 		</control>
-		<control type="label">
-			<align>right</align>
-			<label>$INFO[Window(home).Property(Trailer_Autoscroll)]</label>
-		</control>
 	</controls>
 </window>
\ No newline at end of file
diff --git a/16x9/MyVideoNav.xml b/16x9/MyVideoNav.xml
index 653feba9..9d94bc95 100644
--- a/16x9/MyVideoNav.xml
+++ b/16x9/MyVideoNav.xml
@@ -4,7 +4,7 @@
 	<include content="Multiart_Reset_OnLoad" />
 	<onunload>ClearProperty(OptionsMenu,home)</onunload>
 	<onunload>ClearProperty(Scrollbars,home)</onunload>
-	<onunload condition="String.IsEqual(Window(home).Property(Trailer_Autoplay),true)">PlayerControl(Stop)</onunload>
+	<onunload condition="String.IsEqual(Window(home).Property(Trailer_Autoplay),true) + Player.HasVideo">PlayerControl(Stop)</onunload>
 	<onunload condition="String.IsEqual(Window(home).Property(Trailer_Autoplay),true)">ClearProperty(Trailer_Autoplay,home)</onunload>
 	<defaultcontrol always="true">50</defaultcontrol>
 	<menucontrol>3000</menucontrol>
diff --git a/16x9/OnLoadUnload.xml b/16x9/OnLoadUnload.xml
index 65dfc3a9..520d22f9 100644
--- a/16x9/OnLoadUnload.xml
+++ b/16x9/OnLoadUnload.xml
@@ -43,7 +43,7 @@
 	</include>
 
 	<include name="movieinformation_OnLoadUnload">
-		<onload condition="Skin.HasSetting(Trailer_Autoplay) + String.IsEqual(Window(home).Property(Trailer_Autoplay),true)">PlayerControl(Stop)</onload>
+		<onload condition="Skin.HasSetting(Trailer_Autoplay) + String.IsEqual(Window(home).Property(Trailer_Autoplay),true) + Player.HasVideo">PlayerControl(Stop)</onload>
 		<onload condition="Skin.HasSetting(Trailer_Autoplay) + String.IsEqual(Window(home).Property(Trailer_Autoplay),true)">ClearProperty(Trailer_Autoplay,home)</onload>
 		<onload condition="!String.IsEmpty(ListItem.DBID)">SetProperty(SelectedItem,$INFO[ListItem.DBID],movieinformation)</onload>
 		<onload condition="String.IsEmpty(ListItem.DBID) + !String.IsEmpty(ListItem.Property(tmdb_id))">SetProperty(SelectedItem,$INFO[ListItem.Property(tmdb_id)],movieinformation)</onload>
diff --git a/16x9/Templates_Panels.xml b/16x9/Templates_Panels.xml
index 8a821efe..4cf6a3ea 100644
--- a/16x9/Templates_Panels.xml
+++ b/16x9/Templates_Panels.xml
@@ -47,6 +47,9 @@
 
 	<include name="Default_Settings_Panel_Layout">
 		<param name="visible" default="!System.HasVisibleModalDialog" />
+		<param name="window_animation_panel" default="WindowOpenClose_Fade_Delayed_Animation" />
+		<param name="window_animation_content" default="WindowOpenClose_Fade_Delayed_Long_Animation" />
+		<param name="window_animation_condition" default="true" />
 		<param name="panel_edge_top" default="180" />
 		<param name="panel_edge_bottom" default="180" />
 		<param name="alt_right_id" default="20" />
@@ -58,7 +61,7 @@
 				<param name="top" value="$PARAM[panel_edge_top]" />
 				<param name="bottom" value="$PARAM[panel_edge_bottom]" />
 				<include content="Settings_WindowOpenClose_Fade_Delayed_Animation" />
-				<include content="Visible_Fade_Animation" />
+				<include content="Visible_Fade_Delayed_Animation" />
 			</include>
 			<control type="group">
 				<include content="Settings_WindowOpenClose_Fade_Delayed_Long_Animation" />
diff --git a/16x9/Timers.xml b/16x9/Timers.xml
index 8fc03119..fe7b91f8 100644
--- a/16x9/Timers.xml
+++ b/16x9/Timers.xml
@@ -49,7 +49,7 @@
   <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>
-    <stop>String.IsEmpty(Window(home).Property(Trailer_Autoplay)) + !Player.HasVideo</stop>
+    <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>
@@ -71,17 +71,17 @@
   </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.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight),15) + System.IdleTime(15) + String.IsEmpty(Window(home).Property(Trailer_Autoscroll))] | [Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(widget_spotlight),3) + System.IdleTime(3) + String.IsEqual(Window(home).Property(Trailer_Autoscroll),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) + 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>
+    <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>
+    <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>
+    <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>
   </timer>
 </timers>
diff --git a/16x9/Viewtype_501_Billboard.xml b/16x9/Viewtype_501_Billboard.xml
index a2d273fa..062b137f 100644
--- a/16x9/Viewtype_501_Billboard.xml
+++ b/16x9/Viewtype_501_Billboard.xml
@@ -43,11 +43,12 @@
 				<include content="Progress" condition="Window.Is(videos) | Window.Is(music) | Window.Is(home) | Window.Is(movieinformation)">
 					<param name="id" value="$PARAM[id]" />
 				</include>
-				<include content="Common_Details" />
+				<include content="Common_Details">
+					<param name="widget_clearlogos" value="$PARAM[widget_clearlogos]" />
+				</include>
 				<include content="Now_Playing_Icon" condition="Window.Is(videos) | Window.Is(music)">
 					<param name="visible" value="$EXP[ListItem(0)_NowPlaying]" />
 					<param name="color" value="$VAR[Light_Color]" />
-					<param name="widget_clearlogos" value="$PARAM[widget_clearlogos]" />
 					<animation effect="slide" end="510,450" time="0" condition="true">Conditional</animation>
 					<animation effect="slide" end="180,0" time="0" condition="!$EXP[BillboardView_Flags_Studio_IsVisible] | String.IsEqual(Control.GetLabel(6303),flags/blank.png)">Conditional</animation>
 					<animation effect="slide" end="180,0" time="0" condition="!$EXP[BillboardView_Flags_Rating_IsVisible] | String.IsEqual(Control.GetLabel(6304),flags/blank.png)">Conditional</animation>
diff --git a/16x9/Viewtype_505_Grid.xml b/16x9/Viewtype_505_Grid.xml
index bcd0c840..b408a0ad 100644
--- a/16x9/Viewtype_505_Grid.xml
+++ b/16x9/Viewtype_505_Grid.xml
@@ -36,8 +36,6 @@
 					<top>180</top>
 					<width>1920</width>
 					<height>900</height>
-					<onfocus condition="Skin.HasSetting(Trailer_Autoplay) + String.IsEqual(Window(home).Property(Trailer_Autoplay),true)">PlayerControl(Stop)</onfocus>
-					<onfocus condition="Skin.HasSetting(Trailer_Autoplay) + String.IsEqual(Window(home).Property(Trailer_Autoplay),true)">ClearProperty(Trailer_Autoplay,home)</onfocus>
 					<onfocus>ClearProperty(Widget_DBID,home)</onfocus>
 					<include content="Grid_Navigation" />
 					<pagecontrol>60</pagecontrol>
diff --git a/README.md b/README.md
index a8c56472..a8ce5b27 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.6**
+- Fix for preventing widgets from auto-playing trailers when auto-scroll also enabled
+
 **1.3.5**
 - Added visual listitem indicator for Collections (sets) and items with VideoVersions
 - Added tvchannels window
diff --git a/addon.xml b/addon.xml
index fad94f36..652a25ba 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.5" name="Copacetic" provider-name="realcopacetic">
+<addon id="skin.copacetic" version="1.3.6" name="Copacetic" provider-name="realcopacetic">
 	<requires>
 		<import addon="xbmc.gui" version="5.17.0" />
 		<import addon="script.copacetic.helper" version="1.0.12" />