diff --git a/skin.aeon.nox.silvo/16x9/DialogConfirm.xml b/skin.aeon.nox.silvo/16x9/DialogConfirm.xml
index aee5da0cdf..73c25e5591 100644
--- a/skin.aeon.nox.silvo/16x9/DialogConfirm.xml
+++ b/skin.aeon.nox.silvo/16x9/DialogConfirm.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
 	<defaultcontrol>9000</defaultcontrol>
-	<onload>ClearProperty(BusySkinBackup,Home)</onload>
 	<onload condition="Control.IsVisible(10)">SetFocus(10)</onload>
 	<include>DialogOpenCloseAnimation</include>
 	<controls>
diff --git a/skin.aeon.nox.silvo/16x9/DialogVideoInfo.xml b/skin.aeon.nox.silvo/16x9/DialogVideoInfo.xml
index ddbbce1df3..5eb6f04b36 100644
--- a/skin.aeon.nox.silvo/16x9/DialogVideoInfo.xml
+++ b/skin.aeon.nox.silvo/16x9/DialogVideoInfo.xml
@@ -5,6 +5,7 @@
 	<onload condition="![Window.IsActive(home) + String.IsEqual(ListItem.DBTYPE,tvshow)] + ![String.IsEqual(Skin.String(CinemaVision.Button),$LOCALIZE[31232]) + System.AddonIsEnabled(script.preshowexperience)] + !String.IsEqual(ListItem.Property(item.type),person)">SetFocus(8)</onload>
 	<onload condition="![Window.IsActive(home) + String.IsEqual(ListItem.DBTYPE,tvshow)] + String.IsEqual(Skin.String(CinemaVision.Button),$LOCALIZE[31232]) + System.AddonIsEnabled(script.preshowexperience)">SetFocus(909)</onload>
 	<onload condition="Window.IsActive(home) + String.IsEqual(ListItem.DBTYPE,tvshow)">SetFocus(808)</onload>
+	<onload condition="String.IsEqual(ListItem.Property(item.type),person)">SetProperty(SlideshowActorName,$ESCINFO[ListItem.Label],Home)</onload>
 	<onunload condition="!String.IsEmpty(Window(movieinformation).Property(FSFanart))">ClearProperty(FSFanart,movieinformation)</onunload>
 	<controls>
 		<control type="textbox" id="4">
