diff --git a/language/resource.language.en_gb/strings.po b/language/resource.language.en_gb/strings.po
index a810987..01f0453 100644
--- a/language/resource.language.en_gb/strings.po
+++ b/language/resource.language.en_gb/strings.po
@@ -217,7 +217,7 @@ msgid "Turn Off Shuffle All"
 msgstr ""
 
 msgctxt "#31047"
-msgid "Visualisation Presets"
+msgid "Visualisation presets"
 msgstr ""
 
 msgctxt "#31048"
@@ -625,7 +625,7 @@ msgid "hours"
 msgstr ""
 
 msgctxt "#31149"
-msgid "Hide OSD controls"
+msgid "Lyrics settings"
 msgstr ""
 
 msgctxt "#31150"
@@ -940,7 +940,9 @@ msgctxt "#31227"
 msgid "Air time"
 msgstr ""
 
-#empty string with id 31228
+msgctxt "#31228"
+msgid "Visualisation settings"
+msgstr ""
 
 msgctxt "#31229"
 msgid "Cancel Next Up"
@@ -965,13 +967,12 @@ msgid "Browse Addons"
 msgstr ""
 
 msgctxt "#31235"
-msgid "Your Rating"
+msgid "Your rating"
 msgstr ""
 
-#Must match #31235 without the space
-
+#: Must match #31235 but with an underscore instead of the space
 msgctxt "#31236"
-msgid "Your_Rating"
+msgid "Your_rating"
 msgstr ""
 
 msgctxt "#31237"
diff --git a/xml/Custom_1114_Video_OSD_Options.xml b/xml/Custom_1114_OSD_Options.xml
similarity index 65%
rename from xml/Custom_1114_Video_OSD_Options.xml
rename to xml/Custom_1114_OSD_Options.xml
index 57bed3f..6196ec9 100644
--- a/xml/Custom_1114_Video_OSD_Options.xml
+++ b/xml/Custom_1114_OSD_Options.xml
@@ -102,6 +102,7 @@
 							<label2>[B]$VAR[StreamSubtitleLabel]$VAR[StreamOriginal]$VAR[StreamForced]$VAR[StreamVisualImpaired]$VAR[StreamHearingImpaired][/B]</label2>
 							<onclick>SetProperty(VideoOSDSelect,1,home)</onclick>
 							<onclick>DialogSelectSubtitle</onclick>
+							<visible>Window.IsVisible(fullscreenvideo)</visible>
 						</item>
 						<!-- Audio stream selection button -->
 						<item id="102">
@@ -109,6 +110,7 @@
 							<label2>[B]$VAR[StreamAudioLanguage]$VAR[AudioCodec, | ]$VAR[AudioChannels, | ][/B]</label2>
 							<onclick>SetProperty(VideoOSDSelect,1,home)</onclick>
 							<onclick>DialogSelectAudio</onclick>
+							<visible>Window.IsVisible(fullscreenvideo)</visible>
 						</item>
 						<!-- Video stream selection button -->
 						<item id="103">
@@ -116,41 +118,48 @@
 							<label2>[B]$VAR[VideoCodec]$INFO[Player.Process(VideoWidth), | ]x$INFO[Player.Process(VideoHeight)]$INFO[Player.Process(VideoScanType)][/B]</label2>
 							<onclick>SetProperty(VideoOSDSelect,1,home)</onclick>
 							<onclick>DialogSelectVideo</onclick>
+							<visible>Window.IsVisible(fullscreenvideo)</visible>
 						</item>
 						<!-- Bookmarks button -->
 						<item id="104">
 							<label>298</label>
 							<onclick>ActivateWindow(videobookmarks)</onclick>
+							<visible>Window.IsVisible(fullscreenvideo)</visible>
 						</item>
 						<!-- Subtitle settings button -->
 						<item id="105">
 							<label>24133</label>
 							<onclick>SetProperty(VideoOSDSelect,1,home)</onclick>
 							<onclick>ActivateWindow(osdsubtitlesettings)</onclick>
