diff --git a/16x9/Colors.xml b/16x9/Colors.xml
index 1f3704a6..2531ac2d 100755
--- a/16x9/Colors.xml
+++ b/16x9/Colors.xml
@@ -398,6 +398,11 @@
 		<value>$VAR[Disabled_Color]</value>
 	</variable>
 
+	<variable name="skinsettings_Background_Slideshow_Button_Textcolor">
+		<value condition="Control.HasFocus(16010) | Control.HasFocus(16011)">$VAR[Light_Color]</value>
+		<value>$VAR[Unfocused_Color]</value>
+	</variable>
+
 	<variable name="skinsettings_Background_Low_Threshold_Button_Textcolor">
 		<value condition="Control.HasFocus(10160) | Control.HasFocus(10161) | Control.HasFocus(10162)">$VAR[Light_Color]</value>
 		<value>$VAR[Unfocused_Color]</value>
@@ -406,10 +411,6 @@
 		<value condition="Control.HasFocus(10240) | Control.HasFocus(10241)">$VAR[Light_Color]</value>
 		<value>$VAR[Unfocused_Color]</value>
 	</variable>
-	<variable name="skinsettings_Background_Slideshow_Button_Textcolor">
-		<value condition="Control.HasFocus(10180) | Control.HasFocus(10181)">$VAR[Light_Color]</value>
-		<value>$VAR[Unfocused_Color]</value>
-	</variable>
 	<variable name="skinsettings_Background_Interval_Button_Textcolor">
 		<value condition="Control.HasFocus(10190) | Control.HasFocus(10191)">$VAR[Light_Color]</value>
 		<value>$VAR[Unfocused_Color]</value>
diff --git a/16x9/Components.xml b/16x9/Components.xml
index d6f6e381..e5fe1ffc 100644
--- a/16x9/Components.xml
+++ b/16x9/Components.xml
@@ -80,39 +80,6 @@
 		</definition>
 	</include>
 
-	<include name="Background_List">
-		<param name="time" default="10000" />
-		<definition>
-			<control type="list" id="3300">
-				<include content="Hidden_Control" />
-				<include content="Background_$PARAM[content_source]_Content" />
-				<autoscroll time="$PARAM[time]">true</autoscroll>
-				<itemlayout />
-				<focusedlayout />
-			</control>
-		</definition>
-	</include>
-
-	<include name="Background_List_Home">
-		<include content="Background_List">
-			<param name="content_source" value="Home" />
-			<param name="time" value="$PARAM[time]" />
-		</include>
-	</include>
-
-	<!-- <include name="Background_Backing">
-		<param name="visible" default="Skin.String(Theme,Light)" />
-		<param name="animation_delay" default="1800" />
-		<param name="color_diffuse" default="$VAR[Dark_Color]" />
-		<definition>
-			<control type="image">
-				<visible>$PARAM[visible]</visible>
-				<animation effect="fade" start="0" end="100" time="360" delay="$PARAM[animation_delay]" tween="sine" easing="inout" reversible="true">Visible</animation>
-				<texture colordiffuse="$PARAM[color_diffuse]">views/white_100.png</texture>
-			</control>
-		</definition>
-	</include> -->
-
 	<include name="Background_Multiart">
 		<param name="time" default="10000" />
 		<param name="fadein_animation_condition" default="true" />
@@ -136,6 +103,54 @@
 		</definition>
 	</include>
 
+	<include name="Background_Global">
+		<param name="visible" default="true" />
+		<param name="texture_path" default="$VAR[Background_Global_Texture]" />
+		<param name="fadein_animation_condition" default="true" />
+		<param name="fadeout_animation_condition" default="true" />
+		<definition>
+			<control type="group">
+				<visible>!VideoPlayer.IsFullscreen + $PARAM[visible]</visible>
+				<include content="VisibleHidden_Background_Fade_Delayed_Animation" />
+				<control type="videowindow">
+					<include content="Hidden_Control" />
+				</control>
+				<include content="Background_Multiart">
+					<param name="colordiffuse" value="$VAR[Home_Artwork_Diffuse]" />
+					<param name="texture_path" value="$PARAM[texture_path]" />
+					<param name="fadetime" value="0" />
+					<param name="fadein_animation_condition" value="$PARAM[fadein_animation_condition]" />
+					<param name="fadeout_animation_condition" value="$PARAM[fadeout_animation_condition]" />
+				</include>
+				<include content="Background_Multiart">
+					<param name="colordiffuse" value="$VAR[Home_Artwork_Diffuse]" />
+					<param name="texture_path" value="$PARAM[texture_path]" />
+					<param name="fadetime" value="360" />
+					<param name="fadein_animation_condition" value="$PARAM[fadein_animation_condition]" />
+					<param name="fadeout_animation_condition" value="$PARAM[fadeout_animation_condition]" />
+				</include>
+				<nested />
+			</control>
+		</definition>
+	</include>
+
+
+
+
+	<include name="Background_List">
+		<param name="content_source" default="Home" />
+		<param name="time" default="10000" />
+		<definition>
+			<control type="list" id="3300">
+				<include content="Hidden_Control" />
+				<include content="Background_$PARAM[content_source]_Content" />
+				<autoscroll time="$PARAM[time]">true</autoscroll>
+				<itemlayout />
+				<focusedlayout />
+			</control>
+		</definition>
+	</include>
+
 	<include name="Background_Multiart_Home">
 		<include content="Background_Multiart">
 			<param name="fadein_animation_condition" value="![Window.Previous(addonbrowser) + !String.IsEqual(Window(home).Property(Container_Addons_NonRepo),true)] + !$EXP[Settings_Previous]" />
@@ -148,22 +163,22 @@
 	</include>
 
 	<include name="Background_Home">
-		<include content="Background_List_Home" condition="Skin.String(Background_Interval,5)">
+		<include content="Background_List" condition="Skin.String(Background_Interval,5)">
 			<param name="time" value="5000" />
 		</include>
-		<include content="Background_List_Home" condition="Skin.String(Background_Interval,10) | !Skin.String(Background_Interval)">
+		<include content="Background_List" condition="Skin.String(Background_Interval,10) | !Skin.String(Background_Interval)">
 			<param name="time" value="10000" />
 		</include>
-		<include content="Background_List_Home" condition="Skin.String(Background_Interval,15)">
+		<include content="Background_List" condition="Skin.String(Background_Interval,15)">
 			<param name="time" value="15000" />
 		</include>
-		<include content="Background_List_Home" condition="Skin.String(Background_Interval,20)">
+		<include content="Background_List" condition="Skin.String(Background_Interval,20)">
 			<param name="time" value="20000" />
 		</include>
-		<include content="Background_List_Home" condition="Skin.String(Background_Interval,25)">
+		<include content="Background_List" condition="Skin.String(Background_Interval,25)">
 			<param name="time" value="25000" />
 		</include>
-		<include content="Background_List_Home" condition="Skin.String(Background_Interval,30)">
+		<include content="Background_List" condition="Skin.String(Background_Interval,30)">
 			<param name="time" value="30000" />
 		</include>
 		<control type="image">
@@ -190,36 +205,7 @@
 		</include>
 	</include>
 