@@ -593,7 +594,7 @@
 						<onclick condition="String.IsEqual(ListItem.DBTYPE,movie) + String.IsEmpty(ListItem.SetID)">ActivateWindow(Videos,videodb://movies/titles/$INFO[ListItem.DBID],return)</onclick>
 						<onclick condition="String.IsEqual(ListItem.DBTYPE,movie) + !String.IsEmpty(ListItem.SetID)">ActivateWindow(Videos,videodb://movies/sets/$INFO[ListItem.SetId]/?setid=$INFO[ListItem.SetId],return)</onclick>
 						<onclick condition="String.IsEqual(ListItem.DBTYPE,tvshow)">ActivateWindow(Videos,videodb://tvshows/titles/$INFO[ListItem.DBID],return)</onclick>
-						<visible>Window.IsActive(home) + [String.IsEqual(ListItem.DBTYPE,movie) | String.IsEqual(ListItem.DBTYPE,tvshow)]</visible>
+						<visible>Window.IsActive(home) + [String.IsEqual(ListItem.DBTYPE,movie) + !String.IsEmpty(ListItem.SetID) | String.IsEqual(ListItem.DBTYPE,tvshow)]</visible>
 					</control>
 					<control type="button" id="909">
 						<description>Preshowexperience</description>
@@ -982,5 +983,26 @@
 				</control>
 			</control>
 		</control>
+		<control id="99" type="button">
+			<onup>noop</onup>
+			<ondown>noop</ondown>
+			<onleft condition="!String.IsEmpty(Container(900020).ListItemNoWrap(-1).Label)">Control.Move(900020,-1)</onleft>
+			<onright condition="!String.IsEmpty(Container(900020).ListItemNoWrap(1).Label)">Control.Move(900020,1)</onright>
+			<onback>900020</onback>
+			<include>HiddenObject</include>
+		</control>
+		<control type="group">
+			<visible>Control.HasFocus(99)</visible>
+			<include>VisibleFadeAnimation</include>
+			<control type="image">
+				<include>FullscreenDimensions</include>
+				<texture>colors/black.png</texture>
+			</control>
+			<control type="image">
+				<include>FullscreenDimensions</include>
+				<aspectratio>keep</aspectratio>
+				<texture>$INFO[Container(900020).ListItem.Icon]</texture>
+			</control>
+		</control>
 	</controls>
 </window>
\ No newline at end of file
diff --git a/skin.aeon.nox.silvo/16x9/FileBrowser.xml b/skin.aeon.nox.silvo/16x9/FileBrowser.xml
index 84bd04c593..115ffcaae9 100644
--- a/skin.aeon.nox.silvo/16x9/FileBrowser.xml
+++ b/skin.aeon.nox.silvo/16x9/FileBrowser.xml
@@ -192,6 +192,13 @@
 						<width>527</width>
 						<radioposx>430</radioposx>
 						<label>$LOCALIZE[749]</label>
+						<visible>Control.IsEnabled(416)</visible>
+					</control>
+					<control type="button" id="4016">
+						<description>Empty button</description>
+						<texturenofocus colordiffuse="grey3" border="1">listselect_fo.png</texturenofocus>
+						<width>527</width>
+						<visible>!Control.IsEnabled(416)</visible>
 					</control>
 				</control>
 			</control>
diff --git a/skin.aeon.nox.silvo/16x9/Includes.xml b/skin.aeon.nox.silvo/16x9/Includes.xml
index 722a4ae4e6..4cac4f4172 100644
--- a/skin.aeon.nox.silvo/16x9/Includes.xml
+++ b/skin.aeon.nox.silvo/16x9/Includes.xml
@@ -356,7 +356,6 @@
 			<include>ButtonCommonValues</include>
 			<label>$LOCALIZE[33068]</label>
 			<onclick>ActivateWindow(1128)</onclick>
-			<visible>!Window.IsActive(FavouritesBrowser)</visible>
 		</control>
 	</include>
 	<include name="PVRMediaMenu">
@@ -1129,9 +1128,10 @@
 		</control>
 		<control type="panel" id="900020">
 			<visible allowhiddenfocus="true">Integer.IsGreater(Container(900020).NumItems,0)</visible>
+			<onclick>SetFocus(99)</onclick>
 			<include content="ExtendedInfoListLayout">
 				<param name="PanelID">900020</param>
-				<param name="content">plugin://plugin.video.themoviedb.helper?info=images&amp;type=person&amp;query=$INFO[ListItem.Label]</param>
+				<param name="content">plugin://plugin.video.themoviedb.helper?info=images&amp;type=person&amp;query='"$ESCINFO[ListItem.Label]"'</param>
 			</include>
 		</control>
 	</include>
diff --git a/skin.aeon.nox.silvo/16x9/Includes_Backgrounds.xml b/skin.aeon.nox.silvo/16x9/Includes_Backgrounds.xml
index 1de983856f..46043443f0 100644
--- a/skin.aeon.nox.silvo/16x9/Includes_Backgrounds.xml
+++ b/skin.aeon.nox.silvo/16x9/Includes_Backgrounds.xml
@@ -121,6 +121,7 @@
 				<include condition="Window.IsActive(settings) | Window.IsActive(SettingsCategory.xml) | Window.IsActive(systeminfo) | Window.IsActive(skinsettings) | Window.IsActive(addonbrowser) | Window.IsActive(filemanager) | Window.IsActive(eventlog)">SystemFallback</include>
 				<include condition="Window.IsActive(videos) | Window.IsActive(videoplaylist)">VideoFallback</include>
 				<include condition="Window.IsActive(games)">GamesFallback</include>
+				<include condition="Window.IsActive(favouritesbrowser)">FavouritesFallback</include>
 				<item>
 					<thumb>$INFO[Window(Home).Property(fakelabel)]</thumb>
 					<visible>no</visible>
@@ -518,6 +519,11 @@
 			<visible>![Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes) | Container.Content(movies) | Container.Content(musicvideos)]</visible>
 		</item>
 	</include>
+	<include name="FavouritesFallback">
+		<item>
+			<thumb>$INFO[Skin.String(Favourites.Fallback)]</thumb>
+		</item>
+	</include>
 	<include name="LibreELECBG">
 		<control type="image">
 			<texture background="true">special://skin/extras/backgrounds/le_bg.jpg</texture>
diff --git a/skin.aeon.nox.silvo/16x9/Includes_DialogSettings.xml b/skin.aeon.nox.silvo/16x9/Includes_DialogSettings.xml
index 0786727b54..708f480e10 100644
--- a/skin.aeon.nox.silvo/16x9/Includes_DialogSettings.xml
+++ b/skin.aeon.nox.silvo/16x9/Includes_DialogSettings.xml
@@ -27,7 +27,7 @@
 			</control>
 			<control type="label" id="$PARAM[header_id]">
 				<description>Header label</description>
-				<width>1180</width>
+				<width>1345</width>
 				<height>70</height>
 				<font>font16_title_bold</font>
 				<textoffsetx>15</textoffsetx>
@@ -128,20 +128,20 @@
 		</definition>
 	</include>
 	<include name="VideoOSDSettings">
-		<control type="radiobutton" id="90201">
-			<width>1498</width>
-			<radioposx>1396</radioposx>
-			<label>$LOCALIZE[31508]</label>
-			<onclick>Skin.ToggleSetting(VideoOSDOnTop)</onclick>
-			<selected>Skin.HasSetting(VideoOSDOnTop)</selected>
-		</control>
-		<control type="button" id="90202">
+		<control type="button" id="90201">
 			<width>1498</width>
 			<label>$LOCALIZE[31577]</label>
 			<label2>[COLOR $VAR[ThemeLabelColor]]$VAR[AutoHideVideoOSDLabelVar][/COLOR]</label2>
 			<onclick>SetProperty(CustomSelect,autohidevideoosd,Home)</onclick>
 			<onclick>ActivateWindow(1129)</onclick>
 		</control>
+		<control type="radiobutton" id="90202">
+			<width>1498</width>
+			<radioposx>1396</radioposx>
+			<label>$LOCALIZE[31508]</label>
+			<onclick>Skin.ToggleSetting(VideoOSDOnTop)</onclick>
+			<selected>Skin.HasSetting(VideoOSDOnTop)</selected>
+		</control>
 		<control type="radiobutton" id="90203">
 			<width>1498</width>
 			<radioposx>1396</radioposx>
@@ -223,6 +223,13 @@
 	</include>
 	<include name="MusicOSDSettings">
 		<control type="button" id="90201">
+			<width>1498</width>
+			<label>$LOCALIZE[31577]</label>
+			<label2>[COLOR $VAR[ThemeLabelColor]]$VAR[AutoHideMusicOSDLabelVar][/COLOR]</label2>
+			<onclick>SetProperty(CustomSelect,autohidemusicosd,Home)</onclick>
+			<onclick>ActivateWindow(1129)</onclick>
+		</control>
+		<control type="button" id="90217">
 			<description>Background Button</description>
 			<width>1498</width>
 			<label>$LOCALIZE[31102]:</label>
diff --git a/skin.aeon.nox.silvo/16x9/Includes_Select.xml b/skin.aeon.nox.silvo/16x9/Includes_Select.xml
index e6820cdec3..057ced3694 100644
--- a/skin.aeon.nox.silvo/16x9/Includes_Select.xml
+++ b/skin.aeon.nox.silvo/16x9/Includes_Select.xml
@@ -24,22 +24,29 @@
 				<param name="more_visible">Control.IsVisible(8)</param>
 			</include>
 			<control type="group">
-				<left>958</left>
-				<top>69</top>
+				<left>957</left>
+				<top>68</top>
+				<visible>Control.IsVisible(6)</visible>
 				<control type="image">
-					<width>540</width>
-					<height>540</height>
+					<left>2</left>
+					<top>1</top>
+					<width>539</width>
+					<height>539</height>
 					<fadetime>300</fadetime>
 					<aspectratio>keep</aspectratio>
 					<texture background="true">$INFO[Container(6).ListItem.Icon]</texture>
-					<visible>Control.IsVisible(6)</visible>
+				</control>
+				<control type="image">
+					<width>1</width>
+					<height>542</height>
+					<texture colordiffuse="grey4">separator_vertical.png</texture>
 				</control>
 			</control>
 			<control type="group" id="9000">
 				<control type="list" id="3">
 					<left>1</left>
 					<top>68</top>
-					<width>957</width>
+					<width>956</width>
 					<height>540</height>
 					<onup>3</onup>
 					<ondown>3</ondown>
@@ -47,7 +54,7 @@
 					<onright>60</onright>
 					<pagecontrol>60</pagecontrol>
 					<scrolltime tween="quadratic" easing="out">200</scrolltime>
-					<itemlayout height="60" width="957">
+					<itemlayout height="60" width="950">
 						<control type="label">
 							<width>950</width>
 							<height>60</height>
@@ -68,11 +75,11 @@
 							<label>$INFO[ListItem.Label2]</label>
 						</control>
 					</itemlayout>
-					<focusedlayout height="60" width="957">
+					<focusedlayout height="60" width="956">
 						<control type="group">
 							<animation effect="fade" start="100" end="70" time="300" tween="sine" easing="inout" condition="!Control.HasFocus(3)">Conditional</animation>
 							<control type="image">
-								<width>957</width>
+								<width>956</width>
 								<height>60</height>
 								<texture colordiffuse="$VAR[HighlightBarColor]" border="5">listselect_fo.png</texture>
 							</control>
@@ -100,7 +107,7 @@
 				<control type="list" id="6">
 					<left>1</left>
 					<top>68</top>
-					<width>957</width>
+					<width>956</width>
 					<height>540</height>
 					<onup>6</onup>
 					<ondown>6</ondown>
@@ -129,11 +136,11 @@
 							<label>$VAR[DialogSelectLabel2Var]</label>
 						</control>
 					</itemlayout>
-					<focusedlayout height="60" width="957">
+					<focusedlayout height="60" width="956">
 						<control type="group">
 							<animation effect="fade" start="100" end="70" time="300" tween="sine" easing="inout" condition="!Control.HasFocus(6)">Conditional</animation>
 							<control type="image">
-								<width>957</width>
+								<width>956</width>
 								<height>60</height>
 								<texture colordiffuse="$VAR[HighlightBarColor]" border="5">listselect_fo.png</texture>
 							</control>
@@ -159,7 +166,7 @@
 				</control>
 			</control>
 			<control type="scrollbar" id="60">
-				<left>949</left>
+				<left>948</left>
 				<top>69</top>
 				<width>8</width>
 				<height>540</height>
@@ -477,6 +484,7 @@
 				<include condition="String.IsEqual(Window(Home).Property(CustomSelect),pvrguidelogos)">SelectPVRGuideLogos</include>
 				<include condition="String.IsEqual(Window(Home).Property(CustomSelect),musicgenreiconpath)">SelectMusicGenreIconPath</include>
 				<include condition="String.IsEqual(Window(Home).Property(CustomSelect),autohidevideoosd)">SelectAutoHideVideoOSD</include>
+				<include condition="String.IsEqual(Window(Home).Property(CustomSelect),autohidemusicosd)">SelectAutoHideMusicOSD</include>
 				<include condition="String.IsEqual(Window(Home).Property(CustomSelect),rightlistbackgrounddim)">SelectRightListBackgroundDim</include>
 				<include condition="String.IsEqual(Window(Home).Property(CustomSelect),fallbackbackground)">SelectFallbackBackground</include>
 				<include condition="String.IsEqual(Window(Home).Property(CustomSelect),startupintro)">SelectStartupIntro</include>
@@ -633,7 +641,7 @@
 			<onclick>Dialog.Close(1129)</onclick>
 			<onclick>ClearProperty(ActorID,movieinformation)</onclick>
 			<onclick>ClearProperty(DirectorID,movieinformation)</onclick>
-			<onclick>RunScript(plugin.video.themoviedb.helper,add_query=$INFO[Window(movieinformation).Property(ActorName)],type=person,call_auto=1111)</onclick>
+			<onclick>RunScript(plugin.video.themoviedb.helper,add_query='"$ESCINFO[Window(movieinformation).Property(ActorName)]"',type=person,call_auto=1111)</onclick>
 			<onclick>ClearProperty(ActorName,movieinformation)</onclick>
 		</item>
 	</include>
@@ -1137,6 +1145,68 @@
 			<onclick>Skin.SetString(AutoCloseVideoOSD,90)</onclick>
 		</item>
 	</include>
+	<include name="SelectAutoHideMusicOSD">
+		<item>
+			<label>$LOCALIZE[13113]</label>
+			<onclick>Dialog.Close(1129)</onclick>
+			<onclick>Skin.Reset(AutoCloseMusicOSD)</onclick>
+		</item>
+		<item>
+			<label>5 $LOCALIZE[31090]</label>
+			<onclick>Dialog.Close(1129)</onclick>
+			<onclick>Skin.SetString(AutoCloseMusicOSD,5)</onclick>
+		</item>
+		<item>
+			<label>6 $LOCALIZE[31090]</label>
+			<onclick>Dialog.Close(1129)</onclick>
+			<onclick>Skin.SetString(AutoCloseMusicOSD,6)</onclick>
+		</item>
+		<item>
+			<label>7 $LOCALIZE[31090]</label>
+			<onclick>Dialog.Close(1129)</onclick>
+			<onclick>Skin.SetString(AutoCloseMusicOSD,7)</onclick>
+		</item>
+		<item>
+			<label>8 $LOCALIZE[31090]</label>
+			<onclick>Dialog.Close(1129)</onclick>
+			<onclick>Skin.SetString(AutoCloseMusicOSD,8)</onclick>
+		</item>
+		<item>
+			<label>9 $LOCALIZE[31090]</label>
+			<onclick>Dialog.Close(1129)</onclick>
+			<onclick>Skin.SetString(AutoCloseMusicOSD,9)</onclick>
+		</item>
+		<item>
+			<label>10 $LOCALIZE[31090]</label>
+			<onclick>Dialog.Close(1129)</onclick>
+			<onclick>Skin.SetString(AutoCloseMusicOSD,10)</onclick>
+		</item>
+		<item>
+			<label>15 $LOCALIZE[31090]</label>
+			<onclick>Dialog.Close(1129)</onclick>
+			<onclick>Skin.SetString(AutoCloseMusicOSD,15)</onclick>
+		</item>
+		<item>
+			<label>20 $LOCALIZE[31090]</label>
+			<onclick>Dialog.Close(1129)</onclick>
+			<onclick>Skin.SetString(AutoCloseMusicOSD,20)</onclick>
+		</item>
+		<item>
+			<label>30 $LOCALIZE[31090]</label>
+			<onclick>Dialog.Close(1129)</onclick>
+			<onclick>Skin.SetString(AutoCloseMusicOSD,30)</onclick>
+		</item>
+		<item>
+			<label>60 $LOCALIZE[31090]</label>
+			<onclick>Dialog.Close(1129)</onclick>
+			<onclick>Skin.SetString(AutoCloseMusicOSD,60)</onclick>
+		</item>
+		<item>
+			<label>90 $LOCALIZE[31090]</label>
+			<onclick>Dialog.Close(1129)</onclick>
+			<onclick>Skin.SetString(AutoCloseMusicOSD,90)</onclick>
+		</item>
+	</include>
 	<include name="SelectRightListBackgroundDim">
 		<item>
 			<label>50% - $LOCALIZE[571]</label>
@@ -1163,67 +1233,56 @@
 		<item>
 			<label>$LOCALIZE[13007]</label>
 			<onclick>Skin.Reset(ItemToEdit.MultiFanart)</onclick>
-			<onclick>Skin.Reset(ItemToEdit.BGType)</onclick>
 			<onclick>Skin.SetString($INFO[Window(Home).Property(Nox.Temp)],$INFO[Skin.String(ItemToEdit.MultiFanart)])</onclick>
-			<onclick>Skin.SetString($INFO[Window(Home).Property(Nox.BGType)],$INFO[Skin.String(ItemToEdit.BGType)])</onclick>
 			<onclick>Dialog.Close(1129)</onclick>
 		</item>
 		<item>
 			<label>$LOCALIZE[31110]</label>
-			<onclick>Skin.SetString(ItemToEdit.BGType,1)</onclick>
 			<onclick>Skin.SetImage(ItemToEdit.MultiFanart,special://skin/backgrounds/solidcolors)</onclick>
 			<onclick>Dialog.Close(1129)</onclick>
 		</item>
 		<item>
 			<label>$LOCALIZE[31023]</label>
-			<onclick>Skin.SetString(ItemToEdit.BGType,1)</onclick>
 			<onclick>Skin.SetImage(ItemToEdit.MultiFanart)</onclick>
 			<onclick>Dialog.Close(1129)</onclick>
 		</item>
 		<item>
 			<label>$LOCALIZE[31022]</label>
-			<onclick>Skin.SetString(ItemToEdit.BGType,2)</onclick>
 			<onclick>Skin.SetPath(ItemToEdit.MultiFanart)</onclick>
 			<onclick>Dialog.Close(1129)</onclick>
 		</item>
 		<item>
 			<label>$LOCALIZE[31062]</label>
-			<onclick>Skin.SetString(ItemToEdit.BGType,3)</onclick>
 			<onclick>Skin.SetString(ItemToEdit.MultiFanart,1)</onclick>
 			<onclick>Dialog.Close(1129)</onclick>
 			<visible>System.AddonIsEnabled(script.grab.fanart) + !String.IsEqual(Window(Home).Property(Nox.Temp),Profiles.Fallback)</visible>
 		</item>
 		<item>
 			<label>$LOCALIZE[31063]</label>
-			<onclick>Skin.SetString(ItemToEdit.BGType,3)</onclick>
 			<onclick>Skin.SetString(ItemToEdit.MultiFanart,2)</onclick>
 			<onclick>Dialog.Close(1129)</onclick>
 			<visible>System.AddonIsEnabled(script.grab.fanart) + !String.IsEqual(Window(Home).Property(Nox.Temp),Profiles.Fallback)</visible>
 		</item>
 		<item>
 			<label>$LOCALIZE[31064]</label>
-			<onclick>Skin.SetString(ItemToEdit.BGType,3)</onclick>
 			<onclick>Skin.SetString(ItemToEdit.MultiFanart,3)</onclick>
 			<onclick>Dialog.Close(1129)</onclick>
 			<visible>System.AddonIsEnabled(script.grab.fanart) + !String.IsEqual(Window(Home).Property(Nox.Temp),Profiles.Fallback)</visible>
 		</item>
 		<item>
 			<label>$LOCALIZE[31065]</label>
-			<onclick>Skin.SetString(ItemToEdit.BGType,3)</onclick>
 			<onclick>Skin.SetString(ItemToEdit.MultiFanart,4)</onclick>
 			<onclick>Dialog.Close(1129)</onclick>
 			<visible>System.AddonIsEnabled(script.grab.fanart) + !String.IsEqual(Window(Home).Property(Nox.Temp),Profiles.Fallback)</visible>
 		</item>
 		<item>
 			<label>$LOCALIZE[31066]</label>
-			<onclick>Skin.SetString(ItemToEdit.BGType,3)</onclick>
 			<onclick>Skin.SetString(ItemToEdit.MultiFanart,5)</onclick>
 			<onclick>Dialog.Close(1129)</onclick>
 			<visible>System.AddonIsEnabled(script.grab.fanart) + !String.IsEqual(Window(Home).Property(Nox.Temp),Profiles.Fallback)</visible>
 		</item>
 		<item>
 			<label>$LOCALIZE[31084]</label>
-			<onclick>Skin.SetString(ItemToEdit.BGType,6)</onclick>
 			<onclick>Skin.SetString(ItemToEdit.MultiFanart,6)</onclick>
 			<onclick>Dialog.Close(1129)</onclick>
 			<visible>!String.IsEmpty(Skin.String(weatherfanart.path)) + !String.IsEqual(Window(Home).Property(Nox.Temp),Profiles.Fallback)</visible>
diff --git a/skin.aeon.nox.silvo/16x9/Includes_ViewSettings.xml b/skin.aeon.nox.silvo/16x9/Includes_ViewSettings.xml
index 1c7b60a35d..b1f6cb5630 100644
--- a/skin.aeon.nox.silvo/16x9/Includes_ViewSettings.xml
+++ b/skin.aeon.nox.silvo/16x9/Includes_ViewSettings.xml
@@ -837,7 +837,7 @@
 			<label>$LOCALIZE[31606]</label>
 			<onclick>Skin.ToggleSetting(rightlistlogomovie)</onclick>
 			<selected>Skin.HasSetting(rightlistlogomovie)</selected>
-			<visible>Container.Content(movies)</visible>
+			<visible>Container.Content(movies) | Container.Content(sets)</visible>
 		</control>
 		<control type="radiobutton" id="1519">
 			<textwidth>375</textwidth>
@@ -1003,14 +1003,14 @@
 			<onclick>Skin.ToggleSetting(Enable.MyFlix.OpenCase)</onclick>
 			<onclick condition="String.IsEmpty(Skin.String(MyFlix.Delay))">Skin.SetString(MyFlix.Delay,2)</onclick>
 			<selected>Skin.HasSetting(Enable.MyFlix.OpenCase)</selected>
-			<visible>Container.Content(movies) + !Skin.HasSetting(Enable.MyFlix.MovieLandscape)</visible>
+			<visible>[Container.Content(movies) | Container.Content(sets)] + !Skin.HasSetting(Enable.MyFlix.MovieLandscape)</visible>
 		</control>
 		<control type="button" id="1518">
 			<include>ButtonCommonValues</include>
 			<label>   - $LOCALIZE[31973]</label>
 			<label2>[COLOR $VAR[ThemeLabelColor]]$VAR[MyFlixDelayLocalizeVar][/COLOR]</label2>
 			<onclick>$VAR[MyFlixModDelayOnClickVar]</onclick>
-			<visible>Container.Content(movies) + !Skin.HasSetting(Enable.MyFlix.MovieLandscape) + Skin.HasSetting(Enable.MyFlix.OpenCase)</visible>
+			<visible>[Container.Content(movies) | Container.Content(sets)] + !Skin.HasSetting(Enable.MyFlix.MovieLandscape) + Skin.HasSetting(Enable.MyFlix.OpenCase)</visible>
 		</control>
 		<control type="radiobutton" id="1519">
 			<include>ButtonCommonValues</include>
diff --git a/skin.aeon.nox.silvo/16x9/MyFavourites.xml b/skin.aeon.nox.silvo/16x9/MyFavourites.xml
index 21f9f2b445..fcdb24d4ab 100644
--- a/skin.aeon.nox.silvo/16x9/MyFavourites.xml
+++ b/skin.aeon.nox.silvo/16x9/MyFavourites.xml
@@ -8,6 +8,7 @@
 	<onunload>ClearProperty(MediaMenu,Home)</onunload>
 	<onunload>ClearProperty(Window.HasSettings,Home)</onunload>
 	<controls>
+		<include>CommonBackground</include>
 		<control type="group">
 			<include>WindowOpenCloseAnimation</include>
 			<include condition="!Skin.HasSetting(Enable.SlimList)">AddonList</include>
diff --git a/skin.aeon.nox.silvo/16x9/SkinSettings.xml b/skin.aeon.nox.silvo/16x9/SkinSettings.xml
index 094951f243..45551a297e 100644
--- a/skin.aeon.nox.silvo/16x9/SkinSettings.xml
+++ b/skin.aeon.nox.silvo/16x9/SkinSettings.xml
@@ -3,7 +3,6 @@
 	<defaultcontrol always="true">9000</defaultcontrol>
 	<onload>SetProperty(Window.HasSettings,True,Home)</onload>
 	<onload>ClearProperty(MediaMenu,Home)</onload>
-	<onload>ClearProperty(BusySkinBackup,Home)</onload>
 	<onunload>ClearProperty(MediaMenu,Home)</onunload>
 	<onunload>ClearProperty(Window.HasSettings,Home)</onunload>
 	<onunload condition="!String.IsEmpty(Skin.String(FanartTimePerImage))">RunScript(script.grab.fanart,mode=random,refresh=$INFO[Skin.String(FanartTimePerImage)])</onunload>
diff --git a/skin.aeon.nox.silvo/16x9/Timers.xml b/skin.aeon.nox.silvo/16x9/Timers.xml
index 8f0903e7d6..7285265bd7 100644
--- a/skin.aeon.nox.silvo/16x9/Timers.xml
+++ b/skin.aeon.nox.silvo/16x9/Timers.xml
@@ -4,7 +4,14 @@
 		<start reset="true">Window.IsActive(videoosd) + !System.IdleTime(1) + !String.IsEmpty(Skin.String(AutoCloseVideoOSD))</start>
 		<reset>!System.IdleTime(1) + Window.IsActive(videoosd) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(AutoCloseVideoOSD), 1)</reset>
 		<stop>!Window.IsActive(videoosd) | String.IsEmpty(Skin.String(AutoCloseVideoOSD)) | Window.IsActive(videoosd) + !String.IsEmpty(Skin.String(AutoCloseVideoOSD)) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(AutoCloseVideoOSD),Skin.Numeric(AutoCloseVideoOSD))</stop>
-		<onstop condition="![Window.IsVisible(DialogSettings.xml) | Window.IsVisible(SubtitleSearch) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(1114) | Window.IsVisible(FileBrowser)]">Dialog.Close(videoosd)</onstop>
+		<onstop condition="![Window.IsVisible(DialogSettings.xml) | Window.IsVisible(SubtitleSearch) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(1114) | Window.IsVisible(FileBrowser) | Window.IsVisible(addonsettings) | Window.IsVisible(selectdialog)]">Dialog.Close(videoosd)</onstop>
+	</timer>
+	<timer>
+		<name>autoclosemusicosd</name>
+		<start reset="true">Window.IsActive(musicosd) + !System.IdleTime(1) + !String.IsEmpty(Skin.String(AutoCloseMusicOSD))</start>
+		<reset>!System.IdleTime(1) + Window.IsActive(musicosd) + !String.IsEmpty(Skin.String(AutoCloseMusicOSD)) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(AutoCloseMusicOSD), 1)</reset>
+		<stop>!Window.IsActive(musicosd) | String.IsEmpty(Skin.String(AutoCloseMusicOSD)) | [Window.IsActive(musicosd) + !String.IsEmpty(Skin.String(AutoCloseMusicOSD)) + Integer.IsGreaterOrEqual(Skin.TimerElapsedSecs(AutoCloseMusicOSD),Skin.Numeric(AutoCloseMusicOSD))]</stop>
+		<onstop condition="![Window.IsVisible(DialogSettings.xml) | Window.IsVisible(1114) | Window.IsVisible(FileBrowser) | Window.IsVisible(addonsettings) | Window.IsVisible(selectdialog)]">Dialog.Close(musicosd)</onstop>
 	</timer>
 	<timer>
 		<name>takescreenshot</name>