+							<visible>Window.IsVisible(fullscreenvideo)</visible>
 						</item>
 						<!-- Audio settings button -->
 						<item id="106">
 							<label>13396</label>
 							<onclick>SetProperty(VideoOSDSelect,1,home)</onclick>
 							<onclick>ActivateWindow(osdaudiosettings)</onclick>
+							<visible>Window.IsVisible(fullscreenvideo)</visible>
 						</item>
 						<!-- Video settings button -->
 						<item id="107">
 							<label>31137</label>
 							<onclick>SetProperty(VideoOSDSelect,1,home)</onclick>
 							<onclick>ActivateWindow(osdvideosettings)</onclick>
+							<visible>Window.IsVisible(fullscreenvideo)</visible>
 						</item>
 						<!-- Colour management settings button -->
 						<item id="108">
 							<label>36560</label>
 							<onclick>ActivateWindow(osdcmssettings)</onclick>
 							<visible>System.HasCMS</visible>
+							<visible>Window.IsVisible(fullscreenvideo)</visible>
 						</item>
 						<!-- Resolution button -->
 						<item id="109">
 							<label>169</label>
 							<onclick>PlayerResolutionSelect</onclick>
 							<visible>Player.HasResolutions</visible>
+							<visible>Window.IsVisible(fullscreenvideo)</visible>
 						</item>
 						<!-- 3D button -->
 						<item id="110">
@@ -158,18 +167,21 @@
 							<onclick>Close</onclick>
 							<onclick>StereoMode</onclick>
 							<visible>VideoPlayer.IsStereoscopic</visible>
+							<visible>Window.IsVisible(fullscreenvideo)</visible>
 						</item>
 						<!-- Menu button -->
 						<item id="111">
 							<label>31136</label>
 							<onclick>PlayerControl(ShowVideoMenu)</onclick>
 							<visible>VideoPlayer.HasMenu</visible>
+							<visible>Window.IsVisible(fullscreenvideo)</visible>
 						</item>
 						<!-- Next item button -->
 						<item id="112">
 							<label>$VAR[NextVideo]</label>
 							<onclick>PlayerControl(Next)</onclick>
 							<visible>Window.IsVisible(VideoFullScreen.xml) + system.getbool(videoplayer.autoplaynextitem)</visible>
+							<visible>Window.IsVisible(fullscreenvideo)</visible>
 						</item>
 						<!-- Play speed button -->
 						<item id="113">
@@ -178,6 +190,71 @@
 							<onclick>Dialog.Close(all)</onclick>
 							<onclick>ActivateWindow(1111)</onclick>
 							<visible>Player.TempoEnabled</visible>
