diff --git a/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml b/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml
index b30dbca3..104a5e25 100644
--- a/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml
+++ b/Output/Themes/Ambient/Screens/PopupScreenPlayerControl.xml
@@ -457,4 +457,4 @@
       <!--   <Height>: Reflection Height of selected button-->
     </ButtonToBackgroundVideo>
   </PopupScreenPlayerControl>
-</root>
+</root>
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml
index 958526c2..a21e9cdc 100644
--- a/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml
+++ b/Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml
@@ -540,4 +540,4 @@
       <NumVisible>3</NumVisible>
     </SelectSlideVideosToBackground>
   </ScreenOptionsVideo>
-</root>
+</root>
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Screens/ScreenSong.xml b/Output/Themes/Ambient/Screens/ScreenSong.xml
index c4212e3c..b6546907 100644
--- a/Output/Themes/Ambient/Screens/ScreenSong.xml
+++ b/Output/Themes/Ambient/Screens/ScreenSong.xml
@@ -375,6 +375,104 @@
       <!--   <Space>: Reflection Space of selected button-->
       <!--   <Height>: Reflection Height of selected button-->
     </ButtonOptionsSing>
+    <ButtonOptionsRandom>
+      <!--<Skin>: Texture name-->
+      <Skin>Button</Skin>
+      <!--<SkinSelected>: Texture name for selected button-->
+      <SkinSelected>Button</SkinSelected>
+      <!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
+      <X>40</X>
+      <Y>90</Y>
+      <Z>-2,11</Z>
+      <W>360</W>
+      <H>40</H>
+      <!--<Color>: Button color from ColorScheme (high priority)-->
+      <!--or <R>, <G>, <B>, <A> (lower priority)-->
+      <Color>ButtonColor</Color>
+      <!--<SColor>: Selected button color from ColorScheme (high priority)-->
+      <!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
+      <SColor>ButtonSColor</SColor>
+      <Text>
+        <!--<X>, <Y>: Text position-->
+        <X>180</X>
+        <Y>5</Y>
+        <!--<H>: Text height-->
+        <H>30</H>
+        <!--<MaxW>: Maximum text width (if exists)-->
+        <MaxW>350</MaxW>
+        <!--<Color>: Text color from ColorScheme (high priority)-->
+        <!--or <R>, <G>, <B>, <A> (lower priority)-->
+        <Color>ButtonTextColor</Color>
+        <!--<SColor>: Selected Text color from ColorScheme (high priority)-->
+        <!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
+        <SColor>ButtonTextSColor</SColor>
+        <!--<Align>: Text align horizontal: Left, Center, Right-->
+        <Align>Center</Align>
+        <!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
+        <HAlign>Center</HAlign>
+        <!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
+        <Style>Bold</Style>
+        <!--<Font>: Text font name-->
+        <Font>Outline</Font>
+        <!--<Text>: Nothing or translation tag-->
+        <Text>TR_SCREENSONG_BUTTON_RANDOM</Text>
+      </Text>
+      <!--<Reflection> If exists:-->
+      <!--   <Space>: Reflection Space-->
+      <!--   <Height>: Reflection Height-->
+      <!--<SReflection> If exists:-->
+      <!--   <Space>: Reflection Space of selected button-->
+      <!--   <Height>: Reflection Height of selected button-->
+    </ButtonOptionsRandom>
+    <ButtonOptionsRandomCategory>
+      <!--<Skin>: Texture name-->
+      <Skin>Button</Skin>
+      <!--<SkinSelected>: Texture name for selected button-->
+      <SkinSelected>Button</SkinSelected>
+      <!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
+      <X>40</X>
+      <Y>90</Y>
+      <Z>-2,11</Z>
+      <W>360</W>
+      <H>40</H>
+      <!--<Color>: Button color from ColorScheme (high priority)-->
+      <!--or <R>, <G>, <B>, <A> (lower priority)-->
+      <Color>ButtonColor</Color>
+      <!--<SColor>: Selected button color from ColorScheme (high priority)-->
+      <!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
+      <SColor>ButtonSColor</SColor>
+      <Text>
+        <!--<X>, <Y>: Text position-->
+        <X>180</X>
+        <Y>5</Y>
+        <!--<H>: Text height-->
+        <H>30</H>
+        <!--<MaxW>: Maximum text width (if exists)-->
+        <MaxW>350</MaxW>
+        <!--<Color>: Text color from ColorScheme (high priority)-->
+        <!--or <R>, <G>, <B>, <A> (lower priority)-->
+        <Color>ButtonTextColor</Color>
+        <!--<SColor>: Selected Text color from ColorScheme (high priority)-->
+        <!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
+        <SColor>ButtonTextSColor</SColor>
+        <!--<Align>: Text align horizontal: Left, Center, Right-->
+        <Align>Center</Align>
+        <!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
+        <HAlign>Center</HAlign>
+        <!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
+        <Style>Bold</Style>
+        <!--<Font>: Text font name-->
+        <Font>Outline</Font>
+        <!--<Text>: Nothing or translation tag-->
+        <Text>TR_SCREENSONG_BUTTON_RANDOMCAT</Text>
+      </Text>
+      <!--<Reflection> If exists:-->
+      <!--   <Space>: Reflection Space-->
+      <!--   <Height>: Reflection Height-->
+      <!--<SReflection> If exists:-->
+      <!--   <Space>: Reflection Space of selected button-->
+      <!--   <Height>: Reflection Height of selected button-->
+    </ButtonOptionsRandomCategory>
     <ButtonOptionsSingAll>
       <!--<Skin>: Texture name-->
       <Skin>Button</Skin>