-	<include name="Background_Global">
-		<param name="visible" default="true" />
-		<param name="texture_path" default="$VAR[Background_Global_Texture]" />
-		<param name="fadein_animation_condition" default="true" />
-		<param name="fadeout_animation_condition" default="true" />
-		<definition>
-			<control type="group">
-				<visible>!VideoPlayer.IsFullscreen + $PARAM[visible]</visible>
-				<include content="VisibleHidden_Background_Fade_Delayed_Animation" />
-				<control type="videowindow">
-					<include content="Hidden_Control" />
-				</control>
-				<include content="Background_Multiart">
-					<param name="colordiffuse" value="$VAR[Home_Artwork_Diffuse]" />
-					<param name="texture_path" value="$PARAM[texture_path]" />
-					<param name="fadetime" value="0" />
-					<param name="fadein_animation_condition" value="$PARAM[fadein_animation_condition]" />
-					<param name="fadeout_animation_condition" value="$PARAM[fadeout_animation_condition]" />
-				</include>
-				<include content="Background_Multiart">
-					<param name="colordiffuse" value="$VAR[Home_Artwork_Diffuse]" />
-					<param name="texture_path" value="$PARAM[texture_path]" />
-					<param name="fadetime" value="360" />
-					<param name="fadein_animation_condition" value="$PARAM[fadein_animation_condition]" />
-					<param name="fadeout_animation_condition" value="$PARAM[fadeout_animation_condition]" />
-				</include>
-				<nested />
-			</control>
-		</definition>
-	</include>
+
 
 	<include name="Background_Media">
 		<param name="visible" default="[$EXP[Containers_Background] | Container.Content()] + !$EXP[ListView_Display_IsThumbnails] + !$EXP[GridView_IsVisible]" />
diff --git a/16x9/Content_Settings.xml b/16x9/Content_Settings.xml
index e2ed011b..bd83b2fd 100644
--- a/16x9/Content_Settings.xml
+++ b/16x9/Content_Settings.xml
@@ -166,6 +166,12 @@
 			<texturefocus />
 			<include content="Hide_Expanded_Widgets_OnFocus" />
 		</control>
+		<control type="button" id="16">
+			<description>Background</description>
+			<label>$LOCALIZE[31432]</label>
+			<texturefocus />
+			<include content="Hide_Expanded_Widgets_OnFocus" />
+		</control>
 		<control type="button" id="11">
 			<description>Home</description>
 			<label>$LOCALIZE[31401]</label>
@@ -196,32 +202,26 @@
 			<texturefocus />
 			<include content="Hide_Expanded_Widgets_OnFocus" />
 		</control>
-		<control type="button" id="16">
-			<description>Experiments</description>
-			<label>$LOCALIZE[31406]</label>
-			<texturefocus />
-			<include content="Hide_Expanded_Widgets_OnFocus" />
-		</control>
 	</include>
 
 	<include name="skinsettings_Right_List_Content_Home">
 		<!-- General -->
 		<control type="label" id="1000">
 			<description>Look and feel</description>
-			<visible>!ControlGroup(9).HasFocus(11) + !ControlGroup(9).HasFocus(12) + !ControlGroup(9).HasFocus(13) + !ControlGroup(9).HasFocus(14) + !ControlGroup(9).HasFocus(15) + !ControlGroup(9).HasFocus(16)</visible>
+			<visible>!ControlGroup(9).HasFocus(11) + !ControlGroup(9).HasFocus(12) + !ControlGroup(9).HasFocus(13) + !ControlGroup(9).HasFocus(14) + !ControlGroup(9).HasFocus(15) + !ControlGroup(9).HasFocus(16) + !ControlGroup(9).HasFocus(17)</visible>
 			<include content="skinsettings_Default_Label" />
 			<label>$LOCALIZE[24997]</label>
 			<animation effect="slide" start="0" end="0,-1" condition="true">Conditional</animation>
 		</control>
 		<control type="image" id="1001">
 			<description>Themes screenshot</description>
-			<visible>!ControlGroup(9).HasFocus(11) + !ControlGroup(9).HasFocus(12) + !ControlGroup(9).HasFocus(13) + !ControlGroup(9).HasFocus(14) + !ControlGroup(9).HasFocus(15) + !ControlGroup(9).HasFocus(16)</visible>
+			<visible>!ControlGroup(9).HasFocus(11) + !ControlGroup(9).HasFocus(12) + !ControlGroup(9).HasFocus(13) + !ControlGroup(9).HasFocus(14) + !ControlGroup(9).HasFocus(15) + !ControlGroup(9).HasFocus(16) + !ControlGroup(9).HasFocus(17)</visible>
 			<include content="skinsettings_Detfault_Image" />
 			<texture>$VAR[skinsettings_Themes_Screenshots]</texture>
 		</control>
 		<control type="radiobutton" id="1002">
 			<description>Night / Light</description>
-			<visible>!ControlGroup(9).HasFocus(11) + !ControlGroup(9).HasFocus(12) + !ControlGroup(9).HasFocus(13) + !ControlGroup(9).HasFocus(14) + !ControlGroup(9).HasFocus(15) + !ControlGroup(9).HasFocus(16)</visible>
+			<visible>!ControlGroup(9).HasFocus(11) + !ControlGroup(9).HasFocus(12) + !ControlGroup(9).HasFocus(13) + !ControlGroup(9).HasFocus(14) + !ControlGroup(9).HasFocus(15) + !ControlGroup(9).HasFocus(16) + !ControlGroup(9).HasFocus(17)</visible>
 			<label>$LOCALIZE[15111]</label>
 			<label2>$VAR[Theme_Label]</label2>
 			<selected>!Skin.String(Theme,Light)</selected>
@@ -249,15 +249,6 @@
 			<onclick>Skin.SetString(User_Defined_Accent_Color,copacetic_accent_color)</onclick>
 			<onclick>SetFocus(1004)</onclick>
 		</control>
-		<include content="skinsettings_Slider_Button">
-			<param name="info" value="Background_Opacity" />
-			<param name="label" value="$LOCALIZE[31487]" />
-			<param name="label2" value="$VAR[skinsettings_Background_Opacity_Label]" />
-			<param name="category" value="10" />
-			<param name="previous" value="1004" />
-			<param name="id" value="1024" />
-			<param name="next" value="1005" />
-		</include>
 		<control type="button" id="1005">
 			<description>Recommended Kodi settings</description>
 			<visible>ControlGroup(9).HasFocus(10)</visible>
@@ -302,29 +293,42 @@
 			<description>Artwork</description>
 			<visible>ControlGroup(9).HasFocus(10)</visible>
 			<include content="skinsettings_Default_Label" />
-			<label>$LOCALIZE[31420]</label>
+			<label>$LOCALIZE[39123]</label>
 		</control>
 		<control type="image" id="1012">
+			<description>Prefer keyart screenshot</description>
+			<visible>ControlGroup(9).HasFocus(10)</visible>
+			<include content="skinsettings_Detfault_Image" />
+			<texture>$VAR[skinsettings_Prefer_Keyart_Screenshots]</texture>
+		</control>
+		<control type="radiobutton" id="1013">
+			<description>Prefer keyart for poster views</description>
+			<label>$LOCALIZE[31428]</label>
+			<onclick>Skin.ToggleSetting(Prefer_Keyart)</onclick>
+			<selected>Skin.HasSetting(Prefer_Keyart)</selected>
+			<visible>ControlGroup(9).HasFocus(10)</visible>
+		</control>
+		<control type="image" id="1015">
 			<description>Themes screenshot</description>
 			<visible>ControlGroup(9).HasFocus(10)</visible>
 			<include content="skinsettings_Detfault_Image" />
 			<texture>$VAR[skinsettings_Clearlogo_Cropper_Screenshots]</texture>
 		</control>
-		<control type="radiobutton" id="1013">
+		<control type="radiobutton" id="1016">
 			<description>Crop clearlogos</description>
 			<visible>ControlGroup(9).HasFocus(10)</visible>
 			<label>$LOCALIZE[31421]</label>
 			<onclick>Skin.ToggleSetting(Crop_Clearlogos)</onclick>
 			<selected>Skin.HasSetting(Crop_Clearlogos)</selected>
 		</control>
-		<control type="button" id="1014">
+		<control type="button" id="1017">
 			<description>Clear cache</description>
 			<visible>ControlGroup(9).HasFocus(10) + System.AddonIsEnabled(script.copacetic.helper)</visible>
 			<label>- $LOCALIZE[31422]</label>
 			<label2>$INFO[Window(home).Property(Addon_Data_Folder_Size)]</label2>
 			<onclick condition="!String.Contains(Window(home).Property(Addon_Data_Folder_Size),bytes)">RunScript(script.copacetic.helper,action=clear_cache)</onclick>
 		</control>