+							<visible>Window.IsVisible(fullscreenvideo)</visible>
+						</item>
+						<!-- Lyrics -->
+						<item id="114">
+							<label>24013</label>
+							<label2>[B]$INFO[Skin.String(LyricScript_Path)][/B]</label2>
+							<onclick>Skin.SetAddon(LyricScript_Path,xbmc.python.lyrics)</onclick>
+							<visible>Window.IsVisible(visualisation)</visible>
+						</item>
+						<!-- Lyrics -->
+						<item id="115">
+							<label>31149</label>
+							<onclick>Addon.OpenSettings($INFO[Skin.String(LyricScript_Path)])</onclick>
+							<visible>!String.IsEmpty(Skin.String(LyricScript_Path))</visible>
+							<visible>Window.IsVisible(visualisation)</visible>
+						</item>
+						<!-- Playlist -->
+						<item id="116">
+							<label>559</label>
+							<onclick>Dialog.Close(all)</onclick>
+							<onclick>ActivateWindow(MusicPlaylist)</onclick>
+							<visible>Window.IsVisible(visualisation)</visible>
+						</item>
+						<!-- Repeat -->
+						<item id="117">
+							<label>486</label>
+							<label2>[B]$INFO[Playlist.Repeat][/B]</label2>
+							<onclick>PlayerControl(Repeat)</onclick>
+							<visible>Window.IsVisible(visualisation)</visible>
+						</item>
+						<!-- Random -->
+						<item id="118">
+							<label>590</label>
+							<label2>[B]$INFO[Playlist.Random][/B]</label2>
+							<onclick>PlayerControl(Random)</onclick>
+							<visible>Window.IsVisible(visualisation)</visible>
+						</item>
+						<!-- Rating -->
+						<item id="119">
+							<label>31235</label>
+							<label2>[B]$INFO[MusicPlayer.UserRating,,/10][/B]</label2>
+							<onclick>SetProperty(SetUserRating,music,home)</onclick>
+							<onclick>setrating</onclick>
+							<visible>Window.IsVisible(visualisation)</visible>
+						</item>
+						<!-- Visualisation -->
+						<item id="120">
+							<label>250</label>
+							<label2>[B]$INFO[Visualisation.Name][/B]</label2>
+							<onclick>Close</onclick>
+							<onclick>SendClick(500)</onclick>
+							<visible>Window.IsVisible(visualisation)</visible>
+						</item>
+						<!-- Visualisation settings -->
+						<item id="121">
+					<label>31228</label>
+							<onclick>Addon.Default.OpenSettings(xbmc.player.musicviz)</onclick>
+							<visible>Window.IsVisible(visualisation)</visible>
+						</item>
+						<!-- Visualisation presets -->
+						<item id="122">
+					<label>31047</label>
+							<onclick>ActivateWindow(visualisationpresetlist)</onclick>
+							<visible>Visualisation.HasPresets</visible>
+							<visible>Window.IsVisible(visualisation)</visible>
 						</item>
 					</content>
 				</control>
diff --git a/xml/DialogMusicInfo.xml b/xml/DialogMusicInfo.xml
index 0ca028e..b2e61dd 100644
--- a/xml/DialogMusicInfo.xml
+++ b/xml/DialogMusicInfo.xml
@@ -334,7 +334,7 @@
 						<onclick>SetProperty(SetUserRating,music,home)</onclick>
 						<onclick>SendClick(7)</onclick>
 						<font>Med24</font>
-						<label>[CAPITALIZE]$LOCALIZE[31235][/CAPITALIZE][CR][COLOR=00ffffff]$LOCALIZE[31236][/COLOR]</label>
+						<label>[CAPITALIZE]$LOCALIZE[31235][CR][COLOR=00ffffff]$LOCALIZE[31236][/COLOR][/CAPITALIZE]</label>
 						<textoffsetx>56</textoffsetx>
 						<textcolor>ffdadada</textcolor>
 						<focusedcolor>ff222222</focusedcolor>
diff --git a/xml/Includes_Dialog_Default_Video_Information.xml b/xml/Includes_Dialog_Default_Video_Information.xml
index 56a956d..daf96f8 100644
--- a/xml/Includes_Dialog_Default_Video_Information.xml
+++ b/xml/Includes_Dialog_Default_Video_Information.xml
@@ -389,7 +389,7 @@
 					<onclick>SetProperty(UserRatingIcon,$INFO[ListItem.Icon],home)</onclick>
 					<onclick>SendClick(7)</onclick>
 					<font>Med24</font>
-					<label>[CAPITALIZE]$LOCALIZE[31235][/CAPITALIZE][CR][COLOR=00ffffff]$LOCALIZE[31236][/COLOR]</label>
+					<label>[CAPITALIZE]$LOCALIZE[31235][CR][COLOR=00ffffff]$LOCALIZE[31236][/COLOR][/CAPITALIZE]</label>
 					<textoffsetx>56</textoffsetx>
 					<textcolor>ffdadada</textcolor>
 					<focusedcolor>ff222222</focusedcolor>
diff --git a/xml/Includes_Dialog_Video_Information.xml b/xml/Includes_Dialog_Video_Information.xml
index ff83e2a..6c26108 100644
--- a/xml/Includes_Dialog_Video_Information.xml
+++ b/xml/Includes_Dialog_Video_Information.xml
@@ -428,7 +428,7 @@
 					<onclick>SetProperty(UserRatingIcon,$INFO[ListItem.Icon],home)</onclick>
 					<onclick>SendClick(7)</onclick>
 					<font>Med24</font>