@@ -473,104 +571,6 @@
       <!--   <Space>: Reflection Space of selected button-->
       <!--   <Height>: Reflection Height of selected button-->
     </ButtonOptionsSingAllVisible>
-    <ButtonOptionsRandomCategory>
-      <!--<Skin>: Texture name-->
-      <Skin>Button</Skin>
-      <!--<SkinSelected>: Texture name for selected button-->
-      <SkinSelected>Button</SkinSelected>
-      <!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
-      <X>40</X>
-      <Y>90</Y>
-      <Z>-2,11</Z>
-      <W>360</W>
-      <H>40</H>
-      <!--<Color>: Button color from ColorScheme (high priority)-->
-      <!--or <R>, <G>, <B>, <A> (lower priority)-->
-      <Color>ButtonColor</Color>
-      <!--<SColor>: Selected button color from ColorScheme (high priority)-->
-      <!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
-      <SColor>ButtonSColor</SColor>
-      <Text>
-        <!--<X>, <Y>: Text position-->
-        <X>180</X>
-        <Y>5</Y>
-        <!--<H>: Text height-->
-        <H>30</H>
-        <!--<MaxW>: Maximum text width (if exists)-->
-        <MaxW>350</MaxW>
-        <!--<Color>: Text color from ColorScheme (high priority)-->
-        <!--or <R>, <G>, <B>, <A> (lower priority)-->
-        <Color>ButtonTextColor</Color>
-        <!--<SColor>: Selected Text color from ColorScheme (high priority)-->
-        <!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
-        <SColor>ButtonTextSColor</SColor>
-        <!--<Align>: Text align horizontal: Left, Center, Right-->
-        <Align>Center</Align>
-        <!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
-        <HAlign>Center</HAlign>
-        <!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
-        <Style>Bold</Style>
-        <!--<Font>: Text font name-->
-        <Font>Outline</Font>
-        <!--<Text>: Nothing or translation tag-->
-        <Text>TR_SCREENSONG_BUTTON_RANDOMCAT</Text>
-      </Text>
-      <!--<Reflection> If exists:-->
-      <!--   <Space>: Reflection Space-->
-      <!--   <Height>: Reflection Height-->
-      <!--<SReflection> If exists:-->
-      <!--   <Space>: Reflection Space of selected button-->
-      <!--   <Height>: Reflection Height of selected button-->
-    </ButtonOptionsRandomCategory>
-    <ButtonOptionsRandom>
-      <!--<Skin>: Texture name-->
-      <Skin>Button</Skin>
-      <!--<SkinSelected>: Texture name for selected button-->
-      <SkinSelected>Button</SkinSelected>
-      <!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
-      <X>40</X>
-      <Y>90</Y>
-      <Z>-2,11</Z>
-      <W>360</W>
-      <H>40</H>
-      <!--<Color>: Button color from ColorScheme (high priority)-->
-      <!--or <R>, <G>, <B>, <A> (lower priority)-->
-      <Color>ButtonColor</Color>
-      <!--<SColor>: Selected button color from ColorScheme (high priority)-->
-      <!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
-      <SColor>ButtonSColor</SColor>
-      <Text>
-        <!--<X>, <Y>: Text position-->
-        <X>180</X>
-        <Y>5</Y>
-        <!--<H>: Text height-->
-        <H>30</H>
-        <!--<MaxW>: Maximum text width (if exists)-->
-        <MaxW>350</MaxW>
-        <!--<Color>: Text color from ColorScheme (high priority)-->
-        <!--or <R>, <G>, <B>, <A> (lower priority)-->
-        <Color>ButtonTextColor</Color>
-        <!--<SColor>: Selected Text color from ColorScheme (high priority)-->
-        <!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
-        <SColor>ButtonTextSColor</SColor>
-        <!--<Align>: Text align horizontal: Left, Center, Right-->
-        <Align>Center</Align>
-        <!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
-        <HAlign>Center</HAlign>
-        <!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
-        <Style>Bold</Style>
-        <!--<Font>: Text font name-->
-        <Font>Outline</Font>
-        <!--<Text>: Nothing or translation tag-->
-        <Text>TR_SCREENSONG_BUTTON_RANDOM</Text>
-      </Text>
-      <!--<Reflection> If exists:-->
-      <!--   <Space>: Reflection Space-->
-      <!--   <Height>: Reflection Height-->
-      <!--<SReflection> If exists:-->
-      <!--   <Space>: Reflection Space of selected button-->
-      <!--   <Height>: Reflection Height of selected button-->
-    </ButtonOptionsRandom>
     <ButtonOptionsOpenPlaylist>
       <!--<Skin>: Texture name-->
       <Skin>Button</Skin>