-		<control type="radiobutton" id="1015">
+		<control type="radiobutton" id="1018">
 			<description>Colorise media flags</description>
 			<visible>ControlGroup(9).HasFocus(10)</visible>
 			<visible>Skin.HasSetting(Crop_Clearlogos)</visible>
@@ -339,68 +343,82 @@
 			<param name="label" value="- $LOCALIZE[31424]" />
 			<param name="label2" value="$INFO[Skin.String(Background_Low_Threshold)]$INFO[Skin.String(Background_High_Threshold), - ]" />
 			<param name="category" value="10" />
-			<param name="previous" value="1015" />
-			<param name="id" value="1016" />
-			<param name="next" value="1018" />
+			<param name="previous" value="1018" />
+			<param name="id" value="1019" />
+			<param name="next" value="1001" />
 		</include>
+
+		<!-- Background -->
+		<control type="label" id="1600">
+			<description>Global</description>
+			<visible>ControlGroup(9).HasFocus(16)</visible>
+			<include content="skinsettings_Default_Label" />
+			<label>$LOCALIZE[31425]</label>
+		</control>
 		<include content="skinsettings_Slider_Button">
 			<param name="info" value="Background_Slideshow" />
 			<param name="label" value="$LOCALIZE[31426]" />
 			<param name="label2" value="$VAR[skinsettings_Background_Slideshow_Label]" />
-			<param name="category" value="10" />
-			<param name="previous" value="1016" />
-			<param name="id" value="1018" />
-			<param name="next" value="1019" />
+			<param name="category" value="16" />
+			<param name="previous" value="1606" />
+			<param name="id" value="1601" />
+			<param name="next" value="1602" />
 		</include>
+		<control type="button" id="1602">
+			<description>- Choose a custom path</description>
+			<label>$VAR[skinsettings_Background_Slideshow_Custom_Path_Label,- ]</label>
+			<onclick>RunScript(script.skinshortcuts,type=shortcuts&amp;custom=True&amp;showNone=False&amp;skinList=Background_Slideshow_Custom_Path)</onclick>
+			<visible>ControlGroup(9).HasFocus(16) + [Skin.String(Background_Slideshow,Custom) | !$EXP[Library_Has_Content]]</visible>
+		</control>
 		<include content="skinsettings_Slider_Button">
 			<param name="info" value="Background_Interval" />
-			<param name="label" value="- $LOCALIZE[31427]" />
+			<param name="label" value="$LOCALIZE[31427]" />
 			<param name="label2" value="$VAR[skinsettings_Background_Interval_Label]" />
-			<param name="category" value="10" />
-			<param name="previous" value="1018" />
-			<param name="id" value="1019" />
-			<param name="next" value="1020" />
+			<param name="category" value="16" />
+			<param name="previous" value="1602" />
+			<param name="id" value="1603" />
+			<param name="next" value="1604" />
 		</include>
-		<control type="radiobutton" id="1020">
-			<description>Add movement</description>
-			<label>- $LOCALIZE[31441]</label>
-			<onclick>Skin.ToggleSetting(Global_Ken_Burns_Effect)</onclick>
-			<selected>Skin.HasSetting(Global_Ken_Burns_Effect)</selected>
-			<visible>ControlGroup(9).HasFocus(10)</visible>
-		</control>
-		<control type="label" id="1021">
-			<description>Artwork</description>
-			<visible>ControlGroup(9).HasFocus(10)</visible>
+		<include content="skinsettings_Slider_Button">
+			<param name="info" value="Home_Background_Brightness" />
+			<param name="label" value="$LOCALIZE[31440]" />
+			<param name="label2" value="$INFO[Skin.String(Home_Background_Brightness)]" />
+			<param name="category" value="16" />
+			<param name="previous" value="1603" />
+			<param name="id" value="1604" />
+			<param name="next" value="1605" />
+		</include>
+		<include content="skinsettings_Slider_Button">
+			<param name="info" value="Background_Opacity" />
+			<param name="label" value="$LOCALIZE[31487]" />
+			<param name="label2" value="$VAR[skinsettings_Background_Opacity_Label]" />
+			<param name="category" value="16" />
+			<param name="previous" value="1604" />
+			<param name="id" value="1605" />
+			<param name="next" value="1606" />
+		</include>
+		<control type="label" id="1606">
+			<description>Home</description>
+			<visible>ControlGroup(9).HasFocus(16)</visible>
 			<include content="skinsettings_Default_Label" />
-			<label>$LOCALIZE[39123]</label>
-		</control>
-		<control type="image" id="1022">
-			<description>Prefer keyart screenshot</description>
-			<visible>ControlGroup(9).HasFocus(10)</visible>
-			<include content="skinsettings_Detfault_Image" />
-			<texture>$VAR[skinsettings_Prefer_Keyart_Screenshots]</texture>
+			<label>$LOCALIZE[31401]</label>
 		</control>
-		<control type="radiobutton" id="1023">
-			<description>Prefer keyart for poster views</description>
-			<label>$LOCALIZE[31428]</label>
-			<onclick>Skin.ToggleSetting(Prefer_Keyart)</onclick>
-			<selected>Skin.HasSetting(Prefer_Keyart)</selected>
-			<visible>ControlGroup(9).HasFocus(10)</visible>
+		<control type="radiobutton" id="1607">
+			<description>Override home menu backgrounds</description>
+			<label>$LOCALIZE[31433]</label>
+			<onclick>Skin.ToggleSetting(Home_Background_Override_Enabled)</onclick>
+			<selected>Skin.HasSetting(Home_Background_Override_Enabled)</selected>
+			<visible>ControlGroup(9).HasFocus(16)</visible>
 		</control>
 
 		<!--Home-->
-		<control type="label" id="1100">
-			<description>Widgets</description>
-			<visible>ControlGroup(9).HasFocus(11)</visible>
-			<include content="skinsettings_Default_Label" />
-			<label>$LOCALIZE[31402]</label>
-		</control>
 		<control type="radiobutton" id="1101">
 			<description>Enable widgets</description>
 			<visible>ControlGroup(9).HasFocus(11)</visible>
 			<label>$LOCALIZE[31429]</label>
 			<onclick>Skin.ToggleSetting(Widgets_Enabled)</onclick>
 			<selected>Skin.HasSetting(Widgets_Enabled)</selected>
+			<include content="skinsettings_Default_Label" />
 		</control>
 		<control type="radiobutton" id="1102">
 			<description>Enable clearlogos for widgets</description>
@@ -408,57 +426,14 @@
 			<label>- $LOCALIZE[31476]</label>
 			<onclick>Skin.ToggleSetting(Widgets_Clearlogos_Enabled)</onclick>
 			<selected>Skin.HasSetting(Widgets_Clearlogos_Enabled)</selected>
+			<include content="skinsettings_Default_Label" />
 		</control>
 		<control type="button" id="1103">
 			<description>- Reset widgets</description>
 			<label>- $LOCALIZE[31430]</label>
 			<onclick>RunScript(script.copacetic.helper,action=dialog_yesno,heading=$LOCALIZE[31430],message=$LOCALIZE[31431],yes_actions=SetFocus(4200))</onclick>
 			<visible>ControlGroup(9).HasFocus(11) + Skin.HasSetting(Widgets_Enabled) + System.AddonIsEnabled(script.copacetic.helper)</visible>
-		</control>
-		<control type="label" id="1104">
-			<description>Background</description>
 			<include content="skinsettings_Default_Label" />