diff --git a/skin.aeon.nox.silvo/16x9/Variables.xml b/skin.aeon.nox.silvo/16x9/Variables.xml
index 97db46693e..31668189d2 100644
--- a/skin.aeon.nox.silvo/16x9/Variables.xml
+++ b/skin.aeon.nox.silvo/16x9/Variables.xml
@@ -171,10 +171,11 @@
 		<value condition="Window.IsActive(programs) | Window.IsActive(1133)">SetProperty(Nox.Temp,Apps.Fallback,Home)</value>
 		<value condition="Window.IsActive(pictures)">SetProperty(Nox.Temp,Pictures.Fallback,Home)</value>
 		<value condition="Window.IsActive(games)">SetProperty(Nox.Temp,Games.Fallback,Home)</value>
+		<value condition="Window.IsActive(favouritesbrowser)">SetProperty(Nox.Temp,Favourites.Fallback,Home)</value>
 	</variable>
 	<variable name="BackgroundLabelVar">
-		<value condition="String.StartsWith(Container.FolderPath,videodb://tvshows/)">$LOCALIZE[20343]</value>
-		<value condition="String.StartsWith(Container.FolderPath,videodb://movies/)">$LOCALIZE[20342]</value>
+		<value condition="String.StartsWith(Container.FolderPath,videodb://tvshows/) | Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes)">$LOCALIZE[20343]</value>
+		<value condition="String.StartsWith(Container.FolderPath,videodb://movies/) | Container.Content(movies)">$LOCALIZE[20342]</value>
 		<value condition="Container.Content(musicvideos)">$LOCALIZE[20389]</value>
 		<value condition="Window.IsActive(videos) | Window.IsActive(videoplaylist)">$LOCALIZE[3]</value>
 		<value condition="Window.IsActive(music) | Window.IsActive(musicplaylist)">$LOCALIZE[2]</value>