@@ -1203,18 +1203,18 @@
         <!--<SkinArrowRight>: Texture name of right arrow-->
         <SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
         <!--<SkinSelected>: Texture name for selected SelectSlide-->
-        <SkinSelected>SelectSlide</SkinSelected>
+        <SkinSelected />
         <!--<SkinArrowLeftSelected>: Texture name of selected left arrow-->
         <SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
         <!--<SkinArrowRightSelected>: Texture name of selected right arrow-->
         <SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
         <!--<SkinHighlighted>: Texture name for highlighted SelectSlide-->
-        <SkinHighlighted>SelectSlide</SkinHighlighted>
+        <SkinHighlighted />
         <!--<X>, <Y>, <Z>, <W>, <H>: SelectSlide position, width and height-->
-        <X>52</X>
+        <X>0</X>
         <Y>28</Y>
         <Z>-1,01</Z>
-        <W>241</W>
+        <W>293</W>
         <H>24</H>
         <!--<ArrowLeftX>, <ArrowLeftY>, <ArrowLeftZ>, <ArrowLeftW>, <ArrowLeftH>: Left arrow position, width and height-->
         <ArrowLeftX>54</ArrowLeftX>
@@ -1507,4 +1507,4 @@
       </ButtonPlaylistSing>
     </Playlist>
   </ScreenSong>