-					<label>[CAPITALIZE]$LOCALIZE[31235][/CAPITALIZE][CR][COLOR=00ffffff]$LOCALIZE[31236][/COLOR]</label>
+					<label>[CAPITALIZE]$LOCALIZE[31235][CR][COLOR=00ffffff]$LOCALIZE[31236][/COLOR][/CAPITALIZE]</label>
 					<textoffsetx>56</textoffsetx>
 					<textcolor>ffdadada</textcolor>
 					<focusedcolor>ff222222</focusedcolor>
diff --git a/xml/MusicOSD.xml b/xml/MusicOSD.xml
index c9b0985..615ffe5 100644
--- a/xml/MusicOSD.xml
+++ b/xml/MusicOSD.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
 	<!-- musicosd -->
-	<onload condition="!Skin.HasSetting(HideOSDControls)">SetFocus(304)</onload>
-	<onload condition="Skin.HasSetting(HideOSDControls)">SetFocus(11)</onload>
+	<defaultcontrol>304</defaultcontrol>
 	<controls>
+		<!-- Options -->
+		<control type="button" id="500">
+			<include>HiddenControl</include>
+		</control>
 		<control type="group">
-			<animation effect="fade" start="100" end="0" time="200" condition="Window.IsVisible(visualisationpresetlist) | Window.IsVisible(addonsettings) | Window.IsVisible(selectdialog)">Conditional</animation>
+			<animation effect="fade" start="100" end="0" time="200" condition="Window.IsVisible(visualisationpresetlist) | Window.IsVisible(addonsettings) | Window.IsVisible(selectdialog) | Window.IsVisible(1114)">Conditional</animation>
 			<control type="image">
 				<width>3840</width>
 				<height>420</height>
@@ -79,7 +82,7 @@
 				<!--  Current position -->
 				<control type="label">
 					<width>auto</width>
-					<height>68</height>
+					<height>60</height>
 					<font>OSD32</font>
 					<textcolor>fff3f3f3</textcolor>
 					<label>$VAR[PlayerTime]</label>
@@ -87,7 +90,7 @@
 				<!--  Divider -->
 				<control type="label">
 					<width>auto</width>
-					<height>68</height>
+					<height>60</height>
 					<font>OSD32</font>
 					<textcolor>ff696969</textcolor>
 					<label>/</label>
@@ -96,7 +99,7 @@
 				<!--  Total length -->
 				<control type="label">
 					<width>auto</width>
-					<height>68</height>
+					<height>60</height>
 					<font>OSD32</font>
 					<textcolor>ff696969</textcolor>
 					<label>$VAR[PlayerDuration]</label>
@@ -108,11 +111,10 @@
 				<width>1600</width>
 				<height>128</height>
 				<onup>11</onup>
-				<itemgap>0</itemgap>
+				<itemgap>-14</itemgap>
 				<align>center</align>
 				<orientation>horizontal</orientation>
-				<defaultcontrol always="true">204</defaultcontrol>
-				<visible>!Skin.HasSetting(HideOSDControls)</visible>
+				<defaultcontrol always="true">304</defaultcontrol>
 				<!-- Skip Back -->
 				<control type="button" id="301">
 					<width>128</width>
@@ -140,6 +142,15 @@
 					<texturenofocus colordiffuse="OSDNotFocusColour">osd/osd_stop.png</texturenofocus>
 					<onclick>PlayerControl(Stop)</onclick>
 				</control>
+				<!-- Options -->
+				<control type="button" id="307">
+					<width>128</width>
+					<height>128</height>
+					<font/>
+					<texturefocus colordiffuse="OSDFocusColour">osd/osd_settings.png</texturefocus>
+					<texturenofocus colordiffuse="OSDNotFocusColour">osd/osd_settings.png</texturenofocus>
+					<onclick>ActivateWindow(1114)</onclick>
+				</control>
 				<!-- Play/Pause -->
 				<control type="togglebutton" id="304">
 					<width>128</width>