-			<label>$LOCALIZE[31432]</label>
-			<visible>ControlGroup(9).HasFocus(11)</visible>
-		</control>
-		<control type="radiobutton" id="1105">
-			<description>Override home menu artwork</description>
-			<label>$LOCALIZE[31433]</label>
-			<onclick>Skin.ToggleSetting(Home_Background_Override_Enabled)</onclick>
-			<selected>Skin.HasSetting(Home_Background_Override_Enabled)</selected>
-			<visible>ControlGroup(9).HasFocus(11)</visible>
-		</control>
-		<include content="skinsettings_Slider_Button">
-			<param name="info" value="Home_Background_Override_Source" />
-			<param name="visible" value="Skin.HasSetting(Home_Background_Override_Enabled) + $EXP[Library_Has_Content]" />
-			<param name="label" value="- $LOCALIZE[31426]" />
-			<param name="label2" value="$VAR[skinsettings_Home_Background_Override_Source_Label]" />
-			<param name="category" value="11" />
-			<param name="previous" value="1105" />
-			<param name="id" value="1106" />
-			<param name="next" value="1107" />
-		</include>
-		<control type="button" id="1107">
-			<description>- Choose a custom path</description>
-			<label>$VAR[skinsettings_Home_Background_Override_Path_Label,- ]</label>
-			<onclick>RunScript(script.skinshortcuts,type=shortcuts&amp;custom=True&amp;showNone=False&amp;skinList=Home_Background_Override_Path)</onclick>
-			<visible>ControlGroup(9).HasFocus(11) + Skin.HasSetting(Home_Background_Override_Enabled) + [Skin.String(Home_Background_Override_Source,Custom) | !$EXP[Library_Has_Content]]</visible>
-		</control>
-		<include content="skinsettings_Slider_Button">
-			<param name="info" value="Home_Background_Brightness" />
-			<param name="label" value="$LOCALIZE[31440]" />
-			<param name="label2" value="$INFO[Skin.String(Home_Background_Brightness)]" />
-			<param name="category" value="11" />
-			<param name="previous" value="1107" />
-			<param name="id" value="1108" />
-			<param name="next" value="1109" />
-		</include>
-		<control type="radiobutton" id="1109">
-			<description>Add movement</description>
-			<label>$LOCALIZE[31441]</label>
-			<onclick>Skin.ToggleSetting(Home_Ken_Burns_Effect)</onclick>
-			<selected>Skin.HasSetting(Home_Ken_Burns_Effect)</selected>
-			<visible>ControlGroup(9).HasFocus(11)</visible>
 		</control>
 		<control type="radiobutton" id="1110">
 			<description>Enable screensaver</description>
@@ -466,6 +441,7 @@
 			<onclick>Skin.ToggleSetting(Home_Screensaver_Enabled)</onclick>
 			<selected>Skin.HasSetting(Home_Screensaver_Enabled)</selected>
 			<visible>ControlGroup(9).HasFocus(11)</visible>
+			<include content="skinsettings_Default_Label" />
 		</control>
 		<control type="radiobutton" id="1111">
 			<description> - Show clearlogo</description>
@@ -473,6 +449,7 @@
 			<onclick>Skin.ToggleSetting(Home_Screensaver_Clearlogo_Enabled)</onclick>
 			<selected>Skin.HasSetting(Home_Screensaver_Clearlogo_Enabled)</selected>
 			<visible>ControlGroup(9).HasFocus(11) + Skin.HasSetting(Home_Screensaver_Enabled)</visible>
+			<include content="skinsettings_Default_Label" />
 		</control>
 		<control type="radiobutton" id="1112">
 			<description>Hide clock</description>
@@ -480,6 +457,7 @@
 			<onclick>Skin.ToggleSetting(Hide_Home_Clock)</onclick>
 			<selected>Skin.HasSetting(Hide_Home_Clock)</selected>
 			<visible>ControlGroup(9).HasFocus(11)</visible>
+			<include content="skinsettings_Default_Label" />
 		</control>
 
 		<!-- Widgets -->
@@ -762,48 +740,48 @@
 			<param name="category" value="14" />
 			<param name="previous" value="1404" />
 			<param name="id" value="1405" />
-			<param name="next" value="1412" />
+			<param name="next" value="1406" />
 		</include>
-		<control type="label" id="1412">
+		<control type="label" id="1406">
 			<description>Info screens</description>
 			<include content="skinsettings_Default_Label" />
 			<label>$LOCALIZE[31484]</label>
 			<visible>ControlGroup(9).HasFocus(14)</visible>
 		</control>
-		<control type="radiobutton" id="1413">
+		<control type="radiobutton" id="1407">
 			<description>Disable star ratings</description>
 			<label>$LOCALIZE[31485]</label>
 			<onclick>Skin.ToggleSetting(Star_Ratings_Disabled)</onclick>
 			<selected>Skin.HasSetting(Star_Ratings_Disabled)</selected>
 			<visible>ControlGroup(9).HasFocus(14)</visible>
 		</control>
-		<control type="label" id="1406">
+		<control type="label" id="1408">
 			<description>Video Player</description>
 			<include content="skinsettings_Default_Label" />
 			<label>$LOCALIZE[31478]</label>
 			<visible>ControlGroup(9).HasFocus(14)</visible>
 		</control>
-		<control type="radiobutton" id="1407">
+		<control type="radiobutton" id="1409">
 			<description>Instantly hide progress bar on pause screen</description>
 			<label>$LOCALIZE[31455]</label>
 			<onclick>Skin.ToggleSetting(Player_Progress_Disabled)</onclick>
 			<selected>Skin.HasSetting(Player_Progress_Disabled)</selected>
 			<visible>ControlGroup(9).HasFocus(14)</visible>
 		</control>
-		<control type="radiobutton" id="1408">
+		<control type="radiobutton" id="1410">
 			<description>Show info on pause screen</description>
 			<label>$LOCALIZE[31456]</label>
 			<onclick>Skin.ToggleSetting(Pause_Screen_Info_Enabled)</onclick>
 			<selected>Skin.HasSetting(Pause_Screen_Info_Enabled)</selected>
 			<visible>ControlGroup(9).HasFocus(14)</visible>
 		</control>
-		<control type="label" id="1409">
+		<control type="label" id="1411">
 			<description>Music Player</description>
 			<include content="skinsettings_Default_Label" />
 			<label>$LOCALIZE[31479]</label>
 			<visible>ControlGroup(9).HasFocus(14)</visible>
 		</control>
-		<control type="radiobutton" id="1410">
+		<control type="radiobutton" id="1412">
 			<description>Enable fanart background</description>
 			<label>$LOCALIZE[31480]</label>
 			<onclick>Skin.ToggleSetting(visualisation_Disable_Background)</onclick>
@@ -815,10 +793,30 @@
 			<param name="label" value="$LOCALIZE[31481]" />
 			<param name="label2" value="$VAR[skinsettings_visualisation_Layout_Label2]" />
 			<param name="category" value="14" />
-			<param name="previous" value="1410" />
-			<param name="id" value="1411" />
-			<param name="next" value="1401" />
+			<param name="previous" value="1412" />
+			<param name="id" value="1413" />
+			<param name="next" value="1414" />
 		</include>
+		<control type="label" id="1414">
+			<description>Experiments</description>
+			<visible>ControlGroup(9).HasFocus(14)</visible>
+			<include content="skinsettings_Default_Label" />
+			<label>$LOCALIZE[31406]</label>
+		</control>
+		<control type="radiobutton" id="1415">
+			<description>Use unwatched count in info details</description>
+			<visible>ControlGroup(9).HasFocus(14)</visible>
+			<label>$LOCALIZE[31470]</label>
+			<onclick>Skin.ToggleSetting(Experiment_Unwatched_Info)</onclick>
+			<selected>Skin.HasSetting(Experiment_Unwatched_Info)</selected>
+		</control>
+		<control type="radiobutton" id="1416">
+			<description>Enable fanart display for Grid view in Pictures window</description>
+			<visible>ControlGroup(9).HasFocus(14)</visible>
+			<label>$LOCALIZE[31471]</label>
+			<onclick>Skin.ToggleSetting(Experiment_GridView_Fanart_Pictures)</onclick>
+			<selected>Skin.HasSetting(Experiment_GridView_Fanart_Pictures)</selected>
+		</control>
 
 		<!-- Extras -->
 		<control type="label" id="1500">