-</root>
+</root>
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Skin Blue.xml b/Output/Themes/Ambient/Skin Blue.xml
index 08caa194..7587328b 100644
--- a/Output/Themes/Ambient/Skin Blue.xml	
+++ b/Output/Themes/Ambient/Skin Blue.xml	
@@ -318,7 +318,7 @@
     <DuetIcon>DuetIcon.png</DuetIcon>
     <VideoIcon>VideoIcon.png</VideoIcon>
     <VideoIconCO>VideoIconCO.png</VideoIconCO>
-    <VideoIconBG>VideoIconBG.png</VideoIconBG>    
+    <VideoIconBG>VideoIconBG.png</VideoIconBG>
     <MedleyCalcIcon>MedleyCalcIcon.png</MedleyCalcIcon>
     <MedleyTagIcon>MedleyTagIcon.png</MedleyTagIcon>
     <Invisible>Invisible.png</Invisible>
@@ -340,4 +340,4 @@
     <IntroMid>[Blue]IntroMid.mp4</IntroMid>
     <IntroOut>[Blue]IntroOut.mp4</IntroOut>
   </Videos>
-</root>
+</root>
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Skin Green.xml b/Output/Themes/Ambient/Skin Green.xml
index cfbca51f..a5928d20 100644
--- a/Output/Themes/Ambient/Skin Green.xml	
+++ b/Output/Themes/Ambient/Skin Green.xml	
@@ -312,7 +312,7 @@
     <DuetIcon>DuetIcon.png</DuetIcon>
     <VideoIcon>VideoIcon.png</VideoIcon>
     <VideoIconCO>VideoIconCO.png</VideoIconCO>
-    <VideoIconBG>VideoIconBG.png</VideoIconBG>    
+    <VideoIconBG>VideoIconBG.png</VideoIconBG>
     <MedleyCalcIcon>MedleyCalcIcon.png</MedleyCalcIcon>
     <MedleyTagIcon>MedleyTagIcon.png</MedleyTagIcon>
     <Invisible>Invisible.png</Invisible>
@@ -334,4 +334,4 @@
     <IntroMid>[Green]IntroMid.mp4</IntroMid>
     <IntroOut>[Green]IntroOut.mp4</IntroOut>
   </Videos>
-</root>
+</root>
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Skin Red.xml b/Output/Themes/Ambient/Skin Red.xml
index 546b21d8..fd09e46c 100644
--- a/Output/Themes/Ambient/Skin Red.xml	
+++ b/Output/Themes/Ambient/Skin Red.xml	
@@ -334,4 +334,4 @@
     <IntroMid>[Red]IntroMid.mp4</IntroMid>
     <IntroOut>[Red]IntroOut.mp4</IntroOut>
   </Videos>
-</root>
+</root>
\ No newline at end of file
diff --git a/Output/Themes/Ambient/Skin Yellow.xml b/Output/Themes/Ambient/Skin Yellow.xml
index 1a023e87..83fab332 100644
--- a/Output/Themes/Ambient/Skin Yellow.xml	
+++ b/Output/Themes/Ambient/Skin Yellow.xml	
@@ -312,7 +312,7 @@
     <DuetIcon>DuetIcon.png</DuetIcon>
     <VideoIcon>VideoIcon.png</VideoIcon>
     <VideoIconCO>VideoIconCO.png</VideoIconCO>
-    <VideoIconBG>VideoIconBG.png</VideoIconBG>    
+    <VideoIconBG>VideoIconBG.png</VideoIconBG>
     <MedleyCalcIcon>MedleyCalcIcon.png</MedleyCalcIcon>
     <MedleyTagIcon>MedleyTagIcon.png</MedleyTagIcon>
     <Invisible>Invisible.png</Invisible>
@@ -334,4 +334,4 @@
     <IntroMid>[Yellow]IntroMid.mp4</IntroMid>
     <IntroOut>[Yellow]IntroOut.mp4</IntroOut>
   </Videos>
-</root>
+</root>
\ No newline at end of file