@@ -183,6 +184,7 @@
 		<value condition="Window.IsActive(programs) | Window.IsActive(1133)">$LOCALIZE[24001]</value>
 		<value condition="Window.IsActive(pictures)">$LOCALIZE[1]</value>
 		<value condition="Window.IsActive(games)">$LOCALIZE[10821]</value>
+		<value condition="Window.IsActive(favouritesbrowser)">$LOCALIZE[1036]</value>
 	</variable>
 	<variable name="LoginProfileBackgroundVar">
 		<value condition="!String.IsEmpty(Skin.String(Profiles.Fallback))">$INFO[Skin.String(Profiles.Fallback)]</value>
@@ -267,7 +269,7 @@
 		<value condition="[String.IsEqual(ListItem.DBTYPE,tvshow) | String.IsEqual(ListItem.DBTYPE,season)] + !String.IsEqual(ListItem.Property(TotalEpisodes),ListItem.Property(UnWatchedEpisodes)) + !String.IsEqual(ListItem.Property(UnWatchedEpisodes),0)">$INFO[ListItem.Property(UnWatchedEpisodes)]</value>
 	</variable>
 	<variable name="RightListItemOverlayShowsVar">
-		<value condition="String.IsEqual(ListItem.DBTYPE,tvshow) | String.IsEqual(ListItem.DBTYPE,season)] + Integer.IsGreater(ListItem.Property(UnWatchedEpisodes),99)">   99 +</value>
+		<value condition="[String.IsEqual(ListItem.DBTYPE,tvshow) | String.IsEqual(ListItem.DBTYPE,season)] + Integer.IsGreater(ListItem.Property(UnWatchedEpisodes),99)">   99 +</value>
 		<value condition="[String.IsEqual(ListItem.DBTYPE,tvshow) | String.IsEqual(ListItem.DBTYPE,season)] + !String.IsEqual(ListItem.Property(UnWatchedEpisodes),0)">$INFO[ListItem.Property(UnWatchedEpisodes)]</value>
 	</variable>
 	<variable name="PlayerProgressIconVar">