@@ -959,21 +957,6 @@
 			<visible>ControlGroup(9).HasFocus(15) + Skin.HasSetting(Trailer_Autoplay)</visible>
 		</control>
 
-		<!-- Experiments -->
-		<control type="radiobutton" id="1600">
-			<description>Use unwatched count in info details</description>
-			<visible>ControlGroup(9).HasFocus(16)</visible>
-			<label>$LOCALIZE[31470]</label>
-			<onclick>Skin.ToggleSetting(Experiment_Unwatched_Info)</onclick>
-			<selected>Skin.HasSetting(Experiment_Unwatched_Info)</selected>
-		</control>
-		<control type="radiobutton" id="1601">
-			<description>Enable fanart display for Grid view in Pictures window</description>
-			<visible>ControlGroup(9).HasFocus(16)</visible>
-			<label>$LOCALIZE[31471]</label>
-			<onclick>Skin.ToggleSetting(Experiment_GridView_Fanart_Pictures)</onclick>
-			<selected>Skin.HasSetting(Experiment_GridView_Fanart_Pictures)</selected>
-		</control>
 	</include>
 
 	<include name="systeminfo_Left_List_Content">
diff --git a/16x9/Content_Settings_Sliders.xml b/16x9/Content_Settings_Sliders.xml
index 9d20ba77..2f51c83e 100644
--- a/16x9/Content_Settings_Sliders.xml
+++ b/16x9/Content_Settings_Sliders.xml
@@ -25,6 +25,7 @@
 	</include>
 
 	<include name="skinsettings_Background_Slideshow_Button_Conditions">
+		<onleft condition="Skin.String(Background_Slideshow,Custom)">Skin.SetString(Background_Slideshow,Artists)</onleft>
 		<onleft condition="Skin.String(Background_Slideshow,Artists)">Skin.SetString(Background_Slideshow,TVShows)</onleft>
 		<onleft condition="Skin.String(Background_Slideshow,TVShows)">Skin.SetString(Background_Slideshow,Movies)</onleft>
 		<onleft condition="Skin.String(Background_Slideshow,Movies)">Skin.SetString(Background_Slideshow,Videos)</onleft>
@@ -33,18 +34,21 @@
 		<onright condition="Skin.String(Background_Slideshow,Videos)">Skin.SetString(Background_Slideshow,Movies)</onright>
 		<onright condition="Skin.String(Background_Slideshow,Movies)">Skin.SetString(Background_Slideshow,TVShows)</onright>
 		<onright condition="Skin.String(Background_Slideshow,TVShows)">Skin.SetString(Background_Slideshow,Artists)</onright>
+		<onright condition="Skin.String(Background_Slideshow,Artists)">Skin.SetString(Background_Slideshow,Custom)</onright>
 	</include>
 	<include name="skinsettings_Background_Slideshow_Unfocused_Slides">
-		<animation effect="slide" end="30" time="0" condition="Skin.String(Background_Slideshow,Videos)">Conditional</animation>
-		<animation effect="slide" end="60" time="0" condition="Skin.String(Background_Slideshow,Movies)">Conditional</animation>
-		<animation effect="slide" end="90" time="0" condition="Skin.String(Background_Slideshow,TVShows)">Conditional</animation>
-		<animation effect="slide" end="120" time="0" condition="Skin.String(Background_Slideshow,Artists)">Conditional</animation>
+		<animation effect="slide" end="24" time="0" condition="Skin.String(Background_Slideshow,Videos)">Conditional</animation>
+		<animation effect="slide" end="48" time="0" condition="Skin.String(Background_Slideshow,Movies)">Conditional</animation>
+		<animation effect="slide" end="72" time="0" condition="Skin.String(Background_Slideshow,TVShows)">Conditional</animation>
+		<animation effect="slide" end="96" time="0" condition="Skin.String(Background_Slideshow,Artists)">Conditional</animation>
+		<animation effect="slide" end="120" time="0" condition="Skin.String(Background_Slideshow,Custom)">Conditional</animation>
 	</include>
 	<include name="skinsettings_Background_Slideshow_Focused_Slides">
-		<animation effect="slide" end="28" time="0" condition="Skin.String(Background_Slideshow,Videos)">Conditional</animation>
-		<animation effect="slide" end="55" time="0" condition="Skin.String(Background_Slideshow,Movies)">Conditional</animation>
-		<animation effect="slide" end="83" time="0" condition="Skin.String(Background_Slideshow,TVShows)">Conditional</animation>
-		<animation effect="slide" end="110" time="0" condition="Skin.String(Background_Slideshow,Artists)">Conditional</animation>
+		<animation effect="slide" end="22" time="0" condition="Skin.String(Background_Slideshow,Videos)">Conditional</animation>
+		<animation effect="slide" end="44" time="0" condition="Skin.String(Background_Slideshow,Movies)">Conditional</animation>
+		<animation effect="slide" end="66" time="0" condition="Skin.String(Background_Slideshow,TVShows)">Conditional</animation>
+		<animation effect="slide" end="88" time="0" condition="Skin.String(Background_Slideshow,Artists)">Conditional</animation>
+		<animation effect="slide" end="110" time="0" condition="Skin.String(Background_Slideshow,Custom)">Conditional</animation>
 	</include>
 
 	<include name="skinsettings_Background_Interval_Button_Conditions">
@@ -89,33 +93,6 @@
 		<animation effect="slide" end="55" time="0" condition="Integer.IsLess(Skin.String(Home_Background_Brightness),50)">Conditional</animation>
 	</include>
 
-	<include name="skinsettings_Home_Background_Override_Source_Button_Conditions">
-		<onleft condition="Skin.String(Home_Background_Override_Source,Custom)">Skin.SetString(Home_Background_Override_Source,Artists)</onleft>
-		<onleft condition="Skin.String(Home_Background_Override_Source,Artists)">Skin.SetString(Home_Background_Override_Source,TVShows)</onleft>
-		<onleft condition="Skin.String(Home_Background_Override_Source,TVShows)">Skin.SetString(Home_Background_Override_Source,Movies)</onleft>
-		<onleft condition="Skin.String(Home_Background_Override_Source,Movies)">Skin.SetString(Home_Background_Override_Source,Videos)</onleft>
-		<onleft condition="Skin.String(Home_Background_Override_Source,Videos)">Skin.SetString(Home_Background_Override_Source,Global)</onleft>
-		<onright condition="Skin.String(Home_Background_Override_Source,Global) | !Skin.String(Home_Background_Override_Source)">Skin.SetString(Home_Background_Override_Source,Videos)</onright>
-		<onright condition="Skin.String(Home_Background_Override_Source,Videos)">Skin.SetString(Home_Background_Override_Source,Movies)</onright>
-		<onright condition="Skin.String(Home_Background_Override_Source,Movies)">Skin.SetString(Home_Background_Override_Source,TVShows)</onright>
-		<onright condition="Skin.String(Home_Background_Override_Source,TVShows)">Skin.SetString(Home_Background_Override_Source,Artists)</onright>
-		<onright condition="Skin.String(Home_Background_Override_Source,Artists)">Skin.SetString(Home_Background_Override_Source,Custom)</onright>
-	</include>
-	<include name="skinsettings_Home_Background_Override_Source_Unfocused_Slides">
-		<animation effect="slide" end="24" time="0" condition="Skin.String(Home_Background_Override_Source,Videos)">Conditional</animation>
-		<animation effect="slide" end="48" time="0" condition="Skin.String(Home_Background_Override_Source,Movies)">Conditional</animation>
-		<animation effect="slide" end="72" time="0" condition="Skin.String(Home_Background_Override_Source,TVShows)">Conditional</animation>
-		<animation effect="slide" end="96" time="0" condition="Skin.String(Home_Background_Override_Source,Artists)">Conditional</animation>
-		<animation effect="slide" end="120" time="0" condition="Skin.String(Home_Background_Override_Source,Custom)">Conditional</animation>
-	</include>
-	<include name="skinsettings_Home_Background_Override_Source_Focused_Slides">
-		<animation effect="slide" end="22" time="0" condition="Skin.String(Home_Background_Override_Source,Videos)">Conditional</animation>
-		<animation effect="slide" end="44" time="0" condition="Skin.String(Home_Background_Override_Source,Movies)">Conditional</animation>
-		<animation effect="slide" end="66" time="0" condition="Skin.String(Home_Background_Override_Source,TVShows)">Conditional</animation>
-		<animation effect="slide" end="88" time="0" condition="Skin.String(Home_Background_Override_Source,Artists)">Conditional</animation>
-		<animation effect="slide" end="110" time="0" condition="Skin.String(Home_Background_Override_Source,Custom)">Conditional</animation>
-	</include>
-
 	<include name="skinsettings_Multiart_Interval_Button_Conditions">
 		<onleft condition="Skin.String(Multiart_Interval,10)">Skin.SetString(Multiart_Interval,7)</onleft>
 		<onleft condition="Skin.String(Multiart_Interval,7)">Skin.SetString(Multiart_Interval,5)</onleft>