@@ -182,148 +193,6 @@
 				<textcolor>fff3f3f3</textcolor>
 				<label>$INFO[System.Time][COLOR ff696969] / $INFO[Player.FinishTime][/COLOR]</label>
 			</control>
-			<!-- Options -->
-			<control id="100" type="grouplist">
-				<left>184</left>
-				<bottom>256</bottom>
-				<width>1200</width>
-				<height>1200</height>
-				<align>right</align>
-				<itemgap>0</itemgap>
-				<onleft>noop</onleft>
-				<onright>200</onright>
-				<ondown condition="!Skin.HasSetting(HideOSDControls)">304</ondown>
-				<orientation>vertical</orientation>
-				<visible>!Player.Forwarding + !Player.Rewinding</visible>
-				<!-- Lyrics -->
-				<control type="button" id="9">
-					<width>1200</width>
-					<height>116</height>
-					<font>OSD32</font>
-					<textcolor>ffffffff</textcolor>
-					<shadowcolor>ShadowColour</shadowcolor>
-					<focusedcolor>ffffc04b</focusedcolor>
-					<label>24013</label>
-					<texturefocus/>
-					<texturenofocus/>
-					<onclick>Close</onclick>
-					<onclick condition="!String.IsEmpty(Skin.String(LyricScript_Path))">RunScript($INFO[Skin.String(LyricScript_Path)])</onclick>
-					<onclick condition="String.IsEmpty(Skin.String(LyricScript_Path))">Skin.SetAddon(LyricScript_Path,xbmc.python.lyrics)</onclick>
-					<onclick condition="String.IsEmpty(Skin.String(LyricScript_Path))">Close</onclick>
-					<onclick condition="String.IsEmpty(Skin.String(LyricScript_Path))">RunScript($INFO[Skin.String(LyricScript_Path)])</onclick>
-				</control>
-				<!-- Playlist -->
-				<control type="button" id="10">
-					<width>1200</width>
-					<height>116</height>
-					<font>OSD32</font>
-					<textcolor>ffffffff</textcolor>
-					<shadowcolor>ShadowColour</shadowcolor>
-					<focusedcolor>ffffc04b</focusedcolor>
-					<label>559</label>
-					<texturefocus/>
-					<texturenofocus/>
-					<onclick>Close</onclick>
-					<onclick>ActivateWindow(MusicPlaylist)</onclick>
-				</control>
-				<!-- Repeat -->
-				<control type="button" id="7">
-					<width>1200</width>
-					<height>116</height>
-					<font>OSD32</font>
-					<textcolor>ffffffff</textcolor>
-					<shadowcolor>ShadowColour</shadowcolor>
-					<focusedcolor>ffffc04b</focusedcolor>
-					<label>$LOCALIZE[486]$INFO[Playlist.Repeat, : ]</label>
-					<texturefocus/>
-					<texturenofocus/>
-					<onclick>PlayerControl(Repeat)</onclick>
-				</control>
-				<!-- Random -->
-				<control type="togglebutton" id="8">
-					<width>1200</width>
-					<height>116</height>
-					<font>OSD32</font>
-					<textcolor>ffffffff</textcolor>
-					<shadowcolor>ShadowColour</shadowcolor>
-					<focusedcolor>ffffc04b</focusedcolor>
-					<label>$LOCALIZE[590]$INFO[Playlist.Random, : ]</label>
-					<texturefocus/>
-					<texturenofocus/>
-					<onclick>PlayerControl(Random)</onclick>
-				</control>
-			</control>
-			<!-- Options -->
-			<control id="200" type="grouplist">
-				<right>184</right>
-				<bottom>256</bottom>
-				<width>1200</width>
-				<height>1200</height>
-				<align>right</align>
-				<itemgap>0</itemgap>
-				<onleft>100</onleft>
-				<onright>noop</onright>
-				<ondown condition="!Skin.HasSetting(HideOSDControls)">304</ondown>
-				<orientation>vertical</orientation>
-				<visible>!Player.Forwarding + !Player.Rewinding</visible>
-				<!-- Visualisation -->
-				<control type="button" id="501">
-					<width>1200</width>
-					<height>116</height>
-					<font>OSD32</font>
-					<align>right</align>
-					<textcolor>ffffffff</textcolor>
-					<shadowcolor>ShadowColour</shadowcolor>
-					<focusedcolor>ffffc04b</focusedcolor>
-					<label>31235</label>
-					<texturefocus/>
-					<texturenofocus/>
-					<onclick>SetProperty(SetUserRating,music,home)</onclick>
-					<onclick>setrating</onclick>
-				</control>
-				<!-- Visualisation -->
-				<control type="button" id="500">
-					<width>1200</width>
-					<height>116</height>
-					<font>OSD32</font>
-					<align>right</align>
-					<textcolor>ffffffff</textcolor>
-					<shadowcolor>ShadowColour</shadowcolor>
-					<focusedcolor>ffffc04b</focusedcolor>
-					<label>12006</label>
-					<texturefocus/>
-					<texturenofocus/>
-				</control>
-				<!-- Visualisation presets list -->
-				<control type="button" id="12">
-					<width>1200</width>
-					<height>116</height>
-					<font>OSD32</font>
-					<align>right</align>
-					<textcolor>ffffffff</textcolor>
-					<shadowcolor>ShadowColour</shadowcolor>
-					<focusedcolor>ffffc04b</focusedcolor>
-					<label>$LOCALIZE[31047]</label>
-					<texturefocus/>
-					<texturenofocus/>
-					<onclick>ActivateWindow(visualisationpresetlist)</onclick>
-					<visible>Visualisation.HasPresets</visible>
-				</control>
-				<!-- Visualisation settings -->
-				<control type="button" id="11">
-					<width>1200</width>
-					<height>116</height>
-					<font>OSD32</font>
-					<align>right</align>
-					<textcolor>ffffffff</textcolor>
-					<shadowcolor>ShadowColour</shadowcolor>
-					<focusedcolor>ffffc04b</focusedcolor>
-					<label>$LOCALIZE[250] $LOCALIZE[21417]</label>
-					<texturefocus/>
-					<texturenofocus/>
-					<onclick>Addon.Default.OpenSettings(xbmc.player.musicviz)</onclick>
-				</control>
-			</control>
 		</control>
 	</controls>
 </window>