@@ -708,7 +710,7 @@
 		<value condition="[Container.Content(movies) | Container.Content(episodes) | Container.Content(sets)] + !Skin.HasSetting(Enable.HourMinuteDuration)">[COLOR $VAR[ThemeLabelColor]]$LOCALIZE[2050]:[/COLOR][CR]$INFO[ListItem.Duration(mins),, $LOCALIZE[12391]]</value>
 		<value condition="[Container.Content(movies) | Container.Content(episodes) | Container.Content(sets)] + Skin.HasSetting(Enable.HourMinuteDuration)">[COLOR $VAR[ThemeLabelColor]]$LOCALIZE[2050]:[/COLOR][CR]$VAR[ItemDurationVar]</value>
 		<value condition="[Container.Content(movies) | Container.Content(episodes) | Container.Content(sets)]">[COLOR $VAR[ThemeLabelColor]]$LOCALIZE[2050]:[/COLOR][CR]$INFO[ListItem.Duration(mins),, $LOCALIZE[12391]]</value>
-		<value condition="Container.Content(tvshows) + !String.IsEmpty(Window(Home).Property(NextAired.Runtime))">[COLOR $VAR[ThemeLabelColor]]$LOCALIZE[2050]:[/COLOR][CR]$INFO[ListItem.Duration(mins),, $LOCALIZE[12391]]</value>
+		<value condition="Container.Content(tvshows) + !String.IsEmpty(Container(9143).ListItem.Property(Duration))">[COLOR $VAR[ThemeLabelColor]]$LOCALIZE[2050]:[/COLOR][CR]$INFO[Container(9143).ListItem.Property(Duration),, $LOCALIZE[12391]]</value>
 		<value condition="Container.Content(tvshows)">[COLOR $VAR[ThemeLabelColor]]$LOCALIZE[33054]:[/COLOR][CR]$INFO[ListItem.Property(TotalSeasons)]</value>
 		<value condition="Container.Content(seasons)">[COLOR $VAR[ThemeLabelColor]]$LOCALIZE[16101]:[/COLOR][CR]$INFO[ListItem.Property(UnWatchedEpisodes)]</value>
 	</variable>