diff --git a/16x9/Custom_1199_Test_Label.xml b/16x9/Custom_1199_Test_Label.xml
index 03600191..7e0d22b2 100644
--- a/16x9/Custom_1199_Test_Label.xml
+++ b/16x9/Custom_1199_Test_Label.xml
@@ -5,7 +5,7 @@
 	<controls>
 		<control type="label">
 			<align>right</align>
-			<label>$INFO[System.CurrentWindow]</label>
+			<label>$INFO[Window(home).Property(Background_Custom_Fanart)]</label>
 			<visible>true</visible>
 		</control>
 	</controls>
diff --git a/16x9/Variables_Labels_Windows.xml b/16x9/Variables_Labels_Windows.xml
index 379e902d..843f372c 100644
--- a/16x9/Variables_Labels_Windows.xml
+++ b/16x9/Variables_Labels_Windows.xml
@@ -207,8 +207,8 @@
 		<value condition="Control.HasFocus(1533)">$LOCALIZE[31567]</value>
 		<value condition="Control.HasFocus(1534) | Control.HasFocus(1535)">$LOCALIZE[31568]</value>
 		<!-- Experiments -->
-		<value condition="Control.HasFocus(1600)">$LOCALIZE[31570]</value>
-		<value condition="Control.HasFocus(1601)">$LOCALIZE[31571]</value>
+		<value condition="Control.HasFocus(1700)">$LOCALIZE[31570]</value>
+		<value condition="Control.HasFocus(1701)">$LOCALIZE[31571]</value>
 	</variable>
 
 	<variable name="skinsettings_Background_Interval_Label">
@@ -217,7 +217,7 @@
 		<value>10</value>
 	</variable>
 	<variable name="skinsettings_Background_Opacity_Label">
-		<value condition="Skin.String(Background_Opacity)">$INFO[Skin.String(Background_Opacity),,%]</value>
+		<value condition="Skin.String(Background_Opacity)">$INFO[Skin.String(Background_Opacity)]</value>
 	</variable>
 	<variable name="skinsettings_Background_Slideshow_Label">
 		<value condition="Skin.String(Background_Slideshow,Global) | !Skin.String(Background_Slideshow)">$LOCALIZE[31436]</value>
@@ -225,18 +225,11 @@
 		<value condition="Skin.String(Background_Slideshow,TVShows)">$LOCALIZE[20343]</value>
 		<value condition="Skin.String(Background_Slideshow,Videos)">$LOCALIZE[31437]</value>
 		<value condition="Skin.String(Background_Slideshow,Artists)">$LOCALIZE[133]</value>
+		<value condition="Skin.String(Background_Slideshow,Custom)">$LOCALIZE[31438]</value>
 	</variable>
-	<variable name="skinsettings_Home_Background_Override_Source_Label">
-		<value condition="Skin.String(Home_Background_Override_Source,Global) | !Skin.String(Home_Background_Override_Source)">$LOCALIZE[31436]</value>
-		<value condition="Skin.String(Home_Background_Override_Source,Movies)">$LOCALIZE[342]</value>
-		<value condition="Skin.String(Home_Background_Override_Source,TVShows)">$LOCALIZE[20343]</value>
-		<value condition="Skin.String(Home_Background_Override_Source,Videos)">$LOCALIZE[31437]</value>
-		<value condition="Skin.String(Home_Background_Override_Source,Artists)">$LOCALIZE[133]</value>
-		<value condition="Skin.String(Home_Background_Override_Source,Custom)">$LOCALIZE[31438]</value>
-	</variable>
-	<variable name="skinsettings_Home_Background_Override_Path_Label">
+	<variable name="skinsettings_Background_Slideshow_Custom_Path_Label">
 		<!-- Choose new path... / [shows path] -->
-		<value condition="Skin.String(Home_Background_Override_Path)">$INFO[Skin.String(Home_Background_Override_Path)]</value>
+		<value condition="Skin.String(Background_Slideshow_Custom_Path)">$INFO[Skin.String(Background_Slideshow_Custom_Path)]</value>
 		<value>$LOCALIZE[31439]</value>
 	</variable>
 	<variable name="skinsettings_Multiart_Interval_Label">
diff --git a/16x9/Variables_Paths_Media.xml b/16x9/Variables_Paths_Media.xml
index 9f6bebc4..6ad2f614 100644
--- a/16x9/Variables_Paths_Media.xml
+++ b/16x9/Variables_Paths_Media.xml
@@ -23,7 +23,7 @@
 
 	<variable name="Background_Home_Path">
 		<!-- Global override -->
-		<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.String(Home_Background_Override_Path)">$INFO[Skin.String(Home_Background_Override_Path)]</value>
+		<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.String(Background_Slideshow_Custom_Path)">$INFO[Skin.String(Background_Slideshow_Custom_Path)]</value>
 		<!-- Item override -->
 		<value condition="!String.IsEmpty(Container(3000).ListItem.Property(backgroundPlaylist))">$INFO[Container(3000).ListItem.Property(backgroundPlaylist)]</value>
 		<!-- playlists and xml library paths e.g. inprogress or sets -->
@@ -42,7 +42,11 @@
 		<value condition="Library.HasContent(Movies)">videodb://movies/titles/</value>
 		<value condition="Library.HasContent(TVShows)">videodb://tvshows/titles/</value>
 		<value condition="Library.HasContent(Music)">musicdb://artists/?albumartistsonly=true</value>
-		<value/>
+		<value />
+	</variable>
+
+	<variable name="Background_Global_Path">
+		<value condition="Skin.String(Background_Slideshow,Custom) + Skin.String(Background_Slideshow_Custom_Path)">$INFO[Skin.String(Background_Slideshow_Custom_Path)]</value>
 	</variable>
 
 	<variable name="Background_Media_Path">
diff --git a/16x9/Variables_Textures_Artwork_Media.xml b/16x9/Variables_Textures_Artwork_Media.xml
index 169212d6..4668e2a0 100644
--- a/16x9/Variables_Textures_Artwork_Media.xml
+++ b/16x9/Variables_Textures_Artwork_Media.xml
@@ -23,14 +23,26 @@
 		<value condition="!String.IsEmpty(ListItem.Art(clearlogo))">$INFO[ListItem.Art(clearlogo)]</value>
 	</variable>
 