diff --git a/xml/MusicVisualisation.xml b/xml/MusicVisualisation.xml
index eb6c0a2..562369b 100644
--- a/xml/MusicVisualisation.xml
+++ b/xml/MusicVisualisation.xml
@@ -28,7 +28,7 @@
 			<visible>String.IsEmpty(Visualisation.Enabled)</visible>
 		</control>
 		<control type="group">
-			<visible>!Window.IsActive(seekbar) + !Window.IsActive(musicosd) + Player.ShowInfo</visible>
+			<visible>!Window.IsActive(seekbar) + !Window.IsActive(musicosd) + Player.ShowInfo + !Window.IsVisble(1114)</visible>
 			<!-- Heading / Current item / Total items -->
 			<control type="grouplist">
 				<left>396</left>
diff --git a/xml/SkinSettings.xml b/xml/SkinSettings.xml
index b1972c3..90170e7 100644
--- a/xml/SkinSettings.xml
+++ b/xml/SkinSettings.xml
@@ -431,28 +431,6 @@
 					<texturenofocus border="0,0,0,6">settings/button_no_focus.png</texturenofocus>
 					<onclick>Skin.SelectBool(31135, 31001|US, 31002|UK, 31003|Germany)</onclick>
 				</control>
-				<control id="18" type="radiobutton">
-					<width>1916</width>
-					<height>168</height>
-					<font>Light32</font>
-					<label>31149</label>
-					<textoffsetx>80</textoffsetx>
-					<textcolor>NotFocusedColour</textcolor>
-					<focusedcolor>FocusedColour</focusedcolor>
-					<radiowidth>250</radiowidth>
-					<radioheight>106</radioheight>
-					<radioposx>1626</radioposx>
-					<textureradioonfocus>settings/radio_on_focus.png</textureradioonfocus>
-					<textureradioonnofocus>settings/radio_on_no_focus.png</textureradioonnofocus>
-					<textureradioondisabled>settings/radio_on_disabled.png</textureradioondisabled>
-					<textureradioofffocus>settings/radio_off_focus.png</textureradioofffocus>
-					<textureradiooffnofocus>settings/radio_off_no_focus.png</textureradiooffnofocus>
-					<textureradiooffdisabled>settings/radio_off_disabled.png</textureradiooffdisabled>
-					<texturefocus border="0,0,0,6">settings/button_focus.png</texturefocus>
-					<texturenofocus border="0,0,0,6">settings/button_no_focus.png</texturenofocus>
-					<onclick>Skin.ToggleSetting(HideOSDControls)</onclick>
-					<selected>Skin.HasSetting(HideOSDControls)</selected>
-				</control>
 				<control id="21" type="radiobutton">
 					<width>1916</width>
 					<height>168</height>