@@ -820,6 +822,10 @@
 		<value condition="!String.IsEmpty(Skin.String(AutoCloseVideoOSD))">$INFO[Skin.String(AutoCloseVideoOSD)] $LOCALIZE[31090]</value>
 		<value>$LOCALIZE[13113]</value>
 	</variable>
+	<variable name="AutoHideMusicOSDLabelVar">
+		<value condition="!String.IsEmpty(Skin.String(AutoCloseMusicOSD))">$INFO[Skin.String(AutoCloseMusicOSD)] $LOCALIZE[31090]</value>
+		<value>$LOCALIZE[13113]</value>
+	</variable>
 	<variable name="VideoPlayerForwardRewindVar">
 		<value condition="Player.Forwarding2x | Player.Rewinding2x">2x</value>
 		<value condition="Player.Forwarding4x | Player.Rewinding4x">4x</value>
@@ -1422,6 +1428,7 @@
 		<value condition="ControlGroup(90001).HasFocus(90050) + !String.IsEmpty(Container(90050).ListItem.Icon) + !String.IsEqual(Container(90050).ListItem.Icon,DefaultActor.png)">$INFO[Container(90050).ListItem.Icon]</value>
 		<value condition="ControlGroup(90001).HasFocus(90011) + !String.IsEmpty(Container(90011).ListItem.Art(poster))">$INFO[Container(90011).ListItem.Art(poster)]</value>
 		<value condition="ControlGroup(90001).HasFocus(90012) + !String.IsEmpty(Container(90012).ListItem.Art(poster))">$INFO[Container(90012).ListItem.Art(poster)]</value>
+		<value condition="ControlGroup(90001).HasFocus(90013) + !String.IsEmpty(Container(90013).ListItem.Art(poster))">$INFO[Container(90013).ListItem.Art(poster)]</value>
 		<value condition="ControlGroup(90001).HasFocus(90014) + !String.IsEmpty(Container(90014).ListItem.Art(poster))">$INFO[Container(90014).ListItem.Art(poster)]</value>
 		<value condition="ControlGroup(90001).HasFocus(90016) + !String.IsEmpty(Container(90016).ListItem.Icon)">$INFO[Container(90016).ListItem.Icon]</value>
 		<value condition="ControlGroup(90001).HasFocus(90017) + !String.IsEmpty(Container(90017).ListItem.Art(poster))">$INFO[Container(90017).ListItem.Art(poster)]</value>
@@ -2144,12 +2151,12 @@
 	<!-- Dialog Settings Vars -->
 	<variable name="DialogSettingsHeaderVar">
 		<value condition="Control.HasFocus(97)">[COLOR $VAR[ThemeLabelColor]]$LOCALIZE[15067][/COLOR]</value>
-		<value condition="Window.IsVisible(DialogSelect.xml) + Control.HasFocus(95)">[COLOR $VAR[ThemeLabelColor]]$INFO[Control.GetLabel(5)][/COLOR]</value>
-		<value condition="Window.IsVisible(DialogSelect.xml)">$INFO[Control.GetLabel(1)]</value>
-		<value condition="Window.IsVisible(DialogSettings.xml)">$INFO[Control.GetLabel(2)]</value>
 		<value condition="Window.IsVisible(FileBrowser.xml) + Control.HasFocus(95)">[COLOR $VAR[ThemeLabelColor]]$LOCALIZE[186][/COLOR]</value>
 		<value condition="Window.IsVisible(FileBrowser.xml) + Control.HasFocus(98)">[COLOR $VAR[ThemeLabelColor]]$LOCALIZE[119][/COLOR]</value>
 		<value condition="Window.IsVisible(FileBrowser.xml)">$INFO[Control.GetLabel(411)][COLOR $VAR[ThemeLabelColor]]$INFO[Control.GetLabel(412), - ][/COLOR]</value>
+		<value condition="Window.IsVisible(DialogSelect.xml) + Control.HasFocus(95)">[COLOR $VAR[ThemeLabelColor]]$INFO[Control.GetLabel(5)][/COLOR]</value>
+		<value condition="Window.IsVisible(DialogSelect.xml)">$INFO[Control.GetLabel(1)]</value>
+		<value condition="Window.IsVisible(DialogSettings.xml)">$INFO[Control.GetLabel(2)]</value>
 		<value condition="Window.IsVisible(1114) + String.IsEqual(Window(Home).Property(DialogSettings),videoosd)">$LOCALIZE[31375] $LOCALIZE[5]</value>
 		<value condition="Window.IsVisible(1114) + String.IsEqual(Window(Home).Property(DialogSettings),musicosd)">$LOCALIZE[31376] $LOCALIZE[5]</value>
 		<value condition="Window.IsVisible(1114) + String.IsEqual(Window(Home).Property(DialogSettings),videoinfo)">$LOCALIZE[31190] $LOCALIZE[5]</value>
diff --git a/skin.aeon.nox.silvo/16x9/View_506_RightList.xml b/skin.aeon.nox.silvo/16x9/View_506_RightList.xml
index 05d157abbf..10be5522fd 100644
--- a/skin.aeon.nox.silvo/16x9/View_506_RightList.xml
+++ b/skin.aeon.nox.silvo/16x9/View_506_RightList.xml
@@ -12,7 +12,7 @@
 				<height>155</height>
 				<aspectratio aligny="bottom">keep</aspectratio>
 				<texture background="true">$VAR[ArtworkLogoVar]</texture>
-				<visible>[Skin.HasSetting(rightlistlogomovie) + Container.Content(movies) | Container.Content(sets)] | [Skin.HasSetting(rightlistlogotv) + [Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes)]]</visible>
+				<visible>[Skin.HasSetting(rightlistlogomovie) + [Container.Content(movies) | Container.Content(sets)]] | [Skin.HasSetting(rightlistlogotv) + [Container.Content(tvshows) | Container.Content(seasons) | Container.Content(episodes)]]</visible>
 			</control>
 			<control type="group">
 				<left>5</left>