+	<variable name="Background_Global_Texture">
+		<value condition="Window.IsVisible(loginscreen) + !String.IsEmpty(Container(3300).ListItem.Art(fanart))">$INFO[Container(3300).ListItem.Art(fanart)]</value>
+		<value condition="!String.Contains(Container.FolderPath,plugin://) + $EXP[Containers_Background] + !String.IsEmpty(Container(3300).ListItem.Art(fanart))">$INFO[Container(3300).ListItem.Art(fanart)]</value>
+		<value condition="$EXP[Library_Has_Content] + Window.IsVisible(videos) + !String.IsEmpty(Window(home).Property(Background_Videos))">$INFO[Window(home).Property(Background_Videos)]</value>
+		<value condition="$EXP[Library_Has_Content] + Window.IsVisible(music) + !String.IsEmpty(Window(home).Property(Background_Artists))">$INFO[Window(home).Property(Background_Artists)]</value>
+		<value condition="$EXP[Library_Has_Content] + Skin.String(Background_Slideshow,Custom) + Skin.String(Background_Slideshow_Custom_Path)">$INFO[Window(home).Property(Background_Custom_Fanart)]</value>
+		<value condition="$EXP[Library_Has_Content] + Skin.String(Background_Slideshow,Global) + !String.IsEmpty(Window(home).Property(Background_Global_Fanart))">$INFO[Window(home).Property(Background_Global_Fanart)]</value>
+		<value condition="$EXP[Library_Has_Content] + Skin.String(Background_Slideshow,Videos) + !String.IsEmpty(Window(home).Property(Background_Videos_Fanart))">$INFO[Window(home).Property(Background_Videos_Fanart)]</value>
+		<value condition="$EXP[Library_Has_Content] + Skin.String(Background_Slideshow,Movies) + !String.IsEmpty(Window(home).Property(Background_Movies_Fanart))">$INFO[Window(home).Property(Background_Movies_Fanart)]</value>
+		<value condition="$EXP[Library_Has_Content] + Skin.String(Background_Slideshow,TVShows) + !String.IsEmpty(Window(home).Property(Background_TVShows_Fanart))">$INFO[Window(home).Property(Background_TVShows_Fanart)]</value>
+		<value condition="$EXP[Library_Has_Content] + Skin.String(Background_Slideshow,Artists) + !String.IsEmpty(Window(home).Property(Background_Artists_Fanart))">$INFO[Window(home).Property(Background_Artists_Fanart)]</value>
+	</variable>
+
 	<variable name="Background_Home_Texture">
-		<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + $EXP[Library_Has_Content] + [Skin.String(Home_Background_Override_Source,Global) | !Skin.String(Home_Background_Override_Source)] + !String.IsEmpty(Window(home).Property(Background_Global_Fanart))">$INFO[Window(home).Property(Background_Global_Fanart)]</value>
-		<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + $EXP[Library_Has_Content] + Skin.String(Home_Background_Override_Source,Movies) + !String.IsEmpty(Window(home).Property(Background_Movies_Fanart))">$INFO[Window(home).Property(Background_Movies_Fanart)]</value>
-		<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + $EXP[Library_Has_Content] + Skin.String(Home_Background_Override_Source,TVShows) + !String.IsEmpty(Window(home).Property(Background_TVShows_Fanart))">$INFO[Window(home).Property(Background_TVShows_Fanart)]</value>
-		<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + $EXP[Library_Has_Content] + Skin.String(Home_Background_Override_Source,Videos) + !String.IsEmpty(Window(home).Property(Background_Videos_Fanart))">$INFO[Window(home).Property(Background_Videos_Fanart)]</value>
-		<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + $EXP[Library_Has_Content] + Skin.String(Home_Background_Override_Source,Artists) + !String.IsEmpty(Window(home).Property(Background_Artists_Fanart))">$INFO[Window(home).Property(Background_Artists_Fanart)]</value>
-		<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.String(Home_Background_Override_Path) + !String.IsEmpty(Control.GetLabel(3401))">$INFO[Control.GetLabel(3401)]</value>
-		<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.String(Home_Background_Override_Path)">$INFO[Container(3300).ListItem.Art(fanart)]</value>
+		<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + $EXP[Library_Has_Content] + Skin.String(Background_Slideshow,Custom) + Skin.String(Background_Slideshow_Custom_Path)">$INFO[Window(home).Property(Background_Custom_Fanart)]</value>
+		<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + $EXP[Library_Has_Content] + Skin.String(Background_Slideshow,Global) + !String.IsEmpty(Window(home).Property(Background_Global_Fanart))">$INFO[Window(home).Property(Background_Global_Fanart)]</value>
+		<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + $EXP[Library_Has_Content] + Skin.String(Background_Slideshow,Videos) + !String.IsEmpty(Window(home).Property(Background_Videos_Fanart))">$INFO[Window(home).Property(Background_Videos_Fanart)]</value>
+		<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + $EXP[Library_Has_Content] + Skin.String(Background_Slideshow,Movies) + !String.IsEmpty(Window(home).Property(Background_Movies_Fanart))">$INFO[Window(home).Property(Background_Movies_Fanart)]</value>
+		<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + $EXP[Library_Has_Content] + Skin.String(Background_Slideshow,TVShows) + !String.IsEmpty(Window(home).Property(Background_TVShows_Fanart))">$INFO[Window(home).Property(Background_TVShows_Fanart)]</value>
+		<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + $EXP[Library_Has_Content] + Skin.String(Background_Slideshow,Artists) + !String.IsEmpty(Window(home).Property(Background_Artists_Fanart))">$INFO[Window(home).Property(Background_Artists_Fanart)]</value>
 		<value condition="!String.IsEmpty(Container(3000).ListItem.Property(backgroundPlaylist)) + !String.IsEmpty(Control.GetLabel(3401))">$INFO[Control.GetLabel(3401)]</value>
 		<value condition="!String.IsEmpty(Container(3000).ListItem.Property(backgroundPlaylist))">$INFO[Container(3300).ListItem.Art(fanart)]</value>
 		<value condition="!String.IsEmpty(Container(3000).ListItem.Property(background))">$INFO[Container(3000).ListItem.Property(background)]</value>
@@ -39,29 +51,17 @@
 	</variable>
 
 	<variable name="Background_Home_Clearlogo_Texture"> 
-		<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + $EXP[Library_Has_Content] + [Skin.String(Home_Background_Override_Source,Global) | !Skin.String(Home_Background_Override_Source)]">$INFO[Window(home).Property(Background_Global_Clearlogo)]</value>
-		<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + $EXP[Library_Has_Content] + Skin.String(Home_Background_Override_Source,Movies)">$INFO[Window(home).Property(Background_Movies_Clearlogo)]</value>
-		<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + $EXP[Library_Has_Content] + Skin.String(Home_Background_Override_Source,TVShows)">$INFO[Window(home).Property(Background_TVShows_Clearlogo)]</value>
-		<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + $EXP[Library_Has_Content] + Skin.String(Home_Background_Override_Source,Videos)">$INFO[Window(home).Property(Background_Videos_Clearlogo)]</value>
-		<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + $EXP[Library_Has_Content] + Skin.String(Home_Background_Override_Source,Artists)">$INFO[Window(home).Property(Background_Artists_Clearlogo)]</value>
-		<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + Skin.String(Home_Background_Override_Path)">$INFO[Container(3300).ListItem.Art(clearlogo)]</value>
+		<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + $EXP[Library_Has_Content] + Skin.String(Background_Slideshow,Custom) + Skin.String(Background_Slideshow_Custom_Path)">$INFO[Window(home).Property(Background_Custom_Clearlogo)]</value>
+		<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + $EXP[Library_Has_Content] + Skin.String(Background_Slideshow,Global)">$INFO[Window(home).Property(Background_Global_Clearlogo)]</value>
+		<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + $EXP[Library_Has_Content] + Skin.String(Background_Slideshow,Videos)">$INFO[Window(home).Property(Background_Videos_Clearlogo)]</value>
+		<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + $EXP[Library_Has_Content] + Skin.String(Background_Slideshow,Movies)">$INFO[Window(home).Property(Background_Movies_Clearlogo)]</value>
+		<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + $EXP[Library_Has_Content] + Skin.String(Background_Slideshow,TVShows)">$INFO[Window(home).Property(Background_TVShows_Clearlogo)]</value>
+		<value condition="Skin.HasSetting(Home_Background_Override_Enabled) + $EXP[Library_Has_Content] + Skin.String(Background_Slideshow,Artists)">$INFO[Window(home).Property(Background_Artists_Clearlogo)]</value>
 		<value condition="!String.IsEmpty(Container(3000).ListItem.Property(backgroundPlaylist))">$INFO[Container(3300).ListItem.Art(clearlogo)]</value>
 		<value condition="!String.IsEmpty(Container(3000).ListItem.Property(background))">$INFO[Container(3000).ListItem.Property(background)]</value>
 		<value>$INFO[Container(3300).ListItem.Art(clearlogo)]</value>
 	</variable>
 