diff --git a/xml/VideoOSD.xml b/xml/VideoOSD.xml
index 066017d..dd6c4e0 100644
--- a/xml/VideoOSD.xml
+++ b/xml/VideoOSD.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
 	<!-- videoosd -->
-	<onload condition="!Skin.HasSetting(HideOSDControls)">SetFocus(304)</onload>
-	<onload condition="Skin.HasSetting(HideOSDControls) + system.getbool(videoplayer.autoplaynextitem)">SetFocus(16)</onload>
-	<onload condition="Skin.HasSetting(HideOSDControls) + !system.getbool(videoplayer.autoplaynextitem)">SetFocus(15)</onload>
+	<defaultcontrol>304</defaultcontrol>
 	<controls>
 		<control type="group">
+			<animation effect="fade" start="100" end="0" time="200" condition="Window.IsVisible(selectdialog) | Window.IsVisible(1114)">Conditional</animation>
 			<control type="image">
 				<width>3840</width>
 				<height>420</height>
@@ -86,8 +85,7 @@
 				<itemgap>-14</itemgap>
 				<align>center</align>
 				<orientation>horizontal</orientation>
-				<defaultcontrol always="true">204</defaultcontrol>
-				<visible>!Skin.HasSetting(HideOSDControls)</visible>
+				<defaultcontrol always="true">304</defaultcontrol>
 				<!-- Skip Back -->
 				<control type="button" id="301">
 					<width>128</width>
@@ -118,6 +116,15 @@
 					<texturenofocus colordiffuse="OSDNotFocusColour">osd/osd_stop.png</texturenofocus>
 					<onclick>PlayerControl(Stop)</onclick>
 				</control>
+				<!-- Options -->
+				<control type="button" id="307">
+					<width>128</width>
+					<height>128</height>
+					<font/>
+					<texturefocus colordiffuse="OSDFocusColour">osd/osd_settings.png</texturefocus>
+					<texturenofocus colordiffuse="OSDNotFocusColour">osd/osd_settings.png</texturenofocus>
+					<onclick>ActivateWindow(1114)</onclick>
+				</control>
 				<!-- Play/Pause -->
 				<control type="togglebutton" id="304">
 					<width>128</width>
@@ -130,16 +137,6 @@
 					<alttexturenofocus colordiffuse="OSDNotFocusColour">osd/osd_play.png</alttexturenofocus>
 					<onclick>PlayerControl(Play)</onclick>
 				</control>
-				<!-- Options -->
-				<control type="button" id="307">
-					<width>128</width>
-					<height>128</height>
-					<font/>
-					<texturefocus colordiffuse="OSDFocusColour">osd/osd_settings.png</texturefocus>
-					<texturenofocus colordiffuse="OSDNotFocusColour">osd/osd_settings.png</texturenofocus>
-					<onclick>Close</onclick>
-					<onclick>ActivateWindow(1114)</onclick>
-				</control>
 				<!-- Fast Forward -->
 				<control type="button" id="305">
 					<width>128</width>