diff --git a/skin.aeon.nox.silvo/16x9/View_50_List.xml b/skin.aeon.nox.silvo/16x9/View_50_List.xml
index 3fe5e69aa2..ffd260eb3c 100644
--- a/skin.aeon.nox.silvo/16x9/View_50_List.xml
+++ b/skin.aeon.nox.silvo/16x9/View_50_List.xml
@@ -1275,7 +1275,7 @@
 				</control>
 				<control type="panel" id="50">
 					<top>180</top>
-					<width>1140</width>
+					<width>1160</width>
 					<height>840</height>
 					<onleft>SetProperty(MediaMenu,True,Home)</onleft>
 					<onleft>SetFocus(9050)</onleft>
@@ -1378,9 +1378,9 @@
 							<visible>!ListItem.IsParentFolder + [ListItem.IsPlaying | ListItem.IsSelected]</visible>
 						</control>
 					</itemlayout>
-					<focusedlayout height="120" width="1140" condition="Container.Content(albums) | Container.Content(songs)">
+					<focusedlayout height="120" width="1160" condition="Container.Content(albums) | Container.Content(songs)">
 						<control type="image">
-							<width>1140</width>
+							<width>1160</width>
 							<height>120</height>
 							<texture colordiffuse="$VAR[HighlightBarColor]" border="4">listselect_fo.png</texture>
 							<visible>Control.HasFocus(50)</visible>
@@ -1498,9 +1498,9 @@
 							<label>$INFO[ListItem.Label2]</label>
 						</control>
 					</itemlayout>
-					<focusedlayout height="120" width="1140" condition="Container.Content(addons)">
+					<focusedlayout height="120" width="1160" condition="Container.Content(addons)">
 						<control type="image">
-							<width>1140</width>
+							<width>1160</width>
 							<height>120</height>
 							<texture colordiffuse="$VAR[HighlightBarColor]" border="4">listselect_fo.png</texture>
 							<visible>Control.HasFocus(50)</visible>
@@ -1587,9 +1587,9 @@
 							<label>$INFO[ListItem.Label2]</label>
 						</control>
 					</itemlayout>
-					<focusedlayout height="120" width="1140" condition="![Container.Content(albums) | Container.Content(songs) | Container.Content(addons)]">
+					<focusedlayout height="120" width="1160" condition="![Container.Content(albums) | Container.Content(songs) | Container.Content(addons)]">
 						<control type="image">
-							<width>1140</width>
+							<width>1160</width>
 							<height>120</height>
 							<texture colordiffuse="$VAR[HighlightBarColor]" border="4">listselect_fo.png</texture>
 							<visible>Control.HasFocus(50)</visible>
@@ -1842,7 +1842,7 @@
 							<font>font30</font>
 							<textcolor>grey2</textcolor>
 							<label>$INFO[ListItem.Label]</label>
-							<visible>String.IsEmpty(ListItem.AddonSummary)</visible>
+							<visible>String.IsEmpty(ListItem.AddonSummary) | String.IsEmpty(ListItem.Label2)</visible>
 						</control>
 						<control type="group">
 							<visible>!String.IsEmpty(ListItem.AddonSummary) + !String.IsEmpty(ListItem.Label2)</visible>
@@ -1917,7 +1917,7 @@
 							<height>120</height>
 							<font>font30</font>
 							<label>$INFO[ListItem.Label]</label>
-							<visible>String.IsEmpty(ListItem.AddonSummary)</visible>
+							<visible>String.IsEmpty(ListItem.AddonSummary) | String.IsEmpty(ListItem.Label2)</visible>
 						</control>
 						<control type="group">
 							<visible>!String.IsEmpty(ListItem.AddonSummary) + !String.IsEmpty(ListItem.Label2)</visible>
diff --git a/skin.aeon.nox.silvo/16x9/custom_1117_AddonStatus.xml b/skin.aeon.nox.silvo/16x9/custom_1117_AddonStatus.xml
index 74a6a987e5..dc0a621090 100644
--- a/skin.aeon.nox.silvo/16x9/custom_1117_AddonStatus.xml
+++ b/skin.aeon.nox.silvo/16x9/custom_1117_AddonStatus.xml
@@ -174,6 +174,21 @@
 						<onclick>InstallAddon(plugin.video.themoviedb.helper)</onclick>
 						<visible>!System.HasAddon(plugin.video.themoviedb.helper) | !System.AddonIsEnabled(plugin.video.themoviedb.helper)</visible>
 					</control>
+					<control type="button" id="208">
+						<include>SettingsButtonCommonValues</include>
+						<label>$INFO[System.AddonTitle(script.embuary.helper)]</label>
+						<label2>$INFO[System.AddonVersion(script.embuary.helper),v, [COLOR FF00991F]$LOCALIZE[31331][/COLOR]$LOCALIZE[31450]]</label2>
+						<onclick>Addon.OpenSettings(script.embuary.helper)</onclick>
+						<visible>System.HasAddon(script.embuary.helper) + System.AddonIsEnabled(script.embuary.helper)</visible>
+					</control>
+					<control type="button" id="209">
+						<include>SettingsButtonCommonValues</include>
+						<label>script.embuary.helper</label>
+						<label2>[COLOR invalid]$LOCALIZE[31332][/COLOR]$LOCALIZE[31451]</label2>
+						<onclick condition="!System.AddonIsEnabled(script.embuary.helper)">EnableAddon(script.embuary.helper)</onclick>
+						<onclick>InstallAddon(script.embuary.helper)</onclick>
+						<visible>!System.HasAddon(script.embuary.helper) | !System.AddonIsEnabled(script.embuary.helper)</visible>
+					</control>
 					<control type="button" id="204">
 						<include>SettingsButtonCommonValues</include>
 						<label>$INFO[System.AddonTitle(script.embuary.info)]</label>
@@ -204,21 +219,6 @@
 						<onclick>InstallAddon(script.cu.lrclyrics)</onclick>
 						<visible>!System.HasAddon(script.cu.lrclyrics) | !System.AddonIsEnabled(script.cu.lrclyrics)</visible>
 					</control>
-					<control type="button" id="208">
-						<include>SettingsButtonCommonValues</include>
-						<label>$INFO[System.AddonTitle(script.embuary.helper)]</label>
-						<label2>$INFO[System.AddonVersion(script.embuary.helper),v, [COLOR FF00991F]$LOCALIZE[31331][/COLOR]$LOCALIZE[31450]]</label2>
-						<onclick>Addon.OpenSettings(script.embuary.helper)</onclick>
-						<visible>System.HasAddon(script.embuary.helper) + System.AddonIsEnabled(script.embuary.helper)</visible>
-					</control>
-					<control type="button" id="209">
-						<include>SettingsButtonCommonValues</include>
-						<label>script.embuary.helper</label>
-						<label2>[COLOR invalid]$LOCALIZE[31332][/COLOR]$LOCALIZE[31451]</label2>
-						<onclick condition="!System.AddonIsEnabled(script.embuary.helper)">EnableAddon(script.embuary.helper)</onclick>
-						<onclick>InstallAddon(script.embuary.helper)</onclick>
-						<visible>!System.HasAddon(script.embuary.helper) | !System.AddonIsEnabled(script.embuary.helper)</visible>
-					</control>
 					<control type="button" id="210">
 						<include>SettingsButtonCommonValues</include>
 						<label>$INFO[System.AddonTitle(script.image.resource.select)]</label>