-	<variable name="Background_Global_Texture">
-		<value condition="Window.IsVisible(loginscreen) + !String.IsEmpty(Container(3300).ListItem.Art(fanart))">$INFO[Container(3300).ListItem.Art(fanart)]</value>
-		<value condition="!String.Contains(Container.FolderPath,plugin://) + $EXP[Containers_Background] + !String.IsEmpty(Container(3300).ListItem.Art(fanart))">$INFO[Container(3300).ListItem.Art(fanart)]</value>
-		<value condition="$EXP[Library_Has_Content] + Window.IsVisible(videos) + !String.IsEmpty(Window(home).Property(Background_Videos))">$INFO[Window(home).Property(Background_Videos)]</value>
-		<value condition="$EXP[Library_Has_Content] + Window.IsVisible(music) + !String.IsEmpty(Window(home).Property(Background_Artists))">$INFO[Window(home).Property(Background_Artists)]</value>
-		<value condition="$EXP[Library_Has_Content] + Skin.String(Background_Slideshow,Global) + !String.IsEmpty(Window(home).Property(Background_Global_Fanart))">$INFO[Window(home).Property(Background_Global_Fanart)]</value>
-		<value condition="$EXP[Library_Has_Content] + Skin.String(Background_Slideshow,Videos) + !String.IsEmpty(Window(home).Property(Background_Videos_Fanart))">$INFO[Window(home).Property(Background_Videos_Fanart)]</value>
-		<value condition="$EXP[Library_Has_Content] + Skin.String(Background_Slideshow,Movies) + !String.IsEmpty(Window(home).Property(Background_Movies_Fanart))">$INFO[Window(home).Property(Background_Movies_Fanart)]</value>
-		<value condition="$EXP[Library_Has_Content] + Skin.String(Background_Slideshow,TVShows) + !String.IsEmpty(Window(home).Property(Background_TVShows_Fanart))">$INFO[Window(home).Property(Background_TVShows_Fanart)]</value>
-		<value condition="$EXP[Library_Has_Content] + Skin.String(Background_Slideshow,Artists) + !String.IsEmpty(Window(home).Property(Background_Artists_Fanart))">$INFO[Window(home).Property(Background_Artists_Fanart)]</value>
-	</variable>
-
 	<variable name="Infoscreen_Background_Texture">
 		<value condition="!String.IsEmpty(ListItem.Art(fanart1))">$INFO[Control.GetLabel(3401)]</value>
 		<value condition="String.IsEqual(ListItem.DBType,episode) + !String.IsEmpty(ListItem.Art(thumb))">$INFO[ListItem.Art(thumb)]</value>
diff --git a/16x9/Variables_Textures_Artwork_Widgets.xml b/16x9/Variables_Textures_Artwork_Widgets.xml
index 020a74ef..db6ca8e6 100644
--- a/16x9/Variables_Textures_Artwork_Widgets.xml
+++ b/16x9/Variables_Textures_Artwork_Widgets.xml
@@ -742,7 +742,7 @@
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(-1).Art(fanart)) + !Skin.String(Widget8_Display,Posters) + !String.IsEqual(ListItem(-1).DBType,album) + !String.IsEqual(ListItem(-1).DBType,song)">$INFO[ListItem(-1).Art(fanart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(-1).Art(tvshow.keyart)) + Skin.String(Widget8_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(-1).Art(tvshow.keyart)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(-1).Art(keyart)) + Skin.String(Widget8_Display,Posters) + $EXP[Prefer_Keyart]">$INFO[ListItem(-1).Art(keyart)]</value>
-		<value condition="!String.IsEmpty(Container.ListItemNoWrap(-21.Art(tvshow.poster)) + Skin.String(Widget8_Display,Posters)">$INFO[ListItem(-1).Art(tvshow.poster)]</value>
+		<value condition="!String.IsEmpty(Container.ListItemNoWrap(-1).Art(tvshow.poster)) + Skin.String(Widget8_Display,Posters)">$INFO[ListItem(-1).Art(tvshow.poster)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(-1).Art(poster)) + Skin.String(Widget8_Display,Posters)">$INFO[ListItem(-1).Art(poster)]</value>
 		<value condition="!String.IsEmpty(Container.ListItemNoWrap(-1).Icon)">$INFO[ListItem(-1).Icon]</value>
 	</variable>
diff --git a/README.md b/README.md
index a6d5cd67..eb454c21 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,11 @@ or send a letter to Creative Commons, 171 Second Street, Suite 300, San Francisc
 - removal of ken burns effect - remove param animation 
 - background not updating on some addonbrowser screens
 container animation between addonbrowser levels? (All repositories or add on repository (type))
+- clean up home background
+- login background
+- other window templates like addonbrowser?
+- Update readmes
+- Crop screensaver logo
 
 - Fixed bug causing dialogaddoninformation to lose focus on opening for some addons
 - Added fade effect to infoscreen thumbnail when shutdownmenu visible on top
diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
index 462efbeb..893a4492 100755
--- a/language/resource.language.en_gb/strings.po
+++ b/language/resource.language.en_gb/strings.po
@@ -652,7 +652,7 @@ msgstr ""
 #: NEW
 #/16x9/Content_Settings.xml
 msgctxt "#31487"
-msgid "Background panel opacity"
+msgid "Background panel opacity (%)"
 msgstr ""
 
 #: NEW
@@ -663,7 +663,7 @@ msgstr ""
 
 #/16x9/Content_Settings.xml
 msgctxt "#31412"
-msgid "Recommended Kodi settings"
+msgid "Recommended Kodi settings for Copacetic"
 msgstr ""
 
 #/16x9/Content_Settings.xml
@@ -758,7 +758,7 @@ msgstr ""
 
 #/16x9/Content_Settings.xml
 msgctxt "#31425"
-msgid "Enable background slideshows"
+msgid "Global"
 msgstr ""
 
 #/16x9/Content_Settings.xml
@@ -835,17 +835,17 @@ msgstr ""
 
 #/16x9/Content_Settings.xml
 msgctxt "#31433"
-msgid "Override home menu backgrounds"
+msgid "Override home background with global slideshow"
 msgstr ""
 
 #/16x9/Content_Settings.xml
 msgctxt "#31533"
-msgid "Set a global override for all default home menu shortcut slideshows or any backgrounds you configured for individual shortcuts in 'Home menu' settings under General > Menus. Choose from the preselected or custom global overrides below."
+msgid "EMPTY"
 msgstr ""
 
 #/16x9/Content_Settings.xml
 msgctxt "#31534"
-msgid "Make sure to enable background slideshows in General > Background Service for more slideshow options to choose from, or select your own custom path/playlist below."
+msgid "EMPTY"
 msgstr ""
 
 #/16x9/Content_Settings.xml