diff --git a/skin.aeon.nox.silvo/16x9/custom_1128_WindowCustomizer.xml b/skin.aeon.nox.silvo/16x9/custom_1128_WindowCustomizer.xml
index 6c58ff6589..f34c857586 100644
--- a/skin.aeon.nox.silvo/16x9/custom_1128_WindowCustomizer.xml
+++ b/skin.aeon.nox.silvo/16x9/custom_1128_WindowCustomizer.xml
@@ -17,8 +17,17 @@
 				<texturenofocus />
 				<visible>system.getbool(input.enablemouse)</visible>
 			</control>
+			<control type="label">
+				<top>80</top>
+				<width>400</width>
+				<height>48</height>
+				<textoffsetx>15</textoffsetx>
+				<font>font13_title</font>
+				<label>$VAR[BackgroundLabelVar] $LOCALIZE[31102]</label>
+				<textcolor>$VAR[ThemeLabelColor]</textcolor>
+			</control>
 			<control type="grouplist" id="90100">
-				<top>105</top>
+				<top>128</top>
 				<width>400</width>
 				<height>1080</height>
 				<onleft>Dialog.Close(1128)</onleft>
@@ -31,7 +40,7 @@
 					<label>$LOCALIZE[20445]</label>
 					<onclick>Skin.ToggleSetting(Disable.Fanart)</onclick>
 					<selected>!Skin.HasSetting(Disable.Fanart)</selected>
-					<visible>Window.IsMedia</visible>
+					<visible>Window.IsMedia + !Window.IsVisible(favouritesbrowser)</visible>
 				</control>
 				<control type="radiobutton" id="901002">
 					<description>Extrafanart</description>
@@ -40,7 +49,7 @@
 					<onclick>Skin.ToggleSetting(Disable.Extrafanart)</onclick>
 					<selected>!Skin.HasSetting(Disable.Extrafanart)</selected>
 					<enable>!Skin.HasSetting(Disable.Fanart)</enable>
-					<visible>Window.IsMedia</visible>
+					<visible>Window.IsMedia + !Window.IsVisible(favouritesbrowser)</visible>
 				</control>
 				<control type="button" id="901005">
 					<description>Fallback</description>
diff --git a/skin.aeon.nox.silvo/16x9/custom_1129_Select.xml b/skin.aeon.nox.silvo/16x9/custom_1129_Select.xml
index d85d903a2f..9dae001e7d 100644
--- a/skin.aeon.nox.silvo/16x9/custom_1129_Select.xml
+++ b/skin.aeon.nox.silvo/16x9/custom_1129_Select.xml
@@ -7,7 +7,6 @@
 	<onunload condition="!String.IsEmpty(Window(movieinformation).Property(ActorID)) + !String.IsEmpty(Window(movieinformation).Property(DoAction))">SetFocus(90050)</onunload>
 	<onunload condition="!String.IsEmpty(Window(movieinformation).Property(DirectorID)) + !String.IsEmpty(Window(movieinformation).Property(DoAction))">SendClick(2003,13)</onunload>
 	<onunload condition="!String.IsEmpty(Skin.String(ItemToEdit.MultiFanart))">Skin.SetString($INFO[Window(Home).Property(Nox.Temp)],$INFO[Skin.String(ItemToEdit.MultiFanart)])</onunload>
-	<onunload condition="!String.IsEmpty(Skin.String(ItemToEdit.BGType))">Skin.SetString($INFO[Window(Home).Property(Nox.BGType)],$INFO[Skin.String(ItemToEdit.BGType)])</onunload>
 	<onunload>ClearProperty(ActorID,movieinformation)</onunload>
 	<onunload>ClearProperty(ActorName,movieinformation)</onunload>
 	<onunload>ClearProperty(DirectorID,movieinformation)</onunload>
diff --git a/skin.aeon.nox.silvo/addon.xml b/skin.aeon.nox.silvo/addon.xml
index 826ef9af0c..fbe8004177 100644
--- a/skin.aeon.nox.silvo/addon.xml
+++ b/skin.aeon.nox.silvo/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.aeon.nox.silvo" version="9.1.1" name="Aeon Nox: SiLVO" provider-name="SiLVO">
+<addon id="skin.aeon.nox.silvo" version="9.1.2" name="Aeon Nox: SiLVO" provider-name="SiLVO">
 	<requires>
 		<import addon="xbmc.gui" version="5.16.0" />
 		<import addon="script.skinshortcuts" version="2.0.1" />
@@ -99,6 +99,6 @@
 			<screenshot>resources/screenshots/screenshot-11.jpg</screenshot>
 			<screenshot>resources/screenshots/screenshot-12.jpg</screenshot>
 		</assets>
-		<news>[I][COLOR FFFF9800]v9.1.1[/COLOR][/I][CR]- Add option to hide Tv Show and Season mediaflags for List view[CR]- Rework List.Overlays and move the HD/SD/3D indicators above VideoListLabelVar due to spacing issues[CR]- Add OSD buttons to color customizer and move stop button on the left[CR]- Update menu customizer management buttons[CR]- Add custom Apps window to add-ons shortcuts[CR][I][COLOR FFFF9800]v9.1.0[/COLOR][/I][CR]- Remove outdated reflections[CR]- Add panel border to color customization options[CR]- Update HDR flags[CR]- Add The Movie Db Helper support[CR]- Some PVR fixes and updates[CR]- Update CinemaVision for PreshowExperience[CR]- Add chapter markers to seekbar[CR]- Update VideoOSDBookmarks[CR]- Fix slow loading of Kodi due to missing background=true attribute for Widgets[CR]- Remove Small Icons view and add as setting to Icons view[CR]- Remove BannerPlex view and add as setting to BannerWall view[CR]- Add script.skinvariables viewtype builder support for video library[CR]- Minor tweaks to Netflix style pause screen[CR]- Update OSD and Player Control buttons[CR]- Remove service.library.data.provider as requirement[CR](need script.embuary.helper for playlist statistics)[CR][CR][B]All updates may contain various changes and/or improvements[/B][CR]For a more complete list visit:[CR][I][COLOR FFFF9800]https://github.com/mikesilvo164/Aeon-Nox-SiLVO/commits/master[/COLOR][/I]</news>
+		<news>[I][COLOR FFFF9800]v9.1.2[/COLOR][/I][CR]- Fix missing labels in Addon Browser[CR]- Add favorites window to background customizer[CR]- Add fake slideshow to actor images to scroll left/right[CR]- Add Auto hide to Music OSD[CR]- Fix hiding logo for sets when hidden for movies in RightList view[CR]- Add TV Show duration using TMDb Helper to some areas[CR][I][COLOR FFFF9800]v9.1.1[/COLOR][/I][CR]- Add option to hide TV Show and Season mediaflags for List view[CR]- Rework List.Overlays and move the HD/SD/3D indicators above VideoListLabelVar due to spacing issues[CR]- Add OSD buttons to color customizer and move stop button on the left[CR]- Update menu customizer management buttons[CR]- Add custom Apps window to add-ons shortcuts[CR][CR][B]All updates may contain various changes and/or improvements[/B][CR]For a more complete list visit:[CR][I][COLOR FFFF9800]https://github.com/mikesilvo164/Aeon-Nox-SiLVO/commits/master[/COLOR][/I]</news>
 	</extension>
 </addon>