diff --git a/res/skins/LateNight/aux_unit.xml b/res/skins/LateNight/aux_unit.xml
index cacc5a53fa1f..59c542826de6 100644
--- a/res/skins/LateNight/aux_unit.xml
+++ b/res/skins/LateNight/aux_unit.xml
@@ -1,195 +1,180 @@
 <Template>
+  <SetVariable name="btn_type"><Variable name="TopRegion_btn_type"/></SetVariable>
   <SetVariable name="group">[Auxiliary<Variable name="auxnum"/>]</SetVariable>
   <SetVariable name="Type">auxiliary</SetVariable>
+
   <WidgetGroup>
     <ObjectName>MicAuxUnit</ObjectName>
     <Layout>horizontal</Layout>
     <SizePolicy>min,max</SizePolicy>
-    <MaximumSize>160,</MaximumSize>
+    <MaximumSize>170,</MaximumSize>
     <Children>
+
       <WidgetGroup>
-        <BackPath>style/background_tile.png</BackPath>
-        <Layout>horizontal</Layout>
-        <SizePolicy>min,max</SizePolicy>
+        <ObjectName>MicAuxSubControlsFrame</ObjectName>
+        <Layout>stacked</Layout>
+        <SizePolicy>min,min</SizePolicy>
         <Children>
 
-          <WidgetGroup>
-            <Layout>vertical</Layout>
-            <SizePolicy>min,min</SizePolicy>
+          <WidgetGroup><!-- Gain, Pfl, FX buttons, VU -->
+            <ObjectName>MicAuxSubControls</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,me</SizePolicy>
             <Children>
 
-              <WidgetGroup>
-                <ObjectName>MicAuxInteriorBorderTop</ObjectName>
-                <Size>0me,3f</Size>
-              </WidgetGroup>
-
-              <WidgetGroup><!-- Gain, Pfl, FX buttons, VU -->
-                <ObjectName>MicAuxInterior</ObjectName>
-                <Layout>horizontal</Layout>
+              <WidgetGroup><!-- Gain, Pfl, FX buttons -->
+                <Layout>vertical</Layout>
                 <SizePolicy>min,me</SizePolicy>
                 <Children>
-                  <WidgetGroup><!-- Gain, Pfl, FX buttons -->
-                    <Layout>vertical</Layout>
+                  <WidgetGroup>
+                    <ObjectName>MicAuxGainPFlContainer</ObjectName>
+                    <Layout>horizontal</Layout>
                     <SizePolicy>min,me</SizePolicy>
                     <Children>
-
-                      <WidgetGroup><!-- Gain, Pfl -->
-                        <ObjectName>MicAuxGainPFlContainer</ObjectName>
+                      <Template src="skin:button_2state.xml">
+                        <SetVariable name="TooltipId">pfl</SetVariable>
+                        <SetVariable name="ObjectName">PflButton</SetVariable>
+                        <SetVariable name="btn_format">square</SetVariable>
+                        <SetVariable name="Size">26f,26f</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="group"/>,pfl</SetVariable>
+                      </Template>
+                      <WidgetGroup><Size>8f,0min</Size></WidgetGroup>
+                      <Template src="skin:knob_textless.xml">
+                        <SetVariable name="TooltipId">pregain</SetVariable>
+                        <SetVariable name="Size">35f,30f</SetVariable>
+                        <SetVariable name="Color">orange</SetVariable>
+                        <SetVariable name="type">small</SetVariable>
+                        <SetVariable name="group"><Variable name="group"/></SetVariable>
+                        <SetVariable name="control">pregain</SetVariable>
+                      </Template>
+                    </Children>
+                  </WidgetGroup><!-- MicAuxGainPFlContainer -->
+                  <WidgetGroup><!-- FX buttons 1+2 / 1-4 -->
+                    <ObjectName>MicAuxFxButtons</ObjectName>
+                    <Layout>horizontal</Layout>
+                    <SizePolicy>min,min</SizePolicy>
+                    <Children>
+                      <WidgetGroup><!-- FX buttons 1+2 -->
                         <Layout>horizontal</Layout>
-                        <SizePolicy>min,me</SizePolicy>
+                        <SizePolicy>min,min</SizePolicy>
                         <Children>
-                          <Template src="skin:button_2state.xml">
-                            <SetVariable name="TooltipId">pfl</SetVariable>
-                            <SetVariable name="icon">pfl</SetVariable>
-                            <SetVariable name="ConfigKey"><Variable name="group"/>,pfl</SetVariable>
-                            <SetVariable name="Size">26f,26f</SetVariable>
+                          <Template src="skin:fx_assign_button.xml">
+                            <SetVariable name="MinWidth">35</SetVariable>
+                            <SetVariable name="MaxWidth">35</SetVariable>
+                            <SetVariable name="Text">FX</SetVariable>
+                            <SetVariable name="FxUnit">1</SetVariable>
+                          </Template>
+                          <Template src="skin:fx_assign_button.xml">
+                            <SetVariable name="MinWidth">35</SetVariable>
+                            <SetVariable name="MaxWidth">35</SetVariable>
+                            <SetVariable name="Text">FX</SetVariable>
+                            <SetVariable name="FxUnit">2</SetVariable>
                           </Template>
-
-                          <WidgetGroup>
-                            <ObjectName>MicGainKnob</ObjectName>
-                            <Layout>horizontal</Layout>
-                            <SizePolicy>min,min</SizePolicy>
-                            <Children>
-                              <Template src="skin:knob_textless.xml">
-                                <SetVariable name="TooltipId">pregain</SetVariable>
-                                <SetVariable name="Size">36f,30f</SetVariable>
-                                <SetVariable name="Color">orange</SetVariable>
-                                <SetVariable name="group"><Variable name="group"/></SetVariable>
-                                <SetVariable name="control">pregain</SetVariable>
-                              </Template>
-                            </Children>
-                          </WidgetGroup>
                         </Children>
-                      </WidgetGroup><!-- /Gain, Pfl -->
-
-                      <WidgetGroup><!-- FX buttons 1+2 / 1-4 -->
-                        <ObjectName>MicAuxFxButtons</ObjectName>
+                        <Connection>
+                          <ConfigKey persist="true">[Skin],show_4effectunits</ConfigKey>
+                          <Transform><Not/></Transform>
+                          <BindProperty>visible</BindProperty>
+                        </Connection>
+                      </WidgetGroup><!-- /FX buttons 1+2 -->
+                      <WidgetGroup><!-- FX buttons 1-4 -->
                         <Layout>horizontal</Layout>
                         <SizePolicy>min,min</SizePolicy>
                         <Children>
-                          <WidgetGroup><!-- FX buttons 1+2 -->
-                            <Layout>horizontal</Layout>
-                            <SizePolicy>min,min</SizePolicy>
-                            <Children>
-                              <Template src="skin:fx_assign_button.xml">
-                                <SetVariable name="MinWidth">35</SetVariable>
-                                <SetVariable name="MaxWidth">35</SetVariable>
-                                <SetVariable name="Text">FX&#8202;</SetVariable>
-                                <SetVariable name="FxUnit">1</SetVariable>
-                              </Template>
-                              <Template src="skin:fx_assign_button.xml">
-                                <SetVariable name="MinWidth">35</SetVariable>
-                                <SetVariable name="MaxWidth">35</SetVariable>
-                                <SetVariable name="Text">FX&#8202;</SetVariable>
-                                <SetVariable name="FxUnit">2</SetVariable>
-                              </Template>
-                            </Children>
-                            <Connection>
-                              <ConfigKey persist="true">[Skin],show_4effectunits</ConfigKey>
-                              <Transform><Not/></Transform>
-                              <BindProperty>visible</BindProperty>
-                            </Connection>
-                          </WidgetGroup><!-- /FX buttons 1+2 -->
-
-                          <WidgetGroup><!-- FX buttons 1-4 -->
-                            <Layout>horizontal</Layout>
-                            <SizePolicy>min,min</SizePolicy>
-                            <Children>
-                              <Template src="skin:fx_assign_button.xml">
-                                <SetVariable name="MinWidth">24</SetVariable>
-                                <SetVariable name="MaxWidth">32</SetVariable>
-                                <SetVariable name="Text">FX&#8202;</SetVariable>
-                                <SetVariable name="FxUnit">1</SetVariable>
-                              </Template>
-                              <Template src="skin:fx_assign_button.xml">
-                                <SetVariable name="MinWidth">12</SetVariable>
-                                <SetVariable name="MaxWidth">22</SetVariable>
-                                <SetVariable name="FxUnit">2</SetVariable>
-                              </Template>
-                              <Template src="skin:fx_assign_button.xml">
-                                <SetVariable name="MinWidth">12</SetVariable>
-                                <SetVariable name="MaxWidth">22</SetVariable>
-                                <SetVariable name="FxUnit">3</SetVariable>
-                              </Template>
-                              <Template src="skin:fx_assign_button.xml">
-                                <SetVariable name="MinWidth">12</SetVariable>
-                                <SetVariable name="MaxWidth">22</SetVariable>
-                                <SetVariable name="FxUnit">4</SetVariable>
-                              </Template>
-                            </Children>
-                            <Connection>
-                              <ConfigKey persist="true">[Skin],show_4effectunits</ConfigKey>
-                              <BindProperty>visible</BindProperty>
-                            </Connection>
-                          </WidgetGroup><!-- /FX buttons 1-4 -->
+                          <Template src="skin:fx_assign_button.xml">
+                            <SetVariable name="MinWidth">25</SetVariable>
+                            <SetVariable name="MaxWidth">32</SetVariable>
+                            <SetVariable name="Text">FX</SetVariable>
+                            <SetVariable name="FxUnit">1</SetVariable>
+                          </Template>
+                          <Template src="skin:fx_assign_button.xml">
+                            <SetVariable name="MinWidth">12</SetVariable>
+                            <SetVariable name="MaxWidth">22</SetVariable>
+                            <SetVariable name="FxUnit">2</SetVariable>
+                          </Template>
+                          <Template src="skin:fx_assign_button.xml">
+                            <SetVariable name="MinWidth">12</SetVariable>
+                            <SetVariable name="MaxWidth">22</SetVariable>
+                            <SetVariable name="FxUnit">3</SetVariable>
+                          </Template>
+                          <Template src="skin:fx_assign_button.xml">
+                            <SetVariable name="MinWidth">12</SetVariable>
+                            <SetVariable name="MaxWidth">22</SetVariable>
+                            <SetVariable name="FxUnit">4</SetVariable>
+                          </Template>
                         </Children>
-                      </WidgetGroup><!-- /FX buttons 1+2 / 1-4 -->
-                    </Children>
-                  </WidgetGroup><!-- /Gain, Pfl, FX buttons -->
-
-                  <WidgetGroup>
-                    <ObjectName>MicAuxVUMeter</ObjectName>
-                    <Layout>vertical</Layout>
-                    <SizePolicy>min,min</SizePolicy>
-                    <Children>
-                      <Template src="skin:vumeter_small.xml">
-                        <SetVariable name="GroupType">microphone</SetVariable>
-                      </Template>
+                        <Connection>
+                          <ConfigKey persist="true">[Skin],show_4effectunits</ConfigKey>
+                          <BindProperty>visible</BindProperty>
+                        </Connection>
+                      </WidgetGroup><!-- /FX buttons 1-4 -->
                     </Children>
-                  </WidgetGroup>
+                  </WidgetGroup><!-- MicAuxFxButtons * FX buttons 1+2 / 1-4 -->
                 </Children>
-              </WidgetGroup><!-- Gain, Pfl, FX buttons, VU -->
-
+              </WidgetGroup><!-- /Gain, Pfl, FX buttons -->
               <WidgetGroup>
-                <ObjectName>MicAuxInteriorBorderBottom</ObjectName>
-                <Size>0me,2f</Size>
+                <ObjectName>MicAuxVUMeter</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                  <Template src="skin:vumeter_small.xml">
+                    <SetVariable name="GroupType">microphone</SetVariable>
+                  </Template>
+                </Children>
               </WidgetGroup>
-
             </Children>
-          </WidgetGroup><!-- MicAuxInterior -->
+          </WidgetGroup><!-- MicAuxSubControls -->
 
-          <!-- MicAuxMainControls * Label, Play, xfader orientation -->
+          <!-- Background tile underneath controls conatiner -->
           <WidgetGroup>
-            <ObjectName>MicAuxFrame</ObjectName>
+            <BackPath><Variable name="BgTile"/></BackPath>
+            <SizePolicy>me,me</SizePolicy>
+          </WidgetGroup>
+
+        </Children>
+      </WidgetGroup><!-- MicAuxSubControlsFrame -->
+
+      <WidgetGroup>
+        <ObjectName>MicAuxMainControlsFrame</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,me</SizePolicy>
+        <Children>
+          <WidgetGroup>
+            <ObjectName>MicAuxMainControls</ObjectName>
             <Layout>vertical</Layout>
             <SizePolicy>min,me</SizePolicy>
             <Children>
+
+              <Label>
+                <ObjectName>MicAuxSubTitle</ObjectName>
+                <Size>,17f</Size>
+                <Text>Aux <Variable name="auxnum"/></Text>
+                <Alignment>center</Alignment>
+              </Label>
+
               <WidgetGroup>
-                <ObjectName>MicAuxMainControls</ObjectName>
+                <ObjectName>MicAuxPlayButtonBox</ObjectName>
                 <Layout>vertical</Layout>
                 <SizePolicy>min,me</SizePolicy>
                 <Children>
-
-                  <Label>
-                    <ObjectName>MicAuxSubTitle</ObjectName>
-                    <Size>,17f</Size>
-                    <Text>Aux <Variable name="auxnum"/></Text>
-                    <Alignment>center</Alignment>
-                  </Label>
-
-                  <WidgetGroup><!-- PLAY -->
-                    <ObjectName>AuxPlayButton</ObjectName>
-                    <Layout>vertical</Layout>
-                    <SizePolicy>min,me</SizePolicy>
-                    <Children>
-                      <Template src="skin:button_2state.xml">
-                        <SetVariable name="TooltipId">mute</SetVariable>
-                        <SetVariable name="Size">42f,24f</SetVariable>
-                        <SetVariable name="icon">aux_play</SetVariable>
-                        <SetVariable name="ConfigKey"><Variable name="group"/>,mute</SetVariable>
-                      </Template>
-                    </Children>
-                  </WidgetGroup><!-- /PLAY -->
-
-                  <Template src="skin:button_xfader_aux.xml"/>
-
+                  <Template src="skin:button_2state.xml">
+                    <SetVariable name="TooltipId">mute</SetVariable>
+                    <SetVariable name="ObjectName">AuxPlayButton</SetVariable>
+                    <SetVariable name="Size">42f,26f</SetVariable>
+                    <SetVariable name="btn_type">embedded</SetVariable>
+                    <SetVariable name="btn_format">medium</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="group"/>,mute</SetVariable>
+                  </Template>
                 </Children>
               </WidgetGroup>
-            </Children>
-          </WidgetGroup><!-- MicAuxMainControls * Label, Play, xfader orientation -->
 
+              <Template src="skin:button_xfader_aux.xml"/>
+
+            </Children>
+          </WidgetGroup><!-- MicAuxMainControls -->
         </Children>
-      </WidgetGroup>
+      </WidgetGroup><!-- MicAuxMainControlsFrame -->
+
     </Children>
   </WidgetGroup><!-- /MicAuxUnit -->
 </Template>
diff --git a/res/skins/LateNight/button_1state.xml b/res/skins/LateNight/button_1state.xml
index d255df9a684b..cd6660584f02 100644
--- a/res/skins/LateNight/button_1state.xml
+++ b/res/skins/LateNight/button_1state.xml
@@ -21,9 +21,9 @@ Variables:
     <State>
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="Icon"/>_down.svg</Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="Icon"/>.svg</Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
     </State>
     <Connection>
       <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
diff --git a/res/skins/LateNight/button_1state_right.xml b/res/skins/LateNight/button_1state_right.xml
index a30c4e50677e..0ac0335ef159 100644
--- a/res/skins/LateNight/button_1state_right.xml
+++ b/res/skins/LateNight/button_1state_right.xml
@@ -23,9 +23,9 @@ Variables:
     <State>
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
     </State>
     <Connection>
       <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
diff --git a/res/skins/LateNight/button_2state.xml b/res/skins/LateNight/button_2state.xml
index e33b9294cce0..0ce610fc2314 100644
--- a/res/skins/LateNight/button_2state.xml
+++ b/res/skins/LateNight/button_2state.xml
@@ -23,15 +23,15 @@ Variables:
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="icon"/>_down.svg</Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="icon"/>.svg</Unpressed>
+      <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="icon"/>_overdown.svg</Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="icon"/>_over.svg</Unpressed>
+      <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
     </State>
     <Connection>
       <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
diff --git a/res/skins/LateNight/button_2state_nohover.xml b/res/skins/LateNight/button_2state_nohover.xml
deleted file mode 100644
index c5e580042702..000000000000
--- a/res/skins/LateNight/button_2state_nohover.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
-Description:
-  A button that has click or display controls, but no separate graphics for
-  cursor hovering.
-Variables:
-  ObjectName        : object name
-  ToolTipID         : standard Tooltip from mixxx db
-    see: https://github.com/mixxxdj/mixxx/blob/master/src/skin/TooltipIds.cpp
-  Size              : button size
-  state_X_text      : label text for state X
-  state_X_pressed   : background graphic for pressed state X
-  state_X_unpressed : background graphic for unpressed state X
-  Align             : alignment of text
-  ConfigKey         : left-click control
--->
-<Template>
-  <PushButton>
-    <TooltipId><Variable name="TooltipId"/></TooltipId>
-    <ObjectName><Variable name="ObjectName"/></ObjectName>
-    <Size><Variable name="Size"/></Size>
-    <NumberStates>2</NumberStates>
-    <RightClickIsPushButton>false</RightClickIsPushButton>
-    <State>
-      <Number>0</Number>
-      <Text><Variable name="state_0_text"/></Text>
-      <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="icon"/>.svg</Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="icon"/>.svg</Unpressed>
-    </State>
-    <State>
-      <Number>1</Number>
-      <Text><Variable name="state_1_text"/></Text>
-      <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="icon"/>_over.svg</Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="icon"/>_over.svg</Unpressed>
-    </State>
-    <Connection>
-      <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
-      <ButtonState>LeftButton</ButtonState>
-    </Connection>
-  </PushButton>
-</Template>
diff --git a/res/skins/LateNight/button_2state_persist.xml b/res/skins/LateNight/button_2state_persist.xml
index 604ab0e897c4..6ef60b923c8e 100644
--- a/res/skins/LateNight/button_2state_persist.xml
+++ b/res/skins/LateNight/button_2state_persist.xml
@@ -23,15 +23,15 @@ Variables:
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="icon"/>_down.svg</Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="icon"/>.svg</Unpressed>
+      <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_pressed.svg</Pressed>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="icon"/>_overdown.svg</Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="icon"/>_over.svg</Unpressed>
+      <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_pressed.svg</Pressed>
     </State>
     <Connection>
       <ConfigKey persist="true"><Variable name="ConfigKey"/></ConfigKey>
diff --git a/res/skins/LateNight/button_2state_right.xml b/res/skins/LateNight/button_2state_right.xml
index b8844238cde9..a25b82b4778d 100644
--- a/res/skins/LateNight/button_2state_right.xml
+++ b/res/skins/LateNight/button_2state_right.xml
@@ -24,15 +24,15 @@ Variables:
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
+      <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_unpressed"/></Unpressed>
+      <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
     </State>
     <Connection>
       <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
diff --git a/res/skins/LateNight/button_2state_right_display.xml b/res/skins/LateNight/button_2state_right_display.xml
index a8a8edcb4057..dea9f56a2dfd 100644
--- a/res/skins/LateNight/button_2state_right_display.xml
+++ b/res/skins/LateNight/button_2state_right_display.xml
@@ -25,15 +25,15 @@ Variables:
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
+      <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_unpressed"/></Unpressed>
+      <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
     </State>
     <Connection>
       <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
diff --git a/res/skins/LateNight/button_3state.xml b/res/skins/LateNight/button_3state.xml
index 2448b8143c7b..bad1b18b6943 100644
--- a/res/skins/LateNight/button_3state.xml
+++ b/res/skins/LateNight/button_3state.xml
@@ -22,23 +22,23 @@ Variables:
     <State>
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0"/>.svg</Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0"/>.svg</Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1"/>.svg</Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1"/>.svg</Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
     </State>
     <State>
       <Number>2</Number>
       <Text><Variable name="state_2_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2"/>.svg</Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2"/>.svg</Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
     </State>
     <Connection>
       <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
diff --git a/res/skins/LateNight/button_3state_display.xml b/res/skins/LateNight/button_3state_display.xml
index d8346645e2f7..0992c9523586 100644
--- a/res/skins/LateNight/button_3state_display.xml
+++ b/res/skins/LateNight/button_3state_display.xml
@@ -22,23 +22,23 @@ Variables:
     <State>
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_unpressed"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
     </State>
     <State>
       <Number>2</Number>
       <Text><Variable name="state_2_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_unpressed"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
     </State>
     <Connection>
       <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
diff --git a/res/skins/LateNight/button_3state_persist.xml b/res/skins/LateNight/button_3state_persist.xml
index 2e234d317977..6d24caab223b 100644
--- a/res/skins/LateNight/button_3state_persist.xml
+++ b/res/skins/LateNight/button_3state_persist.xml
@@ -22,23 +22,23 @@ Variables:
     <State>
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0"/>.svg</Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0"/>.svg</Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1"/>.svg</Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1"/>.svg</Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
     </State>
     <State>
       <Number>2</Number>
       <Text><Variable name="state_2_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2"/>.svg</Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2"/>.svg</Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
     </State>
     <Connection>
       <ConfigKey persist="true"><Variable name="ConfigKey"/></ConfigKey>
diff --git a/res/skins/LateNight/button_5state.xml b/res/skins/LateNight/button_5state.xml
index 25f8611f7e17..78dbce113451 100644
--- a/res/skins/LateNight/button_5state.xml
+++ b/res/skins/LateNight/button_5state.xml
@@ -22,37 +22,37 @@ Variables:
     <State>
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_unpressed"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
     </State>
     <State>
       <Number>2</Number>
       <Text><Variable name="state_2_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_unpressed"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
     </State>
     <State>
       <Number>3</Number>
       <Text><Variable name="state_3_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_3_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_3_unpressed"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
     </State>
     <State>
       <Number>4</Number>
       <Text><Variable name="state_4_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_4_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_4_unpressed"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_<Variable name="btn_format"/>_active.svg</Pressed>
     </State>
     <Connection>
       <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
diff --git a/res/skins/LateNight/button_hotcue.xml b/res/skins/LateNight/button_hotcue.xml
index 481b1ab72d7a..647656855040 100644
--- a/res/skins/LateNight/button_hotcue.xml
+++ b/res/skins/LateNight/button_hotcue.xml
@@ -1,35 +1,46 @@
 <!-- A hotcue button. The only variable that needs to be specified is "number" -->
 <Template>
-  <PushButton>
-    <TooltipId>hotcue</TooltipId>
-    <ObjectName>HotcueButton</ObjectName>
-    <Size>26f,26f</Size>
-    <NumberStates>2</NumberStates>
-    <State>
-      <Number>0</Number>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_hotcue_<Variable name="number"/>_unset.svg</Unpressed>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_hotcue_<Variable name="number"/>_pressed.svg</Pressed>
-    </State>
-    <State>
-      <Number>1</Number>
-      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_hotcue_<Variable name="number"/>_set.svg</Unpressed>
-      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_hotcue_<Variable name="number"/>_pressed.svg</Pressed>
-    </State>
-    <Connection>
-      <ConfigKey><Variable name="group"/>,hotcue_<Variable name="number"/>_activate</ConfigKey>
-      <ButtonState>LeftButton</ButtonState>
-    </Connection>
-    <Connection>
-      <ConfigKey><Variable name="group"/>,hotcue_<Variable name="number"/>_clear</ConfigKey>
-      <ButtonState>RightButton</ButtonState>
-    </Connection>
-    <Connection>
-      <ConfigKey><Variable name="group"/>,hotcue_<Variable name="number"/>_enabled</ConfigKey>
-      <ConnectValueFromWidget>false</ConnectValueFromWidget>
-    </Connection>
-    <Connection>
-      <ConfigKey><Variable name="group"/>,hotcue_<Variable name="number"/>_color_id</ConfigKey>
-      <BindProperty>highlight</BindProperty>
-    </Connection>
-  </PushButton>
+  <WidgetGroup>
+    <ObjectName>Hotcue<Variable name="number"/></ObjectName>
+    <MinimumSize>26,26</MinimumSize>
+    <MaximumSize>26,26</MaximumSize>
+    <SizePolicy>me,f</SizePolicy>
+    <Layout>horizontal</Layout>
+    <Children>
+      <PushButton>
+        <TooltipId>hotcue</TooltipId>
+        <ObjectName>HotcueButton</ObjectName>
+        <MinimumSize>26,26</MinimumSize>
+        <MaximumSize>26,26</MaximumSize>
+        <SizePolicy>me,f</SizePolicy>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_square.svg</Unpressed>
+          <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_square_active.svg</Pressed>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_square_set.svg</Unpressed>
+          <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_square_active.svg</Pressed>
+        </State>
+        <Connection>
+          <ConfigKey><Variable name="group"/>,hotcue_<Variable name="number"/>_activate</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey><Variable name="group"/>,hotcue_<Variable name="number"/>_clear</ConfigKey>
+          <ButtonState>RightButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey><Variable name="group"/>,hotcue_<Variable name="number"/>_enabled</ConfigKey>
+          <ConnectValueFromWidget>false</ConnectValueFromWidget>
+        </Connection>
+        <Connection>
+          <ConfigKey><Variable name="group"/>,hotcue_<Variable name="number"/>_color_id</ConfigKey>
+          <BindProperty>highlight</BindProperty>
+        </Connection>
+      </PushButton>
+    </Children>
+  </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/button_special_cue.xml b/res/skins/LateNight/button_special_cue.xml
index 57897097fc3c..da95ad97cb65 100644
--- a/res/skins/LateNight/button_special_cue.xml
+++ b/res/skins/LateNight/button_special_cue.xml
@@ -7,35 +7,43 @@ Variables:
   label: Button text.
 -->
 <Template>
-  <PushButton>
-    <TooltipId><Variable name="cue_type"/></TooltipId>
-    <ObjectName>SpecialCueButton</ObjectName>
-    <MinimumSize>16,26</MinimumSize>
+  <WidgetGroup>
+    <ObjectName>SpecialCueButton_<Variable name="cue_type"/></ObjectName>
+    <MinimumSize>22,26</MinimumSize>
     <MaximumSize>26,26</MaximumSize>
     <SizePolicy>me,f</SizePolicy>
-    <NumberStates>2</NumberStates>
-    <RightClickIsPushButton>true</RightClickIsPushButton>
-    <State>
-      <Number>0</Number>
-      <Unpressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="cue_type"/>.svg</Unpressed>
-      <Pressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="cue_type"/>_pressed.svg</Pressed>
-    </State>
-    <State>
-      <Number>1</Number>
-      <Unpressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="cue_type"/>.svg</Unpressed>
-      <Pressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="cue_type"/>_pressed.svg</Pressed>
-    </State>
-    <Connection>
-      <ConfigKey><Variable name="group"/>,<Variable name="cue_type"/>_activate</ConfigKey>
-      <ButtonState>LeftButton</ButtonState>
-    </Connection>
-    <Connection>
-      <ConfigKey><Variable name="group"/>,<Variable name="cue_type"/>_clear</ConfigKey>
-      <ButtonState>RightButton</ButtonState>
-    </Connection>
-    <Connection>
-      <ConfigKey><Variable name="group"/>,<Variable name="cue_type"/>_enabled</ConfigKey>
-      <ConnectValueFromWidget>false</ConnectValueFromWidget>
-    </Connection>
-  </PushButton>
+    <Layout>horizontal</Layout>
+    <Children>
+      <PushButton>
+        <TooltipId><Variable name="cue_type"/></TooltipId>
+        <ObjectName>SpecialCueButton</ObjectName>
+        <MinimumSize>20,26</MinimumSize>
+        <MaximumSize>26,26</MaximumSize>
+        <SizePolicy>me,f</SizePolicy>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_square.svg</Unpressed>
+          <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_square_active.svg</Pressed>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_square_set.svg</Unpressed>
+          <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_square_active.svg</Pressed>
+        </State>
+        <Connection>
+          <ConfigKey><Variable name="group"/>,<Variable name="cue_type"/>_activate</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey><Variable name="group"/>,<Variable name="cue_type"/>_clear</ConfigKey>
+          <ButtonState>RightButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey><Variable name="group"/>,<Variable name="cue_type"/>_enabled</ConfigKey>
+          <ConnectValueFromWidget>false</ConnectValueFromWidget>
+        </Connection>
+      </PushButton>
+    </Children>
+  </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/button_xfader_aux.xml b/res/skins/LateNight/button_xfader_aux.xml
index c28eda6029d7..c89c3d7266a4 100644
--- a/res/skins/LateNight/button_xfader_aux.xml
+++ b/res/skins/LateNight/button_xfader_aux.xml
@@ -25,13 +25,13 @@
         <RightClickIsPushButton>false</RightClickIsPushButton>
         <State>
           <Number>0</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_left.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_left.svg</Unpressed>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_aux_left_off.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_aux_left_off.svg</Unpressed>
         </State>
         <State>
           <Number>1</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_left.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_left.svg</Unpressed>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_aux_left.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_aux_left.svg</Unpressed>
         </State>
         <Connection>
           <ConfigKey><Variable name="group"/>,orientation</ConfigKey>
@@ -50,13 +50,13 @@
         <RightClickIsPushButton>false</RightClickIsPushButton>
         <State>
           <Number>0</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_mid.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_mid.svg</Unpressed>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_aux_mid_off.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_aux_mid_off.svg</Unpressed>
         </State>
         <State>
           <Number>1</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_mid.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_mid.svg</Unpressed>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_aux_mid.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_aux_mid.svg</Unpressed>
         </State>
         <Connection>
           <ConfigKey><Variable name="group"/>,orientation</ConfigKey>
@@ -76,13 +76,13 @@
         <RightClickIsPushButton>false</RightClickIsPushButton>
         <State>
           <Number>0</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_right.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_right.svg</Unpressed>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_aux_right_off.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_aux_right_off.svg</Unpressed>
         </State>
         <State>
           <Number>1</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_right.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_aux_right.svg</Unpressed>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_aux_right.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_aux_right.svg</Unpressed>
         </State>
         <Connection>
           <ConfigKey><Variable name="group"/>,orientation</ConfigKey>
diff --git a/res/skins/LateNight/button_xfader_deck.xml b/res/skins/LateNight/button_xfader_deck.xml
index 03ef1e788ff2..f09fb3feb9c8 100644
--- a/res/skins/LateNight/button_xfader_deck.xml
+++ b/res/skins/LateNight/button_xfader_deck.xml
@@ -25,13 +25,13 @@
         <RightClickIsPushButton>false</RightClickIsPushButton>
         <State>
           <Number>0</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_left_off.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_left_off.svg</Unpressed>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_deck_left_off.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_deck_left_off.svg</Unpressed>
         </State>
         <State>
           <Number>1</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_left_<Variable name="xfaderLeft"/>.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_left_<Variable name="xfaderLeft"/>.svg</Unpressed>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_deck_left_<Variable name="xfaderLeft"/>.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_deck_left_<Variable name="xfaderLeft"/>.svg</Unpressed>
         </State>
         <Connection>
           <ConfigKey><Variable name="group"/>,orientation</ConfigKey>
@@ -50,13 +50,13 @@
         <RightClickIsPushButton>false</RightClickIsPushButton>
         <State>
           <Number>0</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_mid_off.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_mid_off.svg</Unpressed>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_deck_mid_off.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_deck_mid_off.svg</Unpressed>
         </State>
         <State>
           <Number>1</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_mid_warning.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_mid_warning.svg</Unpressed>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_deck_mid_warning.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_deck_mid_warning.svg</Unpressed>
         </State>
         <Connection>
           <ConfigKey><Variable name="group"/>,orientation</ConfigKey>
@@ -76,13 +76,13 @@
         <RightClickIsPushButton>false</RightClickIsPushButton>
         <State>
           <Number>0</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_right_off.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_right_off.svg</Unpressed>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_deck_right_off.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_deck_right_off.svg</Unpressed>
         </State>
         <State>
           <Number>1</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_right_<Variable name="xfaderRight"/>.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_xfader_deck_right_<Variable name="xfaderRight"/>.svg</Unpressed>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_deck_right_<Variable name="xfaderRight"/>.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_deck_right_<Variable name="xfaderRight"/>.svg</Unpressed>
         </State>
         <Connection>
           <ConfigKey><Variable name="group"/>,orientation</ConfigKey>
diff --git a/res/skins/LateNight/buttons/btn__over.svg b/res/skins/LateNight/buttons/btn__over.svg
deleted file mode 100644
index fb66ea1ba227..000000000000
--- a/res/skins/LateNight/buttons/btn__over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="1" height="1" version="1.1" xmlns="http://www.w3.org/2000/svg"></svg>
diff --git a/res/skins/LateNight/buttons/btn__overdown.svg b/res/skins/LateNight/buttons/btn__overdown.svg
deleted file mode 100644
index fb66ea1ba227..000000000000
--- a/res/skins/LateNight/buttons/btn__overdown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="1" height="1" version="1.1" xmlns="http://www.w3.org/2000/svg"></svg>
diff --git a/res/skins/LateNight/buttons/btn_arrow_left.svg b/res/skins/LateNight/buttons/btn_arrow_left.svg
deleted file mode 100644
index 0144aeae2ce2..000000000000
--- a/res/skins/LateNight/buttons/btn_arrow_left.svg
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="26"
-   width="26"
-   id="svg25537">
-  <metadata
-     id="metadata39">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs25539">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0 -1026.4)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient7834">
-      <stop
-         offset="0"
-         stop-color="#242424"
-         id="stop3803-7-3" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop3805-5-0" />
-    </linearGradient>
-  </defs>
-  <rect
-     style="color:#000000;opacity:0.72000002"
-     ry="2"
-     rx="2"
-     height="24"
-     width="24"
-     y="1"
-     x="0.5"
-     id="rect3029-6-6" />
-  <rect
-     fill="url(#linearGradient7834)"
-     color="#000000"
-     ry="2"
-     rx="2"
-     height="23"
-     width="23"
-     y=".49998"
-     x=".5"
-     id="rect3029" />
-  <path
-     fill="#bfbfbf"
-     display="none"
-     d="m10 9h3v6h-2v-5h-1v-1"
-     id="path3944" />
-  <path
-     fill="#060606"
-     display="none"
-     d="m13 10h1v6h-2v-1h1v-5"
-     id="path3948" />
-  <path
-     fill="#060606"
-     display="none"
-     d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1"
-     id="path5770-89-8-1" />
-  <path
-     fill="#bfbfbf"
-     display="none"
-     d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1"
-     id="path5770-8-5-6-8" />
-  <path
-     fill="#060606"
-     display="none"
-     d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1"
-     id="path6542-5-0" />
-  <path
-     fill="#bfbfbf"
-     display="none"
-     d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1"
-     id="path6542-3" />
-  <path
-     fill="#060606"
-     display="none"
-     d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2"
-     id="path6751-9" />
-  <path
-     fill="#bfbfbf"
-     display="none"
-     d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2"
-     id="path6751" />
-  <path
-     fill="#060606"
-     display="none"
-     d="m-23-14.5h3v-3h3v3h3v3h-3v3h-3v-3h-3v-3"
-     id="path9276-9-3" />
-  <path
-     fill="#bfbfbf"
-     display="none"
-     d="m-24-15.5h3v-3h3v3h3v3h-3v3h-3v-3h-3v-3"
-     id="path9276-5" />
-  <path
-     fill="#060606"
-     display="none"
-     d="m-11-14.5h9v3h-9v-3"
-     id="path9788-2-2" />
-  <path
-     fill="#bfbfbf"
-     display="none"
-     d="m-12-15.5h9v3h-9v-3"
-     id="path9788-6" />
-  <path
-     fill="#060606"
-     d="m17 12h-4v-4l-5 5.5 5 5.5v-4h4v-3"
-     id="path9792-3-2-6" />
-  <path
-     fill="#bfbfbf"
-     d="m16 11h-4v-4l-5 5.5 5 5.5v-4h4v-3"
-     id="path9792-3-3" />
-  <path
-     fill="#060606"
-     display="none"
-     d="m9 12h4v-4l5 5.5-5 5.5v-4h-4v-3"
-     id="path9792-0-0" />
-  <path
-     fill="#bfbfbf"
-     display="none"
-     d="m8 11h4v-4l5 5.5-5 5.5v-4h-4v-3"
-     id="path9792-9" />
-  <path
-     fill="#060606"
-     display="none"
-     d="m11 7h5v13h-1v-7h-4v-6"
-     id="path9817-3-1" />
-  <path
-     fill="#bfbfbf"
-     display="none"
-     d="m10 6h5v13h-1v-7h-4v-6"
-     id="path9817-7" />
-  <path
-     fill="#060606"
-     display="none"
-     d="m16 7h-5v13h1v-7h4v-6"
-     id="path9817-6-7-5" />
-  <path
-     fill="#bfbfbf"
-     display="none"
-     d="m15 6h-5v13h1v-7h4v-6"
-     id="path9817-6-4" />
-  <path
-     stroke-width=".5"
-     stroke="#060606"
-     fill="#060606"
-     display="none"
-     color="#000000"
-     d="m13 6.2188c-3.5899 0-6.5 2.9101-6.5 6.5 0 0.04264-8.17e-4 0.08256 0 0.125 0.31008-0.21529 0.65937-0.36228 1.0312-0.46875 0.1786-2.8763 2.5474-5.1562 5.4687-5.1562 3.0376 0 5.5 2.4624 5.5 5.5 0 0.04206 9.4e-4 0.08317 0 0.125 0.35675 0.2477 0.66301 0.54621 0.90625 0.90625 0.05416-0.33774 0.09375-0.67825 0.09375-1.0312 0-3.5899-2.9102-6.5-6.5-6.5z"
-     id="path9863-3-5" />
-  <path
-     fill="#060606"
-     display="none"
-     color="#000000"
-     d="m8.5 19.219c-1.933 0-3.5-1.567-3.5-3.5s1.567-3.5 3.5-3.5z"
-     id="path9842-6-4" />
-  <path
-     fill="#060606"
-     display="none"
-     color="#000000"
-     d="m17.5 19.219c1.933 0 3.5-1.567 3.5-3.5s-1.567-3.5-3.5-3.5z"
-     id="path9842-2-0-7" />
-  <path
-     stroke-width=".5"
-     stroke="#bfbfbf"
-     fill="#bfbfbf"
-     display="none"
-     color="#000000"
-     d="m12 5.2188c-3.5899 0-6.5 2.9101-6.5 6.5 0 0.04264-8.17e-4 0.08256 0 0.125 0.31008-0.21529 0.65937-0.36228 1.0312-0.46875 0.1786-2.8763 2.5474-5.1562 5.4688-5.1562 3.0376 0 5.5 2.4624 5.5 5.5 0 0.04206 9.39e-4 0.08317 0 0.125 0.35675 0.2477 0.66301 0.54621 0.90625 0.90625 0.05416-0.33774 0.09375-0.67825 0.09375-1.0312 0-3.5899-2.9101-6.5-6.5-6.5z"
-     id="path9863-2" />
-  <path
-     fill="#bfbfbf"
-     display="none"
-     color="#000000"
-     d="m7.5 18.219c-1.933 0-3.5-1.567-3.5-3.5s1.567-3.5 3.5-3.5z"
-     id="path9842-5" />
-  <path
-     fill="#bfbfbf"
-     display="none"
-     color="#000000"
-     d="m16.5 18.219c1.933 0 3.5-1.567 3.5-3.5s-1.567-3.5-3.5-3.5z"
-     id="path9842-2-4" />
-  <path
-     style="block-progression:tb;text-indent:0;text-transform:none"
-     fill="#444444"
-     color="#000000"
-     d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z"
-     id="rect3029-96-0" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_arrow_left_overdown.svg b/res/skins/LateNight/buttons/btn_arrow_left_overdown.svg
deleted file mode 100644
index 62f8197d7a08..000000000000
--- a/res/skins/LateNight/buttons/btn_arrow_left_overdown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg25537" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs25539"><linearGradient id="linearGradient7607" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-9-85" stop-color="#aa1112" offset="0"/><stop id="stop4329-4-61" stop-color="#b60607" offset=".28"/><stop id="stop3805-5-28-5-1" stop-color="#760607" offset="1"/></linearGradient></defs><rect id="rect3029-96-4" x=".5" y=".49998" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient7607)"/><path id="path3944-9-6" d="m10 9h3v6h-2v-5h-1v-1" display="none" fill="#8d8f90"/><path id="path3948-7-8" d="m13 10h1v6h-2v-1h1v-5" display="none" fill="#320202"/><path id="path5770-89" d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" display="none" fill="#320202"/><path id="path5770-8-5" d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" display="none" fill="#8d8f90"/><path id="path6542-5-0-4-4" d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" display="none" fill="#320202"/><path id="path6542-3-5-9" d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" display="none" fill="#8d8f90"/><path id="path6751-9-1" d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" display="none" fill="#320202"/><path id="path6751-6" d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" display="none" fill="#8d8f90"/><path id="path9276-9" d="m-23-14.5h3v-3h3v3h3v3h-3v3h-3v-3h-3v-3" display="none" fill="#320202"/><path id="path9276" d="m-24-15.5h3v-3h3v3h3v3h-3v3h-3v-3h-3v-3" display="none" fill="#8d8f90"/><path id="path9788-2" d="m-11-14.5h9v3h-9v-3" display="none" fill="#320202"/><path id="path9788" d="m-12-15.5h9v3h-9v-3" display="none" fill="#8d8f90"/><path id="path9792-3-2" d="m17 12h-4v-4l-5 5.5 5 5.5v-4h4v-3" fill="#320202"/><path id="path9792-3" d="m16 11h-4v-4l-5 5.5 5 5.5v-4h4v-3" fill="#8d8f90"/><path id="path9792-0" d="m9 12h4v-4l5 5.5-5 5.5v-4h-4v-3" display="none" fill="#320202"/><path id="path9792" d="m8 11h4v-4l5 5.5-5 5.5v-4h-4v-3" display="none" fill="#8d8f90"/><path id="path9817-3" d="m11 7h5v13h-1v-7h-4v-6" display="none" fill="#320202"/><path id="path9817" d="m10 6h5v13h-1v-7h-4v-6" display="none" fill="#8d8f90"/><path id="path9817-6-7" d="m16 7h-5v13h1v-7h4v-6" display="none" fill="#320202"/><path id="path9817-6" d="m15 6h-5v13h1v-7h4v-6" display="none" fill="#8d8f90"/><path id="path9863-3" d="m13 6.25c-3.5899 0-6.5 2.9101-6.5 6.5 0 0.04264-8.17e-4 0.08256 0 0.125 0.31008-0.21529 0.65937-0.36228 1.0312-0.46875 0.1786-2.8763 2.5474-5.1562 5.4688-5.1562 3.0376 0 5.5 2.4624 5.5 5.5 0 0.04206 9.39e-4 0.08317 0 0.125 0.35675 0.2477 0.66301 0.54621 0.90625 0.90625 0.054158-0.33774 0.09375-0.67825 0.09375-1.0312 0-3.5899-2.9101-6.5-6.5-6.5z" color="#000000" display="none" fill="#320202" stroke="#320202" stroke-width=".5"/><path id="path9842-6" d="m8.5 19.25c-1.933 0-3.5-1.567-3.5-3.5s1.567-3.5 3.5-3.5z" color="#000000" display="none" fill="#320202"/><path id="path9842-2-0" d="m17.5 19.25c1.933 0 3.5-1.567 3.5-3.5s-1.567-3.5-3.5-3.5z" color="#000000" display="none" fill="#320202"/><path id="path9863" d="m12 5.25c-3.5899 0-6.5 2.9101-6.5 6.5 0 0.04264-8.17e-4 0.08256 0 0.125 0.31008-0.21529 0.65937-0.36228 1.0312-0.46875 0.1786-2.8763 2.5474-5.1562 5.4688-5.1562 3.0376 0 5.5 2.4624 5.5 5.5 0 0.04206 9.39e-4 0.08317 0 0.125 0.35675 0.2477 0.66301 0.54621 0.90625 0.90625 0.054158-0.33774 0.09375-0.67825 0.09375-1.0312 0-3.5899-2.9101-6.5-6.5-6.5z" color="#000000" display="none" fill="#8d8f90" stroke="#8f8f8f" stroke-width=".5"/><path id="path9842" d="m7.5 18.25c-1.933 0-3.5-1.567-3.5-3.5s1.567-3.5 3.5-3.5z" color="#000000" display="none" fill="#8d8f90"/><path id="path9842-2" d="m16.5 18.25c1.933 0 3.5-1.567 3.5-3.5s-1.567-3.5-3.5-3.5z" color="#000000" display="none" fill="#8d8f90"/><path id="rect3029-96-9" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_arrow_right.svg b/res/skins/LateNight/buttons/btn_arrow_right.svg
deleted file mode 100644
index 60c7a9dad456..000000000000
--- a/res/skins/LateNight/buttons/btn_arrow_right.svg
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="26"
-   width="26"
-   id="svg25537">
-  <metadata
-     id="metadata15">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs25539">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0 -1026.4)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient7413">
-      <stop
-         offset="0"
-         stop-color="#242424"
-         id="stop3803-7-85" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop3805-5-74" />
-    </linearGradient>
-  </defs>
-  <rect
-     style="color:#000000;opacity:0.72000002"
-     ry="2"
-     rx="2"
-     height="24"
-     width="24"
-     y="0.99997997"
-     x="0.5"
-     id="rect3029-6-6" />
-  <rect
-     fill="url(#linearGradient7413)"
-     color="#000000"
-     ry="2"
-     rx="2"
-     height="23"
-     width="23"
-     y=".49998"
-     x=".5"
-     id="rect3029" />
-  <path
-     fill="#060606"
-     d="m9 12h4v-4l5 5.5-5 5.5v-4h-4v-3"
-     id="path9792-0-0" />
-  <path
-     fill="#bfbfbf"
-     d="m8 11h4v-4l5 5.5-5 5.5v-4h-4v-3"
-     id="path9792-9" />
-  <path
-     style="block-progression:tb;text-indent:0;text-transform:none"
-     fill="#444444"
-     color="#000000"
-     d="m2 0c-1.0994 0-2 0.9006-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.9006 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.7374 1.3 1.3v19.4c0 0.5626-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.7374-1.3-1.3v-19.4c0-0.5626 0.73735-1.3 1.3-1.3z"
-     id="rect3029-96-0" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_arrow_right_overdown.svg b/res/skins/LateNight/buttons/btn_arrow_right_overdown.svg
deleted file mode 100644
index 3a87f9ec46c3..000000000000
--- a/res/skins/LateNight/buttons/btn_arrow_right_overdown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg25537" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs25539"><linearGradient id="linearGradient7271" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-9-8" stop-color="#aa1112" offset="0"/><stop id="stop4329-4-5" stop-color="#b60607" offset=".28"/><stop id="stop3805-5-28-5-0" stop-color="#760607" offset="1"/></linearGradient></defs><rect id="rect3029-96-4" x=".5" y=".49998" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient7271)"/><path id="path3944-9-6" d="m10 9h3v6h-2v-5h-1v-1" display="none" fill="#8d8f90"/><path id="path3948-7-8" d="m13 10h1v6h-2v-1h1v-5" display="none" fill="#320202"/><path id="path5770-89" d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" display="none" fill="#320202"/><path id="path5770-8-5" d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" display="none" fill="#8d8f90"/><path id="path6542-5-0-4-4" d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" display="none" fill="#320202"/><path id="path6542-3-5-9" d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" display="none" fill="#8d8f90"/><path id="path6751-9-1" d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" display="none" fill="#320202"/><path id="path6751-6" d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" display="none" fill="#8d8f90"/><path id="path9276-9" d="m-23-14.5h3v-3h3v3h3v3h-3v3h-3v-3h-3v-3" display="none" fill="#320202"/><path id="path9276" d="m-24-15.5h3v-3h3v3h3v3h-3v3h-3v-3h-3v-3" display="none" fill="#8d8f90"/><path id="path9788-2" d="m-11-14.5h9v3h-9v-3" display="none" fill="#320202"/><path id="path9788" d="m-12-15.5h9v3h-9v-3" display="none" fill="#8d8f90"/><path id="path9792-3-2" d="m13-14.5h-4v-4l-5 5.5 5 5.5v-4h4v-3" display="none" fill="#320202"/><path id="path9792-3" d="m12-15.5h-4v-4l-5 5.5 5 5.5v-4h4v-3" display="none" fill="#8d8f90"/><path id="path9792-0" d="m9 12h4v-4l5 5.5-5 5.5v-4h-4v-3" fill="#320202"/><path id="path9792" d="m8 11h4v-4l5 5.5-5 5.5v-4h-4v-3" fill="#8d8f90"/><path id="path9817-3" d="m11 7h5v13h-1v-7h-4v-6" display="none" fill="#320202"/><path id="path9817" d="m10 6h5v13h-1v-7h-4v-6" display="none" fill="#8d8f90"/><path id="path9817-6-7" d="m16 7h-5v13h1v-7h4v-6" display="none" fill="#320202"/><path id="path9817-6" d="m15 6h-5v13h1v-7h4v-6" display="none" fill="#8d8f90"/><path id="path9863-3" d="m13 6.25c-3.5899 0-6.5 2.9101-6.5 6.5 0 0.04264-8.17e-4 0.08256 0 0.125 0.31008-0.21529 0.65937-0.36228 1.0312-0.46875 0.1786-2.8763 2.5474-5.1562 5.4688-5.1562 3.0376 0 5.5 2.4624 5.5 5.5 0 0.04206 9.39e-4 0.08317 0 0.125 0.35675 0.2477 0.66301 0.54621 0.90625 0.90625 0.054158-0.33774 0.09375-0.67825 0.09375-1.0312 0-3.5899-2.9101-6.5-6.5-6.5z" color="#000000" display="none" fill="#320202" stroke="#320202" stroke-width=".5"/><path id="path9842-6" d="m8.5 19.25c-1.933 0-3.5-1.567-3.5-3.5s1.567-3.5 3.5-3.5z" color="#000000" display="none" fill="#320202"/><path id="path9842-2-0" d="m17.5 19.25c1.933 0 3.5-1.567 3.5-3.5s-1.567-3.5-3.5-3.5z" color="#000000" display="none" fill="#320202"/><path id="path9863" d="m12 5.25c-3.5899 0-6.5 2.9101-6.5 6.5 0 0.04264-8.17e-4 0.08256 0 0.125 0.31008-0.21529 0.65937-0.36228 1.0312-0.46875 0.1786-2.8763 2.5474-5.1562 5.4688-5.1562 3.0376 0 5.5 2.4624 5.5 5.5 0 0.04206 9.39e-4 0.08317 0 0.125 0.35675 0.2477 0.66301 0.54621 0.90625 0.90625 0.054158-0.33774 0.09375-0.67825 0.09375-1.0312 0-3.5899-2.9101-6.5-6.5-6.5z" color="#000000" display="none" fill="#8d8f90" stroke="#8f8f8f" stroke-width=".5"/><path id="path9842" d="m7.5 18.25c-1.933 0-3.5-1.567-3.5-3.5s1.567-3.5 3.5-3.5z" color="#000000" display="none" fill="#8d8f90"/><path id="path9842-2" d="m16.5 18.25c1.933 0 3.5-1.567 3.5-3.5s-1.567-3.5-3.5-3.5z" color="#000000" display="none" fill="#8d8f90"/><path id="rect3029-96-9" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_autodj_addrandom.svg b/res/skins/LateNight/buttons/btn_autodj_addrandom.svg
deleted file mode 100644
index bd7cdbe8d685..000000000000
--- a/res/skins/LateNight/buttons/btn_autodj_addrandom.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="32" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg"><g transform="translate(-4)" fill="#cccccc"><g transform="matrix(.68451 0 0 .68268 17.431 -.032504)" aria-label="?"><path d="m17.145 12.382q0 .59245-.20964 1.0846-.20052.49219-.59245.92969-.38281.42838-1.7682 1.431-1.2122.875-1.2578 1.8411h-2.4336q.05469-.9388.53776-1.6771.48307-.7474 1.3672-1.3581 1.0299-.70182 1.4036-1.1484.3737-.45573.3737-.99349 0-.70182-.55599-1.1211-.55599-.42838-1.4583-.42838-.92057 0-1.5495.53776-.61979.53776-.72917 1.4219l-2.5977-.10938q.24609-1.8503 1.5221-2.8802 1.276-1.0299 3.3177-1.0299 2.1146 0 3.3724.94792t1.2578 2.5521zm-6.3346 8.987v-2.4609h2.6341v2.4609z" fill="#cccccc" stroke-width="1.4629"/></g><path d="m21.746 3c-.01174.000237-.02347.0008874-.03516.00195-.0052.0005679-.01043.00122-.01563.00195-.0046.0005871-.0091.00124-.01367.00195-.0065.00117-.01305.00248-.01953.00391-.0052.00122-.01044.00252-.01563.00391-.01584.00379-.03148.00835-.04687.013672-.01389.00461-.02758.00982-.04102.015625-.0072.00309-.0144.00634-.02148.00977-.0073.00373-.01442.00764-.02148.011719-.0026.00128-.0052.00258-.0078.00391-.01.00616-.01977.012679-.0293.019531-.006.00443-.01182.00898-.01758.013672-.01142.008-.02249.016468-.0332.025391-.0067.00633-.0132.012842-.01953.019531l-4.2618 4.25c-.01168.011811-.02276.024196-.0332.037109-.02089.025475-.03921.052953-.05469.082031-.0079.014608-.01508.0296-.02149.044922-.006.015998-.01126.032295-.01563.048828-.0047.015427-.0086.03107-.01172.046875v.00195c-.0061.030231-.0094.060961-.0098.091797-1.1e-5.00195-1.1e-5.00391 0 .00586l-6.7e-5 8.7441c2.8e-5.27613.22387.49997.5.5h17c.27613-2.8e-5.49997-.22387.5-.5l-6.7e-5-13c-2.8e-5-.27613-.22387-.49997-.5-.5h-12.74c-.0046-6.23e-5-.0091-6.23e-5-.01367 0zm.51367 1h11.74l6.7e-5 12h-16l6.7e-5-7.75h3.7599c.27613-2.76e-5.49997-.22387.5-.5zm-1 .70508.000134 2.5449h-2.5509z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/><g transform="matrix(.94002 0 0 .9375 -2.8999 -3.8867)" aria-label="+"><path d="m13.723 15.879v3.2h-2.1276v-3.2h-3.1914v-2.1333h3.1914v-3.2h2.1276v3.2h3.1914v2.1333z" fill="#cccccc" stroke-width="1.0652"/></g></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_autodj_enable_off.svg b/res/skins/LateNight/buttons/btn_autodj_enable_off.svg
deleted file mode 100644
index 39c89a701eba..000000000000
--- a/res/skins/LateNight/buttons/btn_autodj_enable_off.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg"><g fill="#ccc"><path d="m26 3c-.554 0-1 .446-1 1v3h8v-3c0-.554-.446-1-1-1zm1.25 1.5c.41421 0 .75.33579.75.75s-.33579.75-.75.75-.75-.33579-.75-.75.33579-.75.75-.75zm3.5 0c.41421 0 .75.33579.75.75s-.33579.75-.75.75-.75-.33579-.75-.75.33579-.75.75-.75z" color="#000000"/><rect x="26" y="14" width="2" height="3" rx="1" ry="1"/><rect x="30" y="14" width="2" height="3" rx="1" ry="1"/><rect x="22" y="8" width="2" height="5" rx="1" ry="1" color="#000000"/><path d="m25 8v6.4219c0 .32317.223.57812.5.57812h7c.277 0 .5-.25496.5-.57812v-6.4219h-7.5z" color="#000000"/><rect x="34" y="8" width="2" height="5" rx="1" ry="1" color="#000000"/><path d="m6.4414 5.5293a.75008.75008 0 0 0-.45898.18164c-2.011 1.6874-2.7533 4.459-1.8555 6.9258.89787 2.4668 3.2479 4.1133 5.873 4.1133 2.6252 1.6e-5 4.9752-1.6465 5.873-4.1133.89785-2.4668.15554-5.2384-1.8555-6.9258a.75008.75008 0 1 0-.96289 1.1484c1.5319 1.2854 2.0941 3.3865 1.4102 5.2656-.68395 1.8791-2.4651 3.125-4.4648 3.125-1.9997 1.2e-5-3.7789-1.2459-4.4629-3.125-.68393-1.8791-.12173-3.9803 1.4102-5.2656a.75008.75008 0 0 0-.50586-1.3301z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/><path d="m9.9883 2.7383a.75008.75008 0 0 0-.73828.76172v5a.75008.75008 0 1 0 1.5 0v-5a.75008.75008 0 0 0-.76172-.76172z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_autodj_enable_on.svg b/res/skins/LateNight/buttons/btn_autodj_enable_on.svg
deleted file mode 100644
index b34b4165a535..000000000000
--- a/res/skins/LateNight/buttons/btn_autodj_enable_on.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg"><g><path d="m26 3c-.554 0-1 .446-1 1v3h8v-3c0-.554-.446-1-1-1zm1.25 1.5c.41421 0 .75.33579.75.75s-.33579.75-.75.75-.75-.33579-.75-.75.33579-.75.75-.75zm3.5 0c.41421 0 .75.33579.75.75s-.33579.75-.75.75-.75-.33579-.75-.75.33579-.75.75-.75z" color="#000000"/><rect x="26" y="14" width="2" height="3" rx="1" ry="1"/><rect x="30" y="14" width="2" height="3" rx="1" ry="1"/><rect x="22" y="8" width="2" height="5" rx="1" ry="1" color="#000000"/><path d="m25 8v6.4219c0 .32317.223.57812.5.57812h7c.277 0 .5-.25496.5-.57812v-6.4219h-7.5z" color="#000000"/><rect x="34" y="8" width="2" height="5" rx="1" ry="1" color="#000000"/><path d="m6.4414 5.5293a.75008.75008 0 0 0-.45898.18164c-2.011 1.6874-2.7533 4.459-1.8555 6.9258.89787 2.4668 3.2479 4.1133 5.873 4.1133 2.6252 1.6e-5 4.9752-1.6465 5.873-4.1133.89785-2.4668.15554-5.2384-1.8555-6.9258a.75008.75008 0 1 0-.96289 1.1484c1.5319 1.2854 2.0941 3.3865 1.4102 5.2656-.68395 1.8791-2.4651 3.125-4.4648 3.125-1.9997 1.2e-5-3.7789-1.2459-4.4629-3.125-.68393-1.8791-.12173-3.9803 1.4102-5.2656a.75008.75008 0 0 0-.50586-1.3301z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/><path d="m9.9883 2.7383a.75008.75008 0 0 0-.73828.76172v5a.75008.75008 0 1 0 1.5 0v-5a.75008.75008 0 0 0-.76172-.76172z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_autodj_fade.svg b/res/skins/LateNight/buttons/btn_autodj_fade.svg
deleted file mode 100644
index f6c0f66e1007..000000000000
--- a/res/skins/LateNight/buttons/btn_autodj_fade.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="32" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1="5.8939" x2="23.745" y1="16.222" y2="6.7843" gradientUnits="userSpaceOnUse"><stop stop-color="#cccccc" offset="0"/><stop stop-color="#d2d2d2" offset="1"/></linearGradient></defs><path d="m22.344 6.041c-8.5814 1.2349-13.813 4.3649-18.887 9.7031l1.0859 1.0332c4.9261-5.1827 9.694-8.0547 18.014-9.252zm-.57675-3.0402.97008 7.1903 6.7052-4.5652z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#a)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/><path d="m3.7793 4.8281-.2168 1.4844c3.1686.4617 5.4587 1.0047 7.8706 1.9377.59438-.29785 1.1531-.62948 1.7832-.89062-2.853-1.264-5.6118-1.9741-9.437-2.5315zm13.878 4.8589c-.63968.19217-1.2426.38965-1.8359.61523 3.0203 1.6884 5.2014 3.6519 7.8405 6.4634l1.0938-1.0273c-2.3854-2.5411-4.385-4.3747-7.0983-6.0512z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#cccccc" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_autodj_fade_disabled.svg b/res/skins/LateNight/buttons/btn_autodj_fade_disabled.svg
deleted file mode 100644
index 366995bd74cc..000000000000
--- a/res/skins/LateNight/buttons/btn_autodj_fade_disabled.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="32" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m22.344 6.041c-8.5814 1.2349-13.813 4.3649-18.887 9.7031l1.0859 1.0332c4.9261-5.1827 9.694-8.0547 18.014-9.252zm-.57675-3.0402.97008 7.1903 6.7052-4.5652z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#666" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/><path d="m3.7793 4.8281-.2168 1.4844c3.1686.4617 5.4587 1.0047 7.8706 1.9377.59438-.29785 1.1531-.62948 1.7832-.89062-2.853-1.264-5.6118-1.9741-9.437-2.5315zm13.878 4.8589c-.63968.19217-1.2426.38965-1.8359.61523 3.0203 1.6884 5.2014 3.6519 7.8405 6.4634l1.0938-1.0273c-2.3854-2.5411-4.385-4.3747-7.0983-6.0512z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#666" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_autodj_repeat_playlist_off.svg b/res/skins/LateNight/buttons/btn_autodj_repeat_playlist_off.svg
deleted file mode 100644
index f3d2a36df70b..000000000000
--- a/res/skins/LateNight/buttons/btn_autodj_repeat_playlist_off.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m8.0469 1.75-6 3 6 3v-2.25h6.9531c.71734 0 1.5.83133 1.5 1.5v4.6562l1.5 1.1562v-5.8125c0-1.6447-1.3553-3-3-3h-6.9531v-2.25z" color="#000000" fill="#cccccc"/><path d="m11.953 18.25 6-3-6-3v2.25h-6.9531c-.71734 0-1.5-.83133-1.5-1.5v-4.6563l-1.5-1.1562v5.8125c0 1.6447 1.3553 3 3 3h6.9531z" color="#000000" fill="#cccccc"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_autodj_repeat_playlist_on.svg b/res/skins/LateNight/buttons/btn_autodj_repeat_playlist_on.svg
deleted file mode 100644
index 24427bce20ae..000000000000
--- a/res/skins/LateNight/buttons/btn_autodj_repeat_playlist_on.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m8.0469 1.75-6 3 6 3v-2.25h6.9531c.71734 0 1.5.83133 1.5 1.5v4.6562l1.5 1.1562v-5.8125c0-1.6447-1.3553-3-3-3h-6.9531z" color="#000000"/><path d="m11.953 18.25 6-3-6-3v2.25h-6.9531c-.71734 0-1.5-.83133-1.5-1.5v-4.6563l-1.5-1.1562v5.8125c0 1.6447 1.3553 3 3 3h6.9531z" color="#000000"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_autodj_shuffle.svg b/res/skins/LateNight/buttons/btn_autodj_shuffle.svg
deleted file mode 100644
index 678fe38b0d9f..000000000000
--- a/res/skins/LateNight/buttons/btn_autodj_shuffle.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="36" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m26 2.2553 7.1e-5 6.0001 6-3.0001z" fill="#cccccc"/><path d="m26 17.789 7.1e-5-6 5.9999 3.0001z" fill="#cccccc"/><g fill="#cccccc" shape-rendering="auto"><path d="m26 4.4365c-4.7361 0-7.2498 3.3683-9.8477 5.5052-2.5978 2.1369-5.3294 4.1478-11.152 4.1478-1.0142-.01458-1.0142 1.5387 0 1.5242 6.1771 0 9.4455-2.3076 12.098-4.4891 2.6522-2.1815 4.6385-5.1639 8.9023-5.1639 1.0142.014581 1.0142-1.5387 0-1.5242z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/><path d="m19.373 11.282c-.37351.30931-.73323.60416-1.1445.94127-.01226.01002-.02677.0196-.03906.02967 2.1349 1.7261 3.9973 3.4298 7.8106 3.4298 1.0142.01453 1.0142-1.5332 0-1.5187-3.2739 0-4.7051-1.3388-6.627-2.8821zm-14.373-6.8567c-1.0143-.014531-1.0143 1.5332 0 1.5187 4.899 0 7.719 1.7951 10.003 3.5382.21187-.1694.42389-.33773.63672-.51216.18392-.15074.38858-.31002.57617-.4647-2.4909-1.9307-5.7902-4.08-11.216-4.08z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_autodj_skip.svg b/res/skins/LateNight/buttons/btn_autodj_skip.svg
deleted file mode 100644
index 21a7f07ab351..000000000000
--- a/res/skins/LateNight/buttons/btn_autodj_skip.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="32" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg"><g><rect x="1" y="7" width="8" height="6" rx="1" ry="1" fill="#e5e5e5" style="paint-order:fill markers stroke"/><path d="m13 7c-.554 0-1 .446-1 1h1zm1 0v1h1v-1zm2 0v1h1v-1zm2 0v1h2c0-.554-.446-1-1-1zm-6 2v1h1v-1zm7 0v1h1v-1zm-7 2v1c0 .554.446 1 1 1v-2zm7 0c0 .554-.446 1-1 1v1h1c.554 0 1-.446 1-1v-1zm-5 1v1h1v-1zm2 0v1h1v-1z" fill="#d2d2d2" style="paint-order:fill markers stroke"/><path d="m24 7c-.554 0-1 .446-1 1v4c0 .554.446 1 1 1h6c.554 0 1-.446 1-1v-4c0-.554-.446-1-1-1zm1 1h4c.554 0 1 .446 1 1v2c0 .554-.446 1-1 1h-4c-.554 0-1-.446-1-1v-2c0-.554.446-1 1-1z" fill="#d2d2d2" style="paint-order:fill markers stroke"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_autodj_skip_disabled.svg b/res/skins/LateNight/buttons/btn_autodj_skip_disabled.svg
deleted file mode 100644
index fdcce0d17253..000000000000
--- a/res/skins/LateNight/buttons/btn_autodj_skip_disabled.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="32" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg"><g fill="#666"><rect x="1" y="7" width="8" height="6" rx="1" ry="1" style="paint-order:fill markers stroke"/><path d="m13 7c-.554 0-1 .446-1 1h1zm1 0v1h1v-1zm2 0v1h1v-1zm2 0v1h2c0-.554-.446-1-1-1zm-6 2v1h1v-1zm7 0v1h1v-1zm-7 2v1c0 .554.446 1 1 1v-2zm7 0c0 .554-.446 1-1 1v1h1c.554 0 1-.446 1-1v-1zm-5 1v1h1v-1zm2 0v1h1v-1z" style="paint-order:fill markers stroke"/><path d="m24 7c-.554 0-1 .446-1 1v4c0 .554.446 1 1 1h6c.554 0 1-.446 1-1v-4c0-.554-.446-1-1-1zm1 1h4c.554 0 1 .446 1 1v2c0 .554-.446 1-1 1h-4c-.554 0-1-.446-1-1v-2c0-.554.446-1 1-1z" style="paint-order:fill markers stroke"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_aux_play.svg b/res/skins/LateNight/buttons/btn_aux_play.svg
deleted file mode 100644
index ea5a01c092c1..000000000000
--- a/res/skins/LateNight/buttons/btn_aux_play.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="42" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="matrix(2.1304 0 0 1 -.56522 -1048.4)" gradientUnits="userSpaceOnUse"><stop stop-color="#ce0e0e" offset="0"/><stop stop-color="#d00" offset=".28"/><stop stop-color="#8d0000" offset="1"/></linearGradient></defs><path transform="scale(1,-1)" d="m2.5-21.5h35.014c1.108 0 2 .892 2 2v17c0 1.108-.892 2-2 2h-35.014c-1.108 0-2-.892-2-2v-17c0-1.108.892-2 2-2z" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v18c0 1.0994.90065 2 2 2h36c1.0994 0 2-.90065 2-2v-18c0-1.0994-.90065-2-2-2zm.3 1h35.4c.56265 0 1.3.73735 1.3 1.3v17.4c0 .56265-.73735 1.3-1.3 1.3h-35.4c-.56265 0-1.3-.73735-1.3-1.3v-17.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="text-indent:0;text-transform:none"/><g fill="#3d0000"><path d="m22 9v6h2v-2h3v2h2v-6zm2 1h3v2h-3z"/><path d="m14 9v6h7v-1h-5v-5h-2"/><path d="m7 9v6h2v-2h4v-4zm2 1h3v2h-3z"/></g><g fill="#bfbfbf"><path d="m21 8v6h2v-2h3v2h2v-6zm2 1h3v2h-3z"/><path d="m13 8v6h7v-1h-5v-5h-2"/><path d="m6 8v6h2v-2h4v-4zm2 1h3v2h-3z"/></g><path d="m32 15v-3.5l-2-2v-.5h1.5l1.5 1.5 1.5-1.5h1.5v.5l-2 2v3.5h-2" fill="#3d0000"/><path d="m31 14v-3.5l-2-2v-.5h1.5l1.5 1.5 1.5-1.5h1.5v.5l-2 2v3.5h-2" fill="#bfbfbf"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_aux_play_down.svg b/res/skins/LateNight/buttons/btn_aux_play_down.svg
deleted file mode 100644
index 2665b987cb3a..000000000000
--- a/res/skins/LateNight/buttons/btn_aux_play_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="42" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="matrix(2.1304 0 0 1 -.56522 -1048.4)" gradientUnits="userSpaceOnUse"><stop stop-color="#aa1112" offset="0"/><stop stop-color="#b60607" offset=".28"/><stop stop-color="#760607" offset="1"/></linearGradient></defs><path transform="scale(1,-1)" d="m2.5-21.5h35.014c1.108 0 2 .892 2 2v17c0 1.108-.892 2-2 2h-35.014c-1.108 0-2-.892-2-2v-17c0-1.108.892-2 2-2z" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v18c0 1.0994.90065 2 2 2h36c1.0994 0 2-.90065 2-2v-18c0-1.0994-.90065-2-2-2zm.3 1h35.4c.56265 0 1.3.73735 1.3 1.3v17.4c0 .56265-.73735 1.3-1.3 1.3h-35.4c-.56265 0-1.3-.73735-1.3-1.3v-17.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="text-indent:0;text-transform:none"/><g fill="#320202"><path d="m22 9v6h2v-2h3v2h2v-6zm2 1h3v2h-3z"/><path d="m14 9v6h7v-1h-5v-5h-2"/><path d="m7 9v6h2v-2h4v-4zm2 1h3v2h-3z"/></g><g fill="#8d8f90"><path d="m21 8v6h2v-2h3v2h2v-6zm2 1h3v2h-3z"/><path d="m13 8v6h7v-1h-5v-5h-2"/><path d="m6 8v6h2v-2h4v-4zm2 1h3v2h-3z"/></g><path d="m32 15v-3.5l-2-2v-.5h1.5l1.5 1.5 1.5-1.5h1.5v.5l-2 2v3.5h-2" fill="#320202"/><path d="m31 14v-3.5l-2-2v-.5h1.5l1.5 1.5 1.5-1.5h1.5v.5l-2 2v3.5h-2" fill="#8d8f90"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_aux_play_over.svg b/res/skins/LateNight/buttons/btn_aux_play_over.svg
deleted file mode 100644
index ce49a75aec5e..000000000000
--- a/res/skins/LateNight/buttons/btn_aux_play_over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="42" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="matrix(2.1304 0 0 1 -.56522 -1028.4)" gradientUnits="userSpaceOnUse"><stop stop-color="#242424" offset="0"/><stop stop-color="#101010" offset="1"/></linearGradient></defs><path d="m2.5 1h36c1.108 0 2 .892 2 2v18c0 1.108-.892 2-2 2h-36c-1.108 0-2-.892-2-2v-18c0-1.108.892-2 2-2z" color="#000000" opacity=".9"/><path d="m2.5.49998h35.015c1.108 0 2 .892 2 2v17c0 1.108-.892 2-2 2h-35.015c-1.108 0-2-.892-2-2v-17c0-1.108.892-2 2-2z" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v18c0 1.0994.90065 2 2 2h36c1.0994 0 2-.90065 2-2v-18c0-1.0994-.90065-2-2-2zm.3 1h35.4c.56265 0 1.3.73735 1.3 1.3v17.4c0 .56265-.73735 1.3-1.3 1.3h-35.4c-.56265 0-1.3-.73735-1.3-1.3v-17.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#444" style="text-indent:0;text-transform:none"/><g fill="#060606"><path d="m22 9v6h2v-2h3v2h2v-6zm2 1h3v2h-3z"/><path d="m14 9v6h7v-1h-5v-5h-2"/><path d="m7 9v6h2v-2h4v-4zm2 1h3v2h-3z"/></g><g fill="#bfbfbf"><path d="m21 8v6h2v-2h3v2h2v-6zm2 1h3v2h-3z"/><path d="m13 8v6h7v-1h-5v-5h-2"/><path d="m6 8v6h2v-2h4v-4zm2 1h3v2h-3z"/></g><path d="m32 15v-3.5l-2-2v-.5h1.5l1.5 1.5 1.5-1.5h1.5v.5l-2 2v3.5h-2" fill="#060606"/><path d="m31 14v-3.5l-2-2v-.5h1.5l1.5 1.5 1.5-1.5h1.5v.5l-2 2v3.5h-2" fill="#bfbfbf"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_aux_play_overdown.svg b/res/skins/LateNight/buttons/btn_aux_play_overdown.svg
deleted file mode 100644
index c811d344b93b..000000000000
--- a/res/skins/LateNight/buttons/btn_aux_play_overdown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="42" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="matrix(2.1304 0 0 1 -.56522 -1048.4)" gradientUnits="userSpaceOnUse"><stop stop-color="#222" offset="0"/><stop stop-color="#131516" offset="1"/></linearGradient></defs><path transform="scale(1,-1)" d="m2.5-21.5h35.014c1.108 0 2 .892 2 2v17c0 1.108-.892 2-2 2h-35.014c-1.108 0-2-.892-2-2v-17c0-1.108.892-2 2-2z" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v18c0 1.0994.90065 2 2 2h36c1.0994 0 2-.90065 2-2v-18c0-1.0994-.90065-2-2-2zm.3 1h35.4c.56265 0 1.3.73735 1.3 1.3v17.4c0 .56265-.73735 1.3-1.3 1.3h-35.4c-.56265 0-1.3-.73735-1.3-1.3v-17.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#454748" style="text-indent:0;text-transform:none"/><g fill="#080808"><path d="m22 9v6h2v-2h3v2h2v-6zm2 1h3v2h-3z"/><path d="m14 9v6h7v-1h-5v-5h-2"/><path d="m7 9v6h2v-2h4v-4zm2 1h3v2h-3z"/></g><g fill="#8d8f90"><path d="m21 8v6h2v-2h3v2h2v-6zm2 1h3v2h-3z"/><path d="m13 8v6h7v-1h-5v-5h-2"/><path d="m6 8v6h2v-2h4v-4zm2 1h3v2h-3z"/></g><path d="m32 15v-3.5l-2-2v-.5h1.5l1.5 1.5 1.5-1.5h1.5v.5l-2 2v3.5h-2" fill="#080808"/><path d="m31 14v-3.5l-2-2v-.5h1.5l1.5 1.5 1.5-1.5h1.5v.5l-2 2v3.5h-2" fill="#8d8f90"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_beat_curpos.svg b/res/skins/LateNight/buttons/btn_beat_curpos.svg
deleted file mode 100644
index e7bedbf3073d..000000000000
--- a/res/skins/LateNight/buttons/btn_beat_curpos.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="25" height="18" version="1.1" viewBox="0 0 25 18" xmlns="http://www.w3.org/2000/svg"><path id="path3805" d="m4 4v6h2v-6z" fill="#585858" stroke-width=".92582"/><path id="path3805-6" d="m9 4v10h2v-10z" fill="#585858"/><path id="path3805-7" d="m14 4v10h2v-10z" fill="#585858"/><path id="path3805-6-5" d="m19 4v10h2v-10z" fill="#585858"/><path id="path3805-9" d="m4 12v2h2v-2z" fill="#585858"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_beat_curpos_large.svg b/res/skins/LateNight/buttons/btn_beat_curpos_large.svg
deleted file mode 100644
index 210ee4d03a17..000000000000
--- a/res/skins/LateNight/buttons/btn_beat_curpos_large.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="26" height="52" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path4753-7-3" d="m10 33h2v-18h-2z" fill="#888"/><path id="path4753-7-3-6" d="m15 33h2v-18h-2z" fill="#888"/><path id="path4753-7-3-6-7" d="m20 33h2v-18h-2z" fill="#888"/><path id="path4753-7-3-5" d="m5 29h2v-14h-2z" fill="#888"/><path id="path4753-7-3-5-1" d="m5 33h2v-2h-2z" fill="#888"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_beat_curpos_large_down.svg b/res/skins/LateNight/buttons/btn_beat_curpos_large_down.svg
deleted file mode 100644
index b46901785f3d..000000000000
--- a/res/skins/LateNight/buttons/btn_beat_curpos_large_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="26" height="52" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path4753-7-3" d="m10 33h2v-18h-2z" fill="#888"/><path id="path4753-7-3-6" d="m15 33h2v-18h-2z" fill="#888"/><path id="path4753-7-3-6-7" d="m20 33h2v-18h-2z" fill="#888"/><path id="path4753-7-3-5" d="m5 29h2v-14h-2z" fill="#d2d2d2"/><path id="path4753-7-3-5-1" d="m5 33h2v-2h-2z" fill="#d2d2d2"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_beat_curpos_over.svg b/res/skins/LateNight/buttons/btn_beat_curpos_over.svg
deleted file mode 100644
index 580f3ec07570..000000000000
--- a/res/skins/LateNight/buttons/btn_beat_curpos_over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="25" height="18" version="1.1" viewBox="0 0 25 18" xmlns="http://www.w3.org/2000/svg"><path id="path3805-3" d="m4 4v6h2v-6z" fill="#f0bb2b" stroke-width=".70711"/><path id="path3805-6-56" d="m9 4v10h2v-10z" fill="#f0bb2b" stroke-width=".91287"/><path id="path3805-7-2" d="m14 4v10h2v-10z" fill="#f0bb2b" stroke-width=".91287"/><path id="path3805-6-5-9" d="m19 4v10h2v-10z" fill="#f0bb2b" stroke-width=".91287"/><path id="path3805-3-3" d="m4 12v2h2v-2z" fill="#f0bb2b" stroke-width=".40825"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_beatgrid_buttons_toggle.svg b/res/skins/LateNight/buttons/btn_beatgrid_buttons_toggle.svg
deleted file mode 100644
index 5b89595a51df..000000000000
--- a/res/skins/LateNight/buttons/btn_beatgrid_buttons_toggle.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg"><g id="g4021-6-3" transform="matrix(-.5112 .44559 -.50559 -.58003 28.909 20.828)" fill="#d2d2d2" stroke-width="1.0108"><path id="rect3922-2-6" transform="matrix(-1.4588 0 0 1.2857 27.506 3.1429)" d="m12 3c-1.2837 0-2.334 1.0503-2.334 2.334v11.797c-1.6125 0.8501-2.7305 2.5239-2.7305 4.4648 0 1.9422 1.1183 3.6174 2.7324 4.4668v-3.1956c0-1.2837 1.0503-2.334 2.334-2.334s2.332 1.0503 2.332 2.334v3.1956c1.6141-0.84939 2.7324-2.5246 2.7324-4.4668 0-1.9425-1.1184-3.6174-2.7324-4.4668v-11.795c0-1.2837-1.0503-2.334-2.334-2.334z" color="#000000" fill="#d2d2d2"/></g><path id="path4753-7-3" d="m9 13.363v7.6375h2v-5.3425z" fill="#888"/><path id="path4753-7-3-6" d="m14 3v5.9864l2 2.2949v-8.2813z" fill="#888"/><path id="path4753-7-3-6-7" d="m19 3v11.725l2 2.293v-14.018z" fill="#888"/><path id="path4753-7-3-5" d="m4 11.713v9.2874h2v-7.9846c-0.73826-0.26909-1.4212-0.69782-2-1.3027z" fill="#888"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_beats_earlier.svg b/res/skins/LateNight/buttons/btn_beats_earlier.svg
deleted file mode 100644
index 7f8ae3fe6a6c..000000000000
--- a/res/skins/LateNight/buttons/btn_beats_earlier.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path4757" d="m8 22h2v-9h-2z" fill="#888"/><path id="path4753" d="m16 22h-2v-12h2z" fill="#888"/><path id="path4-1" d="m10 4v3l11 1e-6v2l-11-1e-6v3l-7-4z" fill="#aaa"/><path id="path4753-2" d="m16 6h-2v-2h2z" fill="#888"/><path id="path4753-7" d="m22 22h-2v-12h2z" fill="#888"/><path id="path4753-2-0" d="m22 6h-2v-2h2z" fill="#888"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_beats_earlier_down.svg b/res/skins/LateNight/buttons/btn_beats_earlier_down.svg
deleted file mode 100644
index 132113976334..000000000000
--- a/res/skins/LateNight/buttons/btn_beats_earlier_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path4757" d="m8 22h2v-9h-2z" fill="#888"/><path id="path4753" d="m16 22h-2v-12h2z" fill="#888"/><path id="path4-1" d="m10 4v3l11 1e-6v2l-11-1e-6v3l-7-4z" fill="#d2d2d2"/><path id="path4753-2" d="m16 6h-2v-2h2z" fill="#888"/><path id="path4753-7" d="m22 22h-2v-12h2z" fill="#888"/><path id="path4753-2-0" d="m22 6h-2v-2h2z" fill="#888"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_beats_faster.svg b/res/skins/LateNight/buttons/btn_beats_faster.svg
deleted file mode 100644
index 211e16052edb..000000000000
--- a/res/skins/LateNight/buttons/btn_beats_faster.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg5429" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path4753-9" d="m6 22h-2v-18h2z" fill="#888"/><path id="path4753-9-3-7" d="m21 11h-2v3l-7-4 7-4v3h2z" fill="#aaa"/><path id="path4753-9-3" d="m20 22h2v-10h-2z" fill="#888"/><path id="path4753-9-3-5" d="m20 8h2v-4h-2z" fill="#888"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_beats_faster_down.svg b/res/skins/LateNight/buttons/btn_beats_faster_down.svg
deleted file mode 100644
index 65b84e63d074..000000000000
--- a/res/skins/LateNight/buttons/btn_beats_faster_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg5429" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path4753-9" d="m6 22h-2v-18h2z" fill="#888"/><path id="path4753-9-3-7" d="m21 11h-2v3l-7-4 7-4v3h2z" fill="#d2d2d2"/><path id="path4753-9-3" d="m20 22h2v-10h-2z" fill="#888"/><path id="path4753-9-3-5" d="m20 8h2v-4h-2z" fill="#888"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_beats_later.svg b/res/skins/LateNight/buttons/btn_beats_later.svg
deleted file mode 100644
index 583a9c51f67d..000000000000
--- a/res/skins/LateNight/buttons/btn_beats_later.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg3935" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path4757" d="m18 22h-2v-9h2z" fill="#888"/><path id="path4753" d="m10 22h2v-12h-2z" fill="#888"/><path id="path4-1" d="m16 4v3l-11 1e-6v2l11-1e-6v3l7-4z" fill="#aaa"/><path id="path4753-2" d="m10 6h2v-2h-2z" fill="#888"/><path id="path4753-7" d="m4 22h2v-12h-2z" fill="#888"/><path id="path4753-2-0" d="m4 6h2v-2h-2z" fill="#888"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_beats_later_down.svg b/res/skins/LateNight/buttons/btn_beats_later_down.svg
deleted file mode 100644
index fae324ee19ad..000000000000
--- a/res/skins/LateNight/buttons/btn_beats_later_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg3935" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path4757" d="m18 22h-2v-9h2z" fill="#888"/><path id="path4753" d="m10 22h2v-12h-2z" fill="#888"/><path id="path4-1" d="m16 4v3l-11 1e-6v2l11-1e-6v3l7-4z" fill="#d2d2d2"/><path id="path4753-2" d="m10 6h2v-2h-2z" fill="#888"/><path id="path4753-7" d="m4 22h2v-12h-2z" fill="#888"/><path id="path4753-2-0" d="m4 6h2v-2h-2z" fill="#888"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_beats_slower.svg b/res/skins/LateNight/buttons/btn_beats_slower.svg
deleted file mode 100644
index d633259f7eed..000000000000
--- a/res/skins/LateNight/buttons/btn_beats_slower.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg5443" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path4753-9" d="m6 22h-2v-18h2z" fill="#888"/><path id="path4753-9-35" d="m6 22h-2v-18h2z" fill="#888"/><path id="path4753-9-3-7" d="m15 11h2v3l7-4-7-4v3h-2z" fill="#aaa"/><path id="path4753-9-3-6" d="m16 22h-2v-10h2z" fill="#888"/><path id="path4753-9-3-5" d="m16 8h-2v-4h2z" fill="#888"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_beats_slower_down.svg b/res/skins/LateNight/buttons/btn_beats_slower_down.svg
deleted file mode 100644
index e185dda15728..000000000000
--- a/res/skins/LateNight/buttons/btn_beats_slower_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg5443" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path4753-9" d="m6 22h-2v-18h2z" fill="#888"/><path id="path4753-9-35" d="m6 22h-2v-18h2z" fill="#888"/><path id="path4753-9-3-7" d="m15 11h2v3l7-4-7-4v3h-2z" fill="#d2d2d2"/><path id="path4753-9-3-6" d="m16 22h-2v-10h2z" fill="#888"/><path id="path4753-9-3-5" d="m16 8h-2v-4h2z" fill="#888"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_border_image_qpushbutton.svg b/res/skins/LateNight/buttons/btn_border_image_qpushbutton.svg
deleted file mode 100644
index 0e31ccae6985..000000000000
--- a/res/skins/LateNight/buttons/btn_border_image_qpushbutton.svg
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   width="25"
-   height="25"
-   version="1.1"
-   id="svg75">
-  <metadata
-     id="metadata79">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs11">
-    <linearGradient
-       id="a"
-       x1="0.5"
-       x2="23.5"
-       y1="12"
-       y2="12"
-       gradientTransform="translate(3e-5,-24)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         stop-opacity=".17647"
-         offset="0"
-         id="stop2" />
-      <stop
-         stop-opacity=".0047619"
-         offset=".12672"
-         id="stop4" />
-      <stop
-         stop-opacity="0"
-         offset=".54348"
-         id="stop6" />
-      <stop
-         stop-opacity=".47451"
-         offset="1"
-         id="stop8" />
-    </linearGradient>
-  </defs>
-  <path
-     style="opacity:0.8;fill:#030303"
-     id="path15"
-     d="m 23.31367,1.17583 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.875001 -2,1.875 L 2,23.87503 c -0.2947,0 -0.8340987,-0.07706 -1.325,-0.505481 C 0.89414067,24.465835 1.6826,25 2.4992,25 h 20 c 1.108,0 2,-0.892 2,-2 V 3 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z" />
-  <rect
-     transform="rotate(90)"
-     x="0.50002998"
-     y="-23.5"
-     width="23"
-     height="23"
-     rx="1.5"
-     ry="1.5"
-     id="rect17"
-     style="color:#000000;fill:url(#a)" />
-  <g
-     display="none"
-     id="g27"
-     style="display:none"
-     transform="translate(0,-1)">
-    <g
-       display="inline"
-       id="g25"
-       style="display:inline">
-      <path
-         d="m 10,10 h 7 v 4 h -5 v 1 h 5 v 1 h -7 v -3 h 5 v -2 h -5 v -1"
-         id="path21"
-         style="fill:#323232" />
-      <path
-         d="m 9,9 h 7 v 4 h -5 v 1 h 5 v 1 H 9 v -3 h 5 V 10 H 9 V 9"
-         id="path23"
-         style="fill:#dcdcdc" />
-    </g>
-  </g>
-  <g
-     display="none"
-     id="g35"
-     style="display:none"
-     transform="translate(0,-1)">
-    <g
-       display="inline"
-       id="g33"
-       style="display:inline">
-      <path
-         d="m 10,10 h 7 v 6 h -7 v -1 h 5 v -1 h -2 v -1 h 2 v -2 h -5 v -1"
-         id="path29"
-         style="fill:#323232" />
-      <path
-         d="m 9,9 h 7 v 6 H 9 v -1 h 5 v -1 h -2 v -1 h 2 V 10 H 9 V 9"
-         id="path31"
-         style="fill:#dcdcdc" />
-    </g>
-  </g>
-  <g
-     display="none"
-     id="g43"
-     style="display:none"
-     transform="translate(0,-1)">
-    <g
-       display="inline"
-       id="g41"
-       style="display:inline">
-      <path
-         d="m 10,11 v 3 h 5 v 2 h 2 v -6 h -2 v 3 h -3 v -2 h -2"
-         id="path37"
-         style="fill:#323232" />
-      <path
-         d="m 9,10 v 3 h 5 v 2 h 2 V 9 h -2 v 3 H 11 V 10 H 9"
-         id="path39"
-         style="fill:#dcdcdc" />
-    </g>
-  </g>
-  <g
-     display="none"
-     id="g51"
-     style="display:none"
-     transform="translate(0,-1)">
-    <g
-       display="inline"
-       id="g49"
-       style="display:inline">
-      <path
-         d="m 17,10 h -6 v 3 h 4 v 2 h -5 v 1 h 7 v -4 h -5 v -1 h 5 v -1"
-         id="path45"
-         style="fill:#323232" />
-      <path
-         d="m 16,9 h -6 v 3 h 4 v 2 H 9 v 1 h 7 v -4 h -5 v -1 h 5 V 9"
-         id="path47"
-         style="fill:#dcdcdc" />
-    </g>
-  </g>
-  <g
-     display="none"
-     id="g59"
-     style="display:none"
-     transform="translate(0,-1)">
-    <g
-       display="inline"
-       id="g57"
-       style="display:inline">
-      <path
-         d="m 10,10 v 6 h 7 v -4 h -5 v -1 h 4 v -1 z m 2,3 h 4 v 2 h -4 z"
-         id="path53"
-         style="fill:#323232" />
-      <path
-         d="m 9,9 v 6 h 7 v -4 h -5 v -1 h 4 V 9 Z m 2,3 h 4 v 2 h -4 z"
-         id="path55"
-         style="fill:#dcdcdc" />
-    </g>
-  </g>
-  <g
-     display="none"
-     id="g67"
-     style="display:none"
-     transform="translate(0,-1)">
-    <g
-       display="inline"
-       id="g65"
-       style="display:inline">
-      <path
-         d="m 10,10 h 6 v 3 h 1 v 1 h -1 v 2 h -2 v -2 h -2 v -1 h 2 v -2 h -4 v -1"
-         id="path61"
-         style="fill:#323232" />
-      <path
-         d="m 9,9 h 6 v 3 h 1 v 1 h -1 v 2 h -2 v -2 h -2 v -1 h 2 V 10 H 9 V 9"
-         id="path63"
-         style="fill:#dcdcdc" />
-    </g>
-  </g>
-  <g
-     display="none"
-     id="g73"
-     style="display:none"
-     transform="translate(0,-1)">
-    <path
-       d="m 11,10 v 2 h -1 v 4 h 7 v -4 h -1 v -2 z m 2,1 h 2 v 1 h -2 z m -1,2 h 4 v 2 h -4 z"
-       id="path69"
-       style="fill:#323232" />
-    <path
-       d="m 10,9 v 2 H 9 v 4 h 7 V 11 H 15 V 9 Z m 2,1 h 2 v 1 h -2 z m -1,2 h 4 v 2 h -4 z"
-       id="path71"
-       style="fill:#dcdcdc" />
-  </g>
-  <path
-     id="path19"
-     style="color:#000000;text-indent:0;text-transform:none;fill:#666666;fill-opacity:1"
-     d="m 2,3e-5 c -1.0994,0 -2,0.90065 -2,2 v 20 c 0,1.0994 0.90065,2 2,2 h 20 c 1.0994,0 2,-0.90065 2,-2 v -20 c 0,-1.0994 -0.90065,-2 -2,-2 z m 0.3,1 h 19.4 c 0.56265,0 1.3,0.73735 1.3,1.3 v 19.4 c 0,0.56265 -0.73735,1.3 -1.3,1.3 H 2.3 c -0.56265,0 -1.3,-0.73735 -1.3,-1.3 v -19.4 c 0,-0.56265 0.73735,-1.3 1.3,-1.3 z" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_border_image_qpushbutton_active_orange.svg b/res/skins/LateNight/buttons/btn_border_image_qpushbutton_active_orange.svg
deleted file mode 100644
index 545084229818..000000000000
--- a/res/skins/LateNight/buttons/btn_border_image_qpushbutton_active_orange.svg
+++ /dev/null
@@ -1,259 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   width="25"
-   height="25"
-   version="1.1"
-   id="svg75">
-  <metadata
-     id="metadata79">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs11">
-    <linearGradient
-       id="linearGradient1264">
-      <stop
-         id="stop1262"
-         offset="0"
-         style="stop-color:#9d4f00;stop-opacity:1" />
-      <stop
-         id="stop1260"
-         offset="1"
-         style="stop-color:#ff8203;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-24.00003,-24)"
-       y2="12"
-       y1="12"
-       x2="23.5"
-       x1="0.5"
-       id="a-3">
-      <stop
-         id="stop877"
-         offset="0"
-         stop-opacity=".17647" />
-      <stop
-         id="stop879"
-         offset=".12672"
-         stop-opacity=".0047619" />
-      <stop
-         id="stop881"
-         offset=".54348"
-         stop-opacity="0" />
-      <stop
-         id="stop883"
-         offset="1"
-         stop-opacity=".47451" />
-    </linearGradient>
-    <linearGradient
-       id="a"
-       x1="0.5"
-       x2="23.5"
-       y1="12"
-       y2="12"
-       gradientTransform="translate(-24.00003,-24)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#a-3">
-      <stop
-         stop-opacity=".17647"
-         offset="0"
-         id="stop2" />
-      <stop
-         stop-opacity=".0047619"
-         offset=".12672"
-         id="stop4" />
-      <stop
-         stop-opacity="0"
-         offset=".54348"
-         id="stop6" />
-      <stop
-         stop-opacity=".47451"
-         offset="1"
-         id="stop8" />
-    </linearGradient>
-    <linearGradient
-       id="a-3-6"
-       x1="0.5"
-       x2="23.5"
-       y1="12"
-       y2="12"
-       gradientTransform="translate(3.1035156e-5,-24)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         stop-opacity=".17647"
-         offset="0"
-         id="stop2-6"
-         style="stop-color:#ad5700;stop-opacity:1" />
-      <stop
-         stop-opacity=".47451"
-         offset="1"
-         id="stop8-3"
-         style="stop-color:#de7000;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient1264"
-       id="linearGradient1266"
-       x1="0.50003052"
-       y1="-12"
-       x2="23.500031"
-       y2="-12"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <rect
-     transform="rotate(90)"
-     x="0.50003052"
-     y="-23.5"
-     width="23"
-     height="23"
-     rx="1.5"
-     ry="1.5"
-     id="rect17-5"
-     style="color:#000000;fill:url(#linearGradient1266);fill-opacity:1" />
-  <g
-     display="none"
-     id="g27"
-     style="display:none"
-     transform="translate(0,-1)">
-    <g
-       display="inline"
-       id="g25"
-       style="display:inline">
-      <path
-         d="m 10,10 h 7 v 4 h -5 v 1 h 5 v 1 h -7 v -3 h 5 v -2 h -5 v -1"
-         id="path21"
-         style="fill:#323232" />
-      <path
-         d="m 9,9 h 7 v 4 h -5 v 1 h 5 v 1 H 9 v -3 h 5 V 10 H 9 V 9"
-         id="path23"
-         style="fill:#dcdcdc" />
-    </g>
-  </g>
-  <g
-     display="none"
-     id="g35"
-     style="display:none"
-     transform="translate(0,-1)">
-    <g
-       display="inline"
-       id="g33"
-       style="display:inline">
-      <path
-         d="m 10,10 h 7 v 6 h -7 v -1 h 5 v -1 h -2 v -1 h 2 v -2 h -5 v -1"
-         id="path29"
-         style="fill:#323232" />
-      <path
-         d="m 9,9 h 7 v 6 H 9 v -1 h 5 v -1 h -2 v -1 h 2 V 10 H 9 V 9"
-         id="path31"
-         style="fill:#dcdcdc" />
-    </g>
-  </g>
-  <g
-     display="none"
-     id="g43"
-     style="display:none"
-     transform="translate(0,-1)">
-    <g
-       display="inline"
-       id="g41"
-       style="display:inline">
-      <path
-         d="m 10,11 v 3 h 5 v 2 h 2 v -6 h -2 v 3 h -3 v -2 h -2"
-         id="path37"
-         style="fill:#323232" />
-      <path
-         d="m 9,10 v 3 h 5 v 2 h 2 V 9 h -2 v 3 H 11 V 10 H 9"
-         id="path39"
-         style="fill:#dcdcdc" />
-    </g>
-  </g>
-  <g
-     display="none"
-     id="g51"
-     style="display:none"
-     transform="translate(0,-1)">
-    <g
-       display="inline"
-       id="g49"
-       style="display:inline">
-      <path
-         d="m 17,10 h -6 v 3 h 4 v 2 h -5 v 1 h 7 v -4 h -5 v -1 h 5 v -1"
-         id="path45"
-         style="fill:#323232" />
-      <path
-         d="m 16,9 h -6 v 3 h 4 v 2 H 9 v 1 h 7 v -4 h -5 v -1 h 5 V 9"
-         id="path47"
-         style="fill:#dcdcdc" />
-    </g>
-  </g>
-  <g
-     display="none"
-     id="g59"
-     style="display:none"
-     transform="translate(0,-1)">
-    <g
-       display="inline"
-       id="g57"
-       style="display:inline">
-      <path
-         d="m 10,10 v 6 h 7 v -4 h -5 v -1 h 4 v -1 z m 2,3 h 4 v 2 h -4 z"
-         id="path53"
-         style="fill:#323232" />
-      <path
-         d="m 9,9 v 6 h 7 v -4 h -5 v -1 h 4 V 9 Z m 2,3 h 4 v 2 h -4 z"
-         id="path55"
-         style="fill:#dcdcdc" />
-    </g>
-  </g>
-  <g
-     display="none"
-     id="g67"
-     style="display:none"
-     transform="translate(0,-1)">
-    <g
-       display="inline"
-       id="g65"
-       style="display:inline">
-      <path
-         d="m 10,10 h 6 v 3 h 1 v 1 h -1 v 2 h -2 v -2 h -2 v -1 h 2 v -2 h -4 v -1"
-         id="path61"
-         style="fill:#323232" />
-      <path
-         d="m 9,9 h 6 v 3 h 1 v 1 h -1 v 2 h -2 v -2 h -2 v -1 h 2 V 10 H 9 V 9"
-         id="path63"
-         style="fill:#dcdcdc" />
-    </g>
-  </g>
-  <g
-     display="none"
-     id="g73"
-     style="display:none"
-     transform="translate(0,-1)">
-    <path
-       d="m 11,10 v 2 h -1 v 4 h 7 v -4 h -1 v -2 z m 2,1 h 2 v 1 h -2 z m -1,2 h 4 v 2 h -4 z"
-       id="path69"
-       style="fill:#323232" />
-    <path
-       d="m 10,9 v 2 H 9 v 4 h 7 V 11 H 15 V 9 Z m 2,1 h 2 v 1 h -2 z m -1,2 h 4 v 2 h -4 z"
-       id="path71"
-       style="fill:#dcdcdc" />
-  </g>
-  <path
-     id="path19"
-     style="color:#000000;text-indent:0;text-transform:none;fill:#d2d2d2;fill-opacity:1"
-     d="m 2,3e-5 c -1.0994,0 -2,0.90065 -2,2 v 20 c 0,1.0994 0.90065,2 2,2 h 20 c 1.0994,0 2,-0.90065 2,-2 v -20 c 0,-1.0994 -0.90065,-2 -2,-2 z m 0.3,1 h 19.4 c 0.56265,0 1.3,0.73735 1.3,1.3 v 19.4 c 0,0.56265 -0.73735,1.3 -1.3,1.3 H 2.3 c -0.56265,0 -1.3,-0.73735 -1.3,-1.3 v -19.4 c 0,-0.56265 0.73735,-1.3 1.3,-1.3 z" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_border_image_qpushbutton_active_red.svg b/res/skins/LateNight/buttons/btn_border_image_qpushbutton_active_red.svg
deleted file mode 100644
index 335151bb59ad..000000000000
--- a/res/skins/LateNight/buttons/btn_border_image_qpushbutton_active_red.svg
+++ /dev/null
@@ -1,261 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   width="25"
-   height="25"
-   version="1.1"
-   id="svg75">
-  <metadata
-     id="metadata79">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs11">
-    <linearGradient
-       id="linearGradient948">
-      <stop
-         id="stop944"
-         offset="0"
-         style="stop-color:#ca0b00;stop-opacity:1;" />
-      <stop
-         id="stop946"
-         offset="1"
-         style="stop-color:#8e0800;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-24.00003,-24)"
-       y2="12"
-       y1="12"
-       x2="23.5"
-       x1="0.5"
-       id="a-3">
-      <stop
-         id="stop877"
-         offset="0"
-         stop-opacity=".17647" />
-      <stop
-         id="stop879"
-         offset=".12672"
-         stop-opacity=".0047619" />
-      <stop
-         id="stop881"
-         offset=".54348"
-         stop-opacity="0" />
-      <stop
-         id="stop883"
-         offset="1"
-         stop-opacity=".47451" />
-    </linearGradient>
-    <linearGradient
-       id="a"
-       x1="0.5"
-       x2="23.5"
-       y1="12"
-       y2="12"
-       gradientTransform="translate(-24.00003,-24)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#a-3">
-      <stop
-         stop-opacity=".17647"
-         offset="0"
-         id="stop2" />
-      <stop
-         stop-opacity=".0047619"
-         offset=".12672"
-         id="stop4" />
-      <stop
-         stop-opacity="0"
-         offset=".54348"
-         id="stop6" />
-      <stop
-         stop-opacity=".47451"
-         offset="1"
-         id="stop8" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#a-3"
-       id="a-3-6"
-       x1="0.5"
-       x2="23.5"
-       y1="12"
-       y2="12"
-       gradientTransform="translate(3.1035156e-5,-24)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         stop-opacity=".17647"
-         offset="0"
-         id="stop2-6"
-         style="stop-color:#840600;stop-opacity:1" />
-      <stop
-         stop-opacity=".47451"
-         offset="1"
-         id="stop8-3"
-         style="stop-color:#ad0800;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(-24.000061)"
-       gradientUnits="userSpaceOnUse"
-       y2="-12"
-       x2="23.500031"
-       y1="-12"
-       x1="0.50003052"
-       id="linearGradient950"
-       xlink:href="#linearGradient948" />
-  </defs>
-  <rect
-     transform="matrix(0,-1,-1,0,0,0)"
-     x="-23.500031"
-     y="-23.5"
-     width="23"
-     height="23"
-     rx="1.5"
-     ry="1.5"
-     id="rect17-5"
-     style="color:#000000;fill:url(#linearGradient950);fill-opacity:1" />
-  <g
-     display="none"
-     id="g27"
-     style="display:none"
-     transform="translate(0,-1)">
-    <g
-       display="inline"
-       id="g25"
-       style="display:inline">
-      <path
-         d="m 10,10 h 7 v 4 h -5 v 1 h 5 v 1 h -7 v -3 h 5 v -2 h -5 v -1"
-         id="path21"
-         style="fill:#323232" />
-      <path
-         d="m 9,9 h 7 v 4 h -5 v 1 h 5 v 1 H 9 v -3 h 5 V 10 H 9 V 9"
-         id="path23"
-         style="fill:#dcdcdc" />
-    </g>
-  </g>
-  <g
-     display="none"
-     id="g35"
-     style="display:none"
-     transform="translate(0,-1)">
-    <g
-       display="inline"
-       id="g33"
-       style="display:inline">
-      <path
-         d="m 10,10 h 7 v 6 h -7 v -1 h 5 v -1 h -2 v -1 h 2 v -2 h -5 v -1"
-         id="path29"
-         style="fill:#323232" />
-      <path
-         d="m 9,9 h 7 v 6 H 9 v -1 h 5 v -1 h -2 v -1 h 2 V 10 H 9 V 9"
-         id="path31"
-         style="fill:#dcdcdc" />
-    </g>
-  </g>
-  <g
-     display="none"
-     id="g43"
-     style="display:none"
-     transform="translate(0,-1)">
-    <g
-       display="inline"
-       id="g41"
-       style="display:inline">
-      <path
-         d="m 10,11 v 3 h 5 v 2 h 2 v -6 h -2 v 3 h -3 v -2 h -2"
-         id="path37"
-         style="fill:#323232" />
-      <path
-         d="m 9,10 v 3 h 5 v 2 h 2 V 9 h -2 v 3 H 11 V 10 H 9"
-         id="path39"
-         style="fill:#dcdcdc" />
-    </g>
-  </g>
-  <g
-     display="none"
-     id="g51"
-     style="display:none"
-     transform="translate(0,-1)">
-    <g
-       display="inline"
-       id="g49"
-       style="display:inline">
-      <path
-         d="m 17,10 h -6 v 3 h 4 v 2 h -5 v 1 h 7 v -4 h -5 v -1 h 5 v -1"
-         id="path45"
-         style="fill:#323232" />
-      <path
-         d="m 16,9 h -6 v 3 h 4 v 2 H 9 v 1 h 7 v -4 h -5 v -1 h 5 V 9"
-         id="path47"
-         style="fill:#dcdcdc" />
-    </g>
-  </g>
-  <g
-     display="none"
-     id="g59"
-     style="display:none"
-     transform="translate(0,-1)">
-    <g
-       display="inline"
-       id="g57"
-       style="display:inline">
-      <path
-         d="m 10,10 v 6 h 7 v -4 h -5 v -1 h 4 v -1 z m 2,3 h 4 v 2 h -4 z"
-         id="path53"
-         style="fill:#323232" />
-      <path
-         d="m 9,9 v 6 h 7 v -4 h -5 v -1 h 4 V 9 Z m 2,3 h 4 v 2 h -4 z"
-         id="path55"
-         style="fill:#dcdcdc" />
-    </g>
-  </g>
-  <g
-     display="none"
-     id="g67"
-     style="display:none"
-     transform="translate(0,-1)">
-    <g
-       display="inline"
-       id="g65"
-       style="display:inline">
-      <path
-         d="m 10,10 h 6 v 3 h 1 v 1 h -1 v 2 h -2 v -2 h -2 v -1 h 2 v -2 h -4 v -1"
-         id="path61"
-         style="fill:#323232" />
-      <path
-         d="m 9,9 h 6 v 3 h 1 v 1 h -1 v 2 h -2 v -2 h -2 v -1 h 2 V 10 H 9 V 9"
-         id="path63"
-         style="fill:#dcdcdc" />
-    </g>
-  </g>
-  <g
-     display="none"
-     id="g73"
-     style="display:none"
-     transform="translate(0,-1)">
-    <path
-       d="m 11,10 v 2 h -1 v 4 h 7 v -4 h -1 v -2 z m 2,1 h 2 v 1 h -2 z m -1,2 h 4 v 2 h -4 z"
-       id="path69"
-       style="fill:#323232" />
-    <path
-       d="m 10,9 v 2 H 9 v 4 h 7 V 11 H 15 V 9 Z m 2,1 h 2 v 1 h -2 z m -1,2 h 4 v 2 h -4 z"
-       id="path71"
-       style="fill:#dcdcdc" />
-  </g>
-  <path
-     id="path19"
-     style="color:#000000;text-indent:0;text-transform:none;fill:#d2d2d2;fill-opacity:1"
-     d="m 2,3e-5 c -1.0994,0 -2,0.90065 -2,2 v 20 c 0,1.0994 0.90065,2 2,2 h 20 c 1.0994,0 2,-0.90065 2,-2 v -20 c 0,-1.0994 -0.90065,-2 -2,-2 z m 0.3,1 h 19.4 c 0.56265,0 1.3,0.73735 1.3,1.3 v 19.4 c 0,0.56265 -0.73735,1.3 -1.3,1.3 H 2.3 c -0.56265,0 -1.3,-0.73735 -1.3,-1.3 v -19.4 c 0,-0.56265 0.73735,-1.3 1.3,-1.3 z" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_border_image_qpushbutton_disabled.svg b/res/skins/LateNight/buttons/btn_border_image_qpushbutton_disabled.svg
deleted file mode 100644
index a5ebf683104e..000000000000
--- a/res/skins/LateNight/buttons/btn_border_image_qpushbutton_disabled.svg
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   width="25"
-   height="25"
-   version="1.1"
-   id="svg75">
-  <metadata
-     id="metadata79">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs11">
-    <linearGradient
-       id="a"
-       x1="0.5"
-       x2="23.5"
-       y1="12"
-       y2="12"
-       gradientTransform="translate(3e-5,-24)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         stop-opacity=".17647"
-         offset="0"
-         id="stop2" />
-      <stop
-         stop-opacity=".0047619"
-         offset=".12672"
-         id="stop4" />
-      <stop
-         stop-opacity="0"
-         offset=".54348"
-         id="stop6" />
-      <stop
-         stop-opacity=".47451"
-         offset="1"
-         id="stop8" />
-    </linearGradient>
-  </defs>
-  <rect
-     transform="rotate(90)"
-     x="0.50002998"
-     y="-23.5"
-     width="23"
-     height="23"
-     rx="1.5"
-     ry="1.5"
-     id="rect17"
-     style="color:#000000;fill:url(#a)" />
-  <g
-     display="none"
-     id="g27"
-     style="display:none"
-     transform="translate(0,-1)">
-    <g
-       display="inline"
-       id="g25"
-       style="display:inline">
-      <path
-         d="m 10,10 h 7 v 4 h -5 v 1 h 5 v 1 h -7 v -3 h 5 v -2 h -5 v -1"
-         id="path21"
-         style="fill:#323232" />
-      <path
-         d="m 9,9 h 7 v 4 h -5 v 1 h 5 v 1 H 9 v -3 h 5 V 10 H 9 V 9"
-         id="path23"
-         style="fill:#dcdcdc" />
-    </g>
-  </g>
-  <g
-     display="none"
-     id="g35"
-     style="display:none"
-     transform="translate(0,-1)">
-    <g
-       display="inline"
-       id="g33"
-       style="display:inline">
-      <path
-         d="m 10,10 h 7 v 6 h -7 v -1 h 5 v -1 h -2 v -1 h 2 v -2 h -5 v -1"
-         id="path29"
-         style="fill:#323232" />
-      <path
-         d="m 9,9 h 7 v 6 H 9 v -1 h 5 v -1 h -2 v -1 h 2 V 10 H 9 V 9"
-         id="path31"
-         style="fill:#dcdcdc" />
-    </g>
-  </g>
-  <g
-     display="none"
-     id="g43"
-     style="display:none"
-     transform="translate(0,-1)">
-    <g
-       display="inline"
-       id="g41"
-       style="display:inline">
-      <path
-         d="m 10,11 v 3 h 5 v 2 h 2 v -6 h -2 v 3 h -3 v -2 h -2"
-         id="path37"
-         style="fill:#323232" />
-      <path
-         d="m 9,10 v 3 h 5 v 2 h 2 V 9 h -2 v 3 H 11 V 10 H 9"
-         id="path39"
-         style="fill:#dcdcdc" />
-    </g>
-  </g>
-  <g
-     display="none"
-     id="g51"
-     style="display:none"
-     transform="translate(0,-1)">
-    <g
-       display="inline"
-       id="g49"
-       style="display:inline">
-      <path
-         d="m 17,10 h -6 v 3 h 4 v 2 h -5 v 1 h 7 v -4 h -5 v -1 h 5 v -1"
-         id="path45"
-         style="fill:#323232" />
-      <path
-         d="m 16,9 h -6 v 3 h 4 v 2 H 9 v 1 h 7 v -4 h -5 v -1 h 5 V 9"
-         id="path47"
-         style="fill:#dcdcdc" />
-    </g>
-  </g>
-  <g
-     display="none"
-     id="g59"
-     style="display:none"
-     transform="translate(0,-1)">
-    <g
-       display="inline"
-       id="g57"
-       style="display:inline">
-      <path
-         d="m 10,10 v 6 h 7 v -4 h -5 v -1 h 4 v -1 z m 2,3 h 4 v 2 h -4 z"
-         id="path53"
-         style="fill:#323232" />
-      <path
-         d="m 9,9 v 6 h 7 v -4 h -5 v -1 h 4 V 9 Z m 2,3 h 4 v 2 h -4 z"
-         id="path55"
-         style="fill:#dcdcdc" />
-    </g>
-  </g>
-  <g
-     display="none"
-     id="g67"
-     style="display:none"
-     transform="translate(0,-1)">
-    <g
-       display="inline"
-       id="g65"
-       style="display:inline">
-      <path
-         d="m 10,10 h 6 v 3 h 1 v 1 h -1 v 2 h -2 v -2 h -2 v -1 h 2 v -2 h -4 v -1"
-         id="path61"
-         style="fill:#323232" />
-      <path
-         d="m 9,9 h 6 v 3 h 1 v 1 h -1 v 2 h -2 v -2 h -2 v -1 h 2 V 10 H 9 V 9"
-         id="path63"
-         style="fill:#dcdcdc" />
-    </g>
-  </g>
-  <g
-     display="none"
-     id="g73"
-     style="display:none"
-     transform="translate(0,-1)">
-    <path
-       d="m 11,10 v 2 h -1 v 4 h 7 v -4 h -1 v -2 z m 2,1 h 2 v 1 h -2 z m -1,2 h 4 v 2 h -4 z"
-       id="path69"
-       style="fill:#323232" />
-    <path
-       d="m 10,9 v 2 H 9 v 4 h 7 V 11 H 15 V 9 Z m 2,1 h 2 v 1 h -2 z m -1,2 h 4 v 2 h -4 z"
-       id="path71"
-       style="fill:#dcdcdc" />
-  </g>
-  <path
-     id="path19"
-     style="color:#000000;text-indent:0;text-transform:none;fill:#333333;fill-opacity:1"
-     d="m 2,3e-5 c -1.0994,0 -2,0.90065 -2,2 v 20 c 0,1.0994 0.90065,2 2,2 h 20 c 1.0994,0 2,-0.90065 2,-2 v -20 c 0,-1.0994 -0.90065,-2 -2,-2 z m 0.3,1 h 19.4 c 0.56265,0 1.3,0.73735 1.3,1.3 v 19.4 c 0,0.56265 -0.73735,1.3 -1.3,1.3 H 2.3 c -0.56265,0 -1.3,-0.73735 -1.3,-1.3 v -19.4 c 0,-0.56265 0.73735,-1.3 1.3,-1.3 z" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_border_image_qpushbutton_pressed.svg b/res/skins/LateNight/buttons/btn_border_image_qpushbutton_pressed.svg
deleted file mode 100644
index 55dfce4b43c8..000000000000
--- a/res/skins/LateNight/buttons/btn_border_image_qpushbutton_pressed.svg
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg75"
-   version="1.1"
-   height="25"
-   width="25">
-  <metadata
-     id="metadata79">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs11">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-24.00003,-24)"
-       y2="12"
-       y1="12"
-       x2="23.5"
-       x1="0.5"
-       id="a">
-      <stop
-         id="stop2"
-         offset="0"
-         stop-opacity=".17647" />
-      <stop
-         id="stop4"
-         offset=".12672"
-         stop-opacity=".0047619" />
-      <stop
-         id="stop6"
-         offset=".54348"
-         stop-opacity="0" />
-      <stop
-         id="stop8"
-         offset="1"
-         stop-opacity=".47451" />
-    </linearGradient>
-  </defs>
-  <rect
-     style="color:#000000;fill:url(#a)"
-     id="rect17"
-     ry="1.5"
-     rx="1.5"
-     height="23"
-     width="23"
-     y="-23.5"
-     x="-23.500031"
-     transform="matrix(0,-1,-1,0,0,0)" />
-  <g
-     transform="translate(0,-1)"
-     style="display:none"
-     id="g27"
-     display="none">
-    <g
-       style="display:inline"
-       id="g25"
-       display="inline">
-      <path
-         style="fill:#323232"
-         id="path21"
-         d="m 10,10 h 7 v 4 h -5 v 1 h 5 v 1 h -7 v -3 h 5 v -2 h -5 v -1" />
-      <path
-         style="fill:#dcdcdc"
-         id="path23"
-         d="m 9,9 h 7 v 4 h -5 v 1 h 5 v 1 H 9 v -3 h 5 V 10 H 9 V 9" />
-    </g>
-  </g>
-  <g
-     transform="translate(0,-1)"
-     style="display:none"
-     id="g35"
-     display="none">
-    <g
-       style="display:inline"
-       id="g33"
-       display="inline">
-      <path
-         style="fill:#323232"
-         id="path29"
-         d="m 10,10 h 7 v 6 h -7 v -1 h 5 v -1 h -2 v -1 h 2 v -2 h -5 v -1" />
-      <path
-         style="fill:#dcdcdc"
-         id="path31"
-         d="m 9,9 h 7 v 6 H 9 v -1 h 5 v -1 h -2 v -1 h 2 V 10 H 9 V 9" />
-    </g>
-  </g>
-  <g
-     transform="translate(0,-1)"
-     style="display:none"
-     id="g43"
-     display="none">
-    <g
-       style="display:inline"
-       id="g41"
-       display="inline">
-      <path
-         style="fill:#323232"
-         id="path37"
-         d="m 10,11 v 3 h 5 v 2 h 2 v -6 h -2 v 3 h -3 v -2 h -2" />
-      <path
-         style="fill:#dcdcdc"
-         id="path39"
-         d="m 9,10 v 3 h 5 v 2 h 2 V 9 h -2 v 3 H 11 V 10 H 9" />
-    </g>
-  </g>
-  <g
-     transform="translate(0,-1)"
-     style="display:none"
-     id="g51"
-     display="none">
-    <g
-       style="display:inline"
-       id="g49"
-       display="inline">
-      <path
-         style="fill:#323232"
-         id="path45"
-         d="m 17,10 h -6 v 3 h 4 v 2 h -5 v 1 h 7 v -4 h -5 v -1 h 5 v -1" />
-      <path
-         style="fill:#dcdcdc"
-         id="path47"
-         d="m 16,9 h -6 v 3 h 4 v 2 H 9 v 1 h 7 v -4 h -5 v -1 h 5 V 9" />
-    </g>
-  </g>
-  <g
-     transform="translate(0,-1)"
-     style="display:none"
-     id="g59"
-     display="none">
-    <g
-       style="display:inline"
-       id="g57"
-       display="inline">
-      <path
-         style="fill:#323232"
-         id="path53"
-         d="m 10,10 v 6 h 7 v -4 h -5 v -1 h 4 v -1 z m 2,3 h 4 v 2 h -4 z" />
-      <path
-         style="fill:#dcdcdc"
-         id="path55"
-         d="m 9,9 v 6 h 7 v -4 h -5 v -1 h 4 V 9 Z m 2,3 h 4 v 2 h -4 z" />
-    </g>
-  </g>
-  <g
-     transform="translate(0,-1)"
-     style="display:none"
-     id="g67"
-     display="none">
-    <g
-       style="display:inline"
-       id="g65"
-       display="inline">
-      <path
-         style="fill:#323232"
-         id="path61"
-         d="m 10,10 h 6 v 3 h 1 v 1 h -1 v 2 h -2 v -2 h -2 v -1 h 2 v -2 h -4 v -1" />
-      <path
-         style="fill:#dcdcdc"
-         id="path63"
-         d="m 9,9 h 6 v 3 h 1 v 1 h -1 v 2 h -2 v -2 h -2 v -1 h 2 V 10 H 9 V 9" />
-    </g>
-  </g>
-  <g
-     transform="translate(0,-1)"
-     style="display:none"
-     id="g73"
-     display="none">
-    <path
-       style="fill:#323232"
-       id="path69"
-       d="m 11,10 v 2 h -1 v 4 h 7 v -4 h -1 v -2 z m 2,1 h 2 v 1 h -2 z m -1,2 h 4 v 2 h -4 z" />
-    <path
-       style="fill:#dcdcdc"
-       id="path71"
-       d="m 10,9 v 2 H 9 v 4 h 7 V 11 H 15 V 9 Z m 2,1 h 2 v 1 h -2 z m -1,2 h 4 v 2 h -4 z" />
-  </g>
-  <path
-     id="path19"
-     style="color:#000000;text-indent:0;text-transform:none;fill:#d2d2d2;fill-opacity:1"
-     d="m 2,3e-5 c -1.0994,0 -2,0.90065 -2,2 v 20 c 0,1.0994 0.90065,2 2,2 h 20 c 1.0994,0 2,-0.90065 2,-2 v -20 c 0,-1.0994 -0.90065,-2 -2,-2 z m 0.3,1 h 19.4 c 0.56265,0 1.3,0.73735 1.3,1.3 v 19.4 c 0,0.56265 -0.73735,1.3 -1.3,1.3 H 2.3 c -0.56265,0 -1.3,-0.73735 -1.3,-1.3 v -19.4 c 0,-0.56265 0.73735,-1.3 1.3,-1.3 z" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_border_image_spinbox_focus.svg b/res/skins/LateNight/buttons/btn_border_image_spinbox_focus.svg
deleted file mode 100644
index ddedebdf8e72..000000000000
--- a/res/skins/LateNight/buttons/btn_border_image_spinbox_focus.svg
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg75"
-   version="1.1"
-   height="25"
-   width="25">
-  <metadata
-     id="metadata79">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs11">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(3e-5,-24)"
-       y2="12"
-       y1="12"
-       x2="23.5"
-       x1="0.5"
-       id="a">
-      <stop
-         id="stop2"
-         offset="0"
-         stop-opacity=".17647" />
-      <stop
-         id="stop4"
-         offset=".12672"
-         stop-opacity=".0047619" />
-      <stop
-         id="stop6"
-         offset=".54348"
-         stop-opacity="0" />
-      <stop
-         id="stop8"
-         offset="1"
-         stop-opacity=".47451" />
-    </linearGradient>
-  </defs>
-  <g
-     transform="translate(0,-1)"
-     style="display:none"
-     id="g27"
-     display="none">
-    <g
-       style="display:inline"
-       id="g25"
-       display="inline">
-      <path
-         style="fill:#323232"
-         id="path21"
-         d="m 10,10 h 7 v 4 h -5 v 1 h 5 v 1 h -7 v -3 h 5 v -2 h -5 v -1" />
-      <path
-         style="fill:#dcdcdc"
-         id="path23"
-         d="m 9,9 h 7 v 4 h -5 v 1 h 5 v 1 H 9 v -3 h 5 V 10 H 9 V 9" />
-    </g>
-  </g>
-  <g
-     transform="translate(0,-1)"
-     style="display:none"
-     id="g35"
-     display="none">
-    <g
-       style="display:inline"
-       id="g33"
-       display="inline">
-      <path
-         style="fill:#323232"
-         id="path29"
-         d="m 10,10 h 7 v 6 h -7 v -1 h 5 v -1 h -2 v -1 h 2 v -2 h -5 v -1" />
-      <path
-         style="fill:#dcdcdc"
-         id="path31"
-         d="m 9,9 h 7 v 6 H 9 v -1 h 5 v -1 h -2 v -1 h 2 V 10 H 9 V 9" />
-    </g>
-  </g>
-  <g
-     transform="translate(0,-1)"
-     style="display:none"
-     id="g43"
-     display="none">
-    <g
-       style="display:inline"
-       id="g41"
-       display="inline">
-      <path
-         style="fill:#323232"
-         id="path37"
-         d="m 10,11 v 3 h 5 v 2 h 2 v -6 h -2 v 3 h -3 v -2 h -2" />
-      <path
-         style="fill:#dcdcdc"
-         id="path39"
-         d="m 9,10 v 3 h 5 v 2 h 2 V 9 h -2 v 3 H 11 V 10 H 9" />
-    </g>
-  </g>
-  <g
-     transform="translate(0,-1)"
-     style="display:none"
-     id="g51"
-     display="none">
-    <g
-       style="display:inline"
-       id="g49"
-       display="inline">
-      <path
-         style="fill:#323232"
-         id="path45"
-         d="m 17,10 h -6 v 3 h 4 v 2 h -5 v 1 h 7 v -4 h -5 v -1 h 5 v -1" />
-      <path
-         style="fill:#dcdcdc"
-         id="path47"
-         d="m 16,9 h -6 v 3 h 4 v 2 H 9 v 1 h 7 v -4 h -5 v -1 h 5 V 9" />
-    </g>
-  </g>
-  <g
-     transform="translate(0,-1)"
-     style="display:none"
-     id="g59"
-     display="none">
-    <g
-       style="display:inline"
-       id="g57"
-       display="inline">
-      <path
-         style="fill:#323232"
-         id="path53"
-         d="m 10,10 v 6 h 7 v -4 h -5 v -1 h 4 v -1 z m 2,3 h 4 v 2 h -4 z" />
-      <path
-         style="fill:#dcdcdc"
-         id="path55"
-         d="m 9,9 v 6 h 7 v -4 h -5 v -1 h 4 V 9 Z m 2,3 h 4 v 2 h -4 z" />
-    </g>
-  </g>
-  <g
-     transform="translate(0,-1)"
-     style="display:none"
-     id="g67"
-     display="none">
-    <g
-       style="display:inline"
-       id="g65"
-       display="inline">
-      <path
-         style="fill:#323232"
-         id="path61"
-         d="m 10,10 h 6 v 3 h 1 v 1 h -1 v 2 h -2 v -2 h -2 v -1 h 2 v -2 h -4 v -1" />
-      <path
-         style="fill:#dcdcdc"
-         id="path63"
-         d="m 9,9 h 6 v 3 h 1 v 1 h -1 v 2 h -2 v -2 h -2 v -1 h 2 V 10 H 9 V 9" />
-    </g>
-  </g>
-  <g
-     transform="translate(0,-1)"
-     style="display:none"
-     id="g73"
-     display="none">
-    <path
-       style="fill:#323232"
-       id="path69"
-       d="m 11,10 v 2 h -1 v 4 h 7 v -4 h -1 v -2 z m 2,1 h 2 v 1 h -2 z m -1,2 h 4 v 2 h -4 z" />
-    <path
-       style="fill:#dcdcdc"
-       id="path71"
-       d="m 10,9 v 2 H 9 v 4 h 7 V 11 H 15 V 9 Z m 2,1 h 2 v 1 h -2 z m -1,2 h 4 v 2 h -4 z" />
-  </g>
-  <path
-     style="opacity:0.8;fill:#030303"
-     id="path15"
-     d="m 23.31367,1.17583 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.875001 -2,1.875 L 2,23.87503 c -0.2947,0 -0.8340987,-0.07706 -1.325,-0.505481 C 0.89414067,24.465835 1.6826,25 2.4992,25 h 20 c 1.108,0 2,-0.892 2,-2 V 3 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z" />
-  <path
-     id="path19"
-     style="color:#000000;text-indent:0;text-transform:none;fill:#ff6600;fill-opacity:1"
-     d="m 2,3e-5 c -1.0994,0 -2,0.90065 -2,2 v 20 c 0,1.0994 0.90065,2 2,2 h 20 c 1.0994,0 2,-0.90065 2,-2 v -20 c 0,-1.0994 -0.90065,-2 -2,-2 z m 0.3,1 h 19.4 c 0.56265,0 1.3,0.73735 1.3,1.3 v 19.4 c 0,0.56265 -0.73735,1.3 -1.3,1.3 H 2.3 c -0.56265,0 -1.3,-0.73735 -1.3,-1.3 v -19.4 c 0,-0.56265 0.73735,-1.3 1.3,-1.3 z" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_border_image_spinbox_hover.svg b/res/skins/LateNight/buttons/btn_border_image_spinbox_hover.svg
deleted file mode 100644
index a5d7b666df3e..000000000000
--- a/res/skins/LateNight/buttons/btn_border_image_spinbox_hover.svg
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg75"
-   version="1.1"
-   height="25"
-   width="25">
-  <metadata
-     id="metadata79">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs11">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(3e-5,-24)"
-       y2="12"
-       y1="12"
-       x2="23.5"
-       x1="0.5"
-       id="a">
-      <stop
-         id="stop2"
-         offset="0"
-         stop-opacity=".17647" />
-      <stop
-         id="stop4"
-         offset=".12672"
-         stop-opacity=".0047619" />
-      <stop
-         id="stop6"
-         offset=".54348"
-         stop-opacity="0" />
-      <stop
-         id="stop8"
-         offset="1"
-         stop-opacity=".47451" />
-    </linearGradient>
-  </defs>
-  <g
-     transform="translate(0,-1)"
-     style="display:none"
-     id="g27"
-     display="none">
-    <g
-       style="display:inline"
-       id="g25"
-       display="inline">
-      <path
-         style="fill:#323232"
-         id="path21"
-         d="m 10,10 h 7 v 4 h -5 v 1 h 5 v 1 h -7 v -3 h 5 v -2 h -5 v -1" />
-      <path
-         style="fill:#dcdcdc"
-         id="path23"
-         d="m 9,9 h 7 v 4 h -5 v 1 h 5 v 1 H 9 v -3 h 5 V 10 H 9 V 9" />
-    </g>
-  </g>
-  <g
-     transform="translate(0,-1)"
-     style="display:none"
-     id="g35"
-     display="none">
-    <g
-       style="display:inline"
-       id="g33"
-       display="inline">
-      <path
-         style="fill:#323232"
-         id="path29"
-         d="m 10,10 h 7 v 6 h -7 v -1 h 5 v -1 h -2 v -1 h 2 v -2 h -5 v -1" />
-      <path
-         style="fill:#dcdcdc"
-         id="path31"
-         d="m 9,9 h 7 v 6 H 9 v -1 h 5 v -1 h -2 v -1 h 2 V 10 H 9 V 9" />
-    </g>
-  </g>
-  <g
-     transform="translate(0,-1)"
-     style="display:none"
-     id="g43"
-     display="none">
-    <g
-       style="display:inline"
-       id="g41"
-       display="inline">
-      <path
-         style="fill:#323232"
-         id="path37"
-         d="m 10,11 v 3 h 5 v 2 h 2 v -6 h -2 v 3 h -3 v -2 h -2" />
-      <path
-         style="fill:#dcdcdc"
-         id="path39"
-         d="m 9,10 v 3 h 5 v 2 h 2 V 9 h -2 v 3 H 11 V 10 H 9" />
-    </g>
-  </g>
-  <g
-     transform="translate(0,-1)"
-     style="display:none"
-     id="g51"
-     display="none">
-    <g
-       style="display:inline"
-       id="g49"
-       display="inline">
-      <path
-         style="fill:#323232"
-         id="path45"
-         d="m 17,10 h -6 v 3 h 4 v 2 h -5 v 1 h 7 v -4 h -5 v -1 h 5 v -1" />
-      <path
-         style="fill:#dcdcdc"
-         id="path47"
-         d="m 16,9 h -6 v 3 h 4 v 2 H 9 v 1 h 7 v -4 h -5 v -1 h 5 V 9" />
-    </g>
-  </g>
-  <g
-     transform="translate(0,-1)"
-     style="display:none"
-     id="g59"
-     display="none">
-    <g
-       style="display:inline"
-       id="g57"
-       display="inline">
-      <path
-         style="fill:#323232"
-         id="path53"
-         d="m 10,10 v 6 h 7 v -4 h -5 v -1 h 4 v -1 z m 2,3 h 4 v 2 h -4 z" />
-      <path
-         style="fill:#dcdcdc"
-         id="path55"
-         d="m 9,9 v 6 h 7 v -4 h -5 v -1 h 4 V 9 Z m 2,3 h 4 v 2 h -4 z" />
-    </g>
-  </g>
-  <g
-     transform="translate(0,-1)"
-     style="display:none"
-     id="g67"
-     display="none">
-    <g
-       style="display:inline"
-       id="g65"
-       display="inline">
-      <path
-         style="fill:#323232"
-         id="path61"
-         d="m 10,10 h 6 v 3 h 1 v 1 h -1 v 2 h -2 v -2 h -2 v -1 h 2 v -2 h -4 v -1" />
-      <path
-         style="fill:#dcdcdc"
-         id="path63"
-         d="m 9,9 h 6 v 3 h 1 v 1 h -1 v 2 h -2 v -2 h -2 v -1 h 2 V 10 H 9 V 9" />
-    </g>
-  </g>
-  <g
-     transform="translate(0,-1)"
-     style="display:none"
-     id="g73"
-     display="none">
-    <path
-       style="fill:#323232"
-       id="path69"
-       d="m 11,10 v 2 h -1 v 4 h 7 v -4 h -1 v -2 z m 2,1 h 2 v 1 h -2 z m -1,2 h 4 v 2 h -4 z" />
-    <path
-       style="fill:#dcdcdc"
-       id="path71"
-       d="m 10,9 v 2 H 9 v 4 h 7 V 11 H 15 V 9 Z m 2,1 h 2 v 1 h -2 z m -1,2 h 4 v 2 h -4 z" />
-  </g>
-  <path
-     style="opacity:0.8;fill:#030303"
-     id="path15"
-     d="m 23.31367,1.17583 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.875001 -2,1.875 L 2,23.87503 c -0.2947,0 -0.8340987,-0.07706 -1.325,-0.505481 C 0.89414067,24.465835 1.6826,25 2.4992,25 h 20 c 1.108,0 2,-0.892 2,-2 V 3 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z" />
-  <path
-     id="path19"
-     style="color:#000000;text-indent:0;text-transform:none;fill:#979797;fill-opacity:1"
-     d="m 2,3e-5 c -1.0994,0 -2,0.90065 -2,2 v 20 c 0,1.0994 0.90065,2 2,2 h 20 c 1.0994,0 2,-0.90065 2,-2 v -20 c 0,-1.0994 -0.90065,-2 -2,-2 z m 0.3,1 h 19.4 c 0.56265,0 1.3,0.73735 1.3,1.3 v 19.4 c 0,0.56265 -0.73735,1.3 -1.3,1.3 H 2.3 c -0.56265,0 -1.3,-0.73735 -1.3,-1.3 v -19.4 c 0,-0.56265 0.73735,-1.3 1.3,-1.3 z" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_border_image_wbeatspinbox.svg b/res/skins/LateNight/buttons/btn_border_image_wbeatspinbox.svg
deleted file mode 100644
index e941f5d7392b..000000000000
--- a/res/skins/LateNight/buttons/btn_border_image_wbeatspinbox.svg
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg75"
-   version="1.1"
-   height="25"
-   width="25">
-  <metadata
-     id="metadata79">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs11">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(3e-5,-24)"
-       y2="12"
-       y1="12"
-       x2="23.5"
-       x1="0.5"
-       id="a">
-      <stop
-         id="stop2"
-         offset="0"
-         stop-opacity=".17647" />
-      <stop
-         id="stop4"
-         offset=".12672"
-         stop-opacity=".0047619" />
-      <stop
-         id="stop6"
-         offset=".54348"
-         stop-opacity="0" />
-      <stop
-         id="stop8"
-         offset="1"
-         stop-opacity=".47451" />
-    </linearGradient>
-  </defs>
-  <path
-     style="opacity:0.8;fill:#030303"
-     id="path15"
-     d="m 23.31367,1.17583 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,2 -2,2 h -20 c -0.2947,0 -0.5716,-0.06963 -0.82422,-0.18555 C 0.98634,24.51288 1.6826,25 2.4992,25 h 20 c 1.108,0 2,-0.892 2,-2 V 3 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z" />
-  <path
-     id="path19"
-     style="color:#000000;text-indent:0;text-transform:none;fill:#979797"
-     d="m 2,3e-5 c -1.0994,0 -2,0.90065 -2,2 v 20 c 0,1.0994 0.90065,2 2,2 h 20 c 1.0994,0 2,-0.90065 2,-2 v -20 c 0,-1.0994 -0.90065,-2 -2,-2 z m 0.3,1 h 19.4 c 0.56265,0 1.3,0.73735 1.3,1.3 v 19.4 c 0,0.56265 -0.73735,1.3 -1.3,1.3 H 2.3 c -0.56265,0 -1.3,-0.73735 -1.3,-1.3 v -19.4 c 0,-0.56265 0.73735,-1.3 1.3,-1.3 z" />
-  <g
-     transform="translate(0,-1)"
-     style="display:none"
-     id="g27"
-     display="none">
-    <g
-       style="display:inline"
-       id="g25"
-       display="inline">
-      <path
-         style="fill:#323232"
-         id="path21"
-         d="m 10,10 h 7 v 4 h -5 v 1 h 5 v 1 h -7 v -3 h 5 v -2 h -5 v -1" />
-      <path
-         style="fill:#dcdcdc"
-         id="path23"
-         d="m 9,9 h 7 v 4 h -5 v 1 h 5 v 1 H 9 v -3 h 5 V 10 H 9 V 9" />
-    </g>
-  </g>
-  <g
-     transform="translate(0,-1)"
-     style="display:none"
-     id="g35"
-     display="none">
-    <g
-       style="display:inline"
-       id="g33"
-       display="inline">
-      <path
-         style="fill:#323232"
-         id="path29"
-         d="m 10,10 h 7 v 6 h -7 v -1 h 5 v -1 h -2 v -1 h 2 v -2 h -5 v -1" />
-      <path
-         style="fill:#dcdcdc"
-         id="path31"
-         d="m 9,9 h 7 v 6 H 9 v -1 h 5 v -1 h -2 v -1 h 2 V 10 H 9 V 9" />
-    </g>
-  </g>
-  <g
-     transform="translate(0,-1)"
-     style="display:none"
-     id="g43"
-     display="none">
-    <g
-       style="display:inline"
-       id="g41"
-       display="inline">
-      <path
-         style="fill:#323232"
-         id="path37"
-         d="m 10,11 v 3 h 5 v 2 h 2 v -6 h -2 v 3 h -3 v -2 h -2" />
-      <path
-         style="fill:#dcdcdc"
-         id="path39"
-         d="m 9,10 v 3 h 5 v 2 h 2 V 9 h -2 v 3 H 11 V 10 H 9" />
-    </g>
-  </g>
-  <g
-     transform="translate(0,-1)"
-     style="display:none"
-     id="g51"
-     display="none">
-    <g
-       style="display:inline"
-       id="g49"
-       display="inline">
-      <path
-         style="fill:#323232"
-         id="path45"
-         d="m 17,10 h -6 v 3 h 4 v 2 h -5 v 1 h 7 v -4 h -5 v -1 h 5 v -1" />
-      <path
-         style="fill:#dcdcdc"
-         id="path47"
-         d="m 16,9 h -6 v 3 h 4 v 2 H 9 v 1 h 7 v -4 h -5 v -1 h 5 V 9" />
-    </g>
-  </g>
-  <g
-     transform="translate(0,-1)"
-     style="display:none"
-     id="g59"
-     display="none">
-    <g
-       style="display:inline"
-       id="g57"
-       display="inline">
-      <path
-         style="fill:#323232"
-         id="path53"
-         d="m 10,10 v 6 h 7 v -4 h -5 v -1 h 4 v -1 z m 2,3 h 4 v 2 h -4 z" />
-      <path
-         style="fill:#dcdcdc"
-         id="path55"
-         d="m 9,9 v 6 h 7 v -4 h -5 v -1 h 4 V 9 Z m 2,3 h 4 v 2 h -4 z" />
-    </g>
-  </g>
-  <g
-     transform="translate(0,-1)"
-     style="display:none"
-     id="g67"
-     display="none">
-    <g
-       style="display:inline"
-       id="g65"
-       display="inline">
-      <path
-         style="fill:#323232"
-         id="path61"
-         d="m 10,10 h 6 v 3 h 1 v 1 h -1 v 2 h -2 v -2 h -2 v -1 h 2 v -2 h -4 v -1" />
-      <path
-         style="fill:#dcdcdc"
-         id="path63"
-         d="m 9,9 h 6 v 3 h 1 v 1 h -1 v 2 h -2 v -2 h -2 v -1 h 2 V 10 H 9 V 9" />
-    </g>
-  </g>
-  <g
-     transform="translate(0,-1)"
-     style="display:none"
-     id="g73"
-     display="none">
-    <path
-       style="fill:#323232"
-       id="path69"
-       d="m 11,10 v 2 h -1 v 4 h 7 v -4 h -1 v -2 z m 2,1 h 2 v 1 h -2 z m -1,2 h 4 v 2 h -4 z" />
-    <path
-       style="fill:#dcdcdc"
-       id="path71"
-       d="m 10,9 v 2 H 9 v 4 h 7 V 11 H 15 V 9 Z m 2,1 h 2 v 1 h -2 z m -1,2 h 4 v 2 h -4 z" />
-  </g>
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_cue.svg b/res/skins/LateNight/buttons/btn_cue.svg
deleted file mode 100644
index 3929a09e1353..000000000000
--- a/res/skins/LateNight/buttons/btn_cue.svg
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="26"
-   width="52"
-   id="svg2">
-  <metadata
-     id="metadata26">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.1304,0,0,1,-0.56522,-1026.4)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient3807-3">
-      <stop
-         offset="0"
-         stop-color="#242424"
-         id="stop3803-7" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop3805-5" />
-    </linearGradient>
-  </defs>
-  <path
-     id="rect3029"
-     d="M 4.500125,0.499995 47.5,0.49998 c 1.108,-3.9e-7 2,0.892 2,2 v 19 c 0,1.108 -0.892,2 -2,2 l -42.999875,1.5e-5 c -1.108,0 -2,-0.892 -2,-2 v -19 c 0,-1.108 0.892,-1.99999961 2,-2 z"
-     style="color:#000000;fill:url(#linearGradient3807-3)" />
-  <g
-     id="g6087-0-4"
-     style="fill:#bfbfbf">
-    <path
-       id="path6038-8-4"
-       d="m 20,9 h -7 v 6 h 7 v -1 h -5 v -4 h 5 V 9" />
-    <path
-       id="path6042-8-4"
-       d="m 22,9 v 6 h 7 V 9 h -2 v 5 H 24 V 9 h -2" />
-    <path
-       id="path6046-5-4"
-       d="m 31,9 v 6 h 7 v -1 h -5 v -2 h 4 v -1 h -4 v -1 h 5 V 9 h -7" />
-  </g>
-  <g
-     id="g6078-0-7"
-     style="fill:#060606">
-    <path
-       id="path6050-9-6"
-       d="m 21,10 h -6 v 4 h 1 v -3 h 5 v -1" />
-    <path
-       id="path6054-6-3"
-       d="m 21,15 v 1 h -7 v -1 h 7" />
-    <path
-       id="path6058-3-1"
-       d="m 24,10 h 1 v 4 h -1 v -4" />
-    <path
-       id="path6062-8-7"
-       d="m 23,15 v 1 h 7 v -6 h -1 v 5 h -6" />
-    <path
-       id="path6066-5-5"
-       d="m 39,10 h -6 v 1 h 6 v -1" />
-    <path
-       id="path6070-6-9"
-       d="m 38,12 h -5 v 2 h 1 v -1 h 4 v -1" />
-    <path
-       id="path6074-1-6"
-       d="m 39,15 v 1 h -7 v -1 h 7" />
-  </g>
-  <path
-     d="m 49.31367,1.1758 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.965572 -2,1.965572 l -43.499345,-5e-6 c -0.6598637,0 -1.135675,-0.352003 -1.325,-0.511743 0.2090942,0.790888 0.7641575,1.546141 1.8242,1.546141 L 48.4992,24.99997 c 1.108,0 2,-0.892 2,-2 v -20 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z"
-     id="path15"
-     style="opacity:0.8;fill:#030303" />
-  <path
-     d="m 3.999875,1.5e-5 c -1.0994,3.74794e-7 -2,0.90065 -2,2 v 20 c 0,1.0994 0.90065,2 2,2 L 48,24 c 1.0994,0 2,-0.90065 2,-2 V 2 C 50,0.9006 49.09935,-3.7477734e-7 48,0 Z m 0.3,1 L 47.7,1 c 0.56265,-1.9e-7 1.3,0.73735 1.3,1.3 v 19.4 c 0,0.56265 -0.73735,1.3 -1.3,1.3 l -43.400125,1.5e-5 c -0.56265,0 -1.3,-0.73735 -1.3,-1.3 v -19.4 c 0,-0.56265 0.73735,-1.2999998 1.3,-1.3 z"
-     style="color:#000000;text-indent:0;text-transform:none;fill:#444444"
-     id="path19" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_cue_down.svg b/res/skins/LateNight/buttons/btn_cue_down.svg
deleted file mode 100644
index d0b99a1b6149..000000000000
--- a/res/skins/LateNight/buttons/btn_cue_down.svg
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="26"
-   width="52"
-   id="svg2">
-  <metadata
-     id="metadata24">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.1304,0,0,1,-0.56522,-1026.4)"
-       y2="1027.4"
-       y1="1049.4"
-       x2="15"
-       x1="15"
-       id="linearGradient3878">
-      <stop
-         offset="0"
-         stop-color="#222"
-         id="stop3803-7-6" />
-      <stop
-         offset="1"
-         stop-color="#131516"
-         id="stop3805-5-2" />
-    </linearGradient>
-  </defs>
-  <path
-     style="color:#000000;fill:url(#linearGradient3878)"
-     d="m 4.5,0.49998 h 43 c 1.108,0 2,0.892 2,2 v 19 c 0,1.108 -0.892,2 -2,2 h -43 c -1.108,0 -2,-0.892 -2,-2 v -19 c 0,-1.108 0.892,-2 2,-2 z"
-     id="rect3029-9" />
-  <path
-     id="rect3029-96-0-9"
-     d="M 4,0 C 2.9006,0 2,0.90065 2,2 v 20 c 0,1.0994 0.90065,2 2,2 h 44 c 1.0994,0 2,-0.90065 2,-2 V 2 C 50,0.9006 49.09935,0 48,0 Z M 4.3,1 H 47.7 C 48.26265,1 49,1.73735 49,2.3 V 21.7 C 49,22.26265 48.26265,23 47.7,23 H 4.3 C 3.73735,23 3,22.26265 3,21.7 V 2.3 C 3,1.73735 3.73735,1 4.3,1 Z"
-     style="color:#000000;text-indent:0;text-transform:none;fill:#454748" />
-  <g
-     id="g6087-0-4-6"
-     style="fill:#8d8f90">
-    <path
-       id="path6038-8-4-4"
-       d="m 20,9 h -7 v 6 h 7 v -1 h -5 v -4 h 5 V 9" />
-    <path
-       id="path6042-8-4-3"
-       d="m 22,9 v 6 h 7 V 9 h -2 v 5 H 24 V 9 h -2" />
-    <path
-       id="path6046-5-4-3"
-       d="m 31,9 v 6 h 7 v -1 h -5 v -2 h 4 v -1 h -4 v -1 h 5 V 9 h -7" />
-  </g>
-  <g
-     id="g6078-0-7-3"
-     style="fill:#080808">
-    <path
-       id="path6050-9-6-8"
-       d="m 21,10 h -6 v 4 h 1 v -3 h 5 v -1" />
-    <path
-       id="path6054-6-3-6"
-       d="m 21,15 v 1 h -7 v -1 h 7" />
-    <path
-       id="path6058-3-1-0"
-       d="m 24,10 h 1 v 4 h -1 v -4" />
-    <path
-       id="path6062-8-7-4"
-       d="m 23,15 v 1 h 7 v -6 h -1 v 5 h -6" />
-    <path
-       id="path6066-5-5-8"
-       d="m 39,10 h -6 v 1 h 6 v -1" />
-    <path
-       id="path6070-6-9-8"
-       d="m 38,12 h -5 v 2 h 1 v -1 h 4 v -1" />
-    <path
-       id="path6074-1-6-8"
-       d="m 39,15 v 1 h -7 v -1 h 7" />
-  </g>
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_cue_over.svg b/res/skins/LateNight/buttons/btn_cue_over.svg
deleted file mode 100644
index d531c57ecfd2..000000000000
--- a/res/skins/LateNight/buttons/btn_cue_over.svg
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg43"
-   version="1.1"
-   height="26"
-   width="52">
-  <metadata
-     id="metadata47">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs9">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.1304 0 0 1 -.56521 -1026.4)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="11"
-       x1="11"
-       id="a">
-      <stop
-         id="stop2"
-         offset="0"
-         stop-color="#ce0e0e" />
-      <stop
-         id="stop4"
-         offset=".28"
-         stop-color="#d00" />
-      <stop
-         id="stop6"
-         offset="1"
-         stop-color="#8d0000" />
-    </linearGradient>
-  </defs>
-  <path
-     id="rect15"
-     d="M 4.00025,0.49998 H 48 c 0.831,0 1.5,0.669 1.5,1.5 v 20 c 0,0.831 -0.669,1.5 -1.5,1.5 H 4.00025 c -0.831,0 -1.5,-0.669 -1.5,-1.5 v -20 c 0,-0.831 0.669,-1.5 1.5,-1.5 z"
-     style="color:#000000;fill:url(#a)" />
-  <path
-     style="opacity:0.8;fill:#030303"
-     id="path15"
-     d="m 49.31367,1.1758 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.96557 -2,1.965572 l -43.49932,8e-5 c -0.6598637,2e-6 -1.135675,-0.352003 -1.325,-0.511743 0.2090942,0.790888 0.7641575,1.546144 1.8242,1.546141 l 44.0001,-10e-5 c 1.108,-3e-6 2,-0.892 2,-2 v -20 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z" />
-  <path
-     id="path17"
-     style="color:#000000;text-indent:0;text-transform:none;fill:#979797;fill-opacity:1"
-     d="m 4.00025,0 c -1.0994,0 -2,0.90065 -2,2 v 20 c 0,1.0994 0.90065,2 2,2 H 48 c 1.0994,0 2,-0.90065 2,-2 V 2 C 50,0.9006 49.09935,0 48,0 Z m 0.3,1 H 47.7 C 48.26265,1 49,1.73735 49,2.3 V 21.7 C 49,22.26265 48.26265,23 47.7,23 H 4.30025 c -0.56265,0 -1.3,-0.73735 -1.3,-1.3 V 2.3 c 0,-0.56265 0.73735,-1.3 1.3,-1.3 z" />
-  <g
-     id="g41"
-     fill="#3d0000">
-    <path
-       id="path27"
-       d="m21 10h-6v4h1v-3h5v-1" />
-    <path
-       id="path29"
-       d="m21 15v1h-7v-1h7" />
-    <path
-       id="path31"
-       d="m24 10h1v4h-1v-4" />
-    <path
-       id="path33"
-       d="m23 15v1h7v-6h-1v5h-6" />
-    <path
-       id="path35"
-       d="m39 10h-6v1h6v-1" />
-    <path
-       id="path37"
-       d="m38 12h-5v2h1v-1h4v-1" />
-    <path
-       id="path39"
-       d="m39 15v1h-7v-1h7" />
-  </g>
-  <g
-     style="fill:#dcdcdc;fill-opacity:1"
-     id="g6087-0">
-    <path
-       id="path6038-8"
-       d="m 20,9 h -7 v 6 h 7 v -1 h -5 v -4 h 5 V 9"
-       style="fill:#dcdcdc;fill-opacity:1" />
-    <path
-       id="path6042-8"
-       d="m 22,9 v 6 h 7 V 9 h -2 v 5 H 24 V 9 h -2"
-       style="fill:#dcdcdc;fill-opacity:1" />
-    <path
-       id="path6046-5"
-       d="m 31,9 v 6 h 7 v -1 h -5 v -2 h 4 v -1 h -4 v -1 h 5 V 9 h -7"
-       style="fill:#dcdcdc;fill-opacity:1" />
-  </g>
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_cue_overdown.svg b/res/skins/LateNight/buttons/btn_cue_overdown.svg
deleted file mode 100644
index e25e0789333b..000000000000
--- a/res/skins/LateNight/buttons/btn_cue_overdown.svg
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="26"
-   width="52"
-   id="svg2">
-  <metadata
-     id="metadata25">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.1304 0 0 1 -.56522 -1026.4)"
-       y2="1027.4"
-       y1="1049.4"
-       x2="15"
-       x1="15"
-       id="linearGradient4370">
-      <stop
-         offset="0"
-         stop-color="#aa1112"
-         id="stop3803-7-1-9" />
-      <stop
-         offset=".28"
-         stop-color="#b60607"
-         id="stop4329-4" />
-      <stop
-         offset="1"
-         stop-color="#760607"
-         id="stop3805-5-28-5" />
-    </linearGradient>
-  </defs>
-  <g
-     id="layer5">
-    <path
-       id="rect3029-96-4"
-       d="m 4,0.49998 h 44 c 0.831,0 1.5,0.669 1.5,1.5 v 20 c 0,0.831 -0.669,1.5 -1.5,1.5 H 4 c -0.831,0 -1.5,-0.669 -1.5,-1.5 v -20 c 0,-0.831 0.669,-1.5 1.5,-1.5 z"
-       style="color:#000000;fill:url(#linearGradient4370)" />
-    <path
-       style="color:#000000;text-indent:0;text-transform:none;fill:#aaaaaa;fill-opacity:1"
-       d="M 4,0 C 2.9006,0 2,0.90065 2,2 v 20 c 0,1.0994 0.90065,2 2,2 h 44 c 1.0994,0 2,-0.90065 2,-2 V 2 C 50,0.9006 49.09935,0 48,0 Z M 4.3,1 H 47.7 C 48.26265,1 49,1.73735 49,2.3 V 21.7 C 49,22.26265 48.26265,23 47.7,23 H 4.3 C 3.73735,23 3,22.26265 3,21.7 V 2.3 C 3,1.73735 3.73735,1 4.3,1 Z"
-       id="rect3029-96-9" />
-    <g
-       fill="#320202"
-       id="g6078-0">
-      <path
-         d="m21 10h-6v4h1v-3h5v-1"
-         id="path6050-9" />
-      <path
-         d="m21 15v1h-7v-1h7"
-         id="path6054-6" />
-      <path
-         d="m24 10h1v4h-1v-4"
-         id="path6058-3" />
-      <path
-         d="m23 15v1h7v-6h-1v5h-6"
-         id="path6062-8" />
-      <path
-         d="m39 10h-6v1h6v-1"
-         id="path6066-5" />
-      <path
-         d="m38 12h-5v2h1v-1h4v-1"
-         id="path6070-6" />
-      <path
-         d="m39 15v1h-7v-1h7"
-         id="path6074-1" />
-    </g>
-    <g
-       id="g25"
-       style="fill:#ffffff">
-      <path
-         d="m 20,9 h -7 v 6 h 7 v -1 h -5 v -4 h 5 V 9"
-         id="path19" />
-      <path
-         d="m 22,9 v 6 h 7 V 9 h -2 v 5 H 24 V 9 h -2"
-         id="path21" />
-      <path
-         d="m 31,9 v 6 h 7 v -1 h -5 v -2 h 4 v -1 h -4 v -1 h 5 V 9 h -7"
-         id="path23" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_eject.svg b/res/skins/LateNight/buttons/btn_eject.svg
deleted file mode 100644
index 7826d5c580fc..000000000000
--- a/res/skins/LateNight/buttons/btn_eject.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="25" height="18" version="1.1" viewBox="0 0 25 18" xmlns="http://www.w3.org/2000/svg"><path id="path3936-0-8-9-7-1" d="m6.1778 11 6.3222-7 6.3221 7h-12.644" fill="#585858"/><rect id="rect4195" x="6" y="12" width="13" height="3" color="#000000" fill="#585858"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_eject_over.svg b/res/skins/LateNight/buttons/btn_eject_over.svg
deleted file mode 100644
index 6df3c96162e1..000000000000
--- a/res/skins/LateNight/buttons/btn_eject_over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="25" height="18" version="1.1" viewBox="0 0 25 18" xmlns="http://www.w3.org/2000/svg"><path id="path3936-0-8-9-7-1" d="m6.1778 10 6.3222-7 6.3221 7h-12.644" fill="#f0bb2b"/><rect id="rect4195" x="6" y="12" width="13" height="3" color="#000000" fill="#f0bb2b"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_eq_kill.svg b/res/skins/LateNight/buttons/btn_eq_kill.svg
deleted file mode 100644
index 48039404fad7..000000000000
--- a/res/skins/LateNight/buttons/btn_eq_kill.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="18"
-   width="18"
-   id="svg3249">
-  <metadata
-     id="metadata13">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3251">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.56522,0,0,0.56522,2.2174,-577.94)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient3807-3">
-      <stop
-         offset="0"
-         stop-color="#242424"
-         id="stop3803-7" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop3805-5" />
-    </linearGradient>
-  </defs>
-  <rect
-     id="rect3029-6-6"
-     x="2.5"
-     y="3.0000243"
-     width="14"
-     height="14"
-     style="color:#000000;opacity:0.72000002" />
-  <rect
-     id="rect3029"
-     x="2.5"
-     y="2.5000243"
-     width="13"
-     height="13"
-     style="color:#000000;fill:url(#linearGradient3807-3);stroke:#444444" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_eq_kill_down.svg b/res/skins/LateNight/buttons/btn_eq_kill_down.svg
deleted file mode 100644
index 824131bfeb7f..000000000000
--- a/res/skins/LateNight/buttons/btn_eq_kill_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg3249" width="18" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs3251"><linearGradient id="linearGradient3807-3" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="matrix(.56522 0 0 .56522 2.2174 -1630.3)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-6" stop-color="#222" offset="0"/><stop id="stop3805-5-2" stop-color="#131516" offset="1"/></linearGradient></defs><g id="layer1" transform="translate(0 -1034.4)"><rect id="rect3029" transform="scale(1,-1)" x="2.5" y="-1049.9" width="13" height="13" color="#000000" fill="url(#linearGradient3807-3)" stroke="#444444"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_eq_kill_over.svg b/res/skins/LateNight/buttons/btn_eq_kill_over.svg
deleted file mode 100644
index 0119c6c25045..000000000000
--- a/res/skins/LateNight/buttons/btn_eq_kill_over.svg
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="18"
-   width="18"
-   id="svg3249">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3251">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.56522,0,0,0.56522,2.2174,-595.9)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient3807-3">
-      <stop
-         offset="0"
-         stop-color="#ce0e0e"
-         id="stop3803-7-1-95" />
-      <stop
-         offset=".28"
-         stop-color="#d00"
-         id="stop4329-2" />
-      <stop
-         offset="1"
-         stop-color="#8d0000"
-         id="stop3805-5-28-1" />
-    </linearGradient>
-  </defs>
-  <rect
-     id="rect3029"
-     transform="scale(1,-1)"
-     x="2.5"
-     y="-15.500025"
-     width="13"
-     height="13"
-     style="color:#000000;fill:url(#linearGradient3807-3);stroke:#8c4343;stroke-opacity:1" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_eq_kill_overdown.svg b/res/skins/LateNight/buttons/btn_eq_kill_overdown.svg
deleted file mode 100644
index f9bb429337b7..000000000000
--- a/res/skins/LateNight/buttons/btn_eq_kill_overdown.svg
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.1"
-   height="18"
-   width="18"
-   id="svg3249">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3251">
-    <linearGradient
-       xlink:href="#linearGradient4370"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.56522,0,0,0.56522,2.2174,-595.9)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient3807-3">
-      <stop
-         offset="0"
-         stop-color="#659f08"
-         id="stop4819" />
-      <stop
-         offset=".72857"
-         stop-color="#5b9402"
-         id="stop4825" />
-      <stop
-         offset="1"
-         stop-color="#456e05"
-         id="stop4823" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.1304,0,0,1,-46.692339,-1041.6797)"
-       y2="1027.4"
-       y1="1049.4"
-       x2="15"
-       x1="15"
-       id="linearGradient4370">
-      <stop
-         offset="0"
-         stop-color="#aa1112"
-         id="stop3803-7-1-9" />
-      <stop
-         offset=".28"
-         stop-color="#b60607"
-         id="stop4329-4" />
-      <stop
-         offset="1"
-         stop-color="#760607"
-         id="stop3805-5-28-5" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(-18.000025,2.4795532e-5)"
-       gradientUnits="userSpaceOnUse"
-       y2="-9.0000248"
-       x2="16"
-       y1="-9.0000248"
-       x1="2"
-       id="linearGradient843"
-       xlink:href="#linearGradient4370" />
-  </defs>
-  <rect
-     id="rect3029"
-     transform="matrix(0,-1,-1,0,0,0)"
-     x="-15.500025"
-     y="-15.5"
-     width="13"
-     height="13"
-     style="color:#000000;fill:url(#linearGradient843);fill-opacity:1;stroke:#979797" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_fx_assign.svg b/res/skins/LateNight/buttons/btn_fx_assign.svg
deleted file mode 100644
index 8857743d1e57..000000000000
--- a/res/skins/LateNight/buttons/btn_fx_assign.svg
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="22"
-   width="35"
-   id="svg25537">
-  <metadata
-     id="metadata36">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs25539">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-1029.4)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient6227">
-      <stop
-         offset="0"
-         stop-color="#242424"
-         id="stop3803-7-8" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop3805-5-4" />
-    </linearGradient>
-  </defs>
-  <g
-     id="g895"
-     transform="translate(-0.5,-3)">
-    <path
-       id="rect3029-6-6"
-       d="m 3,4 h 30 c 1.108,0 2,0.892 2,2 v 17 c 0,1.108 -0.892,2 -2,2 H 3 C 1.892,25 1,24.108 1,23 V 6 C 1,4.892 1.892,4 3,4 Z"
-       style="color:#000000;opacity:0.72000002" />
-  </g>
-  <path
-     id="rect3029"
-     d="m 2.5,0.49998 h 29 c 1.108,0 2,0.892 2,2 v 16 c 0,1.108 -0.892,2 -2,2 h -29 c -1.108,0 -2,-0.892 -2,-2 v -16 c 0,-1.108 0.892,-2 2,-2 z"
-     style="color:#000000;fill:url(#linearGradient6227)" />
-  <path
-     style="display:none;fill:#bfbfbf"
-     display="none"
-     d="m 10,5 h 3 v 6 H 11 V 6 H 10 V 5"
-     id="path3944" />
-  <path
-     style="display:none;fill:#060606"
-     display="none"
-     d="m 13,6 h 1 v 6 h -2 v -1 h 1 V 6"
-     id="path3948" />
-  <path
-     style="display:none;fill:#060606"
-     display="none"
-     d="m 10,6 h 7 v 4 h -5 v 1 h 5 v 1 H 10 V 9 h 5 V 7 H 10 V 6"
-     id="path5770-89-8-1" />
-  <path
-     style="display:none;fill:#bfbfbf"
-     display="none"
-     d="m 9,5 h 7 v 4 h -5 v 1 h 5 v 1 H 9 V 8 h 5 V 6 H 9 V 5"
-     id="path5770-8-5-6-8" />
-  <path
-     style="display:none;fill:#060606"
-     display="none"
-     d="m 10,6 h 7 v 6 h -7 v -1 h 5 V 10 H 13 V 9 h 2 V 7 H 10 V 6"
-     id="path6542-5-0" />
-  <path
-     style="display:none;fill:#bfbfbf"
-     display="none"
-     d="m 9,5 h 7 v 6 H 9 v -1 h 5 V 9 H 12 V 8 h 2 V 6 H 9 V 5"
-     id="path6542-3" />
-  <path
-     style="display:none;fill:#060606"
-     display="none"
-     d="m 10,7 v 3 h 5 v 2 h 2 V 6 H 15 V 9 H 12 V 7 h -2"
-     id="path6751-9" />
-  <path
-     style="display:none;fill:#bfbfbf"
-     display="none"
-     d="m 9,6 v 3 h 5 v 2 h 2 V 5 H 14 V 8 H 11 V 6 H 9"
-     id="path6751" />
-  <path
-     style="display:none;fill:#060606"
-     display="none"
-     d="m -23,-18.5 h 3 v -3 h 3 v 3 h 3 v 3 h -3 v 3 h -3 v -3 h -3 v -3"
-     id="path9276-9-3" />
-  <path
-     style="display:none;fill:#bfbfbf"
-     display="none"
-     d="m -24,-19.5 h 3 v -3 h 3 v 3 h 3 v 3 h -3 v 3 h -3 v -3 h -3 v -3"
-     id="path9276-5" />
-  <path
-     style="display:none;fill:#060606"
-     display="none"
-     d="m -11,-18.5 h 9 v 3 h -9 v -3"
-     id="path9788-2-2" />
-  <path
-     style="display:none;fill:#bfbfbf"
-     display="none"
-     d="m -12,-19.5 h 9 v 3 h -9 v -3"
-     id="path9788-6" />
-  <path
-     style="display:none;fill:#060606"
-     display="none"
-     d="M 13,-18.5 H 9 v -4 l -5,5.5 5,5.5 v -4 h 4 v -3"
-     id="path9792-3-2-6" />
-  <path
-     style="display:none;fill:#bfbfbf"
-     display="none"
-     d="M 12,-19.5 H 8 v -4 l -5,5.5 5,5.5 v -4 h 4 v -3"
-     id="path9792-3-3" />
-  <path
-     style="display:none;fill:#060606"
-     display="none"
-     d="m 17,-18.5 h 4 v -4 l 5,5.5 -5,5.5 v -4 h -4 v -3"
-     id="path9792-0-0" />
-  <path
-     style="display:none;fill:#bfbfbf"
-     display="none"
-     d="m 16,-19.5 h 4 v -4 l 5,5.5 -5,5.5 v -4 h -4 v -3"
-     id="path9792-9" />
-  <path
-     style="display:none;fill:#060606"
-     display="none"
-     d="m 41,-22 h 5 v 13 h -1 v -7 h -4 v -6"
-     id="path9817-3-1" />
-  <path
-     style="display:none;fill:#bfbfbf"
-     display="none"
-     d="m 40,-23 h 5 v 13 h -1 v -7 h -4 v -6"
-     id="path9817-7" />
-  <path
-     style="display:none;fill:#060606"
-     display="none"
-     d="m 56,-22 h -5 v 13 h 1 v -7 h 4 v -6"
-     id="path9817-6-7-5" />
-  <path
-     style="display:none;fill:#bfbfbf"
-     display="none"
-     d="m 55,-23 h -5 v 13 h 1 v -7 h 4 v -6"
-     id="path9817-6-4" />
-  <path
-     style="color:#000000;text-indent:0;text-transform:none;fill:#444444"
-     d="M 2,0 C 0.9006,0 0,0.90065 0,2 v 17 c 0,1.0994 0.90065,2 2,2 h 30 c 1.0994,0 2,-0.90065 2,-2 V 2 C 34,0.9006 33.09935,0 32,0 Z M 2.3,1 H 31.7 C 32.26265,1 33,1.73735 33,2.3 V 18.7 C 33,19.26265 32.26265,20 31.7,20 H 2.3 C 1.73735,20 1,19.26265 1,18.7 V 2.3 C 1,1.73735 1.73735,1 2.3,1 Z"
-     id="rect3029-96-0" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_fx_assign_over.svg b/res/skins/LateNight/buttons/btn_fx_assign_over.svg
deleted file mode 100644
index 2575411108b4..000000000000
--- a/res/skins/LateNight/buttons/btn_fx_assign_over.svg
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   id="svg25537"
-   width="35"
-   height="22"
-   version="1.1">
-  <metadata
-     id="metadata36">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs25539">
-    <linearGradient
-       xlink:href="#linearGradient3807-3"
-       id="linearGradient1243"
-       x1="16"
-       y1="19"
-       x2="16"
-       y2="1"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.56522,0,0,0.56522,-24.987728,-590.4384)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient3807-3">
-      <stop
-         offset="0"
-         stop-color="#659f08"
-         id="stop4819" />
-      <stop
-         offset=".72857"
-         stop-color="#5b9402"
-         id="stop4825" />
-      <stop
-         offset="1"
-         stop-color="#456e05"
-         id="stop4823" />
-    </linearGradient>
-  </defs>
-  <path
-     id="path3944"
-     d="m 10,5 h 3 v 6 H 11 V 6 H 10 V 5"
-     display="none"
-     style="display:none;fill:#bfbfbf" />
-  <path
-     id="path3948"
-     d="m 13,6 h 1 v 6 h -2 v -1 h 1 V 6"
-     display="none"
-     style="display:none;fill:#060606" />
-  <path
-     id="path5770-89-8-1"
-     d="m 10,6 h 7 v 4 h -5 v 1 h 5 v 1 H 10 V 9 h 5 V 7 H 10 V 6"
-     display="none"
-     style="display:none;fill:#060606" />
-  <path
-     id="path5770-8-5-6-8"
-     d="m 9,5 h 7 v 4 h -5 v 1 h 5 v 1 H 9 V 8 h 5 V 6 H 9 V 5"
-     display="none"
-     style="display:none;fill:#bfbfbf" />
-  <path
-     id="path6542-5-0"
-     d="m 10,6 h 7 v 6 h -7 v -1 h 5 V 10 H 13 V 9 h 2 V 7 H 10 V 6"
-     display="none"
-     style="display:none;fill:#060606" />
-  <path
-     id="path6542-3"
-     d="m 9,5 h 7 v 6 H 9 v -1 h 5 V 9 H 12 V 8 h 2 V 6 H 9 V 5"
-     display="none"
-     style="display:none;fill:#bfbfbf" />
-  <path
-     id="path6751-9"
-     d="m 10,7 v 3 h 5 v 2 h 2 V 6 H 15 V 9 H 12 V 7 h -2"
-     display="none"
-     style="display:none;fill:#060606" />
-  <path
-     id="path6751"
-     d="m 9,6 v 3 h 5 v 2 h 2 V 5 H 14 V 8 H 11 V 6 H 9"
-     display="none"
-     style="display:none;fill:#bfbfbf" />
-  <path
-     id="path9276-9-3"
-     d="m -23,-18.5 h 3 v -3 h 3 v 3 h 3 v 3 h -3 v 3 h -3 v -3 h -3 v -3"
-     display="none"
-     style="display:none;fill:#060606" />
-  <path
-     id="path9276-5"
-     d="m -24,-19.5 h 3 v -3 h 3 v 3 h 3 v 3 h -3 v 3 h -3 v -3 h -3 v -3"
-     display="none"
-     style="display:none;fill:#bfbfbf" />
-  <path
-     id="path9788-2-2"
-     d="m -11,-18.5 h 9 v 3 h -9 v -3"
-     display="none"
-     style="display:none;fill:#060606" />
-  <path
-     id="path9788-6"
-     d="m -12,-19.5 h 9 v 3 h -9 v -3"
-     display="none"
-     style="display:none;fill:#bfbfbf" />
-  <path
-     id="path9792-3-2-6"
-     d="M 13,-18.5 H 9 v -4 l -5,5.5 5,5.5 v -4 h 4 v -3"
-     display="none"
-     style="display:none;fill:#060606" />
-  <path
-     id="path9792-3-3"
-     d="M 12,-19.5 H 8 v -4 l -5,5.5 5,5.5 v -4 h 4 v -3"
-     display="none"
-     style="display:none;fill:#bfbfbf" />
-  <path
-     id="path9792-0-0"
-     d="m 17,-18.5 h 4 v -4 l 5,5.5 -5,5.5 v -4 h -4 v -3"
-     display="none"
-     style="display:none;fill:#060606" />
-  <path
-     id="path9792-9"
-     d="m 16,-19.5 h 4 v -4 l 5,5.5 -5,5.5 v -4 h -4 v -3"
-     display="none"
-     style="display:none;fill:#bfbfbf" />
-  <path
-     id="path9817-3-1"
-     d="m 41,-22 h 5 v 13 h -1 v -7 h -4 v -6"
-     display="none"
-     style="display:none;fill:#060606" />
-  <path
-     id="path9817-7"
-     d="m 40,-23 h 5 v 13 h -1 v -7 h -4 v -6"
-     display="none"
-     style="display:none;fill:#bfbfbf" />
-  <path
-     id="path9817-6-7-5"
-     d="m 56,-22 h -5 v 13 h 1 v -7 h 4 v -6"
-     display="none"
-     style="display:none;fill:#060606" />
-  <path
-     id="path9817-6-4"
-     d="m 55,-23 h -5 v 13 h 1 v -7 h 4 v -6"
-     display="none"
-     style="display:none;fill:#bfbfbf" />
-  <path
-     id="rect3029-5"
-     d="m 2.5,0.49998 29,5e-6 c 1.108,1.9e-7 2,0.892 2,2 V 18.5 c 0,1.108 -0.892,2 -2,2 l -29,-5e-6 c -1.108,0 -2,-0.892 -2,-2 V 2.49998 c 0,-1.108 0.892,-2.00000019 2,-2 z"
-     style="color:#000000;fill:url(#linearGradient1243);fill-opacity:1.0" />
-  <path
-     style="color:#000000;text-indent:0;text-transform:none;fill:#979797;fill-opacity:1"
-     d="M 2,0 C 0.9006,0 0,0.90065 0,2 v 17 c 0,1.0994 0.90065,2 2,2 h 30 c 1.0994,0 2,-0.90065 2,-2 V 2 C 34,0.9006 33.09935,0 32,0 Z M 2.3,1 H 31.7 C 32.26265,1 33,1.73735 33,2.3 V 18.7 C 33,19.26265 32.26265,20 31.7,20 H 2.3 C 1.73735,20 1,19.26265 1,18.7 V 2.3 C 1,1.73735 1.73735,1 2.3,1 Z"
-     id="rect3029-96-0" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_fx_focus_off.svg b/res/skins/LateNight/buttons/btn_fx_focus_off.svg
deleted file mode 100644
index 5fe2dade935c..000000000000
--- a/res/skins/LateNight/buttons/btn_fx_focus_off.svg
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="24"
-   width="24"
-   id="svg2">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8">
-    <linearGradient
-       id="a-1-3"
-       x1="256.73999"
-       x2="484.70999"
-       y1="472.03"
-       y2="472.03"
-       gradientTransform="matrix(-0.02689375,-0.08131675,0.08068125,-0.02710559,-15.654481,51.688341)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         stop-color="#060606"
-         offset="0"
-         id="stop2-27-6" />
-      <stop
-         stop-color="#343434"
-         offset="1"
-         id="stop4-0-7" />
-    </linearGradient>
-  </defs>
-  <g
-     id="g848">
-    <g
-       id="g845"
-       transform="matrix(0.76872597,0.34140352,-0.34140352,0.76872597,3.5802742,-10.097772)">
-      <g
-         style="opacity:0.49300005;fill:#000000;fill-opacity:1"
-         id="g11-3"
-         transform="matrix(0.10676,0,0,0.10676,-19.071124,-31.786292)">
-        <path
-           id="path9-5"
-           d="m 270.69379,536.40673 c 20.01433,60.04489 85.31772,92.31846 145.17067,71.75942 60.21816,-19.46338 93.09981,-84.46428 73.08548,-144.50917 C 410.65308,312.55652 235.42949,418.7094 270.69379,536.40673 Z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:11.80004597;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-      </g>
-      <g
-         style="opacity:0.93999999;fill:#050505;fill-opacity:1"
-         id="g11"
-         transform="matrix(0.10746967,0,0,0.10746967,-20.137858,-33.659792)">
-        <path
-           id="path9"
-           d="m 270.69379,536.40673 c 20.01433,60.04489 85.31772,92.31846 145.17067,71.75942 60.21816,-19.46338 93.09981,-84.46428 73.08548,-144.50917 -20.01433,-60.04488 -85.31957,-92.31785 -145.17252,-71.7588 -60.21816,19.46339 -93.09796,84.46366 -73.08363,144.50855 z"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#050505;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:11.80004597;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-      </g>
-    </g>
-    <path
-       id="path23"
-       d="M 13.261719,1.2636715 C 11.959661,1.1720556 10.619514,1.3407957 9.3085938,1.7988277 4.0209991,3.5065412 1.1300182,9.2449276 2.8847656,14.550781 4.6398583,19.857679 10.37555,22.702603 15.623047,20.869141 20.91064,19.161426 23.799669,13.42304 22.044922,8.1171871 20.728283,4.1360497 17.171683,1.5387858 13.261719,1.2636715 Z"
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#404040;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.8208071;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-    <path
-       style="fill:url(#a-1-3);stroke:none;stroke-width:0.7885651;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 9.4835276,2.98355 A 9.1929467,9.2653595 0 1 1 15.297073,20.562041 9.1929467,9.2653595 0 1 1 9.4835276,2.98355 Z"
-       id="path23-5" />
-  </g>
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_fx_focus_on.svg b/res/skins/LateNight/buttons/btn_fx_focus_on.svg
deleted file mode 100644
index 835429a8f9ba..000000000000
--- a/res/skins/LateNight/buttons/btn_fx_focus_on.svg
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   id="svg2"
-   width="24"
-   height="24"
-   version="1.1">
-  <metadata
-     id="metadata9">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs7">
-    <linearGradient
-       id="linearGradient1166">
-      <stop
-         id="stop1162"
-         offset="0"
-         style="stop-color:#448301;stop-opacity:1" />
-      <stop
-         id="stop1164"
-         offset="1"
-         style="stop-color:#132301;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="a-1-3"
-       x1="228.89679"
-       x2="404.80463"
-       y1="457.40128"
-       y2="467.67676"
-       gradientTransform="matrix(0.02689375,0.08131675,-0.08068125,0.02710559,40.435082,-29.022693)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         style="stop-color:#5a3600;stop-opacity:1"
-         stop-color="#060606"
-         offset="0"
-         id="stop976" />
-      <stop
-         style="stop-color:#e88b00;stop-opacity:1"
-         stop-color="#343434"
-         offset="1"
-         id="stop978" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.02689375,0.08131675,-0.08068125,0.02710559,40.435082,-29.022693)"
-       y2="467.67676"
-       y1="457.40128"
-       x2="404.80463"
-       x1="228.89679"
-       id="a-1-3-3">
-      <stop
-         id="stop2-27-6"
-         offset="0"
-         stop-color="#060606"
-         style="stop-color:#5a3600;stop-opacity:1" />
-      <stop
-         id="stop4-0-7"
-         offset="1"
-         stop-color="#343434"
-         style="stop-color:#e88b00;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="rotate(-99.798936,-7.601802,27.74075)"
-       gradientUnits="userSpaceOnUse"
-       y2="10.898868"
-       x2="26.314127"
-       y1="10.898868"
-       x1="5.295825"
-       id="linearGradient1168"
-       xlink:href="#linearGradient1166" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.0253344,0.07660187,-0.07600321,0.02553396,38.808997,-26.367697)"
-       y2="472.03"
-       y1="472.03"
-       x2="484.70999"
-       x1="256.73999"
-       id="a-1-3-5">
-      <stop
-         id="stop2-27-6-3"
-         offset="0"
-         stop-color="#060606" />
-      <stop
-         id="stop4-0-7-5"
-         offset="1"
-         stop-color="#343434" />
-    </linearGradient>
-  </defs>
-  <path
-     id="path1117"
-     d="m -27.351562,1.2441406 c -4.28469,-0.1275527 -8.33766,2.5592391 -9.763672,6.8710938 -1.754748,5.3058526 1.136233,11.0442396 6.423828,12.7519536 1.31092,0.458032 2.651067,0.626771 3.953125,0.535156 3.909964,-0.275115 7.466564,-2.872379 8.783203,-6.853516 C -16.200331,9.2429751 -19.08936,3.50459 -24.376953,1.796875 -25.360859,1.4531009 -26.362788,1.2735759 -27.351562,1.2441406 Z"
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#404040;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.8208071;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-  <path
-     id="path23"
-     d="m -36.738195,12.581627 a 9.2653595,9.1929467 45.86559 0 1 0.925402,-5.9572963 9.2653595,9.1929467 45.86559 1 1 16.412494,8.5680643 9.2653595,9.1929467 45.86559 0 1 -17.337896,-2.610768 z"
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#linearGradient1168);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.8208071;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-  <path
-     id="path23-6"
-     d="M 13.261719,1.2636715 C 11.959661,1.1720556 10.619514,1.3407957 9.3085938,1.7988277 4.0209991,3.5065412 1.1300182,9.2449276 2.8847656,14.550781 4.6398583,19.857679 10.37555,22.702603 15.623047,20.869141 20.91064,19.161426 23.799669,13.42304 22.044922,8.1171871 20.728283,4.1360497 17.171683,1.5387858 13.261719,1.2636715 Z"
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#248301;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.8208071;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-  <path
-     style="fill:url(#a-1-3-5);stroke:none;stroke-width:0.74284279;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 15.128533,19.513107 A 8.6599241,8.7281383 0 1 1 9.6520672,2.9538466 8.6599241,8.7281383 0 1 1 15.128533,19.513107 Z"
-     id="path23-5" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_fx_mixmode_d+w.svg b/res/skins/LateNight/buttons/btn_fx_mixmode_d+w.svg
deleted file mode 100644
index 7cb58091a85d..000000000000
--- a/res/skins/LateNight/buttons/btn_fx_mixmode_d+w.svg
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="20"
-   width="31"
-   id="svg2">
-  <metadata
-     id="metadata15">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.1304,0,0,1,1.4348,-1026.4)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient6467">
-      <stop
-         offset="0"
-         stop-color="#242424"
-         id="stop3803-7" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop3805-5" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.1304,0,0,1,-2.5652,-1028.4)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient6467-3">
-      <stop
-         offset="0"
-         stop-color="#242424"
-         id="stop3803-7-6" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop3805-5-7" />
-    </linearGradient>
-  </defs>
-  <path
-     d="m 1,-1 h 31 c 1.108,0 2,0.892 2,2 v 20 c 0,1.108 -0.892,2 -2,2 H 1 c -1.108,0 -2,-0.892 -2,-2 V 1 c 0,-1.108 0.892,-2 2,-2 z"
-     id="rect3029-6-6"
-     style="color:#000000;opacity:0.9" />
-  <path
-     d="M 33.812,0.1875 C 33.92353,0.43712 33.9995,0.708 33.9995,1 v 20 c 0,1.108 -0.892,2 -2,2 h -31 C 0.7075,23 0.43662,22.924027 0.187,22.8125 0.49867,23.51008 1.1835,24 1.9995,24 h 31 c 1.108,0 2,-0.892 2,-2 V 2 c 0,-0.816 -0.48992,-1.5008 -1.1875,-1.8125 z"
-     id="rect3029-6"
-     style="color:#000000;opacity:0.62085003;fill:#060606" />
-  <path
-     d="m 0.5,-1.50002 h 30 c 1.108,0 2,0.892 2,2 v 19 c 0,1.108 -0.892,2 -2,2 h -30 c -1.108,0 -2,-0.892 -2,-2 v -19 c 0,-1.108 0.892,-2 2,-2 z"
-     id="rect3029"
-     style="color:#000000;fill:url(#linearGradient6467-3)" />
-  <path
-     style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#444444"
-     d="m 0,-2 c -1.0994,0 -2,0.90065 -2,2 v 20 c 0,1.0994 0.90065,2 2,2 h 31 c 1.0994,0 2,-0.90065 2,-2 V 0 c 0,-1.0994 -0.90065,-2 -2,-2 z m 0.3,1 h 30.4 c 0.56265,0 1.3,0.73735 1.3,1.3 V 19.7 C 32,20.26265 31.26265,21 30.7,21 H 0.3 C -0.26265,21 -1,20.26265 -1,19.7 V 0.3 C -1,-0.26265 -0.26265,-1 0.3,-1 Z"
-     id="rect3029-96-0" />
-  <path
-     d="m 5.0142,5.0018 h 20.972"
-     id="path817"
-     style="fill:none;stroke:#b5b5b5;stroke-width:2;stroke-linecap:round;stroke-opacity:0.99216003" />
-  <path
-     d="M 25.986,5.0018 C 11.306,8.7474 5.014,14.99 5.014,14.99"
-     id="path817-3"
-     style="fill:none;stroke:#da0606;stroke-width:2;stroke-linecap:round" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_fx_mixmode_d-w.svg b/res/skins/LateNight/buttons/btn_fx_mixmode_d-w.svg
deleted file mode 100644
index 3810d2c4f831..000000000000
--- a/res/skins/LateNight/buttons/btn_fx_mixmode_d-w.svg
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="20"
-   width="31"
-   id="svg2">
-  <metadata
-     id="metadata15">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.1304,0,0,1,-2.5652,-1030.4)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient6467">
-      <stop
-         offset="0"
-         stop-color="#242424"
-         id="stop3803-7" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop3805-5" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.1304,0,0,1,-2.5652,-1028.4)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient6467-3">
-      <stop
-         offset="0"
-         stop-color="#242424"
-         id="stop3803-7-6" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop3805-5-7" />
-    </linearGradient>
-  </defs>
-  <path
-     style="color:#000000;opacity:0.9"
-     d="m 1,-1 h 31 c 1.108,0 2,0.892 2,2 v 20 c 0,1.108 -0.892,2 -2,2 H 1 c -1.108,0 -2,-0.892 -2,-2 V 1 c 0,-1.108 0.892,-2 2,-2 z"
-     id="rect3029-6-6" />
-  <path
-     style="color:#000000;opacity:0.62085003;fill:#060606"
-     d="M 33.812,0.1875 C 33.92353,0.43712 33.9995,0.708 33.9995,1 v 20 c 0,1.108 -0.892,2 -2,2 h -31 C 0.7075,23 0.43662,22.924027 0.187,22.8125 0.49867,23.51008 1.1835,24 1.9995,24 h 31 c 1.108,0 2,-0.892 2,-2 V 2 c 0,-0.816 -0.48992,-1.5008 -1.1875,-1.8125 z"
-     id="rect3029-6" />
-  <path
-     style="color:#000000;fill:url(#linearGradient6467-3)"
-     d="m 0.5,-1.50002 h 30 c 1.108,0 2,0.892 2,2 v 19 c 0,1.108 -0.892,2 -2,2 h -30 c -1.108,0 -2,-0.892 -2,-2 v -19 c 0,-1.108 0.892,-2 2,-2 z"
-     id="rect3029" />
-  <path
-     style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#444444"
-     d="m 0,-2 c -1.0994,0 -2,0.90065 -2,2 v 20 c 0,1.0994 0.90065,2 2,2 h 31 c 1.0994,0 2,-0.90065 2,-2 V 0 c 0,-1.0994 -0.90065,-2 -2,-2 z m 0.3,1 h 30.4 c 0.56265,0 1.3,0.73735 1.3,1.3 V 19.7 C 32,20.26265 31.26265,21 30.7,21 H 0.3 C -0.26265,21 -1,20.26265 -1,19.7 V 0.3 C -1,-0.26265 -0.26265,-1 0.3,-1 Z"
-     id="rect3029-96-0" />
-  <path
-     style="fill:none;stroke:#b5b5b5;stroke-width:2;stroke-linecap:round;stroke-opacity:0.99216003"
-     d="m 5.0138,5.0018 c 14.682,3.7456 20.975,9.9882 20.975,9.9882"
-     id="path817-3-9-3" />
-  <path
-     style="fill:none;stroke:#da0606;stroke-width:2;stroke-linecap:round"
-     d="M 25.986,5.0018 C 11.304,8.7474 5.011,14.99 5.011,14.99"
-     id="path817-3-9" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_fx_parameter.svg b/res/skins/LateNight/buttons/btn_fx_parameter.svg
deleted file mode 100644
index 39ec3e0399bd..000000000000
--- a/res/skins/LateNight/buttons/btn_fx_parameter.svg
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="17"
-   width="40"
-   id="svg7007">
-  <metadata
-     id="metadata15">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs7009">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5217,0,0,0.52174,1.7391,-533.29)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient7062">
-      <stop
-         offset="0"
-         stop-color="#242424"
-         id="stop3803-7" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop3805-5" />
-    </linearGradient>
-  </defs>
-  <rect
-     style="color:#000000;opacity:0.62085003;fill:#060606"
-     ry="2"
-     rx="2"
-     height="13"
-     width="36"
-     y="4.0000243"
-     x="3"
-     id="rect3029-6" />
-  <rect
-     style="color:#000000;opacity:0.72000002"
-     ry="2"
-     rx="2"
-     height="13"
-     width="36"
-     y="3.0000243"
-     x="2.5"
-     id="rect3029-6-6" />
-  <rect
-     style="color:#000000;fill:url(#linearGradient7062)"
-     ry="2"
-     rx="2"
-     height="12"
-     width="35"
-     y="2.5000243"
-     x="2.5"
-     id="rect3029" />
-  <path
-     style="color:#000000;text-indent:0;text-transform:none;fill:#444444"
-     d="M 4,2 C 2.9006,2 2,2.9006 2,4 v 9.0001 c 0,1.0994 0.90065,2 2,2 h 32 c 1.0994,0 2,-0.9006 2,-2 V 4 C 38,2.9006 37.09935,2 36,2 Z M 4.3,3 H 35.7 C 36.26265,3 37,3.7374 37,4.3 v 8.4001 c 0,0.5626 -0.73735,1.3 -1.3,1.3 H 4.3 c -0.56265,0 -1.3,-0.7374 -1.3,-1.3 V 4.3 C 3,3.7374 3.73735,3 4.3,3 Z"
-     id="rect3029-96-0" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_fx_parameter_down.svg b/res/skins/LateNight/buttons/btn_fx_parameter_down.svg
deleted file mode 100644
index e71ac3f20a1d..000000000000
--- a/res/skins/LateNight/buttons/btn_fx_parameter_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg7007" width="40" height="17" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs7009"><linearGradient id="linearGradient7062" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="matrix(1.5217 0 0 .52174 2.2391 502.11)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-6" stop-color="#222" offset="0"/><stop id="stop3805-5-2" stop-color="#131516" offset="1"/></linearGradient></defs><g id="layer1" transform="translate(0 -1035.4)"><g id="g7056" transform="translate(-.5 1.7383e-5)"><rect id="rect3029" x="3" y="1037.9" width="35" height="12" rx="2" ry="2" color="#000000" fill="url(#linearGradient7062)"/><path id="rect3029-96-0" d="m4.5 1037.4c-1.0994 0-2 0.9006-2 2v9.0001c0 1.0994 0.90065 2 2 2h32c1.0994 0 2-0.9006 2-2v-9.0001c0-1.0994-0.90065-2-2-2zm0.3 1h31.4c0.56265 0 1.3 0.7374 1.3 1.3v8.4001c0 0.5626-0.73735 1.3-1.3 1.3h-31.4c-0.56265 0-1.3-0.7374-1.3-1.3v-8.4001c0-0.5626 0.73735-1.3 1.3-1.3z" color="#000000" fill="#454748" style="block-progression:tb;text-indent:0;text-transform:none"/></g></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_fx_parameter_over.svg b/res/skins/LateNight/buttons/btn_fx_parameter_over.svg
deleted file mode 100644
index cc712a12b41f..000000000000
--- a/res/skins/LateNight/buttons/btn_fx_parameter_over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="40" height="17" version="1.1" viewBox="0 0 40 17" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><linearGradient id="a" x1="15.394" x2="15.394" y1="-13.848" y2="-3.0788" gradientTransform="translate(0 -1105.5)" gradientUnits="userSpaceOnUse"><stop stop-color="#7fcd03" offset="0"/><stop stop-color="#66a602" offset=".72857"/><stop stop-color="#508301" offset="1"/></linearGradient></defs><g transform="translate(0 -1105.5)"><rect transform="scale(1,-1)" x="2.5" y="-1120" width="35" height="12" rx="2" ry="2" color="#000000" fill="url(#a)"/><path d="m4 1107.5c-1.0994 0-2 .9006-2 2v9.0001c0 1.0994.90065 2 2 2h32c1.0994 0 2-.9006 2-2v-9.0001c0-1.0994-.90065-2-2-2zm.3 1h31.4c.56265 0 1.3.7374 1.3 1.3v8.4001c0 .5626-.73735 1.3-1.3 1.3h-31.4c-.56265 0-1.3-.7374-1.3-1.3v-8.4001c0-.5626.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="text-indent:0;text-transform:none"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_fx_parameter_overdown.svg b/res/skins/LateNight/buttons/btn_fx_parameter_overdown.svg
deleted file mode 100644
index 742fdef513d2..000000000000
--- a/res/skins/LateNight/buttons/btn_fx_parameter_overdown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="40" height="17" version="1.1" viewBox="0 0 40 17" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="matrix(1.5217 0 0 .52174 1.7391 -1655.7)" gradientUnits="userSpaceOnUse"><stop stop-color="#6baa11" offset="0"/><stop stop-color="#6eb606" offset=".28"/><stop stop-color="#487606" offset="1"/></linearGradient></defs><g transform="translate(0 -1105.5)"><rect transform="scale(1,-1)" x="2.5" y="-1120" width="35" height="12" rx="2" ry="2" color="#000000" fill="url(#a)"/><path d="m4 1107.5c-1.0994 0-2 .9006-2 2v9.0001c0 1.0994.90065 2 2 2h32c1.0994 0 2-.9006 2-2v-9.0001c0-1.0994-.90065-2-2-2zm.3 1h31.4c.56265 0 1.3.7374 1.3 1.3v8.4001c0 .5626-.73735 1.3-1.3 1.3h-31.4c-.56265 0-1.3-.7374-1.3-1.3v-8.4001c0-.5626.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="text-indent:0;text-transform:none"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_fx_sampler_collapse.svg b/res/skins/LateNight/buttons/btn_fx_sampler_collapse.svg
deleted file mode 100644
index 295ac8d1aae2..000000000000
--- a/res/skins/LateNight/buttons/btn_fx_sampler_collapse.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.1"
-   height="20"
-   width="20"
-   id="svg2">
-  <metadata
-     id="metadata15">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.1304,0,0,1,1.4348,-1026.4)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient6467">
-      <stop
-         offset="0"
-         stop-color="#242424"
-         id="stop3803-7" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop3805-5" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4724824,0,0,1,24.45704,-1032.8194)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient6467-3">
-      <stop
-         offset="0"
-         stop-color="#242424"
-         id="stop3803-7-6" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop3805-5-7" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.1304,0,0,1,-2.5652,-1028.4)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient6467-3-5">
-      <stop
-         offset="0"
-         stop-color="#242424"
-         id="stop3803-7-6-3" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop3805-5-7-5" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(0,-20)"
-       gradientUnits="userSpaceOnUse"
-       y2="10"
-       x2="20"
-       y1="10"
-       x1="0"
-       id="linearGradient836"
-       xlink:href="#linearGradient6467" />
-  </defs>
-  <g
-     id="layer2"
-     style="opacity:1">
-    <rect
-       transform="rotate(90)"
-       y="-20"
-       x="0"
-       height="20"
-       width="20"
-       id="rect828"
-       style="opacity:1;fill:url(#linearGradient836);fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
-    <path
-       style="fill:#bbbbbb;stroke-width:0.93992448"
-       d="M 14.425305,17.6358 10.000141,13.210541 5.5749765,17.6358 4.4686854,16.529414 l 5.5314556,-5.531549 5.531456,5.531549 z"
-       id="path20" />
-    <path
-       style="fill:#bbbbbb;stroke-width:0.93992448"
-       d="M 14.425305,2.3640014 10.000047,6.7892595 5.5747885,2.3640014 4.4684034,3.4703865 9.999953,9.0019358 15.531503,3.4703865 14.425118,2.3640014 Z"
-       id="path22" />
-  </g>
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_fx_sampler_expand.svg b/res/skins/LateNight/buttons/btn_fx_sampler_expand.svg
deleted file mode 100644
index 3e7d68c097e1..000000000000
--- a/res/skins/LateNight/buttons/btn_fx_sampler_expand.svg
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.1"
-   height="20"
-   width="20"
-   id="svg2">
-  <metadata
-     id="metadata15">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.1304,0,0,1,1.4348,-1026.4)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient6467">
-      <stop
-         offset="0"
-         stop-color="#242424"
-         id="stop3803-7" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop3805-5" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4724824,0,0,1,24.45704,-1032.8194)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient6467-3">
-      <stop
-         offset="0"
-         stop-color="#242424"
-         id="stop3803-7-6" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop3805-5-7" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.1304,0,0,1,-2.5652,-1028.4)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient6467-3-5">
-      <stop
-         offset="0"
-         stop-color="#242424"
-         id="stop3803-7-6-3" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop3805-5-7-5" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(0,-20)"
-       gradientUnits="userSpaceOnUse"
-       y2="10"
-       x2="20"
-       y1="10"
-       x1="0"
-       id="linearGradient836"
-       xlink:href="#linearGradient6467" />
-  </defs>
-  <g
-     id="layer2"
-     style="opacity:1">
-    <rect
-       transform="rotate(90)"
-       y="-20"
-       x="0"
-       height="20"
-       width="20"
-       id="rect828"
-       style="opacity:1;fill:url(#linearGradient836);fill-opacity:1.0;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
-    <g
-       transform="matrix(0.93992449,0,0,0.93992449,0.60075511,0.60074911)"
-       id="g840">
-      <path
-         id="path20"
-         d="m 14.70815,11.4378 -4.708,4.7081 -4.708,-4.7081 -1.177,1.1771 5.885,5.8851 5.885,-5.8851 z"
-         style="fill:#bbbbbb" />
-      <path
-         id="path22"
-         d="M 14.70815,8.562 10.00005,3.8539004 5.29195,8.562 4.11485,7.3849 9.99995,1.4998004 15.88505,7.3849 14.70795,8.562 Z"
-         style="fill:#bbbbbb" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_fx_selector.svg b/res/skins/LateNight/buttons/btn_fx_selector.svg
deleted file mode 100644
index e9f893aae2eb..000000000000
--- a/res/skins/LateNight/buttons/btn_fx_selector.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg3063" width="16" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path3065" d="m8 15.918 4.5715-7.9181h-9.143z" fill="#888"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_fx_selector_pressed.svg b/res/skins/LateNight/buttons/btn_fx_selector_pressed.svg
deleted file mode 100644
index bd5f89f39360..000000000000
--- a/res/skins/LateNight/buttons/btn_fx_selector_pressed.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg3063" width="16" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path3065" d="m8 15.918 4.5715-7.9181h-9.143z" fill="#bfbfbf"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_fx_selector_pressed_x2.svg b/res/skins/LateNight/buttons/btn_fx_selector_pressed_x2.svg
deleted file mode 100644
index 4b7db47eae73..000000000000
--- a/res/skins/LateNight/buttons/btn_fx_selector_pressed_x2.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg3063" width="32" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path3065" d="m16 31.836 9.143-15.836h-18.286z" fill="#888"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_fx_selector_x2.svg b/res/skins/LateNight/buttons/btn_fx_selector_x2.svg
deleted file mode 100644
index 57f6a8f8fec4..000000000000
--- a/res/skins/LateNight/buttons/btn_fx_selector_x2.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg3063" width="32" height="48" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path3065" d="m16 31.836 9.143-15.836h-18.286z" fill="#bfbfbf"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_fx_toggle.svg b/res/skins/LateNight/buttons/btn_fx_toggle.svg
deleted file mode 100644
index 986dbd854b2e..000000000000
--- a/res/skins/LateNight/buttons/btn_fx_toggle.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="30" height="30" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="matrix(1.087 0 0 1.087 1.9565 -1113.7)" gradientUnits="userSpaceOnUse"><stop stop-color="#242424" offset="0"/><stop stop-color="#101010" offset="1"/></linearGradient></defs><path d="m27.263 3.1936c.16756.31221.23765.67839.23766.9731v21.442c0 1.1431-.93572 2.1667-2.1667 2.1667h-21.167c-.79658 0-1.2985-.424-1.4917-.59546.17003.93933.76416 1.8197 1.8242 1.8197h21.979c1.108 0 2.022-.892 2.022-2l-.000235-22c-9e-6-.81658-.5387-1.4952-1.237-1.8065z" fill="#030303" opacity=".8"/><rect x="2.5" y="2.5" width="25" height="25" rx="2" ry="2" color="#000000" fill="url(#a)"/><path d="m4.1667 2c-1.191 0-2.1667.9757-2.1667 2.1667v21.667c0 1.1911.9757 2.1667 2.1667 2.1667h21.667c1.191 0 2.1667-.9756 2.1667-2.1667v-21.667c0-1.191-.9757-2.1667-2.1667-2.1667zm.325 1.0833h21.017c.60954 0 1.4083.7989 1.4083 1.4084v21.017c0 .6095-.7988 1.4084-1.4083 1.4084h-21.017c-.60954 0-1.4083-.7989-1.4083-1.4084v-21.017c0-.6095.7988-1.4084 1.4083-1.4084z" color="#000000" fill="#444" style="text-indent:0;text-transform:none"/><path d="m19.545 8.4-1.437 1.437c1.7154 1.0492 2.864 2.9336 2.864 5.0916 0 3.2966-2.6701 5.9668-5.9668 5.9668s-5.9668-2.6702-5.9668-5.9668c0-2.158 1.1486-4.0424 2.864-5.0916l-1.437-1.437c-2.0635 1.437-3.416 3.8236-3.416 6.5286 0 4.3955 3.5602 7.9556 7.9557 7.9556s7.9557-3.5601 7.9557-7.9556c0-2.705-1.3525-5.0916-3.416-6.5286z" fill="#d2d2d2"/><path d="m16 5h-1.9889v7h1.9889z" fill="#d2d2d2"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_fx_toggle_down.svg b/res/skins/LateNight/buttons/btn_fx_toggle_down.svg
deleted file mode 100644
index 3dba9876631a..000000000000
--- a/res/skins/LateNight/buttons/btn_fx_toggle_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg4867" width="30" height="30" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4869"><linearGradient id="linearGradient3807-3" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="matrix(1.087 0 0 1.087 1.9565 -91.292)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-6" stop-color="#222" offset="0"/><stop id="stop3805-5-2" stop-color="#131516" offset="1"/></linearGradient></defs><g id="layer1" transform="translate(0 -1022.4)"><rect id="rect3029" x="2.5" y="1024.9" width="25" height="25" rx="2" ry="2" color="#000000" fill="url(#linearGradient3807-3)"/><path id="rect3029-96-0" d="m4.1667 1024.4c-1.191 0-2.1667 0.9757-2.1667 2.1667v21.667c0 1.1911 0.9757 2.1667 2.1667 2.1667h21.667c1.191 0 2.1667-0.9756 2.1667-2.1667v-21.667c0-1.191-0.9757-2.1667-2.1667-2.1667zm0.325 1.0833h21.017c0.60954 0 1.4083 0.7989 1.4083 1.4084v21.017c0 0.6095-0.7988 1.4084-1.4083 1.4084h-21.017c-0.60954 0-1.4083-0.7989-1.4083-1.4084v-21.017c0-0.6095 0.7988-1.4084 1.4083-1.4084z" color="#000000" fill="#454748" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path6" d="m19.545 1030.8-1.437 1.437c1.7154 1.0492 2.864 2.9336 2.864 5.0916 0 3.2966-2.6701 5.9668-5.9668 5.9668s-5.9668-2.6702-5.9668-5.9668c0-2.158 1.1486-4.0424 2.864-5.0916l-1.437-1.437c-2.0635 1.437-3.416 3.8236-3.416 6.5286 0 4.3955 3.5602 7.9556 7.9557 7.9556s7.9557-3.5601 7.9557-7.9556c0-2.705-1.3525-5.0916-3.416-6.5286z" fill="#989898"/><path id="path2985-3" d="m16 1027.4h-1.9889v7h1.9889z" fill="#989898"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_fx_toggle_over.svg b/res/skins/LateNight/buttons/btn_fx_toggle_over.svg
deleted file mode 100644
index 08aa5f49fb6f..000000000000
--- a/res/skins/LateNight/buttons/btn_fx_toggle_over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="30" height="30" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="matrix(1.087,0,0,1.087,1.9565,-1143.6)" gradientUnits="userSpaceOnUse"><stop stop-color="#659f08" offset="0"/><stop stop-color="#5b9402" offset=".72857"/><stop stop-color="#456e05" offset="1"/></linearGradient></defs><rect transform="scale(1,-1)" x="2.5" y="-27.5" width="25" height="25" rx="2" ry="2" color="#000000" fill="url(#a)"/><path d="m4.1667 2c-1.191 0-2.1667.9757-2.1667 2.1667v21.667c0 1.1911.9757 2.1667 2.1667 2.1667h21.667c1.191 0 2.1667-.9756 2.1667-2.1667v-21.667c0-1.191-.9757-2.1667-2.1667-2.1667zm.325 1.0833h21.017c.60954 0 1.4083.7989 1.4083 1.4084v21.017c0 .6095-.7988 1.4084-1.4083 1.4084h-21.017c-.60954 0-1.4083-.7989-1.4083-1.4084v-21.017c0-.6095.7988-1.4084 1.4083-1.4084z" color="#000000" fill="#979797" style="text-indent:0;text-transform:none"/><path d="m19.545 8.4-1.437 1.437c1.7154 1.0492 2.864 2.9336 2.864 5.0916 0 3.2966-2.6701 5.9668-5.9668 5.9668s-5.9668-2.6702-5.9668-5.9668c0-2.158 1.1486-4.0424 2.864-5.0916l-1.437-1.437c-2.0635 1.437-3.416 3.8236-3.416 6.5286 0 4.3955 3.5602 7.9556 7.9557 7.9556s7.9557-3.5601 7.9557-7.9556c0-2.705-1.3525-5.0916-3.416-6.5286z" fill="#0e0e0e"/><path d="m16 5h-1.9889v7h1.9889z" fill="#0e0e0e"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_fx_toggle_overdown.svg b/res/skins/LateNight/buttons/btn_fx_toggle_overdown.svg
deleted file mode 100644
index 658e23140f8e..000000000000
--- a/res/skins/LateNight/buttons/btn_fx_toggle_overdown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg4867" width="30" height="30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs id="defs4869"><linearGradient id="linearGradient3807-3" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="matrix(1.087 0 0 1.087 1.9565 -2166)" gradientUnits="userSpaceOnUse" xlink:href="#linearGradient4817"/><linearGradient id="linearGradient4817"><stop id="stop4819" stop-color="#7fcd03" offset="0"/><stop id="stop4825" stop-color="#66a602" offset=".72857"/><stop id="stop4823" stop-color="#508301" offset="1"/></linearGradient><linearGradient id="linearGradient6887" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="matrix(.56522 0 0 .56522 2.2174 -1630.3)" gradientUnits="userSpaceOnUse" xlink:href="#linearGradient4817"/></defs><g id="layer1" transform="translate(0 -1022.4)"><rect id="rect3029" transform="scale(1,-1)" x="2.5" y="-1049.9" width="25" height="25" rx="2" ry="2" color="#000000" fill="url(#linearGradient3807-3)"/><path id="rect3029-96-0" d="m4.1667 1024.4c-1.191 0-2.1667 0.9757-2.1667 2.1667v21.667c0 1.1911 0.9757 2.1667 2.1667 2.1667h21.667c1.191 0 2.1667-0.9756 2.1667-2.1667v-21.667c0-1.191-0.9757-2.1667-2.1667-2.1667zm0.325 1.0833h21.017c0.60954 0 1.4083 0.7989 1.4083 1.4084v21.017c0 0.6095-0.7988 1.4084-1.4083 1.4084h-21.017c-0.60954 0-1.4083-0.7989-1.4083-1.4084v-21.017c0-0.6095 0.7988-1.4084 1.4083-1.4084z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path6" d="m19.545 1030.8-1.437 1.437c1.7154 1.0492 2.864 2.9336 2.864 5.0916 0 3.2966-2.6701 5.9668-5.9668 5.9668s-5.9668-2.6702-5.9668-5.9668c0-2.158 1.1486-4.0424 2.864-5.0916l-1.437-1.437c-2.0635 1.437-3.416 3.8236-3.416 6.5286 0 4.3955 3.5602 7.9556 7.9557 7.9556s7.9557-3.5601 7.9557-7.9556c0-2.705-1.3525-5.0916-3.416-6.5286z" fill="#131313"/><path id="path2985-3" d="m16 1027.4h-1.9889v7h1.9889z" fill="#131313"/><g id="layer1-6" transform="translate(37 -9)"><rect id="rect3029-0" transform="scale(1,-1)" x="2.5" y="-1049.9" width="13" height="13" color="#000000" fill="url(#linearGradient6887)" stroke="#979797"/></g></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_1_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_1_pressed.svg
deleted file mode 100644
index cc722861f4bd..000000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_1_pressed.svg
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg27"
-   version="1.1"
-   height="26"
-   width="26">
-  <metadata
-     id="metadata31">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs11">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-24,-24)"
-       y2="12"
-       y1="12"
-       x2="23.5"
-       x1=".5"
-       id="a">
-      <stop
-         id="stop2"
-         offset="0"
-         stop-opacity=".17647" />
-      <stop
-         id="stop4"
-         offset=".12672"
-         stop-opacity=".0047619" />
-      <stop
-         id="stop6"
-         offset=".54348"
-         stop-opacity="0" />
-      <stop
-         id="stop8"
-         offset="1"
-         stop-opacity=".47451" />
-    </linearGradient>
-  </defs>
-  <path
-     id="path13"
-     opacity=".5"
-     fill="#010101"
-     d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" />
-  <path
-     id="path15"
-     opacity=".8"
-     fill="#030303"
-     d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" />
-  <rect
-     color="#000000"
-     fill="url(#a)"
-     id="rect19"
-     ry="1.5"
-     rx="1.5"
-     height="23"
-     width="23"
-     y="-23.5"
-     x="-23.5"
-     transform="matrix(0,-1,-1,0,0,0)" />
-  <path
-     id="path21"
-     style="text-indent:0;text-transform:none"
-     fill="#c8c8c8"
-     color="#000000"
-     d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" />
-  <path
-     id="path23"
-     stroke-width="1.6"
-     stroke="#000"
-     fill="#dcdcdc"
-     d="m10 9h3v6h-2v-5h-1z" />
-  <path
-     id="path25"
-     fill="#fff"
-     d="m10 9h3v6h-2v-5h-1v-1" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_1_set.svg b/res/skins/LateNight/buttons/btn_hotcue_1_set.svg
deleted file mode 100644
index a12d32f44c83..000000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_1_set.svg
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg79"
-   version="1.1"
-   height="26"
-   width="26">
-  <metadata
-     id="metadata83">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs11">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-24)"
-       y2="12"
-       y1="12"
-       x2="23.5"
-       x1=".5"
-       id="a">
-      <stop
-         id="stop2"
-         offset="0"
-         stop-opacity=".17647" />
-      <stop
-         id="stop4"
-         offset=".12672"
-         stop-opacity=".0047619" />
-      <stop
-         id="stop6"
-         offset=".54348"
-         stop-opacity="0" />
-      <stop
-         id="stop8"
-         offset="1"
-         stop-opacity=".47451" />
-    </linearGradient>
-  </defs>
-  <path
-     style="opacity:0.8;fill:#030303"
-     id="path15"
-     d="m 23.31367,1.1758 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.965573 -2,1.965572 L 2,23.965572 c -0.6598637,-1e-6 -1.13567505,-0.352003 -1.325,-0.511743 0.20909416,0.790888 0.7641575,1.546141 1.8242,1.546141 h 20 c 1.108,0 2,-0.892 2,-2 v -20 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z" />
-  <rect
-     id="rect17"
-     fill="url(#a)"
-     color="#000000"
-     ry="1.5"
-     rx="1.5"
-     height="23"
-     width="23"
-     y="-23.5"
-     x=".5"
-     transform="rotate(90)" />
-  <path
-     id="path19"
-     style="text-indent:0;text-transform:none"
-     fill="#888888"
-     color="#000000"
-     d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" />
-  <path
-     id="path21"
-     stroke-width="1.6"
-     stroke="#000"
-     fill="#dcdcdc"
-     d="m10 9h3v6h-2v-5h-1z" />
-  <g
-     id="g29"
-     display="none">
-    <g
-       id="g27"
-       display="inline">
-      <path
-         id="path23"
-         fill="#323232"
-         d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-      <path
-         id="path25"
-         fill="#dcdcdc"
-         d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g37"
-     display="none">
-    <g
-       id="g35"
-       display="inline">
-      <path
-         id="path31"
-         fill="#323232"
-         d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-      <path
-         id="path33"
-         fill="#dcdcdc"
-         d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g45"
-     display="none">
-    <g
-       id="g43"
-       display="inline">
-      <path
-         id="path39"
-         fill="#323232"
-         d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" />
-      <path
-         id="path41"
-         fill="#dcdcdc"
-         d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" />
-    </g>
-  </g>
-  <g
-     id="g53"
-     display="none">
-    <g
-       id="g51"
-       display="inline">
-      <path
-         id="path47"
-         fill="#323232"
-         d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-      <path
-         id="path49"
-         fill="#dcdcdc"
-         d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-    </g>
-  </g>
-  <g
-     id="g61"
-     display="none">
-    <g
-       id="g59"
-       display="inline">
-      <path
-         id="path55"
-         fill="#323232"
-         d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-      <path
-         id="path57"
-         fill="#dcdcdc"
-         d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-    </g>
-  </g>
-  <g
-     id="g69"
-     display="none">
-    <g
-       id="g67"
-       display="inline">
-      <path
-         id="path63"
-         fill="#323232"
-         d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-      <path
-         id="path65"
-         fill="#dcdcdc"
-         d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-    </g>
-  </g>
-  <g
-     id="g75"
-     display="none">
-    <path
-       id="path71"
-       fill="#323232"
-       d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-    <path
-       id="path73"
-       fill="#dcdcdc"
-       d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-  </g>
-  <path
-     id="path77"
-     fill="#dcdcdc"
-     d="m10 9h3v6h-2v-5h-1v-1" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_1_unset.svg b/res/skins/LateNight/buttons/btn_hotcue_1_unset.svg
deleted file mode 100644
index 4b56cd16b06c..000000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_1_unset.svg
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg79"
-   version="1.1"
-   height="26"
-   width="26">
-  <metadata
-     id="metadata83">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs11">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-24)"
-       y2="12"
-       y1="12"
-       x2="23.5"
-       x1=".5"
-       id="a">
-      <stop
-         id="stop2"
-         offset="0"
-         stop-opacity=".17647" />
-      <stop
-         id="stop4"
-         offset=".12672"
-         stop-opacity=".0047619" />
-      <stop
-         id="stop6"
-         offset=".54348"
-         stop-opacity="0" />
-      <stop
-         id="stop8"
-         offset="1"
-         stop-opacity=".47451" />
-    </linearGradient>
-  </defs>
-  <path
-     style="opacity:0.8;fill:#030303"
-     id="path15"
-     d="m 23.31367,1.1758 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.965573 -2,1.965572 L 2,23.965572 c -0.6598637,-1e-6 -1.13567505,-0.352003 -1.325,-0.511743 0.20909416,0.790888 0.7641575,1.546141 1.8242,1.546141 h 20 c 1.108,0 2,-0.892 2,-2 v -20 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z" />
-  <rect
-     id="rect17"
-     fill="url(#a)"
-     color="#000000"
-     ry="1.5"
-     rx="1.5"
-     height="23"
-     width="23"
-     y="-23.5"
-     x=".5"
-     transform="rotate(90)" />
-  <path
-     id="path19"
-     style="color:#000000;text-indent:0;text-transform:none;fill:#444444"
-     d="M 2,0 C 0.9006,0 0,0.90065 0,2 v 20 c 0,1.0994 0.90065,2 2,2 h 20 c 1.0994,0 2,-0.90065 2,-2 V 2 C 24,0.9006 23.09935,0 22,0 Z M 2.3,1 H 21.7 C 22.26265,1 23,1.73735 23,2.3 V 21.7 C 23,22.26265 22.26265,23 21.7,23 H 2.3 C 1.73735,23 1,22.26265 1,21.7 V 2.3 C 1,1.73735 1.73735,1 2.3,1 Z" />
-  <path
-     id="path21"
-     stroke-width="1.6"
-     stroke="#000"
-     fill="#dcdcdc"
-     d="m10 9h3v6h-2v-5h-1z" />
-  <g
-     id="g29"
-     display="none">
-    <g
-       id="g27"
-       display="inline">
-      <path
-         id="path23"
-         fill="#323232"
-         d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-      <path
-         id="path25"
-         fill="#dcdcdc"
-         d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g37"
-     display="none">
-    <g
-       id="g35"
-       display="inline">
-      <path
-         id="path31"
-         fill="#323232"
-         d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-      <path
-         id="path33"
-         fill="#dcdcdc"
-         d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g45"
-     display="none">
-    <g
-       id="g43"
-       display="inline">
-      <path
-         id="path39"
-         fill="#323232"
-         d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" />
-      <path
-         id="path41"
-         fill="#dcdcdc"
-         d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" />
-    </g>
-  </g>
-  <g
-     id="g53"
-     display="none">
-    <g
-       id="g51"
-       display="inline">
-      <path
-         id="path47"
-         fill="#323232"
-         d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-      <path
-         id="path49"
-         fill="#dcdcdc"
-         d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-    </g>
-  </g>
-  <g
-     id="g61"
-     display="none">
-    <g
-       id="g59"
-       display="inline">
-      <path
-         id="path55"
-         fill="#323232"
-         d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-      <path
-         id="path57"
-         fill="#dcdcdc"
-         d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-    </g>
-  </g>
-  <g
-     id="g69"
-     display="none">
-    <g
-       id="g67"
-       display="inline">
-      <path
-         id="path63"
-         fill="#323232"
-         d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-      <path
-         id="path65"
-         fill="#dcdcdc"
-         d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-    </g>
-  </g>
-  <g
-     id="g75"
-     display="none">
-    <path
-       id="path71"
-       fill="#323232"
-       d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-    <path
-       id="path73"
-       fill="#dcdcdc"
-       d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-  </g>
-  <path
-     id="path77"
-     fill="#dcdcdc"
-     d="m10 9h3v6h-2v-5h-1v-1" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_2_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_2_pressed.svg
deleted file mode 100644
index 4a754c4269d8..000000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_2_pressed.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(-24,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="matrix(0,-1,-1,0,0,0)" x="-23.5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="text-indent:0;text-transform:none"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#fff"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_2_set.svg b/res/skins/LateNight/buttons/btn_hotcue_2_set.svg
deleted file mode 100644
index d156ebb87f75..000000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_2_set.svg
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg79"
-   version="1.1"
-   height="26"
-   width="26">
-  <metadata
-     id="metadata83">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs11">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-24)"
-       y2="12"
-       y1="12"
-       x2="23.5"
-       x1=".5"
-       id="a">
-      <stop
-         id="stop2"
-         offset="0"
-         stop-opacity=".17647" />
-      <stop
-         id="stop4"
-         offset=".12672"
-         stop-opacity=".0047619" />
-      <stop
-         id="stop6"
-         offset=".54348"
-         stop-opacity="0" />
-      <stop
-         id="stop8"
-         offset="1"
-         stop-opacity=".47451" />
-    </linearGradient>
-  </defs>
-  <path
-     style="opacity:0.8;fill:#030303"
-     id="path15"
-     d="m 23.31367,1.1758 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.965573 -2,1.965572 L 2,23.965572 c -0.6598637,-1e-6 -1.13567505,-0.352003 -1.325,-0.511743 0.20909416,0.790888 0.7641575,1.546141 1.8242,1.546141 h 20 c 1.108,0 2,-0.892 2,-2 v -20 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z" />
-  <rect
-     id="rect17"
-     fill="url(#a)"
-     color="#000000"
-     ry="1.5"
-     rx="1.5"
-     height="23"
-     width="23"
-     y="-23.5"
-     x=".5"
-     transform="rotate(90)" />
-  <path
-     id="path19"
-     style="text-indent:0;text-transform:none"
-     fill="#888888"
-     color="#000000"
-     d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" />
-  <g
-     id="g27"
-     display="none">
-    <g
-       id="g25"
-       display="inline">
-      <path
-         id="path21"
-         fill="#dcdcdc"
-         d="m10 9h3v6h-2v-5h-1v-1" />
-      <path
-         id="path23"
-         fill="#323232"
-         d="m13 10h1v6h-2v-1h1v-5" />
-    </g>
-  </g>
-  <path
-     id="path29"
-     stroke-width="1.6"
-     stroke="#000"
-     fill="#dcdcdc"
-     d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5z" />
-  <g
-     id="g37"
-     display="none">
-    <g
-       id="g35"
-       display="inline">
-      <path
-         id="path31"
-         fill="#323232"
-         d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-      <path
-         id="path33"
-         fill="#dcdcdc"
-         d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g45"
-     display="none">
-    <g
-       id="g43"
-       display="inline">
-      <path
-         id="path39"
-         fill="#323232"
-         d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" />
-      <path
-         id="path41"
-         fill="#dcdcdc"
-         d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" />
-    </g>
-  </g>
-  <g
-     id="g53"
-     display="none">
-    <g
-       id="g51"
-       display="inline">
-      <path
-         id="path47"
-         fill="#323232"
-         d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-      <path
-         id="path49"
-         fill="#dcdcdc"
-         d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-    </g>
-  </g>
-  <g
-     id="g61"
-     display="none">
-    <g
-       id="g59"
-       display="inline">
-      <path
-         id="path55"
-         fill="#323232"
-         d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-      <path
-         id="path57"
-         fill="#dcdcdc"
-         d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-    </g>
-  </g>
-  <g
-     id="g69"
-     display="none">
-    <g
-       id="g67"
-       display="inline">
-      <path
-         id="path63"
-         fill="#323232"
-         d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-      <path
-         id="path65"
-         fill="#dcdcdc"
-         d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-    </g>
-  </g>
-  <g
-     id="g75"
-     display="none">
-    <path
-       id="path71"
-       fill="#323232"
-       d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-    <path
-       id="path73"
-       fill="#dcdcdc"
-       d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-  </g>
-  <path
-     id="path77"
-     fill="#dcdcdc"
-     d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_2_unset.svg b/res/skins/LateNight/buttons/btn_hotcue_2_unset.svg
deleted file mode 100644
index 6f0d693f03b7..000000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_2_unset.svg
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg79"
-   version="1.1"
-   height="26"
-   width="26">
-  <metadata
-     id="metadata83">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs11">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-24)"
-       y2="12"
-       y1="12"
-       x2="23.5"
-       x1=".5"
-       id="a">
-      <stop
-         id="stop2"
-         offset="0"
-         stop-opacity=".17647" />
-      <stop
-         id="stop4"
-         offset=".12672"
-         stop-opacity=".0047619" />
-      <stop
-         id="stop6"
-         offset=".54348"
-         stop-opacity="0" />
-      <stop
-         id="stop8"
-         offset="1"
-         stop-opacity=".47451" />
-    </linearGradient>
-  </defs>
-  <rect
-     id="rect17"
-     fill="url(#a)"
-     color="#000000"
-     ry="1.5"
-     rx="1.5"
-     height="23"
-     width="23"
-     y="-23.5"
-     x=".5"
-     transform="rotate(90)" />
-  <g
-     id="g27"
-     display="none">
-    <g
-       id="g25"
-       display="inline">
-      <path
-         id="path21"
-         fill="#dcdcdc"
-         d="m10 9h3v6h-2v-5h-1v-1" />
-      <path
-         id="path23"
-         fill="#323232"
-         d="m13 10h1v6h-2v-1h1v-5" />
-    </g>
-  </g>
-  <path
-     id="path29"
-     stroke-width="1.6"
-     stroke="#000"
-     fill="#dcdcdc"
-     d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5z" />
-  <g
-     id="g37"
-     display="none">
-    <g
-       id="g35"
-       display="inline">
-      <path
-         id="path31"
-         fill="#323232"
-         d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-      <path
-         id="path33"
-         fill="#dcdcdc"
-         d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g45"
-     display="none">
-    <g
-       id="g43"
-       display="inline">
-      <path
-         id="path39"
-         fill="#323232"
-         d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" />
-      <path
-         id="path41"
-         fill="#dcdcdc"
-         d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" />
-    </g>
-  </g>
-  <g
-     id="g53"
-     display="none">
-    <g
-       id="g51"
-       display="inline">
-      <path
-         id="path47"
-         fill="#323232"
-         d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-      <path
-         id="path49"
-         fill="#dcdcdc"
-         d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-    </g>
-  </g>
-  <g
-     id="g61"
-     display="none">
-    <g
-       id="g59"
-       display="inline">
-      <path
-         id="path55"
-         fill="#323232"
-         d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-      <path
-         id="path57"
-         fill="#dcdcdc"
-         d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-    </g>
-  </g>
-  <g
-     id="g69"
-     display="none">
-    <g
-       id="g67"
-       display="inline">
-      <path
-         id="path63"
-         fill="#323232"
-         d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-      <path
-         id="path65"
-         fill="#dcdcdc"
-         d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-    </g>
-  </g>
-  <g
-     id="g75"
-     display="none">
-    <path
-       id="path71"
-       fill="#323232"
-       d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-    <path
-       id="path73"
-       fill="#dcdcdc"
-       d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-  </g>
-  <path
-     id="path77"
-     fill="#dcdcdc"
-     d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-  <path
-     style="opacity:0.8;fill:#030303"
-     id="path15"
-     d="m 23.31367,1.1758 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.965573 -2,1.965572 L 2,23.965572 c -0.6598637,-1e-6 -1.13567505,-0.352003 -1.325,-0.511743 0.20909416,0.790888 0.7641575,1.546141 1.8242,1.546141 h 20 c 1.108,0 2,-0.892 2,-2 v -20 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z" />
-  <path
-     id="path19"
-     style="color:#000000;text-indent:0;text-transform:none;fill:#444444"
-     d="M 2,0 C 0.9006,0 0,0.90065 0,2 v 20 c 0,1.0994 0.90065,2 2,2 h 20 c 1.0994,0 2,-0.90065 2,-2 V 2 C 24,0.9006 23.09935,0 22,0 Z M 2.3,1 H 21.7 C 22.26265,1 23,1.73735 23,2.3 V 21.7 C 23,22.26265 22.26265,23 21.7,23 H 2.3 C 1.73735,23 1,22.26265 1,21.7 V 2.3 C 1,1.73735 1.73735,1 2.3,1 Z" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_3_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_3_pressed.svg
deleted file mode 100644
index 5a3da3c3421c..000000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_3_pressed.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(-24,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="matrix(0,-1,-1,0,0,0)" x="-23.5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="text-indent:0;text-transform:none"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#fff"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_3_set.svg b/res/skins/LateNight/buttons/btn_hotcue_3_set.svg
deleted file mode 100644
index b2928a1fc559..000000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_3_set.svg
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg79"
-   version="1.1"
-   height="26"
-   width="26">
-  <metadata
-     id="metadata83">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs11">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-24)"
-       y2="12"
-       y1="12"
-       x2="23.5"
-       x1=".5"
-       id="a">
-      <stop
-         id="stop2"
-         offset="0"
-         stop-opacity=".17647" />
-      <stop
-         id="stop4"
-         offset=".12672"
-         stop-opacity=".0047619" />
-      <stop
-         id="stop6"
-         offset=".54348"
-         stop-opacity="0" />
-      <stop
-         id="stop8"
-         offset="1"
-         stop-opacity=".47451" />
-    </linearGradient>
-  </defs>
-  <path
-     style="opacity:0.8;fill:#030303"
-     id="path15"
-     d="m 23.31367,1.1758 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.965573 -2,1.965572 L 2,23.965572 c -0.6598637,-1e-6 -1.13567505,-0.352003 -1.325,-0.511743 0.20909416,0.790888 0.7641575,1.546141 1.8242,1.546141 h 20 c 1.108,0 2,-0.892 2,-2 v -20 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z" />
-  <rect
-     id="rect17"
-     fill="url(#a)"
-     color="#000000"
-     ry="1.5"
-     rx="1.5"
-     height="23"
-     width="23"
-     y="-23.5"
-     x=".5"
-     transform="rotate(90)" />
-  <path
-     id="path19"
-     style="text-indent:0;text-transform:none"
-     fill="#888888"
-     color="#000000"
-     d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" />
-  <g
-     id="g27"
-     display="none">
-    <g
-       id="g25"
-       display="inline">
-      <path
-         id="path21"
-         fill="#dcdcdc"
-         d="m10 9h3v6h-2v-5h-1v-1" />
-      <path
-         id="path23"
-         fill="#323232"
-         d="m13 10h1v6h-2v-1h1v-5" />
-    </g>
-  </g>
-  <g
-     id="g35"
-     display="none">
-    <g
-       id="g33"
-       display="inline">
-      <path
-         id="path29"
-         fill="#323232"
-         d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-      <path
-         id="path31"
-         fill="#dcdcdc"
-         d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-    </g>
-  </g>
-  <path
-     id="path37"
-     stroke-width="1.6"
-     stroke="#000"
-     fill="#dcdcdc"
-     d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5z" />
-  <g
-     id="g45"
-     display="none">
-    <g
-       id="g43"
-       display="inline">
-      <path
-         id="path39"
-         fill="#323232"
-         d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" />
-      <path
-         id="path41"
-         fill="#dcdcdc"
-         d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" />
-    </g>
-  </g>
-  <g
-     id="g53"
-     display="none">
-    <g
-       id="g51"
-       display="inline">
-      <path
-         id="path47"
-         fill="#323232"
-         d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-      <path
-         id="path49"
-         fill="#dcdcdc"
-         d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-    </g>
-  </g>
-  <g
-     id="g61"
-     display="none">
-    <g
-       id="g59"
-       display="inline">
-      <path
-         id="path55"
-         fill="#323232"
-         d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-      <path
-         id="path57"
-         fill="#dcdcdc"
-         d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-    </g>
-  </g>
-  <g
-     id="g69"
-     display="none">
-    <g
-       id="g67"
-       display="inline">
-      <path
-         id="path63"
-         fill="#323232"
-         d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-      <path
-         id="path65"
-         fill="#dcdcdc"
-         d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-    </g>
-  </g>
-  <g
-     id="g75"
-     display="none">
-    <path
-       id="path71"
-       fill="#323232"
-       d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-    <path
-       id="path73"
-       fill="#dcdcdc"
-       d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-  </g>
-  <path
-     id="path77"
-     fill="#dcdcdc"
-     d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_3_unset.svg b/res/skins/LateNight/buttons/btn_hotcue_3_unset.svg
deleted file mode 100644
index 0b31031e5c93..000000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_3_unset.svg
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg79"
-   version="1.1"
-   height="26"
-   width="26">
-  <metadata
-     id="metadata83">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs11">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-24)"
-       y2="12"
-       y1="12"
-       x2="23.5"
-       x1=".5"
-       id="a">
-      <stop
-         id="stop2"
-         offset="0"
-         stop-opacity=".17647" />
-      <stop
-         id="stop4"
-         offset=".12672"
-         stop-opacity=".0047619" />
-      <stop
-         id="stop6"
-         offset=".54348"
-         stop-opacity="0" />
-      <stop
-         id="stop8"
-         offset="1"
-         stop-opacity=".47451" />
-    </linearGradient>
-  </defs>
-  <rect
-     id="rect17"
-     fill="url(#a)"
-     color="#000000"
-     ry="1.5"
-     rx="1.5"
-     height="23"
-     width="23"
-     y="-23.5"
-     x=".5"
-     transform="rotate(90)" />
-  <g
-     id="g27"
-     display="none">
-    <g
-       id="g25"
-       display="inline">
-      <path
-         id="path21"
-         fill="#dcdcdc"
-         d="m10 9h3v6h-2v-5h-1v-1" />
-      <path
-         id="path23"
-         fill="#323232"
-         d="m13 10h1v6h-2v-1h1v-5" />
-    </g>
-  </g>
-  <g
-     id="g35"
-     display="none">
-    <g
-       id="g33"
-       display="inline">
-      <path
-         id="path29"
-         fill="#323232"
-         d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-      <path
-         id="path31"
-         fill="#dcdcdc"
-         d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-    </g>
-  </g>
-  <path
-     id="path37"
-     stroke-width="1.6"
-     stroke="#000"
-     fill="#dcdcdc"
-     d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5z" />
-  <g
-     id="g45"
-     display="none">
-    <g
-       id="g43"
-       display="inline">
-      <path
-         id="path39"
-         fill="#323232"
-         d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" />
-      <path
-         id="path41"
-         fill="#dcdcdc"
-         d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" />
-    </g>
-  </g>
-  <g
-     id="g53"
-     display="none">
-    <g
-       id="g51"
-       display="inline">
-      <path
-         id="path47"
-         fill="#323232"
-         d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-      <path
-         id="path49"
-         fill="#dcdcdc"
-         d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-    </g>
-  </g>
-  <g
-     id="g61"
-     display="none">
-    <g
-       id="g59"
-       display="inline">
-      <path
-         id="path55"
-         fill="#323232"
-         d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-      <path
-         id="path57"
-         fill="#dcdcdc"
-         d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-    </g>
-  </g>
-  <g
-     id="g69"
-     display="none">
-    <g
-       id="g67"
-       display="inline">
-      <path
-         id="path63"
-         fill="#323232"
-         d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-      <path
-         id="path65"
-         fill="#dcdcdc"
-         d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-    </g>
-  </g>
-  <g
-     id="g75"
-     display="none">
-    <path
-       id="path71"
-       fill="#323232"
-       d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-    <path
-       id="path73"
-       fill="#dcdcdc"
-       d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-  </g>
-  <path
-     id="path77"
-     fill="#dcdcdc"
-     d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-  <path
-     style="opacity:0.8;fill:#030303"
-     id="path15"
-     d="m 23.31367,1.1758 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.965573 -2,1.965572 L 2,23.965572 c -0.6598637,-1e-6 -1.13567505,-0.352003 -1.325,-0.511743 0.20909416,0.790888 0.7641575,1.546141 1.8242,1.546141 h 20 c 1.108,0 2,-0.892 2,-2 v -20 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z" />
-  <path
-     id="path19"
-     style="color:#000000;text-indent:0;text-transform:none;fill:#444444"
-     d="M 2,0 C 0.9006,0 0,0.90065 0,2 v 20 c 0,1.0994 0.90065,2 2,2 h 20 c 1.0994,0 2,-0.90065 2,-2 V 2 C 24,0.9006 23.09935,0 22,0 Z M 2.3,1 H 21.7 C 22.26265,1 23,1.73735 23,2.3 V 21.7 C 23,22.26265 22.26265,23 21.7,23 H 2.3 C 1.73735,23 1,22.26265 1,21.7 V 2.3 C 1,1.73735 1.73735,1 2.3,1 Z" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_4_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_4_pressed.svg
deleted file mode 100644
index bd4d900f2eed..000000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_4_pressed.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(-24,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="matrix(0,-1,-1,0,0,0)" x="-23.5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="text-indent:0;text-transform:none"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#fff"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_4_set.svg b/res/skins/LateNight/buttons/btn_hotcue_4_set.svg
deleted file mode 100644
index 6b0339e4cab1..000000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_4_set.svg
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg79"
-   version="1.1"
-   height="26"
-   width="26">
-  <metadata
-     id="metadata83">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs11">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-24)"
-       y2="12"
-       y1="12"
-       x2="23.5"
-       x1=".5"
-       id="a">
-      <stop
-         id="stop2"
-         offset="0"
-         stop-opacity=".17647" />
-      <stop
-         id="stop4"
-         offset=".12672"
-         stop-opacity=".0047619" />
-      <stop
-         id="stop6"
-         offset=".54348"
-         stop-opacity="0" />
-      <stop
-         id="stop8"
-         offset="1"
-         stop-opacity=".47451" />
-    </linearGradient>
-  </defs>
-  <path
-     style="opacity:0.8;fill:#030303"
-     id="path15"
-     d="m 23.31367,1.1758 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.965573 -2,1.965572 L 2,23.965572 c -0.6598637,-1e-6 -1.13567505,-0.352003 -1.325,-0.511743 0.20909416,0.790888 0.7641575,1.546141 1.8242,1.546141 h 20 c 1.108,0 2,-0.892 2,-2 v -20 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z" />
-  <rect
-     id="rect17"
-     fill="url(#a)"
-     color="#000000"
-     ry="1.5"
-     rx="1.5"
-     height="23"
-     width="23"
-     y="-23.5"
-     x=".5"
-     transform="rotate(90)" />
-  <path
-     id="path19"
-     style="text-indent:0;text-transform:none"
-     fill="#888888"
-     color="#000000"
-     d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" />
-  <g
-     id="g27"
-     display="none">
-    <g
-       id="g25"
-       display="inline">
-      <path
-         id="path21"
-         fill="#dcdcdc"
-         d="m10 9h3v6h-2v-5h-1v-1" />
-      <path
-         id="path23"
-         fill="#323232"
-         d="m13 10h1v6h-2v-1h1v-5" />
-    </g>
-  </g>
-  <g
-     id="g35"
-     display="none">
-    <g
-       id="g33"
-       display="inline">
-      <path
-         id="path29"
-         fill="#323232"
-         d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-      <path
-         id="path31"
-         fill="#dcdcdc"
-         d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g43"
-     display="none">
-    <g
-       id="g41"
-       display="inline">
-      <path
-         id="path37"
-         fill="#323232"
-         d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-      <path
-         id="path39"
-         fill="#dcdcdc"
-         d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-    </g>
-  </g>
-  <path
-     id="path45"
-     stroke-width="1.6"
-     stroke="#000"
-     fill="#dcdcdc"
-     d="m9 10v3h5v2h2v-6h-2v3h-3v-2z" />
-  <g
-     id="g53"
-     display="none">
-    <g
-       id="g51"
-       display="inline">
-      <path
-         id="path47"
-         fill="#323232"
-         d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-      <path
-         id="path49"
-         fill="#dcdcdc"
-         d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-    </g>
-  </g>
-  <g
-     id="g61"
-     display="none">
-    <g
-       id="g59"
-       display="inline">
-      <path
-         id="path55"
-         fill="#323232"
-         d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-      <path
-         id="path57"
-         fill="#dcdcdc"
-         d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-    </g>
-  </g>
-  <g
-     id="g69"
-     display="none">
-    <g
-       id="g67"
-       display="inline">
-      <path
-         id="path63"
-         fill="#323232"
-         d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-      <path
-         id="path65"
-         fill="#dcdcdc"
-         d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-    </g>
-  </g>
-  <g
-     id="g75"
-     display="none">
-    <path
-       id="path71"
-       fill="#323232"
-       d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-    <path
-       id="path73"
-       fill="#dcdcdc"
-       d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-  </g>
-  <path
-     id="path77"
-     fill="#dcdcdc"
-     d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_4_unset.svg b/res/skins/LateNight/buttons/btn_hotcue_4_unset.svg
deleted file mode 100644
index 481319c8cf33..000000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_4_unset.svg
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg79"
-   version="1.1"
-   height="26"
-   width="26">
-  <metadata
-     id="metadata83">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs11">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-24)"
-       y2="12"
-       y1="12"
-       x2="23.5"
-       x1=".5"
-       id="a">
-      <stop
-         id="stop2"
-         offset="0"
-         stop-opacity=".17647" />
-      <stop
-         id="stop4"
-         offset=".12672"
-         stop-opacity=".0047619" />
-      <stop
-         id="stop6"
-         offset=".54348"
-         stop-opacity="0" />
-      <stop
-         id="stop8"
-         offset="1"
-         stop-opacity=".47451" />
-    </linearGradient>
-  </defs>
-  <rect
-     id="rect17"
-     fill="url(#a)"
-     color="#000000"
-     ry="1.5"
-     rx="1.5"
-     height="23"
-     width="23"
-     y="-23.5"
-     x=".5"
-     transform="rotate(90)" />
-  <g
-     id="g27"
-     display="none">
-    <g
-       id="g25"
-       display="inline">
-      <path
-         id="path21"
-         fill="#dcdcdc"
-         d="m10 9h3v6h-2v-5h-1v-1" />
-      <path
-         id="path23"
-         fill="#323232"
-         d="m13 10h1v6h-2v-1h1v-5" />
-    </g>
-  </g>
-  <g
-     id="g35"
-     display="none">
-    <g
-       id="g33"
-       display="inline">
-      <path
-         id="path29"
-         fill="#323232"
-         d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-      <path
-         id="path31"
-         fill="#dcdcdc"
-         d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g43"
-     display="none">
-    <g
-       id="g41"
-       display="inline">
-      <path
-         id="path37"
-         fill="#323232"
-         d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-      <path
-         id="path39"
-         fill="#dcdcdc"
-         d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-    </g>
-  </g>
-  <path
-     id="path45"
-     stroke-width="1.6"
-     stroke="#000"
-     fill="#dcdcdc"
-     d="m9 10v3h5v2h2v-6h-2v3h-3v-2z" />
-  <g
-     id="g53"
-     display="none">
-    <g
-       id="g51"
-       display="inline">
-      <path
-         id="path47"
-         fill="#323232"
-         d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-      <path
-         id="path49"
-         fill="#dcdcdc"
-         d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-    </g>
-  </g>
-  <g
-     id="g61"
-     display="none">
-    <g
-       id="g59"
-       display="inline">
-      <path
-         id="path55"
-         fill="#323232"
-         d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-      <path
-         id="path57"
-         fill="#dcdcdc"
-         d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-    </g>
-  </g>
-  <g
-     id="g69"
-     display="none">
-    <g
-       id="g67"
-       display="inline">
-      <path
-         id="path63"
-         fill="#323232"
-         d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-      <path
-         id="path65"
-         fill="#dcdcdc"
-         d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-    </g>
-  </g>
-  <g
-     id="g75"
-     display="none">
-    <path
-       id="path71"
-       fill="#323232"
-       d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-    <path
-       id="path73"
-       fill="#dcdcdc"
-       d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-  </g>
-  <path
-     id="path77"
-     fill="#dcdcdc"
-     d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" />
-  <path
-     style="opacity:0.8;fill:#030303"
-     id="path15"
-     d="m 23.31367,1.1758 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.965573 -2,1.965572 L 2,23.965572 c -0.6598637,-1e-6 -1.13567505,-0.352003 -1.325,-0.511743 0.20909416,0.790888 0.7641575,1.546141 1.8242,1.546141 h 20 c 1.108,0 2,-0.892 2,-2 v -20 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z" />
-  <path
-     id="path19"
-     style="color:#000000;text-indent:0;text-transform:none;fill:#444444"
-     d="M 2,0 C 0.9006,0 0,0.90065 0,2 v 20 c 0,1.0994 0.90065,2 2,2 h 20 c 1.0994,0 2,-0.90065 2,-2 V 2 C 24,0.9006 23.09935,0 22,0 Z M 2.3,1 H 21.7 C 22.26265,1 23,1.73735 23,2.3 V 21.7 C 23,22.26265 22.26265,23 21.7,23 H 2.3 C 1.73735,23 1,22.26265 1,21.7 V 2.3 C 1,1.73735 1.73735,1 2.3,1 Z" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_5_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_5_pressed.svg
deleted file mode 100644
index 8ae9bcee64c0..000000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_5_pressed.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs>
-<linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(-24,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient>
-</defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="matrix(0,-1,-1,0,0,0)" x="-23.5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="text-indent:0;text-transform:none"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#fff"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_5_set.svg b/res/skins/LateNight/buttons/btn_hotcue_5_set.svg
deleted file mode 100644
index b05e0df437af..000000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_5_set.svg
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg79"
-   version="1.1"
-   height="26"
-   width="26">
-  <metadata
-     id="metadata83">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs11">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-24)"
-       y2="12"
-       y1="12"
-       x2="23.5"
-       x1=".5"
-       id="a">
-      <stop
-         id="stop2"
-         offset="0"
-         stop-opacity=".17647" />
-      <stop
-         id="stop4"
-         offset=".12672"
-         stop-opacity=".0047619" />
-      <stop
-         id="stop6"
-         offset=".54348"
-         stop-opacity="0" />
-      <stop
-         id="stop8"
-         offset="1"
-         stop-opacity=".47451" />
-    </linearGradient>
-  </defs>
-  <path
-     style="opacity:0.8;fill:#030303"
-     id="path15"
-     d="m 23.31367,1.1758 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.965573 -2,1.965572 L 2,23.965572 c -0.6598637,-1e-6 -1.13567505,-0.352003 -1.325,-0.511743 0.20909416,0.790888 0.7641575,1.546141 1.8242,1.546141 h 20 c 1.108,0 2,-0.892 2,-2 v -20 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z" />
-  <rect
-     id="rect17"
-     fill="url(#a)"
-     color="#000000"
-     ry="1.5"
-     rx="1.5"
-     height="23"
-     width="23"
-     y="-23.5"
-     x=".5"
-     transform="rotate(90)" />
-  <path
-     id="path19"
-     style="text-indent:0;text-transform:none"
-     fill="#888888"
-     color="#000000"
-     d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" />
-  <g
-     id="g27"
-     display="none">
-    <g
-       id="g25"
-       display="inline">
-      <path
-         id="path21"
-         fill="#dcdcdc"
-         d="m10 9h3v6h-2v-5h-1v-1" />
-      <path
-         id="path23"
-         fill="#323232"
-         d="m13 10h1v6h-2v-1h1v-5" />
-    </g>
-  </g>
-  <g
-     id="g35"
-     display="none">
-    <g
-       id="g33"
-       display="inline">
-      <path
-         id="path29"
-         fill="#323232"
-         d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-      <path
-         id="path31"
-         fill="#dcdcdc"
-         d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g43"
-     display="none">
-    <g
-       id="g41"
-       display="inline">
-      <path
-         id="path37"
-         fill="#323232"
-         d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-      <path
-         id="path39"
-         fill="#dcdcdc"
-         d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g51"
-     display="none">
-    <g
-       id="g49"
-       display="inline">
-      <path
-         id="path45"
-         fill="#323232"
-         d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" />
-      <path
-         id="path47"
-         fill="#dcdcdc"
-         d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" />
-    </g>
-  </g>
-  <path
-     id="path53"
-     stroke-width="1.6"
-     stroke="#000"
-     fill="#dcdcdc"
-     d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5z" />
-  <g
-     id="g61"
-     display="none">
-    <g
-       id="g59"
-       display="inline">
-      <path
-         id="path55"
-         fill="#323232"
-         d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-      <path
-         id="path57"
-         fill="#dcdcdc"
-         d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-    </g>
-  </g>
-  <g
-     id="g69"
-     display="none">
-    <g
-       id="g67"
-       display="inline">
-      <path
-         id="path63"
-         fill="#323232"
-         d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-      <path
-         id="path65"
-         fill="#dcdcdc"
-         d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-    </g>
-  </g>
-  <g
-     id="g75"
-     display="none">
-    <path
-       id="path71"
-       fill="#323232"
-       d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-    <path
-       id="path73"
-       fill="#dcdcdc"
-       d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-  </g>
-  <path
-     id="path77"
-     fill="#dcdcdc"
-     d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_5_unset.svg b/res/skins/LateNight/buttons/btn_hotcue_5_unset.svg
deleted file mode 100644
index 22921cc5ac21..000000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_5_unset.svg
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg79"
-   version="1.1"
-   height="26"
-   width="26">
-  <metadata
-     id="metadata83">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs11">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-24)"
-       y2="12"
-       y1="12"
-       x2="23.5"
-       x1=".5"
-       id="a">
-      <stop
-         id="stop2"
-         offset="0"
-         stop-opacity=".17647" />
-      <stop
-         id="stop4"
-         offset=".12672"
-         stop-opacity=".0047619" />
-      <stop
-         id="stop6"
-         offset=".54348"
-         stop-opacity="0" />
-      <stop
-         id="stop8"
-         offset="1"
-         stop-opacity=".47451" />
-    </linearGradient>
-  </defs>
-  <rect
-     id="rect17"
-     fill="url(#a)"
-     color="#000000"
-     ry="1.5"
-     rx="1.5"
-     height="23"
-     width="23"
-     y="-23.5"
-     x=".5"
-     transform="rotate(90)" />
-  <g
-     id="g27"
-     display="none">
-    <g
-       id="g25"
-       display="inline">
-      <path
-         id="path21"
-         fill="#dcdcdc"
-         d="m10 9h3v6h-2v-5h-1v-1" />
-      <path
-         id="path23"
-         fill="#323232"
-         d="m13 10h1v6h-2v-1h1v-5" />
-    </g>
-  </g>
-  <g
-     id="g35"
-     display="none">
-    <g
-       id="g33"
-       display="inline">
-      <path
-         id="path29"
-         fill="#323232"
-         d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-      <path
-         id="path31"
-         fill="#dcdcdc"
-         d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g43"
-     display="none">
-    <g
-       id="g41"
-       display="inline">
-      <path
-         id="path37"
-         fill="#323232"
-         d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-      <path
-         id="path39"
-         fill="#dcdcdc"
-         d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g51"
-     display="none">
-    <g
-       id="g49"
-       display="inline">
-      <path
-         id="path45"
-         fill="#323232"
-         d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" />
-      <path
-         id="path47"
-         fill="#dcdcdc"
-         d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" />
-    </g>
-  </g>
-  <path
-     id="path53"
-     stroke-width="1.6"
-     stroke="#000"
-     fill="#dcdcdc"
-     d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5z" />
-  <g
-     id="g61"
-     display="none">
-    <g
-       id="g59"
-       display="inline">
-      <path
-         id="path55"
-         fill="#323232"
-         d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-      <path
-         id="path57"
-         fill="#dcdcdc"
-         d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-    </g>
-  </g>
-  <g
-     id="g69"
-     display="none">
-    <g
-       id="g67"
-       display="inline">
-      <path
-         id="path63"
-         fill="#323232"
-         d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-      <path
-         id="path65"
-         fill="#dcdcdc"
-         d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-    </g>
-  </g>
-  <g
-     id="g75"
-     display="none">
-    <path
-       id="path71"
-       fill="#323232"
-       d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-    <path
-       id="path73"
-       fill="#dcdcdc"
-       d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-  </g>
-  <path
-     id="path77"
-     fill="#dcdcdc"
-     d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-  <path
-     style="opacity:0.8;fill:#030303"
-     id="path15"
-     d="m 23.31367,1.1758 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.965573 -2,1.965572 L 2,23.965572 c -0.6598637,-1e-6 -1.13567505,-0.352003 -1.325,-0.511743 0.20909416,0.790888 0.7641575,1.546141 1.8242,1.546141 h 20 c 1.108,0 2,-0.892 2,-2 v -20 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z" />
-  <path
-     id="path19"
-     style="color:#000000;text-indent:0;text-transform:none;fill:#444444"
-     d="M 2,0 C 0.9006,0 0,0.90065 0,2 v 20 c 0,1.0994 0.90065,2 2,2 h 20 c 1.0994,0 2,-0.90065 2,-2 V 2 C 24,0.9006 23.09935,0 22,0 Z M 2.3,1 H 21.7 C 22.26265,1 23,1.73735 23,2.3 V 21.7 C 23,22.26265 22.26265,23 21.7,23 H 2.3 C 1.73735,23 1,22.26265 1,21.7 V 2.3 C 1,1.73735 1.73735,1 2.3,1 Z" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_6_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_6_pressed.svg
deleted file mode 100644
index 51830c72b5f7..000000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_6_pressed.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(-24,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="matrix(0,-1,-1,0,0,0)" x="-23.5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="text-indent:0;text-transform:none"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#fff"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_6_set.svg b/res/skins/LateNight/buttons/btn_hotcue_6_set.svg
deleted file mode 100644
index dcd3f2cf2f53..000000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_6_set.svg
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg79"
-   version="1.1"
-   height="26"
-   width="26">
-  <metadata
-     id="metadata83">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs11">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-24)"
-       y2="12"
-       y1="12"
-       x2="23.5"
-       x1=".5"
-       id="a">
-      <stop
-         id="stop2"
-         offset="0"
-         stop-opacity=".17647" />
-      <stop
-         id="stop4"
-         offset=".12672"
-         stop-opacity=".0047619" />
-      <stop
-         id="stop6"
-         offset=".54348"
-         stop-opacity="0" />
-      <stop
-         id="stop8"
-         offset="1"
-         stop-opacity=".47451" />
-    </linearGradient>
-  </defs>
-  <path
-     style="opacity:0.8;fill:#030303"
-     id="path15"
-     d="m 23.31367,1.1758 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.965573 -2,1.965572 L 2,23.965572 c -0.6598637,-1e-6 -1.13567505,-0.352003 -1.325,-0.511743 0.20909416,0.790888 0.7641575,1.546141 1.8242,1.546141 h 20 c 1.108,0 2,-0.892 2,-2 v -20 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z" />
-  <rect
-     id="rect17"
-     fill="url(#a)"
-     color="#000000"
-     ry="1.5"
-     rx="1.5"
-     height="23"
-     width="23"
-     y="-23.5"
-     x=".5"
-     transform="rotate(90)" />
-  <path
-     id="path19"
-     style="text-indent:0;text-transform:none"
-     fill="#888888"
-     color="#000000"
-     d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" />
-  <g
-     id="g27"
-     display="none">
-    <g
-       id="g25"
-       display="inline">
-      <path
-         id="path21"
-         fill="#dcdcdc"
-         d="m10 9h3v6h-2v-5h-1v-1" />
-      <path
-         id="path23"
-         fill="#323232"
-         d="m13 10h1v6h-2v-1h1v-5" />
-    </g>
-  </g>
-  <g
-     id="g35"
-     display="none">
-    <g
-       id="g33"
-       display="inline">
-      <path
-         id="path29"
-         fill="#323232"
-         d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-      <path
-         id="path31"
-         fill="#dcdcdc"
-         d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g43"
-     display="none">
-    <g
-       id="g41"
-       display="inline">
-      <path
-         id="path37"
-         fill="#323232"
-         d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-      <path
-         id="path39"
-         fill="#dcdcdc"
-         d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g51"
-     display="none">
-    <g
-       id="g49"
-       display="inline">
-      <path
-         id="path45"
-         fill="#323232"
-         d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" />
-      <path
-         id="path47"
-         fill="#dcdcdc"
-         d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" />
-    </g>
-  </g>
-  <g
-     id="g59"
-     display="none">
-    <g
-       id="g57"
-       display="inline">
-      <path
-         id="path53"
-         fill="#323232"
-         d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-      <path
-         id="path55"
-         fill="#dcdcdc"
-         d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-    </g>
-  </g>
-  <path
-     id="path61"
-     stroke-width="1.6"
-     stroke="#000"
-     fill="#dcdcdc"
-     d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-  <g
-     id="g69"
-     display="none">
-    <g
-       id="g67"
-       display="inline">
-      <path
-         id="path63"
-         fill="#323232"
-         d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-      <path
-         id="path65"
-         fill="#dcdcdc"
-         d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-    </g>
-  </g>
-  <g
-     id="g75"
-     display="none">
-    <path
-       id="path71"
-       fill="#323232"
-       d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-    <path
-       id="path73"
-       fill="#dcdcdc"
-       d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-  </g>
-  <path
-     id="path77"
-     fill="#dcdcdc"
-     d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_6_unset.svg b/res/skins/LateNight/buttons/btn_hotcue_6_unset.svg
deleted file mode 100644
index 5d721eb9b3d5..000000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_6_unset.svg
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg79"
-   version="1.1"
-   height="26"
-   width="26">
-  <metadata
-     id="metadata83">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs11">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-24)"
-       y2="12"
-       y1="12"
-       x2="23.5"
-       x1=".5"
-       id="a">
-      <stop
-         id="stop2"
-         offset="0"
-         stop-opacity=".17647" />
-      <stop
-         id="stop4"
-         offset=".12672"
-         stop-opacity=".0047619" />
-      <stop
-         id="stop6"
-         offset=".54348"
-         stop-opacity="0" />
-      <stop
-         id="stop8"
-         offset="1"
-         stop-opacity=".47451" />
-    </linearGradient>
-  </defs>
-  <rect
-     id="rect17"
-     fill="url(#a)"
-     color="#000000"
-     ry="1.5"
-     rx="1.5"
-     height="23"
-     width="23"
-     y="-23.5"
-     x=".5"
-     transform="rotate(90)" />
-  <g
-     id="g27"
-     display="none">
-    <g
-       id="g25"
-       display="inline">
-      <path
-         id="path21"
-         fill="#dcdcdc"
-         d="m10 9h3v6h-2v-5h-1v-1" />
-      <path
-         id="path23"
-         fill="#323232"
-         d="m13 10h1v6h-2v-1h1v-5" />
-    </g>
-  </g>
-  <g
-     id="g35"
-     display="none">
-    <g
-       id="g33"
-       display="inline">
-      <path
-         id="path29"
-         fill="#323232"
-         d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-      <path
-         id="path31"
-         fill="#dcdcdc"
-         d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g43"
-     display="none">
-    <g
-       id="g41"
-       display="inline">
-      <path
-         id="path37"
-         fill="#323232"
-         d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-      <path
-         id="path39"
-         fill="#dcdcdc"
-         d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g51"
-     display="none">
-    <g
-       id="g49"
-       display="inline">
-      <path
-         id="path45"
-         fill="#323232"
-         d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" />
-      <path
-         id="path47"
-         fill="#dcdcdc"
-         d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" />
-    </g>
-  </g>
-  <g
-     id="g59"
-     display="none">
-    <g
-       id="g57"
-       display="inline">
-      <path
-         id="path53"
-         fill="#323232"
-         d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-      <path
-         id="path55"
-         fill="#dcdcdc"
-         d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-    </g>
-  </g>
-  <path
-     id="path61"
-     stroke-width="1.6"
-     stroke="#000"
-     fill="#dcdcdc"
-     d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-  <g
-     id="g69"
-     display="none">
-    <g
-       id="g67"
-       display="inline">
-      <path
-         id="path63"
-         fill="#323232"
-         d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-      <path
-         id="path65"
-         fill="#dcdcdc"
-         d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-    </g>
-  </g>
-  <g
-     id="g75"
-     display="none">
-    <path
-       id="path71"
-       fill="#323232"
-       d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-    <path
-       id="path73"
-       fill="#dcdcdc"
-       d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-  </g>
-  <path
-     id="path77"
-     fill="#dcdcdc"
-     d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-  <path
-     style="opacity:0.8;fill:#030303"
-     id="path15"
-     d="m 23.31367,1.1758 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.965573 -2,1.965572 L 2,23.965572 c -0.6598637,-1e-6 -1.13567505,-0.352003 -1.325,-0.511743 0.20909416,0.790888 0.7641575,1.546141 1.8242,1.546141 h 20 c 1.108,0 2,-0.892 2,-2 v -20 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z" />
-  <path
-     id="path19"
-     style="color:#000000;text-indent:0;text-transform:none;fill:#444444"
-     d="M 2,0 C 0.9006,0 0,0.90065 0,2 v 20 c 0,1.0994 0.90065,2 2,2 h 20 c 1.0994,0 2,-0.90065 2,-2 V 2 C 24,0.9006 23.09935,0 22,0 Z M 2.3,1 H 21.7 C 22.26265,1 23,1.73735 23,2.3 V 21.7 C 23,22.26265 22.26265,23 21.7,23 H 2.3 C 1.73735,23 1,22.26265 1,21.7 V 2.3 C 1,1.73735 1.73735,1 2.3,1 Z" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_7_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_7_pressed.svg
deleted file mode 100644
index 9e000236295c..000000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_7_pressed.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(-24,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="matrix(0,-1,-1,0,0,0)" x="-23.5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="text-indent:0;text-transform:none"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#fff"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_7_set.svg b/res/skins/LateNight/buttons/btn_hotcue_7_set.svg
deleted file mode 100644
index 1287b3f120f0..000000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_7_set.svg
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg79"
-   version="1.1"
-   height="26"
-   width="26">
-  <metadata
-     id="metadata83">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs11">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-24)"
-       y2="12"
-       y1="12"
-       x2="23.5"
-       x1=".5"
-       id="a">
-      <stop
-         id="stop2"
-         offset="0"
-         stop-opacity=".17647" />
-      <stop
-         id="stop4"
-         offset=".12672"
-         stop-opacity=".0047619" />
-      <stop
-         id="stop6"
-         offset=".54348"
-         stop-opacity="0" />
-      <stop
-         id="stop8"
-         offset="1"
-         stop-opacity=".47451" />
-    </linearGradient>
-  </defs>
-  <path
-     style="opacity:0.8;fill:#030303"
-     id="path15"
-     d="m 23.31367,1.1758 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.965573 -2,1.965572 L 2,23.965572 c -0.6598637,-1e-6 -1.13567505,-0.352003 -1.325,-0.511743 0.20909416,0.790888 0.7641575,1.546141 1.8242,1.546141 h 20 c 1.108,0 2,-0.892 2,-2 v -20 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z" />
-  <rect
-     id="rect17"
-     fill="url(#a)"
-     color="#000000"
-     ry="1.5"
-     rx="1.5"
-     height="23"
-     width="23"
-     y="-23.5"
-     x=".5"
-     transform="rotate(90)" />
-  <path
-     id="path19"
-     style="text-indent:0;text-transform:none"
-     fill="#888888"
-     color="#000000"
-     d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" />
-  <g
-     id="g27"
-     display="none">
-    <g
-       id="g25"
-       display="inline">
-      <path
-         id="path21"
-         fill="#dcdcdc"
-         d="m10 9h3v6h-2v-5h-1v-1" />
-      <path
-         id="path23"
-         fill="#323232"
-         d="m13 10h1v6h-2v-1h1v-5" />
-    </g>
-  </g>
-  <g
-     id="g35"
-     display="none">
-    <g
-       id="g33"
-       display="inline">
-      <path
-         id="path29"
-         fill="#323232"
-         d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-      <path
-         id="path31"
-         fill="#dcdcdc"
-         d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g43"
-     display="none">
-    <g
-       id="g41"
-       display="inline">
-      <path
-         id="path37"
-         fill="#323232"
-         d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-      <path
-         id="path39"
-         fill="#dcdcdc"
-         d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g51"
-     display="none">
-    <g
-       id="g49"
-       display="inline">
-      <path
-         id="path45"
-         fill="#323232"
-         d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" />
-      <path
-         id="path47"
-         fill="#dcdcdc"
-         d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" />
-    </g>
-  </g>
-  <g
-     id="g59"
-     display="none">
-    <g
-       id="g57"
-       display="inline">
-      <path
-         id="path53"
-         fill="#323232"
-         d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-      <path
-         id="path55"
-         fill="#dcdcdc"
-         d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-    </g>
-  </g>
-  <g
-     id="g67"
-     display="none">
-    <g
-       id="g65"
-       display="inline">
-      <path
-         id="path61"
-         fill="#323232"
-         d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-      <path
-         id="path63"
-         fill="#dcdcdc"
-         d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-    </g>
-  </g>
-  <path
-     id="path69"
-     stroke-width="1.6"
-     stroke="#000"
-     fill="#dcdcdc"
-     d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4z" />
-  <g
-     id="g75"
-     display="none">
-    <path
-       id="path71"
-       fill="#323232"
-       d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-    <path
-       id="path73"
-       fill="#dcdcdc"
-       d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-  </g>
-  <path
-     id="path77"
-     fill="#dcdcdc"
-     d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_7_unset.svg b/res/skins/LateNight/buttons/btn_hotcue_7_unset.svg
deleted file mode 100644
index e1be8aa04c1b..000000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_7_unset.svg
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg79"
-   version="1.1"
-   height="26"
-   width="26">
-  <metadata
-     id="metadata83">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs11">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-24)"
-       y2="12"
-       y1="12"
-       x2="23.5"
-       x1=".5"
-       id="a">
-      <stop
-         id="stop2"
-         offset="0"
-         stop-opacity=".17647" />
-      <stop
-         id="stop4"
-         offset=".12672"
-         stop-opacity=".0047619" />
-      <stop
-         id="stop6"
-         offset=".54348"
-         stop-opacity="0" />
-      <stop
-         id="stop8"
-         offset="1"
-         stop-opacity=".47451" />
-    </linearGradient>
-  </defs>
-  <rect
-     id="rect17"
-     fill="url(#a)"
-     color="#000000"
-     ry="1.5"
-     rx="1.5"
-     height="23"
-     width="23"
-     y="-23.5"
-     x=".5"
-     transform="rotate(90)" />
-  <g
-     id="g27"
-     display="none">
-    <g
-       id="g25"
-       display="inline">
-      <path
-         id="path21"
-         fill="#dcdcdc"
-         d="m10 9h3v6h-2v-5h-1v-1" />
-      <path
-         id="path23"
-         fill="#323232"
-         d="m13 10h1v6h-2v-1h1v-5" />
-    </g>
-  </g>
-  <g
-     id="g35"
-     display="none">
-    <g
-       id="g33"
-       display="inline">
-      <path
-         id="path29"
-         fill="#323232"
-         d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-      <path
-         id="path31"
-         fill="#dcdcdc"
-         d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g43"
-     display="none">
-    <g
-       id="g41"
-       display="inline">
-      <path
-         id="path37"
-         fill="#323232"
-         d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-      <path
-         id="path39"
-         fill="#dcdcdc"
-         d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g51"
-     display="none">
-    <g
-       id="g49"
-       display="inline">
-      <path
-         id="path45"
-         fill="#323232"
-         d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" />
-      <path
-         id="path47"
-         fill="#dcdcdc"
-         d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" />
-    </g>
-  </g>
-  <g
-     id="g59"
-     display="none">
-    <g
-       id="g57"
-       display="inline">
-      <path
-         id="path53"
-         fill="#323232"
-         d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-      <path
-         id="path55"
-         fill="#dcdcdc"
-         d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-    </g>
-  </g>
-  <g
-     id="g67"
-     display="none">
-    <g
-       id="g65"
-       display="inline">
-      <path
-         id="path61"
-         fill="#323232"
-         d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-      <path
-         id="path63"
-         fill="#dcdcdc"
-         d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-    </g>
-  </g>
-  <path
-     id="path69"
-     stroke-width="1.6"
-     stroke="#000"
-     fill="#dcdcdc"
-     d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4z" />
-  <g
-     id="g75"
-     display="none">
-    <path
-       id="path71"
-       fill="#323232"
-       d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-    <path
-       id="path73"
-       fill="#dcdcdc"
-       d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-  </g>
-  <path
-     id="path77"
-     fill="#dcdcdc"
-     d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-  <path
-     style="opacity:0.8;fill:#030303"
-     id="path15"
-     d="m 23.31367,1.1758 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.965573 -2,1.965572 L 2,23.965572 c -0.6598637,-1e-6 -1.13567505,-0.352003 -1.325,-0.511743 0.20909416,0.790888 0.7641575,1.546141 1.8242,1.546141 h 20 c 1.108,0 2,-0.892 2,-2 v -20 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z" />
-  <path
-     id="path19"
-     style="color:#000000;text-indent:0;text-transform:none;fill:#444444"
-     d="M 2,0 C 0.9006,0 0,0.90065 0,2 v 20 c 0,1.0994 0.90065,2 2,2 h 20 c 1.0994,0 2,-0.90065 2,-2 V 2 C 24,0.9006 23.09935,0 22,0 Z M 2.3,1 H 21.7 C 22.26265,1 23,1.73735 23,2.3 V 21.7 C 23,22.26265 22.26265,23 21.7,23 H 2.3 C 1.73735,23 1,22.26265 1,21.7 V 2.3 C 1,1.73735 1.73735,1 2.3,1 Z" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_8_pressed.svg b/res/skins/LateNight/buttons/btn_hotcue_8_pressed.svg
deleted file mode 100644
index 0f3e0c55af4b..000000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_8_pressed.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(-24,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m24.82 2.1797c.11293.25091.17969.52638.17969.82031v20c0 1.108-.892 2-2 2h-20c-.29393 0-.5694-.06676-.82031-.17969.31276.69491 1.0062 1.1797 1.8203 1.1797h20c1.108 0 2-.892 2-2v-20c0-.81407-.48477-1.5075-1.1797-1.8203z" fill="#010101" opacity=".5"/><path d="m23.814 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 2-2 2h-20c-.2947 0-.5716-.06963-.82422-.18555.31134.69838 1.0076 1.1855 1.8242 1.1855h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="matrix(0,-1,-1,0,0,0)" x="-23.5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="text-indent:0;text-transform:none"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc" stroke="#000" stroke-width="1.6"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#fff"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_8_set.svg b/res/skins/LateNight/buttons/btn_hotcue_8_set.svg
deleted file mode 100644
index ca731af321f5..000000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_8_set.svg
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg81"
-   version="1.1"
-   height="26"
-   width="26">
-  <metadata
-     id="metadata85">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs11">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-24)"
-       y2="12"
-       y1="12"
-       x2="23.5"
-       x1=".5"
-       id="a">
-      <stop
-         id="stop2"
-         offset="0"
-         stop-opacity=".17647" />
-      <stop
-         id="stop4"
-         offset=".12672"
-         stop-opacity=".0047619" />
-      <stop
-         id="stop6"
-         offset=".54348"
-         stop-opacity="0" />
-      <stop
-         id="stop8"
-         offset="1"
-         stop-opacity=".47451" />
-    </linearGradient>
-  </defs>
-  <path
-     style="opacity:0.8;fill:#030303"
-     id="path15"
-     d="m 23.31367,1.1758 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.965573 -2,1.965572 L 2,23.965572 c -0.6598637,-1e-6 -1.13567505,-0.352003 -1.325,-0.511743 0.20909416,0.790888 0.7641575,1.546141 1.8242,1.546141 h 20 c 1.108,0 2,-0.892 2,-2 v -20 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z" />
-  <rect
-     id="rect17"
-     fill="url(#a)"
-     color="#000000"
-     ry="1.5"
-     rx="1.5"
-     height="23"
-     width="23"
-     y="-23.5"
-     x=".5"
-     transform="rotate(90)" />
-  <path
-     id="path19"
-     style="text-indent:0;text-transform:none"
-     fill="#888888"
-     color="#000000"
-     d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" />
-  <g
-     id="g27"
-     display="none">
-    <g
-       id="g25"
-       display="inline">
-      <path
-         id="path21"
-         fill="#dcdcdc"
-         d="m10 9h3v6h-2v-5h-1v-1" />
-      <path
-         id="path23"
-         fill="#323232"
-         d="m13 10h1v6h-2v-1h1v-5" />
-    </g>
-  </g>
-  <g
-     id="g35"
-     display="none">
-    <g
-       id="g33"
-       display="inline">
-      <path
-         id="path29"
-         fill="#323232"
-         d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-      <path
-         id="path31"
-         fill="#dcdcdc"
-         d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g43"
-     display="none">
-    <g
-       id="g41"
-       display="inline">
-      <path
-         id="path37"
-         fill="#323232"
-         d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-      <path
-         id="path39"
-         fill="#dcdcdc"
-         d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g51"
-     display="none">
-    <g
-       id="g49"
-       display="inline">
-      <path
-         id="path45"
-         fill="#323232"
-         d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" />
-      <path
-         id="path47"
-         fill="#dcdcdc"
-         d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" />
-    </g>
-  </g>
-  <g
-     id="g59"
-     display="none">
-    <g
-       id="g57"
-       display="inline">
-      <path
-         id="path53"
-         fill="#323232"
-         d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-      <path
-         id="path55"
-         fill="#dcdcdc"
-         d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-    </g>
-  </g>
-  <g
-     id="g67"
-     display="none">
-    <g
-       id="g65"
-       display="inline">
-      <path
-         id="path61"
-         fill="#323232"
-         d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-      <path
-         id="path63"
-         fill="#dcdcdc"
-         d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-    </g>
-  </g>
-  <g
-     id="g75"
-     display="none">
-    <g
-       id="g73"
-       display="inline">
-      <path
-         id="path69"
-         fill="#323232"
-         d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-      <path
-         id="path71"
-         fill="#dcdcdc"
-         d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-    </g>
-  </g>
-  <path
-     id="path77"
-     stroke-width="1.6"
-     stroke="#000"
-     fill="#dcdcdc"
-     d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-  <path
-     id="path79"
-     fill="#dcdcdc"
-     d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_hotcue_8_unset.svg b/res/skins/LateNight/buttons/btn_hotcue_8_unset.svg
deleted file mode 100644
index 74db86db3dfe..000000000000
--- a/res/skins/LateNight/buttons/btn_hotcue_8_unset.svg
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg81"
-   version="1.1"
-   height="26"
-   width="26">
-  <metadata
-     id="metadata85">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs11">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-24)"
-       y2="12"
-       y1="12"
-       x2="23.5"
-       x1=".5"
-       id="a">
-      <stop
-         id="stop2"
-         offset="0"
-         stop-opacity=".17647" />
-      <stop
-         id="stop4"
-         offset=".12672"
-         stop-opacity=".0047619" />
-      <stop
-         id="stop6"
-         offset=".54348"
-         stop-opacity="0" />
-      <stop
-         id="stop8"
-         offset="1"
-         stop-opacity=".47451" />
-    </linearGradient>
-  </defs>
-  <path
-     style="opacity:0.8;fill:#030303"
-     id="path15"
-     d="m 23.31367,1.1758 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.965573 -2,1.965572 L 2,23.965572 c -0.6598637,-1e-6 -1.13567505,-0.352003 -1.325,-0.511743 0.20909416,0.790888 0.7641575,1.546141 1.8242,1.546141 h 20 c 1.108,0 2,-0.892 2,-2 v -20 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z" />
-  <rect
-     id="rect17"
-     fill="url(#a)"
-     color="#000000"
-     ry="1.5"
-     rx="1.5"
-     height="23"
-     width="23"
-     y="-23.5"
-     x=".5"
-     transform="rotate(90)" />
-  <g
-     id="g27"
-     display="none">
-    <g
-       id="g25"
-       display="inline">
-      <path
-         id="path21"
-         fill="#dcdcdc"
-         d="m10 9h3v6h-2v-5h-1v-1" />
-      <path
-         id="path23"
-         fill="#323232"
-         d="m13 10h1v6h-2v-1h1v-5" />
-    </g>
-  </g>
-  <g
-     id="g35"
-     display="none">
-    <g
-       id="g33"
-       display="inline">
-      <path
-         id="path29"
-         fill="#323232"
-         d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-      <path
-         id="path31"
-         fill="#dcdcdc"
-         d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g43"
-     display="none">
-    <g
-       id="g41"
-       display="inline">
-      <path
-         id="path37"
-         fill="#323232"
-         d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-      <path
-         id="path39"
-         fill="#dcdcdc"
-         d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g51"
-     display="none">
-    <g
-       id="g49"
-       display="inline">
-      <path
-         id="path45"
-         fill="#323232"
-         d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" />
-      <path
-         id="path47"
-         fill="#dcdcdc"
-         d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" />
-    </g>
-  </g>
-  <g
-     id="g59"
-     display="none">
-    <g
-       id="g57"
-       display="inline">
-      <path
-         id="path53"
-         fill="#323232"
-         d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-      <path
-         id="path55"
-         fill="#dcdcdc"
-         d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-    </g>
-  </g>
-  <g
-     id="g67"
-     display="none">
-    <g
-       id="g65"
-       display="inline">
-      <path
-         id="path61"
-         fill="#323232"
-         d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-      <path
-         id="path63"
-         fill="#dcdcdc"
-         d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-    </g>
-  </g>
-  <g
-     id="g75"
-     display="none">
-    <g
-       id="g73"
-       display="inline">
-      <path
-         id="path69"
-         fill="#323232"
-         d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-      <path
-         id="path71"
-         fill="#dcdcdc"
-         d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-    </g>
-  </g>
-  <path
-     id="path77"
-     stroke-width="1.6"
-     stroke="#000"
-     fill="#dcdcdc"
-     d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-  <path
-     id="path79"
-     fill="#dcdcdc"
-     d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-  <path
-     id="path19"
-     style="color:#000000;text-indent:0;text-transform:none;fill:#444444"
-     d="M 2,0 C 0.9006,0 0,0.90065 0,2 v 20 c 0,1.0994 0.90065,2 2,2 h 20 c 1.0994,0 2,-0.90065 2,-2 V 2 C 24,0.9006 23.09935,0 22,0 Z M 2.3,1 H 21.7 C 22.26265,1 23,1.73735 23,2.3 V 21.7 C 23,22.26265 22.26265,23 21.7,23 H 2.3 C 1.73735,23 1,22.26265 1,21.7 V 2.3 C 1,1.73735 1.73735,1 2.3,1 Z" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_intro_end.svg b/res/skins/LateNight/buttons/btn_intro_end.svg
deleted file mode 100644
index 6e34f8413c4a..000000000000
--- a/res/skins/LateNight/buttons/btn_intro_end.svg
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg79"
-   version="1.1"
-   height="26"
-   width="26">
-  <metadata
-     id="metadata83">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs11">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-24)"
-       y2="12"
-       y1="12"
-       x2="23.5"
-       x1=".5"
-       id="a">
-      <stop
-         id="stop2"
-         offset="0"
-         stop-opacity=".17647" />
-      <stop
-         id="stop4"
-         offset=".12672"
-         stop-opacity=".0047619" />
-      <stop
-         id="stop6"
-         offset=".54348"
-         stop-opacity="0" />
-      <stop
-         id="stop8"
-         offset="1"
-         stop-opacity=".47451" />
-    </linearGradient>
-  </defs>
-  <path
-     d="m 23.31367,1.1758 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.965573 -2,1.965572 L 2,23.965572 c -0.6598637,-1e-6 -1.13567505,-0.352003 -1.325,-0.511743 0.20909416,0.790888 0.7641575,1.546141 1.8242,1.546141 h 20 c 1.108,0 2,-0.892 2,-2 v -20 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z"
-     id="path15"
-     style="opacity:0.8;fill:#030303" />
-  <rect
-     id="rect17"
-     fill="url(#a)"
-     color="#000000"
-     ry="1.5"
-     rx="1.5"
-     height="23"
-     width="23"
-     y="-23.5"
-     x=".5"
-     transform="rotate(90)" />
-  <path
-     id="path19"
-     style="text-indent:0;text-transform:none"
-     fill="#444444"
-     color="#000000"
-     d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" />
-  <g
-     id="g27"
-     display="none">
-    <g
-       id="g25"
-       display="inline">
-      <path
-         id="path21"
-         fill="#323232"
-         d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-      <path
-         id="path23"
-         fill="#dcdcdc"
-         d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g35"
-     display="none">
-    <g
-       id="g33"
-       display="inline">
-      <path
-         id="path29"
-         fill="#323232"
-         d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-      <path
-         id="path31"
-         fill="#dcdcdc"
-         d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g43"
-     display="none">
-    <g
-       id="g41"
-       display="inline">
-      <path
-         id="path37"
-         fill="#323232"
-         d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" />
-      <path
-         id="path39"
-         fill="#dcdcdc"
-         d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" />
-    </g>
-  </g>
-  <g
-     id="g51"
-     display="none">
-    <g
-       id="g49"
-       display="inline">
-      <path
-         id="path45"
-         fill="#323232"
-         d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-      <path
-         id="path47"
-         fill="#dcdcdc"
-         d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-    </g>
-  </g>
-  <g
-     id="g59"
-     display="none">
-    <g
-       id="g57"
-       display="inline">
-      <path
-         id="path53"
-         fill="#323232"
-         d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-      <path
-         id="path55"
-         fill="#dcdcdc"
-         d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-    </g>
-  </g>
-  <g
-     id="g67"
-     display="none">
-    <g
-       id="g65"
-       display="inline">
-      <path
-         id="path61"
-         fill="#323232"
-         d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-      <path
-         id="path63"
-         fill="#dcdcdc"
-         d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-    </g>
-  </g>
-  <g
-     id="g73"
-     display="none">
-    <path
-       id="path69"
-       fill="#323232"
-       d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-    <path
-       id="path71"
-       fill="#dcdcdc"
-       d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-  </g>
-  <rect
-     id="rect75"
-     style="paint-order:markers fill stroke"
-     fill="#bfbfbf"
-     height="10"
-     width="2"
-     y="7"
-     x="-18"
-     transform="scale(-1,1)" />
-  <path
-     id="path77"
-     fill="#bfbfbf"
-     d="m5 17 9-10v10z" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_intro_end_pressed.svg b/res/skins/LateNight/buttons/btn_intro_end_pressed.svg
deleted file mode 100644
index 54c4c2f3a3e5..000000000000
--- a/res/skins/LateNight/buttons/btn_intro_end_pressed.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(-24,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><rect transform="matrix(0,-1,-1,0,0,0)" x="-23.5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><g><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#c8c8c8" style="text-indent:0;text-transform:none"/><rect transform="scale(-1,1)" x="-18" y="7" width="2" height="10" fill="#b4b4b4" style="paint-order:markers fill stroke"/><path d="m5 17 9-10v10z" fill="#b4b4b4"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_intro_start.svg b/res/skins/LateNight/buttons/btn_intro_start.svg
deleted file mode 100644
index f2481874ee60..000000000000
--- a/res/skins/LateNight/buttons/btn_intro_start.svg
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg79"
-   version="1.1"
-   height="26"
-   width="26">
-  <metadata
-     id="metadata83">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs11">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-24)"
-       y2="12"
-       y1="12"
-       x2="23.5"
-       x1=".5"
-       id="a">
-      <stop
-         id="stop2"
-         offset="0"
-         stop-opacity=".17647" />
-      <stop
-         id="stop4"
-         offset=".12672"
-         stop-opacity=".0047619" />
-      <stop
-         id="stop6"
-         offset=".54348"
-         stop-opacity="0" />
-      <stop
-         id="stop8"
-         offset="1"
-         stop-opacity=".47451" />
-    </linearGradient>
-  </defs>
-  <path
-     d="m 23.31367,1.1758 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.965573 -2,1.965572 L 2,23.965572 c -0.6598637,-1e-6 -1.13567505,-0.352003 -1.325,-0.511743 0.20909416,0.790888 0.7641575,1.546141 1.8242,1.546141 h 20 c 1.108,0 2,-0.892 2,-2 v -20 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z"
-     id="path15"
-     style="opacity:0.8;fill:#030303" />
-  <rect
-     id="rect17"
-     fill="url(#a)"
-     color="#000000"
-     ry="1.5"
-     rx="1.5"
-     height="23"
-     width="23"
-     y="-23.5"
-     x=".5"
-     transform="rotate(90)" />
-  <path
-     id="path19"
-     style="text-indent:0;text-transform:none"
-     fill="#444444"
-     color="#000000"
-     d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" />
-  <g
-     id="g27"
-     display="none">
-    <g
-       id="g25"
-       display="inline">
-      <path
-         id="path21"
-         fill="#323232"
-         d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-      <path
-         id="path23"
-         fill="#dcdcdc"
-         d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g35"
-     display="none">
-    <g
-       id="g33"
-       display="inline">
-      <path
-         id="path29"
-         fill="#323232"
-         d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-      <path
-         id="path31"
-         fill="#dcdcdc"
-         d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g43"
-     display="none">
-    <g
-       id="g41"
-       display="inline">
-      <path
-         id="path37"
-         fill="#323232"
-         d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" />
-      <path
-         id="path39"
-         fill="#dcdcdc"
-         d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" />
-    </g>
-  </g>
-  <g
-     id="g51"
-     display="none">
-    <g
-       id="g49"
-       display="inline">
-      <path
-         id="path45"
-         fill="#323232"
-         d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-      <path
-         id="path47"
-         fill="#dcdcdc"
-         d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-    </g>
-  </g>
-  <g
-     id="g59"
-     display="none">
-    <g
-       id="g57"
-       display="inline">
-      <path
-         id="path53"
-         fill="#323232"
-         d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-      <path
-         id="path55"
-         fill="#dcdcdc"
-         d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-    </g>
-  </g>
-  <g
-     id="g67"
-     display="none">
-    <g
-       id="g65"
-       display="inline">
-      <path
-         id="path61"
-         fill="#323232"
-         d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-      <path
-         id="path63"
-         fill="#dcdcdc"
-         d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-    </g>
-  </g>
-  <g
-     id="g73"
-     display="none">
-    <path
-       id="path69"
-       fill="#323232"
-       d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-    <path
-       id="path71"
-       fill="#dcdcdc"
-       d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-  </g>
-  <rect
-     id="rect75"
-     style="paint-order:markers fill stroke"
-     fill="#bfbfbf"
-     height="10"
-     width="2"
-     y="7"
-     x="6" />
-  <path
-     id="path77"
-     fill="#bfbfbf"
-     d="m9 17 9-10v10z" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_intro_start_pressed.svg b/res/skins/LateNight/buttons/btn_intro_start_pressed.svg
deleted file mode 100644
index bb9409e12e9c..000000000000
--- a/res/skins/LateNight/buttons/btn_intro_start_pressed.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(-24,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><rect transform="matrix(0,-1,-1,0,0,0)" x="-23.5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><g><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#c8c8c8" style="text-indent:0;text-transform:none"/><rect x="6" y="7" width="2" height="10" fill="#b4b4b4" style="paint-order:markers fill stroke"/><path d="m9 17 9-10v10z" fill="#b4b4b4"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_keylock.svg b/res/skins/LateNight/buttons/btn_keylock.svg
deleted file mode 100644
index 3d6aacb306ca..000000000000
--- a/res/skins/LateNight/buttons/btn_keylock.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="25" height="18" version="1.1" viewBox="0 0 25 18" xmlns="http://www.w3.org/2000/svg"><path id="rect4195" d="m12.5 3c-1.933 0-3.5 1.567-3.5 3.5v1.5h-2v7h11v-7h-2v-1.5c0-1.933-1.567-3.5-3.5-3.5zm0 2c0.82843 0 1.5 0.67157 1.5 1.5v1.5h-3v-1.5c0-0.82843 0.67157-1.5 1.5-1.5zm-0.5 5h1v3h-1v-3z" color="#000000" fill="#585858"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_keylock_over.svg b/res/skins/LateNight/buttons/btn_keylock_over.svg
deleted file mode 100644
index d3d16cf2a9b7..000000000000
--- a/res/skins/LateNight/buttons/btn_keylock_over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="25" height="18" version="1.1" viewBox="0 0 25 18" xmlns="http://www.w3.org/2000/svg"><path id="rect4195" d="m12.5 3c-1.933 0-3.5 1.567-3.5 3.5v1.5h-2v7h11v-7h-2v-1.5c0-1.933-1.567-3.5-3.5-3.5zm0 2c0.82843 0 1.5 0.67157 1.5 1.5v1.5h-3v-1.5c0-0.82843 0.67157-1.5 1.5-1.5zm-0.5 5h1v3h-1v-3z" color="#000000" fill="#f0bb2b"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_loop.svg b/res/skins/LateNight/buttons/btn_loop.svg
deleted file mode 100644
index 1af89644dea2..000000000000
--- a/res/skins/LateNight/buttons/btn_loop.svg
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="26"
-   width="26"
-   id="svg14046">
-  <metadata
-     id="metadata18">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs14056">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0 -1026.4)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient3807-3">
-      <stop
-         offset="0"
-         stop-color="#242424"
-         id="stop3803-7" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop3805-5" />
-    </linearGradient>
-  </defs>
-  <rect
-     style="color:#000000;opacity:0.72000002"
-     ry="2"
-     rx="2"
-     height="24"
-     width="24"
-     y="1"
-     x="0.5"
-     id="rect3029-6-6" />
-  <rect
-     fill="url(#linearGradient3807-3)"
-     color="#000000"
-     ry="2"
-     rx="2"
-     height="23"
-     width="23"
-     y=".49998"
-     x=".5"
-     id="rect3029" />
-  <g
-     fill="#060606"
-     id="g3463">
-    <path
-       color="#000000"
-       d="m5.0002 9.1879 1.4999 1.1561-2.5e-4 6.6559c-2.15e-5 0.57129 0.92882 1.5001 1.5001 1.5001l7-6.2e-5v-3l7 3.75-7 3.75v-3l-7 6.3e-5c-1.6447 1.4e-5 -3-1.3553-3-3z"
-       id="path14050-36" />
-    <path
-       color="#000000"
-       d="m21 16.812-1.4999-1.1561 2.5e-4 -6.6559c2.5e-5 -0.66867-0.78276-1.5001-1.5001-1.5001l-7 6.24e-5v3l-7-3.75 7-3.75v3l7-6.25e-5c1.6447-1.47e-5 3 1.3553 3 3z"
-       id="path14050-3-7" />
-  </g>
-  <path
-     fill="#bfbfbf"
-     color="#000000"
-     d="m4.0002 8.1879 1.4999 1.1561-2.5e-4 6.6559c-2.15e-5 0.57129 0.92882 1.5001 1.5001 1.5001l7-6.2e-5v-3l7 3.75-7 3.75v-3l-7 6.3e-5c-1.6447 1.4e-5 -3-1.3553-3-3z"
-     id="path14050" />
-  <path
-     fill="#bfbfbf"
-     color="#000000"
-     d="m20 15.812-1.4999-1.1561 2.5e-4 -6.6559c2.5e-5 -0.66867-0.78276-1.5001-1.5001-1.5001l-7 6.24e-5v3l-7-3.75 7-3.75v3l7-6.25e-5c1.6447-1.47e-5 3 1.3553 3 3z"
-     id="path14050-3" />
-  <path
-     style="block-progression:tb;text-indent:0;text-transform:none"
-     fill="#444444"
-     color="#000000"
-     d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z"
-     id="rect3029-96-0" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_loop_0.svg b/res/skins/LateNight/buttons/btn_loop_0.svg
deleted file mode 100644
index 666a552b39aa..000000000000
--- a/res/skins/LateNight/buttons/btn_loop_0.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg14046" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><g id="layer1" fill="#8d8f90"><path id="path14050" d="m4.0002 8.1879 1.4999 1.1561-2.5e-4 6.6559c-2.1e-5 0.57129 0.92882 1.5001 1.5001 1.5001l7-6.2e-5v-3l7 3.75-7 3.75v-3l-7 6.3e-5c-1.6447 1.4e-5 -3-1.3553-3-3z" color="#000000"/><path id="path14050-3" d="m20 15.812-1.4999-1.1561 2.5e-4 -6.6559c2.5e-5 -0.66867-0.78276-1.5001-1.5001-1.5001l-7 6.2e-5v3l-7-3.75 7-3.75v3l7-6.25e-5c1.6447-1.47e-5 3 1.3553 3 3z" color="#000000"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_loop_down.svg b/res/skins/LateNight/buttons/btn_loop_down.svg
deleted file mode 100644
index 05b1a7e31a10..000000000000
--- a/res/skins/LateNight/buttons/btn_loop_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg14046" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs14056"><linearGradient id="linearGradient4550" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-6" stop-color="#222" offset="0"/><stop id="stop3805-5-2" stop-color="#131516" offset="1"/></linearGradient></defs><rect id="rect3029-9" x=".5" y=".49998" width="23" height="23" rx="2" ry="2" color="#000000" fill="url(#linearGradient4550)"/><g id="g3463-5" fill="#080808"><path id="path14050-36-3" d="m5.0002 9.1879 1.4999 1.1561-2.5e-4 6.6559c-2.15e-5 0.57129 0.92882 1.5001 1.5001 1.5001l7-6.2e-5v-3l7 3.75-7 3.75v-3l-7 6.3e-5c-1.6447 1.4e-5 -3-1.3553-3-3z" color="#000000"/><path id="path14050-3-7-5" d="m21 16.812-1.4999-1.1561 2.5e-4 -6.6559c2.5e-5 -0.66867-0.78276-1.5001-1.5001-1.5001l-7 6.24e-5v3l-7-3.75 7-3.75v3l7-6.25e-5c1.6447-1.47e-5 3 1.3553 3 3z" color="#000000"/></g><path id="path14050-6" d="m4.0002 8.1879 1.4999 1.1561-2.5e-4 6.6559c-2.15e-5 0.57129 0.92882 1.5001 1.5001 1.5001l7-6.2e-5v-3l7 3.75-7 3.75v-3l-7 6.3e-5c-1.6447 1.4e-5 -3-1.3553-3-3z" color="#000000" fill="#8d8f90"/><path id="path14050-3-2" d="m20 15.812-1.4999-1.1561 2.5e-4 -6.6559c2.5e-5 -0.66867-0.78276-1.5001-1.5001-1.5001l-7 6.24e-5v3l-7-3.75 7-3.75v3l7-6.25e-5c1.6447-1.47e-5 3 1.3553 3 3z" color="#000000" fill="#8d8f90"/><path id="rect3029-96-0-9" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#454748" style="block-progression:tb;text-indent:0;text-transform:none"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_loop_in.svg b/res/skins/LateNight/buttons/btn_loop_in.svg
deleted file mode 100644
index 3626dbf4ed6b..000000000000
--- a/res/skins/LateNight/buttons/btn_loop_in.svg
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="26"
-   width="26"
-   id="svg25537">
-  <metadata
-     id="metadata15">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs25539">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0 -1026.4)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient7081">
-      <stop
-         offset="0"
-         stop-color="#242424"
-         id="stop21798" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop21800" />
-    </linearGradient>
-  </defs>
-  <rect
-     style="color:#000000;opacity:0.72000002"
-     ry="2"
-     rx="2"
-     height="24"
-     width="24"
-     y="0.99997997"
-     x="0.5"
-     id="rect21870" />
-  <rect
-     fill="url(#linearGradient7081)"
-     color="#000000"
-     ry="2"
-     rx="2"
-     height="23"
-     width="23"
-     y=".49998"
-     x=".5"
-     id="rect21872" />
-  <path
-     fill="#060606"
-     d="m11 7h5v13h-1v-7h-4v-6"
-     id="path21924" />
-  <path
-     fill="#bfbfbf"
-     d="m10 6h5v13h-1v-7h-4v-6"
-     id="path21926" />
-  <path
-     style="block-progression:tb;text-indent:0;text-transform:none"
-     fill="#444444"
-     color="#000000"
-     d="m2 0c-1.0994 0-2 0.9007-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.9006 2-2v-20c0-1.0994-0.901-2-2-2zm0.3 1h19.4c0.563 0 1.3 0.7374 1.3 1.3v19.4c0 0.563-0.737 1.3-1.3 1.3h-19.4c-0.5626 0-1.3-0.737-1.3-1.3v-19.4c0-0.5626 0.7374-1.3 1.3-1.3z"
-     id="path21950" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_loop_in_active.svg b/res/skins/LateNight/buttons/btn_loop_in_active.svg
deleted file mode 100644
index 77e55479d52e..000000000000
--- a/res/skins/LateNight/buttons/btn_loop_in_active.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg"><path d="M15 3H8v16h7v-2h-5V5h5z" fill="#d2d2d2"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_loop_in_overdown.svg b/res/skins/LateNight/buttons/btn_loop_in_overdown.svg
deleted file mode 100644
index ff6c8237b00d..000000000000
--- a/res/skins/LateNight/buttons/btn_loop_in_overdown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg25537" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs25539"><linearGradient id="linearGradient7012" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-9-9" stop-color="#aa1112" offset="0"/><stop id="stop4329-4-3" stop-color="#b60607" offset=".28"/><stop id="stop3805-5-28-5-9" stop-color="#760607" offset="1"/></linearGradient></defs><rect id="rect3029-96-4" x=".5" y=".49998" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient7012)"/><path id="path9817-3" d="m11 7h5v13h-1v-7h-4v-6" fill="#320202"/><path id="path9817" d="m10 6h5v13h-1v-7h-4v-6" fill="#8d8f90"/><path id="rect3029-96-9" d="m2 0c-1.0994 0-2 0.9006-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.9006 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.7374 1.3 1.3v19.4c0 0.5626-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.7374-1.3-1.3v-19.4c0-0.5626 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_loop_on.svg b/res/skins/LateNight/buttons/btn_loop_on.svg
deleted file mode 100644
index 60061d83ec39..000000000000
--- a/res/skins/LateNight/buttons/btn_loop_on.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg14060" width="30" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg"><g id="g14062" color="#000000" fill="#d2d2d2"><path id="path14064" d="m5.094 7.1879 1.4062 0.8125 0.59375 0.34375-2.5e-4 6.6559c-2.15e-5 0.57129 0.4287 1 1 1h9.9375v-3l6.9376 4-6.9376 4v-3h-9.9375c-1.6447 0-3-1.3553-3-3z"/><path id="path14066" d="m11.969 1v3h9.9375c1.6447 0 3 1.3553 3 3v7.8121l-1.4062-0.8125-0.59375-0.34375v-6.6559c0-0.5713-0.4287-1-1-1h-9.9375v3l-6.9376-4 3.4688-2z" style="block-progression:tb;text-indent:0;text-transform:none"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_loop_out.svg b/res/skins/LateNight/buttons/btn_loop_out.svg
deleted file mode 100644
index 12ed29f03621..000000000000
--- a/res/skins/LateNight/buttons/btn_loop_out.svg
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="26"
-   width="26"
-   id="svg25537">
-  <metadata
-     id="metadata15">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs25539">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0 -1026.4)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient6904">
-      <stop
-         offset="0"
-         stop-color="#242424"
-         id="stop3803-7-2" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop3805-5-1" />
-    </linearGradient>
-  </defs>
-  <rect
-     style="color:#000000;opacity:0.72000002"
-     ry="2"
-     rx="2"
-     height="24"
-     width="24"
-     y="0.99997997"
-     x="0.5"
-     id="rect3029-6-6" />
-  <rect
-     fill="url(#linearGradient6904)"
-     color="#000000"
-     ry="2"
-     rx="2"
-     height="23"
-     width="23"
-     y=".49998"
-     x=".5"
-     id="rect3029" />
-  <path
-     fill="#060606"
-     d="m16 7h-5v13h1v-7h4v-6"
-     id="path9817-6-7-5" />
-  <path
-     fill="#bfbfbf"
-     d="m15 6h-5v13h1v-7h4v-6"
-     id="path9817-6-4" />
-  <path
-     style="block-progression:tb;text-indent:0;text-transform:none"
-     fill="#444444"
-     color="#000000"
-     d="m2 0c-1.0994 0-2 0.9006-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.9006 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.7374 1.3 1.3v19.4c0 0.5626-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.7374-1.3-1.3v-19.4c0-0.5626 0.73735-1.3 1.3-1.3z"
-     id="rect3029-96-0" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_loop_out_active.svg b/res/skins/LateNight/buttons/btn_loop_out_active.svg
deleted file mode 100644
index 51ae7fd5b05b..000000000000
--- a/res/skins/LateNight/buttons/btn_loop_out_active.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 22 22" xmlns="http://www.w3.org/2000/svg"><path d="M7 3h7v16H7v-2h5V5H7z" fill="#d2d2d2"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_loop_out_overdown.svg b/res/skins/LateNight/buttons/btn_loop_out_overdown.svg
deleted file mode 100644
index 054c7b74469f..000000000000
--- a/res/skins/LateNight/buttons/btn_loop_out_overdown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg25537" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs25539"><linearGradient id="linearGradient6840" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-9-39" stop-color="#aa1112" offset="0"/><stop id="stop4329-4-4" stop-color="#b60607" offset=".28"/><stop id="stop3805-5-28-5-8" stop-color="#760607" offset="1"/></linearGradient></defs><rect id="rect3029-96-4" x=".5" y=".49998" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient6840)"/><path id="path9817-6-7" d="m16 7h-5v13h1v-7h4v-6" fill="#320202"/><path id="path9817-6" d="m15 6h-5v13h1v-7h4v-6" fill="#8d8f90"/><path id="rect3029-96-9" d="m2 0c-1.0994 0-2 0.9006-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.9006 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.7374 1.3 1.3v19.4c0 0.5626-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.7374-1.3-1.3v-19.4c0-0.5626 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_loop_over.svg b/res/skins/LateNight/buttons/btn_loop_over.svg
deleted file mode 100644
index 28700575f51b..000000000000
--- a/res/skins/LateNight/buttons/btn_loop_over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg14046" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs14056"><linearGradient id="linearGradient4650" x1="11" x2="11" y1="1027.4" y2="1049.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-95" stop-color="#ce0e0e" offset="0"/><stop id="stop4329-2" stop-color="#d00" offset=".28"/><stop id="stop3805-5-28-1" stop-color="#8d0000" offset="1"/></linearGradient></defs><rect id="rect3029-6-1" x="2" y="2" width="24" height="24" rx="2" ry="2" color="#000000" opacity=".5"/><rect id="rect3029-6-6-7" x="1" y="1" width="24" height="24" rx="2" ry="2" color="#000000" opacity=".8"/><rect id="rect3029-96-3" x=".5" y=".49998" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient4650)"/><path id="rect3029-96" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/><g id="g3463-93" fill="#3d0000"><path id="path14050-36-6" d="m5.0002 9.1879 1.4999 1.1561-2.5e-4 6.6559c-2.15e-5 0.57129 0.92882 1.5001 1.5001 1.5001l7-6.2e-5v-3l7 3.75-7 3.75v-3l-7 6.3e-5c-1.6447 1.4e-5 -3-1.3553-3-3z" color="#000000"/><path id="path14050-3-7-0" d="m21 16.812-1.4999-1.1561 2.5e-4 -6.6559c2.5e-5 -0.66867-0.78276-1.5001-1.5001-1.5001l-7 6.24e-5v3l-7-3.75 7-3.75v3l7-6.25e-5c1.6447-1.47e-5 3 1.3553 3 3z" color="#000000"/></g><path id="path14050-62" d="m4.0002 8.1879 1.4999 1.1561-2.5e-4 6.6559c-2.15e-5 0.57129 0.92882 1.5001 1.5001 1.5001l7-6.2e-5v-3l7 3.75-7 3.75v-3l-7 6.3e-5c-1.6447 1.4e-5 -3-1.3553-3-3z" color="#000000" fill="#bfbfbf"/><path id="path14050-3-6" d="m20 15.812-1.4999-1.1561 2.5e-4 -6.6559c2.5e-5 -0.66867-0.78276-1.5001-1.5001-1.5001l-7 6.24e-5v3l-7-3.75 7-3.75v3l7-6.25e-5c1.6447-1.47e-5 3 1.3553 3 3z" color="#000000" fill="#bfbfbf"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_loop_overdown.svg b/res/skins/LateNight/buttons/btn_loop_overdown.svg
deleted file mode 100644
index d736f3e960b8..000000000000
--- a/res/skins/LateNight/buttons/btn_loop_overdown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg14046" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs14056"><linearGradient id="linearGradient4396" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-9" stop-color="#aa1112" offset="0"/><stop id="stop4329-4" stop-color="#b60607" offset=".28"/><stop id="stop3805-5-28-5" stop-color="#760607" offset="1"/></linearGradient></defs><rect id="rect3029-96-4" x=".5" y=".49998" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient4396)"/><g id="g3463-9" fill="#320202"><path id="path14050-36-1" d="m5.0002 9.1879 1.4999 1.1561-2.5e-4 6.6559c-2.15e-5 0.57129 0.92882 1.5001 1.5001 1.5001l7-6.2e-5v-3l7 3.75-7 3.75v-3l-7 6.3e-5c-1.6447 1.4e-5 -3-1.3553-3-3z" color="#000000"/><path id="path14050-3-7-2" d="m21 16.812-1.4999-1.1561 2.5e-4 -6.6559c2.5e-5 -0.66867-0.78276-1.5001-1.5001-1.5001l-7 6.24e-5v3l-7-3.75 7-3.75v3l7-6.25e-5c1.6447-1.47e-5 3 1.3553 3 3z" color="#000000"/></g><path id="path14050-7" d="m4.0002 8.1879 1.4999 1.1561-2.5e-4 6.6559c-2.15e-5 0.57129 0.92882 1.5001 1.5001 1.5001l7-6.2e-5v-3l7 3.75-7 3.75v-3l-7 6.3e-5c-1.6447 1.4e-5 -3-1.3553-3-3z" color="#000000" fill="#8d8f90"/><path id="path14050-3-0" d="m20 15.812-1.4999-1.1561 2.5e-4 -6.6559c2.5e-5 -0.66867-0.78276-1.5001-1.5001-1.5001l-7 6.24e-5v3l-7-3.75 7-3.75v3l7-6.25e-5c1.6447-1.47e-5 3 1.3553 3 3z" color="#000000" fill="#8d8f90"/><path id="rect3029-96-9" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_mic_duck_auto.svg b/res/skins/LateNight/buttons/btn_mic_duck_auto.svg
deleted file mode 100644
index 383f8e0015f2..000000000000
--- a/res/skins/LateNight/buttons/btn_mic_duck_auto.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="45" height="23" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".50003" x2="23.5" y1="-12" y2="-12" gradientTransform="matrix(0 -.91304 -3 0 -1 21.957)" gradientUnits="userSpaceOnUse"><stop stop-color="#d09300" offset="0"/><stop stop-color="#a06d00" offset="1"/></linearGradient></defs><path d="m43.5 20v-18c0-.831-.669-1.5-1.5-1.5h-40c-.831 0-1.5.669-1.5 1.5v18c0 .831.669 1.5 1.5 1.5h40c.831 0 1.5-.669 1.5-1.5z" color="#000000" fill="url(#a)" stroke-width="1.655"/><path d="m2.0002 0c-1.0994 0-2 .90065-2 2l-6.225e-5 18c-3.8021e-6 1.0994.90065 2 2 2h40c1.0994 0 2-.90065 2-2l6.2e-5-18c4e-6-1.0994-.90065-2-2-2zm.3 1h39.4c.56265 0 1.3.73735 1.3 1.3l-6.2e-5 17.4c-1e-6.56265-.73735 1.3-1.3 1.3h-39.4c-.56265 0-1.3-.73735-1.3-1.3l6.23e-5-17.4c2e-6-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="text-decoration-line:none;text-indent:0;text-transform:none"/><g transform="translate(-14,-2)" fill="#0e0e0e"><path d="m21 10v6h2v-3h3v3h2v-6zm2 1h3v1h-3z"/><path d="m29 10v6h7v-6h-2v5h-3v-5h-2"/><path d="m37 10h6v1h-2v5h-2v-5h-2v-1"/><path d="m44 10v6h7v-6m-2 5h-3v-4h3z"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_mic_duck_manual.svg b/res/skins/LateNight/buttons/btn_mic_duck_manual.svg
deleted file mode 100644
index 3ef38f3e961d..000000000000
--- a/res/skins/LateNight/buttons/btn_mic_duck_manual.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="45" height="23" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".50003" x2="23.5" y1="-12" y2="-12" gradientTransform="matrix(.91304 0 0 3 -21.957 1)" gradientUnits="userSpaceOnUse"><stop stop-color="#d09300" offset="0"/><stop stop-color="#a06d00" offset="1"/></linearGradient></defs><path transform="matrix(0,-1,-1,0,0,0)" d="m-20-43.5h18c.831 0 1.5.669 1.5 1.5v40c0 .831-.669 1.5-1.5 1.5h-18c-.831 0-1.5-.669-1.5-1.5v-40c0-.831.669-1.5 1.5-1.5z" color="#000000" fill="url(#a)" stroke-width="1.655"/><path d="m2.0002 0c-1.0994 0-2 .90065-2 2l-6.225e-5 18c-3.8021e-6 1.0994.90065 2 2 2h40c1.0994 0 2-.90065 2-2l6.2e-5-18c4e-6-1.0994-.90065-2-2-2zm.3 1h39.4c.56265 0 1.3.73735 1.3 1.3l-6.2e-5 17.4c-1e-6.56265-.73735 1.3-1.3 1.3h-39.4c-.56265 0-1.3-.73735-1.3-1.3l6.23e-5-17.4c2e-6-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="text-decoration-line:none;text-indent:0;text-transform:none"/><g fill="#0e0e0e"><path d="m20 8v6h2v-3h3v3h2v-6zm2 1h3v1h-3z"/><path d="m9 8v6h2v-5h3v5h2v-5h2v5h1v-6h-5z"/><path d="m29 8v6h2v-5h2v5h2v-6z"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_mic_duck_off.svg b/res/skins/LateNight/buttons/btn_mic_duck_off.svg
deleted file mode 100644
index 9735da2d9a13..000000000000
--- a/res/skins/LateNight/buttons/btn_mic_duck_off.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="45" height="23" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="matrix(3 0 0 .91304 -1 -937.1)" gradientUnits="userSpaceOnUse"><stop stop-color="#242424" offset="0"/><stop stop-color="#101010" offset="1"/></linearGradient></defs><path d="m2.5.5h38.961c1.108 0 2 .892 2 2v17c0 1.108-.892 2-2 2h-38.961c-1.108 0-2-.892-2-2v-17c0-1.108.892-2 2-2z" color="#000000" fill="url(#a)"/><g fill="#060606"><path d="m31 9h-7v6h7v-1h-5v-4h5v-1"/><path d="m16 9v6h7v-6h-2v5h-3v-5h-2"/><path d="m8 9v6h7v-4.5l-1.5-1.5zm2 1h2.7l1.3 1.3v2.7h-4z"/><path d="m32 15v-6h2v2h1.5l2-2h1.5v.5l-2 2v1l2 2v.5h-1.5l-2-2h-1.5v2z"/></g><path d="m43.561 1.1878c.11225.24927.1875.52278.1875.8125l.000263 18c1.6e-5 1.0994-.90065 2-2 2l-39.75-.00025c-.28972-2e-6-.56323-.07525-.8125-.1875.31167.69758.9965 1.1875 1.8125 1.1875l39.75.00025c1.108 7e-6 1.7511-.89212 1.7511-2.0001l-.000263-18c-1.2e-5-.816-.24106-1.5007-.93864-1.8124z" color="#000000" fill-opacity=".8"/><g fill="#bfbfbf"><path d="m30 8h-7v6h7v-1h-5v-4h5v-1"/><path d="m15 8v6h7v-6h-2v5h-3v-5h-2"/><path d="m7 8v6h7v-4.5l-1.5-1.5zm2 1h2.7l1.3 1.3v2.7h-4z"/></g><path d="m2.0002 0c-1.0994 0-2 .90065-2 2l-1.675e-5 18c-1.023e-6 1.0994.90065 2 2 2h40c1.0994 0 2-.90065 2-2l1.7e-5-18c1e-6-1.0994-.90065-2-2-2zm.3 1h39.4c.56265 0 1.3.73735 1.3 1.3l-1.7e-5 17.4c-1e-6.56265-.73735 1.3-1.3 1.3h-39.4c-.56265 0-1.3-.73735-1.3-1.3l1.68e-5-17.4c5e-7-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#444" style="text-decoration-line:none;text-indent:0;text-transform:none"/><path d="m31 14v-6h2v2h1.5l2-2h1.5v.5l-2 2v1l2 2v.5h-1.5l-2-2h-1.5v2z" fill="#bfbfbf"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_mic_talk.svg b/res/skins/LateNight/buttons/btn_mic_talk.svg
deleted file mode 100644
index 2693d97d22a5..000000000000
--- a/res/skins/LateNight/buttons/btn_mic_talk.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="42" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="matrix(2.1304 0 0 1 -.56522 -1028.4)" gradientUnits="userSpaceOnUse"><stop stop-color="#242424" offset="0"/><stop stop-color="#101010" offset="1"/></linearGradient></defs><path d="m2.5 1h36c1.108 0 2 .892 2 2v18c0 1.108-.892 2-2 2h-36c-1.108 0-2-.892-2-2v-18c0-1.108.892-2 2-2z" color="#000000" opacity=".9"/><path d="m2.5.49998h35.015c1.108 0 2 .892 2 2v17c0 1.108-.892 2-2 2h-35.015c-1.108 0-2-.892-2-2v-17c0-1.108.892-2 2-2z" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v18c0 1.0994.90065 2 2 2h36c1.0994 0 2-.90065 2-2v-18c0-1.0994-.90065-2-2-2zm.3 1h35.4c.56265 0 1.3.73735 1.3 1.3v17.4c0 .56265-.73735 1.3-1.3 1.3h-35.4c-.56265 0-1.3-.73735-1.3-1.3v-17.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#444" style="text-indent:0;text-transform:none"/><g fill="#060606"><path d="m6 9h6v1h-2v5h-2v-5h-2v-1"/><path d="m14 9v6h2v-2h3v2h2v-6zm2 1h3v2h-3z"/><path d="m22 9v6h7v-1h-5v-5h-2"/></g><g fill="#bfbfbf"><path d="m5 8h6v1h-2v5h-2v-5h-2v-1"/><path d="m13 8v6h2v-2h3v2h2v-6zm2 1h3v2h-3z"/><path d="m21 8v6h7v-1h-5v-5h-2"/></g><path d="m30 15v-6h2v2h1.5l2-2h1.5v.5l-2 2v1l2 2v.5h-1.5l-2-2h-1.5v2z" fill="#060606"/><path d="m29 14v-6h2v2h1.5l2-2h1.5v.5l-2 2v1l2 2v.5h-1.5l-2-2h-1.5v2z" fill="#bfbfbf"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_mic_talk_down.svg b/res/skins/LateNight/buttons/btn_mic_talk_down.svg
deleted file mode 100644
index 918b758baac1..000000000000
--- a/res/skins/LateNight/buttons/btn_mic_talk_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="42" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="matrix(2.1304 0 0 1 -.56522 -1048.4)" gradientUnits="userSpaceOnUse"><stop stop-color="#222" offset="0"/><stop stop-color="#131516" offset="1"/></linearGradient></defs><path transform="scale(1,-1)" d="m2.5-21.5h35.014c1.108 0 2 .892 2 2v17c0 1.108-.892 2-2 2h-35.014c-1.108 0-2-.892-2-2v-17c0-1.108.892-2 2-2z" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v18c0 1.0994.90065 2 2 2h36c1.0994 0 2-.90065 2-2v-18c0-1.0994-.90065-2-2-2zm.3 1h35.4c.56265 0 1.3.73735 1.3 1.3v17.4c0 .56265-.73735 1.3-1.3 1.3h-35.4c-.56265 0-1.3-.73735-1.3-1.3v-17.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#454748" style="text-indent:0;text-transform:none"/><g fill="#080808"><path d="m6 9h6v1h-2v5h-2v-5h-2v-1"/><path d="m14 9v6h2v-2h3v2h2v-6zm2 1h3v2h-3z"/><path d="m22 9v6h7v-1h-5v-5h-2"/></g><g fill="#8d8f90"><path d="m5 8h6v1h-2v5h-2v-5h-2v-1"/><path d="m13 8v6h2v-2h3v2h2v-6zm2 1h3v2h-3z"/><path d="m21 8v6h7v-1h-5v-5h-2"/></g><path d="m30 15v-6h2v2h1.5l2-2h1.5v.5l-2 2v1l2 2v.5h-1.5l-2-2h-1.5v2z" fill="#080808"/><path d="m29 14v-6h2v2h1.5l2-2h1.5v.5l-2 2v1l2 2v.5h-1.5l-2-2h-1.5v2z" fill="#8d8f90"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_mic_talk_over.svg b/res/skins/LateNight/buttons/btn_mic_talk_over.svg
deleted file mode 100644
index a6bf539f51cb..000000000000
--- a/res/skins/LateNight/buttons/btn_mic_talk_over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="42" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="matrix(2.1304 0 0 1 -.56522 -1048.4)" gradientUnits="userSpaceOnUse"><stop stop-color="#ce0e0e" offset="0"/><stop stop-color="#d00" offset=".28"/><stop stop-color="#8d0000" offset="1"/></linearGradient></defs><path transform="scale(1,-1)" d="m2.5-21.5h35.014c1.108 0 2 .892 2 2v17c0 1.108-.892 2-2 2h-35.014c-1.108 0-2-.892-2-2v-17c0-1.108.892-2 2-2z" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v18c0 1.0994.90065 2 2 2h36c1.0994 0 2-.90065 2-2v-18c0-1.0994-.90065-2-2-2zm.3 1h35.4c.56265 0 1.3.73735 1.3 1.3v17.4c0 .56265-.73735 1.3-1.3 1.3h-35.4c-.56265 0-1.3-.73735-1.3-1.3v-17.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="text-indent:0;text-transform:none"/><g fill="#3d0000"><path d="m6 9h6v1h-2v5h-2v-5h-2v-1"/><path d="m14 9v6h2v-2h3v2h2v-6zm2 1h3v2h-3z"/><path d="m22 9v6h7v-1h-5v-5h-2"/></g><g fill="#bfbfbf"><path d="m5 8h6v1h-2v5h-2v-5h-2v-1"/><path d="m13 8v6h2v-2h3v2h2v-6zm2 1h3v2h-3z"/><path d="m21 8v6h7v-1h-5v-5h-2"/></g><path d="m30 15v-6h2v2h1.5l2-2h1.5v.5l-2 2v1l2 2v.5h-1.5l-2-2h-1.5v2z" fill="#3d0000"/><path d="m29 14v-6h2v2h1.5l2-2h1.5v.5l-2 2v1l2 2v.5h-1.5l-2-2h-1.5v2z" fill="#bfbfbf"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_mic_talk_overdown.svg b/res/skins/LateNight/buttons/btn_mic_talk_overdown.svg
deleted file mode 100644
index 67beb3245b40..000000000000
--- a/res/skins/LateNight/buttons/btn_mic_talk_overdown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="42" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="matrix(2.1304 0 0 1 -.56522 -1048.4)" gradientUnits="userSpaceOnUse"><stop stop-color="#aa1112" offset="0"/><stop stop-color="#b60607" offset=".28"/><stop stop-color="#760607" offset="1"/></linearGradient></defs><path transform="scale(1,-1)" d="m2.5-21.5h35.014c1.108 0 2 .892 2 2v17c0 1.108-.892 2-2 2h-35.014c-1.108 0-2-.892-2-2v-17c0-1.108.892-2 2-2z" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v18c0 1.0994.90065 2 2 2h36c1.0994 0 2-.90065 2-2v-18c0-1.0994-.90065-2-2-2zm.3 1h35.4c.56265 0 1.3.73735 1.3 1.3v17.4c0 .56265-.73735 1.3-1.3 1.3h-35.4c-.56265 0-1.3-.73735-1.3-1.3v-17.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="text-indent:0;text-transform:none"/><g fill="#320202"><path d="m6 9h6v1h-2v5h-2v-5h-2v-1"/><path d="m14 9v6h2v-2h3v2h2v-6zm2 1h3v2h-3z"/><path d="m22 9v6h7v-1h-5v-5h-2"/></g><g fill="#8d8f90"><path d="m5 8h6v1h-2v5h-2v-5h-2v-1"/><path d="m13 8v6h2v-2h3v2h2v-6zm2 1h3v2h-3z"/><path d="m21 8v6h7v-1h-5v-5h-2"/></g><path d="m30 15v-6h2v2h1.5l2-2h1.5v.5l-2 2v1l2 2v.5h-1.5l-2-2h-1.5v2z" fill="#320202"/><path d="m29 14v-6h2v2h1.5l2-2h1.5v.5l-2 2v1l2 2v.5h-1.5l-2-2h-1.5v2z" fill="#8d8f90"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_minus.svg b/res/skins/LateNight/buttons/btn_minus.svg
deleted file mode 100644
index 9c754af60888..000000000000
--- a/res/skins/LateNight/buttons/btn_minus.svg
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="26"
-   width="26"
-   id="svg25537">
-  <metadata
-     id="metadata39">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs25539">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0 -1026.4)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient6673">
-      <stop
-         offset="0"
-         stop-color="#242424"
-         id="stop3803-7-4" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop3805-5-7" />
-    </linearGradient>
-  </defs>
-  <rect
-     style="color:#000000;opacity:0.72000002"
-     ry="2"
-     rx="2"
-     height="24"
-     width="24"
-     y="1"
-     x="0.5"
-     id="rect3029-6-6" />
-  <rect
-     fill="url(#linearGradient6673)"
-     color="#000000"
-     ry="2"
-     rx="2"
-     height="23"
-     width="23"
-     y=".49998"
-     x=".5"
-     id="rect3029" />
-  <path
-     fill="#bfbfbf"
-     display="none"
-     d="m10 9h3v6h-2v-5h-1v-1"
-     id="path3944" />
-  <path
-     fill="#060606"
-     display="none"
-     d="m13 10h1v6h-2v-1h1v-5"
-     id="path3948" />
-  <path
-     fill="#060606"
-     display="none"
-     d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1"
-     id="path5770-89-8-1" />
-  <path
-     fill="#bfbfbf"
-     display="none"
-     d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1"
-     id="path5770-8-5-6-8" />
-  <path
-     fill="#060606"
-     display="none"
-     d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1"
-     id="path6542-5-0" />
-  <path
-     fill="#bfbfbf"
-     display="none"
-     d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1"
-     id="path6542-3" />
-  <path
-     fill="#060606"
-     display="none"
-     d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2"
-     id="path6751-9" />
-  <path
-     fill="#bfbfbf"
-     display="none"
-     d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2"
-     id="path6751" />
-  <path
-     fill="#060606"
-     display="none"
-     d="m-23-14.5h3v-3h3v3h3v3h-3v3h-3v-3h-3v-3"
-     id="path9276-9-3" />
-  <path
-     fill="#bfbfbf"
-     display="none"
-     d="m-24-15.5h3v-3h3v3h3v3h-3v3h-3v-3h-3v-3"
-     id="path9276-5" />
-  <path
-     fill="#060606"
-     d="m9 12h9v3h-9v-3"
-     id="path9788-2-2" />
-  <path
-     fill="#bfbfbf"
-     d="m8 11h9v3h-9v-3"
-     id="path9788-6" />
-  <path
-     fill="#060606"
-     display="none"
-     d="m17 12h-4v-4l-5 5.5 5 5.5v-4h4v-3"
-     id="path9792-3-2-6" />
-  <path
-     fill="#bfbfbf"
-     display="none"
-     d="m16 11h-4v-4l-5 5.5 5 5.5v-4h4v-3"
-     id="path9792-3-3" />
-  <path
-     fill="#060606"
-     display="none"
-     d="m9 12h4v-4l5 5.5-5 5.5v-4h-4v-3"
-     id="path9792-0-0" />
-  <path
-     fill="#bfbfbf"
-     display="none"
-     d="m8 11h4v-4l5 5.5-5 5.5v-4h-4v-3"
-     id="path9792-9" />
-  <path
-     fill="#060606"
-     display="none"
-     d="m11 7h5v13h-1v-7h-4v-6"
-     id="path9817-3-1" />
-  <path
-     fill="#bfbfbf"
-     display="none"
-     d="m10 6h5v13h-1v-7h-4v-6"
-     id="path9817-7" />
-  <path
-     fill="#060606"
-     display="none"
-     d="m16 7h-5v13h1v-7h4v-6"
-     id="path9817-6-7-5" />
-  <path
-     fill="#bfbfbf"
-     display="none"
-     d="m15 6h-5v13h1v-7h4v-6"
-     id="path9817-6-4" />
-  <path
-     stroke-width=".5"
-     stroke="#060606"
-     fill="#060606"
-     display="none"
-     color="#000000"
-     d="m13 6.2188c-3.5899 0-6.5 2.9101-6.5 6.5 0 0.04264-8.17e-4 0.08256 0 0.125 0.31008-0.21529 0.65937-0.36228 1.0312-0.46875 0.1786-2.8763 2.5474-5.1562 5.4687-5.1562 3.0376 0 5.5 2.4624 5.5 5.5 0 0.04206 9.4e-4 0.08317 0 0.125 0.35675 0.2477 0.66301 0.54621 0.90625 0.90625 0.05416-0.33774 0.09375-0.67825 0.09375-1.0312 0-3.5899-2.9102-6.5-6.5-6.5z"
-     id="path9863-3-5" />
-  <path
-     fill="#060606"
-     display="none"
-     color="#000000"
-     d="m8.5 19.219c-1.933 0-3.5-1.567-3.5-3.5s1.567-3.5 3.5-3.5z"
-     id="path9842-6-4" />
-  <path
-     fill="#060606"
-     display="none"
-     color="#000000"
-     d="m17.5 19.219c1.933 0 3.5-1.567 3.5-3.5s-1.567-3.5-3.5-3.5z"
-     id="path9842-2-0-7" />
-  <path
-     stroke-width=".5"
-     stroke="#bfbfbf"
-     fill="#bfbfbf"
-     display="none"
-     color="#000000"
-     d="m12 5.2188c-3.5899 0-6.5 2.9101-6.5 6.5 0 0.04264-8.17e-4 0.08256 0 0.125 0.31008-0.21529 0.65937-0.36228 1.0312-0.46875 0.1786-2.8763 2.5474-5.1562 5.4688-5.1562 3.0376 0 5.5 2.4624 5.5 5.5 0 0.04206 9.39e-4 0.08317 0 0.125 0.35675 0.2477 0.66301 0.54621 0.90625 0.90625 0.05416-0.33774 0.09375-0.67825 0.09375-1.0312 0-3.5899-2.9101-6.5-6.5-6.5z"
-     id="path9863-2" />
-  <path
-     fill="#bfbfbf"
-     display="none"
-     color="#000000"
-     d="m7.5 18.219c-1.933 0-3.5-1.567-3.5-3.5s1.567-3.5 3.5-3.5z"
-     id="path9842-5" />
-  <path
-     fill="#bfbfbf"
-     display="none"
-     color="#000000"
-     d="m16.5 18.219c1.933 0 3.5-1.567 3.5-3.5s-1.567-3.5-3.5-3.5z"
-     id="path9842-2-4" />
-  <path
-     style="block-progression:tb;text-indent:0;text-transform:none"
-     fill="#444444"
-     color="#000000"
-     d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z"
-     id="rect3029-96-0" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_minus_overdown.svg b/res/skins/LateNight/buttons/btn_minus_overdown.svg
deleted file mode 100644
index 4a308b9a5062..000000000000
--- a/res/skins/LateNight/buttons/btn_minus_overdown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg25537" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs25539"><linearGradient id="linearGradient6466" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-9-3" stop-color="#aa1112" offset="0"/><stop id="stop4329-4-6" stop-color="#b60607" offset=".28"/><stop id="stop3805-5-28-5-5" stop-color="#760607" offset="1"/></linearGradient></defs><rect id="rect3029-96-4" x=".5" y=".49998" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient6466)"/><path id="path3944-9-6" d="m10 9h3v6h-2v-5h-1v-1" display="none" fill="#8d8f90"/><path id="path3948-7-8" d="m13 10h1v6h-2v-1h1v-5" display="none" fill="#320202"/><path id="path5770-89" d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" display="none" fill="#320202"/><path id="path5770-8-5" d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" display="none" fill="#8d8f90"/><path id="path6542-5-0-4-4" d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" display="none" fill="#320202"/><path id="path6542-3-5-9" d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" display="none" fill="#8d8f90"/><path id="path6751-9-1" d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" display="none" fill="#320202"/><path id="path6751-6" d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" display="none" fill="#8d8f90"/><path id="path9276-9" d="m-23-14.5h3v-3h3v3h3v3h-3v3h-3v-3h-3v-3" display="none" fill="#320202"/><path id="path9276" d="m-24-15.5h3v-3h3v3h3v3h-3v3h-3v-3h-3v-3" display="none" fill="#8d8f90"/><path id="path9788-2" d="m9 12h9v3h-9v-3" fill="#320202"/><path id="path9788" d="m8 11h9v3h-9v-3" fill="#8d8f90"/><path id="path9792-3-2" d="m17 12h-4v-4l-5 5.5 5 5.5v-4h4v-3" display="none" fill="#320202"/><path id="path9792-3" d="m16 11h-4v-4l-5 5.5 5 5.5v-4h4v-3" display="none" fill="#8d8f90"/><path id="path9792-0" d="m9 12h4v-4l5 5.5-5 5.5v-4h-4v-3" display="none" fill="#320202"/><path id="path9792" d="m8 11h4v-4l5 5.5-5 5.5v-4h-4v-3" display="none" fill="#8d8f90"/><path id="path9817-3" d="m11 7h5v13h-1v-7h-4v-6" display="none" fill="#320202"/><path id="path9817" d="m10 6h5v13h-1v-7h-4v-6" display="none" fill="#8d8f90"/><path id="path9817-6-7" d="m16 7h-5v13h1v-7h4v-6" display="none" fill="#320202"/><path id="path9817-6" d="m15 6h-5v13h1v-7h4v-6" display="none" fill="#8d8f90"/><path id="path9863-3" d="m13 6.25c-3.5899 0-6.5 2.9101-6.5 6.5 0 0.04264-8.17e-4 0.08256 0 0.125 0.31008-0.21529 0.65937-0.36228 1.0312-0.46875 0.1786-2.8763 2.5474-5.1562 5.4688-5.1562 3.0376 0 5.5 2.4624 5.5 5.5 0 0.04206 9.39e-4 0.08317 0 0.125 0.35675 0.2477 0.66301 0.54621 0.90625 0.90625 0.054158-0.33774 0.09375-0.67825 0.09375-1.0312 0-3.5899-2.9101-6.5-6.5-6.5z" color="#000000" display="none" fill="#320202" stroke="#320202" stroke-width=".5"/><path id="path9842-6" d="m8.5 19.25c-1.933 0-3.5-1.567-3.5-3.5s1.567-3.5 3.5-3.5z" color="#000000" display="none" fill="#320202"/><path id="path9842-2-0" d="m17.5 19.25c1.933 0 3.5-1.567 3.5-3.5s-1.567-3.5-3.5-3.5z" color="#000000" display="none" fill="#320202"/><path id="path9863" d="m12 5.25c-3.5899 0-6.5 2.9101-6.5 6.5 0 0.04264-8.17e-4 0.08256 0 0.125 0.31008-0.21529 0.65937-0.36228 1.0312-0.46875 0.1786-2.8763 2.5474-5.1562 5.4688-5.1562 3.0376 0 5.5 2.4624 5.5 5.5 0 0.04206 9.39e-4 0.08317 0 0.125 0.35675 0.2477 0.66301 0.54621 0.90625 0.90625 0.054158-0.33774 0.09375-0.67825 0.09375-1.0312 0-3.5899-2.9101-6.5-6.5-6.5z" color="#000000" display="none" fill="#8d8f90" stroke="#8f8f8f" stroke-width=".5"/><path id="path9842" d="m7.5 18.25c-1.933 0-3.5-1.567-3.5-3.5s1.567-3.5 3.5-3.5z" color="#000000" display="none" fill="#8d8f90"/><path id="path9842-2" d="m16.5 18.25c1.933 0 3.5-1.567 3.5-3.5s-1.567-3.5-3.5-3.5z" color="#000000" display="none" fill="#8d8f90"/><path id="rect3029-96-9" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_next_down.svg b/res/skins/LateNight/buttons/btn_next_down.svg
deleted file mode 100644
index 0e34c50c8750..000000000000
--- a/res/skins/LateNight/buttons/btn_next_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg7815" width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg"><g id="layer1" transform="translate(0 -1030.4)"><path id="path3936-0-8-9-7" d="m5 1036.7 7 4.667-7 4.6669v-9.3339" fill="#8d8f90"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_outro_end.svg b/res/skins/LateNight/buttons/btn_outro_end.svg
deleted file mode 100644
index a5ad31d39558..000000000000
--- a/res/skins/LateNight/buttons/btn_outro_end.svg
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg79"
-   version="1.1"
-   height="26"
-   width="26">
-  <metadata
-     id="metadata83">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs11">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-24)"
-       y2="12"
-       y1="12"
-       x2="23.5"
-       x1=".5"
-       id="a">
-      <stop
-         id="stop2"
-         offset="0"
-         stop-opacity=".17647" />
-      <stop
-         id="stop4"
-         offset=".12672"
-         stop-opacity=".0047619" />
-      <stop
-         id="stop6"
-         offset=".54348"
-         stop-opacity="0" />
-      <stop
-         id="stop8"
-         offset="1"
-         stop-opacity=".47451" />
-    </linearGradient>
-  </defs>
-  <path
-     d="m 23.31367,1.1758 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.965573 -2,1.965572 L 2,23.965572 c -0.6598637,-1e-6 -1.13567505,-0.352003 -1.325,-0.511743 0.20909416,0.790888 0.7641575,1.546141 1.8242,1.546141 h 20 c 1.108,0 2,-0.892 2,-2 v -20 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z"
-     id="path15"
-     style="opacity:0.8;fill:#030303" />
-  <rect
-     id="rect17"
-     fill="url(#a)"
-     color="#000000"
-     ry="1.5"
-     rx="1.5"
-     height="23"
-     width="23"
-     y="-23.5"
-     x=".5"
-     transform="rotate(90)" />
-  <path
-     id="path19"
-     style="text-indent:0;text-transform:none"
-     fill="#444444"
-     color="#000000"
-     d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" />
-  <g
-     id="g27"
-     display="none">
-    <g
-       id="g25"
-       display="inline">
-      <path
-         id="path21"
-         fill="#323232"
-         d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-      <path
-         id="path23"
-         fill="#dcdcdc"
-         d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g35"
-     display="none">
-    <g
-       id="g33"
-       display="inline">
-      <path
-         id="path29"
-         fill="#323232"
-         d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-      <path
-         id="path31"
-         fill="#dcdcdc"
-         d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g43"
-     display="none">
-    <g
-       id="g41"
-       display="inline">
-      <path
-         id="path37"
-         fill="#323232"
-         d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" />
-      <path
-         id="path39"
-         fill="#dcdcdc"
-         d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" />
-    </g>
-  </g>
-  <g
-     id="g51"
-     display="none">
-    <g
-       id="g49"
-       display="inline">
-      <path
-         id="path45"
-         fill="#323232"
-         d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-      <path
-         id="path47"
-         fill="#dcdcdc"
-         d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-    </g>
-  </g>
-  <g
-     id="g59"
-     display="none">
-    <g
-       id="g57"
-       display="inline">
-      <path
-         id="path53"
-         fill="#323232"
-         d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-      <path
-         id="path55"
-         fill="#dcdcdc"
-         d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-    </g>
-  </g>
-  <g
-     id="g67"
-     display="none">
-    <g
-       id="g65"
-       display="inline">
-      <path
-         id="path61"
-         fill="#323232"
-         d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-      <path
-         id="path63"
-         fill="#dcdcdc"
-         d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-    </g>
-  </g>
-  <g
-     id="g73"
-     display="none">
-    <path
-       id="path69"
-       fill="#323232"
-       d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-    <path
-       id="path71"
-       fill="#dcdcdc"
-       d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-  </g>
-  <rect
-     id="rect75"
-     style="paint-order:markers fill stroke"
-     fill="#bfbfbf"
-     height="10"
-     width="2"
-     y="7"
-     x="-18"
-     transform="scale(-1,1)" />
-  <path
-     id="path77"
-     fill="#bfbfbf"
-     d="m15 17-9-10v10z" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_outro_end_pressed.svg b/res/skins/LateNight/buttons/btn_outro_end_pressed.svg
deleted file mode 100644
index 060ec4243abb..000000000000
--- a/res/skins/LateNight/buttons/btn_outro_end_pressed.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(-24,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><rect transform="matrix(0,-1,-1,0,0,0)" x="-23.5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><g><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#c8c8c8" style="text-indent:0;text-transform:none"/><rect transform="scale(-1,1)" x="-18" y="7" width="2" height="10" fill="#b4b4b4" style="paint-order:markers fill stroke"/><path d="m15 17-9-10v10z" fill="#b4b4b4"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_outro_start.svg b/res/skins/LateNight/buttons/btn_outro_start.svg
deleted file mode 100644
index f451c4670255..000000000000
--- a/res/skins/LateNight/buttons/btn_outro_start.svg
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg79"
-   version="1.1"
-   height="26"
-   width="26">
-  <metadata
-     id="metadata83">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs11">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-24)"
-       y2="12"
-       y1="12"
-       x2="23.5"
-       x1=".5"
-       id="a">
-      <stop
-         id="stop2"
-         offset="0"
-         stop-opacity=".17647" />
-      <stop
-         id="stop4"
-         offset=".12672"
-         stop-opacity=".0047619" />
-      <stop
-         id="stop6"
-         offset=".54348"
-         stop-opacity="0" />
-      <stop
-         id="stop8"
-         offset="1"
-         stop-opacity=".47451" />
-    </linearGradient>
-  </defs>
-  <path
-     d="m 23.31367,1.1758 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.965573 -2,1.965572 L 2,23.965572 c -0.6598637,-1e-6 -1.13567505,-0.352003 -1.325,-0.511743 0.20909416,0.790888 0.7641575,1.546141 1.8242,1.546141 h 20 c 1.108,0 2,-0.892 2,-2 v -20 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z"
-     id="path15"
-     style="opacity:0.8;fill:#030303" />
-  <rect
-     id="rect17"
-     fill="url(#a)"
-     color="#000000"
-     ry="1.5"
-     rx="1.5"
-     height="23"
-     width="23"
-     y="-23.5"
-     x=".5"
-     transform="rotate(90)" />
-  <path
-     id="path19"
-     style="text-indent:0;text-transform:none"
-     fill="#444444"
-     color="#000000"
-     d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" />
-  <g
-     id="g27"
-     display="none">
-    <g
-       id="g25"
-       display="inline">
-      <path
-         id="path21"
-         fill="#323232"
-         d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-      <path
-         id="path23"
-         fill="#dcdcdc"
-         d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g35"
-     display="none">
-    <g
-       id="g33"
-       display="inline">
-      <path
-         id="path29"
-         fill="#323232"
-         d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-      <path
-         id="path31"
-         fill="#dcdcdc"
-         d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" />
-    </g>
-  </g>
-  <g
-     id="g43"
-     display="none">
-    <g
-       id="g41"
-       display="inline">
-      <path
-         id="path37"
-         fill="#323232"
-         d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" />
-      <path
-         id="path39"
-         fill="#dcdcdc"
-         d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" />
-    </g>
-  </g>
-  <g
-     id="g51"
-     display="none">
-    <g
-       id="g49"
-       display="inline">
-      <path
-         id="path45"
-         fill="#323232"
-         d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-      <path
-         id="path47"
-         fill="#dcdcdc"
-         d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" />
-    </g>
-  </g>
-  <g
-     id="g59"
-     display="none">
-    <g
-       id="g57"
-       display="inline">
-      <path
-         id="path53"
-         fill="#323232"
-         d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-      <path
-         id="path55"
-         fill="#dcdcdc"
-         d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" />
-    </g>
-  </g>
-  <g
-     id="g67"
-     display="none">
-    <g
-       id="g65"
-       display="inline">
-      <path
-         id="path61"
-         fill="#323232"
-         d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-      <path
-         id="path63"
-         fill="#dcdcdc"
-         d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" />
-    </g>
-  </g>
-  <g
-     id="g73"
-     display="none">
-    <path
-       id="path69"
-       fill="#323232"
-       d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-    <path
-       id="path71"
-       fill="#dcdcdc"
-       d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" />
-  </g>
-  <rect
-     id="rect75"
-     style="paint-order:markers fill stroke"
-     fill="#bfbfbf"
-     height="10"
-     width="2"
-     y="7"
-     x="6" />
-  <path
-     id="path77"
-     fill="#bfbfbf"
-     d="m19 17-9-10v10z" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_outro_start_pressed.svg b/res/skins/LateNight/buttons/btn_outro_start_pressed.svg
deleted file mode 100644
index 752d6e3eff28..000000000000
--- a/res/skins/LateNight/buttons/btn_outro_start_pressed.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(-24,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><rect transform="matrix(0,-1,-1,0,0,0)" x="-23.5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#c8c8c8" style="text-indent:0;text-transform:none"/><rect x="6" y="7" width="2" height="10" fill="#b4b4b4" style="paint-order:markers fill stroke"/><path d="m19 17-9-10v10z" fill="#b4b4b4"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_pfl.svg b/res/skins/LateNight/buttons/btn_pfl.svg
deleted file mode 100644
index 69f0e97f2a51..000000000000
--- a/res/skins/LateNight/buttons/btn_pfl.svg
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg25537"
-   width="26"
-   height="26"
-   version="1.1">
-  <metadata
-     id="metadata36">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs25539">
-    <linearGradient
-       id="linearGradient6227"
-       x1="13"
-       x2="13"
-       y1="1027.4"
-       y2="1049.4"
-       gradientTransform="translate(0 -1026.4)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop3803-7-8"
-         stop-color="#242424"
-         offset="0" />
-      <stop
-         id="stop3805-5-4"
-         stop-color="#101010"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <g
-     transform="translate(-0.5)"
-     id="g895">
-    <rect
-       style="color:#000000;opacity:0.72000002"
-       ry="2"
-       rx="2"
-       height="24"
-       width="24"
-       y="1"
-       x="1"
-       id="rect3029-6-6" />
-  </g>
-  <rect
-     id="rect3029"
-     x=".5"
-     y=".49998"
-     width="23"
-     height="23"
-     rx="2"
-     ry="2"
-     color="#000000"
-     fill="url(#linearGradient6227)" />
-  <path
-     id="path3944"
-     d="m10 9h3v6h-2v-5h-1v-1"
-     display="none"
-     fill="#bfbfbf" />
-  <path
-     id="path3948"
-     d="m13 10h1v6h-2v-1h1v-5"
-     display="none"
-     fill="#060606" />
-  <path
-     id="path5770-89-8-1"
-     d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1"
-     display="none"
-     fill="#060606" />
-  <path
-     id="path5770-8-5-6-8"
-     d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1"
-     display="none"
-     fill="#bfbfbf" />
-  <path
-     id="path6542-5-0"
-     d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1"
-     display="none"
-     fill="#060606" />
-  <path
-     id="path6542-3"
-     d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1"
-     display="none"
-     fill="#bfbfbf" />
-  <path
-     id="path6751-9"
-     d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2"
-     display="none"
-     fill="#060606" />
-  <path
-     id="path6751"
-     d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2"
-     display="none"
-     fill="#bfbfbf" />
-  <path
-     id="path9276-9-3"
-     d="m-23-14.5h3v-3h3v3h3v3h-3v3h-3v-3h-3v-3"
-     display="none"
-     fill="#060606" />
-  <path
-     id="path9276-5"
-     d="m-24-15.5h3v-3h3v3h3v3h-3v3h-3v-3h-3v-3"
-     display="none"
-     fill="#bfbfbf" />
-  <path
-     id="path9788-2-2"
-     d="m-11-14.5h9v3h-9v-3"
-     display="none"
-     fill="#060606" />
-  <path
-     id="path9788-6"
-     d="m-12-15.5h9v3h-9v-3"
-     display="none"
-     fill="#bfbfbf" />
-  <path
-     id="path9792-3-2-6"
-     d="m13-14.5h-4v-4l-5 5.5 5 5.5v-4h4v-3"
-     display="none"
-     fill="#060606" />
-  <path
-     id="path9792-3-3"
-     d="m12-15.5h-4v-4l-5 5.5 5 5.5v-4h4v-3"
-     display="none"
-     fill="#bfbfbf" />
-  <path
-     id="path9792-0-0"
-     d="m17-14.5h4v-4l5 5.5-5 5.5v-4h-4v-3"
-     display="none"
-     fill="#060606" />
-  <path
-     id="path9792-9"
-     d="m16-15.5h4v-4l5 5.5-5 5.5v-4h-4v-3"
-     display="none"
-     fill="#bfbfbf" />
-  <path
-     id="path9817-3-1"
-     d="m41-18h5v13h-1v-7h-4v-6"
-     display="none"
-     fill="#060606" />
-  <path
-     id="path9817-7"
-     d="m40-19h5v13h-1v-7h-4v-6"
-     display="none"
-     fill="#bfbfbf" />
-  <path
-     id="path9817-6-7-5"
-     d="m56-18h-5v13h1v-7h4v-6"
-     display="none"
-     fill="#060606" />
-  <path
-     id="path9817-6-4"
-     d="m55-19h-5v13h1v-7h4v-6"
-     display="none"
-     fill="#bfbfbf" />
-  <path
-     id="rect3029-96-0"
-     d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z"
-     style="block-progression:tb;text-indent:0;text-transform:none"
-     fill="#444444"
-     color="#000000" />
-  <g
-     id="g7113"
-     transform="translate(-3.3093 -4.7071)">
-    <path
-       id="path9863-1-2-3"
-       d="m16.309 10.676c-3.725 0-6.75 3.025-6.75 6.75 0 0.03983-9.401e-4 0.07667 0 0.125v0.21875c-0.75815 0.64202-1.25 1.585-1.25 2.6562 0 1.933 1.567 3.5 3.5 3.5v-7c-0.24162 0-0.49091 0.01588-0.71875 0.0625 0.21566-2.7031 2.4594-4.8125 5.2188-4.8125 2.753 0 4.9939 2.1183 5.2188 4.8125-0.22784-0.04662-0.47712-0.0625-0.71875-0.0625v7c1.933 0 3.5-1.567 3.5-3.5 0-1.0873-0.50338-2.0455-1.2812-2.6875 0.0061-0.10559 0.03125-0.20307 0.03125-0.3125 0-3.725-3.025-6.75-6.75-6.75z"
-       color="#000000"
-       fill="#060606"
-       style="block-progression:tb;text-indent:0;text-transform:none" />
-    <path
-       id="path9863-1-2"
-       d="m15.309 9.6758c-3.725 0-6.75 3.025-6.75 6.75 0 0.03983-9.401e-4 0.07667 0 0.125v0.21875c-0.75815 0.64202-1.25 1.585-1.25 2.6562 0 1.933 1.567 3.5 3.5 3.5v-7c-0.24162 0-0.49091 0.01588-0.71875 0.0625 0.21566-2.7031 2.4594-4.8125 5.2188-4.8125 2.753 0 4.9939 2.1183 5.2188 4.8125-0.22784-0.04662-0.47712-0.0625-0.71875-0.0625v7c1.933 0 3.5-1.567 3.5-3.5 0-1.0873-0.50338-2.0455-1.2812-2.6875 0.0061-0.10559 0.03125-0.20307 0.03125-0.3125 0-3.725-3.025-6.75-6.75-6.75z"
-       color="#000000"
-       fill="#bfbfbf"
-       style="block-progression:tb;text-indent:0;text-transform:none" />
-  </g>
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_pfl_down.svg b/res/skins/LateNight/buttons/btn_pfl_down.svg
deleted file mode 100644
index 82285f32209a..000000000000
--- a/res/skins/LateNight/buttons/btn_pfl_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg25537" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs25539"><linearGradient id="linearGradient35942" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-6" stop-color="#222" offset="0"/><stop id="stop3805-5-2" stop-color="#131516" offset="1"/></linearGradient></defs><rect id="rect3029-9" x=".5" y=".49998" width="23" height="23" rx="2" ry="2" color="#000000" fill="url(#linearGradient35942)"/><path id="path3944-9" d="m10 9h3v6h-2v-5h-1v-1" display="none" fill="#8d8f90"/><path id="path3948-7" d="m13 10h1v6h-2v-1h1v-5" display="none" fill="#080808"/><path id="path5770-89-8" d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" display="none" fill="#080808"/><path id="path5770-8-5-6" d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" display="none" fill="#8d8f90"/><path id="path6542-5" d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" display="none" fill="#080808"/><path id="path6542" d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" display="none" fill="#8d8f90"/><path id="path6751-9-1-3-1" d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" display="none" fill="#080808"/><path id="path6751-6-3-5" d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" display="none" fill="#8d8f90"/><path id="rect3029-96-0-9" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#454748" style="block-progression:tb;text-indent:0;text-transform:none"/><g id="g6490" transform="translate(-5.678 .96822)"><path id="path9863-1-2-3" d="m18.678 4.7818c-3.725 0-6.75 3.025-6.75 6.75 0 0.03983-9.4e-4 0.07667 0 0.125v0.21875c-0.75815 0.64202-1.25 1.585-1.25 2.6562 0 1.933 1.567 3.5 3.5 3.5v-7c-0.24162 0-0.49091 0.01588-0.71875 0.0625 0.21566-2.7031 2.4594-4.8125 5.2188-4.8125 2.753 0 4.9939 2.1183 5.2188 4.8125-0.22784-0.04662-0.47712-0.0625-0.71875-0.0625v7c1.933 0 3.5-1.567 3.5-3.5 0-1.0873-0.50338-2.0455-1.2812-2.6875 0.0061-0.10559 0.03125-0.20307 0.03125-0.3125 0-3.725-3.025-6.75-6.75-6.75z" color="#000000" fill="#080808" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path9863-1-2" d="m17.678 3.7818c-3.725 0-6.75 3.025-6.75 6.75 0 0.03983-9.4e-4 0.07667 0 0.125v0.21875c-0.75815 0.64202-1.25 1.585-1.25 2.6562 0 1.933 1.567 3.5 3.5 3.5v-7c-0.24162 0-0.49091 0.01588-0.71875 0.0625 0.21566-2.7031 2.4594-4.8125 5.2188-4.8125 2.753 0 4.9939 2.1183 5.2188 4.8125-0.22784-0.04662-0.47712-0.0625-0.71875-0.0625v7c1.933 0 3.5-1.567 3.5-3.5 0-1.0873-0.50338-2.0455-1.2812-2.6875 0.0061-0.10559 0.03125-0.20307 0.03125-0.3125 0-3.725-3.025-6.75-6.75-6.75z" color="#000000" fill="#8d8f90" style="block-progression:tb;text-indent:0;text-transform:none"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_pfl_over.svg b/res/skins/LateNight/buttons/btn_pfl_over.svg
deleted file mode 100644
index 591894c5264a..000000000000
--- a/res/skins/LateNight/buttons/btn_pfl_over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg25537" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs25539"><linearGradient id="linearGradient4165" x1="11" x2="11" y1="1027.4" y2="1049.4" gradientTransform="translate(0 -1050.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-95-8" stop-color="#ce0e0e" offset="0"/><stop id="stop4329-2-5" stop-color="#d00" offset=".28"/><stop id="stop3805-5-28-1-9" stop-color="#8d0000" offset="1"/></linearGradient></defs><rect id="rect3029-96-3" transform="scale(1,-1)" x=".5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient4165)"/><path id="rect3029-96" d="m2 0c-1.0994 0-2 0.9006-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.9006 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.7374 1.3 1.3v19.4c0 0.5626-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.7374-1.3-1.3v-19.4c0-0.5626 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path9863-1-2-3" d="m13 6c-3.725 0-6.75 3.025-6.75 6.75 0 0.03983-9.401e-4 0.07667 0 0.125v0.21875c-0.75815 0.64202-1.25 1.585-1.25 2.6562 0 1.933 1.567 3.5 3.5 3.5v-7c-0.24162 0-0.49091 0.01588-0.71875 0.0625 0.21567-2.7031 2.4594-4.8125 5.2188-4.8125 2.753 0 4.9939 2.1183 5.2188 4.8125-0.22784-0.046623-0.47712-0.0625-0.71875-0.0625v7c1.933 0 3.5-1.567 3.5-3.5 0-1.0873-0.50338-2.0455-1.2812-2.6875 0.006115-0.10559 0.03125-0.20307 0.03125-0.3125 0-3.725-3.025-6.75-6.75-6.75z" color="#000000" fill="#320202" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path9863-1-2" d="m12 5c-3.725 0-6.75 3.025-6.75 6.75 0 0.03983-9.401e-4 0.07667 0 0.125v0.21875c-0.75815 0.64202-1.25 1.585-1.25 2.6562 0 1.933 1.567 3.5 3.5 3.5v-7c-0.24162 0-0.49091 0.01588-0.71875 0.0625 0.21567-2.7031 2.4594-4.8125 5.2188-4.8125 2.753 0 4.9939 2.1183 5.2188 4.8125-0.22784-0.046623-0.47712-0.0625-0.71875-0.0625v7c1.933 0 3.5-1.567 3.5-3.5 0-1.0873-0.50338-2.0455-1.2812-2.6875 0.006115-0.10559 0.03125-0.20307 0.03125-0.3125 0-3.725-3.025-6.75-6.75-6.75z" color="#000000" fill="#eee" style="block-progression:tb;text-indent:0;text-transform:none"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_pfl_overdown.svg b/res/skins/LateNight/buttons/btn_pfl_overdown.svg
deleted file mode 100644
index 53072715597e..000000000000
--- a/res/skins/LateNight/buttons/btn_pfl_overdown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg25537" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs25539"><linearGradient id="linearGradient5815" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-9-5" stop-color="#aa1112" offset="0"/><stop id="stop4329-4-9" stop-color="#b60607" offset=".28"/><stop id="stop3805-5-28-5-7" stop-color="#760607" offset="1"/></linearGradient></defs><rect id="rect3029-96-4" x=".5" y=".49998" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient5815)"/><path id="path3944-9-6" d="m10 9h3v6h-2v-5h-1v-1" display="none" fill="#8d8f90"/><path id="path3948-7-8" d="m13 10h1v6h-2v-1h1v-5" display="none" fill="#320202"/><path id="path5770-89" d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" display="none" fill="#320202"/><path id="path5770-8-5" d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" display="none" fill="#8d8f90"/><path id="path6542-5-0-4-4" d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" display="none" fill="#320202"/><path id="path6542-3-5-9" d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" display="none" fill="#8d8f90"/><path id="path6751-9-1" d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" display="none" fill="#320202"/><path id="path6751-6" d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" display="none" fill="#8d8f90"/><path id="path9276-9" d="m-23-14.5h3v-3h3v3h3v3h-3v3h-3v-3h-3v-3" display="none" fill="#320202"/><path id="path9276" d="m-24-15.5h3v-3h3v3h3v3h-3v3h-3v-3h-3v-3" display="none" fill="#8d8f90"/><path id="path9788-2" d="m-11-14.5h9v3h-9v-3" display="none" fill="#320202"/><path id="path9788" d="m-12-15.5h9v3h-9v-3" display="none" fill="#8d8f90"/><path id="path9792-3-2" d="m13-14.5h-4v-4l-5 5.5 5 5.5v-4h4v-3" display="none" fill="#320202"/><path id="path9792-3" d="m12-15.5h-4v-4l-5 5.5 5 5.5v-4h4v-3" display="none" fill="#8d8f90"/><path id="path9792-0" d="m17-14.5h4v-4l5 5.5-5 5.5v-4h-4v-3" display="none" fill="#320202"/><path id="path9792" d="m16-15.5h4v-4l5 5.5-5 5.5v-4h-4v-3" display="none" fill="#8d8f90"/><path id="path9817-3" d="m41-18h5v13h-1v-7h-4v-6" display="none" fill="#320202"/><path id="path9817" d="m40-19h5v13h-1v-7h-4v-6" display="none" fill="#8d8f90"/><path id="path9817-6-7" d="m56-18h-5v13h1v-7h4v-6" display="none" fill="#320202"/><path id="path9817-6" d="m55-19h-5v13h1v-7h4v-6" display="none" fill="#8d8f90"/><path id="rect3029-96-9" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/><g id="g5888" transform="translate(-8.1292 -4.5381)"><path id="path9863-1-2-3" d="m21.129 10.538c-3.725 0-6.75 3.025-6.75 6.75 0 0.03983-9.4e-4 0.07667 0 0.125v0.21875c-0.75815 0.64202-1.25 1.585-1.25 2.6562 0 1.933 1.567 3.5 3.5 3.5v-7c-0.24162 0-0.49091 0.01588-0.71875 0.0625 0.21566-2.7031 2.4594-4.8125 5.2188-4.8125 2.753 0 4.9939 2.1182 5.2188 4.8125-0.22784-0.04662-0.47712-0.0625-0.71875-0.0625v7c1.933 0 3.5-1.567 3.5-3.5 0-1.0873-0.50338-2.0455-1.2812-2.6875 0.0061-0.10559 0.03125-0.20307 0.03125-0.3125 0-3.725-3.025-6.75-6.75-6.75z" color="#000000" fill="#320202" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path9863-1-2" d="m20.129 9.5381c-3.725 0-6.75 3.025-6.75 6.75 0 0.03983-9.4e-4 0.07667 0 0.125v0.21875c-0.75815 0.64202-1.25 1.585-1.25 2.6562 0 1.933 1.567 3.5 3.5 3.5v-7c-0.24162 0-0.49091 0.01588-0.71875 0.0625 0.21566-2.7031 2.4594-4.8125 5.2188-4.8125 2.753 0 4.9939 2.1182 5.2188 4.8125-0.22784-0.04662-0.47712-0.0625-0.71875-0.0625v7c1.933 0 3.5-1.567 3.5-3.5 0-1.0873-0.50338-2.0455-1.2812-2.6875 0.0061-0.10559 0.03125-0.20307 0.03125-0.3125 0-3.725-3.025-6.75-6.75-6.75z" color="#000000" fill="#8d8f90" style="block-progression:tb;text-indent:0;text-transform:none"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_pfl_small.svg b/res/skins/LateNight/buttons/btn_pfl_small.svg
deleted file mode 100644
index ac36bbeed2e3..000000000000
--- a/res/skins/LateNight/buttons/btn_pfl_small.svg
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="20"
-   width="20"
-   id="svg25537">
-  <metadata
-     id="metadata36">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs25539">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.91666667,0,0,0.91666667,-0.45833331,-941.32498)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient6227">
-      <stop
-         offset="0"
-         stop-color="#242424"
-         id="stop3803-7-8" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop3805-5-4" />
-    </linearGradient>
-  </defs>
-  <rect
-     style="color:#000000;fill:url(#linearGradient6227);stroke-width:0.91666663"
-     height="20"
-     width="20"
-     y="0"
-     x="0"
-     id="rect3029" />
-  <path
-     style="display:none;fill:#bfbfbf"
-     display="none"
-     d="m 10,3 h 3 V 9 H 11 V 4 H 10 V 3"
-     id="path3944" />
-  <path
-     style="display:none;fill:#060606"
-     display="none"
-     d="m 13,4 h 1 v 6 H 12 V 9 h 1 V 4"
-     id="path3948" />
-  <path
-     style="display:none;fill:#060606"
-     display="none"
-     d="m 10,4 h 7 v 4 h -5 v 1 h 5 v 1 H 10 V 7 h 5 V 5 H 10 V 4"
-     id="path5770-89-8-1" />
-  <path
-     style="display:none;fill:#bfbfbf"
-     display="none"
-     d="m 9,3 h 7 v 4 h -5 v 1 h 5 V 9 H 9 V 6 h 5 V 4 H 9 V 3"
-     id="path5770-8-5-6-8" />
-  <path
-     style="display:none;fill:#060606"
-     display="none"
-     d="m 10,4 h 7 v 6 H 10 V 9 h 5 V 8 H 13 V 7 h 2 V 5 H 10 V 4"
-     id="path6542-5-0" />
-  <path
-     style="display:none;fill:#bfbfbf"
-     display="none"
-     d="m 9,3 h 7 V 9 H 9 V 8 h 5 V 7 H 12 V 6 h 2 V 4 H 9 V 3"
-     id="path6542-3" />
-  <path
-     style="display:none;fill:#060606"
-     display="none"
-     d="m 10,5 v 3 h 5 v 2 h 2 V 4 H 15 V 7 H 12 V 5 h -2"
-     id="path6751-9" />
-  <path
-     style="display:none;fill:#bfbfbf"
-     display="none"
-     d="m 9,4 v 3 h 5 v 2 h 2 V 3 H 14 V 6 H 11 V 4 H 9"
-     id="path6751" />
-  <path
-     style="display:none;fill:#060606"
-     display="none"
-     d="m -23,-20.5 h 3 v -3 h 3 v 3 h 3 v 3 h -3 v 3 h -3 v -3 h -3 v -3"
-     id="path9276-9-3" />
-  <path
-     style="display:none;fill:#bfbfbf"
-     display="none"
-     d="m -24,-21.5 h 3 v -3 h 3 v 3 h 3 v 3 h -3 v 3 h -3 v -3 h -3 v -3"
-     id="path9276-5" />
-  <path
-     style="display:none;fill:#060606"
-     display="none"
-     d="m -11,-20.5 h 9 v 3 h -9 v -3"
-     id="path9788-2-2" />
-  <path
-     style="display:none;fill:#bfbfbf"
-     display="none"
-     d="m -12,-21.5 h 9 v 3 h -9 v -3"
-     id="path9788-6" />
-  <path
-     style="display:none;fill:#060606"
-     display="none"
-     d="M 13,-20.5 H 9 v -4 l -5,5.5 5,5.5 v -4 h 4 v -3"
-     id="path9792-3-2-6" />
-  <path
-     style="display:none;fill:#bfbfbf"
-     display="none"
-     d="M 12,-21.5 H 8 v -4 l -5,5.5 5,5.5 v -4 h 4 v -3"
-     id="path9792-3-3" />
-  <path
-     style="display:none;fill:#060606"
-     display="none"
-     d="m 17,-20.5 h 4 v -4 l 5,5.5 -5,5.5 v -4 h -4 v -3"
-     id="path9792-0-0" />
-  <path
-     style="display:none;fill:#bfbfbf"
-     display="none"
-     d="m 16,-21.5 h 4 v -4 l 5,5.5 -5,5.5 v -4 h -4 v -3"
-     id="path9792-9" />
-  <path
-     style="display:none;fill:#060606"
-     display="none"
-     d="m 41,-24 h 5 v 13 h -1 v -7 h -4 v -6"
-     id="path9817-3-1" />
-  <path
-     style="display:none;fill:#bfbfbf"
-     display="none"
-     d="m 40,-25 h 5 v 13 h -1 v -7 h -4 v -6"
-     id="path9817-7" />
-  <path
-     style="display:none;fill:#060606"
-     display="none"
-     d="m 56,-24 h -5 v 13 h 1 v -7 h 4 v -6"
-     id="path9817-6-7-5" />
-  <path
-     style="display:none;fill:#bfbfbf"
-     display="none"
-     d="m 55,-25 h -5 v 13 h 1 v -7 h 4 v -6"
-     id="path9817-6-4" />
-  <g
-     transform="matrix(0.91666667,0,0,0.91666667,-4.033525,-5.3148417)"
-     id="g7113">
-    <path
-       style="color:#000000;text-indent:0;text-transform:none;fill:#060606"
-       d="m 16.309,10.676 c -3.725,0 -6.75,3.025 -6.75,6.75 0,0.03983 -9.401e-4,0.07667 0,0.125 v 0.21875 c -0.75815,0.64202 -1.25,1.585 -1.25,2.6562 0,1.933 1.567,3.5 3.5,3.5 v -7 c -0.24162,0 -0.49091,0.01588 -0.71875,0.0625 0.21566,-2.7031 2.4594,-4.8125 5.2188,-4.8125 2.753,0 4.9939,2.1183 5.2188,4.8125 -0.22784,-0.04662 -0.47712,-0.0625 -0.71875,-0.0625 v 7 c 1.933,0 3.5,-1.567 3.5,-3.5 0,-1.0873 -0.50338,-2.0455 -1.2812,-2.6875 0.0061,-0.10559 0.03125,-0.20307 0.03125,-0.3125 0,-3.725 -3.025,-6.75 -6.75,-6.75 z"
-       id="path9863-1-2-3" />
-    <path
-       style="color:#000000;text-indent:0;text-transform:none;fill:#bfbfbf"
-       d="m 15.309,9.6758 c -3.725,0 -6.75,3.025 -6.75,6.75 0,0.03983 -9.401e-4,0.07667 0,0.125 v 0.21875 c -0.75815,0.64202 -1.25,1.585 -1.25,2.6562 0,1.933 1.567,3.5 3.5,3.5 v -7 c -0.24162,0 -0.49091,0.01588 -0.71875,0.0625 0.21566,-2.7031 2.4594,-4.8125 5.2188,-4.8125 2.753,0 4.9939,2.1183 5.2188,4.8125 -0.22784,-0.04662 -0.47712,-0.0625 -0.71875,-0.0625 v 7 c 1.933,0 3.5,-1.567 3.5,-3.5 0,-1.0873 -0.50338,-2.0455 -1.2812,-2.6875 0.0061,-0.10559 0.03125,-0.20307 0.03125,-0.3125 0,-3.725 -3.025,-6.75 -6.75,-6.75 z"
-       id="path9863-1-2" />
-  </g>
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_pfl_small_down.svg b/res/skins/LateNight/buttons/btn_pfl_small_down.svg
deleted file mode 100644
index 71efa3c750d9..000000000000
--- a/res/skins/LateNight/buttons/btn_pfl_small_down.svg
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="20"
-   width="20"
-   id="svg25537">
-  <metadata
-     id="metadata22">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs25539">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.86956527,0,0,0.86956527,-0.43478261,-892.95656)"
-       y2="1027.4"
-       y1="1049.4"
-       x2="15"
-       x1="15"
-       id="linearGradient35942">
-      <stop
-         offset="0"
-         stop-color="#222"
-         id="stop3803-7-6" />
-      <stop
-         offset="1"
-         stop-color="#131516"
-         id="stop3805-5-2" />
-    </linearGradient>
-  </defs>
-  <rect
-     style="color:#000000;fill:url(#linearGradient35942);stroke-width:0.86956525"
-     height="20"
-     width="20"
-     y="-2.4424907e-15"
-     x="0"
-     id="rect3029-9" />
-  <path
-     style="display:none;fill:#8d8f90"
-     display="none"
-     d="m 10,3 h 3 V 9 H 11 V 4 H 10 V 3"
-     id="path3944-9" />
-  <path
-     style="display:none;fill:#080808"
-     display="none"
-     d="m 13,4 h 1 v 6 H 12 V 9 h 1 V 4"
-     id="path3948-7" />
-  <path
-     style="display:none;fill:#080808"
-     display="none"
-     d="m 10,4 h 7 v 4 h -5 v 1 h 5 v 1 H 10 V 7 h 5 V 5 H 10 V 4"
-     id="path5770-89-8" />
-  <path
-     style="display:none;fill:#8d8f90"
-     display="none"
-     d="m 9,3 h 7 v 4 h -5 v 1 h 5 V 9 H 9 V 6 h 5 V 4 H 9 V 3"
-     id="path5770-8-5-6" />
-  <path
-     style="display:none;fill:#080808"
-     display="none"
-     d="m 10,4 h 7 v 6 H 10 V 9 h 5 V 8 H 13 V 7 h 2 V 5 H 10 V 4"
-     id="path6542-5" />
-  <path
-     style="display:none;fill:#8d8f90"
-     display="none"
-     d="m 9,3 h 7 V 9 H 9 V 8 h 5 V 7 H 12 V 6 h 2 V 4 H 9 V 3"
-     id="path6542" />
-  <path
-     style="display:none;fill:#080808"
-     display="none"
-     d="m 10,5 v 3 h 5 v 2 h 2 V 4 H 15 V 7 H 12 V 5 h -2"
-     id="path6751-9-1-3-1" />
-  <path
-     style="display:none;fill:#8d8f90"
-     display="none"
-     d="m 9,4 v 3 h 5 v 2 h 2 V 3 H 14 V 6 H 11 V 4 H 9"
-     id="path6751-6-3-5" />
-  <g
-     transform="matrix(0.91666666,0,0,0.91666666,-6.2048334,-0.112465)"
-     id="g6490">
-    <path
-       style="color:#000000;text-indent:0;text-transform:none;fill:#080808"
-       d="m 18.678,4.7818 c -3.725,0 -6.75,3.025 -6.75,6.75 0,0.03983 -9.4e-4,0.07667 0,0.125 v 0.21875 c -0.75815,0.64202 -1.25,1.585 -1.25,2.6562 0,1.933 1.567,3.5 3.5,3.5 v -7 c -0.24162,0 -0.49091,0.01588 -0.71875,0.0625 0.21566,-2.7031 2.4594,-4.8125 5.2188,-4.8125 2.753,0 4.9939,2.1183 5.2188,4.8125 -0.22784,-0.04662 -0.47712,-0.0625 -0.71875,-0.0625 v 7 c 1.933,0 3.5,-1.567 3.5,-3.5 0,-1.0873 -0.50338,-2.0455 -1.2812,-2.6875 0.0061,-0.10559 0.03125,-0.20307 0.03125,-0.3125 0,-3.725 -3.025,-6.75 -6.75,-6.75 z"
-       id="path9863-1-2-3" />
-    <path
-       style="color:#000000;text-indent:0;text-transform:none;fill:#8d8f90"
-       d="m 17.678,3.7818 c -3.725,0 -6.75,3.025 -6.75,6.75 0,0.03983 -9.4e-4,0.07667 0,0.125 v 0.21875 c -0.75815,0.64202 -1.25,1.585 -1.25,2.6562 0,1.933 1.567,3.5 3.5,3.5 v -7 c -0.24162,0 -0.49091,0.01588 -0.71875,0.0625 0.21566,-2.7031 2.4594,-4.8125 5.2188,-4.8125 2.753,0 4.9939,2.1183 5.2188,4.8125 -0.22784,-0.04662 -0.47712,-0.0625 -0.71875,-0.0625 v 7 c 1.933,0 3.5,-1.567 3.5,-3.5 0,-1.0873 -0.50338,-2.0455 -1.2812,-2.6875 0.0061,-0.10559 0.03125,-0.20307 0.03125,-0.3125 0,-3.725 -3.025,-6.75 -6.75,-6.75 z"
-       id="path9863-1-2" />
-  </g>
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_pfl_small_over.svg b/res/skins/LateNight/buttons/btn_pfl_small_over.svg
deleted file mode 100644
index 6c32d4a56508..000000000000
--- a/res/skins/LateNight/buttons/btn_pfl_small_over.svg
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="20"
-   width="20"
-   id="svg25537">
-  <metadata
-     id="metadata14">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs25539">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.86956522,0,0,0.86956522,-0.43478261,-912.95652)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="11"
-       x1="11"
-       id="linearGradient4165">
-      <stop
-         offset="0"
-         stop-color="#ce0e0e"
-         id="stop3803-7-1-95-8" />
-      <stop
-         offset=".28"
-         stop-color="#d00"
-         id="stop4329-2-5" />
-      <stop
-         offset="1"
-         stop-color="#8d0000"
-         id="stop3805-5-28-1-9" />
-    </linearGradient>
-  </defs>
-  <rect
-     style="color:#000000;fill:url(#linearGradient4165);stroke-width:0.86956519"
-     height="20"
-     width="20"
-     y="-20"
-     x="0"
-     transform="scale(1,-1)"
-     id="rect3029-96-3" />
-  <path
-     style="color:#000000;text-indent:0;text-transform:none;fill:#320202;stroke-width:0.9130435"
-     d="M 10.913043,4.5217391 C 7.5119565,4.5217391 4.75,7.2836957 4.75,10.684783 c 0,0.03637 -8.584e-4,0.07 0,0.11413 v 0.199728 c -0.6922239,0.586192 -1.1413043,1.447174 -1.1413043,2.425226 0,1.764913 1.4307391,3.195653 3.1956521,3.195653 v -6.391305 c -0.2206095,0 -0.4482221,0.0145 -0.65625,0.05706 0.1969161,-2.4680474 2.2455392,-4.3940213 4.7649912,-4.3940213 2.513609,0 4.559648,1.9341 4.764991,4.3940213 -0.208027,-0.04257 -0.435631,-0.05706 -0.65625,-0.05706 v 6.391305 c 1.764913,0 3.195653,-1.43074 3.195653,-3.195653 0,-0.992752 -0.459608,-1.86763 -1.169792,-2.453804 0.0056,-0.09641 0.02853,-0.185412 0.02853,-0.285326 0,-3.401087 -2.761957,-6.1630435 -6.163044,-6.1630435 z"
-     id="path9863-1-2-3" />
-  <path
-     style="color:#000000;text-indent:0;text-transform:none;fill:#eeeeee;stroke-width:0.9130435"
-     d="m 10,3.6086957 c -3.401087,0 -6.1630435,2.7619565 -6.1630435,6.1630434 0,0.036367 -8.583e-4,0.070003 0,0.1141305 v 0.1997284 c -0.6922239,0.586192 -1.1413043,1.447174 -1.1413043,2.425226 0,1.764913 1.4307391,3.195652 3.1956521,3.195652 V 9.3151717 c -0.2206095,0 -0.4482221,0.014499 -0.65625,0.057065 0.1969161,-2.4680479 2.2455392,-4.3940218 4.7649917,-4.3940218 2.513608,0 4.559647,1.9341 4.764991,4.3940218 -0.208028,-0.042566 -0.435631,-0.057065 -0.65625,-0.057065 v 6.3913043 c 1.764913,0 3.195652,-1.430739 3.195652,-3.195652 0,-0.992752 -0.459608,-1.867631 -1.169791,-2.453804 0.0056,-0.096409 0.02853,-0.1854122 0.02853,-0.2853265 0,-3.401087 -2.761956,-6.1630435 -6.163043,-6.1630435 z"
-     id="path9863-1-2" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_pfl_small_overdown.svg b/res/skins/LateNight/buttons/btn_pfl_small_overdown.svg
deleted file mode 100644
index b2906f03e28b..000000000000
--- a/res/skins/LateNight/buttons/btn_pfl_small_overdown.svg
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="20"
-   width="20"
-   id="svg25537">
-  <metadata
-     id="metadata35">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs25539">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.91304348,0,0,0.91304348,-0.95652174,-938.10435)"
-       y2="1027.4"
-       y1="1049.4"
-       x2="15"
-       x1="15"
-       id="linearGradient5815">
-      <stop
-         offset="0"
-         stop-color="#aa1112"
-         id="stop3803-7-1-9-5" />
-      <stop
-         offset=".28"
-         stop-color="#b60607"
-         id="stop4329-4-9" />
-      <stop
-         offset="1"
-         stop-color="#760607"
-         id="stop3805-5-28-5-7" />
-    </linearGradient>
-  </defs>
-  <rect
-     style="color:#000000;fill:url(#linearGradient5815);stroke-width:0.9130435"
-     height="21"
-     width="21"
-     y="-0.5"
-     x="-0.5"
-     id="rect3029-96-4" />
-  <path
-     style="display:none;fill:#8d8f90"
-     display="none"
-     d="m 10,3 h 3 V 9 H 11 V 4 H 10 V 3"
-     id="path3944-9-6" />
-  <path
-     style="display:none;fill:#320202"
-     display="none"
-     d="m 13,4 h 1 v 6 H 12 V 9 h 1 V 4"
-     id="path3948-7-8" />
-  <path
-     style="display:none;fill:#320202"
-     display="none"
-     d="m 10,4 h 7 v 4 h -5 v 1 h 5 v 1 H 10 V 7 h 5 V 5 H 10 V 4"
-     id="path5770-89" />
-  <path
-     style="display:none;fill:#8d8f90"
-     display="none"
-     d="m 9,3 h 7 v 4 h -5 v 1 h 5 V 9 H 9 V 6 h 5 V 4 H 9 V 3"
-     id="path5770-8-5" />
-  <path
-     style="display:none;fill:#320202"
-     display="none"
-     d="m 10,4 h 7 v 6 H 10 V 9 h 5 V 8 H 13 V 7 h 2 V 5 H 10 V 4"
-     id="path6542-5-0-4-4" />
-  <path
-     style="display:none;fill:#8d8f90"
-     display="none"
-     d="m 9,3 h 7 V 9 H 9 V 8 h 5 V 7 H 12 V 6 h 2 V 4 H 9 V 3"
-     id="path6542-3-5-9" />
-  <path
-     style="display:none;fill:#320202"
-     display="none"
-     d="m 10,5 v 3 h 5 v 2 h 2 V 4 H 15 V 7 H 12 V 5 h -2"
-     id="path6751-9-1" />
-  <path
-     style="display:none;fill:#8d8f90"
-     display="none"
-     d="m 9,4 v 3 h 5 v 2 h 2 V 3 H 14 V 6 H 11 V 4 H 9"
-     id="path6751-6" />
-  <path
-     style="display:none;fill:#320202"
-     display="none"
-     d="m -23,-20.5 h 3 v -3 h 3 v 3 h 3 v 3 h -3 v 3 h -3 v -3 h -3 v -3"
-     id="path9276-9" />
-  <path
-     style="display:none;fill:#8d8f90"
-     display="none"
-     d="m -24,-21.5 h 3 v -3 h 3 v 3 h 3 v 3 h -3 v 3 h -3 v -3 h -3 v -3"
-     id="path9276" />
-  <path
-     style="display:none;fill:#320202"
-     display="none"
-     d="m -11,-20.5 h 9 v 3 h -9 v -3"
-     id="path9788-2" />
-  <path
-     style="display:none;fill:#8d8f90"
-     display="none"
-     d="m -12,-21.5 h 9 v 3 h -9 v -3"
-     id="path9788" />
-  <path
-     style="display:none;fill:#320202"
-     display="none"
-     d="M 13,-20.5 H 9 v -4 l -5,5.5 5,5.5 v -4 h 4 v -3"
-     id="path9792-3-2" />
-  <path
-     style="display:none;fill:#8d8f90"
-     display="none"
-     d="M 12,-21.5 H 8 v -4 l -5,5.5 5,5.5 v -4 h 4 v -3"
-     id="path9792-3" />
-  <path
-     style="display:none;fill:#320202"
-     display="none"
-     d="m 17,-20.5 h 4 v -4 l 5,5.5 -5,5.5 v -4 h -4 v -3"
-     id="path9792-0" />
-  <path
-     style="display:none;fill:#8d8f90"
-     display="none"
-     d="m 16,-21.5 h 4 v -4 l 5,5.5 -5,5.5 v -4 h -4 v -3"
-     id="path9792" />
-  <path
-     style="display:none;fill:#320202"
-     display="none"
-     d="m 41,-24 h 5 v 13 h -1 v -7 h -4 v -6"
-     id="path9817-3" />
-  <path
-     style="display:none;fill:#8d8f90"
-     display="none"
-     d="m 40,-25 h 5 v 13 h -1 v -7 h -4 v -6"
-     id="path9817" />
-  <path
-     style="display:none;fill:#320202"
-     display="none"
-     d="m 56,-24 h -5 v 13 h 1 v -7 h 4 v -6"
-     id="path9817-6-7" />
-  <path
-     style="display:none;fill:#8d8f90"
-     display="none"
-     d="m 55,-25 h -5 v 13 h 1 v -7 h 4 v -6"
-     id="path9817-6" />
-  <g
-     transform="matrix(0.91304348,0,0,0.91304348,-8.3788348,-5.0999861)"
-     id="g5888">
-    <path
-       style="color:#000000;text-indent:0;text-transform:none;fill:#320202"
-       d="m 21.129,10.538 c -3.725,0 -6.75,3.025 -6.75,6.75 0,0.03983 -9.4e-4,0.07667 0,0.125 v 0.21875 c -0.75815,0.64202 -1.25,1.585 -1.25,2.6562 0,1.933 1.567,3.5 3.5,3.5 v -7 c -0.24162,0 -0.49091,0.01588 -0.71875,0.0625 0.21566,-2.7031 2.4594,-4.8125 5.2188,-4.8125 2.753,0 4.9939,2.1182 5.2188,4.8125 -0.22784,-0.04662 -0.47712,-0.0625 -0.71875,-0.0625 v 7 c 1.933,0 3.5,-1.567 3.5,-3.5 0,-1.0873 -0.50338,-2.0455 -1.2812,-2.6875 0.0061,-0.10559 0.03125,-0.20307 0.03125,-0.3125 0,-3.725 -3.025,-6.75 -6.75,-6.75 z"
-       id="path9863-1-2-3" />
-    <path
-       style="color:#000000;text-indent:0;text-transform:none;fill:#8d8f90"
-       d="m 20.129,9.5381 c -3.725,0 -6.75,3.025 -6.75,6.75 0,0.03983 -9.4e-4,0.07667 0,0.125 v 0.21875 c -0.75815,0.64202 -1.25,1.585 -1.25,2.6562 0,1.933 1.567,3.5 3.5,3.5 v -7 c -0.24162,0 -0.49091,0.01588 -0.71875,0.0625 0.21566,-2.7031 2.4594,-4.8125 5.2188,-4.8125 2.753,0 4.9939,2.1182 5.2188,4.8125 -0.22784,-0.04662 -0.47712,-0.0625 -0.71875,-0.0625 v 7 c 1.933,0 3.5,-1.567 3.5,-3.5 0,-1.0873 -0.50338,-2.0455 -1.2812,-2.6875 0.0061,-0.10559 0.03125,-0.20307 0.03125,-0.3125 0,-3.725 -3.025,-6.75 -6.75,-6.75 z"
-       id="path9863-1-2" />
-  </g>
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_play_deck.svg b/res/skins/LateNight/buttons/btn_play_deck.svg
deleted file mode 100644
index faa81bedcfa6..000000000000
--- a/res/skins/LateNight/buttons/btn_play_deck.svg
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="26"
-   width="52"
-   id="svg2">
-  <metadata
-     id="metadata19">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.1304 0 0 1 -.56522 -1026.4)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient6467">
-      <stop
-         offset="0"
-         stop-color="#242424"
-         id="stop3803-7" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop3805-5" />
-    </linearGradient>
-  </defs>
-  <rect
-     fill="url(#linearGradient6467)"
-     color="#000000"
-     ry="2"
-     rx="2"
-     height="23"
-     width="49"
-     y=".49998"
-     x=".5"
-     id="rect3029" />
-  <path
-     fill="#060606"
-     d="m33 7v11h-3v1h4v-12h-1z"
-     id="path3940-3" />
-  <path
-     fill="#060606"
-     d="m39 7v11h-3v1h4v-12h-1z"
-     id="path3944-5" />
-  <path
-     fill="#bfbfbf"
-     d="m29 6h4v12h-4v-12"
-     id="path3940" />
-  <path
-     fill="#bfbfbf"
-     d="m35 6v12h4v-12h-4"
-     id="path3944" />
-  <path
-     fill="#060606"
-     d="m21.75 12.156-7.75 5.1875v1.6562l9-6-1.25-0.84375z"
-     id="path3936-0-8-9-3" />
-  <path
-     fill="#bfbfbf"
-     d="m13 6 8.9995 6-8.9995 6v-12"
-     id="path3936-0-8-9-7" />
-  <path
-     style="opacity:0.8;fill:#030303"
-     id="path15"
-     d="m 49.31367,1.1758 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.965572 -2,1.965572 L 2,23.965572 c -0.6598637,0 -1.13567505,-0.352003 -1.325,-0.511743 0.20909416,0.790888 0.7641575,1.546141 1.8242,1.546141 h 46 c 1.108,0 2,-0.892 2,-2 v -20 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z" />
-  <path
-     id="path19"
-     style="color:#000000;text-indent:0;text-transform:none;fill:#444444"
-     d="M 2,0 C 0.9006,0 0,0.90065 0,2 v 20 c 0,1.0994 0.90065,2 2,2 h 46 c 1.0994,0 2,-0.90065 2,-2 V 2 C 50,0.9006 49.09935,0 48,0 Z M 2.3,1 H 47.7 C 48.26265,1 49,1.73735 49,2.3 V 21.7 C 49,22.26265 48.26265,23 47.7,23 H 2.3 C 1.73735,23 1,22.26265 1,21.7 V 2.3 C 1,1.73735 1.73735,1 2.3,1 Z" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_play_deck_down.svg b/res/skins/LateNight/buttons/btn_play_deck_down.svg
deleted file mode 100644
index cae6712ba7df..000000000000
--- a/res/skins/LateNight/buttons/btn_play_deck_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="52" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient5899" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="matrix(2.1304 0 0 1 -.56522 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-6" stop-color="#222" offset="0"/><stop id="stop3805-5-2" stop-color="#131516" offset="1"/></linearGradient></defs><rect id="rect3029-9" x=".5" y=".49998" width="49" height="23" rx="2" ry="2" color="#000000" fill="url(#linearGradient5899)"/><path id="path3940-3-2" d="m33 7v11h-3v1h4v-12h-1z" fill="#080808"/><path id="path3944-5-7" d="m39 7v11h-3v1h4v-12h-1z" fill="#080808"/><path id="path3940-9" d="m29 6h4v12h-4v-12" fill="#8d8f90"/><path id="path3944-3" d="m35 6v12h4v-12h-4" fill="#8d8f90"/><path id="rect3029-96-0-9" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h46c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h45.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-45.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#454748" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path3936-0-8-9-3" d="m21.75 12.156-7.75 5.1875v1.6562l9-6-1.25-0.84375z" fill="#080808"/><path id="path3936-0-8-9-7" d="m13 6 8.9995 6-8.9995 6v-12" fill="#8d8f90"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_play_deck_over.svg b/res/skins/LateNight/buttons/btn_play_deck_over.svg
deleted file mode 100644
index 412c277696a6..000000000000
--- a/res/skins/LateNight/buttons/btn_play_deck_over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="52" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient5331" x1="11" x2="11" y1="1027.4" y2="1049.4" gradientTransform="matrix(2.1304 0 0 1 -.56522 -1050.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-95" stop-color="#ce0e0e" offset="0"/><stop id="stop4329-2" stop-color="#d00" offset=".28"/><stop id="stop3805-5-28-1" stop-color="#8d0000" offset="1"/></linearGradient></defs><rect id="rect3029-96-3" transform="scale(1,-1)" x=".5" y="-23.5" width="49" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient5331)"/><path id="rect3029-96" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h46c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h45.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-45.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path3940-3-2-6" d="m33 7v11h-3v1h4v-12h-1z" fill="#3d0000"/><path id="path3944-5-7-1" d="m39 7v11h-3v1h4v-12h-1z" fill="#3d0000"/><path id="path3940-9-7" d="m29 6h4v12h-4v-12" fill="#bfbfbf"/><path id="path3944-3-9" d="m35 6v12h4v-12h-4" fill="#bfbfbf"/><path id="path3936-0-8-9-3" d="m21.75 12.156-7.75 5.1875v1.6562l9-6-1.25-0.84375z" fill="#3d0000"/><path id="path3936-0-8-9-6" d="m13 6 8.9995 6-8.9995 6v-12" fill="#bfbfbf"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_play_deck_overdown.svg b/res/skins/LateNight/buttons/btn_play_deck_overdown.svg
deleted file mode 100644
index 5bcee808753c..000000000000
--- a/res/skins/LateNight/buttons/btn_play_deck_overdown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="52" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient3285" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="matrix(2.1304 0 0 1 -.56522 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-9" stop-color="#aa1112" offset="0"/><stop id="stop4329-4" stop-color="#b60607" offset=".28"/><stop id="stop3805-5-28-5" stop-color="#760607" offset="1"/></linearGradient></defs><rect id="rect3029-96-4" x=".5" y=".49998" width="49" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient3285)"/><path id="path3936-0-8-9-3" d="m21.75 12.156-7.75 5.1875v1.6562l9-6-1.25-0.84375z" fill="#320202"/><path id="path3940-3-2-6-7" d="m33 7v11h-3v1h4v-12h-1z" fill="#320202"/><path id="path3944-5-7-1-5" d="m39 7v11h-3v1h4v-12h-1z" fill="#320202"/><path id="path3940-9-7-2" d="m29 6h4v12h-4v-12" fill="#8d8f90"/><path id="path3944-3-9-2" d="m35 6v12h4v-12h-4" fill="#8d8f90"/><path id="rect3029-96-9" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h46c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h45.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-45.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path3936-0-8-9" d="m13 6 8.9995 6-8.9995 6v-12" fill="#8d8f90"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_play_deck_small.svg b/res/skins/LateNight/buttons/btn_play_deck_small.svg
deleted file mode 100644
index 07dc231d5dcb..000000000000
--- a/res/skins/LateNight/buttons/btn_play_deck_small.svg
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg33"
-   version="1.1"
-   height="38"
-   width="38">
-  <metadata
-     id="metadata37">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs7">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0 .9494 -.94623 0 36.011 .050715)"
-       y2="19"
-       y1="19"
-       x2="37"
-       x1=".99975"
-       id="a">
-      <stop
-         id="stop2"
-         offset="0"
-         stop-color="#242424" />
-      <stop
-         id="stop4"
-         offset="1"
-         stop-color="#101010" />
-    </linearGradient>
-  </defs>
-  <rect
-     style="color:#000000;opacity:0.9;stroke-width:0.98623788"
-     id="rect9"
-     ry="2"
-     rx="1.9999999"
-     height="36"
-     width="36"
-     y="1"
-     x="0.5" />
-  <path
-     id="path11"
-     opacity=".9"
-     fill="url(#a)"
-     color="#000000"
-     d="m35.064 33.28c0 1.0519-.84404 1.8988-1.8925 1.8988l-30.28-.000237c-1.0484-9e-6-1.8925-.84686-1.8925-1.8988v-30.381c0-1.0519.84404-1.8988 1.8925-1.8988l32.172.00023739z" />
-  <g
-     id="g23"
-     transform="translate(-10,-7)">
-    <path
-       id="path15"
-       fill="#060606"
-       d="m33 20v11h-3v1h4v-12z" />
-    <path
-       id="path17"
-       fill="#060606"
-       d="m39 20v11h-3v1h4v-12z" />
-    <path
-       id="path19"
-       fill="#bfbfbf"
-       d="m29 19h4v12h-4v-12" />
-    <path
-       id="path21"
-       fill="#bfbfbf"
-       d="m35 19v12h4v-12h-4" />
-  </g>
-  <path
-     id="path25"
-     style="text-indent:0;text-transform:none"
-     fill="#444444"
-     color="#000000"
-     d="m2.0002 0c-1.0994 0-2 .90065-2 2l-.00025 32c-8.5891e-6 1.0994.90065 2 2 2h32c1.0994 0 2-.90065 2-2l.00025-32c9e-6-1.0994-.90065-2-2-2zm.3 1h31.4c.56265 0 1.3.73735 1.3 1.3l-.00025 31.4c-4e-6.56265-.73735 1.3-1.3 1.3h-31.4c-.56265 0-1.3-.73735-1.3-1.3l.00025-31.4c4.5e-6-.56265.73735-1.3 1.3-1.3z" />
-  <g
-     id="g31"
-     transform="translate(-6,-7)">
-    <path
-       id="path27"
-       fill="#060606"
-       d="m21.75 25.156-7.75 5.1875v1.6562l9-6-1.25-.84375z" />
-    <path
-       id="path29"
-       fill="#bfbfbf"
-       d="m13 19 8.9995 6-8.9995 6v-12" />
-  </g>
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_play_deck_small_down.svg b/res/skins/LateNight/buttons/btn_play_deck_small_down.svg
deleted file mode 100644
index b9161bd399b1..000000000000
--- a/res/skins/LateNight/buttons/btn_play_deck_small_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="38" height="38" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><linearGradient id="a" x1="1" x2="35" y1="18.5" y2="18.5" gradientTransform="matrix(1.0059 0 0 .98861 -.10588 -.18862)" gradientUnits="userSpaceOnUse"><stop stop-color="#222" offset="0"/><stop stop-color="#131516" offset="1"/></linearGradient></defs><path d="m33.792.8c1.1145 0 1.3076.18981 1.3076 1.2852v31.339c0 1.0954-.89725 1.9772-2.0118 1.9772h-30.176c-1.1145 0-2.0118-.88184-2.0118-1.9772v-32.624z" color="#000000" fill="url(#a)"/><path d="m19 12h4v12h-4v-12" fill="#8d8f90"/><path d="m25 12v12h4v-12h-4" fill="#8d8f90"/><path d="m23 13v11h-3v1h4v-12z" fill="#060606"/><path d="m29 13v11h-3v1h4v-12z" fill="#060606"/><path d="m2 0c-1.0994 0-2 .90065-2 2v32c0 1.0994.90065 2 2 2h32c1.0994 0 2-.90065 2-2v-32c0-1.0994-.90065-2-2-2zm.3 1h31.4c.56265 0 1.3.73735 1.3 1.3v31.4c0 .56265-.73735 1.3-1.3 1.3h-31.4c-.56265 0-1.3-.73735-1.3-1.3v-31.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#454748" style="text-indent:0;text-transform:none"/><path d="m15.75 18.156-7.75 5.1875v1.6562l9-6-1.25-.84375z" fill="#080808"/><path d="m7 12 8.9995 6-8.9995 6v-12" fill="#8d8f90"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_play_deck_small_over.svg b/res/skins/LateNight/buttons/btn_play_deck_small_over.svg
deleted file mode 100644
index 16f5354608e4..000000000000
--- a/res/skins/LateNight/buttons/btn_play_deck_small_over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="38" height="38" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1="11" x2="11" y1="1014.9" y2="1049.4" gradientTransform="matrix(2.1304 0 0 -1 -.06522 1049.9)" gradientUnits="userSpaceOnUse"><stop stop-color="#ce0e0e" offset="0"/><stop stop-color="#d00" offset=".28"/><stop stop-color="#8d0000" offset="1"/></linearGradient></defs><path d="m2.5 35 31.933 9.4e-5c.831 2e-6 1.5-.669 1.5-1.5v-31.016c0-.831-.669-1.5-1.5-1.5l-33.433.015531v32.5c0 .831.669 1.5 1.5 1.5z" color="#000000" fill="url(#a)"/><path d="m19 12h4v12h-4v-12" fill="#bfbfbf"/><path d="m25 12v12h4v-12h-4" fill="#bfbfbf"/><g fill="#3d0000"><path d="m23 13v11h-3v1h4v-12z"/><path d="m29 13v11h-3v1h4v-12z"/><path d="m15.75 18.156-7.75 5.1875v1.6562l9-6-1.25-.84375z"/></g><path d="m2-.0001875c-1.0994-3.2209e-6-2 .90065-2 2v32c0 1.0994.90065 2 2 2l32 9.4e-5c1.0994 3e-6 2-.90065 2-2v-32c0-1.0994-.90065-2-2-2zm.3 1 31.4 9.375e-5c.56265 1.68e-6 1.3.73735 1.3 1.3v31.4c0 .56265-.73735 1.3-1.3 1.3l-31.4-9.4e-5c-.56265-2e-6-1.3-.73735-1.3-1.3v-31.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="text-indent:0;text-transform:none"/><path d="m7 12 8.9995 6-8.9995 6v-12" fill="#bfbfbf"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_play_deck_small_overdown.svg b/res/skins/LateNight/buttons/btn_play_deck_small_overdown.svg
deleted file mode 100644
index 43344767f46e..000000000000
--- a/res/skins/LateNight/buttons/btn_play_deck_small_overdown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="38" height="38" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="matrix(2.1304 0 0 1 -.26522 -1025.9)" gradientUnits="userSpaceOnUse"><stop stop-color="#aa1112" offset="0"/><stop stop-color="#b60607" offset=".28"/><stop stop-color="#760607" offset="1"/></linearGradient></defs><path d="m2.3 1h31.319c.831 0 1.5.669 1.5 1.5v31.011c0 .831-.669 1.5-1.5 1.5h-31.319c-.831 0-1.5-.669-1.5-1.5v-31.011c0-.831.669-1.5 1.5-1.5z" color="#000000" fill="url(#a)"/><path d="m23 13v11h-3v1h4v-12z" fill="#320202"/><path d="m29 13v11h-3v1h4v-12z" fill="#320202"/><path d="m19 12h4v12h-4v-12" fill="#8d8f90"/><path d="m25 12v12h4v-12h-4" fill="#8d8f90"/><path d="m15.75 18.156-7.75 5.1875v1.6562l9-6-1.25-.84375z" fill="#320202"/><path d="m7 12 8.9995 6-8.9995 6v-12" fill="#8d8f90"/><path d="m2 0c-1.0994 0-2 .90065-2 2v32c0 1.0994.90065 2 2 2h32c1.0994 0 2-.90065 2-2v-32c0-1.0994-.90065-2-2-2zm.3 1h31.4c.56265 0 1.3.73735 1.3 1.3v31.4c0 .56265-.73735 1.3-1.3 1.3h-31.4c-.56265 0-1.3-.73735-1.3-1.3v-31.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="text-indent:0;text-transform:none"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_play_preview.svg b/res/skins/LateNight/buttons/btn_play_preview.svg
deleted file mode 100644
index 6bd9ed7b9c97..000000000000
--- a/res/skins/LateNight/buttons/btn_play_preview.svg
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="26"
-   width="26"
-   id="svg2">
-  <metadata
-     id="metadata15">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0 -1026.4)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient5688">
-      <stop
-         offset="0"
-         stop-color="#242424"
-         id="stop3803-7" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop3805-5" />
-    </linearGradient>
-  </defs>
-  <rect
-     style="color:#000000;opacity:0.72000002"
-     ry="2"
-     rx="2"
-     height="24"
-     width="24"
-     y="0.99997997"
-     x="0.5"
-     id="rect3029-6-6" />
-  <rect
-     fill="url(#linearGradient5688)"
-     color="#000000"
-     ry="2"
-     rx="2"
-     height="23"
-     width="23"
-     y=".49998"
-     x=".5"
-     id="rect3029" />
-  <path
-     style="block-progression:tb;text-indent:0;text-transform:none"
-     fill="#444444"
-     color="#000000"
-     d="m2.6562 3.75e-4c-1.4658 1.4707e-5 -2.6562 1.1904-2.6562 2.6562v18.687c0 1.4658 1.1904 2.6563 2.6562 2.6562l18.687-1.88e-4c1.4658-1.4e-5 2.6562-1.1904 2.6562-2.6562v-18.687c0-1.4658-1.1904-2.6563-2.6562-2.6562zm0.125 1 18.437-1.875e-4c0.76725-7.8e-6 1.7812 1.014 1.7812 1.7812v18.437c0 0.76725-1.014 1.7812-1.7812 1.7812l-18.437 1.88e-4c-0.76725 8e-6 -1.7812-1.014-1.7812-1.7812v-18.437c0-0.76725 1.014-1.7812 1.7812-1.7812z"
-     id="path5055" />
-  <path
-     fill="#060606"
-     d="m17.75 12.156-7.75 5.1875v1.6562l9-6-1.25-0.84375z"
-     id="path3936-0-8-9-3-3" />
-  <path
-     fill="#bfbfbf"
-     d="M 9,6 17.9995,12 9,18 9,6"
-     id="path3936-0-8-9-7-6" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_play_preview_down.svg b/res/skins/LateNight/buttons/btn_play_preview_down.svg
deleted file mode 100644
index e9a95d89d9b4..000000000000
--- a/res/skins/LateNight/buttons/btn_play_preview_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient5688" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="translate(0 -1050.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-6" stop-color="#222" offset="0"/><stop id="stop3805-5-2" stop-color="#131516" offset="1"/></linearGradient></defs><rect id="rect3029" transform="scale(1,-1)" x=".5" y="-23.5" width="23" height="23" rx="2" ry="2" color="#000000" fill="url(#linearGradient5688)"/><path id="path5055" d="m2.6562 3.75e-4c-1.4658 1.4707e-5 -2.6562 1.1904-2.6562 2.6562v18.687c0 1.4658 1.1904 2.6563 2.6562 2.6562l18.687-1.88e-4c1.4658-1.4e-5 2.6562-1.1904 2.6562-2.6562v-18.687c0-1.4658-1.1904-2.6563-2.6562-2.6562zm0.125 1 18.437-1.875e-4c0.76725-7.8e-6 1.7812 1.014 1.7812 1.7812v18.437c0 0.76725-1.014 1.7812-1.7812 1.7812l-18.437 1.88e-4c-0.76725 8e-6 -1.7812-1.014-1.7812-1.7812v-18.437c0-0.76725 1.014-1.7812 1.7812-1.7812z" color="#000000" fill="#454748" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path3936-0-8-9-3-3" d="m17.75 12.156-7.75 5.1875v1.6562l9-6-1.25-0.84375z" fill="#080808"/><path id="path3936-0-8-9-7-6" d="M 9,6 17.9995,12 9,18 9,6" fill="#8d8f90"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_play_preview_over.svg b/res/skins/LateNight/buttons/btn_play_preview_over.svg
deleted file mode 100644
index 9e2d20160f19..000000000000
--- a/res/skins/LateNight/buttons/btn_play_preview_over.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   width="26"
-   height="26"
-   version="1.1"
-   sodipodi:docname="btn_play_preview_over.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)">
-  <metadata
-     id="metadata14">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="740"
-     id="namedview12"
-     showgrid="false"
-     inkscape:zoom="9.0769231"
-     inkscape:cx="0.38559322"
-     inkscape:cy="13"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5688"
-       x1="13"
-       x2="13"
-       y1="1027.4"
-       y2="1049.4"
-       gradientTransform="translate(0 -1050.4)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop3803-7-1-95"
-         stop-color="#ce0e0e"
-         offset="0" />
-      <stop
-         id="stop4329-2"
-         stop-color="#d00"
-         offset=".28" />
-      <stop
-         id="stop3805-5-28-1"
-         stop-color="#8d0000"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <rect
-     id="rect3029"
-     transform="scale(1,-1)"
-     x=".5"
-     y="-23.5"
-     width="23"
-     height="23"
-     rx="2"
-     ry="2"
-     color="#000000"
-     fill="url(#linearGradient5688)" />
-  <path
-     id="path5055"
-     d="m2.6562 3.75e-4c-1.4658 1.4707e-5 -2.6562 1.1904-2.6562 2.6562v18.687c0 1.4658 1.1904 2.6563 2.6562 2.6562l18.687-1.88e-4c1.4658-1.4e-5 2.6562-1.1904 2.6562-2.6562v-18.687c0-1.4658-1.1904-2.6563-2.6562-2.6562zm0.125 1 18.437-1.875e-4c0.76725-7.8e-6 1.7812 1.014 1.7812 1.7812v18.437c0 0.76725-1.014 1.7812-1.7812 1.7812l-18.437 1.88e-4c-0.76725 8e-6 -1.7812-1.014-1.7812-1.7812v-18.437c0-0.76725 1.014-1.7812 1.7812-1.7812z"
-     color="#000000"
-     fill="#979797"
-     style="block-progression:tb;text-indent:0;text-transform:none" />
-  <path
-     inkscape:connector-curvature="0"
-     style="fill:#3d0000"
-     id="path3940-3-2-6"
-     d="M 11,7 V 18 H 8 v 1 h 4 V 7 Z" />
-  <path
-     inkscape:connector-curvature="0"
-     style="fill:#3d0000"
-     id="path3944-5-7-1"
-     d="m 17,7 v 11 h -3 v 1 h 4 V 7 Z" />
-  <path
-     inkscape:connector-curvature="0"
-     style="fill:#bfbfbf"
-     id="path3940-9-7"
-     d="m 7,6 h 4 V 18 H 7 V 6" />
-  <path
-     inkscape:connector-curvature="0"
-     style="fill:#bfbfbf"
-     id="path3944-3-9"
-     d="m 13,6 v 12 h 4 V 6 h -4" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_play_preview_overdown.svg b/res/skins/LateNight/buttons/btn_play_preview_overdown.svg
deleted file mode 100644
index d80c24b9843f..000000000000
--- a/res/skins/LateNight/buttons/btn_play_preview_overdown.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   width="26"
-   height="26"
-   version="1.1"
-   sodipodi:docname="btn_play_preview_overdown.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)">
-  <metadata
-     id="metadata14">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="740"
-     id="namedview12"
-     showgrid="false"
-     inkscape:zoom="9.0769231"
-     inkscape:cx="0.38559322"
-     inkscape:cy="13"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5688"
-       x1="13"
-       x2="13"
-       y1="1027.4"
-       y2="1049.4"
-       gradientTransform="translate(0 -1050.4)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop3803-7-1-9"
-         stop-color="#aa1112"
-         offset="0" />
-      <stop
-         id="stop4329-4"
-         stop-color="#b60607"
-         offset=".28" />
-      <stop
-         id="stop3805-5-28-5"
-         stop-color="#760607"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <rect
-     id="rect3029"
-     transform="scale(1,-1)"
-     x=".5"
-     y="-23.5"
-     width="23"
-     height="23"
-     rx="2"
-     ry="2"
-     color="#000000"
-     fill="url(#linearGradient5688)" />
-  <path
-     id="path5055"
-     d="m2.6562 3.75e-4c-1.4658 1.4707e-5 -2.6562 1.1904-2.6562 2.6562v18.687c0 1.4658 1.1904 2.6563 2.6562 2.6562l18.687-1.88e-4c1.4658-1.4e-5 2.6562-1.1904 2.6562-2.6562v-18.687c0-1.4658-1.1904-2.6563-2.6562-2.6562zm0.125 1 18.437-1.875e-4c0.76725-7.8e-6 1.7812 1.014 1.7812 1.7812v18.437c0 0.76725-1.014 1.7812-1.7812 1.7812l-18.437 1.88e-4c-0.76725 8e-6 -1.7812-1.014-1.7812-1.7812v-18.437c0-0.76725 1.014-1.7812 1.7812-1.7812z"
-     color="#000000"
-     fill="#979797"
-     style="block-progression:tb;text-indent:0;text-transform:none" />
-  <path
-     inkscape:connector-curvature="0"
-     style="fill:#320202"
-     id="path3940-3-2-6-7"
-     d="M 11,7 V 18 H 8 v 1 h 4 V 7 Z" />
-  <path
-     inkscape:connector-curvature="0"
-     style="fill:#320202"
-     id="path3944-5-7-1-5"
-     d="m 17,7 v 11 h -3 v 1 h 4 V 7 Z" />
-  <path
-     inkscape:connector-curvature="0"
-     style="fill:#8d8f90"
-     id="path3940-9-7-2"
-     d="m 7,6 h 4 V 18 H 7 V 6" />
-  <path
-     inkscape:connector-curvature="0"
-     style="fill:#8d8f90"
-     id="path3944-3-9-2"
-     d="m 13,6 v 12 h 4 V 6 h -4" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_play_sampler.svg b/res/skins/LateNight/buttons/btn_play_sampler.svg
deleted file mode 100644
index 2425203377d5..000000000000
--- a/res/skins/LateNight/buttons/btn_play_sampler.svg
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="34"
-   width="34"
-   id="svg2">
-  <metadata
-     id="metadata16">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3478 0 0 1.3478 -.17391 -1383.5)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient5688">
-      <stop
-         offset="0"
-         stop-color="#242424"
-         id="stop3803-7" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop3805-5" />
-    </linearGradient>
-  </defs>
-  <rect
-     style="color:#000000;opacity:0.72000002"
-     ry="2"
-     rx="2"
-     height="32"
-     width="32"
-     y="0.99997997"
-     x="0.5"
-     id="rect3029-6-6" />
-  <rect
-     fill="url(#linearGradient5688)"
-     color="#000000"
-     ry="2"
-     rx="2"
-     height="31"
-     width="31"
-     y=".49998"
-     x=".5"
-     id="rect3029" />
-  <g
-     transform="translate(0 -1018.4)"
-     id="g3770">
-    <path
-       fill="#060606"
-       d="m23.95 1035.4-11.95 7.9777v1.6562l13.2-8.7902z"
-       id="path3936-0-8-9-3" />
-    <path
-       fill="#bfbfbf"
-       d="m11 1026.7 12.95 8.634-12.95 8.6339v-17.268"
-       id="path3936-0-8-9-7" />
-  </g>
-  <path
-     style="block-progression:tb;text-indent:0;text-transform:none"
-     fill="#444444"
-     color="#000000"
-     d="m2.6562 0c-1.4658 0-2.6562 1.1904-2.6562 2.6562v26.688c0 1.4658 1.1904 2.6562 2.6562 2.6562h26.688c1.4658 0 2.6562-1.1904 2.6562-2.6562v-26.688c0-1.4658-1.1904-2.6562-2.6562-2.6562h-26.688zm0.125 1h26.438c0.76725 0 1.7812 1.014 1.7812 1.7812v26.438c0 0.76725-1.014 1.7812-1.7812 1.7812h-26.438c-0.76725 0-1.7812-1.014-1.7812-1.7812v-26.438c0-0.76725 1.014-1.7812 1.7812-1.7812z"
-     id="path5055" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_play_sampler_down.svg b/res/skins/LateNight/buttons/btn_play_sampler_down.svg
deleted file mode 100644
index 76e62a939548..000000000000
--- a/res/skins/LateNight/buttons/btn_play_sampler_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="34" height="34" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient3830" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="matrix(1.3478 0 0 1.3478 -.17391 -1383.5)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-6" stop-color="#222" offset="0"/><stop id="stop3805-5-2" stop-color="#131516" offset="1"/></linearGradient></defs><rect id="rect3029-9" x=".5" y=".5" width="31" height="31" rx="2" ry="2" color="#000000" fill="url(#linearGradient3830)"/><g id="g3770" transform="translate(0 -1018.4)"><path id="path3936-0-8-9-3" d="m23.95 1035.4-11.95 7.9777v1.6562l13.2-8.7902z" fill="#080808"/><path id="path3936-0-8-9-7" d="m11 1026.7 12.95 8.634-12.95 8.6339v-17.268" fill="#8d8f90"/></g><path id="path5055" d="m2.6562 0c-1.4658 0-2.6562 1.1904-2.6562 2.6562v26.688c0 1.4658 1.1904 2.6562 2.6562 2.6562h26.688c1.4658 0 2.6562-1.1904 2.6562-2.6562v-26.688c0-1.4658-1.1904-2.6562-2.6562-2.6562h-26.688zm0.125 1h26.438c0.76725 0 1.7812 1.014 1.7812 1.7812v26.438c0 0.76725-1.014 1.7812-1.7812 1.7812h-26.438c-0.76725 0-1.7812-1.014-1.7812-1.7812v-26.438c0-0.76725 1.014-1.7812 1.7812-1.7812z" color="#000000" fill="#454748" style="block-progression:tb;text-indent:0;text-transform:none"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_play_sampler_over.svg b/res/skins/LateNight/buttons/btn_play_sampler_over.svg
deleted file mode 100644
index 0bdd3fed888d..000000000000
--- a/res/skins/LateNight/buttons/btn_play_sampler_over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="34" height="34" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient4736" x1="11" x2="11" y1="1027.4" y2="1049.4" gradientTransform="matrix(1.3478 0 0 1.3478 -.17391 -1415.5)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-95" stop-color="#ce0e0e" offset="0"/><stop id="stop4329-2" stop-color="#d00" offset=".28"/><stop id="stop3805-5-28-1" stop-color="#8d0000" offset="1"/></linearGradient></defs><rect id="rect3029-96-3" transform="scale(1,-1)" x=".5" y="-31.5" width="31" height="31" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient4736)"/><path id="path3936-0-8-9-3" d="m23.95 17-11.95 7.9777v1.6562l13.2-8.7902z" fill="#3d0000"/><path id="path3936-0-8-9-7" d="m11 8.3661 12.95 8.634-12.95 8.6339v-17.268" fill="#bfbfbf"/><path id="path5055" d="m2.6562 0c-1.4658 0-2.6562 1.1904-2.6562 2.6562v26.688c0 1.4658 1.1904 2.6562 2.6562 2.6562h26.688c1.4658 0 2.6562-1.1904 2.6562-2.6562v-26.688c0-1.4658-1.1904-2.6562-2.6562-2.6562h-26.688zm0.125 1h26.438c0.76725 0 1.7812 1.014 1.7812 1.7812v26.438c0 0.76725-1.014 1.7812-1.7812 1.7812h-26.438c-0.76725 0-1.7812-1.014-1.7812-1.7812v-26.438c0-0.76725 1.014-1.7812 1.7812-1.7812z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_play_sampler_overdown.svg b/res/skins/LateNight/buttons/btn_play_sampler_overdown.svg
deleted file mode 100644
index 3d44d1972396..000000000000
--- a/res/skins/LateNight/buttons/btn_play_sampler_overdown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="34" height="34" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient4836" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="matrix(1.3478 0 0 1.3478 -.17391 -1383.5)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-9" stop-color="#aa1112" offset="0"/><stop id="stop4329-4" stop-color="#b60607" offset=".28"/><stop id="stop3805-5-28-5" stop-color="#760607" offset="1"/></linearGradient></defs><rect id="rect3029-96-4" x=".5" y=".5" width="31" height="31" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient4836)"/><path id="path3936-0-8-9-3" d="m23.95 17-11.95 7.9777v1.6562l13.2-8.7902z" fill="#320202"/><path id="path3936-0-8-9-7" d="m11 8.3661 12.95 8.634-12.95 8.6339v-17.268" fill="#8d8f90"/><path id="path5055" d="m2.6562 0c-1.4658 0-2.6562 1.1904-2.6562 2.6562v26.688c0 1.4658 1.1904 2.6562 2.6562 2.6562h26.688c1.4658 0 2.6562-1.1904 2.6562-2.6562v-26.688c0-1.4658-1.1904-2.6562-2.6562-2.6562h-26.688zm0.125 1h26.438c0.76725 0 1.7812 1.014 1.7812 1.7812v26.438c0 0.76725-1.014 1.7812-1.7812 1.7812h-26.438c-0.76725 0-1.7812-1.014-1.7812-1.7812v-26.438c0-0.76725 1.014-1.7812 1.7812-1.7812z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_plus.svg b/res/skins/LateNight/buttons/btn_plus.svg
deleted file mode 100644
index 0094966dc885..000000000000
--- a/res/skins/LateNight/buttons/btn_plus.svg
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="26"
-   width="26"
-   id="svg8760">
-  <metadata
-     id="metadata16">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8762">
-    <linearGradient
-       gradientTransform="translate(0,-1026.4)"
-       gradientUnits="userSpaceOnUse"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient3807-3-3">
-      <stop
-         offset="0"
-         stop-color="#242424"
-         id="stop3803-7-6" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop3805-5-2" />
-    </linearGradient>
-  </defs>
-  <rect
-     id="rect3029-6-6"
-     x="0.5"
-     y="1.0000244"
-     width="24"
-     height="24"
-     rx="2"
-     ry="2"
-     style="color:#000000;opacity:0.72000002" />
-  <rect
-     id="rect3029"
-     x="0.5"
-     y="0.50002444"
-     width="23"
-     height="23"
-     rx="2"
-     ry="2"
-     style="color:#000000;fill:url(#linearGradient3807-3-3)" />
-  <path
-     id="rect3029-96-0"
-     d="M 2,0 C 0.9006,0 0,0.9006 0,2 v 20 c 0,1.0994 0.90065,2 2,2 h 20 c 1.0994,0 2,-0.9006 2,-2 V 2 C 24,0.9006 23.09935,0 22,0 Z M 2.3,1 H 21.7 C 22.26265,1 23,1.7374 23,2.3 V 21.7 C 23,22.2626 22.26265,23 21.7,23 H 2.3 C 1.73735,23 1,22.2626 1,21.7 V 2.3 C 1,1.7374 1.73735,1 2.3,1 Z"
-     style="color:#000000;text-indent:0;text-transform:none;fill:#444444" />
-  <path
-     id="path9276-9-3-7"
-     d="m 9,12 h 3 V 9 h 3 v 3 h 3 v 3 h -3 v 3 H 12 V 15 H 9 v -3"
-     style="fill:#060606" />
-  <path
-     id="path9276-5-5"
-     d="m 8,11 h 3 V 8 h 3 v 3 h 3 v 3 h -3 v 3 H 11 V 14 H 8 v -3"
-     style="fill:#bfbfbf" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_plus_overdown.svg b/res/skins/LateNight/buttons/btn_plus_overdown.svg
deleted file mode 100644
index 92c989279069..000000000000
--- a/res/skins/LateNight/buttons/btn_plus_overdown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg25537" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs25539"><linearGradient id="linearGradient35870" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-9" stop-color="#aa1112" offset="0"/><stop id="stop4329-4" stop-color="#b60607" offset=".28"/><stop id="stop3805-5-28-5" stop-color="#760607" offset="1"/></linearGradient></defs><rect id="rect3029-96-4" x=".5" y=".49998" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient35870)"/><path id="path9276-9" d="m9 12h3v-3h3v3h3v3h-3v3h-3v-3h-3v-3" fill="#320202"/><path id="path9276" d="m8 11h3v-3h3v3h3v3h-3v3h-3v-3h-3v-3" fill="#8d8f90"/><path id="rect3029-96-9" d="m2 0c-1.0994 0-2 0.9006-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.9006 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.7374 1.3 1.3v19.4c0 0.5626-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.7374-1.3-1.3v-19.4c0-0.5626 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_power_off.svg b/res/skins/LateNight/buttons/btn_power_off.svg
deleted file mode 100644
index 55fb7cd4aa7a..000000000000
--- a/res/skins/LateNight/buttons/btn_power_off.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="48" height="48" version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path id="path2985" d="m26 4.9955h-4v14.078h4z" fill="#8d8f90"/><path id="path6" d="m33.13 11.87-2.89 2.89c3.45 2.11 5.76 5.9 5.76 10.24 0 6.63-5.37 12-12 12s-12-5.37-12-12c0-4.34 2.31-8.13 5.76-10.24l-2.89-2.89c-4.15 2.89-6.87 7.69-6.87 13.13 0 8.84 7.16 16 16 16s16-7.16 16-16c0-5.44-2.72-10.24-6.87-13.13z" fill="#8d8f90"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_power_on.svg b/res/skins/LateNight/buttons/btn_power_on.svg
deleted file mode 100644
index e8a832f9499e..000000000000
--- a/res/skins/LateNight/buttons/btn_power_on.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="48" height="48" version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path id="path6" d="m33.13 11.87-2.89 2.89c3.45 2.11 5.76 5.9 5.76 10.24 0 6.63-5.37 12-12 12s-12-5.37-12-12c0-4.34 2.31-8.13 5.76-10.24l-2.89-2.89c-4.15 2.89-6.87 7.69-6.87 13.13 0 8.84 7.16 16 16 16s16-7.16 16-16c0-5.44-2.72-10.24-6.87-13.13z" fill="#bfbfbf"/><path id="path2985-3" d="m26 4.9955h-4v14.078h4z" fill="#bfbfbf"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_prev_down.svg b/res/skins/LateNight/buttons/btn_prev_down.svg
deleted file mode 100644
index 248b452db655..000000000000
--- a/res/skins/LateNight/buttons/btn_prev_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg7815" width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg"><g id="layer1" transform="translate(0 -1030.4)"><path id="path3936-0-8-9-7" d="m11 1036.7-7 4.667 7 4.6669v-9.3339" fill="#8d8f90"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_quantize.svg b/res/skins/LateNight/buttons/btn_quantize.svg
deleted file mode 100644
index a7217d141c18..000000000000
--- a/res/skins/LateNight/buttons/btn_quantize.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="25" height="18" version="1.1" viewBox="0 0 25 18" xmlns="http://www.w3.org/2000/svg"><path id="path4448" d="m11.156 4c-2.7614 0-5 2.2386-5 5s2.2386 5 5 5h3.8438v-3h-3.9688c-1.1046 0-2-0.89543-2-2 0-1.1046 0.89543-2 2-2h3.9688v-3z" fill="#585858"/><path id="path4481" d="m19 11h-3v3h3z" fill="#585858"/><path id="path4450" d="m19 4h-2.9896v3h2.9896z" fill="#585858"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_quantize_over.svg b/res/skins/LateNight/buttons/btn_quantize_over.svg
deleted file mode 100644
index ae5e81ca21ad..000000000000
--- a/res/skins/LateNight/buttons/btn_quantize_over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="25" height="18" version="1.1" viewBox="0 0 25 18" xmlns="http://www.w3.org/2000/svg"><path id="path4448" d="m11.156 4c-2.7614 0-5 2.2386-5 5s2.2386 5 5 5h3.8438v-3h-3.9688c-1.1046 0-2-0.89543-2-2 0-1.1046 0.89543-2 2-2h3.9688v-3z" fill="#f0bb2b"/><path id="path4481" d="m19 11h-3v3h3z" fill="#f0bb2b"/><path id="path4450" d="m19 4h-2.9896v3h2.9896z" fill="#f0bb2b"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_quickEffect.svg b/res/skins/LateNight/buttons/btn_quickEffect.svg
deleted file mode 100644
index d7cbf678a6c3..000000000000
--- a/res/skins/LateNight/buttons/btn_quickEffect.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="18"
-   width="18"
-   id="svg3249">
-  <metadata
-     id="metadata13">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3251">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.56522,0,0,0.56522,2.2174,-577.94)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient3807-3">
-      <stop
-         offset="0"
-         stop-color="#242424"
-         id="stop3803-7" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop3805-5" />
-    </linearGradient>
-  </defs>
-  <rect
-     id="rect3029-6-6"
-     x="2.5"
-     y="3"
-     width="14"
-     height="14"
-     style="color:#000000;opacity:0.72000002" />
-  <rect
-     id="rect3029"
-     x="2.5"
-     y="2.5000243"
-     width="13"
-     height="13"
-     style="color:#000000;fill:url(#linearGradient3807-3);stroke:#444444" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_quickEffect_down.svg b/res/skins/LateNight/buttons/btn_quickEffect_down.svg
deleted file mode 100644
index 824131bfeb7f..000000000000
--- a/res/skins/LateNight/buttons/btn_quickEffect_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg3249" width="18" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs3251"><linearGradient id="linearGradient3807-3" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="matrix(.56522 0 0 .56522 2.2174 -1630.3)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-6" stop-color="#222" offset="0"/><stop id="stop3805-5-2" stop-color="#131516" offset="1"/></linearGradient></defs><g id="layer1" transform="translate(0 -1034.4)"><rect id="rect3029" transform="scale(1,-1)" x="2.5" y="-1049.9" width="13" height="13" color="#000000" fill="url(#linearGradient3807-3)" stroke="#444444"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_quickEffect_over.svg b/res/skins/LateNight/buttons/btn_quickEffect_over.svg
deleted file mode 100644
index 6e6c62167493..000000000000
--- a/res/skins/LateNight/buttons/btn_quickEffect_over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg3249" width="18" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs3251"><linearGradient id="linearGradient3807-3" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="matrix(.56522 0 0 .56522 2.2174 -1630.3)" gradientUnits="userSpaceOnUse"><stop id="stop4819" stop-color="#659f08" offset="0"/><stop id="stop4825" stop-color="#5b9402" offset=".72857"/><stop id="stop4823" stop-color="#456e05" offset="1"/></linearGradient></defs><g id="layer1" transform="translate(0 -1034.4)"><rect id="rect3029" transform="scale(1,-1)" x="2.5" y="-1049.9" width="13" height="13" color="#000000" fill="url(#linearGradient3807-3)" stroke="#979797"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_quickEffect_overdown.svg b/res/skins/LateNight/buttons/btn_quickEffect_overdown.svg
deleted file mode 100644
index 24787bcce0e7..000000000000
--- a/res/skins/LateNight/buttons/btn_quickEffect_overdown.svg
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="18"
-   width="18"
-   id="svg3249">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3251">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(.56522 0 0 .56522 2.2174 -1630.3)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient3807-3">
-      <stop
-         style="stop-color:#73b503;stop-opacity:1"
-         offset="0"
-         stop-color="#7fcd03"
-         id="stop4819" />
-      <stop
-         style="stop-color:#5a8e02;stop-opacity:1"
-         offset=".72857"
-         stop-color="#66a602"
-         id="stop4825" />
-      <stop
-         style="stop-color:#446b01;stop-opacity:1"
-         offset="1"
-         stop-color="#508301"
-         id="stop4823" />
-    </linearGradient>
-  </defs>
-  <g
-     transform="translate(0 -1034.4)"
-     id="layer1">
-    <rect
-       stroke="#979797"
-       fill="url(#linearGradient3807-3)"
-       color="#000000"
-       height="13"
-       width="13"
-       y="-1049.9"
-       x="2.5"
-       transform="scale(1,-1)"
-       id="rect3029" />
-  </g>
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_reloop.svg b/res/skins/LateNight/buttons/btn_reloop.svg
deleted file mode 100644
index 41c523d49079..000000000000
--- a/res/skins/LateNight/buttons/btn_reloop.svg
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="26"
-   width="26"
-   id="svg4272">
-  <metadata
-     id="metadata21">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4282">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0 -1026.4)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient3807-3">
-      <stop
-         offset="0"
-         stop-color="#242424"
-         id="stop3803-7" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop3805-5" />
-    </linearGradient>
-  </defs>
-  <rect
-     style="color:#000000;opacity:0.72000002"
-     ry="2"
-     rx="2"
-     height="24"
-     width="24"
-     y="1"
-     x="0.5"
-     id="rect3029-6-6" />
-  <rect
-     fill="url(#linearGradient3807-3)"
-     color="#000000"
-     ry="2"
-     rx="2"
-     height="23"
-     width="23"
-     y=".49998"
-     x=".5"
-     id="rect3029" />
-  <g
-     fill="#060606"
-     transform="translate(2,-2.5e-4)"
-     id="layer4-9-1">
-    <path
-       color="#000000"
-       d="m6 6.0001c-1.6447-1.028e-4 -3 1.3553-3 3v7.0002c0 1.6447 1.3553 3 3 3l1.0002-1.25e-4v3l6.9998-3.75-6.9999-3.7501v3l-1.0002 1.24e-4c-0.74686 9.3e-5 -1.4999-0.76713-1.4999-1.4999v-7.0002c0-0.71175 0.76705-1.4999 1.5-1.4999l2 1.24e-4v-1.5001z"
-       id="path4276-5-2" />
-    <path
-       color="#000000"
-       d="m10 3h2v8h-2z"
-       id="path3871-3-7" />
-    <path
-       color="#000000"
-       d="m16 6.0001c1.6447-1.028e-4 3 1.3553 3 3v7.0002c0 1.6447-1.3553 3-3 3l-1.0002-6.3e-5 5e-4 -1.5001 1.0002 6.2e-5c0.78903 4.9e-5 1.4995-0.78813 1.4995-1.4999v-7.0002c0-0.72579-0.75327-1.4999-1.5001-1.4999l-1.9998 1.25e-4 1.25e-4 -1.5001z"
-       id="path4278-5-0" />
-  </g>
-  <g
-     fill="#bfbfbf"
-     transform="translate(1,-1)"
-     id="layer4-9">
-    <path
-       color="#000000"
-       d="m6 6.0001c-1.6447-1.028e-4 -3 1.3553-3 3v7.0002c0 1.6447 1.3553 3 3 3l1.0002-1.25e-4v3l6.9998-3.75-6.9999-3.7501v3l-1.0002 1.24e-4c-0.74686 9.3e-5 -1.4999-0.76713-1.4999-1.4999v-7.0002c0-0.71175 0.76705-1.4999 1.5-1.4999l2 1.24e-4v-1.5001z"
-       id="path4276-5" />
-    <path
-       color="#000000"
-       d="m10 3h2v8h-2z"
-       id="path3871-3" />
-    <path
-       color="#000000"
-       d="m16 6.0001c1.6447-1.028e-4 3 1.3553 3 3v7.0002c0 1.6447-1.3553 3-3 3l-1.0002-6.3e-5 5e-4 -1.5001 1.0002 6.2e-5c0.78903 4.9e-5 1.4995-0.78813 1.4995-1.4999v-7.0002c0-0.72579-0.75327-1.4999-1.5001-1.4999l-1.9998 1.25e-4 1.25e-4 -1.5001z"
-       id="path4278-5" />
-  </g>
-  <path
-     style="block-progression:tb;text-indent:0;text-transform:none"
-     fill="#444444"
-     color="#000000"
-     d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z"
-     id="rect3029-96-0" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_reloop_down.svg b/res/skins/LateNight/buttons/btn_reloop_down.svg
deleted file mode 100644
index 461c9a8e30ef..000000000000
--- a/res/skins/LateNight/buttons/btn_reloop_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg4272" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4282"><linearGradient id="linearGradient11236" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-6" stop-color="#222" offset="0"/><stop id="stop3805-5-2" stop-color="#131516" offset="1"/></linearGradient></defs><rect id="rect3029-9" x=".5" y=".49998" width="23" height="23" rx="2" ry="2" color="#000000" fill="url(#linearGradient11236)"/><g id="layer4-9-1-9" transform="translate(2,-2.5e-4)" fill="#080808"><path id="path4276-5-2-3" d="m6 6.0001c-1.6447-1.028e-4 -3 1.3553-3 3v7.0002c0 1.6447 1.3553 3 3 3l1.0002-1.25e-4v3l6.9998-3.75-6.9999-3.7501v3l-1.0002 1.24e-4c-0.74686 9.3e-5 -1.4999-0.76713-1.4999-1.4999v-7.0002c0-0.71175 0.76705-1.4999 1.5-1.4999l2 1.24e-4v-1.5001z" color="#000000"/><path id="path3871-3-7-1" d="m10 3h2v8h-2z" color="#000000"/><path id="path4278-5-0-94" d="m16 6.0001c1.6447-1.028e-4 3 1.3553 3 3v7.0002c0 1.6447-1.3553 3-3 3l-1.0002-6.3e-5 5e-4 -1.5001 1.0002 6.2e-5c0.78903 4.9e-5 1.4995-0.78813 1.4995-1.4999v-7.0002c0-0.72579-0.75327-1.4999-1.5001-1.4999l-1.9998 1.25e-4 1.25e-4 -1.5001z" color="#000000"/></g><g id="layer4-9-78" transform="translate(1,-1)" fill="#8d8f90"><path id="path4276-5-4" d="m6 6.0001c-1.6447-1.028e-4 -3 1.3553-3 3v7.0002c0 1.6447 1.3553 3 3 3l1.0002-1.25e-4v3l6.9998-3.75-6.9999-3.7501v3l-1.0002 1.24e-4c-0.74686 9.3e-5 -1.4999-0.76713-1.4999-1.4999v-7.0002c0-0.71175 0.76705-1.4999 1.5-1.4999l2 1.24e-4v-1.5001z" color="#000000"/><path id="path3871-3-5" d="m10 3h2v8h-2z" color="#000000"/><path id="path4278-5-03" d="m16 6.0001c1.6447-1.028e-4 3 1.3553 3 3v7.0002c0 1.6447-1.3553 3-3 3l-1.0002-6.3e-5 5e-4 -1.5001 1.0002 6.2e-5c0.78903 4.9e-5 1.4995-0.78813 1.4995-1.4999v-7.0002c0-0.72579-0.75327-1.4999-1.5001-1.4999l-1.9998 1.25e-4 1.25e-4 -1.5001z" color="#000000"/></g><path id="rect3029-96-0-9" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#454748" style="block-progression:tb;text-indent:0;text-transform:none"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_reloop_over.svg b/res/skins/LateNight/buttons/btn_reloop_over.svg
deleted file mode 100644
index 2c10b39d4bdc..000000000000
--- a/res/skins/LateNight/buttons/btn_reloop_over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg4272" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4282"><linearGradient id="linearGradient4650" x1="11" x2="11" y1="1027.4" y2="1049.4" gradientTransform="translate(0 -1050.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-95" stop-color="#ce0e0e" offset="0"/><stop id="stop4329-2" stop-color="#d00" offset=".28"/><stop id="stop3805-5-28-1" stop-color="#8d0000" offset="1"/></linearGradient></defs><rect id="rect3029-96-3" transform="scale(1,-1)" x=".5" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient4650)"/><path id="rect3029-96" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/><g id="layer4-9-1-2" transform="translate(2,-2.5e-4)" fill="#3d0000"><path id="path4276-5-2-2" d="m6 6.0001c-1.6447-1.028e-4 -3 1.3553-3 3v7.0002c0 1.6447 1.3553 3 3 3l1.0002-1.25e-4v3l6.9998-3.75-6.9999-3.7501v3l-1.0002 1.24e-4c-0.74686 9.3e-5 -1.4999-0.76713-1.4999-1.4999v-7.0002c0-0.71175 0.76705-1.4999 1.5-1.4999l2 1.24e-4v-1.5001z" color="#000000"/><path id="path3871-3-7-8" d="m10 3h2v8h-2z" color="#000000"/><path id="path4278-5-0-9" d="m16 6.0001c1.6447-1.028e-4 3 1.3553 3 3v7.0002c0 1.6447-1.3553 3-3 3l-1.0002-6.3e-5 5e-4 -1.5001 1.0002 6.2e-5c0.78903 4.9e-5 1.4995-0.78813 1.4995-1.4999v-7.0002c0-0.72579-0.75327-1.4999-1.5001-1.4999l-1.9998 1.25e-4 1.25e-4 -1.5001z" color="#000000"/></g><g id="layer4-9-7" transform="translate(1,-1)" fill="#bfbfbf"><path id="path4276-5-36" d="m6 6.0001c-1.6447-1.028e-4 -3 1.3553-3 3v7.0002c0 1.6447 1.3553 3 3 3l1.0002-1.25e-4v3l6.9998-3.75-6.9999-3.7501v3l-1.0002 1.24e-4c-0.74686 9.3e-5 -1.4999-0.76713-1.4999-1.4999v-7.0002c0-0.71175 0.76705-1.4999 1.5-1.4999l2 1.24e-4v-1.5001z" color="#000000"/><path id="path3871-3-1" d="m10 3h2v8h-2z" color="#000000"/><path id="path4278-5-2" d="m16 6.0001c1.6447-1.028e-4 3 1.3553 3 3v7.0002c0 1.6447-1.3553 3-3 3l-1.0002-6.3e-5 5e-4 -1.5001 1.0002 6.2e-5c0.78903 4.9e-5 1.4995-0.78813 1.4995-1.4999v-7.0002c0-0.72579-0.75327-1.4999-1.5001-1.4999l-1.9998 1.25e-4 1.25e-4 -1.5001z" color="#000000"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_reloop_overdown.svg b/res/skins/LateNight/buttons/btn_reloop_overdown.svg
deleted file mode 100644
index b6e12b65b7fb..000000000000
--- a/res/skins/LateNight/buttons/btn_reloop_overdown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg4272" width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4282"><linearGradient id="linearGradient11030" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="translate(0 -1026.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-1-9" stop-color="#aa1112" offset="0"/><stop id="stop4329-4" stop-color="#b60607" offset=".28"/><stop id="stop3805-5-28-5" stop-color="#760607" offset="1"/></linearGradient></defs><rect id="rect3029-96-4" x=".5" y=".49998" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#linearGradient11030)"/><g id="layer4-9-1-7" transform="translate(2,-2.5e-4)" fill="#320202"><path id="path4276-5-2-9" d="m6 6.0001c-1.6447-1.028e-4 -3 1.3553-3 3v7.0002c0 1.6447 1.3553 3 3 3l1.0002-1.25e-4v3l6.9998-3.75-6.9999-3.7501v3l-1.0002 1.24e-4c-0.74686 9.3e-5 -1.4999-0.76713-1.4999-1.4999v-7.0002c0-0.71175 0.76705-1.4999 1.5-1.4999l2 1.24e-4v-1.5001z" color="#000000"/><path id="path3871-3-7-2" d="m10 3h2v8h-2z" color="#000000"/><path id="path4278-5-0-0" d="m16 6.0001c1.6447-1.028e-4 3 1.3553 3 3v7.0002c0 1.6447-1.3553 3-3 3l-1.0002-6.3e-5 5e-4 -1.5001 1.0002 6.2e-5c0.78903 4.9e-5 1.4995-0.78813 1.4995-1.4999v-7.0002c0-0.72579-0.75327-1.4999-1.5001-1.4999l-1.9998 1.25e-4 1.25e-4 -1.5001z" color="#000000"/></g><g id="layer4-9-2" transform="translate(1,-1)" fill="#8d8f90"><path id="path4276-5-3" d="m6 6.0001c-1.6447-1.028e-4 -3 1.3553-3 3v7.0002c0 1.6447 1.3553 3 3 3l1.0002-1.25e-4v3l6.9998-3.75-6.9999-3.7501v3l-1.0002 1.24e-4c-0.74686 9.3e-5 -1.4999-0.76713-1.4999-1.4999v-7.0002c0-0.71175 0.76705-1.4999 1.5-1.4999l2 1.24e-4v-1.5001z" color="#000000"/><path id="path3871-3-75" d="m10 3h2v8h-2z" color="#000000"/><path id="path4278-5-9" d="m16 6.0001c1.6447-1.028e-4 3 1.3553 3 3v7.0002c0 1.6447-1.3553 3-3 3l-1.0002-6.3e-5 5e-4 -1.5001 1.0002 6.2e-5c0.78903 4.9e-5 1.4995-0.78813 1.4995-1.4999v-7.0002c0-0.72579-0.75327-1.4999-1.5001-1.4999l-1.9998 1.25e-4 1.25e-4 -1.5001z" color="#000000"/></g><path id="rect3029-96-9" d="m2 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="block-progression:tb;text-indent:0;text-transform:none"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_repeat.svg b/res/skins/LateNight/buttons/btn_repeat.svg
deleted file mode 100644
index 29e30be560f9..000000000000
--- a/res/skins/LateNight/buttons/btn_repeat.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="25" height="18" version="1.1" viewBox="0 0 25 18" xmlns="http://www.w3.org/2000/svg"><path id="path4448" d="m9.156 4.0005c-2.7614 1.841e-4 -5 2.2386-5 5 0 0.48325 0.090832 0.93297 0.21875 1.375l2.6562-1.5312c0.080009-1.0312 0.94822-1.8437 2-1.8438l7.6252-5e-4v-3z" fill="#585858"/><path id="path4794" transform="matrix(1.251 0 0 1.251 2.458 10.514)" d="m6.0286 4.8264-5.2277-3.0182 5.2277-3.0182z" color="#000000" fill="#585858"/><path id="path4448-5" d="m16 14c2.7614 1.84e-4 5-2.2386 5-5 0-0.48325-0.09083-0.93297-0.21875-1.375l-2.6562 1.5313c-0.08001 1.0312-0.94822 1.8438-2 1.8437l-7.625-5e-4v3z" fill="#585858"/><path id="path4794-6" transform="matrix(-1.251 0 0 -1.251 22.542 7.4862)" d="m6.0286 4.8264-5.2277-3.0182 5.2277-3.0182z" color="#000000" fill="#585858"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_repeat_over.svg b/res/skins/LateNight/buttons/btn_repeat_over.svg
deleted file mode 100644
index 3ef3161e9e52..000000000000
--- a/res/skins/LateNight/buttons/btn_repeat_over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="25" height="18" version="1.1" viewBox="0 0 25 18" xmlns="http://www.w3.org/2000/svg"><path id="path4448" d="m9.156 4.0005c-2.7614 1.841e-4 -5 2.2386-5 5 0 0.48325 0.090832 0.93297 0.21875 1.375l2.6562-1.5312c0.080009-1.0312 0.94822-1.8437 2-1.8438l7.6252-5e-4v-3z" fill="#f0bb2b"/><path id="path4794" transform="matrix(1.251 0 0 1.251 2.458 10.514)" d="m6.0286 4.8264-5.2277-3.0182 5.2277-3.0182z" color="#000000" fill="#f0bb2b"/><path id="path4448-5" d="m16 14c2.7614 1.84e-4 5-2.2386 5-5 0-0.48325-0.09083-0.93297-0.21875-1.375l-2.6562 1.5313c-0.08001 1.0312-0.94822 1.8438-2 1.8437l-7.625-5e-4v3z" fill="#f0bb2b"/><path id="path4794-6" transform="matrix(-1.251 0 0 -1.251 22.542 7.4862)" d="m6.0286 4.8264-5.2277-3.0182 5.2277-3.0182z" color="#000000" fill="#f0bb2b"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_reverse.svg b/res/skins/LateNight/buttons/btn_reverse.svg
deleted file mode 100644
index 61664d2602a8..000000000000
--- a/res/skins/LateNight/buttons/btn_reverse.svg
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg2"
-   width="52"
-   height="26"
-   version="1.1">
-  <metadata
-     id="metadata21">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient5414"
-       x1="13"
-       x2="13"
-       y1="1027.4"
-       y2="1049.4"
-       gradientTransform="matrix(2.1304,0,0,1,-0.56522,-1027.4)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop3803-7"
-         stop-color="#242424"
-         offset="0" />
-      <stop
-         id="stop3805-5"
-         stop-color="#101010"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <path
-     style="color:#000000;fill:url(#linearGradient5414)"
-     d="M 4.50025,1.49998 H 47.5 c 1.108,0 2,0.892 2,2 l 0,18 c 0,1.108 -0.892,2 -2,2 H 4.50025 c -1.108,0 -2,-0.892 -2,-2 l 0,-18 c 0,-1.108 0.892,-2 2,-2 z"
-     id="rect3029" />
-  <path
-     id="path3936-5"
-     d="m21.624 11.75-7.6245 5.5938v1.6562l8.9995-6.5z"
-     display="none"
-     fill="#060606" />
-  <path
-     id="path3940-3"
-     d="m33 7v11h-3v1h4v-12h-1z"
-     display="none"
-     fill="#060606" />
-  <path
-     id="path3944-5"
-     d="m39 7v11h-3v1h4v-12h-1z"
-     display="none"
-     fill="#060606" />
-  <path
-     id="path3936"
-     d="M 13,6 21.9995,11.5 13,18 13,6"
-     display="none"
-     fill="#bfbfbf" />
-  <path
-     id="path3940"
-     d="m29 6h4v12h-4v-12"
-     display="none"
-     fill="#bfbfbf" />
-  <path
-     id="path3944"
-     d="m35 6v12h4v-12h-4"
-     display="none"
-     fill="#bfbfbf" />
-  <path
-     id="path3936-0-9-4-4"
-     d="m 30,6.71925 c -0.27402,0.15082 -0.62867,0.36449 -1,0.625 v 10.656 l 1,0.71875 z"
-     style="fill:#060606" />
-  <path
-     id="path3936-0-9-5"
-     d="m 29,6.00045 -8.9995,6 8.9995,6 v -12"
-     style="fill:#bfbfbf" />
-  <path
-     style="opacity:0.8;fill:#030303"
-     id="path15"
-     d="m 49.31367,1.1758 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.96557 -2,1.965572 l -43.49932,8e-5 c -0.6598637,2e-6 -1.135675,-0.352003 -1.325,-0.511743 0.2090942,0.790888 0.7641575,1.546144 1.8242,1.546141 l 44.0001,-10e-5 c 1.108,-3e-6 2,-0.892 2,-2 v -20 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z" />
-  <path
-     id="rect3029-96-0"
-     d="m 4.00025,1 c -1.0994,0 -2,0.90065 -2,2 l 0,19 c 0,1.0994 0.90065,2 2,2 H 48 c 1.0994,0 2,-0.90065 2,-2 L 50,3 C 50,1.9006 49.09935,1 48,1 Z m 0.3,1 H 47.7 C 48.26265,2 49,2.73735 49,3.3 l 0,18.4 C 49,22.26265 48.26265,23 47.7,23 H 4.30025 c -0.56265,0 -1.3,-0.73735 -1.3,-1.3 l 0,-18.4 c 0,-0.56265 0.73735,-1.3 1.3,-1.3 z"
-     style="color:#000000;text-indent:0;text-transform:none;fill:#444444" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_reverse_down.svg b/res/skins/LateNight/buttons/btn_reverse_down.svg
deleted file mode 100644
index 3efaf2372ce6..000000000000
--- a/res/skins/LateNight/buttons/btn_reverse_down.svg
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2"
-   width="52"
-   height="26"
-   version="1.1"
-   sodipodi:docname="btn_reverse_down.svg"
-   inkscape:version="0.92.4 (unknown)">
-  <metadata
-     id="metadata15">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="740"
-     id="namedview13"
-     showgrid="false"
-     inkscape:zoom="5.25"
-     inkscape:cx="26"
-     inkscape:cy="13"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3878"
-       x1="15"
-       x2="15"
-       y1="1049.4"
-       y2="1027.4"
-       gradientTransform="matrix(2.1304,0,0,1,-0.56522,-1026.4)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop3803-7-6"
-         stop-color="#222"
-         offset="0" />
-      <stop
-         id="stop3805-5-2"
-         stop-color="#131516"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <path
-     style="color:#000000;fill:url(#linearGradient3878)"
-     d="m 4.5,2.49999 h 43 c 1.108,0 2,0.892 2,2 v 16.99999 c 0,1.108 -0.892,2 -2,2 h -43 c -1.108,0 -2,-0.892 -2,-2 V 4.49999 c 0,-1.108 0.892,-2 2,-2 z"
-     id="rect3029-9"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="sssssssss" />
-  <g
-     id="layer19"
-     transform="translate(0,1.00045)">
-    <path
-       style="fill:#080808"
-       inkscape:connector-curvature="0"
-       d="m 30,6.7188 c -0.27402,0.15082 -0.62867,0.36449 -1,0.625 v 10.656 l 1,0.71875 z"
-       id="path3936-0-9-4" />
-    <path
-       style="fill:#8d8f90"
-       inkscape:connector-curvature="0"
-       d="M 29,6 20.0005,12 29,18 V 6"
-       id="path3936-0-9" />
-  </g>
-  <path
-     inkscape:connector-curvature="0"
-     style="color:#000000;text-indent:0;text-transform:none;fill:#454748"
-     d="m 4,2.00001 c -1.0994,0 -2,0.90065 -2,2 V 22 c 0,1.0994 0.90065,2 2,2 h 44 c 1.0994,0 2,-0.90065 2,-2 V 4.00001 c 0,-1.0994 -0.90065,-2 -2,-2 z m 0.3,1 h 43.4 c 0.56265,0 1.3,0.73735 1.3,1.3 V 21.7 C 49,22.26265 48.26265,23 47.7,23 H 4.3 C 3.73735,23 3,22.26265 3,21.7 V 4.30001 c 0,-0.56265 0.73735,-1.3 1.3,-1.3 z"
-     id="rect3029-96-0-9"
-     sodipodi:nodetypes="ssssssssssssssssss" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_reverse_over.svg b/res/skins/LateNight/buttons/btn_reverse_over.svg
deleted file mode 100644
index 81c0c679dd2b..000000000000
--- a/res/skins/LateNight/buttons/btn_reverse_over.svg
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="26"
-   width="52"
-   id="svg2">
-  <metadata
-     id="metadata16">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.1304,0,0,1,-0.56522,-1050.4)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="11"
-       x1="11"
-       id="linearGradient4650">
-      <stop
-         offset="0"
-         stop-color="#ce0e0e"
-         id="stop3803-7-1-95" />
-      <stop
-         offset=".28"
-         stop-color="#d00"
-         id="stop4329-2" />
-      <stop
-         offset="1"
-         stop-color="#8d0000"
-         id="stop3805-5-28-1" />
-    </linearGradient>
-  </defs>
-  <path
-     id="rect3029-96-3"
-     d="m 4,-23.5 h 44 c 0.831,0 1.5,0.669 1.5,1.5 v 18 c 0,0.831 -0.669,1.5 -1.5,1.5 H 4 C 3.169,-2.5 2.5,-3.169 2.5,-4 v -18 c 0,-0.831 0.669,-1.5 1.5,-1.5 z"
-     style="color:#000000;fill:url(#linearGradient4650)"
-     transform="scale(1,-1)" />
-  <path
-     id="rect3029-96"
-     d="M 4,2 C 2.9006,2 2,2.90065 2,4 v 18 c 0,1.0994 0.90065,2 2,2 h 44 c 1.0994,0 2,-0.90065 2,-2 V 4 C 50,2.9006 49.09935,2 48,2 Z M 4.3,3 H 47.7 C 48.26265,3 49,3.73735 49,4.3 V 21.7 C 49,22.26265 48.26265,23 47.7,23 H 4.3 C 3.73735,23 3,22.26265 3,21.7 V 4.3 C 3,3.73735 3.73735,3 4.3,3 Z"
-     style="color:#000000;text-indent:0;text-transform:none;fill:#979797" />
-  <g
-     transform="translate(0,1.00045)"
-     id="layer16">
-    <path
-       id="path3936-0-9-4-4-3-0"
-       d="m 30,6.7188 c -0.27402,0.15082 -0.62867,0.36449 -1,0.625 v 10.656 l 1,0.71875 z"
-       style="fill:#3d0000" />
-    <path
-       id="path3936-0-9-5-6-6"
-       d="M 29,6 20.0005,12 29,18 V 6"
-       style="fill:#bfbfbf" />
-  </g>
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_reverse_overdown.svg b/res/skins/LateNight/buttons/btn_reverse_overdown.svg
deleted file mode 100644
index 839e6ea2a161..000000000000
--- a/res/skins/LateNight/buttons/btn_reverse_overdown.svg
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="26"
-   width="52"
-   id="svg2">
-  <metadata
-     id="metadata15">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.1304 0 0 1 -.56522 -1026.4)"
-       y2="1027.4"
-       y1="1049.4"
-       x2="15"
-       x1="15"
-       id="linearGradient8406">
-      <stop
-         offset="0"
-         stop-color="#aa1112"
-         id="stop3803-7-1-9" />
-      <stop
-         offset=".28"
-         stop-color="#b60607"
-         id="stop4329-4" />
-      <stop
-         offset="1"
-         stop-color="#760607"
-         id="stop3805-5-28-5" />
-    </linearGradient>
-  </defs>
-  <path
-     id="rect3029-96-4"
-     d="m 4,2.49998 h 44 c 0.831,0 1.5,0.669 1.5,1.5 v 18 c 0,0.831 -0.669,1.5 -1.5,1.5 H 4 c -0.831,0 -1.5,-0.669 -1.5,-1.5 v -18 c 0,-0.831 0.669,-1.5 1.5,-1.5 z"
-     style="color:#000000;fill:url(#linearGradient8406)" />
-  <g
-     transform="translate(0,1.00045)"
-     id="layer17">
-    <path
-       style="fill:#320202"
-       d="m 30,6.7188 c -0.27402,0.15082 -0.62867,0.36449 -1,0.625 v 10.656 l 1,0.71875 z"
-       id="path3936-0-9-4-4-3" />
-    <path
-       style="fill:#8d8f90"
-       d="m 29,6 -8.9995,6 9,6 V 6"
-       id="path3936-0-9-5-6" />
-  </g>
-  <path
-     style="color:#000000;text-indent:0;text-transform:none;fill:#979797"
-     d="M 4,2 C 2.9006,2 2,2.90065 2,4 v 18 c 0,1.0994 0.90065,2 2,2 h 44 c 1.0994,0 2,-0.90065 2,-2 V 4 C 50,2.9006 49.09935,2 48,2 Z M 4.3,3 H 47.7 C 48.26265,3 49,3.73735 49,4.3 V 21.7 C 49,22.26265 48.26265,23 47.7,23 H 4.3 C 3.73735,23 3,22.26265 3,21.7 V 4.3 C 3,3.73735 3.73735,3 4.3,3 Z"
-     id="rect3029-96-9" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_settings_off.svg b/res/skins/LateNight/buttons/btn_settings_off.svg
deleted file mode 100644
index 23b0ce3c63fa..000000000000
--- a/res/skins/LateNight/buttons/btn_settings_off.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="73" height="17" version="1.1" xmlns="http://www.w3.org/2000/svg"><g id="g4021" transform="matrix(-.60802 0 0 .68989 15.08 1.1011)" fill="#d2d2d2" stroke-width="1.1274"><path id="rect3922" transform="matrix(1.1347 0 0 1 -34.251 6)" d="m37.625-5-0.1875 2.625c-0.66019 0.16435-1.2765 0.43313-1.8438 0.78125l-1.9688-1.75-1.9688 1.9688 1.75 1.9688c-0.34382 0.56314-0.61891 1.1878-0.78125 1.8438l-2.625 0.1875v2.75l2.625 0.1875c0.16385 0.66212 0.431 1.2793 0.78125 1.8438l-1.75 1.9688 1.9688 1.9688 2-1.75c0.55851 0.33599 1.1644 0.58862 1.8125 0.75l0.1875 2.6562h2.75l0.1875-2.625c0.66019-0.16435 1.2765-0.43313 1.8438-0.78125l1.9688 1.75 1.9688-1.9688-1.75-1.9688c0.34382-0.56314 0.61891-1.1878 0.78125-1.8438l2.625-0.1875v-2.75l-2.625-0.1875c-0.16435-0.66019-0.43313-1.2765-0.78125-1.8438l1.75-1.9688-1.9688-1.9688-1.9688 1.75c-0.56314-0.34382-1.1878-0.61891-1.8438-0.78125l-0.1875-2.625zm1.375 6c1.6505 0 3 1.3495 3 3s-1.3495 3-3 3-3-1.3495-3-3 1.3495-3 3-3z" color="#000000" fill="#d2d2d2"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_skinsettings_on.svg b/res/skins/LateNight/buttons/btn_skinsettings_on.svg
deleted file mode 100644
index 182e169e895d..000000000000
--- a/res/skins/LateNight/buttons/btn_skinsettings_on.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg4201" width="20" height="20" version="1.1" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m10.002 3.4247c-3.6167 0-6.5686 2.9519-6.5686 6.5686s2.9519 6.5686 6.5686 6.5686 6.5686-2.9519 6.5686-6.5686-2.9519-6.5686-6.5686-6.5686zm0 2.0019c2.5359 0 4.5667 2.0309 4.5667 4.5667 0 2.5359-2.0309 4.5667-4.5667 4.5667-2.5359 0-4.5667-2.0309-4.5667-4.5667 0-2.5359 2.0309-4.5667 4.5667-4.5667z" color="#000000" fill="#d2d2d2" style="block-progression:tb;text-indent:0;text-transform:none"/><g id="g4021" transform="matrix(.88133 0 0 1 1.1867 0)" fill="#d2d2d2"><path id="rect3922" d="m8.4375 1h3.125l0.2995 4h-3.724z" color="#000000" fill="#d2d2d2"/></g><g id="g4021-3" transform="matrix(0 .88133 -1 0 20 1.1867)" fill="#d2d2d2"><path id="rect3922-6" d="m8.4375 1h3.125l0.2995 4h-3.724z" color="#000000" fill="#d2d2d2"/></g><g id="g4021-0" transform="matrix(.62319 .62319 -.70711 .70711 10.839 -3.303)" fill="#d2d2d2"><path id="rect3922-62" d="m8.4375 1h3.125l0.2995 4h-3.724z" color="#000000" fill="#d2d2d2"/></g><g id="g4021-3-6" transform="matrix(-.62319 .62319 -.70711 -.70711 23.303 10.839)" fill="#d2d2d2"><path id="rect3922-6-1" d="m8.4375 1h3.125l0.2995 4h-3.724z" color="#000000" fill="#d2d2d2"/></g><g id="g4021-8" transform="matrix(-.88133 0 0 -1 18.813 20)" fill="#d2d2d2"><path id="rect3922-7" d="m8.4375 1h3.125l0.2995 4h-3.724z" color="#000000" fill="#d2d2d2"/></g><g id="g4021-3-9" transform="matrix(0 -.88133 1 0 2.6815e-8 18.813)" fill="#d2d2d2"><path id="rect3922-6-2" d="m8.4375 1h3.125l0.2995 4h-3.724z" color="#000000" fill="#d2d2d2"/></g><g id="g4021-0-0" transform="matrix(-.62319 -.62319 .70711 -.70711 9.1608 23.303)" fill="#d2d2d2"><path id="rect3922-62-2" d="m8.4375 1h3.125l0.2995 4h-3.724z" color="#000000" fill="#d2d2d2"/></g><g id="g4021-3-6-3" transform="matrix(.62319 -.62319 .70711 .70711 -3.303 9.1608)" fill="#d2d2d2"><path id="rect3922-6-1-7" d="m8.4375 1h3.125l0.2995 4h-3.724z" color="#000000" fill="#d2d2d2"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_slip.svg b/res/skins/LateNight/buttons/btn_slip.svg
deleted file mode 100644
index e167b346b2dc..000000000000
--- a/res/skins/LateNight/buttons/btn_slip.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="25" height="18" version="1.1" viewBox="0 0 25 18" xmlns="http://www.w3.org/2000/svg"><path id="path5170" transform="matrix(.91414 0 0 .91414 12.99 4.0003)" d="m-4 12-6.9282-12 13.856-3.7128e-7z" color="#000000" fill="#585858"/><path id="path5170-9" d="m9.3333 4.0003 6.3333 10.965 6.3333-10.965h-12.667zm2.9292 1.7021h6.8083l-3.4042 5.8979-3.4042-5.8979z" color="#000000" fill="#585858"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_slip_over.svg b/res/skins/LateNight/buttons/btn_slip_over.svg
deleted file mode 100644
index 6ef36071e575..000000000000
--- a/res/skins/LateNight/buttons/btn_slip_over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="25" height="18" version="1.1" viewBox="0 0 25 18" xmlns="http://www.w3.org/2000/svg"><path id="path5170" transform="matrix(.91414 0 0 .91414 12.99 4.0003)" d="m-4 12-6.9282-12 13.856-3.7128e-7z" color="#000000" fill="#f0bb2b"/><path id="path5170-9" d="m9.3333 4.0003 6.3333 10.965 6.3333-10.965h-12.667zm2.9292 1.7021h6.8083l-3.4042 5.8979-3.4042-5.8979z" color="#000000" fill="#f0bb2b"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_splitcue.svg b/res/skins/LateNight/buttons/btn_splitcue.svg
deleted file mode 100644
index d9ffc4468e1c..000000000000
--- a/res/skins/LateNight/buttons/btn_splitcue.svg
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   id="svg17"
-   version="1.1"
-   height="23"
-   width="76">
-  <metadata
-     id="metadata21">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs7">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.6957,0,0,1,-0.8478,-1027.4)"
-       y2="1049"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="a">
-      <stop
-         id="stop2"
-         offset="0"
-         stop-color="#242424"
-         style="stop-color:#282828;stop-opacity:1" />
-      <stop
-         id="stop4"
-         offset="1"
-         stop-color="#101010"
-         style="stop-color:#101010;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#a"
-       id="linearGradient886"
-       x1="37.300365"
-       y1="0"
-       x2="37.300365"
-       y2="21.663004"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.2173913,0,0,0.91304348,-1.1086957,-937.10435)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient6227">
-      <stop
-         offset="0"
-         stop-color="#242424"
-         id="stop3803-7-8" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop3805-5-4" />
-    </linearGradient>
-  </defs>
-  <rect
-     ry="2"
-     rx="2"
-     height="21"
-     width="74"
-     y="0.5"
-     x="0.5"
-     id="rect3029"
-     style="color:#000000;fill:url(#linearGradient6227);stroke-width:1.71394813" />
-  <path
-     style="color:#000000;fill-opacity:0.8"
-     id="path9"
-     d="m 74.561149,1.18775 c 0.112251,0.24927 0.1875,0.52278 0.1875,0.8125 L 74.748913,20 c 1.6e-5,1.0994 -0.90065,2.000004 -2,2 L 1.999438,21.99975 c -0.28972,-10e-7 -0.56323,-0.07525 -0.8125,-0.1875 0.31167,0.69758 0.9965,1.187497 1.8125,1.1875 L 73.748913,23 c 1.108,4e-6 1.751141,-0.892125 1.751141,-2.000125 L 75.499791,3.000125 C 75.499779,2.184125 75.25873,1.49945 74.561149,1.18775 Z" />
-  <path
-     d="M 2.0001527,0 C 0.9007537,0 1.5449998e-4,0.90065 1.5449998e-4,2 L 1.3775e-4,20 c -1.02305e-6,1.0994 0.9006492,2 1.99999825,2 h 70.99981 c 1.099399,0 1.999997,-0.90065 1.999998,-2 l 1.7e-5,-18 c 2e-6,-1.0994 -0.900649,-2 -1.999998,-2 z M 2.3001525,1 H 72.699963 c 0.562649,0 1.3,0.73735 1.299999,1.3 l -1.7e-5,17.4 c 0,0.56265 -0.737349,1.3 -1.299999,1.3 H 2.300136 C 1.7374865,21 1.0001371,20.26265 1.0001371,19.7 L 1.0001539,2.3 C 1.0001544,1.73735 1.7375033,1 2.3001525,1 Z"
-     style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#444444;fill-opacity:1"
-     id="path15-3" />
-  <g
-     transform="translate(0,1)"
-     id="g863">
-    <path
-       style="fill:#bfbfbf"
-       id="path5532-3-9"
-       d="M 14,7 H 7 v 4 h 5 v 1 H 7 v 1 h 7 V 10 H 9 V 8 h 5 V 7" />
-    <path
-       style="fill:#060606"
-       id="path5554-5-9"
-       d="M 15,8 H 9 v 2 h 1 V 9 h 5 V 8" />
-    <path
-       style="fill:#060606"
-       id="path5558-4-5"
-       d="m 14,11 h 1 v 3 H 8 v -1 h 6 v -2" />
-    <path
-       style="fill:#060606"
-       id="path5562-7-0"
-       d="m 12,11 v 1 H 8 v -1 h 4" />
-    <path
-       style="fill:#060606"
-       d="m 23,8 v 6 h 6 V 13 H 25 V 8 h -2"
-       id="path3466-9-1" />
-    <path
-       style="fill:#060606"
-       d="m 16,8 v 6 h 2 v -2 h 4 V 8 Z m 2,1 h 3 v 2 h -3 z"
-       id="path3458-3-8-9" />
-    <path
-       style="fill:#bfbfbf"
-       d="m 22,7 v 6 h 6 V 12 H 24 V 7 h -2"
-       id="path3466-9" />
-    <path
-       style="fill:#bfbfbf"
-       d="m 15,7 v 6 h 2 v -2 h 4 V 7 Z m 2,1 h 3 v 2 h -3 z"
-       id="path3458-3-8" />
-    <path
-       style="fill:#060606"
-       d="m 33,8 h 6 v 1 h -2 v 5 H 35 V 9 H 33 V 8"
-       id="path3454-3" />
-    <path
-       style="fill:#bfbfbf"
-       d="m 32,7 h 6 v 1 h -2 v 5 H 34 V 8 H 32 V 7"
-       id="path3454" />
-    <rect
-       style="opacity:1;fill:#bfbfbf;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
-       id="rect885"
-       width="2"
-       height="6"
-       x="29"
-       y="7" />
-    <path
-       style="fill:#060606;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 30,13 v 1 h 2 V 8 h -1 v 5 z"
-       id="path887" />
-    <g
-       transform="translate(31,-2)"
-       id="g6087-0-4"
-       style="fill:#bfbfbf">
-      <path
-         id="path6038-8-4"
-         d="m 20,9 h -7 v 6 h 7 v -1 h -5 v -4 h 5 V 9" />
-      <path
-         id="path6042-8-4"
-         d="m 22,9 v 6 h 7 V 9 h -2 v 5 H 24 V 9 h -2" />
-      <path
-         id="path6046-5-4"
-         d="m 31,9 v 6 h 7 v -1 h -5 v -2 h 4 v -1 h -4 v -1 h 5 V 9 h -7" />
-    </g>
-    <g
-       transform="translate(31,-2)"
-       id="g6078-0-7"
-       style="fill:#060606">
-      <path
-         id="path6050-9-6"
-         d="m 21,10 h -6 v 4 h 1 v -3 h 5 v -1" />
-      <path
-         id="path6054-6-3"
-         d="m 21,15 v 1 h -7 v -1 h 7" />
-      <path
-         id="path6058-3-1"
-         d="m 24,10 h 1 v 4 h -1 v -4" />
-      <path
-         id="path6062-8-7"
-         d="m 23,15 v 1 h 7 v -6 h -1 v 5 h -6" />
-      <path
-         id="path6066-5-5"
-         d="m 39,10 h -6 v 1 h 6 v -1" />
-      <path
-         id="path6070-6-9"
-         d="m 38,12 h -5 v 2 h 1 v -1 h 4 v -1" />
-      <path
-         id="path6074-1-6"
-         d="m 39,15 v 1 h -7 v -1 h 7" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_splitcue_down.svg b/res/skins/LateNight/buttons/btn_splitcue_down.svg
deleted file mode 100644
index a8fb5ecfc288..000000000000
--- a/res/skins/LateNight/buttons/btn_splitcue_down.svg
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg2"
-   width="76"
-   height="22"
-   version="1.1">
-  <metadata
-     id="metadata29">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3807-3"
-       x1="13"
-       x2="13"
-       y1="1027.4"
-       y2="1049.4"
-       gradientTransform="matrix(2.1304,0,0,1,0.43478,-1026.4)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop3803-7"
-         stop-color="#242424"
-         offset="0" />
-      <stop
-         id="stop3805-5"
-         stop-color="#101010"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <g
-     id="g888"
-     style="fill:#080808;fill-opacity:1">
-    <path
-       style="fill:#080808;fill-opacity:1"
-       id="path5554-5-9"
-       d="M 15,8 H 9 v 2 h 1 V 9 h 5 V 8" />
-    <path
-       style="fill:#080808;fill-opacity:1"
-       id="path5558-4-5"
-       d="m 14,11 h 1 v 3 H 8 v -1 h 6 v -2" />
-    <path
-       style="fill:#080808;fill-opacity:1"
-       d="m 23,8 v 6 h 6 V 13 H 25 V 8 h -2"
-       id="path3466-9-1" />
-    <path
-       style="fill:#080808;fill-opacity:1"
-       d="m 16,8 v 6 h 2 v -2 h 4 V 8 Z m 2,1 h 3 v 2 h -3 z"
-       id="path3458-3-8-9" />
-    <path
-       style="fill:#080808;fill-opacity:1"
-       d="m 33,8 h 6 v 1 h -2 v 5 H 35 V 9 H 33 V 8"
-       id="path3454-3" />
-    <path
-       style="fill:#080808;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 30,13 v 1 h 2 V 8 h -1 v 5 z"
-       id="path887" />
-    <path
-       style="fill:#080808;fill-opacity:1"
-       id="path5562-7-0"
-       d="m 12,11 v 1 H 8 v -1 h 4" />
-    <g
-       transform="translate(31,-2)"
-       id="g6078-0-7"
-       style="fill:#080808;fill-opacity:1">
-      <path
-         id="path6050-9-6"
-         d="m 21,10 h -6 v 4 h 1 v -3 h 5 v -1"
-         style="fill:#080808;fill-opacity:1" />
-      <path
-         id="path6054-6-3"
-         d="m 21,15 v 1 h -7 v -1 h 7"
-         style="fill:#080808;fill-opacity:1" />
-      <path
-         id="path6058-3-1"
-         d="m 24,10 h 1 v 4 h -1 v -4"
-         style="fill:#080808;fill-opacity:1" />
-      <path
-         id="path6062-8-7"
-         d="m 23,15 v 1 h 7 v -6 h -1 v 5 h -6"
-         style="fill:#080808;fill-opacity:1" />
-      <path
-         id="path6066-5-5"
-         d="m 39,10 h -6 v 1 h 6 v -1"
-         style="fill:#080808;fill-opacity:1" />
-      <path
-         id="path6070-6-9"
-         d="m 38,12 h -5 v 2 h 1 v -1 h 4 v -1"
-         style="fill:#080808;fill-opacity:1" />
-      <path
-         id="path6074-1-6"
-         d="m 39,15 v 1 h -7 v -1 h 7"
-         style="fill:#080808;fill-opacity:1" />
-    </g>
-  </g>
-  <g
-     id="g871"
-     style="fill:#8d8f90;fill-opacity:1">
-    <path
-       style="fill:#8d8f90;fill-opacity:1"
-       id="path5532-3-9"
-       d="M 14,7 H 7 v 4 h 5 v 1 H 7 v 1 h 7 V 10 H 9 V 8 h 5 V 7" />
-    <path
-       style="fill:#8d8f90;fill-opacity:1"
-       d="m 22,7 v 6 h 6 V 12 H 24 V 7 h -2"
-       id="path3466-9" />
-    <path
-       style="fill:#8d8f90;fill-opacity:1"
-       d="m 15,7 v 6 h 2 v -2 h 4 V 7 Z m 2,1 h 3 v 2 h -3 z"
-       id="path3458-3-8" />
-    <path
-       style="fill:#8d8f90;fill-opacity:1"
-       d="m 32,7 h 6 v 1 h -2 v 5 H 34 V 8 H 32 V 7"
-       id="path3454" />
-    <rect
-       style="opacity:1;fill:#8d8f90;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
-       id="rect885"
-       width="2"
-       height="6"
-       x="29"
-       y="7" />
-    <path
-       d="m 51,7 h -7 v 6 h 7 V 12 H 46 V 8 h 5 V 7"
-       id="path6038-8-4"
-       style="fill:#8d8f90;fill-opacity:1" />
-    <path
-       d="m 53,7 v 6 h 7 V 7 h -2 v 5 H 55 V 7 h -2"
-       id="path6042-8-4"
-       style="fill:#8d8f90;fill-opacity:1" />
-    <path
-       d="m 62,7 v 6 h 7 v -1 h -5 v -2 h 4 V 9 H 64 V 8 h 5 V 7 h -7"
-       id="path6046-5-4"
-       style="fill:#8d8f90;fill-opacity:1" />
-  </g>
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_splitcue_over.svg b/res/skins/LateNight/buttons/btn_splitcue_over.svg
deleted file mode 100644
index fe2f0dc07c7b..000000000000
--- a/res/skins/LateNight/buttons/btn_splitcue_over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="76" height="23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><linearGradient id="a" x1=".50003" x2="23.5" y1="-12" y2="-12" gradientTransform="matrix(.91304 0 0 3.2174 -21.957 1.1087)" gradientUnits="userSpaceOnUse"><stop stop-color="#d09300" offset="0"/><stop stop-color="#a06d00" offset="1"/></linearGradient></defs><rect transform="matrix(0,-1,-1,0,0,0)" x="-21.5" y="-74.5" width="21" height="74" rx="1.5" ry="1.5" color="#000000" fill="url(#a)" stroke-width="1.7139"/><path d="m2.0002 0c-1.0994 0-2 .90065-2 2l-1.675e-5 18c-1.023e-6 1.0994.90065 2 2 2h71c1.0994 0 2-.90065 2-2l1.7e-5-18c2e-6-1.0994-.90065-2-2-2zm.3 1h70.4c.56265 0 1.3.73735 1.3 1.3l-1.7e-5 17.4c0 .56265-.73735 1.3-1.3 1.3h-70.4c-.56265 0-1.3-.73735-1.3-1.3l1.68e-5-17.4c5e-7-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="text-decoration-line:none;text-indent:0;text-transform:none"/><g fill="#0e0e0e"><path d="m14 8h-7v4h5v1h-5v1h7v-3h-5v-2h5v-1"/><path d="m22 8v6h6v-1h-4v-5h-2"/><path d="m15 8v6h2v-2h4v-4zm2 1h3v2h-3z"/><path d="m32 8h6v1h-2v5h-2v-5h-2v-1"/><rect x="29" y="8" width="2" height="6" style="paint-order:fill markers stroke"/><g transform="translate(31,-1)"><path d="m20 9h-7v6h7v-1h-5v-4h5v-1"/><path d="m22 9v6h7v-6h-2v5h-3v-5h-2"/><path d="m31 9v6h7v-1h-5v-2h4v-1h-4v-1h5v-1h-7"/></g></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_sync.svg b/res/skins/LateNight/buttons/btn_sync.svg
deleted file mode 100644
index 8829534999fd..000000000000
--- a/res/skins/LateNight/buttons/btn_sync.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="52" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="matrix(2.1304 0 0 1 -.56522 -1026.4)" gradientUnits="userSpaceOnUse"><stop stop-color="#242424" offset="0"/><stop stop-color="#101010" offset="1"/></linearGradient></defs><rect x=".5" y="1" width="50" height="24" rx="2" ry="2" color="#000000" opacity=".9"/><rect x=".5" y=".49998" width="49" height="23" rx="2" ry="2" color="#000000" fill="url(#a)"/><g fill="#bfbfbf"><path d="m17 9h-7v4h5v1h-5v1h7v-3h-5v-2h5v-1"/><path d="m26 9v6h2v-5h3v5h2v-6h-7"/><path d="m34 9v6h7v-1h-5v-4h5v-1h-7"/></g><g fill="#060606"><path d="m18 10h-6v2h1v-1h5v-1"/><path d="m17 13h1v3h-7v-1h6v-2"/><path d="m15 13v1h-4v-1h4"/><path d="m27 15v1h2v-5h2v-1h-3v5h-1"/><path d="m33 10h1v6h-2v-1h1v-5"/><path d="m42 10h-6v4h1v-3h5v-1"/><path d="m42 15v1h-7v-1h7"/></g><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h46c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h45.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-45.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#444" style="text-indent:0;text-transform:none"/><path d="m21 16v-3.5l-2-2v-.5h1.5l1.5 1.5 1.5-1.5h1.5v.5l-2 2v3.5h-2" fill="#060606"/><path d="m20 15v-3.5l-2-2v-.5h1.5l1.5 1.5 1.5-1.5h1.5v.5l-2 2v3.5h-2" fill="#bfbfbf"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_sync_down.svg b/res/skins/LateNight/buttons/btn_sync_down.svg
deleted file mode 100644
index 320ca8688d9a..000000000000
--- a/res/skins/LateNight/buttons/btn_sync_down.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="52" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="matrix(2.1304 0 0 1 -.56522 -1026.4)" gradientUnits="userSpaceOnUse"><stop stop-color="#222" offset="0"/><stop stop-color="#131516" offset="1"/></linearGradient></defs><rect x=".5" y=".49998" width="49" height="23" rx="2" ry="2" color="#000000" fill="url(#a)"/><g fill="#8d8f90"><path d="m17 9h-7v4h5v1h-5v1h7v-3h-5v-2h5v-1"/><path d="m26 9v6h2v-5h3v5h2v-6h-7"/><path d="m34 9v6h7v-1h-5v-4h5v-1h-7"/></g><g fill="#080808"><path d="m18 10h-6v2h1v-1h5v-1"/><path d="m17 13h1v3h-7v-1h6v-2"/><path d="m15 13v1h-4v-1h4"/><path d="m27 15v1h2v-5h2v-1h-3v5h-1"/><path d="m33 10h1v6h-2v-1h1v-5"/><path d="m42 10h-6v4h1v-3h5v-1"/><path d="m42 15v1h-7v-1h7"/></g><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h46c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h45.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-45.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#454748" style="text-indent:0;text-transform:none"/><path d="m21 16v-3.5l-2-2v-.5h1.5l1.5 1.5 1.5-1.5h1.5v.5l-2 2v3.5h-2" fill="#080808"/><path d="m20 15v-3.5l-2-2v-.5h1.5l1.5 1.5 1.5-1.5h1.5v.5l-2 2v3.5h-2" fill="#8d8f90"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_sync_over.svg b/res/skins/LateNight/buttons/btn_sync_over.svg
deleted file mode 100644
index 3cb233e58ba1..000000000000
--- a/res/skins/LateNight/buttons/btn_sync_over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="52" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1="11" x2="11" y1="1027.4" y2="1049.4" gradientTransform="matrix(2.1304 0 0 1 -.56522 -1050.4)" gradientUnits="userSpaceOnUse"><stop stop-color="#ce0e0e" offset="0"/><stop stop-color="#d00" offset=".28"/><stop stop-color="#8d0000" offset="1"/></linearGradient></defs><rect transform="scale(1,-1)" x=".5" y="-23.5" width="49" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h46c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h45.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-45.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="text-indent:0;text-transform:none"/><g fill="#bfbfbf"><path d="m17 9h-7v4h5v1h-5v1h7v-3h-5v-2h5v-1"/><path d="m26 9v6h2v-5h3v5h2v-6h-7"/><path d="m34 9v6h7v-1h-5v-4h5v-1h-7"/></g><g fill="#3d0000"><path d="m18 10h-6v2h1v-1h5v-1"/><path d="m17 13h1v3h-7v-1h6v-2"/><path d="m15 13v1h-4v-1h4"/><path d="m27 15v1h2v-5h2v-1h-3v5h-1"/><path d="m33 10h1v6h-2v-1h1v-5"/><path d="m42 10h-6v4h1v-3h5v-1"/><path d="m42 15v1h-7v-1h7"/><path d="m21 16v-3.5l-2-2v-.5h1.5l1.5 1.5 1.5-1.5h1.5v.5l-2 2v3.5h-2"/></g><path d="m20 15v-3.5l-2-2v-.5h1.5l1.5 1.5 1.5-1.5h1.5v.5l-2 2v3.5h-2" fill="#bfbfbf"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_sync_overdown.svg b/res/skins/LateNight/buttons/btn_sync_overdown.svg
deleted file mode 100644
index ae7ee0cf1a48..000000000000
--- a/res/skins/LateNight/buttons/btn_sync_overdown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="52" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1="15" x2="15" y1="1049.4" y2="1027.4" gradientTransform="matrix(2.1304 0 0 1 -.56522 -1026.4)" gradientUnits="userSpaceOnUse"><stop stop-color="#aa1112" offset="0"/><stop stop-color="#b60607" offset=".28"/><stop stop-color="#760607" offset="1"/></linearGradient></defs><rect x=".5" y=".49998" width="49" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><g fill="#8d8f90"><path d="m17 9h-7v4h5v1h-5v1h7v-3h-5v-2h5v-1"/><path d="m26 9v6h2v-5h3v5h2v-6h-7"/><path d="m34 9v6h7v-1h-5v-4h5v-1h-7"/></g><g fill="#320202"><path d="m18 10h-6v2h1v-1h5v-1"/><path d="m17 13h1v3h-7v-1h6v-2"/><path d="m15 13v1h-4v-1h4"/><path d="m27 15v1h2v-5h2v-1h-3v5h-1"/><path d="m33 10h1v6h-2v-1h1v-5"/><path d="m42 10h-6v4h1v-3h5v-1"/><path d="m42 15v1h-7v-1h7"/></g><path d="m2 0c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h46c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h45.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-45.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="text-indent:0;text-transform:none"/><path d="m21 16v-3.5l-2-2v-.5h1.5l1.5 1.5 1.5-1.5h1.5v.5l-2 2v3.5h-2" fill="#320202"/><path d="m20 15v-3.5l-2-2v-.5h1.5l1.5 1.5 1.5-1.5h1.5v.5l-2 2v3.5h-2" fill="#8d8f90"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_sync_sampler.svg b/res/skins/LateNight/buttons/btn_sync_sampler.svg
deleted file mode 100644
index b24c97c7b94a..000000000000
--- a/res/skins/LateNight/buttons/btn_sync_sampler.svg
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="26"
-   width="28"
-   id="svg2">
-  <metadata
-     id="metadata18">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(2 -1026.4)"
-       y2="1049.4"
-       y1="1027.4"
-       x2="13"
-       x1="13"
-       id="linearGradient4163">
-      <stop
-         offset="0"
-         stop-color="#242424"
-         id="stop3803-7" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop3805-5" />
-    </linearGradient>
-  </defs>
-  <path
-     d="m 25.31367,1.17583 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.965573 -2,1.965572 L 4,23.965602 C 3.3401363,23.965601 2.864325,23.613599 2.675,23.453859 2.8840942,24.244747 3.4391575,25 4.4992,25 h 20 c 1.108,0 2,-0.892 2,-2 V 3 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z"
-     id="path15"
-     style="opacity:0.8;fill:#030303" />
-  <rect
-     fill="url(#linearGradient4163)"
-     color="#000000"
-     ry="2"
-     rx="2"
-     height="23"
-     width="23"
-     y=".49998"
-     x="2.5"
-     id="rect3029" />
-  <path
-     style="block-progression:tb;text-indent:0;text-transform:none"
-     fill="#444444"
-     color="#000000"
-     d="m4 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z"
-     id="rect3029-96-0" />
-  <g
-     fill="#060606"
-     transform="translate(2)"
-     id="g4992">
-    <path
-       d="m6 8.3636 6.955 4.6367-6.955 4.6367v-9.2734"
-       id="path3936-0-8-9-7-5" />
-    <path
-       d="m21 8.3636-6.955 4.6367 6.955 4.6367v-9.2734"
-       id="path3936-0-8-9-7-3-3" />
-  </g>
-  <path
-     fill="#bfbfbf"
-     d="m7 7.3636 6.955 4.6367-6.955 4.6367v-9.2734"
-     id="path3936-0-8-9-7" />
-  <path
-     fill="#bfbfbf"
-     d="m22 7.3636-6.955 4.6367 6.955 4.6367v-9.2734"
-     id="path3936-0-8-9-7-3" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_sync_sampler_overdown.svg b/res/skins/LateNight/buttons/btn_sync_sampler_overdown.svg
deleted file mode 100644
index cee54b12b460..000000000000
--- a/res/skins/LateNight/buttons/btn_sync_sampler_overdown.svg
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="26"
-   width="28"
-   id="svg2">
-  <metadata
-     id="metadata17">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(2 -1026.4)"
-       y2="1027.4"
-       y1="1049.4"
-       x2="15"
-       x1="15"
-       id="linearGradient12758">
-      <stop
-         offset="0"
-         stop-color="#aa1112"
-         id="stop3803-7-1-9" />
-      <stop
-         offset=".28"
-         stop-color="#b60607"
-         id="stop4329-4" />
-      <stop
-         offset="1"
-         stop-color="#760607"
-         id="stop3805-5-28-5" />
-    </linearGradient>
-  </defs>
-  <rect
-     fill="url(#linearGradient12758)"
-     color="#000000"
-     ry="1.5"
-     rx="1.5"
-     height="23"
-     width="23"
-     y=".49998"
-     x="2.5"
-     id="rect3029-96-4" />
-  <path
-     style="block-progression:tb;text-indent:0;text-transform:none"
-     fill="#979797"
-     color="#000000"
-     d="m4 0c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h20c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h19.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-19.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z"
-     id="rect3029-96-9" />
-  <g
-     fill="#320202"
-     transform="translate(2)"
-     id="g4992">
-    <path
-       d="m6 8.3636 6.955 4.6367-6.955 4.6367v-9.2734"
-       id="path3936-0-8-9-7-5" />
-    <path
-       d="m21 8.3636-6.955 4.6367 6.955 4.6367v-9.2734"
-       id="path3936-0-8-9-7-3-3" />
-  </g>
-  <path
-     d="M 7,7.3636 13.955,12.0003 7,16.637 V 7.3636"
-     id="path3936-0-8-9-7-36"
-     style="fill:#bfbfbf" />
-  <path
-     d="M 22,7.3636 15.045,12.0003 22,16.637 V 7.3636"
-     id="path3936-0-8-9-7-3-7"
-     style="fill:#bfbfbf" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_xfader_aux_left.svg b/res/skins/LateNight/buttons/btn_xfader_aux_left.svg
deleted file mode 100644
index 07cb76b5f835..000000000000
--- a/res/skins/LateNight/buttons/btn_xfader_aux_left.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   height="13"
-   width="11">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     style="fill:#aaaaaa"
-     id="path2"
-     d="m 2,2 v 9 H 9 V 9 H 4 V 2 H 2" />
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_xfader_aux_master.svg b/res/skins/LateNight/buttons/btn_xfader_aux_master.svg
deleted file mode 100644
index 0dd0b6b4e24e..000000000000
--- a/res/skins/LateNight/buttons/btn_xfader_aux_master.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="34" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m1 3v9h9v-2h-7v-7h-2" fill="#6a6a6a"/><path d="m24 3v9h2v-3h4v1h1v1h1v1h2v-2h-1v-1h-1v-1h1v-4h-1v-1zm2 2h5v2h-5z" fill="#6a6a6a"/><path d="m12 12v-9h1.5l3.5 3.5 3.5-3.5h1.5v9h-2v-6l-3 3-3-3v6z" fill="#c8c8c8"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_xfader_sampler_left.svg b/res/skins/LateNight/buttons/btn_xfader_sampler_left.svg
deleted file mode 100644
index 9110ccd5ff84..000000000000
--- a/res/skins/LateNight/buttons/btn_xfader_sampler_left.svg
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="18"
-   width="25"
-   id="svg2">
-  <metadata
-     id="metadata9">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs7" />
-  <g
-     transform="translate(0 -1034.4)"
-     id="layer1">
-    <path
-       style="fill:#61eb5e"
-       d="m 8,1039.4 v 9 h 8 v -2 h -6 v -7 H 8"
-       id="path3143" />
-  </g>
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_xfader_sampler_master.svg b/res/skins/LateNight/buttons/btn_xfader_sampler_master.svg
deleted file mode 100644
index 98ebe94e7cd9..000000000000
--- a/res/skins/LateNight/buttons/btn_xfader_sampler_master.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="25" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m8 14v-9h2l3 3 3-3h2v9h-2v-6l-3 3-3-3v6z" fill="#585858"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_xfader_sampler_right.svg b/res/skins/LateNight/buttons/btn_xfader_sampler_right.svg
deleted file mode 100644
index ac78a7c1c042..000000000000
--- a/res/skins/LateNight/buttons/btn_xfader_sampler_right.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="25" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m8.0252 5v9h2v-3h2.4998l3 3h1.5v-1.5l-2-2 1-1v-3l-1.5-1.5zm2 2h3.9998v2h-3.9998z" fill="#61eb5e"/></svg>
diff --git a/res/skins/LateNight/buttons/rec_dot.svg b/res/skins/LateNight/buttons/rec_dot.svg
deleted file mode 100644
index 7d79390028a4..000000000000
--- a/res/skins/LateNight/buttons/rec_dot.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" version="1.1" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg"><path id="path2987" d="m13.477 7.5a3.9775 3.9775 0 1 1-7.955 0 3.9775 3.9775 0 1 1 7.955 0z" color="#000000" fill="#d2d2d2"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_.svg b/res/skins/LateNight/buttons_classic/btn_.svg
similarity index 100%
rename from res/skins/LateNight/buttons/btn_.svg
rename to res/skins/LateNight/buttons_classic/btn_.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__1.svg b/res/skins/LateNight/buttons_classic/btn__1.svg
new file mode 100644
index 000000000000..3f112a2f8953
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__1.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m8 9h3v6h-2v-5h-1z" stroke="#000" stroke-width="1.60000002"/>
+	<path d="m8 9h3v6h-2v-5h-1v-1" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__2.svg b/res/skins/LateNight/buttons_classic/btn__2.svg
new file mode 100644
index 000000000000..cd09dd19cca0
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__2.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m7 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002"/>
+	<path d="m7 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__3.svg b/res/skins/LateNight/buttons_classic/btn__3.svg
new file mode 100644
index 000000000000..f0abdd89ec56
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__3.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m6 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5z" stroke="#000" stroke-width="1.60000002"/>
+	<path d="m6 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__4.svg b/res/skins/LateNight/buttons_classic/btn__4.svg
new file mode 100644
index 000000000000..3d6f98081ab4
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__4.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m6 10v3h5v2h2v-6h-2v3h-3v-2z" stroke="#000" stroke-width="1.60000002"/>
+	<path d="m6 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__5.svg b/res/skins/LateNight/buttons_classic/btn__5.svg
new file mode 100644
index 000000000000..34dd7b0b4479
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__5.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m13 9h-6v3h4v2h-5v1h7v-4h-5v-1h5z" stroke="#000" stroke-width="1.60000002"/>
+	<path d="m13 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__6.svg b/res/skins/LateNight/buttons_classic/btn__6.svg
new file mode 100644
index 000000000000..677aec06cb36
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__6.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m7 8.9999997v6.0000003h7v-4h-5v-1h4v-1.0000003zm2 3.0000003h4v2h-4z" stroke="#000" stroke-width="1.60000002"/>
+	<path d="m7 8.9999997v6.0000003h7v-4h-5v-1h4v-1.0000003zm2 3.0000003h4v2h-4z" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__7.svg b/res/skins/LateNight/buttons_classic/btn__7.svg
new file mode 100644
index 000000000000..d7b906f48018
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__7.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m7.031 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4z" stroke="#000" stroke-width="1.60000002"/>
+	<path d="m7.031 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__8.svg b/res/skins/LateNight/buttons_classic/btn__8.svg
new file mode 100644
index 000000000000..cc7dd1d678b6
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__8.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m7 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" stroke="#000" stroke-width="1.60000002"/>
+	<path d="m7 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__arrow_left.svg b/res/skins/LateNight/buttons_classic/btn__arrow_left.svg
new file mode 100644
index 000000000000..f64bd35deee4
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__arrow_left.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m16 10.999714h-4v-3.9999995l-5 5.4999995 5 5.5v-4h4v-3" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002"/>
+	<path d="m16 10.999714h-4v-3.9999995l-5 5.4999995 5 5.5v-4h4v-3" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__arrow_right.svg b/res/skins/LateNight/buttons_classic/btn__arrow_right.svg
new file mode 100644
index 000000000000..7f319803274a
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__arrow_right.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m8 10h4v-4l5 5.5-5 5.5v-4h-4v-3" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.6"/>
+	<path d="m8 10h4v-4l5 5.5-5 5.5v-4h-4v-3" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__autodj_addrandom.svg b/res/skins/LateNight/buttons_classic/btn__autodj_addrandom.svg
new file mode 100644
index 000000000000..3cf8575bc38b
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__autodj_addrandom.svg
@@ -0,0 +1,19 @@
+<svg width="32" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="d">
+			<stop stop-color="#888" offset="0"/>
+			<stop stop-color="#bfbfbe" offset="1"/>
+		</linearGradient>
+		<linearGradient id="e" x1="1.5855784" x2="1.5855784" y1="19" y2="1" gradientUnits="userSpaceOnUse" xlink:href="#d"/>
+		<linearGradient id="f" x1="8.1985474" x2="8.1985474" y1="24.412479" y2="5.2124801" gradientUnits="userSpaceOnUse" xlink:href="#d"/>
+	</defs>
+	<g fill="url(#e)">
+		<g transform="matrix(.68451 0 0 .68268 12.431277 -.032504)" aria-label="?">
+			<path d="m17.145 12.382q0 .59245-.20964 1.0846-.20052.49219-.59245.92969-.38281.42838-1.7682 1.431-1.2122.875-1.2578 1.8411h-2.4336q.05469-.9388.53776-1.6771.48307-.7474 1.3672-1.3581 1.0299-.70182 1.4036-1.1484.3737-.45573.3737-.99349 0-.70182-.55599-1.1211-.55599-.42838-1.4583-.42838-.92057 0-1.5495.53776-.61979.53776-.72917 1.4219l-2.5977-.10938q.24609-1.8503 1.5221-2.8802 1.276-1.0299 3.3177-1.0299 2.1146 0 3.3724.94792t1.2578 2.5521zm-6.3346 8.987v-2.4609h2.6341v2.4609z" fill="url(#e)" stroke-width="1.46290004"/>
+		</g>
+		<path d="m16.746277 3c-.01174.000237-.02347.0008874-.03516.00195-.0052.0005679-.01043.00122-.01563.00195-.0046.0005871-.0091.00124-.01367.00195-.0065.00117-.01305.00248-.01953.00391-.0052.00122-.01044.00252-.01563.00391-.01584.00379-.03148.00835-.04687.013672-.01389.00461-.02758.00982-.04102.015625-.0072.00309-.0144.00634-.02148.00977-.0073.00373-.01442.00764-.02148.011719-.0026.00128-.0052.00258-.0078.00391-.01.00616-.01977.012679-.0293.019531-.006.00443-.01182.00898-.01758.013672-.01142.008-.02249.016468-.0332.025391-.0067.00633-.0132.012842-.01953.019531l-4.2618 4.25c-.01168.011811-.02276.024196-.0332.037109-.02089.025475-.03921.052953-.05469.082031-.0079.014608-.01508.0296-.02149.044922-.006.015998-.01126.032295-.01563.048828-.0047.015427-.0086.03107-.01172.046875v.00195c-.0061.030231-.0094.060961-.0098.091797-1.1e-5.00195-1.1e-5.00391 0 .00586l-6.7e-5 8.7441c2.8e-5.27613.22387.49997.5.5h17c.27613-2.8e-5.49997-.22387.5-.5l-6.7e-5-13c-2.8e-5-.27613-.22387-.49997-.5-.5h-12.74c-.0046-6.23e-5-.0091-6.23e-5-.01367 0zm.51367 1h11.74l6.7e-5 12h-16l6.7e-5-7.75h3.7599c.27613-2.76e-5.49997-.22387.5-.5zm-1 .70508.000134 2.5449h-2.5509z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<g transform="matrix(.94002 0 0 .9375 -5.8999281 -3.8867)" aria-label="+">
+			<path d="m13.723 15.879v3.2h-2.1276v-3.2h-3.1914v-2.1333h3.1914v-3.2h2.1276v3.2h3.1914v2.1333z" fill="url(#f)" stroke-width="1.06519997"/>
+		</g>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__autodj_enable_off.svg b/res/skins/LateNight/buttons_classic/btn__autodj_enable_off.svg
new file mode 100644
index 000000000000..bb5e5916f573
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__autodj_enable_off.svg
@@ -0,0 +1,23 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="c" x1="2.8712108" x2="2.8712108" y1="19.047619" y2="1.025641" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#888" offset="0"/>
+			<stop stop-color="#bfbfbe" offset="1"/>
+		</linearGradient>
+		<linearGradient id="b" x1="-11.208792" x2="-11.208792" y1="19.047619" y2="1.025641" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#888" offset="0"/>
+			<stop stop-color="#bfbfbe" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g fill="url(#c)">
+		<path d="m26 3c-.554 0-1 .446-1 1v3h8v-3c0-.554-.446-1-1-1zm1.25 1.5c.41421 0 .75.33579.75.75s-.33579.75-.75.75-.75-.33579-.75-.75.33579-.75.75-.75zm3.5 0c.41421 0 .75.33579.75.75s-.33579.75-.75.75-.75-.33579-.75-.75.33579-.75.75-.75z" color="#000000"/>
+		<rect x="26" y="14" width="2" height="3" rx="1" ry="1"/>
+		<rect x="30" y="14" width="2" height="3" rx="1" ry="1"/>
+		<rect x="22" y="8" width="2" height="5" rx="1" ry="1" color="#000000"/>
+		<path d="m25 8v6.4219c0 .32317.223.57812.5.57812h7c.277 0 .5-.25496.5-.57812v-6.4219h-7.5z" color="#000000"/>
+		<rect x="34" y="8" width="2" height="5" rx="1" ry="1" color="#000000"/>
+		<path d="m6.4414 5.5293a.75008.75008 0 0 0-.45898.18164c-2.011 1.6874-2.7533 4.459-1.8555 6.9258.89787 2.4668 3.2479 4.1133 5.873 4.1133 2.6252 1.6e-5 4.9752-1.6465 5.873-4.1133.89785-2.4668.15554-5.2384-1.8555-6.9258a.75008.75008 0 1 0-.96289 1.1484c1.5319 1.2854 2.0941 3.3865 1.4102 5.2656-.68395 1.8791-2.4651 3.125-4.4648 3.125-1.9997 1.2e-5-3.7789-1.2459-4.4629-3.125-.68393-1.8791-.12173-3.9803 1.4102-5.2656a.75008.75008 0 0 0-.50586-1.3301z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<path d="m9.9883 2.7383a.75008.75008 0 0 0-.73828.76172v5a.75008.75008 0 1 0 1.5 0v-5a.75008.75008 0 0 0-.76172-.76172z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	</g>
+	<rect x="-18.168499" y="1.025641" width="15.018315" height="18.02198" rx=".5" ry=".5" fill="url(#b)" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__autodj_enable_on.svg b/res/skins/LateNight/buttons_classic/btn__autodj_enable_on.svg
new file mode 100644
index 000000000000..cfc8befa14bc
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__autodj_enable_on.svg
@@ -0,0 +1,10 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m26 3c-.554 0-1 .446-1 1v3h8v-3c0-.554-.446-1-1-1zm1.25 1.5c.41421 0 .75.33579.75.75s-.33579.75-.75.75-.75-.33579-.75-.75.33579-.75.75-.75zm3.5 0c.41421 0 .75.33579.75.75s-.33579.75-.75.75-.75-.33579-.75-.75.33579-.75.75-.75z" color="#000000"/>
+	<rect x="26" y="14" width="2" height="3" rx="1" ry="1"/>
+	<rect x="30" y="14" width="2" height="3" rx="1" ry="1"/>
+	<rect x="22" y="8" width="2" height="5" rx="1" ry="1" color="#000000"/>
+	<path d="m25 8v6.4219c0 .32317.223.57812.5.57812h7c.277 0 .5-.25496.5-.57812v-6.4219h-7.5z" color="#000000"/>
+	<rect x="34" y="8" width="2" height="5" rx="1" ry="1" color="#000000"/>
+	<path d="m6.4414 5.5293a.75008.75008 0 0 0-.45898.18164c-2.011 1.6874-2.7533 4.459-1.8555 6.9258.89787 2.4668 3.2479 4.1133 5.873 4.1133 2.6252 1.6e-5 4.9752-1.6465 5.873-4.1133.89785-2.4668.15554-5.2384-1.8555-6.9258a.75008.75008 0 1 0-.96289 1.1484c1.5319 1.2854 2.0941 3.3865 1.4102 5.2656-.68395 1.8791-2.4651 3.125-4.4648 3.125-1.9997 1.2e-5-3.7789-1.2459-4.4629-3.125-.68393-1.8791-.12173-3.9803 1.4102-5.2656a.75008.75008 0 0 0-.50586-1.3301z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<path d="m9.9883 2.7383a.75008.75008 0 0 0-.73828.76172v5a.75008.75008 0 1 0 1.5 0v-5a.75008.75008 0 0 0-.76172-.76172z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__autodj_fade.svg b/res/skins/LateNight/buttons_classic/btn__autodj_fade.svg
new file mode 100644
index 000000000000..32fdc0a99861
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__autodj_fade.svg
@@ -0,0 +1,12 @@
+<svg width="32" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="a">
+			<stop stop-color="#888" offset="0"/>
+			<stop stop-color="#bfbfbe" offset="1"/>
+		</linearGradient>
+		<linearGradient id="c" x1="7.6989398" x2="7.6989398" y1="19.047621" y2="1.025641" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="b" x1="24.42697" x2="24.42697" y1="19.047621" y2="1.025641" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+	</defs>
+	<path d="m22.344 6.041c-8.5814 1.2349-13.813 4.3649-18.887 9.7031l1.0859 1.0332c4.9261-5.1827 9.694-8.0547 18.014-9.252zm-.57675-3.0402.97008 7.1903 6.7052-4.5652z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#c)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<path d="m3.7793 4.8281-.2168 1.4844c3.1686.4617 5.4587 1.0047 7.8706 1.9377.59438-.29785 1.1531-.62948 1.7832-.89062-2.853-1.264-5.6118-1.9741-9.437-2.5315zm13.878 4.8589c-.63968.19217-1.2426.38965-1.8359.61523 3.0203 1.6884 5.2014 3.6519 7.8405 6.4634l1.0938-1.0273c-2.3854-2.5411-4.385-4.3747-7.0983-6.0512z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#b)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__autodj_fade_disabled.svg b/res/skins/LateNight/buttons_classic/btn__autodj_fade_disabled.svg
new file mode 100644
index 000000000000..12dd0b9b2c19
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__autodj_fade_disabled.svg
@@ -0,0 +1,4 @@
+<svg width="32" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m22.344 6.041c-8.5814 1.2349-13.813 4.3649-18.887 9.7031l1.0859 1.0332c4.9261-5.1827 9.694-8.0547 18.014-9.252zm-.57675-3.0402.97008 7.1903 6.7052-4.5652z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#666" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<path d="m3.7793 4.8281-.2168 1.4844c3.1686.4617 5.4587 1.0047 7.8706 1.9377.59438-.29785 1.1531-.62948 1.7832-.89062-2.853-1.264-5.6118-1.9741-9.437-2.5315zm13.878 4.8589c-.63968.19217-1.2426.38965-1.8359.61523 3.0203 1.6884 5.2014 3.6519 7.8405 6.4634l1.0938-1.0273c-2.3854-2.5411-4.385-4.3747-7.0983-6.0512z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#666" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__autodj_repeat_playlist_off.svg b/res/skins/LateNight/buttons_classic/btn__autodj_repeat_playlist_off.svg
new file mode 100644
index 000000000000..4cbcd0694ebd
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__autodj_repeat_playlist_off.svg
@@ -0,0 +1,12 @@
+<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="a" x1="4.7117639" x2="4.7117639" y1="19.047621" y2="1.025641" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#888" offset="0"/>
+			<stop stop-color="#bfbfbe" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g fill="url(#a)">
+		<path d="m8.0469 1.75-6 3 6 3v-2.25h6.9531c.71734 0 1.5.83133 1.5 1.5v4.6562l1.5 1.1562v-5.8125c0-1.6447-1.3553-3-3-3h-6.9531v-2.25z" color="#000000"/>
+		<path d="m11.953 18.25 6-3-6-3v2.25h-6.9531c-.71734 0-1.5-.83133-1.5-1.5v-4.6563l-1.5-1.1562v5.8125c0 1.6447 1.3553 3 3 3h6.9531z" color="#000000"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__autodj_repeat_playlist_on.svg b/res/skins/LateNight/buttons_classic/btn__autodj_repeat_playlist_on.svg
new file mode 100644
index 000000000000..7738efacd3ba
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__autodj_repeat_playlist_on.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m8.0469 1.75-6 3 6 3v-2.25h6.9531c.71734 0 1.5.83133 1.5 1.5v4.6562l1.5 1.1562v-5.8125c0-1.6447-1.3553-3-3-3h-6.9531z" color="#000000"/>
+	<path d="m11.953 18.25 6-3-6-3v2.25h-6.9531c-.71734 0-1.5-.83133-1.5-1.5v-4.6563l-1.5-1.1562v5.8125c0 1.6447 1.3553 3 3 3h6.9531z" color="#000000"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__autodj_shuffle.svg b/res/skins/LateNight/buttons_classic/btn__autodj_shuffle.svg
new file mode 100644
index 000000000000..25b3f3410bdd
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__autodj_shuffle.svg
@@ -0,0 +1,16 @@
+<svg width="36" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="a" x1="4.7667475" x2="4.7667475" y1="19.047621" y2="1.025641" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#888" offset="0"/>
+			<stop stop-color="#bfbfbe" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g fill="url(#a)">
+		<path d="m26 2.2553 7.1e-5 6.0001 6-3.0001z"/>
+		<path d="m26 17.789 7.1e-5-6 5.9999 3.0001z"/>
+		<g shape-rendering="auto">
+			<path d="m26 4.4365c-4.7361 0-7.2498 3.3683-9.8477 5.5052-2.5978 2.1369-5.3294 4.1478-11.152 4.1478-1.0142-.01458-1.0142 1.5387 0 1.5242 6.1771 0 9.4455-2.3076 12.098-4.4891 2.6522-2.1815 4.6385-5.1639 8.9023-5.1639 1.0142.014581 1.0142-1.5387 0-1.5242z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+			<path d="m19.373 11.282c-.37351.30931-.73323.60416-1.1445.94127-.01226.01002-.02677.0196-.03906.02967 2.1349 1.7261 3.9973 3.4298 7.8106 3.4298 1.0142.01453 1.0142-1.5332 0-1.5187-3.2739 0-4.7051-1.3388-6.627-2.8821zm-14.373-6.8567c-1.0143-.014531-1.0143 1.5332 0 1.5187 4.899 0 7.719 1.7951 10.003 3.5382.21187-.1694.42389-.33773.63672-.51216.18392-.15074.38858-.31002.57617-.4647-2.4909-1.9307-5.7902-4.08-11.216-4.08z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		</g>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__autodj_skip.svg b/res/skins/LateNight/buttons_classic/btn__autodj_skip.svg
new file mode 100644
index 000000000000..32c65f92ee24
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__autodj_skip.svg
@@ -0,0 +1,13 @@
+<svg width="32" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="a" x1="9.3150187" x2="9.3150187" y1="19.047621" y2="1.025641" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#888" offset="0"/>
+			<stop stop-color="#bfbfbe" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g fill="url(#a)">
+		<rect x="1" y="7" width="8" height="6" rx="1" ry="1" style="paint-order:fill markers stroke"/>
+		<path d="m13 7c-.554 0-1 .446-1 1h1zm1 0v1h1v-1zm2 0v1h1v-1zm2 0v1h2c0-.554-.446-1-1-1zm-6 2v1h1v-1zm7 0v1h1v-1zm-7 2v1c0 .554.446 1 1 1v-2zm7 0c0 .554-.446 1-1 1v1h1c.554 0 1-.446 1-1v-1zm-5 1v1h1v-1zm2 0v1h1v-1z" style="paint-order:fill markers stroke"/>
+		<path d="m24 7c-.554 0-1 .446-1 1v4c0 .554.446 1 1 1h6c.554 0 1-.446 1-1v-4c0-.554-.446-1-1-1zm1 1h4c.554 0 1 .446 1 1v2c0 .554-.446 1-1 1h-4c-.554 0-1-.446-1-1v-2c0-.554.446-1 1-1z" style="paint-order:fill markers stroke"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__autodj_skip_disabled.svg b/res/skins/LateNight/buttons_classic/btn__autodj_skip_disabled.svg
new file mode 100644
index 000000000000..1de2abb02858
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__autodj_skip_disabled.svg
@@ -0,0 +1,7 @@
+<svg width="32" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g fill="#666">
+		<rect x="1" y="7" width="8" height="6" rx="1" ry="1" style="paint-order:fill markers stroke"/>
+		<path d="m13 7c-.554 0-1 .446-1 1h1zm1 0v1h1v-1zm2 0v1h1v-1zm2 0v1h2c0-.554-.446-1-1-1zm-6 2v1h1v-1zm7 0v1h1v-1zm-7 2v1c0 .554.446 1 1 1v-2zm7 0c0 .554-.446 1-1 1v1h1c.554 0 1-.446 1-1v-1zm-5 1v1h1v-1zm2 0v1h1v-1z" style="paint-order:fill markers stroke"/>
+		<path d="m24 7c-.554 0-1 .446-1 1v4c0 .554.446 1 1 1h6c.554 0 1-.446 1-1v-4c0-.554-.446-1-1-1zm1 1h4c.554 0 1 .446 1 1v2c0 .554-.446 1-1 1h-4c-.554 0-1-.446-1-1v-2c0-.554.446-1 1-1z" style="paint-order:fill markers stroke"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__aux_play.svg b/res/skins/LateNight/buttons_classic/btn__aux_play.svg
new file mode 100644
index 000000000000..3d3a8cc51a3a
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__aux_play.svg
@@ -0,0 +1,14 @@
+<svg width="40" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(2,1)" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<path d="m19 7v6h2v-2h3v2h2v-6zm2 1h3v2h-3z"/>
+		<path d="m11 7v6h7v-1h-5v-5h-2"/>
+		<path d="m4 7v6h2v-2h4v-4zm2 1h3v2h-3z"/>
+		<path d="m29 13v-3.5l-2-2v-.5h1.5l1.5 1.5 1.5-1.5h1.5v.5l-2 2v3.5h-2"/>
+	</g>
+	<g transform="translate(2,1)" fill="#d2d2d1">
+		<path d="m19 7v6h2v-2h3v2h2v-6zm2 1h3v2h-3z"/>
+		<path d="m11 7v6h7v-1h-5v-5h-2"/>
+		<path d="m4 7v6h2v-2h4v-4zm2 1h3v2h-3z"/>
+		<path d="m29 13v-3.5l-2-2v-.5h1.5l1.5 1.5 1.5-1.5h1.5v.5l-2 2v3.5h-2"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__beat_curpos.svg b/res/skins/LateNight/buttons_classic/btn__beat_curpos.svg
new file mode 100644
index 000000000000..b850982aed1c
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__beat_curpos.svg
@@ -0,0 +1,9 @@
+<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+	<g fill="#585858">
+		<path d="m2 4v6h2v-6z" stroke-width=".92581999"/>
+		<path d="m7 4v10h2v-10z"/>
+		<path d="m12 4v10h2v-10z"/>
+		<path d="m17 4v10h2v-10z"/>
+		<path d="m2 12v2h2v-2z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__beat_curpos_active_12.svg b/res/skins/LateNight/buttons_classic/btn__beat_curpos_active_12.svg
new file mode 100644
index 000000000000..36912c9573f4
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__beat_curpos_active_12.svg
@@ -0,0 +1,11 @@
+<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+	<g fill="#f0bb2b">
+		<path d="m2 4v6h2v-6z" stroke-width=".70710999"/>
+		<g stroke-width=".91286999">
+			<path d="m7 4v10h2v-10z"/>
+			<path d="m12 4v10h2v-10z"/>
+			<path d="m17 4v10h2v-10z"/>
+		</g>
+		<path d="m2 12v2h2v-2z" stroke-width=".40825"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__beat_curpos_active_34.svg b/res/skins/LateNight/buttons_classic/btn__beat_curpos_active_34.svg
new file mode 100644
index 000000000000..3714e8e6b3fc
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__beat_curpos_active_34.svg
@@ -0,0 +1,11 @@
+<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+	<g fill="#0bd9d1">
+		<path d="m2 4v6h2v-6z" stroke-width=".70710999"/>
+		<g stroke-width=".91286999">
+			<path d="m7 4v10h2v-10z"/>
+			<path d="m12 4v10h2v-10z"/>
+			<path d="m17 4v10h2v-10z"/>
+		</g>
+		<path d="m2 12v2h2v-2z" stroke-width=".40825"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__beat_curpos_large.svg b/res/skins/LateNight/buttons_classic/btn__beat_curpos_large.svg
new file mode 100644
index 000000000000..598c4647584c
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__beat_curpos_large.svg
@@ -0,0 +1,11 @@
+<svg width="24" height="50" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(1,1)">
+		<g fill="#888886">
+			<path d="m8 31h2v-18h-2z"/>
+			<path d="m13 31h2v-18h-2z"/>
+			<path d="m18 31h2v-18h-2z"/>
+		</g>
+		<path d="m3 27h2v-14h-2z" fill="#bfbfbe"/>
+		<path d="m3 31h2v-2h-2z" fill="#d3d3d1"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__beatgrid_buttons_toggle.svg b/res/skins/LateNight/buttons_classic/btn__beatgrid_buttons_toggle.svg
new file mode 100644
index 000000000000..67faac9f64ac
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__beatgrid_buttons_toggle.svg
@@ -0,0 +1,11 @@
+<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="matrix(-.5112 .44559 -.50559 -.58003 26.908684 18.828444)" fill="#bfbfbe" stroke-width="1.0108">
+		<path transform="matrix(-1.4588,0,0,1.2857,27.506,3.1429)" d="m12 3c-1.2837 0-2.334 1.0503-2.334 2.334v11.797c-1.6125.8501-2.7305 2.5239-2.7305 4.4648 0 1.9422 1.1183 3.6174 2.7324 4.4668v-3.1956c0-1.2837 1.0503-2.334 2.334-2.334s2.332 1.0503 2.332 2.334v3.1956c1.6141-.84939 2.7324-2.5246 2.7324-4.4668 0-1.9425-1.1184-3.6174-2.7324-4.4668v-11.795c0-1.2837-1.0503-2.334-2.334-2.334z" color="#000000" fill="#bfbfbe"/>
+	</g>
+	<g fill="#7c7c7a">
+		<path d="m6.9996834 11.363444v7.6375h2v-5.3425z"/>
+		<path d="m11.999684 1.0004446v5.9864l2 2.2948997v-8.2812997z"/>
+		<path d="m16.999684 1.0004446v11.7249994l2 2.293v-14.0179994z"/>
+		<path d="m1.9996834 9.7134443v9.2873997h2v-7.9846c-.73826-.26909-1.4212-.69782-2-1.3026997z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__beats_earlier.svg b/res/skins/LateNight/buttons_classic/btn__beats_earlier.svg
new file mode 100644
index 000000000000..ad3ed6e4a314
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__beats_earlier.svg
@@ -0,0 +1,10 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m15 21h-2v-12h2z" fill="#888"/>
+	<path d="m9 3v3l11 1e-6v2l-11-1e-6v3l-7-4z" fill="#bfbfbe"/>
+	<g fill="#888886">
+		<path d="m7 21h2v-9h-2z"/>
+		<path d="m15 5h-2v-2h2z"/>
+		<path d="m21 21h-2v-12h2z"/>
+		<path d="m21 5h-2v-2h2z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__beats_faster.svg b/res/skins/LateNight/buttons_classic/btn__beats_faster.svg
new file mode 100644
index 000000000000..9d37a0233d6d
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__beats_faster.svg
@@ -0,0 +1,8 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m20 10h-2v3l-7-4 7-4v3h2z" fill="#bfbfbe"/>
+	<g fill="#888886">
+		<path d="m5 21h-2v-18h2z"/>
+		<path d="m19 21h2v-10h-2z"/>
+		<path d="m19 7h2v-4h-2z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__beats_later.svg b/res/skins/LateNight/buttons_classic/btn__beats_later.svg
new file mode 100644
index 000000000000..123a52f2e512
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__beats_later.svg
@@ -0,0 +1,12 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g>
+		<path d="m17 21h-2v-9h2z" fill="#888886"/>
+		<path d="m9 21h2v-12h-2z" fill="#888886"/>
+		<path d="m15 3v3l-11 1e-6v2l11-1e-6v3l7-4z" fill="#bfbfbe"/>
+		<g transform="translate(1,1)" fill="#888886">
+			<path d="m8 4h2v-2h-2z"/>
+			<path d="m2 20h2v-12h-2z"/>
+			<path d="m2 4h2v-2h-2z"/>
+		</g>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__beats_slower.svg b/res/skins/LateNight/buttons_classic/btn__beats_slower.svg
new file mode 100644
index 000000000000..9465b259c2cb
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__beats_slower.svg
@@ -0,0 +1,9 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m5 21h-2v-18h2z" fill="#888"/>
+	<g>
+		<path d="m5 21h-2v-18h2z" fill="#888886"/>
+		<path d="m14 10h2v3l7-4-7-4v3h-2z" fill="#bfbfbe"/>
+		<path d="m15 21h-2v-10h2z" fill="#888886"/>
+		<path d="m15 7h-2v-4h2z" fill="#888886"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__cue_deck.svg b/res/skins/LateNight/buttons_classic/btn__cue_deck.svg
new file mode 100644
index 000000000000..3657edc4a09b
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__cue_deck.svg
@@ -0,0 +1,12 @@
+<svg width="38" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-6)" fill="#d2d2d1" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.60000002">
+		<path d="m20 9h-7v6h7v-1h-5v-4h5v-1"/>
+		<path d="m22 9v6h7v-6h-2v5h-3v-5h-2"/>
+		<path d="m31 9v6h7v-1h-5v-2h4v-1h-4v-1h5v-1h-7"/>
+	</g>
+	<g transform="translate(-6)" fill="#d2d2d1">
+		<path d="m20 9h-7v6h7v-1h-5v-4h5v-1"/>
+		<path d="m22 9v6h7v-6h-2v5h-3v-5h-2"/>
+		<path d="m31 9v6h7v-1h-5v-2h4v-1h-4v-1h5v-1h-7"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__effectselector_border.svg b/res/skins/LateNight/buttons_classic/btn__effectselector_border.svg
new file mode 100644
index 000000000000..70449e3a7b93
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__effectselector_border.svg
@@ -0,0 +1,19 @@
+<svg width="25" height="25" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="b" x1="1.4220984" x2="24.143082" y1="19.699568" y2="19.699568" gradientTransform="translate(-.99996996 -25.00003)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".30102351"/>
+			<stop stop-color="#141414" offset="1"/>
+		</linearGradient>
+		<linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(-1,-23)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".17647" offset="0"/>
+			<stop stop-opacity=".0047619" offset=".12672"/>
+			<stop stop-opacity="0" offset=".54348"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x=".50002998" y="-23.5" width="23" height="23" color="#000000" fill="url(#a)"/>
+	<rect x=".5" y=".5" width="24" height="24" fill="none" stroke="#111" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+	<path d="m23.31367 1.17583c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 1.965573-2 1.965572l-19.49922-2e-5c-.6598637-1e-6-1.135675-.352003-1.325-.511743.2090942.790888.7641575 1.546141 1.8242 1.546141h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#020201"/>
+	<rect transform="rotate(90)" x=".50003004" y="-23.5" width="23" height="23" rx=".30000001" ry=".30000001" fill="none" stroke="url(#b)" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_eject_sampler.svg b/res/skins/LateNight/buttons_classic/btn__eject.svg
similarity index 66%
rename from res/skins/LateNight/buttons/btn_eject_sampler.svg
rename to res/skins/LateNight/buttons_classic/btn__eject.svg
index 2531a4aff804..33b5e06318d3 100644
--- a/res/skins/LateNight/buttons/btn_eject_sampler.svg
+++ b/res/skins/LateNight/buttons_classic/btn__eject.svg
@@ -1 +1 @@
-<svg id="svg2" width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg"><path id="path3936-0-8-9-7-1" d="m4.1778 11 6.3222-7 6.3221 7h-12.644" fill="#444444"/><rect id="rect4195" x="4" y="12" width="13" height="3" color="#000000" fill="#444444"/></svg>
+<svg id="svg2" width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg"><path id="path3936-0-8-9-7-1" d="m4.1778 11 6.3222-7 6.3221 7h-12.644" fill="#585858"/><rect id="rect4195" x="4" y="12" width="13" height="3" color="#000000" fill="#585858"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_eject_sampler_over.svg b/res/skins/LateNight/buttons_classic/btn__eject_active_12.svg
similarity index 66%
rename from res/skins/LateNight/buttons/btn_eject_sampler_over.svg
rename to res/skins/LateNight/buttons_classic/btn__eject_active_12.svg
index 3f0f3fa25b2f..ee531a973ec4 100644
--- a/res/skins/LateNight/buttons/btn_eject_sampler_over.svg
+++ b/res/skins/LateNight/buttons_classic/btn__eject_active_12.svg
@@ -1 +1 @@
-<svg id="svg2" width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg"><path id="path3936-0-8-9-7-1" d="m4.1778 10 6.3222-7 6.3221 7h-12.644" fill="#55f864"/><rect id="rect4195" x="4" y="12" width="13" height="3" color="#000000" fill="#55f864"/></svg>
+<svg id="svg2" width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg"><path id="path3936-0-8-9-7-1" d="m4.1778 10 6.3222-7 6.3221 7h-12.644" fill="#f0bb2b"/><rect id="rect4195" x="4" y="12" width="13" height="3" color="#000000" fill="#f0bb2b"/></svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__eject_active_34.svg b/res/skins/LateNight/buttons_classic/btn__eject_active_34.svg
new file mode 100644
index 000000000000..784c6ad2ba63
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__eject_active_34.svg
@@ -0,0 +1 @@
+<svg id="svg2" width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg"><path id="path3936-0-8-9-7-1" d="m4.1778 10 6.3222-7 6.3221 7h-12.644" fill="#0bd9d1"/><rect id="rect4195" x="4" y="12" width="13" height="3" color="#000000" fill="#0bd9d1"/></svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__fx_2.svg b/res/skins/LateNight/buttons_classic/btn__fx_2.svg
new file mode 100644
index 000000000000..af881d69e644
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__fx_2.svg
@@ -0,0 +1,4 @@
+<svg width="12" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m2 6h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002"/>
+	<path d="m2 6h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__fx_2_active.svg b/res/skins/LateNight/buttons_classic/btn__fx_2_active.svg
new file mode 100644
index 000000000000..8d693355e6ca
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__fx_2_active.svg
@@ -0,0 +1,3 @@
+<svg width="12" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m2 6h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__fx_3.svg b/res/skins/LateNight/buttons_classic/btn__fx_3.svg
new file mode 100644
index 000000000000..cc618c49a2db
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__fx_3.svg
@@ -0,0 +1,4 @@
+<svg width="12" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m2 6h7v6h-7v-1h5v-1h-2v-1h2v-2h-5z" stroke="#000" stroke-width="1.60000002"/>
+	<path d="m2 6h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__fx_3_active.svg b/res/skins/LateNight/buttons_classic/btn__fx_3_active.svg
new file mode 100644
index 000000000000..43f3fb10c6e7
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__fx_3_active.svg
@@ -0,0 +1,3 @@
+<svg width="12" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m2 6h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__fx_4.svg b/res/skins/LateNight/buttons_classic/btn__fx_4.svg
new file mode 100644
index 000000000000..871b467b4205
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__fx_4.svg
@@ -0,0 +1,4 @@
+<svg width="12" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m2 7v3h5v2h2v-6h-2v3h-3v-2z" stroke="#000" stroke-width="1.60000002"/>
+	<path d="m2 7v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__fx_4_active.svg b/res/skins/LateNight/buttons_classic/btn__fx_4_active.svg
new file mode 100644
index 000000000000..a039bce0d1d6
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__fx_4_active.svg
@@ -0,0 +1,3 @@
+<svg width="12" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m2 7v3h5v2h2v-6h-2v3h-3v-2h-2"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__fx_FX1.svg b/res/skins/LateNight/buttons_classic/btn__fx_FX1.svg
new file mode 100644
index 000000000000..a30df4184494
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__fx_FX1.svg
@@ -0,0 +1,12 @@
+<svg width="23" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g fill="none" stroke="#0a0a0a" stroke-linecap="square" stroke-width="1.60000002">
+		<path d="m19 6h3v6h-2v-5h-1v-1"/>
+		<path d="m1 6v6h2v-3h4v-1h-4v-1h5v-1h-7"/>
+		<path d="m16 11.5-2.25-2.25 2.25-2.25v-1h-1.5l-2 2-2-2h-1.5v.5l2.5 2.5-2.5 2.5v.5h2l1.75-1.75 1.75 1.75h1.5z"/>
+	</g>
+	<g fill="#d2d2d1">
+		<path d="m19 6h3v6h-2v-5h-1v-1"/>
+		<path d="m1 6v6h2v-3h4v-1h-4v-1h5v-1h-7"/>
+		<path d="m16 11.5-2.25-2.25 2.25-2.25v-1h-1.5l-2 2-2-2h-1.5v.5l2.5 2.5-2.5 2.5v.5h2l1.75-1.75 1.75 1.75h1.5z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__fx_FX1_active.svg b/res/skins/LateNight/buttons_classic/btn__fx_FX1_active.svg
new file mode 100644
index 000000000000..f0fb0fc9c8c0
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__fx_FX1_active.svg
@@ -0,0 +1,7 @@
+<svg width="23" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-5)" fill="#020201">
+		<path d="m24 6h3v6h-2v-5h-1v-1"/>
+		<path d="m6 6v6h2v-3h4v-1h-4v-1h5v-1h-7"/>
+		<path d="m21 11.5-2.25-2.25 2.25-2.25v-1h-1.5l-2 2-2-2h-1.5v.5l2.5 2.5-2.5 2.5v.5h2l1.75-1.75 1.75 1.75h1.5z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__fx_FX2.svg b/res/skins/LateNight/buttons_classic/btn__fx_FX2.svg
new file mode 100644
index 000000000000..ede68751320c
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__fx_FX2.svg
@@ -0,0 +1,12 @@
+<svg width="27" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<path d="m1 6v6h2v-3h4v-1h-4v-1h5v-1h-7"/>
+		<path d="m16 11.5-2.25-2.25 2.25-2.25v-1h-1.5l-2 2-2-2h-1.5v.5l2.5 2.5-2.5 2.5v.5h2l1.75-1.75 1.75 1.75h1.5z"/>
+		<path d="m19 6h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1"/>
+	</g>
+	<g fill="#d2d2d1">
+		<path d="m1 6v6h2v-3h4v-1h-4v-1h5v-1h-7"/>
+		<path d="m16 11.5-2.25-2.25 2.25-2.25v-1h-1.5l-2 2-2-2h-1.5v.5l2.5 2.5-2.5 2.5v.5h2l1.75-1.75 1.75 1.75h1.5z"/>
+		<path d="m19 6h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__fx_FX2_active.svg b/res/skins/LateNight/buttons_classic/btn__fx_FX2_active.svg
new file mode 100644
index 000000000000..b26ae578a38b
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__fx_FX2_active.svg
@@ -0,0 +1,7 @@
+<svg width="27" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-3)">
+		<path d="m4 6v6h2v-3h4v-1h-4v-1h5v-1h-7"/>
+		<path d="m19 11.5-2.25-2.25 2.25-2.25v-1h-1.5l-2 2-2-2h-1.5v.5l2.5 2.5-2.5 2.5v.5h2l1.75-1.75 1.75 1.75h1.5z"/>
+		<path d="m22 6h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__fx_FX3.svg b/res/skins/LateNight/buttons_classic/btn__fx_FX3.svg
new file mode 100644
index 000000000000..b8213d06605f
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__fx_FX3.svg
@@ -0,0 +1,12 @@
+<svg width="27" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<path d="m1 6v6h2v-3h4v-1h-4v-1h5v-1h-7"/>
+		<path d="m16 11.5-2.25-2.25 2.25-2.25v-1h-1.5l-2 2-2-2h-1.5v.5l2.5 2.5-2.5 2.5v.5h2l1.75-1.75 1.75 1.75h1.5z"/>
+		<path d="m19 6h7v6h-7v-1h5v-1h-2v-1h2v-2h-5z"/>
+	</g>
+	<g fill="#d2d2d1">
+		<path d="m1 6v6h2v-3h4v-1h-4v-1h5v-1h-7"/>
+		<path d="m16 11.5-2.25-2.25 2.25-2.25v-1h-1.5l-2 2-2-2h-1.5v.5l2.5 2.5-2.5 2.5v.5h2l1.75-1.75 1.75 1.75h1.5z"/>
+		<path d="m19 6h7v6h-7v-1h5v-1h-2v-1h2v-2h-5z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__fx_FX3_active.svg b/res/skins/LateNight/buttons_classic/btn__fx_FX3_active.svg
new file mode 100644
index 000000000000..eb026958dfb8
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__fx_FX3_active.svg
@@ -0,0 +1,7 @@
+<svg width="27" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-3)">
+		<path d="m4 6v6h2v-3h4v-1h-4v-1h5v-1h-7"/>
+		<path d="m19 11.5-2.25-2.25 2.25-2.25v-1h-1.5l-2 2-2-2h-1.5v.5l2.5 2.5-2.5 2.5v.5h2l1.75-1.75 1.75 1.75h1.5z"/>
+		<path d="m22 6h7v6h-7v-1h5v-1h-2v-1h2v-2h-5z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__fx_FX4.svg b/res/skins/LateNight/buttons_classic/btn__fx_FX4.svg
new file mode 100644
index 000000000000..1ee43fbb46e1
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__fx_FX4.svg
@@ -0,0 +1,12 @@
+<svg width="27" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g stroke="#000" stroke-width="1.60000002">
+		<path d="m1 6v6h2v-3h4v-1h-4v-1h5v-1h-7" fill="none" stroke-linecap="square"/>
+		<path d="m16 11.5-2.25-2.25 2.25-2.25v-1h-1.5l-2 2-2-2h-1.5v.5l2.5 2.5-2.5 2.5v.5h2l1.75-1.75 1.75 1.75h1.5z" fill="none" stroke-linecap="square"/>
+		<path d="m19 7v3h5v2h2v-6h-2v3h-3v-2z"/>
+	</g>
+	<g fill="#d2d2d1">
+		<path d="m1 6v6h2v-3h4v-1h-4v-1h5v-1h-7"/>
+		<path d="m16 11.5-2.25-2.25 2.25-2.25v-1h-1.5l-2 2-2-2h-1.5v.5l2.5 2.5-2.5 2.5v.5h2l1.75-1.75 1.75 1.75h1.5z"/>
+		<path d="m19 7v3h5v2h2v-6h-2v3h-3v-2h-2"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__fx_FX4_active.svg b/res/skins/LateNight/buttons_classic/btn__fx_FX4_active.svg
new file mode 100644
index 000000000000..79cd7ec5d8c8
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__fx_FX4_active.svg
@@ -0,0 +1,7 @@
+<svg width="27" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-3)" fill="#0c0c0b">
+		<path d="m4 6v6h2v-3h4v-1h-4v-1h5v-1h-7"/>
+		<path d="m19 11.5-2.25-2.25 2.25-2.25v-1h-1.5l-2 2-2-2h-1.5v.5l2.5 2.5-2.5 2.5v.5h2l1.75-1.75 1.75 1.75h1.5z"/>
+		<path d="m22 7v3h5v2h2v-6h-2v3h-3v-2h-2"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__fx_focus.svg b/res/skins/LateNight/buttons_classic/btn__fx_focus.svg
new file mode 100644
index 000000000000..5c82284c1499
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__fx_focus.svg
@@ -0,0 +1,14 @@
+<svg width="16" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g fill="none" stroke="#000" stroke-linecap="square" stroke-width="2.8">
+		<path d="m5.25 3.75h-1.5v4.5"/>
+		<path d="m10.75 3.75h1.5v4.5"/>
+		<path d="m5.25 20.25h-1.5v-4.5"/>
+		<path d="m10.75 20.25h1.5v-4.5"/>
+	</g>
+	<g fill="none" stroke="#bfbfbe" stroke-linecap="square" stroke-width="1.5">
+		<path d="m5.25 3.75h-1.5v4.5"/>
+		<path d="m10.75 3.75h1.5v4.5"/>
+		<path d="m5.25 20.25h-1.5v-4.5"/>
+		<path d="m10.75 20.25h1.5v-4.5"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__fx_focus_active.svg b/res/skins/LateNight/buttons_classic/btn__fx_focus_active.svg
new file mode 100644
index 000000000000..de4880bd7f06
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__fx_focus_active.svg
@@ -0,0 +1,20 @@
+<svg width="16" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g fill="none" stroke-linecap="square" stroke-width="1.5">
+		<g stroke="#000">
+			<path d="m46.75 3.75h-3v7"/>
+			<path d="m49.25 3.75h3v7"/>
+			<path d="m46.75 20.25h-3v-7"/>
+			<path d="m49.25 20.25h3v-7"/>
+			<path d="m6.25 5.75h-1.5v4.5"/>
+			<path d="m9.75 5.75h1.5v4.5"/>
+			<path d="m6.25 18.25h-1.5v-4.5"/>
+			<path d="m9.75 18.25h1.5v-4.5"/>
+		</g>
+		<g transform="translate(20)" stroke="#020201">
+			<path d="m5.25 3.75h-1.5v4.5"/>
+			<path d="m10.75 3.75h1.5v4.5"/>
+			<path d="m5.25 20.25h-1.5v-4.5"/>
+			<path d="m10.75 20.25h1.5v-4.5"/>
+		</g>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__fx_mixmode_d+w.svg b/res/skins/LateNight/buttons_classic/btn__fx_mixmode_d+w.svg
new file mode 100644
index 000000000000..89231d14cdc5
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__fx_mixmode_d+w.svg
@@ -0,0 +1,8 @@
+<svg width="28" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-.55235449)" fill="none" stroke-linecap="round">
+		<path d="m4.0142425 8.0017027h20.9715155" stroke="#0d0505" stroke-opacity=".99608005" stroke-width="3.20000005"/>
+		<path d="m4.0142425 8.0017026h20.9715155" stroke="#b5b5b5" stroke-opacity=".99216003" stroke-width="2"/>
+		<path d="m24.985558 8.0017027c-14.679661 3.7456013-20.9715155 9.9882003-20.9715155 9.9882003" stroke="#0d0505" stroke-opacity=".99608005" stroke-width="3.20000005"/>
+		<path d="m24.985558 8.0017026c-14.679661 3.7456004-20.9715155 9.9882004-20.9715155 9.9882004" stroke="#da0606" stroke-width="2"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__fx_mixmode_d-w.svg b/res/skins/LateNight/buttons_classic/btn__fx_mixmode_d-w.svg
new file mode 100644
index 000000000000..3d9d9826e7d2
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__fx_mixmode_d-w.svg
@@ -0,0 +1,8 @@
+<svg width="28" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-.49971785 -3.5964877e-5)" fill="none" stroke-linecap="round">
+		<path d="m4.0138036 7.00174c14.6820004 3.7456 20.9750004 9.9882 20.9750004 9.9882" stroke="#060202" stroke-opacity=".99608005" stroke-width="3.20000005"/>
+		<path d="m4.0138036 7.00174c14.6820004 3.7456 20.9750004 9.9882 20.9750004 9.9882" stroke="#b5b5b5" stroke-opacity=".99216003" stroke-width="2"/>
+		<path d="m24.986004 7.00174c-14.682 3.7456-20.9750004 9.9882-20.9750004 9.9882" stroke="#060202" stroke-opacity=".99608005" stroke-width="3.20000005"/>
+		<path d="m24.986004 7.00174c-14.682 3.7456-20.9750004 9.9882-20.9750004 9.9882" stroke="#da0606" stroke-width="2"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__fx_sampler_collapse.svg b/res/skins/LateNight/buttons_classic/btn__fx_sampler_collapse.svg
new file mode 100644
index 000000000000..655f83ba26e7
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__fx_sampler_collapse.svg
@@ -0,0 +1,6 @@
+<svg width="22" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m15.424902 18.636-4.425164-4.425259-4.4251649 4.425259-1.1062911-1.106386 5.531456-5.531549 5.531456 5.531549z" fill="none" stroke="#000" stroke-linejoin="round" stroke-width="1.60000002"/>
+	<path d="M 15.424902,3.364201 10.999644,7.7894591 6.5743851,3.364201 5.468,4.4705861 10.99955,10.002136 16.5311,4.4705861 15.424715,3.364201 Z" fill="none" stroke="#000" stroke-linejoin="round" stroke-width="1.60000002"/>
+	<path d="m15.424902 18.636-4.425164-4.425259-4.4251649 4.425259-1.1062911-1.106386 5.531456-5.531549 5.531456 5.531549z" fill="#bbb" stroke-width=".93992448"/>
+	<path d="m15.424902 3.3642014-4.425258 4.4252581-4.4252589-4.4252581-1.1063851 1.1063851 5.53155 5.5315495 5.53155-5.5315495-1.106385-1.1063851z" fill="#bbb" stroke-width=".93992448"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__fx_sampler_expand.svg b/res/skins/LateNight/buttons_classic/btn__fx_sampler_expand.svg
new file mode 100644
index 000000000000..b89030431aed
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__fx_sampler_expand.svg
@@ -0,0 +1,12 @@
+<svg width="22" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g fill="none" stroke="#000" stroke-linejoin="round" stroke-width="1.6">
+		<g transform="matrix(.93992449 0 0 .93992449 1.6003517 1.6003969)" fill="none" stroke="#000" stroke-linejoin="round" stroke-width="1.7022644">
+			<path d="m14.70815 11.4378-4.708 4.7081-4.708-4.7081-1.177 1.1771 5.885 5.8851 5.885-5.8851z"/>
+			<path d="m14.70815 8.562-4.7081-4.7080996-4.7081 4.7080996-1.1771-1.1771 5.8851-5.8850996 5.8851 5.8850996-1.1771 1.1771z"/>
+		</g>
+	</g>
+	<g transform="matrix(.93992449 0 0 .93992449 1.6003517 1.6003969)" fill="#bbb">
+		<path d="m14.70815 11.4378-4.708 4.7081-4.708-4.7081-1.177 1.1771 5.885 5.8851 5.885-5.8851z"/>
+		<path d="m14.70815 8.562-4.7081-4.7080996-4.7081 4.7080996-1.1771-1.1771 5.8851-5.8850996 5.8851 5.8850996-1.1771 1.1771z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__fx_selector_down.svg b/res/skins/LateNight/buttons_classic/btn__fx_selector_down.svg
new file mode 100644
index 000000000000..18a996c5b2bd
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__fx_selector_down.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m8 15.918 4.5715-7.9181h-9.143z" fill="none" stroke="#000" stroke-width="1.6"/>
+	<path d="m8 15.918 4.5715-7.9181h-9.143z" fill="#888"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__fx_selector_down_pressed.svg b/res/skins/LateNight/buttons_classic/btn__fx_selector_down_pressed.svg
new file mode 100644
index 000000000000..72d8a1ac27f2
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__fx_selector_down_pressed.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m8 15.918 4.5715-7.9181h-9.143z" fill="none" stroke="#000" stroke-width="1.60000002"/>
+	<path d="m8 15.918 4.5715-7.9181h-9.143z" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__fx_toggle.svg b/res/skins/LateNight/buttons_classic/btn__fx_toggle.svg
new file mode 100644
index 000000000000..c1254d707cf6
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__fx_toggle.svg
@@ -0,0 +1,8 @@
+<svg width="22" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g fill="none" stroke="#000" stroke-width="1.60000002">
+		<path d="m13.730156 7.0804229c1.509333.923162 2.519954 2.5811933 2.519954 4.4799511 0 2.900587-2.349347 5.250022-5.250022 5.250022s-5.250022-2.349435-5.250022-5.250022c0-1.8987578 1.0106213-3.5567891 2.5199542-4.4799511l-1.2643765-1.2643765c-1.8156164 1.2643765-3.0056437 3.3642797-3.0056437 5.7443276 0 3.867479 3.1325213 6.999912 7 6.999912 3.867479 0 7-3.132433 7-6.999912 0-2.3800479-1.190027-4.4799511-3.005644-5.7443276z"/>
+		<path d="m11.999999 3h-1.9999998v6.0000003h1.9999998z"/>
+	</g>
+	<path d="m13.730156 7.080423c1.509333.923162 2.519954 2.5811933 2.519954 4.479951 0 2.900587-2.349347 5.250022-5.250022 5.250022s-5.250022-2.349435-5.250022-5.250022c0-1.8987577 1.0106213-3.556789 2.5199542-4.479951l-1.2643765-1.2643765c-1.8156164 1.2643765-3.0056437 3.3642797-3.0056437 5.7443275 0 3.867479 3.1325213 6.999912 7 6.999912 3.867479 0 7-3.132433 7-6.999912 0-2.3800478-1.190027-4.479951-3.005644-5.7443275z" fill="#d2d2d1"/>
+	<path d="m11.999999 3.0000001h-1.9999998v6.0000003h1.9999998z" fill="#d2d2d1" stroke-width=".99999994"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__fx_toggle_active.svg b/res/skins/LateNight/buttons_classic/btn__fx_toggle_active.svg
new file mode 100644
index 000000000000..8760ce6f0b74
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__fx_toggle_active.svg
@@ -0,0 +1,4 @@
+<svg width="22" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m14.994532 5.8160464-1.264376 1.2643765c1.509333.923162 2.519954 2.5811933 2.519954 4.4799511 0 2.900587-2.349347 5.250022-5.250022 5.250022s-5.250022-2.349435-5.250022-5.250022c0-1.8987578 1.0106213-3.5567891 2.5199542-4.4799511l-1.2643765-1.2643765c-1.8156164 1.2643765-3.0056437 3.3642797-3.0056437 5.7443276 0 3.867479 3.1325213 6.999912 7 6.999912 3.867479 0 7-3.132433 7-6.999912 0-2.3800479-1.190027-4.4799511-3.005644-5.7443276z" fill="#0e0e0e"/>
+	<path d="m11.999999 3h-1.9999998v6.0000003h1.9999998z" fill="#0e0e0e" stroke-width=".99999994"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__intro_end.svg b/res/skins/LateNight/buttons_classic/btn__intro_end.svg
new file mode 100644
index 000000000000..7cf7876d9bfe
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__intro_end.svg
@@ -0,0 +1,10 @@
+<svg width="18" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-2.99971)" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<rect transform="scale(-1,1)" x="-18" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
+		<path d="m5 17 9-10v10z"/>
+	</g>
+	<g transform="translate(-2.99971)" fill="#d2d2d1">
+		<rect transform="scale(-1,1)" x="-18" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
+		<path d="m5 17 9-10v10z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__intro_start.svg b/res/skins/LateNight/buttons_classic/btn__intro_start.svg
new file mode 100644
index 000000000000..e6c7d49b670d
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__intro_start.svg
@@ -0,0 +1,10 @@
+<svg width="18" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-3)" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<rect x="6" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
+		<path d="m9 17 9-10v10z"/>
+	</g>
+	<g transform="translate(-3)" fill="#d2d2d1">
+		<rect x="6" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
+		<path d="m9 17 9-10v10z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__key_down.svg b/res/skins/LateNight/buttons_classic/btn__key_down.svg
new file mode 100644
index 000000000000..b154682ce020
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__key_down.svg
@@ -0,0 +1,4 @@
+<svg width="10" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m5.0000515 12-3.4641429-6h6.9281999z" fill="none" stroke="#000" stroke-width="1.60000002"/>
+	<path d="m5.0000515 12-3.4641429-6h6.9281999z" fill="#bfbfbe" stroke-width=".85714287"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__key_match.svg b/res/skins/LateNight/buttons_classic/btn__key_match.svg
new file mode 100644
index 000000000000..4cf38407327b
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__key_match.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="matrix(.77463677 0 0 .77463677 19.507552 .20097752)" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.06548419" aria-label="♪">
+		<path d="m-14.623223 1.7718814h1.132812l.104167.091146v.5078125c.234375.4687499 1.10243.9765624 2.604166 1.5234374 2.0833332.6076389 3.1250002 1.5104167 3.1250002 2.7083333 0 1.2673611-.529514 2.3177083-1.588541 3.1510416h-.05208l-.390625-.4166667c.529514-.4253472.794271-1.0026041.794271-1.7317708 0-.6076388-.989583-1.219618-2.9687502-1.8359374-.798611-.3645833-1.306423-.6597222-1.523437-.8854167v11.2983524c0 1.328125-.972222 2.1875-2.916667 2.578125h-.742187c-2.100695 0-3.151042-.729167-3.151042-2.1875 0-1.137153.920139-1.805555 2.760417-2.005208h.299479c.833333 0 1.636285.277778 2.408854.833333v-13.5379358z" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.06548419"/>
+	</g>
+	<g transform="matrix(.77463677 0 0 .77463677 19.507552 .20097721)" fill="#bfbfbe" aria-label="♪">
+		<path d="m-14.623223 1.7718814h1.132812l.104167.091146v.5078125c.234375.4687499 1.10243.9765624 2.604166 1.5234374 2.0833332.6076389 3.1250002 1.5104167 3.1250002 2.7083333 0 1.2673611-.529514 2.3177083-1.588541 3.1510416h-.05208l-.390625-.4166667c.529514-.4253472.794271-1.0026041.794271-1.7317708 0-.6076388-.989583-1.219618-2.9687502-1.8359374-.798611-.3645833-1.306423-.6597222-1.523437-.8854167v11.2983524c0 1.328125-.972222 2.1875-2.916667 2.578125h-.742187c-2.100695 0-3.151042-.729167-3.151042-2.1875 0-1.137153.920139-1.805555 2.760417-2.005208h.299479c.833333 0 1.636285.277778 2.408854.833333v-13.5379358z" fill="#bfbfbe" stroke-width="1.29092765"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__key_up.svg b/res/skins/LateNight/buttons_classic/btn__key_up.svg
new file mode 100644
index 000000000000..776fa24e6491
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__key_up.svg
@@ -0,0 +1,4 @@
+<svg width="10" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="M 5.0000515,4.9999996 1.5359086,11 h 6.9281999 z" fill="none" stroke="#000" stroke-width="1.60000002"/>
+	<path d="M 5.0000515,4.9999996 1.5359086,11 h 6.9281999 z" fill="#bfbfbe" stroke-width=".85714287"/>
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_keylock_sampler.svg b/res/skins/LateNight/buttons_classic/btn__keylock.svg
similarity index 92%
rename from res/skins/LateNight/buttons/btn_keylock_sampler.svg
rename to res/skins/LateNight/buttons_classic/btn__keylock.svg
index 8d07e5b7fc7a..f0f0d577a521 100644
--- a/res/skins/LateNight/buttons/btn_keylock_sampler.svg
+++ b/res/skins/LateNight/buttons_classic/btn__keylock.svg
@@ -1 +1 @@
-<svg id="svg2" width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg"><path id="rect4195" d="m10.5 3c-1.933 0-3.5 1.567-3.5 3.5v1.5h-2v7h11v-7h-2v-1.5c0-1.933-1.567-3.5-3.5-3.5zm0 2c0.82843 0 1.5 0.67157 1.5 1.5v1.5h-3v-1.5c0-0.82843 0.67157-1.5 1.5-1.5zm-0.5 5h1v3h-1z" color="#000000" fill="#444444"/></svg>
+<svg id="svg2" width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg"><path id="rect4195" d="m10.5 3c-1.933 0-3.5 1.567-3.5 3.5v1.5h-2v7h11v-7h-2v-1.5c0-1.933-1.567-3.5-3.5-3.5zm0 2c0.82843 0 1.5 0.67157 1.5 1.5v1.5h-3v-1.5c0-0.82843 0.67157-1.5 1.5-1.5zm-0.5 5h1v3h-1z" color="#000000" fill="#585858"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_keylock_sampler_over.svg b/res/skins/LateNight/buttons_classic/btn__keylock_active_12.svg
similarity index 92%
rename from res/skins/LateNight/buttons/btn_keylock_sampler_over.svg
rename to res/skins/LateNight/buttons_classic/btn__keylock_active_12.svg
index e1c8bfe50cf8..2702af4a6d9b 100644
--- a/res/skins/LateNight/buttons/btn_keylock_sampler_over.svg
+++ b/res/skins/LateNight/buttons_classic/btn__keylock_active_12.svg
@@ -1 +1 @@
-<svg id="svg2" width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg"><path id="rect4195" d="m10.5 3c-1.933 0-3.5 1.567-3.5 3.5v1.5h-2v7h11v-7h-2v-1.5c0-1.933-1.567-3.5-3.5-3.5zm0 2c0.82843 0 1.5 0.67157 1.5 1.5v1.5h-3v-1.5c0-0.82843 0.67157-1.5 1.5-1.5zm-0.5 5h1v3h-1z" color="#000000" fill="#55f864"/></svg>
+<svg id="svg2" width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg"><path id="rect4195" d="m10.5 3c-1.933 0-3.5 1.567-3.5 3.5v1.5h-2v7h11v-7h-2v-1.5c0-1.933-1.567-3.5-3.5-3.5zm0 2c0.82843 0 1.5 0.67157 1.5 1.5v1.5h-3v-1.5c0-0.82843 0.67157-1.5 1.5-1.5zm-0.5 5h1v3h-1z" color="#000000" fill="#f0bb2b"/></svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__keylock_active_34.svg b/res/skins/LateNight/buttons_classic/btn__keylock_active_34.svg
new file mode 100644
index 000000000000..f5282e6cd194
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__keylock_active_34.svg
@@ -0,0 +1 @@
+<svg id="svg2" width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg"><path id="rect4195" d="m10.5 3c-1.933 0-3.5 1.567-3.5 3.5v1.5h-2v7h11v-7h-2v-1.5c0-1.933-1.567-3.5-3.5-3.5zm0 2c0.82843 0 1.5 0.67157 1.5 1.5v1.5h-3v-1.5c0-0.82843 0.67157-1.5 1.5-1.5zm-0.5 5h1v3h-1z" color="#000000" fill="#0bd9d1"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_lib_bpm_locked.svg b/res/skins/LateNight/buttons_classic/btn__lib_bpm_locked.svg
similarity index 100%
rename from res/skins/LateNight/buttons/btn_lib_bpm_locked.svg
rename to res/skins/LateNight/buttons_classic/btn__lib_bpm_locked.svg
diff --git a/res/skins/LateNight/buttons/btn_lib_bpm_unlocked.svg b/res/skins/LateNight/buttons_classic/btn__lib_bpm_unlocked.svg
similarity index 100%
rename from res/skins/LateNight/buttons/btn_lib_bpm_unlocked.svg
rename to res/skins/LateNight/buttons_classic/btn__lib_bpm_unlocked.svg
diff --git a/res/skins/LateNight/buttons/btn_lib_checkmark.svg b/res/skins/LateNight/buttons_classic/btn__lib_checkmark.svg
similarity index 100%
rename from res/skins/LateNight/buttons/btn_lib_checkmark.svg
rename to res/skins/LateNight/buttons_classic/btn__lib_checkmark.svg
diff --git a/res/skins/LateNight/buttons/btn_lib_clear_search.svg b/res/skins/LateNight/buttons_classic/btn__lib_clear_search.svg
similarity index 100%
rename from res/skins/LateNight/buttons/btn_lib_clear_search.svg
rename to res/skins/LateNight/buttons_classic/btn__lib_clear_search.svg
diff --git a/res/skins/LateNight/buttons/btn_lib_clear_search_focus.svg b/res/skins/LateNight/buttons_classic/btn__lib_clear_search_focus.svg
similarity index 100%
rename from res/skins/LateNight/buttons/btn_lib_clear_search_focus.svg
rename to res/skins/LateNight/buttons_classic/btn__lib_clear_search_focus.svg
diff --git a/res/skins/LateNight/buttons/btn_lib_preview_pause.svg b/res/skins/LateNight/buttons_classic/btn__lib_preview_pause.svg
similarity index 100%
rename from res/skins/LateNight/buttons/btn_lib_preview_pause.svg
rename to res/skins/LateNight/buttons_classic/btn__lib_preview_pause.svg
diff --git a/res/skins/LateNight/buttons/btn_lib_preview_play.svg b/res/skins/LateNight/buttons_classic/btn__lib_preview_play.svg
similarity index 100%
rename from res/skins/LateNight/buttons/btn_lib_preview_play.svg
rename to res/skins/LateNight/buttons_classic/btn__lib_preview_play.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__lib_radio_button_gold_on.svg b/res/skins/LateNight/buttons_classic/btn__lib_radio_button_gold_on.svg
new file mode 100644
index 000000000000..271857a10b70
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__lib_radio_button_gold_on.svg
@@ -0,0 +1,4 @@
+<svg id="svg2" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
+  <path id="path2987" d="m9 5.1042c-2.1505 0-3.8958 1.7453-3.8958 3.8958s1.7453 3.8958 3.8958 3.8958 3.8958-1.7453 3.8958-3.8958-1.7453-3.8958-3.8958-3.8958z" fill="#cab32c"/>
+  <path id="path2985" d="m9 2c-3.8675 0-7 3.1325-7 7s3.1325 7 7 7 7-3.1325 7-7-3.132-7-7-7zm0 1.4062c3.094 0 5.5938 2.4998 5.5938 5.5938s-2.4998 5.5938-5.5938 5.5938-5.5938-2.4998-5.5938-5.5938 2.4998-5.5938 5.5938-5.5938z" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_lib_radio_button_off.svg b/res/skins/LateNight/buttons_classic/btn__lib_radio_button_off.svg
similarity index 90%
rename from res/skins/LateNight/buttons/btn_lib_radio_button_off.svg
rename to res/skins/LateNight/buttons_classic/btn__lib_radio_button_off.svg
index 31dbe5bc7af4..680fb2316fd8 100644
--- a/res/skins/LateNight/buttons/btn_lib_radio_button_off.svg
+++ b/res/skins/LateNight/buttons_classic/btn__lib_radio_button_off.svg
@@ -1 +1 @@
-<svg id="svg2" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg"><path id="path4" d="m9 2c-3.8677 0-7 3.1323-7 7s3.1323 7 7 7 7-3.1323 7-7-3.132-7-7-7zm0 12.6c-3.094 0-5.6-2.506-5.6-5.6s2.506-5.6 5.6-5.6 5.6 2.506 5.6 5.6-2.506 5.6-5.6 5.6z" fill="#d2d2d2"/></svg>
+<svg id="svg2" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg"><path id="path4" d="m9 2c-3.8677 0-7 3.1323-7 7s3.1323 7 7 7 7-3.1323 7-7-3.132-7-7-7zm0 12.6c-3.094 0-5.6-2.506-5.6-5.6s2.506-5.6 5.6-5.6 5.6 2.506 5.6 5.6-2.506 5.6-5.6 5.6z" fill="#d2d2d1"/></svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__lib_radio_button_on_gold.svg b/res/skins/LateNight/buttons_classic/btn__lib_radio_button_on_gold.svg
new file mode 100644
index 000000000000..c82ccf9677f7
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__lib_radio_button_on_gold.svg
@@ -0,0 +1,4 @@
+<svg version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
+	<path d="m9 5.1042c-2.1505 0-3.8958 1.7453-3.8958 3.8958s1.7453 3.8958 3.8958 3.8958 3.8958-1.7453 3.8958-3.8958-1.7453-3.8958-3.8958-3.8958z" fill="#e49100"/>
+	<path d="m9 2c-3.8675 0-7 3.1325-7 7s3.1325 7 7 7 7-3.1325 7-7-3.132-7-7-7zm0 1.4062c3.094 0 5.5938 2.4998 5.5938 5.5938s-2.4998 5.5938-5.5938 5.5938-5.5938-2.4998-5.5938-5.5938 2.4998-5.5938 5.5938-5.5938z" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__lib_radio_button_on_yellow.svg b/res/skins/LateNight/buttons_classic/btn__lib_radio_button_on_yellow.svg
new file mode 100644
index 000000000000..b077114da826
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__lib_radio_button_on_yellow.svg
@@ -0,0 +1,4 @@
+<svg version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
+	<path d="m9 5.1042c-2.1505 0-3.8958 1.7453-3.8958 3.8958s1.7453 3.8958 3.8958 3.8958 3.8958-1.7453 3.8958-3.8958-1.7453-3.8958-3.8958-3.8958z" fill="#ecb82b"/>
+	<path d="m9 2c-3.8675 0-7 3.1325-7 7s3.1325 7 7 7 7-3.1325 7-7-3.132-7-7-7zm0 1.4062c3.094 0 5.5938 2.4998 5.5938 5.5938s-2.4998 5.5938-5.5938 5.5938-5.5938-2.4998-5.5938-5.5938 2.4998-5.5938 5.5938-5.5938z" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_lib_radio_button_on.svg b/res/skins/LateNight/buttons_classic/btn__lib_radio_button_yellow_on.svg
similarity index 89%
rename from res/skins/LateNight/buttons/btn_lib_radio_button_on.svg
rename to res/skins/LateNight/buttons_classic/btn__lib_radio_button_yellow_on.svg
index 738e53f141ea..8f8cccef4340 100644
--- a/res/skins/LateNight/buttons/btn_lib_radio_button_on.svg
+++ b/res/skins/LateNight/buttons_classic/btn__lib_radio_button_yellow_on.svg
@@ -1 +1 @@
-<svg id="svg2" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg"><path id="path2987" d="m9 5.1042c-2.1505 0-3.8958 1.7453-3.8958 3.8958s1.7453 3.8958 3.8958 3.8958 3.8958-1.7453 3.8958-3.8958-1.7453-3.8958-3.8958-3.8958z" fill="#cab32c"/><path id="path2985" d="m9 2c-3.8675 0-7 3.1325-7 7s3.1325 7 7 7 7-3.1325 7-7-3.132-7-7-7zm0 1.4062c3.094 0 5.5938 2.4998 5.5938 5.5938s-2.4998 5.5938-5.5938 5.5938-5.5938-2.4998-5.5938-5.5938 2.4998-5.5938 5.5938-5.5938z" fill="#d2d2d2"/></svg>
+<svg id="svg2" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg"><path id="path2987" d="m9 5.1042c-2.1505 0-3.8958 1.7453-3.8958 3.8958s1.7453 3.8958 3.8958 3.8958 3.8958-1.7453 3.8958-3.8958-1.7453-3.8958-3.8958-3.8958z" fill="#cab32c"/><path id="path2985" d="m9 2c-3.8675 0-7 3.1325-7 7s3.1325 7 7 7 7-3.1325 7-7-3.132-7-7-7zm0 1.4062c3.094 0 5.5938 2.4998 5.5938 5.5938s-2.4998 5.5938-5.5938 5.5938-5.5938-2.4998-5.5938-5.5938 2.4998-5.5938 5.5938-5.5938z" fill="#d2d2d1"/></svg>
diff --git a/res/skins/LateNight/style/btn_lib_sort_down.png b/res/skins/LateNight/buttons_classic/btn__lib_sort_down.png
similarity index 100%
rename from res/skins/LateNight/style/btn_lib_sort_down.png
rename to res/skins/LateNight/buttons_classic/btn__lib_sort_down.png
diff --git a/res/skins/LateNight/buttons_classic/btn__lib_sort_down.svg b/res/skins/LateNight/buttons_classic/btn__lib_sort_down.svg
new file mode 100644
index 000000000000..04c2d3335097
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__lib_sort_down.svg
@@ -0,0 +1,4 @@
+<svg width="12" height="12" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m6 9.5590477 4.5715-7.9181h-9.143z" fill="none" stroke="#000" stroke-width="1.60000002"/>
+	<path d="m6 9.5590477 4.5715-7.9181h-9.143z" fill="#fa0"/>
+</svg>
diff --git a/res/skins/LateNight/style/btn_lib_sort_up.png b/res/skins/LateNight/buttons_classic/btn__lib_sort_up.png
similarity index 100%
rename from res/skins/LateNight/style/btn_lib_sort_up.png
rename to res/skins/LateNight/buttons_classic/btn__lib_sort_up.png
diff --git a/res/skins/LateNight/buttons_classic/btn__lib_sort_up.svg b/res/skins/LateNight/buttons_classic/btn__lib_sort_up.svg
new file mode 100644
index 000000000000..c1b71cdb27f3
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__lib_sort_up.svg
@@ -0,0 +1,4 @@
+<svg width="12" height="12" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m6 2.4409522 4.5715 7.9180998h-9.143z" fill="none" stroke="#000" stroke-width="1.60000002"/>
+	<path d="m6 2.4409522 4.5715 7.9180998h-9.143z" fill="#fa0"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__loop.svg b/res/skins/LateNight/buttons_classic/btn__loop.svg
new file mode 100644
index 000000000000..4d9c2bc4f26f
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__loop.svg
@@ -0,0 +1,10 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<path d="m4 8.488 1.4998895.856062-.00025 6.6559c-2.15e-5.57129.9288347 1.5001 1.5001237 1.5001l7.0001108-6.2e-5v-3l7.00011 3.75-7.00011 3.75v-3l-7.0001108 6.3e-5c-1.644726 1.4e-5-3.0000474-1.3553-3.0000474-3z" color="#000000"/>
+		<path d="m20 15.612-1.499905-.956038.00025-6.6559c2.5e-5-.66867-.782772-1.5001-1.500124-1.5001l-7.00011 6.24e-5v2.9999996l-7.000111-3.7499996 7.000111-3.75v3l7.00011-6.25e-5c1.644726-1.47e-5 3.000048 1.3553 3.000048 3z" color="#000000"/>
+	</g>
+	<g fill="#d2d2d1">
+		<path d="m4 8.488 1.4998895.856062-.00025 6.6559c-2.15e-5.57129.9288347 1.5001 1.5001237 1.5001l7.0001108-6.2e-5v-3l7.00011 3.75-7.00011 3.75v-3l-7.0001108 6.3e-5c-1.644726 1.4e-5-3.0000474-1.3553-3.0000474-3z" color="#000000"/>
+		<path d="m20 15.612-1.499905-.956038.00025-6.6559c2.5e-5-.66867-.782772-1.5001-1.500124-1.5001l-7.00011 6.24e-5v2.9999996l-7.000111-3.7499996 7.000111-3.75v3l7.00011-6.25e-5c1.644726-1.47e-5 3.000048 1.3553 3.000048 3z" color="#000000"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__loop_in.svg b/res/skins/LateNight/buttons_classic/btn__loop_in.svg
new file mode 100644
index 000000000000..5f727baad3c8
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__loop_in.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m9 6h5v13h-1v-7h-4v-6" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.6"/>
+	<path d="m9 6h5v13h-1v-7h-4v-6" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__loop_out.svg b/res/skins/LateNight/buttons_classic/btn__loop_out.svg
new file mode 100644
index 000000000000..6434e30d2fdf
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__loop_out.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m14 6h-5v13h1v-7h4v-6" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002"/>
+	<path d="m14 6h-5v13h1v-7h4v-6" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_mastersync_master_off.png b/res/skins/LateNight/buttons_classic/btn__mastersync_master_off.png
similarity index 100%
rename from res/skins/LateNight/buttons/btn_mastersync_master_off.png
rename to res/skins/LateNight/buttons_classic/btn__mastersync_master_off.png
diff --git a/res/skins/LateNight/buttons/btn_mastersync_master_on.png b/res/skins/LateNight/buttons_classic/btn__mastersync_master_on.png
similarity index 100%
rename from res/skins/LateNight/buttons/btn_mastersync_master_on.png
rename to res/skins/LateNight/buttons_classic/btn__mastersync_master_on.png
diff --git a/res/skins/LateNight/buttons_classic/btn__mic_duck_auto.svg b/res/skins/LateNight/buttons_classic/btn__mic_duck_auto.svg
new file mode 100644
index 000000000000..4c83f74b8852
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__mic_duck_auto.svg
@@ -0,0 +1,8 @@
+<svg width="40" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-16,-2)" fill="#0e0e0e">
+		<path d="m21 10v6h2v-3h3v3h2v-6zm2 1h3v1h-3z"/>
+		<path d="m29 10v6h7v-6h-2v5h-3v-5h-2"/>
+		<path d="m37 10h6v1h-2v5h-2v-5h-2v-1"/>
+		<path d="m44 10v6h7v-6m-2 5h-3v-4h3z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__mic_duck_manual.svg b/res/skins/LateNight/buttons_classic/btn__mic_duck_manual.svg
new file mode 100644
index 000000000000..1ec77e0c12df
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__mic_duck_manual.svg
@@ -0,0 +1,7 @@
+<svg width="40" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-2)" fill="#0e0e0e">
+		<path d="m20 8v6h2v-2h3v2h2v-6zm2 1h3v2h-3z"/>
+		<path d="m9 8v6h2v-5h3v5h2v-5h2v5h1v-6h-5z"/>
+		<path d="m29 8v6h2v-5h2v5h2v-6z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__mic_duck_off.svg b/res/skins/LateNight/buttons_classic/btn__mic_duck_off.svg
new file mode 100644
index 000000000000..6accd37ae6cd
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__mic_duck_off.svg
@@ -0,0 +1,14 @@
+<svg width="40" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-2,3)" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<path d="m30 5h-7v6h7v-1h-5v-4h5v-1"/>
+		<path d="m15 5v6h7v-6h-2v5h-3v-5h-2"/>
+		<path d="m7 5v6h7v-4.5l-1.5-1.5zm2 1h2.7l1.3 1.3v2.7h-4z"/>
+		<path d="m31 11v-6h2v2h1.5l2-2h1.5v.5l-2 2v1l2 2v.5h-1.5l-2-2h-1.5v2z"/>
+	</g>
+	<g transform="translate(-2,3)" fill="#d2d2d1">
+		<path d="m30 5h-7v6h7v-1h-5v-4h5v-1"/>
+		<path d="m15 5v6h7v-6h-2v5h-3v-5h-2"/>
+		<path d="m7 5v6h7v-4.5l-1.5-1.5zm2 1h2.7l1.3 1.3v2.7h-4z"/>
+		<path d="m31 11v-6h2v2h1.5l2-2h1.5v.5l-2 2v1l2 2v.5h-1.5l-2-2h-1.5v2z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__mic_talk.svg b/res/skins/LateNight/buttons_classic/btn__mic_talk.svg
new file mode 100644
index 000000000000..521ba4937ee4
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__mic_talk.svg
@@ -0,0 +1,14 @@
+<svg width="40" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(2,1)" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<path d="m3 7h6v1h-2v5h-2v-5h-2v-1"/>
+		<path d="m11 7v6h2v-2h3v2h2v-6zm2 1h3v2h-3z"/>
+		<path d="m19 7v6h7v-1h-5v-5h-2"/>
+		<path d="m27 13v-6h2v2h1.5l2-2h1.5v.5l-2 2v1l2 2v.5h-1.5l-2-2h-1.5v2z"/>
+	</g>
+	<g transform="translate(2,1)" fill="#d2d2d1">
+		<path d="m3 7h6v1h-2v5h-2v-5h-2v-1"/>
+		<path d="m11 7v6h2v-2h3v2h2v-6zm2 1h3v2h-3z"/>
+		<path d="m19 7v6h7v-1h-5v-5h-2"/>
+		<path d="m27 13v-6h2v2h1.5l2-2h1.5v.5l-2 2v1l2 2v.5h-1.5l-2-2h-1.5v2z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__minus.svg b/res/skins/LateNight/buttons_classic/btn__minus.svg
new file mode 100644
index 000000000000..041db478fa9f
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__minus.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m8 10h9v3h-9v-3" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.6"/>
+	<path d="m8 10h9v3h-9v-3" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_next.svg b/res/skins/LateNight/buttons_classic/btn__next.svg
similarity index 70%
rename from res/skins/LateNight/buttons/btn_next.svg
rename to res/skins/LateNight/buttons_classic/btn__next.svg
index a188db21b0e0..b846e1a0f5f1 100644
--- a/res/skins/LateNight/buttons/btn_next.svg
+++ b/res/skins/LateNight/buttons_classic/btn__next.svg
@@ -1 +1 @@
-<svg id="svg7815" width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path3936-0-8-9-7-1" d="m5 6.3331 7 4.667-7 4.6669v-9.3339" fill="#bfbfbf"/></svg>
+<svg id="svg7815" width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path3936-0-8-9-7-1" d="m5 6.3331 7 4.667-7 4.6669v-9.3339" fill="#d2d2d1"/></svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__outro_end.svg b/res/skins/LateNight/buttons_classic/btn__outro_end.svg
new file mode 100644
index 000000000000..9729703d1a2f
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__outro_end.svg
@@ -0,0 +1,10 @@
+<svg width="18" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-3)" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<rect transform="scale(-1,1)" x="-18" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
+		<path d="m15 17-9-10v10z"/>
+	</g>
+	<g transform="translate(-3)" fill="#d2d2d1">
+		<rect transform="scale(-1,1)" x="-18" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
+		<path d="m15 17-9-10v10z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__outro_start.svg b/res/skins/LateNight/buttons_classic/btn__outro_start.svg
new file mode 100644
index 000000000000..f93765b1956d
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__outro_start.svg
@@ -0,0 +1,10 @@
+<svg width="18" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-3)" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<rect x="6" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
+		<path d="m19 17-9-10v10z"/>
+	</g>
+	<g transform="translate(-3)" fill="#d2d2d1">
+		<rect x="6" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
+		<path d="m19 17-9-10v10z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__pause_preview.svg b/res/skins/LateNight/buttons_classic/btn__pause_preview.svg
new file mode 100644
index 000000000000..6d4f69bb4690
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__pause_preview.svg
@@ -0,0 +1,10 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<path d="m7 6h4v12h-4v-12"/>
+		<path d="m13 6v12h4v-12h-4"/>
+	</g>
+	<g fill="#d2d2d1">
+		<path d="m7 6h4v12h-4v-12"/>
+		<path d="m13 6v12h4v-12h-4"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__pause_sampler.svg b/res/skins/LateNight/buttons_classic/btn__pause_sampler.svg
new file mode 100644
index 000000000000..560f56d3e03d
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__pause_sampler.svg
@@ -0,0 +1,10 @@
+<svg width="32" height="32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(1,1)" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<path d="m8 7h5v15h-5v-15"/>
+		<path d="m17 7v15h5v-15h-5"/>
+	</g>
+	<g transform="translate(1,1)" fill="#d2d2d1">
+		<path d="m8 7h5v15h-5v-15"/>
+		<path d="m17 7v15h5v-15h-5"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__pfl.svg b/res/skins/LateNight/buttons_classic/btn__pfl.svg
new file mode 100644
index 000000000000..2df575d24e76
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__pfl.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m11.999999 5.5116282c-3.7340627 0-6.766423 3.0324992-6.766423 6.7667318 0 .03993-.0009388.07686 0 .12531v.219292c-.7599946.643612-1.2530413 1.588929-1.2530413 2.662785 0 1.937792 1.0139653 3.50893 4.0194653 3.50893v-7.017354c-.242208 0-1.0030538.01567-1.2314482.06241.2161847-2.709799 2.465384-4.8244286 5.2314982-4.8244286 2.759698 0 5.00605 2.1235516 5.231498 4.8244286-.228394-.04674-.98933-.06241-1.231548-.06241v7.017354c3.513974 0 4.019565-1.571135 4.019565-3.508927 0-1.089995-.504605-2.050571-1.284317-2.694162.0061-.105852.03132-.203573.03132-.313275 0-3.7342327-3.03236-6.7667319-6.766424-6.7667319z" color="#000000" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.60000002" style="text-indent:0;text-transform:none"/>
+	<path d="m11.999999 5.5116282c-3.7340627 0-6.766423 3.0324992-6.766423 6.7667318 0 .03993-.0009388.07686 0 .12531v.219292c-.7599946.643612-1.2530413 1.588929-1.2530413 2.662785 0 1.937792.6326094 3.50893 4.0194653 3.50893v-7.017354c-.242208 0-1.0030538.01567-1.2314482.06241.2161847-2.709799 2.465384-4.8244286 5.2314982-4.8244286 2.759698 0 5.00605 2.1235516 5.231498 4.8244286-.228394-.04674-.98933-.06241-1.231548-.06241v7.017354c3.539398 0 4.019565-1.571135 4.019565-3.508927 0-1.089995-.504605-2.050571-1.284317-2.694162.0061-.105852.03132-.203573.03132-.313275 0-3.7342327-3.03236-6.7667319-6.766424-6.7667319z" color="#000000" fill="#d2d2d1" style="text-indent:0;text-transform:none"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__play_deck.svg b/res/skins/LateNight/buttons_classic/btn__play_deck.svg
new file mode 100644
index 000000000000..ea7547d40ca0
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__play_deck.svg
@@ -0,0 +1,12 @@
+<svg width="50" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(0,2)" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.60000002">
+		<path d="m28.000494 4h4v12h-4v-12"/>
+		<path d="m35.000888 4v12h4v-12h-4"/>
+		<path d="m12.000494 4 8.9995 6-8.9995 6v-12"/>
+	</g>
+	<g transform="translate(1.0004937 .99999999)" fill="#d2d2d1">
+		<path d="m27 5h4v12h-4v-12"/>
+		<path d="m34 5v12h4v-12h-4"/>
+		<path d="m11 5 8.9995 6-8.9995 6v-12"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__play_preview.svg b/res/skins/LateNight/buttons_classic/btn__play_preview.svg
new file mode 100644
index 000000000000..97f27621d834
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__play_preview.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m8 6 8.9995 6-8.9995 6z" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.6"/>
+	<path d="m8 6 8.9995 6-8.9995 6z" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__play_sampler.svg b/res/skins/LateNight/buttons_classic/btn__play_sampler.svg
new file mode 100644
index 000000000000..664b69ff8056
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__play_sampler.svg
@@ -0,0 +1,4 @@
+<svg width="32" height="32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m11 7.3661 12.95 8.634-12.95 8.6339z" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.6"/>
+	<path d="m11 7.3661 12.95 8.634-12.95 8.6339z" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__plus.svg b/res/skins/LateNight/buttons_classic/btn__plus.svg
new file mode 100644
index 000000000000..d4df6f7d746a
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__plus.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m8 10h3v-3h3v3h3v3h-3v3h-3v-3h-3v-3" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.6"/>
+	<path d="m8 10h3v-3h3v3h3v3h-3v3h-3v-3h-3v-3" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_prev.svg b/res/skins/LateNight/buttons_classic/btn__prev.svg
similarity index 69%
rename from res/skins/LateNight/buttons/btn_prev.svg
rename to res/skins/LateNight/buttons_classic/btn__prev.svg
index 183469e3d288..e021190ad2da 100644
--- a/res/skins/LateNight/buttons/btn_prev.svg
+++ b/res/skins/LateNight/buttons_classic/btn__prev.svg
@@ -1 +1 @@
-<svg id="svg7815" width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path3936-0-8-9-7-1" d="m11 6.3331-7 4.667 7 4.6669v-9.3339" fill="#bfbfbf"/></svg>
+<svg id="svg7815" width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path3936-0-8-9-7-1" d="m11 6.3331-7 4.667 7 4.6669v-9.3339" fill="#d2d2d1"/></svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__quantize.svg b/res/skins/LateNight/buttons_classic/btn__quantize.svg
new file mode 100644
index 000000000000..a9d18e0cfaef
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__quantize.svg
@@ -0,0 +1,7 @@
+<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+	<g fill="#585858">
+		<path d="m9.156 4c-2.7614 0-5 2.2386-5 5s2.2386 5 5 5h3.8438v-3h-3.9688c-1.1046 0-2-.89543-2-2 0-1.1046.89543-2 2-2h3.9688v-3z"/>
+		<path d="m17 11h-3v3h3z"/>
+		<path d="m17 4h-2.9896v3h2.9896z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__quantize_active_12.svg b/res/skins/LateNight/buttons_classic/btn__quantize_active_12.svg
new file mode 100644
index 000000000000..231618e541b7
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__quantize_active_12.svg
@@ -0,0 +1,7 @@
+<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+	<g fill="#f0bb2b">
+		<path d="m9.156 4c-2.7614 0-5 2.2386-5 5s2.2386 5 5 5h3.8438v-3h-3.9688c-1.1046 0-2-.89543-2-2 0-1.1046.89543-2 2-2h3.9688v-3z"/>
+		<path d="m17 11h-3v3h3z"/>
+		<path d="m17 4h-2.9896v3h2.9896z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__quantize_active_34.svg b/res/skins/LateNight/buttons_classic/btn__quantize_active_34.svg
new file mode 100644
index 000000000000..4b3cb69b7ee3
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__quantize_active_34.svg
@@ -0,0 +1,7 @@
+<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+	<g fill="#0bd9d1">
+		<path d="m9.156 4c-2.7614 0-5 2.2386-5 5s2.2386 5 5 5h3.8438v-3h-3.9688c-1.1046 0-2-.89543-2-2 0-1.1046.89543-2 2-2h3.9688v-3z"/>
+		<path d="m17 11h-3v3h3z"/>
+		<path d="m17 4h-2.9896v3h2.9896z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__rec_dot.svg b/res/skins/LateNight/buttons_classic/btn__rec_dot.svg
new file mode 100644
index 000000000000..674a41ab5a24
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__rec_dot.svg
@@ -0,0 +1,3 @@
+<svg id="svg2" version="1.1" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg">
+<path id="path2987" d="m13.477 7.5a3.9775 3.9775 0 1 1-7.955 0 3.9775 3.9775 0 1 1 7.955 0z" color="#000000" fill="#bfbfbe"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__reloop.svg b/res/skins/LateNight/buttons_classic/btn__reloop.svg
new file mode 100644
index 000000000000..bccc537141e6
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__reloop.svg
@@ -0,0 +1,12 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(1,-1.000175)" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<path d="m6 6.0001c-1.6447-.0001028-3 1.3553-3 3v7.0002c0 1.6447 1.3553 3 3 3l1.0002-.000125v3l6.9998-3.75-6.9999-3.7501v3l-1.0002.000124c-.74686 9.3e-5-1.4999-.76713-1.4999-1.4999v-7.0002c0-.71175.76705-1.4999 1.5-1.4999l2 .000124v-1.5001z" color="#000000"/>
+		<path d="m10 4.000175h2v6h-2z" color="#000000"/>
+		<path d="m16 6.0001c1.6447-.0001028 3 1.3553 3 3v7.0002c0 1.6447-1.3553 3-3 3l-1.0002-6.3e-5 5e-4-1.5001 1.0002 6.2e-5c.78903 4.9e-5 1.4995-.78813 1.4995-1.4999v-7.0002c0-.72579-.75327-1.4999-1.5001-1.4999l-1.9998.000125.000125-1.5001z" color="#000000"/>
+	</g>
+	<g transform="translate(1,-1.000175)" fill="#d2d2d1">
+		<path d="m6 6.0001c-1.6447-.0001028-3 1.3553-3 3v7.0002c0 1.6447 1.3553 3 3 3l1.0002-.000125v3l6.9998-3.75-6.9999-3.7501v3l-1.0002.000124c-.74686 9.3e-5-1.4999-.76713-1.4999-1.4999v-7.0002c0-.71175.76705-1.4999 1.5-1.4999l2 .000124v-1.5001z" color="#000000"/>
+		<path d="m10 4.000175h2v6h-2z" color="#000000"/>
+		<path d="m16 6.0001c1.6447-.0001028 3 1.3553 3 3v7.0002c0 1.6447-1.3553 3-3 3l-1.0002-6.3e-5 5e-4-1.5001 1.0002 6.2e-5c.78903 4.9e-5 1.4995-.78813 1.4995-1.4999v-7.0002c0-.72579-.75327-1.4999-1.5001-1.4999l-1.9998.000125.000125-1.5001z" color="#000000"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__repeat.svg b/res/skins/LateNight/buttons_classic/btn__repeat.svg
new file mode 100644
index 000000000000..df993a17bb34
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__repeat.svg
@@ -0,0 +1,8 @@
+<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+	<g fill="#585858">
+		<path d="m7.156 4.0005c-2.7614.0001841-5 2.2386-5 5 0 .48325.090832.93297.21875 1.375l2.6562-1.5312c.080009-1.0312.94822-1.8437 2-1.8438l7.6252-5e-4v-3z"/>
+		<path d="m7.9997786 16.551826-6.5398527-3.775768 6.5398527-3.775768z" color="#000000" stroke-width="1.25100005"/>
+		<path d="m14 14c2.7614.000184 5-2.2386 5-5 0-.48325-.09083-.93297-.21875-1.375l-2.6562 1.5313c-.08001 1.0312-.94822 1.8438-2 1.8437l-7.625-5e-4v3z"/>
+		<path d="m13.000221 1.4483736 6.539853 3.7757682-6.539853 3.7757682z" color="#000000" stroke-width="1.25100005"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__repeat_active_12.svg b/res/skins/LateNight/buttons_classic/btn__repeat_active_12.svg
new file mode 100644
index 000000000000..53f7abec28d0
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__repeat_active_12.svg
@@ -0,0 +1,8 @@
+<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+	<g fill="#f0bb2b">
+		<path d="m7.156 4.0005c-2.7614.0001841-5 2.2386-5 5 0 .48325.090832.93297.21875 1.375l2.6562-1.5312c.080009-1.0312.94822-1.8437 2-1.8438l7.6252-5e-4v-3z"/>
+		<path d="m7.9997786 16.551826-6.5398527-3.775768 6.5398527-3.775768z" color="#000000" stroke-width="1.25100005"/>
+		<path d="m14 14c2.7614.000184 5-2.2386 5-5 0-.48325-.09083-.93297-.21875-1.375l-2.6562 1.5313c-.08001 1.0312-.94822 1.8438-2 1.8437l-7.625-5e-4v3z"/>
+		<path d="m13.000221 1.4483736 6.539853 3.7757682-6.539853 3.7757682z" color="#000000" stroke-width="1.25100005"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__repeat_active_34.svg b/res/skins/LateNight/buttons_classic/btn__repeat_active_34.svg
new file mode 100644
index 000000000000..bab87e7e4e86
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__repeat_active_34.svg
@@ -0,0 +1,8 @@
+<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+	<g fill="#0bd9d1">
+		<path d="m7.156 4.0005c-2.7614.0001841-5 2.2386-5 5 0 .48325.090832.93297.21875 1.375l2.6562-1.5312c.080009-1.0312.94822-1.8437 2-1.8438l7.6252-5e-4v-3z"/>
+		<path d="m7.9997786 16.551826-6.5398527-3.775768 6.5398527-3.775768z" color="#000000" stroke-width="1.25100005"/>
+		<path d="m14 14c2.7614.000184 5-2.2386 5-5 0-.48325-.09083-.93297-.21875-1.375l-2.6562 1.5313c-.08001 1.0312-.94822 1.8438-2 1.8437l-7.625-5e-4v3z"/>
+		<path d="m13.000221 1.4483736 6.539853 3.7757682-6.539853 3.7757682z" color="#000000" stroke-width="1.25100005"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__reverse.svg b/res/skins/LateNight/buttons_classic/btn__reverse.svg
new file mode 100644
index 000000000000..7569855a0264
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__reverse.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m16.000506 6.0058019-8.9995702 5.9999991 8.9995702 6v-11.9999991" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5999999"/>
+	<path d="m16.000506 6.0000702-8.9995702 5.9999988 8.9995702 6v-11.9999988" fill="#d2d2d1" stroke-width=".99999994"/>
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_settings.svg b/res/skins/LateNight/buttons_classic/btn__settings.svg
similarity index 84%
rename from res/skins/LateNight/buttons/btn_settings.svg
rename to res/skins/LateNight/buttons_classic/btn__settings.svg
index 37760452d56e..d00f3c0ec80b 100644
--- a/res/skins/LateNight/buttons/btn_settings.svg
+++ b/res/skins/LateNight/buttons_classic/btn__settings.svg
@@ -1 +1 @@
-<svg id="svg2" width="18" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg"><g id="g4021" transform="matrix(-.68548 0 0 .77778 15.855 1.2222)" fill="#d2d2d2"><path id="rect3922" transform="matrix(1.1347 0 0 1 -34.251 6)" d="m37.625-5-0.1875 2.625c-0.66019 0.16435-1.2765 0.43313-1.8438 0.78125l-1.9688-1.75-1.9688 1.9688 1.75 1.9688c-0.34382 0.56314-0.61891 1.1878-0.78125 1.8438l-2.625 0.1875v2.75l2.625 0.1875c0.16385 0.66212 0.431 1.2793 0.78125 1.8438l-1.75 1.9688 1.9688 1.9688 2-1.75c0.55851 0.33599 1.1644 0.58862 1.8125 0.75l0.1875 2.6562h2.75l0.1875-2.625c0.66019-0.16435 1.2765-0.43313 1.8438-0.78125l1.9688 1.75 1.9688-1.9688-1.75-1.9688c0.34382-0.56314 0.61891-1.1878 0.78125-1.8438l2.625-0.1875v-2.75l-2.625-0.1875c-0.16435-0.66019-0.43313-1.2765-0.78125-1.8438l1.75-1.9688-1.9688-1.9688-1.9688 1.75c-0.56314-0.34382-1.1878-0.61891-1.8438-0.78125l-0.1875-2.625zm1.375 6c1.6505 0 3 1.3495 3 3s-1.3495 3-3 3-3-1.3495-3-3 1.3495-3 3-3z" color="#000000" fill="#d2d2d2"/></g><g id="g4021-6" transform="matrix(-.68548 0 0 .77778 15.855 1.2222)" fill="#d2d2d2"><path id="rect3922-2" transform="matrix(1.1347 0 0 1 -34.251 6)" d="m39 1c1.6505 0 3 1.3495 3 3s-1.3495 3-3 3-3-1.3495-3-3 1.3495-3 3-3z" color="#000000" fill="#1a1a1a"/></g></svg>
+<svg id="svg2" width="18" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg"><g id="g4021" transform="matrix(-.68548 0 0 .77778 15.855 1.2222)" fill="#d2d2d1"><path id="rect3922" transform="matrix(1.1347 0 0 1 -34.251 6)" d="m37.625-5-0.1875 2.625c-0.66019 0.16435-1.2765 0.43313-1.8438 0.78125l-1.9688-1.75-1.9688 1.9688 1.75 1.9688c-0.34382 0.56314-0.61891 1.1878-0.78125 1.8438l-2.625 0.1875v2.75l2.625 0.1875c0.16385 0.66212 0.431 1.2793 0.78125 1.8438l-1.75 1.9688 1.9688 1.9688 2-1.75c0.55851 0.33599 1.1644 0.58862 1.8125 0.75l0.1875 2.6562h2.75l0.1875-2.625c0.66019-0.16435 1.2765-0.43313 1.8438-0.78125l1.9688 1.75 1.9688-1.9688-1.75-1.9688c0.34382-0.56314 0.61891-1.1878 0.78125-1.8438l2.625-0.1875v-2.75l-2.625-0.1875c-0.16435-0.66019-0.43313-1.2765-0.78125-1.8438l1.75-1.9688-1.9688-1.9688-1.9688 1.75c-0.56314-0.34382-1.1878-0.61891-1.8438-0.78125l-0.1875-2.625zm1.375 6c1.6505 0 3 1.3495 3 3s-1.3495 3-3 3-3-1.3495-3-3 1.3495-3 3-3z" color="#000000" fill="#d2d2d1"/></g><g id="g4021-6" transform="matrix(-.68548 0 0 .77778 15.855 1.2222)" fill="#d2d2d1"><path id="rect3922-2" transform="matrix(1.1347 0 0 1 -34.251 6)" d="m39 1c1.6505 0 3 1.3495 3 3s-1.3495 3-3 3-3-1.3495-3-3 1.3495-3 3-3z" color="#000000" fill="#1a1a1a"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_skinsettings_close.svg b/res/skins/LateNight/buttons_classic/btn__settings_close.svg
similarity index 100%
rename from res/skins/LateNight/buttons/btn_skinsettings_close.svg
rename to res/skins/LateNight/buttons_classic/btn__settings_close.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__settings_off.svg b/res/skins/LateNight/buttons_classic/btn__settings_off.svg
new file mode 100644
index 000000000000..0c700c92c883
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__settings_off.svg
@@ -0,0 +1,5 @@
+<svg width="76" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="matrix(-.60802 0 0 .68989 14.4115 1.101031)" fill="#d2d2d1" stroke-width="1.12740004">
+		<path transform="matrix(1.1347,0,0,1,-34.251,6)" d="m37.625-5-.1875 2.625c-.66019.16435-1.2765.43313-1.8438.78125l-1.9688-1.75-1.9688 1.9688 1.75 1.9688c-.34382.56314-.61891 1.1878-.78125 1.8438l-2.625.1875v2.75l2.625.1875c.16385.66212.431 1.2793.78125 1.8438l-1.75 1.9688 1.9688 1.9688 2-1.75c.55851.33599 1.1644.58862 1.8125.75l.1875 2.6562h2.75l.1875-2.625c.66019-.16435 1.2765-.43313 1.8438-.78125l1.9688 1.75 1.9688-1.9688-1.75-1.9688c.34382-.56314.61891-1.1878.78125-1.8438l2.625-.1875v-2.75l-2.625-.1875c-.16435-.66019-.43313-1.2765-.78125-1.8438l1.75-1.9688-1.9688-1.9688-1.9688 1.75c-.56314-.34382-1.1878-.61891-1.8438-.78125l-.1875-2.625zm1.375 6c1.6505 0 3 1.3495 3 3s-1.3495 3-3 3-3-1.3495-3-3 1.3495-3 3-3z" color="#000000" fill="#d2d2d1"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__settings_on.svg b/res/skins/LateNight/buttons_classic/btn__settings_on.svg
new file mode 100644
index 000000000000..9c38e6aef1fc
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__settings_on.svg
@@ -0,0 +1,5 @@
+<svg width="76" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="matrix(-.60803453 0 0 .68993295 14.356316 1.1006015)" stroke-width="1.12734854">
+		<path transform="matrix(1.1347,0,0,1,-34.251,6)" d="m37.625-5-.1875 2.625c-.66019.16435-1.2765.43313-1.8438.78125l-1.9688-1.75-1.9688 1.9688 1.75 1.9688c-.34382.56314-.61891 1.1878-.78125 1.8438l-2.625.1875v2.75l2.625.1875c.16385.66212.431 1.2793.78125 1.8438l-1.75 1.9688 1.9688 1.9688 2-1.75c.55851.33599 1.1644.58862 1.8125.75l.1875 2.6562h2.75l.1875-2.625c.66019-.16435 1.2765-.43313 1.8438-.78125l1.9688 1.75 1.9688-1.9688-1.75-1.9688c.34382-.56314.61891-1.1878.78125-1.8438l2.625-.1875v-2.75l-2.625-.1875c-.16435-.66019-.43313-1.2765-.78125-1.8438l1.75-1.9688-1.9688-1.9688-1.9688 1.75c-.56314-.34382-1.1878-.61891-1.8438-.78125l-.1875-2.625zm1.375 6c1.6505 0 3 1.3495 3 3s-1.3495 3-3 3-3-1.3495-3-3 1.3495-3 3-3z" color="#000000" stroke-width="1.12734854"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__slip.svg b/res/skins/LateNight/buttons_classic/btn__slip.svg
new file mode 100644
index 000000000000..c27c27228748
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__slip.svg
@@ -0,0 +1,4 @@
+<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+	<path d="m7.33344 14.96998-6.3333447-10.96968 12.6663237-3e-7z" color="#000000" fill="#585858" stroke-width=".91413999"/>
+	<path d="m7.3333 4.0003 6.3333 10.965 6.3333-10.965h-12.667zm2.9292 1.7021h6.8083l-3.4042 5.8979-3.4042-5.8979z" color="#000000" fill="#585858"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__slip_active_12.svg b/res/skins/LateNight/buttons_classic/btn__slip_active_12.svg
new file mode 100644
index 000000000000..8421042da9cd
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__slip_active_12.svg
@@ -0,0 +1,4 @@
+<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+	<path d="m7.33344 14.96998-6.3333447-10.96968 12.6663237-3e-7z" color="#000000" fill="#f0bb2b" stroke-width=".91413999"/>
+	<path d="m7.3333 4.0003 6.3333 10.965 6.3333-10.965h-12.667zm2.9292 1.7021h6.8083l-3.4042 5.8979-3.4042-5.8979z" color="#000000" fill="#f0bb2b"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__slip_active_34.svg b/res/skins/LateNight/buttons_classic/btn__slip_active_34.svg
new file mode 100644
index 000000000000..aa2af6f73e29
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__slip_active_34.svg
@@ -0,0 +1,4 @@
+<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+	<path d="m7.33344 14.96998-6.3333447-10.96968 12.6663237-3e-7z" color="#000000" fill="#0bd9d1" stroke-width=".91413999"/>
+	<path d="m7.3333 4.0003 6.3333 10.965 6.3333-10.965h-12.667zm2.9292 1.7021h6.8083l-3.4042 5.8979-3.4042-5.8979z" color="#000000" fill="#0bd9d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__splitcue.svg b/res/skins/LateNight/buttons_classic/btn__splitcue.svg
new file mode 100644
index 000000000000..9e4aa78c3e0e
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__splitcue.svg
@@ -0,0 +1,22 @@
+<svg width="66" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-2,2)" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<path d="m12 7h-7v4h5v1h-5v1h7v-3h-5v-2h5v-1"/>
+		<path d="m20 7v6h6v-1h-4v-5h-2"/>
+		<path d="m13 7v6h2v-2h4v-4zm2 1h3v2h-3z"/>
+		<path d="m30 7h6v1h-2v5h-2v-5h-2v-1"/>
+		<rect x="27" y="7" width="2" height="6" style="paint-order:fill markers stroke"/>
+		<path d="m49 7h-7v6h7v-1h-5v-4h5v-1"/>
+		<path d="m51 7v6h7v-6h-2v5h-3v-5h-2"/>
+		<path d="m60 7v6h5v-1h-3v-2h2v-1h-2v-1h3v-1h-5"/>
+	</g>
+	<g transform="translate(-2,2)" fill="#d2d2d1">
+		<path d="m12 7h-7v4h5v1h-5v1h7v-3h-5v-2h5v-1"/>
+		<path d="m20 7v6h6v-1h-4v-5h-2"/>
+		<path d="m13 7v6h2v-2h4v-4zm2 1h3v2h-3z"/>
+		<path d="m30 7h6v1h-2v5h-2v-5h-2v-1"/>
+		<rect x="27" y="7" width="2" height="6" style="paint-order:fill markers stroke"/>
+		<path d="m49 7h-7v6h7v-1h-5v-4h5v-1"/>
+		<path d="m51 7v6h7v-6h-2v5h-3v-5h-2"/>
+		<path d="m60 7v6h5v-1h-3v-2h2v-1h-2v-1h3v-1h-5"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__splitcue_active.svg b/res/skins/LateNight/buttons_classic/btn__splitcue_active.svg
new file mode 100644
index 000000000000..007585e13d74
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__splitcue_active.svg
@@ -0,0 +1,14 @@
+<svg width="66" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-4,1)" fill="#0e0e0e">
+		<path d="m14 8h-7v4h5v1h-5v1h7v-3h-5v-2h5v-1"/>
+		<path d="m22 8v6h6v-1h-4v-5h-2"/>
+		<path d="m15 8v6h2v-2h4v-4zm2 1h3v2h-3z"/>
+		<path d="m32 8h6v1h-2v5h-2v-5h-2v-1"/>
+		<rect x="29" y="8" width="2" height="6" style="paint-order:fill markers stroke"/>
+		<g transform="translate(31,-1)">
+			<path d="m20 9h-7v6h7v-1h-5v-4h5v-1"/>
+			<path d="m22 9v6h7v-6h-2v5h-3v-5h-2"/>
+			<path d="m31 9v6h5v-1h-3v-2h2v-1h-2v-1h3v-1h-5"/>
+		</g>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__star.svg b/res/skins/LateNight/buttons_classic/btn__star.svg
new file mode 100644
index 000000000000..891ca96f8a83
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__star.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m8.0000001 5.9262617.4700968 1.4036761 1.4802433.013329-1.1897075.8808484.4447438 1.4119139-1.2053765-.8592819-1.2053766.8592819.4447439-1.4119139-1.1897074-.8808485 1.4802432-.0133288z" stroke="#777" stroke-linecap="round" stroke-width="2.65781951" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__sync_deck.svg b/res/skins/LateNight/buttons_classic/btn__sync_deck.svg
new file mode 100644
index 000000000000..d6726bd62546
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__sync_deck.svg
@@ -0,0 +1,14 @@
+<svg width="50" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(1,1)" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<path d="m16 8h-7v4h5v1h-5v1h7v-3h-5v-2h5v-1"/>
+		<path d="m25 8v6h2v-5h3v5h2v-6h-7"/>
+		<path d="m33 8v6h7v-1h-5v-4h5v-1h-7"/>
+		<path d="m19 14v-3.5l-2-2v-.5h1.5l1.5 1.5 1.5-1.5h1.5v.5l-2 2v3.5h-2"/>
+	</g>
+	<g transform="translate(1,1)" fill="#d2d2d1">
+		<path d="m16 8h-7v4h5v1h-5v1h7v-3h-5v-2h5v-1"/>
+		<path d="m25 8v6h2v-5h3v5h2v-6h-7"/>
+		<path d="m33 8v6h7v-1h-5v-4h5v-1h-7"/>
+		<path d="m19 14v-3.5l-2-2v-.5h1.5l1.5 1.5 1.5-1.5h1.5v.5l-2 2v3.5h-2"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__sync_sampler.svg b/res/skins/LateNight/buttons_classic/btn__sync_sampler.svg
new file mode 100644
index 000000000000..bf062f67b0a6
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__sync_sampler.svg
@@ -0,0 +1,14 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<path d="m5 7.3636 6.955 4.6367-6.955 4.6367z"/>
+		<path d="M 19,7.3633 12.045,12 19,16.6367 Z"/>
+	</g>
+	<g transform="translate(1 -.9997)" fill="none">
+		<path d="M 4,8.3633 10.955,13 4,17.6367 V 8.3633"/>
+		<path d="M 18,8.3633 11.045,13 18,17.6367 V 8.3633"/>
+	</g>
+	<g fill="#d2d2d1">
+		<path d="m5 7.3636 6.955 4.6367-6.955 4.6367z"/>
+		<path d="M 19,7.3633 12.045,12 19,16.6367 Z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__xfader_aux_left.svg b/res/skins/LateNight/buttons_classic/btn__xfader_aux_left.svg
new file mode 100644
index 000000000000..da5b928d80c6
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__xfader_aux_left.svg
@@ -0,0 +1 @@
+<svg width="11" height="13" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v9h7v-2h-5v-7h-2" fill="#888"/></svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__xfader_aux_left_off.svg b/res/skins/LateNight/buttons_classic/btn__xfader_aux_left_off.svg
new file mode 100644
index 000000000000..c15d77c4bc00
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__xfader_aux_left_off.svg
@@ -0,0 +1 @@
+<svg width="11" height="13" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v9h7v-2h-5v-7h-2" fill="#555"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_xfader_aux_mid.svg b/res/skins/LateNight/buttons_classic/btn__xfader_aux_mid.svg
similarity index 80%
rename from res/skins/LateNight/buttons/btn_xfader_aux_mid.svg
rename to res/skins/LateNight/buttons_classic/btn__xfader_aux_mid.svg
index d24beed8dd83..71a9f0487850 100644
--- a/res/skins/LateNight/buttons/btn_xfader_aux_mid.svg
+++ b/res/skins/LateNight/buttons_classic/btn__xfader_aux_mid.svg
@@ -1 +1 @@
-<svg width="11" height="13" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m1 11v-9h1.5l3 3.5 3-3.5h1.5v9h-2v-6l-2.5 3-2.5-3v6z" fill="#aaa"/></svg>
+<svg width="11" height="13" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m1 11v-9h1.5l3 3.5 3-3.5h1.5v9h-2v-6l-2.5 3-2.5-3v6z" fill="#888"/></svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__xfader_aux_mid_off.svg b/res/skins/LateNight/buttons_classic/btn__xfader_aux_mid_off.svg
new file mode 100644
index 000000000000..e8c9e7490b18
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__xfader_aux_mid_off.svg
@@ -0,0 +1 @@
+<svg width="11" height="13" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m1 11v-9h1.5l3 3.5 3-3.5h1.5v9h-2v-6l-2.5 3-2.5-3v6z" fill="#555"/></svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__xfader_aux_right.svg b/res/skins/LateNight/buttons_classic/btn__xfader_aux_right.svg
new file mode 100644
index 000000000000..1c91063e788a
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__xfader_aux_right.svg
@@ -0,0 +1 @@
+<svg width="11" height="13" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v9h2v-3h1.5l3 3h1.5v-1.5l-2-2 1-1v-3l-1.5-1.5zm2 2h3v2h-3z" fill="#888"/></svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__xfader_aux_right_off.svg b/res/skins/LateNight/buttons_classic/btn__xfader_aux_right_off.svg
new file mode 100644
index 000000000000..b8b6290eee59
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__xfader_aux_right_off.svg
@@ -0,0 +1 @@
+<svg width="11" height="13" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v9h2v-3h1.5l3 3h1.5v-1.5l-2-2 1-1v-3l-1.5-1.5zm2 2h3v2h-3z" fill="#555"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_xfader_deck_left_default.svg b/res/skins/LateNight/buttons_classic/btn__xfader_deck_left_default.svg
similarity index 50%
rename from res/skins/LateNight/buttons/btn_xfader_deck_left_default.svg
rename to res/skins/LateNight/buttons_classic/btn__xfader_deck_left_default.svg
index ffeb3828f0ae..97c1a08df78e 100644
--- a/res/skins/LateNight/buttons/btn_xfader_deck_left_default.svg
+++ b/res/skins/LateNight/buttons_classic/btn__xfader_deck_left_default.svg
@@ -1 +1 @@
-<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 3v9h7v-2h-5v-7h-2" fill="#aaa"/></svg>
+<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 3v9h7v-2h-5v-7h-2" fill="#888"/></svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__xfader_deck_left_off.svg b/res/skins/LateNight/buttons_classic/btn__xfader_deck_left_off.svg
new file mode 100644
index 000000000000..71a6d97b8664
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__xfader_deck_left_off.svg
@@ -0,0 +1 @@
+<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 3v9h7v-2h-5v-7h-2" fill="#555"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_xfader_deck_left_warning.svg b/res/skins/LateNight/buttons_classic/btn__xfader_deck_left_warning.svg
similarity index 100%
rename from res/skins/LateNight/buttons/btn_xfader_deck_left_warning.svg
rename to res/skins/LateNight/buttons_classic/btn__xfader_deck_left_warning.svg
diff --git a/res/skins/LateNight/buttons/btn_xfader_deck_mid_off.svg b/res/skins/LateNight/buttons_classic/btn__xfader_deck_mid_off.svg
similarity index 78%
rename from res/skins/LateNight/buttons/btn_xfader_deck_mid_off.svg
rename to res/skins/LateNight/buttons_classic/btn__xfader_deck_mid_off.svg
index f8dec37e9916..ec87f75be5ee 100644
--- a/res/skins/LateNight/buttons/btn_xfader_deck_mid_off.svg
+++ b/res/skins/LateNight/buttons_classic/btn__xfader_deck_mid_off.svg
@@ -1 +1 @@
-<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m1 12v-9h1.5l3 3.5 3-3.5h1.5v9h-2v-6l-2.5 3-2.5-3v6z" fill="#6a6a6a"/></svg>
+<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m1 12v-9h1.5l3 3.5 3-3.5h1.5v9h-2v-6l-2.5 3-2.5-3v6z" fill="#555"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_xfader_deck_mid_warning.svg b/res/skins/LateNight/buttons_classic/btn__xfader_deck_mid_warning.svg
similarity index 92%
rename from res/skins/LateNight/buttons/btn_xfader_deck_mid_warning.svg
rename to res/skins/LateNight/buttons_classic/btn__xfader_deck_mid_warning.svg
index 16aeeb8934cc..eb0d70aafa37 100644
--- a/res/skins/LateNight/buttons/btn_xfader_deck_mid_warning.svg
+++ b/res/skins/LateNight/buttons_classic/btn__xfader_deck_mid_warning.svg
@@ -26,5 +26,5 @@
   <path
      id="path820"
      d="M 1,12 V 3 h 1.5 l 3,3.5 3,-3.5 H 10 v 9 H 8 V 6 L 5.5,9 3,6 v 6 z"
-     style="fill:#61eb5e;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+     style="fill:#f0bb2b;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
 </svg>
diff --git a/res/skins/LateNight/buttons/btn_xfader_deck_right_default.svg b/res/skins/LateNight/buttons_classic/btn__xfader_deck_right_default.svg
similarity index 75%
rename from res/skins/LateNight/buttons/btn_xfader_deck_right_default.svg
rename to res/skins/LateNight/buttons_classic/btn__xfader_deck_right_default.svg
index 44cb82077faf..d590c5ab6b61 100644
--- a/res/skins/LateNight/buttons/btn_xfader_deck_right_default.svg
+++ b/res/skins/LateNight/buttons_classic/btn__xfader_deck_right_default.svg
@@ -1 +1 @@
-<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 3v9h2v-3h1.5l3 3h1.5v-1.5l-2-2 1-1v-3l-1.5-1.5zm2 2h3v2h-3z" fill="#aaa"/></svg>
+<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 3v9h2v-3h1.5l3 3h1.5v-1.5l-2-2 1-1v-3l-1.5-1.5zm2 2h3v2h-3z" fill="#888"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_xfader_deck_right_off.svg b/res/skins/LateNight/buttons_classic/btn__xfader_deck_right_off.svg
similarity index 73%
rename from res/skins/LateNight/buttons/btn_xfader_deck_right_off.svg
rename to res/skins/LateNight/buttons_classic/btn__xfader_deck_right_off.svg
index ac3552e07a80..6224588d3d2a 100644
--- a/res/skins/LateNight/buttons/btn_xfader_deck_right_off.svg
+++ b/res/skins/LateNight/buttons_classic/btn__xfader_deck_right_off.svg
@@ -1 +1 @@
-<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 3v9h2v-3h1.5l3 3h1.5v-1.5l-2-2 1-1v-3l-1.5-1.5zm2 2h3v2h-3z" fill="#6a6a6a"/></svg>
+<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 3v9h2v-3h1.5l3 3h1.5v-1.5l-2-2 1-1v-3l-1.5-1.5zm2 2h3v2h-3z" fill="#555"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_xfader_deck_right_warning.svg b/res/skins/LateNight/buttons_classic/btn__xfader_deck_right_warning.svg
similarity index 100%
rename from res/skins/LateNight/buttons/btn_xfader_deck_right_warning.svg
rename to res/skins/LateNight/buttons_classic/btn__xfader_deck_right_warning.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__xfader_sampler_left.svg b/res/skins/LateNight/buttons_classic/btn__xfader_sampler_left.svg
new file mode 100644
index 000000000000..7dd52debae55
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__xfader_sampler_left.svg
@@ -0,0 +1,5 @@
+<svg width="21" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-2,-1034.4)">
+		<path d="m8 1039.4v9h8v-2h-6v-7h-2" fill="#f856e7"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__xfader_sampler_master.svg b/res/skins/LateNight/buttons_classic/btn__xfader_sampler_master.svg
new file mode 100644
index 000000000000..6eb53f82c3a7
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__xfader_sampler_master.svg
@@ -0,0 +1,3 @@
+<svg width="21" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m6 14v-9h2l3 3 3-3h2v9h-2v-6l-3 3-3-3v6z" fill="#585858"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__xfader_sampler_right.svg b/res/skins/LateNight/buttons_classic/btn__xfader_sampler_right.svg
new file mode 100644
index 000000000000..2a67bf6a43f0
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn__xfader_sampler_right.svg
@@ -0,0 +1,3 @@
+<svg width="21" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m6.0252 5v9h2v-3h2.4998l3 3h1.5v-1.5l-2-2 1-1v-3l-1.5-1.5zm2 2h3.9998v2h-3.9998z" fill="#f856e7"/>
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_border_image_qpushbutton_active_grey.svg b/res/skins/LateNight/buttons_classic/btn_border_image_qpushbutton_active_grey.svg
similarity index 100%
rename from res/skins/LateNight/buttons/btn_border_image_qpushbutton_active_grey.svg
rename to res/skins/LateNight/buttons_classic/btn_border_image_qpushbutton_active_grey.svg
diff --git a/res/skins/LateNight/buttons/btn_border_image_qpushbutton_checked_focus.svg b/res/skins/LateNight/buttons_classic/btn_border_image_qpushbutton_checked_focus.svg
similarity index 97%
rename from res/skins/LateNight/buttons/btn_border_image_qpushbutton_checked_focus.svg
rename to res/skins/LateNight/buttons_classic/btn_border_image_qpushbutton_checked_focus.svg
index 3b5e31e30716..58dce9f7a338 100644
--- a/res/skins/LateNight/buttons/btn_border_image_qpushbutton_checked_focus.svg
+++ b/res/skins/LateNight/buttons_classic/btn_border_image_qpushbutton_checked_focus.svg
@@ -1 +1 @@
-<svg width="25" height="25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><linearGradient id="a" x1=".50003" x2="23.5" y1="-12" y2="-12" gradientUnits="userSpaceOnUse"><stop stop-color="#7c4e20" offset="0"/><stop stop-color="#cb8237" offset="1"/></linearGradient></defs><path d="m23.314 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 1.875-2 1.875l-19.499-2e-5c-.2947 0-.8341-.07706-1.325-.50548.21914 1.0963 1.0076 1.6305 1.8242 1.6305h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#323232"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#323232"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#323232"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#323232"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#323232"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><path d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#323232"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></g><rect transform="rotate(90)" x=".50003" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 3e-5c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#f60" style="text-indent:0;text-transform:none"/></svg>
+<svg width="25" height="25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><linearGradient id="a" x1=".50003" x2="23.5" y1="-12" y2="-12" gradientUnits="userSpaceOnUse"><stop stop-color="#7c4e20" offset="0"/><stop stop-color="#cb8237" offset="1"/></linearGradient></defs><path d="m23.314 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 1.875-2 1.875l-19.499-2e-5c-.2947 0-.8341-.07706-1.325-.50548.21914 1.0963 1.0076 1.6305 1.8242 1.6305h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#020201" opacity=".8"/><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#323232"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#323232"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#323232"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#323232"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#323232"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><path d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#323232"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></g><rect transform="rotate(90)" x=".50003" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 3e-5c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#f60" style="text-indent:0;text-transform:none"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_border_image_qpushbutton_focus.svg b/res/skins/LateNight/buttons_classic/btn_border_image_qpushbutton_focus.svg
similarity index 97%
rename from res/skins/LateNight/buttons/btn_border_image_qpushbutton_focus.svg
rename to res/skins/LateNight/buttons_classic/btn_border_image_qpushbutton_focus.svg
index 228441068e46..c71e5e2de6c7 100644
--- a/res/skins/LateNight/buttons/btn_border_image_qpushbutton_focus.svg
+++ b/res/skins/LateNight/buttons_classic/btn_border_image_qpushbutton_focus.svg
@@ -1 +1 @@
-<svg width="25" height="25" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(3e-5,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m23.314 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 1.875-2 1.875l-19.499-2e-5c-.2947 0-.8341-.07706-1.325-.50548.21914 1.0963 1.0076 1.6305 1.8242 1.6305h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="rotate(90)" x=".50003" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#323232"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#323232"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#323232"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#323232"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#323232"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><path d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#323232"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></g><path d="m2 3e-5c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#f60" style="text-indent:0;text-transform:none"/></svg>
+<svg width="25" height="25" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(3e-5,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m23.314 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 1.875-2 1.875l-19.499-2e-5c-.2947 0-.8341-.07706-1.325-.50548.21914 1.0963 1.0076 1.6305 1.8242 1.6305h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#020201" opacity=".8"/><rect transform="rotate(90)" x=".50003" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#323232"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#323232"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#323232"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#323232"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#323232"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><path d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#323232"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></g><path d="m2 3e-5c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#f60" style="text-indent:0;text-transform:none"/></svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_fx.svg b/res/skins/LateNight/buttons_classic/btn_elevated_fx.svg
new file mode 100644
index 000000000000..a37349d3455a
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_elevated_fx.svg
@@ -0,0 +1,18 @@
+<svg width="35" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="c" x1="1.00003" x2="21.000031" y1="-17" y2="-17" gradientTransform="matrix(.89473685 0 0 1.0322581 .1578978 .0483871)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".30102351"/>
+			<stop stop-color="#141414" offset="1"/>
+		</linearGradient>
+		<linearGradient id="b" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(.69565218 0 0 1.3478261 .95650088 -32.326087)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<path d="m33.313235 2.08793c.11592.25262.185545.52951.18555.82422l.000225 14.088c1.8e-5 1.0994-.9006 1.965577-2 1.965572l-28.49901-.00012c-.6598637-3e-6-1.135675-.352003-1.325-.511743.2090942.790888.7641575 1.546137 1.8242 1.546141l28.99979 1e-4c1.108 4e-6 2.000018-.892 2-2l-.000225-14.088c-1.3e-5-.81658-.48717-1.5129-1.1855-1.8242z" fill="#020201"/>
+	<rect transform="rotate(90)" x="1.5000299" y="-33.5" width="17" height="32" rx=".30000001" ry=".30000004" fill="none" stroke="url(#c)" stroke-linecap="round" stroke-linejoin="round" stroke-width=".99999988" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2" y="-33" width="16" height="31" color="#000000" fill="url(#b)"/>
+	<rect transform="rotate(90)" x="2" y="-33" width="16" height="31" color="#000000" fill-opacity=".09019608"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_fx_active.svg b/res/skins/LateNight/buttons_classic/btn_elevated_fx_active.svg
new file mode 100644
index 000000000000..44f9af4dd1a5
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_elevated_fx_active.svg
@@ -0,0 +1,16 @@
+<svg width="35" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="c" x1="-24.500031" x2="-1.5000305" y1="-13" y2="-13" gradientTransform="matrix(.69565217 0 0 1.3478261 19.043499 .02173915)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".47451" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+		<linearGradient id="b" x1="1" x2="25" y1="13" y2="13" gradientTransform="matrix(.73913043 0 0 1.3913043 .39130442 -35.586955)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#202020" stop-opacity=".80808079" offset="0"/>
+			<stop stop-color="#404040" stop-opacity=".74747473" offset=".30102351"/>
+			<stop stop-opacity=".82323235" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2" y="-33" width="16" height="31" color="#000000" fill="url(#c)"/>
+	<rect transform="rotate(90)" x="1.5000001" y="-33.5" width="17" height="31.999998" rx=".2" ry=".19999999" fill="none" stroke="url(#b)" stroke-linecap="square" stroke-opacity=".39215686" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_fx_focus.svg b/res/skins/LateNight/buttons_classic/btn_elevated_fx_focus.svg
new file mode 100644
index 000000000000..2cadcfce6a93
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_elevated_fx_focus.svg
@@ -0,0 +1,18 @@
+<svg width="18" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="b" x1="1.4220984" x2="24.143082" y1="19.699568" y2="19.699568" gradientTransform="matrix(1 0 0 .65217391 3.0040741e-5 -17.47828)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".30102351"/>
+			<stop stop-color="#141414" offset="1"/>
+		</linearGradient>
+		<linearGradient id="a" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(1 0 0 .65217391 0 -16.173913)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<path d="m17 2.708984v21.291016c0 .545351-.454649 1-1 1h-14c-.043374 0-.073191.0036-.1152344-.002.2892095.571048.7949947 1.002 1.6152344 1.002h12c1.108 0 2-.892 2-2v-20.0000004c0-.4998619-.19821-.9420109-.5-1.2910156z"/>
+	<rect transform="rotate(90)" x="1.50003" y="-16.5" width="23" height="15" rx="1.5" ry=".97826087" color="#000000" fill="url(#a)"/>
+	<rect transform="rotate(90)" x="1.50003" y="-16.5" width="23" height="15" rx=".30000001" ry=".19565219" fill="none" stroke="url(#b)" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2" y="-16" width="22" height="14" color="#000000" fill-opacity=".09019608"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_fx_focus_active.svg b/res/skins/LateNight/buttons_classic/btn_elevated_fx_focus_active.svg
new file mode 100644
index 000000000000..7c200ca6acf4
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_elevated_fx_focus_active.svg
@@ -0,0 +1,10 @@
+<svg width="18" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="-24.500031" x2="-1.5000305" y1="-13" y2="-13" gradientTransform="matrix(.95652174 0 0 .60869566 25.434811 -1.0869565)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".39215687" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2" y="-16" width="22" height="14" rx=".5" ry=".31818181" color="#000000" fill="url(#a)"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_fx_selector.svg b/res/skins/LateNight/buttons_classic/btn_elevated_fx_selector.svg
new file mode 100644
index 000000000000..c2511052c803
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_elevated_fx_selector.svg
@@ -0,0 +1,18 @@
+<svg width="25" height="25" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="c" x1="1.4220984" x2="24.143082" y1="19.699568" y2="19.699568" gradientTransform="translate(-.99996996 -25.00003)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".30102351"/>
+			<stop stop-color="#141414" offset="1"/>
+		</linearGradient>
+		<linearGradient id="d" x1="2" x2="24" y1="12" y2="12" gradientTransform="translate(-1,-23)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect x=".5" y=".5" width="24" height="24" fill="none" stroke="#141414" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x=".50003004" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#d)"/>
+	<path d="m23.31367 1.17583c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 1.965573-2 1.965572l-19.49922-2e-5c-.6598637-1e-6-1.135675-.352003-1.325-.511743.2090942.790888.7641575 1.546141 1.8242 1.546141h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#020201"/>
+	<rect transform="rotate(90)" x=".50003004" y="-23.5" width="23" height="23" rx=".30000001" ry=".30000001" fill="none" stroke="url(#c)" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_medium.svg b/res/skins/LateNight/buttons_classic/btn_elevated_medium.svg
new file mode 100644
index 000000000000..2c1f124be1d5
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_elevated_medium.svg
@@ -0,0 +1,18 @@
+<svg width="42" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="d" x1="1.00003" x2="25.000031" y1="-26" y2="-26" gradientTransform="matrix(1 0 0 .79591837 .80952381 16.332338)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".30102351"/>
+			<stop stop-color="#141414" offset="1"/>
+		</linearGradient>
+		<linearGradient id="c" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(.95652175 0 0 1.6521739 .56518906 -39.173913)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<path d="m40.31446 2.17593c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 1.965576-2 1.965572l-35.50001-.00012c-.6598637-2e-6-1.135675-.352003-1.325-.511743.2090942.790888.7641575 1.546138 1.8242 1.546141l36.00079 1e-4c1.108 3e-6 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#020201"/>
+	<rect transform="rotate(90)" x="1.50003" y="-40.5" width="23" height="39" rx=".30000001" ry=".23877552" fill="none" stroke="url(#d)" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2" y="-40" width="22" height="38" color="#000000" fill-opacity=".09019608" stroke-width=".99999994"/>
+	<rect transform="rotate(90)" x="2" y="-40" width="22" height="38" color="#000000" fill="url(#c)" stroke-width=".99999994"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_medium_active.svg b/res/skins/LateNight/buttons_classic/btn_elevated_medium_active.svg
new file mode 100644
index 000000000000..597828a07a0e
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_elevated_medium_active.svg
@@ -0,0 +1,10 @@
+<svg width="42" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="-24.500031" x2="-1.5000305" y1="-13" y2="-13" gradientTransform="matrix(1,0,0,1.6865942,26.50003,1.321558)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".39215687" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2" y="-40" width="22" height="38" rx="1" ry=".79166669" color="#000000" fill="url(#a)" stroke-width=".99999994"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_medium_set.svg b/res/skins/LateNight/buttons_classic/btn_elevated_medium_set.svg
new file mode 100644
index 000000000000..ef92b4599376
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_elevated_medium_set.svg
@@ -0,0 +1,17 @@
+<svg width="42" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="c" x1="1" x2="25" y1="13.00003" y2="13.00003" gradientTransform="matrix(.99999998 0 0 1.6956522 2.4812674e-8 -43.043529)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity="0" offset="0"/>
+			<stop stop-color="#090909" stop-opacity="0" offset=".30102351"/>
+			<stop stop-opacity=".44949496" offset="1"/>
+		</linearGradient>
+		<linearGradient id="d" x1="1.5097979" x2="24.381355" y1="12" y2="12" gradientTransform="matrix(.95652174 0 0 1.6521739 .56518861 -39.173916)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".54365706"/>
+			<stop stop-opacity=".47058824" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2" y="-40" width="22" height="38" color="#000000" fill="url(#d)" stroke-width=".99999994"/>
+	<path d="m40.999953 2.7084922v20.9902348c0 .711551-.58923 1.300771-1.300781 1.300781l-37.3983908.000492c-.1572625 2e-6-.3069938-.03341-.4472656-.08594.2830595.59834.79839 1.085938 1.6464844 1.08594l35.998-.000492c1.108 2e-6 2-.892 2-2v-20.0000002c0-.4998619-.196257-.9420109-.498047-1.2910156z"/>
+	<rect transform="rotate(90)" x="1.4999999" y="-40.5" width="23" height="39" rx=".80000001" ry=".63673472" fill="none" stroke="url(#c)" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_play.svg b/res/skins/LateNight/buttons_classic/btn_elevated_play.svg
new file mode 100644
index 000000000000..3f8ab8d77907
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_elevated_play.svg
@@ -0,0 +1,18 @@
+<svg width="68" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="1.00003" x2="25.000031" y1="-26" y2="-26" gradientTransform="matrix(1 0 0 1.3265306 .80952381 28.220564)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".30102351"/>
+			<stop stop-color="#141414" offset="1"/>
+		</linearGradient>
+		<linearGradient id="b" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(.95652175 0 0 2.7826086 .56518906 -64.608695)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<path d="m66.31446 2.17593c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 1.965574-2 1.965572l-61.50001-.00012c-.6598637-1e-6-1.135675-.352003-1.325-.511743.2090942.790888.7641575 1.546139 1.8242 1.546141l62.00079 1e-4c1.108 2e-6 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#020201"/>
+	<rect transform="rotate(90)" x="1.50003" y="-66.5" width="23" height="65" rx=".30000001" ry=".3979592" fill="none" stroke="url(#a)" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2" y="-66" width="22" height="64" color="#000000" fill-opacity=".09019608" stroke-width=".99999988"/>
+	<rect transform="rotate(90)" x="2" y="-66" width="22" height="64" color="#000000" fill="url(#b)" stroke-width=".99999988"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_play_active.svg b/res/skins/LateNight/buttons_classic/btn_elevated_play_active.svg
new file mode 100644
index 000000000000..3f0569e092b8
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_elevated_play_active.svg
@@ -0,0 +1,10 @@
+<svg width="68" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="-24.500031" x2="-1.5000305" y1="-13" y2="-13" gradientTransform="matrix(1,0,0,2.8405797,26.50003,3.594203)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".39215687" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2" y="-66" width="22" height="64" rx="1" ry="1.3333334" color="#000000" fill="url(#a)" stroke-width=".99999988"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_square.svg b/res/skins/LateNight/buttons_classic/btn_elevated_square.svg
new file mode 100644
index 000000000000..ef43347eee2e
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_elevated_square.svg
@@ -0,0 +1,18 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="b" x1="1.4220984" x2="24.143082" y1="19.699568" y2="19.699568" gradientTransform="translate(3.0040741e-5,-26.00003)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".30102351"/>
+			<stop stop-color="#141414" offset="1"/>
+		</linearGradient>
+		<linearGradient id="a" x1="2" x2="24" y1="12" y2="12" gradientTransform="translate(0,-24)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<path d="m25 2.708984v21.291016c0 .545351-.454649 1-1 1h-22c-.043374 0-.073191.0036-.1152344-.002.2892095.571048.7949947 1.002 1.6152344 1.002h20c1.108 0 2-.892 2-2v-20.0000004c0-.4998619-.19821-.9420109-.5-1.2910156z"/>
+	<rect transform="rotate(90)" x="1.50003" y="-24.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/>
+	<rect transform="rotate(90)" x="1.50003" y="-24.5" width="23" height="23" rx=".30000001" ry=".30000001" fill="none" stroke="url(#b)" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2" y="-24" width="22" height="22" color="#000000" fill-opacity=".09019608"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_square_active.svg b/res/skins/LateNight/buttons_classic/btn_elevated_square_active.svg
new file mode 100644
index 000000000000..7f94324c6e85
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_elevated_square_active.svg
@@ -0,0 +1,10 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="-24.500031" x2="-1.5000305" y1="-13" y2="-13" gradientTransform="matrix(.95652174 0 0 .95652174 25.434811 -.56521739)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".39215687" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2" y="-24" width="22" height="22" rx=".5" ry=".5" color="#000000" fill="url(#a)"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_square_big.svg b/res/skins/LateNight/buttons_classic/btn_elevated_square_big.svg
new file mode 100644
index 000000000000..385175ba9a0b
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_elevated_square_big.svg
@@ -0,0 +1,18 @@
+<svg width="34" height="34" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="b" x1="1" x2="25" y1="13.00003" y2="13.00003" gradientTransform="matrix(1.3478261 0 0 1.3478261 -.52170877 -34.52178)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#333" offset="0"/>
+			<stop stop-color="#333" offset=".49880221"/>
+			<stop stop-color="#232323" offset="1"/>
+		</linearGradient>
+		<linearGradient id="a" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(1.3478261 0 0 1.3478261 -.5217492 -31.826087)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="1.5000298" y="-32.5" width="31" height="31" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/>
+	<path d="m32.313235 2.17593c.11592.25262.185548.52951.18555.82422l.000225 28c9e-6 1.0994-.9006 1.965577-2 1.965572l-27.49901-.00012c-.6598637-3e-6-1.135675-.352003-1.325-.511743.2090942.790888.7641575 1.546137 1.8242 1.546141l27.99979 1e-4c1.108 4e-6 2.000009-.892 2-2l-.000225-28c-7e-6-.81658-.48717-1.5129-1.1855-1.8242z" fill="#020201"/>
+	<rect transform="rotate(90)" x="1.5000311" y="-32.5" width="31" height="31" rx=".30000001" ry=".30000001" fill="none" stroke="url(#b)" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2" y="-32" width="30" height="30" color="#000000" fill-opacity=".09019608"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_square_big_active.svg b/res/skins/LateNight/buttons_classic/btn_elevated_square_big_active.svg
new file mode 100644
index 000000000000..d57a7d69e11e
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_elevated_square_big_active.svg
@@ -0,0 +1,11 @@
+<svg width="34" height="34" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="a" x1="1.5000294" x2="24.500029" y1="12" y2="12" gradientTransform="matrix(1.3478261 0 0 1.3478261 -.52174896 -31.826087)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".47451" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="1.5000305" y="-32.5" width="31" height="31" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/>
+	<rect x="1.5" y="1.5000311" width="31" height="31" rx=".30000001" ry=".30000001" fill="none" stroke="#888" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_square_set.svg b/res/skins/LateNight/buttons_classic/btn_elevated_square_set.svg
new file mode 100644
index 000000000000..86dc2d0ac876
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_elevated_square_set.svg
@@ -0,0 +1,18 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="1.5097979" x2="24.381355" y1="12" y2="12" gradientTransform="matrix(.95652182 0 0 .95652182 .56518861 -23.521742)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".54365706"/>
+			<stop stop-opacity=".47058824" offset="1"/>
+		</linearGradient>
+		<linearGradient id="b" x1="1" x2="25" y1="13.00003" y2="13.00003" gradientTransform="translate(1.502544e-8,-26.00003)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#0c0c0c" stop-opacity="0" offset="0"/>
+			<stop stop-opacity="0" offset=".57185686"/>
+			<stop stop-opacity=".59090906" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2" y="-24" width="22" height="22" color="#000000" fill="url(#a)"/>
+	<path d="m25 2.7089844v21.2910156c0 .545351-.454649 1-1 1h-22c-.043374 0-.073191.0036-.1152344-.002.2892095.571048.7949947 1.002 1.6152344 1.002h20c1.108 0 2-.892 2-2v-20c0-.4998619-.19821-.9420109-.5-1.2910156z"/>
+	<rect transform="rotate(90)" x="1.4999999" y="-24.5" width="23" height="23" fill="none" stroke="url(#b)" stroke-linecap="round" stroke-linejoin="round" stroke-width=".99999994" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2" y="-24" width="22" height="22" color="#000000" fill-opacity=".2020201"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_wide.svg b/res/skins/LateNight/buttons_classic/btn_elevated_wide.svg
new file mode 100644
index 000000000000..9b50246ade14
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_elevated_wide.svg
@@ -0,0 +1,18 @@
+<svg width="52" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="1.00003" x2="25.000031" y1="-26" y2="-26" gradientTransform="translate(.80952381 20.904732)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".30102351"/>
+			<stop stop-color="#141414" offset="1"/>
+		</linearGradient>
+		<linearGradient id="b" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(.95652175 0 0 2.0869565 .56518906 -48.956522)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<path d="m50.31446 2.17593c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 1.965575-2 1.965572l-45.50001-.00012c-.6598637-2e-6-1.135675-.352003-1.325-.511743.2090942.790888.7641575 1.546139 1.8242 1.546141l46.00079 1e-4c1.108 2e-6 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#020201"/>
+	<rect transform="rotate(90)" x="1.50003" y="-50.5" width="23" height="49" rx=".30000001" ry=".30000001" fill="none" stroke="url(#a)" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2" y="-50" width="22" height="48" color="#000000" fill-opacity=".09019608"/>
+	<rect transform="rotate(90)" x="2" y="-50" width="22" height="48" color="#000000" fill="url(#b)" stroke-width=".99999994"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_wide_active.svg b/res/skins/LateNight/buttons_classic/btn_elevated_wide_active.svg
new file mode 100644
index 000000000000..4ae02cea8728
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_elevated_wide_active.svg
@@ -0,0 +1,10 @@
+<svg width="52" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="-24.500031" x2="-1.5000305" y1="-13" y2="-13" gradientTransform="matrix(1,0,0,2.1304348,26.50003,2.1956522)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".39215687" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2" y="-50" width="22" height="48" rx="1" ry="1" color="#000000" fill="url(#a)"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_wide_set.svg b/res/skins/LateNight/buttons_classic/btn_elevated_wide_set.svg
new file mode 100644
index 000000000000..73e09d9bb81d
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_elevated_wide_set.svg
@@ -0,0 +1,17 @@
+<svg width="52" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="b" x1="1" x2="25" y1="13.00003" y2="13.00003" gradientTransform="matrix(.99999998 0 0 2.1304348 2.4812674e-8 -53.695716)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity="0" offset="0"/>
+			<stop stop-color="#090909" stop-opacity="0" offset=".30102351"/>
+			<stop stop-opacity=".44949496" offset="1"/>
+		</linearGradient>
+		<linearGradient id="a" x1="1.5097979" x2="24.381355" y1="12" y2="12" gradientTransform="matrix(.95652174 0 0 2.0869565 .56518861 -48.956525)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".54365706"/>
+			<stop stop-opacity=".47058824" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2" y="-50" width="22" height="48" color="#000000" fill="url(#a)"/>
+	<path d="m51 2.7089844v20.9902346c0 .711551-.58923 1.300781-1.300781 1.300781h-47.3984378c-.1572625 0-.3069938-.033414-.4472656-.085938.2830595.598338.79839 1.085936 1.6464844 1.085938h45.998047c1.108 2e-6 2-.892 2-2v-20c0-.4998619-.196257-.9420109-.498047-1.2910156z"/>
+	<rect transform="rotate(90)" x="1.4999999" y="-50.5" width="23" height="49" rx=".80000001" ry=".80000001" fill="none" stroke="url(#b)" stroke-linecap="round" stroke-linejoin="round" stroke-width=".99999994" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_border_image_qcombobox.svg b/res/skins/LateNight/buttons_classic/btn_embedded_combobox.svg
similarity index 99%
rename from res/skins/LateNight/buttons/btn_border_image_qcombobox.svg
rename to res/skins/LateNight/buttons_classic/btn_embedded_combobox.svg
index 6b4674ac36dd..2cc7a48b8d10 100644
--- a/res/skins/LateNight/buttons/btn_border_image_qcombobox.svg
+++ b/res/skins/LateNight/buttons_classic/btn_embedded_combobox.svg
@@ -52,7 +52,7 @@
   <path
      d="m 23.31367,1.17583 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.875001 -2,1.875 L 2,23.87503 c -0.2947,0 -0.8340987,-0.07706 -1.325,-0.505481 C 0.89414067,24.465835 1.6826,25 2.4992,25 h 20 c 1.108,0 2,-0.892 2,-2 V 3 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z"
      id="path15"
-     style="opacity:0.8;fill:#030303" />
+     style="opacity:0.8;fill:#020201" />
   <rect
      style="color:#000000;fill:url(#a)"
      id="rect17"
diff --git a/res/skins/LateNight/buttons/btn_border_image_qcombobox_focus.svg b/res/skins/LateNight/buttons_classic/btn_embedded_combobox_focus.svg
similarity index 97%
rename from res/skins/LateNight/buttons/btn_border_image_qcombobox_focus.svg
rename to res/skins/LateNight/buttons_classic/btn_embedded_combobox_focus.svg
index 228441068e46..c71e5e2de6c7 100644
--- a/res/skins/LateNight/buttons/btn_border_image_qcombobox_focus.svg
+++ b/res/skins/LateNight/buttons_classic/btn_embedded_combobox_focus.svg
@@ -1 +1 @@
-<svg width="25" height="25" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(3e-5,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m23.314 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 1.875-2 1.875l-19.499-2e-5c-.2947 0-.8341-.07706-1.325-.50548.21914 1.0963 1.0076 1.6305 1.8242 1.6305h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#030303" opacity=".8"/><rect transform="rotate(90)" x=".50003" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#323232"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#323232"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#323232"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#323232"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#323232"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><path d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#323232"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></g><path d="m2 3e-5c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#f60" style="text-indent:0;text-transform:none"/></svg>
+<svg width="25" height="25" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(3e-5,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m23.314 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 1.875-2 1.875l-19.499-2e-5c-.2947 0-.8341-.07706-1.325-.50548.21914 1.0963 1.0076 1.6305 1.8242 1.6305h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#020201" opacity=".8"/><rect transform="rotate(90)" x=".50003" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#323232"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#323232"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#323232"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#323232"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#323232"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><path d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#323232"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></g><path d="m2 3e-5c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#f60" style="text-indent:0;text-transform:none"/></svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_embedded_eqkill.svg b/res/skins/LateNight/buttons_classic/btn_embedded_eqkill.svg
new file mode 100644
index 000000000000..80678f52403a
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_embedded_eqkill.svg
@@ -0,0 +1,18 @@
+<svg width="18" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="b" x1="1.5" x2="21.405401" y1="24.500031" y2="18.657106" gradientTransform="matrix(.58695651 0 0 .58695651 1.3695652 -16.630452)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".49880221"/>
+			<stop stop-color="#1e1e1e" offset="1"/>
+		</linearGradient>
+		<linearGradient id="a" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(.60869566 0 0 .60869566 1.0869383 -15.695652)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2" y="-16" width="14" height="14" color="#000000" fill="url(#a)"/>
+	<rect transform="rotate(90)" x="2" y="-16" width="14" height="14" color="#000000" fill-opacity=".09019608"/>
+	<rect x="1.5" y="1.50003" width="15" height="15" rx=".30000001" ry=".30000001" fill="none" stroke="#020201" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2.25" y="-15.75" width="13.5" height="13.5" fill="none" stroke="url(#b)" stroke-linecap="round" stroke-width=".49999997" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_embedded_eqkill_active.svg b/res/skins/LateNight/buttons_classic/btn_embedded_eqkill_active.svg
new file mode 100644
index 000000000000..2e2e1add7cf4
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_embedded_eqkill_active.svg
@@ -0,0 +1,12 @@
+<svg width="18" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1=".5" x2="24.405561" y1="12" y2="12" gradientTransform="matrix(-.5652174 0 0 .26530613 -1.6521574 -8.4693876)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".47451" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="matrix(0,-1,-1,0,0,0)" x="-15.5" y="-15.5" width="13" height="13" rx="1.5" color="#000000" fill="url(#a)" stroke-width=".99999988"/>
+	<rect x="1.5" y="1.50003" width="15" height="15" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+	<rect x="1.5" y="1.50003" width="15" height="15" rx="1.5" ry="1.5" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_embedded_fx.svg b/res/skins/LateNight/buttons_classic/btn_embedded_fx.svg
new file mode 100644
index 000000000000..f102f367ff41
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_embedded_fx.svg
@@ -0,0 +1,18 @@
+<svg width="35" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="b" x1="1" x2="25" y1="13.00003" y2="13.00003" gradientTransform="matrix(.67391307 0 0 1.3260868 1.2391304 -34.739168)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".49880221"/>
+			<stop stop-color="#1e1e1e" offset="1"/>
+		</linearGradient>
+		<linearGradient id="a" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(.65217392 0 0 1.3913044 2.5217492 -32.804349)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="1.9999977" y="-33" width="15.999999" height="31" color="#000000" fill-opacity=".09019608"/>
+	<rect transform="rotate(90)" x="3.5000296" y="-33.5" width="15" height="32" rx="1.0714285" ry="1.2307693" color="#000000" fill="url(#a)"/>
+	<rect x="1.4999999" y="1.5000299" width="32" height="17" rx=".2461538" ry=".24285716" fill="none" stroke="#020201" stroke-linecap="round" stroke-linejoin="round" stroke-width=".99999988" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2.25" y="-32.75" width="15.5" height="30.5" fill="none" stroke="url(#b)" stroke-linecap="round" stroke-width=".49999994" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_embedded_fx_active.svg b/res/skins/LateNight/buttons_classic/btn_embedded_fx_active.svg
new file mode 100644
index 000000000000..5d308018fa03
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_embedded_fx_active.svg
@@ -0,0 +1,12 @@
+<svg width="35" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1=".5" x2="24.405561" y1="12" y2="12" gradientTransform="matrix(-.65217394 0 0 .6122449 -1.5217207 -16.275509)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".39215687" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="matrix(0,-1,-1,0,0,0)" x="-17.500002" y="-32.5" width="15" height="30" color="#000000" fill="url(#a)" stroke-width=".99999988"/>
+	<rect x="1.4999999" y="1.50003" width="32" height="17" fill="none" stroke="#020201" stroke-linecap="square" stroke-width=".99999994" style="paint-order:fill markers stroke"/>
+	<rect x="1.4999999" y="1.50003" width="32" height="17" rx="1.5" ry="1.5" fill="none" stroke="#020201" stroke-linecap="round" stroke-linejoin="round" stroke-width=".99999994" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_embedded_fx_focus.svg b/res/skins/LateNight/buttons_classic/btn_embedded_fx_focus.svg
new file mode 100644
index 000000000000..b5015f132c48
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_embedded_fx_focus.svg
@@ -0,0 +1,18 @@
+<svg width="18" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="1" x2="25" y1="13.00003" y2="13.00003" gradientTransform="matrix(.93478265 0 0 .58695645 .84782531 -16.630452)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".49880221"/>
+			<stop stop-color="#1e1e1e" offset="1"/>
+		</linearGradient>
+		<linearGradient id="b" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(1 0 0 .65217396 -6.4387355e-7 -16.173913)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="1.9999971" y="-16" width="22" height="14" color="#000000" fill-opacity=".09019608"/>
+	<rect transform="rotate(90)" x="1.5000292" y="-16.5" width="22.999998" height="15" rx="1.6428571" ry=".57692313" color="#000000" fill="url(#b)" stroke-width=".99999994"/>
+	<rect x="1.4999999" y="1.5000298" width="15" height="23" rx=".11538486" ry=".32857147" fill="none" stroke="#020201" stroke-linecap="round" stroke-linejoin="round" stroke-width=".9999997" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2.2499993" y="-15.75" width="21.5" height="13.5" fill="none" stroke="url(#a)" stroke-linecap="round" stroke-width=".49999994" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_embedded_fx_focus_active.svg b/res/skins/LateNight/buttons_classic/btn_embedded_fx_focus_active.svg
new file mode 100644
index 000000000000..db31acd42136
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_embedded_fx_focus_active.svg
@@ -0,0 +1,14 @@
+<svg width="18" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1=".5" x2="24.405561" y1="12" y2="12" gradientTransform="matrix(-.91304351 0 0 .26530613 -1.1304082 -8.4693873)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".39215687" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g stroke-width=".99999988">
+		<rect transform="matrix(0,-1,-1,0,0,0)" x="-23.500002" y="-15.5" width="21" height="13" color="#000000" fill="url(#a)"/>
+		<rect x="1.4999999" y="1.50003" width="15" height="23" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+		<rect x="1.4999999" y="1.50003" width="15" height="23" rx="1.5" ry="1.5" fill="none" stroke="#020201" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_embedded_fx_set.svg b/res/skins/LateNight/buttons_classic/btn_embedded_fx_set.svg
new file mode 100644
index 000000000000..c8852c76c247
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_embedded_fx_set.svg
@@ -0,0 +1,11 @@
+<svg width="35" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(.65217391 0 0 1.3043478 1.5217195 -31.847825)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2.5" y="-32.5" width="15" height="30" rx="1.5" ry="1.625" color="#000000" fill="url(#a)"/>
+	<rect x="1.5" y="1.5000299" width="32" height="17" rx=".32499999" ry=".30000001" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_embedded_library.svg b/res/skins/LateNight/buttons_classic/btn_embedded_library.svg
new file mode 100644
index 000000000000..66399df128f2
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_embedded_library.svg
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   version="1.1"
+   id="svg26"
+   sodipodi:docname="btn_embedded_library.svg"
+   inkscape:version="0.92.4 (unknown)">
+  <metadata
+     id="metadata30">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="740"
+     id="namedview28"
+     showgrid="false"
+     inkscape:zoom="9.8333333"
+     inkscape:cx="-1.3728814"
+     inkscape:cy="12"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg26" />
+  <defs
+     id="defs16">
+    <linearGradient
+       id="b"
+       x1="1.8333464"
+       x2="23.988836"
+       y1="18.657106"
+       y2="18.657106"
+       gradientTransform="matrix(.93478259 0 0 .93478259 -.15220394 -24.152202)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#393939"
+         offset="0"
+         id="stop2" />
+      <stop
+         stop-color="#393939"
+         offset=".49880221"
+         id="stop4" />
+      <stop
+         stop-color="#121212"
+         offset="1"
+         id="stop6" />
+    </linearGradient>
+    <linearGradient
+       id="a"
+       x1="2"
+       x2="24"
+       y1="12"
+       y2="12"
+       gradientTransform="matrix(.95652174 0 0 .95652174 -.4348113 -22.521739)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-opacity=".0047619"
+         offset="0"
+         id="stop9" />
+      <stop
+         stop-opacity="0"
+         offset=".5"
+         id="stop11" />
+      <stop
+         stop-opacity=".47451"
+         offset="1"
+         id="stop13" />
+    </linearGradient>
+  </defs>
+  <rect
+     transform="rotate(90)"
+     x="1"
+     y="-23"
+     width="22"
+     height="22"
+     color="#000000"
+     fill="url(#a)"
+     id="rect18" />
+  <rect
+     transform="rotate(90)"
+     x="1"
+     y="-23"
+     width="22"
+     height="22"
+     color="#000000"
+     fill-opacity=".09019608"
+     id="rect20" />
+  <rect
+     x=".5"
+     y=".5"
+     width="23"
+     height="23"
+     rx=".30000001"
+     ry=".30000001"
+     fill="none"
+     stroke="#000"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     style="paint-order:fill markers stroke;stroke:#020201;stroke-opacity:1"
+     id="rect22" />
+  <rect
+     transform="rotate(90)"
+     x="1.24997"
+     y="-22.75"
+     width="21.5"
+     height="21.5"
+     fill="none"
+     stroke="url(#b)"
+     stroke-linecap="round"
+     stroke-width=".5"
+     style="paint-order:fill markers stroke"
+     id="rect24" />
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_embedded_library_active.svg b/res/skins/LateNight/buttons_classic/btn_embedded_library_active.svg
new file mode 100644
index 000000000000..672a9daac517
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_embedded_library_active.svg
@@ -0,0 +1,12 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1=".5" x2="24.405561" y1="12" y2="12" gradientTransform="matrix(-.91304352 0 0 .42857142 -.13037539 -11.142857)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".47451" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect x=".5" y=".5" width="23" height="23" fill="none" stroke="#000" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+	<rect x=".5" y=".5" width="23" height="23" ry="1.5" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+	<rect transform="matrix(0,-1,-1,0,0,0)" x="-22.499968" y="-22.5" width="21" height="21" rx="1.4999999" ry="1.5" color="#000000" fill="url(#a)"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_embedded_library_focus.svg b/res/skins/LateNight/buttons_classic/btn_embedded_library_focus.svg
new file mode 100644
index 000000000000..344a13a93138
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_embedded_library_focus.svg
@@ -0,0 +1,25 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="e" x1="1.8333464" x2="23.988836" y1="18.657106" y2="18.657106" gradientTransform="matrix(.93478259 0 0 .93478259 -.15220394 -24.152202)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".49880221"/>
+			<stop stop-color="#121212" offset="1"/>
+		</linearGradient>
+		<linearGradient id="f" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(.95652174 0 0 .95652174 -.4348113 -22.521739)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+		<linearGradient id="d" x1="12.889831" x2="12.889831" y1=".22033899" y2="27.211864" gradientTransform="matrix(.93877551 0 0 .93877551 -7.4358636 38.778969)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#f60" offset="0"/>
+			<stop stop-color="#bf4c00" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="1" y="-23" width="22" height="22" color="#000000" fill="url(#f)"/>
+	<rect transform="rotate(90)" x="1" y="-23" width="22" height="22" color="#000000" fill-opacity=".09019608"/>
+	<g fill="none" stroke-linecap="round">
+		<rect x=".5" y=".5" width="23" height="23" rx=".30000001" ry=".30000001" stroke="#000" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+		<rect transform="rotate(90)" x="1.24997" y="-22.75" width="21.5" height="21.5" stroke="url(#e)" stroke-width=".5" style="paint-order:fill markers stroke"/>
+		<rect x=".5" y=".5" width="23" height="23" rx=".30000007" ry=".30000007" opacity=".592" stroke="url(#d)" stroke-linejoin="round" stroke-width=".99999994" style="paint-order:fill markers stroke"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_embedded_medium.svg b/res/skins/LateNight/buttons_classic/btn_embedded_medium.svg
new file mode 100644
index 000000000000..3bfd062075a3
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_embedded_medium.svg
@@ -0,0 +1,18 @@
+<svg width="42" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="b" x1="1" x2="25" y1="13.00003" y2="13.00003" gradientTransform="matrix(.93478263 0 0 1.6304346 .84782605 -42.195699)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".49880221"/>
+			<stop stop-color="#1e1e1e" offset="1"/>
+		</linearGradient>
+		<linearGradient id="a" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(1,0,0,1.6956522,-3.279503e-7,-39.652175)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2" y="-40" width="22" height="38" color="#000000" fill-opacity=".09019608" stroke-width=".99999994"/>
+	<rect transform="rotate(90)" x="1.5000297" y="-40.5" width="23" height="39" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/>
+	<rect x="1.4999999" y="1.50003" width="39" height="23" rx=".29999995" ry=".30000001" fill="none" stroke="#020201" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2.25" y="-39.75" width="21.5" height="37.5" fill="none" stroke="url(#b)" stroke-linecap="round" stroke-width=".49999994" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_embedded_medium_active.svg b/res/skins/LateNight/buttons_classic/btn_embedded_medium_active.svg
new file mode 100644
index 000000000000..ec579def443c
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_embedded_medium_active.svg
@@ -0,0 +1,14 @@
+<svg width="42" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1=".5" x2="24.405561" y1="12" y2="12" gradientTransform="matrix(-.91304356 0 0 .75510204 -1.1304082 -19.489795)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".39215687" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g>
+		<rect transform="matrix(0,-1,-1,0,0,0)" x="-23.500004" y="-39.5" width="21" height="37" color="#000000" fill="url(#a)"/>
+		<rect x="1.4999999" y="1.50003" width="39" height="23" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+		<rect x="1.4999999" y="1.50003" width="39" height="23" rx="1.5" ry="1.5" fill="none" stroke="#020201" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_embedded_medium_set.svg b/res/skins/LateNight/buttons_classic/btn_embedded_medium_set.svg
new file mode 100644
index 000000000000..9795277057cf
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_embedded_medium_set.svg
@@ -0,0 +1,11 @@
+<svg width="42" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(1,0,0,1.6956521,0,-39.652173)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="1.50003" y="-40.5" width="23" height="39" rx="1.5" ry="1.625" color="#000000" fill="url(#a)"/>
+	<rect x="1.5" y="1.50003" width="39" height="23" rx=".32499999" ry=".30000001" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_embedded_play.svg b/res/skins/LateNight/buttons_classic/btn_embedded_play.svg
new file mode 100644
index 000000000000..d098c20a88b8
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_embedded_play.svg
@@ -0,0 +1,14 @@
+<svg width="68" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(.95652174 0 0 2.7826087 .5651887 -64.608695)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g>
+		<rect transform="rotate(90)" x="2" y="-66" width="22" height="64" color="#000000" fill-opacity=".09019608"/>
+		<rect transform="rotate(90)" x="2" y="-66" width="22" height="64" color="#000000" fill="url(#a)"/>
+		<rect x="1.5000001" y="1.50003" width="65" height="23" rx=".84782612" ry=".30000001" fill="none" stroke="#020201" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_embedded_play_active.svg b/res/skins/LateNight/buttons_classic/btn_embedded_play_active.svg
new file mode 100644
index 000000000000..c1a3bfdb7417
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_embedded_play_active.svg
@@ -0,0 +1,14 @@
+<svg width="68" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1=".5" x2="24.405561" y1="12" y2="12" gradientTransform="matrix(-.91304348 0 0 1.2857143 -1.130408 -31.428571)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".47451" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g>
+		<rect x="1.5000001" y="1.50003" width="65" height="23" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+		<rect transform="matrix(0,-1,-1,0,0,0)" x="-23.5" y="-65.5" width="21" height="63" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/>
+		<rect x="1.5000001" y="1.50003" width="65" height="23" rx="1.5" ry="1.5" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_embedded_square.svg b/res/skins/LateNight/buttons_classic/btn_embedded_square.svg
new file mode 100644
index 000000000000..4443297375c5
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_embedded_square.svg
@@ -0,0 +1,18 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="b" x1="1.8333464" x2="23.988836" y1="18.657106" y2="18.657106" gradientTransform="matrix(.93478259 0 0 .93478259 .84782607 -25.152202)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".49880221"/>
+			<stop stop-color="#121212" offset="1"/>
+		</linearGradient>
+		<linearGradient id="a" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(.95652174 0 0 .95652174 .5651887 -23.521739)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2" y="-24" width="22" height="22" color="#000000" fill-opacity=".09019608"/>
+	<rect transform="rotate(90)" x="2" y="-24" width="22" height="22" color="#000000" fill="url(#a)"/>
+	<rect x="1.5" y="1.50003" width="23" height="23" rx=".30000001" ry=".30000001" fill="none" stroke="#020201" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2.25" y="-23.75" width="21.5" height="21.5" fill="none" stroke="url(#b)" stroke-linecap="round" stroke-width=".5" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_embedded_square_active.svg b/res/skins/LateNight/buttons_classic/btn_embedded_square_active.svg
new file mode 100644
index 000000000000..4fd91ad22889
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_embedded_square_active.svg
@@ -0,0 +1,12 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1=".5" x2="24.405561" y1="12" y2="12" gradientTransform="matrix(-.91304348 0 0 .42857143 -1.130408 -12.142857)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".47451" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect x="1.5" y="1.50003" width="23" height="23" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+	<rect transform="matrix(0,-1,-1,0,0,0)" x="-23.5" y="-23.5" width="21" height="21" rx="1.5" color="#000000" fill="url(#a)"/>
+	<rect x="1.5" y="1.50003" width="23" height="23" rx="1.5" ry="1.5" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_embedded_square_big.svg b/res/skins/LateNight/buttons_classic/btn_embedded_square_big.svg
new file mode 100644
index 000000000000..c34935016d5c
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_embedded_square_big.svg
@@ -0,0 +1,18 @@
+<svg width="34" height="34" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="c" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(1.3478261 0 0 1.3478261 -.5217492 -31.826087)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+		<linearGradient id="b" x1="1.8333464" x2="23.988836" y1="18.657106" y2="18.657106" gradientTransform="matrix(1.2826086 0 0 1.2826086 .32608726 -33.673951)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".49880221"/>
+			<stop stop-color="#121212" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2" y="-32" width="30" height="30" color="#000000" fill-opacity=".09019608"/>
+	<rect transform="rotate(90)" x="1.5000298" y="-32.5" width="31" height="31" rx="1.5" ry="1.5" color="#000000" fill="url(#c)"/>
+	<rect x="1.5" y="1.5000311" width="31" height="31" rx=".30000001" ry=".30000001" fill="none" stroke="#020201" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2.2500002" y="-31.75" width="29.5" height="29.5" fill="none" stroke="url(#b)" stroke-linecap="round" stroke-width=".5" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_embedded_square_big_active.svg b/res/skins/LateNight/buttons_classic/btn_embedded_square_big_active.svg
new file mode 100644
index 000000000000..2bbcc9b12d9a
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_embedded_square_big_active.svg
@@ -0,0 +1,12 @@
+<svg width="34" height="34" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1=".5" x2="24.405561" y1="12" y2="12" gradientTransform="matrix(-1.2608696 0 0 .59183674 -.60865815 -15.816326)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".47451" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect x="1.5" y="1.5000298" width="31" height="31" fill="none" stroke="#020201" stroke-linecap="round" stroke-width=".99999994" style="paint-order:fill markers stroke"/>
+	<rect transform="matrix(0,-1,-1,0,0,0)" x="-31.5" y="-31.5" width="29" height="29" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/>
+	<rect x="1.5" y="1.5" width="31" height="31" rx="1.5" ry="1.5" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_embedded_square_set.svg b/res/skins/LateNight/buttons_classic/btn_embedded_square_set.svg
new file mode 100644
index 000000000000..6d86eb0599e2
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_embedded_square_set.svg
@@ -0,0 +1,13 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(.95652174 0 0 .95652174 .5651887 -23.521739)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2" y="-24" width="22" height="22" color="#000000" fill-opacity=".09019608"/>
+	<rect transform="rotate(90)" x="2" y="-24" width="22" height="22" color="#000000" fill="url(#a)"/>
+	<rect x="1.5" y="1.50003" width="23" height="23" rx=".30000001" ry=".30000001" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	<rect x="1.5" y="1.50003" width="23" height="23" rx="1.5" ry="1.5" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_embedded_tall.svg b/res/skins/LateNight/buttons_classic/btn_embedded_tall.svg
new file mode 100644
index 000000000000..59dcea8a6003
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_embedded_tall.svg
@@ -0,0 +1,18 @@
+<svg width="26" height="52" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="b" x1="1.8333464" x2="23.988836" y1="18.657106" y2="18.657106" gradientTransform="matrix(2.0652173 0 0 .93478259 -.84782727 -25.152202)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".49880221"/>
+			<stop stop-color="#121212" offset="1"/>
+		</linearGradient>
+		<linearGradient id="a" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(2.0869564 0 0 .95652174 -1.1304966 -23.521739)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="1.9999998" y="-24" width="48" height="22" color="#000000" fill-opacity=".09019608" stroke-width=".99999988"/>
+	<rect transform="rotate(90)" x="1.9999998" y="-24" width="48" height="22" color="#000000" fill="url(#a)" stroke-width=".99999988"/>
+	<rect x="1.5" y="1.5000305" width="23" height="49" rx=".30000001" ry=".30000001" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2.249999" y="-23.75" width="47.5" height="21.5" fill="none" stroke="url(#b)" stroke-linecap="round" stroke-width=".5" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_embedded_tall_active.svg b/res/skins/LateNight/buttons_classic/btn_embedded_tall_active.svg
new file mode 100644
index 000000000000..ea27ed20c1a5
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_embedded_tall_active.svg
@@ -0,0 +1,14 @@
+<svg width="26" height="52" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1=".5" x2="24.405561" y1="12" y2="12" gradientTransform="matrix(-2.1304348 0 0 .46938776 1.6956841 -12.061224)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".47451" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g>
+		<rect transform="matrix(0,-1,-1,0,0,0)" x="-50.500031" y="-24.5" width="49" height="23" color="#000000" fill="url(#a)"/>
+		<rect x="1.5" y="1.500031" width="23" height="49" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+		<rect x="1.5" y="1.500031" width="23" height="49" rx="1.5" ry="1.5" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_embedded_wide.svg b/res/skins/LateNight/buttons_classic/btn_embedded_wide.svg
new file mode 100644
index 000000000000..4b7b9544e969
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_embedded_wide.svg
@@ -0,0 +1,18 @@
+<svg width="52" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="c" x1="1" x2="25" y1="13.00003" y2="13.00003" gradientTransform="matrix(.93478259 0 0 2.0652173 .8478261 -52.847888)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".49880221"/>
+			<stop stop-color="#1e1e1e" offset="1"/>
+		</linearGradient>
+		<linearGradient id="d" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(1,0,0,2.1304348,0,-49.434783)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2" y="-50" width="22" height="48" color="#000000" fill-opacity=".09019608"/>
+	<rect transform="rotate(90)" x="1.50003" y="-50.5" width="23" height="49" rx="1.5" ry="1.5" color="#000000" fill="url(#d)"/>
+	<rect x="1.5" y="1.50003" width="49" height="23" rx=".30000001" ry=".30000001" fill="none" stroke="#020201" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2.25" y="-49.75" width="21.5" height="47.5" fill="none" stroke="url(#c)" stroke-linecap="round" stroke-width=".5" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_embedded_wide_active.svg b/res/skins/LateNight/buttons_classic/btn_embedded_wide_active.svg
new file mode 100644
index 000000000000..01474535afaa
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/btn_embedded_wide_active.svg
@@ -0,0 +1,12 @@
+<svg width="52" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1=".5" x2="24.405561" y1="12" y2="12" gradientTransform="matrix(-.91304348 0 0 .95918367 -1.1304075 -24.081632)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".47451" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect x="1.5" y="1.50003" width="49" height="23" fill="none" stroke="#020201" stroke-linecap="round" style="paint-order:fill markers stroke"/>
+	<rect transform="matrix(0,-1,-1,0,0,0)" x="-23.5" y="-49.5" width="21" height="47" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/>
+	<rect x="1.5" y="1.50003" width="49" height="23" rx="1.5" ry="1.5" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/spinbox_down.svg b/res/skins/LateNight/buttons_classic/spinbox_down.svg
new file mode 100644
index 000000000000..b7394f5ac389
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/spinbox_down.svg
@@ -0,0 +1,17 @@
+<svg width="17" height="11" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="d" x1="12.460919" x2="12.460919" y1="21.71229" y2=".37588444" gradientTransform="matrix(.96801856 0 0 1.0311015 1.9375991 -11.387575)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#141414" offset="0"/>
+			<stop stop-color="#262626" offset="1"/>
+		</linearGradient>
+		<linearGradient id="c" x1="1" x2="1" y2="24.007122" gradientTransform="translate(0,-13.007122)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".30102351"/>
+			<stop stop-color="#141414" offset="1"/>
+		</linearGradient>
+	</defs>
+	<path d="m 1,11 16,-2.62e-4 V 0 H 1 Z" color="#000000" fill="url(#d)" stroke-width=".94349116" style="text-indent:0;text-transform:none"/>
+	<path d="m9 9-3.4641429-6h6.9281999z" fill="none" stroke="#000" stroke-width="1.60000002"/>
+	<path d="m9 9-3.4641429-6h6.9281999z" fill="#bfbfbe" stroke-width=".85714287"/>
+	<rect y="-13.007122" width="1" height="24.007122" fill="url(#c)" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_beatbox_halve_pressed.svg b/res/skins/LateNight/buttons_classic/spinbox_down_pressed.svg
similarity index 98%
rename from res/skins/LateNight/buttons/btn_beatbox_halve_pressed.svg
rename to res/skins/LateNight/buttons_classic/spinbox_down_pressed.svg
index eae119b8c6ac..44ced2b96347 100644
--- a/res/skins/LateNight/buttons/btn_beatbox_halve_pressed.svg
+++ b/res/skins/LateNight/buttons_classic/spinbox_down_pressed.svg
@@ -102,5 +102,5 @@
   <path
      id="path3065-6"
      d="M 8.0050588,9 4.5409159,3 h 6.9282001 z"
-     style="fill:#bfbfbf;stroke-width:0.85714287" />
+     style="fill:#d2d2d1;stroke-width:0.85714287" />
 </svg>
diff --git a/res/skins/LateNight/buttons_classic/spinbox_elevated_border.svg b/res/skins/LateNight/buttons_classic/spinbox_elevated_border.svg
new file mode 100644
index 000000000000..efc2c5f8e053
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/spinbox_elevated_border.svg
@@ -0,0 +1,20 @@
+<svg width="25" height="25" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="2" x2="22" y1="2" y2="22" gradientTransform="matrix(1.0476191 0 0 1.0476191 -.07142871 -.07143053)" gradientUnits="userSpaceOnUse">
+			<stop offset="0"/>
+			<stop offset=".5"/>
+			<stop stop-color="#333" stop-opacity=".97474748" offset=".5"/>
+			<stop stop-color="#333" offset="1"/>
+		</linearGradient>
+		<linearGradient id="b" x1="-1" x2="-1" y1="2" y2="25" gradientTransform="translate(1.50005,-1.507121)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".30102351"/>
+			<stop stop-color="#141414" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect x=".5" y=".5" width="24" height="24" fill="none" stroke="#111" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+	<path d="m23.31367 1.17583c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 1.965573-2 1.965572l-19.49922-2e-5c-.6598637-1e-6-1.135675-.352003-1.325-.511743.2090942.790888.7641575 1.546141 1.8242 1.546141h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#020201"/>
+	<rect x="1.4999999" y="1.4999981" width="22" height="22.000002" fill="none" stroke="url(#a)" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+	<path d="m.50005 23.492879v-23h22.99995v23" fill="none" stroke="url(#b)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1px"/>
+	<rect x="6" y="23" width="18" height="1" fill="#222" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/spinbox_elevated_border_focus.svg b/res/skins/LateNight/buttons_classic/spinbox_elevated_border_focus.svg
new file mode 100644
index 000000000000..51838ed13749
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/spinbox_elevated_border_focus.svg
@@ -0,0 +1,14 @@
+<svg width="25" height="25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="a" x1="2" x2="22" y1="2" y2="22" gradientTransform="matrix(1.0476191 0 0 1.0476191 -.07142871 -.0714286)" gradientUnits="userSpaceOnUse">
+			<stop offset="0"/>
+			<stop offset=".5"/>
+			<stop stop-color="#333" stop-opacity=".97474748" offset=".5"/>
+			<stop stop-color="#333" offset="1"/>
+		</linearGradient>
+	</defs>
+	<path d="m23.31367 1.17583c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 1.965573-2 1.965572l-19.49922-2e-5c-.6598637-1e-6-1.135675-.352003-1.325-.511743.2090942.790888.7641575 1.546141 1.8242 1.546141h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#020201"/>
+	<rect x=".5" y=".5" width="24" height="24" fill="none" stroke="#111" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+	<rect x="1.4999999" y="1.5" width="22" height="22.000002" fill="none" stroke="url(#a)" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x=".50002998" y="-23.5" width="23" height="23" rx=".30000001" ry=".30000001" fill="none" stroke="#d08e00" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/spinbox_elevated_border_hover.svg b/res/skins/LateNight/buttons_classic/spinbox_elevated_border_hover.svg
new file mode 100644
index 000000000000..490adcbe5187
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/spinbox_elevated_border_hover.svg
@@ -0,0 +1,18 @@
+<svg width="25" height="25" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="2" x2="22" y1="2" y2="22" gradientTransform="matrix(1.0476191 0 0 1.0476191 -.07142862 -.07143054)" gradientUnits="userSpaceOnUse">
+			<stop offset="0"/>
+			<stop offset=".5"/>
+			<stop stop-color="#333" stop-opacity=".97474748" offset=".5"/>
+			<stop stop-color="#333" offset="1"/>
+		</linearGradient>
+		<linearGradient id="b" x1="3.0040741e-5" x2="24.000031" y1="-12" y2="-12" gradientTransform="matrix(1.047619 0 0 1 -.07142861 0)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#888" offset="0"/>
+			<stop stop-color="#666" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect x=".5" y=".5" width="24" height="24" fill="none" stroke="#111" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+	<path d="m23.31367 1.17583c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 1.965573-2 1.965572l-19.49922-2e-5c-.6598637-1e-6-1.135675-.352003-1.325-.511743.2090942.790888.7641575 1.546141 1.8242 1.546141h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#020201"/>
+	<rect x="1.5" y="1.4999981" width="22" height="22.000002" fill="none" stroke="url(#a)" stroke-linecap="square" stroke-width=".99999994" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x=".50002998" y="-23.5" width="23" height="23" rx=".30000001" ry=".30000001" fill="none" stroke="url(#b)" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/spinbox_embedded_border.svg b/res/skins/LateNight/buttons_classic/spinbox_embedded_border.svg
new file mode 100644
index 000000000000..1a156148d8c7
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/spinbox_embedded_border.svg
@@ -0,0 +1,21 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="2" x2="22" y1="2" y2="22" gradientTransform="matrix(1.0476191 0 0 1.0476191 .92857129 .92856947)" gradientUnits="userSpaceOnUse">
+			<stop offset="0"/>
+			<stop offset=".5"/>
+			<stop stop-color="#333" stop-opacity=".97474748" offset=".5"/>
+			<stop stop-color="#333" offset="1"/>
+		</linearGradient>
+		<linearGradient id="b" x1="-1" x2="-1" y1="2" y2="25" gradientTransform="translate(2.50005 -.507121)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".30102351"/>
+			<stop stop-color="#141414" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g fill="none">
+		<rect x=".75" y=".75" width="24.5" height="24.5" rx=".30000007" ry=".30000007" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" style="paint-order:fill markers stroke"/>
+		<rect x="2.5" y="2.4999981" width="22" height="22.000002" stroke="url(#a)" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+		<path d="m1.50005 24.492879v-23h22.99995v23" stroke="url(#b)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1px"/>
+	</g>
+	<rect x="7" y="24" width="18" height="1" fill="#141414" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/spinbox_embedded_border_focus_cyan.svg b/res/skins/LateNight/buttons_classic/spinbox_embedded_border_focus_cyan.svg
new file mode 100644
index 000000000000..98cd685aabca
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/spinbox_embedded_border_focus_cyan.svg
@@ -0,0 +1,21 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="d" x1="2" x2="22" y1="2" y2="22" gradientTransform="matrix(1.0476191 0 0 1.0476191 .92857129 .92856947)" gradientUnits="userSpaceOnUse">
+			<stop offset="0"/>
+			<stop offset=".5"/>
+			<stop stop-color="#333" stop-opacity=".97474748" offset=".5"/>
+			<stop stop-color="#333" offset="1"/>
+		</linearGradient>
+		<linearGradient id="c" x1="-1" x2="-1" y1="2" y2="25" gradientTransform="translate(2.50005 -.507121)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".30102351"/>
+			<stop stop-color="#141414" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g fill="none">
+		<rect x=".75" y=".75" width="24.5" height="24.5" rx=".30000007" ry=".30000007" stroke="#0ff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" style="paint-order:fill markers stroke"/>
+		<rect x="2.5" y="2.4999981" width="22" height="22.000002" stroke="url(#d)" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+		<path d="m1.50005 24.492879v-23h22.99995v23" stroke="url(#c)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1px"/>
+	</g>
+	<rect x="7" y="24" width="18" height="1" fill="#141414" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/spinbox_embedded_border_focus_orange.svg b/res/skins/LateNight/buttons_classic/spinbox_embedded_border_focus_orange.svg
new file mode 100644
index 000000000000..a482f0afd702
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/spinbox_embedded_border_focus_orange.svg
@@ -0,0 +1,25 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="2" x2="22" y1="2" y2="22" gradientTransform="matrix(1.0476191 0 0 1.0476191 .92857129 .92856947)" gradientUnits="userSpaceOnUse">
+			<stop offset="0"/>
+			<stop offset=".5"/>
+			<stop stop-color="#333" stop-opacity=".97474748" offset=".5"/>
+			<stop stop-color="#333" offset="1"/>
+		</linearGradient>
+		<linearGradient id="b" x1="-1" x2="-1" y1="2" y2="25" gradientTransform="translate(2.50005 -.507121)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".30102351"/>
+			<stop stop-color="#141414" offset="1"/>
+		</linearGradient>
+		<linearGradient id="c" x1="12.889831" x2="12.889831" y1="-42.966103" y2="17.737288" gradientTransform="translate(-7.7034199,41.525424)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#d09300" offset="0"/>
+			<stop stop-color="#bf4c00" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g fill="none">
+		<rect x=".75" y=".75" width="24.5" height="24.5" rx=".30000007" ry=".30000007" stroke="url(#c)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" style="paint-order:fill markers stroke"/>
+		<rect x="2.5" y="2.4999981" width="22" height="22.000002" stroke="url(#a)" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+		<path d="m1.50005 24.492879v-23h22.99995v23" stroke="url(#b)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1px"/>
+	</g>
+	<rect x="7" y="24" width="18" height="1" fill="#141414" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/spinbox_embedded_border_hover.svg b/res/skins/LateNight/buttons_classic/spinbox_embedded_border_hover.svg
new file mode 100644
index 000000000000..b206a41179a4
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/spinbox_embedded_border_hover.svg
@@ -0,0 +1,25 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="e" x1="2" x2="22" y1="2" y2="22" gradientTransform="matrix(1.0476191 0 0 1.0476191 .92857129 .92856947)" gradientUnits="userSpaceOnUse">
+			<stop offset="0"/>
+			<stop offset=".5"/>
+			<stop stop-color="#333" stop-opacity=".97474748" offset=".5"/>
+			<stop stop-color="#333" offset="1"/>
+		</linearGradient>
+		<linearGradient id="d" x1="-1" x2="-1" y1="2" y2="25" gradientTransform="translate(2.50005 -.507121)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".30102351"/>
+			<stop stop-color="#141414" offset="1"/>
+		</linearGradient>
+		<linearGradient id="c" x1="12.889831" x2="12.889831" y1=".22033899" y2="27.211864" gradientTransform="matrix(1.047619,0,0,1,-13.613832,46.152542)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#888" offset="0"/>
+			<stop stop-color="#666" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g fill="none">
+		<rect x=".75" y=".75" width="24.5" height="24.5" rx=".30000007" ry=".30000007" stroke="url(#c)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" style="paint-order:fill markers stroke"/>
+		<rect x="2.5" y="2.4999981" width="22" height="22.000002" stroke="url(#e)" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+		<path d="m1.50005 24.492879v-23h22.99995v23" stroke="url(#d)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1px"/>
+	</g>
+	<rect x="7" y="24" width="18" height="1" fill="#141414" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/spinbox_up.svg b/res/skins/LateNight/buttons_classic/spinbox_up.svg
new file mode 100644
index 000000000000..d41da6790053
--- /dev/null
+++ b/res/skins/LateNight/buttons_classic/spinbox_up.svg
@@ -0,0 +1,17 @@
+<svg width="17" height="11" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="d" x1="12.460919" x2="12.460919" y1="32.380493" y2="11.044087" gradientTransform="matrix(.96801856 0 0 1.0311015 1.9375991 -11.387575)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#141414" offset="0"/>
+			<stop stop-color="#262626" offset="1"/>
+		</linearGradient>
+		<linearGradient id="c" x1="1" x2="1" y2="24.007122" gradientTransform="translate(-22.5,-1.5)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".30102351"/>
+			<stop stop-color="#141414" offset="1"/>
+		</linearGradient>
+	</defs>
+	<path d="m 1,11 16,-2.62e-4 V 0 H 1 Z" color="#000000" fill="url(#d)" stroke-width=".94349116" style="text-indent:0;text-transform:none"/>
+	<path d="M 9.0050588,1.9999997 5.5409159,8 h 6.9282001 z" fill="none" stroke="#000" stroke-width="1.60000002"/>
+	<path d="M 9.0050588,1.9999997 5.5409159,8 h 6.9282001 z" fill="#bfbfbe" stroke-width=".85714287"/>
+	<rect width="1" height="24.007122" fill="url(#c)" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_beatbox_double_pressed.svg b/res/skins/LateNight/buttons_classic/spinbox_up_pressed.svg
similarity index 98%
rename from res/skins/LateNight/buttons/btn_beatbox_double_pressed.svg
rename to res/skins/LateNight/buttons_classic/spinbox_up_pressed.svg
index 9e4174997473..76543576a028 100644
--- a/res/skins/LateNight/buttons/btn_beatbox_double_pressed.svg
+++ b/res/skins/LateNight/buttons_classic/spinbox_up_pressed.svg
@@ -97,7 +97,7 @@
      d="m 0,11 16,-2.62e-4 V 2.964 C 16.0056,1.3114853 14.854001,0 13.459567,0 H 0 Z"
      style="color:#000000;text-indent:0;text-transform:none;fill:url(#linearGradient6970-3-3);stroke-width:0.94349116" />
   <path
-     style="fill:#bfbfbf;stroke-width:0.85714287"
+     style="fill:#d2d2d1;stroke-width:0.85714287"
      d="M 8.0050588,1.9999997 4.5409159,8 h 6.9282001 z"
      id="path3065-6" />
 </svg>
diff --git a/res/skins/LateNight/buttons/btn__down.svg b/res/skins/LateNight/buttons_flip/btn_.svg
similarity index 100%
rename from res/skins/LateNight/buttons/btn__down.svg
rename to res/skins/LateNight/buttons_flip/btn_.svg
diff --git a/res/skins/LateNight/buttons_flip/btn__1.svg b/res/skins/LateNight/buttons_flip/btn__1.svg
new file mode 100644
index 000000000000..3f112a2f8953
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__1.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m8 9h3v6h-2v-5h-1z" stroke="#000" stroke-width="1.60000002"/>
+	<path d="m8 9h3v6h-2v-5h-1v-1" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__2.svg b/res/skins/LateNight/buttons_flip/btn__2.svg
new file mode 100644
index 000000000000..cd09dd19cca0
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__2.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m7 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002"/>
+	<path d="m7 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__3.svg b/res/skins/LateNight/buttons_flip/btn__3.svg
new file mode 100644
index 000000000000..f0abdd89ec56
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__3.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m6 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5z" stroke="#000" stroke-width="1.60000002"/>
+	<path d="m6 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__4.svg b/res/skins/LateNight/buttons_flip/btn__4.svg
new file mode 100644
index 000000000000..3d6f98081ab4
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__4.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m6 10v3h5v2h2v-6h-2v3h-3v-2z" stroke="#000" stroke-width="1.60000002"/>
+	<path d="m6 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__5.svg b/res/skins/LateNight/buttons_flip/btn__5.svg
new file mode 100644
index 000000000000..34dd7b0b4479
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__5.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m13 9h-6v3h4v2h-5v1h7v-4h-5v-1h5z" stroke="#000" stroke-width="1.60000002"/>
+	<path d="m13 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__6.svg b/res/skins/LateNight/buttons_flip/btn__6.svg
new file mode 100644
index 000000000000..677aec06cb36
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__6.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m7 8.9999997v6.0000003h7v-4h-5v-1h4v-1.0000003zm2 3.0000003h4v2h-4z" stroke="#000" stroke-width="1.60000002"/>
+	<path d="m7 8.9999997v6.0000003h7v-4h-5v-1h4v-1.0000003zm2 3.0000003h4v2h-4z" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__7.svg b/res/skins/LateNight/buttons_flip/btn__7.svg
new file mode 100644
index 000000000000..d7b906f48018
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__7.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m7.031 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4z" stroke="#000" stroke-width="1.60000002"/>
+	<path d="m7.031 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__8.svg b/res/skins/LateNight/buttons_flip/btn__8.svg
new file mode 100644
index 000000000000..cc7dd1d678b6
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__8.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m7 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" stroke="#000" stroke-width="1.60000002"/>
+	<path d="m7 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__arrow_left.svg b/res/skins/LateNight/buttons_flip/btn__arrow_left.svg
new file mode 100644
index 000000000000..f64bd35deee4
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__arrow_left.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m16 10.999714h-4v-3.9999995l-5 5.4999995 5 5.5v-4h4v-3" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002"/>
+	<path d="m16 10.999714h-4v-3.9999995l-5 5.4999995 5 5.5v-4h4v-3" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__arrow_right.svg b/res/skins/LateNight/buttons_flip/btn__arrow_right.svg
new file mode 100644
index 000000000000..7f319803274a
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__arrow_right.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m8 10h4v-4l5 5.5-5 5.5v-4h-4v-3" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.6"/>
+	<path d="m8 10h4v-4l5 5.5-5 5.5v-4h-4v-3" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__autodj_addrandom.svg b/res/skins/LateNight/buttons_flip/btn__autodj_addrandom.svg
new file mode 100644
index 000000000000..3cf8575bc38b
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__autodj_addrandom.svg
@@ -0,0 +1,19 @@
+<svg width="32" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="d">
+			<stop stop-color="#888" offset="0"/>
+			<stop stop-color="#bfbfbe" offset="1"/>
+		</linearGradient>
+		<linearGradient id="e" x1="1.5855784" x2="1.5855784" y1="19" y2="1" gradientUnits="userSpaceOnUse" xlink:href="#d"/>
+		<linearGradient id="f" x1="8.1985474" x2="8.1985474" y1="24.412479" y2="5.2124801" gradientUnits="userSpaceOnUse" xlink:href="#d"/>
+	</defs>
+	<g fill="url(#e)">
+		<g transform="matrix(.68451 0 0 .68268 12.431277 -.032504)" aria-label="?">
+			<path d="m17.145 12.382q0 .59245-.20964 1.0846-.20052.49219-.59245.92969-.38281.42838-1.7682 1.431-1.2122.875-1.2578 1.8411h-2.4336q.05469-.9388.53776-1.6771.48307-.7474 1.3672-1.3581 1.0299-.70182 1.4036-1.1484.3737-.45573.3737-.99349 0-.70182-.55599-1.1211-.55599-.42838-1.4583-.42838-.92057 0-1.5495.53776-.61979.53776-.72917 1.4219l-2.5977-.10938q.24609-1.8503 1.5221-2.8802 1.276-1.0299 3.3177-1.0299 2.1146 0 3.3724.94792t1.2578 2.5521zm-6.3346 8.987v-2.4609h2.6341v2.4609z" fill="url(#e)" stroke-width="1.46290004"/>
+		</g>
+		<path d="m16.746277 3c-.01174.000237-.02347.0008874-.03516.00195-.0052.0005679-.01043.00122-.01563.00195-.0046.0005871-.0091.00124-.01367.00195-.0065.00117-.01305.00248-.01953.00391-.0052.00122-.01044.00252-.01563.00391-.01584.00379-.03148.00835-.04687.013672-.01389.00461-.02758.00982-.04102.015625-.0072.00309-.0144.00634-.02148.00977-.0073.00373-.01442.00764-.02148.011719-.0026.00128-.0052.00258-.0078.00391-.01.00616-.01977.012679-.0293.019531-.006.00443-.01182.00898-.01758.013672-.01142.008-.02249.016468-.0332.025391-.0067.00633-.0132.012842-.01953.019531l-4.2618 4.25c-.01168.011811-.02276.024196-.0332.037109-.02089.025475-.03921.052953-.05469.082031-.0079.014608-.01508.0296-.02149.044922-.006.015998-.01126.032295-.01563.048828-.0047.015427-.0086.03107-.01172.046875v.00195c-.0061.030231-.0094.060961-.0098.091797-1.1e-5.00195-1.1e-5.00391 0 .00586l-6.7e-5 8.7441c2.8e-5.27613.22387.49997.5.5h17c.27613-2.8e-5.49997-.22387.5-.5l-6.7e-5-13c-2.8e-5-.27613-.22387-.49997-.5-.5h-12.74c-.0046-6.23e-5-.0091-6.23e-5-.01367 0zm.51367 1h11.74l6.7e-5 12h-16l6.7e-5-7.75h3.7599c.27613-2.76e-5.49997-.22387.5-.5zm-1 .70508.000134 2.5449h-2.5509z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<g transform="matrix(.94002 0 0 .9375 -5.8999281 -3.8867)" aria-label="+">
+			<path d="m13.723 15.879v3.2h-2.1276v-3.2h-3.1914v-2.1333h3.1914v-3.2h2.1276v3.2h3.1914v2.1333z" fill="url(#f)" stroke-width="1.06519997"/>
+		</g>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__autodj_enable_off.svg b/res/skins/LateNight/buttons_flip/btn__autodj_enable_off.svg
new file mode 100644
index 000000000000..bb5e5916f573
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__autodj_enable_off.svg
@@ -0,0 +1,23 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="c" x1="2.8712108" x2="2.8712108" y1="19.047619" y2="1.025641" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#888" offset="0"/>
+			<stop stop-color="#bfbfbe" offset="1"/>
+		</linearGradient>
+		<linearGradient id="b" x1="-11.208792" x2="-11.208792" y1="19.047619" y2="1.025641" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#888" offset="0"/>
+			<stop stop-color="#bfbfbe" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g fill="url(#c)">
+		<path d="m26 3c-.554 0-1 .446-1 1v3h8v-3c0-.554-.446-1-1-1zm1.25 1.5c.41421 0 .75.33579.75.75s-.33579.75-.75.75-.75-.33579-.75-.75.33579-.75.75-.75zm3.5 0c.41421 0 .75.33579.75.75s-.33579.75-.75.75-.75-.33579-.75-.75.33579-.75.75-.75z" color="#000000"/>
+		<rect x="26" y="14" width="2" height="3" rx="1" ry="1"/>
+		<rect x="30" y="14" width="2" height="3" rx="1" ry="1"/>
+		<rect x="22" y="8" width="2" height="5" rx="1" ry="1" color="#000000"/>
+		<path d="m25 8v6.4219c0 .32317.223.57812.5.57812h7c.277 0 .5-.25496.5-.57812v-6.4219h-7.5z" color="#000000"/>
+		<rect x="34" y="8" width="2" height="5" rx="1" ry="1" color="#000000"/>
+		<path d="m6.4414 5.5293a.75008.75008 0 0 0-.45898.18164c-2.011 1.6874-2.7533 4.459-1.8555 6.9258.89787 2.4668 3.2479 4.1133 5.873 4.1133 2.6252 1.6e-5 4.9752-1.6465 5.873-4.1133.89785-2.4668.15554-5.2384-1.8555-6.9258a.75008.75008 0 1 0-.96289 1.1484c1.5319 1.2854 2.0941 3.3865 1.4102 5.2656-.68395 1.8791-2.4651 3.125-4.4648 3.125-1.9997 1.2e-5-3.7789-1.2459-4.4629-3.125-.68393-1.8791-.12173-3.9803 1.4102-5.2656a.75008.75008 0 0 0-.50586-1.3301z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<path d="m9.9883 2.7383a.75008.75008 0 0 0-.73828.76172v5a.75008.75008 0 1 0 1.5 0v-5a.75008.75008 0 0 0-.76172-.76172z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	</g>
+	<rect x="-18.168499" y="1.025641" width="15.018315" height="18.02198" rx=".5" ry=".5" fill="url(#b)" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__autodj_enable_on.svg b/res/skins/LateNight/buttons_flip/btn__autodj_enable_on.svg
new file mode 100644
index 000000000000..cfc8befa14bc
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__autodj_enable_on.svg
@@ -0,0 +1,10 @@
+<svg width="40" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m26 3c-.554 0-1 .446-1 1v3h8v-3c0-.554-.446-1-1-1zm1.25 1.5c.41421 0 .75.33579.75.75s-.33579.75-.75.75-.75-.33579-.75-.75.33579-.75.75-.75zm3.5 0c.41421 0 .75.33579.75.75s-.33579.75-.75.75-.75-.33579-.75-.75.33579-.75.75-.75z" color="#000000"/>
+	<rect x="26" y="14" width="2" height="3" rx="1" ry="1"/>
+	<rect x="30" y="14" width="2" height="3" rx="1" ry="1"/>
+	<rect x="22" y="8" width="2" height="5" rx="1" ry="1" color="#000000"/>
+	<path d="m25 8v6.4219c0 .32317.223.57812.5.57812h7c.277 0 .5-.25496.5-.57812v-6.4219h-7.5z" color="#000000"/>
+	<rect x="34" y="8" width="2" height="5" rx="1" ry="1" color="#000000"/>
+	<path d="m6.4414 5.5293a.75008.75008 0 0 0-.45898.18164c-2.011 1.6874-2.7533 4.459-1.8555 6.9258.89787 2.4668 3.2479 4.1133 5.873 4.1133 2.6252 1.6e-5 4.9752-1.6465 5.873-4.1133.89785-2.4668.15554-5.2384-1.8555-6.9258a.75008.75008 0 1 0-.96289 1.1484c1.5319 1.2854 2.0941 3.3865 1.4102 5.2656-.68395 1.8791-2.4651 3.125-4.4648 3.125-1.9997 1.2e-5-3.7789-1.2459-4.4629-3.125-.68393-1.8791-.12173-3.9803 1.4102-5.2656a.75008.75008 0 0 0-.50586-1.3301z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<path d="m9.9883 2.7383a.75008.75008 0 0 0-.73828.76172v5a.75008.75008 0 1 0 1.5 0v-5a.75008.75008 0 0 0-.76172-.76172z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__autodj_fade.svg b/res/skins/LateNight/buttons_flip/btn__autodj_fade.svg
new file mode 100644
index 000000000000..32fdc0a99861
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__autodj_fade.svg
@@ -0,0 +1,12 @@
+<svg width="32" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="a">
+			<stop stop-color="#888" offset="0"/>
+			<stop stop-color="#bfbfbe" offset="1"/>
+		</linearGradient>
+		<linearGradient id="c" x1="7.6989398" x2="7.6989398" y1="19.047621" y2="1.025641" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="b" x1="24.42697" x2="24.42697" y1="19.047621" y2="1.025641" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+	</defs>
+	<path d="m22.344 6.041c-8.5814 1.2349-13.813 4.3649-18.887 9.7031l1.0859 1.0332c4.9261-5.1827 9.694-8.0547 18.014-9.252zm-.57675-3.0402.97008 7.1903 6.7052-4.5652z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#c)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<path d="m3.7793 4.8281-.2168 1.4844c3.1686.4617 5.4587 1.0047 7.8706 1.9377.59438-.29785 1.1531-.62948 1.7832-.89062-2.853-1.264-5.6118-1.9741-9.437-2.5315zm13.878 4.8589c-.63968.19217-1.2426.38965-1.8359.61523 3.0203 1.6884 5.2014 3.6519 7.8405 6.4634l1.0938-1.0273c-2.3854-2.5411-4.385-4.3747-7.0983-6.0512z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#b)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__autodj_fade_disabled.svg b/res/skins/LateNight/buttons_flip/btn__autodj_fade_disabled.svg
new file mode 100644
index 000000000000..12dd0b9b2c19
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__autodj_fade_disabled.svg
@@ -0,0 +1,4 @@
+<svg width="32" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m22.344 6.041c-8.5814 1.2349-13.813 4.3649-18.887 9.7031l1.0859 1.0332c4.9261-5.1827 9.694-8.0547 18.014-9.252zm-.57675-3.0402.97008 7.1903 6.7052-4.5652z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#666" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<path d="m3.7793 4.8281-.2168 1.4844c3.1686.4617 5.4587 1.0047 7.8706 1.9377.59438-.29785 1.1531-.62948 1.7832-.89062-2.853-1.264-5.6118-1.9741-9.437-2.5315zm13.878 4.8589c-.63968.19217-1.2426.38965-1.8359.61523 3.0203 1.6884 5.2014 3.6519 7.8405 6.4634l1.0938-1.0273c-2.3854-2.5411-4.385-4.3747-7.0983-6.0512z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#666" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__autodj_repeat_playlist_off.svg b/res/skins/LateNight/buttons_flip/btn__autodj_repeat_playlist_off.svg
new file mode 100644
index 000000000000..4cbcd0694ebd
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__autodj_repeat_playlist_off.svg
@@ -0,0 +1,12 @@
+<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="a" x1="4.7117639" x2="4.7117639" y1="19.047621" y2="1.025641" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#888" offset="0"/>
+			<stop stop-color="#bfbfbe" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g fill="url(#a)">
+		<path d="m8.0469 1.75-6 3 6 3v-2.25h6.9531c.71734 0 1.5.83133 1.5 1.5v4.6562l1.5 1.1562v-5.8125c0-1.6447-1.3553-3-3-3h-6.9531v-2.25z" color="#000000"/>
+		<path d="m11.953 18.25 6-3-6-3v2.25h-6.9531c-.71734 0-1.5-.83133-1.5-1.5v-4.6563l-1.5-1.1562v5.8125c0 1.6447 1.3553 3 3 3h6.9531z" color="#000000"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__autodj_repeat_playlist_on.svg b/res/skins/LateNight/buttons_flip/btn__autodj_repeat_playlist_on.svg
new file mode 100644
index 000000000000..7738efacd3ba
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__autodj_repeat_playlist_on.svg
@@ -0,0 +1,4 @@
+<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m8.0469 1.75-6 3 6 3v-2.25h6.9531c.71734 0 1.5.83133 1.5 1.5v4.6562l1.5 1.1562v-5.8125c0-1.6447-1.3553-3-3-3h-6.9531z" color="#000000"/>
+	<path d="m11.953 18.25 6-3-6-3v2.25h-6.9531c-.71734 0-1.5-.83133-1.5-1.5v-4.6563l-1.5-1.1562v5.8125c0 1.6447 1.3553 3 3 3h6.9531z" color="#000000"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__autodj_shuffle.svg b/res/skins/LateNight/buttons_flip/btn__autodj_shuffle.svg
new file mode 100644
index 000000000000..25b3f3410bdd
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__autodj_shuffle.svg
@@ -0,0 +1,16 @@
+<svg width="36" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="a" x1="4.7667475" x2="4.7667475" y1="19.047621" y2="1.025641" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#888" offset="0"/>
+			<stop stop-color="#bfbfbe" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g fill="url(#a)">
+		<path d="m26 2.2553 7.1e-5 6.0001 6-3.0001z"/>
+		<path d="m26 17.789 7.1e-5-6 5.9999 3.0001z"/>
+		<g shape-rendering="auto">
+			<path d="m26 4.4365c-4.7361 0-7.2498 3.3683-9.8477 5.5052-2.5978 2.1369-5.3294 4.1478-11.152 4.1478-1.0142-.01458-1.0142 1.5387 0 1.5242 6.1771 0 9.4455-2.3076 12.098-4.4891 2.6522-2.1815 4.6385-5.1639 8.9023-5.1639 1.0142.014581 1.0142-1.5387 0-1.5242z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+			<path d="m19.373 11.282c-.37351.30931-.73323.60416-1.1445.94127-.01226.01002-.02677.0196-.03906.02967 2.1349 1.7261 3.9973 3.4298 7.8106 3.4298 1.0142.01453 1.0142-1.5332 0-1.5187-3.2739 0-4.7051-1.3388-6.627-2.8821zm-14.373-6.8567c-1.0143-.014531-1.0143 1.5332 0 1.5187 4.899 0 7.719 1.7951 10.003 3.5382.21187-.1694.42389-.33773.63672-.51216.18392-.15074.38858-.31002.57617-.4647-2.4909-1.9307-5.7902-4.08-11.216-4.08z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		</g>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__autodj_skip.svg b/res/skins/LateNight/buttons_flip/btn__autodj_skip.svg
new file mode 100644
index 000000000000..32c65f92ee24
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__autodj_skip.svg
@@ -0,0 +1,13 @@
+<svg width="32" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="a" x1="9.3150187" x2="9.3150187" y1="19.047621" y2="1.025641" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#888" offset="0"/>
+			<stop stop-color="#bfbfbe" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g fill="url(#a)">
+		<rect x="1" y="7" width="8" height="6" rx="1" ry="1" style="paint-order:fill markers stroke"/>
+		<path d="m13 7c-.554 0-1 .446-1 1h1zm1 0v1h1v-1zm2 0v1h1v-1zm2 0v1h2c0-.554-.446-1-1-1zm-6 2v1h1v-1zm7 0v1h1v-1zm-7 2v1c0 .554.446 1 1 1v-2zm7 0c0 .554-.446 1-1 1v1h1c.554 0 1-.446 1-1v-1zm-5 1v1h1v-1zm2 0v1h1v-1z" style="paint-order:fill markers stroke"/>
+		<path d="m24 7c-.554 0-1 .446-1 1v4c0 .554.446 1 1 1h6c.554 0 1-.446 1-1v-4c0-.554-.446-1-1-1zm1 1h4c.554 0 1 .446 1 1v2c0 .554-.446 1-1 1h-4c-.554 0-1-.446-1-1v-2c0-.554.446-1 1-1z" style="paint-order:fill markers stroke"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__autodj_skip_disabled.svg b/res/skins/LateNight/buttons_flip/btn__autodj_skip_disabled.svg
new file mode 100644
index 000000000000..1de2abb02858
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__autodj_skip_disabled.svg
@@ -0,0 +1,7 @@
+<svg width="32" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g fill="#666">
+		<rect x="1" y="7" width="8" height="6" rx="1" ry="1" style="paint-order:fill markers stroke"/>
+		<path d="m13 7c-.554 0-1 .446-1 1h1zm1 0v1h1v-1zm2 0v1h1v-1zm2 0v1h2c0-.554-.446-1-1-1zm-6 2v1h1v-1zm7 0v1h1v-1zm-7 2v1c0 .554.446 1 1 1v-2zm7 0c0 .554-.446 1-1 1v1h1c.554 0 1-.446 1-1v-1zm-5 1v1h1v-1zm2 0v1h1v-1z" style="paint-order:fill markers stroke"/>
+		<path d="m24 7c-.554 0-1 .446-1 1v4c0 .554.446 1 1 1h6c.554 0 1-.446 1-1v-4c0-.554-.446-1-1-1zm1 1h4c.554 0 1 .446 1 1v2c0 .554-.446 1-1 1h-4c-.554 0-1-.446-1-1v-2c0-.554.446-1 1-1z" style="paint-order:fill markers stroke"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__aux_play.svg b/res/skins/LateNight/buttons_flip/btn__aux_play.svg
new file mode 100644
index 000000000000..3d3a8cc51a3a
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__aux_play.svg
@@ -0,0 +1,14 @@
+<svg width="40" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(2,1)" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<path d="m19 7v6h2v-2h3v2h2v-6zm2 1h3v2h-3z"/>
+		<path d="m11 7v6h7v-1h-5v-5h-2"/>
+		<path d="m4 7v6h2v-2h4v-4zm2 1h3v2h-3z"/>
+		<path d="m29 13v-3.5l-2-2v-.5h1.5l1.5 1.5 1.5-1.5h1.5v.5l-2 2v3.5h-2"/>
+	</g>
+	<g transform="translate(2,1)" fill="#d2d2d1">
+		<path d="m19 7v6h2v-2h3v2h2v-6zm2 1h3v2h-3z"/>
+		<path d="m11 7v6h7v-1h-5v-5h-2"/>
+		<path d="m4 7v6h2v-2h4v-4zm2 1h3v2h-3z"/>
+		<path d="m29 13v-3.5l-2-2v-.5h1.5l1.5 1.5 1.5-1.5h1.5v.5l-2 2v3.5h-2"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__beat_curpos.svg b/res/skins/LateNight/buttons_flip/btn__beat_curpos.svg
new file mode 100644
index 000000000000..b850982aed1c
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__beat_curpos.svg
@@ -0,0 +1,9 @@
+<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+	<g fill="#585858">
+		<path d="m2 4v6h2v-6z" stroke-width=".92581999"/>
+		<path d="m7 4v10h2v-10z"/>
+		<path d="m12 4v10h2v-10z"/>
+		<path d="m17 4v10h2v-10z"/>
+		<path d="m2 12v2h2v-2z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__beat_curpos_active_12.svg b/res/skins/LateNight/buttons_flip/btn__beat_curpos_active_12.svg
new file mode 100644
index 000000000000..25afbf8a2550
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__beat_curpos_active_12.svg
@@ -0,0 +1,11 @@
+<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+	<g fill="#ffaa00">
+		<path d="m2 4v6h2v-6z" stroke-width=".70710999"/>
+		<g stroke-width=".91286999">
+			<path d="m7 4v10h2v-10z"/>
+			<path d="m12 4v10h2v-10z"/>
+			<path d="m17 4v10h2v-10z"/>
+		</g>
+		<path d="m2 12v2h2v-2z" stroke-width=".40825"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__beat_curpos_active_34.svg b/res/skins/LateNight/buttons_flip/btn__beat_curpos_active_34.svg
new file mode 100644
index 000000000000..c47b2d8ef954
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__beat_curpos_active_34.svg
@@ -0,0 +1,11 @@
+<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+	<g fill="#00aaff">
+		<path d="m2 4v6h2v-6z" stroke-width=".70710999"/>
+		<g stroke-width=".91286999">
+			<path d="m7 4v10h2v-10z"/>
+			<path d="m12 4v10h2v-10z"/>
+			<path d="m17 4v10h2v-10z"/>
+		</g>
+		<path d="m2 12v2h2v-2z" stroke-width=".40825"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__beat_curpos_large.svg b/res/skins/LateNight/buttons_flip/btn__beat_curpos_large.svg
new file mode 100644
index 000000000000..598c4647584c
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__beat_curpos_large.svg
@@ -0,0 +1,11 @@
+<svg width="24" height="50" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(1,1)">
+		<g fill="#888886">
+			<path d="m8 31h2v-18h-2z"/>
+			<path d="m13 31h2v-18h-2z"/>
+			<path d="m18 31h2v-18h-2z"/>
+		</g>
+		<path d="m3 27h2v-14h-2z" fill="#bfbfbe"/>
+		<path d="m3 31h2v-2h-2z" fill="#d3d3d1"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__beatgrid_buttons_toggle.svg b/res/skins/LateNight/buttons_flip/btn__beatgrid_buttons_toggle.svg
new file mode 100644
index 000000000000..67faac9f64ac
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__beatgrid_buttons_toggle.svg
@@ -0,0 +1,11 @@
+<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="matrix(-.5112 .44559 -.50559 -.58003 26.908684 18.828444)" fill="#bfbfbe" stroke-width="1.0108">
+		<path transform="matrix(-1.4588,0,0,1.2857,27.506,3.1429)" d="m12 3c-1.2837 0-2.334 1.0503-2.334 2.334v11.797c-1.6125.8501-2.7305 2.5239-2.7305 4.4648 0 1.9422 1.1183 3.6174 2.7324 4.4668v-3.1956c0-1.2837 1.0503-2.334 2.334-2.334s2.332 1.0503 2.332 2.334v3.1956c1.6141-.84939 2.7324-2.5246 2.7324-4.4668 0-1.9425-1.1184-3.6174-2.7324-4.4668v-11.795c0-1.2837-1.0503-2.334-2.334-2.334z" color="#000000" fill="#bfbfbe"/>
+	</g>
+	<g fill="#7c7c7a">
+		<path d="m6.9996834 11.363444v7.6375h2v-5.3425z"/>
+		<path d="m11.999684 1.0004446v5.9864l2 2.2948997v-8.2812997z"/>
+		<path d="m16.999684 1.0004446v11.7249994l2 2.293v-14.0179994z"/>
+		<path d="m1.9996834 9.7134443v9.2873997h2v-7.9846c-.73826-.26909-1.4212-.69782-2-1.3026997z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__beats_earlier.svg b/res/skins/LateNight/buttons_flip/btn__beats_earlier.svg
new file mode 100644
index 000000000000..ad3ed6e4a314
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__beats_earlier.svg
@@ -0,0 +1,10 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m15 21h-2v-12h2z" fill="#888"/>
+	<path d="m9 3v3l11 1e-6v2l-11-1e-6v3l-7-4z" fill="#bfbfbe"/>
+	<g fill="#888886">
+		<path d="m7 21h2v-9h-2z"/>
+		<path d="m15 5h-2v-2h2z"/>
+		<path d="m21 21h-2v-12h2z"/>
+		<path d="m21 5h-2v-2h2z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__beats_faster.svg b/res/skins/LateNight/buttons_flip/btn__beats_faster.svg
new file mode 100644
index 000000000000..9d37a0233d6d
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__beats_faster.svg
@@ -0,0 +1,8 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m20 10h-2v3l-7-4 7-4v3h2z" fill="#bfbfbe"/>
+	<g fill="#888886">
+		<path d="m5 21h-2v-18h2z"/>
+		<path d="m19 21h2v-10h-2z"/>
+		<path d="m19 7h2v-4h-2z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__beats_later.svg b/res/skins/LateNight/buttons_flip/btn__beats_later.svg
new file mode 100644
index 000000000000..123a52f2e512
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__beats_later.svg
@@ -0,0 +1,12 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g>
+		<path d="m17 21h-2v-9h2z" fill="#888886"/>
+		<path d="m9 21h2v-12h-2z" fill="#888886"/>
+		<path d="m15 3v3l-11 1e-6v2l11-1e-6v3l7-4z" fill="#bfbfbe"/>
+		<g transform="translate(1,1)" fill="#888886">
+			<path d="m8 4h2v-2h-2z"/>
+			<path d="m2 20h2v-12h-2z"/>
+			<path d="m2 4h2v-2h-2z"/>
+		</g>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__beats_slower.svg b/res/skins/LateNight/buttons_flip/btn__beats_slower.svg
new file mode 100644
index 000000000000..9465b259c2cb
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__beats_slower.svg
@@ -0,0 +1,9 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m5 21h-2v-18h2z" fill="#888"/>
+	<g>
+		<path d="m5 21h-2v-18h2z" fill="#888886"/>
+		<path d="m14 10h2v3l7-4-7-4v3h-2z" fill="#bfbfbe"/>
+		<path d="m15 21h-2v-10h2z" fill="#888886"/>
+		<path d="m15 7h-2v-4h2z" fill="#888886"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__cue_deck.svg b/res/skins/LateNight/buttons_flip/btn__cue_deck.svg
new file mode 100644
index 000000000000..3657edc4a09b
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__cue_deck.svg
@@ -0,0 +1,12 @@
+<svg width="38" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-6)" fill="#d2d2d1" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.60000002">
+		<path d="m20 9h-7v6h7v-1h-5v-4h5v-1"/>
+		<path d="m22 9v6h7v-6h-2v5h-3v-5h-2"/>
+		<path d="m31 9v6h7v-1h-5v-2h4v-1h-4v-1h5v-1h-7"/>
+	</g>
+	<g transform="translate(-6)" fill="#d2d2d1">
+		<path d="m20 9h-7v6h7v-1h-5v-4h5v-1"/>
+		<path d="m22 9v6h7v-6h-2v5h-3v-5h-2"/>
+		<path d="m31 9v6h7v-1h-5v-2h4v-1h-4v-1h5v-1h-7"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__effectselector_border.svg b/res/skins/LateNight/buttons_flip/btn__effectselector_border.svg
new file mode 100644
index 000000000000..70449e3a7b93
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__effectselector_border.svg
@@ -0,0 +1,19 @@
+<svg width="25" height="25" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="b" x1="1.4220984" x2="24.143082" y1="19.699568" y2="19.699568" gradientTransform="translate(-.99996996 -25.00003)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".30102351"/>
+			<stop stop-color="#141414" offset="1"/>
+		</linearGradient>
+		<linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(-1,-23)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".17647" offset="0"/>
+			<stop stop-opacity=".0047619" offset=".12672"/>
+			<stop stop-opacity="0" offset=".54348"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x=".50002998" y="-23.5" width="23" height="23" color="#000000" fill="url(#a)"/>
+	<rect x=".5" y=".5" width="24" height="24" fill="none" stroke="#111" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+	<path d="m23.31367 1.17583c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 1.965573-2 1.965572l-19.49922-2e-5c-.6598637-1e-6-1.135675-.352003-1.325-.511743.2090942.790888.7641575 1.546141 1.8242 1.546141h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#020201"/>
+	<rect transform="rotate(90)" x=".50003004" y="-23.5" width="23" height="23" rx=".30000001" ry=".30000001" fill="none" stroke="url(#b)" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__eject.svg b/res/skins/LateNight/buttons_flip/btn__eject.svg
new file mode 100644
index 000000000000..33b5e06318d3
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__eject.svg
@@ -0,0 +1 @@
+<svg id="svg2" width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg"><path id="path3936-0-8-9-7-1" d="m4.1778 11 6.3222-7 6.3221 7h-12.644" fill="#585858"/><rect id="rect4195" x="4" y="12" width="13" height="3" color="#000000" fill="#585858"/></svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__eject_active_12.svg b/res/skins/LateNight/buttons_flip/btn__eject_active_12.svg
new file mode 100644
index 000000000000..007269f6b634
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__eject_active_12.svg
@@ -0,0 +1,4 @@
+<svg id="svg2" width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+  <path id="path3936-0-8-9-7-1" d="m4.1778 10 6.3222-7 6.3221 7h-12.644" fill="#ffaa00"/>
+  <rect id="rect4195" x="4" y="12" width="13" height="3" color="#000000" fill="#ffaa00"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__eject_active_34.svg b/res/skins/LateNight/buttons_flip/btn__eject_active_34.svg
new file mode 100644
index 000000000000..b66cc42f5bda
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__eject_active_34.svg
@@ -0,0 +1,4 @@
+<svg id="svg2" width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+  <path id="path3936-0-8-9-7-1" d="m4.1778 10 6.3222-7 6.3221 7h-12.644" fill="#00aaff"/>
+  <rect id="rect4195" x="4" y="12" width="13" height="3" color="#000000" fill="#00aaff"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__fx_2.svg b/res/skins/LateNight/buttons_flip/btn__fx_2.svg
new file mode 100644
index 000000000000..af881d69e644
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__fx_2.svg
@@ -0,0 +1,4 @@
+<svg width="12" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m2 6h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002"/>
+	<path d="m2 6h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__fx_2_active.svg b/res/skins/LateNight/buttons_flip/btn__fx_2_active.svg
new file mode 100644
index 000000000000..8d693355e6ca
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__fx_2_active.svg
@@ -0,0 +1,3 @@
+<svg width="12" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m2 6h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__fx_3.svg b/res/skins/LateNight/buttons_flip/btn__fx_3.svg
new file mode 100644
index 000000000000..cc618c49a2db
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__fx_3.svg
@@ -0,0 +1,4 @@
+<svg width="12" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m2 6h7v6h-7v-1h5v-1h-2v-1h2v-2h-5z" stroke="#000" stroke-width="1.60000002"/>
+	<path d="m2 6h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__fx_3_active.svg b/res/skins/LateNight/buttons_flip/btn__fx_3_active.svg
new file mode 100644
index 000000000000..43f3fb10c6e7
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__fx_3_active.svg
@@ -0,0 +1,3 @@
+<svg width="12" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m2 6h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__fx_4.svg b/res/skins/LateNight/buttons_flip/btn__fx_4.svg
new file mode 100644
index 000000000000..871b467b4205
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__fx_4.svg
@@ -0,0 +1,4 @@
+<svg width="12" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m2 7v3h5v2h2v-6h-2v3h-3v-2z" stroke="#000" stroke-width="1.60000002"/>
+	<path d="m2 7v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__fx_4_active.svg b/res/skins/LateNight/buttons_flip/btn__fx_4_active.svg
new file mode 100644
index 000000000000..a039bce0d1d6
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__fx_4_active.svg
@@ -0,0 +1,3 @@
+<svg width="12" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m2 7v3h5v2h2v-6h-2v3h-3v-2h-2"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__fx_FX1.svg b/res/skins/LateNight/buttons_flip/btn__fx_FX1.svg
new file mode 100644
index 000000000000..a30df4184494
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__fx_FX1.svg
@@ -0,0 +1,12 @@
+<svg width="23" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g fill="none" stroke="#0a0a0a" stroke-linecap="square" stroke-width="1.60000002">
+		<path d="m19 6h3v6h-2v-5h-1v-1"/>
+		<path d="m1 6v6h2v-3h4v-1h-4v-1h5v-1h-7"/>
+		<path d="m16 11.5-2.25-2.25 2.25-2.25v-1h-1.5l-2 2-2-2h-1.5v.5l2.5 2.5-2.5 2.5v.5h2l1.75-1.75 1.75 1.75h1.5z"/>
+	</g>
+	<g fill="#d2d2d1">
+		<path d="m19 6h3v6h-2v-5h-1v-1"/>
+		<path d="m1 6v6h2v-3h4v-1h-4v-1h5v-1h-7"/>
+		<path d="m16 11.5-2.25-2.25 2.25-2.25v-1h-1.5l-2 2-2-2h-1.5v.5l2.5 2.5-2.5 2.5v.5h2l1.75-1.75 1.75 1.75h1.5z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__fx_FX1_active.svg b/res/skins/LateNight/buttons_flip/btn__fx_FX1_active.svg
new file mode 100644
index 000000000000..f0fb0fc9c8c0
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__fx_FX1_active.svg
@@ -0,0 +1,7 @@
+<svg width="23" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-5)" fill="#020201">
+		<path d="m24 6h3v6h-2v-5h-1v-1"/>
+		<path d="m6 6v6h2v-3h4v-1h-4v-1h5v-1h-7"/>
+		<path d="m21 11.5-2.25-2.25 2.25-2.25v-1h-1.5l-2 2-2-2h-1.5v.5l2.5 2.5-2.5 2.5v.5h2l1.75-1.75 1.75 1.75h1.5z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__fx_FX2.svg b/res/skins/LateNight/buttons_flip/btn__fx_FX2.svg
new file mode 100644
index 000000000000..ede68751320c
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__fx_FX2.svg
@@ -0,0 +1,12 @@
+<svg width="27" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<path d="m1 6v6h2v-3h4v-1h-4v-1h5v-1h-7"/>
+		<path d="m16 11.5-2.25-2.25 2.25-2.25v-1h-1.5l-2 2-2-2h-1.5v.5l2.5 2.5-2.5 2.5v.5h2l1.75-1.75 1.75 1.75h1.5z"/>
+		<path d="m19 6h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1"/>
+	</g>
+	<g fill="#d2d2d1">
+		<path d="m1 6v6h2v-3h4v-1h-4v-1h5v-1h-7"/>
+		<path d="m16 11.5-2.25-2.25 2.25-2.25v-1h-1.5l-2 2-2-2h-1.5v.5l2.5 2.5-2.5 2.5v.5h2l1.75-1.75 1.75 1.75h1.5z"/>
+		<path d="m19 6h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__fx_FX2_active.svg b/res/skins/LateNight/buttons_flip/btn__fx_FX2_active.svg
new file mode 100644
index 000000000000..b26ae578a38b
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__fx_FX2_active.svg
@@ -0,0 +1,7 @@
+<svg width="27" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-3)">
+		<path d="m4 6v6h2v-3h4v-1h-4v-1h5v-1h-7"/>
+		<path d="m19 11.5-2.25-2.25 2.25-2.25v-1h-1.5l-2 2-2-2h-1.5v.5l2.5 2.5-2.5 2.5v.5h2l1.75-1.75 1.75 1.75h1.5z"/>
+		<path d="m22 6h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__fx_FX3.svg b/res/skins/LateNight/buttons_flip/btn__fx_FX3.svg
new file mode 100644
index 000000000000..b8213d06605f
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__fx_FX3.svg
@@ -0,0 +1,12 @@
+<svg width="27" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<path d="m1 6v6h2v-3h4v-1h-4v-1h5v-1h-7"/>
+		<path d="m16 11.5-2.25-2.25 2.25-2.25v-1h-1.5l-2 2-2-2h-1.5v.5l2.5 2.5-2.5 2.5v.5h2l1.75-1.75 1.75 1.75h1.5z"/>
+		<path d="m19 6h7v6h-7v-1h5v-1h-2v-1h2v-2h-5z"/>
+	</g>
+	<g fill="#d2d2d1">
+		<path d="m1 6v6h2v-3h4v-1h-4v-1h5v-1h-7"/>
+		<path d="m16 11.5-2.25-2.25 2.25-2.25v-1h-1.5l-2 2-2-2h-1.5v.5l2.5 2.5-2.5 2.5v.5h2l1.75-1.75 1.75 1.75h1.5z"/>
+		<path d="m19 6h7v6h-7v-1h5v-1h-2v-1h2v-2h-5z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__fx_FX3_active.svg b/res/skins/LateNight/buttons_flip/btn__fx_FX3_active.svg
new file mode 100644
index 000000000000..eb026958dfb8
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__fx_FX3_active.svg
@@ -0,0 +1,7 @@
+<svg width="27" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-3)">
+		<path d="m4 6v6h2v-3h4v-1h-4v-1h5v-1h-7"/>
+		<path d="m19 11.5-2.25-2.25 2.25-2.25v-1h-1.5l-2 2-2-2h-1.5v.5l2.5 2.5-2.5 2.5v.5h2l1.75-1.75 1.75 1.75h1.5z"/>
+		<path d="m22 6h7v6h-7v-1h5v-1h-2v-1h2v-2h-5z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__fx_FX4.svg b/res/skins/LateNight/buttons_flip/btn__fx_FX4.svg
new file mode 100644
index 000000000000..1ee43fbb46e1
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__fx_FX4.svg
@@ -0,0 +1,12 @@
+<svg width="27" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g stroke="#000" stroke-width="1.60000002">
+		<path d="m1 6v6h2v-3h4v-1h-4v-1h5v-1h-7" fill="none" stroke-linecap="square"/>
+		<path d="m16 11.5-2.25-2.25 2.25-2.25v-1h-1.5l-2 2-2-2h-1.5v.5l2.5 2.5-2.5 2.5v.5h2l1.75-1.75 1.75 1.75h1.5z" fill="none" stroke-linecap="square"/>
+		<path d="m19 7v3h5v2h2v-6h-2v3h-3v-2z"/>
+	</g>
+	<g fill="#d2d2d1">
+		<path d="m1 6v6h2v-3h4v-1h-4v-1h5v-1h-7"/>
+		<path d="m16 11.5-2.25-2.25 2.25-2.25v-1h-1.5l-2 2-2-2h-1.5v.5l2.5 2.5-2.5 2.5v.5h2l1.75-1.75 1.75 1.75h1.5z"/>
+		<path d="m19 7v3h5v2h2v-6h-2v3h-3v-2h-2"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__fx_FX4_active.svg b/res/skins/LateNight/buttons_flip/btn__fx_FX4_active.svg
new file mode 100644
index 000000000000..79cd7ec5d8c8
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__fx_FX4_active.svg
@@ -0,0 +1,7 @@
+<svg width="27" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-3)" fill="#0c0c0b">
+		<path d="m4 6v6h2v-3h4v-1h-4v-1h5v-1h-7"/>
+		<path d="m19 11.5-2.25-2.25 2.25-2.25v-1h-1.5l-2 2-2-2h-1.5v.5l2.5 2.5-2.5 2.5v.5h2l1.75-1.75 1.75 1.75h1.5z"/>
+		<path d="m22 7v3h5v2h2v-6h-2v3h-3v-2h-2"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__fx_focus.svg b/res/skins/LateNight/buttons_flip/btn__fx_focus.svg
new file mode 100644
index 000000000000..5c82284c1499
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__fx_focus.svg
@@ -0,0 +1,14 @@
+<svg width="16" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g fill="none" stroke="#000" stroke-linecap="square" stroke-width="2.8">
+		<path d="m5.25 3.75h-1.5v4.5"/>
+		<path d="m10.75 3.75h1.5v4.5"/>
+		<path d="m5.25 20.25h-1.5v-4.5"/>
+		<path d="m10.75 20.25h1.5v-4.5"/>
+	</g>
+	<g fill="none" stroke="#bfbfbe" stroke-linecap="square" stroke-width="1.5">
+		<path d="m5.25 3.75h-1.5v4.5"/>
+		<path d="m10.75 3.75h1.5v4.5"/>
+		<path d="m5.25 20.25h-1.5v-4.5"/>
+		<path d="m10.75 20.25h1.5v-4.5"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__fx_focus_active.svg b/res/skins/LateNight/buttons_flip/btn__fx_focus_active.svg
new file mode 100644
index 000000000000..de4880bd7f06
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__fx_focus_active.svg
@@ -0,0 +1,20 @@
+<svg width="16" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g fill="none" stroke-linecap="square" stroke-width="1.5">
+		<g stroke="#000">
+			<path d="m46.75 3.75h-3v7"/>
+			<path d="m49.25 3.75h3v7"/>
+			<path d="m46.75 20.25h-3v-7"/>
+			<path d="m49.25 20.25h3v-7"/>
+			<path d="m6.25 5.75h-1.5v4.5"/>
+			<path d="m9.75 5.75h1.5v4.5"/>
+			<path d="m6.25 18.25h-1.5v-4.5"/>
+			<path d="m9.75 18.25h1.5v-4.5"/>
+		</g>
+		<g transform="translate(20)" stroke="#020201">
+			<path d="m5.25 3.75h-1.5v4.5"/>
+			<path d="m10.75 3.75h1.5v4.5"/>
+			<path d="m5.25 20.25h-1.5v-4.5"/>
+			<path d="m10.75 20.25h1.5v-4.5"/>
+		</g>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__fx_mixmode_d+w.svg b/res/skins/LateNight/buttons_flip/btn__fx_mixmode_d+w.svg
new file mode 100644
index 000000000000..89231d14cdc5
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__fx_mixmode_d+w.svg
@@ -0,0 +1,8 @@
+<svg width="28" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-.55235449)" fill="none" stroke-linecap="round">
+		<path d="m4.0142425 8.0017027h20.9715155" stroke="#0d0505" stroke-opacity=".99608005" stroke-width="3.20000005"/>
+		<path d="m4.0142425 8.0017026h20.9715155" stroke="#b5b5b5" stroke-opacity=".99216003" stroke-width="2"/>
+		<path d="m24.985558 8.0017027c-14.679661 3.7456013-20.9715155 9.9882003-20.9715155 9.9882003" stroke="#0d0505" stroke-opacity=".99608005" stroke-width="3.20000005"/>
+		<path d="m24.985558 8.0017026c-14.679661 3.7456004-20.9715155 9.9882004-20.9715155 9.9882004" stroke="#da0606" stroke-width="2"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__fx_mixmode_d-w.svg b/res/skins/LateNight/buttons_flip/btn__fx_mixmode_d-w.svg
new file mode 100644
index 000000000000..3d9d9826e7d2
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__fx_mixmode_d-w.svg
@@ -0,0 +1,8 @@
+<svg width="28" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-.49971785 -3.5964877e-5)" fill="none" stroke-linecap="round">
+		<path d="m4.0138036 7.00174c14.6820004 3.7456 20.9750004 9.9882 20.9750004 9.9882" stroke="#060202" stroke-opacity=".99608005" stroke-width="3.20000005"/>
+		<path d="m4.0138036 7.00174c14.6820004 3.7456 20.9750004 9.9882 20.9750004 9.9882" stroke="#b5b5b5" stroke-opacity=".99216003" stroke-width="2"/>
+		<path d="m24.986004 7.00174c-14.682 3.7456-20.9750004 9.9882-20.9750004 9.9882" stroke="#060202" stroke-opacity=".99608005" stroke-width="3.20000005"/>
+		<path d="m24.986004 7.00174c-14.682 3.7456-20.9750004 9.9882-20.9750004 9.9882" stroke="#da0606" stroke-width="2"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__fx_sampler_collapse.svg b/res/skins/LateNight/buttons_flip/btn__fx_sampler_collapse.svg
new file mode 100644
index 000000000000..655f83ba26e7
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__fx_sampler_collapse.svg
@@ -0,0 +1,6 @@
+<svg width="22" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m15.424902 18.636-4.425164-4.425259-4.4251649 4.425259-1.1062911-1.106386 5.531456-5.531549 5.531456 5.531549z" fill="none" stroke="#000" stroke-linejoin="round" stroke-width="1.60000002"/>
+	<path d="M 15.424902,3.364201 10.999644,7.7894591 6.5743851,3.364201 5.468,4.4705861 10.99955,10.002136 16.5311,4.4705861 15.424715,3.364201 Z" fill="none" stroke="#000" stroke-linejoin="round" stroke-width="1.60000002"/>
+	<path d="m15.424902 18.636-4.425164-4.425259-4.4251649 4.425259-1.1062911-1.106386 5.531456-5.531549 5.531456 5.531549z" fill="#bbb" stroke-width=".93992448"/>
+	<path d="m15.424902 3.3642014-4.425258 4.4252581-4.4252589-4.4252581-1.1063851 1.1063851 5.53155 5.5315495 5.53155-5.5315495-1.106385-1.1063851z" fill="#bbb" stroke-width=".93992448"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__fx_sampler_expand.svg b/res/skins/LateNight/buttons_flip/btn__fx_sampler_expand.svg
new file mode 100644
index 000000000000..b89030431aed
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__fx_sampler_expand.svg
@@ -0,0 +1,12 @@
+<svg width="22" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g fill="none" stroke="#000" stroke-linejoin="round" stroke-width="1.6">
+		<g transform="matrix(.93992449 0 0 .93992449 1.6003517 1.6003969)" fill="none" stroke="#000" stroke-linejoin="round" stroke-width="1.7022644">
+			<path d="m14.70815 11.4378-4.708 4.7081-4.708-4.7081-1.177 1.1771 5.885 5.8851 5.885-5.8851z"/>
+			<path d="m14.70815 8.562-4.7081-4.7080996-4.7081 4.7080996-1.1771-1.1771 5.8851-5.8850996 5.8851 5.8850996-1.1771 1.1771z"/>
+		</g>
+	</g>
+	<g transform="matrix(.93992449 0 0 .93992449 1.6003517 1.6003969)" fill="#bbb">
+		<path d="m14.70815 11.4378-4.708 4.7081-4.708-4.7081-1.177 1.1771 5.885 5.8851 5.885-5.8851z"/>
+		<path d="m14.70815 8.562-4.7081-4.7080996-4.7081 4.7080996-1.1771-1.1771 5.8851-5.8850996 5.8851 5.8850996-1.1771 1.1771z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__fx_selector_down.svg b/res/skins/LateNight/buttons_flip/btn__fx_selector_down.svg
new file mode 100644
index 000000000000..18a996c5b2bd
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__fx_selector_down.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m8 15.918 4.5715-7.9181h-9.143z" fill="none" stroke="#000" stroke-width="1.6"/>
+	<path d="m8 15.918 4.5715-7.9181h-9.143z" fill="#888"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__fx_selector_down_pressed.svg b/res/skins/LateNight/buttons_flip/btn__fx_selector_down_pressed.svg
new file mode 100644
index 000000000000..72d8a1ac27f2
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__fx_selector_down_pressed.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m8 15.918 4.5715-7.9181h-9.143z" fill="none" stroke="#000" stroke-width="1.60000002"/>
+	<path d="m8 15.918 4.5715-7.9181h-9.143z" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__fx_toggle.svg b/res/skins/LateNight/buttons_flip/btn__fx_toggle.svg
new file mode 100644
index 000000000000..c1254d707cf6
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__fx_toggle.svg
@@ -0,0 +1,8 @@
+<svg width="22" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g fill="none" stroke="#000" stroke-width="1.60000002">
+		<path d="m13.730156 7.0804229c1.509333.923162 2.519954 2.5811933 2.519954 4.4799511 0 2.900587-2.349347 5.250022-5.250022 5.250022s-5.250022-2.349435-5.250022-5.250022c0-1.8987578 1.0106213-3.5567891 2.5199542-4.4799511l-1.2643765-1.2643765c-1.8156164 1.2643765-3.0056437 3.3642797-3.0056437 5.7443276 0 3.867479 3.1325213 6.999912 7 6.999912 3.867479 0 7-3.132433 7-6.999912 0-2.3800479-1.190027-4.4799511-3.005644-5.7443276z"/>
+		<path d="m11.999999 3h-1.9999998v6.0000003h1.9999998z"/>
+	</g>
+	<path d="m13.730156 7.080423c1.509333.923162 2.519954 2.5811933 2.519954 4.479951 0 2.900587-2.349347 5.250022-5.250022 5.250022s-5.250022-2.349435-5.250022-5.250022c0-1.8987577 1.0106213-3.556789 2.5199542-4.479951l-1.2643765-1.2643765c-1.8156164 1.2643765-3.0056437 3.3642797-3.0056437 5.7443275 0 3.867479 3.1325213 6.999912 7 6.999912 3.867479 0 7-3.132433 7-6.999912 0-2.3800478-1.190027-4.479951-3.005644-5.7443275z" fill="#d2d2d1"/>
+	<path d="m11.999999 3.0000001h-1.9999998v6.0000003h1.9999998z" fill="#d2d2d1" stroke-width=".99999994"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__fx_toggle_active.svg b/res/skins/LateNight/buttons_flip/btn__fx_toggle_active.svg
new file mode 100644
index 000000000000..8760ce6f0b74
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__fx_toggle_active.svg
@@ -0,0 +1,4 @@
+<svg width="22" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m14.994532 5.8160464-1.264376 1.2643765c1.509333.923162 2.519954 2.5811933 2.519954 4.4799511 0 2.900587-2.349347 5.250022-5.250022 5.250022s-5.250022-2.349435-5.250022-5.250022c0-1.8987578 1.0106213-3.5567891 2.5199542-4.4799511l-1.2643765-1.2643765c-1.8156164 1.2643765-3.0056437 3.3642797-3.0056437 5.7443276 0 3.867479 3.1325213 6.999912 7 6.999912 3.867479 0 7-3.132433 7-6.999912 0-2.3800479-1.190027-4.4799511-3.005644-5.7443276z" fill="#0e0e0e"/>
+	<path d="m11.999999 3h-1.9999998v6.0000003h1.9999998z" fill="#0e0e0e" stroke-width=".99999994"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__intro_end.svg b/res/skins/LateNight/buttons_flip/btn__intro_end.svg
new file mode 100644
index 000000000000..7cf7876d9bfe
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__intro_end.svg
@@ -0,0 +1,10 @@
+<svg width="18" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-2.99971)" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<rect transform="scale(-1,1)" x="-18" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
+		<path d="m5 17 9-10v10z"/>
+	</g>
+	<g transform="translate(-2.99971)" fill="#d2d2d1">
+		<rect transform="scale(-1,1)" x="-18" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
+		<path d="m5 17 9-10v10z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__intro_start.svg b/res/skins/LateNight/buttons_flip/btn__intro_start.svg
new file mode 100644
index 000000000000..e6c7d49b670d
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__intro_start.svg
@@ -0,0 +1,10 @@
+<svg width="18" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-3)" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<rect x="6" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
+		<path d="m9 17 9-10v10z"/>
+	</g>
+	<g transform="translate(-3)" fill="#d2d2d1">
+		<rect x="6" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
+		<path d="m9 17 9-10v10z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__key_down.svg b/res/skins/LateNight/buttons_flip/btn__key_down.svg
new file mode 100644
index 000000000000..b154682ce020
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__key_down.svg
@@ -0,0 +1,4 @@
+<svg width="10" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m5.0000515 12-3.4641429-6h6.9281999z" fill="none" stroke="#000" stroke-width="1.60000002"/>
+	<path d="m5.0000515 12-3.4641429-6h6.9281999z" fill="#bfbfbe" stroke-width=".85714287"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__key_match.svg b/res/skins/LateNight/buttons_flip/btn__key_match.svg
new file mode 100644
index 000000000000..4cf38407327b
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__key_match.svg
@@ -0,0 +1,8 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="matrix(.77463677 0 0 .77463677 19.507552 .20097752)" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.06548419" aria-label="♪">
+		<path d="m-14.623223 1.7718814h1.132812l.104167.091146v.5078125c.234375.4687499 1.10243.9765624 2.604166 1.5234374 2.0833332.6076389 3.1250002 1.5104167 3.1250002 2.7083333 0 1.2673611-.529514 2.3177083-1.588541 3.1510416h-.05208l-.390625-.4166667c.529514-.4253472.794271-1.0026041.794271-1.7317708 0-.6076388-.989583-1.219618-2.9687502-1.8359374-.798611-.3645833-1.306423-.6597222-1.523437-.8854167v11.2983524c0 1.328125-.972222 2.1875-2.916667 2.578125h-.742187c-2.100695 0-3.151042-.729167-3.151042-2.1875 0-1.137153.920139-1.805555 2.760417-2.005208h.299479c.833333 0 1.636285.277778 2.408854.833333v-13.5379358z" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.06548419"/>
+	</g>
+	<g transform="matrix(.77463677 0 0 .77463677 19.507552 .20097721)" fill="#bfbfbe" aria-label="♪">
+		<path d="m-14.623223 1.7718814h1.132812l.104167.091146v.5078125c.234375.4687499 1.10243.9765624 2.604166 1.5234374 2.0833332.6076389 3.1250002 1.5104167 3.1250002 2.7083333 0 1.2673611-.529514 2.3177083-1.588541 3.1510416h-.05208l-.390625-.4166667c.529514-.4253472.794271-1.0026041.794271-1.7317708 0-.6076388-.989583-1.219618-2.9687502-1.8359374-.798611-.3645833-1.306423-.6597222-1.523437-.8854167v11.2983524c0 1.328125-.972222 2.1875-2.916667 2.578125h-.742187c-2.100695 0-3.151042-.729167-3.151042-2.1875 0-1.137153.920139-1.805555 2.760417-2.005208h.299479c.833333 0 1.636285.277778 2.408854.833333v-13.5379358z" fill="#bfbfbe" stroke-width="1.29092765"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__key_up.svg b/res/skins/LateNight/buttons_flip/btn__key_up.svg
new file mode 100644
index 000000000000..776fa24e6491
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__key_up.svg
@@ -0,0 +1,4 @@
+<svg width="10" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="M 5.0000515,4.9999996 1.5359086,11 h 6.9281999 z" fill="none" stroke="#000" stroke-width="1.60000002"/>
+	<path d="M 5.0000515,4.9999996 1.5359086,11 h 6.9281999 z" fill="#bfbfbe" stroke-width=".85714287"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__keylock.svg b/res/skins/LateNight/buttons_flip/btn__keylock.svg
new file mode 100644
index 000000000000..f0f0d577a521
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__keylock.svg
@@ -0,0 +1 @@
+<svg id="svg2" width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg"><path id="rect4195" d="m10.5 3c-1.933 0-3.5 1.567-3.5 3.5v1.5h-2v7h11v-7h-2v-1.5c0-1.933-1.567-3.5-3.5-3.5zm0 2c0.82843 0 1.5 0.67157 1.5 1.5v1.5h-3v-1.5c0-0.82843 0.67157-1.5 1.5-1.5zm-0.5 5h1v3h-1z" color="#000000" fill="#585858"/></svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__keylock_active_12.svg b/res/skins/LateNight/buttons_flip/btn__keylock_active_12.svg
new file mode 100644
index 000000000000..051460f438ec
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__keylock_active_12.svg
@@ -0,0 +1,3 @@
+<svg id="svg2" width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+  <path id="rect4195" d="m10.5 3c-1.933 0-3.5 1.567-3.5 3.5v1.5h-2v7h11v-7h-2v-1.5c0-1.933-1.567-3.5-3.5-3.5zm0 2c0.82843 0 1.5 0.67157 1.5 1.5v1.5h-3v-1.5c0-0.82843 0.67157-1.5 1.5-1.5zm-0.5 5h1v3h-1z" color="#000000" fill="#ffaa00"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__keylock_active_34.svg b/res/skins/LateNight/buttons_flip/btn__keylock_active_34.svg
new file mode 100644
index 000000000000..53a30b3faefd
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__keylock_active_34.svg
@@ -0,0 +1,3 @@
+<svg id="svg2" width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+  <path id="rect4195" d="m10.5 3c-1.933 0-3.5 1.567-3.5 3.5v1.5h-2v7h11v-7h-2v-1.5c0-1.933-1.567-3.5-3.5-3.5zm0 2c0.82843 0 1.5 0.67157 1.5 1.5v1.5h-3v-1.5c0-0.82843 0.67157-1.5 1.5-1.5zm-0.5 5h1v3h-1z" color="#000000" fill="#00aaff"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__lib_bpm_locked.svg b/res/skins/LateNight/buttons_flip/btn__lib_bpm_locked.svg
new file mode 100644
index 000000000000..c0ceaebf8f8b
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__lib_bpm_locked.svg
@@ -0,0 +1 @@
+<svg id="svg2" width="10" height="12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:osb="http://www.openswatchbook.org/uri/2009/osb" xmlns:xlink="http://www.w3.org/1999/xlink"><g id="ic_library_crates" transform="translate(0,-20)"><g id="g867"><path id="path8889-9" d="m2.25 26.25s0.00538-2.2 0-2.8599c-0.00538-0.66018 0.22449-2.6227 2.7312-2.6399 2.4906-0.01712 2.767 1.9798 2.7688 3.0799 0.00108 0.65999 0 2.42 0 2.42" fill="none" stroke="#ff6600" stroke-width="1.5"/><path id="rect8885-1" transform="translate(0,20)" d="m0.83398 6c-0.41667 0-0.83398 0.41498-0.83398 0.83008v4.3398c0 0.4151 0.41732 0.83008 0.83398 0.83008h8.332c0.41667 0 0.83398-0.41498 0.83398-0.83008v-4.3398c0-0.4151-0.41732-0.83008-0.83398-0.83008h-8.332zm1.166 2h6c0.277 0 0.5 0.223 0.5 0.5s-0.223 0.5-0.5 0.5h-6c-0.277 0-0.5-0.223-0.5-0.5s0.223-0.5 0.5-0.5zm0 2h6c0.277 0 0.5 0.223 0.5 0.5s-0.223 0.5-0.5 0.5h-6c-0.277 0-0.5-0.223-0.5-0.5s0.223-0.5 0.5-0.5z" color="#000000" fill="#ff6600" style="text-decoration-line:none;text-indent:0;text-transform:none"/></g></g></svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__lib_bpm_unlocked.svg b/res/skins/LateNight/buttons_flip/btn__lib_bpm_unlocked.svg
new file mode 100644
index 000000000000..f04470ae9495
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__lib_bpm_unlocked.svg
@@ -0,0 +1 @@
+<svg id="svg2" width="10" height="12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:osb="http://www.openswatchbook.org/uri/2009/osb" xmlns:xlink="http://www.w3.org/1999/xlink"><g id="ic_library_crates" transform="translate(0,-20)"><path id="path8889-9" transform="translate(0,20)" d="m4.9766 0c-1.4489 0.01-2.4418 0.65947-2.9336 1.4238-0.49176 0.76435-0.54642 1.5495-0.54297 1.9727 0.001109 0.13594-3.192e-4 0.363 0 0.60352h1.5c-3.314e-4 -0.24806 0.0011845-0.46983 0-0.61523-0.00193-0.237 0.056186-0.76414 0.30469-1.1504 0.2485-0.38625 0.62385-0.7271 1.6816-0.73438 1.0447-0.007181 1.407 0.31941 1.6699 0.75781 0.26297 0.4384 0.34296 1.0862 0.34375 1.5742 9.639e-4 0.58906 1.684e-4 1.8689 0 2.168h-6.166c-0.41667 0-0.83398 0.41498-0.83398 0.83008v4.3398c0 0.4151 0.41732 0.83008 0.83398 0.83008h8.332c0.41667 0 0.83398-0.41498 0.83398-0.83008v-4.3398c0-0.4151-0.41732-0.83008-0.83398-0.83008h-0.66602c1.69e-4 -0.29836 9.685e-4 -1.5773 0-2.1719-9.966e-4 -0.61214-0.060246-1.5129-0.55859-2.3438-0.49835-0.83081-1.5189-1.4943-2.9648-1.4844zm-2.9766 8h6c0.277 0 0.5 0.223 0.5 0.5s-0.223 0.5-0.5 0.5h-6c-0.277 0-0.5-0.223-0.5-0.5s0.223-0.5 0.5-0.5zm0 2h6c0.277 0 0.5 0.223 0.5 0.5s-0.223 0.5-0.5 0.5h-6c-0.277 0-0.5-0.223-0.5-0.5s0.223-0.5 0.5-0.5z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#979797" fill-opacity=".50196" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/></g></svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__lib_checkmark.svg b/res/skins/LateNight/buttons_flip/btn__lib_checkmark.svg
new file mode 100644
index 000000000000..d18dbba1ef6a
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__lib_checkmark.svg
@@ -0,0 +1 @@
+<svg id="svg2" width="10" height="10" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:osb="http://www.openswatchbook.org/uri/2009/osb" xmlns:xlink="http://www.w3.org/1999/xlink"><defs id="defs28"><linearGradient id="linearGradient5559" x1="28" x2="28" y1="24" y2="34" gradientTransform="matrix(2.4091 0 0 2.4091 -17.681 3.5004)" gradientUnits="userSpaceOnUse"><stop id="stop4944" stop-color="#f60" offset="0"/><stop id="stop4946" stop-color="#de5800" offset="1"/></linearGradient></defs><g id="ic_library_crates" transform="translate(0,-22)"><g id="ic_library_unchecked" transform="matrix(.4151 0 0 .4151 -1.6604 19.547)"><path id="path142" d="m8.8184 20.364 4.8181 4.8181 9.6363-14.454" fill="none" stroke="url(#linearGradient5559)" stroke-linecap="round" stroke-linejoin="round" stroke-width="4.8181"/></g></g></svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__lib_clear_search.svg b/res/skins/LateNight/buttons_flip/btn__lib_clear_search.svg
new file mode 100644
index 000000000000..07c0c5fd03e7
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__lib_clear_search.svg
@@ -0,0 +1 @@
+<svg width="19" height="19" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"><title>Mixxx 1.12+ iconset</title><g transform="translate(0,-13)"><g transform="matrix(.4151 0 0 .4151 -1.6604 19.547)"><path d="m26.886-7.3406c-7.2888 0-14.454 7.1656-14.454 14.454 0 7.2888 7.1656 14.454 14.454 14.454 7.2888 0 14.454-7.1656 14.454-14.454 0-7.2888-7.1656-14.454-14.454-14.454zm-5.8398 6.5497c.52783 0 1.0474.20857 1.4519.61302l4.3879 4.3879 4.3879-4.3879c.8089-.8089 2.0949-.8089 2.9038 0 .8089.8089.8089 2.0949 0 2.9038l-4.3879 4.3879 4.3879 4.3879c.8089.8089.8089 2.0949 0 2.9038-.8089.8089-2.0949.8089-2.9038 0l-4.3879-4.3879-4.3879 4.3879c-.8089.8089-2.0949.8089-2.9038 0-.8089-.8089-.8089-2.0949 0-2.9038l4.3879-4.3879-4.3879-4.3879c-.8089-.8089-.8089-2.0949 0-2.9038.40445-.40445.92406-.61302 1.4519-.61302z" color="#000000" fill="#b3b3b3" stroke-width="0"/></g></g></svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__lib_clear_search_focus.svg b/res/skins/LateNight/buttons_flip/btn__lib_clear_search_focus.svg
new file mode 100644
index 000000000000..0ac219cd30a9
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__lib_clear_search_focus.svg
@@ -0,0 +1 @@
+<svg width="19" height="19" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"><title>Mixxx 1.12+ iconset</title><g transform="translate(0,-13)"><g transform="matrix(.4151 0 0 .4151 -1.6604 19.547)"><path d="m26.886-7.3406c-7.2888 0-14.454 7.1656-14.454 14.454 0 7.2888 7.1656 14.454 14.454 14.454 7.2888 0 14.454-7.1656 14.454-14.454 0-7.2888-7.1656-14.454-14.454-14.454zm-5.8398 6.5497c.52783 0 1.0474.20857 1.4519.61302l4.3879 4.3879 4.3879-4.3879c.8089-.8089 2.0949-.8089 2.9038 0 .8089.8089.8089 2.0949 0 2.9038l-4.3879 4.3879 4.3879 4.3879c.8089.8089.8089 2.0949 0 2.9038-.8089.8089-2.0949.8089-2.9038 0l-4.3879-4.3879-4.3879 4.3879c-.8089.8089-2.0949.8089-2.9038 0-.8089-.8089-.8089-2.0949 0-2.9038l4.3879-4.3879-4.3879-4.3879c-.8089-.8089-.8089-2.0949 0-2.9038.40445-.40445.92406-.61302 1.4519-.61302z" color="#000000" fill="#f60" stroke-width="0"/></g></g></svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__lib_preview_pause.svg b/res/skins/LateNight/buttons_flip/btn__lib_preview_pause.svg
new file mode 100644
index 000000000000..0d305de0930e
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__lib_preview_pause.svg
@@ -0,0 +1 @@
+<svg id="svg2" width="30" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg"><g id="ic_library_crates" transform="translate(0,-14)"><g id="ic_library_unchecked" transform="matrix(.4151 0 0 .4151 -1.6604 19.547)" fill="#f60"><rect id="rect3370" x="54.591" y="-1.3179" width="4.818" height="19.273" color="#000000"/><rect id="rect3372" x="64.227" y="-1.3179" width="4.818" height="19.273" color="#000000"/><path id="path9863-1-2-3" d="m28.091-5.2913c-7.6146 0-14.009 6.184-14.009 13.799 0 0.081419-0.0018 0.15673 0 0.25552v0.44717c-1.5498 1.3124-2.5552 3.24-2.5552 5.4298 0 3.9514 2.9756 7.1547 6.927 7.1547v-14.309c-0.49392 0-0.77584 0.032462-1.2416 0.12776 0.44085-5.5257 5.2378-9.838 10.879-9.838 5.6277 0 10.418 4.3312 10.878 9.8387-0.46575-0.0953-0.74765-0.12776-1.2416-0.12776v14.309c3.9514 0 6.927-3.2033 6.927-7.1547 0-2.2227-1.029-4.1814-2.619-5.4938 0.01253-0.21585 0.06386-0.41511 0.06386-0.63881 2.1e-5 -7.6146-6.3933-13.799-14.008-13.799z" color="#000000" stroke-width="2.4091" style="text-indent:0;text-transform:none"/></g></g></svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__lib_preview_play.svg b/res/skins/LateNight/buttons_flip/btn__lib_preview_play.svg
new file mode 100644
index 000000000000..be70beb88001
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__lib_preview_play.svg
@@ -0,0 +1 @@
+<svg id="svg2" width="30" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg"><g id="ic_library_crates" transform="translate(0,-14)"><g id="ic_library_unchecked" transform="matrix(.4151 0 0 .4151 -1.6604 19.547)" fill="#979797" fill-opacity=".50196"><path id="path4203" transform="matrix(0 1.0073 -.99696 0 665.47 -566.48)" d="m582.29 615.16h-23.318l11.659-20.194z"/><path id="path9863-1-2-3" d="m28.091-5.2913c-7.6146 0-14.009 6.184-14.009 13.799 0 0.081419-0.0018 0.15673 0 0.25552v0.44717c-1.5498 1.3124-2.5552 3.24-2.5552 5.4298 0 3.9514 2.9756 7.1547 6.927 7.1547v-14.309c-0.49392 0-0.77584 0.032462-1.2416 0.12776 0.44085-5.5257 5.2378-9.838 10.879-9.838 5.6277 0 10.418 4.3312 10.878 9.8387-0.46575-0.0953-0.74765-0.12776-1.2416-0.12776v14.309c3.9514 0 6.927-3.2033 6.927-7.1547 0-2.2227-1.029-4.1814-2.619-5.4938 0.01253-0.21585 0.06386-0.41511 0.06386-0.63881 2.1e-5 -7.6146-6.3933-13.799-14.008-13.799z" color="#000000" stroke-width="2.4091" style="text-indent:0;text-transform:none"/></g></g></svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__lib_radio_button_gold_on.svg b/res/skins/LateNight/buttons_flip/btn__lib_radio_button_gold_on.svg
new file mode 100644
index 000000000000..271857a10b70
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__lib_radio_button_gold_on.svg
@@ -0,0 +1,4 @@
+<svg id="svg2" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
+  <path id="path2987" d="m9 5.1042c-2.1505 0-3.8958 1.7453-3.8958 3.8958s1.7453 3.8958 3.8958 3.8958 3.8958-1.7453 3.8958-3.8958-1.7453-3.8958-3.8958-3.8958z" fill="#cab32c"/>
+  <path id="path2985" d="m9 2c-3.8675 0-7 3.1325-7 7s3.1325 7 7 7 7-3.1325 7-7-3.132-7-7-7zm0 1.4062c3.094 0 5.5938 2.4998 5.5938 5.5938s-2.4998 5.5938-5.5938 5.5938-5.5938-2.4998-5.5938-5.5938 2.4998-5.5938 5.5938-5.5938z" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__lib_radio_button_off.svg b/res/skins/LateNight/buttons_flip/btn__lib_radio_button_off.svg
new file mode 100644
index 000000000000..680fb2316fd8
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__lib_radio_button_off.svg
@@ -0,0 +1 @@
+<svg id="svg2" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg"><path id="path4" d="m9 2c-3.8677 0-7 3.1323-7 7s3.1323 7 7 7 7-3.1323 7-7-3.132-7-7-7zm0 12.6c-3.094 0-5.6-2.506-5.6-5.6s2.506-5.6 5.6-5.6 5.6 2.506 5.6 5.6-2.506 5.6-5.6 5.6z" fill="#d2d2d1"/></svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__lib_radio_button_on_gold.svg b/res/skins/LateNight/buttons_flip/btn__lib_radio_button_on_gold.svg
new file mode 100644
index 000000000000..c82ccf9677f7
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__lib_radio_button_on_gold.svg
@@ -0,0 +1,4 @@
+<svg version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
+	<path d="m9 5.1042c-2.1505 0-3.8958 1.7453-3.8958 3.8958s1.7453 3.8958 3.8958 3.8958 3.8958-1.7453 3.8958-3.8958-1.7453-3.8958-3.8958-3.8958z" fill="#e49100"/>
+	<path d="m9 2c-3.8675 0-7 3.1325-7 7s3.1325 7 7 7 7-3.1325 7-7-3.132-7-7-7zm0 1.4062c3.094 0 5.5938 2.4998 5.5938 5.5938s-2.4998 5.5938-5.5938 5.5938-5.5938-2.4998-5.5938-5.5938 2.4998-5.5938 5.5938-5.5938z" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__lib_radio_button_on_yellow.svg b/res/skins/LateNight/buttons_flip/btn__lib_radio_button_on_yellow.svg
new file mode 100644
index 000000000000..b077114da826
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__lib_radio_button_on_yellow.svg
@@ -0,0 +1,4 @@
+<svg version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
+	<path d="m9 5.1042c-2.1505 0-3.8958 1.7453-3.8958 3.8958s1.7453 3.8958 3.8958 3.8958 3.8958-1.7453 3.8958-3.8958-1.7453-3.8958-3.8958-3.8958z" fill="#ecb82b"/>
+	<path d="m9 2c-3.8675 0-7 3.1325-7 7s3.1325 7 7 7 7-3.1325 7-7-3.132-7-7-7zm0 1.4062c3.094 0 5.5938 2.4998 5.5938 5.5938s-2.4998 5.5938-5.5938 5.5938-5.5938-2.4998-5.5938-5.5938 2.4998-5.5938 5.5938-5.5938z" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__lib_radio_button_yellow_on.svg b/res/skins/LateNight/buttons_flip/btn__lib_radio_button_yellow_on.svg
new file mode 100644
index 000000000000..8f8cccef4340
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__lib_radio_button_yellow_on.svg
@@ -0,0 +1 @@
+<svg id="svg2" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg"><path id="path2987" d="m9 5.1042c-2.1505 0-3.8958 1.7453-3.8958 3.8958s1.7453 3.8958 3.8958 3.8958 3.8958-1.7453 3.8958-3.8958-1.7453-3.8958-3.8958-3.8958z" fill="#cab32c"/><path id="path2985" d="m9 2c-3.8675 0-7 3.1325-7 7s3.1325 7 7 7 7-3.1325 7-7-3.132-7-7-7zm0 1.4062c3.094 0 5.5938 2.4998 5.5938 5.5938s-2.4998 5.5938-5.5938 5.5938-5.5938-2.4998-5.5938-5.5938 2.4998-5.5938 5.5938-5.5938z" fill="#d2d2d1"/></svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__lib_sort_down.png b/res/skins/LateNight/buttons_flip/btn__lib_sort_down.png
new file mode 100644
index 000000000000..85a8f9726a3e
Binary files /dev/null and b/res/skins/LateNight/buttons_flip/btn__lib_sort_down.png differ
diff --git a/res/skins/LateNight/buttons_flip/btn__lib_sort_down.svg b/res/skins/LateNight/buttons_flip/btn__lib_sort_down.svg
new file mode 100644
index 000000000000..04c2d3335097
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__lib_sort_down.svg
@@ -0,0 +1,4 @@
+<svg width="12" height="12" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m6 9.5590477 4.5715-7.9181h-9.143z" fill="none" stroke="#000" stroke-width="1.60000002"/>
+	<path d="m6 9.5590477 4.5715-7.9181h-9.143z" fill="#fa0"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__lib_sort_up.png b/res/skins/LateNight/buttons_flip/btn__lib_sort_up.png
new file mode 100644
index 000000000000..ae53038219a0
Binary files /dev/null and b/res/skins/LateNight/buttons_flip/btn__lib_sort_up.png differ
diff --git a/res/skins/LateNight/buttons_flip/btn__lib_sort_up.svg b/res/skins/LateNight/buttons_flip/btn__lib_sort_up.svg
new file mode 100644
index 000000000000..c1b71cdb27f3
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__lib_sort_up.svg
@@ -0,0 +1,4 @@
+<svg width="12" height="12" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m6 2.4409522 4.5715 7.9180998h-9.143z" fill="none" stroke="#000" stroke-width="1.60000002"/>
+	<path d="m6 2.4409522 4.5715 7.9180998h-9.143z" fill="#fa0"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__loop.svg b/res/skins/LateNight/buttons_flip/btn__loop.svg
new file mode 100644
index 000000000000..4d9c2bc4f26f
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__loop.svg
@@ -0,0 +1,10 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<path d="m4 8.488 1.4998895.856062-.00025 6.6559c-2.15e-5.57129.9288347 1.5001 1.5001237 1.5001l7.0001108-6.2e-5v-3l7.00011 3.75-7.00011 3.75v-3l-7.0001108 6.3e-5c-1.644726 1.4e-5-3.0000474-1.3553-3.0000474-3z" color="#000000"/>
+		<path d="m20 15.612-1.499905-.956038.00025-6.6559c2.5e-5-.66867-.782772-1.5001-1.500124-1.5001l-7.00011 6.24e-5v2.9999996l-7.000111-3.7499996 7.000111-3.75v3l7.00011-6.25e-5c1.644726-1.47e-5 3.000048 1.3553 3.000048 3z" color="#000000"/>
+	</g>
+	<g fill="#d2d2d1">
+		<path d="m4 8.488 1.4998895.856062-.00025 6.6559c-2.15e-5.57129.9288347 1.5001 1.5001237 1.5001l7.0001108-6.2e-5v-3l7.00011 3.75-7.00011 3.75v-3l-7.0001108 6.3e-5c-1.644726 1.4e-5-3.0000474-1.3553-3.0000474-3z" color="#000000"/>
+		<path d="m20 15.612-1.499905-.956038.00025-6.6559c2.5e-5-.66867-.782772-1.5001-1.500124-1.5001l-7.00011 6.24e-5v2.9999996l-7.000111-3.7499996 7.000111-3.75v3l7.00011-6.25e-5c1.644726-1.47e-5 3.000048 1.3553 3.000048 3z" color="#000000"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__loop_in.svg b/res/skins/LateNight/buttons_flip/btn__loop_in.svg
new file mode 100644
index 000000000000..5f727baad3c8
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__loop_in.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m9 6h5v13h-1v-7h-4v-6" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.6"/>
+	<path d="m9 6h5v13h-1v-7h-4v-6" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__loop_out.svg b/res/skins/LateNight/buttons_flip/btn__loop_out.svg
new file mode 100644
index 000000000000..6434e30d2fdf
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__loop_out.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m14 6h-5v13h1v-7h4v-6" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002"/>
+	<path d="m14 6h-5v13h1v-7h4v-6" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__mastersync_master_off.png b/res/skins/LateNight/buttons_flip/btn__mastersync_master_off.png
new file mode 100644
index 000000000000..f6e2e14df47a
Binary files /dev/null and b/res/skins/LateNight/buttons_flip/btn__mastersync_master_off.png differ
diff --git a/res/skins/LateNight/buttons_flip/btn__mastersync_master_on.png b/res/skins/LateNight/buttons_flip/btn__mastersync_master_on.png
new file mode 100644
index 000000000000..5dbe9c7a70e5
Binary files /dev/null and b/res/skins/LateNight/buttons_flip/btn__mastersync_master_on.png differ
diff --git a/res/skins/LateNight/buttons_flip/btn__mic_duck_auto.svg b/res/skins/LateNight/buttons_flip/btn__mic_duck_auto.svg
new file mode 100644
index 000000000000..4c83f74b8852
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__mic_duck_auto.svg
@@ -0,0 +1,8 @@
+<svg width="40" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-16,-2)" fill="#0e0e0e">
+		<path d="m21 10v6h2v-3h3v3h2v-6zm2 1h3v1h-3z"/>
+		<path d="m29 10v6h7v-6h-2v5h-3v-5h-2"/>
+		<path d="m37 10h6v1h-2v5h-2v-5h-2v-1"/>
+		<path d="m44 10v6h7v-6m-2 5h-3v-4h3z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__mic_duck_manual.svg b/res/skins/LateNight/buttons_flip/btn__mic_duck_manual.svg
new file mode 100644
index 000000000000..1ec77e0c12df
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__mic_duck_manual.svg
@@ -0,0 +1,7 @@
+<svg width="40" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-2)" fill="#0e0e0e">
+		<path d="m20 8v6h2v-2h3v2h2v-6zm2 1h3v2h-3z"/>
+		<path d="m9 8v6h2v-5h3v5h2v-5h2v5h1v-6h-5z"/>
+		<path d="m29 8v6h2v-5h2v5h2v-6z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__mic_duck_off.svg b/res/skins/LateNight/buttons_flip/btn__mic_duck_off.svg
new file mode 100644
index 000000000000..6accd37ae6cd
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__mic_duck_off.svg
@@ -0,0 +1,14 @@
+<svg width="40" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-2,3)" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<path d="m30 5h-7v6h7v-1h-5v-4h5v-1"/>
+		<path d="m15 5v6h7v-6h-2v5h-3v-5h-2"/>
+		<path d="m7 5v6h7v-4.5l-1.5-1.5zm2 1h2.7l1.3 1.3v2.7h-4z"/>
+		<path d="m31 11v-6h2v2h1.5l2-2h1.5v.5l-2 2v1l2 2v.5h-1.5l-2-2h-1.5v2z"/>
+	</g>
+	<g transform="translate(-2,3)" fill="#d2d2d1">
+		<path d="m30 5h-7v6h7v-1h-5v-4h5v-1"/>
+		<path d="m15 5v6h7v-6h-2v5h-3v-5h-2"/>
+		<path d="m7 5v6h7v-4.5l-1.5-1.5zm2 1h2.7l1.3 1.3v2.7h-4z"/>
+		<path d="m31 11v-6h2v2h1.5l2-2h1.5v.5l-2 2v1l2 2v.5h-1.5l-2-2h-1.5v2z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__mic_talk.svg b/res/skins/LateNight/buttons_flip/btn__mic_talk.svg
new file mode 100644
index 000000000000..521ba4937ee4
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__mic_talk.svg
@@ -0,0 +1,14 @@
+<svg width="40" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(2,1)" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<path d="m3 7h6v1h-2v5h-2v-5h-2v-1"/>
+		<path d="m11 7v6h2v-2h3v2h2v-6zm2 1h3v2h-3z"/>
+		<path d="m19 7v6h7v-1h-5v-5h-2"/>
+		<path d="m27 13v-6h2v2h1.5l2-2h1.5v.5l-2 2v1l2 2v.5h-1.5l-2-2h-1.5v2z"/>
+	</g>
+	<g transform="translate(2,1)" fill="#d2d2d1">
+		<path d="m3 7h6v1h-2v5h-2v-5h-2v-1"/>
+		<path d="m11 7v6h2v-2h3v2h2v-6zm2 1h3v2h-3z"/>
+		<path d="m19 7v6h7v-1h-5v-5h-2"/>
+		<path d="m27 13v-6h2v2h1.5l2-2h1.5v.5l-2 2v1l2 2v.5h-1.5l-2-2h-1.5v2z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__minus.svg b/res/skins/LateNight/buttons_flip/btn__minus.svg
new file mode 100644
index 000000000000..041db478fa9f
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__minus.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m8 10h9v3h-9v-3" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.6"/>
+	<path d="m8 10h9v3h-9v-3" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__next.svg b/res/skins/LateNight/buttons_flip/btn__next.svg
new file mode 100644
index 000000000000..b846e1a0f5f1
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__next.svg
@@ -0,0 +1 @@
+<svg id="svg7815" width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path3936-0-8-9-7-1" d="m5 6.3331 7 4.667-7 4.6669v-9.3339" fill="#d2d2d1"/></svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__outro_end.svg b/res/skins/LateNight/buttons_flip/btn__outro_end.svg
new file mode 100644
index 000000000000..9729703d1a2f
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__outro_end.svg
@@ -0,0 +1,10 @@
+<svg width="18" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-3)" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<rect transform="scale(-1,1)" x="-18" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
+		<path d="m15 17-9-10v10z"/>
+	</g>
+	<g transform="translate(-3)" fill="#d2d2d1">
+		<rect transform="scale(-1,1)" x="-18" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
+		<path d="m15 17-9-10v10z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__outro_start.svg b/res/skins/LateNight/buttons_flip/btn__outro_start.svg
new file mode 100644
index 000000000000..f93765b1956d
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__outro_start.svg
@@ -0,0 +1,10 @@
+<svg width="18" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-3)" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<rect x="6" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
+		<path d="m19 17-9-10v10z"/>
+	</g>
+	<g transform="translate(-3)" fill="#d2d2d1">
+		<rect x="6" y="7" width="2" height="10" style="paint-order:markers fill stroke"/>
+		<path d="m19 17-9-10v10z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__pause_preview.svg b/res/skins/LateNight/buttons_flip/btn__pause_preview.svg
new file mode 100644
index 000000000000..6d4f69bb4690
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__pause_preview.svg
@@ -0,0 +1,10 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<path d="m7 6h4v12h-4v-12"/>
+		<path d="m13 6v12h4v-12h-4"/>
+	</g>
+	<g fill="#d2d2d1">
+		<path d="m7 6h4v12h-4v-12"/>
+		<path d="m13 6v12h4v-12h-4"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__pause_sampler.svg b/res/skins/LateNight/buttons_flip/btn__pause_sampler.svg
new file mode 100644
index 000000000000..560f56d3e03d
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__pause_sampler.svg
@@ -0,0 +1,10 @@
+<svg width="32" height="32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(1,1)" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<path d="m8 7h5v15h-5v-15"/>
+		<path d="m17 7v15h5v-15h-5"/>
+	</g>
+	<g transform="translate(1,1)" fill="#d2d2d1">
+		<path d="m8 7h5v15h-5v-15"/>
+		<path d="m17 7v15h5v-15h-5"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__pfl.svg b/res/skins/LateNight/buttons_flip/btn__pfl.svg
new file mode 100644
index 000000000000..2df575d24e76
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__pfl.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m11.999999 5.5116282c-3.7340627 0-6.766423 3.0324992-6.766423 6.7667318 0 .03993-.0009388.07686 0 .12531v.219292c-.7599946.643612-1.2530413 1.588929-1.2530413 2.662785 0 1.937792 1.0139653 3.50893 4.0194653 3.50893v-7.017354c-.242208 0-1.0030538.01567-1.2314482.06241.2161847-2.709799 2.465384-4.8244286 5.2314982-4.8244286 2.759698 0 5.00605 2.1235516 5.231498 4.8244286-.228394-.04674-.98933-.06241-1.231548-.06241v7.017354c3.513974 0 4.019565-1.571135 4.019565-3.508927 0-1.089995-.504605-2.050571-1.284317-2.694162.0061-.105852.03132-.203573.03132-.313275 0-3.7342327-3.03236-6.7667319-6.766424-6.7667319z" color="#000000" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.60000002" style="text-indent:0;text-transform:none"/>
+	<path d="m11.999999 5.5116282c-3.7340627 0-6.766423 3.0324992-6.766423 6.7667318 0 .03993-.0009388.07686 0 .12531v.219292c-.7599946.643612-1.2530413 1.588929-1.2530413 2.662785 0 1.937792.6326094 3.50893 4.0194653 3.50893v-7.017354c-.242208 0-1.0030538.01567-1.2314482.06241.2161847-2.709799 2.465384-4.8244286 5.2314982-4.8244286 2.759698 0 5.00605 2.1235516 5.231498 4.8244286-.228394-.04674-.98933-.06241-1.231548-.06241v7.017354c3.539398 0 4.019565-1.571135 4.019565-3.508927 0-1.089995-.504605-2.050571-1.284317-2.694162.0061-.105852.03132-.203573.03132-.313275 0-3.7342327-3.03236-6.7667319-6.766424-6.7667319z" color="#000000" fill="#d2d2d1" style="text-indent:0;text-transform:none"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__play_deck.svg b/res/skins/LateNight/buttons_flip/btn__play_deck.svg
new file mode 100644
index 000000000000..ea7547d40ca0
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__play_deck.svg
@@ -0,0 +1,12 @@
+<svg width="50" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(0,2)" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.60000002">
+		<path d="m28.000494 4h4v12h-4v-12"/>
+		<path d="m35.000888 4v12h4v-12h-4"/>
+		<path d="m12.000494 4 8.9995 6-8.9995 6v-12"/>
+	</g>
+	<g transform="translate(1.0004937 .99999999)" fill="#d2d2d1">
+		<path d="m27 5h4v12h-4v-12"/>
+		<path d="m34 5v12h4v-12h-4"/>
+		<path d="m11 5 8.9995 6-8.9995 6v-12"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__play_preview.svg b/res/skins/LateNight/buttons_flip/btn__play_preview.svg
new file mode 100644
index 000000000000..97f27621d834
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__play_preview.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m8 6 8.9995 6-8.9995 6z" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.6"/>
+	<path d="m8 6 8.9995 6-8.9995 6z" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__play_sampler.svg b/res/skins/LateNight/buttons_flip/btn__play_sampler.svg
new file mode 100644
index 000000000000..664b69ff8056
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__play_sampler.svg
@@ -0,0 +1,4 @@
+<svg width="32" height="32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m11 7.3661 12.95 8.634-12.95 8.6339z" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.6"/>
+	<path d="m11 7.3661 12.95 8.634-12.95 8.6339z" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__plus.svg b/res/skins/LateNight/buttons_flip/btn__plus.svg
new file mode 100644
index 000000000000..d4df6f7d746a
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__plus.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m8 10h3v-3h3v3h3v3h-3v3h-3v-3h-3v-3" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.6"/>
+	<path d="m8 10h3v-3h3v3h3v3h-3v3h-3v-3h-3v-3" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__prev.svg b/res/skins/LateNight/buttons_flip/btn__prev.svg
new file mode 100644
index 000000000000..e021190ad2da
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__prev.svg
@@ -0,0 +1 @@
+<svg id="svg7815" width="16" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path3936-0-8-9-7-1" d="m11 6.3331-7 4.667 7 4.6669v-9.3339" fill="#d2d2d1"/></svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__quantize.svg b/res/skins/LateNight/buttons_flip/btn__quantize.svg
new file mode 100644
index 000000000000..a9d18e0cfaef
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__quantize.svg
@@ -0,0 +1,7 @@
+<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+	<g fill="#585858">
+		<path d="m9.156 4c-2.7614 0-5 2.2386-5 5s2.2386 5 5 5h3.8438v-3h-3.9688c-1.1046 0-2-.89543-2-2 0-1.1046.89543-2 2-2h3.9688v-3z"/>
+		<path d="m17 11h-3v3h3z"/>
+		<path d="m17 4h-2.9896v3h2.9896z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__quantize_active_12.svg b/res/skins/LateNight/buttons_flip/btn__quantize_active_12.svg
new file mode 100644
index 000000000000..36c596a6dd7c
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__quantize_active_12.svg
@@ -0,0 +1,7 @@
+<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+	<g fill="#ffaa00">
+		<path d="m9.156 4c-2.7614 0-5 2.2386-5 5s2.2386 5 5 5h3.8438v-3h-3.9688c-1.1046 0-2-.89543-2-2 0-1.1046.89543-2 2-2h3.9688v-3z"/>
+		<path d="m17 11h-3v3h3z"/>
+		<path d="m17 4h-2.9896v3h2.9896z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__quantize_active_34.svg b/res/skins/LateNight/buttons_flip/btn__quantize_active_34.svg
new file mode 100644
index 000000000000..7077953f1587
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__quantize_active_34.svg
@@ -0,0 +1,7 @@
+<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+	<g fill="#00aaff">
+		<path d="m9.156 4c-2.7614 0-5 2.2386-5 5s2.2386 5 5 5h3.8438v-3h-3.9688c-1.1046 0-2-.89543-2-2 0-1.1046.89543-2 2-2h3.9688v-3z"/>
+		<path d="m17 11h-3v3h3z"/>
+		<path d="m17 4h-2.9896v3h2.9896z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__rec_dot.svg b/res/skins/LateNight/buttons_flip/btn__rec_dot.svg
new file mode 100644
index 000000000000..674a41ab5a24
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__rec_dot.svg
@@ -0,0 +1,3 @@
+<svg id="svg2" version="1.1" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg">
+<path id="path2987" d="m13.477 7.5a3.9775 3.9775 0 1 1-7.955 0 3.9775 3.9775 0 1 1 7.955 0z" color="#000000" fill="#bfbfbe"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__reloop.svg b/res/skins/LateNight/buttons_flip/btn__reloop.svg
new file mode 100644
index 000000000000..bccc537141e6
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__reloop.svg
@@ -0,0 +1,12 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(1,-1.000175)" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<path d="m6 6.0001c-1.6447-.0001028-3 1.3553-3 3v7.0002c0 1.6447 1.3553 3 3 3l1.0002-.000125v3l6.9998-3.75-6.9999-3.7501v3l-1.0002.000124c-.74686 9.3e-5-1.4999-.76713-1.4999-1.4999v-7.0002c0-.71175.76705-1.4999 1.5-1.4999l2 .000124v-1.5001z" color="#000000"/>
+		<path d="m10 4.000175h2v6h-2z" color="#000000"/>
+		<path d="m16 6.0001c1.6447-.0001028 3 1.3553 3 3v7.0002c0 1.6447-1.3553 3-3 3l-1.0002-6.3e-5 5e-4-1.5001 1.0002 6.2e-5c.78903 4.9e-5 1.4995-.78813 1.4995-1.4999v-7.0002c0-.72579-.75327-1.4999-1.5001-1.4999l-1.9998.000125.000125-1.5001z" color="#000000"/>
+	</g>
+	<g transform="translate(1,-1.000175)" fill="#d2d2d1">
+		<path d="m6 6.0001c-1.6447-.0001028-3 1.3553-3 3v7.0002c0 1.6447 1.3553 3 3 3l1.0002-.000125v3l6.9998-3.75-6.9999-3.7501v3l-1.0002.000124c-.74686 9.3e-5-1.4999-.76713-1.4999-1.4999v-7.0002c0-.71175.76705-1.4999 1.5-1.4999l2 .000124v-1.5001z" color="#000000"/>
+		<path d="m10 4.000175h2v6h-2z" color="#000000"/>
+		<path d="m16 6.0001c1.6447-.0001028 3 1.3553 3 3v7.0002c0 1.6447-1.3553 3-3 3l-1.0002-6.3e-5 5e-4-1.5001 1.0002 6.2e-5c.78903 4.9e-5 1.4995-.78813 1.4995-1.4999v-7.0002c0-.72579-.75327-1.4999-1.5001-1.4999l-1.9998.000125.000125-1.5001z" color="#000000"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__repeat.svg b/res/skins/LateNight/buttons_flip/btn__repeat.svg
new file mode 100644
index 000000000000..df993a17bb34
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__repeat.svg
@@ -0,0 +1,8 @@
+<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+	<g fill="#585858">
+		<path d="m7.156 4.0005c-2.7614.0001841-5 2.2386-5 5 0 .48325.090832.93297.21875 1.375l2.6562-1.5312c.080009-1.0312.94822-1.8437 2-1.8438l7.6252-5e-4v-3z"/>
+		<path d="m7.9997786 16.551826-6.5398527-3.775768 6.5398527-3.775768z" color="#000000" stroke-width="1.25100005"/>
+		<path d="m14 14c2.7614.000184 5-2.2386 5-5 0-.48325-.09083-.93297-.21875-1.375l-2.6562 1.5313c-.08001 1.0312-.94822 1.8438-2 1.8437l-7.625-5e-4v3z"/>
+		<path d="m13.000221 1.4483736 6.539853 3.7757682-6.539853 3.7757682z" color="#000000" stroke-width="1.25100005"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__repeat_active_12.svg b/res/skins/LateNight/buttons_flip/btn__repeat_active_12.svg
new file mode 100644
index 000000000000..91574f38027f
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__repeat_active_12.svg
@@ -0,0 +1,8 @@
+<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+	<g fill="#ffaa00">
+		<path d="m7.156 4.0005c-2.7614.0001841-5 2.2386-5 5 0 .48325.090832.93297.21875 1.375l2.6562-1.5312c.080009-1.0312.94822-1.8437 2-1.8438l7.6252-5e-4v-3z"/>
+		<path d="m7.9997786 16.551826-6.5398527-3.775768 6.5398527-3.775768z" color="#000000" stroke-width="1.25100005"/>
+		<path d="m14 14c2.7614.000184 5-2.2386 5-5 0-.48325-.09083-.93297-.21875-1.375l-2.6562 1.5313c-.08001 1.0312-.94822 1.8438-2 1.8437l-7.625-5e-4v3z"/>
+		<path d="m13.000221 1.4483736 6.539853 3.7757682-6.539853 3.7757682z" color="#000000" stroke-width="1.25100005"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__repeat_active_34.svg b/res/skins/LateNight/buttons_flip/btn__repeat_active_34.svg
new file mode 100644
index 000000000000..dcf16208c658
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__repeat_active_34.svg
@@ -0,0 +1,8 @@
+<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+	<g fill="#00aaff">
+		<path d="m7.156 4.0005c-2.7614.0001841-5 2.2386-5 5 0 .48325.090832.93297.21875 1.375l2.6562-1.5312c.080009-1.0312.94822-1.8437 2-1.8438l7.6252-5e-4v-3z"/>
+		<path d="m7.9997786 16.551826-6.5398527-3.775768 6.5398527-3.775768z" color="#000000" stroke-width="1.25100005"/>
+		<path d="m14 14c2.7614.000184 5-2.2386 5-5 0-.48325-.09083-.93297-.21875-1.375l-2.6562 1.5313c-.08001 1.0312-.94822 1.8438-2 1.8437l-7.625-5e-4v3z"/>
+		<path d="m13.000221 1.4483736 6.539853 3.7757682-6.539853 3.7757682z" color="#000000" stroke-width="1.25100005"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__reverse.svg b/res/skins/LateNight/buttons_flip/btn__reverse.svg
new file mode 100644
index 000000000000..7569855a0264
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__reverse.svg
@@ -0,0 +1,4 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m16.000506 6.0058019-8.9995702 5.9999991 8.9995702 6v-11.9999991" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5999999"/>
+	<path d="m16.000506 6.0000702-8.9995702 5.9999988 8.9995702 6v-11.9999988" fill="#d2d2d1" stroke-width=".99999994"/>
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_settings_on.svg b/res/skins/LateNight/buttons_flip/btn__settings.svg
similarity index 66%
rename from res/skins/LateNight/buttons/btn_settings_on.svg
rename to res/skins/LateNight/buttons_flip/btn__settings.svg
index c9eb18294b74..d00f3c0ec80b 100644
--- a/res/skins/LateNight/buttons/btn_settings_on.svg
+++ b/res/skins/LateNight/buttons_flip/btn__settings.svg
@@ -1 +1 @@
-<svg id="svg2" width="73" height="17" version="1.1" xmlns="http://www.w3.org/2000/svg"><g id="g4021" transform="matrix(-.68548 0 0 .77778 15.855 .22222)" fill="#0e0e0e"><path id="rect3922" transform="matrix(1.1347 0 0 1 -34.251 6)" d="m37.625-5-0.1875 2.625c-0.66019 0.16435-1.2765 0.43313-1.8438 0.78125l-1.9688-1.75-1.9688 1.9688 1.75 1.9688c-0.34382 0.56314-0.61891 1.1878-0.78125 1.8438l-2.625 0.1875v2.75l2.625 0.1875c0.16385 0.66212 0.431 1.2793 0.78125 1.8438l-1.75 1.9688 1.9688 1.9688 2-1.75c0.55851 0.33599 1.1644 0.58862 1.8125 0.75l0.1875 2.6562h2.75l0.1875-2.625c0.66019-0.16435 1.2765-0.43313 1.8438-0.78125l1.9688 1.75 1.9688-1.9688-1.75-1.9688c0.34382-0.56314 0.61891-1.1878 0.78125-1.8438l2.625-0.1875v-2.75l-2.625-0.1875c-0.16435-0.66019-0.43313-1.2765-0.78125-1.8438l1.75-1.9688-1.9688-1.9688-1.9688 1.75c-0.56314-0.34382-1.1878-0.61891-1.8438-0.78125l-0.1875-2.625zm1.375 6c1.6505 0 3 1.3495 3 3s-1.3495 3-3 3-3-1.3495-3-3 1.3495-3 3-3z" color="#000000" fill="#0e0e0e"/></g></svg>
+<svg id="svg2" width="18" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg"><g id="g4021" transform="matrix(-.68548 0 0 .77778 15.855 1.2222)" fill="#d2d2d1"><path id="rect3922" transform="matrix(1.1347 0 0 1 -34.251 6)" d="m37.625-5-0.1875 2.625c-0.66019 0.16435-1.2765 0.43313-1.8438 0.78125l-1.9688-1.75-1.9688 1.9688 1.75 1.9688c-0.34382 0.56314-0.61891 1.1878-0.78125 1.8438l-2.625 0.1875v2.75l2.625 0.1875c0.16385 0.66212 0.431 1.2793 0.78125 1.8438l-1.75 1.9688 1.9688 1.9688 2-1.75c0.55851 0.33599 1.1644 0.58862 1.8125 0.75l0.1875 2.6562h2.75l0.1875-2.625c0.66019-0.16435 1.2765-0.43313 1.8438-0.78125l1.9688 1.75 1.9688-1.9688-1.75-1.9688c0.34382-0.56314 0.61891-1.1878 0.78125-1.8438l2.625-0.1875v-2.75l-2.625-0.1875c-0.16435-0.66019-0.43313-1.2765-0.78125-1.8438l1.75-1.9688-1.9688-1.9688-1.9688 1.75c-0.56314-0.34382-1.1878-0.61891-1.8438-0.78125l-0.1875-2.625zm1.375 6c1.6505 0 3 1.3495 3 3s-1.3495 3-3 3-3-1.3495-3-3 1.3495-3 3-3z" color="#000000" fill="#d2d2d1"/></g><g id="g4021-6" transform="matrix(-.68548 0 0 .77778 15.855 1.2222)" fill="#d2d2d1"><path id="rect3922-2" transform="matrix(1.1347 0 0 1 -34.251 6)" d="m39 1c1.6505 0 3 1.3495 3 3s-1.3495 3-3 3-3-1.3495-3-3 1.3495-3 3-3z" color="#000000" fill="#1a1a1a"/></g></svg>
diff --git a/res/skins/LateNight/buttons/btn_skinsettings_close_hover.svg b/res/skins/LateNight/buttons_flip/btn__settings_close.svg
similarity index 82%
rename from res/skins/LateNight/buttons/btn_skinsettings_close_hover.svg
rename to res/skins/LateNight/buttons_flip/btn__settings_close.svg
index 5179f4b10a35..f04edc298edc 100644
--- a/res/skins/LateNight/buttons/btn_skinsettings_close_hover.svg
+++ b/res/skins/LateNight/buttons_flip/btn__settings_close.svg
@@ -1 +1 @@
-<svg id="svg3515" width="20" height="20" version="1.1" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path id="path3517" d="m5.5287 4.7729c-0.20064-0.0065044-0.39701 0.061142-0.5458 0.20992-0.29757 0.29757-0.27542 0.79518 0.041984 1.1126l3.9045 3.9045-3.9045 3.9045c-0.31741 0.3174-0.33955 0.81502-0.041984 1.1126 0.29757 0.29757 0.79518 0.27542 1.1126-0.04198l3.9045-3.9046 3.9045 3.9045c0.3174 0.31741 0.81502 0.33955 1.1126 0.04198 0.29757-0.29757 0.27542-0.79518-0.04198-1.1126l-3.9046-3.9045 3.9045-3.9045c0.31741-0.31741 0.33955-0.81502 0.041982-1.1126-0.29757-0.29757-0.79518-0.27542-1.1126 0.041982l-3.9045 3.9046-3.9045-3.9045c-0.1587-0.1587-0.36615-0.24543-0.56679-0.25191z" fill="#eee"/></svg>
+<svg id="svg3505" width="20" height="20" version="1.1" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path id="path3507" d="m5.5287 4.7729c-0.20064-0.0065044-0.39701 0.061142-0.5458 0.20992-0.29757 0.29757-0.27542 0.79518 0.041984 1.1126l3.9045 3.9045-3.9045 3.9045c-0.31741 0.3174-0.33955 0.81502-0.041984 1.1126 0.29757 0.29757 0.79518 0.27542 1.1126-0.04198l3.9045-3.9046 3.9045 3.9045c0.3174 0.31741 0.81502 0.33955 1.1126 0.04198 0.29757-0.29757 0.27542-0.79518-0.04198-1.1126l-3.9046-3.9045 3.9045-3.9045c0.31741-0.31741 0.33955-0.81502 0.041982-1.1126-0.29757-0.29757-0.79518-0.27542-1.1126 0.041982l-3.9045 3.9046-3.9045-3.9045c-0.1587-0.1587-0.36615-0.24543-0.56679-0.25191z" fill="#eee"/></svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__settings_off.svg b/res/skins/LateNight/buttons_flip/btn__settings_off.svg
new file mode 100644
index 000000000000..0c700c92c883
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__settings_off.svg
@@ -0,0 +1,5 @@
+<svg width="76" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="matrix(-.60802 0 0 .68989 14.4115 1.101031)" fill="#d2d2d1" stroke-width="1.12740004">
+		<path transform="matrix(1.1347,0,0,1,-34.251,6)" d="m37.625-5-.1875 2.625c-.66019.16435-1.2765.43313-1.8438.78125l-1.9688-1.75-1.9688 1.9688 1.75 1.9688c-.34382.56314-.61891 1.1878-.78125 1.8438l-2.625.1875v2.75l2.625.1875c.16385.66212.431 1.2793.78125 1.8438l-1.75 1.9688 1.9688 1.9688 2-1.75c.55851.33599 1.1644.58862 1.8125.75l.1875 2.6562h2.75l.1875-2.625c.66019-.16435 1.2765-.43313 1.8438-.78125l1.9688 1.75 1.9688-1.9688-1.75-1.9688c.34382-.56314.61891-1.1878.78125-1.8438l2.625-.1875v-2.75l-2.625-.1875c-.16435-.66019-.43313-1.2765-.78125-1.8438l1.75-1.9688-1.9688-1.9688-1.9688 1.75c-.56314-.34382-1.1878-.61891-1.8438-.78125l-.1875-2.625zm1.375 6c1.6505 0 3 1.3495 3 3s-1.3495 3-3 3-3-1.3495-3-3 1.3495-3 3-3z" color="#000000" fill="#d2d2d1"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__settings_on.svg b/res/skins/LateNight/buttons_flip/btn__settings_on.svg
new file mode 100644
index 000000000000..9c38e6aef1fc
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__settings_on.svg
@@ -0,0 +1,5 @@
+<svg width="76" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="matrix(-.60803453 0 0 .68993295 14.356316 1.1006015)" stroke-width="1.12734854">
+		<path transform="matrix(1.1347,0,0,1,-34.251,6)" d="m37.625-5-.1875 2.625c-.66019.16435-1.2765.43313-1.8438.78125l-1.9688-1.75-1.9688 1.9688 1.75 1.9688c-.34382.56314-.61891 1.1878-.78125 1.8438l-2.625.1875v2.75l2.625.1875c.16385.66212.431 1.2793.78125 1.8438l-1.75 1.9688 1.9688 1.9688 2-1.75c.55851.33599 1.1644.58862 1.8125.75l.1875 2.6562h2.75l.1875-2.625c.66019-.16435 1.2765-.43313 1.8438-.78125l1.9688 1.75 1.9688-1.9688-1.75-1.9688c.34382-.56314.61891-1.1878.78125-1.8438l2.625-.1875v-2.75l-2.625-.1875c-.16435-.66019-.43313-1.2765-.78125-1.8438l1.75-1.9688-1.9688-1.9688-1.9688 1.75c-.56314-.34382-1.1878-.61891-1.8438-.78125l-.1875-2.625zm1.375 6c1.6505 0 3 1.3495 3 3s-1.3495 3-3 3-3-1.3495-3-3 1.3495-3 3-3z" color="#000000" stroke-width="1.12734854"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__slip.svg b/res/skins/LateNight/buttons_flip/btn__slip.svg
new file mode 100644
index 000000000000..c27c27228748
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__slip.svg
@@ -0,0 +1,4 @@
+<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+	<path d="m7.33344 14.96998-6.3333447-10.96968 12.6663237-3e-7z" color="#000000" fill="#585858" stroke-width=".91413999"/>
+	<path d="m7.3333 4.0003 6.3333 10.965 6.3333-10.965h-12.667zm2.9292 1.7021h6.8083l-3.4042 5.8979-3.4042-5.8979z" color="#000000" fill="#585858"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__slip_active_12.svg b/res/skins/LateNight/buttons_flip/btn__slip_active_12.svg
new file mode 100644
index 000000000000..3a3cf81ac2f4
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__slip_active_12.svg
@@ -0,0 +1,4 @@
+<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+	<path d="m7.33344 14.96998-6.3333447-10.96968 12.6663237-3e-7z" color="#000000" fill="#ffaa00" stroke-width=".91413999"/>
+	<path d="m7.3333 4.0003 6.3333 10.965 6.3333-10.965h-12.667zm2.9292 1.7021h6.8083l-3.4042 5.8979-3.4042-5.8979z" color="#000000" fill="#ffaa00"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__slip_active_34.svg b/res/skins/LateNight/buttons_flip/btn__slip_active_34.svg
new file mode 100644
index 000000000000..ef783dbd1755
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__slip_active_34.svg
@@ -0,0 +1,4 @@
+<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+	<path d="m7.33344 14.96998-6.3333447-10.96968 12.6663237-3e-7z" color="#000000" fill="#00aaff" stroke-width=".91413999"/>
+	<path d="m7.3333 4.0003 6.3333 10.965 6.3333-10.965h-12.667zm2.9292 1.7021h6.8083l-3.4042 5.8979-3.4042-5.8979z" color="#000000" fill="#00aaff"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__splitcue.svg b/res/skins/LateNight/buttons_flip/btn__splitcue.svg
new file mode 100644
index 000000000000..9e4aa78c3e0e
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__splitcue.svg
@@ -0,0 +1,22 @@
+<svg width="66" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-2,2)" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<path d="m12 7h-7v4h5v1h-5v1h7v-3h-5v-2h5v-1"/>
+		<path d="m20 7v6h6v-1h-4v-5h-2"/>
+		<path d="m13 7v6h2v-2h4v-4zm2 1h3v2h-3z"/>
+		<path d="m30 7h6v1h-2v5h-2v-5h-2v-1"/>
+		<rect x="27" y="7" width="2" height="6" style="paint-order:fill markers stroke"/>
+		<path d="m49 7h-7v6h7v-1h-5v-4h5v-1"/>
+		<path d="m51 7v6h7v-6h-2v5h-3v-5h-2"/>
+		<path d="m60 7v6h5v-1h-3v-2h2v-1h-2v-1h3v-1h-5"/>
+	</g>
+	<g transform="translate(-2,2)" fill="#d2d2d1">
+		<path d="m12 7h-7v4h5v1h-5v1h7v-3h-5v-2h5v-1"/>
+		<path d="m20 7v6h6v-1h-4v-5h-2"/>
+		<path d="m13 7v6h2v-2h4v-4zm2 1h3v2h-3z"/>
+		<path d="m30 7h6v1h-2v5h-2v-5h-2v-1"/>
+		<rect x="27" y="7" width="2" height="6" style="paint-order:fill markers stroke"/>
+		<path d="m49 7h-7v6h7v-1h-5v-4h5v-1"/>
+		<path d="m51 7v6h7v-6h-2v5h-3v-5h-2"/>
+		<path d="m60 7v6h5v-1h-3v-2h2v-1h-2v-1h3v-1h-5"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__splitcue_active.svg b/res/skins/LateNight/buttons_flip/btn__splitcue_active.svg
new file mode 100644
index 000000000000..007585e13d74
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__splitcue_active.svg
@@ -0,0 +1,14 @@
+<svg width="66" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-4,1)" fill="#0e0e0e">
+		<path d="m14 8h-7v4h5v1h-5v1h7v-3h-5v-2h5v-1"/>
+		<path d="m22 8v6h6v-1h-4v-5h-2"/>
+		<path d="m15 8v6h2v-2h4v-4zm2 1h3v2h-3z"/>
+		<path d="m32 8h6v1h-2v5h-2v-5h-2v-1"/>
+		<rect x="29" y="8" width="2" height="6" style="paint-order:fill markers stroke"/>
+		<g transform="translate(31,-1)">
+			<path d="m20 9h-7v6h7v-1h-5v-4h5v-1"/>
+			<path d="m22 9v6h7v-6h-2v5h-3v-5h-2"/>
+			<path d="m31 9v6h5v-1h-3v-2h2v-1h-2v-1h3v-1h-5"/>
+		</g>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__star.svg b/res/skins/LateNight/buttons_flip/btn__star.svg
new file mode 100644
index 000000000000..81f3e740bcbd
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__star.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m8.0000001 5.9262617.4700968 1.4036761 1.4802433.013329-1.1897075.8808484.4447438 1.4119139-1.2053765-.8592819-1.2053766.8592819.4447439-1.4119139-1.1897074-.8808485 1.4802432-.0133288z" stroke="#bbb" stroke-linecap="round" stroke-width="2.65781951" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__sync_deck.svg b/res/skins/LateNight/buttons_flip/btn__sync_deck.svg
new file mode 100644
index 000000000000..d6726bd62546
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__sync_deck.svg
@@ -0,0 +1,14 @@
+<svg width="50" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(1,1)" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<path d="m16 8h-7v4h5v1h-5v1h7v-3h-5v-2h5v-1"/>
+		<path d="m25 8v6h2v-5h3v5h2v-6h-7"/>
+		<path d="m33 8v6h7v-1h-5v-4h5v-1h-7"/>
+		<path d="m19 14v-3.5l-2-2v-.5h1.5l1.5 1.5 1.5-1.5h1.5v.5l-2 2v3.5h-2"/>
+	</g>
+	<g transform="translate(1,1)" fill="#d2d2d1">
+		<path d="m16 8h-7v4h5v1h-5v1h7v-3h-5v-2h5v-1"/>
+		<path d="m25 8v6h2v-5h3v5h2v-6h-7"/>
+		<path d="m33 8v6h7v-1h-5v-4h5v-1h-7"/>
+		<path d="m19 14v-3.5l-2-2v-.5h1.5l1.5 1.5 1.5-1.5h1.5v.5l-2 2v3.5h-2"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__sync_sampler.svg b/res/skins/LateNight/buttons_flip/btn__sync_sampler.svg
new file mode 100644
index 000000000000..bf062f67b0a6
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__sync_sampler.svg
@@ -0,0 +1,14 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.60000002">
+		<path d="m5 7.3636 6.955 4.6367-6.955 4.6367z"/>
+		<path d="M 19,7.3633 12.045,12 19,16.6367 Z"/>
+	</g>
+	<g transform="translate(1 -.9997)" fill="none">
+		<path d="M 4,8.3633 10.955,13 4,17.6367 V 8.3633"/>
+		<path d="M 18,8.3633 11.045,13 18,17.6367 V 8.3633"/>
+	</g>
+	<g fill="#d2d2d1">
+		<path d="m5 7.3636 6.955 4.6367-6.955 4.6367z"/>
+		<path d="M 19,7.3633 12.045,12 19,16.6367 Z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__xfader_aux_left.svg b/res/skins/LateNight/buttons_flip/btn__xfader_aux_left.svg
new file mode 100644
index 000000000000..da5b928d80c6
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__xfader_aux_left.svg
@@ -0,0 +1 @@
+<svg width="11" height="13" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v9h7v-2h-5v-7h-2" fill="#888"/></svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__xfader_aux_left_off.svg b/res/skins/LateNight/buttons_flip/btn__xfader_aux_left_off.svg
new file mode 100644
index 000000000000..c15d77c4bc00
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__xfader_aux_left_off.svg
@@ -0,0 +1 @@
+<svg width="11" height="13" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v9h7v-2h-5v-7h-2" fill="#555"/></svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__xfader_aux_mid.svg b/res/skins/LateNight/buttons_flip/btn__xfader_aux_mid.svg
new file mode 100644
index 000000000000..71a9f0487850
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__xfader_aux_mid.svg
@@ -0,0 +1 @@
+<svg width="11" height="13" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m1 11v-9h1.5l3 3.5 3-3.5h1.5v9h-2v-6l-2.5 3-2.5-3v6z" fill="#888"/></svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__xfader_aux_mid_off.svg b/res/skins/LateNight/buttons_flip/btn__xfader_aux_mid_off.svg
new file mode 100644
index 000000000000..e8c9e7490b18
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__xfader_aux_mid_off.svg
@@ -0,0 +1 @@
+<svg width="11" height="13" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m1 11v-9h1.5l3 3.5 3-3.5h1.5v9h-2v-6l-2.5 3-2.5-3v6z" fill="#555"/></svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__xfader_aux_right.svg b/res/skins/LateNight/buttons_flip/btn__xfader_aux_right.svg
new file mode 100644
index 000000000000..1c91063e788a
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__xfader_aux_right.svg
@@ -0,0 +1 @@
+<svg width="11" height="13" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v9h2v-3h1.5l3 3h1.5v-1.5l-2-2 1-1v-3l-1.5-1.5zm2 2h3v2h-3z" fill="#888"/></svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__xfader_aux_right_off.svg b/res/skins/LateNight/buttons_flip/btn__xfader_aux_right_off.svg
new file mode 100644
index 000000000000..b8b6290eee59
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__xfader_aux_right_off.svg
@@ -0,0 +1 @@
+<svg width="11" height="13" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v9h2v-3h1.5l3 3h1.5v-1.5l-2-2 1-1v-3l-1.5-1.5zm2 2h3v2h-3z" fill="#555"/></svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__xfader_deck_left_default.svg b/res/skins/LateNight/buttons_flip/btn__xfader_deck_left_default.svg
new file mode 100644
index 000000000000..97c1a08df78e
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__xfader_deck_left_default.svg
@@ -0,0 +1 @@
+<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 3v9h7v-2h-5v-7h-2" fill="#888"/></svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__xfader_deck_left_off.svg b/res/skins/LateNight/buttons_flip/btn__xfader_deck_left_off.svg
new file mode 100644
index 000000000000..71a6d97b8664
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__xfader_deck_left_off.svg
@@ -0,0 +1 @@
+<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 3v9h7v-2h-5v-7h-2" fill="#555"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_xfader_deck_left_off.svg b/res/skins/LateNight/buttons_flip/btn__xfader_deck_left_warning.svg
similarity index 51%
rename from res/skins/LateNight/buttons/btn_xfader_deck_left_off.svg
rename to res/skins/LateNight/buttons_flip/btn__xfader_deck_left_warning.svg
index 1956bd2487db..52a1e3225b62 100644
--- a/res/skins/LateNight/buttons/btn_xfader_deck_left_off.svg
+++ b/res/skins/LateNight/buttons_flip/btn__xfader_deck_left_warning.svg
@@ -1 +1 @@
-<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 3v9h7v-2h-5v-7h-2" fill="#6a6a6a"/></svg>
+<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 3v9h7v-2h-5v-7h-2" fill="#f856e7"/></svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__xfader_deck_mid_off.svg b/res/skins/LateNight/buttons_flip/btn__xfader_deck_mid_off.svg
new file mode 100644
index 000000000000..ec87f75be5ee
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__xfader_deck_mid_off.svg
@@ -0,0 +1 @@
+<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m1 12v-9h1.5l3 3.5 3-3.5h1.5v9h-2v-6l-2.5 3-2.5-3v6z" fill="#555"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_xfader_aux_right.svg b/res/skins/LateNight/buttons_flip/btn__xfader_deck_mid_warning.svg
similarity index 76%
rename from res/skins/LateNight/buttons/btn_xfader_aux_right.svg
rename to res/skins/LateNight/buttons_flip/btn__xfader_deck_mid_warning.svg
index b0b97229f65d..eb0d70aafa37 100644
--- a/res/skins/LateNight/buttons/btn_xfader_aux_right.svg
+++ b/res/skins/LateNight/buttons_flip/btn__xfader_deck_mid_warning.svg
@@ -5,10 +5,10 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   width="11"
-   height="13"
+   id="svg4"
    version="1.1"
-   id="svg4">
+   height="15"
+   width="11">
   <metadata
      id="metadata10">
     <rdf:RDF>
@@ -24,7 +24,7 @@
   <defs
      id="defs8" />
   <path
-     id="path817"
-     d="m 2,2 v 9 H 4 V 8 h 1.5 l 3,3 H 10 V 9.5 l -2,-2 1,-1 v -3 L 7.5,2 Z M 4,4 H 7 V 6 H 4 Z"
-     style="fill:#aaaaaa;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+     id="path820"
+     d="M 1,12 V 3 h 1.5 l 3,3.5 3,-3.5 H 10 v 9 H 8 V 6 L 5.5,9 3,6 v 6 z"
+     style="fill:#f0bb2b;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
 </svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__xfader_deck_right_default.svg b/res/skins/LateNight/buttons_flip/btn__xfader_deck_right_default.svg
new file mode 100644
index 000000000000..d590c5ab6b61
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__xfader_deck_right_default.svg
@@ -0,0 +1 @@
+<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 3v9h2v-3h1.5l3 3h1.5v-1.5l-2-2 1-1v-3l-1.5-1.5zm2 2h3v2h-3z" fill="#888"/></svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__xfader_deck_right_off.svg b/res/skins/LateNight/buttons_flip/btn__xfader_deck_right_off.svg
new file mode 100644
index 000000000000..6224588d3d2a
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__xfader_deck_right_off.svg
@@ -0,0 +1 @@
+<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 3v9h2v-3h1.5l3 3h1.5v-1.5l-2-2 1-1v-3l-1.5-1.5zm2 2h3v2h-3z" fill="#555"/></svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__xfader_deck_right_warning.svg b/res/skins/LateNight/buttons_flip/btn__xfader_deck_right_warning.svg
new file mode 100644
index 000000000000..dedd1075ff2f
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__xfader_deck_right_warning.svg
@@ -0,0 +1 @@
+<svg width="11" height="15" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m2 3v9h2v-3h1.5l3 3h1.5v-1.5l-2-2 1-1v-3l-1.5-1.5h-5.5zm2 2h3v2h-3v-2z" fill="#f856e7"/></svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__xfader_sampler_left.svg b/res/skins/LateNight/buttons_flip/btn__xfader_sampler_left.svg
new file mode 100644
index 000000000000..7dd52debae55
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__xfader_sampler_left.svg
@@ -0,0 +1,5 @@
+<svg width="21" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-2,-1034.4)">
+		<path d="m8 1039.4v9h8v-2h-6v-7h-2" fill="#f856e7"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__xfader_sampler_master.svg b/res/skins/LateNight/buttons_flip/btn__xfader_sampler_master.svg
new file mode 100644
index 000000000000..6eb53f82c3a7
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__xfader_sampler_master.svg
@@ -0,0 +1,3 @@
+<svg width="21" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m6 14v-9h2l3 3 3-3h2v9h-2v-6l-3 3-3-3v6z" fill="#585858"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__xfader_sampler_right.svg b/res/skins/LateNight/buttons_flip/btn__xfader_sampler_right.svg
new file mode 100644
index 000000000000..2a67bf6a43f0
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn__xfader_sampler_right.svg
@@ -0,0 +1,3 @@
+<svg width="21" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m6.0252 5v9h2v-3h2.4998l3 3h1.5v-1.5l-2-2 1-1v-3l-1.5-1.5zm2 2h3.9998v2h-3.9998z" fill="#f856e7"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_border_image_qpushbutton_active_grey.svg b/res/skins/LateNight/buttons_flip/btn_border_image_qpushbutton_active_grey.svg
new file mode 100644
index 000000000000..38ddccdb5b76
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_border_image_qpushbutton_active_grey.svg
@@ -0,0 +1 @@
+<svg width="25" height="25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><linearGradient id="a" x1=".50003" x2="23.5" y1="-12" y2="-12" gradientUnits="userSpaceOnUse"><stop stop-color="#544f49" offset="0"/><stop stop-color="#818181" offset="1"/></linearGradient></defs><rect transform="rotate(90)" x=".50003" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#323232"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#323232"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#323232"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#323232"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#323232"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><path d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#323232"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></g><path d="m2 3e-5c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#d2d2d2" style="text-indent:0;text-transform:none"/></svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_border_image_qpushbutton_checked_focus.svg b/res/skins/LateNight/buttons_flip/btn_border_image_qpushbutton_checked_focus.svg
new file mode 100644
index 000000000000..58dce9f7a338
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_border_image_qpushbutton_checked_focus.svg
@@ -0,0 +1 @@
+<svg width="25" height="25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><linearGradient id="a" x1=".50003" x2="23.5" y1="-12" y2="-12" gradientUnits="userSpaceOnUse"><stop stop-color="#7c4e20" offset="0"/><stop stop-color="#cb8237" offset="1"/></linearGradient></defs><path d="m23.314 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 1.875-2 1.875l-19.499-2e-5c-.2947 0-.8341-.07706-1.325-.50548.21914 1.0963 1.0076 1.6305 1.8242 1.6305h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#020201" opacity=".8"/><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#323232"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#323232"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#323232"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#323232"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#323232"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><path d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#323232"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></g><rect transform="rotate(90)" x=".50003" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><path d="m2 3e-5c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#f60" style="text-indent:0;text-transform:none"/></svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_border_image_qpushbutton_focus.svg b/res/skins/LateNight/buttons_flip/btn_border_image_qpushbutton_focus.svg
new file mode 100644
index 000000000000..c71e5e2de6c7
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_border_image_qpushbutton_focus.svg
@@ -0,0 +1 @@
+<svg width="25" height="25" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(3e-5,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m23.314 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 1.875-2 1.875l-19.499-2e-5c-.2947 0-.8341-.07706-1.325-.50548.21914 1.0963 1.0076 1.6305 1.8242 1.6305h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#020201" opacity=".8"/><rect transform="rotate(90)" x=".50003" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#323232"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#323232"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#323232"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#323232"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#323232"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><path d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#323232"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></g><path d="m2 3e-5c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#f60" style="text-indent:0;text-transform:none"/></svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_elevated_fx.svg b/res/skins/LateNight/buttons_flip/btn_elevated_fx.svg
new file mode 100644
index 000000000000..a37349d3455a
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_elevated_fx.svg
@@ -0,0 +1,18 @@
+<svg width="35" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="c" x1="1.00003" x2="21.000031" y1="-17" y2="-17" gradientTransform="matrix(.89473685 0 0 1.0322581 .1578978 .0483871)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".30102351"/>
+			<stop stop-color="#141414" offset="1"/>
+		</linearGradient>
+		<linearGradient id="b" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(.69565218 0 0 1.3478261 .95650088 -32.326087)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<path d="m33.313235 2.08793c.11592.25262.185545.52951.18555.82422l.000225 14.088c1.8e-5 1.0994-.9006 1.965577-2 1.965572l-28.49901-.00012c-.6598637-3e-6-1.135675-.352003-1.325-.511743.2090942.790888.7641575 1.546137 1.8242 1.546141l28.99979 1e-4c1.108 4e-6 2.000018-.892 2-2l-.000225-14.088c-1.3e-5-.81658-.48717-1.5129-1.1855-1.8242z" fill="#020201"/>
+	<rect transform="rotate(90)" x="1.5000299" y="-33.5" width="17" height="32" rx=".30000001" ry=".30000004" fill="none" stroke="url(#c)" stroke-linecap="round" stroke-linejoin="round" stroke-width=".99999988" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2" y="-33" width="16" height="31" color="#000000" fill="url(#b)"/>
+	<rect transform="rotate(90)" x="2" y="-33" width="16" height="31" color="#000000" fill-opacity=".09019608"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_elevated_fx_active.svg b/res/skins/LateNight/buttons_flip/btn_elevated_fx_active.svg
new file mode 100644
index 000000000000..44f9af4dd1a5
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_elevated_fx_active.svg
@@ -0,0 +1,16 @@
+<svg width="35" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="c" x1="-24.500031" x2="-1.5000305" y1="-13" y2="-13" gradientTransform="matrix(.69565217 0 0 1.3478261 19.043499 .02173915)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".47451" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+		<linearGradient id="b" x1="1" x2="25" y1="13" y2="13" gradientTransform="matrix(.73913043 0 0 1.3913043 .39130442 -35.586955)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#202020" stop-opacity=".80808079" offset="0"/>
+			<stop stop-color="#404040" stop-opacity=".74747473" offset=".30102351"/>
+			<stop stop-opacity=".82323235" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2" y="-33" width="16" height="31" color="#000000" fill="url(#c)"/>
+	<rect transform="rotate(90)" x="1.5000001" y="-33.5" width="17" height="31.999998" rx=".2" ry=".19999999" fill="none" stroke="url(#b)" stroke-linecap="square" stroke-opacity=".39215686" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_elevated_fx_focus.svg b/res/skins/LateNight/buttons_flip/btn_elevated_fx_focus.svg
new file mode 100644
index 000000000000..2cadcfce6a93
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_elevated_fx_focus.svg
@@ -0,0 +1,18 @@
+<svg width="18" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="b" x1="1.4220984" x2="24.143082" y1="19.699568" y2="19.699568" gradientTransform="matrix(1 0 0 .65217391 3.0040741e-5 -17.47828)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".30102351"/>
+			<stop stop-color="#141414" offset="1"/>
+		</linearGradient>
+		<linearGradient id="a" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(1 0 0 .65217391 0 -16.173913)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<path d="m17 2.708984v21.291016c0 .545351-.454649 1-1 1h-14c-.043374 0-.073191.0036-.1152344-.002.2892095.571048.7949947 1.002 1.6152344 1.002h12c1.108 0 2-.892 2-2v-20.0000004c0-.4998619-.19821-.9420109-.5-1.2910156z"/>
+	<rect transform="rotate(90)" x="1.50003" y="-16.5" width="23" height="15" rx="1.5" ry=".97826087" color="#000000" fill="url(#a)"/>
+	<rect transform="rotate(90)" x="1.50003" y="-16.5" width="23" height="15" rx=".30000001" ry=".19565219" fill="none" stroke="url(#b)" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2" y="-16" width="22" height="14" color="#000000" fill-opacity=".09019608"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_elevated_fx_focus_active.svg b/res/skins/LateNight/buttons_flip/btn_elevated_fx_focus_active.svg
new file mode 100644
index 000000000000..7c200ca6acf4
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_elevated_fx_focus_active.svg
@@ -0,0 +1,10 @@
+<svg width="18" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="-24.500031" x2="-1.5000305" y1="-13" y2="-13" gradientTransform="matrix(.95652174 0 0 .60869566 25.434811 -1.0869565)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".39215687" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2" y="-16" width="22" height="14" rx=".5" ry=".31818181" color="#000000" fill="url(#a)"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_elevated_fx_selector.svg b/res/skins/LateNight/buttons_flip/btn_elevated_fx_selector.svg
new file mode 100644
index 000000000000..c2511052c803
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_elevated_fx_selector.svg
@@ -0,0 +1,18 @@
+<svg width="25" height="25" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="c" x1="1.4220984" x2="24.143082" y1="19.699568" y2="19.699568" gradientTransform="translate(-.99996996 -25.00003)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".30102351"/>
+			<stop stop-color="#141414" offset="1"/>
+		</linearGradient>
+		<linearGradient id="d" x1="2" x2="24" y1="12" y2="12" gradientTransform="translate(-1,-23)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect x=".5" y=".5" width="24" height="24" fill="none" stroke="#141414" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x=".50003004" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#d)"/>
+	<path d="m23.31367 1.17583c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 1.965573-2 1.965572l-19.49922-2e-5c-.6598637-1e-6-1.135675-.352003-1.325-.511743.2090942.790888.7641575 1.546141 1.8242 1.546141h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#020201"/>
+	<rect transform="rotate(90)" x=".50003004" y="-23.5" width="23" height="23" rx=".30000001" ry=".30000001" fill="none" stroke="url(#c)" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_elevated_medium.svg b/res/skins/LateNight/buttons_flip/btn_elevated_medium.svg
new file mode 100644
index 000000000000..2c1f124be1d5
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_elevated_medium.svg
@@ -0,0 +1,18 @@
+<svg width="42" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="d" x1="1.00003" x2="25.000031" y1="-26" y2="-26" gradientTransform="matrix(1 0 0 .79591837 .80952381 16.332338)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".30102351"/>
+			<stop stop-color="#141414" offset="1"/>
+		</linearGradient>
+		<linearGradient id="c" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(.95652175 0 0 1.6521739 .56518906 -39.173913)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<path d="m40.31446 2.17593c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 1.965576-2 1.965572l-35.50001-.00012c-.6598637-2e-6-1.135675-.352003-1.325-.511743.2090942.790888.7641575 1.546138 1.8242 1.546141l36.00079 1e-4c1.108 3e-6 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#020201"/>
+	<rect transform="rotate(90)" x="1.50003" y="-40.5" width="23" height="39" rx=".30000001" ry=".23877552" fill="none" stroke="url(#d)" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2" y="-40" width="22" height="38" color="#000000" fill-opacity=".09019608" stroke-width=".99999994"/>
+	<rect transform="rotate(90)" x="2" y="-40" width="22" height="38" color="#000000" fill="url(#c)" stroke-width=".99999994"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_elevated_medium_active.svg b/res/skins/LateNight/buttons_flip/btn_elevated_medium_active.svg
new file mode 100644
index 000000000000..597828a07a0e
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_elevated_medium_active.svg
@@ -0,0 +1,10 @@
+<svg width="42" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="-24.500031" x2="-1.5000305" y1="-13" y2="-13" gradientTransform="matrix(1,0,0,1.6865942,26.50003,1.321558)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".39215687" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2" y="-40" width="22" height="38" rx="1" ry=".79166669" color="#000000" fill="url(#a)" stroke-width=".99999994"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_elevated_medium_set.svg b/res/skins/LateNight/buttons_flip/btn_elevated_medium_set.svg
new file mode 100644
index 000000000000..ef92b4599376
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_elevated_medium_set.svg
@@ -0,0 +1,17 @@
+<svg width="42" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="c" x1="1" x2="25" y1="13.00003" y2="13.00003" gradientTransform="matrix(.99999998 0 0 1.6956522 2.4812674e-8 -43.043529)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity="0" offset="0"/>
+			<stop stop-color="#090909" stop-opacity="0" offset=".30102351"/>
+			<stop stop-opacity=".44949496" offset="1"/>
+		</linearGradient>
+		<linearGradient id="d" x1="1.5097979" x2="24.381355" y1="12" y2="12" gradientTransform="matrix(.95652174 0 0 1.6521739 .56518861 -39.173916)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".54365706"/>
+			<stop stop-opacity=".47058824" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2" y="-40" width="22" height="38" color="#000000" fill="url(#d)" stroke-width=".99999994"/>
+	<path d="m40.999953 2.7084922v20.9902348c0 .711551-.58923 1.300771-1.300781 1.300781l-37.3983908.000492c-.1572625 2e-6-.3069938-.03341-.4472656-.08594.2830595.59834.79839 1.085938 1.6464844 1.08594l35.998-.000492c1.108 2e-6 2-.892 2-2v-20.0000002c0-.4998619-.196257-.9420109-.498047-1.2910156z"/>
+	<rect transform="rotate(90)" x="1.4999999" y="-40.5" width="23" height="39" rx=".80000001" ry=".63673472" fill="none" stroke="url(#c)" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_elevated_play.svg b/res/skins/LateNight/buttons_flip/btn_elevated_play.svg
new file mode 100644
index 000000000000..3f8ab8d77907
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_elevated_play.svg
@@ -0,0 +1,18 @@
+<svg width="68" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="1.00003" x2="25.000031" y1="-26" y2="-26" gradientTransform="matrix(1 0 0 1.3265306 .80952381 28.220564)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".30102351"/>
+			<stop stop-color="#141414" offset="1"/>
+		</linearGradient>
+		<linearGradient id="b" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(.95652175 0 0 2.7826086 .56518906 -64.608695)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<path d="m66.31446 2.17593c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 1.965574-2 1.965572l-61.50001-.00012c-.6598637-1e-6-1.135675-.352003-1.325-.511743.2090942.790888.7641575 1.546139 1.8242 1.546141l62.00079 1e-4c1.108 2e-6 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#020201"/>
+	<rect transform="rotate(90)" x="1.50003" y="-66.5" width="23" height="65" rx=".30000001" ry=".3979592" fill="none" stroke="url(#a)" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2" y="-66" width="22" height="64" color="#000000" fill-opacity=".09019608" stroke-width=".99999988"/>
+	<rect transform="rotate(90)" x="2" y="-66" width="22" height="64" color="#000000" fill="url(#b)" stroke-width=".99999988"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_elevated_play_active.svg b/res/skins/LateNight/buttons_flip/btn_elevated_play_active.svg
new file mode 100644
index 000000000000..3f0569e092b8
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_elevated_play_active.svg
@@ -0,0 +1,10 @@
+<svg width="68" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="-24.500031" x2="-1.5000305" y1="-13" y2="-13" gradientTransform="matrix(1,0,0,2.8405797,26.50003,3.594203)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".39215687" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2" y="-66" width="22" height="64" rx="1" ry="1.3333334" color="#000000" fill="url(#a)" stroke-width=".99999988"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_elevated_square.svg b/res/skins/LateNight/buttons_flip/btn_elevated_square.svg
new file mode 100644
index 000000000000..ef43347eee2e
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_elevated_square.svg
@@ -0,0 +1,18 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="b" x1="1.4220984" x2="24.143082" y1="19.699568" y2="19.699568" gradientTransform="translate(3.0040741e-5,-26.00003)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".30102351"/>
+			<stop stop-color="#141414" offset="1"/>
+		</linearGradient>
+		<linearGradient id="a" x1="2" x2="24" y1="12" y2="12" gradientTransform="translate(0,-24)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<path d="m25 2.708984v21.291016c0 .545351-.454649 1-1 1h-22c-.043374 0-.073191.0036-.1152344-.002.2892095.571048.7949947 1.002 1.6152344 1.002h20c1.108 0 2-.892 2-2v-20.0000004c0-.4998619-.19821-.9420109-.5-1.2910156z"/>
+	<rect transform="rotate(90)" x="1.50003" y="-24.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/>
+	<rect transform="rotate(90)" x="1.50003" y="-24.5" width="23" height="23" rx=".30000001" ry=".30000001" fill="none" stroke="url(#b)" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2" y="-24" width="22" height="22" color="#000000" fill-opacity=".09019608"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_elevated_square_active.svg b/res/skins/LateNight/buttons_flip/btn_elevated_square_active.svg
new file mode 100644
index 000000000000..7f94324c6e85
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_elevated_square_active.svg
@@ -0,0 +1,10 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="-24.500031" x2="-1.5000305" y1="-13" y2="-13" gradientTransform="matrix(.95652174 0 0 .95652174 25.434811 -.56521739)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".39215687" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2" y="-24" width="22" height="22" rx=".5" ry=".5" color="#000000" fill="url(#a)"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_elevated_square_big.svg b/res/skins/LateNight/buttons_flip/btn_elevated_square_big.svg
new file mode 100644
index 000000000000..385175ba9a0b
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_elevated_square_big.svg
@@ -0,0 +1,18 @@
+<svg width="34" height="34" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="b" x1="1" x2="25" y1="13.00003" y2="13.00003" gradientTransform="matrix(1.3478261 0 0 1.3478261 -.52170877 -34.52178)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#333" offset="0"/>
+			<stop stop-color="#333" offset=".49880221"/>
+			<stop stop-color="#232323" offset="1"/>
+		</linearGradient>
+		<linearGradient id="a" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(1.3478261 0 0 1.3478261 -.5217492 -31.826087)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="1.5000298" y="-32.5" width="31" height="31" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/>
+	<path d="m32.313235 2.17593c.11592.25262.185548.52951.18555.82422l.000225 28c9e-6 1.0994-.9006 1.965577-2 1.965572l-27.49901-.00012c-.6598637-3e-6-1.135675-.352003-1.325-.511743.2090942.790888.7641575 1.546137 1.8242 1.546141l27.99979 1e-4c1.108 4e-6 2.000009-.892 2-2l-.000225-28c-7e-6-.81658-.48717-1.5129-1.1855-1.8242z" fill="#020201"/>
+	<rect transform="rotate(90)" x="1.5000311" y="-32.5" width="31" height="31" rx=".30000001" ry=".30000001" fill="none" stroke="url(#b)" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2" y="-32" width="30" height="30" color="#000000" fill-opacity=".09019608"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_elevated_square_big_active.svg b/res/skins/LateNight/buttons_flip/btn_elevated_square_big_active.svg
new file mode 100644
index 000000000000..d57a7d69e11e
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_elevated_square_big_active.svg
@@ -0,0 +1,11 @@
+<svg width="34" height="34" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="a" x1="1.5000294" x2="24.500029" y1="12" y2="12" gradientTransform="matrix(1.3478261 0 0 1.3478261 -.52174896 -31.826087)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".47451" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="1.5000305" y="-32.5" width="31" height="31" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/>
+	<rect x="1.5" y="1.5000311" width="31" height="31" rx=".30000001" ry=".30000001" fill="none" stroke="#888" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_elevated_square_set.svg b/res/skins/LateNight/buttons_flip/btn_elevated_square_set.svg
new file mode 100644
index 000000000000..86dc2d0ac876
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_elevated_square_set.svg
@@ -0,0 +1,18 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="1.5097979" x2="24.381355" y1="12" y2="12" gradientTransform="matrix(.95652182 0 0 .95652182 .56518861 -23.521742)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".54365706"/>
+			<stop stop-opacity=".47058824" offset="1"/>
+		</linearGradient>
+		<linearGradient id="b" x1="1" x2="25" y1="13.00003" y2="13.00003" gradientTransform="translate(1.502544e-8,-26.00003)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#0c0c0c" stop-opacity="0" offset="0"/>
+			<stop stop-opacity="0" offset=".57185686"/>
+			<stop stop-opacity=".59090906" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2" y="-24" width="22" height="22" color="#000000" fill="url(#a)"/>
+	<path d="m25 2.7089844v21.2910156c0 .545351-.454649 1-1 1h-22c-.043374 0-.073191.0036-.1152344-.002.2892095.571048.7949947 1.002 1.6152344 1.002h20c1.108 0 2-.892 2-2v-20c0-.4998619-.19821-.9420109-.5-1.2910156z"/>
+	<rect transform="rotate(90)" x="1.4999999" y="-24.5" width="23" height="23" fill="none" stroke="url(#b)" stroke-linecap="round" stroke-linejoin="round" stroke-width=".99999994" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2" y="-24" width="22" height="22" color="#000000" fill-opacity=".2020201"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_elevated_wide.svg b/res/skins/LateNight/buttons_flip/btn_elevated_wide.svg
new file mode 100644
index 000000000000..9b50246ade14
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_elevated_wide.svg
@@ -0,0 +1,18 @@
+<svg width="52" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="1.00003" x2="25.000031" y1="-26" y2="-26" gradientTransform="translate(.80952381 20.904732)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".30102351"/>
+			<stop stop-color="#141414" offset="1"/>
+		</linearGradient>
+		<linearGradient id="b" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(.95652175 0 0 2.0869565 .56518906 -48.956522)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<path d="m50.31446 2.17593c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 1.965575-2 1.965572l-45.50001-.00012c-.6598637-2e-6-1.135675-.352003-1.325-.511743.2090942.790888.7641575 1.546139 1.8242 1.546141l46.00079 1e-4c1.108 2e-6 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#020201"/>
+	<rect transform="rotate(90)" x="1.50003" y="-50.5" width="23" height="49" rx=".30000001" ry=".30000001" fill="none" stroke="url(#a)" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2" y="-50" width="22" height="48" color="#000000" fill-opacity=".09019608"/>
+	<rect transform="rotate(90)" x="2" y="-50" width="22" height="48" color="#000000" fill="url(#b)" stroke-width=".99999994"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_elevated_wide_active.svg b/res/skins/LateNight/buttons_flip/btn_elevated_wide_active.svg
new file mode 100644
index 000000000000..4ae02cea8728
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_elevated_wide_active.svg
@@ -0,0 +1,10 @@
+<svg width="52" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="-24.500031" x2="-1.5000305" y1="-13" y2="-13" gradientTransform="matrix(1,0,0,2.1304348,26.50003,2.1956522)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".39215687" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2" y="-50" width="22" height="48" rx="1" ry="1" color="#000000" fill="url(#a)"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_elevated_wide_set.svg b/res/skins/LateNight/buttons_flip/btn_elevated_wide_set.svg
new file mode 100644
index 000000000000..73e09d9bb81d
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_elevated_wide_set.svg
@@ -0,0 +1,17 @@
+<svg width="52" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="b" x1="1" x2="25" y1="13.00003" y2="13.00003" gradientTransform="matrix(.99999998 0 0 2.1304348 2.4812674e-8 -53.695716)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity="0" offset="0"/>
+			<stop stop-color="#090909" stop-opacity="0" offset=".30102351"/>
+			<stop stop-opacity=".44949496" offset="1"/>
+		</linearGradient>
+		<linearGradient id="a" x1="1.5097979" x2="24.381355" y1="12" y2="12" gradientTransform="matrix(.95652174 0 0 2.0869565 .56518861 -48.956525)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".54365706"/>
+			<stop stop-opacity=".47058824" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2" y="-50" width="22" height="48" color="#000000" fill="url(#a)"/>
+	<path d="m51 2.7089844v20.9902346c0 .711551-.58923 1.300781-1.300781 1.300781h-47.3984378c-.1572625 0-.3069938-.033414-.4472656-.085938.2830595.598338.79839 1.085936 1.6464844 1.085938h45.998047c1.108 2e-6 2-.892 2-2v-20c0-.4998619-.196257-.9420109-.498047-1.2910156z"/>
+	<rect transform="rotate(90)" x="1.4999999" y="-50.5" width="23" height="49" rx=".80000001" ry=".80000001" fill="none" stroke="url(#b)" stroke-linecap="round" stroke-linejoin="round" stroke-width=".99999994" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_border_image_spinbox.svg b/res/skins/LateNight/buttons_flip/btn_embedded_combobox.svg
similarity index 94%
rename from res/skins/LateNight/buttons/btn_border_image_spinbox.svg
rename to res/skins/LateNight/buttons_flip/btn_embedded_combobox.svg
index db32346ac571..2cc7a48b8d10 100644
--- a/res/skins/LateNight/buttons/btn_border_image_spinbox.svg
+++ b/res/skins/LateNight/buttons_flip/btn_embedded_combobox.svg
@@ -49,6 +49,20 @@
          stop-opacity=".47451" />
     </linearGradient>
   </defs>
+  <path
+     d="m 23.31367,1.17583 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.875001 -2,1.875 L 2,23.87503 c -0.2947,0 -0.8340987,-0.07706 -1.325,-0.505481 C 0.89414067,24.465835 1.6826,25 2.4992,25 h 20 c 1.108,0 2,-0.892 2,-2 V 3 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z"
+     id="path15"
+     style="opacity:0.8;fill:#020201" />
+  <rect
+     style="color:#000000;fill:url(#a)"
+     id="rect17"
+     ry="1.5"
+     rx="1.5"
+     height="23"
+     width="23"
+     y="-23.5"
+     x="0.50002998"
+     transform="rotate(90)" />
   <g
      transform="translate(0,-1)"
      style="display:none"
@@ -178,11 +192,7 @@
        d="m 10,9 v 2 H 9 v 4 h 7 V 11 H 15 V 9 Z m 2,1 h 2 v 1 h -2 z m -1,2 h 4 v 2 h -4 z" />
   </g>
   <path
-     style="opacity:0.8;fill:#030303"
-     id="path15"
-     d="m 23.31367,1.17583 c 0.11592,0.25262 0.18555,0.52951 0.18555,0.82422 v 20 c 0,1.0994 -0.9006,1.875001 -2,1.875 L 2,23.87503 c -0.2947,0 -0.8340987,-0.07706 -1.325,-0.505481 C 0.89414067,24.465835 1.6826,25 2.4992,25 h 20 c 1.108,0 2,-0.892 2,-2 V 3 c 0,-0.81658 -0.48717,-1.5129 -1.1855,-1.8242 z" />
-  <path
-     id="path19"
+     d="m 2,3e-5 c -1.0994,0 -2,0.90065 -2,2 v 20 c 0,1.0994 0.90065,2 2,2 h 20 c 1.0994,0 2,-0.90065 2,-2 v -20 c 0,-1.0994 -0.90065,-2 -2,-2 z m 0.3,1 h 19.4 c 0.56265,0 1.3,0.73735 1.3,1.3 v 19.4 c 0,0.56265 -0.73735,1.3 -1.3,1.3 H 2.3 c -0.56265,0 -1.3,-0.73735 -1.3,-1.3 v -19.4 c 0,-0.56265 0.73735,-1.3 1.3,-1.3 z"
      style="color:#000000;text-indent:0;text-transform:none;fill:#444444;fill-opacity:1"
-     d="m 2,3e-5 c -1.0994,0 -2,0.90065 -2,2 v 20 c 0,1.0994 0.90065,2 2,2 h 20 c 1.0994,0 2,-0.90065 2,-2 v -20 c 0,-1.0994 -0.90065,-2 -2,-2 z m 0.3,1 h 19.4 c 0.56265,0 1.3,0.73735 1.3,1.3 v 19.4 c 0,0.56265 -0.73735,1.3 -1.3,1.3 H 2.3 c -0.56265,0 -1.3,-0.73735 -1.3,-1.3 v -19.4 c 0,-0.56265 0.73735,-1.3 1.3,-1.3 z" />
+     id="path19" />
 </svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_embedded_combobox_focus.svg b/res/skins/LateNight/buttons_flip/btn_embedded_combobox_focus.svg
new file mode 100644
index 000000000000..c71e5e2de6c7
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_embedded_combobox_focus.svg
@@ -0,0 +1 @@
+<svg width="25" height="25" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1=".5" x2="23.5" y1="12" y2="12" gradientTransform="translate(3e-5,-24)" gradientUnits="userSpaceOnUse"><stop stop-opacity=".17647" offset="0"/><stop stop-opacity=".0047619" offset=".12672"/><stop stop-opacity="0" offset=".54348"/><stop stop-opacity=".47451" offset="1"/></linearGradient></defs><path d="m23.314 1.1758c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 1.875-2 1.875l-19.499-2e-5c-.2947 0-.8341-.07706-1.325-.50548.21914 1.0963 1.0076 1.6305 1.8242 1.6305h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#020201" opacity=".8"/><rect transform="rotate(90)" x=".50003" y="-23.5" width="23" height="23" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#323232"/><path d="m9 9h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#323232"/><path d="m9 9h7v6h-7v-1h5v-1h-2v-1h2v-2h-5v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 11v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#323232"/><path d="m9 10v3h5v2h2v-6h-2v3h-3v-2h-2" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m17 10h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#323232"/><path d="m16 9h-6v3h4v2h-5v1h7v-4h-5v-1h5v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#323232"/><path d="m9 9v6h7v-4h-5v-1h4v-1zm2 3h4v2h-4z" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#323232"/><path d="m9 9h6v3h1v1h-1v2h-2v-2h-2v-1h2v-2h-4v-1" fill="#dcdcdc"/></g></g><g transform="translate(0,-1)" display="none"><path d="m11 10v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#323232"/><path d="m10 9v2h-1v4h7v-4h-1v-2zm2 1h2v1h-2zm-1 2h4v2h-4z" fill="#dcdcdc"/></g><path d="m2 3e-5c-1.0994 0-2 .90065-2 2v20c0 1.0994.90065 2 2 2h20c1.0994 0 2-.90065 2-2v-20c0-1.0994-.90065-2-2-2zm.3 1h19.4c.56265 0 1.3.73735 1.3 1.3v19.4c0 .56265-.73735 1.3-1.3 1.3h-19.4c-.56265 0-1.3-.73735-1.3-1.3v-19.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#f60" style="text-indent:0;text-transform:none"/></svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_embedded_eqkill.svg b/res/skins/LateNight/buttons_flip/btn_embedded_eqkill.svg
new file mode 100644
index 000000000000..80678f52403a
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_embedded_eqkill.svg
@@ -0,0 +1,18 @@
+<svg width="18" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="b" x1="1.5" x2="21.405401" y1="24.500031" y2="18.657106" gradientTransform="matrix(.58695651 0 0 .58695651 1.3695652 -16.630452)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".49880221"/>
+			<stop stop-color="#1e1e1e" offset="1"/>
+		</linearGradient>
+		<linearGradient id="a" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(.60869566 0 0 .60869566 1.0869383 -15.695652)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2" y="-16" width="14" height="14" color="#000000" fill="url(#a)"/>
+	<rect transform="rotate(90)" x="2" y="-16" width="14" height="14" color="#000000" fill-opacity=".09019608"/>
+	<rect x="1.5" y="1.50003" width="15" height="15" rx=".30000001" ry=".30000001" fill="none" stroke="#020201" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2.25" y="-15.75" width="13.5" height="13.5" fill="none" stroke="url(#b)" stroke-linecap="round" stroke-width=".49999997" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_embedded_eqkill_active.svg b/res/skins/LateNight/buttons_flip/btn_embedded_eqkill_active.svg
new file mode 100644
index 000000000000..2e2e1add7cf4
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_embedded_eqkill_active.svg
@@ -0,0 +1,12 @@
+<svg width="18" height="18" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1=".5" x2="24.405561" y1="12" y2="12" gradientTransform="matrix(-.5652174 0 0 .26530613 -1.6521574 -8.4693876)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".47451" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="matrix(0,-1,-1,0,0,0)" x="-15.5" y="-15.5" width="13" height="13" rx="1.5" color="#000000" fill="url(#a)" stroke-width=".99999988"/>
+	<rect x="1.5" y="1.50003" width="15" height="15" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+	<rect x="1.5" y="1.50003" width="15" height="15" rx="1.5" ry="1.5" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_embedded_fx.svg b/res/skins/LateNight/buttons_flip/btn_embedded_fx.svg
new file mode 100644
index 000000000000..f102f367ff41
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_embedded_fx.svg
@@ -0,0 +1,18 @@
+<svg width="35" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="b" x1="1" x2="25" y1="13.00003" y2="13.00003" gradientTransform="matrix(.67391307 0 0 1.3260868 1.2391304 -34.739168)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".49880221"/>
+			<stop stop-color="#1e1e1e" offset="1"/>
+		</linearGradient>
+		<linearGradient id="a" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(.65217392 0 0 1.3913044 2.5217492 -32.804349)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="1.9999977" y="-33" width="15.999999" height="31" color="#000000" fill-opacity=".09019608"/>
+	<rect transform="rotate(90)" x="3.5000296" y="-33.5" width="15" height="32" rx="1.0714285" ry="1.2307693" color="#000000" fill="url(#a)"/>
+	<rect x="1.4999999" y="1.5000299" width="32" height="17" rx=".2461538" ry=".24285716" fill="none" stroke="#020201" stroke-linecap="round" stroke-linejoin="round" stroke-width=".99999988" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2.25" y="-32.75" width="15.5" height="30.5" fill="none" stroke="url(#b)" stroke-linecap="round" stroke-width=".49999994" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_embedded_fx_active.svg b/res/skins/LateNight/buttons_flip/btn_embedded_fx_active.svg
new file mode 100644
index 000000000000..5d308018fa03
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_embedded_fx_active.svg
@@ -0,0 +1,12 @@
+<svg width="35" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1=".5" x2="24.405561" y1="12" y2="12" gradientTransform="matrix(-.65217394 0 0 .6122449 -1.5217207 -16.275509)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".39215687" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="matrix(0,-1,-1,0,0,0)" x="-17.500002" y="-32.5" width="15" height="30" color="#000000" fill="url(#a)" stroke-width=".99999988"/>
+	<rect x="1.4999999" y="1.50003" width="32" height="17" fill="none" stroke="#020201" stroke-linecap="square" stroke-width=".99999994" style="paint-order:fill markers stroke"/>
+	<rect x="1.4999999" y="1.50003" width="32" height="17" rx="1.5" ry="1.5" fill="none" stroke="#020201" stroke-linecap="round" stroke-linejoin="round" stroke-width=".99999994" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_embedded_fx_focus.svg b/res/skins/LateNight/buttons_flip/btn_embedded_fx_focus.svg
new file mode 100644
index 000000000000..b5015f132c48
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_embedded_fx_focus.svg
@@ -0,0 +1,18 @@
+<svg width="18" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="1" x2="25" y1="13.00003" y2="13.00003" gradientTransform="matrix(.93478265 0 0 .58695645 .84782531 -16.630452)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".49880221"/>
+			<stop stop-color="#1e1e1e" offset="1"/>
+		</linearGradient>
+		<linearGradient id="b" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(1 0 0 .65217396 -6.4387355e-7 -16.173913)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="1.9999971" y="-16" width="22" height="14" color="#000000" fill-opacity=".09019608"/>
+	<rect transform="rotate(90)" x="1.5000292" y="-16.5" width="22.999998" height="15" rx="1.6428571" ry=".57692313" color="#000000" fill="url(#b)" stroke-width=".99999994"/>
+	<rect x="1.4999999" y="1.5000298" width="15" height="23" rx=".11538486" ry=".32857147" fill="none" stroke="#020201" stroke-linecap="round" stroke-linejoin="round" stroke-width=".9999997" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2.2499993" y="-15.75" width="21.5" height="13.5" fill="none" stroke="url(#a)" stroke-linecap="round" stroke-width=".49999994" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_embedded_fx_focus_active.svg b/res/skins/LateNight/buttons_flip/btn_embedded_fx_focus_active.svg
new file mode 100644
index 000000000000..db31acd42136
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_embedded_fx_focus_active.svg
@@ -0,0 +1,14 @@
+<svg width="18" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1=".5" x2="24.405561" y1="12" y2="12" gradientTransform="matrix(-.91304351 0 0 .26530613 -1.1304082 -8.4693873)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".39215687" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g stroke-width=".99999988">
+		<rect transform="matrix(0,-1,-1,0,0,0)" x="-23.500002" y="-15.5" width="21" height="13" color="#000000" fill="url(#a)"/>
+		<rect x="1.4999999" y="1.50003" width="15" height="23" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+		<rect x="1.4999999" y="1.50003" width="15" height="23" rx="1.5" ry="1.5" fill="none" stroke="#020201" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_embedded_fx_set.svg b/res/skins/LateNight/buttons_flip/btn_embedded_fx_set.svg
new file mode 100644
index 000000000000..c8852c76c247
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_embedded_fx_set.svg
@@ -0,0 +1,11 @@
+<svg width="35" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(.65217391 0 0 1.3043478 1.5217195 -31.847825)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2.5" y="-32.5" width="15" height="30" rx="1.5" ry="1.625" color="#000000" fill="url(#a)"/>
+	<rect x="1.5" y="1.5000299" width="32" height="17" rx=".32499999" ry=".30000001" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_embedded_library.svg b/res/skins/LateNight/buttons_flip/btn_embedded_library.svg
new file mode 100644
index 000000000000..66399df128f2
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_embedded_library.svg
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="24"
+   version="1.1"
+   id="svg26"
+   sodipodi:docname="btn_embedded_library.svg"
+   inkscape:version="0.92.4 (unknown)">
+  <metadata
+     id="metadata30">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="740"
+     id="namedview28"
+     showgrid="false"
+     inkscape:zoom="9.8333333"
+     inkscape:cx="-1.3728814"
+     inkscape:cy="12"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg26" />
+  <defs
+     id="defs16">
+    <linearGradient
+       id="b"
+       x1="1.8333464"
+       x2="23.988836"
+       y1="18.657106"
+       y2="18.657106"
+       gradientTransform="matrix(.93478259 0 0 .93478259 -.15220394 -24.152202)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#393939"
+         offset="0"
+         id="stop2" />
+      <stop
+         stop-color="#393939"
+         offset=".49880221"
+         id="stop4" />
+      <stop
+         stop-color="#121212"
+         offset="1"
+         id="stop6" />
+    </linearGradient>
+    <linearGradient
+       id="a"
+       x1="2"
+       x2="24"
+       y1="12"
+       y2="12"
+       gradientTransform="matrix(.95652174 0 0 .95652174 -.4348113 -22.521739)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-opacity=".0047619"
+         offset="0"
+         id="stop9" />
+      <stop
+         stop-opacity="0"
+         offset=".5"
+         id="stop11" />
+      <stop
+         stop-opacity=".47451"
+         offset="1"
+         id="stop13" />
+    </linearGradient>
+  </defs>
+  <rect
+     transform="rotate(90)"
+     x="1"
+     y="-23"
+     width="22"
+     height="22"
+     color="#000000"
+     fill="url(#a)"
+     id="rect18" />
+  <rect
+     transform="rotate(90)"
+     x="1"
+     y="-23"
+     width="22"
+     height="22"
+     color="#000000"
+     fill-opacity=".09019608"
+     id="rect20" />
+  <rect
+     x=".5"
+     y=".5"
+     width="23"
+     height="23"
+     rx=".30000001"
+     ry=".30000001"
+     fill="none"
+     stroke="#000"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     style="paint-order:fill markers stroke;stroke:#020201;stroke-opacity:1"
+     id="rect22" />
+  <rect
+     transform="rotate(90)"
+     x="1.24997"
+     y="-22.75"
+     width="21.5"
+     height="21.5"
+     fill="none"
+     stroke="url(#b)"
+     stroke-linecap="round"
+     stroke-width=".5"
+     style="paint-order:fill markers stroke"
+     id="rect24" />
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_embedded_library_active.svg b/res/skins/LateNight/buttons_flip/btn_embedded_library_active.svg
new file mode 100644
index 000000000000..672a9daac517
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_embedded_library_active.svg
@@ -0,0 +1,12 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1=".5" x2="24.405561" y1="12" y2="12" gradientTransform="matrix(-.91304352 0 0 .42857142 -.13037539 -11.142857)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".47451" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect x=".5" y=".5" width="23" height="23" fill="none" stroke="#000" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+	<rect x=".5" y=".5" width="23" height="23" ry="1.5" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+	<rect transform="matrix(0,-1,-1,0,0,0)" x="-22.499968" y="-22.5" width="21" height="21" rx="1.4999999" ry="1.5" color="#000000" fill="url(#a)"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_embedded_library_focus.svg b/res/skins/LateNight/buttons_flip/btn_embedded_library_focus.svg
new file mode 100644
index 000000000000..344a13a93138
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_embedded_library_focus.svg
@@ -0,0 +1,25 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="e" x1="1.8333464" x2="23.988836" y1="18.657106" y2="18.657106" gradientTransform="matrix(.93478259 0 0 .93478259 -.15220394 -24.152202)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".49880221"/>
+			<stop stop-color="#121212" offset="1"/>
+		</linearGradient>
+		<linearGradient id="f" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(.95652174 0 0 .95652174 -.4348113 -22.521739)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+		<linearGradient id="d" x1="12.889831" x2="12.889831" y1=".22033899" y2="27.211864" gradientTransform="matrix(.93877551 0 0 .93877551 -7.4358636 38.778969)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#f60" offset="0"/>
+			<stop stop-color="#bf4c00" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="1" y="-23" width="22" height="22" color="#000000" fill="url(#f)"/>
+	<rect transform="rotate(90)" x="1" y="-23" width="22" height="22" color="#000000" fill-opacity=".09019608"/>
+	<g fill="none" stroke-linecap="round">
+		<rect x=".5" y=".5" width="23" height="23" rx=".30000001" ry=".30000001" stroke="#000" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+		<rect transform="rotate(90)" x="1.24997" y="-22.75" width="21.5" height="21.5" stroke="url(#e)" stroke-width=".5" style="paint-order:fill markers stroke"/>
+		<rect x=".5" y=".5" width="23" height="23" rx=".30000007" ry=".30000007" opacity=".592" stroke="url(#d)" stroke-linejoin="round" stroke-width=".99999994" style="paint-order:fill markers stroke"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_embedded_medium.svg b/res/skins/LateNight/buttons_flip/btn_embedded_medium.svg
new file mode 100644
index 000000000000..3bfd062075a3
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_embedded_medium.svg
@@ -0,0 +1,18 @@
+<svg width="42" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="b" x1="1" x2="25" y1="13.00003" y2="13.00003" gradientTransform="matrix(.93478263 0 0 1.6304346 .84782605 -42.195699)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".49880221"/>
+			<stop stop-color="#1e1e1e" offset="1"/>
+		</linearGradient>
+		<linearGradient id="a" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(1,0,0,1.6956522,-3.279503e-7,-39.652175)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2" y="-40" width="22" height="38" color="#000000" fill-opacity=".09019608" stroke-width=".99999994"/>
+	<rect transform="rotate(90)" x="1.5000297" y="-40.5" width="23" height="39" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/>
+	<rect x="1.4999999" y="1.50003" width="39" height="23" rx=".29999995" ry=".30000001" fill="none" stroke="#020201" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2.25" y="-39.75" width="21.5" height="37.5" fill="none" stroke="url(#b)" stroke-linecap="round" stroke-width=".49999994" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_embedded_medium_active.svg b/res/skins/LateNight/buttons_flip/btn_embedded_medium_active.svg
new file mode 100644
index 000000000000..ec579def443c
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_embedded_medium_active.svg
@@ -0,0 +1,14 @@
+<svg width="42" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1=".5" x2="24.405561" y1="12" y2="12" gradientTransform="matrix(-.91304356 0 0 .75510204 -1.1304082 -19.489795)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".39215687" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g>
+		<rect transform="matrix(0,-1,-1,0,0,0)" x="-23.500004" y="-39.5" width="21" height="37" color="#000000" fill="url(#a)"/>
+		<rect x="1.4999999" y="1.50003" width="39" height="23" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+		<rect x="1.4999999" y="1.50003" width="39" height="23" rx="1.5" ry="1.5" fill="none" stroke="#020201" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_embedded_medium_set.svg b/res/skins/LateNight/buttons_flip/btn_embedded_medium_set.svg
new file mode 100644
index 000000000000..9795277057cf
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_embedded_medium_set.svg
@@ -0,0 +1,11 @@
+<svg width="42" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(1,0,0,1.6956521,0,-39.652173)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="1.50003" y="-40.5" width="23" height="39" rx="1.5" ry="1.625" color="#000000" fill="url(#a)"/>
+	<rect x="1.5" y="1.50003" width="39" height="23" rx=".32499999" ry=".30000001" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_embedded_play.svg b/res/skins/LateNight/buttons_flip/btn_embedded_play.svg
new file mode 100644
index 000000000000..d098c20a88b8
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_embedded_play.svg
@@ -0,0 +1,14 @@
+<svg width="68" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(.95652174 0 0 2.7826087 .5651887 -64.608695)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g>
+		<rect transform="rotate(90)" x="2" y="-66" width="22" height="64" color="#000000" fill-opacity=".09019608"/>
+		<rect transform="rotate(90)" x="2" y="-66" width="22" height="64" color="#000000" fill="url(#a)"/>
+		<rect x="1.5000001" y="1.50003" width="65" height="23" rx=".84782612" ry=".30000001" fill="none" stroke="#020201" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_embedded_play_active.svg b/res/skins/LateNight/buttons_flip/btn_embedded_play_active.svg
new file mode 100644
index 000000000000..c1a3bfdb7417
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_embedded_play_active.svg
@@ -0,0 +1,14 @@
+<svg width="68" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1=".5" x2="24.405561" y1="12" y2="12" gradientTransform="matrix(-.91304348 0 0 1.2857143 -1.130408 -31.428571)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".47451" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g>
+		<rect x="1.5000001" y="1.50003" width="65" height="23" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+		<rect transform="matrix(0,-1,-1,0,0,0)" x="-23.5" y="-65.5" width="21" height="63" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/>
+		<rect x="1.5000001" y="1.50003" width="65" height="23" rx="1.5" ry="1.5" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_embedded_square.svg b/res/skins/LateNight/buttons_flip/btn_embedded_square.svg
new file mode 100644
index 000000000000..4443297375c5
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_embedded_square.svg
@@ -0,0 +1,18 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="b" x1="1.8333464" x2="23.988836" y1="18.657106" y2="18.657106" gradientTransform="matrix(.93478259 0 0 .93478259 .84782607 -25.152202)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".49880221"/>
+			<stop stop-color="#121212" offset="1"/>
+		</linearGradient>
+		<linearGradient id="a" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(.95652174 0 0 .95652174 .5651887 -23.521739)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2" y="-24" width="22" height="22" color="#000000" fill-opacity=".09019608"/>
+	<rect transform="rotate(90)" x="2" y="-24" width="22" height="22" color="#000000" fill="url(#a)"/>
+	<rect x="1.5" y="1.50003" width="23" height="23" rx=".30000001" ry=".30000001" fill="none" stroke="#020201" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2.25" y="-23.75" width="21.5" height="21.5" fill="none" stroke="url(#b)" stroke-linecap="round" stroke-width=".5" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_embedded_square_active.svg b/res/skins/LateNight/buttons_flip/btn_embedded_square_active.svg
new file mode 100644
index 000000000000..4fd91ad22889
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_embedded_square_active.svg
@@ -0,0 +1,12 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1=".5" x2="24.405561" y1="12" y2="12" gradientTransform="matrix(-.91304348 0 0 .42857143 -1.130408 -12.142857)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".47451" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect x="1.5" y="1.50003" width="23" height="23" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+	<rect transform="matrix(0,-1,-1,0,0,0)" x="-23.5" y="-23.5" width="21" height="21" rx="1.5" color="#000000" fill="url(#a)"/>
+	<rect x="1.5" y="1.50003" width="23" height="23" rx="1.5" ry="1.5" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_embedded_square_big.svg b/res/skins/LateNight/buttons_flip/btn_embedded_square_big.svg
new file mode 100644
index 000000000000..c34935016d5c
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_embedded_square_big.svg
@@ -0,0 +1,18 @@
+<svg width="34" height="34" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="c" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(1.3478261 0 0 1.3478261 -.5217492 -31.826087)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+		<linearGradient id="b" x1="1.8333464" x2="23.988836" y1="18.657106" y2="18.657106" gradientTransform="matrix(1.2826086 0 0 1.2826086 .32608726 -33.673951)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".49880221"/>
+			<stop stop-color="#121212" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2" y="-32" width="30" height="30" color="#000000" fill-opacity=".09019608"/>
+	<rect transform="rotate(90)" x="1.5000298" y="-32.5" width="31" height="31" rx="1.5" ry="1.5" color="#000000" fill="url(#c)"/>
+	<rect x="1.5" y="1.5000311" width="31" height="31" rx=".30000001" ry=".30000001" fill="none" stroke="#020201" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2.2500002" y="-31.75" width="29.5" height="29.5" fill="none" stroke="url(#b)" stroke-linecap="round" stroke-width=".5" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_embedded_square_big_active.svg b/res/skins/LateNight/buttons_flip/btn_embedded_square_big_active.svg
new file mode 100644
index 000000000000..2bbcc9b12d9a
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_embedded_square_big_active.svg
@@ -0,0 +1,12 @@
+<svg width="34" height="34" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1=".5" x2="24.405561" y1="12" y2="12" gradientTransform="matrix(-1.2608696 0 0 .59183674 -.60865815 -15.816326)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".47451" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect x="1.5" y="1.5000298" width="31" height="31" fill="none" stroke="#020201" stroke-linecap="round" stroke-width=".99999994" style="paint-order:fill markers stroke"/>
+	<rect transform="matrix(0,-1,-1,0,0,0)" x="-31.5" y="-31.5" width="29" height="29" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/>
+	<rect x="1.5" y="1.5" width="31" height="31" rx="1.5" ry="1.5" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_embedded_square_set.svg b/res/skins/LateNight/buttons_flip/btn_embedded_square_set.svg
new file mode 100644
index 000000000000..6d86eb0599e2
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_embedded_square_set.svg
@@ -0,0 +1,13 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(.95652174 0 0 .95652174 .5651887 -23.521739)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2" y="-24" width="22" height="22" color="#000000" fill-opacity=".09019608"/>
+	<rect transform="rotate(90)" x="2" y="-24" width="22" height="22" color="#000000" fill="url(#a)"/>
+	<rect x="1.5" y="1.50003" width="23" height="23" rx=".30000001" ry=".30000001" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	<rect x="1.5" y="1.50003" width="23" height="23" rx="1.5" ry="1.5" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_embedded_tall.svg b/res/skins/LateNight/buttons_flip/btn_embedded_tall.svg
new file mode 100644
index 000000000000..59dcea8a6003
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_embedded_tall.svg
@@ -0,0 +1,18 @@
+<svg width="26" height="52" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="b" x1="1.8333464" x2="23.988836" y1="18.657106" y2="18.657106" gradientTransform="matrix(2.0652173 0 0 .93478259 -.84782727 -25.152202)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".49880221"/>
+			<stop stop-color="#121212" offset="1"/>
+		</linearGradient>
+		<linearGradient id="a" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(2.0869564 0 0 .95652174 -1.1304966 -23.521739)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="1.9999998" y="-24" width="48" height="22" color="#000000" fill-opacity=".09019608" stroke-width=".99999988"/>
+	<rect transform="rotate(90)" x="1.9999998" y="-24" width="48" height="22" color="#000000" fill="url(#a)" stroke-width=".99999988"/>
+	<rect x="1.5" y="1.5000305" width="23" height="49" rx=".30000001" ry=".30000001" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2.249999" y="-23.75" width="47.5" height="21.5" fill="none" stroke="url(#b)" stroke-linecap="round" stroke-width=".5" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_embedded_tall_active.svg b/res/skins/LateNight/buttons_flip/btn_embedded_tall_active.svg
new file mode 100644
index 000000000000..ea27ed20c1a5
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_embedded_tall_active.svg
@@ -0,0 +1,14 @@
+<svg width="26" height="52" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1=".5" x2="24.405561" y1="12" y2="12" gradientTransform="matrix(-2.1304348 0 0 .46938776 1.6956841 -12.061224)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".47451" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g>
+		<rect transform="matrix(0,-1,-1,0,0,0)" x="-50.500031" y="-24.5" width="49" height="23" color="#000000" fill="url(#a)"/>
+		<rect x="1.5" y="1.500031" width="23" height="49" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+		<rect x="1.5" y="1.500031" width="23" height="49" rx="1.5" ry="1.5" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_embedded_wide.svg b/res/skins/LateNight/buttons_flip/btn_embedded_wide.svg
new file mode 100644
index 000000000000..4b7b9544e969
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_embedded_wide.svg
@@ -0,0 +1,18 @@
+<svg width="52" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="c" x1="1" x2="25" y1="13.00003" y2="13.00003" gradientTransform="matrix(.93478259 0 0 2.0652173 .8478261 -52.847888)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".49880221"/>
+			<stop stop-color="#1e1e1e" offset="1"/>
+		</linearGradient>
+		<linearGradient id="d" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(1,0,0,2.1304348,0,-49.434783)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".0047619" offset="0"/>
+			<stop stop-opacity="0" offset=".5"/>
+			<stop stop-opacity=".47451" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect transform="rotate(90)" x="2" y="-50" width="22" height="48" color="#000000" fill-opacity=".09019608"/>
+	<rect transform="rotate(90)" x="1.50003" y="-50.5" width="23" height="49" rx="1.5" ry="1.5" color="#000000" fill="url(#d)"/>
+	<rect x="1.5" y="1.50003" width="49" height="23" rx=".30000001" ry=".30000001" fill="none" stroke="#020201" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x="2.25" y="-49.75" width="21.5" height="47.5" fill="none" stroke="url(#c)" stroke-linecap="round" stroke-width=".5" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_embedded_wide_active.svg b/res/skins/LateNight/buttons_flip/btn_embedded_wide_active.svg
new file mode 100644
index 000000000000..01474535afaa
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/btn_embedded_wide_active.svg
@@ -0,0 +1,12 @@
+<svg width="52" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1=".5" x2="24.405561" y1="12" y2="12" gradientTransform="matrix(-.91304348 0 0 .95918367 -1.1304075 -24.081632)" gradientUnits="userSpaceOnUse">
+			<stop stop-opacity=".47451" offset="0"/>
+			<stop stop-opacity="0" offset=".50727087"/>
+			<stop stop-opacity=".0047619" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect x="1.5" y="1.50003" width="49" height="23" fill="none" stroke="#020201" stroke-linecap="round" style="paint-order:fill markers stroke"/>
+	<rect transform="matrix(0,-1,-1,0,0,0)" x="-23.5" y="-49.5" width="21" height="47" rx="1.5" ry="1.5" color="#000000" fill="url(#a)"/>
+	<rect x="1.5" y="1.50003" width="49" height="23" rx="1.5" ry="1.5" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/spinbox_down.svg b/res/skins/LateNight/buttons_flip/spinbox_down.svg
new file mode 100644
index 000000000000..b7394f5ac389
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/spinbox_down.svg
@@ -0,0 +1,17 @@
+<svg width="17" height="11" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="d" x1="12.460919" x2="12.460919" y1="21.71229" y2=".37588444" gradientTransform="matrix(.96801856 0 0 1.0311015 1.9375991 -11.387575)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#141414" offset="0"/>
+			<stop stop-color="#262626" offset="1"/>
+		</linearGradient>
+		<linearGradient id="c" x1="1" x2="1" y2="24.007122" gradientTransform="translate(0,-13.007122)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".30102351"/>
+			<stop stop-color="#141414" offset="1"/>
+		</linearGradient>
+	</defs>
+	<path d="m 1,11 16,-2.62e-4 V 0 H 1 Z" color="#000000" fill="url(#d)" stroke-width=".94349116" style="text-indent:0;text-transform:none"/>
+	<path d="m9 9-3.4641429-6h6.9281999z" fill="none" stroke="#000" stroke-width="1.60000002"/>
+	<path d="m9 9-3.4641429-6h6.9281999z" fill="#bfbfbe" stroke-width=".85714287"/>
+	<rect y="-13.007122" width="1" height="24.007122" fill="url(#c)" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_beatbox_halve.svg b/res/skins/LateNight/buttons_flip/spinbox_down_pressed.svg
similarity index 59%
rename from res/skins/LateNight/buttons/btn_beatbox_halve.svg
rename to res/skins/LateNight/buttons_flip/spinbox_down_pressed.svg
index f00a07e01477..44ced2b96347 100644
--- a/res/skins/LateNight/buttons/btn_beatbox_halve.svg
+++ b/res/skins/LateNight/buttons_flip/spinbox_down_pressed.svg
@@ -6,10 +6,10 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.1"
-   height="11"
+   id="svg3063"
    width="16"
-   id="svg3063">
+   height="11"
+   version="1.1">
   <metadata
      id="metadata13">
     <rdf:RDF>
@@ -25,64 +25,82 @@
   <defs
      id="defs3071">
     <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.032,0,0,1.0145,0.5,-9.9667)"
-       y2="1.1144"
-       y1="21.841"
-       x2="12.525"
+       id="linearGradient4263"
        x1="12.551"
-       id="linearGradient4263">
+       x2="12.525"
+       y1="21.841"
+       y2="1.1144"
+       gradientTransform="matrix(1.032,0,0,1.0145,0.5,-9.9667)"
+       gradientUnits="userSpaceOnUse">
       <stop
-         offset="0"
+         id="stop5422-3-0"
          stop-color="#101010"
-         id="stop5422-3-0" />
+         offset="0" />
       <stop
-         offset="1"
+         id="stop5424-5-9"
          stop-color="#242424"
-         id="stop5424-5-9" />
+         offset="1" />
     </linearGradient>
     <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96801856,0,0,-1.0311015,18.871665,12.545084)"
-       y2="1.1144"
-       y1="21.841"
-       x2="12.525"
+       id="linearGradient6970"
        x1="12.551"
-       id="linearGradient6970">
+       x2="12.525"
+       y1="21.841"
+       y2="1.1144"
+       gradientTransform="matrix(0.96801856,0,0,-1.0311015,0.93759913,23.387575)"
+       gradientUnits="userSpaceOnUse">
       <stop
-         offset="0"
+         id="stop5422-3"
          stop-color="#101010"
-         id="stop5422-3" />
+         offset="0" />
       <stop
-         offset="1"
+         id="stop5424-5"
          stop-color="#242424"
-         id="stop5424-5" />
+         offset="1" />
     </linearGradient>
     <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96801856,0,0,-1.0311015,0.93759899,22.387575)"
-       y2="11.044087"
-       y1="32.356445"
+       xlink:href="#linearGradient4263"
+       id="linearGradient6970-5"
+       x1="12.551"
        x2="12.585544"
+       y1="21.841"
+       y2="11.044087"
+       gradientTransform="matrix(0.96801856,0,0,-1.0311015,0.93759899,22.387575)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         stop-color="#242424"
+         id="stop5424-5-5" />
+      <stop
+         offset="1"
+         stop-color="#101010"
+         id="stop5422-3-3" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient4263"
+       id="linearGradient6970-5-3"
        x1="12.585544"
-       id="linearGradient6970-5"
-       xlink:href="#linearGradient4263">
+       x2="12.585544"
+       y1="32.356445"
+       y2="11.044087"
+       gradientTransform="matrix(0.96801856,0,0,-1.0311015,0.93759899,22.387575)"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop5424-5-5"
+         offset="0"
          stop-color="#242424"
-         offset="0" />
+         id="stop5424-5-5-6" />
       <stop
-         id="stop5422-3-3"
+         offset="1"
          stop-color="#101010"
-         offset="1" />
+         id="stop5422-3-3-7" />
     </linearGradient>
   </defs>
   <path
-     style="color:#000000;text-indent:0;text-transform:none;fill:url(#linearGradient6970-5);fill-opacity:1;stroke-width:0.94349116"
+     id="path3067-6-3-5"
      d="M -1e-6,0 H 16 l 0.01546,8.0354762 C 16.021061,9.687991 14.854002,11 13.459568,11 H 0 Z"
-     id="path3067-6-3" />
+     style="color:#000000;text-indent:0;text-transform:none;fill:url(#linearGradient6970-5-3);fill-opacity:1;stroke-width:0.94349116" />
   <path
-     style="fill:#bfbfbf;stroke-width:0.85714287"
-     d="M 8,8 4.5358571,2 h 6.9281999 z"
-     id="path3065-6" />
+     id="path3065-6"
+     d="M 8.0050588,9 4.5409159,3 h 6.9282001 z"
+     style="fill:#d2d2d1;stroke-width:0.85714287" />
 </svg>
diff --git a/res/skins/LateNight/buttons_flip/spinbox_elevated_border.svg b/res/skins/LateNight/buttons_flip/spinbox_elevated_border.svg
new file mode 100644
index 000000000000..efc2c5f8e053
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/spinbox_elevated_border.svg
@@ -0,0 +1,20 @@
+<svg width="25" height="25" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="2" x2="22" y1="2" y2="22" gradientTransform="matrix(1.0476191 0 0 1.0476191 -.07142871 -.07143053)" gradientUnits="userSpaceOnUse">
+			<stop offset="0"/>
+			<stop offset=".5"/>
+			<stop stop-color="#333" stop-opacity=".97474748" offset=".5"/>
+			<stop stop-color="#333" offset="1"/>
+		</linearGradient>
+		<linearGradient id="b" x1="-1" x2="-1" y1="2" y2="25" gradientTransform="translate(1.50005,-1.507121)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".30102351"/>
+			<stop stop-color="#141414" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect x=".5" y=".5" width="24" height="24" fill="none" stroke="#111" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+	<path d="m23.31367 1.17583c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 1.965573-2 1.965572l-19.49922-2e-5c-.6598637-1e-6-1.135675-.352003-1.325-.511743.2090942.790888.7641575 1.546141 1.8242 1.546141h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#020201"/>
+	<rect x="1.4999999" y="1.4999981" width="22" height="22.000002" fill="none" stroke="url(#a)" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+	<path d="m.50005 23.492879v-23h22.99995v23" fill="none" stroke="url(#b)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1px"/>
+	<rect x="6" y="23" width="18" height="1" fill="#222" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/spinbox_elevated_border_focus.svg b/res/skins/LateNight/buttons_flip/spinbox_elevated_border_focus.svg
new file mode 100644
index 000000000000..51838ed13749
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/spinbox_elevated_border_focus.svg
@@ -0,0 +1,14 @@
+<svg width="25" height="25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="a" x1="2" x2="22" y1="2" y2="22" gradientTransform="matrix(1.0476191 0 0 1.0476191 -.07142871 -.0714286)" gradientUnits="userSpaceOnUse">
+			<stop offset="0"/>
+			<stop offset=".5"/>
+			<stop stop-color="#333" stop-opacity=".97474748" offset=".5"/>
+			<stop stop-color="#333" offset="1"/>
+		</linearGradient>
+	</defs>
+	<path d="m23.31367 1.17583c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 1.965573-2 1.965572l-19.49922-2e-5c-.6598637-1e-6-1.135675-.352003-1.325-.511743.2090942.790888.7641575 1.546141 1.8242 1.546141h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#020201"/>
+	<rect x=".5" y=".5" width="24" height="24" fill="none" stroke="#111" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+	<rect x="1.4999999" y="1.5" width="22" height="22.000002" fill="none" stroke="url(#a)" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x=".50002998" y="-23.5" width="23" height="23" rx=".30000001" ry=".30000001" fill="none" stroke="#d08e00" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/spinbox_elevated_border_hover.svg b/res/skins/LateNight/buttons_flip/spinbox_elevated_border_hover.svg
new file mode 100644
index 000000000000..490adcbe5187
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/spinbox_elevated_border_hover.svg
@@ -0,0 +1,18 @@
+<svg width="25" height="25" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="2" x2="22" y1="2" y2="22" gradientTransform="matrix(1.0476191 0 0 1.0476191 -.07142862 -.07143054)" gradientUnits="userSpaceOnUse">
+			<stop offset="0"/>
+			<stop offset=".5"/>
+			<stop stop-color="#333" stop-opacity=".97474748" offset=".5"/>
+			<stop stop-color="#333" offset="1"/>
+		</linearGradient>
+		<linearGradient id="b" x1="3.0040741e-5" x2="24.000031" y1="-12" y2="-12" gradientTransform="matrix(1.047619 0 0 1 -.07142861 0)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#888" offset="0"/>
+			<stop stop-color="#666" offset="1"/>
+		</linearGradient>
+	</defs>
+	<rect x=".5" y=".5" width="24" height="24" fill="none" stroke="#111" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+	<path d="m23.31367 1.17583c.11592.25262.18555.52951.18555.82422v20c0 1.0994-.9006 1.965573-2 1.965572l-19.49922-2e-5c-.6598637-1e-6-1.135675-.352003-1.325-.511743.2090942.790888.7641575 1.546141 1.8242 1.546141h20c1.108 0 2-.892 2-2v-20c0-.81658-.48717-1.5129-1.1855-1.8242z" fill="#020201"/>
+	<rect x="1.5" y="1.4999981" width="22" height="22.000002" fill="none" stroke="url(#a)" stroke-linecap="square" stroke-width=".99999994" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(90)" x=".50002998" y="-23.5" width="23" height="23" rx=".30000001" ry=".30000001" fill="none" stroke="url(#b)" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/spinbox_embedded_border.svg b/res/skins/LateNight/buttons_flip/spinbox_embedded_border.svg
new file mode 100644
index 000000000000..1a156148d8c7
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/spinbox_embedded_border.svg
@@ -0,0 +1,21 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="2" x2="22" y1="2" y2="22" gradientTransform="matrix(1.0476191 0 0 1.0476191 .92857129 .92856947)" gradientUnits="userSpaceOnUse">
+			<stop offset="0"/>
+			<stop offset=".5"/>
+			<stop stop-color="#333" stop-opacity=".97474748" offset=".5"/>
+			<stop stop-color="#333" offset="1"/>
+		</linearGradient>
+		<linearGradient id="b" x1="-1" x2="-1" y1="2" y2="25" gradientTransform="translate(2.50005 -.507121)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".30102351"/>
+			<stop stop-color="#141414" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g fill="none">
+		<rect x=".75" y=".75" width="24.5" height="24.5" rx=".30000007" ry=".30000007" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" style="paint-order:fill markers stroke"/>
+		<rect x="2.5" y="2.4999981" width="22" height="22.000002" stroke="url(#a)" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+		<path d="m1.50005 24.492879v-23h22.99995v23" stroke="url(#b)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1px"/>
+	</g>
+	<rect x="7" y="24" width="18" height="1" fill="#141414" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/spinbox_embedded_border_focus_cyan.svg b/res/skins/LateNight/buttons_flip/spinbox_embedded_border_focus_cyan.svg
new file mode 100644
index 000000000000..98cd685aabca
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/spinbox_embedded_border_focus_cyan.svg
@@ -0,0 +1,21 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="d" x1="2" x2="22" y1="2" y2="22" gradientTransform="matrix(1.0476191 0 0 1.0476191 .92857129 .92856947)" gradientUnits="userSpaceOnUse">
+			<stop offset="0"/>
+			<stop offset=".5"/>
+			<stop stop-color="#333" stop-opacity=".97474748" offset=".5"/>
+			<stop stop-color="#333" offset="1"/>
+		</linearGradient>
+		<linearGradient id="c" x1="-1" x2="-1" y1="2" y2="25" gradientTransform="translate(2.50005 -.507121)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".30102351"/>
+			<stop stop-color="#141414" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g fill="none">
+		<rect x=".75" y=".75" width="24.5" height="24.5" rx=".30000007" ry=".30000007" stroke="#0ff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" style="paint-order:fill markers stroke"/>
+		<rect x="2.5" y="2.4999981" width="22" height="22.000002" stroke="url(#d)" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+		<path d="m1.50005 24.492879v-23h22.99995v23" stroke="url(#c)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1px"/>
+	</g>
+	<rect x="7" y="24" width="18" height="1" fill="#141414" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/spinbox_embedded_border_focus_orange.svg b/res/skins/LateNight/buttons_flip/spinbox_embedded_border_focus_orange.svg
new file mode 100644
index 000000000000..a482f0afd702
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/spinbox_embedded_border_focus_orange.svg
@@ -0,0 +1,25 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="a" x1="2" x2="22" y1="2" y2="22" gradientTransform="matrix(1.0476191 0 0 1.0476191 .92857129 .92856947)" gradientUnits="userSpaceOnUse">
+			<stop offset="0"/>
+			<stop offset=".5"/>
+			<stop stop-color="#333" stop-opacity=".97474748" offset=".5"/>
+			<stop stop-color="#333" offset="1"/>
+		</linearGradient>
+		<linearGradient id="b" x1="-1" x2="-1" y1="2" y2="25" gradientTransform="translate(2.50005 -.507121)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".30102351"/>
+			<stop stop-color="#141414" offset="1"/>
+		</linearGradient>
+		<linearGradient id="c" x1="12.889831" x2="12.889831" y1="-42.966103" y2="17.737288" gradientTransform="translate(-7.7034199,41.525424)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#d09300" offset="0"/>
+			<stop stop-color="#bf4c00" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g fill="none">
+		<rect x=".75" y=".75" width="24.5" height="24.5" rx=".30000007" ry=".30000007" stroke="url(#c)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" style="paint-order:fill markers stroke"/>
+		<rect x="2.5" y="2.4999981" width="22" height="22.000002" stroke="url(#a)" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+		<path d="m1.50005 24.492879v-23h22.99995v23" stroke="url(#b)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1px"/>
+	</g>
+	<rect x="7" y="24" width="18" height="1" fill="#141414" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/spinbox_embedded_border_hover.svg b/res/skins/LateNight/buttons_flip/spinbox_embedded_border_hover.svg
new file mode 100644
index 000000000000..b206a41179a4
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/spinbox_embedded_border_hover.svg
@@ -0,0 +1,25 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="e" x1="2" x2="22" y1="2" y2="22" gradientTransform="matrix(1.0476191 0 0 1.0476191 .92857129 .92856947)" gradientUnits="userSpaceOnUse">
+			<stop offset="0"/>
+			<stop offset=".5"/>
+			<stop stop-color="#333" stop-opacity=".97474748" offset=".5"/>
+			<stop stop-color="#333" offset="1"/>
+		</linearGradient>
+		<linearGradient id="d" x1="-1" x2="-1" y1="2" y2="25" gradientTransform="translate(2.50005 -.507121)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".30102351"/>
+			<stop stop-color="#141414" offset="1"/>
+		</linearGradient>
+		<linearGradient id="c" x1="12.889831" x2="12.889831" y1=".22033899" y2="27.211864" gradientTransform="matrix(1.047619,0,0,1,-13.613832,46.152542)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#888" offset="0"/>
+			<stop stop-color="#666" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g fill="none">
+		<rect x=".75" y=".75" width="24.5" height="24.5" rx=".30000007" ry=".30000007" stroke="url(#c)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" style="paint-order:fill markers stroke"/>
+		<rect x="2.5" y="2.4999981" width="22" height="22.000002" stroke="url(#e)" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+		<path d="m1.50005 24.492879v-23h22.99995v23" stroke="url(#d)" stroke-linecap="round" stroke-linejoin="round" stroke-width="1px"/>
+	</g>
+	<rect x="7" y="24" width="18" height="1" fill="#141414" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/spinbox_up.svg b/res/skins/LateNight/buttons_flip/spinbox_up.svg
new file mode 100644
index 000000000000..d41da6790053
--- /dev/null
+++ b/res/skins/LateNight/buttons_flip/spinbox_up.svg
@@ -0,0 +1,17 @@
+<svg width="17" height="11" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="d" x1="12.460919" x2="12.460919" y1="32.380493" y2="11.044087" gradientTransform="matrix(.96801856 0 0 1.0311015 1.9375991 -11.387575)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#141414" offset="0"/>
+			<stop stop-color="#262626" offset="1"/>
+		</linearGradient>
+		<linearGradient id="c" x1="1" x2="1" y2="24.007122" gradientTransform="translate(-22.5,-1.5)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#393939" offset="0"/>
+			<stop stop-color="#393939" offset=".30102351"/>
+			<stop stop-color="#141414" offset="1"/>
+		</linearGradient>
+	</defs>
+	<path d="m 1,11 16,-2.62e-4 V 0 H 1 Z" color="#000000" fill="url(#d)" stroke-width=".94349116" style="text-indent:0;text-transform:none"/>
+	<path d="M 9.0050588,1.9999997 5.5409159,8 h 6.9282001 z" fill="none" stroke="#000" stroke-width="1.60000002"/>
+	<path d="M 9.0050588,1.9999997 5.5409159,8 h 6.9282001 z" fill="#bfbfbe" stroke-width=".85714287"/>
+	<rect width="1" height="24.007122" fill="url(#c)" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_beatbox_double.svg b/res/skins/LateNight/buttons_flip/spinbox_up_pressed.svg
similarity index 74%
rename from res/skins/LateNight/buttons/btn_beatbox_double.svg
rename to res/skins/LateNight/buttons_flip/spinbox_up_pressed.svg
index 0f513aa3d739..76543576a028 100644
--- a/res/skins/LateNight/buttons/btn_beatbox_double.svg
+++ b/res/skins/LateNight/buttons_flip/spinbox_up_pressed.svg
@@ -43,9 +43,9 @@
     <linearGradient
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.96801856,0,0,1.0311015,0.93759913,-11.387575)"
-       y2="11.118282"
-       y1="31.958563"
-       x2="12.551"
+       y2="1.1144"
+       y1="21.841"
+       x2="12.525"
        x1="12.551"
        id="linearGradient6970-3">
       <stop
@@ -59,7 +59,7 @@
     </linearGradient>
     <linearGradient
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96801856,0,0,1.0311015,13.245291,-12.208088)"
+       gradientTransform="matrix(0.96801856,0,0,1.0311015,0.93759913,-11.387575)"
        y2="1.1144"
        y1="21.841"
        x2="12.525"
@@ -74,13 +74,30 @@
          stop-color="#242424"
          id="stop5424-5-5" />
     </linearGradient>
+    <linearGradient
+       id="linearGradient6970-3-3"
+       x1="12.551"
+       x2="12.551"
+       y1="31.958563"
+       y2="11.118282"
+       gradientTransform="matrix(0.96801856,0,0,1.0311015,0.93759913,-11.387575)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop5422-3-6-6"
+         stop-color="#101010"
+         offset="0" />
+      <stop
+         id="stop5424-5-7-7"
+         stop-color="#242424"
+         offset="1" />
+    </linearGradient>
   </defs>
   <path
-     style="color:#000000;text-indent:0;text-transform:none;fill:url(#linearGradient6970-3);stroke-width:0.94349116"
+     id="path3067-6-7"
      d="m 0,11 16,-2.62e-4 V 2.964 C 16.0056,1.3114853 14.854001,0 13.459567,0 H 0 Z"
-     id="path3067-6-7" />
+     style="color:#000000;text-indent:0;text-transform:none;fill:url(#linearGradient6970-3-3);stroke-width:0.94349116" />
   <path
-     style="fill:#bfbfbf;stroke-width:0.85714287"
-     d="M 8.0050588,3 4.5409159,9.0000003 h 6.9282001 z"
+     style="fill:#d2d2d1;stroke-width:0.85714287"
+     d="M 8.0050588,1.9999997 4.5409159,8 h 6.9282001 z"
      id="path3065-6" />
 </svg>
diff --git a/res/skins/LateNight/deck.xml b/res/skins/LateNight/deck.xml
index f45c1ebf1a91..4f648cdb8e7b 100644
--- a/res/skins/LateNight/deck.xml
+++ b/res/skins/LateNight/deck.xml
@@ -8,53 +8,62 @@
 
       <Template src="skin:deck_rate_controls.xml"/>
 
-      <WidgetGroup>  <!-- Deck Channel -->
+      <WidgetGroup>
         <SizePolicy>me,min</SizePolicy>
         <Layout>vertical</Layout>
         <Children>
           <Template src="skin:deck_row_1_keyVinylFx.xml"/>
+
           <WidgetGroup>
             <ObjectName>DeckRows234</ObjectName>
             <SizePolicy>me,min</SizePolicy>
             <Layout>horizontal</Layout>
             <Children>
-              <WidgetGroup><!-- Big spinny -->
+
+              <WidgetGroup><!-- Big spinny /cover -->
                 <SizePolicy>min,min</SizePolicy>
-                <MaximumSize>102,</MaximumSize>
                 <Layout>horizontal</Layout>
                 <Children>
                   <WidgetGroup>
                     <SizePolicy>min,min</SizePolicy>
-                    <MaximumSize>103,</MaximumSize>
                     <Layout>horizontal</Layout>
                     <Children>
-                      <Template src="skin:spinny_coverart.xml">
-                        <SetVariable name="MaxSize">100,100</SetVariable>
-                      </Template>
+                      <!-- draws a line to separate rate rate controls and spinny/cover -->
+                      <Template src="skin:separator_spinny_cover.xml"/>
+                      <WidgetGroup>
+                        <ObjectName>BigSpinnyCoverContainer</ObjectName>
+                        <Size><Variable name="BigSpinnySize"/></Size>
+                        <Layout>horizontal</Layout>
+                        <Children>
+                          <SingletonContainer>
+                            <ObjectName>SpinnyCoverart<Variable name="channum"/></ObjectName>
+                          </SingletonContainer>
+                        </Children>
+                      </WidgetGroup>
                     </Children>
+                    <Connection>
+                      <ConfigKey persist="true">[LateNight],show_spinny_cover</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
                   </WidgetGroup>
                 </Children>
                 <Connection>
                   <ConfigKey persist="true">[Skin],show_big_spinny_coverart</ConfigKey>
                   <BindProperty>visible</BindProperty>
                 </Connection>
-              </WidgetGroup><!-- Big spinny -->
+              </WidgetGroup><!-- Big spinny /cover -->
+
               <WidgetGroup>
                 <SizePolicy>me,min</SizePolicy>
                 <Layout>vertical</Layout>
                 <Children>
-                  <WidgetGroup>
-                    <SizePolicy>me,min</SizePolicy>
-                    <Layout>horizontal</Layout>
-                    <Children>
-                      <Template src="skin:deck_row_2_3_TitleArtistTime.xml" />
-                    </Children>
-                  </WidgetGroup>
+                  <Template src="skin:deck_row_2_3_TitleArtistTime.xml" />
                   <Template src="skin:deck_row_4_overviewSpinny.xml" />
                 </Children>
               </WidgetGroup>
             </Children>
-          </WidgetGroup>
+          </WidgetGroup><!-- DeckRows234 -->
+
           <Template src="skin:deck_row_5_transportLoopJump.xml" />
         </Children>
       </WidgetGroup> <!-- /Deck Channel1 -->
diff --git a/res/skins/LateNight/deck_small.xml b/res/skins/LateNight/deck_mini.xml
similarity index 78%
rename from res/skins/LateNight/deck_small.xml
rename to res/skins/LateNight/deck_mini.xml
index 42b93cd8093c..41cbb73d5dca 100644
--- a/res/skins/LateNight/deck_small.xml
+++ b/res/skins/LateNight/deck_mini.xml
@@ -1,7 +1,8 @@
 <Template>
   <SetVariable name="group">[Channel<Variable name="channum"/>]</SetVariable>
+
   <WidgetGroup>
-    <ObjectName>DeckSmall<Variable name="channum" /></ObjectName>
+    <ObjectName>DeckMini<Variable name="channum" /></ObjectName>
     <Layout>vertical</Layout>
     <SizePolicy>me,min</SizePolicy>
     <Children>
@@ -11,21 +12,28 @@
         <SizePolicy>i,min</SizePolicy>
         <Children>
 
+          <!-- Small spinny / cover art -->
           <WidgetGroup>
-            <Size>42f,42f</Size>
+            <Size><Variable name="MiniDeckSpinnySize"/></Size>
             <Layout>horizontal</Layout>
-            <!-- hack/trick: remove the css border (top & left) from SpinnyContainer
-                so we can use the Spinny singleton from regular decks :) -->
-            <Style>QWidget {border: none};</Style>
             <Children>
-              <SingletonContainer>
-                <ObjectName>SpinnyCoverart<Variable name="channum"/></ObjectName>
-              </SingletonContainer>
+              <WidgetGroup>
+                <ObjectName>MiniDeckSpinnyCoverContainer</ObjectName>
+                <SizePolicy>me,me</SizePolicy>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <SingletonContainer>
+                    <ObjectName>SpinnyCoverart<Variable name="channum"/></ObjectName>
+                  </SingletonContainer>
+                </Children>
+              </WidgetGroup>
             </Children>
+            <Connection>
+              <ConfigKey persist="true">[LateNight],show_spinny_cover</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
           </WidgetGroup>
 
-          <WidgetGroup><Size>2f,0min</Size></WidgetGroup>
-
           <WidgetGroup>
             <ObjectName>OverviewBox</ObjectName>
             <SizePolicy>me,min</SizePolicy>
@@ -39,7 +47,7 @@
             </Children>
           </WidgetGroup>
 
-          <WidgetGroup><!-- DeckSmall_TitlePlayPosKeyBPM -->
+          <WidgetGroup><!-- DeckMini_TitlePlayPosKeyBPM -->
             <Layout>vertical</Layout>
             <Size>200min,46f</Size>
             <Children>
@@ -114,7 +122,7 @@
               </WidgetGroup><!-- Artist / Key / BPM -->
 
             </Children>
-          </WidgetGroup><!-- DeckSmall_TitlePlayPosKeyBPM -->
+          </WidgetGroup><!-- DeckMini_TitlePlayPosKeyBPM -->
 
           <WidgetGroup>
             <ObjectName>PlayContainerSmall</ObjectName>
@@ -122,11 +130,10 @@
             <Children>
               <Template src="skin:button_2state_right_display.xml">
                 <SetVariable name="TooltipId">play_cue_set</SetVariable>
-                <SetVariable name="Size">38f,38f</SetVariable>
-                <SetVariable name="state_0_unpressed">play_deck_small.svg</SetVariable>
-                <SetVariable name="state_0_pressed">play_deck_small_down.svg</SetVariable>
-                <SetVariable name="state_1_unpressed">play_deck_small_over.svg</SetVariable>
-                <SetVariable name="state_1_pressed">play_deck_small_overdown.svg</SetVariable>
+                <SetVariable name="ObjectName">PlayButtonDeckMini</SetVariable>
+                <SetVariable name="Size">34f,34f</SetVariable>
+                <SetVariable name="btn_type"><Variable name="SubRegion_btn_type"/></SetVariable>
+                <SetVariable name="btn_format">square_big</SetVariable>
                 <SetVariable name="ConfigKey"><Variable name="group"/>,play</SetVariable>
                 <SetVariable name="ConfigKeyRight"><Variable name="group"/>,cue_set</SetVariable>
                 <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,play_indicator</SetVariable>
@@ -137,5 +144,5 @@
         </Children>
       </WidgetGroup>
     </Children>
-  </WidgetGroup><!-- DeckSmall -->
+  </WidgetGroup><!-- DeckMini -->
 </Template>
diff --git a/res/skins/LateNight/deck_overview.xml b/res/skins/LateNight/deck_overview.xml
index d63f2c58f713..5b957c2ec6e3 100644
--- a/res/skins/LateNight/deck_overview.xml
+++ b/res/skins/LateNight/deck_overview.xml
@@ -4,14 +4,20 @@
     <TooltipId>waveform_overview</TooltipId>
     <Channel><Variable name="channum"/></Channel>
     <Size>150me,40me</Size>
-    <BgColor>#0f0f0f</BgColor>
+    <BgColor><Variable name="SignalBgColor"/></BgColor>
     <SignalColor><Variable name="SignalColor"/></SignalColor>
     <SignalRGBLowColor><Variable name="SignalRGBLowColor"/></SignalRGBLowColor>
     <SignalRGBMidColor><Variable name="SignalRGBMidColor"/></SignalRGBMidColor>
     <SignalRGBHighColor><Variable name="SignalRGBHighColor"/></SignalRGBHighColor>
     <PlayedOverlayColor><Variable name="PlayedOverlayColor"/></PlayedOverlayColor>
-    <PlayPosColor>#00FF00</PlayPosColor>
-    <EndOfTrackColor>#EA0000</EndOfTrackColor>
+    <PlayPosColor><Variable name="PlayPosColor"/></PlayPosColor>
+    <EndOfTrackColor><Variable name="EndOfTrackColor"/></EndOfTrackColor>
+    <!--LabelFontSize>12</LabelFontSize>
+    <LabelTextColor>#fff</LabelTextColor>
+    <LabelBackgroundColor>rgba(0,0,0,255)</LabelBackgroundColor>
+    <LabelBackgroundColor>0,0,0,255</LabelBackgroundColor>
+    <LabelBackgroundColor>#aa000000</LabelBackgroundColor>
+    <LabelBackgroundColor>0,0,0,255</LabelBackgroundColor-->
     <DefaultMark>
       <Align>bottom|right</Align>
       <Color>#FF0000</Color>
diff --git a/res/skins/LateNight/deck_rate_controls.xml b/res/skins/LateNight/deck_rate_controls.xml
index 4021d9069cac..2100212c5599 100644
--- a/res/skins/LateNight/deck_rate_controls.xml
+++ b/res/skins/LateNight/deck_rate_controls.xml
@@ -1,202 +1,198 @@
 <Template>
+  <SetVariable name="btn_type"><Variable name="TopRegion_btn_type"/></SetVariable>
+  <SetVariable name="btn_format">square</SetVariable>
+
   <WidgetGroup>
-    <ObjectName>RateContainer</ObjectName>
     <Layout>vertical</Layout>
     <SizePolicy>min,me</SizePolicy>
     <Children>
-
-      <WidgetGroup><!-- BPM + rate -->
-        <ObjectName>AlignCenter</ObjectName>
+      <WidgetGroup>
+        <ObjectName>RateContainer</ObjectName>
         <Layout>vertical</Layout>
         <SizePolicy>min,me</SizePolicy>
-        <MaximumSize>,46</MaximumSize>
         <Children>
-          <WidgetGroup><!-- BpmContainer + Tap overlay -->
+
+          <WidgetGroup><!-- BPM + rate -->
             <ObjectName>BpmContainer</ObjectName>
-            <Layout>stacked</Layout>
-            <Size>62f,22f</Size>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,me</SizePolicy>
+            <MaximumSize>,46</MaximumSize>
             <Children>
-              <!-- In order to make the bpm display tappable, we use an old-style
-              widget group and put the bpm pushbutton on top of the display. -->
-              <PushButton>
-                <TooltipId>bpm_tap_visual_bpm</TooltipId>
-                <Size>62f,22f</Size>
-                <NumberStates>1</NumberStates>
-                <State>
-                  <Number>0</Number>
-                </State>
-                <State>
-                  <Number>1</Number>
-                </State>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,bpm_tap</ConfigKey>
-                  <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-                </Connection>
-              </PushButton>
-              <NumberBpm>
-                <ObjectName>BpmText</ObjectName>
-                <TooltipId>visual_bpm</TooltipId>
+              <WidgetGroup><!-- BpmContainer + Tap overlay -->
+                <ObjectName>AlignCenter</ObjectName>
+                <Layout>stacked</Layout>
                 <Size>62f,22f</Size>
+                <Children>
+                  <!-- In order to make the bpm display tappable, we use an old-style
+                  widget group and put the bpm pushbutton on top of the display. -->
+                  <PushButton>
+                    <TooltipId>bpm_tap_visual_bpm</TooltipId>
+                    <Size>62f,22f</Size>
+                    <NumberStates>1</NumberStates>
+                    <State>
+                      <Number>0</Number>
+                    </State>
+                    <State>
+                      <Number>1</Number>
+                    </State>
+                    <Connection>
+                      <ConfigKey><Variable name="group"/>,bpm_tap</ConfigKey>
+                      <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+                    </Connection>
+                  </PushButton>
+                  <NumberBpm>
+                    <ObjectName>BpmText</ObjectName>
+                    <TooltipId>visual_bpm</TooltipId>
+                    <Size>62f,22f</Size>
+                    <Channel><Variable name="channum" /></Channel>
+                    <NumberOfDigits>2</NumberOfDigits>
+                    <Connection>
+                      <ConfigKey><Variable name="group"/>,visual_bpm</ConfigKey>
+                    </Connection>
+                  </NumberBpm>
+                </Children>
+              </WidgetGroup><!-- BpmContainer + Tap overlay -->
+
+              <NumberRate>
+                <TooltipId>rate_display</TooltipId>
+                <ObjectName>RateText</ObjectName>
                 <Channel><Variable name="channum" /></Channel>
                 <NumberOfDigits>2</NumberOfDigits>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,visual_bpm</ConfigKey>
-                </Connection>
-              </NumberBpm>
+              </NumberRate>
             </Children>
-          </WidgetGroup><!-- BpmContainer + Tap overlay -->
-
-          <NumberRate>
-            <TooltipId>rate_display</TooltipId>
-            <ObjectName>RateText</ObjectName>
-            <Channel><Variable name="channum" /></Channel>
-            <NumberOfDigits>2</NumberOfDigits>
-          </NumberRate>
-        </Children>
-      </WidgetGroup><!-- BPM + rate -->
+          </WidgetGroup><!-- BPM + rate -->
 
-      <WidgetGroup>
-        <ObjectName>RateControls</ObjectName>
-        <SizePolicy>min,me</SizePolicy>
-        <Layout>horizontal</Layout>
-        <Children>
-          <SliderComposed>
-            <ObjectName>RateSlider</ObjectName>
-            <TooltipId>rate</TooltipId>
-            <Handle scalemode="STRETCH">skin:/knobs_sliders/knob_pitch_deck.svg</Handle>
-            <Slider>skin:/knobs_sliders/slider_pitch_deck.svg</Slider>
-            <Horizontal>false</Horizontal>
-            <Connection>
-              <ConfigKey><Variable name="group"/>,rate</ConfigKey>
-            </Connection>
-          </SliderComposed>
-
-          <WidgetGroup><!-- RateButtons for different rate directions -->
-            <ObjectName>RateButtons</ObjectName>
-            <Layout>vertical</Layout>
-            <SizePolicy>min,min</SizePolicy>
+          <WidgetGroup>
+            <ObjectName>RateControls</ObjectName>
+            <SizePolicy>min,me</SizePolicy>
+            <Layout>horizontal</Layout>
             <Children>
-              <WidgetGroup><Size>0min,2f</Size></WidgetGroup>
-              <WidgetGroup><!-- Rate buttons for up=faster -->
+              <SliderComposed>
+                <ObjectName>RateSlider</ObjectName>
+                <Size>40f,113f</Size>
+                <TooltipId>rate</TooltipId>
+                <Handle scalemode="STRETCH_ASPECT">skin:/sliders_<Variable name="slider_scheme"/>/knob_pitch_deck.svg</Handle>
+                <Slider scalemode="STRETCH_ASPECT">skin:/sliders_<Variable name="slider_scheme"/>/slider_pitch_deck.svg</Slider>
+                <Horizontal>false</Horizontal>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,rate</ConfigKey>
+                </Connection>
+              </SliderComposed>
+
+              <WidgetGroup><!-- RateButtons for different rate directions -->
+                <ObjectName>RateButtons</ObjectName>
                 <Layout>vertical</Layout>
                 <SizePolicy>min,min</SizePolicy>
                 <Children>
-                  <Template src="skin:button_1state_right.xml">
-                    <SetVariable name="TooltipId">rate_perm_up_rate_perm_up_small</SetVariable>
-                    <SetVariable name="Size">26f,26f</SetVariable>
-                    <SetVariable name="state_0_pressed">plus_overdown.svg</SetVariable>
-                    <SetVariable name="state_0_unpressed">plus.svg</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="group"/>,rate_perm_up</SetVariable>
-                    <SetVariable name="ConfigKeyRight"><Variable name="group"/>,rate_perm_up_small</SetVariable>
-                  </Template>
+                  <WidgetGroup><!-- Rate buttons for up=faster -->
+                    <Layout>vertical</Layout>
+                    <SizePolicy>min,min</SizePolicy>
+                    <Children>
+                      <Template src="skin:button_1state_right.xml">
+                        <SetVariable name="TooltipId">rate_perm_up_rate_perm_up_small</SetVariable>
+                        <SetVariable name="ObjectName">RatePermUp</SetVariable>
+                        <SetVariable name="Size">26f,26f</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="group"/>,rate_perm_up</SetVariable>
+                        <SetVariable name="ConfigKeyRight"><Variable name="group"/>,rate_perm_up_small</SetVariable>
+                      </Template>
 
-                  <Template src="skin:button_1state_right.xml">
-                    <SetVariable name="TooltipId">rate_temp_up_rate_temp_up_small</SetVariable>
-                    <SetVariable name="Size">26f,26f</SetVariable>
-                    <SetVariable name="state_0_pressed">arrow_right_overdown.svg</SetVariable>
-                    <SetVariable name="state_0_unpressed">arrow_right.svg</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="group"/>,rate_temp_up</SetVariable>
-                    <SetVariable name="ConfigKeyRight"><Variable name="group"/>,rate_temp_up_small</SetVariable>
-                  </Template>
+                      <Template src="skin:button_1state_right.xml">
+                        <SetVariable name="TooltipId">rate_temp_up_rate_temp_up_small</SetVariable>
+                        <SetVariable name="ObjectName">RateTempUp</SetVariable>
+                        <SetVariable name="Size">26f,26f</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="group"/>,rate_temp_up</SetVariable>
+                        <SetVariable name="ConfigKeyRight"><Variable name="group"/>,rate_temp_up_small</SetVariable>
+                      </Template>
 
-                  <Template src="skin:button_1state_right.xml">
-                    <SetVariable name="TooltipId">rate_temp_down_rate_temp_down_small</SetVariable>
-                    <SetVariable name="Size">26f,26f</SetVariable>
-                    <SetVariable name="state_0_pressed">arrow_left_overdown.svg</SetVariable>
-                    <SetVariable name="state_0_unpressed">arrow_left.svg</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="group"/>,rate_temp_down</SetVariable>
-                    <SetVariable name="ConfigKeyRight"><Variable name="group"/>,rate_temp_down_small</SetVariable>
-                  </Template>
+                      <Template src="skin:button_1state_right.xml">
+                        <SetVariable name="TooltipId">rate_temp_down_rate_temp_down_small</SetVariable>
+                        <SetVariable name="ObjectName">RateTempDown</SetVariable>
+                        <SetVariable name="Size">26f,26f</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="group"/>,rate_temp_down</SetVariable>
+                        <SetVariable name="ConfigKeyRight"><Variable name="group"/>,rate_temp_down_small</SetVariable>
+                      </Template>
 
-                  <Template src="skin:button_1state_right.xml">
-                    <SetVariable name="TooltipId">rate_perm_down_rate_perm_down_small</SetVariable>
-                    <SetVariable name="Size">26f,26f</SetVariable>
-                    <SetVariable name="state_0_pressed">minus_overdown.svg</SetVariable>
-                    <SetVariable name="state_0_unpressed">minus.svg</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="group"/>,rate_perm_down</SetVariable>
-                    <SetVariable name="ConfigKeyRight"><Variable name="group"/>,rate_perm_down_small</SetVariable>
-                  </Template>
-                </Children>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,rate_dir</ConfigKey>
-                  <Transform><IsEqual>1</IsEqual></Transform>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup><!-- /Rate buttons for up=faster -->
+                      <Template src="skin:button_1state_right.xml">
+                        <SetVariable name="TooltipId">rate_perm_down_rate_perm_down_small</SetVariable>
+                        <SetVariable name="ObjectName">RatePermDown</SetVariable>
+                        <SetVariable name="Size">26f,26f</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="group"/>,rate_perm_down</SetVariable>
+                        <SetVariable name="ConfigKeyRight"><Variable name="group"/>,rate_perm_down_small</SetVariable>
+                      </Template>
+                    </Children>
+                    <Connection>
+                      <ConfigKey><Variable name="group"/>,rate_dir</ConfigKey>
+                      <Transform><IsEqual>1</IsEqual></Transform>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup><!-- /Rate buttons for up=faster -->
 
-              <WidgetGroup><!-- Rate buttons for up=slower -->
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                  <Template src="skin:button_1state_right.xml">
-                    <SetVariable name="TooltipId">rate_perm_down_rate_perm_down_small</SetVariable>
-                    <SetVariable name="Size">26f,26f</SetVariable>
-                    <SetVariable name="state_0_pressed">minus_overdown.svg</SetVariable>
-                    <SetVariable name="state_0_unpressed">minus.svg</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="group"/>,rate_perm_down</SetVariable>
-                    <SetVariable name="ConfigKeyRight"><Variable name="group"/>,rate_perm_down_small</SetVariable>
-                  </Template>
+                  <WidgetGroup><!-- Rate buttons for up=slower -->
+                    <Layout>vertical</Layout>
+                    <SizePolicy>min,min</SizePolicy>
+                    <Children>
+                      <Template src="skin:button_1state_right.xml">
+                        <SetVariable name="TooltipId">rate_perm_down_rate_perm_down_small</SetVariable>
+                        <SetVariable name="ObjectName">RatePermDown</SetVariable>
+                        <SetVariable name="Size">26f,26f</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="group"/>,rate_perm_down</SetVariable>
+                        <SetVariable name="ConfigKeyRight"><Variable name="group"/>,rate_perm_down_small</SetVariable>
+                      </Template>
 
-                  <Template src="skin:button_1state_right.xml">
-                    <SetVariable name="TooltipId">rate_temp_down_rate_temp_down_small</SetVariable>
-                    <SetVariable name="Size">26f,26f</SetVariable>
-                    <SetVariable name="state_0_pressed">arrow_left_overdown.svg</SetVariable>
-                    <SetVariable name="state_0_unpressed">arrow_left.svg</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="group"/>,rate_temp_down</SetVariable>
-                    <SetVariable name="ConfigKeyRight"><Variable name="group"/>,rate_temp_down_small</SetVariable>
-                  </Template>
+                      <Template src="skin:button_1state_right.xml">
+                        <SetVariable name="TooltipId">rate_temp_down_rate_temp_down_small</SetVariable>
+                        <SetVariable name="ObjectName">RateTempDown</SetVariable>
+                        <SetVariable name="Size">26f,26f</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="group"/>,rate_temp_down</SetVariable>
+                        <SetVariable name="ConfigKeyRight"><Variable name="group"/>,rate_temp_down_small</SetVariable>
+                      </Template>
 
-                  <Template src="skin:button_1state_right.xml">
-                    <SetVariable name="TooltipId">rate_temp_up_rate_temp_up_small</SetVariable>
-                    <SetVariable name="Size">26f,26f</SetVariable>
-                    <SetVariable name="state_0_pressed">arrow_right_overdown.svg</SetVariable>
-                    <SetVariable name="state_0_unpressed">arrow_right.svg</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="group"/>,rate_temp_up</SetVariable>
-                    <SetVariable name="ConfigKeyRight"><Variable name="group"/>,rate_temp_up_small</SetVariable>
-                  </Template>
+                      <Template src="skin:button_1state_right.xml">
+                        <SetVariable name="TooltipId">rate_temp_up_rate_temp_up_small</SetVariable>
+                        <SetVariable name="ObjectName">RateTempUp</SetVariable>
+                        <SetVariable name="Size">26f,26f</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="group"/>,rate_temp_up</SetVariable>
+                        <SetVariable name="ConfigKeyRight"><Variable name="group"/>,rate_temp_up_small</SetVariable>
+                      </Template>
 
-                  <Template src="skin:button_1state_right.xml">
-                    <SetVariable name="TooltipId">rate_perm_up_rate_perm_up_small</SetVariable>
-                    <SetVariable name="Size">26f,26f</SetVariable>
-                    <SetVariable name="state_0_pressed">plus_overdown.svg</SetVariable>
-                    <SetVariable name="state_0_unpressed">plus.svg</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="group"/>,rate_perm_up</SetVariable>
-                    <SetVariable name="ConfigKeyRight"><Variable name="group"/>,rate_perm_up_small</SetVariable>
-                  </Template>
+                      <Template src="skin:button_1state_right.xml">
+                        <SetVariable name="TooltipId">rate_perm_up_rate_perm_up_small</SetVariable>
+                        <SetVariable name="ObjectName">RatePermUp</SetVariable>
+                        <SetVariable name="Size">26f,26f</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="group"/>,rate_perm_up</SetVariable>
+                        <SetVariable name="ConfigKeyRight"><Variable name="group"/>,rate_perm_up_small</SetVariable>
+                      </Template>
+                    </Children>
+                    <Connection>
+                      <ConfigKey><Variable name="group"/>,rate_dir</ConfigKey>
+                      <Transform><IsEqual>-1</IsEqual></Transform>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup><!-- /Rate buttons for up=slower -->
                 </Children>
                 <Connection>
-                  <ConfigKey><Variable name="group"/>,rate_dir</ConfigKey>
-                  <Transform><IsEqual>-1</IsEqual></Transform>
+                  <ConfigKey>[Skin],show_rate_control_buttons</ConfigKey>
                   <BindProperty>visible</BindProperty>
                 </Connection>
-              </WidgetGroup><!-- /Rate buttons for up=slower -->
+              </WidgetGroup><!-- RateButtons for different rate directions -->
             </Children>
-            <Connection>
-              <ConfigKey>[Skin],show_rate_control_buttons</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup><!-- RateButtons for different rate directions -->
-        </Children>
-      </WidgetGroup><!-- RateControls -->
-
-      <WidgetGroup><Size>0min,2f</Size></WidgetGroup>
+          </WidgetGroup><!-- RateControls -->
 
-      <WidgetGroup>
-        <ObjectName>SyncControls</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <Template src="skin:button_2state_right.xml">
-            <SetVariable name="TooltipId">sync_enabled</SetVariable>
-            <SetVariable name="ObjectName">SyncToggleButton</SetVariable>
-            <SetVariable name="Size">52f,26f</SetVariable>
-            <SetVariable name="state_0_pressed">sync_over.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">sync.svg</SetVariable>
-            <SetVariable name="state_1_pressed">sync_overdown.svg</SetVariable>
-            <SetVariable name="state_1_unpressed">sync_over.svg</SetVariable>
-            <SetVariable name="ConfigKey"><Variable name="group"/>,sync_enabled</SetVariable>
-            <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beatsync_tempo</SetVariable>
-          </Template>
+          <WidgetGroup>
+            <ObjectName>SyncBox</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <Template src="skin:button_2state_right.xml">
+                <SetVariable name="TooltipId">sync_enabled</SetVariable>
+                <SetVariable name="ObjectName">SyncButton</SetVariable>
+                <SetVariable name="Size">52f,26f</SetVariable>
+                <SetVariable name="btn_format">wide</SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="group"/>,sync_enabled</SetVariable>
+                <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beatsync_tempo</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
         </Children>
       </WidgetGroup>
     </Children>
diff --git a/res/skins/LateNight/deck_row_1_keyVinylFx.xml b/res/skins/LateNight/deck_row_1_keyVinylFx.xml
index e1377348e7f7..f039572d6665 100644
--- a/res/skins/LateNight/deck_row_1_keyVinylFx.xml
+++ b/res/skins/LateNight/deck_row_1_keyVinylFx.xml
@@ -6,84 +6,136 @@
     <SizePolicy>me,min</SizePolicy>
     <Children>
 
-      <Template src="skin:button_2state_right.xml">
-        <SetVariable name="TooltipId">sync_reset_key</SetVariable>
-        <SetVariable name="ObjectName">KeyButton</SetVariable>
-        <SetVariable name="Size">28f,22f</SetVariable>
-        <SetVariable name="state_0_text">KEY</SetVariable>
-        <SetVariable name="state_1_text">KEY</SetVariable>
-        <SetVariable name="ConfigKey"><Variable name="group"/>,sync_key</SetVariable>
-        <SetVariable name="ConfigKeyRight"><Variable name="group"/>,reset_key</SetVariable>
-      </Template>
+      <WidgetGroup>
+        <ObjectName>KeyButtons</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <MaximumSize>118,</MaximumSize>
+        <Children>
+          <Template src="skin:button_2state_right.xml">
+            <SetVariable name="TooltipId">sync_reset_key</SetVariable>
+            <SetVariable name="ObjectName">KeyMatchButton</SetVariable>
+            <SetVariable name="Size">26f,20f</SetVariable>
+            <!--Musical note 1/8th icon: &#9834; -->
+            <!--SetVariable name="state_0_text">&#8202;&#9834;&#8202;</SetVariable>
+            <SetVariable name="state_1_text">&#8202;&#9834;&#8202;</SetVariable-->
+            <SetVariable name="ConfigKey"><Variable name="group"/>,sync_key</SetVariable>
+            <SetVariable name="ConfigKeyRight"><Variable name="group"/>,reset_key</SetVariable>
+          </Template>
 
-      <Template src="skin:button_1state_right.xml">
-        <SetVariable name="TooltipId">pitch_down</SetVariable>
-        <SetVariable name="ObjectName">KeyButton</SetVariable>
-        <SetVariable name="Size">16f,22f</SetVariable>
-        <SetVariable name="state_0_pressed">prev_down.svg</SetVariable>
-        <SetVariable name="state_0_unpressed">prev.svg</SetVariable>
-        <SetVariable name="ConfigKey"><Variable name="group"/>,pitch_down</SetVariable>
-        <SetVariable name="ConfigKeyRight"><Variable name="group"/>,pitch_down_small</SetVariable>
-      </Template>
+          <Key>
+            <ObjectName>KeyText</ObjectName>
+            <TooltipId>track_key</TooltipId>
+            <Group><Variable name="group"/></Group>
+            <MinimumSize>30,20</MinimumSize>
+            <MaximumSize>65,20</MaximumSize>
+            <SizePolicy>me,f</SizePolicy>
+            <Elide>right</Elide>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,visual_key</ConfigKey>
+            </Connection>
+            <!-- unfortunately this doesn't indicate a not-original key -->
+            <Connection>
+              <ConfigKey><Variable name="group"/>,visual_key</ConfigKey>
+              <Transform><Not><Variable name="group"/>,file_key</Not></Transform>
+              <BindProperty>highlight</BindProperty>
+            </Connection>
+          </Key>
 
-      <Key>
-        <ObjectName>KeyText</ObjectName>
-        <TooltipId>track_key</TooltipId>
-        <Group><Variable name="group"/></Group>
-        <MinimumSize>30,20</MinimumSize>
-        <MaximumSize>65,20</MaximumSize>
-        <SizePolicy>me,f</SizePolicy>
-        <Elide>right</Elide>
-        <!-- has no effect, only 'qproperty-alignment' in style.qss works
-        <Alignment>left</Alignment-->
-        <Connection>
-          <ConfigKey><Variable name="group"/>,visual_key</ConfigKey>
-        </Connection>
-      </Key>
+          <Template src="skin:button_2state_right.xml">
+            <SetVariable name="TooltipId">pitch_up</SetVariable>
+            <SetVariable name="ObjectName">KeyUpButton</SetVariable>
+            <SetVariable name="Size">13f,20f</SetVariable>
+            <SetVariable name="ConfigKey"><Variable name="group"/>,pitch_up</SetVariable>
+            <SetVariable name="ConfigKeyRight"><Variable name="group"/>,pitch_up_small</SetVariable>
+          </Template>
 
-      <Template src="skin:button_1state_right.xml">
-        <SetVariable name="TooltipId">pitch_up</SetVariable>
-        <SetVariable name="ObjectName">KeyButton</SetVariable>
-        <SetVariable name="Size">16f,22f</SetVariable>
-        <SetVariable name="state_0_pressed">next_down.svg</SetVariable>
-        <SetVariable name="state_0_unpressed">next.svg</SetVariable>
-        <SetVariable name="ConfigKey"><Variable name="group"/>,pitch_up</SetVariable>
-        <SetVariable name="ConfigKeyRight"><Variable name="group"/>,pitch_up_small</SetVariable>
-      </Template>
+          <Template src="skin:button_2state_right.xml">
+            <SetVariable name="TooltipId">pitch_down</SetVariable>
+            <SetVariable name="ObjectName">KeyDownButton</SetVariable>
+            <SetVariable name="Size">14f,20f</SetVariable>
+            <SetVariable name="ConfigKey"><Variable name="group"/>,pitch_down</SetVariable>
+            <SetVariable name="ConfigKeyRight"><Variable name="group"/>,pitch_down_small</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
 
-      <WidgetGroup><Size>0min,0min</Size></WidgetGroup>
+      <WidgetGroup>
+        <SizePolicy>min,min</SizePolicy>
+        <MinimumSize>3,0</MinimumSize>
+      </WidgetGroup>
 
       <Template src="skin:deck_vinyl_controls.xml"/>
 
-      <WidgetGroup><Size>0min,0min</Size></WidgetGroup>
+      <WidgetGroup>
+        <SizePolicy>min,min</SizePolicy>
+        <MinimumSize>3,0</MinimumSize>
+      </WidgetGroup>
 
       <!-- FX buttons -->
       <WidgetGroup>
+        <ObjectName>AlignRightTop</ObjectName>
         <Layout>horizontal</Layout>
+        <SizePolicy>f,min</SizePolicy>
+        <Children>
+          <WidgetGroup>
+            <ObjectName>FxAssingButtonsDeck</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>f,min</SizePolicy>
+            <Children>
+              <Template src="skin:fx_assign_button_deck.xml">
+                <SetVariable name="FxUnit">1</SetVariable>
+                <SetVariable name="Width">26</SetVariable>
+                <SetVariable name="Text">&#8202;FX</SetVariable>
+              </Template>
+              <Template src="skin:fx_assign_button_deck.xml">
+                <SetVariable name="FxUnit">2</SetVariable>
+                <SetVariable name="Width">26</SetVariable>
+                <SetVariable name="Text">&#8202;FX</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+        </Children>
+        <Connection>
+          <ConfigKey>[Skin],show_4effectunits</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+      <WidgetGroup>
         <ObjectName>AlignRightTop</ObjectName>
-          <Children>
-            <Template src="skin:fx_assign_button_deck.xml">
-              <SetVariable name="FxUnit">1</SetVariable>
-            </Template>
-            <Template src="skin:fx_assign_button_deck.xml">
-              <SetVariable name="FxUnit">2</SetVariable>
-            </Template>
-            <WidgetGroup>
-              <Layout>horizontal</Layout>
-              <Children>
-                <Template src="skin:fx_assign_button_deck.xml">
-                  <SetVariable name="FxUnit">3</SetVariable>
-                </Template>
-                <Template src="skin:fx_assign_button_deck.xml">
-                  <SetVariable name="FxUnit">4</SetVariable>
-                </Template>
-              </Children>
-              <Connection>
-                <ConfigKey>[Skin],show_4effectunits</ConfigKey>
-                <BindProperty>visible</BindProperty>
-              </Connection>
-            </WidgetGroup>
+        <Layout>horizontal</Layout>
+        <SizePolicy>f,min</SizePolicy>
+        <Children>
+          <WidgetGroup>
+            <ObjectName>FxAssingButtonsDeck</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>f,min</SizePolicy>
+            <Children>
+              <Template src="skin:fx_assign_button_deck.xml">
+                <SetVariable name="FxUnit">1</SetVariable>
+                <SetVariable name="Width">26</SetVariable>
+                <SetVariable name="Text">&#8202;FX&#8202;</SetVariable>
+              </Template>
+              <Template src="skin:fx_assign_button_deck.xml">
+                <SetVariable name="FxUnit">2</SetVariable>
+                <SetVariable name="Width">20</SetVariable>
+              </Template>
+              <Template src="skin:fx_assign_button_deck.xml">
+                <SetVariable name="FxUnit">3</SetVariable>
+                <SetVariable name="Width">20</SetVariable>
+              </Template>
+              <Template src="skin:fx_assign_button_deck.xml">
+                <SetVariable name="FxUnit">4</SetVariable>
+                <SetVariable name="Width">20</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
         </Children>
+        <Connection>
+          <ConfigKey>[Skin],show_4effectunits</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
       </WidgetGroup><!-- FX buttons -->
     </Children>
   </WidgetGroup><!-- DeckRow_1_KeyVinylFx -->
diff --git a/res/skins/LateNight/deck_row_2_3_TitleArtistTime.xml b/res/skins/LateNight/deck_row_2_3_TitleArtistTime.xml
index e7d604181fed..f71d480addab 100644
--- a/res/skins/LateNight/deck_row_2_3_TitleArtistTime.xml
+++ b/res/skins/LateNight/deck_row_2_3_TitleArtistTime.xml
@@ -1,99 +1,104 @@
 <Template>
   <WidgetGroup>
-    <ObjectName>DeckRow_2_3_ArtistTitleTime</ObjectName>
-    <Layout>vertical</Layout>
-    <SizePolicy>i,min</SizePolicy>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,min</SizePolicy>
     <Children>
 
+      <!-- In Classic scheme this draws a line to separate
+          rate controls and artist/title -->
+      <Template src="skin:separator_artist_title.xml"/>
+
       <WidgetGroup>
-        <ObjectName>TitleRow</ObjectName>
-        <Layout>horizontal</Layout>
+        <ObjectName>DeckRow_2_3_ArtistTitleTime</ObjectName>
+        <Layout>vertical</Layout>
         <SizePolicy>i,min</SizePolicy>
         <Children>
+
           <WidgetGroup>
-            <ObjectName>TitleGutter</ObjectName>
+            <ObjectName>TitleRow</ObjectName>
             <Layout>horizontal</Layout>
             <SizePolicy>i,min</SizePolicy>
             <Children>
-              <TrackProperty>
-                <ObjectName>TitleText</ObjectName>
-                <Alignment>Left</Alignment>
-                <TooltipId>track_title</TooltipId>
-                <Property>title</Property>
-                <Elide>right</Elide>
-                <SizePolicy>me,min</SizePolicy>
-                <Channel><Variable name="channum"/></Channel>
-              </TrackProperty>
-            </Children>
-          </WidgetGroup>
+              <WidgetGroup>
+                <ObjectName>TitleGutter</ObjectName>
+                <Layout>horizontal</Layout>
+                <SizePolicy>i,min</SizePolicy>
+                <Children>
+                  <TrackProperty>
+                    <ObjectName>TitleText</ObjectName>
+                    <Size>0me,22f</Size>
+                    <TooltipId>track_title</TooltipId>
+                    <Property>title</Property>
+                    <Alignment>Left</Alignment>
+                    <Elide>right</Elide>
+                    <Channel><Variable name="channum"/></Channel>
+                  </TrackProperty>
+                </Children>
+              </WidgetGroup><!-- TitleGutter -->
 
-          <WidgetGroup>
-            <ObjectName>AlignRightTop</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>p,min</SizePolicy>
-            <MinimumSize>80,</MinimumSize>
-            <Children>
-              <NumberPos>
-                <ObjectName>PlayPositionText</ObjectName>
-                <TooltipId>track_time</TooltipId>
-                <SizePolicy>min,min</SizePolicy>
-                <MaximumSize>,19</MaximumSize>
-                <Alignment>right</Alignment>
-                <Channel><Variable name="channum"/></Channel>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,playposition</ConfigKey>
-                </Connection>
-              </NumberPos>
+              <WidgetGroup>
+                <ObjectName>PlayPositionGutter</ObjectName>
+                <Layout>horizontal</Layout>
+                <SizePolicy>p,min</SizePolicy>
+                <MinimumSize>80,</MinimumSize>
+                <Children>
+                  <NumberPos>
+                    <ObjectName>PlayPositionText</ObjectName>
+                    <TooltipId>track_time</TooltipId>
+                    <Size>0min,22f</Size>
+                    <Alignment>right</Alignment>
+                    <Channel><Variable name="channum"/></Channel>
+                    <Connection>
+                      <ConfigKey><Variable name="group"/>,playposition</ConfigKey>
+                    </Connection>
+                  </NumberPos>
+                </Children>
+              </WidgetGroup><!-- PlayPositionGutter -->
             </Children>
-          </WidgetGroup>
-        </Children>
-      </WidgetGroup><!-- TitleRow -->
+          </WidgetGroup><!-- TitleRow -->
 
-      <WidgetGroup>
-        <ObjectName>ArtistRow</ObjectName>
-        <Layout>horizontal</Layout>
-        <SizePolicy>me,min</SizePolicy>
-        <Children>
           <WidgetGroup>
-            <ObjectName>ArtistGutter</ObjectName>
+            <ObjectName>ArtistRow</ObjectName>
             <Layout>horizontal</Layout>
             <SizePolicy>me,min</SizePolicy>
             <Children>
-              <TrackProperty>
-                <ObjectName>ArtistText</ObjectName>
-                <TooltipId>track_artist</TooltipId>
-                <Property>artist</Property>
-                <Elide>right</Elide>
+              <WidgetGroup>
+                <ObjectName>ArtistGutter</ObjectName>
+                <Layout>horizontal</Layout>
                 <SizePolicy>me,min</SizePolicy>
-                <Channel>
-                  <Variable name="channum"/>
-                </Channel>
-              </TrackProperty>
-            </Children>
-          </WidgetGroup>
-          <WidgetGroup>
-            <ObjectName>DurationGutter</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>max,min</SizePolicy>
-            <Children>
-              <TrackProperty>
-                <ObjectName>DurationText</ObjectName>
-                <TooltipId>track_duration</TooltipId>
-                <SizePolicy>min,min</SizePolicy>
-                <MaximumSize>,20</MaximumSize>
-                <Property>durationFormatted</Property>
-                <Channel>
-                  <Variable name="channum"/>
-                </Channel>
-              </TrackProperty>
+                <Children>
+                  <TrackProperty>
+                    <ObjectName>ArtistText</ObjectName>
+                    <Size>0me,22f</Size>
+                    <TooltipId>track_artist</TooltipId>
+                    <Property>artist</Property>
+                    <Elide>right</Elide>
+                    <Channel>
+                      <Variable name="channum"/>
+                    </Channel>
+                  </TrackProperty>
+                </Children>
+              </WidgetGroup><!-- ArtistGutter -->
+              <WidgetGroup>
+                <ObjectName>DurationGutter</ObjectName>
+                <Layout>horizontal</Layout>
+                <SizePolicy>max,min</SizePolicy>
+                <Children>
+                  <TrackProperty>
+                    <ObjectName>DurationText</ObjectName>
+                    <TooltipId>track_duration</TooltipId>
+                    <Size>0min,22f</Size>
+                    <Property>durationFormatted</Property>
+                    <Channel>
+                      <Variable name="channum"/>
+                    </Channel>
+                  </TrackProperty>
+                </Children>
+              </WidgetGroup><!-- DurationGutter -->
             </Children>
-          </WidgetGroup>
+          </WidgetGroup><!-- ArtistRow -->
         </Children>
-      </WidgetGroup><!-- ArtistRow -->
+      </WidgetGroup><!-- DeckRow_2_3_ArtistTitleTime -->
     </Children>
-    <Connection>
-      <ConfigKey>[Skin],show_rate_controls</ConfigKey>
-      <BindProperty>highlight</BindProperty>
-    </Connection>
-  </WidgetGroup><!-- DeckRow_2_3_ArtistTitleTime -->
+  </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/deck_row_4_overviewSpinny.xml b/res/skins/LateNight/deck_row_4_overviewSpinny.xml
index 25b86e7ec3ec..c423ea33fbca 100644
--- a/res/skins/LateNight/deck_row_4_overviewSpinny.xml
+++ b/res/skins/LateNight/deck_row_4_overviewSpinny.xml
@@ -1,23 +1,38 @@
 <Template>
+  <SetVariable name="btn_type"></SetVariable>
+
   <WidgetGroup>
     <ObjectName>DeckRow_4_OverviewSpinny</ObjectName>
     <Layout>horizontal</Layout>
     <SizePolicy>me,me</SizePolicy>
     <Children>
+
+      <!-- Small spinny / cover art -->
       <WidgetGroup>
         <SizePolicy>min,me</SizePolicy>
-        <MaximumSize>54,</MaximumSize>
         <Layout>horizontal</Layout>
         <Children>
           <WidgetGroup>
             <SizePolicy>min,me</SizePolicy>
-            <MaximumSize>54,</MaximumSize>
             <Layout>horizontal</Layout>
             <Children>
-              <SingletonContainer>
-                <ObjectName>SpinnyCoverart<Variable name="channum"/></ObjectName>
-              </SingletonContainer>
+              <!-- draws a line to separate rate rate controls and spinny/cover -->
+              <Template src="skin:separator_spinny_cover.xml"/>
+              <WidgetGroup>
+                <ObjectName>SmallSpinnyCoverContainer</ObjectName>
+                <Size><Variable name="SmallSpinnySize"/></Size>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <SingletonContainer>
+                    <ObjectName>SpinnyCoverart<Variable name="channum"/></ObjectName>
+                  </SingletonContainer>
+                </Children>
+              </WidgetGroup>
             </Children>
+            <Connection>
+              <ConfigKey persist="true">[LateNight],show_spinny_cover</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
           </WidgetGroup>
         </Children>
         <Connection>
@@ -25,7 +40,7 @@
           <Transform><Not/></Transform>
           <BindProperty>visible</BindProperty>
         </Connection>
-      </WidgetGroup>
+      </WidgetGroup><!-- Small spinny / cover art -->
 
       <WidgetGroup>
         <ObjectName>OverviewBox</ObjectName>
@@ -38,9 +53,8 @@
         </Children>
       </WidgetGroup>
 
-      <!-- Deck controls + Star rating -->
       <WidgetGroup>
-        <ObjectName>DeckControls</ObjectName>
+        <ObjectName>DeckControlsStars</ObjectName>
         <Layout>vertical</Layout>
         <Children>
 
@@ -49,7 +63,7 @@
           <WidgetGroup>
             <ObjectName>Stars</ObjectName>
             <Layout>vertical</Layout>
-            <Size>0min,17me</Size>
+            <Size>0min,15f</Size>
             <Children>
               <StarRating>
                 <Size>0min,15f</Size>
@@ -60,71 +74,70 @@
             </Children>
           </WidgetGroup>
 
-          <WidgetGroup><Size>0min,0me</Size></WidgetGroup>
+          <WidgetGroup><Size>0min,1f</Size></WidgetGroup>
 
-          <!-- Deck controls row 1 -->
           <WidgetGroup>
+            <ObjectName>DeckControlButtons</ObjectName>
             <Layout>horizontal</Layout>
             <Children>
 
-              <Template src="skin:button_2state_nohover.xml">
+              <Template src="skin:button_2state.xml">
                 <SetVariable name="TooltipId">slip_mode</SetVariable>
-                <SetVariable name="icon">slip</SetVariable>
+                <SetVariable name="ObjectName">SlipmodeButton<Variable name="decks_group"/></SetVariable>
                 <SetVariable name="ConfigKey"><Variable name="group"/>,slip_enabled</SetVariable>
-                <SetVariable name="Size">25,18</SetVariable>
+                <SetVariable name="Size">21f,18f</SetVariable>
               </Template>
 
-              <Template src="skin:button_2state_nohover.xml">
+              <Template src="skin:button_2state.xml">
                 <SetVariable name="TooltipId">quantize</SetVariable>
-                <SetVariable name="icon">quantize</SetVariable>
+                <SetVariable name="ObjectName">QuantizeButton<Variable name="decks_group"/></SetVariable>
                 <SetVariable name="ConfigKey"><Variable name="group"/>,quantize</SetVariable>
-                <SetVariable name="Size">25,18</SetVariable>
+                <SetVariable name="Size">21f,18f</SetVariable>
               </Template>
 
               <Template src="skin:button_1state_right.xml">
                 <SetVariable name="TooltipId">beats_translate_curpos</SetVariable>
-                <SetVariable name="state_0_unpressed">beat_curpos</SetVariable>
-                <SetVariable name="state_0_pressed">beat_curpos_over</SetVariable>
+                <SetVariable name="ObjectName">CurposButton<Variable name="decks_group"/></SetVariable>
                 <SetVariable name="ConfigKey"><Variable name="group"/>,beats_translate_curpos</SetVariable>
                 <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beats_translate_match_alignment</SetVariable>
-                <SetVariable name="Size">25,18</SetVariable>
+                <SetVariable name="Size">21f,18f</SetVariable>
               </Template>
 
             </Children>
-          </WidgetGroup><!-- Deck controls row 1 -->
+          </WidgetGroup><!-- DeckControlButtons row 1 -->
 
-          <!-- Deck controls row 2 -->
           <WidgetGroup>
+            <ObjectName>DeckControlButtons</ObjectName>
             <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:button_2state_nohover.xml">
+              <Template src="skin:button_1state.xml">
                 <SetVariable name="TooltipId">eject</SetVariable>
-                <SetVariable name="icon">eject</SetVariable>
+                <SetVariable name="ObjectName">EjectButton<Variable name="decks_group"/></SetVariable>
                 <SetVariable name="ConfigKey"><Variable name="group"/>,eject</SetVariable>
-                <SetVariable name="Size">25,18</SetVariable>
+                <SetVariable name="Size">21f,18f</SetVariable>
               </Template>
 
-              <Template src="skin:button_2state_nohover.xml">
+              <Template src="skin:button_2state.xml">
                 <SetVariable name="TooltipId">repeat</SetVariable>
-                <SetVariable name="icon">repeat</SetVariable>
+                <SetVariable name="ObjectName">RepeatButton<Variable name="decks_group"/></SetVariable>
                 <SetVariable name="ConfigKey"><Variable name="group"/>,repeat</SetVariable>
-                <SetVariable name="Size">25,18</SetVariable>
+                <SetVariable name="Size">21f,18f</SetVariable>
               </Template>
 
-              <Template src="skin:button_2state_nohover.xml">
+              <Template src="skin:button_2state.xml">
                 <SetVariable name="TooltipId">keylock</SetVariable>
-                <SetVariable name="icon">keylock</SetVariable>
+                <SetVariable name="ObjectName">KeylockButton<Variable name="decks_group"/></SetVariable>
                 <SetVariable name="ConfigKey"><Variable name="group"/>,keylock</SetVariable>
-                <SetVariable name="Size">25,18</SetVariable>
+                <SetVariable name="Size">21f,18f</SetVariable>
               </Template>
 
             </Children>
-          </WidgetGroup><!-- /Deck controls row 2 -->
+          </WidgetGroup><!-- /DeckControlButtons row 2 -->
 
           <WidgetGroup><Size>0min,0me</Size></WidgetGroup>
 
         </Children>
-      </WidgetGroup>
+      </WidgetGroup><!-- DeckControlsStars -->
     </Children>
-  </WidgetGroup>
+  </WidgetGroup><!-- DeckRow_4_OverviewSpinny -->
 </Template>
diff --git a/res/skins/LateNight/deck_row_5_transportLoopJump.xml b/res/skins/LateNight/deck_row_5_transportLoopJump.xml
index 7092f99f4d18..4a471b149e52 100644
--- a/res/skins/LateNight/deck_row_5_transportLoopJump.xml
+++ b/res/skins/LateNight/deck_row_5_transportLoopJump.xml
@@ -1,6 +1,9 @@
 <Template>
+  <SetVariable name="btn_type"><Variable name="SubRegion_btn_type"/></SetVariable>
+  <SetVariable name="btn_format">square</SetVariable>
+
   <WidgetGroup>
-    <BackPath>style/background_tile.png</BackPath>
+    <BackPath><Variable name="BgTile"/></BackPath>
     <SizePolicy>min,min</SizePolicy>
     <Layout>horizontal</Layout>
     <Children>
@@ -10,19 +13,15 @@
         <Layout>horizontal</Layout>
         <Children>
 
-          <WidgetGroup>
-            <Size>0min,0min</Size>
-          </WidgetGroup>
-
-          <WidgetGroup>
-            <MaximumSize>80,</MaximumSize>
-            <SizePolicy>min,min</SizePolicy>
-          </WidgetGroup>
+          <WidgetGroup><Size>2f,0min</Size></WidgetGroup>
+          <WidgetGroup><SizePolicy>i,min</SizePolicy></WidgetGroup>
 
           <WidgetGroup><!-- Loop buttons + beatloop size spinbox -->
-            <ObjectName>AlignLeftTop</ObjectName>
+            <ObjectName>LoopControls</ObjectName>
             <Layout>vertical</Layout>
-            <SizePolicy>f,max</SizePolicy>
+            <SizePolicy>min,min</SizePolicy>
+            <MinimumSize>78,52</MinimumSize>
+            <MaximumSize>86,52</MaximumSize>
             <Children>
               <WidgetGroup><!-- loop enable + beatloop size -->
                 <ObjectName>AlignLeftTop</ObjectName>
@@ -31,18 +30,18 @@
                 <Children>
                   <Template src="skin:button_2state_right.xml">
                     <SetVariable name="TooltipId">beatloop_activate</SetVariable>
+                    <SetVariable name="ObjectName">LoopActivate</SetVariable>
                     <SetVariable name="Size">26f,26f</SetVariable>
-                    <SetVariable name="state_0_pressed">loop_down.svg</SetVariable>
-                    <SetVariable name="state_0_unpressed">loop.svg</SetVariable>
-                    <SetVariable name="state_1_pressed">loop_overdown.svg</SetVariable>
-                    <SetVariable name="state_1_unpressed">loop_over.svg</SetVariable>
                     <SetVariable name="ConfigKey"><Variable name="group"/>,beatloop_activate</SetVariable>
                     <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beatlooproll_activate</SetVariable>
                   </Template>
 
                   <BeatSpinBox>
                     <TooltipId>beatloop_size</TooltipId>
-                    <Size>58f,26f</Size>
+                    <ObjectName>Spinbox_<Variable name="btn_type"/></ObjectName>
+                    <SizePolicy>me,min</SizePolicy>
+                    <MinimumSize>52,26</MinimumSize>
+                    <MaximumSize>60,26</MaximumSize>
                     <Value><Variable name="group"/>,beatloop_size</Value>
                   </BeatSpinBox>
                 </Children>
@@ -55,11 +54,8 @@
                 <Children>
                   <Template src="skin:button_2state_right_display.xml">
                     <SetVariable name="TooltipId">reloop_toggle</SetVariable>
+                    <SetVariable name="ObjectName">Reloop</SetVariable>
                     <SetVariable name="Size">26f,26f</SetVariable>
-                    <SetVariable name="state_0_pressed">reloop_down.svg</SetVariable>
-                    <SetVariable name="state_0_unpressed">reloop.svg</SetVariable>
-                    <SetVariable name="state_1_pressed">reloop_overdown.svg</SetVariable>
-                    <SetVariable name="state_1_unpressed">reloop_over.svg</SetVariable>
                     <SetVariable name="ConfigKey"><Variable name="group"/>,reloop_toggle</SetVariable>
                     <SetVariable name="ConfigKeyRight"><Variable name="group"/>,reloop_andstop</SetVariable>
                     <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,loop_enabled</SetVariable>
@@ -67,18 +63,16 @@
 
                   <Template src="skin:button_1state_right.xml">
                     <SetVariable name="TooltipId">loop_in</SetVariable>
+                    <SetVariable name="ObjectName">LoopIn</SetVariable>
                     <SetVariable name="Size">26f,26f</SetVariable>
-                    <SetVariable name="state_0_pressed">loop_in_overdown.svg</SetVariable>
-                    <SetVariable name="state_0_unpressed">loop_in.svg</SetVariable>
                     <SetVariable name="ConfigKey"><Variable name="group"/>,loop_in</SetVariable>
                     <SetVariable name="ConfigKeyRight"><Variable name="group"/>,loop_in_goto</SetVariable>
                   </Template>
 
                   <Template src="skin:button_1state_right.xml">
                     <SetVariable name="TooltipId">loop_out</SetVariable>
+                    <SetVariable name="ObjectName">LoopOut</SetVariable>
                     <SetVariable name="Size">26f,26f</SetVariable>
-                    <SetVariable name="state_0_pressed">loop_out_overdown.svg</SetVariable>
-                    <SetVariable name="state_0_unpressed">loop_out.svg</SetVariable>
                     <SetVariable name="ConfigKey"><Variable name="group"/>,loop_out</SetVariable>
                     <SetVariable name="ConfigKeyRight"><Variable name="group"/>,loop_out_goto</SetVariable>
                   </Template>
@@ -87,26 +81,29 @@
             </Children>
           </WidgetGroup><!-- /Loop buttons + beatloop size spinbox -->
 
-          <WidgetGroup>
-            <MaximumSize>80,</MaximumSize>
-            <SizePolicy>min,min</SizePolicy>
-          </WidgetGroup>
+          <WidgetGroup><Size>2f,0min</Size></WidgetGroup><!--  = 2-80px wide -->
+          <WidgetGroup><SizePolicy>i,min</SizePolicy><MaximumSize>80,</MaximumSize></WidgetGroup>
 
           <WidgetGroup><!-- Jump buttons + beatjump size spinbox -->
-            <ObjectName>AlignLeftTop</ObjectName>
+            <ObjectName>BeatjumpControls</ObjectName>
             <Layout>vertical</Layout>
-            <SizePolicy>f,min</SizePolicy>
+            <SizePolicy>min,min</SizePolicy>
+            <MinimumSize>52,52</MinimumSize>
+            <MaximumSize>60,52</MaximumSize>
             <Children>
               <WidgetGroup><!-- beatjump size -->
                 <ObjectName>AlignLeftTop</ObjectName>
                 <Layout>horizontal</Layout>
-                <SizePolicy>26f,min</SizePolicy>
+                <SizePolicy>0min,26f</SizePolicy>
                 <Children>
-                  <!-- put this spacer here so BeatSpinBox expands with HiDPI scaling -->
-                  <WidgetGroup><Size>0f,26f</Size></WidgetGroup>
+                  <!-- put this spacer here so BeatSpinBox expands with HiDPI scaling
+                  <WidgetGroup><Size>0f,26f</Size></WidgetGroup> -->
                   <BeatSpinBox>
                     <TooltipId>beatjump_size</TooltipId>
-                    <Size>58f,26f</Size>
+                    <ObjectName>Spinbox_<Variable name="btn_type"/></ObjectName>
+                    <SizePolicy>me,min</SizePolicy>
+                    <MinimumSize>52,26</MinimumSize>
+                    <MaximumSize>60,26</MaximumSize>
                     <Value><Variable name="group"/>,beatjump_size</Value>
                   </BeatSpinBox>
                 </Children>
@@ -119,18 +116,16 @@
 
                   <Template src="skin:button_1state_right.xml">
                     <SetVariable name="TooltipId">beatjump_backward</SetVariable>
+                    <SetVariable name="ObjectName">JumpBack</SetVariable>
                     <SetVariable name="Size">26f,26f</SetVariable>
-                    <SetVariable name="state_0_pressed">arrow_left_overdown.svg</SetVariable>
-                    <SetVariable name="state_0_unpressed">arrow_left.svg</SetVariable>
                     <SetVariable name="ConfigKey"><Variable name="group"/>,beatjump_backward</SetVariable>
                     <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beatjump_1_backward</SetVariable>
                   </Template>
 
                   <Template src="skin:button_1state_right.xml">
                     <SetVariable name="TooltipId">beatjump_forward</SetVariable>
+                    <SetVariable name="ObjectName">JumpForward</SetVariable>
                     <SetVariable name="Size">26f,26f</SetVariable>
-                    <SetVariable name="state_0_pressed">arrow_right_overdown.svg</SetVariable>
-                    <SetVariable name="state_0_unpressed">arrow_right.svg</SetVariable>
                     <SetVariable name="ConfigKey"><Variable name="group"/>,beatjump_forward</SetVariable>
                     <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beatjump_1_forward</SetVariable>
                   </Template>
@@ -139,10 +134,8 @@
             </Children>
           </WidgetGroup><!-- /Jump buttons + beatjump size spinbox -->
 
-          <WidgetGroup>
-            <MaximumSize>80,</MaximumSize>
-            <SizePolicy>min,min</SizePolicy>
-          </WidgetGroup>
+          <WidgetGroup><Size>2f,0min</Size></WidgetGroup><!--  = 2-80px wide -->
+          <WidgetGroup><SizePolicy>i,min</SizePolicy><MaximumSize>80,</MaximumSize></WidgetGroup>
 
           <WidgetGroup><!-- Intro + Outro -->
             <Layout>vertical</Layout>
@@ -151,7 +144,7 @@
             <Children>
               <WidgetGroup><!-- Intro -->
                 <ObjectName>AlignLeftTop</ObjectName>
-                <SizePolicy>min,min</SizePolicy>
+                <SizePolicy>me,min</SizePolicy>
                 <Layout>horizontal</Layout>
                 <Children>
                   <Template src="skin:button_special_cue.xml">
@@ -165,7 +158,7 @@
               </WidgetGroup>
               <WidgetGroup><!-- Outro -->
                 <ObjectName>AlignLeftTop</ObjectName>
-                <SizePolicy>min,min</SizePolicy>
+                <SizePolicy>me,min</SizePolicy>
                 <Layout>horizontal</Layout>
                 <Children>
                   <Template src="skin:button_special_cue.xml">
@@ -179,45 +172,38 @@
               </WidgetGroup>
             </Children>
             <Connection>
-                <ConfigKey>[Skin],show_intro_outro_cues</ConfigKey>
-                <BindProperty>visible</BindProperty>
+              <ConfigKey>[Skin],show_intro_outro_cues</ConfigKey>
+              <BindProperty>visible</BindProperty>
             </Connection>
           </WidgetGroup><!-- / Intro + Outro -->
 
-          <WidgetGroup>
-            <MaximumSize>10,</MaximumSize>
-            <SizePolicy>min,min</SizePolicy>
-          </WidgetGroup>
+          <WidgetGroup><Size>2f,0min</Size></WidgetGroup><!--  = 2-8px wide -->
+          <WidgetGroup><SizePolicy>i,min</SizePolicy><MaximumSize>8,</MaximumSize></WidgetGroup>
 
-          <WidgetGroup><!-- HotCues, Play, Cue, Reverse -->
+          <WidgetGroup><!-- HotCues -->
             <Layout>vertical</Layout>
-            <SizePolicy>f,min</SizePolicy>
+            <SizePolicy>max,min</SizePolicy>
             <Children>
-              <WidgetGroup><!-- HotCues 1-4(5), Cue -->
+              <WidgetGroup><!-- HotCues 1-2 / 1-4 -->
                 <ObjectName>PlayCueRevHotCues</ObjectName>
                 <Layout>horizontal</Layout>
                 <Children>
+
                   <Template src="skin:button_hotcue.xml">
                     <SetVariable name="number">1</SetVariable>
                   </Template>
-
                   <Template src="skin:button_hotcue.xml">
                     <SetVariable name="number">2</SetVariable>
                   </Template>
 
-                  <Template src="skin:button_hotcue.xml">
-                    <SetVariable name="number">3</SetVariable>
-                  </Template>
-
-                  <Template src="skin:button_hotcue.xml">
-                    <SetVariable name="number">4</SetVariable>
-                  </Template>
-
                   <WidgetGroup>
                     <Layout>horizontal</Layout>
                     <Children>
                       <Template src="skin:button_hotcue.xml">
-                        <SetVariable name="number">5</SetVariable>
+                        <SetVariable name="number">3</SetVariable>
+                      </Template>
+                      <Template src="skin:button_hotcue.xml">
+                        <SetVariable name="number">4</SetVariable>
                       </Template>
                     </Children>
                     <Connection>
@@ -225,74 +211,123 @@
                       <BindProperty>visible</BindProperty>
                     </Connection>
                   </WidgetGroup>
+                </Children>
+              </WidgetGroup><!-- HotCues 1-2 / 1-4 -->
 
-                  <Template src="skin:button_2state_right_display.xml">
-                    <SetVariable name="TooltipId">cue_default_cue_gotoandstop</SetVariable>
-                    <SetVariable name="Size">52f,26f</SetVariable>
-                    <SetVariable name="state_0_pressed">cue_down.svg</SetVariable>
-                    <SetVariable name="state_0_unpressed">cue.svg</SetVariable>
-                    <SetVariable name="state_1_pressed">cue_overdown.svg</SetVariable>
-                    <SetVariable name="state_1_unpressed">cue_over.svg</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="group"/>,cue_default</SetVariable>
-                    <SetVariable name="ConfigKeyRight"><Variable name="group"/>,cue_gotoandstop</SetVariable>
-                    <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,cue_indicator</SetVariable>
+              <!-- HotCues (3-4 / 5-8) -->
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:button_hotcue.xml">
+                    <SetVariable name="number">3</SetVariable>
+                  </Template>
+                  <Template src="skin:button_hotcue.xml">
+                    <SetVariable name="number">4</SetVariable>
                   </Template>
-
                 </Children>
-              </WidgetGroup><!-- /HotCues 1-4(5), Cue -->
+                <Connection>
+                  <ConfigKey>[Skin],show_8_hotcues</ConfigKey>
+                  <Transform><Not/></Transform>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
 
-              <WidgetGroup><!-- (HotCues 6-8) Reverse, Play -->
-                <ObjectName>PlayCueRevHotCues</ObjectName>
+              <WidgetGroup>
                 <Layout>horizontal</Layout>
                 <Children>
+                  <Template src="skin:button_hotcue.xml">
+                    <SetVariable name="number">5</SetVariable>
+                  </Template>
+                  <Template src="skin:button_hotcue.xml">
+                    <SetVariable name="number">6</SetVariable>
+                  </Template>
+                  <Template src="skin:button_hotcue.xml">
+                    <SetVariable name="number">7</SetVariable>
+                  </Template>
+                  <Template src="skin:button_hotcue.xml">
+                    <SetVariable name="number">8</SetVariable>
+                  </Template>
+                </Children>
+                <Connection>
+                  <ConfigKey>[Skin],show_8_hotcues</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup><!-- HotCues (3-4 / 5-8) -->
+            </Children>
+          </WidgetGroup><!-- HotCues -->
 
-                  <WidgetGroup>
-                    <Layout>horizontal</Layout>
-                    <Children>
-                      <Template src="skin:button_hotcue.xml">
-                        <SetVariable name="number">6</SetVariable>
-                      </Template>
-
-                      <Template src="skin:button_hotcue.xml">
-                        <SetVariable name="number">7</SetVariable>
-                      </Template>
+          <WidgetGroup><Size>2f,0min</Size></WidgetGroup><!--  = 2-8px wide -->
+          <WidgetGroup><SizePolicy>i,min</SizePolicy><MaximumSize>8,</MaximumSize></WidgetGroup>
 
-                      <Template src="skin:button_hotcue.xml">
-                        <SetVariable name="number">8</SetVariable>
-                      </Template>
-                    </Children>
-                    <Connection>
-                      <ConfigKey>[Skin],show_8_hotcues</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup>
+          <WidgetGroup><!-- Play, Cue, Reverse -->
+            <Layout>vertical</Layout>
+            <SizePolicy>max,min</SizePolicy>
+            <Children>
+              <WidgetGroup><!-- Reverse | Cue -->
+                <ObjectName>PlayCueRevHotCues</ObjectName>
+                <Layout>horizontal</Layout>
+                <Children>
 
                   <Template src="skin:button_1state_right.xml">
                     <SetVariable name="TooltipId">reverse</SetVariable>
-                    <SetVariable name="Size">52f,26f</SetVariable>
-                    <SetVariable name="state_0_unpressed">reverse.svg</SetVariable>
-                    <SetVariable name="state_0_pressed">reverse_overdown.svg</SetVariable>
+                    <SetVariable name="ObjectName">Reverse</SetVariable>
+                    <SetVariable name="Size">26f,26f</SetVariable>
+                    <SetVariable name="btn_format">square</SetVariable>
                     <SetVariable name="ConfigKey"><Variable name="group"/>,reverse</SetVariable>
                     <SetVariable name="ConfigKeyRight"><Variable name="group"/>,reverseroll</SetVariable>
                   </Template>
 
-                  <Template src="skin:button_2state_right_display.xml">
-                    <SetVariable name="TooltipId">play_cue_set</SetVariable>
-                    <SetVariable name="Size">52f,26f</SetVariable>
-                    <SetVariable name="state_0_unpressed">play_deck.svg</SetVariable>
-                    <SetVariable name="state_0_pressed">play_deck_down.svg</SetVariable>
-                    <SetVariable name="state_1_unpressed">play_deck_over.svg</SetVariable>
-                    <SetVariable name="state_1_pressed">play_deck_overdown.svg</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="group"/>,play</SetVariable>
-                    <SetVariable name="ConfigKeyRight"><Variable name="group"/>,cue_set</SetVariable>
-                    <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,play_indicator</SetVariable>
-                  </Template>
+                  <PushButton>
+                    <TooltipId>cue_default_cue_gotoandstop</TooltipId>
+                    <ObjectName>CueDeck</ObjectName>
+                    <Size>42f,26f</Size>
+                    <NumberStates>2</NumberStates>
+                    <RightClickIsPushButton>true</RightClickIsPushButton>
+                    <State>
+                      <Number>0</Number>
+                      <Text><Variable name="state_0_text"/></Text>
+                      <Alignment><Variable name="Align"/></Alignment>
+                      <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_medium.svg</Unpressed>
+                      <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_medium_active.svg</Pressed>
+                    </State>
+                    <State>
+                      <Number>1</Number>
+                      <Text><Variable name="state_1_text"/></Text>
+                      <Alignment><Variable name="Align"/></Alignment>
+                      <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_medium_set.svg</Unpressed>
+                      <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_medium_active.svg</Pressed>
+                    </State>
+                    <Connection>
+                      <ConfigKey><Variable name="group"/>,cue_default</ConfigKey>
+                      <ButtonState>LeftButton</ButtonState>
+                    </Connection>
+                    <Connection>
+                      <ConfigKey><Variable name="group"/>,cue_gotoandstop</ConfigKey>
+                      <ButtonState>RightButton</ButtonState>
+                    </Connection>
+                    <Connection>
+                      <ConfigKey><Variable name="group"/>,cue_indicator</ConfigKey>
+                      <ConnectValueFromWidget>false</ConnectValueFromWidget>
+                    </Connection>
+                  </PushButton>
+
                 </Children>
-              </WidgetGroup><!-- /(HotCues 6-8) Reverse, Play -->
+              </WidgetGroup><!-- Reverse | Cue -->
+
+              <Template src="skin:button_2state_right_display.xml">
+                <SetVariable name="TooltipId">play_cue_set</SetVariable>
+                <SetVariable name="ObjectName">PlayDeck</SetVariable>
+                <SetVariable name="Size">68f,26f</SetVariable>
+                <SetVariable name="btn_format">play</SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="group"/>,play</SetVariable>
+                <SetVariable name="ConfigKeyRight"><Variable name="group"/>,cue_set</SetVariable>
+                <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,play_indicator</SetVariable>
+              </Template>
+
             </Children>
           </WidgetGroup><!-- /HotCues, Play, Cue, Reverse -->
         </Children>
-      </WidgetGroup>
+      </WidgetGroup><!-- DeckRow_5_LoopCuesTransport -->
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/deck_vinyl_controls.xml b/res/skins/LateNight/deck_vinyl_controls.xml
index 978414df69a9..710421bb4425 100644
--- a/res/skins/LateNight/deck_vinyl_controls.xml
+++ b/res/skins/LateNight/deck_vinyl_controls.xml
@@ -2,70 +2,72 @@
   <WidgetGroup>
     <ObjectName>VinylControls</ObjectName>
     <Layout>horizontal</Layout>
-    <SizePolicy>max,f</SizePolicy>
+    <SizePolicy>min,f</SizePolicy>
     <Children>
 
-      <WidgetGroup>
-        <ObjectName>AlignVCenter</ObjectName>
-        <SizePolicy>f,f</SizePolicy>
-        <Layout>horizontal</Layout>
-        <Children>
-          <StatusLight>
-            <ObjectName>VinylStatus</ObjectName>
-            <Size>20f,20f</Size>
-            <TooltipId>vinylcontrol_status</TooltipId>
-            <NumberPos>3</NumberPos>
-            <PathStatusLight scalemode="STRETCH">style/vinyl_control_1.svg</PathStatusLight>
-            <PathStatusLight2 scalemode="STRETCH">style/vinyl_control_2.svg</PathStatusLight2>
-            <PathStatusLight3 scalemode="STRETCH">style/vinyl_control_3.svg</PathStatusLight3>
-            <Connection>
-              <ConfigKey><Variable name="group"/>,vinylcontrol_status</ConfigKey>
-            </Connection>
-          </StatusLight>
-        </Children>
+      <StatusLight>
+        <ObjectName>VinylStatus</ObjectName>
+        <Size>18f,18f</Size>
+        <TooltipId>vinylcontrol_status</TooltipId>
+        <PathStatusLight0 scalemode="STRETCH_ASPECT">skin:/style_<Variable name="style_scheme"/>/vinyl_control_0.svg</PathStatusLight0>
+        <PathStatusLight1 scalemode="STRETCH_ASPECT">skin:/style_<Variable name="style_scheme"/>/vinyl_control_1.svg</PathStatusLight1>
+        <PathStatusLight2 scalemode="STRETCH_ASPECT">skin:/style_<Variable name="style_scheme"/>/vinyl_control_2.svg</PathStatusLight2>
+        <PathStatusLight3 scalemode="STRETCH_ASPECT">skin:/style_<Variable name="style_scheme"/>/vinyl_control_3.svg</PathStatusLight3>
         <Connection>
-          <ConfigKey persist="true">[Channel<Variable name="channum"/>],vinylcontrol_enabled</ConfigKey>
-          <BindProperty>visible</BindProperty>
+          <ConfigKey><Variable name="group"/>,vinylcontrol_status</ConfigKey>
         </Connection>
-      </WidgetGroup>
+      </StatusLight>
 
-      <Template src="skin:button_2state.xml">
-        <SetVariable name="TooltipId">vinylcontrol_enabled</SetVariable>
-        <SetVariable name="ObjectName">VinylButton</SetVariable>
-        <SetVariable name="Size">39f,22f</SetVariable>
-        <SetVariable name="state_0_text">VINYL</SetVariable>
-        <SetVariable name="state_1_text">VINYL</SetVariable>
-        <SetVariable name="ConfigKey"><Variable name="group"/>,vinylcontrol_enabled</SetVariable>
-      </Template>
+      <!-- increase margin -->
+      <WidgetGroup><Size>3f,0min</Size></WidgetGroup>
 
-      <Template src="skin:button_3state_persist.xml">
-        <SetVariable name="TooltipId">vinylcontrol_mode</SetVariable>
-        <SetVariable name="ObjectName">VinylTristateButton</SetVariable>
-        <SetVariable name="Size">44f,22f</SetVariable>
-        <SetVariable name="state_0_text">ABS</SetVariable>
-        <SetVariable name="state_1_text">REL</SetVariable>
-        <SetVariable name="state_2_text">CONST</SetVariable>
-        <SetVariable name="ConfigKey"><Variable name="group"/>,vinylcontrol_mode</SetVariable>
-      </Template>
+      <WidgetGroup>
+        <ObjectName>VinylButtons</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,f</SizePolicy>
+        <Children>
+          <!-- &#8202; is a hack to push text labels to the left or right
+               because the kerning of some letters/numbers destroys the desired
+               effect of center 'Align' and 'text-alignment' -->
+          <Template src="skin:button_2state.xml">
+            <SetVariable name="TooltipId">vinylcontrol_enabled</SetVariable>
+            <SetVariable name="ObjectName">VinylButton</SetVariable>
+            <SetVariable name="Size">39f,20f</SetVariable>
+            <SetVariable name="state_0_text">&#8202;&#8202;VINYL</SetVariable>
+            <SetVariable name="state_1_text">&#8202;&#8202;VINYL</SetVariable>
+            <SetVariable name="ConfigKey"><Variable name="group"/>,vinylcontrol_enabled</SetVariable>
+          </Template>
+
+          <Template src="skin:button_3state_persist.xml">
+            <SetVariable name="TooltipId">vinylcontrol_mode</SetVariable>
+            <SetVariable name="ObjectName">VinylTristateButton</SetVariable>
+            <SetVariable name="Size">42f,20f</SetVariable>
+            <SetVariable name="state_0_text">ABS</SetVariable>
+            <SetVariable name="state_1_text">REL</SetVariable>
+            <SetVariable name="state_2_text">&#8202;CONST</SetVariable>
+            <SetVariable name="ConfigKey"><Variable name="group"/>,vinylcontrol_mode</SetVariable>
+          </Template>
 
-      <Template src="skin:button_3state_persist.xml">
-        <SetVariable name="TooltipId">vinylcontrol_cueing</SetVariable>
-        <SetVariable name="ObjectName">VinylButton</SetVariable>
-        <SetVariable name="Size">28f,22f</SetVariable>
-        <SetVariable name="state_0_text">CUE</SetVariable>
-        <SetVariable name="state_1_text">CUE</SetVariable>
-        <SetVariable name="state_2_text">HOT</SetVariable>
-        <SetVariable name="ConfigKey"><Variable name="group"/>,vinylcontrol_cueing</SetVariable>
-      </Template>
+          <Template src="skin:button_3state_persist.xml">
+            <SetVariable name="TooltipId">vinylcontrol_cueing</SetVariable>
+            <SetVariable name="ObjectName">VinylButton</SetVariable>
+            <SetVariable name="Size">28f,20f</SetVariable>
+            <SetVariable name="state_0_text">&#8202;CUE</SetVariable>
+            <SetVariable name="state_1_text">&#8202;CUE</SetVariable>
+            <SetVariable name="state_2_text">&#8202;HOT</SetVariable>
+            <SetVariable name="ConfigKey"><Variable name="group"/>,vinylcontrol_cueing</SetVariable>
+          </Template>
 
-      <Template src="skin:button_2state.xml">
-        <SetVariable name="TooltipId">passthrough_enabled</SetVariable>
-        <SetVariable name="ObjectName">VinylButton</SetVariable>
-        <SetVariable name="Size">34f,22f</SetVariable>
-        <SetVariable name="state_0_text">PASS</SetVariable>
-        <SetVariable name="state_1_text">PASS</SetVariable>
-        <SetVariable name="ConfigKey"><Variable name="group"/>,passthrough</SetVariable>
-      </Template>
+          <Template src="skin:button_2state.xml">
+            <SetVariable name="TooltipId">passthrough_enabled</SetVariable>
+            <SetVariable name="ObjectName">VinylButton</SetVariable>
+            <SetVariable name="Size">33f,20f</SetVariable>
+            <SetVariable name="state_0_text">&#8202;PASS</SetVariable>
+            <SetVariable name="state_1_text">&#8202;PASS</SetVariable>
+            <SetVariable name="ConfigKey"><Variable name="group"/>,passthrough</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
 
     </Children>
     <Connection>
diff --git a/res/skins/LateNight/decks_left.xml b/res/skins/LateNight/decks_left.xml
index cd2ac39820d9..830bd9f4bcd9 100644
--- a/res/skins/LateNight/decks_left.xml
+++ b/res/skins/LateNight/decks_left.xml
@@ -10,6 +10,7 @@
         <Children>
           <Template src="skin:deck.xml">
             <SetVariable name="channum">1</SetVariable>
+            <SetVariable name="decks_group">12</SetVariable>
           </Template>
 
           <WidgetGroup>
@@ -18,6 +19,7 @@
             <Children>
               <Template src="skin:deck.xml">
                 <SetVariable name="channum">3</SetVariable>
+                <SetVariable name="decks_group">34</SetVariable>
               </Template>
             </Children>
             <Connection>
diff --git a/res/skins/LateNight/decks_small.xml b/res/skins/LateNight/decks_mini.xml
similarity index 93%
rename from res/skins/LateNight/decks_small.xml
rename to res/skins/LateNight/decks_mini.xml
index a546462e5033..81120e1fe9a8 100644
--- a/res/skins/LateNight/decks_small.xml
+++ b/res/skins/LateNight/decks_mini.xml
@@ -8,7 +8,7 @@
         <Layout>horizontal</Layout>
         <SizePolicy>me,min</SizePolicy>
         <Children>
-          <Template src="skin:deck_small.xml">
+          <Template src="skin:deck_mini.xml">
             <SetVariable name="channum">1</SetVariable>
             <SetVariable name="signal_color">#E7C413</SetVariable>
             <SetVariable name="SignalBgColor">#2f290a</SetVariable>
@@ -17,7 +17,7 @@
             <SetVariable name="SignalRGBHighColor">#332acc</SetVariable>
           </Template>
 
-          <Template src="skin:deck_small.xml">
+          <Template src="skin:deck_mini.xml">
             <SetVariable name="channum">2</SetVariable>
             <SetVariable name="signal_color">#E7C413</SetVariable>
             <SetVariable name="SignalBgColor">#2f290a</SetVariable>
@@ -40,7 +40,7 @@
         <Layout>horizontal</Layout>
         <SizePolicy>me,min</SizePolicy>
         <Children>
-          <Template src="skin:deck_small.xml">
+          <Template src="skin:deck_mini.xml">
             <SetVariable name="channum">3</SetVariable>
             <SetVariable name="signal_color">#09B2AE</SetVariable>
             <SetVariable name="SignalBgColor">#2f290a</SetVariable>
@@ -49,7 +49,7 @@
             <SetVariable name="SignalRGBHighColor">#332acc</SetVariable>
           </Template>
 
-          <Template src="skin:deck_small.xml">
+          <Template src="skin:deck_mini.xml">
             <SetVariable name="channum">4</SetVariable>
             <SetVariable name="signal_color">#09B2AE</SetVariable>
             <SetVariable name="SignalBgColor">#2f290a</SetVariable>
diff --git a/res/skins/LateNight/decks_right.xml b/res/skins/LateNight/decks_right.xml
index 23142004d6cb..fa97401c4eee 100644
--- a/res/skins/LateNight/decks_right.xml
+++ b/res/skins/LateNight/decks_right.xml
@@ -11,6 +11,7 @@
         <Children>
           <Template src="skin:deck.xml">
             <SetVariable name="channum">2</SetVariable>
+            <SetVariable name="decks_group">12</SetVariable>
           </Template>
 
           <WidgetGroup>
@@ -19,6 +20,7 @@
             <Children>
               <Template src="skin:deck.xml">
                 <SetVariable name="channum">4</SetVariable>
+                <SetVariable name="decks_group">34</SetVariable>
               </Template>
             </Children>
             <Connection>
@@ -31,7 +33,7 @@
       </WidgetGroup>
 
       <WidgetGroup>
-        <Size>5f,1min</Size>
+        <Size>2f,1min</Size>
         <Connection>
           <ConfigKey>[Master],skin_settings</ConfigKey>
           <BindProperty>visible</BindProperty>
diff --git a/res/skins/LateNight/eq_knob_4decks.xml b/res/skins/LateNight/eq_knob_4decks.xml
index 116c8e486f61..bc0ff6834466 100644
--- a/res/skins/LateNight/eq_knob_4decks.xml
+++ b/res/skins/LateNight/eq_knob_4decks.xml
@@ -11,32 +11,53 @@
       <WidgetGroup><Size>4f,0min</Size></WidgetGroup>
 
       <WidgetGroup>
+        <ObjectName>AlignRight</ObjectName>
         <Layout>horizontal</Layout>
         <SizePolicy>min,min</SizePolicy>
         <Children>
 
           <!-- Kill button -->
           <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <Size>22f,30min</Size>
+            <ObjectName>EQKillButtonBox4Decks</ObjectName>
+            <Layout>vertical</Layout>
+            <Size>20f,34f</Size>
             <Children>
-              <WidgetGroup>
-                <ObjectName>KillButtonLeft</ObjectName>
-                <Layout>horizontal</Layout>
-                <Size>22f,30min</Size>
-                <Children>
-                  <Template src="skin:fx_button.xml">
-                    <SetVariable name="icon">eq_kill</SetVariable>
-                    <SetVariable name="Size">18f,18f</SetVariable>
-                    <SetVariable name="FxParameter">button_parameter<Variable name="FxParameter"/></SetVariable>
-                  </Template>
-                </Children>
+              <WidgetGroup><Size>0min,5f</Size></WidgetGroup>
+              <EffectPushButton>
+                <ObjectName>EQKillButton</ObjectName>
+                <Size>18f,18f</Size>
+                <NumberStates>2</NumberStates>
+                <State>
+                  <Number>0</Number>
+                  <Text><Variable name="Text"/></Text>
+                  <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_eqkill.svg</Unpressed>
+                  <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_eqkill_active.svg</Pressed>
+                </State>
+                <State>
+                  <Number>1</Number>
+                  <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_eqkill_active.svg</Unpressed>
+                  <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_eqkill_active.svg</Pressed>
+                </State>
                 <Connection>
-                  <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
-                  <BindProperty>visible</BindProperty>
+                  <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,button_parameter<Variable name="FxParameter"/></ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
                 </Connection>
-              </WidgetGroup>
+              </EffectPushButton>
             </Children>
+            <Connection>
+              <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>EQKillButtonBox4Decks</ObjectName>
+            <Size>20f,34f</Size>
+            <Connection>
+              <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
+              <Transform><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
           </WidgetGroup>
 
           <!-- EQ knob -->
@@ -46,8 +67,8 @@
             <Children>
               <EffectParameterKnobComposed>
                 <Size>40f,34f</Size>
-                <Knob>skin:knobs_sliders/knob_indicator_red.svg</Knob>
-                <BackPath>skin:knobs_sliders/knob_bg.svg</BackPath>
+                <Knob>skin:/knobs_<Variable name="knob_scheme"/>/knob_indicator_regular_red.svg</Knob>
+                <BackPath>skin:/knobs_<Variable name="knob_scheme"/>/knob_bg_regular.svg</BackPath>
                 <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
                 <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
                 <KnobCenterYOffset>1.598</KnobCenterYOffset>
@@ -58,6 +79,8 @@
             </Children>
           </WidgetGroup>
 
+          <WidgetGroup><Size>2f,0min</Size></WidgetGroup>
+
         </Children>
         <Connection>
           <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_loaded</ConfigKey>
diff --git a/res/skins/LateNight/eq_knob_left.xml b/res/skins/LateNight/eq_knob_left.xml
index b7dd6c16a849..583e4672fcfc 100644
--- a/res/skins/LateNight/eq_knob_left.xml
+++ b/res/skins/LateNight/eq_knob_left.xml
@@ -7,59 +7,64 @@
     <Layout>horizontal</Layout>
     <SizePolicy>min,min</SizePolicy>
     <Children>
+
+      <!-- Kill button -->
       <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <SizePolicy>min,min</SizePolicy>
+        <Layout>vertical</Layout>
+        <Size>18f,34f</Size>
         <Children>
-
-          <!-- Kill button -->
-          <WidgetGroup>
-            <ObjectName>KillButtonLeft</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,min</SizePolicy>
-            <MinimumSize>22,30</MinimumSize>
-            <Children>
-              <Template src="skin:fx_button.xml">
-                <SetVariable name="icon">eq_kill</SetVariable>
-                <SetVariable name="Size">18f,18f</SetVariable>
-                <SetVariable name="FxParameter">button_parameter<Variable name="FxParameter"/></SetVariable>
-              </Template>
-            </Children>
+          <WidgetGroup><Size>0min,5f</Size></WidgetGroup>
+          <EffectPushButton>
+            <ObjectName>EQKillButton</ObjectName>
+            <Size>18f,18f</Size>
+            <NumberStates>2</NumberStates>
+            <State>
+              <Number>0</Number>
+              <Text><Variable name="Text"/></Text>
+              <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_eqkill.svg</Unpressed>
+              <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_eqkill_active.svg</Pressed>
+            </State>
+            <State>
+              <Number>1</Number>
+              <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_eqkill_active.svg</Unpressed>
+              <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_eqkill_active.svg</Pressed>
+            </State>
             <Connection>
-              <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
-              <BindProperty>visible</BindProperty>
+              <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,button_parameter<Variable name="FxParameter"/></ConfigKey>
+              <ButtonState>LeftButton</ButtonState>
             </Connection>
-          </WidgetGroup>
-
-          <!-- EQ knob -->
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <SizePolicy>me,min</SizePolicy>
-            <Children>
-              <EffectParameterKnobComposed>
-                <Size>40f,34f</Size>
-                <Knob>skin:knobs_sliders/knob_indicator_red.svg</Knob>
-                <BackPath>skin:knobs_sliders/knob_bg.svg</BackPath>
-                <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
-                <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
-                <KnobCenterYOffset>1.598</KnobCenterYOffset>
-                <Connection>
-                  <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/></ConfigKey>
-                </Connection>
-              </EffectParameterKnobComposed>
-            </Children>
-          </WidgetGroup>
-
+          </EffectPushButton>
         </Children>
         <Connection>
-          <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_loaded</ConfigKey>
+          <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
       </WidgetGroup>
 
+      <WidgetGroup>
+        <Size>2f,34f</Size>
+        <Connection>
+          <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+      <!-- EQ knob -->
+      <EffectParameterKnobComposed>
+        <Size>40f,34f</Size>
+        <Knob>skin:/knobs_<Variable name="knob_scheme"/>/knob_indicator_regular_red.svg</Knob>
+        <BackPath>skin:/knobs_<Variable name="knob_scheme"/>/knob_bg_regular.svg</BackPath>
+        <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
+        <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
+        <KnobCenterYOffset>1.598</KnobCenterYOffset>
+        <Connection>
+          <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/></ConfigKey>
+        </Connection>
+      </EffectParameterKnobComposed>
+
     </Children>
     <Connection>
-      <ConfigKey>[Skin],show_eq_knobs</ConfigKey>
+      <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_loaded</ConfigKey>
       <BindProperty>visible</BindProperty>
     </Connection>
   </WidgetGroup>
diff --git a/res/skins/LateNight/eq_knob_right.xml b/res/skins/LateNight/eq_knob_right.xml
index 194a5c2e9d9d..656943e04c1b 100644
--- a/res/skins/LateNight/eq_knob_right.xml
+++ b/res/skins/LateNight/eq_knob_right.xml
@@ -5,59 +5,65 @@
 
   <WidgetGroup>
     <Layout>horizontal</Layout>
-    <SizePolicy>min,min</SizePolicy>
+    <Size>0min,34f</Size>
     <Children>
+      <!-- EQ knob -->
+      <EffectParameterKnobComposed>
+        <Size>40f,34f</Size>
+        <Knob>skin:/knobs_<Variable name="knob_scheme"/>/knob_indicator_regular_red.svg</Knob>
+        <BackPath>skin:/knobs_<Variable name="knob_scheme"/>/knob_bg_regular.svg</BackPath>
+        <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
+        <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
+        <KnobCenterYOffset>1.598</KnobCenterYOffset>
+        <Connection>
+          <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/></ConfigKey>
+        </Connection>
+      </EffectParameterKnobComposed>
+
       <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <!-- EQ knob -->
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <SizePolicy>me, min</SizePolicy>
-            <Children>
-              <EffectParameterKnobComposed>
-                <Size>40f,34f</Size>
-                <Knob>skin:knobs_sliders/knob_indicator_red.svg</Knob>
-                <BackPath>skin:knobs_sliders/knob_bg.svg</BackPath>
-                <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
-                <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
-                <KnobCenterYOffset>1.598</KnobCenterYOffset>
-                <Connection>
-                  <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/></ConfigKey>
-                </Connection>
-              </EffectParameterKnobComposed>
-            </Children>
-          </WidgetGroup>
+        <Size>2f,34f</Size>
+        <Connection>
+          <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
 
-          <!-- Kill button -->
-          <WidgetGroup>
-            <ObjectName>KillButtonRight</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,min</SizePolicy>
-            <MinimumSize>22,30</MinimumSize>
-            <Children>
-              <Template src="skin:fx_button.xml">
-                <SetVariable name="icon">eq_kill</SetVariable>
-                <SetVariable name="Size">18f,18f</SetVariable>
-                <SetVariable name="FxParameter">button_parameter<Variable name="FxParameter"/></SetVariable>
-              </Template>
-            </Children>
+      <!-- Kill button -->
+      <WidgetGroup>
+        <Layout>vertical</Layout>
+        <Size>18f,34f</Size>
+        <Children>
+          <WidgetGroup><Size>0min,5f</Size></WidgetGroup>
+          <EffectPushButton>
+            <ObjectName>EQKillButton</ObjectName>
+            <Size>18f,18f</Size>
+            <NumberStates>2</NumberStates>
+            <State>
+              <Number>0</Number>
+              <Text><Variable name="Text"/></Text>
+              <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_eqkill.svg</Unpressed>
+              <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_eqkill_active.svg</Pressed>
+            </State>
+            <State>
+              <Number>1</Number>
+              <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_eqkill_active.svg</Unpressed>
+              <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_eqkill_active.svg</Pressed>
+            </State>
             <Connection>
-              <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
-              <BindProperty>visible</BindProperty>
+              <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,button_parameter<Variable name="FxParameter"/></ConfigKey>
+              <ButtonState>LeftButton</ButtonState>
             </Connection>
-          </WidgetGroup>
-
+          </EffectPushButton>
         </Children>
         <Connection>
-          <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_loaded</ConfigKey>
+          <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
       </WidgetGroup>
+
     </Children>
     <Connection>
-      <ConfigKey>[Skin],show_eq_knobs</ConfigKey>
+      <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_loaded</ConfigKey>
       <BindProperty>visible</BindProperty>
     </Connection>
   </WidgetGroup>
diff --git a/res/skins/LateNight/fx_assign_button.xml b/res/skins/LateNight/fx_assign_button.xml
index 4833856a34a3..3b73028e61b5 100644
--- a/res/skins/LateNight/fx_assign_button.xml
+++ b/res/skins/LateNight/fx_assign_button.xml
@@ -13,31 +13,48 @@ Variables:
   ConfigKey         : left-click control
 -->
 <Template>
-  <PushButton>
-    <TooltipId>EffectUnit_<Variable name="Type"/>_enabled</TooltipId>
-    <ObjectName>FxAssignButton</ObjectName>
-    <MinimumSize><Variable name="MinWidth"/>,22</MinimumSize>
-    <MaximumSize><Variable name="MaxWidth"/>,22</MaximumSize>
+  <WidgetGroup>
+    <ObjectName>FxAssignButton_<Variable name="Text"/><Variable name="FxUnit"/></ObjectName>
+    <Layout>horizontal</Layout>
+    <MinimumSize><Variable name="MinWidth"/>,20</MinimumSize>
+    <MaximumSize><Variable name="MaxWidth"/>,20</MaximumSize>
     <SizePolicy>me,f</SizePolicy>
-    <NumberStates>2</NumberStates>
-    <RightClickIsPushButton>false</RightClickIsPushButton>
-    <State>
-      <Number>0</Number>
-      <Text><Variable name="Text"/><Variable name="FxUnit"/></Text>
-      <Alignment>center</Alignment>
-      <Pressed scalemode="STRETCH">skin:/buttons/btn_fx_assign.svg</Pressed>
-      <Unpressed scalemode="STRETCH">skin:/buttons/btn_fx_assign.svg</Unpressed>
-    </State>
-    <State>
-      <Number>1</Number>
-      <Text><Variable name="Text"/><Variable name="FxUnit"/></Text>
-      <Alignment>center</Alignment>
-      <Pressed scalemode="STRETCH">skin:/buttons/btn_fx_assign_over.svg</Pressed>
-      <Unpressed scalemode="STRETCH">skin:/buttons/btn_fx_assign_over.svg</Unpressed>
-    </State>
-    <Connection>
-      <ConfigKey>[EffectRack1_EffectUnit<Variable name="FxUnit"/>],group_<Variable name="group"/>_enable</ConfigKey>
-      <ButtonState>LeftButton</ButtonState>
-    </Connection>
-  </PushButton>
+    <!-- This overrides the external stylesheet properties and would save numerous
+    per-button icons in qss, but unfortunately variables aren't recognised.
+    <Style>
+      WPushButton[value="0"] {
+        image: url(skin:/buttons_<Variable name="btn_scheme"/>/btn__fx_<Variable name="Text"/><Variable name="FxUnit"/>.svg) no-repeat center center;}
+      WPushButton[value="1"] {
+        image: url(skin:/buttons_<Variable name="btn_scheme"/>/btn__fx_<Variable name="Text"/><Variable name="FxUnit"/>_active.svg) no-repeat center center;}
+    </Style> -->
+    <Children>
+      <PushButton>
+        <TooltipId>EffectUnit_<Variable name="Type"/>_enabled</TooltipId>
+        <ObjectName>FxAssignButton</ObjectName>
+        <MinimumSize><Variable name="MinWidth"/>,20</MinimumSize>
+        <MaximumSize><Variable name="MaxWidth"/>,20</MaximumSize>
+        <SizePolicy>me,f</SizePolicy>
+        <NumberStates>2</NumberStates>
+        <RightClickIsPushButton>false</RightClickIsPushButton>
+        <State>
+          <Number>0</Number>
+          <!--Text><Variable name="Text"/><Variable name="FxUnit"/></Text-->
+          <Alignment>center</Alignment>
+          <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="SubRegion_btn_type"/>_fx.svg</Unpressed>
+          <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="SubRegion_btn_type"/>_fx_active.svg</Pressed>
+        </State>
+        <State>
+          <Number>1</Number>
+          <!--Text><Variable name="Text"/><Variable name="FxUnit"/></Text-->
+          <Alignment>center</Alignment>
+          <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="SubRegion_btn_type"/>_fx_active.svg</Unpressed>
+          <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="SubRegion_btn_type"/>_fx_active.svg</Pressed>
+        </State>
+        <Connection>
+          <ConfigKey>[EffectRack1_EffectUnit<Variable name="FxUnit"/>],group_<Variable name="group"/>_enable</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+      </PushButton>
+    </Children>
+  </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/fx_assign_button_deck.xml b/res/skins/LateNight/fx_assign_button_deck.xml
index 82deec6b6c93..dacb32e8752d 100644
--- a/res/skins/LateNight/fx_assign_button_deck.xml
+++ b/res/skins/LateNight/fx_assign_button_deck.xml
@@ -16,17 +16,17 @@ Variables:
   <PushButton>
     <TooltipId>EffectUnit_<Variable name="Type"/>_enabled</TooltipId>
     <ObjectName>FxAssignButtonDeck</ObjectName>
-    <Size>28f,22f</Size>
+    <Size><Variable name="Width"/>f,20f</Size>
     <NumberStates>2</NumberStates>
     <RightClickIsPushButton>false</RightClickIsPushButton>
     <State>
       <Number>0</Number>
-      <Text>FX&#8202;<Variable name="FxUnit"/></Text>
+      <Text><Variable name="Text"/><Variable name="FxUnit"/></Text>
       <Alignment>center</Alignment>
     </State>
     <State>
       <Number>1</Number>
-      <Text>FX&#8202;<Variable name="FxUnit"/></Text>
+      <Text><Variable name="Text"/><Variable name="FxUnit"/></Text>
       <Alignment>center</Alignment>
     </State>
     <Connection>
diff --git a/res/skins/LateNight/fx_button.xml b/res/skins/LateNight/fx_button.xml
deleted file mode 100644
index 2cdb31b95eaa..000000000000
--- a/res/skins/LateNight/fx_button.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
-Description:
-  An EffectPushButton template used for FX parameter buttons,
-  EQ kill buttons and QuickEffect buttons.
-Variables:
-  ObjectName:
-  Size      :
-  parameter : 1, 2, 3, ...
-  icon      : optional button graphic for ON/OFF state, is prefixed with
-              '_over', '_down' & '_over_down' is respective button template
-  labelOff  : optional button graphic for OFF state
-  FxRack_FxUnit_FxNum : various, might be
-      [EffectRack1_EffectUnitX_EffectY]
-      [EqualizerRack1_[ChannelA]_EffectY]
-      [QuickEffectRack1_[ChannelA]_EffectY]
-  FxParameter : 
--->
-<Template>
-  <EffectPushButton>
-    <ObjectName><Variable name="ObjectName"/></ObjectName>
-    <Size><Variable name="Size"/></Size>
-    <NumberStates>2</NumberStates>
-    <State>
-      <Number>0</Number>
-      <Pressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="icon"/>_down.svg</Pressed>
-      <Unpressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="icon"/>.svg</Unpressed>
-    </State>
-    <State>
-      <Number>1</Number>
-      <Pressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="icon"/>_overdown.svg</Pressed>
-      <Unpressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="icon"/>_over.svg</Unpressed>
-    </State>
-    <Connection>
-      <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,<Variable name="FxParameter"/></ConfigKey>
-      <ButtonState>LeftButton</ButtonState>
-    </Connection>
-  </EffectPushButton>
-</Template>
diff --git a/res/skins/LateNight/fx_focus_button.xml b/res/skins/LateNight/fx_focus_button.xml
index 797fe376c2b1..d4bbdb6b2388 100644
--- a/res/skins/LateNight/fx_focus_button.xml
+++ b/res/skins/LateNight/fx_focus_button.xml
@@ -10,29 +10,29 @@ Variables:
 <Template>
   <WidgetGroup>
     <Layout>horizontal</Layout>
-    <Size>30f,0me</Size>
+    <SizePolicy>min,min</SizePolicy>
     <Children>
-      <WidgetGroup><Size>5f,0min</Size></WidgetGroup>
-
+      <!-- wrapper to apply padding -->
       <WidgetGroup>
-        <ObjectName>FxFocusButton</ObjectName>
-        <Layout>vertical</Layout>
-        <Size>0min,20f</Size>
+        <ObjectName>FxFocusButtonBox</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
         <Children>
           <PushButton>
             <TooltipId>EffectSlot_focus</TooltipId>
-            <Size>20f,20f</Size>
+            <ObjectName>FxFocusButton</ObjectName>
+            <Size>18f,26f</Size>
             <NumberStates>2</NumberStates>
             <RightClickIsPushButton>true</RightClickIsPushButton>
             <State>
               <Number>0</Number>
-              <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_focus_off.svg</Pressed>
-              <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_focus_off.svg</Unpressed>
+              <Pressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_fx_focus.svg</Pressed>
+              <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_fx_focus.svg</Unpressed>
             </State>
             <State>
               <Number>1</Number>
-              <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_focus_on.svg</Pressed>
-              <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_focus_on.svg</Unpressed>
+              <Pressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_fx_focus_active.svg</Pressed>
+              <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_fx_focus_active.svg</Unpressed>
             </State>
             <Connection>
               <ConfigKey><Variable name="FxRack_FxUnit"/>,focused_effect</ConfigKey>
@@ -49,8 +49,6 @@ Variables:
           </PushButton>
         </Children>
       </WidgetGroup>
-
-      <WidgetGroup><Size>5f,0min</Size></WidgetGroup>
     </Children>
     <Connection>
       <ConfigKey><Variable name="FxRack_FxUnit"/>,show_focus</ConfigKey>
diff --git a/res/skins/LateNight/fx_meta_knob.xml b/res/skins/LateNight/fx_meta_knob.xml
index c3285849b5b6..42068a3bed01 100644
--- a/res/skins/LateNight/fx_meta_knob.xml
+++ b/res/skins/LateNight/fx_meta_knob.xml
@@ -8,14 +8,14 @@
 <Template>
   <WidgetGroup>
     <Layout>horizontal</Layout>
-    <ObjectName>MetaKnob</ObjectName>
+    <ObjectName>FxMetaKnob</ObjectName>
     <SizePolicy>f,max</SizePolicy>
     <Children>
       <KnobComposed>
         <TooltipId>EffectSlot_metaknob</TooltipId>
         <Size>25f,25f</Size>
-        <Knob>skin:knobs_sliders/knob_small_indicator_green.svg</Knob>
-        <BackPath>skin:knobs_sliders/knob_small_bg.svg</BackPath>
+        <Knob>skin:/knobs_<Variable name="knob_scheme"/>/knob_indicator_fx_green.svg</Knob>
+        <BackPath>skin:/knobs_<Variable name="knob_scheme"/>/knob_bg_fx.svg</BackPath>
         <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
         <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
         <Connection>
diff --git a/res/skins/LateNight/fx_parameter_button.xml b/res/skins/LateNight/fx_parameter_button.xml
index 8584b868037b..e76731c3eea8 100644
--- a/res/skins/LateNight/fx_parameter_button.xml
+++ b/res/skins/LateNight/fx_parameter_button.xml
@@ -19,26 +19,43 @@
     <Children>
 
       <WidgetGroup>
-        <ObjectName>FxButton</ObjectName>
+        <ObjectName>FxButtonBox</ObjectName>
         <Layout>horizontal</Layout>
-        <Size>40me,18f</Size>
+        <Size>40me,20f</Size>
         <Children>
-          <Template src="skin:fx_button.xml">
-            <SetVariable name="icon">fx_parameter</SetVariable>
-            <SetVariable name="Size">40f,17f</SetVariable>
-            <SetVariable name="FxParameter">button_parameter<Variable name="FxParameter"/></SetVariable>
-          </Template>
+          <EffectPushButton>
+            <ObjectName>FxParameterButton</ObjectName>
+            <Size>35f,20f</Size>
+            <NumberStates>2</NumberStates>
+            <RightClickIsPushButton>false</RightClickIsPushButton>
+            <State>
+              <Number>0</Number>
+              <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_fx.svg</Unpressed>
+              <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_fx_active.svg</Pressed>
+            </State>
+            <State>
+              <Number>1</Number>
+              <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_fx_active.svg</Unpressed>
+              <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_fx_active.svg</Pressed>
+            </State>
+            <Connection>
+              <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,button_parameter<Variable name="FxParameter"/></ConfigKey>
+              <ButtonState>LeftButton</ButtonState>
+            </Connection>
+          </EffectPushButton>
 	     </Children>
       </WidgetGroup>
 
+      <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
+
       <WidgetGroup>
         <ObjectName>AlignBottom</ObjectName>
         <Layout>horizontal</Layout>
         <SizePolicy>me,f</SizePolicy>
-        <MinimumSize>40,12</MinimumSize>
-        <MaximumSize>58,12</MaximumSize>
+        <MinimumSize>40,10</MinimumSize>
+        <MaximumSize>58,10</MaximumSize>
         <Children>
-          <WidgetGroup><SizePolicy>me,min</SizePolicy></WidgetGroup>
+          <WidgetGroup><Size>1me,0min</Size></WidgetGroup>
           <EffectButtonParameterName>
             <ObjectName>FxButtonLabel</ObjectName>
             <EffectRack><Variable name="FxRack"/></EffectRack>
@@ -47,7 +64,7 @@
             <EffectButtonParameter><Variable name="FxParameter"/></EffectButtonParameter>
             <Alignment>center</Alignment>
           </EffectButtonParameterName>
-          <WidgetGroup><SizePolicy>me,min</SizePolicy></WidgetGroup>
+          <WidgetGroup><Size>1me,0min</Size></WidgetGroup>
         </Children>
       </WidgetGroup>
 
diff --git a/res/skins/LateNight/fx_parameter_knob.xml b/res/skins/LateNight/fx_parameter_knob.xml
index 4a4eb7e68426..b4627ca9a44c 100644
--- a/res/skins/LateNight/fx_parameter_knob.xml
+++ b/res/skins/LateNight/fx_parameter_knob.xml
@@ -16,11 +16,8 @@
     <Layout>vertical</Layout>
     <MinimumSize>40,35</MinimumSize>
     <MaximumSize>60,</MaximumSize>
-    <SizePolicy>me,me</SizePolicy>
+    <SizePolicy>me,min</SizePolicy>
     <Children>
-
-      <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
-
       <WidgetGroup>
         <ObjectName>FxKnob</ObjectName>
         <Layout>horizontal</Layout>
@@ -28,8 +25,8 @@
         <Children>
           <EffectParameterKnobComposed>
             <Size>25f,25f</Size>
-            <Knob>skin:knobs_sliders/knob_small_indicator_green.svg</Knob>
-            <BackPath>skin:knobs_sliders/knob_small_bg.svg</BackPath>
+            <Knob>skin:/knobs_<Variable name="knob_scheme"/>/knob_indicator_fx_white.svg</Knob>
+            <BackPath>skin:/knobs_<Variable name="knob_scheme"/>/knob_bg_fx.svg</BackPath>
             <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
             <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
             <Connection>
@@ -43,10 +40,10 @@
         <ObjectName>AlignBottom</ObjectName>
         <Layout>horizontal</Layout>
         <SizePolicy>me,f</SizePolicy>
-        <MinimumSize>40,12</MinimumSize>
-        <MaximumSize>58,12</MaximumSize>
+        <MinimumSize>40,10</MinimumSize>
+        <MaximumSize>58,10</MaximumSize>
         <Children>
-          <WidgetGroup><SizePolicy>me,min</SizePolicy></WidgetGroup>
+          <WidgetGroup><Size>1me,0min</Size></WidgetGroup>
           <EffectParameterName>
             <ObjectName>FxKnobLabel</ObjectName>
             <EffectRack><Variable name="FxRack"/></EffectRack>
@@ -55,12 +52,10 @@
             <EffectParameter><Variable name="FxParameter"/></EffectParameter>
             <Alignment>center</Alignment>
           </EffectParameterName>
-          <WidgetGroup><SizePolicy>me,min</SizePolicy></WidgetGroup>
+          <WidgetGroup><Size>1me,0min</Size></WidgetGroup>
         </Children>
       </WidgetGroup>
 
-      <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
-
       <WidgetGroup>
         <ObjectName>AlignHCenter</ObjectName>
         <Layout>horizontal</Layout>
@@ -71,7 +66,7 @@
           <Template src="skin:button_2state.xml">
             <SetVariable name="TooltipId">EffectSlot_parameter_inversion</SetVariable>
             <SetVariable name="ObjectName">FxSuperLinkInvertButton</SetVariable>
-            <SetVariable name="Size">9f,5f</SetVariable>
+            <SetVariable name="Size">9f,7f</SetVariable>
             <SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_link_inverse</SetVariable>
           </Template>
 
@@ -79,7 +74,7 @@
           <Template src="skin:button_5state.xml">
             <SetVariable name="TooltipId">EffectSlot_parameter_link_type</SetVariable>
             <SetVariable name="ObjectName">FxSuperLinkButton</SetVariable>
-            <SetVariable name="Size">33,5f</SetVariable>
+            <SetVariable name="Size">33,7f</SetVariable>
             <SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_link_type</SetVariable>
           </Template>
           <WidgetGroup><Size>0min,0min</Size></WidgetGroup>
diff --git a/res/skins/LateNight/fx_rack.xml b/res/skins/LateNight/fx_rack.xml
index 14aa71fefb03..07341851fc2a 100644
--- a/res/skins/LateNight/fx_rack.xml
+++ b/res/skins/LateNight/fx_rack.xml
@@ -17,7 +17,7 @@
       </WidgetGroup>
 
       <WidgetGroup>
-        <Size>5f,1min</Size>
+        <Size>2f,1min</Size>
         <Connection>
           <ConfigKey>[Master],skin_settings</ConfigKey>
           <BindProperty>visible</BindProperty>
diff --git a/res/skins/LateNight/fx_slot.xml b/res/skins/LateNight/fx_slot.xml
index 1a739822b0b7..4129732750d8 100644
--- a/res/skins/LateNight/fx_slot.xml
+++ b/res/skins/LateNight/fx_slot.xml
@@ -12,16 +12,28 @@
 <Template>
   <SetVariable name="FxRack_FxUnit_FxNum">[EffectRack1_EffectUnit<Variable name="FxUnit"/>_Effect<Variable name="FxNum"/>]</SetVariable>
   <SetVariable name="FxRack_FxUnit">[EffectRack1_EffectUnit<Variable name="FxUnit"/>]</SetVariable>
+  <SetVariable name="btn_type"><Variable name="SubRegion_btn_type"/></SetVariable>
 
+<!-- wrapper that allows to set an indirect top/bottom padding within the Fx unit
+    so the Fx unit controls layout is independent. -->
   <WidgetGroup>
-    <Size>0me,46me</Size>
+    <ObjectName>FxSlotContainer</ObjectName>
+    <SizePolicy>me,min</SizePolicy>
     <Layout>stacked</Layout>
+    <!-- This allows additional styles for focused Fx slots via qss selector:
+        #FxSlotContainer[highlight="0/1"] -->
+    <Connection>
+      <ConfigKey persist="true"><Variable name="FxRack_FxUnit"/>,show_parameters</ConfigKey>
+      <BindProperty>highlight</BindProperty>
+    </Connection>
     <Children>
 
+    <!-- transparent container. 3D border (or focus highlight border) as well as
+        background tile are set in FxSlotBorder* widgets underneath -->
       <WidgetGroup>
         <ObjectName>FxSlot<Variable name="FxNum"/></ObjectName>
         <Layout>horizontal</Layout>
-        <SizePolicy>min,me</SizePolicy>
+        <SizePolicy>min,min</SizePolicy>
         <Children>
           <WidgetGroup>
             <Layout>horizontal</Layout>
@@ -83,63 +95,68 @@
             </Connection>
           </WidgetGroup>
 
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <MinimumSize>75,26</MinimumSize>
+          <EffectSelector>
+            <MinimumSize>65,26</MinimumSize>
             <MaximumSize>150,26</MaximumSize>
             <SizePolicy>me,f</SizePolicy>
-            <Children>
-              <EffectSelector>
-                <MinimumSize>75,26</MinimumSize>
-                <MaximumSize>150,26</MaximumSize>
-                <SizePolicy>me,f</SizePolicy>
-                <EffectRack><Variable name="FxRack"/></EffectRack>
-                <EffectUnit><Variable name="FxUnit"/></EffectUnit>
-                <Effect><Variable name="FxNum"/></Effect>
-              </EffectSelector>
-            </Children>
-          </WidgetGroup>
+            <EffectRack><Variable name="FxRack"/></EffectRack>
+            <EffectUnit><Variable name="FxUnit"/></EffectUnit>
+            <Effect><Variable name="FxNum"/></Effect>
+          </EffectSelector>
 
           <Template src="skin:fx_meta_knob.xml">
             <SetVariable name="group"><Variable name="FxRack_FxUnit_FxNum"/></SetVariable>
             <SetVariable name="TooltipId">EffectUnit_mix</SetVariable>
             <SetVariable name="control">meta</SetVariable>
           </Template>
+          
+          <Template src="skin:button_2state.xml">
+            <SetVariable name="TooltipId">EffectSlot_enabled</SetVariable>
+            <SetVariable name="ObjectName">FxToggleButton</SetVariable>
+            <SetVariable name="btn_format">square</SetVariable>
+            <SetVariable name="Size">26f,26f</SetVariable>
+            <SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,enabled</SetVariable>
+          </Template>
 
-          <WidgetGroup>
-            <ObjectName>AlignCenter</ObjectName>
-            <Layout>vertical</Layout>
-            <Size>30f,0me</Size>
-            <Children>
-              <Template src="skin:button_2state.xml">
-                <SetVariable name="TooltipId">EffectSlot_enabled</SetVariable>
-                <SetVariable name="ObjectName">FxToggleButton</SetVariable>
-                <SetVariable name="icon">fx_toggle</SetVariable>
-                <SetVariable name="Size">30f,30f</SetVariable>
-                <SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,enabled</SetVariable>
-              </Template>
-
-              <Template src="skin:fx_focus_button.xml"/>
-
-            </Children>
-          </WidgetGroup>
+          <Template src="skin:fx_focus_button.xml"/>
 
         </Children>
+      </WidgetGroup>
+
+      <!-- Those style the Fx slot border, depending on focus state -->
+      <WidgetGroup>
+        <ObjectName>FxSlotBorder<Variable name="FxNum"/></ObjectName>
+        <SizePolicy>me,min</SizePolicy>
+        <Connection>
+          <ConfigKey><Variable name="FxRack_FxUnit"/>,show_focus</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
         <Connection>
-          <ConfigKey persist="true"><Variable name="FxRack_FxUnit"/>,focused_effect</ConfigKey>
-          <Transform><IsEqual><Variable name="FxNum"/></IsEqual></Transform>
+          <ConfigKey><Variable name="FxRack_FxUnit"/>,show_focus</ConfigKey>
           <BindProperty>highlight</BindProperty>
         </Connection>
       </WidgetGroup>
 
       <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <SizePolicy>me,me</SizePolicy>
+        <SizePolicy>me,min</SizePolicy>
+        <Layout>stacked</Layout>
         <Children>
+          <!-- Fx focus highligh border -->
           <WidgetGroup>
-            <Layout>horizontal</Layout>
+            <ObjectName>FxSlotBorder<Variable name="FxNum"/></ObjectName>
             <SizePolicy>me,me</SizePolicy>
-            <BackPath>style/background_tile_fx_focus.png</BackPath>
+            <Connection>
+              <ConfigKey persist="true"><Variable name="FxRack_FxUnit"/>,focused_effect</ConfigKey>
+              <Transform><IsEqual><Variable name="FxNum"/></IsEqual></Transform>
+              <BindProperty>highlight</BindProperty>
+            </Connection>
+          </WidgetGroup>
+          <WidgetGroup>
+            <SizePolicy>me,me</SizePolicy>
+            <!-- Dark focus background tile. Inhibits border of parent widget... -->
+            <!--BackPath>skin:/style_<Variable name="style_scheme"/>/background_tile_fx_focus.png</BackPath-->
+            <BackPath><Variable name="BgTile"/></BackPath>
             <Connection>
               <ConfigKey persist="true"><Variable name="FxRack_FxUnit"/>,focused_effect</ConfigKey>
               <Transform><IsEqual><Variable name="FxNum"/></IsEqual></Transform>
@@ -148,11 +165,17 @@
           </WidgetGroup>
         </Children>
         <Connection>
-          <ConfigKey persist="true"><Variable name="FxRack_FxUnit"/>,show_focus</ConfigKey>
+          <ConfigKey><Variable name="FxRack_FxUnit"/>,show_focus</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
       </WidgetGroup>
+      <!-- /Focus borders -->
+
+      <WidgetGroup><!-- Regular background tile -->
+        <SizePolicy>me,min</SizePolicy>
+        <BackPath><Variable name="BgTile"/></BackPath>
+      </WidgetGroup>
 
     </Children>
-  </WidgetGroup>
+  </WidgetGroup><!-- FxSlotContainer -->
 </Template>
diff --git a/res/skins/LateNight/fx_unit_parameters_hidden.xml b/res/skins/LateNight/fx_unit_parameters_hidden.xml
index f632b406c80f..6f9432ee0326 100644
--- a/res/skins/LateNight/fx_unit_parameters_hidden.xml
+++ b/res/skins/LateNight/fx_unit_parameters_hidden.xml
@@ -8,7 +8,8 @@
     FxUnit
 -->
 <Template>
-  <SetVariable name="FxRack_FxUnit">EffectRack<Variable name="FxRack"/>_EffectUnit<Variable name="FxUnit"/></SetVariable>
+  <SetVariable name="FxRack_FxUnit">[EffectRack<Variable name="FxRack"/>_EffectUnit<Variable name="FxUnit"/>]</SetVariable>
+  <SetVariable name="btn_type"><Variable name="TopRegion_btn_type"/></SetVariable>
 
   <WidgetGroup>
     <ObjectName>FxUnit<Variable name="FxUnit"/></ObjectName>
@@ -16,17 +17,15 @@
     <SizePolicy>me,max</SizePolicy>
     <Children>
 
-      <!-- Effect slots -->
       <WidgetGroup>
-        <ObjectName>FxRows</ObjectName>
+        <ObjectName>FxSlotsCollapsed</ObjectName>
         <SizePolicy>me,min</SizePolicy>
         <Layout>horizontal</Layout>
-        <BackPath>style/background_tile.png</BackPath>
         <Children>
 
-          <WidgetGroup>
-            <ObjectName>Spacer1e</ObjectName>
-            <Size>0min,1min</Size>
+          <WidgetGroup><!-- Dummy to fill empty space -->
+            <ObjectName>FxRackFiller</ObjectName>
+            <SizePolicy>min,min</SizePolicy>
           </WidgetGroup>
 
           <WidgetGroup>
@@ -40,8 +39,6 @@
             </Children>
           </WidgetGroup>
 
-          <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>2f,1min</Size></WidgetGroup>
-
           <WidgetGroup>
             <Layout>horizontal</Layout>
             <SizePolicy>me,min</SizePolicy>
@@ -53,8 +50,6 @@
             </Children>
           </WidgetGroup>
 
-          <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>2f,1min</Size></WidgetGroup>
-
           <WidgetGroup>
             <Layout>horizontal</Layout>
             <SizePolicy>me,min</SizePolicy>
@@ -66,15 +61,15 @@
             </Children>
           </WidgetGroup>
         </Children>
-      </WidgetGroup><!-- /Effect slots -->
+      </WidgetGroup><!-- FxSlotsCollapsed -->
 
-      <WidgetGroup><!-- Mix / Super -->
-        <ObjectName>FxUnitControls</ObjectName>
+      <WidgetGroup>
+        <ObjectName>FxUnitControlsCollapsed</ObjectName>
         <Layout>horizontal</Layout>
         <SizePolicy>max,min</SizePolicy>
         <Children>
 
-          <WidgetGroup><Size>3f,</Size></WidgetGroup>
+          <WidgetGroup><Size>2f,</Size></WidgetGroup>
 
           <WidgetGroup><!-- Super knob, optional -->
             <Layout>horizontal</Layout>
@@ -98,75 +93,113 @@
 
           <WidgetGroup><Size>5f,</Size></WidgetGroup>
 
+          <!-- MixMode + Pfl in a row with Fx label + Expand button -->
+          <WidgetGroup>
+            <SizePolicy>min,min</SizePolicy>
+            <Layout>horizontal</Layout>
+            <Children>
+              <PushButton>
+                <TooltipId>EffectUnit_mix_mode</TooltipId>
+                <ObjectName>MixModeButton</ObjectName>
+                <Size>32f,26f</Size>
+                <NumberStates>2</NumberStates>
+                <RightClickIsPushButton>false</RightClickIsPushButton>
+                <State>
+                  <Number>0</Number>
+                  <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_square.svg</Unpressed>
+                  <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_square_active.svg</Pressed>
+                </State>
+                <State>
+                  <Number>1</Number>
+                  <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_square.svg</Unpressed>
+                  <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_square_active.svg</Pressed>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="FxRack_FxUnit"/>,mix_mode</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+              </PushButton>
+              <Template src="skin:button_2state.xml">
+                <SetVariable name="TooltipId">pfl</SetVariable>
+                <SetVariable name="ObjectName">PflButton</SetVariable>
+                <SetVariable name="Size">26f,26f</SetVariable>
+                <SetVariable name="btn_format">square</SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit"/>,group_[Headphone]_enable</SetVariable>
+              </Template>
+            </Children>
+            <Connection>
+              <ConfigKey>[LateNight],wide_screen</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup><!-- MixMode + Pfl in a row with Fx label + Expand button -->
+
           <!-- Fx label + expand | mix mode + Pfl -->
           <WidgetGroup>
             <Layout>vertical</Layout>
             <SizePolicy>max,min</SizePolicy>
             <Children>
-
               <!-- Fx label + Expand_Collapsed -->
               <WidgetGroup>
                 <ObjectName></ObjectName>
                 <SizePolicy>min,min</SizePolicy>
                 <Layout>horizontal</Layout>
                 <Children>
-                  <!-- Label -->
                   <Label>
                     <ObjectName>FxUnitLabel</ObjectName>
-                    <Size>me,22f</Size>
+                    <Size>30min,16min</Size>
                     <Text>FX&#8202;<Variable name="FxUnit"/></Text>
                     <Alignment>center</Alignment>
                   </Label>
-                  <WidgetGroup><Size>3f,0min</Size></WidgetGroup>
-                  <WidgetGroup>
-                    <ObjectName>EmbeddeButtonBox</ObjectName>
-                    <Size>22f,22f</Size>
-                    <Layout>vertical</Layout>
-                    <Children>
-                      <SingletonContainer>
-                        <ObjectName>FxUnit<Variable name="FxUnit"/>_ExpandCollapseButton</ObjectName>
-                      </SingletonContainer>
-                    </Children>
-                  </WidgetGroup>
+                  <SingletonContainer>
+                    <ObjectName>FxUnit<Variable name="FxUnit"/>_ExpandCollapseButton</ObjectName>
+                  </SingletonContainer>
                 </Children>
               </WidgetGroup>
-
-              <WidgetGroup><Size>,3f</Size></WidgetGroup>
-
               <!-- MixMode_Collapsed + Pfl -->
               <WidgetGroup>
                 <ObjectName></ObjectName>
                 <SizePolicy>min,min</SizePolicy>
                 <Layout>horizontal</Layout>
                 <Children>
-                  <WidgetGroup>
-                    <ObjectName>EmbeddeButtonBox</ObjectName>
-                    <Size>33f,22f</Size>
-                    <Layout>vertical</Layout>
-                    <Children>
-                      <SingletonContainer>
-                        <ObjectName>FxUnit<Variable name="FxUnit"/>_MixModeButton</ObjectName>
-                      </SingletonContainer>
-                    </Children>
-                  </WidgetGroup>
-                  <WidgetGroup><Size>3f,</Size></WidgetGroup>
-                  <WidgetGroup>
-                    <ObjectName>EmbeddeButtonBox</ObjectName>
-                    <Size>22f,22f</Size>
-                    <Layout>vertical</Layout>
-                    <Children>
-				              <SingletonContainer>
-				                <ObjectName>FxUnit<Variable name="FxUnit"/>_PflButton</ObjectName>
-				              </SingletonContainer>
-                    </Children>
-                  </WidgetGroup>
+                  <PushButton>
+                    <TooltipId>EffectUnit_mix_mode</TooltipId>
+                    <ObjectName>MixModeButton</ObjectName>
+                    <Size>39f,26f</Size>
+                    <NumberStates>2</NumberStates>
+                    <RightClickIsPushButton>false</RightClickIsPushButton>
+                    <State>
+                      <Number>0</Number>
+                      <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_medium.svg</Unpressed>
+                      <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_medium_active.svg</Pressed>
+                    </State>
+                    <State>
+                      <Number>1</Number>
+                      <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_medium.svg</Unpressed>
+                      <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_medium_active.svg</Pressed>
+                    </State>
+                    <Connection>
+                      <ConfigKey><Variable name="FxRack_FxUnit"/>,mix_mode</ConfigKey>
+                      <ButtonState>LeftButton</ButtonState>
+                    </Connection>
+                  </PushButton>
+                  <Template src="skin:button_2state.xml">
+                    <SetVariable name="TooltipId">pfl</SetVariable>
+                    <SetVariable name="ObjectName">PflButton</SetVariable>
+                    <SetVariable name="Size">26f,26f</SetVariable>
+                    <SetVariable name="btn_format">square</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit"/>,group_[Headphone]_enable</SetVariable>
+                  </Template>
                 </Children>
+                <Connection>
+                  <ConfigKey>[LateNight],wide_screen</ConfigKey>
+                  <Transform><Not/></Transform>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
               </WidgetGroup><!-- MixMode_Collapsed + Pfl -->
-
             </Children>
           </WidgetGroup><!-- Fx label + expand | mix mode + Pfl -->
         </Children>
-      </WidgetGroup><!-- /Mix / Super + control buttons + fx label -->
+      </WidgetGroup><!-- FxUnitControlsCollapsed -->
 
     </Children>
   </WidgetGroup>
diff --git a/res/skins/LateNight/fx_unit_parameters_visible.xml b/res/skins/LateNight/fx_unit_parameters_visible.xml
index d4486bbecb1f..862334e7ffaa 100644
--- a/res/skins/LateNight/fx_unit_parameters_visible.xml
+++ b/res/skins/LateNight/fx_unit_parameters_visible.xml
@@ -8,145 +8,133 @@
     FxUnit
 -->
 <Template>
-  <SetVariable name="FxRack_FxUnit">EffectRack<Variable name="FxRack"/>_EffectUnit<Variable name="FxUnit"/></SetVariable>
+  <SetVariable name="FxRack_FxUnit">[EffectRack<Variable name="FxRack"/>_EffectUnit<Variable name="FxUnit"/>]</SetVariable>
+  <SetVariable name="btn_type"><Variable name="TopRegion_btn_type"/></SetVariable>
 
   <WidgetGroup>
     <ObjectName>FxUnit<Variable name="FxUnit"/></ObjectName>
-    <Layout>vertical</Layout>
-    <Size>635me,170min</Size>
+    <Layout>horizontal</Layout>
+    <Size>635me,0min</Size>
     <Children>
 
-      <WidgetGroup><!-- Fx Parameters -->
+      <WidgetGroup>
+        <ObjectName>FxSlotsExpanded</ObjectName>
         <SizePolicy>me,me</SizePolicy>
-        <Layout>horizontal</Layout>
+        <Layout>vertical</Layout>
         <Children>
-          <WidgetGroup>
-            <ObjectName>FxRows</ObjectName>
-            <SizePolicy>me,me</SizePolicy>
-            <Layout>vertical</Layout>
-            <BackPath>style/background_tile.png</BackPath>
-            <Children>
-              <Template src="skin:fx_slot.xml">
-                <SetVariable name="FxNum">1</SetVariable>
-              </Template>
+          <Template src="skin:fx_slot.xml">
+            <SetVariable name="FxNum">1</SetVariable>
+          </Template>
 
-              <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>1me,2f</Size></WidgetGroup>
+          <Template src="skin:fx_slot.xml">
+            <SetVariable name="FxNum">2</SetVariable>
+          </Template>
 
-              <Template src="skin:fx_slot.xml">
-                <SetVariable name="FxNum">2</SetVariable>
-              </Template>
-
-              <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>1me,2f</Size></WidgetGroup>
+          <Template src="skin:fx_slot.xml">
+            <SetVariable name="FxNum">3</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
 
-              <Template src="skin:fx_slot.xml">
-                <SetVariable name="FxNum">3</SetVariable>
-              </Template>
-            </Children>
-          </WidgetGroup>
+      <WidgetGroup><!-- Expand/Collapse + Mix/Super + Pfl -->
+        <ObjectName>FxUnitControlsExpanded</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>max,min</SizePolicy>
+        <Children>
 
-          <WidgetGroup><!-- Expand/Collapse + Mix/Super + Pfl -->
-            <ObjectName>FxUnitControls</ObjectName>
+          <!-- Fx label + expand | mix mode + Pfl -->
+          <WidgetGroup>
             <Layout>vertical</Layout>
             <SizePolicy>max,min</SizePolicy>
             <Children>
 
-              <!-- Fx label + expand | mix mode + Pfl -->
+              <!-- Fx Pfl + Expand_Collapsed -->
               <WidgetGroup>
-                <Layout>vertical</Layout>
-                <SizePolicy>max,min</SizePolicy>
+                <ObjectName></ObjectName>
+                <SizePolicy>min,min</SizePolicy>
+                <Layout>horizontal</Layout>
                 <Children>
-
-                  <!-- Fx Pfl + Expand_Collapsed -->
-                  <WidgetGroup>
-                    <ObjectName></ObjectName>
-                    <SizePolicy>min,min</SizePolicy>
-                    <Layout>horizontal</Layout>
-                    <Children>
-                      <WidgetGroup>
-                        <ObjectName>EmbeddeButtonBox</ObjectName>
-                        <Size>22f,22f</Size>
-                        <Layout>vertical</Layout>
-                        <Children>
-				                  <SingletonContainer>
-				                    <ObjectName>FxUnit<Variable name="FxUnit"/>_PflButton</ObjectName>
-				                  </SingletonContainer>
-                        </Children>
-                      </WidgetGroup>
-                      <WidgetGroup><Size>3f,0min</Size></WidgetGroup>
-                      <WidgetGroup>
-                        <ObjectName>EmbeddeButtonBox</ObjectName>
-                        <Size>22f,22f</Size>
-                        <Layout>vertical</Layout>
-                        <Children>
-                          <SingletonContainer>
-                            <ObjectName>FxUnit<Variable name="FxUnit"/>_ExpandCollapseButton</ObjectName>
-                          </SingletonContainer>
-                        </Children>
-                      </WidgetGroup>
-                    </Children>
-                  </WidgetGroup>
-
-                  <!-- Label -->
-                  <Label>
-                    <ObjectName>FxUnitLabel</ObjectName>
-                    <Size>me,22f</Size>
-                    <Text>FX&#8202;<Variable name="FxUnit"/></Text>
-                    <Alignment>center</Alignment>
-                  </Label>
-
-                  <WidgetGroup>
-                    <Size>0me,22f</Size>
-                    <Layout>vertical</Layout>
-                    <Children>
-                      <WidgetGroup>
-                        <ObjectName>EmbeddeButtonBox</ObjectName>
-                        <Size>33f,22f</Size>
-                        <Layout>vertical</Layout>
-                        <Children>
-                          <SingletonContainer>
-                            <ObjectName>FxUnit<Variable name="FxUnit"/>_MixModeButton</ObjectName>
-                          </SingletonContainer>
-                        </Children>
-                      </WidgetGroup>
-                    </Children>
-                  </WidgetGroup>
-
-                  <WidgetGroup><Size>3f,</Size></WidgetGroup>
-
+                  <Template src="skin:button_2state.xml">
+                    <SetVariable name="TooltipId">pfl</SetVariable>
+                    <SetVariable name="ObjectName">PflButton</SetVariable>
+                    <SetVariable name="Size">26f,26f</SetVariable>
+                    <SetVariable name="btn_format">square</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit"/>,group_[Headphone]_enable</SetVariable>
+                  </Template>
+                  <SingletonContainer>
+                    <ObjectName>FxUnit<Variable name="FxUnit"/>_ExpandCollapseButton</ObjectName>
+                  </SingletonContainer>
                 </Children>
-              </WidgetGroup><!-- Fx label + expand | mix mode + Pfl -->
-
-              <WidgetGroup>
-                <MinimumSize>,0</MinimumSize>
-                <MaximumSize>,5</MaximumSize>
-                <SizePolicy>min,me</SizePolicy>
               </WidgetGroup>
 
-              <SingletonContainer>
-                <ObjectName>FxUnit<Variable name="FxUnit"/>_DryWetKnob</ObjectName>
-              </SingletonContainer>
+              <Label>
+                <ObjectName>FxUnitLabel</ObjectName>
+                <Size>52f,20f</Size>
+                <Text>FX&#8202;<Variable name="FxUnit"/></Text>
+                <Alignment>center</Alignment>
+              </Label>
 
-              <WidgetGroup><!-- Super knob, optional -->
-                <Layout>vertical</Layout>
-                <SizePolicy>min,me</SizePolicy>
+              <WidgetGroup>
+                <ObjectName></ObjectName>
+                <SizePolicy>min,min</SizePolicy>
+                <Layout>horizontal</Layout>
                 <Children>
-                  <WidgetGroup><Size>,1f</Size></WidgetGroup>
-                  <SingletonContainer>
-                    <ObjectName>FxUnit<Variable name="FxUnit"/>_SuperKnob</ObjectName>
-                  </SingletonContainer>
+                  <PushButton>
+                    <TooltipId>EffectUnit_mix_mode</TooltipId>
+                    <ObjectName>MixModeButton</ObjectName>
+                    <Size>42f,26f</Size>
+                    <NumberStates>2</NumberStates>
+                    <RightClickIsPushButton>false</RightClickIsPushButton>
+                    <State>
+                      <Number>0</Number>
+                      <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_medium.svg</Unpressed>
+                      <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_medium_active.svg</Pressed>
+                    </State>
+                    <State>
+                      <Number>1</Number>
+                      <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_medium.svg</Unpressed>
+                      <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_medium_active.svg</Pressed>
+                    </State>
+                    <Connection>
+                      <ConfigKey><Variable name="FxRack_FxUnit"/>,mix_mode</ConfigKey>
+                      <ButtonState>LeftButton</ButtonState>
+                    </Connection>
+                  </PushButton>
                 </Children>
-                <Connection>
-                  <ConfigKey persist="true">[Skin],show_superknobs</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
               </WidgetGroup>
+              <WidgetGroup><Size>3f,</Size></WidgetGroup>
+            </Children>
+          </WidgetGroup><!-- Fx label + expand | mix mode + Pfl -->
+
+          <WidgetGroup>
+            <MinimumSize>,1</MinimumSize>
+            <MaximumSize>,15</MaximumSize>
+            <SizePolicy>min,me</SizePolicy>
+          </WidgetGroup>
+
+          <SingletonContainer>
+            <ObjectName>FxUnit<Variable name="FxUnit"/>_DryWetKnob</ObjectName>
+          </SingletonContainer>
 
-              <WidgetGroup><Size>,0me</Size></WidgetGroup>
+          <WidgetGroup><Size>,1me</Size></WidgetGroup>
+
+          <WidgetGroup><!-- Super knob, optional -->
+            <Layout>vertical</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <SingletonContainer>
+                <ObjectName>FxUnit<Variable name="FxUnit"/>_SuperKnob</ObjectName>
+              </SingletonContainer>
             </Children>
-          </WidgetGroup><!-- /Expand/Collapse + Mix/Super + Pfl -->
-        </Children>
-      </WidgetGroup>
+            <Connection>
+              <ConfigKey persist="true">[Skin],show_superknobs</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
 
+          <WidgetGroup><Size>,1me</Size></WidgetGroup>
+        </Children>
+      </WidgetGroup><!-- /FxUnitControlsExpanded -->
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/fx_units_12.xml b/res/skins/LateNight/fx_units_12.xml
index 9263696534e0..609dff917182 100644
--- a/res/skins/LateNight/fx_units_12.xml
+++ b/res/skins/LateNight/fx_units_12.xml
@@ -1,166 +1,6 @@
 <Template>
   <SetVariable name="FxRack">1</SetVariable>
 
-  <SingletonDefinition>
-    <ObjectName>FxUnit1_ExpandCollapseButton</ObjectName>
-    <Children>
-      <PushButton>
-        <TooltipId>EffectUnit_show_parameters</TooltipId>
-        <Size>20f,20f</Size>
-        <NumberStates>2</NumberStates>
-        <State>
-          <Number>0</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_sampler_expand.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_sampler_expand.svg</Unpressed>
-        </State>
-        <State>
-          <Number>1</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_sampler_collapse.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_sampler_collapse.svg</Unpressed>
-        </State>
-        <Connection>
-          <ConfigKey>[EffectRack1_EffectUnit1],show_parameters</ConfigKey>
-          <ButtonState>LeftButton</ButtonState>
-        </Connection>
-      </PushButton>
-    </Children>
-  </SingletonDefinition>
-
-  <SingletonDefinition>
-    <ObjectName>FxUnit2_ExpandCollapseButton</ObjectName>
-    <Children>
-      <PushButton>
-        <TooltipId>EffectUnit_show_parameters</TooltipId>
-        <Size>20f,20f</Size>
-        <NumberStates>2</NumberStates>
-        <State>
-          <Number>0</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_sampler_expand.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_sampler_expand.svg</Unpressed>
-        </State>
-        <State>
-          <Number>1</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_sampler_collapse.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_sampler_collapse.svg</Unpressed>
-        </State>
-        <Connection>
-          <ConfigKey>[EffectRack1_EffectUnit2],show_parameters</ConfigKey>
-          <ButtonState>LeftButton</ButtonState>
-        </Connection>
-      </PushButton>
-    </Children>
-  </SingletonDefinition>
-
-  <SingletonDefinition>
-    <ObjectName>FxUnit1_MixModeButton</ObjectName>
-    <Children>
-      <PushButton>
-        <TooltipId>EffectUnit_mix_mode</TooltipId>
-        <Size>31f,20f</Size>
-        <NumberStates>2</NumberStates>
-        <State>
-          <Number>0</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_mixmode_d-w.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_mixmode_d-w.svg</Unpressed>
-        </State>
-        <State>
-          <Number>1</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_mixmode_d+w.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_mixmode_d+w.svg</Unpressed>
-        </State>
-        <Connection>
-          <ConfigKey>[EffectRack1_EffectUnit1],mix_mode</ConfigKey>
-          <ButtonState>LeftButton</ButtonState>
-        </Connection>
-      </PushButton>
-    </Children>
-  </SingletonDefinition>
-
-  <SingletonDefinition>
-    <ObjectName>FxUnit2_MixModeButton</ObjectName>
-    <Children>
-      <PushButton>
-        <TooltipId>EffectUnit_mix_mode</TooltipId>
-        <Size>31f,20f</Size>
-        <NumberStates>2</NumberStates>
-        <State>
-          <Number>0</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_mixmode_d-w.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_mixmode_d-w.svg</Unpressed>
-        </State>
-        <State>
-          <Number>1</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_mixmode_d+w.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_mixmode_d+w.svg</Unpressed>
-        </State>
-        <Connection>
-          <ConfigKey>[EffectRack1_EffectUnit2],mix_mode</ConfigKey>
-          <ButtonState>LeftButton</ButtonState>
-        </Connection>
-      </PushButton>
-    </Children>
-  </SingletonDefinition>
-
-  <SingletonDefinition>
-    <ObjectName>FxUnit1_PflButton</ObjectName>
-    <Children>
-      <WidgetGroup>
-        <SizePolicy>me,min</SizePolicy>
-        <Layout>vertical</Layout>
-        <Children>
-          <PushButton>
-            <Size>20f,20f</Size>
-            <TooltipId>EffectUnit_headphones_enabled</TooltipId>
-            <NumberStates>2</NumberStates>
-            <State>
-              <Number>0</Number>
-              <Pressed scalemode="STRETCH_ASPECT">buttons/btn_pfl_small_down.svg</Pressed>
-              <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_pfl_small.svg</Unpressed>
-            </State>
-            <State>
-              <Number>1</Number>
-              <Pressed scalemode="STRETCH_ASPECT">buttons/btn_pfl_small_over.svg</Pressed>
-              <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_pfl_small_over.svg</Unpressed>
-            </State>
-            <Connection>
-              <ConfigKey>[EffectRack1_EffectUnit1],group_[Headphone]_enable</ConfigKey>
-            </Connection>
-          </PushButton>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </SingletonDefinition>
-
-  <SingletonDefinition>
-    <ObjectName>FxUnit2_PflButton</ObjectName>
-    <Children>
-      <WidgetGroup>
-        <SizePolicy>me,min</SizePolicy>
-        <Layout>vertical</Layout>
-        <Children>
-          <PushButton>
-            <Size>20f,20f</Size>
-            <TooltipId>EffectUnit_headphones_enabled</TooltipId>
-            <NumberStates>2</NumberStates>
-            <State>
-              <Number>0</Number>
-              <Pressed scalemode="STRETCH_ASPECT">buttons/btn_pfl_small_down.svg</Pressed>
-              <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_pfl_small.svg</Unpressed>
-            </State>
-            <State>
-              <Number>1</Number>
-              <Pressed scalemode="STRETCH_ASPECT">buttons/btn_pfl_small_over.svg</Pressed>
-              <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_pfl_small_over.svg</Unpressed>
-            </State>
-            <Connection>
-              <ConfigKey>[EffectRack1_EffectUnit2],group_[Headphone]_enable</ConfigKey>
-            </Connection>
-          </PushButton>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </SingletonDefinition>
-
   <SingletonDefinition>
     <ObjectName>FxUnit1_SuperKnob</ObjectName>
     <Children>
@@ -168,9 +8,10 @@
         <SizePolicy>me,min</SizePolicy>
         <Layout>vertical</Layout>
         <Children>
-          <Template src="skin:knob.xml">
-            <SetVariable name="Size">35f,30f</SetVariable>
+          <Template src="skin:knob_textless.xml">
+            <SetVariable name="Size">40f,34f</SetVariable>
             <SetVariable name="Color">green</SetVariable>
+            <SetVariable name="type">regular</SetVariable>
             <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
             <SetVariable name="group">[EffectRack1_EffectUnit1]</SetVariable>
             <SetVariable name="control">super1</SetVariable>
@@ -188,9 +29,10 @@
         <SizePolicy>me,min</SizePolicy>
         <Layout>vertical</Layout>
         <Children>
-          <Template src="skin:knob.xml">
-            <SetVariable name="Size">35f,30f</SetVariable>
+          <Template src="skin:knob_textless.xml">
+            <SetVariable name="Size">40f,34f</SetVariable>
             <SetVariable name="Color">green</SetVariable>
+            <SetVariable name="type">regular</SetVariable>
             <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
             <SetVariable name="group">[EffectRack1_EffectUnit2]</SetVariable>
             <SetVariable name="control">super1</SetVariable>
@@ -208,9 +50,10 @@
         <SizePolicy>me,min</SizePolicy>
         <Layout>vertical</Layout>
         <Children>
-          <Template src="skin:knob.xml">
-            <SetVariable name="Size">35f,30f</SetVariable>
+          <Template src="skin:knob_textless.xml">
+            <SetVariable name="Size">40f,34f</SetVariable>
             <SetVariable name="Color">red</SetVariable>
+            <SetVariable name="type">regular</SetVariable>
             <SetVariable name="TooltipId">EffectUnit_mix</SetVariable>
             <SetVariable name="group">[EffectRack1_EffectUnit1]</SetVariable>
             <SetVariable name="control">mix</SetVariable>
@@ -228,9 +71,10 @@
         <SizePolicy>me,min</SizePolicy>
         <Layout>vertical</Layout>
         <Children>
-          <Template src="skin:knob.xml">
-            <SetVariable name="Size">35f,30f</SetVariable>
+          <Template src="skin:knob_textless.xml">
+            <SetVariable name="Size">40f,34f</SetVariable>
             <SetVariable name="Color">red</SetVariable>
+            <SetVariable name="type">regular</SetVariable>
             <SetVariable name="TooltipId">EffectUnit_mix</SetVariable>
             <SetVariable name="group">[EffectRack1_EffectUnit2]</SetVariable>
             <SetVariable name="control">mix</SetVariable>
@@ -240,6 +84,70 @@
       </WidgetGroup>
     </Children>
   </SingletonDefinition>
+      
+  <SingletonDefinition>
+    <ObjectName>FxUnit1_ExpandCollapseButton</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <SizePolicy>me,min</SizePolicy>
+        <Layout>vertical</Layout>
+        <Children>
+          <PushButton>
+            <TooltipId>EffectUnit_show_parameters</TooltipId>
+            <ObjectName>FxExpandCollapseButton</ObjectName>
+            <Size>26f,26f</Size>
+            <NumberStates>2</NumberStates>
+            <State>
+              <Number>0</Number>
+              <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="TopRegion_btn_type"/>_square.svg</Unpressed>
+              <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="TopRegion_btn_type"/>_square_active.svg</Pressed>
+            </State>
+            <State>
+              <Number>1</Number>
+              <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="TopRegion_btn_type"/>_square.svg</Unpressed>
+              <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="TopRegion_btn_type"/>_square_active.svg</Pressed>
+            </State>
+            <Connection>
+              <ConfigKey>[EffectRack1_EffectUnit1],show_parameters</ConfigKey>
+              <ButtonState>LeftButton</ButtonState>
+            </Connection>
+          </PushButton>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+      
+  <SingletonDefinition>
+    <ObjectName>FxUnit2_ExpandCollapseButton</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <SizePolicy>me,min</SizePolicy>
+        <Layout>vertical</Layout>
+        <Children>
+          <PushButton>
+            <TooltipId>EffectUnit_show_parameters</TooltipId>
+            <ObjectName>FxExpandCollapseButton</ObjectName>
+            <Size>26f,26f</Size>
+            <NumberStates>2</NumberStates>
+            <State>
+              <Number>0</Number>
+              <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="TopRegion_btn_type"/>_square.svg</Unpressed>
+              <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="TopRegion_btn_type"/>_square_active.svg</Pressed>
+            </State>
+            <State>
+              <Number>1</Number>
+              <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="TopRegion_btn_type"/>_square.svg</Unpressed>
+              <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="TopRegion_btn_type"/>_square_active.svg</Pressed>
+            </State>
+            <Connection>
+              <ConfigKey>[EffectRack1_EffectUnit2],show_parameters</ConfigKey>
+              <ButtonState>LeftButton</ButtonState>
+            </Connection>
+          </PushButton>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
 
   <WidgetGroup>
     <ObjectName>FxRack</ObjectName>
diff --git a/res/skins/LateNight/fx_units_34.xml b/res/skins/LateNight/fx_units_34.xml
index 3ddcf4f33d83..d7d4704a2fd4 100644
--- a/res/skins/LateNight/fx_units_34.xml
+++ b/res/skins/LateNight/fx_units_34.xml
@@ -1,166 +1,6 @@
 <Template>
   <SetVariable name="FxRack">1</SetVariable>
 
-  <SingletonDefinition>
-    <ObjectName>FxUnit3_ExpandCollapseButton</ObjectName>
-    <Children>
-      <PushButton>
-        <TooltipId>EffectUnit_show_parameters</TooltipId>
-        <Size>20f,20f</Size>
-        <NumberStates>2</NumberStates>
-        <State>
-          <Number>0</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_sampler_expand.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_sampler_expand.svg</Unpressed>
-        </State>
-        <State>
-          <Number>1</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_sampler_collapse.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_sampler_collapse.svg</Unpressed>
-        </State>
-        <Connection>
-          <ConfigKey>[EffectRack1_EffectUnit3],show_parameters</ConfigKey>
-          <ButtonState>LeftButton</ButtonState>
-        </Connection>
-      </PushButton>
-    </Children>
-  </SingletonDefinition>
-
-  <SingletonDefinition>
-    <ObjectName>FxUnit4_ExpandCollapseButton</ObjectName>
-    <Children>
-      <PushButton>
-        <TooltipId>EffectUnit_show_parameters</TooltipId>
-        <Size>20f,20f</Size>
-        <NumberStates>2</NumberStates>
-        <State>
-          <Number>0</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_sampler_expand.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_sampler_expand.svg</Unpressed>
-        </State>
-        <State>
-          <Number>1</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_sampler_collapse.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_sampler_collapse.svg</Unpressed>
-        </State>
-        <Connection>
-          <ConfigKey>[EffectRack1_EffectUnit4],show_parameters</ConfigKey>
-          <ButtonState>LeftButton</ButtonState>
-        </Connection>
-      </PushButton>
-    </Children>
-  </SingletonDefinition>
-
-  <SingletonDefinition>
-    <ObjectName>FxUnit3_MixModeButton</ObjectName>
-    <Children>
-      <PushButton>
-        <TooltipId>EffectUnit_mix_mode</TooltipId>
-        <Size>31f,20f</Size>
-        <NumberStates>2</NumberStates>
-        <State>
-          <Number>0</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_mixmode_d-w.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_mixmode_d-w.svg</Unpressed>
-        </State>
-        <State>
-          <Number>1</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_mixmode_d+w.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_mixmode_d+w.svg</Unpressed>
-        </State>
-        <Connection>
-          <ConfigKey>[EffectRack1_EffectUnit3],mix_mode</ConfigKey>
-          <ButtonState>LeftButton</ButtonState>
-        </Connection>
-      </PushButton>
-    </Children>
-  </SingletonDefinition>
-
-  <SingletonDefinition>
-    <ObjectName>FxUnit4_MixModeButton</ObjectName>
-    <Children>
-      <PushButton>
-        <TooltipId>EffectUnit_mix_mode</TooltipId>
-        <Size>31f,20f</Size>
-        <NumberStates>2</NumberStates>
-        <State>
-          <Number>0</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_mixmode_d-w.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_mixmode_d-w.svg</Unpressed>
-        </State>
-        <State>
-          <Number>1</Number>
-          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_mixmode_d+w.svg</Pressed>
-          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_mixmode_d+w.svg</Unpressed>
-        </State>
-        <Connection>
-          <ConfigKey>[EffectRack1_EffectUnit4],mix_mode</ConfigKey>
-          <ButtonState>LeftButton</ButtonState>
-        </Connection>
-      </PushButton>
-    </Children>
-  </SingletonDefinition>
-
-  <SingletonDefinition>
-    <ObjectName>FxUnit3_PflButton</ObjectName>
-    <Children>
-      <WidgetGroup>
-        <SizePolicy>me,min</SizePolicy>
-        <Layout>vertical</Layout>
-        <Children>
-          <PushButton>
-            <Size>20f,20f</Size>
-            <TooltipId>EffectUnit_headphones_enabled</TooltipId>
-            <NumberStates>2</NumberStates>
-            <State>
-              <Number>0</Number>
-              <Pressed scalemode="STRETCH_ASPECT">buttons/btn_pfl_small_down.svg</Pressed>
-              <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_pfl_small.svg</Unpressed>
-            </State>
-            <State>
-              <Number>1</Number>
-              <Pressed scalemode="STRETCH_ASPECT">buttons/btn_pfl_small_over.svg</Pressed>
-              <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_pfl_small_over.svg</Unpressed>
-            </State>
-            <Connection>
-              <ConfigKey>[EffectRack1_EffectUnit3],group_[Headphone]_enable</ConfigKey>
-            </Connection>
-          </PushButton>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </SingletonDefinition>
-
-  <SingletonDefinition>
-    <ObjectName>FxUnit4_PflButton</ObjectName>
-    <Children>
-      <WidgetGroup>
-        <SizePolicy>me,min</SizePolicy>
-        <Layout>vertical</Layout>
-        <Children>
-          <PushButton>
-            <Size>20f,20f</Size>
-            <TooltipId>EffectUnit_headphones_enabled</TooltipId>
-            <NumberStates>2</NumberStates>
-            <State>
-              <Number>0</Number>
-              <Pressed scalemode="STRETCH_ASPECT">buttons/btn_pfl_small_down.svg</Pressed>
-              <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_pfl_small.svg</Unpressed>
-            </State>
-            <State>
-              <Number>1</Number>
-              <Pressed scalemode="STRETCH_ASPECT">buttons/btn_pfl_small_over.svg</Pressed>
-              <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_pfl_small_over.svg</Unpressed>
-            </State>
-            <Connection>
-              <ConfigKey>[EffectRack1_EffectUnit4],group_[Headphone]_enable</ConfigKey>
-            </Connection>
-          </PushButton>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </SingletonDefinition>
-
   <SingletonDefinition>
     <ObjectName>FxUnit3_SuperKnob</ObjectName>
     <Children>
@@ -168,9 +8,10 @@
         <SizePolicy>me,min</SizePolicy>
         <Layout>vertical</Layout>
         <Children>
-          <Template src="skin:knob.xml">
-            <SetVariable name="Size">35f,30f</SetVariable>
+          <Template src="skin:knob_textless.xml">
+            <SetVariable name="Size">40f,34f</SetVariable>
             <SetVariable name="Color">green</SetVariable>
+            <SetVariable name="type">regular</SetVariable>
             <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
             <SetVariable name="group">[EffectRack1_EffectUnit3]</SetVariable>
             <SetVariable name="control">super1</SetVariable>
@@ -188,9 +29,10 @@
         <SizePolicy>me,min</SizePolicy>
         <Layout>vertical</Layout>
         <Children>
-          <Template src="skin:knob.xml">
-            <SetVariable name="Size">35f,30f</SetVariable>
+          <Template src="skin:knob_textless.xml">
+            <SetVariable name="Size">40f,34f</SetVariable>
             <SetVariable name="Color">green</SetVariable>
+            <SetVariable name="type">regular</SetVariable>
             <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
             <SetVariable name="group">[EffectRack1_EffectUnit4]</SetVariable>
             <SetVariable name="control">super1</SetVariable>
@@ -208,9 +50,10 @@
         <SizePolicy>me,min</SizePolicy>
         <Layout>vertical</Layout>
         <Children>
-          <Template src="skin:knob.xml">
-            <SetVariable name="Size">35f,30f</SetVariable>
+          <Template src="skin:knob_textless.xml">
+            <SetVariable name="Size">40f,34f</SetVariable>
             <SetVariable name="Color">red</SetVariable>
+            <SetVariable name="type">regular</SetVariable>
             <SetVariable name="TooltipId">EffectUnit_mix</SetVariable>
             <SetVariable name="group">[EffectRack1_EffectUnit3]</SetVariable>
             <SetVariable name="control">mix</SetVariable>
@@ -228,9 +71,10 @@
         <SizePolicy>me,min</SizePolicy>
         <Layout>vertical</Layout>
         <Children>
-          <Template src="skin:knob.xml">
-            <SetVariable name="Size">35f,30f</SetVariable>
+          <Template src="skin:knob_textless.xml">
+            <SetVariable name="Size">40f,34f</SetVariable>
             <SetVariable name="Color">red</SetVariable>
+            <SetVariable name="type">regular</SetVariable>
             <SetVariable name="TooltipId">EffectUnit_mix</SetVariable>
             <SetVariable name="group">[EffectRack1_EffectUnit4]</SetVariable>
             <SetVariable name="control">mix</SetVariable>
@@ -240,6 +84,70 @@
       </WidgetGroup>
     </Children>
   </SingletonDefinition>
+      
+  <SingletonDefinition>
+    <ObjectName>FxUnit3_ExpandCollapseButton</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <SizePolicy>me,min</SizePolicy>
+        <Layout>vertical</Layout>
+        <Children>
+          <PushButton>
+            <TooltipId>EffectUnit_show_parameters</TooltipId>
+            <ObjectName>FxExpandCollapseButton</ObjectName>
+            <Size>26f,26f</Size>
+            <NumberStates>2</NumberStates>
+            <State>
+              <Number>0</Number>
+              <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="TopRegion_btn_type"/>_square.svg</Unpressed>
+              <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="TopRegion_btn_type"/>_square_active.svg</Pressed>
+            </State>
+            <State>
+              <Number>1</Number>
+              <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="TopRegion_btn_type"/>_square.svg</Unpressed>
+              <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="TopRegion_btn_type"/>_square_active.svg</Pressed>
+            </State>
+            <Connection>
+              <ConfigKey>[EffectRack1_EffectUnit3],show_parameters</ConfigKey>
+              <ButtonState>LeftButton</ButtonState>
+            </Connection>
+          </PushButton>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+      
+  <SingletonDefinition>
+    <ObjectName>FxUnit4_ExpandCollapseButton</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <SizePolicy>me,min</SizePolicy>
+        <Layout>vertical</Layout>
+        <Children>
+          <PushButton>
+            <TooltipId>EffectUnit_show_parameters</TooltipId>
+            <ObjectName>FxExpandCollapseButton</ObjectName>
+            <Size>26f,26f</Size>
+            <NumberStates>2</NumberStates>
+            <State>
+              <Number>0</Number>
+              <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="TopRegion_btn_type"/>_square.svg</Unpressed>
+              <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="TopRegion_btn_type"/>_square_active.svg</Pressed>
+            </State>
+            <State>
+              <Number>1</Number>
+              <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="TopRegion_btn_type"/>_square.svg</Unpressed>
+              <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="TopRegion_btn_type"/>_square_active.svg</Pressed>
+            </State>
+            <Connection>
+              <ConfigKey>[EffectRack1_EffectUnit4],show_parameters</ConfigKey>
+              <ButtonState>LeftButton</ButtonState>
+            </Connection>
+          </PushButton>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
 
   <WidgetGroup>
     <ObjectName>FxRack</ObjectName>
diff --git a/res/skins/LateNight/graphics/batt/ic_battery_charged.svg b/res/skins/LateNight/graphics/batt/ic_battery_charged.svg
deleted file mode 100644
index 6841f4177122..000000000000
--- a/res/skins/LateNight/graphics/batt/ic_battery_charged.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m20 4v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v30.662c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-2.3301h-2e-3l2e-3 -28.332c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4zm6 10v11h4l-8 15v-11h-4z" fill="#b4b4b4"/></svg>
diff --git a/res/skins/LateNight/graphics/batt/ic_battery_charging_0.svg b/res/skins/LateNight/graphics/batt/ic_battery_charging_0.svg
deleted file mode 100644
index 22437af77b4a..000000000000
--- a/res/skins/LateNight/graphics/batt/ic_battery_charging_0.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m22.236 39.557-0.23633 0.44336v-0.44336h-8v1.7734c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-1.7734h-2e-3z" fill="#f00"/><path d="m20 4v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v28.889h8v-10.557h-4l8-15v11h4l-7.7637 14.557h11.762l0.001953-28.889c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/LateNight/graphics/batt/ic_battery_charging_1.svg b/res/skins/LateNight/graphics/batt/ic_battery_charging_1.svg
deleted file mode 100644
index 109220793962..000000000000
--- a/res/skins/LateNight/graphics/batt/ic_battery_charging_1.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m22 35.111h-8v6.2188c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-6.2188h-9.3926l-2.6074 4.8887z" fill="#ff5c00"/><path d="m20 4v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v24.443h8v-6.1113h-4l8-15v11h4l-5.3926 10.111h9.3906l0.001953-24.443c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/LateNight/graphics/batt/ic_battery_charging_2.svg b/res/skins/LateNight/graphics/batt/ic_battery_charging_2.svg
deleted file mode 100644
index 7aae0ef1f8e8..000000000000
--- a/res/skins/LateNight/graphics/batt/ic_battery_charging_2.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m22 30.668h-8v10.662c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-10.662h-7.0235l-4.9765 9.332z" fill="#ffb108"/><path d="m20 4v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v20h8v-1.668h-4l8-15v11h4l-3.0234 5.668h7.0215l2e-3 -20c-0.010047-1.4798-1.1987-2.6677-2.6778-2.668h-3.3223v-4z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/LateNight/graphics/batt/ic_battery_charging_3.svg b/res/skins/LateNight/graphics/batt/ic_battery_charging_3.svg
deleted file mode 100644
index 9ec7b713351a..000000000000
--- a/res/skins/LateNight/graphics/batt/ic_battery_charging_3.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m19.48 26.223h-5.4805v15.107c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-15.107h-4.6524l-7.3476 13.777v-11h-4z" fill="#b4b4b4"/><path d="m20 4v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v15.555h5.4805l6.5195-12.223v11h4l-0.65234 1.2227h4.6504l0.001953-15.555c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/LateNight/graphics/batt/ic_battery_charging_4.svg b/res/skins/LateNight/graphics/batt/ic_battery_charging_4.svg
deleted file mode 100644
index 81890a03dfce..000000000000
--- a/res/skins/LateNight/graphics/batt/ic_battery_charging_4.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m21.852 21.777h-7.8516v19.553c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-19.553h-8v3.2227h4l-8 15v-11h-4z" fill="#b4b4b4"/><path d="m20 4v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v11.109h7.8516l4.1484-7.7773v7.7773h7.998l0.001953-11.109c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/LateNight/graphics/batt/ic_battery_charging_5.svg b/res/skins/LateNight/graphics/batt/ic_battery_charging_5.svg
deleted file mode 100644
index 37484a54030a..000000000000
--- a/res/skins/LateNight/graphics/batt/ic_battery_charging_5.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m24.223 17.334h-10.223v23.996c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-23.996h-8v7.666h4l-8 15v-11h-4z" fill="#b4b4b4"/><path d="m20 4v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v6.666h10.223l1.7773-3.334v3.334h7.998l0.001953-6.666c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/LateNight/graphics/batt/ic_battery_charging_6.svg b/res/skins/LateNight/graphics/batt/ic_battery_charging_6.svg
deleted file mode 100644
index afcdfaff53ba..000000000000
--- a/res/skins/LateNight/graphics/batt/ic_battery_charging_6.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m14 12.889v28.441c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-28.441h-2e-3zm12 1.1113v11h4l-8 15v-11h-4z" fill="#b4b4b4"/><path d="m33.999 12.889 1e-3 -2.221c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v2.221z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/LateNight/graphics/batt/ic_battery_charging_7.svg b/res/skins/LateNight/graphics/batt/ic_battery_charging_7.svg
deleted file mode 100644
index e1f4f4997dd8..000000000000
--- a/res/skins/LateNight/graphics/batt/ic_battery_charging_7.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m16.668 8c-1.4791 0-2.668 1.1882-2.668 2.668v30.662c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-29.33h-2e-3l2e-3 -1.332c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-11.322zm9.332 6v11h4l-8 15v-11h-4z" fill="#b4b4b4"/><path d="m20 4v4h8v-4z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/LateNight/graphics/batt/ic_battery_discharging_0.svg b/res/skins/LateNight/graphics/batt/ic_battery_discharging_0.svg
deleted file mode 100644
index d256dd35e5cc..000000000000
--- a/res/skins/LateNight/graphics/batt/ic_battery_discharging_0.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m14 39.556v1.7741c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-1.7741h-2e-3 1e-3z" fill="#f00"/><path d="m33.999 39.556 1e-3 -28.888c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v28.888z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/LateNight/graphics/batt/ic_battery_discharging_1.svg b/res/skins/LateNight/graphics/batt/ic_battery_discharging_1.svg
deleted file mode 100644
index a96ada813c5c..000000000000
--- a/res/skins/LateNight/graphics/batt/ic_battery_discharging_1.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m14 35.112v6.2181c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-6.2181h-2e-3 1e-3z" fill="#ff5c00"/><path d="m33.999 35.112 1e-3 -24.444c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v24.444z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/LateNight/graphics/batt/ic_battery_discharging_2.svg b/res/skins/LateNight/graphics/batt/ic_battery_discharging_2.svg
deleted file mode 100644
index c3150d2e308f..000000000000
--- a/res/skins/LateNight/graphics/batt/ic_battery_discharging_2.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m14 30.667v10.663c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-10.663h-2e-3 1e-3z" fill="#ffb108"/><path d="m33.999 30.667 1e-3 -19.999c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v19.999z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/LateNight/graphics/batt/ic_battery_discharging_3.svg b/res/skins/LateNight/graphics/batt/ic_battery_discharging_3.svg
deleted file mode 100644
index 7aa843cc0382..000000000000
--- a/res/skins/LateNight/graphics/batt/ic_battery_discharging_3.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m14 26.223v15.107c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-15.107h-2e-3 1e-3z" fill="#b4b4b4"/><path d="m33.999 26.223 1e-3 -15.555c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v15.555z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/LateNight/graphics/batt/ic_battery_discharging_4.svg b/res/skins/LateNight/graphics/batt/ic_battery_discharging_4.svg
deleted file mode 100644
index e3831a7f41c2..000000000000
--- a/res/skins/LateNight/graphics/batt/ic_battery_discharging_4.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m14 21.778v19.552c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-19.552h-2e-3 1e-3z" fill="#b4b4b4"/><path d="m33.999 21.778 1e-3 -11.11c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v11.11z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/LateNight/graphics/batt/ic_battery_discharging_5.svg b/res/skins/LateNight/graphics/batt/ic_battery_discharging_5.svg
deleted file mode 100644
index 3824ad247ec3..000000000000
--- a/res/skins/LateNight/graphics/batt/ic_battery_discharging_5.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m14 17.334v23.996c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-23.996h-2e-3 1e-3z" fill="#b4b4b4"/><path d="m33.999 17.334 1e-3 -6.666c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v6.666z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/LateNight/graphics/batt/ic_battery_discharging_6.svg b/res/skins/LateNight/graphics/batt/ic_battery_discharging_6.svg
deleted file mode 100644
index 97ace39848fd..000000000000
--- a/res/skins/LateNight/graphics/batt/ic_battery_discharging_6.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m14 12.889v28.441c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-28.441h-2e-3 1e-3z" fill="#b4b4b4"/><path d="m33.999 12.889 1e-3 -2.221c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v2.221z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/LateNight/graphics/batt/ic_battery_discharging_7.svg b/res/skins/LateNight/graphics/batt/ic_battery_discharging_7.svg
deleted file mode 100644
index c476b0cb686e..000000000000
--- a/res/skins/LateNight/graphics/batt/ic_battery_discharging_7.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m20 8h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v30.662c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-29.33h-2e-3l2e-3 -1.332c-0.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223z" fill="#b4b4b4"/><path d="m20 4v4h8v-4z" fill="#5f5f5f"/></svg>
diff --git a/res/skins/LateNight/graphics/batt/ic_battery_unknown.svg b/res/skins/LateNight/graphics/batt/ic_battery_unknown.svg
deleted file mode 100644
index 269589e46bae..000000000000
--- a/res/skins/LateNight/graphics/batt/ic_battery_unknown.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg"><path d="m31.33 8h-3.33v-4h-8v4h-3.33c-1.48 0-2.67 1.18-2.67 2.66v30.67c0 1.47 1.19 2.67 2.67 2.67h14.67c1.47 0 2.66-1.19 2.66-2.67v-30.67c-0.01-1.48-1.19-2.6556-2.67-2.66z" fill="#5f5f5f"/><path d="m28.6 25.37s-0.76 0.84-1.34 1.42c-0.97 0.97-1.66 2.29-1.66 3.2h-3.2c0-1.66 0.92-3.05 1.86-3.99l1.86-1.89c0.54-0.54 0.88-1.29 0.88-2.12 0-1.66-1.34-3-3-3s-3 1.34-3 3h-3c0-3.31 2.69-6 6-6s6 2.69 6 6c0 1.32-0.53 2.52-1.4 3.38zm-2.7 10.52h-3.8v-3.8h3.8z" fill="#b4b4b4"/></svg>
diff --git a/res/skins/LateNight/knob.xml b/res/skins/LateNight/knob.xml
index 408fdf2354dc..f1a2c6fd1954 100644
--- a/res/skins/LateNight/knob.xml
+++ b/res/skins/LateNight/knob.xml
@@ -24,8 +24,8 @@
           <KnobComposed>
             <TooltipId><Variable name="TooltipId"/></TooltipId>
             <Size><Variable name="Size"/></Size>
-            <Knob>skin:knobs_sliders/knob_indicator_<Variable name="Color"/>.svg</Knob>
-            <BackPath>skin:knobs_sliders/knob_bg.svg</BackPath>
+            <Knob>skin:/knobs_<Variable name="knob_scheme"/>/knob_indicator_<Variable name="type"/>_<Variable name="Color"/>.svg</Knob>
+            <BackPath>skin:/knobs_<Variable name="knob_scheme"/>/knob_bg_<Variable name="type"/>.svg</BackPath>
             <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
             <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
             <KnobCenterYOffset>1.602</KnobCenterYOffset>
diff --git a/res/skins/LateNight/knob_small_textless.xml b/res/skins/LateNight/knob_small_textless.xml
deleted file mode 100644
index fa651a94245c..000000000000
--- a/res/skins/LateNight/knob_small_textless.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    A standard knob.
-  Variables:
-    control: The control to connect to.
--->
-<Template>
-  <WidgetGroup>
-    <Layout>horizontal</Layout>
-    <ObjectName>KnobCentered</ObjectName>
-    <Children>
-      <KnobComposed>
-        <TooltipId><Variable name="TooltipId"/></TooltipId>
-        <Size><Variable name="Size"/></Size>
-        <Knob>skin:knobs_sliders/knob_small_indicator.svg</Knob>
-        <BackPath>skin:knobs_sliders/knob_small_bg.svg</BackPath>
-        <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
-        <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
-        <KnobCenterYOffset>1.602</KnobCenterYOffset>
-        <Connection>
-          <ConfigKey><Variable name="group"/>,<Variable name="control"/></ConfigKey>
-        </Connection>
-      </KnobComposed>
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/knob_textless.xml b/res/skins/LateNight/knob_textless.xml
index d01259a20708..a2b8cd03e98f 100644
--- a/res/skins/LateNight/knob_textless.xml
+++ b/res/skins/LateNight/knob_textless.xml
@@ -13,8 +13,8 @@
       <KnobComposed>
         <TooltipId><Variable name="TooltipId"/></TooltipId>
         <Size><Variable name="Size"/></Size>
-        <Knob>skin:knobs_sliders/knob_indicator_<Variable name="Color"/>.svg</Knob>
-        <BackPath>skin:knobs_sliders/knob_bg.svg</BackPath>
+        <Knob>skin:/knobs_<Variable name="knob_scheme"/>/knob_indicator_<Variable name="type"/>_<Variable name="Color"/>.svg</Knob>
+        <BackPath>skin:/knobs_<Variable name="knob_scheme"/>/knob_bg_<Variable name="type"/>.svg</BackPath>
         <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
         <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
         <KnobCenterYOffset>1.598</KnobCenterYOffset>
diff --git a/res/skins/LateNight/knobs_classic/knob_bg_fx.svg b/res/skins/LateNight/knobs_classic/knob_bg_fx.svg
new file mode 100644
index 000000000000..3c3b2a66a72c
--- /dev/null
+++ b/res/skins/LateNight/knobs_classic/knob_bg_fx.svg
@@ -0,0 +1,25 @@
+<svg width="25" height="25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="a" x1="8.000597" x2="31.999203" y1="18.998119" y2="18.998119" gradientTransform="rotate(254.03464 -4.469143 20.360757)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#0e0e0e" offset="0"/>
+			<stop stop-color="#5d5d5d" offset="1"/>
+		</linearGradient>
+		<linearGradient id="b" x1="256.73999" x2="446.62161" y1="472.03" y2="483.05225" gradientTransform="matrix(-.0309358 -.09353841 .09280739 -.03117947 -44.769021 43.124832)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#1e1e1e" offset="0"/>
+			<stop stop-color="#3d3d3d" offset="1"/>
+		</linearGradient>
+	</defs>
+	<path d="m13.382929 1.3434613c-1.442918-.1015316-2.928676.0839128-4.3814054.5915896-5.859482 1.8916979-9.0598725 8.2514501-7.1154584 14.1308011 1.9445374 5.879724 8.2967888 9.031465 14.1107788 7.000781 5.859482-1.891697 9.061691-8.249629 7.117278-14.1289814-1.45885-4.4111423-5.398913-7.2893476-9.731193-7.5941903z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#080808" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stroke-width=".99999994" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<g transform="matrix(.76872597 .34140352 -.34140352 .76872597 3.5802739 -9.0977713)">
+		<g transform="matrix(.10676 0 0 .10676 -19.071124 -31.786292)" opacity=".49300005">
+			<path d="m270.69379 536.40673c20.01433 60.04489 85.31772 92.31846 145.17067 71.75942 60.21816-19.46338 93.09981-84.46428 73.08548-144.50917-78.29686-151.10046-253.52045-44.94758-218.25615 72.74975z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" opacity="1" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		</g>
+		<g transform="matrix(.10746967 0 0 .10746967 -20.137858 -33.659792)" fill="#050505" opacity=".93999999">
+			<path d="m270.69379 536.40673c20.01433 60.04489 85.31772 92.31846 145.17067 71.75942 60.21816-19.46338 93.09981-84.46428 73.08548-144.50917-20.01433-60.04488-85.31957-92.31785-145.17252-71.7588-60.21816 19.46339-93.09796 84.46366-73.08363 144.50855z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#050505" image-rendering="auto" opacity="1" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		</g>
+	</g>
+	<g transform="matrix(.84551628 0 0 .84551628 23.076731 14.858902)" stroke-width="1.18270934">
+		<path d="m-24.279204-.40785789c.321108 1.51847199.950906 2.99644599 1.903367 4.34524399 3.68078 5.486321 11.186006 6.9108739 16.6772688 3.169848 5.49160905-3.741264 6.868188-11.224396 3.057458-16.6227683-3.680781-5.4863208-11.1846678-6.9132888-16.6759288-3.1722638-4.119967 2.8068068-5.92628 7.7208059-4.962165 12.27994011z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#a)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<path d="m-14.410588-13.267573a10.574617 10.657914 8.0144789 1 1 3.802779 20.9553541 10.574617 10.657914 8.0144789 1 1-3.802779-20.9553541z" fill="url(#b)"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/knobs_classic/knob_bg_regular.svg b/res/skins/LateNight/knobs_classic/knob_bg_regular.svg
new file mode 100644
index 000000000000..f54b48c36b9c
--- /dev/null
+++ b/res/skins/LateNight/knobs_classic/knob_bg_regular.svg
@@ -0,0 +1,29 @@
+<svg width="40" height="34" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="c" x1="256.73999" x2="446.62161" y1="472.03" y2="483.05225" gradientTransform="matrix(-.0309358 -.09353841 .09280739 -.03117947 -12.260041 64.912913)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#1e1e1e" offset="0"/>
+			<stop stop-color="#3d3d3d" offset="1"/>
+		</linearGradient>
+		<linearGradient id="b" x1="8.000597" x2="31.999203" y1="18.998119" y2="18.998119" gradientTransform="rotate(254.03464 19.999759 18.998456)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#0e0e0e" offset="0"/>
+			<stop stop-color="#5d5d5d" offset="1"/>
+		</linearGradient>
+	</defs>
+	<path d="m21.025349 6.0407012c-1.675832-.1179207-3.40142.097458-5.088647.6870836-6.8053152 2.1970543-10.5223103 9.5833922-8.2640303 16.4117842 2.2584231 6.828825 9.6360493 10.489317 16.3885293 8.130842 6.805314-2.197054 10.524423-9.581278 8.266143-16.409671-1.694336-5.1231855-6.2704-8.4659885-11.301995-8.8200388z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#080808" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stroke-width=".99999994" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<path d="m31.5 28v4h6v-4z" color="#000000" style="text-indent:0;text-transform:none"/>
+	<path d="m1.5 28v4h6v-4zm1 1h4v2h-4z" color="#000000" style="text-indent:0;text-transform:none"/>
+	<path d="m2 29v4h6v-4zm1 1h4v2h-4z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#4d4d4d" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<path d="m32 29v4h6v-4z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#4d4d4d" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<g transform="rotate(15.625951,20.010363,19.03425)">
+		<g transform="matrix(.10676 0 0 .10676 -19.071124 -31.786292)" opacity=".49300005">
+			<path d="m270.69379 536.40673c20.01433 60.04489 85.31772 92.31846 145.17067 71.75942 60.21816-19.46338 93.09981-84.46428 73.08548-144.50917-78.29686-151.10046-253.52045-44.94758-218.25615 72.74975z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" opacity="1" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		</g>
+		<g transform="matrix(.10746967 0 0 .10746967 -20.137858 -33.659792)" fill="#050505" opacity=".93999999">
+			<path d="m270.69379 536.40673c20.01433 60.04489 85.31772 92.31846 145.17067 71.75942 60.21816-19.46338 93.09981-84.46428 73.08548-144.50917-20.01433-60.04488-85.31957-92.31785-145.17252-71.7588-60.21816 19.46339-93.09796 84.46366-73.08363 144.50855z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#050505" image-rendering="auto" opacity="1" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		</g>
+	</g>
+	<path d="m8.2297758 21.380224c.3211083 1.518471.9509058 2.996445 1.9033672 4.345243 3.68078 5.486321 11.186006 6.910874 16.677268 3.169848 5.491609-3.741264 6.868188-11.224395 3.057458-16.622767-3.680781-5.486321-11.184667-6.9132893-16.675928-3.1722633-4.1199672 2.8068063-5.9262795 7.7208053-4.9621652 12.2799393z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#b)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<path d="m18.098392 8.5205096a10.574617 10.657914 8.0144789 1 1 3.802779 20.9553524 10.574617 10.657914 8.0144789 1 1-3.802779-20.9553524z" fill="url(#c)"/>
+	<path d="m4.2885454 24.518558a16.746911 16.754821 0 0 1 5.7363876-19.1699185 16.746911 16.754821 0 0 1 20.001123 0 16.746911 16.754821 0 0 1 5.736387 19.1699185" fill="none" stroke="#0b0b0b" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.10000002" style="paint-order:fill markers stroke"/>
+	<path d="m4.2040566 25.536932a16.836822 16.84602 0 0 1 5.7671838-19.2742619 16.836822 16.84602 0 0 1 20.1085056 0 16.836822 16.84602 0 0 1 5.767184 19.2742619" fill="none" stroke="#555" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.10000002" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/knobs_classic/knob_bg_small.svg b/res/skins/LateNight/knobs_classic/knob_bg_small.svg
new file mode 100644
index 000000000000..2e1815cad773
--- /dev/null
+++ b/res/skins/LateNight/knobs_classic/knob_bg_small.svg
@@ -0,0 +1,33 @@
+<svg width="35" height="30" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="b" x1="256.73999" x2="446.62161" y1="472.03" y2="483.05225" gradientTransform="matrix(-.0309358 -.09353841 .09280739 -.03117947 -12.497094 64.492233)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#1e1e1e" offset="0"/>
+			<stop stop-color="#3d3d3d" offset="1"/>
+		</linearGradient>
+		<linearGradient id="a" x1="8.000597" x2="31.999203" y1="18.998119" y2="18.998119" gradientTransform="rotate(254.03464 19.72263 18.877489)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#0e0e0e" offset="0"/>
+			<stop stop-color="#5d5d5d" offset="1"/>
+		</linearGradient>
+	</defs>
+	<path d="m3.7540617 20.98629a14.651862 14.660449 0 0 1 5.0187614-16.7736522 14.651862 14.660449 0 0 1 17.4989699 0 14.651862 14.660449 0 0 1 5.01876 16.7736522" fill="none" stroke="#0b0b0b" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.10000002" style="paint-order:fill markers stroke"/>
+	<g shape-rendering="auto">
+		<path d="m.5 25v4h5v-4zm1 1h3v2h-3z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" solid-color="#000000" stroke-width=".99999994" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<path d="m28.50007 25v4h5v-4z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<path d="m18.408635 5.2238562c-1.485074-.1044979-3.014241.0863644-4.50941.6088736-6.0306758 1.9469661-9.3245696 8.4925262-7.3233471 14.5436492 2.0013494 6.051508 8.5391891 9.29533 14.5230421 7.205318 6.030672-1.946967 9.32644-8.490653 7.325217-14.541777-1.50147-4.5400191-5.556648-7.5023146-10.015502-7.8160638z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#080808" image-rendering="auto" solid-color="#000000" stroke-width=".95833886" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<path d="m1 26v4h5v-4zm1 1h3v2h-3z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#4d4d4d" image-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<path d="m29 26.000001v4h5v-4z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#4d4d4d" image-rendering="auto" solid-color="#000000" stroke-width=".95833892" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	</g>
+	<g transform="matrix(.79968255 .35515184 -.35515184 .79968255 8.2569669 -5.5571877)" stroke-width="1.14285719">
+		<g transform="matrix(.10676 0 0 .10676 -19.071124 -31.786292)" opacity=".49300005">
+			<path d="m270.69379 536.40673c20.01433 60.04489 85.31772 92.31846 145.17067 71.75942 60.21816-19.46338 93.09981-84.46428 73.08548-144.50917-78.29686-151.10046-253.52045-44.94758-218.25615 72.74975z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" opacity="1" shape-rendering="auto" solid-color="#000000" stroke-width="1.14285719" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		</g>
+		<g transform="matrix(.10746967 0 0 .10746967 -20.137858 -33.659792)" fill="#050505" opacity=".93999999">
+			<path d="m270.69379 536.40673c20.01433 60.04489 85.31772 92.31846 145.17067 71.75942 60.21816-19.46338 93.09981-84.46428 73.08548-144.50917-20.01433-60.04488-85.31957-92.31785-145.17252-71.7588-60.21816 19.46339-93.09796 84.46366-73.08363 144.50855z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#050505" image-rendering="auto" opacity="1" shape-rendering="auto" solid-color="#000000" stroke-width="1.14285719" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		</g>
+	</g>
+	<path d="m3.7068307 21.675642a14.702124 14.711531 0 0 1 5.0359772-16.8320996 14.702124 14.711531 0 0 1 17.5589991 0 14.702124 14.711531 0 0 1 5.035977 16.8320996" fill="none" stroke="#555" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.10000014" style="paint-order:fill markers stroke"/>
+	<g transform="matrix(.87319548 0 0 .87606868 .24318816 .46110601)" stroke-width="1.1433394">
+		<path d="m7.9927222 20.959544c.321108 1.518471.950906 2.996445 1.903367 4.345243 3.6807798 5.486321 11.1860058 6.910874 16.6772678 3.169848 5.491609-3.741264 6.868188-11.224395 3.057458-16.622767-3.680781-5.4863209-11.184667-6.9132889-16.675928-3.1722629-4.1199668 2.8068059-5.9262785 7.7208049-4.9621648 12.2799389z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#a)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<path d="m17.861338 8.0998291a10.574617 10.657914 8.0144789 1 1 3.802779 20.9553529 10.574617 10.657914 8.0144789 1 1-3.802779-20.9553529z" fill="url(#b)"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/knobs_classic/knob_indicator_fx_green.svg b/res/skins/LateNight/knobs_classic/knob_indicator_fx_green.svg
new file mode 100644
index 000000000000..93c10375dab3
--- /dev/null
+++ b/res/skins/LateNight/knobs_classic/knob_indicator_fx_green.svg
@@ -0,0 +1,22 @@
+<svg width="25" height="25" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<filter id="c" color-interpolation-filters="sRGB">
+			<feGaussianBlur stdDeviation="0.42678198"/>
+		</filter>
+		<radialGradient id="b" cx="366.94" cy="355.35999" r="21.466" gradientTransform="matrix(1 0 0 .98824 -5.7382e-7 4.1807)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#c4f161" stop-opacity=".94901961" offset="0"/>
+			<stop stop-color="#c0ff5d" stop-opacity=".81961" offset=".54692036"/>
+			<stop stop-color="#7bd002" stop-opacity="0" offset="1"/>
+		</radialGradient>
+		<linearGradient id="d" x1="12.517102" x2="12.517102" y1="3.9656665" y2="11.698717" gradientTransform="translate(0 .0529661)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#77c305" offset="0"/>
+			<stop stop-color="#457600" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g transform="matrix(.79197011 0 0 .85270722 -9.0218349 -3.1351223)" fill="none" stroke="#000">
+		<path d="m25.174967 7.5102553c0-.7709527.64828-1.4446214 1.9809-1.4446214 1.2699 0 1.9692.6439408 1.9947 1.4271876 0 2.1984691.0244 8.6535835.0244 8.6535835-.0742.735839-.988499 1.42949-2.044399 1.42949-1.055901 0-1.937001-.837151-1.937001-1.446512-.009-3.291208-.0184-5.537373-.0185-8.6190455z" stroke-width="1.94699848"/>
+		<path d="m25.174967 5.3358c0-.9375.64828-1.7567 1.9809-1.7567 1.2699 0 1.9692.78305 1.9947 1.7355 0 2.6734.0244 10.523.0244 10.523-.0742.8948-.988499 1.7383-2.044399 1.7383-1.055901 0-1.937001-1.018-1.937001-1.759-.009-4.0022-.0184-6.7336-.0185-10.481z" stroke-width="1.21687412"/>
+	</g>
+	<path d="m12.478516.00999735c-.828428.01186317-1.490384.53415794-1.478516 1.36258605v9.3310386c0 1.55371 3.021961 1.55282 3 0v-9.3310386c.01211-.84525728-.676227-1.37469462-1.521484-1.36258605z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#d)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<path transform="matrix(.06987957 0 0 .07008943 -13.141225 -23.338963)" d="m388.4 355.36a21.466 21.213 0 1 1-42.931 0 21.466 21.213 0 1 1 42.931 0z" fill="url(#b)" filter="url(#c)" opacity=".772" stroke-width="1.26455235"/>
+</svg>
diff --git a/res/skins/LateNight/knobs_classic/knob_indicator_fx_white.svg b/res/skins/LateNight/knobs_classic/knob_indicator_fx_white.svg
new file mode 100644
index 000000000000..8bf1a024e6c6
--- /dev/null
+++ b/res/skins/LateNight/knobs_classic/knob_indicator_fx_white.svg
@@ -0,0 +1,22 @@
+<svg width="25" height="25" version="1.1" viewBox="0 0 25 25" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<radialGradient id="d" cx="367.10001" cy="353.17999" r="28.985001" gradientTransform="matrix(1 0 0 .67653 0 114.24)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#dfdfdd" stop-opacity=".94901961" offset="0"/>
+			<stop stop-color="#c5c5c1" stop-opacity=".81960785" offset=".61062"/>
+			<stop stop-color="#787878" stop-opacity="0" offset="1"/>
+		</radialGradient>
+		<filter id="c" color-interpolation-filters="sRGB">
+			<feGaussianBlur stdDeviation="0.42678198"/>
+		</filter>
+		<linearGradient id="b" x1="12.569915" x2="12.569915" y1="6.4768233" y2="12.000253" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#9b9d99" offset="0"/>
+			<stop stop-color="#737373" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g transform="matrix(.79197011 0 0 .85270722 -9.0218351 -3.1351227)" fill="none" stroke="#000">
+		<path d="m25.174967 7.5102553c0-.7709527.64828-1.4446214 1.9809-1.4446214 1.2699 0 1.9692.6439408 1.9947 1.4271876 0 2.1984691.0244 8.6535835.0244 8.6535835-.0742.735839-.988499 1.42949-2.044399 1.42949-1.055901 0-1.937001-.837151-1.937001-1.446512-.009-3.291208-.0184-5.537373-.0185-8.6190455z" stroke-width="1.94699848"/>
+		<path d="m25.174967 5.3358c0-.9375.64828-1.7567 1.9809-1.7567 1.2699 0 1.9692.78305 1.9947 1.7355 0 2.6734.0244 10.523.0244 10.523-.0742.8948-.988499 1.7383-2.044399 1.7383-1.055901 0-1.937001-1.018-1.937001-1.759-.009-4.0022-.0184-6.7336-.0185-10.481z" stroke-width="1.21687412"/>
+	</g>
+	<path d="m14 10.32794c0 .80694-.4862 1.67231-1.4857 1.67231-.95241 0-1.4769-.83425-1.4959-1.65405 0-2.30113-.0184-8.95323-.0184-8.95323.0557-.7702.74137-1.39297 1.5333-1.39297.79194 0 1.4528.77301 1.4528 1.41081.007 3.44491.0134 5.69125.0134 8.91713z" fill="url(#b)" stroke-width="1.02151847"/>
+	<ellipse transform="matrix(.051698 0 0 .07974844 -6.48 -26.59109)" cx="367.10001" cy="353.17999" rx="24.153999" ry="16.341" fill="url(#d)" filter="url(#c)"/>
+</svg>
diff --git a/res/skins/LateNight/knobs_classic/knob_indicator_regular_green.svg b/res/skins/LateNight/knobs_classic/knob_indicator_regular_green.svg
new file mode 100644
index 000000000000..8c6b26ad0c0a
--- /dev/null
+++ b/res/skins/LateNight/knobs_classic/knob_indicator_regular_green.svg
@@ -0,0 +1,22 @@
+<svg width="40" height="34" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="b" x1="202.39" x2="202.49" y1="623.48" y2="634.37" gradientTransform="matrix(1.2573 0 0 .86853 -234.59 -533.44)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#77c305" offset="0"/>
+			<stop stop-color="#457600" offset="1"/>
+		</linearGradient>
+		<filter id="c" color-interpolation-filters="sRGB">
+			<feGaussianBlur stdDeviation="0.42678198"/>
+		</filter>
+		<radialGradient id="a" cx="366.94" cy="355.36" r="21.466" gradientTransform="matrix(1 0 0 .98824 -5.7382e-7 4.1807)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#def7a7" stop-opacity=".94902" offset="0"/>
+			<stop stop-color="#c0ff5d" stop-opacity=".81961" offset=".61062"/>
+			<stop stop-color="#7bd002" stop-opacity="0" offset="1"/>
+		</radialGradient>
+	</defs>
+	<g fill="none" stroke="#000">
+		<path d="m18 7.5102553c0-.7709527.64828-1.4446214 1.9809-1.4446214 1.2699 0 1.9692.6439408 1.9947 1.4271876 0 2.1984691.0244 8.6535835.0244 8.6535835-.0742.735839-.9885 1.42949-2.0444 1.42949s-1.937-.837151-1.937-1.446512c-.009-3.291208-.0184-5.537373-.0185-8.6190455z" stroke-width="1.60000002"/>
+		<path d="m18 5.3358c0-.9375.64828-1.7567 1.9809-1.7567 1.2699 0 1.9692.78305 1.9947 1.7355 0 2.6734.0244 10.523.0244 10.523-.0742.8948-.9885 1.7383-2.0444 1.7383s-1.937-1.018-1.937-1.759c-.009-4.0022-.0184-6.7336-.0185-10.481z"/>
+	</g>
+	<path d="m18 5.3358c0-.9375.64828-1.7567 1.9809-1.7567 1.2699 0 1.9692.78305 1.9947 1.7355 0 2.6734.0244 10.523.0244 10.523-.0742.8948-.9885 1.7383-2.0444 1.7383s-1.937-1.018-1.937-1.759c-.009-4.0022-.0184-6.7336-.0185-10.481z" fill="url(#b)"/>
+	<path transform="matrix(.088928 0 0 .088072 -12.631 -25.838)" d="m388.4 355.36a21.466 21.213 0 1 1-42.931 0 21.466 21.213 0 1 1 42.931 0z" fill="url(#a)" filter="url(#c)"/>
+</svg>
diff --git a/res/skins/LateNight/knobs_classic/knob_indicator_regular_orange.svg b/res/skins/LateNight/knobs_classic/knob_indicator_regular_orange.svg
new file mode 100644
index 000000000000..b1ded085a16c
--- /dev/null
+++ b/res/skins/LateNight/knobs_classic/knob_indicator_regular_orange.svg
@@ -0,0 +1,22 @@
+<svg width="40" height="34" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="e" x1="202.39" x2="202.49" y1="623.48" y2="634.37" gradientTransform="matrix(1.2573 0 0 .86853 -234.59 -533.44)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#f18900" offset="0"/>
+			<stop stop-color="#b67300" offset="1"/>
+		</linearGradient>
+		<filter id="d" color-interpolation-filters="sRGB">
+			<feGaussianBlur stdDeviation="0.42678198"/>
+		</filter>
+		<radialGradient id="f" cx="366.94" cy="355.36" r="21.466" gradientTransform="matrix(1 0 0 .98824 -5.7382e-7 4.1807)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#fffefa" stop-opacity=".94902" offset="0"/>
+			<stop stop-color="#ff994e" stop-opacity=".81961" offset=".61062"/>
+			<stop stop-color="#ff902d" stop-opacity="0" offset="1"/>
+		</radialGradient>
+	</defs>
+	<g fill="none" stroke="#000">
+		<path d="m18 7.5102553c0-.7709527.64828-1.4446214 1.9809-1.4446214 1.2699 0 1.9692.6439408 1.9947 1.4271876 0 2.1984691.0244 8.6535835.0244 8.6535835-.0742.735839-.9885 1.42949-2.0444 1.42949s-1.937-.837151-1.937-1.446512c-.009-3.291208-.0184-5.537373-.0185-8.6190455z" stroke-width="1.60000002"/>
+		<path d="m18 5.3358c0-.9375.64828-1.7567 1.9809-1.7567 1.2699 0 1.9692.78305 1.9947 1.7355 0 2.6734.0244 10.523.0244 10.523-.0742.8948-.9885 1.7383-2.0444 1.7383s-1.937-1.018-1.937-1.759c-.009-4.0022-.0184-6.7336-.0185-10.481z"/>
+	</g>
+	<path d="m18 5.3358c0-.9375.64828-1.7567 1.9809-1.7567 1.2699 0 1.9692.78305 1.9947 1.7355 0 2.6734.0244 10.523.0244 10.523-.0742.8948-.9885 1.7383-2.0444 1.7383s-1.937-1.018-1.937-1.759c-.009-4.0022-.0184-6.7336-.0185-10.481z" fill="url(#e)"/>
+	<path transform="matrix(.088928 0 0 .088072 -12.631 -25.838)" d="m388.4 355.36a21.466 21.213 0 1 1-42.931 0 21.466 21.213 0 1 1 42.931 0z" fill="url(#f)" filter="url(#d)"/>
+</svg>
diff --git a/res/skins/LateNight/knobs_classic/knob_indicator_regular_red.svg b/res/skins/LateNight/knobs_classic/knob_indicator_regular_red.svg
new file mode 100644
index 000000000000..c334f2f4d213
--- /dev/null
+++ b/res/skins/LateNight/knobs_classic/knob_indicator_regular_red.svg
@@ -0,0 +1,22 @@
+<svg width="40" height="34" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<radialGradient id="a" cx="366.94" cy="355.35999" r="21.466" gradientTransform="matrix(1 0 0 .98824 -5.7382e-7 4.1807)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#eece33" stop-opacity=".95055" offset="0"/>
+			<stop stop-color="#ff734e" stop-opacity=".81868" offset=".61062"/>
+			<stop stop-color="#ff2d2d" stop-opacity="0" offset="1"/>
+		</radialGradient>
+		<filter id="c" color-interpolation-filters="sRGB">
+			<feGaussianBlur stdDeviation="0.42678198"/>
+		</filter>
+		<linearGradient id="b" x1="202.39" x2="202.49001" y1="623.47998" y2="634.37" gradientTransform="matrix(1.2573 0 0 .86853 -234.59 -533.44)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#e90808" offset="0"/>
+			<stop stop-color="#b60000" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g fill="none" stroke="#000">
+		<path d="m18 7.5102553c0-.7709527.64828-1.4446214 1.9809-1.4446214 1.2699 0 1.9692.6439408 1.9947 1.4271876 0 2.1984691.0244 8.6535835.0244 8.6535835-.0742.735839-.9885 1.42949-2.0444 1.42949s-1.937-.837151-1.937-1.446512c-.009-3.291208-.0184-5.537373-.0185-8.6190455z" stroke-width="1.60000002"/>
+		<path d="m18 5.3358c0-.9375.64828-1.7567 1.9809-1.7567 1.2699 0 1.9692.78305 1.9947 1.7355 0 2.6734.0244 10.523.0244 10.523-.0742.8948-.9885 1.7383-2.0444 1.7383s-1.937-1.018-1.937-1.759c-.009-4.0022-.0184-6.7336-.0185-10.481z"/>
+	</g>
+	<path d="m18 5.3358c0-.9375.64828-1.7567 1.9809-1.7567 1.2699 0 1.9692.78305 1.9947 1.7355 0 2.6734.0244 10.523.0244 10.523-.0742.8948-.9885 1.7383-2.0444 1.7383s-1.937-1.018-1.937-1.759c-.009-4.0022-.0184-6.7336-.0185-10.481z" fill="url(#b)"/>
+	<path transform="matrix(.088928 0 0 .088072 -12.631 -25.838)" d="m388.4 355.36a21.466 21.213 0 1 1-42.931 0 21.466 21.213 0 1 1 42.931 0z" fill="url(#a)" filter="url(#c)"/>
+</svg>
diff --git a/res/skins/LateNight/knobs_classic/knob_indicator_small_green.svg b/res/skins/LateNight/knobs_classic/knob_indicator_small_green.svg
new file mode 100644
index 000000000000..a9d07fe9b952
--- /dev/null
+++ b/res/skins/LateNight/knobs_classic/knob_indicator_small_green.svg
@@ -0,0 +1,22 @@
+<svg width="40" height="34" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<radialGradient id="f" cx="366.94" cy="355.35999" r="21.466" gradientTransform="matrix(1 0 0 .98824 -5.7382e-7 4.1807)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#def7a7" stop-opacity=".94902" offset="0"/>
+			<stop stop-color="#c0ff5d" stop-opacity=".81961" offset=".38035452"/>
+			<stop stop-color="#7bd002" stop-opacity="0" offset="1"/>
+		</radialGradient>
+		<filter id="d" color-interpolation-filters="sRGB">
+			<feGaussianBlur stdDeviation="0.42678198"/>
+		</filter>
+		<linearGradient id="e" x1="202.39" x2="202.49001" y1="623.47998" y2="634.37" gradientTransform="matrix(1.2573 0 0 .86853 -234.58976 -533.43991)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#77c305" offset="0"/>
+			<stop stop-color="#457600" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g transform="translate(-7.175043)" fill="none" stroke="#000">
+		<path d="m25.174967 7.5102553c0-.7709527.64828-1.4446214 1.9809-1.4446214 1.2699 0 1.9692.6439408 1.9947 1.4271876 0 2.1984691.0244 8.6535835.0244 8.6535835-.0742.735839-.988499 1.42949-2.044399 1.42949-1.055901 0-1.937001-.837151-1.937001-1.446512-.009-3.291208-.0184-5.537373-.0185-8.6190455z" stroke-width="1.60000002"/>
+		<path d="m25.174967 5.3358c0-.9375.64828-1.7567 1.9809-1.7567 1.2699 0 1.9692.78305 1.9947 1.7355 0 2.6734.0244 10.523.0244 10.523-.0742.8948-.988499 1.7383-2.044399 1.7383-1.055901 0-1.937001-1.018-1.937001-1.759-.009-4.0022-.0184-6.7336-.0185-10.481z"/>
+	</g>
+	<path d="m18.000249 5.3359011c0-.9375.64828-1.7567 1.9809-1.7567 1.2699 0 1.9692.78305 1.9947 1.7355 0 2.6734.0244 10.5229989.0244 10.5229989-.0742.8948-.9885 1.7383-2.0444 1.7383s-1.937-1.018-1.937-1.759c-.009-4.002199-.0184-6.7335989-.0185-10.4809989z" fill="url(#e)"/>
+	<path transform="matrix(.088928 0 0 .088072 -12.630751 -25.726832)" d="m388.4 355.36a21.466 21.213 0 1 1-42.931 0 21.466 21.213 0 1 1 42.931 0z" fill="url(#f)" filter="url(#d)"/>
+</svg>
diff --git a/res/skins/LateNight/knobs_classic/knob_indicator_small_orange.svg b/res/skins/LateNight/knobs_classic/knob_indicator_small_orange.svg
new file mode 100644
index 000000000000..1ea1fa2f0f78
--- /dev/null
+++ b/res/skins/LateNight/knobs_classic/knob_indicator_small_orange.svg
@@ -0,0 +1,22 @@
+<svg width="40" height="34" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="b" x1="202.39" x2="202.49" y1="623.48" y2="634.37" gradientTransform="matrix(1.2573 0 0 .86853 -234.59 -533.44)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#f18900" offset="0"/>
+			<stop stop-color="#b67300" offset="1"/>
+		</linearGradient>
+		<filter id="c" color-interpolation-filters="sRGB">
+			<feGaussianBlur stdDeviation="0.42678198"/>
+		</filter>
+		<radialGradient id="a" cx="366.94" cy="355.36" r="21.466" gradientTransform="matrix(1 0 0 .98824 -5.7382e-7 4.1807)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#fffefa" stop-opacity=".94902" offset="0"/>
+			<stop stop-color="#ff994e" stop-opacity=".81961" offset=".61062"/>
+			<stop stop-color="#ff902d" stop-opacity="0" offset="1"/>
+		</radialGradient>
+	</defs>
+	<g transform="translate(-7.175043)" fill="none" stroke="#000">
+		<path d="m25.174967 7.5102553c0-.7709527.64828-1.4446214 1.9809-1.4446214 1.2699 0 1.9692.6439408 1.9947 1.4271876 0 2.1984691.0244 8.6535835.0244 8.6535835-.0742.735839-.988499 1.42949-2.044399 1.42949-1.055901 0-1.937001-.837151-1.937001-1.446512-.009-3.291208-.0184-5.537373-.0185-8.6190455z" stroke-width="1.60000002"/>
+		<path d="m25.174967 5.3358c0-.9375.64828-1.7567 1.9809-1.7567 1.2699 0 1.9692.78305 1.9947 1.7355 0 2.6734.0244 10.523.0244 10.523-.0742.8948-.988499 1.7383-2.044399 1.7383-1.055901 0-1.937001-1.018-1.937001-1.759-.009-4.0022-.0184-6.7336-.0185-10.481z"/>
+	</g>
+	<path d="m18 5.3358c0-.9375.64828-1.7567 1.9809-1.7567 1.2699 0 1.9692.78305 1.9947 1.7355 0 2.6734.0244 10.523.0244 10.523-.0742.8948-.9885 1.7383-2.0444 1.7383s-1.937-1.018-1.937-1.759c-.009-4.0022-.0184-6.7336-.0185-10.481z" fill="url(#b)"/>
+	<path transform="matrix(.088928 0 0 .088072 -12.631 -25.838)" d="m388.4 355.36a21.466 21.213 0 1 1-42.931 0 21.466 21.213 0 1 1 42.931 0z" fill="url(#a)" filter="url(#c)"/>
+</svg>
diff --git a/res/skins/LateNight/knobs_classic/knob_indicator_small_red.svg b/res/skins/LateNight/knobs_classic/knob_indicator_small_red.svg
new file mode 100644
index 000000000000..b3e41fb47dd3
--- /dev/null
+++ b/res/skins/LateNight/knobs_classic/knob_indicator_small_red.svg
@@ -0,0 +1,24 @@
+<svg width="40" height="34" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<linearGradient id="b" x1="202.39" x2="202.49" y1="623.48" y2="634.37" gradientTransform="matrix(1.2573 0 0 .86853 -234.59 -533.44)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#e90808" offset="0"/>
+			<stop stop-color="#b60000" offset="1"/>
+		</linearGradient>
+		<filter id="c" color-interpolation-filters="sRGB">
+			<feGaussianBlur stdDeviation="0.42678198"/>
+		</filter>
+		<radialGradient id="a" cx="366.94" cy="355.36" r="21.466" gradientTransform="matrix(1 0 0 .98824 -5.7382e-7 4.1807)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#eece33" stop-opacity=".95055" offset="0"/>
+			<stop stop-color="#ff734e" stop-opacity=".81868" offset=".61062"/>
+			<stop stop-color="#ff2d2d" stop-opacity="0" offset="1"/>
+		</radialGradient>
+	</defs>
+	<g transform="translate(-7.175043)" fill="none" stroke="#000">
+		<path d="m25.174967 7.5102553c0-.7709527.64828-1.4446214 1.9809-1.4446214 1.2699 0 1.9692.6439408 1.9947 1.4271876 0 2.1984691.0244 8.6535835.0244 8.6535835-.0742.735839-.988499 1.42949-2.044399 1.42949-1.055901 0-1.937001-.837151-1.937001-1.446512-.009-3.291208-.0184-5.537373-.0185-8.6190455z" stroke-width="1.60000002"/>
+		<path d="m25.174967 5.3358c0-.9375.64828-1.7567 1.9809-1.7567 1.2699 0 1.9692.78305 1.9947 1.7355 0 2.6734.0244 10.523.0244 10.523-.0742.8948-.988499 1.7383-2.044399 1.7383-1.055901 0-1.937001-1.018-1.937001-1.759-.009-4.0022-.0184-6.7336-.0185-10.481z"/>
+	</g>
+	<g>
+		<path d="m18 5.3358c0-.9375.64828-1.7567 1.9809-1.7567 1.2699 0 1.9692.78305 1.9947 1.7355 0 2.6734.0244 10.523.0244 10.523-.0742.8948-.9885 1.7383-2.0444 1.7383s-1.937-1.018-1.937-1.759c-.009-4.0022-.0184-6.7336-.0185-10.481z" fill="url(#b)"/>
+		<path transform="matrix(.088928 0 0 .088072 -12.631 -25.838)" d="m388.4 355.36a21.466 21.213 0 1 1-42.931 0 21.466 21.213 0 1 1 42.931 0z" fill="url(#a)" filter="url(#c)"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/knobs_sliders/knob_bg.svg b/res/skins/LateNight/knobs_sliders/knob_bg.svg
deleted file mode 100644
index 9c454f6db590..000000000000
--- a/res/skins/LateNight/knobs_sliders/knob_bg.svg
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg33"
-   version="1.1"
-   height="34"
-   width="40">
-  <metadata
-     id="metadata37">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs7">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-.03376 -.10128 .10128 -.03376 -15.208 68.318)"
-       y2="472.03"
-       y1="472.03"
-       x2="484.71"
-       x1="256.74"
-       id="a">
-      <stop
-         id="stop2"
-         offset="0"
-         stop-color="#060606" />
-      <stop
-         id="stop4"
-         offset="1"
-         stop-color="#343434" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.03376,-0.10128,0.10128,-0.03376,-15.208007,68.317998)"
-       y2="472.03"
-       y1="472.03"
-       x2="484.70999"
-       x1="256.73999"
-       id="a-3">
-      <stop
-         id="stop2-6"
-         offset="0"
-         stop-color="#060606" />
-      <stop
-         id="stop4-7"
-         offset="1"
-         stop-color="#343434" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.03376,-0.10128,0.10128,-0.03376,-15.208,68.318)"
-       y2="472.03"
-       y1="472.03"
-       x2="484.70999"
-       x1="256.73999"
-       id="a-6">
-      <stop
-         id="stop2-2"
-         offset="0"
-         stop-color="#060606" />
-      <stop
-         id="stop4-9"
-         offset="1"
-         stop-color="#343434" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.03328073,-0.10062864,0.0998422,-0.03354288,-14.705473,68.394673)"
-       y2="472.03"
-       y1="472.03"
-       x2="484.70999"
-       x1="256.73999"
-       id="a-1">
-      <stop
-         id="stop2-27"
-         offset="0"
-         stop-color="#060606" />
-      <stop
-         id="stop4-0"
-         offset="1"
-         stop-color="#343434" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.03288643,-0.09943641,0.09865929,-0.03314547,-14.294293,68.371646)"
-       y2="472.03"
-       y1="472.03"
-       x2="484.70999"
-       x1="256.73999"
-       id="a-1-3">
-      <stop
-         id="stop2-27-6"
-         offset="0"
-         stop-color="#060606" />
-      <stop
-         id="stop4-0-7"
-         offset="1"
-         stop-color="#343434" />
-    </linearGradient>
-  </defs>
-  <g
-     transform="matrix(0.10676,0,0,0.10676,-19.213,-33.246908)"
-     id="g21"
-     style="fill:#000000;fill-opacity:1">
-    <path
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:11.80000019;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       d="m 367.63086,322.51172 c -30.46967,-0.0642 -52.78717,8.49417 -52.99024,8.57226 C 241.23979,357.08895 198.7918,432.46474 212.32227,507.2832 a 5.9007761,5.9007761 0 1 0 11.61328,-2.09961 C 211.4153,435.95126 250.61986,366.23723 318.6582,342.17578 l 0.0781,-0.0273 0.0781,-0.0293 c 0,0 20.39793,-7.8665 48.79102,-7.80664 28.42149,0.0598 48.05078,7.79297 48.05078,7.79297 l 0.0937,0.0351 0.0937,0.0332 c 40.83399,14.48765 74.78969,46.9257 89.5625,91.24414 7.9982,23.99565 9.39152,48.54081 5.19727,71.77344 a 5.9006018,5.9006018 0 1 0 11.61328,2.09765 c 4.53415,-25.11537 3.01716,-51.70517 -5.61524,-77.60351 -15.93263,-47.79791 -52.63754,-82.92589 -96.72656,-98.59766 -0.27798,-0.10867 -21.86056,-8.51221 -52.24414,-8.57617 z"
-       id="path19" />
-  </g>
-  <g
-     style="display:none"
-     id="layer1">
-    <rect
-       y="-713"
-       x="-840.6828"
-       height="1459"
-       width="1780.3656"
-       id="rect1034"
-       style="opacity:1;fill:#1e1e1e;fill-opacity:1;stroke:none;stroke-width:7.07004404;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
-  </g>
-  <path
-     d="m 32,28 v 4 h 6 v -4 z"
-     style="color:#000000;text-indent:0;text-transform:none;fill:#101010"
-     id="path29" />
-  <path
-     d="m 2,28 v 4 h 6 v -4 z m 1,1 h 4 v 2 H 3 Z"
-     style="color:#000000;text-indent:0;text-transform:none;fill:#101010"
-     id="path25" />
-  <rect
-     style="fill:none;stroke:#767676;stroke-linecap:round;stroke-dashoffset:319.5"
-     x="2.5"
-     y="29.500002"
-     width="5.0001001"
-     height="3"
-     id="rect27" />
-  <rect
-     style="fill:#767676;stroke:#767676;stroke-linecap:round;stroke-dashoffset:319.5"
-     x="32.5"
-     y="29.500002"
-     width="5"
-     height="3"
-     id="rect31" />
-  <g
-     transform="matrix(0.10676,0,0,0.10676,-19.213,-32.583998)"
-     id="g21-3">
-    <path
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#585858;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:11.80000019;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       d="m 367.63086,322.51172 c -30.46967,-0.0642 -52.78717,8.49417 -52.99024,8.57226 C 241.23979,357.08895 198.7918,432.46474 212.32227,507.2832 a 5.9007761,5.9007761 0 1 0 11.61328,-2.09961 C 211.4153,435.95126 250.61986,366.23723 318.6582,342.17578 l 0.0781,-0.0273 0.0781,-0.0293 c 0,0 20.39793,-7.8665 48.79102,-7.80664 28.42149,0.0598 48.05078,7.79297 48.05078,7.79297 l 0.0937,0.0351 0.0937,0.0332 c 40.83399,14.48765 74.78969,46.9257 89.5625,91.24414 7.9982,23.99565 9.39152,48.54081 5.19727,71.77344 a 5.9006018,5.9006018 0 1 0 11.61328,2.09765 c 4.53415,-25.11537 3.01716,-51.70517 -5.61524,-77.60351 -15.93263,-47.79791 -52.63754,-82.92589 -96.72656,-98.59766 -0.27798,-0.10867 -21.86056,-8.51221 -52.24414,-8.57617 z"
-       id="path19-6" />
-  </g>
-  <g
-     id="g845"
-     transform="rotate(23.946774,19.996454,19.008447)">
-    <g
-       style="opacity:0.49300005;fill:#000000;fill-opacity:1"
-       id="g11-3"
-       transform="matrix(0.10676,0,0,0.10676,-19.071124,-31.786292)">
-      <path
-         id="path9-5"
-         d="m 270.69379,536.40673 c 20.01433,60.04489 85.31772,92.31846 145.17067,71.75942 60.21816,-19.46338 93.09981,-84.46428 73.08548,-144.50917 C 410.65308,312.55652 235.42949,418.7094 270.69379,536.40673 Z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:11.80004597;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-    </g>
-    <g
-       style="opacity:0.93999999;fill:#050505;fill-opacity:1"
-       id="g11"
-       transform="matrix(0.10746967,0,0,0.10746967,-20.137858,-33.659792)">
-      <path
-         id="path9"
-         d="m 270.69379,536.40673 c 20.01433,60.04489 85.31772,92.31846 145.17067,71.75942 60.21816,-19.46338 93.09981,-84.46428 73.08548,-144.50917 -20.01433,-60.04488 -85.31957,-92.31785 -145.17252,-71.7588 -60.21816,19.46339 -93.09796,84.46366 -73.08363,144.50855 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#050505;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:11.80004597;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-    </g>
-  </g>
-  <path
-     id="path23"
-     d="M 20.947266,7.0273438 C 19.399041,6.9184022 17.804847,7.1173812 16.246094,7.6621094 9.9589694,9.6918692 6.5250047,16.515774 8.6113281,22.824219 c 2.0864559,6.308845 8.9023139,9.690608 15.1406249,7.511719 6.287125,-2.02976 9.723042,-8.851712 7.636719,-15.160157 C 29.823351,10.4427 25.595731,7.354435 20.947266,7.0273438 Z"
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#404040;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9758411;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-  <path
-     style="fill:url(#a-1-3);stroke:none;stroke-width:0.96427953;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 16.445167,8.8140636 A 11.241392,11.329941 0 1 1 23.554132,30.309534 11.241392,11.329941 0 1 1 16.445167,8.8140636 Z"
-     id="path23-5" />
-</svg>
diff --git a/res/skins/LateNight/knobs_sliders/knob_bg.svg_no_ring b/res/skins/LateNight/knobs_sliders/knob_bg.svg_no_ring
deleted file mode 100644
index 44de52837243..000000000000
--- a/res/skins/LateNight/knobs_sliders/knob_bg.svg_no_ring
+++ /dev/null
@@ -1,357 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.1"
-   width="40"
-   height="34"
-   id="svg2">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient4937">
-      <stop
-         id="stop4939"
-         style="stop-color:#e90808;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4941"
-         style="stop-color:#b60000;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3939">
-      <stop
-         id="stop3941"
-         style="stop-color:#eece33;stop-opacity:0.95054942"
-         offset="0" />
-      <stop
-         id="stop5813"
-         style="stop-color:#ff734e;stop-opacity:0.8186813"
-         offset="0.61061949" />
-      <stop
-         id="stop3943"
-         style="stop-color:#ff2d2d;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5461">
-      <stop
-         id="stop5463"
-         style="stop-color:#b9dcff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5465"
-         style="stop-color:#0d0d0d;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441">
-      <stop
-         id="stop5443"
-         style="stop-color:#060606;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5445"
-         style="stop-color:#343434;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692"
-       id="linearGradient5483-8"
-       xlink:href="#linearGradient5441-4"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient5441-4">
-      <stop
-         id="stop5443-2"
-         style="stop-color:#060606;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5445-4"
-         style="stop-color:#2a2a2a;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441-7">
-      <stop
-         id="stop5443-4"
-         style="stop-color:#060606;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5445-7"
-         style="stop-color:#2a2a2a;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692"
-       id="linearGradient5573-4"
-       xlink:href="#linearGradient5441-4-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.31622183,-0.94868524,0.94868524,-0.31622183,39.645062,974.00808)" />
-    <linearGradient
-       id="linearGradient5441-4-6">
-      <stop
-         id="stop5443-2-5"
-         style="stop-color:#060606;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5445-4-9"
-         style="stop-color:#2a2a2a;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="366.93793"
-       cy="355.35693"
-       r="21.465742"
-       fx="366.93793"
-       fy="355.35693"
-       id="radialGradient3945"
-       xlink:href="#linearGradient3939"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,223.83677,381.60387)" />
-    <linearGradient
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954"
-       id="linearGradient5024"
-       xlink:href="#linearGradient5441"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(54.522364,18.173742)" />
-    <linearGradient
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509"
-       id="linearGradient5032"
-       xlink:href="#linearGradient5441-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-57.471498)" />
-    <linearGradient
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509"
-       id="linearGradient5265"
-       xlink:href="#linearGradient5441-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)" />
-    <linearGradient
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954"
-       id="linearGradient5267"
-       xlink:href="#linearGradient5441"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)" />
-    <radialGradient
-       cx="366.93793"
-       cy="355.35693"
-       r="21.465742"
-       fx="366.93793"
-       fy="355.35693"
-       id="radialGradient5791"
-       xlink:href="#linearGradient3939"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381477e-7,4.1806787)" />
-    <linearGradient
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509"
-       id="linearGradient5793"
-       xlink:href="#linearGradient5441-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)" />
-    <linearGradient
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954"
-       id="linearGradient5795"
-       xlink:href="#linearGradient5441"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)" />
-    <linearGradient
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509"
-       id="linearGradient5803"
-       xlink:href="#linearGradient5441-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)" />
-    <radialGradient
-       cx="366.93793"
-       cy="355.35693"
-       r="21.465742"
-       fx="366.93793"
-       fy="355.35693"
-       id="radialGradient5825"
-       xlink:href="#linearGradient3939"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381459e-7,4.1806787)" />
-    <linearGradient
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509"
-       id="linearGradient5845"
-       xlink:href="#linearGradient5441-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)" />
-    <linearGradient
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954"
-       id="linearGradient5847"
-       xlink:href="#linearGradient5441"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)" />
-    <linearGradient
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509"
-       id="linearGradient3354"
-       xlink:href="#linearGradient5441-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)" />
-    <linearGradient
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954"
-       id="linearGradient3356"
-       xlink:href="#linearGradient5441"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)" />
-    <radialGradient
-       cx="366.93793"
-       cy="355.35693"
-       r="21.465742"
-       fx="366.93793"
-       fy="355.35693"
-       id="radialGradient3358"
-       xlink:href="#linearGradient3939"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381495e-7,4.1806787)" />
-    <linearGradient
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509"
-       id="linearGradient3837"
-       xlink:href="#linearGradient5441-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)" />
-    <linearGradient
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954"
-       id="linearGradient3839"
-       xlink:href="#linearGradient5441"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)" />
-    <linearGradient
-       x1="202.39464"
-       y1="623.47784"
-       x2="202.48778"
-       y2="634.36542"
-       id="linearGradient4945"
-       xlink:href="#linearGradient4937"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-52.110466,0)" />
-    <radialGradient
-       cx="366.93793"
-       cy="355.35693"
-       r="21.465742"
-       fx="366.93793"
-       fy="355.35693"
-       id="radialGradient4947"
-       xlink:href="#linearGradient3939"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)" />
-  </defs>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-182.48349,-619.88674)"
-     id="layer4"
-     style="display:inline">
-    <g
-       transform="matrix(0.10676061,0,0,0.10675946,162.71346,586.67292)"
-       id="g3912"
-       style="opacity:0.94000005;display:inline">
-      <path
-         d="m 478.8123,472.02954 a 108.08632,108.08632 0 1 1 -216.17264,0 108.08632,108.08632 0 1 1 216.17264,0 z"
-         transform="matrix(-0.31622183,-0.94868528,0.94868528,-0.31622183,49.241524,1000.9691)"
-         id="path4669-2"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:11.79993725;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
-    </g>
-  </g>
-  <g
-     transform="translate(-182.48349,-619.88674)"
-     id="layer2"
-     style="display:inline">
-    <path
-       d="m 478.8123,472.02954 a 108.08632,108.08632 0 1 1 -216.17264,0 108.08632,108.08632 0 1 1 216.17264,0 z"
-       transform="matrix(-0.03376004,-0.10128113,0.10128222,-0.03375967,167.18755,691.97202)"
-       id="path4669"
-       style="fill:url(#linearGradient3839);fill-opacity:1;fill-rule:nonzero;stroke:#585858;stroke-width:11.79993725;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <rect
-       width="5.0000539"
-       height="3"
-       x="184.98351"
-       y="650.38672"
-       id="rect5530-9"
-       style="fill:none;stroke:#252525;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:319.5;display:inline" />
-    <rect
-       width="5.0000539"
-       height="3"
-       x="183.98349"
-       y="649.38672"
-       id="rect5530"
-       style="fill:none;stroke:#767676;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:319.5" />
-    <rect
-       width="5.0000043"
-       height="3"
-       x="215.98349"
-       y="650.38672"
-       id="rect5530-9-3"
-       style="fill:#370000;fill-opacity:0;stroke:#252525;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:319.5;display:inline" />
-    <rect
-       width="5.0000043"
-       height="3"
-       x="214.98349"
-       y="649.38672"
-       id="rect5530-5"
-       style="fill:#767676;fill-opacity:1;stroke:#767676;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:319.5" />
-  </g>
-</svg>
diff --git a/res/skins/LateNight/knobs_sliders/knob_bg.svg_ring b/res/skins/LateNight/knobs_sliders/knob_bg.svg_ring
deleted file mode 100644
index 62a953970175..000000000000
--- a/res/skins/LateNight/knobs_sliders/knob_bg.svg_ring
+++ /dev/null
@@ -1,447 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="40"
-   height="34"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="knob_bg.svg">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient4937">
-      <stop
-         style="stop-color:#e90808;stop-opacity:1;"
-         offset="0"
-         id="stop4939" />
-      <stop
-         style="stop-color:#b60000;stop-opacity:1;"
-         offset="1"
-         id="stop4941" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3939">
-      <stop
-         style="stop-color:#eece33;stop-opacity:0.95054942;"
-         offset="0"
-         id="stop3941" />
-      <stop
-         id="stop5813"
-         offset="0.61061949"
-         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
-      <stop
-         style="stop-color:#ff2d2d;stop-opacity:0;"
-         offset="1"
-         id="stop3943" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5461">
-      <stop
-         id="stop5463"
-         offset="0"
-         style="stop-color:#b9dcff;stop-opacity:1;" />
-      <stop
-         id="stop5465"
-         offset="1"
-         style="stop-color:#0d0d0d;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443" />
-      <stop
-         style="stop-color:#343434;stop-opacity:1;"
-         offset="1"
-         id="stop5445" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5483-8"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient5441-4">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5441-7">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-4" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4-6"
-       id="linearGradient5573-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.31622183,-0.94868524,0.94868524,-0.31622183,39.645062,974.00808)"
-       x1="345.55801"
-       y1="460.78387"
-       x2="477.52518"
-       y2="506.3692" />
-    <linearGradient
-       id="linearGradient5441-4-6">
-      <stop
-         style="stop-color:#060606;stop-opacity:1;"
-         offset="0"
-         id="stop5443-2-5" />
-      <stop
-         style="stop-color:#2a2a2a;stop-opacity:1;"
-         offset="1"
-         id="stop5445-4-9" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3945"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,223.83677,381.60387)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5024"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(54.522364,18.173742)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5032"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-57.471498)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5265"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5267"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5791"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381477e-7,4.1806787)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5793"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.822937,-35.303175)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5795"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5803"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient5825"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381459e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient5845"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient5847"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3354"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3356"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient3358"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381495e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441-4"
-       id="linearGradient3837"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-37.471498)"
-       x1="366.71561"
-       y1="515.51764"
-       x2="368.96512"
-       y2="333.18509" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5441"
-       id="linearGradient3839"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(33.231373,11.944343)"
-       x1="256.73965"
-       y1="472.02954"
-       x2="484.71231"
-       y2="472.02954" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4937"
-       id="linearGradient4945"
-       x1="202.39464"
-       y1="623.47784"
-       x2="202.48778"
-       y2="634.36542"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.257316,0,0,1,-52.110466,0)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3939"
-       id="radialGradient4947"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
-       cx="366.93793"
-       cy="355.35693"
-       fx="366.93793"
-       fy="355.35693"
-       r="21.465742" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="20.482041"
-     inkscape:cx="20.856753"
-     inkscape:cy="14.029772"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer4"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1056"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="shadow"
-     style="display:inline"
-     transform="translate(-182.48349,-619.88674)">
-    <!-- shadow for the top arc -->
-    <g
-       style="display:inline"
-       id="g5840"
-       transform="matrix(0.10676061,0,0,0.10675946,163.27006,587.30226)">
-      <g id="g5835" transform="translate(7,7)">
-        <path
-            style="fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:#000000;stroke-width:11.79993725;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-            d="m 516.41339,506.23793 c 4.36416,-24.17368 2.9091,-49.74094 -5.40625,-74.6875 -15.35754,-46.0736 -50.70669,-79.86553 -93.1875,-94.9375 0,0 -20.697,-8.14015 -50.19834,-8.20231 -29.50134,-0.0622 -50.92666,8.20231 -50.92666,8.20231 -70.74581,25.01887 -111.59378,97.57954 -98.5625,169.625"
-            id="path4669-1-shadow"
-            inkscape:connector-curvature="0"
-            sodipodi:nodetypes="csczcc" />
-      </g>
-    </g>
-    <!-- shadow for the center oval -->
-    <g
-       id="g3912"
-       style="display:inline;opacity:0.94000006"
-       transform="matrix(0.10676061,0,0,0.10675946,162.71346,586.67292)">
-      <path
-         transform="matrix(-0.31622183,-0.94868528,0.94868528,-0.31622183,49.241524,1000.9691)"
-         d="m 478.8123,472.02954 c 0,59.69443 -48.39189,108.08632 -108.08632,108.08632 -59.69442,0 -108.08632,-48.39189 -108.08632,-108.08632 0,-59.69442 48.3919,-108.08632 108.08632,-108.08632 59.69443,0 108.08632,48.3919 108.08632,108.08632 z"
-         sodipodi:ry="108.08632"
-         sodipodi:rx="108.08632"
-         sodipodi:cy="472.02954"
-         sodipodi:cx="370.72598"
-         id="path4669-2"
-         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:11.79993724999999927;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-         sodipodi:type="arc" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="bg"
-     style="display:inline"
-     transform="translate(-182.48349,-619.88674)">
-    <g
-       style="display:inline"
-       id="g5840"
-       transform="matrix(0.10676061,0,0,0.10675946,163.27006,587.30226)">
-      <g
-         id="g5835">
-        <path
-           style="fill:none;stroke:#585858;stroke-width:11.79993725;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-           d="m 516.41339,506.23793 c 4.36416,-24.17368 2.9091,-49.74094 -5.40625,-74.6875 -15.35754,-46.0736 -50.70669,-79.86553 -93.1875,-94.9375 0,0 -20.697,-8.14015 -50.19834,-8.20231 -29.50134,-0.0622 -50.92666,8.20231 -50.92666,8.20231 -70.74581,25.01887 -111.59378,97.57954 -98.5625,169.625"
-           id="path4669-1"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="csczcc" />
-      </g>
-      <path
-         transform="matrix(-0.31622183,-0.94868528,0.94868528,-0.31622183,36.694118,980.42607)"
-         d="m 478.8123,472.02954 c 0,59.69443 -48.39189,108.08632 -108.08632,108.08632 -59.69442,0 -108.08632,-48.39189 -108.08632,-108.08632 0,-59.69442 48.3919,-108.08632 108.08632,-108.08632 59.69443,0 108.08632,48.3919 108.08632,108.08632 z"
-         sodipodi:ry="108.08632"
-         sodipodi:rx="108.08632"
-         sodipodi:cy="472.02954"
-         sodipodi:cx="370.72598"
-         id="path4669"
-         style="fill:url(#linearGradient3839);fill-opacity:1;fill-rule:nonzero;stroke:#585858;stroke-width:11.79993725;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
-    </g>
-    <rect
-       style="fill:none;stroke:#252525;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:319.50000000000000000;display:inline"
-       id="rect5530-9"
-       width="5.0000539"
-       height="3"
-       x="184.98351"
-       y="650.38672" />
-    <rect
-       style="fill:none;stroke:#767676;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:319.5"
-       id="rect5530"
-       width="5.0000539"
-       height="3"
-       x="183.98349"
-       y="649.38672" />
-    <rect
-       style="fill:#370000;fill-opacity:0;stroke:#252525;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:319.50000000000000000;display:inline"
-       id="rect5530-9-3"
-       width="5.0000043"
-       height="3"
-       x="215.98349"
-       y="650.38672" />
-    <rect
-       style="fill:#767676;fill-opacity:1;stroke:#767676;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:319.5"
-       id="rect5530-5"
-       width="5.0000043"
-       height="3"
-       x="214.98349"
-       y="649.38672" />
-  </g>
-</svg>
diff --git a/res/skins/LateNight/knobs_sliders/knob_crossfader.svg b/res/skins/LateNight/knobs_sliders/knob_crossfader.svg
deleted file mode 100644
index 31b617c8318a..000000000000
--- a/res/skins/LateNight/knobs_sliders/knob_crossfader.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   width="20"
-   height="46"
-   version="1.1"
-   id="svg24">
-  <metadata
-     id="metadata30">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs28" />
-  <path
-     id="path2"
-     d="m 5.43775,42.562075 c 0.45484,0.27725 0.98869,0.437484 1.5625,0.4375 l 5.5,1.5e-4 c 1.415374,3.5e-4 2.4995,-0.99965 2.830554,-2 0,1.662 -0.668554,3.00005 -2.330554,3 l -5,-1.5e-4 c -1.0882,-3.3e-5 -2.0367,-0.57494 -2.5625,-1.4375 z"
-     style="color:#000000;opacity:0.15" />
-  <path
-     id="path4"
-     d="m 4.93775,41.562075 c 0.45484,0.27725 0.98869,0.437484 1.5625,0.4375 l 5.397748,1.5e-4 c 2.101752,5.8e-5 3.101752,-1.652533 3.101752,-2.99965 v -34 c 0,-0.57381 -0.198496,-1.292136 -0.580323,-1.777694 0.86256,0.52578 1.080823,1.689144 1.080823,2.777344 v 34 c 0,1.662 -1.338,3.00005 -3,3 l -5,-1.5e-4 c -1.0882,-3.3e-5 -2.0367,-0.57494 -2.5625,-1.4375 z"
-     style="color:#000000;opacity:0.5" />
-  <path
-     id="path6"
-     d="m 3.99975,5.000275 v 34 c 0,1.662 1.338,2.99995 3,3 l 5,1.5e-4 c 1.662,5e-5 3,-1.338 3,-3 v -34 c 0,-1.662 -1.338,-2.9999501 -3,-3 l -5,-1.5e-4 c -1.662,-4.99e-5 -3,1.338 -3,3 z"
-     style="color:#000000;opacity:0.8" />
-  <path
-     d="m 6.99975,2.000425 c -1.662,0 -3,1.338 -3,3 v 32.99985 c 0,0.831 0.33275,1.5828 0.875,2.125 l 1.125,-1.125 7,-34.99985 1.125,-1.125 c -0.54225,-0.54225 -1.294,-0.875 -2.125,-0.875 z"
-     id="path8"
-     style="color:#000000;fill:#444444" />
-  <path
-     d="m 14.12475,2.875425 -1.125,1.125 -7,34.99985 -1.125,1.125 c 0.54225,0.54225 1.294,0.875 2.125,0.875 h 5 c 1.662,0 3,-1.338 3,-3 V 5.000425 c 0,-0.831 -0.33275,-1.5828 -0.875,-2.125 z"
-     id="path10"
-     style="color:#000000;fill:#1a1a1a" />
-  <path
-     d="m 6.99975,3.000425 h 5 c 1.108,0 2,0.892 2,2 v 32.99985 c 0,1.108 -0.892,2 -2,2 h -5 c -1.108,0 -2,-0.892 -2,-2 V 5.000425 c 0,-1.108 0.892,-2 2,-2 z"
-     id="path12"
-     style="color:#000000;fill:#333333" />
-  <path
-     d="m 7.99975,3.000425 h 1 v 36.99985 h -1 z"
-     id="path14"
-     style="color:#000000;fill:#131313" />
-  <path
-     style="color:#000000;fill:#ea0000"
-     id="path18"
-     d="m 8.99975,3.000425 h 1 v 36.99985 h -1 z" />
-  <path
-     style="color:#000000;fill:#515151"
-     id="path20"
-     d="m 9.99975,3.000425 h 1 v 36.99985 h -1 z" />
-</svg>
diff --git a/res/skins/LateNight/knobs_sliders/knob_indicator_green.svg b/res/skins/LateNight/knobs_sliders/knob_indicator_green.svg
deleted file mode 100644
index 3b96b6e606e3..000000000000
--- a/res/skins/LateNight/knobs_sliders/knob_indicator_green.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="40" height="34" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="e" x1="202.39" x2="202.49" y1="623.48" y2="634.37" gradientTransform="matrix(1.2573 0 0 .86853 -234.59 -533.44)" gradientUnits="userSpaceOnUse"><stop stop-color="#77c305" offset="0"/><stop stop-color="#457600" offset="1"/></linearGradient><filter id="d" color-interpolation-filters="sRGB"><feGaussianBlur stdDeviation="0.42678198"/></filter><radialGradient id="f" cx="366.94" cy="355.36" r="21.466" gradientTransform="matrix(1 0 0 .98824 -5.7382e-7 4.1807)" gradientUnits="userSpaceOnUse"><stop stop-color="#def7a7" stop-opacity=".94902" offset="0"/><stop stop-color="#c0ff5d" stop-opacity=".81961" offset=".61062"/><stop stop-color="#7bd002" stop-opacity="0" offset="1"/></radialGradient></defs><path d="m18 5.3358c0-.9375.64828-1.7567 1.9809-1.7567 1.2699 0 1.9692.78305 1.9947 1.7355 0 2.6734.0244 10.523.0244 10.523-.0742.8948-.9885 1.7383-2.0444 1.7383s-1.937-1.018-1.937-1.759c-.009-4.0022-.0184-6.7336-.0185-10.481z" fill="url(#e)"/><path transform="matrix(.088928 0 0 .088072 -12.631 -25.838)" d="m388.4 355.36a21.466 21.213 0 1 1-42.931 0 21.466 21.213 0 1 1 42.931 0z" fill="url(#f)" filter="url(#d)"/></svg>
diff --git a/res/skins/LateNight/knobs_sliders/knob_indicator_orange.svg b/res/skins/LateNight/knobs_sliders/knob_indicator_orange.svg
deleted file mode 100644
index 273d1d8adbbf..000000000000
--- a/res/skins/LateNight/knobs_sliders/knob_indicator_orange.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="40" height="34" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="b" x1="202.39" x2="202.49" y1="623.48" y2="634.37" gradientTransform="matrix(1.2573 0 0 .86853 -234.59 -533.44)" gradientUnits="userSpaceOnUse"><stop stop-color="#f18900" offset="0"/><stop stop-color="#b67300" offset="1"/></linearGradient><filter id="c" color-interpolation-filters="sRGB"><feGaussianBlur stdDeviation="0.42678198"/></filter><radialGradient id="a" cx="366.94" cy="355.36" r="21.466" gradientTransform="matrix(1 0 0 .98824 -5.7382e-7 4.1807)" gradientUnits="userSpaceOnUse"><stop stop-color="#fffefa" stop-opacity=".94902" offset="0"/><stop stop-color="#ff994e" stop-opacity=".81961" offset=".61062"/><stop stop-color="#ff902d" stop-opacity="0" offset="1"/></radialGradient></defs><path d="m18 5.3358c0-.9375.64828-1.7567 1.9809-1.7567 1.2699 0 1.9692.78305 1.9947 1.7355 0 2.6734.0244 10.523.0244 10.523-.0742.8948-.9885 1.7383-2.0444 1.7383s-1.937-1.018-1.937-1.759c-.009-4.0022-.0184-6.7336-.0185-10.481z" fill="url(#b)"/><path transform="matrix(.088928 0 0 .088072 -12.631 -25.838)" d="m388.4 355.36a21.466 21.213 0 1 1-42.931 0 21.466 21.213 0 1 1 42.931 0z" fill="url(#a)" filter="url(#c)"/></svg>
diff --git a/res/skins/LateNight/knobs_sliders/knob_indicator_red.svg b/res/skins/LateNight/knobs_sliders/knob_indicator_red.svg
deleted file mode 100644
index c4e66932a3ad..000000000000
--- a/res/skins/LateNight/knobs_sliders/knob_indicator_red.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg id="svg2" width="40" height="34" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs id="defs4">
-  <linearGradient id="linearGradient3166" x1="202.39" x2="202.49" y1="623.48" y2="634.37" gradientTransform="matrix(1.2573 0 0 .86853 -234.59 -533.44)" gradientUnits="userSpaceOnUse">
-   <stop id="stop4939-5" stop-color="#e90808" offset="0"/>
-   <stop id="stop4941-3" stop-color="#b60000" offset="1"/>
-  </linearGradient>
-  <filter id="filter5815-2" color-interpolation-filters="sRGB">
-   <feGaussianBlur id="feGaussianBlur5817-7" stdDeviation="0.42678198"/>
-  </filter>
-  <radialGradient id="radialGradient3198" cx="366.94" cy="355.36" r="21.466" gradientTransform="matrix(1 0 0 .98824 -5.7382e-7 4.1807)" gradientUnits="userSpaceOnUse">
-   <stop id="stop3941-2" stop-color="#eece33" stop-opacity=".95055" offset="0"/>
-   <stop id="stop5813-9" stop-color="#ff734e" stop-opacity=".81868" offset=".61062"/>
-   <stop id="stop3943-1" stop-color="#ff2d2d" stop-opacity="0" offset="1"/>
-  </radialGradient>
- </defs>
- <metadata id="metadata7">
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:title/>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <g id="g3170">
-  <path id="rect5578" d="m18 5.3358c0-0.9375 0.64828-1.7567 1.9809-1.7567 1.2699 0 1.9692 0.78305 1.9947 1.7355 0 2.6734 0.0244 10.523 0.0244 10.523-0.0742 0.8948-0.9885 1.7383-2.0444 1.7383-1.0559 0-1.937-1.018-1.937-1.759-9e-3 -4.0022-0.0184-6.7336-0.0185-10.481z" fill="url(#linearGradient3166)"/>
-  <path id="path3936" transform="matrix(.088928 0 0 .088072 -12.631 -25.838)" d="m388.4 355.36a21.466 21.213 0 1 1-42.931 0 21.466 21.213 0 1 1 42.931 0z" fill="url(#radialGradient3198)" filter="url(#filter5815-2)"/>
- </g>
-</svg>
diff --git a/res/skins/LateNight/knobs_sliders/knob_pitch_sampler.svg b/res/skins/LateNight/knobs_sliders/knob_pitch_sampler.svg
deleted file mode 100644
index 609507e13f88..000000000000
--- a/res/skins/LateNight/knobs_sliders/knob_pitch_sampler.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg3014"
-   width="27"
-   height="11"
-   version="1.1">
-  <defs
-     id="defs17" />
-  <metadata
-     id="metadata3019">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <path
-     id="path4"
-     d="M 2.294,9.1834346 C 2.7982904,9.5966736 3.3692284,10 4.4993571,10 H 21.898248 C 24,10 25.000112,8.347467 25,7.00035 L 24.99975,4 C 24.999702,3.42619 24.801254,2.7078645 24.419427,2.2223066 25.281987,2.7480866 25.500159,3.91145 25.50025,4.99965 L 25.5005,8 c 1.38e-4,1.662 -1.338,3 -3,3 H 4.8564999 C 3.7682999,11 2.5849098,10.861929 2.294,9.1834346 Z"
-     style="color:#000000;opacity:0.5" />
-  <path
-     id="path6"
-     d="M 1.35575,4.00035 1.356,7.0007 c 1.385e-4,1.662 1.3379999,3 2.9999999,3 H 22 c 1.662,0 3.000138,-1.338 3,-3 l -2.5e-4,-3.00035 c -1.38e-4,-1.662 -1.338,-3 -3,-3 H 4.3557499 c -1.662,0 -3.0001384,1.338 -2.9999999,3 z"
-     style="color:#000000;opacity:0.8" />
-  <path
-     style="color:#000000;fill:#444444"
-     d="m 1,2.99965 c 0,-1.662 1.338,-3.000032 3,-3 L 22,0 c 0.831,1.6e-5 1.5828,0.33275 2.125,0.875 L 23,2 3,6.999575 1.875,8.124575 C 1.33275,7.582325 1,6.830575 1,5.999575 Z"
-     id="path8" />
-  <path
-     style="color:#000000;fill:#1a1a1a"
-     d="M 1.875,8.124375 3,6.999375 23,1.9998 24.125,0.8748 C 24.66725,1.41705 25,2.1688 25,2.9998 v 2.999925 c 0,1.662 -1.338,3.000032 -3,3 L 4,8.999375 c -0.831,-1.6e-5 -1.5828,-0.33275 -2.125,-0.875 z"
-     id="path10" />
-  <path
-     style="color:#000000;fill:#333333"
-     d="m 2,2.99965 v 2.999925 c 0,1.108 0.892,1.999978 2,2 l 18,3.5e-4 c 1.108,2.2e-5 2,-0.892 2,-2 V 3 C 24,1.892 23.108,1.000022 22,1 L 4,0.99965 c -1.108,-2.2e-5 -2,0.892 -2,2 z"
-     id="path12" />
-  <path
-     style="color:#000000;fill:#131313"
-     d="m 2,2.9992 v 1 l 22,3.5e-4 v -1 z"
-     id="path14" />
-  <path
-     id="path18"
-     d="m 2,3.9992 v 1 l 22,3.5e-4 v -1 z"
-     style="color:#000000;fill:#ea0000" />
-  <path
-     id="path20"
-     d="m 2,4.9992 v 1 l 22,3.5e-4 v -1 z"
-     style="color:#000000;fill:#515151" />
-</svg>
diff --git a/res/skins/LateNight/knobs_sliders/knob_small_bg.svg b/res/skins/LateNight/knobs_sliders/knob_small_bg.svg
deleted file mode 100644
index 5ca99bfc1eae..000000000000
--- a/res/skins/LateNight/knobs_sliders/knob_small_bg.svg
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg2"
-   width="25"
-   height="25"
-   version="1.1">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3839"
-       x1="358.44"
-       x2="505.36"
-       y1="427.04"
-       y2="383.93"
-       gradientTransform="matrix(0.11185,-1.892e-6,-1.893e-6,0.11191,-717.1,-63.676)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop5443"
-         stop-color="#060606"
-         offset="0" />
-      <stop
-         id="stop5445"
-         stop-color="#343434"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="a-1-3"
-       x1="256.73999"
-       x2="484.70999"
-       y1="472.03"
-       y2="472.03"
-       gradientTransform="matrix(-0.02689375,-0.08131675,0.08068125,-0.02710559,-15.654481,52.688341)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         stop-color="#060606"
-         offset="0"
-         id="stop2-27-6" />
-      <stop
-         stop-color="#343434"
-         offset="1"
-         id="stop4-0-7" />
-    </linearGradient>
-  </defs>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="matrix(0.76872597,0.34140352,-0.34140352,0.76872597,3.5802742,-9.0977713)"
-     id="g845">
-    <g
-       transform="matrix(0.10676,0,0,0.10676,-19.071124,-31.786292)"
-       id="g11-3"
-       style="opacity:0.49300005;fill:#000000;fill-opacity:1">
-      <path
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:11.80004597;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         d="m 270.69379,536.40673 c 20.01433,60.04489 85.31772,92.31846 145.17067,71.75942 60.21816,-19.46338 93.09981,-84.46428 73.08548,-144.50917 C 410.65308,312.55652 235.42949,418.7094 270.69379,536.40673 Z"
-         id="path9-5" />
-    </g>
-    <g
-       transform="matrix(0.10746967,0,0,0.10746967,-20.137858,-33.659792)"
-       id="g11"
-       style="opacity:0.93999999;fill:#050505;fill-opacity:1">
-      <path
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#050505;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:11.80004597;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         d="m 270.69379,536.40673 c 20.01433,60.04489 85.31772,92.31846 145.17067,71.75942 60.21816,-19.46338 93.09981,-84.46428 73.08548,-144.50917 -20.01433,-60.04488 -85.31957,-92.31785 -145.17252,-71.7588 -60.21816,19.46339 -93.09796,84.46366 -73.08363,144.50855 z"
-         id="path9" />
-    </g>
-  </g>
-  <path
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#404040;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.8208071;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-     d="M 13.261719,2.2636719 C 11.959661,2.172056 10.619514,2.3407961 9.3085938,2.7988281 4.0209991,4.5065416 1.1300182,10.244928 2.8847656,15.550781 4.6398583,20.857679 10.37555,23.702603 15.623047,21.869141 20.91064,20.161426 23.799669,14.42304 22.044922,9.1171875 20.728283,5.1360501 17.171683,2.5387862 13.261719,2.2636719 Z"
-     id="path23" />
-  <path
-     id="path23-5"
-     d="M 9.4835276,3.9835504 A 9.1929467,9.2653595 0 1 1 15.297073,21.562041 9.1929467,9.2653595 0 1 1 9.4835276,3.9835504 Z"
-     style="fill:url(#a-1-3);stroke:none;stroke-width:0.7885651;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-</svg>
diff --git a/res/skins/LateNight/knobs_sliders/knob_small_indicator_green.svg b/res/skins/LateNight/knobs_sliders/knob_small_indicator_green.svg
deleted file mode 100644
index 3d17275199f0..000000000000
--- a/res/skins/LateNight/knobs_sliders/knob_small_indicator_green.svg
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="25"
-   height="25"
-   viewBox="0 0 25 25"
-   version="1.1"
-   id="svg880"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   sodipodi:docname="knob_small_indicator_green.svg">
-  <defs
-     id="defs874">
-    <radialGradient
-       id="a"
-       cx="367.10001"
-       cy="353.17999"
-       r="28.985001"
-       gradientTransform="matrix(1,0,0,0.67653,0,114.24)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         stop-color="#def7a7"
-         stop-opacity=".94902"
-         offset="0"
-         id="stop10" />
-      <stop
-         stop-color="#e4ff5d"
-         stop-opacity=".81961"
-         offset=".61062"
-         id="stop12" />
-      <stop
-         stop-color="#0ed002"
-         stop-opacity="0"
-         offset="1"
-         id="stop14" />
-    </radialGradient>
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="c">
-      <feGaussianBlur
-         stdDeviation="0.42678198"
-         id="feGaussianBlur2" />
-    </filter>
-    <linearGradient
-       gradientTransform="translate(4.3069839e-8,290.38542)"
-       inkscape:collect="always"
-       xlink:href="#b-5"
-       id="linearGradient875"
-       x1="12.569915"
-       y1="6.4768233"
-       x2="12.569915"
-       y2="12.000253"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="b-5"
-       x1="202.39"
-       x2="202.49001"
-       y1="623.47998"
-       y2="634.37"
-       gradientTransform="matrix(1.2573,0,0,0.86853,-254.06009,-532.97092)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         stop-color="#4fc305"
-         offset="0"
-         id="stop2"
-         style="stop-color:#80d505;stop-opacity:1" />
-      <stop
-         stop-color="#1c7600"
-         offset="1"
-         id="stop4"
-         style="stop-color:#457600;stop-opacity:1" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="12.006922"
-     inkscape:cy="1.4218846"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:window-width="1366"
-     inkscape:window-height="740"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata877">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-290.38542)">
-    <path
-       d="m 14,300.71336 c 0,0.80694 -0.4862,1.67231 -1.4857,1.67231 -0.95241,0 -1.4769,-0.83425 -1.4959,-1.65405 0,-2.30113 -0.0184,-8.95323 -0.0184,-8.95323 0.0557,-0.7702 0.74137,-1.39297 1.5333,-1.39297 0.79194,0 1.4528,0.77301 1.4528,1.41081 0.007,3.44491 0.0134,5.69125 0.0134,8.91713 z"
-       id="path19"
-       style="fill:url(#linearGradient875);fill-opacity:1;stroke-width:1.02151847"
-       inkscape:connector-curvature="0" />
-    <ellipse
-       transform="matrix(0.051698,0,0,0.07974844,-6.48,263.79433)"
-       cx="367.10001"
-       cy="353.17999"
-       rx="24.153999"
-       ry="16.341"
-       id="ellipse21"
-       style="fill:url(#a);filter:url(#c)" />
-  </g>
-</svg>
diff --git a/res/skins/LateNight/knobs_sliders/knob_small_indicator_red.svg b/res/skins/LateNight/knobs_sliders/knob_small_indicator_red.svg
deleted file mode 100644
index 4639b8d128a3..000000000000
--- a/res/skins/LateNight/knobs_sliders/knob_small_indicator_red.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="25" height="25" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><filter id="c" color-interpolation-filters="sRGB"><feGaussianBlur stdDeviation="0.42678198"/></filter><linearGradient id="b" x1="196.12" x2="196.15" y1="616.53" y2="626.48" gradientTransform="matrix(1.2573,0,0,1,-52.11,15)" gradientUnits="userSpaceOnUse"><stop stop-color="#e90808" offset="0"/><stop stop-color="#b60000" offset="1"/></linearGradient><radialGradient id="a" cx="277.23" cy="316.59" r="21.466" gradientTransform="matrix(1.2346 -.010354 .016272 .88786 19.827 74.038)" gradientUnits="userSpaceOnUse"><stop stop-color="#eece33" stop-opacity=".95055" offset="0"/><stop stop-color="#ff734e" stop-opacity=".81868" offset=".61064"/><stop stop-color="#ff2d2d" stop-opacity="0" offset="1"/></radialGradient></defs><g transform="translate(-182.48 -629.9)"><g transform="matrix(1 0 0 1.0435 .5 -27.908)"><path d="m192.98 631.99c0-.7733.4862-1.6026 1.4857-1.6026.95241 0 1.4769.79947 1.4959 1.5851 0 2.2052.0184 8.58.0184 8.58-.0557.73809-.74136 1.3349-1.5333 1.3349s-1.4528-.74079-1.4528-1.352c-.007-3.3013-.0134-5.454-.0134-8.5454z" fill="url(#b)"/><ellipse transform="matrix(.051698 0 0 .076424 175.5 604.9)" cx="367.1" cy="353.18" rx="24.154" ry="16.341" fill="url(#a)" filter="url(#c)"/></g></g></svg>
diff --git a/res/skins/LateNight/knobs_sliders/knob_volume_deck.svg b/res/skins/LateNight/knobs_sliders/knob_volume_deck.svg
deleted file mode 100644
index cee3acdf4170..000000000000
--- a/res/skins/LateNight/knobs_sliders/knob_volume_deck.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="46" height="17" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m4.794 13.148c.60561.57244 1.4882.85239 2.062.85238l32.657-7e-4c1.4154.00035 2.7757-1.0248 2.9852-2.6991.01105 2.1371-.42549 3.6991-2.3306 3.6991h-32.811c-1.0882 0-2.3492-.62974-2.5625-1.8517z" color="#000000" opacity=".15"/><path d="m4.294 12.183c.69268.64195 1.4882.81723 2.062.81722l32.555-7e-4c2.1018-4.5e-5 3.1018-1.6525 3.1018-2.9996v-5c0-.57381-.1985-1.2921-.58032-1.7777.86256.52578 1.0808 1.6891 1.0808 2.7773v5c0 1.662-1.338 3-3 3h-32.657c-1.0882 0-2.5339-.85452-2.5625-1.8165z" color="#000000" opacity=".5"/><path d="m3.356 5.0007v5c0 1.662 1.338 3 3 3h32.657c1.662 0 3-1.338 3-3v-5c0-1.662-1.338-3-3-3h-32.657c-1.662 0-3 1.338-3 3z" color="#000000" opacity=".8"/><path d="m2.9998 4.0004c0-1.662 1.338-3 3-3l33-7.5e-5c.831-1.9e-6 1.5828.33275 2.125.875l-1.125 1.125-35 7.0001-1.125 1.125c-.54225-.54225-.875-1.294-.875-2.125z" color="#000000" fill="#444"/><path d="m3.8748 11.125 1.125-1.125 35-7.0001 1.125-1.125c.54225.54225.875 1.294.875 2.125v5c0 1.662-1.338 3-3 3l-33 7.5e-5c-.831 2e-6-1.5828-.33275-2.125-.875z" color="#000000" fill="#1a1a1a"/><path d="m3.9998 4.0004v5c0 1.108.892 2 2 2l33-7.5e-5c1.108-3e-6 2-.892 2-2v-5c0-1.108-.892-2-2-2l-33 7.5e-5c-1.108 2.5e-6-2 .892-2 2z" color="#000000" fill="#333"/><path d="m3.9998 5.0002v1l37-7.5e-5v-1z" color="#000000" fill="#131313"/><path transform="matrix(0,1,1,0,0,0)" d="m7.0002 3.9998h1l-7.5e-5 37h-1z" color="#000000" fill="#515151"/><path d="m3.9998 6.0002v1l37-7.5e-5v-1z" color="#000000" fill="#ea0000"/></svg>
diff --git a/res/skins/LateNight/knobs_sliders/slider_crossfader.svg b/res/skins/LateNight/knobs_sliders/slider_crossfader.svg
deleted file mode 100644
index dce2136e1d0f..000000000000
--- a/res/skins/LateNight/knobs_sliders/slider_crossfader.svg
+++ /dev/null
@@ -1,237 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   id="svg174"
-   version="1.1"
-   height="46"
-   width="158">
-  <metadata
-     id="metadata178">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs14">
-    <linearGradient
-       id="linearGradient1559"
-       x1="76"
-       x2="151"
-       y1="1028.4"
-       y2="1028.4"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         style="stop-color:#f1f1f1;stop-opacity:1"
-         stop-color="#828282"
-         offset="0"
-         id="stop1553" />
-      <stop
-         stop-color="#828282"
-         offset="0.68058109"
-         id="stop1555"
-         style="stop-color:#717171;stop-opacity:1" />
-      <stop
-         stop-color="#464646"
-         offset="1"
-         id="stop1557"
-         style="stop-color:#717171;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1462"
-       x1="76"
-       x2="151"
-       y1="1028.4"
-       y2="1028.4"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         style="stop-color:#717171;stop-opacity:1"
-         stop-color="#828282"
-         offset="0"
-         id="stop1450" />
-      <stop
-         style="stop-color:#717171;stop-opacity:1"
-         id="stop1452"
-         offset="0.45715839"
-         stop-color="#828282" />
-      <stop
-         stop-color="#828282"
-         offset="1"
-         id="stop1454"
-         style="stop-color:#080808;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="1028.4"
-       y1="1028.4"
-       x2="151"
-       x1="76"
-       id="linearGradient5026">
-      <stop
-         id="stop5020"
-         offset="0"
-         stop-color="#828282"
-         style="stop-color:#f1f1f1;stop-opacity:1" />
-      <stop
-         style="stop-color:#717171;stop-opacity:1"
-         id="stop5028"
-         offset="0.68058109"
-         stop-color="#828282" />
-      <stop
-         style="stop-color:#717171;stop-opacity:1"
-         id="stop5024"
-         offset="1"
-         stop-color="#464646" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient994"
-       x1="76"
-       x2="151"
-       y1="1028.4"
-       y2="1028.4"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         style="stop-color:#464646;stop-opacity:1"
-         stop-color="#828282"
-         offset="0"
-         id="stop990" />
-      <stop
-         style="stop-color:#828282;stop-opacity:1"
-         id="stop996"
-         offset="0.5"
-         stop-color="#828282" />
-      <stop
-         stop-color="#464646"
-         offset="1"
-         id="stop992" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="1028.4"
-       y1="1028.4"
-       x2="76"
-       x1="2"
-       id="d">
-      <stop
-         id="stop2"
-         offset="0"
-         stop-color="#464646" />
-      <stop
-         id="stop4"
-         offset="1"
-         stop-color="#828282" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="1028.4"
-       y1="1028.4"
-       x2="151"
-       x1="76"
-       id="c">
-      <stop
-         id="stop7"
-         offset="0"
-         stop-color="#828282" />
-      <stop
-         id="stop9"
-         offset="1"
-         stop-color="#464646" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#d"
-       gradientUnits="userSpaceOnUse"
-       y2="1028.4"
-       y1="1028.4"
-       x2="76"
-       x1="2"
-       id="b" />
-    <linearGradient
-       xlink:href="#c"
-       gradientUnits="userSpaceOnUse"
-       y2="1028.4"
-       y1="1028.4"
-       x2="151"
-       x1="76"
-       id="a" />
-    <linearGradient
-       y2="20.125"
-       x2="114"
-       y1="14"
-       x1="114"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1295"
-       xlink:href="#linearGradient1462" />
-  </defs>
-  <g
-     style="display:none"
-     id="layer2">
-    <rect
-       y="-1208.74"
-       x="-1902.9451"
-       height="2486.3296"
-       width="3838.3003"
-       id="rect1648"
-       style="opacity:1;fill:#1e1e1e;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
-  </g>
-  <g
-     id="layer1">
-    <path
-       style="color:#000000;stroke:none;stroke-opacity:1"
-       d="m 151,20 v 4 H 6 v -4 z"
-       id="path170-3" />
-    <g
-       style="fill:#606060;fill-opacity:1"
-       id="g1862">
-      <path
-         style="color:#000000;fill:#606060;fill-opacity:1;stroke:none;stroke-opacity:1"
-         d="M 5,11 V 33 H 4 V 11 Z"
-         id="path88" />
-      <path
-         style="color:#000000;fill:#606060;fill-opacity:1;stroke:none;stroke-opacity:1"
-         d="m 153,11 v 22 h -1 V 11 Z"
-         id="path120" />
-    </g>
-    <path
-       id="path166-9"
-       d="m 6,24 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z m 2,0 v 1 h 1 v -1 z"
-       style="color:#000000;fill:#787878;fill-opacity:1;stroke:none;stroke-opacity:1" />
-    <path
-       style="color:#000000;stroke:none;stroke-opacity:1;fill:#000000;fill-opacity:1"
-       d="m 151,20 v 4 H 6 v -4 z"
-       id="path170" />
-    <path
-       id="path166-9-6"
-       d="m 6,25 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 5 h 1 v -5 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 3 h 1 v -3 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 5 h 1 v -5 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z m 2,0 v 2 h 1 v -2 z"
-       style="color:#000000;fill:#525252;fill-opacity:1;stroke:none;stroke-opacity:1" />
-    <path
-       id="path166-9-1"
-       d="m 6,20 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z"
-       style="color:#000000;fill:#434343;fill-opacity:1;stroke:none;stroke-opacity:1" />
-    <path
-       id="path166-9-6-8"
-       d="m 6,19 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -5 h 1 v 5 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -3 h 1 v 3 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -5 h 1 v 5 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z m 2,0 v -2 h 1 v 2 z"
-       style="color:#000000;fill:#666666;fill-opacity:1;stroke:none;stroke-opacity:1" />
-    <path
-       id="path166-9-1-7"
-       d="m 7,20 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z m 2,0 v -1 h 1 v 1 z"
-       style="color:#000000;fill:#101010;fill-opacity:1;stroke:none;stroke-opacity:1" />
-  </g>
-  <g
-     style="display:inline"
-     id="layer3">
-    <path
-       id="rect1769"
-       d="m 5,20 v 4 h 147 v -4 z m 1,1 h 145 v 2 H 6 Z"
-       style="opacity:1;fill:#0f0f0f;fill-opacity:1;stroke:none;stroke-width:2.4370873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
-  </g>
-</svg>
diff --git a/res/skins/LateNight/knobs_sliders/slider_crossfader.svg.png b/res/skins/LateNight/knobs_sliders/slider_crossfader.svg.png
deleted file mode 100644
index 95a414a71d22..000000000000
Binary files a/res/skins/LateNight/knobs_sliders/slider_crossfader.svg.png and /dev/null differ
diff --git a/res/skins/LateNight/knobs_sliders/slider_crossfader_small.svg b/res/skins/LateNight/knobs_sliders/slider_crossfader_small.svg
deleted file mode 100644
index 656736338142..000000000000
--- a/res/skins/LateNight/knobs_sliders/slider_crossfader_small.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="104" height="46" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><linearGradient id="b" x1="2" x2="49" y1="22" y2="22" gradientUnits="userSpaceOnUse"><stop stop-color="#464646" offset="0"/><stop stop-color="#828282" offset="1"/></linearGradient><linearGradient id="a" x1="50" x2="99" y1="22" y2="22" gradientUnits="userSpaceOnUse"><stop stop-color="#828282" offset="0"/><stop stop-color="#464646" offset="1"/></linearGradient></defs><g fill="url(#b)"><path d="m49 17v10h-1v-10z" color="#000000"/><path d="m47 17v10h-1v-10z" color="#000000"/><path d="m45 17v10h-1v-10z" color="#000000"/><path d="m43 17v10h-1v-10z" color="#000000"/><path d="m41 17v10h-1v-10z" color="#000000"/><path d="m39 17v10h-1v-10z" color="#000000"/><path d="m37 17v10h-1v-10z" color="#000000"/><path d="m35 17v10h-1v-10z" color="#000000"/><path d="m33 17v10h-1v-10z" color="#000000"/><path d="m31 17v10h-1v-10z" color="#000000"/><path d="m27 14v16h-1v-16z" color="#000000"/><path d="m25 17v10h-1v-10z" color="#000000"/><path d="m23 17v10h-1v-10z" color="#000000"/><path d="m21 17v10h-1v-10z" color="#000000"/><path d="m19 17v10h-1v-10z" color="#000000"/><path d="m17 17v10h-1v-10z" color="#000000"/><path d="m15 17v10h-1v-10z" color="#000000"/><path d="m13 17v10h-1v-10z" color="#000000"/><path d="m11 17v10h-1v-10z" color="#000000"/><path d="m9 17v10h-1v-10z" color="#000000"/><path d="m7 17v10h-1v-10z" color="#000000"/><path d="m29 17v10h-1v-10z" color="#000000"/><path d="m5 17v10h-1v-10z" color="#000000"/><path d="m3 11v22h-1v-22z" color="#000000"/></g><g fill="url(#a)"><path d="m51 16v12h-1v-12z" color="#000000"/><path d="m53 17v10h-1v-10z" color="#000000"/><path d="m99 11v22h-1v-22z" color="#000000"/><path d="m97 17v10h-1v-10z" color="#000000"/><path d="m95 17v10h-1v-10z" color="#000000"/><path d="m93 17v10h-1v-10z" color="#000000"/><path d="m91 17v10h-1v-10z" color="#000000"/><path d="m87 17v9.9999h-1v-9.9999z" color="#000000"/><path d="m85 17v10h-1v-10z" color="#000000"/><path d="m83 17v10h-1v-10z" color="#000000"/><path d="m81 17v10h-1v-10z" color="#000000"/><path d="m79 17v10h-1v-10z" color="#000000"/><path d="m77 17v10h-1v-10z" color="#000000"/><path d="m75 14v16h-1v-16z" color="#000000"/><path d="m73 17v10h-1v-10z" color="#000000"/><path d="m71 17v10h-1v-10z" color="#000000"/><path d="m69 17v10h-1v-10z" color="#000000"/><path d="m67 17v10h-1v-10z" color="#000000"/><path d="m65 17v10h-1v-10z" color="#000000"/><path d="m59 17v10h-1v-10z" color="#000000"/><path d="m57 17v10h-1v-10z" color="#000000"/><path d="m55 17v10h-1v-10z" color="#000000"/><path d="m89 17v10h-1v-10z" color="#000000"/><path d="m63 17v10h-1v-10z" color="#000000"/><path d="m61 17v10h-1v-10z" color="#000000"/></g><path d="m97 20v4h-93v-4z" color="#000000"/></svg>
diff --git a/res/skins/LateNight/knobs_sliders/slider_pitch_deck.svg b/res/skins/LateNight/knobs_sliders/slider_pitch_deck.svg
deleted file mode 100644
index b5c9580ef23c..000000000000
--- a/res/skins/LateNight/knobs_sliders/slider_pitch_deck.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="40" height="113" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect x="9" y="4.8748" width="22" height=".9996" color="#000000" fill="#525252" stroke-width=".9998"/><g fill="#666" stroke-width=".99979"><path d="m11 82.875 6-.0115v.9995l-6 .0115z" color="#000000"/><path d="m15 100.87 2-8e-4v.9996l-2 8e-4z" color="#000000"/><path d="m15 98.876 2-8e-4v.9995l-2 9e-4z" color="#000000"/><path d="m15 96.877 2-8e-4v.9996l-2 8e-4z" color="#000000"/><path d="m15 94.878 2-8e-4v.9996l-2 8e-4z" color="#000000"/><path d="m15 92.879 2-8e-4v.9995l-2 8e-4z" color="#000000"/><path d="m15 90.88 2-8e-4v.9996l-2 8e-4z" color="#000000"/><path d="m15 88.881 2-8e-4v.9995l-2 9e-4z" color="#000000"/><path d="m15 86.881 2-8e-4v.9996l-2 8e-4z" color="#000000"/><path d="m15 84.882 2-8e-4v.9996l-2 8e-4z" color="#000000"/><path d="m15 80.884 2-8e-4v.9996l-2 8e-4z" color="#000000"/><path d="m15 76.886 2-8e-4v.9996l-2 8e-4z" color="#000000"/><path d="m15 74.887 2-8e-4v.9996l-2 8e-4z" color="#000000"/><path d="m15 72.887 2-8e-4v.9995l-2 8e-4z" color="#000000"/><path d="m15 70.888 2-8e-4v.9996l-2 8e-4z" color="#000000"/><path d="m15 68.889 2-8e-4v.9995l-2 9e-4z" color="#000000"/><path d="m15 66.89 2-8e-4v.9996l-2 8e-4z" color="#000000"/><path d="m15 64.891 2-8e-4v.9996l-2 8e-4z" color="#000000"/><path d="m15 62.892 2-8e-4v.9995l-2 8e-4z" color="#000000"/><path d="m15 60.893 2-8e-4v.9996l-2 8e-4z" color="#000000"/><path d="m15 58.893 2-8e-4v.9995l-2 8e-4z" color="#000000"/><path d="m15 28.874 2-9e-4v.9996l-2 8e-4z" color="#000000"/><path d="m15 26.867 2-.00081v.99957l-2 .00081z" color="#000000"/><path d="m15 24.868 2-.00081v.99957l-2 .00081z" color="#000000"/><path d="m15 22.869 2-.00081v.99957l-2 .00081z" color="#000000"/><path d="m15 20.87 2-.00081v.99957l-2 .00081z" color="#000000"/><path d="m15 18.871 2-.00081v.99957l-2 .00081z" color="#000000"/><path d="m15 16.872 2-.00081v.99957l-2 .00081z" color="#000000"/><path d="m15 14.872 2-.00081v.99957l-2 .00081z" color="#000000"/><path d="m15 12.873 2-.00081v.99957l-2 .00081z" color="#000000"/><path d="m15 10.874 2-.00081v.99957l-2 .00081z" color="#000000"/><path d="m15 8.8748 2-.00081v.99957l-2 .00081z" color="#000000"/><path d="m15 6.8756 2-.00081v.99957l-2 .00081z" color="#000000"/></g><path d="m11 106.88h18v.9996h-18z" color="#000000" fill="#525252" stroke-width=".9998"/><rect x="18" y="6.8748" width="4" height="98.999" color="#000000" fill="#030303"/><g transform="translate(1 3.8748)" fill="#434343" stroke-width=".99978"><path d="m16 75h1v.9995h-1z" color="#000000"/><path d="m16 49 1-1e-5v.99956h-1z" color="#000000"/><path d="m16 25.001h1v.99956l-1 1e-5z" color="#000000"/><path d="m16 96.999h1v.9996h-1z" color="#000000"/><path d="m16 95h1v.9996h-1z" color="#000000"/><path d="m16 93.001h1v.9996h-1z" color="#000000"/><path d="m16 91.002h1v.9995h-1z" color="#000000"/><path d="m16 89.002h1v.9996h-1z" color="#000000"/><path d="m16 87.003h1v.9996h-1z" color="#000000"/><path d="m16 85.004h1v.9996h-1z" color="#000000"/><path d="m16 83.005h1v.9995h-1z" color="#000000"/><path d="m16 81.006h1v.9996h-1z" color="#000000"/><path d="m16 79.007h1v.9996h-1z" color="#000000"/><path d="m16 77.008h1v.9996h-1z" color="#000000"/><path d="m16 73.009h1v.9995h-1z" color="#000000"/><path d="m16 71.01h1v.9996h-1z" color="#000000"/><path d="m16 69.011h1v.9996h-1z" color="#000000"/><path d="m16 67.012h1v.9995h-1z" color="#000000"/><path d="m16 65.013h1v.9995h-1z" color="#000000"/><path d="m16 63.014h1v.9996h-1z" color="#000000"/><path d="m16 61.015h1v.9996h-1z" color="#000000"/><path d="m16 59.016h1v.9995h-1z" color="#000000"/><path d="m16 57.016h1v.9995h-1z" color="#000000"/><path d="m16 55.017h1v.9996h-1z" color="#000000"/><path d="m16 53.018h1v.9996h-1z" color="#000000"/><path d="m16 50.979 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 46.981 1 .002v.99957l-1-.002z" color="#000000"/><path d="m16 44.982 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 42.982 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 40.983 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 38.984 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 36.985 1 .002v.99957l-1-.002z" color="#000000"/><path d="m16 34.986 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 32.987 1 .002v.99957l-1-.002z" color="#000000"/><path d="m16 30.988 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 28.989 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 26.989 1 .002v.99957l-1-.002z" color="#000000"/><path d="m16 22.991 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 20.992 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 18.993 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 16.994 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 14.995 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 12.996 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 10.996 1 .002v.99957l-1-.002z" color="#000000"/><path d="m16 8.9974 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 6.9983 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 4.9991 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 3 1 .002v.99956l-1-.002z" color="#000000"/></g><g fill="#525252" stroke-width=".99979"><path d="m29 82.875-6-.0115v.9995l6 .0115z" color="#000000"/><path d="m25 100.88-2-8e-4v.9996l2 8e-4z" color="#000000"/><path d="m25 98.877-2-8e-4v.9996l2 8e-4z" color="#000000"/><path d="m25 96.878-2-9e-4v.9996l2 8e-4z" color="#000000"/><path d="m25 94.879-2-8e-4v.9996l2 8e-4z" color="#000000"/><path d="m25 92.88-2-8e-4v.9995l2 8e-4z" color="#000000"/><path d="m25 90.881-2-8e-4v.9996l2 8e-4z" color="#000000"/><path d="m25 88.881-2-8e-4v.9996l2 8e-4z" color="#000000"/><path d="m25 86.882-2-9e-4v.9996l2 8e-4z" color="#000000"/><path d="m25 84.883-2-8e-4v.9996l2 8e-4z" color="#000000"/><path d="m25 80.885-2-8e-4v.9996l2 8e-4z" color="#000000"/><path d="m25 76.887-2-9e-4v.9996l2 8e-4z" color="#000000"/><path d="m25 74.887-2-8e-4v.9996l2 8e-4z" color="#000000"/><path d="m25 72.888-2-8e-4v.9995l2 8e-4z" color="#000000"/><path d="m25 70.889-2-8e-4v.9996l2 8e-4z" color="#000000"/><path d="m25 68.89-2-8e-4v.9996l2 8e-4z" color="#000000"/><path d="m25 66.891-2-9e-4v.9996l2 8e-4z" color="#000000"/><path d="m25 64.892-2-8e-4v.9996l2 8e-4z" color="#000000"/><path d="m25 62.893-2-8e-4v.9995l2 8e-4z" color="#000000"/><path d="m25 60.893-2-8e-4v.9996l2 8e-4z" color="#000000"/><path d="m25 58.894-2-8e-4v.9995l2 9e-4z" color="#000000"/><path d="m25 28.875-2-8e-4v.9995l2 8e-4z" color="#000000"/><path d="m25 26.868-2-.00081v.99957l2 .00081z" color="#000000"/><path d="m25 24.869-2-.00081v.99957l2 .00081z" color="#000000"/><path d="m25 22.87-2-.00081v.99957l2 .00081z" color="#000000"/><path d="m25 20.871-2-.00081v.99957l2 .00081z" color="#000000"/><path d="m25 18.871-2-.00081v.99957l2 .00081z" color="#000000"/><path d="m25 16.872-2-.00081v.99957l2 .00081z" color="#000000"/><path d="m25 14.873-2-.00081v.99957l2 .00081z" color="#000000"/><path d="m25 12.874-2-.00081v.99957l2 .00081z" color="#000000"/><path d="m25 10.875-2-.00081v.99957l2 .00081z" color="#000000"/><path d="m25 8.8756-2-.00081v.99957l2 .00081z" color="#000000"/><path d="m25 6.8764-2-.00081v.99957l2 .00081z" color="#000000"/></g><g transform="translate(1 3.8748)" fill="#6e6e6e" stroke-width=".99978"><path d="m22 75h-1v.9995l1 1e-4z" color="#000000"/><path d="m22 49.001h-1v.99956h1z" color="#000000"/><path d="m22 25.002-1-1e-5v.99957h1z" color="#000000"/><path d="m22 97h-1v.9996h1z" color="#000000"/><path d="m22 95h-1v.9996h1z" color="#000000"/><path d="m22 93.001h-1v.9996h1z" color="#000000"/><path d="m22 91.002h-1v.9995h1z" color="#000000"/><path d="m22 89.003h-1v.9995h1z" color="#000000"/><path d="m22 87.004h-1v.9996h1z" color="#000000"/><path d="m22 85.005h-1v.9996h1z" color="#000000"/><path d="m22 83.006h-1v.9995h1z" color="#000000"/><path d="m22 81.007h-1v.9995h1z" color="#000000"/><path d="m22 79.008h-1v.9996h1z" color="#000000"/><path d="m22 77.008h-1v.9996h1z" color="#000000"/><path d="m22 73.01h-1v.9995h1z" color="#000000"/><path d="m22 71.011h-1v.9996h1z" color="#000000"/><path d="m22 69.012h-1v.9996h1z" color="#000000"/><path d="m22 67.013h-1v.9996h1z" color="#000000"/><path d="m22 65.014h-1v.9995h1z" color="#000000"/><path d="m22 63.014h-1v.9996h1z" color="#000000"/><path d="m22 61.015h-1v.9996h1z" color="#000000"/><path d="m22 59.016h-1v.9996h1z" color="#000000"/><path d="m22 57.017h-1v.9995h1z" color="#000000"/><path d="m22 55.018h-1v.9996h1z" color="#000000"/><path d="m22 53.019h-1v.9996h1z" color="#000000"/><path d="m22 50.98-1 .002v.99956l1-.002z" color="#000000"/><path d="m22 46.982-1 .002v.99956l1-.002z" color="#000000"/><path d="m22 44.982-1 .002v.99956l1-.002z" color="#000000"/><path d="m22 42.983-1 .002v.99956l1-.002z" color="#000000"/><path d="m22 40.984-1 .002v.99956l1-.002z" color="#000000"/><path d="m22 38.985-1 .002v.99957l1-.002z" color="#000000"/><path d="m22 36.986-1 .002v.99956l1-.002z" color="#000000"/><path d="m22 34.987-1 .002v.99956l1-.002z" color="#000000"/><path d="m22 32.988-1 .002v.99957l1-.002z" color="#000000"/><path d="m22 30.989-1 .002v.99956l1-.002z" color="#000000"/><path d="m22 28.989-1 .002v.99956l1-.002z" color="#000000"/><path d="m22 26.99-1 .002v.99956l1-.002z" color="#000000"/><path d="m22 22.992-1 .002v.99956l1-.002z" color="#000000"/><path d="m22 20.993-1 .002v.99956l1-.002z" color="#000000"/><path d="m22 18.994-1 .002v.99956l1-.002z" color="#000000"/><path d="m22 16.995-1 .002v.99957l1-.002z" color="#000000"/><path d="m22 14.996-1 .002v.99956l1-.002z" color="#000000"/><path d="m22 12.996-1 .002v.99956l1-.002z" color="#000000"/><path d="m22 10.997-1 .002v.99956l1-.002z" color="#000000"/><path d="m22 8.9982-1 .002v.99956l1-.002z" color="#000000"/><path d="m22 6.9991-1 .002v.99957l1-.002z" color="#000000"/><path d="m22 4.9999-1 .002v.99956l1-.002z" color="#000000"/><path d="m22 3.0008-1 .002v.99956l1-.002z" color="#000000"/></g><g transform="translate(1 3.8748)" fill="#101010" stroke-width=".99978"><path d="m16 73.983h1v.9995h-1z" color="#000000"/><path d="m16 47.984h1v.99956h-1z" color="#000000"/><path d="m16 23.985 1-1e-5v.99957h-1z" color="#000000"/><path d="m16 95.983h1v.9996h-1z" color="#000000"/><path d="m16 93.984h1v.9996h-1z" color="#000000"/><path d="m16 91.984h1v.9995h-1z" color="#000000"/><path d="m16 89.985h1v.9995h-1z" color="#000000"/><path d="m16 87.986h1v.9996h-1z" color="#000000"/><path d="m16 85.987h1v.9996h-1z" color="#000000"/><path d="m16 83.988h1v.9995h-1z" color="#000000"/><path d="m16 81.989h1v.9995h-1z" color="#000000"/><path d="m16 79.99h1v.9996h-1z" color="#000000"/><path d="m16 77.99h1v.9996h-1z" color="#000000"/><path d="m16 75.991h1v.9996h-1z" color="#000000"/><path d="m16 71.993h1v.9996h-1z" color="#000000"/><path d="m16 69.994h1v.9996h-1z" color="#000000"/><path d="m16 67.995h1v.9996h-1z" color="#000000"/><path d="m16 65.996h1v.9995h-1z" color="#000000"/><path d="m16 63.997h1v.9996h-1z" color="#000000"/><path d="m16 61.998h1v.9996h-1z" color="#000000"/><path d="m16 59.998h1v.9996h-1z" color="#000000"/><path d="m16 57.999h1v.9995h-1z" color="#000000"/><path d="m16 56h1v.9995h-1z" color="#000000"/><path d="m16 54.001h1v.9996h-1z" color="#000000"/><path d="m16 52.002 1 .002v.99959h-1z" color="#000000"/><path d="m16 49.963 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 45.965 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 43.965 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 41.966 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 39.967 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 37.968 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 35.969 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 33.97 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 31.971 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 29.972 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 27.972 1 .002v.99957l-1-.002z" color="#000000"/><path d="m16 25.973 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 21.975 1 .002v.99957l-1-.002z" color="#000000"/><path d="m16 19.976 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 17.977 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 15.978 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 13.979 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 11.979 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 9.9803 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 7.9812 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 5.982 1 .002v.99956l-1-.002z" color="#000000"/><path d="m16 3.9829 1 .002v.99956l-1-.002z" color="#000000"/></g><path d="m18 105.87h4v-99h-4zm1-1v-97h2v97z" fill="#0f0f0f" style="paint-order:fill markers stroke"/><g transform="translate(1 3.8748)" fill="#666" stroke-width=".99979"><path d="m13 53 3-.001v.9996l-3 .001z" color="#000000"/><path d="m10 26.991 6 .009v.99958l-6-.009z" color="#000000"/><path d="m14 48.982 2-.00081v.99957l-2 .00081z" color="#000000"/><path d="m14 46.983 2-.00081v.99957l-2 .00081z" color="#000000"/><path d="m14 44.984 2-8e-4v.99957l-2 8e-4z" color="#000000"/><path d="m14 42.984 2-.00081v.99958l-2 8e-4z" color="#000000"/><path d="m14 40.985 2-.00081v.99958l-2 8e-4z" color="#000000"/><path d="m14 38.986 2-.00081v.99958l-2 8e-4z" color="#000000"/><path d="m14 36.987 2-8e-4v.99956l-2 .00081z" color="#000000"/><path d="m14 34.988 2-.00081v.99957l-2 .00081z" color="#000000"/><path d="m14 32.989 2-.00081v.99957l-2 .00081z" color="#000000"/><path d="m14 30.99 2-.00081v.99957l-2 .00081z" color="#000000"/><path d="m14 28.99 2-.00081v.99957l-2 .00081z" color="#000000"/></g><g transform="translate(1 3.8748)" fill="#525252" stroke-width=".99979"><path d="m25 53-3-2e-4v.9996l3 2e-4z" color="#000000"/><path d="m28 26.992-6 .009v.99958l6-.009z" color="#000000"/><path d="m24 48.983-2-.00081v.99957l2 .00081z" color="#000000"/><path d="m24 46.984-2-.00081v.99957l2 .00081z" color="#000000"/><path d="m24 44.984-2-.00081v.99957l2 .00081z" color="#000000"/><path d="m24 42.985-2-.00081v.99957l2 .00081z" color="#000000"/><path d="m24 40.986-2-.00081v.99957l2 .00081z" color="#000000"/><path d="m24 38.987-2-.00081v.99957l2 .00081z" color="#000000"/><path d="m24 36.988-2-.00081v.99957l2 .00081z" color="#000000"/><path d="m24 34.989-2-.00081v.99957l2 .00081z" color="#000000"/><path d="m24 32.99-2-.00081v.99957l2 .00081z" color="#000000"/><path d="m24 30.99-2-.00081v.99957l2 .00081z" color="#000000"/><path d="m24 28.991-2-.00081v.99957l2 .00081z" color="#000000"/></g><g transform="translate(1 3.8748)"><path d="m14 51.001 2-.00081v.99838l-2 .00081z" color="#000000" fill="#666" stroke-width=".99919"/><path d="m24 51.002-2-.00081v.99838l2 .00081z" color="#000000" fill="#525252" stroke-width=".99919"/><g stroke-width=".99979"><path d="m14 75.008 2-8e-4v.9995l-2 8e-4z" color="#000000" fill="#666"/><path d="m24 75.009-2-8e-4v.9995l2 8e-4z" color="#000000" fill="#525252"/><path d="m14 101 2-8e-4v.9996l-2 8e-4z" color="#000000" fill="#666"/><path d="m14 99.001 2-8e-4v.9995l-2 9e-4z" color="#000000" fill="#666"/></g><path d="m16 101h1v.9996h-1z" color="#000000" fill="#434343" stroke-width=".99978"/><path d="m16 99h1v.9996h-1z" color="#000000" fill="#434343" stroke-width=".99978"/><path d="m24 101-2-8e-4v.9996l2 8e-4z" color="#000000" fill="#525252" stroke-width=".99979"/><path d="m24 99.002-2-8e-4v.9996l2 8e-4z" color="#000000" fill="#525252" stroke-width=".99979"/><g stroke-width=".99978"><path d="m22 101h-1v.9996h1z" color="#000000" fill="#6e6e6e"/><path d="m22 99h-1v.9996h1z" color="#000000" fill="#6e6e6e"/><path d="m16 99.983h1v.9996h-1z" color="#000000" fill="#101010"/><path d="m16 97.984h1v.9996h-1z" color="#000000" fill="#101010"/></g></g></svg>
diff --git a/res/skins/LateNight/knobs_sliders/slider_pitch_sampler.svg b/res/skins/LateNight/knobs_sliders/slider_pitch_sampler.svg
deleted file mode 100644
index 3dc4b26508dd..000000000000
--- a/res/skins/LateNight/knobs_sliders/slider_pitch_sampler.svg
+++ /dev/null
@@ -1,805 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.1"
-   height="65"
-   width="26"
-   id="svg9398">
-  <defs
-     id="defs9400">
-    <linearGradient
-       id="linearGradient9783-2">
-      <stop
-         offset="0"
-         stop-color="#464646"
-         id="stop9785-4" />
-      <stop
-         offset=".5"
-         stop-color="#828282"
-         id="stop9787-9" />
-      <stop
-         offset="1"
-         stop-color="#464646"
-         id="stop9789-9" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient9783-2"
-       gradientUnits="userSpaceOnUse"
-       y2="1049.4"
-       y1="988.36"
-       x2="3"
-       x1="3"
-       id="linearGradient11945" />
-  </defs>
-  <metadata
-     id="metadata9403">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1;stroke-width:0.89442718"
-     d="M 5,0.99998619 H 21 V 1.9999862 H 5 Z"
-     id="use3364" />
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1"
-     d="m 10,2.9999862 h 6 v 1 h -6 z"
-     id="use3366" />
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1"
-     d="m 10,4.99999 h 6 v 1 h -6 z"
-     id="use3368" />
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1"
-     d="m 10,6.99999 h 6 v 1 h -6 z"
-     id="use3370" />
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1"
-     d="m 10,10.99999 h 6 v 1 h -6 z"
-     id="use3374" />
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1"
-     d="m 10,12.999989 h 6 v 1 h -6 z"
-     id="use3376" />
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1;stroke-width:1.09544516"
-     d="m 7,14.999989 h 12 v 1 H 7 Z"
-     id="use3378" />
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1"
-     d="m 10,16.999989 h 6 v 1 h -6 z"
-     id="use3380" />
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1"
-     d="m 10,18.999992 h 6 v 1 h -6 z"
-     id="use3382" />
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1"
-     d="m 10,20.999992 h 6 v 1 h -6 z"
-     id="use3384" />
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1"
-     d="m 10,22.999992 h 6 v 1 h -6 z"
-     id="use3386" />
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1"
-     d="m 10,24.999992 h 6 v 1 h -6 z"
-     id="use3388" />
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1"
-     d="m 10,26.999992 h 6 v 1 h -6 z"
-     id="use3390" />
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1"
-     d="m 10,28.999992 h 6 v 1 h -6 z"
-     id="use3392" />
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1"
-     d="m 9,30.999992 h 8 v 1 H 9 Z"
-     id="use3394" />
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1"
-     d="m 10,32.999994 h 6 v 1 h -6 z"
-     id="use3396" />
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1"
-     d="m 10,36.999994 h 6 v 1 h -6 z"
-     id="use3400" />
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1"
-     d="m 10,38.999996 h 6 v 1 h -6 z"
-     id="use3402" />
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1"
-     d="m 10,40.999996 h 6 v 1 h -6 z"
-     id="use3404" />
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1"
-     d="m 10,42.999996 h 6 v 1 h -6 z"
-     id="use3406" />
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1"
-     d="m 10,44.999996 h 6 v 1 h -6 z"
-     id="use3408" />
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1;stroke-width:1.09544516"
-     d="m 7,46.999996 h 12 v 1 H 7 Z"
-     id="use3410" />
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1"
-     d="m 10,48.999998 h 6 v 1 h -6 z"
-     id="use3412" />
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1"
-     d="m 10,50.999998 h 6 v 1 h -6 z"
-     id="use3414" />
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1"
-     d="m 10,52.999998 h 6 v 1 h -6 z"
-     id="use3416" />
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1"
-     d="m 10,54.999999 h 6 v 1 h -6 z"
-     id="use3418" />
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1"
-     d="m 10,57 h 6 v 1 h -6 z"
-     id="use3420" />
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1"
-     d="m 10,8.99999 h 6 v 1 h -6 z"
-     id="rect4750" />
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1"
-     d="m 10,34.999994 h 6 v 1 h -6 z"
-     id="rect4752" />
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1"
-     d="m 10,59 h 6 v 1 h -6 z"
-     id="rect4754" />
-  <path
-     style="color:#000000;fill:#5c5c5c;fill-opacity:1;stroke-width:0.89442718"
-     d="m 5,61.04 h 16 v 1 H 5 Z"
-     id="rect4754-3" />
-  <path
-     id="rect5098"
-     d="m 12,3 h 2 v 57 h -2 z"
-     style="color:#000000;fill:#000000;fill-opacity:1" />
-  <g
-     id="g172"
-     style="fill:#434343;stroke-width:0.99978"
-     transform="translate(-23.131356,-10)">
-    <path
-       d="m 16,75 h 1 v 0.9995 h -1 z"
-       id="path76"
-       style="color:#000000" />
-    <path
-       d="m 16,49 1,-1e-5 v 0.99956 h -1 z"
-       id="path78"
-       style="color:#000000" />
-    <path
-       d="m 16,25.001 h 1 v 0.99956 l -1,10e-6 z"
-       id="path80"
-       style="color:#000000" />
-    <path
-       d="m 16,96.999 h 1 v 0.9996 h -1 z"
-       id="path82"
-       style="color:#000000" />
-    <path
-       d="m 16,95 h 1 v 0.9996 h -1 z"
-       id="path84"
-       style="color:#000000" />
-    <path
-       d="m 16,93.001 h 1 v 0.9996 h -1 z"
-       id="path86"
-       style="color:#000000" />
-    <path
-       d="m 16,91.002 h 1 v 0.9995 h -1 z"
-       id="path88"
-       style="color:#000000" />
-    <path
-       d="m 16,89.002 h 1 v 0.9996 h -1 z"
-       id="path90"
-       style="color:#000000" />
-    <path
-       d="m 16,87.003 h 1 v 0.9996 h -1 z"
-       id="path92"
-       style="color:#000000" />
-    <path
-       d="m 16,85.004 h 1 v 0.9996 h -1 z"
-       id="path94"
-       style="color:#000000" />
-    <path
-       d="m 16,83.005 h 1 v 0.9995 h -1 z"
-       id="path96"
-       style="color:#000000" />
-    <path
-       d="m 16,81.006 h 1 v 0.9996 h -1 z"
-       id="path98"
-       style="color:#000000" />
-    <path
-       d="m 16,79.007 h 1 v 0.9996 h -1 z"
-       id="path100"
-       style="color:#000000" />
-    <path
-       d="m 16,77.008 h 1 v 0.9996 h -1 z"
-       id="path102"
-       style="color:#000000" />
-    <path
-       d="m 16,73.009 h 1 v 0.9995 h -1 z"
-       id="path104"
-       style="color:#000000" />
-    <path
-       d="m 16,71.01 h 1 v 0.9996 h -1 z"
-       id="path106"
-       style="color:#000000" />
-    <path
-       d="m 16,69.011 h 1 v 0.9996 h -1 z"
-       id="path108"
-       style="color:#000000" />
-    <path
-       d="m 16,67.012 h 1 v 0.9995 h -1 z"
-       id="path110"
-       style="color:#000000" />
-    <path
-       d="m 16,65.013 h 1 v 0.9995 h -1 z"
-       id="path112"
-       style="color:#000000" />
-    <path
-       d="m 16,63.014 h 1 v 0.9996 h -1 z"
-       id="path114"
-       style="color:#000000" />
-    <path
-       d="m 16,61.015 h 1 v 0.9996 h -1 z"
-       id="path116"
-       style="color:#000000" />
-    <path
-       d="m 16,59.016 h 1 v 0.9995 h -1 z"
-       id="path118"
-       style="color:#000000" />
-    <path
-       d="m 16,57.016 h 1 v 0.9995 h -1 z"
-       id="path120"
-       style="color:#000000" />
-    <path
-       d="m 16,55.017 h 1 v 0.9996 h -1 z"
-       id="path122"
-       style="color:#000000" />
-    <path
-       d="m 16,53.018 h 1 v 0.9996 h -1 z"
-       id="path124"
-       style="color:#000000;fill:#434343;fill-opacity:1" />
-    <path
-       d="m 16,50.979 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path126"
-       style="color:#000000" />
-    <path
-       d="m 16,46.981 1,0.002 v 0.99957 l -1,-0.002 z"
-       id="path128"
-       style="color:#000000" />
-    <path
-       d="m 16,44.982 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path130"
-       style="color:#000000" />
-    <path
-       d="m 16,42.982 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path132"
-       style="color:#000000" />
-    <path
-       d="m 16,40.983 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path134"
-       style="color:#000000" />
-    <path
-       d="m 16,38.984 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path136"
-       style="color:#000000" />
-    <path
-       d="m 16,36.985 1,0.002 v 0.99957 l -1,-0.002 z"
-       id="path138"
-       style="color:#000000" />
-    <path
-       d="m 16,34.986 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path140"
-       style="color:#000000" />
-    <path
-       d="m 16,32.987 1,0.002 v 0.99957 l -1,-0.002 z"
-       id="path142"
-       style="color:#000000" />
-    <path
-       d="m 16,30.988 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path144"
-       style="color:#000000" />
-    <path
-       d="m 16,28.989 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path146"
-       style="color:#000000" />
-    <path
-       d="m 16,26.989 1,0.002 v 0.99957 l -1,-0.002 z"
-       id="path148"
-       style="color:#000000" />
-    <path
-       d="m 16,22.991 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path150"
-       style="color:#000000" />
-    <path
-       d="m 16,20.992 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path152"
-       style="color:#000000" />
-    <path
-       d="m 16,18.993 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path154"
-       style="color:#000000" />
-    <path
-       d="m 16,16.994 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path156"
-       style="color:#000000" />
-    <path
-       d="m 16,14.995 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path158"
-       style="color:#000000" />
-    <path
-       d="m 16,12.996 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path160"
-       style="color:#000000" />
-    <path
-       d="m 16,10.996 1,0.002 v 0.99957 l -1,-0.002 z"
-       id="path162"
-       style="color:#000000" />
-    <path
-       d="m 16,8.9974 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path164"
-       style="color:#000000" />
-    <path
-       d="m 16,6.9983 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path166"
-       style="color:#000000" />
-    <path
-       d="m 16,4.9991 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path168"
-       style="color:#000000" />
-    <path
-       d="m 16,3 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path170"
-       style="color:#000000" />
-  </g>
-  <g
-     id="g2849">
-    <path
-       d="m 15,49.000541 h -1 v 0.9993 h 1 z"
-       id="path244"
-       style="color:#000000;fill:#6e6e6e;stroke-width:0.99965024" />
-    <path
-       d="m 15,25.000269 -1,-10e-6 v 0.999311 h 1 z"
-       id="path246"
-       style="color:#000000;fill:#6e6e6e;stroke-width:0.99965024" />
-    <path
-       d="M 15,59.00066 H 14 V 60 h 1 z"
-       id="path284"
-       style="color:#000000;fill:#6e6e6e;stroke-width:0.99965024" />
-    <path
-       d="m 15,57.000636 h -1 v 0.99924 h 1 z"
-       id="path286"
-       style="color:#000000;fill:#6e6e6e;stroke-width:0.99965024" />
-    <path
-       d="m 15,55.000612 h -1 v 0.999341 h 1 z"
-       id="path288"
-       style="color:#000000;fill:#6e6e6e;stroke-width:0.99965024" />
-    <path
-       d="m 15,53.00059 h -1 v 0.999341 h 1 z"
-       id="path290"
-       style="color:#000000;fill:#6e6e6e;stroke-width:0.99965024" />
-    <path
-       d="m 15,51.000565 -1,0.002 v 0.9993 l 1,-0.002 z"
-       id="path292"
-       style="color:#000000;fill:#6e6e6e;stroke-width:0.99965024" />
-    <path
-       d="m 15,47.000518 -1,0.002 v 0.999301 l 1,-0.002 z"
-       id="path294"
-       style="color:#000000;fill:#6e6e6e;stroke-width:0.99965024" />
-    <path
-       d="m 15,45.000496 -1,0.002 v 0.999301 l 1,-0.002 z"
-       id="path296"
-       style="color:#000000;fill:#6e6e6e;stroke-width:0.99965024" />
-    <path
-       d="m 15,43.00047 -1,0.002 v 0.9993 l 1,-0.002 z"
-       id="path298"
-       style="color:#000000;fill:#6e6e6e;stroke-width:0.99965024" />
-    <path
-       d="m 15,41.000448 -1,0.002 v 0.9993 l 1,-0.002 z"
-       id="path300"
-       style="color:#000000;fill:#6e6e6e;stroke-width:0.99965024" />
-    <path
-       d="m 15,39.000423 -1,0.002 v 0.999311 l 1,-0.002 z"
-       id="path302"
-       style="color:#000000;fill:#6e6e6e;stroke-width:0.99965024" />
-    <path
-       d="m 15,37.000401 -1,0.002 v 0.9993 l 1,-0.002 z"
-       id="path304"
-       style="color:#000000;fill:#6e6e6e;stroke-width:0.99965024" />
-    <path
-       d="m 15,35.000377 -1,0.002 v 0.999301 l 1,-0.002 z"
-       id="path306"
-       style="color:#000000;fill:#6e6e6e;stroke-width:0.99965024" />
-    <path
-       d="m 15,33.000353 -1,0.002 v 0.99931 l 1,-0.002 z"
-       id="path308"
-       style="color:#000000;fill:#6e6e6e;stroke-width:0.99965024" />
-    <path
-       d="m 15,31.000329 -1,0.002 v 0.9993 l 1,-0.002 z"
-       id="path310"
-       style="color:#000000;fill:#6e6e6e;stroke-width:0.99965024" />
-    <path
-       d="m 15,29.000306 -1,0.002 v 0.999301 l 1,-0.002 z"
-       id="path312"
-       style="color:#000000;fill:#6e6e6e;stroke-width:0.99965024" />
-    <path
-       d="m 15,27.000284 -1,0.002 v 0.999301 l 1,-0.002 z"
-       id="path314"
-       style="color:#000000;fill:#6e6e6e;stroke-width:0.99965024" />
-    <path
-       d="m 15,23.000236 -1,0.002 v 0.999301 l 1,-0.002 z"
-       id="path316"
-       style="color:#000000;fill:#6e6e6e;stroke-width:0.99965024" />
-    <path
-       d="m 15,21.00021 -1,0.002 v 0.9993 l 1,-0.002 z"
-       id="path318"
-       style="color:#000000;fill:#6e6e6e;stroke-width:0.99965024" />
-    <path
-       d="m 15,19.000188 -1,0.002 v 0.999299 l 1,-0.002 z"
-       id="path320"
-       style="color:#000000;fill:#6e6e6e;stroke-width:0.99965024" />
-    <path
-       d="m 15,17.000165 -1,0.002 v 0.999311 l 1,-0.002 z"
-       id="path322"
-       style="color:#000000;fill:#6e6e6e;stroke-width:0.99965024" />
-    <path
-       d="m 15,15.000143 -1,0.002 v 0.999301 l 1,-0.002 z"
-       id="path324"
-       style="color:#000000;fill:#6e6e6e;stroke-width:0.99965024" />
-    <path
-       d="m 15,13.000117 -1,0.002 v 0.999301 l 1,-0.002 z"
-       id="path326"
-       style="color:#000000;fill:#6e6e6e;stroke-width:0.99965024" />
-    <path
-       d="m 15,11.000095 -1,0.002 v 0.9993 l 1,-0.002 z"
-       id="path328"
-       style="color:#000000;fill:#6e6e6e;stroke-width:0.99965024" />
-    <path
-       d="m 15,9.00007 -1,0.002 v 0.999301 l 1,-0.002 z"
-       id="path330"
-       style="color:#000000;fill:#6e6e6e;stroke-width:0.99965024" />
-    <path
-       d="m 15,7.0000469 -1,0.002 v 0.9993106 l 1,-0.002 z"
-       id="path332"
-       style="color:#000000;fill:#6e6e6e;stroke-width:0.99965024" />
-    <path
-       d="m 15,5.0000231 -1,0.002 v 0.9993005 l 1,-0.002 z"
-       id="path334"
-       style="color:#000000;fill:#6e6e6e;stroke-width:0.99965024" />
-    <path
-       d="m 15,3 -1,0.002 v 0.9993 l 1,-0.002 z"
-       id="path336"
-       style="color:#000000;fill:#6e6e6e;stroke-width:0.99965024" />
-  </g>
-  <g
-     id="g434"
-     style="fill:#101010;stroke-width:0.99978"
-     transform="translate(-23.131356,-10)">
-    <path
-       d="m 16,73.983 h 1 v 0.9995 h -1 z"
-       id="path340"
-       style="color:#000000" />
-    <path
-       d="m 16,47.984 h 1 v 0.99956 h -1 z"
-       id="path342"
-       style="color:#000000" />
-    <path
-       d="m 16,23.985 1,-10e-6 v 0.99957 h -1 z"
-       id="path344"
-       style="color:#000000" />
-    <path
-       d="m 16,95.983 h 1 v 0.9996 h -1 z"
-       id="path346"
-       style="color:#000000" />
-    <path
-       d="m 16,93.984 h 1 v 0.9996 h -1 z"
-       id="path348"
-       style="color:#000000" />
-    <path
-       d="m 16,91.984 h 1 v 0.9995 h -1 z"
-       id="path350"
-       style="color:#000000" />
-    <path
-       d="m 16,89.985 h 1 v 0.9995 h -1 z"
-       id="path352"
-       style="color:#000000" />
-    <path
-       d="m 16,87.986 h 1 v 0.9996 h -1 z"
-       id="path354"
-       style="color:#000000" />
-    <path
-       d="m 16,85.987 h 1 v 0.9996 h -1 z"
-       id="path356"
-       style="color:#000000" />
-    <path
-       d="m 16,83.988 h 1 v 0.9995 h -1 z"
-       id="path358"
-       style="color:#000000" />
-    <path
-       d="m 16,81.989 h 1 v 0.9995 h -1 z"
-       id="path360"
-       style="color:#000000" />
-    <path
-       d="m 16,79.99 h 1 v 0.9996 h -1 z"
-       id="path362"
-       style="color:#000000" />
-    <path
-       d="m 16,77.99 h 1 v 0.9996 h -1 z"
-       id="path364"
-       style="color:#000000" />
-    <path
-       d="m 16,75.991 h 1 v 0.9996 h -1 z"
-       id="path366"
-       style="color:#000000" />
-    <path
-       d="m 16,71.993 h 1 v 0.9996 h -1 z"
-       id="path368"
-       style="color:#000000" />
-    <path
-       d="m 16,69.994 h 1 v 0.9996 h -1 z"
-       id="path370"
-       style="color:#000000" />
-    <path
-       d="m 16,67.995 h 1 v 0.9996 h -1 z"
-       id="path372"
-       style="color:#000000" />
-    <path
-       d="m 16,65.996 h 1 v 0.9995 h -1 z"
-       id="path374"
-       style="color:#000000" />
-    <path
-       d="m 16,63.997 h 1 v 0.9996 h -1 z"
-       id="path376"
-       style="color:#000000" />
-    <path
-       d="m 16,61.998 h 1 v 0.9996 h -1 z"
-       id="path378"
-       style="color:#000000" />
-    <path
-       d="m 16,59.998 h 1 v 0.9996 h -1 z"
-       id="path380"
-       style="color:#000000" />
-    <path
-       d="m 16,57.999 h 1 v 0.9995 h -1 z"
-       id="path382"
-       style="color:#000000" />
-    <path
-       d="m 16,56 h 1 v 0.9995 h -1 z"
-       id="path384"
-       style="color:#000000" />
-    <path
-       d="m 16,54.001 h 1 v 0.9996 h -1 z"
-       id="path386"
-       style="color:#000000" />
-    <path
-       d="m 16,52.002 1,0.002 v 0.99959 h -1 z"
-       id="path388"
-       style="color:#000000" />
-    <path
-       d="m 16,49.963 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path390"
-       style="color:#000000" />
-    <path
-       d="m 16,45.965 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path392"
-       style="color:#000000" />
-    <path
-       d="m 16,43.965 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path394"
-       style="color:#000000" />
-    <path
-       d="m 16,41.966 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path396"
-       style="color:#000000" />
-    <path
-       d="m 16,39.967 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path398"
-       style="color:#000000" />
-    <path
-       d="m 16,37.968 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path400"
-       style="color:#000000" />
-    <path
-       d="m 16,35.969 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path402"
-       style="color:#000000" />
-    <path
-       d="m 16,33.97 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path404"
-       style="color:#000000" />
-    <path
-       d="m 16,31.971 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path406"
-       style="color:#000000" />
-    <path
-       d="m 16,29.972 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path408"
-       style="color:#000000" />
-    <path
-       d="m 16,27.972 1,0.002 v 0.99957 l -1,-0.002 z"
-       id="path410"
-       style="color:#000000" />
-    <path
-       d="m 16,25.973 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path412"
-       style="color:#000000" />
-    <path
-       d="m 16,21.975 1,0.002 v 0.99957 l -1,-0.002 z"
-       id="path414"
-       style="color:#000000" />
-    <path
-       d="m 16,19.976 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path416"
-       style="color:#000000" />
-    <path
-       d="m 16,17.977 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path418"
-       style="color:#000000" />
-    <path
-       d="m 16,15.978 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path420"
-       style="color:#000000" />
-    <path
-       d="m 16,13.979 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path422"
-       style="color:#000000" />
-    <path
-       d="m 16,11.979 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path424"
-       style="color:#000000" />
-    <path
-       d="m 16,9.9803 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path426"
-       style="color:#000000" />
-    <path
-       d="m 16,7.9812 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path428"
-       style="color:#000000" />
-    <path
-       d="m 16,5.982 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path430"
-       style="color:#000000" />
-    <path
-       d="m 16,3.9829 1,0.002 v 0.99956 l -1,-0.002 z"
-       id="path432"
-       style="color:#000000" />
-  </g>
-  <g
-     style="fill:#101010;fill-opacity:1"
-     transform="translate(-3,-1.002423)"
-     id="g2849-3-9">
-    <path
-       d="m 15,49.000541 h -1 v 0.9993 h 1 z"
-       id="path244-6-2"
-       style="color:#000000;fill:#101010;fill-opacity:1;stroke-width:0.99965024" />
-    <path
-       d="m 15,25.000269 -1,-10e-6 v 0.999311 h 1 z"
-       id="path246-7-2"
-       style="color:#000000;fill:#101010;fill-opacity:1;stroke-width:0.99965024" />
-    <path
-       d="M 15,59.00066 H 14 V 60 h 1 z"
-       id="path284-5-8"
-       style="color:#000000;fill:#101010;fill-opacity:1;stroke-width:0.99965024" />
-    <path
-       d="m 15,57.000636 h -1 v 0.99924 h 1 z"
-       id="path286-3-9"
-       style="color:#000000;fill:#101010;fill-opacity:1;stroke-width:0.99965024" />
-    <path
-       d="m 15,55.000612 h -1 v 0.999341 h 1 z"
-       id="path288-5-7"
-       style="color:#000000;fill:#101010;fill-opacity:1;stroke-width:0.99965024" />
-    <path
-       d="m 15,53.00059 h -1 v 0.999341 h 1 z"
-       id="path290-6-3"
-       style="color:#000000;fill:#101010;fill-opacity:1;stroke-width:0.99965024" />
-    <path
-       d="m 15,51.000565 -1,0.002 v 0.9993 l 1,-0.002 z"
-       id="path292-2-6"
-       style="color:#000000;fill:#101010;fill-opacity:1;stroke-width:0.99965024" />
-    <path
-       d="m 15,47.000518 -1,0.002 v 0.999301 l 1,-0.002 z"
-       id="path294-9-1"
-       style="color:#000000;fill:#101010;fill-opacity:1;stroke-width:0.99965024" />
-    <path
-       d="m 15,45.000496 -1,0.002 v 0.999301 l 1,-0.002 z"
-       id="path296-1-2"
-       style="color:#000000;fill:#101010;fill-opacity:1;stroke-width:0.99965024" />
-    <path
-       d="m 15,43.00047 -1,0.002 v 0.9993 l 1,-0.002 z"
-       id="path298-2-9"
-       style="color:#000000;fill:#101010;fill-opacity:1;stroke-width:0.99965024" />
-    <path
-       d="m 15,41.000448 -1,0.002 v 0.9993 l 1,-0.002 z"
-       id="path300-7-3"
-       style="color:#000000;fill:#101010;fill-opacity:1;stroke-width:0.99965024" />
-    <path
-       d="m 15,39.000423 -1,0.002 v 0.999311 l 1,-0.002 z"
-       id="path302-0-1"
-       style="color:#000000;fill:#101010;fill-opacity:1;stroke-width:0.99965024" />
-    <path
-       d="m 15,37.000401 -1,0.002 v 0.9993 l 1,-0.002 z"
-       id="path304-9-9"
-       style="color:#000000;fill:#101010;fill-opacity:1;stroke-width:0.99965024" />
-    <path
-       d="m 15,35.000377 -1,0.002 v 0.999301 l 1,-0.002 z"
-       id="path306-3-4"
-       style="color:#000000;fill:#101010;fill-opacity:1;stroke-width:0.99965024" />
-    <path
-       d="m 15,33.000353 -1,0.002 v 0.99931 l 1,-0.002 z"
-       id="path308-6-7"
-       style="color:#000000;fill:#101010;fill-opacity:1;stroke-width:0.99965024" />
-    <path
-       d="m 15,31.000329 -1,0.002 v 0.9993 l 1,-0.002 z"
-       id="path310-0-8"
-       style="color:#000000;fill:#101010;fill-opacity:1;stroke-width:0.99965024" />
-    <path
-       d="m 15,29.000306 -1,0.002 v 0.999301 l 1,-0.002 z"
-       id="path312-6-4"
-       style="color:#000000;fill:#101010;fill-opacity:1;stroke-width:0.99965024" />
-    <path
-       d="m 15,27.000284 -1,0.002 v 0.999301 l 1,-0.002 z"
-       id="path314-2-5"
-       style="color:#000000;fill:#101010;fill-opacity:1;stroke-width:0.99965024" />
-    <path
-       d="m 15,23.000236 -1,0.002 v 0.999301 l 1,-0.002 z"
-       id="path316-6-0"
-       style="color:#000000;fill:#101010;fill-opacity:1;stroke-width:0.99965024" />
-    <path
-       d="m 15,21.00021 -1,0.002 v 0.9993 l 1,-0.002 z"
-       id="path318-1-3"
-       style="color:#000000;fill:#101010;fill-opacity:1;stroke-width:0.99965024" />
-    <path
-       d="m 15,19.000188 -1,0.002 v 0.999299 l 1,-0.002 z"
-       id="path320-8-6"
-       style="color:#000000;fill:#101010;fill-opacity:1;stroke-width:0.99965024" />
-    <path
-       d="m 15,17.000165 -1,0.002 v 0.999311 l 1,-0.002 z"
-       id="path322-7-1"
-       style="color:#000000;fill:#101010;fill-opacity:1;stroke-width:0.99965024" />
-    <path
-       d="m 15,15.000143 -1,0.002 v 0.999301 l 1,-0.002 z"
-       id="path324-9-0"
-       style="color:#000000;fill:#101010;fill-opacity:1;stroke-width:0.99965024" />
-    <path
-       d="m 15,13.000117 -1,0.002 v 0.999301 l 1,-0.002 z"
-       id="path326-2-6"
-       style="color:#000000;fill:#101010;fill-opacity:1;stroke-width:0.99965024" />
-    <path
-       d="m 15,11.000095 -1,0.002 v 0.9993 l 1,-0.002 z"
-       id="path328-0-3"
-       style="color:#000000;fill:#101010;fill-opacity:1;stroke-width:0.99965024" />
-    <path
-       d="m 15,9.00007 -1,0.002 v 0.999301 l 1,-0.002 z"
-       id="path330-2-2"
-       style="color:#000000;fill:#101010;fill-opacity:1;stroke-width:0.99965024" />
-    <path
-       d="m 15,7.0000469 -1,0.002 v 0.9993106 l 1,-0.002 z"
-       id="path332-3-0"
-       style="color:#000000;fill:#101010;fill-opacity:1;stroke-width:0.99965024" />
-    <path
-       d="m 15,5.0000231 -1,0.002 v 0.9993005 l 1,-0.002 z"
-       id="path334-7-6"
-       style="color:#000000;fill:#101010;fill-opacity:1;stroke-width:0.99965024" />
-  </g>
-</svg>
diff --git a/res/skins/LateNight/knobs_sliders/slider_volume_deck.svg b/res/skins/LateNight/knobs_sliders/slider_volume_deck.svg
deleted file mode 100644
index 4e0f2cbfc099..000000000000
--- a/res/skins/LateNight/knobs_sliders/slider_volume_deck.svg
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.1"
-   height="106"
-   width="46"
-   id="svg2">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient4539-7-1-1-3">
-      <stop
-         offset="0"
-         stop-color="#444"
-         id="stop4541-7-0-0-8" />
-      <stop
-         offset=".5"
-         stop-color="#858585"
-         id="stop4707-7-2-9" />
-      <stop
-         offset="1"
-         stop-color="#444"
-         id="stop4543-9-6-5-5" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient4539-7-1-1-3"
-       gradientUnits="userSpaceOnUse"
-       y2="948.35999"
-       y1="1047.4"
-       x2="12"
-       x1="12"
-       id="linearGradient6215" />
-  </defs>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <rect
-     id="rect4746"
-     x="12"
-     y="2.0000019"
-     width="22"
-     height="0.9995957"
-     style="color:#000000;fill:#525252;fill-opacity:1;stroke-width:0.99979782" />
-  <path
-     d="m 16,76.009887 4,-0.01132 v 0.999566 l -4,0.01132 z m -1,-26.028847 5,0.01819 v 0.999566 l -5,-0.01819 z m -1,-23.989686 6,0.0085 v 0.999576 l -6,-0.0085 z m 4,72.009076 2,-8.09e-4 v 0.99957 L 18,99 Z m 0,-1.99914 2,-8.09e-4 v 0.999569 l -2,8.09e-4 z m 0,-1.99914 2,-8.09e-4 v 0.999569 l -2,8.09e-4 z m 0,-1.999141 2,-8.09e-4 v 0.99957 l -2,8.09e-4 z m 0,-1.99914 2,-8.09e-4 v 0.99957 l -2,8.09e-4 z m 0,-1.99914 2,-8.09e-4 v 0.999569 l -2,8.09e-4 z m 0,-1.999141 2,-8.09e-4 v 0.99957 l -2,8.09e-4 z m 0,-1.99914 2,-8.09e-4 v 0.99957 l -2,8.09e-4 z m 0,-1.99914 2,-8.09e-4 v 0.99957 l -2,8.09e-4 z m 0,-1.99914 2,-8.09e-4 v 0.999569 l -2,8.09e-4 z m 0,-1.999141 2,-8.09e-4 v 0.99957 l -2,8.09e-4 z m 0,-3.99828 2,-8.09e-4 v 0.999569 l -2,8.09e-4 z m 0,-1.999141 2,-8.09e-4 v 0.99957 l -2,8.09e-4 z m 0,-1.99914 2,-8.09e-4 v 0.99957 l -2,8.09e-4 z m 0,-1.99914 2,-8.09e-4 v 0.99957 l -2,8.09e-4 z m 0,-1.99914 2,-8.09e-4 v 0.99957 l -2,8.08e-4 z m 0,-1.999141 2,-8.09e-4 v 0.999571 l -2,8.09e-4 z m 0,-1.99914 2,-8.09e-4 v 0.999571 l -2,8.09e-4 z m 0,-1.99914 2,-8.09e-4 v 0.99957 l -2,8.09e-4 z m 0,-1.999141 2,-8.09e-4 v 0.999571 l -2,8.09e-4 z m 0,-1.999144 2,-8.09e-4 v 0.999571 l -2,8.09e-4 z m 0,-1.99914 2,-8.09e-4 v 0.999571 l -2,8.09e-4 z m 0,-2.039159 2,-8.09e-4 v 0.99957 l -2,8.09e-4 z m 0,-3.998281 2,-8.09e-4 v 0.999571 l -2,8.09e-4 z m 0,-1.99914 2,-8.09e-4 v 0.999571 l -2,8.09e-4 z m 0,-1.999144 2,-8.09e-4 v 0.99957 l -2,8.09e-4 z m 0,-1.999141 2,-8.09e-4 v 0.999571 l -2,8.09e-4 z m 0,-1.99914 2,-8.09e-4 v 0.999571 l -2,8.09e-4 z m 0,-1.99914 2,-8.09e-4 v 0.999571 l -2,8.09e-4 z m 0,-1.99914 2,-8.08e-4 v 0.999569 l -2,8.09e-4 z m 0,-1.99914 2,-8.09e-4 v 0.99957 l -2,8.09e-4 z m 0,-1.99914 2,-8.09e-4 v 0.99957 l -2,8.09e-4 z m 0,-1.99914 2,-8.09e-4 v 0.999569 l -2,8.09e-4 z m 0,-1.99914 2,-8.09e-4 v 0.999569 l -2,8.09e-4 z m 0,-3.998281 2,-8.09e-4 v 0.99957 l -2,8.09e-4 z m 0,-1.99914 2,-8.09e-4 v 0.999569 l -2,8.09e-4 z m 0,-1.999141 2,-8.09e-4 v 0.99957 l -2,8.09e-4 z m 0,-1.99914 2,-8.09e-4 v 0.99957 l -2,8.09e-4 z m 0,-1.999141 2,-8.09e-4 v 0.99957 l -2,8.09e-4 z m 0,-1.99914 2,-8.09e-4 v 0.999569 l -2,8.09e-4 z m 0,-1.999141 2,-8.09e-4 v 0.99957 l -2,8.09e-4 z m 0,-1.9991401 2,-8.094e-4 v 0.9995705 l -2,8.09e-4 z m 0,-1.9991408 2,-8.094e-4 v 0.9995702 l -2,8.094e-4 z m 0,-1.9991402 2,-8.093e-4 v 0.9995702 l -2,8.093e-4 z M 18,4.0008094 20,4 v 0.9995702 l -2,8.094e-4 z"
-     style="color:#000000;fill:#666666;fill-opacity:1;stroke-width:0.99978507"
-     id="rect4752" />
-  <rect
-     id="rect4754"
-     x="17"
-     y="100.0004"
-     width="12"
-     height="0.9995957"
-     style="color:#000000;fill:#525252;fill-opacity:1;stroke-width:0.99979782" />
-  <rect
-     style="color:#000000;fill:#030303;fill-opacity:1"
-     height="95"
-     width="4"
-     y="4"
-     x="21"
-     id="rect5098" />
-  <path
-     d="m 20,75.999588 1,-3e-6 v 0.999557 l -1,3e-6 z m 0,-25.999121 1,-3e-6 v 0.999558 l -1,3e-6 z m 0,-23.999197 1,-3e-6 v 0.999567 l -1,3e-6 z m 0,71.997568 1,0.0016 V 99 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999561 l -1,-0.0016 z m 0,-1.999124 1,0.0016 v 0.999561 l -1,-0.0016 z m 0,-1.999124 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999124 1,0.0016 v 0.999561 l -1,-0.0016 z m 0,-1.999124 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999124 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999561 l -1,-0.0016 z m 0,-1.999124 1,0.0016 v 0.999575 l -1,-0.0016 z m 0,-3.998247 1,0.0016 v 0.999561 l -1,-0.0016 z m 0,-1.999124 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999124 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999561 l -1,-0.0016 z m 0,-1.999125 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999561 l -1,-0.0016 z m 0,-1.999125 1,0.0016 v 0.999563 l -1,-0.0016 z m 0,-1.999127 1,0.0016 V 57.0184 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-2.039142 1,0.0016 v 0.999561 l -1,-0.0016 z m 0,-3.998248 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999128 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999124 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999563 l -1,-0.0016 z m 0,-1.999124 1,0.0016 v 0.999561 l -1,-0.0016 z m 0,-1.999124 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999563 l -1,-0.0016 z m 0,-1.999124 1,0.0016 v 0.999561 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999561 l -1,-0.0016 z m 0,-3.998248 1,0.0016 V 24.9924 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999561 l -1,-0.0016 z m 0,-1.999124 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999124 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999124 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999561 l -1,-0.0016 z m 0,-1.999125 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.9991234 1,0.00161 v 0.9995624 l -1,-0.0016 z m 0,-1.9991242 1,0.00161 v 0.9995619 l -1,-0.00161 z m 0,-1.9991235 1,0.00161 v 0.9995618 l -1,-0.00161 z M 20,4 21,4.00161 v 0.9995619 l -1,-0.00161 z"
-     style="color:#000000;fill:#434343;fill-opacity:1;stroke-width:0.99978089"
-     id="rect4752-7" />
-  <path
-     d="m 30,76.010696 -4,-0.01132 v 0.999566 l 4,0.01132 z m 1,-26.028847 -5,0.01819 v 0.999566 l 5,-0.01819 z m 1,-23.989686 -6,0.0085 v 0.999576 l 6,-0.0085 z M 28,98.001239 26,98.00043 V 99 l 2,8.09e-4 z m 0,-1.99914 -2,-8.09e-4 v 0.999569 l 2,8.09e-4 z m 0,-1.99914 -2,-8.09e-4 v 0.999569 l 2,8.09e-4 z m 0,-1.999141 -2,-8.09e-4 v 0.99957 l 2,8.09e-4 z m 0,-1.99914 -2,-8.09e-4 v 0.99957 l 2,8.09e-4 z m 0,-1.99914 -2,-8.09e-4 v 0.999569 l 2,8.09e-4 z m 0,-1.999141 -2,-8.09e-4 v 0.99957 l 2,8.09e-4 z m 0,-1.99914 -2,-8.09e-4 v 0.99957 l 2,8.09e-4 z m 0,-1.99914 -2,-8.09e-4 v 0.99957 l 2,8.09e-4 z m 0,-1.99914 -2,-8.09e-4 v 0.999569 l 2,8.09e-4 z m 0,-1.999141 -2,-8.09e-4 v 0.99957 l 2,8.09e-4 z m 0,-3.99828 -2,-8.09e-4 v 0.999569 l 2,8.09e-4 z m 0,-1.999141 -2,-8.09e-4 v 0.99957 l 2,8.09e-4 z m 0,-1.99914 -2,-8.09e-4 v 0.99957 l 2,8.09e-4 z m 0,-1.99914 -2,-8.09e-4 v 0.99957 l 2,8.09e-4 z m 0,-1.99914 -2,-8.09e-4 v 0.99957 l 2,8.08e-4 z m 0,-1.999141 -2,-8.09e-4 v 0.999571 l 2,8.09e-4 z m 0,-1.99914 -2,-8.09e-4 v 0.999571 l 2,8.09e-4 z m 0,-1.99914 -2,-8.09e-4 v 0.99957 l 2,8.09e-4 z m 0,-1.999141 -2,-8.09e-4 v 0.999571 l 2,8.09e-4 z m 0,-1.999144 -2,-8.09e-4 v 0.999571 l 2,8.09e-4 z m 0,-1.99914 -2,-8.09e-4 v 0.999571 l 2,8.09e-4 z m 0,-2.039159 -2,-8.09e-4 v 0.99957 l 2,8.09e-4 z m 0,-3.998281 -2,-8.09e-4 v 0.999571 l 2,8.09e-4 z m 0,-1.99914 -2,-8.09e-4 v 0.999571 l 2,8.09e-4 z m 0,-1.999144 -2,-8.09e-4 v 0.99957 l 2,8.09e-4 z m 0,-1.999141 -2,-8.09e-4 v 0.999571 l 2,8.09e-4 z m 0,-1.99914 -2,-8.09e-4 v 0.999571 l 2,8.09e-4 z m 0,-1.99914 -2,-8.09e-4 v 0.999571 l 2,8.09e-4 z m 0,-1.99914 -2,-8.08e-4 v 0.999569 l 2,8.09e-4 z m 0,-1.99914 -2,-8.09e-4 v 0.99957 l 2,8.09e-4 z m 0,-1.99914 -2,-8.09e-4 v 0.99957 l 2,8.09e-4 z m 0,-1.99914 -2,-8.09e-4 v 0.999569 l 2,8.09e-4 z m 0,-1.99914 -2,-8.09e-4 v 0.999569 l 2,8.09e-4 z m 0,-3.998281 -2,-8.09e-4 v 0.99957 l 2,8.09e-4 z m 0,-1.99914 -2,-8.09e-4 v 0.999569 l 2,8.09e-4 z m 0,-1.999141 -2,-8.09e-4 v 0.99957 l 2,8.09e-4 z m 0,-1.99914 -2,-8.09e-4 v 0.99957 l 2,8.09e-4 z m 0,-1.999141 -2,-8.09e-4 v 0.99957 l 2,8.09e-4 z m 0,-1.99914 -2,-8.09e-4 v 0.999569 l 2,8.09e-4 z m 0,-1.999141 -2,-8.09e-4 v 0.99957 l 2,8.09e-4 z m 0,-1.9991401 -2,-8.094e-4 v 0.9995705 l 2,8.09e-4 z m 0,-1.9991408 -2,-8.094e-4 v 0.9995702 l 2,8.094e-4 z m 0,-1.9991402 -2,-8.093e-4 v 0.9995702 l 2,8.093e-4 z M 28,4.0016184 26,4.000809 v 0.9995702 l 2,8.094e-4 z"
-     style="color:#000000;fill:#525252;fill-opacity:1;stroke-width:0.99978507"
-     id="rect4752-2" />
-  <path
-     d="m 26,76.000397 -1,-3e-6 v 0.999557 l 1,3e-6 z m 0,-25.999121 -1,-3e-6 v 0.999558 l 1,3e-6 z m 0,-23.999197 -1,-3e-6 v 0.999567 l 1,3e-6 z m 0,71.997568 -1,0.0016 v 0.999562 l 1,-0.0016 z m 0,-1.999123 -1,0.0016 v 0.999561 l 1,-0.0016 z M 26,94.0014 25,94.003 v 0.999561 l 1,-0.0016 z m 0,-1.999124 -1,0.0016 v 0.999562 l 1,-0.0016 z m 0,-1.999123 -1,0.0016 v 0.999562 l 1,-0.0016 z m 0,-1.999124 -1,0.0016 v 0.999561 l 1,-0.0016 z m 0,-1.999124 -1,0.0016 v 0.999562 l 1,-0.0016 z m 0,-1.999123 -1,0.0016 v 0.999562 l 1,-0.0016 z m 0,-1.999124 -1,0.0016 v 0.999562 l 1,-0.0016 z m 0,-1.999123 -1,0.0016 v 0.999561 l 1,-0.0016 z m 0,-1.999124 -1,0.0016 v 0.999575 l 1,-0.0016 z m 0,-3.998247 -1,0.0016 v 0.999561 l 1,-0.0016 z m 0,-1.999124 -1,0.0016 v 0.999562 l 1,-0.0016 z m 0,-1.999124 -1,0.0016 v 0.999562 l 1,-0.0016 z m 0,-1.999123 -1,0.0016 v 0.999562 l 1,-0.0016 z m 0,-1.999123 -1,0.0016 v 0.999561 l 1,-0.0016 z m 0,-1.999125 -1,0.0016 v 0.999562 l 1,-0.0016 z m 0,-1.999123 -1,0.0016 v 0.999562 l 1,-0.0016 z m 0,-1.999123 -1,0.0016 v 0.999561 l 1,-0.0016 z m 0,-1.999125 -1,0.0016 v 0.999563 l 1,-0.0016 z m 0,-1.999127 -1,0.0016 v 0.999562 l 1,-0.0016 z m 0,-1.999123 -1,0.0016 v 0.999562 l 1,-0.0016 z m 0,-2.039142 -1,0.0016 v 0.999561 l 1,-0.0016 z m 0,-3.998248 -1,0.0016 v 0.999562 l 1,-0.0016 z m 0,-1.999123 -1,0.0016 v 0.999562 l 1,-0.0016 z m 0,-1.999128 -1,0.0016 v 0.999562 l 1,-0.0016 z m 0,-1.999124 -1,0.0016 v 0.999562 l 1,-0.0016 z m 0,-1.999123 -1,0.0016 v 0.999562 l 1,-0.0016 z m 0,-1.999123 -1,0.0016 v 0.999563 l 1,-0.0016 z m 0,-1.999124 -1,0.0016 v 0.999561 l 1,-0.0016 z m 0,-1.999124 -1,0.0016 v 0.999562 l 1,-0.0016 z m 0,-1.999123 -1,0.0016 v 0.999563 l 1,-0.0016 z m 0,-1.999124 -1,0.0016 v 0.999561 l 1,-0.0016 z m 0,-1.999123 -1,0.0016 v 0.999561 l 1,-0.0016 z m 0,-3.998248 -1,0.0016 v 0.999562 l 1,-0.0016 z m 0,-1.999123 -1,0.0016 v 0.999561 l 1,-0.0016 z m 0,-1.999124 -1,0.0016 v 0.999562 l 1,-0.0016 z m 0,-1.999124 -1,0.0016 v 0.999562 l 1,-0.0016 z m 0,-1.999124 -1,0.0016 v 0.999562 l 1,-0.0016 z m 0,-1.999123 -1,0.0016 v 0.999561 l 1,-0.0016 z m 0,-1.999125 -1,0.0016 v 0.999562 l 1,-0.0016 z m 0,-1.9991234 -1,0.00161 v 0.9995624 l 1,-0.0016 z m 0,-1.9991242 -1,0.00161 v 0.9995619 l 1,-0.00161 z m 0,-1.9991235 -1,0.00161 v 0.9995618 l 1,-0.00161 z m 0,-1.9991239 -1,0.00161 v 0.9995619 l 1,-0.00161 z"
-     style="color:#000000;fill:#6e6e6e;fill-opacity:1;stroke-width:0.99978089"
-     id="rect4752-7-0" />
-  <path
-     d="m 20,74.983375 1,-3e-6 v 0.999557 l -1,3e-6 z m 0,-25.999121 1,-3e-6 v 0.999558 l -1,3e-6 z m 0,-23.999197 1,-3e-6 v 0.999567 l -1,3e-6 z m 0,71.997568 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999561 l -1,-0.0016 z m 0,-1.999124 1,0.0016 v 0.999561 l -1,-0.0016 z m 0,-1.999124 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999124 1,0.0016 v 0.999561 l -1,-0.0016 z m 0,-1.999124 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999124 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999561 l -1,-0.0016 z m 0,-1.999124 1,0.0016 v 0.999575 l -1,-0.0016 z m 0,-3.998247 1,0.0016 v 0.999561 l -1,-0.0016 z m 0,-1.999124 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999124 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999561 l -1,-0.0016 z m 0,-1.999125 1,0.0016 v 0.999562 l -1,-0.0016 z M 20,60.9984 21,61 v 0.999562 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999561 l -1,-0.0016 z m 0,-1.999125 1,0.0016 v 0.999563 l -1,-0.0016 z m 0,-1.999127 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-2.039142 1,0.0016 v 0.999561 l -1,-0.0016 z m 0,-3.998248 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999128 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999124 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999563 l -1,-0.0016 z m 0,-1.999124 1,0.0016 v 0.999561 l -1,-0.0016 z m 0,-1.999124 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999563 l -1,-0.0016 z m 0,-1.999124 1,0.0016 v 0.999561 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999561 l -1,-0.0016 z m 0,-3.998248 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999561 l -1,-0.0016 z m 0,-1.999124 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999124 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999124 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.999123 1,0.0016 v 0.999561 l -1,-0.0016 z m 0,-1.999125 1,0.0016 v 0.999562 l -1,-0.0016 z m 0,-1.9991234 1,0.00161 V 9.982331 l -1,-0.0016 z m 0,-1.9991242 1,0.00161 v 0.9995619 l -1,-0.00161 z m 0,-1.9991235 1,0.00161 v 0.9995618 l -1,-0.00161 z"
-     style="color:#000000;fill:#101010;fill-opacity:1;stroke-width:0.99978089"
-     id="rect4752-7-2" />
-  <path
-     id="rect1769"
-     d="m 21,99 h 4 V 4 h -4 z m 1,-1 V 5 h 2 v 93 z"
-     style="display:inline;opacity:1;fill:#0f0f0f;fill-opacity:1;stroke:none;stroke-width:2.4370873;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
-</svg>
diff --git a/res/skins/LateNight/library.xml b/res/skins/LateNight/library.xml
index 3e9f9a6acbf1..c0b4bebe113f 100644
--- a/res/skins/LateNight/library.xml
+++ b/res/skins/LateNight/library.xml
@@ -9,7 +9,7 @@
       **********************************************
       -->
       <WidgetGroup>
-        <ObjectName>Library</ObjectName>
+        <ObjectName>LibraryContainer</ObjectName>
         <Layout>horizontal</Layout>
         <SizePolicy>me,me</SizePolicy>
         <Children>
diff --git a/res/skins/LateNight/mic_aux_rack.xml b/res/skins/LateNight/mic_aux_rack.xml
index a716df3e3fcd..e8eeec80f8c4 100644
--- a/res/skins/LateNight/mic_aux_rack.xml
+++ b/res/skins/LateNight/mic_aux_rack.xml
@@ -10,38 +10,44 @@
         <Layout>horizontal</Layout>
         <SizePolicy>me,min</SizePolicy>
         <Children>
+          <!-- Dummy to fill empty space -->
+          <WidgetGroup>
+            <ObjectName>MicAuxRackFiller</ObjectName>
+            <SizePolicy>i,min</SizePolicy>
+          </WidgetGroup>
             <WidgetGroup>
-              <SizePolicy>min,min</SizePolicy>
+              <SizePolicy>i,min</SizePolicy>
+              <MaximumSize>5,</MaximumSize>
             </WidgetGroup>
           <Template src="skin:mic_unit.xml">
             <SetVariable name="micnum">4</SetVariable>
           </Template>
             <WidgetGroup>
               <SizePolicy>min,min</SizePolicy>
-              <MinimumSize>1,0</MinimumSize>
-              <MaximumSize>20,</MaximumSize>
+              <MinimumSize>3,0</MinimumSize>
+              <MaximumSize>5,</MaximumSize>
             </WidgetGroup>
           <Template src="skin:mic_unit.xml">
             <SetVariable name="micnum">3</SetVariable>
           </Template>
             <WidgetGroup>
               <SizePolicy>min,min</SizePolicy>
-              <MinimumSize>1,0</MinimumSize>
-              <MaximumSize>20,</MaximumSize>
+              <MinimumSize>3,0</MinimumSize>
+              <MaximumSize>5,</MaximumSize>
             </WidgetGroup>
           <Template src="skin:mic_unit.xml">
             <SetVariable name="micnum">2</SetVariable>
           </Template>
             <WidgetGroup>
               <SizePolicy>min,min</SizePolicy>
-              <MinimumSize>1,0</MinimumSize>
-              <MaximumSize>20,</MaximumSize>
+              <MinimumSize>3,0</MinimumSize>
+              <MaximumSize>5,</MaximumSize>
             </WidgetGroup>
           <Template src="skin:mic_unit.xml">
             <SetVariable name="mic1hack">1</SetVariable>
           </Template>
 
-          <WidgetGroup><!-- Ducking controls -->
+          <WidgetGroup>
             <ObjectName>MicDuckingContainer</ObjectName>
             <Layout>vertical</Layout>
             <SizePolicy>max,min</SizePolicy>
@@ -49,10 +55,9 @@
               <Template src="skin:button_3state.xml">
                 <SetVariable name="TooltipId">talkover_duck_mode</SetVariable>
                 <SetVariable name="ObjectName">MicDuckingButton</SetVariable>
-                <SetVariable name="Size">45f,23f</SetVariable>
-                <SetVariable name="state_0">mic_duck_off</SetVariable>
-                <SetVariable name="state_1">mic_duck_auto</SetVariable>
-                <SetVariable name="state_2">mic_duck_manual</SetVariable>
+                <SetVariable name="Size">42f,24f</SetVariable>
+                <SetVariable name="btn_type">embedded</SetVariable>
+                <SetVariable name="btn_format">medium</SetVariable>
                 <SetVariable name="ConfigKey">[Master],talkoverDucking</SetVariable>
               </Template>
               <WidgetGroup>
@@ -62,7 +67,8 @@
                 <Children>
                   <Template src="skin:knob_textless.xml">
                     <SetVariable name="TooltipId">talkover_duck_strength</SetVariable>
-                    <SetVariable name="Size">36f,30f</SetVariable>
+                    <SetVariable name="Size">35f,30f</SetVariable>
+                    <SetVariable name="type">small</SetVariable>
                     <SetVariable name="Color">red</SetVariable>
                     <SetVariable name="group">[Master]</SetVariable>
                     <SetVariable name="control">duckStrength</SetVariable>
@@ -70,47 +76,53 @@
                 </Children>
               </WidgetGroup><!-- MicDuckingStrengthKnob -->
             </Children>
-          </WidgetGroup><!-- /Ducking controls -->
+          </WidgetGroup><!-- MicDuckingContainer -->
         </Children>
-      </WidgetGroup><!-- /Mic -->
+      </WidgetGroup><!-- MicRack -->
       
-      <WidgetGroup><!-- Aux -->
+      <WidgetGroup>
         <ObjectName>AuxRack</ObjectName>
         <Layout>horizontal</Layout>
         <SizePolicy>me,min</SizePolicy>
         <Children>
+          <!-- Dummy to fill empty space -->
+          <WidgetGroup>
+            <ObjectName>MicAuxRackFiller</ObjectName>
+            <SizePolicy>i,min</SizePolicy>
+          </WidgetGroup>
+            <WidgetGroup>
+              <SizePolicy>i,min</SizePolicy>
+              <MaximumSize>5,</MaximumSize>
+            </WidgetGroup>
           <Template src="skin:aux_unit.xml">
             <SetVariable name="auxnum">4</SetVariable>
           </Template>
             <WidgetGroup>
               <SizePolicy>min,min</SizePolicy>
-              <MinimumSize>1,0</MinimumSize>
-              <MaximumSize>20,</MaximumSize>
+              <MinimumSize>3,0</MinimumSize>
+              <MaximumSize>5,</MaximumSize>
             </WidgetGroup>
           <Template src="skin:aux_unit.xml">
             <SetVariable name="auxnum">3</SetVariable>
           </Template>
             <WidgetGroup>
               <SizePolicy>min,min</SizePolicy>
-              <MinimumSize>1,0</MinimumSize>
-              <MaximumSize>20,</MaximumSize>
+              <MinimumSize>3,0</MinimumSize>
+              <MaximumSize>5,</MaximumSize>
             </WidgetGroup>
           <Template src="skin:aux_unit.xml">
             <SetVariable name="auxnum">2</SetVariable>
           </Template>
             <WidgetGroup>
               <SizePolicy>min,min</SizePolicy>
-              <MinimumSize>1,0</MinimumSize>
-              <MaximumSize>20,</MaximumSize>
+              <MinimumSize>3,0</MinimumSize>
+              <MaximumSize>5,</MaximumSize>
             </WidgetGroup>
           <Template src="skin:aux_unit.xml">
             <SetVariable name="auxnum">1</SetVariable>
           </Template>
-            <WidgetGroup>
-              <SizePolicy>min,min</SizePolicy>
-            </WidgetGroup>
         </Children>
-      </WidgetGroup><!-- Aux -->
+      </WidgetGroup><!-- AuxRack -->
 
       <WidgetGroup>
         <SizePolicy>min,min</SizePolicy>
@@ -120,7 +132,7 @@
       <WidgetGroup><SizePolicy>min,min</SizePolicy></WidgetGroup>
 
       <WidgetGroup>
-        <Size>5f,1min</Size>
+        <Size>2f,1min</Size>
         <Connection>
           <ConfigKey>[Master],skin_settings</ConfigKey>
           <BindProperty>visible</BindProperty>
diff --git a/res/skins/LateNight/mic_unit.xml b/res/skins/LateNight/mic_unit.xml
index 97945bdfb7e1..0c91381c3c30 100644
--- a/res/skins/LateNight/mic_unit.xml
+++ b/res/skins/LateNight/mic_unit.xml
@@ -1,193 +1,178 @@
 <Template>
+  <SetVariable name="btn_type"><Variable name="SubRegion_btn_type"/></SetVariable>
   <SetVariable name="group">[Microphone<Variable name="micnum"/>]</SetVariable>
   <SetVariable name="Type">microphone</SetVariable>
+
   <WidgetGroup>
     <ObjectName>MicAuxUnit</ObjectName>
     <Layout>horizontal</Layout>
-    <SizePolicy>p,max</SizePolicy>
-    <MaximumSize>160,</MaximumSize>
+    <SizePolicy>min,max</SizePolicy>
+    <MaximumSize>170,</MaximumSize>
     <Children>
+
       <WidgetGroup>
-        <BackPath>style/background_tile.png</BackPath>
-        <Layout>horizontal</Layout>
-        <SizePolicy>min,max</SizePolicy>
+        <ObjectName>MicAuxSubControlsFrame</ObjectName>
+        <Layout>stacked</Layout>
+        <SizePolicy>min,min</SizePolicy>
         <Children>
 
-          <WidgetGroup>
-            <Layout>vertical</Layout>
-            <SizePolicy>min,min</SizePolicy>
+          <WidgetGroup><!-- Gain, Pfl, FX buttons, VU -->
+            <ObjectName>MicAuxSubControls</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,me</SizePolicy>
             <Children>
 
-              <WidgetGroup>
-                <ObjectName>MicAuxInteriorBorderTop</ObjectName>
-                <Size>0me,3f</Size>
-              </WidgetGroup>
-
-              <WidgetGroup><!-- Gain, Pfl, FX buttons, VU -->
-                <ObjectName>MicAuxInterior</ObjectName>
-                <Layout>horizontal</Layout>
+              <WidgetGroup><!-- Gain, Pfl, FX buttons -->
+                <Layout>vertical</Layout>
                 <SizePolicy>min,me</SizePolicy>
                 <Children>
-                  <WidgetGroup><!-- Gain, Pfl, FX buttons -->
-                    <Layout>vertical</Layout>
+                  <WidgetGroup>
+                    <ObjectName>MicAuxGainPFlContainer</ObjectName>
+                    <Layout>horizontal</Layout>
                     <SizePolicy>min,me</SizePolicy>
                     <Children>
-
-                      <WidgetGroup><!-- Gain, Pfl -->
-                        <ObjectName>MicAuxGainPFlContainer</ObjectName>
+                      <Template src="skin:button_2state.xml">
+                        <SetVariable name="TooltipId">pfl</SetVariable>
+                        <SetVariable name="ObjectName">PflButton</SetVariable>
+                        <SetVariable name="btn_format">square</SetVariable>
+                        <SetVariable name="Size">26f,26f</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="group"/>,pfl</SetVariable>
+                      </Template>
+                      <WidgetGroup><Size>8f,0min</Size></WidgetGroup>
+                      <Template src="skin:knob_textless.xml">
+                        <SetVariable name="TooltipId">pregain</SetVariable>
+                        <SetVariable name="Size">35f,30f</SetVariable>
+                        <SetVariable name="Color">orange</SetVariable>
+                        <SetVariable name="type">small</SetVariable>
+                        <SetVariable name="group"><Variable name="group"/></SetVariable>
+                        <SetVariable name="control">pregain</SetVariable>
+                      </Template>
+                    </Children>
+                  </WidgetGroup><!-- MicAuxGainPFlContainer -->
+                  <WidgetGroup><!-- FX buttons 1+2 / 1-4 -->
+                    <ObjectName>MicAuxFxButtons</ObjectName>
+                    <Layout>horizontal</Layout>
+                    <SizePolicy>min,min</SizePolicy>
+                    <Children>
+                      <WidgetGroup><!-- FX buttons 1+2 -->
                         <Layout>horizontal</Layout>
-                        <SizePolicy>min,me</SizePolicy>
+                        <SizePolicy>min,min</SizePolicy>
                         <Children>
-                          <Template src="skin:button_2state.xml">
-                            <SetVariable name="TooltipId">pfl</SetVariable>
-                            <SetVariable name="icon">pfl</SetVariable>
-                            <SetVariable name="ConfigKey"><Variable name="group"/>,pfl</SetVariable>
-                            <SetVariable name="Size">26f,26f</SetVariable>
+                          <Template src="skin:fx_assign_button.xml">
+                            <SetVariable name="MinWidth">35</SetVariable>
+                            <SetVariable name="MaxWidth">35</SetVariable>
+                            <SetVariable name="Text">FX</SetVariable>
+                            <SetVariable name="FxUnit">1</SetVariable>
+                          </Template>
+                          <Template src="skin:fx_assign_button.xml">
+                            <SetVariable name="MinWidth">35</SetVariable>
+                            <SetVariable name="MaxWidth">35</SetVariable>
+                            <SetVariable name="Text">FX</SetVariable>
+                            <SetVariable name="FxUnit">2</SetVariable>
                           </Template>
-
-                          <WidgetGroup>
-                            <ObjectName>MicGainKnob</ObjectName>
-                            <Layout>horizontal</Layout>
-                            <SizePolicy>min,min</SizePolicy>
-                            <Children>
-                              <Template src="skin:knob_textless.xml">
-                                <SetVariable name="TooltipId">pregain</SetVariable>
-                                <SetVariable name="Size">36f,30f</SetVariable>
-                                <SetVariable name="Color">orange</SetVariable>
-                                <SetVariable name="group"><Variable name="group"/></SetVariable>
-                                <SetVariable name="control">pregain</SetVariable>
-                              </Template>
-                            </Children>
-                          </WidgetGroup>
                         </Children>
-                      </WidgetGroup><!-- /Gain, Pfl -->
-
-                      <WidgetGroup><!-- FX buttons 1+2 / 1-4 -->
-                        <ObjectName>MicAuxFxButtons</ObjectName>
+                        <Connection>
+                          <ConfigKey persist="true">[Skin],show_4effectunits</ConfigKey>
+                          <Transform><Not/></Transform>
+                          <BindProperty>visible</BindProperty>
+                        </Connection>
+                      </WidgetGroup><!-- /FX buttons 1+2 -->
+                      <WidgetGroup><!-- FX buttons 1-4 -->
                         <Layout>horizontal</Layout>
                         <SizePolicy>min,min</SizePolicy>
                         <Children>
-                          <WidgetGroup><!-- FX buttons 1+2 -->
-                            <Layout>horizontal</Layout>
-                            <SizePolicy>min,min</SizePolicy>
-                            <Children>
-                              <Template src="skin:fx_assign_button.xml">
-                                <SetVariable name="MinWidth">35</SetVariable>
-                                <SetVariable name="MaxWidth">35</SetVariable>
-                                <SetVariable name="Text">FX&#8202;</SetVariable>
-                                <SetVariable name="FxUnit">1</SetVariable>
-                              </Template>
-                              <Template src="skin:fx_assign_button.xml">
-                                <SetVariable name="MinWidth">35</SetVariable>
-                                <SetVariable name="MaxWidth">35</SetVariable>
-                                <SetVariable name="Text">FX&#8202;</SetVariable>
-                                <SetVariable name="FxUnit">2</SetVariable>
-                              </Template>
-                            </Children>
-                            <Connection>
-                              <ConfigKey persist="true">[Skin],show_4effectunits</ConfigKey>
-                              <Transform><Not/></Transform>
-                              <BindProperty>visible</BindProperty>
-                            </Connection>
-                          </WidgetGroup><!-- /FX buttons 1+2 -->
-
-                          <WidgetGroup><!-- FX buttons 1-4 -->
-                            <Layout>horizontal</Layout>
-                            <SizePolicy>min,min</SizePolicy>
-                            <Children>
-                              <Template src="skin:fx_assign_button.xml">
-                                <SetVariable name="MinWidth">24</SetVariable>
-                                <SetVariable name="MaxWidth">32</SetVariable>
-                                <SetVariable name="Text">FX&#8202;</SetVariable>
-                                <SetVariable name="FxUnit">1</SetVariable>
-                              </Template>
-                              <Template src="skin:fx_assign_button.xml">
-                                <SetVariable name="MinWidth">12</SetVariable>
-                                <SetVariable name="MaxWidth">22</SetVariable>
-                                <SetVariable name="FxUnit">2</SetVariable>
-                              </Template>
-                              <Template src="skin:fx_assign_button.xml">
-                                <SetVariable name="MinWidth">12</SetVariable>
-                                <SetVariable name="MaxWidth">22</SetVariable>
-                                <SetVariable name="FxUnit">3</SetVariable>
-                              </Template>
-                              <Template src="skin:fx_assign_button.xml">
-                                <SetVariable name="MinWidth">12</SetVariable>
-                                <SetVariable name="MaxWidth">22</SetVariable>
-                                <SetVariable name="FxUnit">4</SetVariable>
-                              </Template>
-                            </Children>
-                            <Connection>
-                              <ConfigKey persist="true">[Skin],show_4effectunits</ConfigKey>
-                              <BindProperty>visible</BindProperty>
-                            </Connection>
-                          </WidgetGroup><!-- /FX buttons 1-4 -->
+                          <Template src="skin:fx_assign_button.xml">
+                            <SetVariable name="MinWidth">25</SetVariable>
+                            <SetVariable name="MaxWidth">32</SetVariable>
+                            <SetVariable name="Text">FX</SetVariable>
+                            <SetVariable name="FxUnit">1</SetVariable>
+                          </Template>
+                          <Template src="skin:fx_assign_button.xml">
+                            <SetVariable name="MinWidth">12</SetVariable>
+                            <SetVariable name="MaxWidth">22</SetVariable>
+                            <SetVariable name="FxUnit">2</SetVariable>
+                          </Template>
+                          <Template src="skin:fx_assign_button.xml">
+                            <SetVariable name="MinWidth">12</SetVariable>
+                            <SetVariable name="MaxWidth">22</SetVariable>
+                            <SetVariable name="FxUnit">3</SetVariable>
+                          </Template>
+                          <Template src="skin:fx_assign_button.xml">
+                            <SetVariable name="MinWidth">12</SetVariable>
+                            <SetVariable name="MaxWidth">22</SetVariable>
+                            <SetVariable name="FxUnit">4</SetVariable>
+                          </Template>
                         </Children>
-                      </WidgetGroup><!-- /FX buttons 1+2 / 1-4 -->
-                    </Children>
-                  </WidgetGroup><!-- /Gain, Pfl, FX buttons -->
-
-                  <WidgetGroup>
-                    <ObjectName>MicAuxVUMeter</ObjectName>
-                    <Layout>vertical</Layout>
-                    <SizePolicy>min,min</SizePolicy>
-                    <Children>
-                      <Template src="skin:vumeter_small.xml">
-                        <SetVariable name="GroupType">microphone</SetVariable>
-                      </Template>
+                        <Connection>
+                          <ConfigKey persist="true">[Skin],show_4effectunits</ConfigKey>
+                          <BindProperty>visible</BindProperty>
+                        </Connection>
+                      </WidgetGroup><!-- /FX buttons 1-4 -->
                     </Children>
-                  </WidgetGroup>
+                  </WidgetGroup><!-- MicAuxFxButtons * FX buttons 1+2 / 1-4 -->
                 </Children>
-              </WidgetGroup><!-- Gain, Pfl, FX buttons, VU -->
-
+              </WidgetGroup><!-- /Gain, Pfl, FX buttons -->
               <WidgetGroup>
-                <ObjectName>MicAuxInteriorBorderBottom</ObjectName>
-                <Size>0me,2f</Size>
+                <ObjectName>MicAuxVUMeter</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                  <Template src="skin:vumeter_small.xml">
+                    <SetVariable name="GroupType">microphone</SetVariable>
+                  </Template>
+                </Children>
               </WidgetGroup>
-
             </Children>
-          </WidgetGroup><!-- MicAuxInterior -->
+          </WidgetGroup><!-- MicAuxSubControls -->
+
+          <!-- Background tile underneath controls conatiner -->
+          <WidgetGroup>
+            <BackPath><Variable name="BgTile"/></BackPath>
+            <SizePolicy>me,me</SizePolicy>
+          </WidgetGroup>
 
-          <!-- MicAuxMainControls * Label, Play, xfader orientation -->
+        </Children>
+      </WidgetGroup><!-- MicAuxSubControlsFrame -->
+
+      <WidgetGroup>
+        <ObjectName>MicAuxMainControlsFrame</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,me</SizePolicy>
+        <Children>
           <WidgetGroup>
-            <ObjectName>MicAuxFrame</ObjectName>
+            <ObjectName>MicAuxMainControls</ObjectName>
             <Layout>vertical</Layout>
             <SizePolicy>min,me</SizePolicy>
             <Children>
-              <WidgetGroup>
-                <ObjectName>MicAuxMainControls</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,me</SizePolicy>
-                <Children>
 
-                  <Label>
-                    <ObjectName>MicAuxSubTitle</ObjectName>
-                    <Size>,17f</Size>
-                    <Text>mic <Variable name="mic1hack"/><Variable name="micnum"/></Text>
-                    <Alignment>center</Alignment>
-                  </Label>
+                <Label>
+                  <ObjectName>MicAuxSubTitle</ObjectName>
+                  <Size>,17f</Size>
+                  <Text>mic <Variable name="mic1hack"/><Variable name="micnum"/></Text>
+                  <Alignment>center</Alignment>
+                </Label>
 
-                  <WidgetGroup><!-- PLAY -->
-                    <ObjectName>AuxPlayButton</ObjectName>
-                    <Layout>vertical</Layout>
-                    <SizePolicy>min,me</SizePolicy>
-                    <Children>
-                      <Template src="skin:button_2state.xml">
-                        <SetVariable name="TooltipId">microphone_talkover</SetVariable>
-                        <SetVariable name="Size">42f,24f</SetVariable>
-                        <SetVariable name="icon">mic_talk</SetVariable>
-                        <SetVariable name="ConfigKey"><Variable name="group"/>,talkover</SetVariable>
-                      </Template>
-                    </Children>
-                  </WidgetGroup><!-- /PLAY -->
+                <WidgetGroup>
+                  <ObjectName>MicAuxPlayButtonBox</ObjectName>
+                  <Layout>vertical</Layout>
+                  <SizePolicy>min,me</SizePolicy>
+                  <Children>
+                    <Template src="skin:button_2state.xml">
+                      <SetVariable name="TooltipId">microphone_talkover</SetVariable>
+                      <SetVariable name="ObjectName">MicTalkButton</SetVariable>
+                      <SetVariable name="Size">42f,26f</SetVariable>
+                      <SetVariable name="btn_type">embedded</SetVariable>
+                      <SetVariable name="btn_format">medium</SetVariable>
+                      <SetVariable name="ConfigKey"><Variable name="group"/>,talkover</SetVariable>
+                    </Template>
+                  </Children>
+                </WidgetGroup>
 
-                </Children>
-              </WidgetGroup>
             </Children>
-          </WidgetGroup><!-- MicAuxMainControls * Label, Play, xfader orientation -->
-
+          </WidgetGroup><!-- MicAuxMainControls -->
         </Children>
-      </WidgetGroup>
+      </WidgetGroup><!-- MicAuxMainControlsFrame -->
+
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/mixer.xml b/res/skins/LateNight/mixer.xml
index 69abbcfc0087..3d4d3370937d 100644
--- a/res/skins/LateNight/mixer.xml
+++ b/res/skins/LateNight/mixer.xml
@@ -1,12 +1,14 @@
 <Template>
+  <SetVariable name="btn_type"><Variable name="TopRegion_btn_type"/></SetVariable>
 
   <SingletonDefinition>
     <ObjectName>CrossfaderSingleton</ObjectName>
     <Children>
       <SliderComposed>
         <TooltipId>crossfader</TooltipId>
-        <Handle scalemode="STRETCH_ASPECT">skin:/knobs_sliders/knob_crossfader.svg</Handle>
-        <Slider>skin:/knobs_sliders/slider_crossfader.svg</Slider>
+        <Size>141f,46f</Size>
+        <Handle scalemode="STRETCH_ASPECT">skin:/sliders_<Variable name="slider_scheme"/>/knob_crossfader.svg</Handle>
+        <Slider scalemode="STRETCH_ASPECT">skin:/sliders_<Variable name="slider_scheme"/>/slider_crossfader.svg</Slider>
         <Horizontal>true</Horizontal>
         <Connection>
           <ConfigKey>[Master],crossfader</ConfigKey>
@@ -84,27 +86,24 @@
   </SingletonDefinition>
 
   <WidgetGroup>
-    <ObjectName>MixerContainer</ObjectName>
     <SizePolicy>max,me</SizePolicy>
     <Layout>horizontal</Layout>
     <Children>
 
       <WidgetGroup>
-        <ObjectName>MixerChannelControls</ObjectName>
+        <ObjectName>MixerContainer</ObjectName>
+        <SizePolicy>min,me</SizePolicy>
         <Layout>horizontal</Layout>
-        <SizePolicy>max,min</SizePolicy>
         <Children>
 
           <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <Size>2f,min</Size>
-          </WidgetGroup>
-
-          <WidgetGroup>
-            <ObjectName>Mixer</ObjectName>
+            <ObjectName>MixerDecks</ObjectName>
             <Layout>vertical</Layout>
-            <SizePolicy>min,min</SizePolicy>
+            <SizePolicy>max,min</SizePolicy>
             <Children>
+
+              <!-- spacer to center channel controls without crossfader without
+                  stretching them -->
               <WidgetGroup><SizePolicy>min,e</SizePolicy></WidgetGroup>
 
               <WidgetGroup><!-- Channel controls -->
@@ -112,6 +111,8 @@
                 <SizePolicy>min,min</SizePolicy>
                 <Layout>horizontal</Layout>
                 <Children>
+
+                  <!-- Channel 3 -->
                   <WidgetGroup>
                     <SizePolicy>max,min</SizePolicy>
                     <Layout>horizontal</Layout>
@@ -139,13 +140,7 @@
                     <Layout>vertical</Layout>
                     <SizePolicy>max,me</SizePolicy>
                     <Children>
-                      <!-- Spacer -->
-                      <WidgetGroup>
-                        <Layout>vertical</Layout>
-                        <Size>1min,0me</Size>
-                        <Children/>
-                      </WidgetGroup>
-
+                      <WidgetGroup><Size>1min,44f</Size></WidgetGroup>
                       <WidgetGroup>
                         <ObjectName>VuMeterMaster2Decks</ObjectName>
                         <Layout>horizontal</Layout>
@@ -156,13 +151,7 @@
                           </SingletonContainer>
                         </Children>
                       </WidgetGroup>
-
-                      <!-- Spacer -->
-                      <WidgetGroup>
-                        <Layout>vertical</Layout>
-                        <Size>1min,5f</Size>
-                        <Children/>
-                      </WidgetGroup>
+                      <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
                     </Children>
                     <Connection>
                       <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
@@ -177,6 +166,7 @@
                     <SetVariable name="xfaderRight">default</SetVariable>
                   </Template>
 
+                  <!-- Channel 4 -->
                   <WidgetGroup>
                     <SizePolicy>max,min</SizePolicy>
                     <Layout>horizontal</Layout>
@@ -193,6 +183,7 @@
                       <BindProperty>visible</BindProperty>
                     </Connection>
                   </WidgetGroup>
+
                 </Children>
               </WidgetGroup><!-- /Channel controls -->
 
@@ -202,12 +193,12 @@
                 <ObjectName>CrossfaderAndSwitches2Decks</ObjectName>
                 <Layout>horizontal</Layout>
                 <Children>
+                  <WidgetGroup><Size>me,min</Size></WidgetGroup>
 
-                  <!-- Channel1 xfader switch:
-                      visible if deck is NOT assigned to left side of xFader -->
+                  <!-- Channel1 xfader switch -->
                   <WidgetGroup>
                     <Layout>vertical</Layout>
-                    <SizePolicy>me,min</SizePolicy>
+                    <SizePolicy>min,min</SizePolicy>
                     <Children>
                       <WidgetGroup><Size>min,2f</Size></WidgetGroup>
                       <Template src="skin:button_xfader_deck.xml">
@@ -224,32 +215,63 @@
                     </Connection>
                   </WidgetGroup><!-- /Channel1 xfader switch -->
 
+                  <!-- center xfader buttons below EQ knobs -->
                   <WidgetGroup>
-                    <ObjectName>Crossfader</ObjectName>
+                    <Size>11f,0min</Size>
+                    <Connection>
+                      <ConfigKey persist="true">[Skin],show_eq_knobs</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup>
+
+                  <!--  Regular crossfader for
+                        * 2 decks with EQ knobs visible
+                        * 4 decks
+                        Narrow crossfader for
+                        * 2 decks with EQ knobs hidden -->
+                  <WidgetGroup>
+                    <ObjectName>CrossfaderContainer</ObjectName>
                     <Layout>horizontal</Layout>
                     <SizePolicy>min,min</SizePolicy>
                     <Children>
-                      <SingletonContainer>
-                        <ObjectName>CrossfaderSingleton</ObjectName>
+                      <!-- 4 decks -->
+                      <WidgetGroup>
+                        <Layout>horizontal</Layout>
+                        <Children>
+                          <SingletonContainer>
+                            <ObjectName>CrossfaderSingleton</ObjectName>
+                          </SingletonContainer>
+                        </Children>
                         <Connection>
                           <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
                           <BindProperty>visible</BindProperty>
                         </Connection>
-                      </SingletonContainer>
+                      </WidgetGroup>
+
+                      <!-- 2 decks -->
                       <WidgetGroup>
                         <Layout>horizontal</Layout>
                         <Children>
-                          <SingletonContainer>
-                            <ObjectName>CrossfaderSingleton</ObjectName>
+                          <!-- with EQ knobs -->
+                          <WidgetGroup>
+                            <Layout>horizontal</Layout>
+                            <Children>
+                              <SingletonContainer>
+                                <ObjectName>CrossfaderSingleton</ObjectName>
+                              </SingletonContainer>
+                            </Children>
                             <Connection>
                               <ConfigKey persist="true">[Skin],show_eq_knobs</ConfigKey>
                               <BindProperty>visible</BindProperty>
                             </Connection>
-                          </SingletonContainer>
+                          </WidgetGroup>
+
+                          <!-- without EQ knobs -->
                           <SliderComposed>
                             <TooltipId>crossfader</TooltipId>
-                            <Handle scalemode="STRETCH_ASPECT">skin:/knobs_sliders/knob_crossfader.svg</Handle>
-                            <Slider>skin:/knobs_sliders/slider_crossfader_small.svg</Slider>
+                            <Size>102f,46f</Size>
+                            <Handle scalemode="STRETCH_ASPECT">skin:/sliders_<Variable name="slider_scheme"/>/knob_crossfader.svg</Handle>
+                            <Slider scalemode="STRETCH_ASPECT">skin:/sliders_<Variable name="slider_scheme"/>/slider_crossfader_small.svg</Slider>
                             <Horizontal>true</Horizontal>
                             <Connection>
                               <ConfigKey>[Master],crossfader</ConfigKey>
@@ -266,15 +288,24 @@
                           <Transform><Not/></Transform>
                           <BindProperty>visible</BindProperty>
                         </Connection>
-                      </WidgetGroup>
+                      </WidgetGroup><!-- 2 decks -->
                     </Children>
+                  </WidgetGroup><!-- CrossfaderContainer -->
+
+                  <!-- center xfader buttons below EQ knobs -->
+                  <WidgetGroup>
+                    <Size>11f,0min</Size>
+                    <Connection>
+                      <ConfigKey persist="true">[Skin],show_eq_knobs</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
                   </WidgetGroup>
 
-                  <!-- Channel2 xfader switch:
-                      visible if deck is NOT assigned to right side of xFader -->
+                  <!-- Channel2 xfader switch -->
                   <WidgetGroup>
+                    <ObjectName>AlignLeft</ObjectName>
                     <Layout>vertical</Layout>
-                    <SizePolicy>me,min</SizePolicy>
+                    <SizePolicy>min,min</SizePolicy>
                     <Children>
                       <WidgetGroup><Size>min,2f</Size></WidgetGroup>
                       <Template src="skin:button_xfader_deck.xml">
@@ -291,6 +322,8 @@
                     </Connection>
                   </WidgetGroup><!-- /Channel2 xfader switch -->
 
+                  <WidgetGroup><Size>me,min</Size></WidgetGroup>
+
                 </Children>
                 <Connection>
                   <ConfigKey persist="true">[Skin],show_xfader</ConfigKey>
@@ -298,20 +331,18 @@
                 </Connection>
               </WidgetGroup><!-- /Crossfader + Channel1/2 assign switches -->
 
+              <!-- spacer to center channel controls without crossfader without
+                  stretching them -->
               <WidgetGroup><SizePolicy>min,e</SizePolicy></WidgetGroup>
 
             </Children>
-          </WidgetGroup>
+          </WidgetGroup><!-- MixerDecks -->
 
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <Size>2f,min</Size>
-          </WidgetGroup>
-        </Children>
-      </WidgetGroup>
+          <!-- Mixer Master & Headphone -->
+          <Template src="skin:mixer_master_headphone.xml"/>
 
-      <!-- Master & Headphone Controls -->
-      <Template src="skin:mixer_master_headphone.xml"/>
+        </Children>
+      </WidgetGroup><!-- MixerContainer -->
 
     </Children>
     <Connection>
diff --git a/res/skins/LateNight/mixer_channel_4decks.xml b/res/skins/LateNight/mixer_channel_4decks.xml
index f72a74939f13..b670f8e39c61 100644
--- a/res/skins/LateNight/mixer_channel_4decks.xml
+++ b/res/skins/LateNight/mixer_channel_4decks.xml
@@ -11,56 +11,65 @@
       </WidgetGroup>
 
       <WidgetGroup>
+        <ObjectName>AlignRight</ObjectName>
+        <Layout>horizontal</Layout>
+        <Children>
+          <Template src="skin:button_2state.xml">
+            <SetVariable name="TooltipId">pfl</SetVariable>
+            <SetVariable name="ObjectName">PflButton</SetVariable>
+            <SetVariable name="Size">26,26</SetVariable>
+            <SetVariable name="btn_format">square</SetVariable>
+            <SetVariable name="ConfigKey"><Variable name="group"/>,pfl</SetVariable>
+          </Template>
+          <WidgetGroup><Size>10f,0min</Size></WidgetGroup>
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>AlignRight</ObjectName>
         <Layout>horizontal</Layout>
         <SizePolicy>min,max</SizePolicy>
         <Children>
-          <WidgetGroup>
-            <Layout>vertical</Layout>
-            <Children>
-              <Template src="skin:button_2state.xml">
-                <SetVariable name="TooltipId">pfl</SetVariable>
-                <SetVariable name="icon">pfl</SetVariable>
-                <SetVariable name="ConfigKey"><Variable name="group"/>,pfl</SetVariable>
-                <SetVariable name="Size">26,26</SetVariable>
-              </Template>
-
-              <!-- Spacer to put the PFL button a little bit higher -->
-              <WidgetGroup>
-                <Layout>vertical</Layout>
-                <Size>1min,8f</Size>
-                <Children/>
-              </WidgetGroup>
-            </Children>
-          </WidgetGroup>
-          <Template src="skin:knob.xml">
+          <Template src="skin:knob_textless.xml">
             <SetVariable name="Size">40f,34f</SetVariable>
             <SetVariable name="Color">orange</SetVariable>
-            <SetVariable name="group"><Variable name="group"/></SetVariable>
+                <SetVariable name="type">regular</SetVariable>
             <SetVariable name="control">pregain</SetVariable>
-            <SetVariable name="label">gain</SetVariable>
             <SetVariable name="TooltipId">pregain</SetVariable>
           </Template>
+          <WidgetGroup><Size>3f,0min</Size></WidgetGroup>
         </Children>
       </WidgetGroup>
 
-      <Template src="skin:eq_knob_4decks.xml">
-        <SetVariable name="FxParameter">4</SetVariable>
-      </Template>
+      <WidgetGroup><Size>1min,5f</Size></WidgetGroup>
 
       <Template src="skin:eq_knob_4decks.xml">
         <SetVariable name="FxParameter">3</SetVariable>
+        <SetVariable name="Text">H</SetVariable>
       </Template>
 
+      <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
+
       <Template src="skin:eq_knob_4decks.xml">
         <SetVariable name="FxParameter">2</SetVariable>
+        <SetVariable name="Text">M</SetVariable>
       </Template>
 
+      <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
+
       <Template src="skin:eq_knob_4decks.xml">
         <SetVariable name="FxParameter">1</SetVariable>
+        <SetVariable name="Text">L</SetVariable>
       </Template>
 
+      <WidgetGroup><Size>1min,5f</Size></WidgetGroup>
+
       <Template src="skin:quick_effect_knob_4decks.xml"/>
 
+      <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
+
       <WidgetGroup>
         <ObjectName>CrossfaderSwitch4Decks</ObjectName>
         <Layout>vertical</Layout>
@@ -100,7 +109,7 @@
 
           <WidgetGroup>
             <ObjectName>VuMeterChannel4Decks</ObjectName>
-            <Size>26f,0min</Size>
+            <Size>22f,0min</Size>
             <Layout>horizontal</Layout>
             <Children>
               <SingletonContainer>
@@ -111,8 +120,9 @@
 
           <SliderComposed>
             <TooltipId>channel_volume</TooltipId>
-            <Handle scalemode="STRETCH_ASPECT">skin:knobs_sliders/knob_volume_deck.svg</Handle>
-            <Slider>skin:knobs_sliders/slider_volume_deck.svg</Slider>
+            <Size>46f,108f</Size>
+            <Handle scalemode="STRETCH_ASPECT">skin:/sliders_<Variable name="slider_scheme"/>/knob_volume_deck.svg</Handle>
+            <Slider scalemode="STRETCH_ASPECT">skin:/sliders_<Variable name="slider_scheme"/>/slider_volume_deck.svg</Slider>
             <Horizontal>false</Horizontal>
             <Connection>
               <ConfigKey><Variable name="group"/>,volume</ConfigKey>
@@ -121,9 +131,7 @@
         </Children>
       </WidgetGroup>
 
-      <WidgetGroup>
-        <Size>0min,0me</Size>
-      </WidgetGroup>
+      <WidgetGroup><Size>0min,0me</Size></WidgetGroup>
 
     </Children>
   </WidgetGroup>
diff --git a/res/skins/LateNight/mixer_channel_left.xml b/res/skins/LateNight/mixer_channel_left.xml
index 1f5f1eddab7f..c5e5f2cdd3b8 100644
--- a/res/skins/LateNight/mixer_channel_left.xml
+++ b/res/skins/LateNight/mixer_channel_left.xml
@@ -4,7 +4,7 @@ vertical layout and a side-by-side layout for two-deck mode -->
 <Template>
   <SetVariable name="group">[Channel<Variable name="channum"/>]</SetVariable>
   <WidgetGroup>
-    <SizePolicy>max,min</SizePolicy>
+    <SizePolicy>min,min</SizePolicy>
     <Layout>horizontal</Layout>
     <Children>
 
@@ -20,76 +20,78 @@ vertical layout and a side-by-side layout for two-deck mode -->
             <SizePolicy>min,min</SizePolicy>
             <Children>
 
-              <!-- Spacer when there's no 4th EQ AND no QuickEffect loaded -->
+              <!-- Spacer when there's no QuickEffect loaded -->
               <WidgetGroup>
                 <Layout>horizontal</Layout>
-                <SizePolicy>min,min</SizePolicy>
+                <Size>0min,34f</Size>
                 <Children>
-                  <WidgetGroup>
-                    <Layout>horizontal</Layout>
-                    <Size>0min,34f</Size>
-                    <Children/>
-                    <Connection>
-                      <ConfigKey>[QuickEffectRack1_<Variable name="group"/>_Effect1],loaded</ConfigKey>
-                      <Transform><Not/></Transform>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup>
                 </Children>
                 <Connection>
-                  <ConfigKey>[EqualizerRack1_<Variable name="group"/>_Effect1],parameter4_loaded</ConfigKey>
+                  <ConfigKey>[QuickEffectRack1_<Variable name="group"/>_Effect1],loaded</ConfigKey>
                   <Transform><Not/></Transform>
                   <BindProperty>visible</BindProperty>
                 </Connection>
               </WidgetGroup>
 
-              <Template src="skin:eq_knob_left.xml">
-                <SetVariable name="FxParameter">4</SetVariable>
-              </Template>
-
               <Template src="skin:eq_knob_left.xml">
                 <SetVariable name="FxParameter">3</SetVariable>
+                <SetVariable name="Text">H</SetVariable>
               </Template>
 
+              <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
+
               <Template src="skin:eq_knob_left.xml">
                 <SetVariable name="FxParameter">2</SetVariable>
+                <SetVariable name="Text">M</SetVariable>
               </Template>
 
+              <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
+
               <Template src="skin:eq_knob_left.xml">
                 <SetVariable name="FxParameter">1</SetVariable>
+                <SetVariable name="Text">L</SetVariable>
               </Template>
 
+              <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
+
               <Template src="skin:quick_effect_knob_left.xml"/>
 
               <!-- Spacer -->
               <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
             </Children>
+            <Connection>
+              <ConfigKey>[Skin],show_eq_knobs</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
           </WidgetGroup><!-- /EQs -->
 
           <WidgetGroup><!-- Gain knob + Vol fader -->
             <ObjectName>VolumeGain2Decks</ObjectName>
             <Layout>vertical</Layout>
-            <SizePolicy>min,min</SizePolicy>
+            <SizePolicy>me,min</SizePolicy>
             <Children>
               <Template src="skin:knob_textless.xml">
                 <SetVariable name="Size">40f,34f</SetVariable>
                 <SetVariable name="Color">orange</SetVariable>
+                <SetVariable name="type">regular</SetVariable>
                 <SetVariable name="control">pregain</SetVariable>
                 <SetVariable name="TooltipId">pregain</SetVariable>
               </Template>
 
-              <!-- Spacer -->
-              <WidgetGroup><Size>1min,4me</Size></WidgetGroup>
+              <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
 
-              <SliderComposed>   <!-- Volume -->
+              <SliderComposed><!-- Volume -->
                 <TooltipId>channel_volume</TooltipId>
-                <Handle scalemode="STRETCH_ASPECT">skin:knobs_sliders/knob_volume_deck.svg</Handle>
-                <Slider>skin:knobs_sliders/slider_volume_deck.svg</Slider>
+                <Size>46f,108f</Size>
+                <Handle scalemode="STRETCH_ASPECT">skin:/sliders_<Variable name="slider_scheme"/>/knob_volume_deck.svg</Handle>
+                <Slider scalemode="STRETCH_ASPECT">skin:/sliders_<Variable name="slider_scheme"/>/slider_volume_deck.svg</Slider>
                 <Horizontal>false</Horizontal>
                 <Connection>
                   <ConfigKey><Variable name="group"/>,volume</ConfigKey>
                 </Connection>
               </SliderComposed>
+
+              <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
             </Children>
           </WidgetGroup><!-- /Gain knob + Vol fader -->
 
@@ -100,17 +102,13 @@ vertical layout and a side-by-side layout for two-deck mode -->
             <Children>
               <Template src="skin:button_2state.xml">
                 <SetVariable name="TooltipId">pfl</SetVariable>
-                <SetVariable name="icon">pfl</SetVariable>
-                <SetVariable name="ConfigKey"><Variable name="group"/>,pfl</SetVariable>
+                <SetVariable name="ObjectName">PflButton</SetVariable>
                 <SetVariable name="Size">26,26</SetVariable>
+                <SetVariable name="btn_format">square</SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="group"/>,pfl</SetVariable>
               </Template>
 
-              <!-- Spacer -->
-              <WidgetGroup>
-                <Layout>vertical</Layout>
-                <Size>1min,0me</Size>
-                <Children/>
-              </WidgetGroup>
+              <WidgetGroup><Size>1min,14f</Size></WidgetGroup>
 
               <WidgetGroup>
                 <ObjectName>VuMeterChannel2Decks</ObjectName>
@@ -122,6 +120,8 @@ vertical layout and a side-by-side layout for two-deck mode -->
                 </Children>
               </WidgetGroup>
 
+              <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
+
             </Children>
           </WidgetGroup><!-- /Pfl button + VU Meter -->
         </Children>
diff --git a/res/skins/LateNight/mixer_channel_right.xml b/res/skins/LateNight/mixer_channel_right.xml
index 55d54a9d847f..bf7d47c52305 100644
--- a/res/skins/LateNight/mixer_channel_right.xml
+++ b/res/skins/LateNight/mixer_channel_right.xml
@@ -4,7 +4,7 @@ vertical layout and a reversed side-by-side layout for two-deck mode -->
 <Template>
   <SetVariable name="group">[Channel<Variable name="channum"/>]</SetVariable>
   <WidgetGroup>
-    <SizePolicy>max,min</SizePolicy>
+    <SizePolicy>min,min</SizePolicy>
     <Layout>horizontal</Layout>
     <Children>
 
@@ -21,13 +21,13 @@ vertical layout and a reversed side-by-side layout for two-deck mode -->
             <Children>
               <Template src="skin:button_2state.xml">
                 <SetVariable name="TooltipId">pfl</SetVariable>
-                <SetVariable name="icon">pfl</SetVariable>
-                <SetVariable name="ConfigKey"><Variable name="group"/>,pfl</SetVariable>
+                <SetVariable name="ObjectName">PflButton</SetVariable>
                 <SetVariable name="Size">26,26</SetVariable>
+                <SetVariable name="btn_format">square</SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="group"/>,pfl</SetVariable>
               </Template>
 
-              <!-- Spacer -->
-              <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
+              <WidgetGroup><Size>1min,14f</Size></WidgetGroup>
 
               <WidgetGroup>
                 <ObjectName>VuMeterChannel2Decks</ObjectName>
@@ -39,33 +39,38 @@ vertical layout and a reversed side-by-side layout for two-deck mode -->
                 </Children>
               </WidgetGroup>
 
+              <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
+
             </Children>
           </WidgetGroup><!-- /Pfl button + VU Meter -->
 
           <WidgetGroup><!-- Gain knob + Vol fader -->
             <ObjectName>VolumeGain2Decks</ObjectName>
             <Layout>vertical</Layout>
-            <SizePolicy>min,min</SizePolicy>
+            <SizePolicy>me,min</SizePolicy>
             <Children>
               <Template src="skin:knob_textless.xml">
                 <SetVariable name="Size">40f,34f</SetVariable>
                 <SetVariable name="Color">orange</SetVariable>
+                <SetVariable name="type">regular</SetVariable>
                 <SetVariable name="control">pregain</SetVariable>
                 <SetVariable name="TooltipId">pregain</SetVariable>
               </Template>
 
-              <!-- Spacer -->
-              <WidgetGroup><Size>1min,4me</Size></WidgetGroup>
+              <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
 
               <SliderComposed><!-- Volume -->
                 <TooltipId>channel_volume</TooltipId>
-                <Handle scalemode="STRETCH_ASPECT">skin:knobs_sliders/knob_volume_deck.svg</Handle>
-                <Slider>skin:knobs_sliders/slider_volume_deck.svg</Slider>
+                <Size>46f,108f</Size>
+                <Handle scalemode="STRETCH_ASPECT">skin:/sliders_<Variable name="slider_scheme"/>/knob_volume_deck.svg</Handle>
+                <Slider scalemode="STRETCH_ASPECT">skin:/sliders_<Variable name="slider_scheme"/>/slider_volume_deck.svg</Slider>
                 <Horizontal>false</Horizontal>
                 <Connection>
                   <ConfigKey><Variable name="group"/>,volume</ConfigKey>
                 </Connection>
               </SliderComposed>
+
+              <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
             </Children>
           </WidgetGroup><!-- /Gain knob + Vol fader -->
 
@@ -75,45 +80,40 @@ vertical layout and a reversed side-by-side layout for two-deck mode -->
             <SizePolicy>min,min</SizePolicy>
             <Children>
 
-              <!-- Spacer when there's no 4th EQ AND no QuickEffect loaded -->
+              <!-- Spacer when there's no QuickEffect loaded -->
               <WidgetGroup>
                 <Layout>horizontal</Layout>
-                <SizePolicy>min,min</SizePolicy>
+                <Size>0min,34f</Size>
                 <Children>
-                  <WidgetGroup>
-                    <Layout>horizontal</Layout>
-                    <Size>0min,34f</Size>
-                    <Children/>
-                    <Connection>
-                      <ConfigKey>[QuickEffectRack1_<Variable name="group"/>_Effect1],loaded</ConfigKey>
-                      <Transform><Not/></Transform>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup>
                 </Children>
                 <Connection>
-                  <ConfigKey>[EqualizerRack1_<Variable name="group"/>_Effect1],parameter4_loaded</ConfigKey>
+                  <ConfigKey>[QuickEffectRack1_<Variable name="group"/>_Effect1],loaded</ConfigKey>
                   <Transform><Not/></Transform>
                   <BindProperty>visible</BindProperty>
                 </Connection>
               </WidgetGroup>
 
-              <Template src="skin:eq_knob_right.xml">
-                <SetVariable name="FxParameter">4</SetVariable>
-              </Template>
-
               <Template src="skin:eq_knob_right.xml">
                 <SetVariable name="FxParameter">3</SetVariable>
+                <SetVariable name="Text">H</SetVariable>
               </Template>
 
+              <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
+
               <Template src="skin:eq_knob_right.xml">
                 <SetVariable name="FxParameter">2</SetVariable>
+                <SetVariable name="Text">M</SetVariable>
               </Template>
 
+              <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
+
               <Template src="skin:eq_knob_right.xml">
                 <SetVariable name="FxParameter">1</SetVariable>
+                <SetVariable name="Text">L</SetVariable>
               </Template>
 
+              <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
+
               <Template src="skin:quick_effect_knob_right.xml"/>
 
               <WidgetGroup>
@@ -122,6 +122,10 @@ vertical layout and a reversed side-by-side layout for two-deck mode -->
                 <Children/>
               </WidgetGroup>
             </Children>
+            <Connection>
+              <ConfigKey>[Skin],show_eq_knobs</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
           </WidgetGroup><!-- /EQs -->
 
         </Children>
diff --git a/res/skins/LateNight/mixer_master_headphone.xml b/res/skins/LateNight/mixer_master_headphone.xml
index c07b3ba5bf4a..621a97656a8b 100644
--- a/res/skins/LateNight/mixer_master_headphone.xml
+++ b/res/skins/LateNight/mixer_master_headphone.xml
@@ -1,284 +1,439 @@
 <Template>
+  <SetVariable name="btn_type"><Variable name="SubRegion_btn_type"/></SetVariable>
   <SetVariable name="group">[Master]</SetVariable>
   <SetVariable name="Type">master</SetVariable>
+
+  <!-- Regular Master Fx buttons 2x2 layout for
+      * 2 decks + 2 Fx, no Booth
+      * 4 decks, any configuration
+        Gain | Balance
+         [ Booth ]
+         Fx1 | Fx2
+       [ Fx3 | Fx4 ] -->
+  <SingletonDefinition>
+    <ObjectName>MasterFxbuttons2x2</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <SizePolicy>me,min</SizePolicy>
+        <Layout>vertical</Layout>
+        <Children>
+          <WidgetGroup><!-- FX buttons 1/2 -->
+            <ObjectName>AlignHCenter</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <Template src="skin:fx_assign_button.xml">
+                <SetVariable name="MaxWidth">35</SetVariable>
+                <SetVariable name="Text">FX</SetVariable>
+                <SetVariable name="FxUnit">1</SetVariable>
+              </Template>
+              <Template src="skin:fx_assign_button.xml">
+                <SetVariable name="MaxWidth">35</SetVariable>
+                <SetVariable name="Text">FX</SetVariable>
+                <SetVariable name="FxUnit">2</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup><!-- /FX buttons 1/2 -->
+          <WidgetGroup><!-- FX buttons 3/4 -->
+            <ObjectName>AlignHCenter</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <Template src="skin:fx_assign_button.xml">
+                <SetVariable name="MaxWidth">35</SetVariable>
+                <SetVariable name="Text">FX</SetVariable>
+                <SetVariable name="FxUnit">3</SetVariable>
+              </Template>
+              <Template src="skin:fx_assign_button.xml">
+                <SetVariable name="MaxWidth">35</SetVariable>
+                <SetVariable name="Text">FX</SetVariable>
+                <SetVariable name="FxUnit">4</SetVariable>
+              </Template>
+            </Children>
+            <Connection>
+              <ConfigKey persist="true">[Skin],show_4effectunits</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup><!-- /FX buttons 3/4 -->
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition><!-- MasterFxbuttons2x2 -->
+
+
+  <!-- Compact Master controls layout for
+      * 2 decks + 4 Fx + Booth
+        Gain  | Balance
+              | Fx1
+        Booth | Fx2
+              | Fx3
+              | Fx4 -->
+  <SingletonDefinition>
+    <ObjectName>MasterFxbuttons4x1</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <SizePolicy>me,min</SizePolicy>
+        <Layout>horizontal</Layout>
+        <Children>
+          <Template src="skin:fx_assign_button.xml">
+            <SetVariable name="MinWidth">28</SetVariable>
+            <SetVariable name="MaxWidth">28</SetVariable>
+            <SetVariable name="Text">FX</SetVariable>
+            <SetVariable name="FxUnit">1</SetVariable>
+          </Template>
+          <Template src="skin:fx_assign_button.xml">
+            <SetVariable name="MinWidth">20</SetVariable>
+            <SetVariable name="MaxWidth">20</SetVariable>
+            <SetVariable name="FxUnit">2</SetVariable>
+          </Template>
+          <Template src="skin:fx_assign_button.xml">
+            <SetVariable name="MinWidth">20</SetVariable>
+            <SetVariable name="MaxWidth">20</SetVariable>
+            <SetVariable name="FxUnit">3</SetVariable>
+          </Template>
+          <Template src="skin:fx_assign_button.xml">
+            <SetVariable name="MinWidth">20</SetVariable>
+            <SetVariable name="MaxWidth">20</SetVariable>
+            <SetVariable name="FxUnit">4</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition><!-- MasterFxbuttons4x1 -->
+
   <WidgetGroup>
-    <ObjectName>MasterHeadphoneMixerContainer</ObjectName>
     <SizePolicy>max,min</SizePolicy>
     <Layout>vertical</Layout>
     <Children>
-      <!-- This container gives the Master/Headphone
-            a continuous background image -->
+
       <WidgetGroup>
-        <ObjectName>MasterHeadphoneMixer</ObjectName>
-        <BackPath>style/background_tile.png</BackPath>
-        <SizePolicy>min,min</SizePolicy>
+        <ObjectName>MasterHeadphoneMixerContainer</ObjectName>
+        <SizePolicy>max,min</SizePolicy>
         <Layout>vertical</Layout>
         <Children>
-
+          <!-- This container gives the Master/Headphone
+                a continuous background image -->
           <WidgetGroup>
-            <ObjectName>MasterControls</ObjectName>
-            <SizePolicy>min,me</SizePolicy>
+            <ObjectName>MasterHeadphoneMixer</ObjectName>
+            <BackPath><Variable name="BgTile"/></BackPath>
+            <SizePolicy>min,min</SizePolicy>
             <Layout>vertical</Layout>
             <Children>
 
-              <!-- Master knobs
-                  Labels are separate so knobs are spaced equally -->
               <WidgetGroup>
-                <Layout>horizontal</Layout>
-                <SizePolicy>min,min</SizePolicy>
+                <ObjectName>MasterControls</ObjectName>
+                <SizePolicy>min,me</SizePolicy>
+                <Layout>vertical</Layout>
                 <Children>
+
+                  <!-- Master knobs
+                      Labels are separate so knobs are spaced equally -->
                   <WidgetGroup>
                     <Layout>horizontal</Layout>
-                    <SizePolicy>me,min</SizePolicy>
+                    <SizePolicy>min,min</SizePolicy>
                     <Children>
-                      <Template src="skin:knob_textless.xml">
-                        <SetVariable name="Size">35f,30f</SetVariable>
-                        <SetVariable name="Color">orange</SetVariable>
-                        <SetVariable name="TooltipId">master_gain</SetVariable>
-                        <SetVariable name="control">gain</SetVariable>
-                      </Template>
+                      <WidgetGroup>
+                        <Layout>horizontal</Layout>
+                        <SizePolicy>me,min</SizePolicy>
+                        <Children>
+                          <Template src="skin:knob_textless.xml">
+                            <SetVariable name="Size">35f,30f</SetVariable>
+                            <SetVariable name="type">small</SetVariable>
+                            <SetVariable name="Color">orange</SetVariable>
+                            <SetVariable name="TooltipId">master_gain</SetVariable>
+                            <SetVariable name="control">gain</SetVariable>
+                          </Template>
+                        </Children>
+                      </WidgetGroup>
+
+                      <WidgetGroup>
+                        <Layout>horizontal</Layout>
+                        <SizePolicy>me,min</SizePolicy>
+                        <Children>
+                          <Template src="skin:knob_textless.xml">
+                            <SetVariable name="Size">35f,30f</SetVariable>
+                            <SetVariable name="type">small</SetVariable>
+                            <SetVariable name="Color">red</SetVariable>
+                            <SetVariable name="TooltipId">balance</SetVariable>
+                            <SetVariable name="control">balance</SetVariable>
+                          </Template>
+                        </Children>
+                      </WidgetGroup>
                     </Children>
                   </WidgetGroup>
 
+                  <WidgetGroup><Size>0min,1f</Size></WidgetGroup>
+
+                  <!-- Master knob labels -->
                   <WidgetGroup>
                     <Layout>horizontal</Layout>
-                    <SizePolicy>me,min</SizePolicy>
+                    <SizePolicy>min,min</SizePolicy>
                     <Children>
+                      <Label>
+                        <ObjectName>KnobLabel</ObjectName>
+                        <SizePolicy>min,min</SizePolicy>
+                        <Alignment>left</Alignment>
+                        <Text> master&#8194;&#8194;l / r </Text>
+                      </Label>
+                      <WidgetGroup><Size>0me,0min</Size></WidgetGroup>
+                    </Children>
+                  </WidgetGroup>
+
+                  <WidgetGroup><!-- Booth knob -->
+                    <Layout>vertical</Layout>
+                    <SizePolicy>min,min</SizePolicy>
+                    <Children>
+                      <WidgetGroup><Size>0min,2f</Size></WidgetGroup>
                       <Template src="skin:knob_textless.xml">
                         <SetVariable name="Size">35f,30f</SetVariable>
-                        <SetVariable name="Color">red</SetVariable>
-                        <SetVariable name="TooltipId">balance</SetVariable>
-                        <SetVariable name="control">balance</SetVariable>
+                        <SetVariable name="Color">orange</SetVariable>
+                        <SetVariable name="type">small</SetVariable>
+                        <SetVariable name="TooltipId">booth_gain</SetVariable>
+                        <SetVariable name="control">booth_gain</SetVariable>
                       </Template>
+                      <WidgetGroup><Size>0min,1f</Size></WidgetGroup>
+                      <Label>
+                        <ObjectName>KnobLabel</ObjectName>
+                        <SizePolicy>min,min</SizePolicy>
+                        <Alignment>right</Alignment>
+                        <Text>Booth</Text>
+                      </Label>
                     </Children>
+                    <Connection>
+                      <ConfigKey>[Master],booth_enabled</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
                   </WidgetGroup>
-                </Children>
-              </WidgetGroup>
 
-              <!-- Master knob labels -->
-              <WidgetGroup>
-                <Layout>horizontal</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                  <Label>
-                    <ObjectName>KnobLabel</ObjectName>
-                    <SizePolicy>min,min</SizePolicy>
-                    <Alignment>left</Alignment>
-                    <Text> master</Text>
-                  </Label>
+                  <WidgetGroup><Size>0min,2f</Size></WidgetGroup>
+                  <!-- MasterFxButtons 2 decks -->
+                  <WidgetGroup>
+                    <Layout>vertical</Layout>
+                    <SizePolicy>min,me</SizePolicy>
+                    <Children>
+                      <!-- 2 decks, no Booth, 2/4 Fx -->
+                      <WidgetGroup>
+                        <Layout>horizontal</Layout>
+                        <SizePolicy>min,min</SizePolicy>
+                        <Children>
+                          <SingletonContainer>
+                            <ObjectName>MasterFxbuttons2x2</ObjectName>
+                          </SingletonContainer>
+                        </Children>
+                        <Connection>
+                          <ConfigKey persist="true">[Master],booth_enabled</ConfigKey>
+                          <Transform><Not/></Transform>
+                          <BindProperty>visible</BindProperty>
+                        </Connection>
+                      </WidgetGroup>
 
-                  <Label>
-                    <ObjectName>KnobLabel</ObjectName>
-                    <SizePolicy>me,min</SizePolicy>
-                    <Alignment>right</Alignment>
-                    <Text>l / r</Text>
-                  </Label>
-                </Children>
-              </WidgetGroup>
+                      <!-- 2 decks + Booth -->
+                      <WidgetGroup>
+                        <Layout>horizontal</Layout>
+                        <SizePolicy>min,min</SizePolicy>
+                        <Children>
+                          <!-- 2 decks + Booth + 2 Fx -->
+                          <WidgetGroup>
+                            <Layout>horizontal</Layout>
+                            <SizePolicy>min,min</SizePolicy>
+                            <Children>
+                              <SingletonContainer>
+                                <ObjectName>MasterFxbuttons2x2</ObjectName>
+                              </SingletonContainer>
+                            </Children>
+                            <Connection>
+                              <ConfigKey persist="true">[Skin],show_4effectunits</ConfigKey>
+                              <Transform><Not/></Transform>
+                              <BindProperty>visible</BindProperty>
+                            </Connection>
+                          </WidgetGroup>
+                          <!-- 2 decks + Booth + 4 Fx -->
+                          <WidgetGroup>
+                            <Layout>horizontal</Layout>
+                            <SizePolicy>min,min</SizePolicy>
+                            <Children>
+                              <SingletonContainer>
+                                <ObjectName>MasterFxbuttons4x1</ObjectName>
+                              </SingletonContainer>
+                            </Children>
+                            <Connection>
+                              <ConfigKey persist="true">[Skin],show_4effectunits</ConfigKey>
+                              <BindProperty>visible</BindProperty>
+                            </Connection>
+                          </WidgetGroup>
+                        </Children>
+                        <Connection>
+                          <ConfigKey persist="true">[Master],booth_enabled</ConfigKey>
+                          <BindProperty>visible</BindProperty>
+                        </Connection>
+                      </WidgetGroup>
+                    </Children>
+                    <Connection>
+                      <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
+                      <Transform><Not/></Transform>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup><!-- MasterFxButtons 2 decks -->
 
-              <WidgetGroup>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                  <WidgetGroup><Size>0min,4f</Size></WidgetGroup>
-                  <Template src="skin:knob_textless.xml">
-                    <SetVariable name="Size">35f,30f</SetVariable>
-                    <SetVariable name="Color">orange</SetVariable>
-                    <SetVariable name="TooltipId">booth_gain</SetVariable>
-                    <SetVariable name="control">booth_gain</SetVariable>
-                  </Template>
-                  <Label>
-                    <ObjectName>KnobLabel</ObjectName>
-                    <SizePolicy>min,min</SizePolicy>
-                    <Alignment>right</Alignment>
-                    <Text>Booth</Text>
-                  </Label>
-                </Children>
-                <Connection>
-                  <ConfigKey>[Master],booth_enabled</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
+                  <!-- MasterFxButtons 4 decks -->
+                  <WidgetGroup>
+                    <Layout>vertical</Layout>
+                    <SizePolicy>min,me</SizePolicy>
+                    <Children>
+                      <SingletonContainer>
+                        <ObjectName>MasterFxbuttons2x2</ObjectName>
+                      </SingletonContainer>
+                    </Children>
+                    <Connection>
+                      <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup><!-- MasterFxButtons 4 decks -->
 
-              <WidgetGroup><Size>0min,4f</Size></WidgetGroup>
+                  <WidgetGroup>
+                    <Layout>vertical</Layout>
+                    <SizePolicy>min,me</SizePolicy>
+                    <Children>
+                      <WidgetGroup>
+                        <ObjectName>VuMeterMaster4Decks</ObjectName>
+                        <Layout>horizontal</Layout>
+                        <SizePolicy>max,max</SizePolicy>
+                        <Children>
+                          <SingletonContainer>
+                            <ObjectName>VuMeterMaster</ObjectName>
+                          </SingletonContainer>
+                        </Children>
+                      </WidgetGroup>
+                    </Children>
+                    <Connection>
+                      <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup><!-- /MasterVuMeter4ch -->
 
-              <WidgetGroup><!-- FX buttons 1/2 -->
-                <ObjectName>AlignHCenter</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                  <WidgetGroup><Size>1f,0min</Size></WidgetGroup>
-                  <Template src="skin:fx_assign_button.xml">
-                    <SetVariable name="MaxWidth">35</SetVariable>
-                    <SetVariable name="Text">FX&#8202;</SetVariable>
-                    <SetVariable name="FxUnit">1</SetVariable>
-                  </Template>
-                  <WidgetGroup><Size>1f,0min</Size></WidgetGroup>
-                  <Template src="skin:fx_assign_button.xml">
-                    <SetVariable name="MaxWidth">35</SetVariable>
-                    <SetVariable name="Text">FX&#8202;</SetVariable>
-                    <SetVariable name="FxUnit">2</SetVariable>
-                  </Template>
                 </Children>
-              </WidgetGroup><!-- /FX buttons 1/2 -->
-
-              <WidgetGroup><Size>0min,1f</Size></WidgetGroup>
+              </WidgetGroup><!-- MasterControls -->
 
-              <!-- FX buttons 3/4 -->
               <WidgetGroup>
-                <ObjectName>AlignHCenter</ObjectName>
+                <ObjectName>MasterHeadphoneSeparator</ObjectName>
+                <Size>0me,0min</Size>
+                <!-- Layout + Children let's us apply qss padding -->
                 <Layout>horizontal</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                  <WidgetGroup><Size>1f,0min</Size></WidgetGroup>
-                  <Template src="skin:fx_assign_button.xml">
-                    <SetVariable name="MaxWidth">35</SetVariable>
-                    <SetVariable name="Text">FX&#8202;</SetVariable>
-                    <SetVariable name="FxUnit">3</SetVariable>
-                  </Template>
-                  <WidgetGroup><Size>1f,0min</Size></WidgetGroup>
-                  <Template src="skin:fx_assign_button.xml">
-                    <SetVariable name="MaxWidth">35</SetVariable>
-                    <SetVariable name="Text">FX&#8202;</SetVariable>
-                    <SetVariable name="FxUnit">4</SetVariable>
-                  </Template>
-                </Children>
-                <Connection>
-                  <ConfigKey persist="true">[Skin],show_4effectunits</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup><!-- /FX buttons 3/4 -->
+                <Children/>
+              </WidgetGroup>
 
               <WidgetGroup>
-                <Layout>vertical</Layout>
+                <ObjectName>HeadphoneControls</ObjectName>
                 <SizePolicy>min,me</SizePolicy>
+                <Layout>vertical</Layout>
                 <Children>
+
+                  <!-- Headphone knobs
+                      Labels are separate so knobs are spaced equally -->
                   <WidgetGroup>
-                    <ObjectName>VuMeterMaster4Decks</ObjectName>
                     <Layout>horizontal</Layout>
-                    <SizePolicy>max,max</SizePolicy>
+                    <SizePolicy>min,min</SizePolicy>
                     <Children>
-                      <SingletonContainer>
-                        <ObjectName>VuMeterMaster</ObjectName>
-                      </SingletonContainer>
+                      <WidgetGroup>
+                        <Layout>horizontal</Layout>
+                        <SizePolicy>me,min</SizePolicy>
+                        <Children>
+                          <Template src="skin:knob_textless.xml">
+                            <SetVariable name="Size">35f,30f</SetVariable>
+                            <SetVariable name="Color">orange</SetVariable>
+                            <SetVariable name="type">small</SetVariable>
+                            <SetVariable name="TooltipId">headphone_gain</SetVariable>
+                            <SetVariable name="group">[Master]</SetVariable>
+                            <SetVariable name="control">headGain</SetVariable>
+                          </Template>
+                        </Children>
+                      </WidgetGroup>
+
+                      <WidgetGroup>
+                        <Layout>horizontal</Layout>
+                        <SizePolicy>me,min</SizePolicy>
+                        <Children>
+                          <Template src="skin:knob_textless.xml">
+                            <SetVariable name="Size">35f,30f</SetVariable>
+                            <SetVariable name="Color">green</SetVariable>
+                            <SetVariable name="type">small</SetVariable>
+                            <SetVariable name="TooltipId">headMix</SetVariable>
+                            <SetVariable name="group">[Master]</SetVariable>
+                            <SetVariable name="control">headMix</SetVariable>
+                          </Template>
+                        </Children>
+                      </WidgetGroup>
                     </Children>
                   </WidgetGroup>
-                </Children>
-                <Connection>
-                  <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup><!-- /MasterVuMeter4ch -->
 
-            </Children>
-          </WidgetGroup><!-- MasterControls -->
-
-          <WidgetGroup>
-            <ObjectName>MasterHeadphoneDivider</ObjectName>
-            <Size>,2f</Size>
-          </WidgetGroup>
+                  <WidgetGroup><Size>0min,1f</Size></WidgetGroup>
 
-          <WidgetGroup>
-            <ObjectName>HeadphoneControls</ObjectName>
-            <SizePolicy>min,me</SizePolicy>
-            <Layout>vertical</Layout>
-            <Children>
-
-              <!-- Headphone knobs
-                  Labels are separate so knobs are spaced equally -->
-              <WidgetGroup>
-                <Layout>horizontal</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                  <WidgetGroup>
+                  <WidgetGroup><!-- Headphone knob labels -->
                     <Layout>horizontal</Layout>
-                    <SizePolicy>me,min</SizePolicy>
+                    <SizePolicy>min,min</SizePolicy>
                     <Children>
-                      <Template src="skin:knob_textless.xml">
-                        <SetVariable name="Size">35f,30f</SetVariable>
-                        <SetVariable name="Color">orange</SetVariable>
-                        <SetVariable name="TooltipId">headphone_gain</SetVariable>
-                        <SetVariable name="group">[Master]</SetVariable>
-                        <SetVariable name="control">headGain</SetVariable>
-                      </Template>
+                      <Label>
+                        <ObjectName>KnobLabel</ObjectName>
+                        <SizePolicy>me,min</SizePolicy>
+                        <Alignment>left</Alignment>
+                        <Text>  Head   </Text>
+                      </Label>
+
+                      <Label>
+                        <ObjectName>KnobLabel</ObjectName>
+                        <SizePolicy>me,min</SizePolicy>
+                        <Alignment>right</Alignment>
+                        <Text>CUE/MST</Text>
+                      </Label>
                     </Children>
                   </WidgetGroup>
 
                   <WidgetGroup>
-                    <Layout>horizontal</Layout>
+                    <MinimumSize>0,3</MinimumSize>
+                    <MaximumSize>,5</MaximumSize>
                     <SizePolicy>me,min</SizePolicy>
-                    <Children>
-                      <Template src="skin:knob_textless.xml">
-                        <SetVariable name="Size">35f,30f</SetVariable>
-                        <SetVariable name="Color">green</SetVariable>
-                        <SetVariable name="TooltipId">headMix</SetVariable>
-                        <SetVariable name="group">[Master]</SetVariable>
-                        <SetVariable name="control">headMix</SetVariable>
-                      </Template>
-                    </Children>
                   </WidgetGroup>
-                </Children>
-              </WidgetGroup>
-
-              <WidgetGroup><!-- Headphone knob labels -->
-                <Layout>horizontal</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                  <Label>
-                    <ObjectName>KnobLabel</ObjectName>
-                    <SizePolicy>me,min</SizePolicy>
-                    <Alignment>left</Alignment>
-                    <Text>  Head   </Text>
-                  </Label>
 
-                  <Label>
-                    <ObjectName>KnobLabel</ObjectName>
+                  <WidgetGroup><!-- HeadSplit button -->
+                    <Layout>horizontal</Layout>
                     <SizePolicy>me,min</SizePolicy>
-                    <Alignment>right</Alignment>
-                    <Text>CUE/MST</Text>
-                  </Label>
-                </Children>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <MinimumSize>0,3</MinimumSize>
-                <MaximumSize>,5</MaximumSize>
-                <SizePolicy>me,min</SizePolicy>
-              </WidgetGroup>
+                    <Children>
+                      <PushButton>
+                        <TooltipId>headSplit</TooltipId>
+                        <ObjectName>SplitCueButton</ObjectName>
+                        <Size>72f,26f</Size>
+                        <NumberStates>2</NumberStates>
+                        <RightClickIsPushButton>false</RightClickIsPushButton>
+                        <State>
+                          <Number>0</Number>
+                          <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_play.svg</Unpressed>
+                          <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_play_active.svg</Pressed>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                          <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_play_active.svg</Unpressed>
+                          <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_play_active.svg</Pressed>
+                        </State>
+                        <Connection>
+                          <ConfigKey>[Master],headSplit</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                      </PushButton>
+                    </Children>
+                  </WidgetGroup><!-- /HeadSplit button -->
 
-              <WidgetGroup><!-- HeadSplit button -->
-                <Layout>horizontal</Layout>
-                <SizePolicy>me,min</SizePolicy>
-                <Children>
-                  <PushButton>
-                    <TooltipId>headSplit</TooltipId>
-                    <ObjectName>SplitCueButton</ObjectName>
-                    <Size>76f,23f</Size>
-                    <NumberStates>2</NumberStates>
-                    <RightClickIsPushButton>false</RightClickIsPushButton>
-                    <State>
-                      <Number>0</Number>
-                      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_splitcue.svg</Unpressed>
-                      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_splitcue.svg</Pressed>
-                    </State>
-                    <State>
-                      <Number>1</Number>
-                      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_splitcue_over.svg</Unpressed>
-                      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_splitcue_over.svg</Pressed>
-                    </State>
-                    <Connection>
-                      <ConfigKey>[Master],headSplit</ConfigKey>
-                      <ButtonState>LeftButton</ButtonState>
-                    </Connection>
-                  </PushButton>
                 </Children>
-              </WidgetGroup><!-- /HeadSplit button -->
+              </WidgetGroup><!-- /HeadphoneControls -->
 
             </Children>
-          </WidgetGroup><!-- /HeadphoneControls -->
-
+          </WidgetGroup>
         </Children>
       </WidgetGroup>
+
     </Children>
+    <Connection>
+      <ConfigKey persist="true">[Skin],show_master_head_mixer</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/preview_deck.xml b/res/skins/LateNight/preview_deck.xml
index 1b7b082814ee..5192a2849f8d 100644
--- a/res/skins/LateNight/preview_deck.xml
+++ b/res/skins/LateNight/preview_deck.xml
@@ -72,19 +72,13 @@
                     <Layout>horizontal</Layout>
                     <SizePolicy>min,min</SizePolicy>
                     <Children>
-                      <PushButton>
-                        <TooltipId>eject</TooltipId>
-                        <NumberStates>1</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Pressed>buttons/btn_eject_over.svg</Pressed>
-                          <Unpressed>buttons/btn_eject.svg</Unpressed>
-                        </State>
-                        <Connection>
-                          <ConfigKey><Variable name="group"/>,eject</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                      </PushButton>
+                      <Template src="skin:button_1state.xml">
+                        <SetVariable name="TooltipId">eject</SetVariable>
+                        <SetVariable name="ObjectName">EjectButton12</SetVariable>
+                        <SetVariable name="btn_type"></SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="group"/>,eject</SetVariable>
+                        <SetVariable name="Size">21f,18f</SetVariable>
+                      </Template>
                     </Children>
                   </WidgetGroup>
                 </Children>
@@ -97,50 +91,38 @@
                 <SizePolicy>me,me</SizePolicy>
                 <Children>
                   <WidgetGroup>
-                    <ObjectName>PreviewPlay</ObjectName>
+                    <ObjectName>PreviewPlayBox</ObjectName>
                     <Layout>horizontal</Layout>
                     <SizePolicy>min,min</SizePolicy>
                     <Children>
-                      <PushButton>
-                        <TooltipId>play_start</TooltipId>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Pressed>buttons/btn_play_preview_down.svg</Pressed>
-                          <Unpressed>buttons/btn_play_preview.svg</Unpressed>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Pressed>buttons/btn_play_preview_overdown.svg</Pressed>
-                          <Unpressed>buttons/btn_play_preview_over.svg</Unpressed>
-                        </State>
-                        <Connection>
-                          <ConfigKey><Variable name="group"/>,play</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey><Variable name="group"/>,start</ConfigKey>
-                          <ButtonState>RightButton</ButtonState>
-                        </Connection>
-                      </PushButton>
+                      <Template src="skin:button_2state_right_display.xml">
+                        <SetVariable name="TooltipId">cue_gotoandplay_cue_default</SetVariable>
+                        <SetVariable name="ObjectName">PlayButtonPreview</SetVariable>
+                        <SetVariable name="Size">34f,34f</SetVariable>
+                        <SetVariable name="btn_type">embedded</SetVariable>
+                        <SetVariable name="btn_format">square_big</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="group"/>,play</SetVariable>
+                        <SetVariable name="ConfigKeyRight"><Variable name="group"/>,start</SetVariable>
+                        <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,play_indicator</SetVariable>
+                      </Template>
                     </Children>
                   </WidgetGroup>
 
                   <WidgetGroup>
                     <ObjectName>OverviewBox</ObjectName>
                     <Layout>vertical</Layout>
-                    <Size>0me,20me</Size>
+                    <Size>0me,32f</Size>
                     <Children>
                       <Overview>
                         <TooltipId>waveform_overview</TooltipId>
                         <SizePolicy>me,me</SizePolicy>
                         <Group><Variable name="group"/></Group>
-                        <BgColor>#0f0f0f</BgColor>
-                        <SignalColor>#FF8000</SignalColor>
-                        <SignalHighColor>#F0EBD1</SignalHighColor>
-                        <SignalMidColor>#EECE33</SignalMidColor>
-                        <SignalLowColor>#E4C739</SignalLowColor>
-                        <PlayPosColor>#00FF00</PlayPosColor>
+                        <SignalColor><Variable name="SignalColor_12"/></SignalColor>
+                        <BgColor><Variable name="SignalBgColor_SamplerPreview"/></BgColor>
+                        <SignalHighColor><Variable name="SignalRGBHighColor"/></SignalHighColor>
+                        <SignalMidColor><Variable name="SignalRGBMidColor"/></SignalMidColor>
+                        <SignalLowColor><Variable name="SignalRGBLowColor"/></SignalLowColor>
+                        <PlayPosColor><Variable name="PlayPosColor"/></PlayPosColor>
                         <PlayedOverlayColor><Variable name="PlayedOverlayColor"/></PlayedOverlayColor>
                         <ShowCueTimes>false</ShowCueTimes>
                         <DefaultMark>
@@ -185,8 +167,8 @@
 
               <SliderComposed>
                 <TooltipId>pregain</TooltipId>
-                <Handle scalemode="STRETCH_ASPECT">skin:knobs_sliders/knob_volume_previewdeck.svg</Handle>
-                <Slider>skin:knobs_sliders/slider_volume_previewdeck.svg</Slider>
+                <Handle scalemode="STRETCH_ASPECT">skin:/sliders_<Variable name="slider_scheme"/>/knob_volume_previewdeck.svg</Handle>
+                <Slider>skin:/sliders_<Variable name="slider_scheme"/>/slider_volume_previewdeck.svg</Slider>
                 <Horizontal>false</Horizontal>
                 <Connection>
                   <ConfigKey><Variable name="group"/>,pregain</ConfigKey>
diff --git a/res/skins/LateNight/quick_effect_knob_4decks.xml b/res/skins/LateNight/quick_effect_knob_4decks.xml
index 64ccf080016a..a39a361f4aff 100644
--- a/res/skins/LateNight/quick_effect_knob_4decks.xml
+++ b/res/skins/LateNight/quick_effect_knob_4decks.xml
@@ -14,27 +14,46 @@
           <WidgetGroup><Size>4f,0min</Size></WidgetGroup>
 
           <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <Size>22f,30min</Size>
+            <ObjectName>EQKillButtonBox4Decks</ObjectName>
+            <Layout>vertical</Layout>
+            <Size>20f,34f</Size>
             <Children>
-              <WidgetGroup>
-                <ObjectName>KillButtonLeft</ObjectName>
-                <Layout>horizontal</Layout>
-                <Size>22f,30min</Size>
-                <Children>
-                  <Template src="skin:button_2state.xml">
-                    <SetVariable name="TooltipId">QuickEffectRack_enabled</SetVariable>
-                    <SetVariable name="icon">quickEffect</SetVariable>
-                    <SetVariable name="Size">18f,18f</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="QuickEffect"/>,enabled</SetVariable>
-                  </Template>
-                </Children>
+              <WidgetGroup><Size>0min,5f</Size></WidgetGroup>
+              <PushButton>
+                <TooltipId>QuickEffectRack_enabled</TooltipId>
+                <ObjectName>QuickEffectButton</ObjectName>
+                <Size>18f,18f</Size>
+                <NumberStates>2</NumberStates>
+                <State>
+                  <Number>0</Number>
+                  <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_eqkill.svg</Unpressed>
+                  <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_eqkill_active.svg</Pressed>
+                </State>
+                <State>
+                  <Number>1</Number>
+                  <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_eqkill_active.svg</Unpressed>
+                  <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_eqkill_active.svg</Pressed>
+                </State>
                 <Connection>
-                  <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
-                  <BindProperty>visible</BindProperty>
+                  <ConfigKey><Variable name="QuickEffect"/>,enabled</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
                 </Connection>
-              </WidgetGroup>
+              </PushButton>
             </Children>
+            <Connection>
+              <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>EQKillButtonBox4Decks</ObjectName>
+            <Size>20f,34f</Size>
+            <Connection>
+              <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
+              <Transform><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
           </WidgetGroup>
 
           <WidgetGroup>
@@ -42,46 +61,23 @@
             <SizePolicy>me,min</SizePolicy>
             <Children>
               <Template src="skin:knob_textless.xml">
-                <SetVariable name="Color">green</SetVariable>
                 <SetVariable name="Size">40f,34f</SetVariable>
+                <SetVariable name="Color">green</SetVariable>
+                <SetVariable name="type">regular</SetVariable>
                 <SetVariable name="group"><Variable name="QuickEffectGroup"/></SetVariable>
                 <SetVariable name="control">super1</SetVariable>
                 <SetVariable name="TooltipId">QuickEffectRack_super1</SetVariable>
               </Template>
             </Children>
           </WidgetGroup>
-        </Children>
-        <Connection>
-          <ConfigKey><Variable name="QuickEffect"/>,loaded</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup><!-- /Kill button + knob -->
-
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <SizePolicy>me,f</SizePolicy>
-        <Children>
-          <WidgetGroup>
-            <Size>0min,0min</Size>
-            <Children/>
-          </WidgetGroup>
 
-          <EffectName>
-            <ObjectName>KnobLabel</ObjectName>
-            <MinimumSize>40,12</MinimumSize>
-            <MaximumSize>62,12</MaximumSize>
-            <SizePolicy>me,f</SizePolicy>
-            <Elide>right</Elide>
-            <EffectRackGroup>[QuickEffectRack1]</EffectRackGroup>
-            <EffectUnitGroup><Variable name="QuickEffectGroup"/></EffectUnitGroup>
-            <Effect>1</Effect>
-          </EffectName>
+          <WidgetGroup><Size>2f,0min</Size></WidgetGroup>
         </Children>
         <Connection>
           <ConfigKey><Variable name="QuickEffect"/>,loaded</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
-      </WidgetGroup>
+      </WidgetGroup><!-- /Kill button + knob -->
 
     </Children>
     <Connection>
diff --git a/res/skins/LateNight/quick_effect_knob_left.xml b/res/skins/LateNight/quick_effect_knob_left.xml
index 06a5d7658fcd..836165ea9174 100644
--- a/res/skins/LateNight/quick_effect_knob_left.xml
+++ b/res/skins/LateNight/quick_effect_knob_left.xml
@@ -2,101 +2,69 @@
 <Template>
   <SetVariable name="QuickEffectGroup">[QuickEffectRack1_<Variable name="group"/>]</SetVariable>
   <SetVariable name="QuickEffect">[QuickEffectRack1_<Variable name="group"/>_Effect1]</SetVariable>
+
   <WidgetGroup>
-    <Layout>vertical</Layout>
+    <Layout>horizontal</Layout>
     <SizePolicy>min,min</SizePolicy>
     <Children>
 
-      <WidgetGroup><!-- Kill button + knob -->
-        <Layout>horizontal</Layout>
-        <SizePolicy>min,min</SizePolicy>
+      <WidgetGroup>
+        <Layout>vertical</Layout>
+        <Size>18f,34f</Size>
         <Children>
-
-          <WidgetGroup>
-            <ObjectName>KillButtonLeft</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,min</SizePolicy>
-            <MinimumSize>22,30</MinimumSize>
-            <Children>
-              <Template src="skin:button_2state.xml">
-                <SetVariable name="TooltipId">QuickEffectRack_enabled</SetVariable>
-                <SetVariable name="icon">quickEffect</SetVariable>
-                <SetVariable name="Size">18f,18f</SetVariable>
-                <SetVariable name="ConfigKey"><Variable name="QuickEffect"/>,enabled</SetVariable>
-              </Template>
-            </Children>
+          <WidgetGroup><Size>0min,5f</Size></WidgetGroup>
+          <PushButton>
+            <TooltipId>QuickEffectRack_enabled</TooltipId>
+            <ObjectName>QuickEffectButton</ObjectName>
+            <Size>18f,18f</Size>
+            <NumberStates>2</NumberStates>
+            <State>
+              <Number>0</Number>
+              <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_eqkill.svg</Unpressed>
+              <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_eqkill_active.svg</Pressed>
+            </State>
+            <State>
+              <Number>1</Number>
+              <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_eqkill_active.svg</Unpressed>
+              <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_eqkill_active.svg</Pressed>
+            </State>
             <Connection>
-              <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
-              <BindProperty>visible</BindProperty>
+              <ConfigKey><Variable name="QuickEffect"/>,enabled</ConfigKey>
+              <ButtonState>LeftButton</ButtonState>
             </Connection>
-          </WidgetGroup>
-
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <SizePolicy>me,min</SizePolicy>
-            <Children>
-              <Template src="skin:knob_textless.xml">
-                <SetVariable name="Size">40f,34f</SetVariable>
-                <SetVariable name="Color">green</SetVariable>
-                <SetVariable name="group"><Variable name="QuickEffectGroup"/></SetVariable>
-                <SetVariable name="control">super1</SetVariable>
-                <SetVariable name="TooltipId">QuickEffectRack_super1</SetVariable>
-              </Template>
-            </Children>
-          </WidgetGroup>
+          </PushButton>
         </Children>
         <Connection>
-          <ConfigKey><Variable name="QuickEffect"/>,loaded</ConfigKey>
+          <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
-      </WidgetGroup><!-- /Kill button + knob -->
+      </WidgetGroup>
 
       <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <SizePolicy>me,f</SizePolicy>
-        <Children>
-          <WidgetGroup>
-            <Size>0min,0min</Size>
-            <Children/>
-          </WidgetGroup>
-
-          <EffectName>
-            <ObjectName>KnobLabel</ObjectName>
-            <MinimumSize>40,12</MinimumSize>
-            <MaximumSize>62,12</MaximumSize>
-            <SizePolicy>me,f</SizePolicy>
-            <Elide>right</Elide>
-            <EffectRackGroup>[QuickEffectRack1]</EffectRackGroup>
-            <EffectUnitGroup><Variable name="QuickEffectGroup"/></EffectUnitGroup>
-            <Effect>1</Effect>
-            <Connection>
-              <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </EffectName>
-          <EffectName>
-            <ObjectName>KnobLabel</ObjectName>
-            <Size>40f,12f</Size>
-            <Elide>right</Elide>
-            <EffectRackGroup>[QuickEffectRack1]</EffectRackGroup>
-            <EffectUnitGroup><Variable name="QuickEffectGroup"/></EffectUnitGroup>
-            <Effect>1</Effect>
-            <Connection>
-              <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
-              <Transform><Not/></Transform>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </EffectName>
-        </Children>
+        <Size>2f,34f</Size>
         <Connection>
-          <ConfigKey><Variable name="QuickEffect"/>,loaded</ConfigKey>
+          <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
       </WidgetGroup>
 
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <SizePolicy>me,min</SizePolicy>
+        <Children>
+          <Template src="skin:knob_textless.xml">
+            <SetVariable name="Size">40f,34f</SetVariable>
+            <SetVariable name="Color">green</SetVariable>
+            <SetVariable name="type">regular</SetVariable>
+            <SetVariable name="group"><Variable name="QuickEffectGroup"/></SetVariable>
+            <SetVariable name="control">super1</SetVariable>
+            <SetVariable name="TooltipId">QuickEffectRack_super1</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
     </Children>
     <Connection>
-      <ConfigKey>[Skin],show_eq_knobs</ConfigKey>
+      <ConfigKey><Variable name="QuickEffect"/>,loaded</ConfigKey>
       <BindProperty>visible</BindProperty>
     </Connection>
   </WidgetGroup>
diff --git a/res/skins/LateNight/quick_effect_knob_right.xml b/res/skins/LateNight/quick_effect_knob_right.xml
index 81601b293270..3a2e48e46b97 100644
--- a/res/skins/LateNight/quick_effect_knob_right.xml
+++ b/res/skins/LateNight/quick_effect_knob_right.xml
@@ -2,102 +2,70 @@
 <Template>
   <SetVariable name="QuickEffectGroup">[QuickEffectRack1_<Variable name="group"/>]</SetVariable>
   <SetVariable name="QuickEffect">[QuickEffectRack1_<Variable name="group"/>_Effect1]</SetVariable>
+
   <WidgetGroup>
-    <Layout>vertical</Layout>
+    <Layout>horizontal</Layout>
     <SizePolicy>min,min</SizePolicy>
     <Children>
 
-      <WidgetGroup><!-- Kill button + knob -->
+      <WidgetGroup>
         <Layout>horizontal</Layout>
-        <SizePolicy>min,min</SizePolicy>
+        <SizePolicy>me,min</SizePolicy>
         <Children>
-
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <SizePolicy>me,min</SizePolicy>
-            <Children>
-              <Template src="skin:knob_textless.xml">
-                <SetVariable name="Size">40f,34f</SetVariable>
-                <SetVariable name="Color">green</SetVariable>
-                <SetVariable name="group"><Variable name="QuickEffectGroup"/></SetVariable>
-                <SetVariable name="control">super1</SetVariable>
-                <SetVariable name="TooltipId">QuickEffectRack_super1</SetVariable>
-              </Template>
-            </Children>
-          </WidgetGroup>
-
-          <WidgetGroup>
-            <ObjectName>KillButtonRight</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,min</SizePolicy>
-            <MinimumSize>22,30</MinimumSize>
-            <Children>
-              <Template src="skin:button_2state.xml">
-                <SetVariable name="TooltipId">QuickEffectRack_enabled</SetVariable>
-                <SetVariable name="icon">quickEffect</SetVariable>
-                <SetVariable name="Size">18f,18f</SetVariable>
-                <SetVariable name="ConfigKey"><Variable name="QuickEffect"/>,enabled</SetVariable>
-              </Template>
-            </Children>
-            <Connection>
-              <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup>
-
+          <Template src="skin:knob_textless.xml">
+            <SetVariable name="Size">40f,34f</SetVariable>
+            <SetVariable name="Color">green</SetVariable>
+            <SetVariable name="type">regular</SetVariable>
+            <SetVariable name="group"><Variable name="QuickEffectGroup"/></SetVariable>
+            <SetVariable name="control">super1</SetVariable>
+            <SetVariable name="TooltipId">QuickEffectRack_super1</SetVariable>
+          </Template>
         </Children>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <Size>2f,34f</Size>
         <Connection>
-          <ConfigKey><Variable name="QuickEffect"/>,loaded</ConfigKey>
+          <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
-      </WidgetGroup><!-- /Kill button + knob -->
+      </WidgetGroup>
 
       <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <SizePolicy>me,f</SizePolicy>
+        <Layout>vertical</Layout>
+        <Size>18f,34f</Size>
         <Children>
-
-          <EffectName>
-            <ObjectName>KnobLabel</ObjectName>
-            <MinimumSize>40,12</MinimumSize>
-            <MaximumSize>62,12</MaximumSize>
-            <SizePolicy>me,f</SizePolicy>
-            <Elide>right</Elide>
-            <EffectRackGroup>[QuickEffectRack1]</EffectRackGroup>
-            <EffectUnitGroup><Variable name="QuickEffectGroup"/></EffectUnitGroup>
-            <Effect>1</Effect>
+          <WidgetGroup><Size>0min,5f</Size></WidgetGroup>
+          <PushButton>
+            <TooltipId>QuickEffectRack_enabled</TooltipId>
+            <ObjectName>QuickEffectButton</ObjectName>
+            <Size>18f,18f</Size>
+            <NumberStates>2</NumberStates>
+            <State>
+              <Number>0</Number>
+              <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_eqkill.svg</Unpressed>
+              <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_eqkill_active.svg</Pressed>
+            </State>
+            <State>
+              <Number>1</Number>
+              <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_eqkill_active.svg</Unpressed>
+              <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_eqkill_active.svg</Pressed>
+            </State>
             <Connection>
-              <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
-              <BindProperty>visible</BindProperty>
+              <ConfigKey><Variable name="QuickEffect"/>,enabled</ConfigKey>
+              <ButtonState>LeftButton</ButtonState>
             </Connection>
-          </EffectName>
-          <EffectName>
-            <ObjectName>KnobLabel</ObjectName>
-            <Size>40f,12f</Size>
-            <Elide>right</Elide>
-            <EffectRackGroup>[QuickEffectRack1]</EffectRackGroup>
-            <EffectUnitGroup><Variable name="QuickEffectGroup"/></EffectUnitGroup>
-            <Effect>1</Effect>
-            <Connection>
-              <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
-              <Transform><Not/></Transform>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </EffectName>
-
-          <WidgetGroup>
-            <Size>0min,0min</Size>
-            <Children/>
-          </WidgetGroup>
+          </PushButton>
         </Children>
         <Connection>
-          <ConfigKey><Variable name="QuickEffect"/>,loaded</ConfigKey>
+          <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
       </WidgetGroup>
+
     </Children>
     <Connection>
-      <ConfigKey>[Skin],show_eq_knobs</ConfigKey>
+      <ConfigKey><Variable name="QuickEffect"/>,loaded</ConfigKey>
       <BindProperty>visible</BindProperty>
     </Connection>
   </WidgetGroup>
diff --git a/res/skins/LateNight/sampler.xml b/res/skins/LateNight/sampler.xml
index 289e235f1005..8a2630e4aa70 100644
--- a/res/skins/LateNight/sampler.xml
+++ b/res/skins/LateNight/sampler.xml
@@ -1,5 +1,7 @@
 <Template>
   <SetVariable name="group">[Sampler<Variable name="samplernum"/>]</SetVariable>
+  <SetVariable name="btn_type"><Variable name="SubRegion_btn_type"/></SetVariable>
+
   <WidgetGroup>
     <ObjectName>SamplerDeck</ObjectName>
     <Layout>horizontal</Layout>
@@ -8,9 +10,9 @@
       <!-- SamplerMainControls -->
       <WidgetGroup>
         <ObjectName>SamplerMainControls</ObjectName>
-        <BackPath>style/background_tile.png</BackPath>
+        <BackPath><Variable name="BgTile"/></BackPath>
         <Layout>vertical</Layout>
-        <SizePolicy>me,min</SizePolicy>
+        <SizePolicy>me,me</SizePolicy>
         <Children>
           <WidgetGroup>
             <ObjectName>SamplerText</ObjectName>
@@ -44,7 +46,7 @@
             </Children>
           </WidgetGroup>
 
-          <!-- Second Row: Play, Overview, Controls, Gain -->
+          <!-- SamplerRowTwo: Play, Overview, Controls, Gain -->
           <WidgetGroup>
             <ObjectName>SamplerRowTwo</ObjectName>
             <Layout>horizontal</Layout>
@@ -57,11 +59,10 @@
                 <Children>
                   <Template src="skin:button_2state_right_display.xml">
                     <SetVariable name="TooltipId">cue_gotoandplay_cue_default</SetVariable>
+                    <SetVariable name="ObjectName">PlayButtonSampler</SetVariable>
                     <SetVariable name="Size">34f,34f</SetVariable>
-                    <SetVariable name="state_0_pressed">play_sampler_down.svg</SetVariable>
-                    <SetVariable name="state_0_unpressed">play_sampler.svg</SetVariable>
-                    <SetVariable name="state_1_pressed">play_sampler_overdown.svg</SetVariable>
-                    <SetVariable name="state_1_unpressed">play_sampler_over.svg</SetVariable>
+                    <SetVariable name="btn_type"><Variable name="SubRegion_btn_type"/></SetVariable>
+                    <SetVariable name="btn_format">square_big</SetVariable>
                     <SetVariable name="ConfigKey"><Variable name="group"/>,cue_gotoandplay</SetVariable>
                     <SetVariable name="ConfigKeyRight"><Variable name="group"/>,cue_default</SetVariable>
                     <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,play_indicator</SetVariable>
@@ -69,35 +70,43 @@
                 </Children>
               </WidgetGroup>
 
-              <Overview>
-                <TooltipId>waveform_overview</TooltipId>
+              <WidgetGroup>
+                <ObjectName>OverviewBox</ObjectName>
+                <Layout>horizontal</Layout>
                 <SizePolicy>me,min</SizePolicy>
-                <Group><Variable name="group"/></Group>
-                <BgColor>#0f0f0f</BgColor>
-                <SignalHighColor></SignalHighColor>
-                <SignalMidColor></SignalMidColor>
-                <SignalLowColor></SignalLowColor>
-                <PlayedOverlayColor><Variable name="PlayedOverlayColor"/></PlayedOverlayColor>
-                <SignalColor>#EECE33</SignalColor>
-                <ShowCueTimes>false</ShowCueTimes>
-                <MarkerColor>#00FF00</MarkerColor>
-                <DefaultMark>
-                  <Align>bottom|right</Align>
-                  <Color>#FF0000</Color>
-                  <TextColor>#FFFFFF</TextColor>
-                  <Text> %1 </Text>
-                </DefaultMark>
-                <Mark>
-                  <Control>cue_point</Control>
-                  <Text> C </Text>
-                  <Align>top|right</Align>
-                  <Color>#FF001C</Color>
-                  <TextColor>#FFFFFF</TextColor>
-                </Mark>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,playposition</ConfigKey>
-                </Connection>
-              </Overview>
+                <Children>
+                  <Overview>
+                    <TooltipId>waveform_overview</TooltipId>
+                    <SizePolicy>me,me</SizePolicy>
+                    <Group><Variable name="group"/></Group>
+                    <BgColor><Variable name="SignalBgColor_SamplerPreview"/></BgColor>
+                    <SignalColor><Variable name="SignalColor_12"/></SignalColor>
+                    <SignalHighColor><Variable name="SignalRGBHighColor"/></SignalHighColor>
+                    <SignalMidColor><Variable name="SignalRGBMidColor"/></SignalMidColor>
+                    <SignalLowColor><Variable name="SignalRGBLowColor"/></SignalLowColor>
+                    <PlayPosColor><Variable name="PlayPosColor"/></PlayPosColor>
+                    <PlayedOverlayColor><Variable name="PlayedOverlayColor"/></PlayedOverlayColor>
+                    <ShowCueTimes>false</ShowCueTimes>
+                    <MarkerColor>#00FF00</MarkerColor>
+                    <DefaultMark>
+                      <Align>bottom|right</Align>
+                      <Color>#FF0000</Color>
+                      <TextColor>#FFFFFF</TextColor>
+                      <Text> %1 </Text>
+                    </DefaultMark>
+                    <Mark>
+                      <Control>cue_point</Control>
+                      <Text> C </Text>
+                      <Align>top|right</Align>
+                      <Color>#FF001C</Color>
+                      <TextColor>#FFFFFF</TextColor>
+                    </Mark>
+                    <Connection>
+                      <ConfigKey><Variable name="group"/>,playposition</ConfigKey>
+                    </Connection>
+                  </Overview>
+                </Children>
+              </WidgetGroup>
 
               <!-- Sampler controls -->
               <WidgetGroup>
@@ -109,17 +118,19 @@
                     <Layout>horizontal</Layout>
                     <SizePolicy>min,min</SizePolicy>
                     <Children>
-                      <Template src="skin:button_2state_nohover.xml">
+                      <Template src="skin:button_2state.xml">
                         <SetVariable name="TooltipId">repeat</SetVariable>
-                        <SetVariable name="icon">repeat</SetVariable>
+                        <SetVariable name="ObjectName">RepeatButton12</SetVariable>
+                        <SetVariable name="btn_type"></SetVariable>
                         <SetVariable name="ConfigKey"><Variable name="group"/>,repeat</SetVariable>
-                        <SetVariable name="Size">25,18</SetVariable>
+                        <SetVariable name="Size">21f,18f</SetVariable>
                       </Template>
-                      <Template src="skin:button_2state_nohover.xml">
+                      <Template src="skin:button_1state.xml">
                         <SetVariable name="TooltipId">eject</SetVariable>
-                        <SetVariable name="icon">eject</SetVariable>
+                        <SetVariable name="ObjectName">EjectButton12</SetVariable>
+                        <SetVariable name="btn_type"></SetVariable>
                         <SetVariable name="ConfigKey"><Variable name="group"/>,eject</SetVariable>
-                        <SetVariable name="Size">25,18</SetVariable>
+                        <SetVariable name="Size">21f,18f</SetVariable>
                       </Template>
                     </Children>
                   </WidgetGroup>
@@ -130,33 +141,34 @@
                     <Children>
                       <PushButton>
                         <TooltipId>orientation</TooltipId>
-                        <Size>25f,18f</Size>
+                        <Size>21f,18f</Size>
                         <NumberStates>3</NumberStates>
                         <State>
                           <Number>0</Number>
-                          <Pressed scalemode="STRETCH_ASPECT">buttons/btn_xfader_sampler_left.svg</Pressed>
-                          <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_xfader_sampler_left.svg</Unpressed>
+                          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_sampler_left.svg</Pressed>
+                          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_sampler_left.svg</Unpressed>
                         </State>
                         <State>
                           <Number>1</Number>
-                          <Pressed scalemode="STRETCH_ASPECT">buttons/btn_xfader_sampler_master.svg</Pressed>
-                          <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_xfader_sampler_master.svg</Unpressed>
+                          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_sampler_master.svg</Pressed>
+                          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_sampler_master.svg</Unpressed>
                         </State>
                         <State>
                           <Number>2</Number>
-                          <Pressed scalemode="STRETCH_ASPECT">buttons/btn_xfader_sampler_right.svg</Pressed>
-                          <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_xfader_sampler_right.svg</Unpressed>
+                          <Pressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_sampler_right.svg</Pressed>
+                          <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_sampler_right.svg</Unpressed>
                         </State>
                         <Connection>
                           <ConfigKey><Variable name="group"/>,orientation</ConfigKey>
                           <ButtonState>LeftButton</ButtonState>
                         </Connection>
                       </PushButton>
-                      <Template src="skin:button_2state_nohover.xml">
+                      <Template src="skin:button_2state.xml">
                         <SetVariable name="TooltipId">keylock</SetVariable>
-                        <SetVariable name="icon">keylock</SetVariable>
+                        <SetVariable name="ObjectName">KeylockButton12</SetVariable>
+                        <SetVariable name="btn_type"></SetVariable>
                         <SetVariable name="ConfigKey"><Variable name="group"/>,keylock</SetVariable>
-                        <SetVariable name="Size">25,18</SetVariable>
+                        <SetVariable name="Size">21f,18f</SetVariable>
                       </Template>
                     </Children>
                   </WidgetGroup>
@@ -172,6 +184,7 @@
                     <SetVariable name="TooltipId">pregain</SetVariable>
                     <SetVariable name="Size">35f,30f</SetVariable>
                     <SetVariable name="Color">orange</SetVariable>
+                    <SetVariable name="type">small</SetVariable>
                     <SetVariable name="group"><Variable name="group"/></SetVariable>
                     <SetVariable name="control">pregain</SetVariable>
                   </Template>
@@ -179,9 +192,9 @@
               </WidgetGroup>
 
             </Children>
-          </WidgetGroup><!-- Second Row: Play, Overview, Controls, Gain -->
+          </WidgetGroup><!-- SamplerRowTwo: Play, Overview, Controls, Gain -->
 
-          <!-- Third Row: SamplerButtons -->
+          <!-- Third Row -->
           <WidgetGroup>
             <ObjectName>SamplerButtons</ObjectName>
             <Layout>horizontal</Layout>
@@ -234,23 +247,25 @@
                       <BindProperty>visible</BindProperty>
                     </Connection>
                   </WidgetGroup><!-- /Hotcues 5-8 -->
-                </Children>
-              </WidgetGroup>
 
-              <WidgetGroup>
-                <SizePolicy>me,min</SizePolicy>
+                  <WidgetGroup>
+                    <SizePolicy>me,min</SizePolicy>
+                  </WidgetGroup>
+                </Children>
               </WidgetGroup>
 
               <WidgetGroup>
                 <ObjectName>SamplerPfl</ObjectName>
                 <Layout>horizontal</Layout>
-                <SizePolicy>min,min</SizePolicy>
+                <Size>0min,0min</Size>
                 <Children>
                   <Template src="skin:button_2state.xml">
                     <SetVariable name="TooltipId">pfl</SetVariable>
-                    <SetVariable name="icon">pfl</SetVariable>
+                    <SetVariable name="ObjectName">PflButton</SetVariable>
+                    <SetVariable name="btn_type"><Variable name="TopRegion_btn_type"/></SetVariable>
+                    <SetVariable name="btn_format">square</SetVariable>
+                    <SetVariable name="Size">26f,26f</SetVariable>
                     <SetVariable name="ConfigKey"><Variable name="group"/>,pfl</SetVariable>
-                    <SetVariable name="Size">26,26</SetVariable>
                   </Template>
                 </Children>
               </WidgetGroup><!-- /SamplerPfl -->
@@ -260,7 +275,6 @@
         </Children>
       </WidgetGroup><!-- /SamplerMainControls -->
 
-      <!-- VU Meter -->
       <WidgetGroup>
         <ObjectName>SamplerVU</ObjectName>
         <Layout>vertical</Layout>
@@ -273,16 +287,16 @@
             <Children>
               <StatusLight>
                 <TooltipId>sampler_PeakIndicator</TooltipId>
-                <PathStatusLight>style/vu_clipping_deck_over.png</PathStatusLight>
-                <PathBack>style/vu_clipping_deck.png</PathBack>
+                <PathStatusLight>skin:/style_<Variable name="style_scheme"/>/vu_clipping_deck_over.png</PathStatusLight>
+                <PathBack>skin:/style_<Variable name="style_scheme"/>/vu_clipping_deck.png</PathBack>
                 <Connection>
                   <ConfigKey><Variable name="group"/>,PeakIndicator</ConfigKey>
                 </Connection>
               </StatusLight>
               <VuMeter>
                 <TooltipId>sampler_VuMeter</TooltipId>
-                <PathVu>style/vu_level_sampler_over.png</PathVu>
-                <PathBack>style/vu_level_sampler.png</PathBack>
+                <PathVu>skin:/style_<Variable name="style_scheme"/>/vu_level_sampler_over.png</PathVu>
+                <PathBack>skin:/style_<Variable name="style_scheme"/>/vu_level_sampler.png</PathBack>
                 <Horizontal>false</Horizontal>
                 <PeakHoldSize>5</PeakHoldSize>
                 <PeakHoldTime>500</PeakHoldTime>
@@ -295,22 +309,23 @@
             </Children>
           </WidgetGroup>
         </Children>
-      </WidgetGroup><!-- /VU Meter -->
+      </WidgetGroup><!-- SamplerVU -->
 
-      <!-- Pitch Control -->
       <WidgetGroup>
+        <ObjectName>SamplerRateControls</ObjectName>
         <Layout>vertical</Layout>
         <SizePolicy>min,min</SizePolicy>
         <Children>
           <WidgetGroup>
-            <ObjectName>SamplerPitch</ObjectName>
+            <ObjectName>SamplerPitchSlider</ObjectName>
             <Layout>horizontal</Layout>
             <SizePolicy>min,min</SizePolicy>
             <Children>
               <SliderComposed>
                 <TooltipId>rate</TooltipId>
-                <Handle scalemode="STRETCH_ASPECT">skin:knobs_sliders/knob_pitch_sampler.svg</Handle>
-                <Slider>skin:knobs_sliders/slider_pitch_sampler.svg</Slider>
+                <Size>30f,65f</Size>
+                <Handle scalemode="STRETCH_ASPECT">skin:/sliders_<Variable name="slider_scheme"/>/knob_pitch_sampler.svg</Handle>
+                <Slider scalemode="STRETCH_ASPECT">skin:/sliders_<Variable name="slider_scheme"/>/slider_pitch_sampler.svg</Slider>
                 <Horizontal>false</Horizontal>
                 <Connection>
                   <ConfigKey><Variable name="group"/>,rate</ConfigKey>
@@ -320,22 +335,23 @@
           </WidgetGroup>
 
           <WidgetGroup>
-            <ObjectName>SamplerSyncButton</ObjectName>
+            <ObjectName>AlignHCenter</ObjectName>
             <Layout>horizontal</Layout>
             <SizePolicy>min,min</SizePolicy>
             <Children>
-              <Template src="skin:button_1state_right.xml">
+              <Template src="skin:button_2state_right.xml">
                 <SetVariable name="TooltipId">beatsync_beatsync_tempo</SetVariable>
-                <SetVariable name="Size">28f,26f</SetVariable>
-                <SetVariable name="state_0_pressed">sync_sampler_overdown.svg</SetVariable>
-                <SetVariable name="state_0_unpressed">sync_sampler.svg</SetVariable>
+                <SetVariable name="ObjectName">SamplerSyncButton</SetVariable>
+                <SetVariable name="Size">26f,26f</SetVariable>
+                <SetVariable name="btn_type"><Variable name="TopRegion_btn_type"/></SetVariable>
+                <SetVariable name="btn_format">square</SetVariable>
                 <SetVariable name="ConfigKey"><Variable name="group"/>,beatsync</SetVariable>
                 <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beatsync_tempo</SetVariable>
               </Template>
             </Children>
           </WidgetGroup>
         </Children>
-      </WidgetGroup>
+      </WidgetGroup><!-- SamplerRateControls -->
 
     </Children>
   </WidgetGroup>
diff --git a/res/skins/LateNight/sampler_small.xml b/res/skins/LateNight/sampler_mini.xml
similarity index 63%
rename from res/skins/LateNight/sampler_small.xml
rename to res/skins/LateNight/sampler_mini.xml
index 401313407b47..2c69381be16d 100644
--- a/res/skins/LateNight/sampler_small.xml
+++ b/res/skins/LateNight/sampler_mini.xml
@@ -1,7 +1,8 @@
 <Template>
   <SetVariable name="group">[Sampler<Variable name="samplernum"/>]</SetVariable>
+
   <WidgetGroup>
-    <ObjectName>SamplerDeckSmall</ObjectName>
+    <ObjectName>SamplerDeckMini</ObjectName>
     <Layout>horizontal</Layout>
     <SizePolicy>me,min</SizePolicy>
     <Children>
@@ -13,11 +14,10 @@
         <Children>
           <Template src="skin:button_2state_right_display.xml">
             <SetVariable name="TooltipId">cue_gotoandplay_cue_default</SetVariable>
+            <SetVariable name="ObjectName">PlayButtonSampler</SetVariable>
             <SetVariable name="Size">34f,34f</SetVariable>
-            <SetVariable name="state_0_pressed">play_sampler_down.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">play_sampler.svg</SetVariable>
-            <SetVariable name="state_1_pressed">play_sampler_overdown.svg</SetVariable>
-            <SetVariable name="state_1_unpressed">play_sampler_over.svg</SetVariable>
+            <SetVariable name="btn_type"><Variable name="SubRegion_btn_type"/></SetVariable>
+            <SetVariable name="btn_format">square_big</SetVariable>
             <SetVariable name="ConfigKey"><Variable name="group"/>,cue_gotoandplay</SetVariable>
             <SetVariable name="ConfigKeyRight"><Variable name="group"/>,cue_default</SetVariable>
             <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,play_indicator</SetVariable>
@@ -26,15 +26,16 @@
       </WidgetGroup>
 
       <WidgetGroup>
+        <ObjectName>SamplerMiniControls</ObjectName>
         <Layout>vertical</Layout>
-        <SizePolicy>min,min</SizePolicy>
+        <Size>0me,36f</Size>
         <Children>
 
-          <!-- First row -->
+          <!-- Top row -->
           <WidgetGroup>
             <ObjectName>SamplerTextSmall</ObjectName>
             <Layout>horizontal</Layout>
-            <SizePolicy>min,min</SizePolicy>
+            <Size>0min,18f</Size>
             <Children>
               <TrackProperty>
                 <TooltipId>track_title</TooltipId>
@@ -46,16 +47,12 @@
               </TrackProperty>
             </Children>
           </WidgetGroup>
-          <!-- /First row -->
 
-          <!-- Second row -->
+          <!-- Bottom row -->
           <WidgetGroup>
-            <ObjectName>AlignLeft</ObjectName>
             <Layout>horizontal</Layout>
+            <Size>0min,18f</Size>
             <Children>
-
-              <WidgetGroup><Size>2f,0min</Size></WidgetGroup>
-
               <Number>
                 <TooltipId>visual_bpm</TooltipId>
                 <ObjectName>SamplerBpm</ObjectName>
@@ -75,22 +72,22 @@
 
               <PushButton>
                 <TooltipId>orientation</TooltipId>
-                <Size>25f,18f</Size>
+                <Size>21f,18f</Size>
                 <NumberStates>3</NumberStates>
                 <State>
                   <Number>0</Number>
-                  <Pressed scalemode="STRETCH_ASPECT">buttons/btn_xfader_sampler_left.svg</Pressed>
-                  <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_xfader_sampler_left.svg</Unpressed>
+                  <Pressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_sampler_left.svg</Pressed>
+                  <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_sampler_left.svg</Unpressed>
                 </State>
                 <State>
                   <Number>1</Number>
-                  <Pressed scalemode="STRETCH_ASPECT">buttons/btn_xfader_sampler_master.svg</Pressed>
-                  <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_xfader_sampler_master.svg</Unpressed>
+                  <Pressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_sampler_master.svg</Pressed>
+                  <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_sampler_master.svg</Unpressed>
                 </State>
                 <State>
                   <Number>2</Number>
-                  <Pressed scalemode="STRETCH_ASPECT">buttons/btn_xfader_sampler_right.svg</Pressed>
-                  <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_xfader_sampler_right.svg</Unpressed>
+                  <Pressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_sampler_right.svg</Pressed>
+                  <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons_<Variable name="btn_scheme"/>/btn__xfader_sampler_right.svg</Unpressed>
                 </State>
                 <Connection>
                   <ConfigKey><Variable name="group"/>,orientation</ConfigKey>
@@ -98,28 +95,28 @@
                 </Connection>
               </PushButton>
 
-              <Template src="skin:button_2state_nohover.xml">
+              <Template src="skin:button_2state.xml">
                 <SetVariable name="TooltipId">keylock</SetVariable>
-                <SetVariable name="icon">keylock_sampler</SetVariable>
+                <SetVariable name="ObjectName">KeylockButton12</SetVariable>
+                <SetVariable name="btn_type"></SetVariable>
                 <SetVariable name="ConfigKey"><Variable name="group"/>,keylock</SetVariable>
-                <SetVariable name="Size">21,18</SetVariable>
+                <SetVariable name="Size">21f,18f</SetVariable>
               </Template>
 
-              <Template src="skin:button_2state_nohover.xml">
+              <Template src="skin:button_1state.xml">
                 <SetVariable name="TooltipId">eject</SetVariable>
-                <SetVariable name="icon">eject_sampler</SetVariable>
+                <SetVariable name="ObjectName">EjectButton12</SetVariable>
+                <SetVariable name="btn_type"></SetVariable>
                 <SetVariable name="ConfigKey"><Variable name="group"/>,eject</SetVariable>
-                <SetVariable name="Size">21,18</SetVariable>
+                <SetVariable name="Size">21f,18f</SetVariable>
               </Template>
 
             </Children>
-          </WidgetGroup>
-          <!-- /Second row -->
-
+          </WidgetGroup><!-- Bottom row -->
 
         </Children>
-      </WidgetGroup>
+      </WidgetGroup><!-- SamplerMiniControls -->
 
     </Children>
-  </WidgetGroup>
+  </WidgetGroup><!-- SamplerDeckMini -->
 </Template>
diff --git a/res/skins/LateNight/samplers_4decks.xml b/res/skins/LateNight/samplers_4decks.xml
index 338bc5c7c317..7e8d7dd8f920 100644
--- a/res/skins/LateNight/samplers_4decks.xml
+++ b/res/skins/LateNight/samplers_4decks.xml
@@ -15,11 +15,11 @@
 		        <Children>
 
               <SingletonContainer>
-                <ObjectName>Sampler1Small_Singleton</ObjectName>
+                <ObjectName>SamplerMini1_Singleton</ObjectName>
               </SingletonContainer>
 
               <SingletonContainer>
-                <ObjectName>Sampler2Small_Singleton</ObjectName>
+                <ObjectName>SamplerMini2_Singleton</ObjectName>
               </SingletonContainer>
 
               <SingletonContainer>
@@ -27,11 +27,11 @@
               </SingletonContainer>
 
               <SingletonContainer>
-                <ObjectName>Sampler3Small_Singleton</ObjectName>
+                <ObjectName>SamplerMini3_Singleton</ObjectName>
               </SingletonContainer>
 
               <SingletonContainer>
-                <ObjectName>Sampler4Small_Singleton</ObjectName>
+                <ObjectName>SamplerMini4_Singleton</ObjectName>
               </SingletonContainer>
 
             </Children>
@@ -46,11 +46,11 @@
             <Children>
 
               <SingletonContainer>
-                <ObjectName>Sampler1Big_Singleton</ObjectName>
+                <ObjectName>Sampler1_Singleton</ObjectName>
               </SingletonContainer>
 
               <SingletonContainer>
-                <ObjectName>Sampler2Big_Singleton</ObjectName>
+                <ObjectName>Sampler2_Singleton</ObjectName>
               </SingletonContainer>
 
               <SingletonContainer>
@@ -58,11 +58,11 @@
               </SingletonContainer>
 
               <SingletonContainer>
-                <ObjectName>Sampler3Big_Singleton</ObjectName>
+                <ObjectName>Sampler3_Singleton</ObjectName>
               </SingletonContainer>
 
               <SingletonContainer>
-                <ObjectName>Sampler4Big_Singleton</ObjectName>
+                <ObjectName>Sampler4_Singleton</ObjectName>
               </SingletonContainer>
 
             </Children>
diff --git a/res/skins/LateNight/samplers_8decks.xml b/res/skins/LateNight/samplers_8decks.xml
index 1e62b4040417..d60fd138ebe0 100644
--- a/res/skins/LateNight/samplers_8decks.xml
+++ b/res/skins/LateNight/samplers_8decks.xml
@@ -15,19 +15,19 @@
 		        <Children>
 
               <SingletonContainer>
-                <ObjectName>Sampler1Small_Singleton</ObjectName>
+                <ObjectName>SamplerMini1_Singleton</ObjectName>
               </SingletonContainer>
 
               <SingletonContainer>
-                <ObjectName>Sampler2Small_Singleton</ObjectName>
+                <ObjectName>SamplerMini2_Singleton</ObjectName>
               </SingletonContainer>
 
               <SingletonContainer>
-                <ObjectName>Sampler3Small_Singleton</ObjectName>
+                <ObjectName>SamplerMini3_Singleton</ObjectName>
               </SingletonContainer>
 
               <SingletonContainer>
-                <ObjectName>Sampler4Small_Singleton</ObjectName>
+                <ObjectName>SamplerMini4_Singleton</ObjectName>
               </SingletonContainer>
 
               <SingletonContainer>
@@ -35,19 +35,19 @@
               </SingletonContainer>
 
               <SingletonContainer>
-                <ObjectName>Sampler5Small_Singleton</ObjectName>
+                <ObjectName>SamplerMini5_Singleton</ObjectName>
               </SingletonContainer>
 
               <SingletonContainer>
-                <ObjectName>Sampler6Small_Singleton</ObjectName>
+                <ObjectName>SamplerMini6_Singleton</ObjectName>
               </SingletonContainer>
 
               <SingletonContainer>
-                <ObjectName>Sampler7Small_Singleton</ObjectName>
+                <ObjectName>SamplerMini7_Singleton</ObjectName>
               </SingletonContainer>
 
               <SingletonContainer>
-                <ObjectName>Sampler8Small_Singleton</ObjectName>
+                <ObjectName>SamplerMini8_Singleton</ObjectName>
               </SingletonContainer>
 
             </Children>
@@ -67,11 +67,11 @@
                 <Children>
 
                   <SingletonContainer>
-                    <ObjectName>Sampler1Big_Singleton</ObjectName>
+                    <ObjectName>Sampler1_Singleton</ObjectName>
                   </SingletonContainer>
 
                   <SingletonContainer>
-                    <ObjectName>Sampler2Big_Singleton</ObjectName>
+                    <ObjectName>Sampler2_Singleton</ObjectName>
                   </SingletonContainer>
 
                   <SingletonContainer>
@@ -97,14 +97,14 @@
                 <Children>
 
                   <SingletonContainer>
-                    <ObjectName>Sampler3Big_Singleton</ObjectName>
+                    <ObjectName>Sampler3_Singleton</ObjectName>
                   </SingletonContainer>
 
                   <SingletonContainer>
-                    <ObjectName>Sampler4Big_Singleton</ObjectName>
+                    <ObjectName>Sampler4_Singleton</ObjectName>
                   </SingletonContainer>
 
-                  <WidgetGroup><Size>21f,1min</Size></WidgetGroup>
+                  <WidgetGroup><Size>6f,1min</Size></WidgetGroup>
 
                   <Template src="skin:sampler.xml">
                     <SetVariable name="samplernum">7</SetVariable>
diff --git a/res/skins/LateNight/samplers_rack.xml b/res/skins/LateNight/samplers_rack.xml
index 7711389cc0a7..dc2be7a6845c 100644
--- a/res/skins/LateNight/samplers_rack.xml
+++ b/res/skins/LateNight/samplers_rack.xml
@@ -1,4 +1,5 @@
 <Template>
+  <SetVariable name="btn_type">embedded</SetVariable>
 
   <SingletonDefinition>
     <ObjectName>SamplerExpandbutton_Singleton</ObjectName>
@@ -9,39 +10,30 @@
         <SizePolicy>min,min</SizePolicy>
         <Children>
           <WidgetGroup>
-            <ObjectName>SamplerExpand</ObjectName>
+            <ObjectName>SamplerExpandButtonBox</ObjectName>
             <SizePolicy>min,me</SizePolicy>
             <Layout>vertical</Layout>
             <Children>
-              <WidgetGroup>
-                <ObjectName>EmbeddeButtonBox</ObjectName>
-                <Layout>vertical</Layout>
-                <Size>22f,22f</Size>
-                <Children>
-                  <PushButton>
-                    <Size>20f,20f</Size>
-                    <TooltipId>show_samplers</TooltipId>
-                    <ObjectName>SamplerExpandButton</ObjectName>
-                    <NumberStates>2</NumberStates>
-                      <State>
-                        <Number>0</Number>
-                        <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_sampler_expand.svg</Pressed>
-                        <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_sampler_expand.svg</Unpressed>
-                      </State>
-                      <State>
-                        <Number>1</Number>
-                        <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_sampler_collapse.svg</Pressed>
-                        <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_sampler_collapse.svg</Unpressed>
-                      </State>
-                    <Connection>
-                      <ConfigKey>[Skin],expand_samplers</ConfigKey>
-                      <ButtonState>LeftButton</ButtonState>
-                    </Connection>
-                  </PushButton>
-
-                </Children>
-              </WidgetGroup>
-                  <WidgetGroup><Size>0min,0me</Size></WidgetGroup>
+              <PushButton>
+                <TooltipId>show_samplers</TooltipId>
+                <ObjectName>FxExpandCollapseButton</ObjectName>
+                <Size>26f,26f</Size>
+                <NumberStates>2</NumberStates>
+                <State>
+                  <Number>0</Number>
+                  <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_square.svg</Unpressed>
+                  <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_square_active.svg</Pressed>
+                </State>
+                <State>
+                  <Number>1</Number>
+                  <Unpressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_square.svg</Unpressed>
+                  <Pressed scalemode="STRETCH">skin:/buttons_<Variable name="btn_scheme"/>/btn_<Variable name="btn_type"/>_square_active.svg</Pressed>
+                </State>
+                <Connection>
+                  <ConfigKey>[Skin],expand_samplers</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+              </PushButton>
             </Children>
           </WidgetGroup>
         </Children>
@@ -50,14 +42,14 @@
   </SingletonDefinition>
 
   <SingletonDefinition>
-    <ObjectName>Sampler1Small_Singleton</ObjectName>
+    <ObjectName>SamplerMini1_Singleton</ObjectName>
     <Children>
       <WidgetGroup>
         <ObjectName>AlignCenterTop</ObjectName>
         <Layout>vertical</Layout>
         <SizePolicy>min,min</SizePolicy>
         <Children>
-          <Template src="skin:sampler_small.xml">
+          <Template src="skin:sampler_mini.xml">
             <SetVariable name="samplernum">1</SetVariable>
           </Template>
         </Children>
@@ -66,14 +58,14 @@
   </SingletonDefinition>
 
   <SingletonDefinition>
-    <ObjectName>Sampler2Small_Singleton</ObjectName>
+    <ObjectName>SamplerMini2_Singleton</ObjectName>
     <Children>
       <WidgetGroup>
         <ObjectName>AlignCenterTop</ObjectName>
         <Layout>vertical</Layout>
         <SizePolicy>min,min</SizePolicy>
         <Children>
-          <Template src="skin:sampler_small.xml">
+          <Template src="skin:sampler_mini.xml">
             <SetVariable name="samplernum">2</SetVariable>
           </Template>
         </Children>
@@ -82,14 +74,14 @@
   </SingletonDefinition>
 
   <SingletonDefinition>
-    <ObjectName>Sampler3Small_Singleton</ObjectName>
+    <ObjectName>SamplerMini3_Singleton</ObjectName>
     <Children>
       <WidgetGroup>
         <ObjectName>AlignCenterTop</ObjectName>
         <Layout>vertical</Layout>
         <SizePolicy>min,min</SizePolicy>
         <Children>
-          <Template src="skin:sampler_small.xml">
+          <Template src="skin:sampler_mini.xml">
             <SetVariable name="samplernum">3</SetVariable>
           </Template>
         </Children>
@@ -98,14 +90,14 @@
   </SingletonDefinition>
 
   <SingletonDefinition>
-    <ObjectName>Sampler4Small_Singleton</ObjectName>
+    <ObjectName>SamplerMini4_Singleton</ObjectName>
     <Children>
       <WidgetGroup>
         <ObjectName>AlignCenterTop</ObjectName>
         <Layout>vertical</Layout>
         <SizePolicy>min,min</SizePolicy>
         <Children>
-          <Template src="skin:sampler_small.xml">
+          <Template src="skin:sampler_mini.xml">
             <SetVariable name="samplernum">4</SetVariable>
           </Template>
         </Children>
@@ -114,14 +106,14 @@
   </SingletonDefinition>
 
   <SingletonDefinition>
-    <ObjectName>Sampler5Small_Singleton</ObjectName>
+    <ObjectName>SamplerMini5_Singleton</ObjectName>
     <Children>
       <WidgetGroup>
         <ObjectName>AlignCenterTop</ObjectName>
         <Layout>vertical</Layout>
         <SizePolicy>min,min</SizePolicy>
         <Children>
-          <Template src="skin:sampler_small.xml">
+          <Template src="skin:sampler_mini.xml">
             <SetVariable name="samplernum">5</SetVariable>
           </Template>
         </Children>
@@ -130,14 +122,14 @@
   </SingletonDefinition>
 
   <SingletonDefinition>
-    <ObjectName>Sampler6Small_Singleton</ObjectName>
+    <ObjectName>SamplerMini6_Singleton</ObjectName>
     <Children>
       <WidgetGroup>
         <ObjectName>AlignCenterTop</ObjectName>
         <Layout>vertical</Layout>
         <SizePolicy>min,min</SizePolicy>
         <Children>
-          <Template src="skin:sampler_small.xml">
+          <Template src="skin:sampler_mini.xml">
             <SetVariable name="samplernum">6</SetVariable>
           </Template>
         </Children>
@@ -146,14 +138,14 @@
   </SingletonDefinition>
 
   <SingletonDefinition>
-    <ObjectName>Sampler7Small_Singleton</ObjectName>
+    <ObjectName>SamplerMini7_Singleton</ObjectName>
     <Children>
       <WidgetGroup>
         <ObjectName>AlignCenterTop</ObjectName>
         <Layout>vertical</Layout>
         <SizePolicy>min,min</SizePolicy>
         <Children>
-          <Template src="skin:sampler_small.xml">
+          <Template src="skin:sampler_mini.xml">
             <SetVariable name="samplernum">7</SetVariable>
           </Template>
         </Children>
@@ -162,14 +154,14 @@
   </SingletonDefinition>
 
   <SingletonDefinition>
-    <ObjectName>Sampler8Small_Singleton</ObjectName>
+    <ObjectName>SamplerMini8_Singleton</ObjectName>
     <Children>
       <WidgetGroup>
         <ObjectName>AlignCenterTop</ObjectName>
         <Layout>vertical</Layout>
         <SizePolicy>min,min</SizePolicy>
         <Children>
-          <Template src="skin:sampler_small.xml">
+          <Template src="skin:sampler_mini.xml">
             <SetVariable name="samplernum">8</SetVariable>
           </Template>
         </Children>
@@ -178,7 +170,7 @@
   </SingletonDefinition>
 
   <SingletonDefinition>
-    <ObjectName>Sampler1Big_Singleton</ObjectName>
+    <ObjectName>Sampler1_Singleton</ObjectName>
     <Children>
       <WidgetGroup>
         <ObjectName>AlignCenterTop</ObjectName>
@@ -194,7 +186,7 @@
   </SingletonDefinition>
 
   <SingletonDefinition>
-    <ObjectName>Sampler2Big_Singleton</ObjectName>
+    <ObjectName>Sampler2_Singleton</ObjectName>
     <Children>
       <WidgetGroup>
         <ObjectName>AlignCenterTop</ObjectName>
@@ -210,7 +202,7 @@
   </SingletonDefinition>
 
   <SingletonDefinition>
-    <ObjectName>Sampler3Big_Singleton</ObjectName>
+    <ObjectName>Sampler3_Singleton</ObjectName>
     <Children>
       <WidgetGroup>
         <ObjectName>AlignCenterTop</ObjectName>
@@ -226,7 +218,7 @@
   </SingletonDefinition>
 
   <SingletonDefinition>
-    <ObjectName>Sampler4Big_Singleton</ObjectName>
+    <ObjectName>Sampler4_Singleton</ObjectName>
     <Children>
       <WidgetGroup>
         <ObjectName>AlignCenterTop</ObjectName>
@@ -266,14 +258,13 @@
 
             </Children>
           </WidgetStack>
-
         </Children>
       </WidgetGroup>
 
       <WidgetGroup><Size>0min,0min</Size></WidgetGroup>
 
       <WidgetGroup>
-        <Size>5f,1min</Size>
+        <Size>2f,1min</Size>
         <Connection>
           <ConfigKey>[Master],skin_settings</ConfigKey>
           <BindProperty>visible</BindProperty>
diff --git a/res/skins/LateNight/screen_h-size_detection.xml b/res/skins/LateNight/screen_h-size_detection.xml
new file mode 100644
index 000000000000..72e3c5682d81
--- /dev/null
+++ b/res/skins/LateNight/screen_h-size_detection.xml
@@ -0,0 +1,56 @@
+<!--
+Description:
+  Size-aware container that checks if the screen (Mixxx window) is wide enough
+  to show the Fx unit main controls in one row in order to save vertical space
+  for other skin elements. It's also considered if the Super knobs are shown.
+  This detector is placed below toolbar.xml so it doesn't interfere with other
+  skin elements.
+
+
+Controls:
+  [LateNight],wide_screen
+
+-->
+<Template>
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <Size>0me,0f</Size>
+    <Children>
+
+      <WidgetGroup><!-- Super knob, optional -->
+        <Layout>horizontal</Layout>
+        <Size>90f,0f</Size>
+        <Connection>
+          <ConfigKey persist="true">[Skin],show_superknobs</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+      <SizeAwareStack><!-- Size detector -->
+        <Children>
+          <WidgetStack><!-- Not enough space for stars -->
+            <SizePolicy>me,f</SizePolicy>
+            <MinimumSize>0,0</MinimumSize>
+            <MaximumSize>1269,0</MaximumSize>
+            <Children>
+              <WidgetGroup><Size>1f,0f</Size></WidgetGroup>
+              <WidgetGroup trigger="[LateNight],wide_screen"><Size>1f,20f</Size></WidgetGroup>
+            </Children>
+          </WidgetStack>
+
+          <WidgetStack><!-- when there is enough space for stars (min 83px) show them. -->
+            <SizePolicy>me,f</SizePolicy>
+            <MinimumSize>1270,0</MinimumSize>
+            <MaximumSize>-1,0</MaximumSize>
+            <Children>
+              <WidgetGroup trigger="[LateNight],wide_screen"><Size>1f,20f</Size></WidgetGroup>
+              <WidgetGroup><Size>1f,20f</Size></WidgetGroup>
+            </Children>
+          </WidgetStack>
+
+        </Children>
+      </SizeAwareStack><!-- /Size detector -->
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/separator_artist_title.xml b/res/skins/LateNight/separator_artist_title.xml
new file mode 100644
index 000000000000..8b78b9fd6539
--- /dev/null
+++ b/res/skins/LateNight/separator_artist_title.xml
@@ -0,0 +1,68 @@
+<!-- Description:
+        draws a black line to separate
+         * rate controls  | Artist/Title  (small or no spinny) 
+         * big spinny     | Artist/Title
+         
+        Conditions:
+        a) with rate_controls
+          OR
+        b) !rate controls && spinny_cover && big_spinny_coverart
+ 
+ -->
+<Template>
+  <WidgetGroup>
+    <Size>0min,0me</Size>
+    <Layout>horizontal</Layout>
+    <Children>
+
+      <!-- rate_controls -->
+      <WidgetGroup>
+        <Size>0min,0me</Size>
+        <Layout>horizontal</Layout>
+        <Children>
+          <!-- rate_controls && !big_spinny_coverart -->
+          <WidgetGroup>
+            <ObjectName>SeparatorLine</ObjectName>
+            <Size><Variable name="SeparatorSize"/>,0me</Size>
+          </WidgetGroup>
+        </Children>
+        <Connection>
+          <ConfigKey persist="true">[Skin],show_rate_controls</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+      
+      <!-- !rate_controls && spinny_cover && big_spinny_coverart -->
+      <WidgetGroup>
+        <Size>0min,0me</Size>
+        <Layout>horizontal</Layout>
+        <Children>
+          <WidgetGroup>
+            <Size>0min,0me</Size>
+            <Layout>horizontal</Layout>
+            <Children>
+              <WidgetGroup>
+                <ObjectName>SeparatorLine</ObjectName>
+                <Size><Variable name="SeparatorSize"/>,0me</Size>
+                <Connection>
+                  <ConfigKey persist="true">[Skin],show_big_spinny_coverart</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+            </Children>
+            <Connection>
+              <ConfigKey persist="true">[LateNight],show_spinny_cover</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+        </Children>
+        <Connection>
+          <ConfigKey persist="true">[Skin],show_rate_controls</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/separator_spinny_cover.xml b/res/skins/LateNight/separator_spinny_cover.xml
new file mode 100644
index 000000000000..a052a0d2bc2e
--- /dev/null
+++ b/res/skins/LateNight/separator_spinny_cover.xml
@@ -0,0 +1,30 @@
+<!-- Description:
+        draws a black line to separate
+        rate controls | big/small spinny
+         
+          Conditions:
+          show_rate_controls
+            AND show_spinny_cover
+ 
+ -->
+<Template>
+  <WidgetGroup>
+    <Size>0min,0me</Size>
+    <Layout>horizontal</Layout>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>SeparatorLine</ObjectName>
+        <Size><Variable name="SeparatorSize"/>,0me</Size>
+        <Connection>
+          <ConfigKey persist="true">[LateNight],show_spinny_cover</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+    </Children>
+    <Connection>
+      <ConfigKey persist="true">[Skin],show_rate_controls</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/skin.xml b/res/skins/LateNight/skin.xml
index 4c3bbd64d640..5b68d75f230b 100644
--- a/res/skins/LateNight/skin.xml
+++ b/res/skins/LateNight/skin.xml
@@ -21,8 +21,6 @@
   Share Alike - If you alter, transform, or build upon this work, you may distribute
   the resulting work only under the same or similar license to this one.
 
-  See CHANGELOG.txt for the list of changes.
-
   TODO: Remove "persist" attributes throughout the skin and confirm that declaring
   them in the attributes section instead works.
   -->
@@ -32,7 +30,7 @@
   <manifest>
     <title>LateNight</title>
     <author>owilliams</author>
-    <version>2.1.0.01</version>
+    <version>2.3.0.01</version>
     <description>A nighttime-compatible skin</description>
     <language>en</language>
     <license>Creative Commons Attribution, Share-Alike 3.0 Unported</license>
@@ -52,6 +50,7 @@
       <attribute persist="true" config_key="[Skin],show_rate_control_buttons">1</attribute>
       <!-- Mixer -->
       <attribute persist="true" config_key="[Master],show_mixer">1</attribute>
+      <attribute persist="true" config_key="[Skin],show_master_head_mixer">1</attribute>
       <attribute persist="true" config_key="[Skin],show_eq_knobs">1</attribute>
       <attribute persist="true" config_key="[Skin],show_eq_kill_buttons">1</attribute>
       <attribute persist="true" config_key="[Skin],show_xfader">1</attribute>
@@ -93,12 +92,124 @@
       <attribute persist="false" config_key="[EffectRack1_EffectUnit4],group_[BusTalkover]_enable">0</attribute>
     </attributes>
   </manifest>
+  <Schemes>
+    <Scheme>
+      <Name>Classic</Name>
+      <!-- Optional: add stylesheet to complement and/or override the main
+      'Mixxx' widget's stylesheet style.qss -->
+      <!-- Mix any of the existing btn_, knob_, slider_ or style_ schemes.
+            btn_scheme    all borders & icons for pushbuttons, spinboxes,
+                          effect selector, AutoDJ fade mode selector
+            knob_scheme   guess what
+            slider_scheme ...exactly!
+            style_scheme  icons & backgrounds for library, splitters, spinnies,
+                          covers, vinyl control, toolbar
+            bg_tile       allows to experiment with the background tile of recessed
+                          areas without having to creat a new style_scheme folder
+            Note:   button borders and icons are set in style_[SCHEME].qss, too
+                    so do a mass-find-and-replace there, as well. -->
+      <SetVariable name="btn_scheme">classic</SetVariable>
+      <SetVariable name="knob_scheme">classic</SetVariable>
+      <SetVariable name="slider_scheme">classic</SetVariable>
+      <SetVariable name="style_scheme">classic</SetVariable>
+      <!--  For no background tile leave empty.
+            To override the <BackPath> tile it's sufficient [in most cases :]
+            to assign the respective containers a background-color in qss.
+            Good to know:
+            <BackPath> suppresses qss borders -->
+      <SetVariable name="bg_tile">classic</SetVariable>
+
+      <!-- Set the '3D button mode'
+          * elevated: buttons stand out, 3D border, drop shadow
+          * embedded: buttons are kind of leveled with surface, surrounding groove -->
+      <!-- Buttons in mixer, rate controls, collapsed Fx / Mic / Aux units etc. -->
+      <SetVariable name="TopRegion_btn_type">embedded</SetVariable>
+      <!-- Buttons in transport row, mic / aux units, sampler hotcue row etc. -->
+      <SetVariable name="SubRegion_btn_type">elevated</SetVariable>
+
+      <!--  Some widget sizes that are scheme specific -->
+      <!--  Here, the goal was to avoid 'spinny eggs'.
+            Just guarantee 1:1 x/y ratio for both spinny and cover art widgets in every situation.
+            The small spinny containers in decks have a top border included to separate them from
+            artist/title, therefore the containers are 1px taller than 1:1 -->
+      <SetVariable name="SmallSpinnySize">55f,56f</SetVariable>
+      <!--  Big spinnies are borderless = 1:1, borders are created by separator_*.xml
+            Size spinnies so they force-expand the decks to match the mixer's max height
+            in order to avoid the decks expand vertically when the mixer is shown
+            (would screw up the layout).
+            +1px margin-bottom -->
+      <SetVariable name="BigSpinnySize">107f,108f</SetVariable>
+      <!--  In small decks there's 2px margin-right before overview -->
+      <SetVariable name="MiniDeckSpinnySize">48f,46f</SetVariable>
+
+      <!-- Classic scheme uses black lines to separate certain areas; those are 1px wide/tall -->
+      <SetVariable name="SeparatorSize">1f</SetVariable>
+
+      <!-- Waveform & Overview colors -->
+      <SetVariable name="SignalBgColor_12">#0f0f0f</SetVariable>
+      <SetVariable name="SignalBgColor_34">#012322</SetVariable>
+      <SetVariable name="SignalBgColor_SamplerPreview">#0f0f0f</SetVariable>
+      <SetVariable name="SignalColor_12">#E7C413</SetVariable>
+      <SetVariable name="SignalColor_34">#09B2AE</SetVariable>
+      <SetVariable name="SignalRGBLowColor">#ff2a00</SetVariable>
+      <SetVariable name="SignalRGBMidColor">#33f600</SetVariable>
+      <SetVariable name="SignalRGBHighColor">#332acc</SetVariable>
+      <SetVariable name="BeatColor">#ffffff</SetVariable>
+      <SetVariable name="AxesColor">#ffffff</SetVariable>
+      <SetVariable name="PlayPosColor">#00FF00</SetVariable>
+      <SetVariable name="PlayedOverlayColor">#bb000000</SetVariable>
+      <SetVariable name="EndOfTrackColor">#F856E7</SetVariable>
+
+    </Scheme>
+
+    <Scheme>
+      <Name>Flip</Name>
+      <Style src="skin:style_flip.qss"/>
+      <!-- btn_theme actually only changes color of deck control icons: keylock, ... -->
+      <SetVariable name="btn_scheme">flip</SetVariable>
+      <SetVariable name="knob_scheme">classic</SetVariable>
+      <SetVariable name="slider_scheme">flip</SetVariable>
+      <SetVariable name="style_scheme">flip</SetVariable>
+      <SetVariable name="TopRegion_btn_type">embedded</SetVariable>
+      <SetVariable name="SubRegion_btn_type">embedded</SetVariable>
+
+      <!-- Small spinnies in regular decks are square, no margin -->
+      <SetVariable name="SmallSpinnySize">57f,57f</SetVariable>
+      <!-- Big spinnies in decks are square (110 x 110px)
+           + 1px border on all sides
+           + 1px margin-right (overview)
+           + 1px margin-bottom (transport row)
+           If you want pixel-sharp indicators size for the big spinnies, size
+              /style_[scheme]/spinny_indicator.svg according to effective size in
+              skin at 100% and make sure the white indicator's width in px is an integer -->
+      <SetVariable name="BigSpinnySize">116f,116f</SetVariable>
+      <!-- In small decks there's a 2px margin before the overview -->
+      <SetVariable name="MiniDeckSpinnySize">48f,46f</SetVariable>
+
+      <SetVariable name="SeparatorSize">0f</SetVariable>
+
+      <SetVariable name="SignalBgColor_12">#0f0f0e</SetVariable>
+      <SetVariable name="SignalBgColor_34">#001b23</SetVariable>
+      <SetVariable name="SignalBgColor_SamplerPreview">#080807</SetVariable>
+      <SetVariable name="SignalColor_12">#e7c413</SetVariable>
+      <SetVariable name="SignalColor_34">#0893b2</SetVariable>
+      <SetVariable name="SignalRGBLowColor">#ff2a00</SetVariable>
+      <SetVariable name="SignalRGBMidColor">#33f600</SetVariable>
+      <SetVariable name="SignalRGBHighColor">#332acc</SetVariable>
+      <SetVariable name="BeatColor">#ffffff</SetVariable>
+      <SetVariable name="AxesColor">#ffffff</SetVariable>
+      <SetVariable name="PlayPosColor">#00ff00</SetVariable>
+      <SetVariable name="PlayedOverlayColor">#bb000000</SetVariable>
+      <SetVariable name="EndOfTrackColor">#ff00ff</SetVariable>
+
+    </Scheme>
+  </Schemes>
 
   <ObjectName>Mixxx</ObjectName>
   <Style src="skin:style.qss" src-mac="skin:style-mac.qss"/>
-
   <!-- MinimumSize should not be an exact monitor resolution. There needs
-  to be space for the title bar or other chrome at full screen -->
+  to be space for the title bar or other chrome at full screen.
+  https://www.mixxx.org/wiki/doku.php/skin_guidelines#the_optimal_size_for_skins -->
   <MinimumSize>1270,550</MinimumSize>
   <SizePolicy>me,me</SizePolicy>
   <Layout>vertical</Layout>
@@ -107,7 +218,9 @@
       background-color: #0f0f0f;
     }
     QLabel {
-      image: url(skin:/style/mixxx_logo.svg);
+      <!-- ToDo ronso0 :: Unfortunately, variables are not considered here. Yet ;)
+      image: url(skin:/style_<Variable name="scheme"/>/mixxx_logo.svg); -->
+      image: url(skin:/style_classic/mixxx_logo.svg);
       padding: 0;
       margin: 0px 2px 0px 2px;
       border: none;
@@ -117,7 +230,7 @@
       max-height: 40px;
     }
     QProgressBar {
-      background: url(skin:/style/progressbar_bg.svg);
+      background: url(skin:/style_classic/progressbar_bg.svg);
       border: none;
       min-width: 164px;
       min-height: 5px;
@@ -125,22 +238,17 @@
       max-height: 5px;
     }
     QProgressBar::chunk {
-      background: url(skin:/style/progressbar.svg);
+      background: url(skin:/style_classic/progressbar.svg);
     }
   </LaunchImageStyle>
 
   <Children>
+    <SetVariable name="BgTile">skin:/style_<Variable name="bg_tile"/>/background_tile.png</SetVariable>
+
+    <SetVariable name="Align">center</SetVariable>
+    
     <SetVariable name="PotiMinAngle">-135</SetVariable>
     <SetVariable name="PotiMaxAngle">135</SetVariable>
-
-    <SetVariable name="SignalColor_12">#E7C413</SetVariable>
-    <!-- <SetVariable name="SignalBgColor_12">#2f290a</SetVariable> -->
-    <SetVariable name="SignalColor_34">#09B2AE</SetVariable>
-    <!-- <SetVariable name="SignalBgColor_34">#2f290a</SetVariable> -->
-    <SetVariable name="SignalRGBLowColor">#ff2a00</SetVariable>
-    <SetVariable name="SignalRGBMidColor">#33f600</SetVariable>
-    <SetVariable name="SignalRGBHighColor">#332acc</SetVariable>
-    <SetVariable name="PlayedOverlayColor">#bb000000</SetVariable>
     <!-- Define singletons as early in the skin as possible.  Note that the
     library doesn't actually appear here, it's just instantiated and configured.
     -->
@@ -157,7 +265,6 @@
       <Children>
         <Template src="skin:spinny_coverart.xml">
           <SetVariable name="channum">1</SetVariable>
-          <SetVariable name="MaxSize">53,53</SetVariable>
         </Template>
       </Children>
     </SingletonDefinition>
@@ -167,7 +274,6 @@
       <Children>
         <Template src="skin:spinny_coverart.xml">
           <SetVariable name="channum">2</SetVariable>
-          <SetVariable name="MaxSize">53,53</SetVariable>
         </Template>
       </Children>
     </SingletonDefinition>
@@ -177,7 +283,6 @@
       <Children>
         <Template src="skin:spinny_coverart.xml">
           <SetVariable name="channum">3</SetVariable>
-          <SetVariable name="MaxSize">53,53</SetVariable>
         </Template>
       </Children>
     </SingletonDefinition>
@@ -187,7 +292,6 @@
       <Children>
         <Template src="skin:spinny_coverart.xml">
           <SetVariable name="channum">4</SetVariable>
-          <SetVariable name="MaxSize">53,53</SetVariable>
         </Template>
       </Children>
     </SingletonDefinition>
@@ -198,6 +302,7 @@
         <Template src="skin:deck_overview.xml">
           <SetVariable name="channum">1</SetVariable>
           <SetVariable name="SignalColor"><Variable name="SignalColor_12"/></SetVariable>
+          <SetVariable name="SignalBgColor"><Variable name="SignalBgColor_12"/></SetVariable>
         </Template>
       </Children>
     </SingletonDefinition>
@@ -208,6 +313,7 @@
         <Template src="skin:deck_overview.xml">
           <SetVariable name="channum">2</SetVariable>
           <SetVariable name="SignalColor"><Variable name="SignalColor_12"/></SetVariable>
+          <SetVariable name="SignalBgColor"><Variable name="SignalBgColor_12"/></SetVariable>
         </Template>
       </Children>
     </SingletonDefinition>
@@ -218,6 +324,7 @@
         <Template src="skin:deck_overview.xml">
           <SetVariable name="channum">3</SetVariable>
           <SetVariable name="SignalColor"><Variable name="SignalColor_34"/></SetVariable>
+          <SetVariable name="SignalBgColor"><Variable name="SignalBgColor_34"/></SetVariable>
         </Template>
       </Children>
     </SingletonDefinition>
@@ -228,6 +335,7 @@
         <Template src="skin:deck_overview.xml">
           <SetVariable name="channum">4</SetVariable>
           <SetVariable name="SignalColor"><Variable name="SignalColor_34"/></SetVariable>
+          <SetVariable name="SignalBgColor"><Variable name="SignalBgColor_34"/></SetVariable>
         </Template>
       </Children>
     </SingletonDefinition>
@@ -297,7 +405,7 @@
                   <SizePolicy>me,me</SizePolicy>
                   <Children>
 
-                    <Template src="skin:decks_small.xml"/>
+                    <Template src="skin:decks_mini.xml"/>
 
                     <SingletonContainer>
                       <ObjectName>LibrarySingleton</ObjectName>
@@ -313,6 +421,7 @@
         </WidgetGroup>
 
         <Template src="skin:toolbar.xml"/>
+        <Template src="skin:screen_h-size_detection.xml"/>
       </Children>
     </WidgetGroup>
   </Children>
diff --git a/res/skins/LateNight/skin_preview.png b/res/skins/LateNight/skin_preview.png
deleted file mode 100644
index 1023a16aa9af..000000000000
Binary files a/res/skins/LateNight/skin_preview.png and /dev/null differ
diff --git a/res/skins/LateNight/skin_preview_890x500px.png b/res/skins/LateNight/skin_preview_890x500px.png
deleted file mode 100644
index 807ef9ad4ce2..000000000000
Binary files a/res/skins/LateNight/skin_preview_890x500px.png and /dev/null differ
diff --git a/res/skins/LateNight/skin_preview_Classic.png b/res/skins/LateNight/skin_preview_Classic.png
new file mode 100644
index 000000000000..0d795c0d2551
Binary files /dev/null and b/res/skins/LateNight/skin_preview_Classic.png differ
diff --git a/res/skins/LateNight/skin_preview_Flip.png b/res/skins/LateNight/skin_preview_Flip.png
new file mode 100644
index 000000000000..f17ec0d2446a
Binary files /dev/null and b/res/skins/LateNight/skin_preview_Flip.png differ
diff --git a/res/skins/LateNight/skin_settings.xml b/res/skins/LateNight/skin_settings.xml
index e2b48824b6b0..488088afade1 100644
--- a/res/skins/LateNight/skin_settings.xml
+++ b/res/skins/LateNight/skin_settings.xml
@@ -127,10 +127,27 @@ Description:
               </Template>
 
               <!-- Big Spinny -->
-              <Template src="skin:skin_settings_button_2state.xml">
-                <SetVariable name="text">Big Spinny/Cover Art</SetVariable>
-                <SetVariable name="Setting">[Skin],show_big_spinny_coverart</SetVariable>
-              </Template>
+              <WidgetGroup>
+                <Layout>stacked</Layout>
+                <Size>190f,17f</Size>
+                <Children>
+                  <!-- index 0 due to bug -->
+                  <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
+                  <WidgetGroup><!-- translucent cover when Channel Mixer is hidden -->
+                    <ObjectName>SubmenuCover</ObjectName>
+                    <Layout>vertical</Layout>
+                    <Size>190f,17f</Size>
+                    <Connection>
+                      <ConfigKey persist="true">[LateNight],no_spinny_no_cover</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup>
+                  <Template src="skin:skin_settings_button_2state.xml">
+                    <SetVariable name="text">Big Spinny/Cover Art</SetVariable>
+                    <SetVariable name="Setting">[Skin],show_big_spinny_coverart</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup><!-- Big Spinny -->
 
             </Children>
           </WidgetGroup><!-- /Deck / General -->
@@ -148,6 +165,11 @@ Description:
             <Layout>vertical</Layout>
             <Children>
 
+              <Template src="skin:skin_settings_button_2state.xml">
+                <SetVariable name="text">Master / Headphone Mixer</SetVariable>
+                <SetVariable name="Setting">[Skin],show_master_head_mixer</SetVariable>
+              </Template>
+
               <WidgetGroup><!-- EQ knobs -->
                 <Layout>stacked</Layout>
                 <Size>190f,17f</Size>
diff --git a/res/skins/LateNight/skin_settings_labelbutton_2state.xml b/res/skins/LateNight/skin_settings_labelbutton_2state.xml
index 3ce035e10620..ada3c43a78ca 100644
--- a/res/skins/LateNight/skin_settings_labelbutton_2state.xml
+++ b/res/skins/LateNight/skin_settings_labelbutton_2state.xml
@@ -8,32 +8,25 @@ Variables:
   Setting       : persistent left-click control
 -->
 <Template>
-  <WidgetGroup>
-    <ObjectName>CategoryLabel</ObjectName>
-    <Layout>horizontal</Layout>
+  <PushButton>
+    <TooltipId><Variable name="TooltipId"/></TooltipId>
+    <ObjectName>SkinSettingsLabelButton</ObjectName>
     <Size>190min,21f</Size>
-    <Children>
-      <PushButton>
-        <TooltipId><Variable name="TooltipId"/></TooltipId>
-        <ObjectName>SkinSettingsLabelButton</ObjectName>
-        <Size>190min,17f</Size>
-        <NumberStates>2</NumberStates>
-        <RightClickIsPushButton>false</RightClickIsPushButton>
-        <State>
-          <Number>0</Number>
-          <Text> &#9744; <Variable name="text"/></Text>
-          <Alignment>left</Alignment>
-        </State>
-        <State>
-          <Number>1</Number>
-          <Text> &#9745; <Variable name="text"/></Text>
-          <Alignment>left</Alignment>
-        </State>
-        <Connection>
-          <ConfigKey persist="true"><Variable name="Setting"/></ConfigKey>
-          <ButtonState>LeftButton</ButtonState>
-        </Connection>
-      </PushButton>
-    </Children>
-  </WidgetGroup>
+    <NumberStates>2</NumberStates>
+    <RightClickIsPushButton>false</RightClickIsPushButton>
+    <State>
+      <Number>0</Number>
+      <Text> &#9744; <Variable name="text"/></Text>
+      <Alignment>left</Alignment>
+    </State>
+    <State>
+      <Number>1</Number>
+      <Text> &#9745; <Variable name="text"/></Text>
+      <Alignment>left</Alignment>
+    </State>
+    <Connection>
+      <ConfigKey persist="true"><Variable name="Setting"/></ConfigKey>
+      <ButtonState>LeftButton</ButtonState>
+    </Connection>
+  </PushButton>
 </Template>
diff --git a/res/skins/LateNight/sliders_classic/knob_crossfader.svg b/res/skins/LateNight/sliders_classic/knob_crossfader.svg
new file mode 100644
index 000000000000..63372cd9a688
--- /dev/null
+++ b/res/skins/LateNight/sliders_classic/knob_crossfader.svg
@@ -0,0 +1 @@
+<svg width="19" height="46" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m5.43775 42.562075c.45484.27725.98869.437484 1.5625.4375l5.5.00015c1.415374.00035 2.4995-.99965 2.830554-2 0 1.662-.668554 3.00005-2.330554 3l-5-.00015c-1.0882-3.3e-5-2.0367-.57494-2.5625-1.4375z" color="#000000" opacity=".15"/><path d="m4.93775 41.562075c.45484.27725.98869.437484 1.5625.4375l5.397748.00015c2.101752 5.8e-5 3.101752-1.652533 3.101752-2.99965v-34c0-.57381-.198496-1.292136-.580323-1.777694.86256.52578 1.080823 1.689144 1.080823 2.777344v34c0 1.662-1.338 3.00005-3 3l-5-.00015c-1.0882-3.3e-5-2.0367-.57494-2.5625-1.4375z" color="#000000" opacity=".5"/><path d="m3.99975 5.000275v34c0 1.662 1.338 2.99995 3 3l5 .00015c1.662 5e-5 3-1.338 3-3v-34c0-1.662-1.338-2.9999501-3-3l-5-.00015c-1.662-4.99e-5-3 1.338-3 3z" color="#000000" opacity=".8"/><path d="m6.99975 2.000425c-1.662 0-3 1.338-3 3v32.99985c0 .831.33275 1.5828.875 2.125l1.125-1.125 7-34.99985 1.125-1.125c-.54225-.54225-1.294-.875-2.125-.875z" color="#000000" fill="#444"/><path d="m14.12475 2.875425-1.125 1.125-7 34.99985-1.125 1.125c.54225.54225 1.294.875 2.125.875h5c1.662 0 3-1.338 3-3v-32.99985c0-.831-.33275-1.5828-.875-2.125z" color="#000000" fill="#1a1a1a"/><path d="m6.99975 3.000425h5c1.108 0 2 .892 2 2v32.99985c0 1.108-.892 2-2 2h-5c-1.108 0-2-.892-2-2v-32.99985c0-1.108.892-2 2-2z" color="#000000" fill="#333"/><path d="m7.99975 3.000425h1v36.99985h-1z" color="#000000" fill="#282828"/><path d="m8.99975 3.000425h1v36.99985h-1z" color="#000000" fill="#ea0000"/><path d="m9.99975 3.000425h1v36.99985h-1z" color="#000000" fill="#414141"/></svg>
diff --git a/res/skins/LateNight/knobs_sliders/knob_pitch_deck.svg b/res/skins/LateNight/sliders_classic/knob_pitch_deck.svg
similarity index 60%
rename from res/skins/LateNight/knobs_sliders/knob_pitch_deck.svg
rename to res/skins/LateNight/sliders_classic/knob_pitch_deck.svg
index 6abf65d31edf..db639a6dccaf 100644
--- a/res/skins/LateNight/knobs_sliders/knob_pitch_deck.svg
+++ b/res/skins/LateNight/sliders_classic/knob_pitch_deck.svg
@@ -1 +1 @@
-<svg width="40" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m3.7942 14.148c.60561.57244 1.4882.85239 2.062.85238l29.657-7e-4c1.4154.00035 2.7757-1.0248 2.9852-2.6991.01105 2.1371-.42549 3.6991-2.3306 3.6991h-29.811c-1.0882 0-2.3492-.62974-2.5625-1.8517z" color="#000000" opacity=".15"/><path d="m3.2942 13.183c.69268.64195 1.4882.81723 2.062.81722l29.555-7e-4c2.1018-5e-5 3.1018-1.6525 3.1018-2.9996v-5c0-.57381-.1985-1.2921-.58032-1.7777.86256.52578 1.0808 1.6891 1.0808 2.7773v5c0 1.662-1.338 3-3 3h-29.657c-1.0882 0-2.5339-.85452-2.5625-1.8165z" color="#000000" opacity=".5"/><path d="m2.3562 6.0005v5c0 1.662 1.338 3 3 3h29.657c1.662 0 3-1.338 3-3v-5c0-1.662-1.338-3-3-3h-29.657c-1.662 0-3 1.338-3 3z" color="#000000" opacity=".8"/><path d="m2 5.0002c0-1.662 1.338-3 3-3h30.001c.831 0 1.5828.33275 2.125.875l-1.125 1.125-32.001 7-1.125 1.125c-.54225-.54225-.875-1.294-.875-2.125z" color="#000000" fill="#444"/><path d="m2.875 12.125 1.125-1.125 32.001-7 1.125-1.125c.54225.54225.875 1.294.875 2.125v5c0 1.662-1.338 3-3 3h-30.001c-.831 0-1.5828-.33275-2.125-.875z" color="#000000" fill="#1a1a1a"/><path d="m3 5.0002v5c0 1.108.892 2 2 2h30.001c1.108 0 2-.892 2-2v-5c0-1.108-.892-2-2-2h-30.001c-1.108 0-2 .892-2 2z" color="#000000" fill="#333"/><path d="m3 6v1h34.001v-1z" color="#000000" fill="#131313"/><path d="m3 7v1h34.001v-1z" color="#000000" fill="#ea0000"/><path d="m3 8v1h34.001v-1z" color="#000000" fill="#515151"/></svg>
+<svg width="40" height="17" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m3.7942 15.148c.60561.57244 1.4882.85239 2.062.85238l29.657-7e-4c1.4154.00035 2.7757-1.0248 2.9852-2.6991.01105 2.1371-.42549 3.6991-2.3306 3.6991h-29.811c-1.0882 0-2.3492-.62974-2.5625-1.8517z" color="#000000" opacity=".15"/><path d="m3.2942 14.183c.69268.64195 1.4882.81723 2.062.81722l29.555-7e-4c2.1018-5e-5 3.1018-1.6525 3.1018-2.9996v-5c0-.57381-.1985-1.2921-.58032-1.7777.86256.52578 1.0808 1.6891 1.0808 2.7773v5c0 1.662-1.338 3-3 3h-29.657c-1.0882 0-2.5339-.85452-2.5625-1.8165z" color="#000000" opacity=".5"/><path d="m2.3562 7.0005v5c0 1.662 1.338 3 3 3h29.657c1.662 0 3-1.338 3-3v-5c0-1.662-1.338-3-3-3h-29.657c-1.662 0-3 1.338-3 3z" color="#000000" opacity=".8"/><path d="m2 6.0002c0-1.662 1.338-3 3-3h30.001c.831 0 1.5828.33275 2.125.875l-1.125 1.125-32.001 7-1.125 1.125c-.54225-.54225-.875-1.294-.875-2.125z" color="#000000" fill="#444"/><path d="m2.875 13.125 1.125-1.125 32.001-7 1.125-1.125c.54225.54225.875 1.294.875 2.125v5c0 1.662-1.338 3-3 3h-30.001c-.831 0-1.5828-.33275-2.125-.875z" color="#000000" fill="#1a1a1a"/><path d="m3 6.0002v5c0 1.108.892 2 2 2h30.001c1.108 0 2-.892 2-2v-5c0-1.108-.892-2-2-2h-30.001c-1.108 0-2 .892-2 2z" color="#000000" fill="#333"/><path d="m3 7v1h34.001v-1z" color="#000000" fill="#131313"/><path d="m3 8v1h34.001v-1z" color="#000000" fill="#ea0000"/><path d="m3 9v1h34.001v-1z" color="#000000" fill="#515151"/></svg>
diff --git a/res/skins/LateNight/sliders_classic/knob_pitch_sampler.svg b/res/skins/LateNight/sliders_classic/knob_pitch_sampler.svg
new file mode 100644
index 000000000000..4ea321cb8a66
--- /dev/null
+++ b/res/skins/LateNight/sliders_classic/knob_pitch_sampler.svg
@@ -0,0 +1,10 @@
+<svg width="30" height="13" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m3.2937501 11.18361c.5042904.413239 1.0752284.816575 2.2053571.816565l19.3987668-.000175c2.101752-1.9e-5 3.101864-1.652533 3.101752-2.99965l-.00025-3.00035c-4.8e-5-.57381-.198496-1.2921355-.580323-1.7776934.86256.52578 1.080732 1.6891434 1.080823 2.7773434l.00025 3.00035c.000138 1.662-1.338 2.999985-3 3l-19.643876.000175c-1.0882 1e-5-2.2715901-.138071-2.5624999-1.816565z" color="#000000" opacity=".5"/>
+	<path d="m2.3555001 6.000525.00025 3.00035c.0001384 1.662 1.3379999 3.000015 2.9999999 3l19.643876-.000175c1.662-1.5e-5 3.000138-1.338 3-3l-.00025-3.00035c-.000138-1.662-1.338-3.0000148-3-3l-19.643876.000175c-1.662 1.48e-5-3.0001384 1.338-2.9999999 3z" color="#000000" opacity=".8"/>
+	<path d="m1.9997501 4.999825c0-1.662 1.3379999-3.0000145 2.9999999-3l19.999876.000175c.831 7.3e-6 1.5828.33275 2.125.875l-1.125 1.125-21.9998759 4.99975-1.125 1.125c-.54225-.54225-.875-1.294-.875-2.125z" color="#000000" fill="#444"/>
+	<path d="m2.8747501 10.12455 1.125-1.125 21.9998759-4.99975 1.125-1.125c.54225.54225.875 1.294.875 2.125v2.999925c0 1.662-1.338 3.000015-3 3l-19.999876-.000175c-.831-7e-6-1.5827999-.33275-2.1249999-.875z" color="#000000" fill="#1a1a1a"/>
+	<path d="m2.9997501 4.999825v2.999925c0 1.108.8919999 1.9999903 1.9999999 2l19.999876.000175c1.108 9.7e-6 2-.892 2-2v-2.999925c0-1.108-.892-1.9999903-2-2l-19.999876-.000175c-1.108-9.7e-6-1.9999999.892-1.9999999 2z" color="#000000" fill="#333"/>
+	<path d="m2.9997501 4.999375v1l23.9998759.000175v-1z" color="#000000" fill="#131313"/>
+	<path d="m2.9997501 5.999375v1l23.9998759.000175v-1z" color="#000000" fill="#ea0000"/>
+	<path d="m2.9997501 6.999375v1l23.9998759.000175v-1z" color="#000000" fill="#515151"/>
+</svg>
diff --git a/res/skins/LateNight/sliders_classic/knob_volume_deck.svg b/res/skins/LateNight/sliders_classic/knob_volume_deck.svg
new file mode 100644
index 000000000000..c659eaff3bed
--- /dev/null
+++ b/res/skins/LateNight/sliders_classic/knob_volume_deck.svg
@@ -0,0 +1 @@
+<svg width="46" height="19" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m4.794 16.14832c.60561.57244 1.4882.85239 2.062.85238l32.657-7e-4c1.4154.00035 2.7757-1.0248 2.9852-2.6991.01105 2.1371-.42549 3.6991-2.3306 3.6991h-32.811c-1.0882 0-2.3492-.62974-2.5625-1.8517z" color="#000000" opacity=".15"/><path d="m4.294 15.18332c.69268.64195 1.4882.81723 2.062.81722l32.555-7e-4c2.1018-4.5e-5 3.1018-1.6525 3.1018-2.9996v-5c0-.57381-.1985-1.2921-.58032-1.7777.86256.52578 1.0808 1.6891 1.0808 2.7773v5c0 1.662-1.338 3-3 3h-32.657c-1.0882 0-2.5339-.85452-2.5625-1.8165z" color="#000000" opacity=".5"/><path d="m3.356 8.00102v5c0 1.662 1.338 3 3 3h32.657c1.662 0 3-1.338 3-3v-5c0-1.662-1.338-3-3-3h-32.657c-1.662 0-3 1.338-3 3z" color="#000000" opacity=".8"/><path d="m2.9998 7.00072c0-1.662 1.338-3 3-3l33-7.5e-5c.831-1.9e-6 1.5828.33275 2.125.875l-1.125 1.125-35 7.0001-1.125 1.125c-.54225-.54225-.875-1.294-.875-2.125z" color="#000000" fill="#444"/><path d="m3.8748 14.12532 1.125-1.125 35-7.0001 1.125-1.125c.54225.54225.875 1.294.875 2.125v5c0 1.662-1.338 3-3 3l-33 7.5e-5c-.831 2e-6-1.5828-.33275-2.125-.875z" color="#000000" fill="#1a1a1a"/><path d="m3.9998 7.00072v5c0 1.108.892 2 2 2l33-7.5e-5c1.108-3e-6 2-.892 2-2v-5c0-1.108-.892-2-2-2l-33 7.5e-5c-1.108 2.5e-6-2 .892-2 2z" color="#000000" fill="#333"/><path d="m3.9998 8.00052v1l37-7.5e-5v-1z" color="#000000" fill="#131313"/><path d="m3.9998 10.00052v1l37-7.5e-5v-1z" color="#000000" fill="#515151"/><path d="m3.9998 9.00052v1l37-7.5e-5v-1z" color="#000000" fill="#ea0000"/></svg>
diff --git a/res/skins/LateNight/knobs_sliders/knob_volume_previewdeck.svg b/res/skins/LateNight/sliders_classic/knob_volume_previewdeck.svg
similarity index 100%
rename from res/skins/LateNight/knobs_sliders/knob_volume_previewdeck.svg
rename to res/skins/LateNight/sliders_classic/knob_volume_previewdeck.svg
diff --git a/res/skins/LateNight/sliders_classic/slider_crossfader.svg b/res/skins/LateNight/sliders_classic/slider_crossfader.svg
new file mode 100644
index 000000000000..cae6bb353d7f
--- /dev/null
+++ b/res/skins/LateNight/sliders_classic/slider_crossfader.svg
@@ -0,0 +1,30 @@
+<svg width="141" height="46" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m 134.00001,20 v 4 H 7 v -4 z" color="#000000" fill="#050505" stroke-width=".99999994"/>
+	<g transform="translate(0 -.5)" fill="#050505" stroke-width=".99979782">
+		<path d="m70.999796 26.5-2e-4 9h-.999596l2e-4-9z" color="#000000"/>
+		<path d="m70.999796 8.5-2e-4 9h-.999596l2e-4-9z" color="#000000"/>
+		<path d="m7.999796 26.5-2e-4 9h-.999596l2e-4-9z" color="#000000"/>
+		<path d="m7.999796 8.5-2e-4 9h-.999596l2e-4-9z" color="#000000"/>
+		<path d="m133.9998 26.5-2e-4 9h-.9996l2e-4-9z" color="#000000"/>
+		<path d="m133.9998 8.5-2e-4 9h-.9996l2e-4-9z" color="#000000"/>
+		<path d="m54.999796 26.5 2e-6 7h-.999596l-2e-6-7z" color="#000000"/>
+		<path d="m54.999998 10.5-.000402 7h-.999596l.000402-7z" color="#000000"/>
+		<path d="m86.999796 26.5 2e-6 7h-.999596l-2e-6-7z" color="#000000"/>
+		<path d="m86.999998 10.5-.000402 7h-.999596l.000402-7z" color="#000000"/>
+	</g>
+	<path d="m6 19v6h129v-6zm1 1h127v4h-127z" fill="#4b4b4b" style="paint-order:fill markers stroke"/>
+	<g fill="#636363" stroke-width=".99979782">
+		<path d="m70.999796 9-2e-4 9h-.999596l2e-4-9z" color="#000000"/>
+		<path d="m70.999596 36 2e-4-9h-.999596l-2e-4 9z" color="#000000"/>
+	</g>
+	<g fill="#4b4b4b" stroke-width=".99979782">
+		<path d="m7.999796 9-2e-4 9h-.999596l2e-4-9z" color="#000000"/>
+		<path d="m7.999596 36 2e-4-9h-.999596l-2e-4 9z" color="#000000"/>
+		<path d="m133.9998 9-2e-4 9h-.9996l2e-4-9z" color="#000000"/>
+		<path d="m133.9996 36 2e-4-9h-.9996l-2e-4 9z" color="#000000"/>
+		<path d="m54.999998 11-.000402 7h-.999596l.000402-7z" color="#000000"/>
+		<path d="m54.999798 34-2e-6-7h-.999596l2e-6 7z" color="#000000"/>
+		<path d="m86.999998 11-.000402 7h-.999596l.000402-7z" color="#000000"/>
+		<path d="m86.999798 34-2e-6-7h-.999596l2e-6 7z" color="#000000"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/sliders_classic/slider_crossfader_small.svg b/res/skins/LateNight/sliders_classic/slider_crossfader_small.svg
new file mode 100644
index 000000000000..53e312239994
--- /dev/null
+++ b/res/skins/LateNight/sliders_classic/slider_crossfader_small.svg
@@ -0,0 +1,34 @@
+<svg width="102" height="46" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g fill="#050505">
+		<path d="m94.00001 20v4h-87.00001v-4z" color="#000000" stroke-width=".99999994"/>
+		<g stroke-width=".99979782">
+			<path d="m50.999596 26v10h-.999596v-10z" color="#000000"/>
+			<path d="m50.999596 8v10h-.999596v-10z" color="#000000"/>
+			<path d="m7.999596 26v10h-.999596v-10z" color="#000000"/>
+			<path d="M 7.999596,7 V 17 H 7 V 7 Z" color="#000000"/>
+			<path d="m93.9996 26v10h-.9996v-10z" color="#000000"/>
+			<path d="m93.9996 7v10h-.9996v-10z" color="#000000"/>
+			<path d="m36.999596 26 .000202 8h-.999596l-.000202-8z" color="#000000"/>
+			<path d="m36.999798 9-.000202 8h-.999596l.000202-8z" color="#000000"/>
+			<path d="m64.999596 26 .000202 8h-.999596l-.000202-8z" color="#000000"/>
+			<path d="m64.999798 9-.000202 8h-.999596l.000202-8z" color="#000000"/>
+		</g>
+	</g>
+	<g fill="#4b4b4b">
+		<path d="m6 19v6h89v-6zm1 1h87v4h-87z" style="paint-order:fill markers stroke"/>
+		<g stroke-width=".99979782">
+			<path d="M 7.999596,8 V 18 H 7 V 8 Z" color="#000000"/>
+			<path d="m7.999596 37v-10h-.999596v10z" color="#000000"/>
+			<path d="m93.9996 8v10h-.9996v-10z" color="#000000"/>
+			<path d="m93.9996 37v-10h-.9996v10z" color="#000000"/>
+			<path d="m36.999798 10-.000202 8h-.999596l.000202-8z" color="#000000"/>
+			<path d="m36.999798 35-.000202-8h-.999596l.000202 8z" color="#000000"/>
+			<path d="m64.999798 10-.000202 8h-.999596l.000202-8z" color="#000000"/>
+			<path d="m64.999798 35-.000202-8h-.999596l.000202 8z" color="#000000"/>
+		</g>
+	</g>
+	<g transform="translate(-20)" fill="#636363" stroke-width=".99979782">
+		<path d="m70.999796 9-2e-4 9h-.999596l2e-4-9z" color="#000000"/>
+		<path d="m70.999596 36 2e-4-9h-.999596l-2e-4 9z" color="#000000"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/sliders_classic/slider_pitch_deck.svg b/res/skins/LateNight/sliders_classic/slider_pitch_deck.svg
new file mode 100644
index 000000000000..622fd753d9e2
--- /dev/null
+++ b/res/skins/LateNight/sliders_classic/slider_pitch_deck.svg
@@ -0,0 +1,46 @@
+<svg width="40" height="113" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g fill="#050505" stroke-width=".99979782">
+		<path d="m8 20.500564h8v.999596h-8z" color="#000000"/>
+		<path d="m8 32.500511h8v.999596h-8z" color="#000000"/>
+		<path d="m8 44.500457h8v.999596h-8z" color="#000000"/>
+		<path d="m6 56.500404h10v.999596h-10z" color="#000000"/>
+		<path d="m8 68.500361h8v.999596h-8z" color="#000000"/>
+		<path d="m8 80.500308h8v.999596h-8z" color="#000000"/>
+		<path d="m8 92.500254h8v.999596h-8z" color="#000000"/>
+		<path d="m32 20.500564h-8v.999596h8z" color="#000000"/>
+		<path d="m32 32.500511h-8v.999596h8z" color="#000000"/>
+		<path d="m32 44.500457h-8v.999596h8z" color="#000000"/>
+		<path d="m34 56.500404h-10v.999596h10z" color="#000000"/>
+		<path d="m32 68.500361h-8v.999596h8z" color="#000000"/>
+		<path d="m32 80.500308h-8v.999596h8z" color="#000000"/>
+		<path d="m32 92.500254h-8v.999596h8z" color="#000000"/>
+		<path d="m8 6.500564h8v.999596h-8z" color="#000000"/>
+		<path d="m32 6.500564h-8v.999596h8z" color="#000000"/>
+		<path d="m8 104.50025h8v.9996h-8z" color="#000000"/>
+		<path d="m32 104.50025h-8v.9996h8z" color="#000000"/>
+	</g>
+	<path d="m18 7h4v99h-4z" color="#000000" fill="#050505" stroke-width=".99999994"/>
+	<path d="m17 107h6v-101h-6zm1-1v-98.999999h4v98.999999z" fill="#505050" style="paint-order:fill markers stroke"/>
+	<g fill="#636363" stroke-width=".99979782">
+		<path d="m6 57.000404h10v.999596h-10z" color="#000000"/>
+		<path d="m34 57.000404h-10v.999596h10z" color="#000000"/>
+	</g>
+	<g fill="#404040" stroke-width=".99979782">
+		<path d="m8 21.000564h8v.999596h-8z" color="#000000"/>
+		<path d="m8 33.000511h8v.999596h-8z" color="#000000"/>
+		<path d="m8 45.000457h8v.999596h-8z" color="#000000"/>
+		<path d="m8 69.000361h8v.999596h-8z" color="#000000"/>
+		<path d="m8 81.000308h8v.999596h-8z" color="#000000"/>
+		<path d="m8 93.000254h8v.999596h-8z" color="#000000"/>
+		<path d="m32 21.000564h-8v.999596h8z" color="#000000"/>
+		<path d="m32 33.000511h-8v.999596h8z" color="#000000"/>
+		<path d="m32 45.000457h-8v.999596h8z" color="#000000"/>
+		<path d="m32 69.000361h-8v.999596h8z" color="#000000"/>
+		<path d="m32 81.000308h-8v.999596h8z" color="#000000"/>
+		<path d="m32 93.000254h-8v.999596h8z" color="#000000"/>
+		<path d="m8 7.000564h8v.999596h-8z" color="#000000"/>
+		<path d="m32 7.000564h-8v.999596h8z" color="#000000"/>
+		<path d="m8 105.00025h8v.9996h-8z" color="#000000"/>
+		<path d="m32 105.00025h-8v.9996h8z" color="#000000"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/sliders_classic/slider_pitch_sampler.svg b/res/skins/LateNight/sliders_classic/slider_pitch_sampler.svg
new file mode 100644
index 000000000000..7eab8ab4c57d
--- /dev/null
+++ b/res/skins/LateNight/sliders_classic/slider_pitch_sampler.svg
@@ -0,0 +1,40 @@
+<svg width="30" height="65" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(2)" fill="#050505">
+		<path d="m12 4.999999h2v55.000001h-2z" color="#000000" stroke-width=".99999994"/>
+		<g stroke-width=".99979782">
+			<path d="m4 4.500412h6v.999596h-6z" color="#000000"/>
+			<path d="m4 13.500404h6v.999596h-6z" color="#000000"/>
+			<path d="m2 31.500404h8v.999596h-8z" color="#000000"/>
+			<path d="m4 22.500404h6v.999596h-6z" color="#000000"/>
+			<path d="m4 40.500352h6v.999596h-6z" color="#000000"/>
+			<path d="m4 58.500254h6v.999596h-6z" color="#000000"/>
+			<path d="m4 49.500303h6v.999596h-6z" color="#000000"/>
+			<path d="m22 4.500412h-6v.999596h6z" color="#000000"/>
+			<path d="m22 13.500404h-6v.999596h6z" color="#000000"/>
+			<path d="m24 31.500404h-8v.999596h8z" color="#000000"/>
+			<path d="m22 22.500404h-6v.999596h6z" color="#000000"/>
+			<path d="m22 40.500352h-6v.999596h6z" color="#000000"/>
+			<path d="m22 58.500254h-6v.999596h6z" color="#000000"/>
+			<path d="m22 49.500303h-6v.999596h6z" color="#000000"/>
+		</g>
+	</g>
+	<path d="m13 61h4v-57.000001h-4zm1-1v-55h2v55z" fill="#505050" style="paint-order:fill markers stroke"/>
+	<g transform="translate(2)" fill="#636363" stroke-width=".99979782">
+		<path d="m2 32.000404h8v.999596h-8z" color="#000000"/>
+		<path d="m24 32.000404h-8v.999596h8z" color="#000000"/>
+	</g>
+	<g transform="translate(2)" fill="#404040" stroke-width=".99979782">
+		<path d="m4 5.000412h6v.999596h-6z" color="#000000"/>
+		<path d="m4 14.000404h6v.999596h-6z" color="#000000"/>
+		<path d="m4 23.000404h6v.999596h-6z" color="#000000"/>
+		<path d="m4 41.000352h6v.999596h-6z" color="#000000"/>
+		<path d="m4 59.000254h6v.999596h-6z" color="#000000"/>
+		<path d="m4 50.000303h6v.999596h-6z" color="#000000"/>
+		<path d="m22 5.000412h-6v.999596h6z" color="#000000"/>
+		<path d="m22 14.000404h-6v.999596h6z" color="#000000"/>
+		<path d="m22 23.000404h-6v.999596h6z" color="#000000"/>
+		<path d="m22 41.000352h-6v.999596h6z" color="#000000"/>
+		<path d="m22 59.000254h-6v.999596h6z" color="#000000"/>
+		<path d="m22 50.000303h-6v.999596h6z" color="#000000"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/sliders_classic/slider_volume_deck.svg b/res/skins/LateNight/sliders_classic/slider_volume_deck.svg
new file mode 100644
index 000000000000..ad23ef6c25ba
--- /dev/null
+++ b/res/skins/LateNight/sliders_classic/slider_volume_deck.svg
@@ -0,0 +1 @@
+<svg width="46" height="107" version="1.1" xmlns="http://www.w3.org/2000/svg"><g fill="#050505"><path d="m21 8h4v91h-4z" color="#000000" stroke-width=".99999994"/><g stroke-width=".99979782"><path d="m11 57.500804h8v.999596h-8z" color="#000000"/><path d="m11 67.500956h8v.999596h-8z" color="#000000"/><path d="m11 77.500705h8v.999596h-8z" color="#000000"/><path d="m11 87.500454h8v.999596h-8z" color="#000000"/><path d="m11 17.499953h8v.999596h-8z" color="#000000"/><path d="m11 27.501559h8v.999596h-8z" color="#000000"/><path d="m11 37.501307h8v.999596h-8z" color="#000000"/><path d="m11 47.501055h8v.999596h-8z" color="#000000"/><path d="m10 7.500404 9-.0002025v.999596l-9 .0002025z" color="#000000"/><path d="m10 97.500405 9-.000203v.999595l-9 .000203z" color="#000000"/><path d="m27 57.500804 7 .000203v.999596l-7-.000203z" color="#000000"/><path d="m27 67.500956 7 .000203v.999596l-7-.000203z" color="#000000"/><path d="m27 77.500705 7 .000203v.999596l-7-.000203z" color="#000000"/><path d="m27 87.500454 7 .000202v.999596l-7-.000202z" color="#000000"/><path d="m27 17.499953 7 .000202v.999596l-7-.000202z" color="#000000"/><path d="m27 27.501559 7 .000203v.999596l-7-.000203z" color="#000000"/><path d="m27 37.501307 7 .000203v.999596l-7-.000203z" color="#000000"/><path d="m27 47.501055 7 .000203v.999596l-7-.000203z" color="#000000"/></g></g><g stroke-width=".99979782"><g fill="#404040"><path d="m11 58.000804h8v.999596h-8z" color="#000000"/><path d="m11 68.000956h8v.999596h-8z" color="#000000"/><path d="m11 78.000705h8v.999596h-8z" color="#000000"/><path d="m11 88.000454h8v.999596h-8z" color="#000000"/><path d="m11 17.999953h8v.999596h-8z" color="#000000"/><path d="m11 28.001559h8v.999596h-8z" color="#000000"/><path d="m11 38.001307h8v.999596h-8z" color="#000000"/><path d="m11 48.001055h8v.999596h-8z" color="#000000"/><path d="m27 58.000804 7 .000203v.999596l-7-.000203z" color="#000000"/><path d="m27 68.000956 7 .000203v.999596l-7-.000203z" color="#000000"/><path d="m27 78.000705 7 .000203v.999596l-7-.000203z" color="#000000"/><path d="m27 88.000454 7 .000202v.999596l-7-.000202z" color="#000000"/><path d="m27 17.999953 7 .000202v.999596l-7-.000202z" color="#000000"/><path d="m27 28.001559 7 .000203v.999596l-7-.000203z" color="#000000"/><path d="m27 38.001307 7 .000203v.999596l-7-.000203z" color="#000000"/><path d="m27 48.001055 7 .000203v.999596l-7-.000203z" color="#000000"/></g><path d="m27 7.5002015 8 .0002025v.999596l-8-.0002025z" color="#000000" fill="#050505"/><path d="m27 97.500202 8 .000202v.999596l-8-.000203z" color="#000000" fill="#050505"/></g><g fill="#505050"><path d="m20 100h6v-93h-6zm1-.999999v-90.9999996h4v90.9999996z" style="paint-order:fill markers stroke"/><g stroke-width=".99979782"><path d="m10 8.000404 9-.0002025v.999596l-9 .0002025z" color="#000000"/><path d="m10 98.000405 9-.000203v.999595l-9 .000203z" color="#000000"/><path d="m27 8.0002015 8 .0002025v.999596l-8-.0002025z" color="#000000"/><path d="m27 98.000202 8 .000202v.999596l-8-.000203z" color="#000000"/></g></g></svg>
diff --git a/res/skins/LateNight/knobs_sliders/slider_volume_previewdeck.svg b/res/skins/LateNight/sliders_classic/slider_volume_previewdeck.svg
similarity index 100%
rename from res/skins/LateNight/knobs_sliders/slider_volume_previewdeck.svg
rename to res/skins/LateNight/sliders_classic/slider_volume_previewdeck.svg
diff --git a/res/skins/LateNight/sliders_flip/knob_crossfader.svg b/res/skins/LateNight/sliders_flip/knob_crossfader.svg
new file mode 100644
index 000000000000..e3feb46ed8c3
--- /dev/null
+++ b/res/skins/LateNight/sliders_flip/knob_crossfader.svg
@@ -0,0 +1,14 @@
+<svg width="19" height="46" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m5.43775 42.562075c.45484.27725.98869.437484 1.5625.4375l5.5.00015c1.415374.00035 2.4995-.99965 2.830554-2 0 1.662-.668554 3.00005-2.330554 3l-5-.00015c-1.0882-3.3e-5-2.0367-.57494-2.5625-1.4375z" color="#000000" opacity=".15"/>
+	<path d="m4.93775 41.562075c.45484.27725.98869.437484 1.5625.4375l5.397748.00015c2.101752 5.8e-5 3.101752-1.652533 3.101752-2.99965v-34c0-.57381-.198496-1.292136-.580323-1.777694.86256.52578 1.080823 1.689144 1.080823 2.777344v34c0 1.662-1.338 3.00005-3 3l-5-.00015c-1.0882-3.3e-5-2.0367-.57494-2.5625-1.4375z" color="#000000" opacity=".5"/>
+	<path d="m3.99975 5.000275v34c0 1.662 1.338 2.99995 3 3l5 .00015c1.662 5e-5 3-1.338 3-3v-34c0-1.662-1.338-2.9999501-3-3l-5-.00015c-1.662-4.99e-5-3 1.338-3 3z" color="#000000" opacity=".8"/>
+	<path d="m6.99975 2.000425c-1.662 0-3 1.338-3 3v32.99985c0 .831.33275 1.5828.875 2.125l1.125-1.125 7-34.99985 1.125-1.125c-.54225-.54225-1.294-.875-2.125-.875z" color="#000000" fill="#444"/>
+	<path d="m14.12475 2.875425-1.125 1.125-7 34.99985-1.125 1.125c.54225.54225 1.294.875 2.125.875h5c1.662 0 3-1.338 3-3v-32.99985c0-.831-.33275-1.5828-.875-2.125z" color="#000000" fill="#1a1a1a"/>
+	<path d="m6.99975 3.000425h5c1.108 0 2 .892 2 2v32.99985c0 1.108-.892 2-2 2h-5c-1.108 0-2-.892-2-2v-32.99985c0-1.108.892-2 2-2z" color="#000000" fill="#333"/>
+	<g>
+		<path d="m8.00052 40h1l-7.5e-5-37h-1z" color="#000000" fill="#c20000"/>
+		<path d="m10.00052 40h1l-7.5e-5-37h-1z" color="#000000" fill="#ea0000"/>
+		<path d="m9.00052 40h1l-7.5e-5-37h-1z" color="#000000" fill="#d60000"/>
+		<path d="m7 40h1l-7.5e-5-37h-1z" color="#000000" fill="#282828"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/sliders_flip/knob_pitch_deck.svg b/res/skins/LateNight/sliders_flip/knob_pitch_deck.svg
new file mode 100644
index 000000000000..ac116f795aa7
--- /dev/null
+++ b/res/skins/LateNight/sliders_flip/knob_pitch_deck.svg
@@ -0,0 +1,14 @@
+<svg width="40" height="17" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m3.7942 15.148c.60561.57244 1.4882.85239 2.062.85238l29.657-7e-4c1.4154.00035 2.7757-1.0248 2.9852-2.6991.01105 2.1371-.42549 3.6991-2.3306 3.6991h-29.811c-1.0882 0-2.3492-.62974-2.5625-1.8517z" color="#000000" opacity=".15"/>
+	<path d="m3.2942 14.183c.69268.64195 1.4882.81723 2.062.81722l29.555-7e-4c2.1018-5e-5 3.1018-1.6525 3.1018-2.9996v-5c0-.57381-.1985-1.2921-.58032-1.7777.86256.52578 1.0808 1.6891 1.0808 2.7773v5c0 1.662-1.338 3-3 3h-29.657c-1.0882 0-2.5339-.85452-2.5625-1.8165z" color="#000000" opacity=".5"/>
+	<path d="m2.3562 7.0005v5c0 1.662 1.338 3 3 3h29.657c1.662 0 3-1.338 3-3v-5c0-1.662-1.338-3-3-3h-29.657c-1.662 0-3 1.338-3 3z" color="#000000" opacity=".8"/>
+	<path d="m2 6.0002c0-1.662 1.338-3 3-3h30.001c.831 0 1.5828.33275 2.125.875l-1.125 1.125-32.001 7-1.125 1.125c-.54225-.54225-.875-1.294-.875-2.125z" color="#000000" fill="#444"/>
+	<path d="m2.875 13.125 1.125-1.125 32.001-7 1.125-1.125c.54225.54225.875 1.294.875 2.125v5c0 1.662-1.338 3-3 3h-30.001c-.831 0-1.5828-.33275-2.125-.875z" color="#000000" fill="#1a1a1a"/>
+	<path d="m3 6.0002v5c0 1.108.892 2 2 2h30.001c1.108 0 2-.892 2-2v-5c0-1.108-.892-2-2-2h-30.001c-1.108 0-2 .892-2 2z" color="#000000" fill="#333"/>
+	<g>
+		<path d="m3 7v1l34-7.5e-5v-1z" color="#000000" fill="#ae0000"/>
+		<path d="m3 9v1l34-7.5e-5v-1z" color="#000000" fill="#ff2727"/>
+		<path d="m3 8v1l34-7.5e-5v-1z" color="#000000" fill="#ea0000"/>
+		<path d="m3 5.99948v1l34-7.5e-5v-1z" color="#000000" fill="#1a1a1a"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/sliders_flip/knob_pitch_sampler.svg b/res/skins/LateNight/sliders_flip/knob_pitch_sampler.svg
new file mode 100644
index 000000000000..ba3cee8fdf1e
--- /dev/null
+++ b/res/skins/LateNight/sliders_flip/knob_pitch_sampler.svg
@@ -0,0 +1,13 @@
+<svg width="30" height="13" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m3.2937501 11.18361c.5042904.413239 1.0752284.816575 2.2053571.816565l19.3987668-.000175c2.101752-1.9e-5 3.101864-1.652533 3.101752-2.99965l-.00025-3.00035c-4.8e-5-.57381-.198496-1.2921355-.580323-1.7776934.86256.52578 1.080732 1.6891434 1.080823 2.7773434l.00025 3.00035c.000138 1.662-1.338 2.999985-3 3l-19.643876.000175c-1.0882 1e-5-2.2715901-.138071-2.5624999-1.816565z" color="#000000" opacity=".5"/>
+	<path d="m2.3555001 6.000525.00025 3.00035c.0001384 1.662 1.3379999 3.000015 2.9999999 3l19.643876-.000175c1.662-1.5e-5 3.000138-1.338 3-3l-.00025-3.00035c-.000138-1.662-1.338-3.0000148-3-3l-19.643876.000175c-1.662 1.48e-5-3.0001384 1.338-2.9999999 3z" color="#000000" opacity=".8"/>
+	<path d="m1.9997501 4.999825c0-1.662 1.3379999-3.0000145 2.9999999-3l19.999876.000175c.831 7.3e-6 1.5828.33275 2.125.875l-1.125 1.125-21.9998759 4.99975-1.125 1.125c-.54225-.54225-.875-1.294-.875-2.125z" color="#000000" fill="#444"/>
+	<path d="m2.8747501 10.12455 1.125-1.125 21.9998759-4.99975 1.125-1.125c.54225.54225.875 1.294.875 2.125v2.999925c0 1.662-1.338 3.000015-3 3l-19.999876-.000175c-.831-7e-6-1.5827999-.33275-2.1249999-.875z" color="#000000" fill="#1a1a1a"/>
+	<path d="m2.9997501 4.999825v2.999925c0 1.108.8919999 1.9999903 1.9999999 2l19.999876.000175c1.108 9.7e-6 2-.892 2-2v-2.999925c0-1.108-.892-1.9999903-2-2l-19.999876-.000175c-1.108-9.7e-6-1.9999999.892-1.9999999 2z" color="#000000" fill="#333"/>
+	<g stroke-width=".99999994">
+		<path d="m3.0000001 5.00052v1l23.9999999-7.5e-5v-1z" color="#000000" fill="#ae0000"/>
+		<path d="m3.0000001 7.00052v1l23.9999999-7.5e-5v-1z" color="#000000" fill="#ff2727"/>
+		<path d="m3.0000001 6.00052v1l23.9999999-7.5e-5v-1z" color="#000000" fill="#ea0000"/>
+		<path d="M 3.2142749,4 3.0000001,5 27,4.999925 v -1 z" color="#000000" fill="#1a1a1a"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/sliders_flip/knob_volume_deck.svg b/res/skins/LateNight/sliders_flip/knob_volume_deck.svg
new file mode 100644
index 000000000000..349bc072e5be
--- /dev/null
+++ b/res/skins/LateNight/sliders_flip/knob_volume_deck.svg
@@ -0,0 +1,12 @@
+<svg width="46" height="19" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m4.794 16.14832c.60561.57244 1.4882.85239 2.062.85238l32.657-7e-4c1.4154.00035 2.7757-1.0248 2.9852-2.6991.01105 2.1371-.42549 3.6991-2.3306 3.6991h-32.811c-1.0882 0-2.3492-.62974-2.5625-1.8517z" color="#000000" opacity=".15"/>
+	<path d="m4.294 15.18332c.69268.64195 1.4882.81723 2.062.81722l32.555-7e-4c2.1018-4.5e-5 3.1018-1.6525 3.1018-2.9996v-5c0-.57381-.1985-1.2921-.58032-1.7777.86256.52578 1.0808 1.6891 1.0808 2.7773v5c0 1.662-1.338 3-3 3h-32.657c-1.0882 0-2.5339-.85452-2.5625-1.8165z" color="#000000" opacity=".5"/>
+	<path d="m3.356 8.00102v5c0 1.662 1.338 3 3 3h32.657c1.662 0 3-1.338 3-3v-5c0-1.662-1.338-3-3-3h-32.657c-1.662 0-3 1.338-3 3z" color="#000000" opacity=".8"/>
+	<path d="m2.9998 7.00072c0-1.662 1.338-3 3-3l33-7.5e-5c.831-1.9e-6 1.5828.33275 2.125.875l-1.125 1.125-35 7.0001-1.125 1.125c-.54225-.54225-.875-1.294-.875-2.125z" color="#000000" fill="#444"/>
+	<path d="m3.8748 14.12532 1.125-1.125 35-7.0001 1.125-1.125c.54225.54225.875 1.294.875 2.125v5c0 1.662-1.338 3-3 3l-33 7.5e-5c-.831 2e-6-1.5828-.33275-2.125-.875z" color="#000000" fill="#1a1a1a"/>
+	<path d="m3.9998 7.00072v5c0 1.108.892 2 2 2l33-7.5e-5c1.108-3e-6 2-.892 2-2v-5c0-1.108-.892-2-2-2l-33 7.5e-5c-1.108 2.5e-6-2 .892-2 2z" color="#000000" fill="#333"/>
+	<path d="m3.9998 8.00052v1l37-7.5e-5v-1z" color="#000000" fill="#ae0000"/>
+	<path d="m3.9998 10.00052v1l37-7.5e-5v-1z" color="#000000" fill="#ff2727"/>
+	<path d="m3.9998 9.00052v1l37-7.5e-5v-1z" color="#000000" fill="#ea0000"/>
+	<path d="m3.9998 7v1l37-7.5e-5v-1z" color="#000000" fill="#1a1a1a"/>
+</svg>
diff --git a/res/skins/LateNight/sliders_flip/knob_volume_previewdeck.svg b/res/skins/LateNight/sliders_flip/knob_volume_previewdeck.svg
new file mode 100644
index 000000000000..28d7c0468f71
--- /dev/null
+++ b/res/skins/LateNight/sliders_flip/knob_volume_previewdeck.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg2" width="10" height="9" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata id="metadata7">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g id="layer1" transform="translate(0 -1043.4)">
+  <path id="path2996" transform="matrix(1.0017 0 0 1.0017 -2.6114 1047.8)" d="m2.8125-2.4075e-7 7.7812-4.4925v8.985z" color="#000000" fill="#a4a4a4"/>
+ </g>
+</svg>
diff --git a/res/skins/LateNight/sliders_flip/slider_crossfader.svg b/res/skins/LateNight/sliders_flip/slider_crossfader.svg
new file mode 100644
index 000000000000..cae6bb353d7f
--- /dev/null
+++ b/res/skins/LateNight/sliders_flip/slider_crossfader.svg
@@ -0,0 +1,30 @@
+<svg width="141" height="46" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m 134.00001,20 v 4 H 7 v -4 z" color="#000000" fill="#050505" stroke-width=".99999994"/>
+	<g transform="translate(0 -.5)" fill="#050505" stroke-width=".99979782">
+		<path d="m70.999796 26.5-2e-4 9h-.999596l2e-4-9z" color="#000000"/>
+		<path d="m70.999796 8.5-2e-4 9h-.999596l2e-4-9z" color="#000000"/>
+		<path d="m7.999796 26.5-2e-4 9h-.999596l2e-4-9z" color="#000000"/>
+		<path d="m7.999796 8.5-2e-4 9h-.999596l2e-4-9z" color="#000000"/>
+		<path d="m133.9998 26.5-2e-4 9h-.9996l2e-4-9z" color="#000000"/>
+		<path d="m133.9998 8.5-2e-4 9h-.9996l2e-4-9z" color="#000000"/>
+		<path d="m54.999796 26.5 2e-6 7h-.999596l-2e-6-7z" color="#000000"/>
+		<path d="m54.999998 10.5-.000402 7h-.999596l.000402-7z" color="#000000"/>
+		<path d="m86.999796 26.5 2e-6 7h-.999596l-2e-6-7z" color="#000000"/>
+		<path d="m86.999998 10.5-.000402 7h-.999596l.000402-7z" color="#000000"/>
+	</g>
+	<path d="m6 19v6h129v-6zm1 1h127v4h-127z" fill="#4b4b4b" style="paint-order:fill markers stroke"/>
+	<g fill="#636363" stroke-width=".99979782">
+		<path d="m70.999796 9-2e-4 9h-.999596l2e-4-9z" color="#000000"/>
+		<path d="m70.999596 36 2e-4-9h-.999596l-2e-4 9z" color="#000000"/>
+	</g>
+	<g fill="#4b4b4b" stroke-width=".99979782">
+		<path d="m7.999796 9-2e-4 9h-.999596l2e-4-9z" color="#000000"/>
+		<path d="m7.999596 36 2e-4-9h-.999596l-2e-4 9z" color="#000000"/>
+		<path d="m133.9998 9-2e-4 9h-.9996l2e-4-9z" color="#000000"/>
+		<path d="m133.9996 36 2e-4-9h-.9996l-2e-4 9z" color="#000000"/>
+		<path d="m54.999998 11-.000402 7h-.999596l.000402-7z" color="#000000"/>
+		<path d="m54.999798 34-2e-6-7h-.999596l2e-6 7z" color="#000000"/>
+		<path d="m86.999998 11-.000402 7h-.999596l.000402-7z" color="#000000"/>
+		<path d="m86.999798 34-2e-6-7h-.999596l2e-6 7z" color="#000000"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/sliders_flip/slider_crossfader_small.svg b/res/skins/LateNight/sliders_flip/slider_crossfader_small.svg
new file mode 100644
index 000000000000..53e312239994
--- /dev/null
+++ b/res/skins/LateNight/sliders_flip/slider_crossfader_small.svg
@@ -0,0 +1,34 @@
+<svg width="102" height="46" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g fill="#050505">
+		<path d="m94.00001 20v4h-87.00001v-4z" color="#000000" stroke-width=".99999994"/>
+		<g stroke-width=".99979782">
+			<path d="m50.999596 26v10h-.999596v-10z" color="#000000"/>
+			<path d="m50.999596 8v10h-.999596v-10z" color="#000000"/>
+			<path d="m7.999596 26v10h-.999596v-10z" color="#000000"/>
+			<path d="M 7.999596,7 V 17 H 7 V 7 Z" color="#000000"/>
+			<path d="m93.9996 26v10h-.9996v-10z" color="#000000"/>
+			<path d="m93.9996 7v10h-.9996v-10z" color="#000000"/>
+			<path d="m36.999596 26 .000202 8h-.999596l-.000202-8z" color="#000000"/>
+			<path d="m36.999798 9-.000202 8h-.999596l.000202-8z" color="#000000"/>
+			<path d="m64.999596 26 .000202 8h-.999596l-.000202-8z" color="#000000"/>
+			<path d="m64.999798 9-.000202 8h-.999596l.000202-8z" color="#000000"/>
+		</g>
+	</g>
+	<g fill="#4b4b4b">
+		<path d="m6 19v6h89v-6zm1 1h87v4h-87z" style="paint-order:fill markers stroke"/>
+		<g stroke-width=".99979782">
+			<path d="M 7.999596,8 V 18 H 7 V 8 Z" color="#000000"/>
+			<path d="m7.999596 37v-10h-.999596v10z" color="#000000"/>
+			<path d="m93.9996 8v10h-.9996v-10z" color="#000000"/>
+			<path d="m93.9996 37v-10h-.9996v10z" color="#000000"/>
+			<path d="m36.999798 10-.000202 8h-.999596l.000202-8z" color="#000000"/>
+			<path d="m36.999798 35-.000202-8h-.999596l.000202 8z" color="#000000"/>
+			<path d="m64.999798 10-.000202 8h-.999596l.000202-8z" color="#000000"/>
+			<path d="m64.999798 35-.000202-8h-.999596l.000202 8z" color="#000000"/>
+		</g>
+	</g>
+	<g transform="translate(-20)" fill="#636363" stroke-width=".99979782">
+		<path d="m70.999796 9-2e-4 9h-.999596l2e-4-9z" color="#000000"/>
+		<path d="m70.999596 36 2e-4-9h-.999596l-2e-4 9z" color="#000000"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/sliders_flip/slider_pitch_deck.svg b/res/skins/LateNight/sliders_flip/slider_pitch_deck.svg
new file mode 100644
index 000000000000..622fd753d9e2
--- /dev/null
+++ b/res/skins/LateNight/sliders_flip/slider_pitch_deck.svg
@@ -0,0 +1,46 @@
+<svg width="40" height="113" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g fill="#050505" stroke-width=".99979782">
+		<path d="m8 20.500564h8v.999596h-8z" color="#000000"/>
+		<path d="m8 32.500511h8v.999596h-8z" color="#000000"/>
+		<path d="m8 44.500457h8v.999596h-8z" color="#000000"/>
+		<path d="m6 56.500404h10v.999596h-10z" color="#000000"/>
+		<path d="m8 68.500361h8v.999596h-8z" color="#000000"/>
+		<path d="m8 80.500308h8v.999596h-8z" color="#000000"/>
+		<path d="m8 92.500254h8v.999596h-8z" color="#000000"/>
+		<path d="m32 20.500564h-8v.999596h8z" color="#000000"/>
+		<path d="m32 32.500511h-8v.999596h8z" color="#000000"/>
+		<path d="m32 44.500457h-8v.999596h8z" color="#000000"/>
+		<path d="m34 56.500404h-10v.999596h10z" color="#000000"/>
+		<path d="m32 68.500361h-8v.999596h8z" color="#000000"/>
+		<path d="m32 80.500308h-8v.999596h8z" color="#000000"/>
+		<path d="m32 92.500254h-8v.999596h8z" color="#000000"/>
+		<path d="m8 6.500564h8v.999596h-8z" color="#000000"/>
+		<path d="m32 6.500564h-8v.999596h8z" color="#000000"/>
+		<path d="m8 104.50025h8v.9996h-8z" color="#000000"/>
+		<path d="m32 104.50025h-8v.9996h8z" color="#000000"/>
+	</g>
+	<path d="m18 7h4v99h-4z" color="#000000" fill="#050505" stroke-width=".99999994"/>
+	<path d="m17 107h6v-101h-6zm1-1v-98.999999h4v98.999999z" fill="#505050" style="paint-order:fill markers stroke"/>
+	<g fill="#636363" stroke-width=".99979782">
+		<path d="m6 57.000404h10v.999596h-10z" color="#000000"/>
+		<path d="m34 57.000404h-10v.999596h10z" color="#000000"/>
+	</g>
+	<g fill="#404040" stroke-width=".99979782">
+		<path d="m8 21.000564h8v.999596h-8z" color="#000000"/>
+		<path d="m8 33.000511h8v.999596h-8z" color="#000000"/>
+		<path d="m8 45.000457h8v.999596h-8z" color="#000000"/>
+		<path d="m8 69.000361h8v.999596h-8z" color="#000000"/>
+		<path d="m8 81.000308h8v.999596h-8z" color="#000000"/>
+		<path d="m8 93.000254h8v.999596h-8z" color="#000000"/>
+		<path d="m32 21.000564h-8v.999596h8z" color="#000000"/>
+		<path d="m32 33.000511h-8v.999596h8z" color="#000000"/>
+		<path d="m32 45.000457h-8v.999596h8z" color="#000000"/>
+		<path d="m32 69.000361h-8v.999596h8z" color="#000000"/>
+		<path d="m32 81.000308h-8v.999596h8z" color="#000000"/>
+		<path d="m32 93.000254h-8v.999596h8z" color="#000000"/>
+		<path d="m8 7.000564h8v.999596h-8z" color="#000000"/>
+		<path d="m32 7.000564h-8v.999596h8z" color="#000000"/>
+		<path d="m8 105.00025h8v.9996h-8z" color="#000000"/>
+		<path d="m32 105.00025h-8v.9996h8z" color="#000000"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/sliders_flip/slider_pitch_sampler.svg b/res/skins/LateNight/sliders_flip/slider_pitch_sampler.svg
new file mode 100644
index 000000000000..7eab8ab4c57d
--- /dev/null
+++ b/res/skins/LateNight/sliders_flip/slider_pitch_sampler.svg
@@ -0,0 +1,40 @@
+<svg width="30" height="65" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(2)" fill="#050505">
+		<path d="m12 4.999999h2v55.000001h-2z" color="#000000" stroke-width=".99999994"/>
+		<g stroke-width=".99979782">
+			<path d="m4 4.500412h6v.999596h-6z" color="#000000"/>
+			<path d="m4 13.500404h6v.999596h-6z" color="#000000"/>
+			<path d="m2 31.500404h8v.999596h-8z" color="#000000"/>
+			<path d="m4 22.500404h6v.999596h-6z" color="#000000"/>
+			<path d="m4 40.500352h6v.999596h-6z" color="#000000"/>
+			<path d="m4 58.500254h6v.999596h-6z" color="#000000"/>
+			<path d="m4 49.500303h6v.999596h-6z" color="#000000"/>
+			<path d="m22 4.500412h-6v.999596h6z" color="#000000"/>
+			<path d="m22 13.500404h-6v.999596h6z" color="#000000"/>
+			<path d="m24 31.500404h-8v.999596h8z" color="#000000"/>
+			<path d="m22 22.500404h-6v.999596h6z" color="#000000"/>
+			<path d="m22 40.500352h-6v.999596h6z" color="#000000"/>
+			<path d="m22 58.500254h-6v.999596h6z" color="#000000"/>
+			<path d="m22 49.500303h-6v.999596h6z" color="#000000"/>
+		</g>
+	</g>
+	<path d="m13 61h4v-57.000001h-4zm1-1v-55h2v55z" fill="#505050" style="paint-order:fill markers stroke"/>
+	<g transform="translate(2)" fill="#636363" stroke-width=".99979782">
+		<path d="m2 32.000404h8v.999596h-8z" color="#000000"/>
+		<path d="m24 32.000404h-8v.999596h8z" color="#000000"/>
+	</g>
+	<g transform="translate(2)" fill="#404040" stroke-width=".99979782">
+		<path d="m4 5.000412h6v.999596h-6z" color="#000000"/>
+		<path d="m4 14.000404h6v.999596h-6z" color="#000000"/>
+		<path d="m4 23.000404h6v.999596h-6z" color="#000000"/>
+		<path d="m4 41.000352h6v.999596h-6z" color="#000000"/>
+		<path d="m4 59.000254h6v.999596h-6z" color="#000000"/>
+		<path d="m4 50.000303h6v.999596h-6z" color="#000000"/>
+		<path d="m22 5.000412h-6v.999596h6z" color="#000000"/>
+		<path d="m22 14.000404h-6v.999596h6z" color="#000000"/>
+		<path d="m22 23.000404h-6v.999596h6z" color="#000000"/>
+		<path d="m22 41.000352h-6v.999596h6z" color="#000000"/>
+		<path d="m22 59.000254h-6v.999596h6z" color="#000000"/>
+		<path d="m22 50.000303h-6v.999596h6z" color="#000000"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/sliders_flip/slider_volume_deck.svg b/res/skins/LateNight/sliders_flip/slider_volume_deck.svg
new file mode 100644
index 000000000000..ad23ef6c25ba
--- /dev/null
+++ b/res/skins/LateNight/sliders_flip/slider_volume_deck.svg
@@ -0,0 +1 @@
+<svg width="46" height="107" version="1.1" xmlns="http://www.w3.org/2000/svg"><g fill="#050505"><path d="m21 8h4v91h-4z" color="#000000" stroke-width=".99999994"/><g stroke-width=".99979782"><path d="m11 57.500804h8v.999596h-8z" color="#000000"/><path d="m11 67.500956h8v.999596h-8z" color="#000000"/><path d="m11 77.500705h8v.999596h-8z" color="#000000"/><path d="m11 87.500454h8v.999596h-8z" color="#000000"/><path d="m11 17.499953h8v.999596h-8z" color="#000000"/><path d="m11 27.501559h8v.999596h-8z" color="#000000"/><path d="m11 37.501307h8v.999596h-8z" color="#000000"/><path d="m11 47.501055h8v.999596h-8z" color="#000000"/><path d="m10 7.500404 9-.0002025v.999596l-9 .0002025z" color="#000000"/><path d="m10 97.500405 9-.000203v.999595l-9 .000203z" color="#000000"/><path d="m27 57.500804 7 .000203v.999596l-7-.000203z" color="#000000"/><path d="m27 67.500956 7 .000203v.999596l-7-.000203z" color="#000000"/><path d="m27 77.500705 7 .000203v.999596l-7-.000203z" color="#000000"/><path d="m27 87.500454 7 .000202v.999596l-7-.000202z" color="#000000"/><path d="m27 17.499953 7 .000202v.999596l-7-.000202z" color="#000000"/><path d="m27 27.501559 7 .000203v.999596l-7-.000203z" color="#000000"/><path d="m27 37.501307 7 .000203v.999596l-7-.000203z" color="#000000"/><path d="m27 47.501055 7 .000203v.999596l-7-.000203z" color="#000000"/></g></g><g stroke-width=".99979782"><g fill="#404040"><path d="m11 58.000804h8v.999596h-8z" color="#000000"/><path d="m11 68.000956h8v.999596h-8z" color="#000000"/><path d="m11 78.000705h8v.999596h-8z" color="#000000"/><path d="m11 88.000454h8v.999596h-8z" color="#000000"/><path d="m11 17.999953h8v.999596h-8z" color="#000000"/><path d="m11 28.001559h8v.999596h-8z" color="#000000"/><path d="m11 38.001307h8v.999596h-8z" color="#000000"/><path d="m11 48.001055h8v.999596h-8z" color="#000000"/><path d="m27 58.000804 7 .000203v.999596l-7-.000203z" color="#000000"/><path d="m27 68.000956 7 .000203v.999596l-7-.000203z" color="#000000"/><path d="m27 78.000705 7 .000203v.999596l-7-.000203z" color="#000000"/><path d="m27 88.000454 7 .000202v.999596l-7-.000202z" color="#000000"/><path d="m27 17.999953 7 .000202v.999596l-7-.000202z" color="#000000"/><path d="m27 28.001559 7 .000203v.999596l-7-.000203z" color="#000000"/><path d="m27 38.001307 7 .000203v.999596l-7-.000203z" color="#000000"/><path d="m27 48.001055 7 .000203v.999596l-7-.000203z" color="#000000"/></g><path d="m27 7.5002015 8 .0002025v.999596l-8-.0002025z" color="#000000" fill="#050505"/><path d="m27 97.500202 8 .000202v.999596l-8-.000203z" color="#000000" fill="#050505"/></g><g fill="#505050"><path d="m20 100h6v-93h-6zm1-.999999v-90.9999996h4v90.9999996z" style="paint-order:fill markers stroke"/><g stroke-width=".99979782"><path d="m10 8.000404 9-.0002025v.999596l-9 .0002025z" color="#000000"/><path d="m10 98.000405 9-.000203v.999595l-9 .000203z" color="#000000"/><path d="m27 8.0002015 8 .0002025v.999596l-8-.0002025z" color="#000000"/><path d="m27 98.000202 8 .000202v.999596l-8-.000203z" color="#000000"/></g></g></svg>
diff --git a/res/skins/LateNight/sliders_flip/slider_volume_previewdeck.svg b/res/skins/LateNight/sliders_flip/slider_volume_previewdeck.svg
new file mode 100644
index 000000000000..2bb28ac91ff1
--- /dev/null
+++ b/res/skins/LateNight/sliders_flip/slider_volume_previewdeck.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg3017" width="10" height="54" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata id="metadata3022">
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+</svg>
diff --git a/res/skins/LateNight/spinny_coverart.xml b/res/skins/LateNight/spinny_coverart.xml
index 1e456c16b302..7327fae90b0c 100644
--- a/res/skins/LateNight/spinny_coverart.xml
+++ b/res/skins/LateNight/spinny_coverart.xml
@@ -12,19 +12,18 @@
           <WidgetGroup>
             <ObjectName>SpinnyContainer</ObjectName>
             <Layout>horizontal</Layout>
-            <SizePolicy>me,me</SizePolicy>
+            <SizePolicy>min,me</SizePolicy>
             <Children>
 
               <Spinny>
                 <TooltipId>spinny</TooltipId>
                 <SizePolicy>me,me</SizePolicy>
                 <MinimumSize>40,40</MinimumSize>
-                <MaximumSize><Variable name="MaxSize"/></MaximumSize>
                 <Group><Variable name="group"/></Group>
-                <PathBackground scalemode="STRETCH_ASPECT">style/spinny_bg.svg</PathBackground>
-                <PathMask scalemode="STRETCH_ASPECT">style/spinny<Variable name="channum"/>_mask.svg</PathMask>
-                <PathForeground>style/spinny_indicator.svg</PathForeground>
-                <PathGhost>style/spinny_indicator_ghost.svg</PathGhost>
+                <PathBackground scalemode="STRETCH_ASPECT">skin:/style_<Variable name="style_scheme"/>/spinny_bg.svg</PathBackground>
+                <PathMask scalemode="STRETCH_ASPECT">skin:/style_<Variable name="style_scheme"/>/spinny<Variable name="channum"/>_mask.svg</PathMask>
+                <PathForeground>skin:/style_<Variable name="style_scheme"/>/spinny_indicator.svg</PathForeground>
+                <PathGhost>skin:/style_<Variable name="style_scheme"/>/spinny_indicator_ghost.svg</PathGhost>
                 <ShowCover>false</ShowCover>
                 <Connection>
                   <ConfigKey persist="true">[Skin],show_coverart</ConfigKey>
@@ -37,12 +36,11 @@
                 <TooltipId>spinny</TooltipId>
                 <SizePolicy>me,me</SizePolicy>
                 <MinimumSize>40,40</MinimumSize>
-                <MaximumSize><Variable name="MaxSize"/></MaximumSize>
                 <Group><Variable name="group"/></Group>
-                <PathBackground scalemode="STRETCH_ASPECT">style/spinny_bg.svg</PathBackground>
-                <PathMask scalemode="STRETCH_ASPECT">style/spinny<Variable name="channum"/>_mask.svg</PathMask>
-                <PathForeground>style/spinny_indicator.svg</PathForeground>
-                <PathGhost>style/spinny_indicator_ghost.svg</PathGhost>
+                <PathBackground scalemode="STRETCH_ASPECT">skin:/style_<Variable name="style_scheme"/>/spinny_bg.svg</PathBackground>
+                <PathMask scalemode="STRETCH_ASPECT">skin:/style_<Variable name="style_scheme"/>/spinny<Variable name="channum"/>_mask.svg</PathMask>
+                <PathForeground>skin:/style_<Variable name="style_scheme"/>/spinny_indicator.svg</PathForeground>
+                <PathGhost>skin:/style_<Variable name="style_scheme"/>/spinny_indicator_ghost.svg</PathGhost>
                 <ShowCover>true</ShowCover>
                 <Connection>
                   <ConfigKey persist="true">[Skin],show_coverart</ConfigKey>
@@ -51,10 +49,6 @@
               </Spinny>
 
             </Children>
-            <Connection>
-              <ConfigKey>[Skin],show_big_spinny_coverart</ConfigKey>
-              <BindProperty>highlight</BindProperty>
-            </Connection>
           </WidgetGroup>
         </Children>
         <Connection>
@@ -81,15 +75,10 @@
                     <TooltipId>coverart</TooltipId>
                     <SizePolicy>me,me</SizePolicy>
                     <MinimumSize>40,40</MinimumSize>
-                    <MaximumSize><Variable name="MaxSize"/></MaximumSize>
                     <Group><Variable name="group"/></Group>
-                    <DefaultCover>style/cover_default.svg</DefaultCover>
+                    <DefaultCover>skin:/style_<Variable name="style_scheme"/>/cover_default.svg</DefaultCover>
                   </CoverArt>
                 </Children>
-                <Connection>
-                  <ConfigKey>[Skin],show_big_spinny_coverart</ConfigKey>
-                  <BindProperty>highlight</BindProperty>
-                </Connection>
               </WidgetGroup>
             </Children>
             <Connection>
@@ -108,4 +97,5 @@
 
     </Children>
   </WidgetGroup>
+
 </Template>
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index 9dfbf5251127..ef665df2e87b 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -1,86 +1,347 @@
-/* LateNight 2.1 */
-
-#debugbg {
-    background-color: #fff;
-}
+/* LateNight 2.3 */
 
+/************** font settings *************************************************/
 #Mixxx, WWidget,
+WEffect, WEffectSelector,
+WKey,
 WLabel, WLibrary QLabel,
+WNumber,
+WNumberPos,
 WPushButton, WLibrary QPushButton,
-WEffect, WEffectSelector,
+WRecordingDuration,
+WSearchLineEdit,
+WText,
+WTime,
+WTrackText,
+WTrackProperty,
 WBeatSpinBox,
-QSpinBox {
-  font-family: Ubuntu;
+QSpinBox,
+QComboBox,
+WLibrary QHeaderView,
+QToolTip,
+WOverview /* Hotcue labels in the overview */
+/* Edit label and pushbuttons in the hotcue label edit dialog
+WOverview QLabel,
+WOverview QPushButton */ {
+  font-family: "Open Sans";
   text-transform: uppercase;
   font-weight: bold;
+  font-style: normal;
+}
+
+/* regular font weight */
+WSearchLineEdit,
+QToolTip {
+  font-weight: normal;
+}
+
+/* regular case / no text transformation */
+WKey,
+WOverview,
+WSearchLineEdit,
+WTrackProperty, WTrackText,
+QToolTip,
+/* WLibrary QMenu,  */
+WLibrary QHeaderView {
+  text-transform: none;
+}
+
+/************** font sizes / alignment ****************************************/
+WPushButton, WLibrary QPushButton,
+#RecDuration[highlight="0"],
+#RecDuration[highlight="1"] {
+  font-size: 11px/12px;
+}
+#RecDuration[highlight="2"] {
+	font-size: 12px/12px;
+}
+
+#KnobLabel,
+#FxKnobLabel,
+#FxButtonLabel,
+#LatencyLabel {
+  font-size: 10px;
+  text-align: center;
+}
+#EQKillButton {
+  font-size: 12px;
+}
+
+#ArtistText,
+#TitleText,
+#BpmText {
+  font-size: 18px;
+  }
+  #ArtistText,
+  #TitleText {
+    text-align: left;
+  }
+  #BpmText {
+    text-align: center;
+  }
+
+#SkinSettingsLabelButton,
+#CategoryLabel  {
+  font-size: 17px;
+  text-align: left;
 }
 
-#KeyText,
+#TitleTextSmall,
+#ArtistTextSmall,
 #PlayPositionText,
 #PlayPositionTextSmall,
-#DurationText,
-#BpmText,
 #BpmTextSmall,
-#RateText,
+#FxUnitLabel,
+#SamplerTitle {
+	font-size: 16px;
+}
+
+#SamplerTitleSmall,
+#MicAuxSubTitle,
+#PreviewTitle,
+#PreviewLabel,
+WTime {
+  font-size: 14px;
+  text-align: left;
+}
+
+WKey,
+#DurationText,
 WBeatSpinBox,
-QSpinBox,
-/* Hotcue labels in the overview */
-WOverview,
-/* 'Edit' label in the hotcue label edit dialog */
+#DlgAutoDJ QSpinBox,
+#LibraryBPMSpinBox,
+WLibrary QHeaderView {
+  font-size: 13px;
+}
+
+#RateText,
+#PreviewBPM,
+WEffectSelector,
+WEffectSelector QAbstractItemView,
+#fadeModeCombobox,
+#fadeModeCombobox QAbstractItemView {
+  font-size: 12px;
+  }
+  #RateText,
+  #MicAuxSubTitle,
+  #PreviewBPM {
+    text-align: center;
+  }
+
+#SamplerTitle {
+  text-align: left;
+}
+#SamplerTitleSmall {
+  text-align: left;
+}
+
+
+/* This does NOT style the cue labels in the overview
+WOverview {
+  font-size: 20px;
+}
+  To style the overview cue labels use this
+  <LabelFontSize>
+  <LabelTextColor>
+  <LabelBackgroundColor>
+  in deck_overview.xml instead.
+  See https://github.com/mixxxdj/mixxx/pull/2238/files#diff-63372b146329ec67669d336bc0decfdaR100  */
+/* Those styles affect the labels in the overview cue menu and its child dialogs.
 WOverview QLabel {
-  font-family: "Open Sans";
-  text-transform: none;
+  font-weight: bold;
+  font-size: 12px;
+  color: green;
+  background-color: blue;
+} */
+/************** font sizes / alignment ****************************************/
+
+
+
+/************** font colors **************************************************/
+#KeyMatchButton,
+#VinylButton[displayValue="0"],
+#VinylTristateButton,
+#FxAssignButton WPushButton[displayValue="0"],
+#FxAssignButtonDeck[displayValue="0"],
+#GuiToggleButton[displayValue="0"],
+#BroadcastButton[displayValue="0"],
+#SettingsButton[displayValue="0"],
+#RecDuration[highlight="0"],
+#RecDuration[highlight="1"] {
+  color: #bfbfbf;
+  }
+  #RecDuration[highlight="2"] {
+    color: #d2d2d2;
+  }
+
+#VinylButton[displayValue="1"],
+#VinylButton[displayValue="2"],
+#FxAssignButton WPushButton[displayValue="1"],
+#FxAssignButtonDeck[displayValue="1"],
+#GuiToggleButton[displayValue="1"],
+#GuiToggleButton[displayValue="2"],
+#BroadcastButton[displayValue="1"], /* connecting: yellow */
+#SettingsButton[displayValue="1"] {
+  color: #000;
+}
+
+#EQKillButton[displayValue="0"] {
+  color: #666;
+}
+#KeyButton[displayValue="1"] {
+  color: #d2d2d2;
+}
+
+WSearchLineEdit,
+#LibraryBPMSpinBox,
+#LibraryBPMButton::item,
+#LibraryContainer QTableView,
+#LibraryContainer QTextBrowser,
+#LibraryContainer QTreeView {
+  color: #eece33;
+  selection-color: #eece33;
+}
+
+/* yellow */
+#Deck1 WLabel, #Deck2 WLabel,
+#DeckMini1 WLabel, #DeckMini2 WLabel,
+#Deck1 WBeatSpinBox, #Deck2 WBeatSpinBox, #DlgAutoDJ QSpinBox,
+#Deck1 WStarRating, #Deck2 WStarRating,
+#SamplerTitle, #SamplerTitleSmall, #SamplerBpm,
+#FxUnitLabel, #MicAuxSubTitle,
+WEffectSelector, WEffectSelector QAbstractItemView,
+#PreviewLabel, #PreviewDeckText, #PreviewTitle, #PreviewBPM,
+#fadeModeCombobox, #fadeModeCombobox QAbstractItemView,
+#CategoryLabel, #SkinSettingsLabelButton,
+WLibrary QLabel, WLibrary QRadioButton,
+WLibrary QTableView::indicator,
+WSearchLineEdit,
+QToolTip,
+#LatencyLabel, WTime {
+  color: #f0bb2b;
+}
+
+/* light blue / cyan */
+#Deck3 WLabel, #Deck4 WLabel,
+#DeckMini3 WLabel, #DeckMini4 WLabel,
+#Deck3 WStarRating, #Deck4 WStarRating,
+#Deck3 WBeatSpinBox, #Deck4 WBeatSpinBox {
+  color: #0bd9d1;
+}
+
+#KnobLabel,
+#FxKnobLabel,
+#FxButtonLabel {
+  color: #666;
+  qproperty-alignment: 'AlignCenter | AlignBottom';
+  padding-top: -1px;
+}
+
+#MasterHeadphoneMixer WLabel,
+#FxKnobLabel,
+#FxButtonLabel {
+  padding: 0px;
+  background-color: #101010;
+  }
+  #FxKnobLabel,
+  #FxButtonLabel {
+    qproperty-alignment: 'AlignLeft | AlignVCenter';
+    }
+/************** font colors **************************************************/
+/************** font settings *************************************************/
+
+
+
+/************** Backgrounds, 3D borders & margins *****************************
+************** of major GUI containers **************************************/
+
+#debugbg {
+    background-color: #fff;
 }
 
 QToolTip {
-  font-family: Ubuntu;
-  text-transform: none;
-  font-weight: normal;
-  background-color: #0f0f0f;
   padding: 3px;
   border: 1px solid #333;
   border-radius: 2px;
 }
 
-WPushButton, WLibary QPushButton {
-  font-size: 11px/12px;
+#SkinContainer {
+  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
 }
 
-/************** 3D borders and margin   **************
- ************** of major GUI containers **************/
-#Deck1, #DeckSmall1,
-#Deck2, #DeckSmall2,
-#Deck3, #DeckSmall3,
-#Deck4, #DeckSmall4,
+#SkinContainer,
+QToolTip,
+#CrossfaderButtonContainerDeck, #CrossfaderButtonContainerAux,
+#CrossfaderButton[value="0"],
+WEffectSelector, WEffectSelector QAbstractItemView,
+#fadeModeCombobox, #fadeModeCombobox QAbstractItemView,
+QTableView, QTextBrowser, QTreeView {
+  background-color: #0f0f0f;
+}
+
+#Deck1, #DeckMini1, #Deck2, #DeckMini2,
+  #Deck3, #DeckMini3, #Deck4, #DeckMini4,
+  #DeckRow_1_KeyVinylFx,
+  #DeckRow_2_3_ArtistTitleTime,
+  #DeckRow_4_OverviewSpinny,
 #FxUnit1, #FxUnit2, #FxUnit3, #FxUnit4,
-#MixerChannelControls,
-#MasterHeadphoneMixerContainer,
-#MicRack, #AuxRack,
-#SamplerDeck,
-#SamplerDeckSmall,
-#SamplerExpand,
-#PreviewDeck,
-WLibrary,
-#SidebarBox,
-#SearchLineBox,
-#MicAuxMainControls {
+  #FxUnitControlsExpanded, #FxUnitControlsCollapsed,
+  #FxSlotsExpanded, #FxSlotsCollapsed, #FxSlotContainer,
+#MixerContainer, #MasterHeadphoneSeparator,
+#MicRack, #AuxRack, #MicAuxMainControls,
+#SamplerDeck, #SamplerDeckMini, #SamplerExpandButtonBox,
+  #SamplerDeckMini, #SamplerText, #SamplerRowTwo, #SamplerPfl,
+WEffectSelector::checked, #fadeModeCombobox::checked,
+#ToolBar, #WaveformsContainer,
+WLibrary, #SidebarBox, #SearchLineBox, #PreviewDeck,
+QAbstractScrollArea::corner {
   background-color: #1e1e1e;
+}
+
+/* borders of elevated containers */
+#WaveformsContainer,
+#Deck1, #DeckMini1, #Deck2, #DeckMini2,
+#Deck3, #DeckMini3, #Deck4, #DeckMini4,
+#FxUnit1, #FxUnit2, #FxUnit3, #FxUnit4,
+#MixerContainer,
+#MicRack, #AuxRack, #MicAuxMainControls,
+#SamplerDeck, #SamplerDeckMini, #SamplerExpandButtonBox,
+WLibrary, #SidebarBox, #SearchLineBox, #PreviewDeck {
   border-top: 1px solid #333;
   border-left: 1px solid #333;
   border-bottom: 1px solid #0a0a0a;
   border-right: 1px solid #0a0a0a;
   border-radius: 2px;
 }
+#WaveformsBottomBorder, #WaveformsRightBorder {
+  background-color: #333;
+}
+#WaveformsBottomBorder {
+  padding-top: 1px;
+}
+#WaveformsContainer {
+  padding: 0px 0px 1px 0px;
+}
+#WaveformsContainer[highlight="0"] {
+  padding: 0px 0px 1px 0px;
+  border-width: 0px 0px 1px 0px;
+  border-bottom-right-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+#WaveformsContainer[highlight="1"] {
+  /* the right border is necessary only when the skin settings menu is visible */
+  border-width: 0px 1px 1px 0px;
+}
+
 
 /* borders of embedded regions like deck buttons & Master mixer */
 #DeckRow_5_LoopCuesTransport,
-#MasterControls,
-#HeadphoneControls,
-#FxSlot1[highlight="0"],
-#FxSlot2[highlight="0"],
-#FxSlot3[highlight="0"],
-#SamplerButtons,
-#MicAuxFrame,
+#MasterControls, #HeadphoneControls,
+#FxSlotBorder1[highlight="0"],
+#FxSlotBorder2[highlight="0"],
+#FxSlotBorder3[highlight="0"],
+#SamplerHotcues,
+#MicAuxMainControlsFrame, #MicAuxSubControlsFrame,
 WSearchLineEdit,
 #OverviewBox,
 #KeyText {
@@ -90,21 +351,50 @@ WSearchLineEdit,
   border-right: 1px solid #333;
   border-bottom-left-radius: 1px;
   border-top-right-radius: 1px; /*
-  any color would cover the background tetxture
+  any color would cover the background texture
   background-color: #131313;  */
 }
-
+/* In conjunction with
+    <ConfigKey><Variable name="group"/>,visual_key</ConfigKey>
+    <Transform><Not><Variable name="group"/>,file_key</Not></Transform>
+    <BindProperty>highlight</BindProperty>
+  this is uspposed to highlight a not-original key, but it doesn't work.
+#KeyText[highlight="1"] {
+  margin-top: 1px;
+  border: 1px solid #F856E7;
+} */
+
+/************ separator lines within decks, samplers etc. *********************/
+#DeckRow_1_KeyVinylFx, #ArtistRow, #DeckControlsStars, #DeckRateSeparator,
+#BigSpinnyCoverContainer, #SmallSpinnyCoverContainer,
+#BpmTextSmall, #KeyTextSmall, #ArtistTextSmall, #PlayPositionTextSmall,
+#PlayContainerSmall,
+#PreviewLabel, #PreviewPlayBox,
+#SamplerText, #SamplerPlay, #SamplerButtonGrid,
+#SamplerGain, #SamplerVU, #SamplerPfl {
+  border-style: solid;
+  border-color: #0c0c0c;
+}
+
+/* see
+  separator_artist_title.xml and
+  separator_spinny_cover
+  for visibilty conditions */
+#SeparatorLine {
+  background-color: #0c0c0c;
+}
+
+/*********** layout margins & paddings ****************************************/
 #Deck1, #Deck2,
 #Deck3, #Deck4,
-#DeckSmall1, #DeckSmall2,
-#DeckSmall3, #DeckSmall4,
+#DeckMini1, #DeckMini2,
+#DeckMini3, #DeckMini4,
 #FxUnit1, #FxUnit3,
 #FxUnit2, #FxUnit4,
 #MicRack, #AuxRack {
   margin-bottom: 5px;
 }
-#MixerChannelControls,
-#MasterHeadphoneMixerContainer {
+#MixerContainer {
   margin-bottom: 3px;
 }
 
@@ -112,53 +402,101 @@ WSearchLineEdit,
 #Deck3, #Deck4 {
   padding: 2px 3px 3px 2px;
 }
-#DeckSmall1, #DeckSmall2,
-#DeckSmall3, #DeckSmall4 {
-  padding: 0px 0px 0px 2px;
+#DeckMini1, #DeckMini2,
+#DeckMini3, #DeckMini4 {
+  padding: 1px;
 }
-#DeckSmall1, #DeckSmall2 {
+#DeckMini1, #DeckMini2 {
   margin-top: 5px;
 }
 
-#Deck1, #DeckSmall1,
-#Deck3, #DeckSmall3,
-#FxUnit1, #FxUnit3 {
-  margin-right: 5px;
+#Deck1, #DeckMini1,
+#Deck2, #DeckMini2,
+#Deck3, #DeckMini3,
+#Deck4, #DeckMini4,
+#FxUnit1, #FxUnit3,
+#FxUnit2, #FxUnit4 {
+  margin-right: 3px;
   margin-left: 3px;
 }
 
-#Deck1, #DeckSmall1,
-#Deck3, #DeckSmall3,
-#FxUnit1, #FxUnit3 {
-  margin-right: 5px;
+#MicRack, #AuxRack {
   margin-left: 3px;
-}
-#Deck2, #DeckSmall2,
-#Deck4, #DeckSmall4,
-#FxUnit2, #FxUnit4 {
   margin-right: 3px;
-  margin-left: 5px;
 }
-/************** 3D borders and margin   **************
- ************** of major GUI containers **************/
+/************** Backgrounds, 3D borders & margins *****************************
+************** of major GUI containers **************************************/
 
 
-/************** Button borders **************/
-#KeyButton,
-#VinylButton,
-#VinylTristateButton,
-#FxAssignButtonDeck {
-  border: 1px solid #0f0f0f;
-  border-radius: 1px;
+
+/************** Button styles *************************************************
+*************** Button borders ************************************************/
+QHeaderView,
+QHeaderView::section,
+QHeaderView::up-arrow,
+QHeaderView::down-arrow {
+  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
+    stop:0 #222,
+    stop:1 #111);
+}
+
+#KeyMatchButton[displayValue="0"], #KeyDownButton[displayValue="0"],
+#VinylButton[displayValue="0"], #VinylTristateButton,
+#FxAssignButtonDeck[displayValue="0"],
+#GuiToggleButton[displayValue="0"],
+#RecFeedback[displayValue="0"],
+#BroadcastButton[displayValue="0"],
+#SettingsButton[displayValue="0"],
+#DlgMissing > QPushButton,
+#DlgHidden > QPushButton,
+#DlgAutoDJ > QPushButton,
+#DlgRecording > QPushButton,
+#DlgAnalysis > QPushButton {
+  border-width: 2px;
+  border-image: url(skin:buttons_classic/btn_embedded_library.svg) 2 2 2 2;
+  }
+  #KeyUpButton[displayValue="0"] {
+    border-width: 2px 0px 2px 2px;
+    border-image: url(skin:buttons_classic/btn_embedded_library.svg) 2 1 2 2;
+  }
+  #KeyMatchButton[displayValue="1"], #KeyDownButton[displayValue="1"],
+  #VinylButton[displayValue="1"], #VinylButton[displayValue="2"],
+  #FxAssignButtonDeck[displayValue="1"],
+  #GuiToggleButton[displayValue="1"],
+  #RecFeedback[displayValue="1"], #RecFeedback[displayValue="2"],
+  #BroadcastButton[displayValue="1"], #BroadcastButton[displayValue="2"],
+  #BroadcastButton[displayValue="3"],
+  #SettingsButton[displayValue="1"],
+  QPushButton#pushButtonAutoDJ:checked,
+  QPushButton#pushButtonRepeatPlaylist:checked,
+  #DlgAnalysis > QPushButton:checked,
+  QPushButton#pushButtonRecording:checked {
+    border-width: 2px;
+    border-image: url(skin:buttons_classic/btn_embedded_library_active.svg) 2 2 2 2;
+  }
+  #KeyUpButton[displayValue="1"] {
+    border-width: 2px 0px 2px 2px;
+    border-image: url(skin:buttons_classic/btn_embedded_library_active.svg) 2 1 2 2;
+  }
+
+#FxSuperLinkButton,
+#FxSuperLinkInvertButton {
+  border: 1px solid #0a0a0a;
+  border-radius: 2px;
+}
+
+#BeatgridButtonsToggle {
+  border-width: 2px;
+  border-image: url(skin:buttons_classic/btn_embedded_library.svg) 2 2 2 2;
   margin: 1px;
 }
+
+/* Library controls in AutoDJ etc. */
 #DlgMissing > QPushButton,
 #DlgHidden > QPushButton,
 #DlgAutoDJ > QPushButton,
 #DlgRecording > QPushButton,
 #DlgAnalysis > QPushButton {
-  border-width: 2px 3px 3px 2px;
-  border-image: url(skin:buttons/btn_border_image_qpushbutton.svg) 2 3 3 2;
   color: #bbb;
   }
   #DlgMissing > QPushButton:focus,
@@ -166,8 +504,8 @@ WSearchLineEdit,
   #DlgAutoDJ > QPushButton:focus,
   #DlgRecording > QPushButton:focus,
   #DlgAnalysis > QPushButton:focus {
-    border-width: 2px 3px 3px 2px;
-    border-image: url(skin:buttons/btn_border_image_qpushbutton_focus.svg) 2 3 3 2;
+    border-width: 2px 2px 2px 2px;
+    border-image: url(skin:buttons_classic/btn_embedded_library.svg) 2 2 2 2;
     outline: none;
   }
   #DlgAnalysis > QPushButton:checked:focus,
@@ -176,8 +514,8 @@ WSearchLineEdit,
   #DlgAutoDJ > QPushButton:checked:focus,
   #DlgRecording > QPushButton:checked:focus,
   #DlgAnalysis > QPushButton:checked:focus {
-    border-width: 2px 3px 3px 2px;
-    border-image: url(skin:buttons/btn_border_image_qpushbutton_checked_focus.svg) 2 3 3 2;
+    border-width: 2px 2px 2px 2px;
+    border-image: url(skin:buttons_classic/btn_embedded_library_active.svg) 2 2 2 2;
     outline: none;
   }
   #DlgMissing > QPushButton:pressed,
@@ -185,7 +523,7 @@ WSearchLineEdit,
   #DlgAutoDJ > QPushButton:pressed,
   #DlgRecording > QPushButton:pressed,
   #DlgAnalysis > QPushButton:pressed {
-    border-image: url(skin:buttons/btn_border_image_qpushbutton_pressed.svg) 2 3 3 2;
+    border-image: url(skin:buttons_classic/btn_embedded_library_pressed.svg) 2 2 2 2;
     color: #d2d2d2;
   }
   #DlgMissing > QPushButton:!enabled,
@@ -193,143 +531,30 @@ WSearchLineEdit,
   #DlgAutoDJ > QPushButton:!enabled,
   #DlgRecording > QPushButton:!enabled,
   #DlgAnalysis > QPushButton:!enabled {
-    border-image: url(skin:buttons/btn_border_image_qpushbutton_disabled.svg) 2 3 3 2;
     color: #666;
   }
   QPushButton#pushButtonAutoDJ:checked,
-  #DlgAnalysis > QPushButton:checked {
-    border-image: url(skin:buttons/btn_border_image_qpushbutton_active_orange.svg) 2 3 3 2;
-    color: #000;
-  }
+  QPushButton#pushButtonRepeatPlaylist:checked,
+  #DlgAnalysis > QPushButton:checked,
   QPushButton#pushButtonRecording:checked {
-    border-image: url(skin:buttons/btn_border_image_qpushbutton_active_red.svg) 2 3 3 2;
-    color: #000;
-  }
-  QPushButton#pushButtonRepeatPlaylist:checked {
-    border-image: url(skin:buttons/btn_border_image_qpushbutton_active_grey.svg) 2 3 3 2;
     color: #000;
   }
 
-WBeatSpinBox,
-#DlgAutoDJ QSpinBox {
+WEffectSelector {
   border-width: 1px 2px 2px 1px;
-  border-image: url(skin:buttons/btn_border_image_spinbox.svg) 1 2 2 1;
-  }
-  WBeatSpinBox:hover,
-  #DlgAutoDJ QSpinBox:hover {
-    border-image: url(skin:buttons/btn_border_image_spinbox_hover.svg) 1 2 2 1;
-  }
-  WBeatSpinBox:focus,
-  #DlgAutoDJ QSpinBox:focus {
-    border-image: url(skin:buttons/btn_border_image_spinbox_focus.svg) 1 2 2 1;
-  }
-
-WEffectSelector,
-#fadeModeCombobox {
-  border-width: 2px 3px 3px 2px;
-  border-image: url(skin:buttons/btn_border_image_qcombobox.svg) 2 3 3 2;
-  }
-  #fadeModeCombobox:focus {
-    border-width: 2px 3px 3px 2px;
-    border-image: url(skin:buttons/btn_border_image_qcombobox_focus.svg) 2 3 3 2;
-  }
-  
-#RecBox,
-#GuiToggleButton,
-#BroadcastButton,
-#SettingsButton,
-#BeatgridButtonsToggle,
-#BeatGridButton {
-  border: 1px solid #444;
-  border-radius: 2px;
-}
-/************** Button borders **************/
-
-
-/************** Button backgrounds **************/
-#VinylButton[displayValue="0"],
-#VinylTristateButton,
-#FxAssignButtonDeck[displayValue="0"],
-QHeaderView,
-QHeaderView::section,
-QHeaderView::up-arrow,
-QHeaderView::down-arrow {
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
-    stop:0 #222,
-    stop:1 #111);
-}
-
-#GuiToggleButton[displayValue="0"],
-#BroadcastButton[displayValue="0"],
-#SettingsButton[displayValue="0"] {
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
-    stop:0 #282828,
-    stop:1 #0e0e0e);
+  border-image: url(skin:buttons_classic/btn_elevated_fx_selector.svg) 1 2 2 1;
 }
 
-#MicDuckingButton {
-    margin: 1px 2px 2px 1px;
-    border-radius: 1px;
-}
-
-#VinylButton[displayValue="1"],
-#VinylButton[displayValue="2"],
-#GuiToggleButton[displayValue="1"],
-#GuiToggleButton[displayValue="2"],
-#BroadcastButton[displayValue="1"], /* connecting: yellow */
-#SettingsButton[displayValue="1"] {
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
-    stop:0 #a06d00,
-    stop:1 #f0bb2b);
-}
-
-#FxAssignButtonDeck[displayValue="1"] {
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
-    stop:0 #456e05,
-    stop:0.25 #5b9402,
-    stop:1 #659f08);
+#fadeModeCombobox {
+  border-width: 2px 2px 2px 2px;
+  border-image: url(skin:buttons_classic/btn_embedded_library.svg) 2 2 2 2;
 }
 
-#SettingsButton[displayValue="0"] {
-  image: url(skin:/buttons/btn_settings_off.svg) no-repeat left center;
-  }
-  #SettingsButton[displayValue="1"] {
-    image: url(skin:/buttons/btn_settings_on.svg) no-repeat left center;
-  }
-
-#BroadcastButton[displayValue="2"] { /* good: green */
-  background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1,
-    stop:0 #3F8A2B,
-    stop:1 #26A803);
-  }
-  #BroadcastButton[displayValue="3"] {  /* failure: pink */
-    background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1,
-      stop:0 #962D8B,
-      stop:1 #E602CD);
-  }
-
-#KeyButton[displayValue="0"] {
-  background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1,
-    stop:0 #282828,
-    stop:1 #0e0e0e);
-  }
-  #KeyButton[displayValue="1"] {
-    background-color: #c00a09;
-  }
-
-#HotcueButton,
-#SpecialCueButton {
-  /* limit background to button surface resulting from SVG backpath.
-    border width wouldn't be applied.
-    otoh, margin would set in the colored background area and not
-    crop the SVG background image set in xml button template.
-    border-width:  1px 3px 3px 1px;*/
-  margin: 1px 3px 3px 1px;
-  /* just to be sure the colored background doesn't overlap the rounded SVG border */
+#HotcueButton {
   /* ronso0
   TEST pixel fonts instead of icons
   FAIL basically all characters look blurry with a 100% GUI scale factor of 1oo%
-  
+
   font-size: tried a lot of integers as well as .5 values
   didn't find the magic number.. it's some unintuitive floating point value
   that aligns font pixels to screen pixels so the fonts look sharp.
@@ -344,22 +569,138 @@ QHeaderView::down-arrow {
   color: #eee;
   */
 }
-#HotcueButton[displayValue="0"],
-#SpecialCueButton[displayValue="0"] {
-  background-color: #1d1d1d;
-}
-#SpecialCueButton[displayValue="1"] {
-  background-color: #0000D4;
+
+#RateControls WPushButton, #SyncButton,
+#DeckRow_5_LoopCuesTransport WPushButton,
+#PflButton, #EQKillButton, #QuickEffectButton,
+#PlayButtonSampler, #PlayButtonDeckMini,
+#SamplerButtons WPushButton,
+#SamplerSyncButton,
+#FxUnitControlsExpanded WPushButton, #FxUnitControlsCollapsed  WPushButton,
+#FxExpandCollapseButton,
+#FxAssignButton, #FxToggleButton, #FxParameterButton, #FxFocusButton,
+#SplitCueButton,
+#PlayButtonPreview,
+#BeatgridButtons WPushButton,
+#MicTalkButton, #AuxPlayButton, #MicDuckingButton {
+  /* limit background to button surface resulting from SVG backpath.
+    border width wouldn't be applied.
+    otoh, margin would set in the colored background area and not
+    crop the SVG background image set in xml button template.
+    border-width:  1px 3px 3px 1px;*/
+  /* just to be sure the colored background doesn't overlap the rounded SVG border */
+  margin: 1px;
+  border-radius: 2px;
 }
-/* Hotcue Color: Red
-   this is also the default color if Auto-Color
-   in Preferences > Decks is Off */
+
+/************** button background colors **************************************/
+/* embedded buttons */
+#RateControls WPushButton[value="0"], #SyncButton[value="0"],
+#PflButton[value="0"],
+#EQKillButton[displayValue="0"],
+#QuickEffectButton[displayValue="0"],
+#FxUnitControlsCollapsed WPushButton, #FxUnitControlsExpanded WPushButton,
+#FxExpandCollapseButton,
+#PlayButtonSampler[displayValue="0"], #PlayButtonDeckMini[displayValue="0"],
+#SamplerSyncButton[displayValue="0"],
+#MicTalkButton[value="0"], #AuxPlayButton[value="0"],
+#MicDuckingButton[value="0"],
+#PlayButtonPreview[displayValue="0"],
+QPushButton#pushButtonAutoDJ:enabled:!checked,
+#DlgMissing > QPushButton:enabled,
+#DlgHidden > QPushButton:enabled,
+#DlgAutoDJ > QPushButton:enabled,
+#DlgRecording > QPushButton:enabled,
+#DlgAnalysis > QPushButton:enabled,
+#BeatgridButtonsToggle, #BeatgridButtons WPushButton[displayValue="0"],
+#DeckRow_1_KeyVinylFx WPushButton[displayValue="0"],
+#VinylTristateButton[displayValue="1"], #VinylTristateButton[displayValue="2"],
+#GuiToggleButton[displayValue="0"], #RecFeedback[displayValue="0"],
+#BroadcastButton[displayValue="0"], #SettingsButton[displayValue="0"] {
+  background-color: #262626;
+}
+/* elevated buttons & embedded buttons in top row & toolbar
+      brighter bg color to enhance contrast in darker containers
+      and with small size respectively */
+#DeckRow_5_LoopCuesTransport WPushButton[value="0"],
+#HotcueButton[displayValue="0"],
+#FxAssignButton[displayValue="0"], #FxFocusButton[displayValue="0"],
+#FxToggleButton[displayValue="0"], #FxParameterButton[displayValue="0"],
+#SplitCueButton[value="0"],
+#MicAuxGainPFlContainer WPushButton[displayValue="0"] {
+  background-color: #2c2c2c;
+}
+
+/* Green/Lime Fx-related buttons */
+#FxToggleButton[displayValue="1"], #QuickEffectButton[displayValue="1"],
+#FxAssignButton[displayValue="1"], #FxAssignButtonDeck[displayValue="1"],
+#BroadcastButton[displayValue="2"] {
+  background-color: #659f08;
+  }
+  /* Grey for active Fx parameters and SplitCue */
+  QPushButton#pushButtonRepeatPlaylist:checked,
+  #FxParameterButton[displayValue="1"],
+  #SplitCueButton[value="1"] {
+    background-color: #888;
+  }
+
+/* Red
+  this is also the default hotcue color if
+  Auto-Color in Preferences > Decks is Off */
+#RateControls WPushButton[value="1"], #SyncButton[value="1"],
+/* define red buttons in DeckRow_5_LoopCuesTransport indivually,
+because somehow bg color for #SpecialCueButton can't be overwritten */
+#LoopControls WPushButton[value="1"], #BeatjumpControls WPushButton[value="1"],
+#CueDeck[value="1"], #Reverse[value="1"],
+/* Indicating play_from_cue. Not working 100%, will be fixed later on
+#PlayDeck[value="1"][highlight="0"], #PlayDeck[value="1"][highlight="1"],
+#PlayButtonDeckMini[value="1"][highlight="0"], #PlayButtonDeckMini[value="1"][highlight="1"],
+#PlayButtonSampler[value="1"][highlight="0"], #PlayButtonSampler[value="1"][highlight="1"], */
+#PlayDeck[displayValue="1"],
+#PlayButtonDeckMini[displayValue="1"],
+#PlayButtonSampler[displayValue="1"],
+#PflButton[value="1"],
+#SamplerSyncButton[displayValue="1"],
+#EQKillButton[displayValue="1"],
+#MicTalkButton[value="1"], #AuxPlayButton[value="1"],
+#MicDuckingButton[value="1"],
+#PlayButtonPreview[displayValue="1"],
+QPushButton#pushButtonRecording:checked,
+#RecFeedback[displayValue="2"],
+#BeatgridButtons WPushButton[value="1"],
+#KeyMatchButton[displayValue="1"],
+#KeyUpButton[displayValue="1"], #KeyDownButton[displayValue="1"],
 #HotcueButton[displayValue="1"][highlight="0"],
 #HotcueButton[displayValue="2"][highlight="0"],
 #HotcueButton[displayValue="1"][highlight="1"],
 #HotcueButton[displayValue="2"][highlight="1"] {
   background-color: #db0000;
 }
+
+#BroadcastButton[displayValue="3"] {
+  /* pink */
+  background-color: #f856e7;
+}
+
+/* Orange/yellow */
+/* Play bg when playing from Cue / hotcue
+#PlayDeck[value="0"][highlight="1"],
+#PlayButtonDeckMini[value="0"][highlight="1"],
+#PlayButtonSampler[value="0"][highlight="1"], */
+#VinylButton[displayValue="1"], #VinylButton[displayValue="2"],
+#FxFocusButton[displayValue="1"],
+#GuiToggleButton[displayValue="1"], #GuiToggleButton[displayValue="2"],
+#BroadcastButton[displayValue="1"], /* connecting: yellow */
+#RecFeedback[displayValue="1"], /* initialize recording */
+#SettingsButton[displayValue="1"],
+QPushButton#pushButtonAutoDJ:checked,
+#DlgAnalysis > QPushButton:checked,
+#MicDuckingButton[value="1"],
+#MicDuckingButton[value="2"] {
+  background-color: #d09300;
+}
+/* ToDo
+  * orange Play button when playing from Cue / Hotcue */
 /* Hotcue Color: Green */
 #HotcueButton[displayValue="1"][highlight="2"],
 #HotcueButton[displayValue="2"][highlight="2"] {
@@ -367,7 +708,8 @@ QHeaderView::down-arrow {
 }
 /* Hotcue Color: Blue */
 #HotcueButton[displayValue="1"][highlight="3"],
-#HotcueButton[displayValue="2"][highlight="3"] {
+#HotcueButton[displayValue="2"][highlight="3"],
+#SpecialCueButton[value="1"] {
   background-color: #0044ff;
 }
 /* Hotcue Color: Yellow */
@@ -395,264 +737,462 @@ QHeaderView::down-arrow {
 #HotcueButton[displayValue="2"][highlight="8"] {
   background-color: #f2f2ff;
 }
+/************** Button borders & backgrounds **********************************/
 
-#BeatgridButtonsToggle {
-  image: url(skin:/buttons/btn_beatgrid_buttons_toggle.svg) no-repeat center center;
-  margin: 1px;
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
-          stop:0 #282828,
-          stop:0.13 #1a1a1a,
-          stop:0.87 #1a1a1a,
-          stop:1 #0e0e0e);
-}
 
-#BeatGridButton {
-  margin: 1px;
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
-          stop:0 #282828,
-          stop:0.25 #1a1a1a,
-          stop:0.75 #1a1a1a,
-          stop:1 #0e0e0e);
-}
-/************** Button backgrounds **************/
 
+/************** Button icons **************************************************/
+#SyncButton {
+  image: url(skin:/buttons_classic/btn__sync_deck.svg) no-repeat center center;
+  }
+  #SamplerSyncButton {
+    image: url(skin:/buttons_classic/btn__sync_sampler.svg) no-repeat center center;
+  }
+  #RatePermUp {
+    image: url(skin:/buttons_classic/btn__plus.svg) no-repeat center center;
+  }
+  #RateTempUp,
+  #JumpForward {
+    image: url(skin:/buttons_classic/btn__arrow_right.svg) no-repeat center center;
+  }
+  #RatePermDown {
+    image: url(skin:/buttons_classic/btn__minus.svg) no-repeat center center;
+  }
+  #RateTempDown,
+  #JumpBack {
+    image: url(skin:/buttons_classic/btn__arrow_left.svg) no-repeat center center;
+  }
 
-/*************** Button labels ***************/
-#KeyButton[displayValue="0"],
-#VinylButton[displayValue="0"],
-#VinylTristateButton,
-#FxAssignButton[displayValue="0"],
-#FxAssignButtonDeck[displayValue="0"],
-#GuiToggleButton[displayValue="0"],
-#BroadcastButton[displayValue="0"],
-#SettingsButton[displayValue="0"] {
-  color: #bfbfbf;
+#LoopActivate {
+  image: url(skin:/buttons_classic/btn__loop.svg) no-repeat center center;
+  }
+  #Reloop {
+    image: url(skin:/buttons_classic/btn__reloop.svg) no-repeat center center;
+  }
+  #LoopIn {
+    image: url(skin:/buttons_classic/btn__loop_in.svg) no-repeat center center;
+  }
+  #LoopOut {
+    image: url(skin:/buttons_classic/btn__loop_out.svg) no-repeat center center;
+  }
+
+#PflButton {
+  image: url(skin:/buttons_classic/btn__pfl.svg) no-repeat center center;
 }
 
-#KeyButton[displayValue="1"],
-#VinylButton[displayValue="1"],
-#VinylButton[displayValue="2"],
-#FxAssignButton[displayValue="1"],
-#FxAssignButtonDeck[displayValue="1"],
-#GuiToggleButton[displayValue="1"],
-#GuiToggleButton[displayValue="2"],
-#BroadcastButton[displayValue="1"], /* connecting: yellow */
-#SettingsButton[displayValue="1"] {
-  color: #0e0e0e;
+#Hotcue1 WPushButton {
+  image: url(skin:/buttons_classic/btn__1.svg) no-repeat center center;
+  }
+  #Hotcue2 WPushButton {
+    image: url(skin:/buttons_classic/btn__2.svg) no-repeat center center;
+  }
+  #Hotcue3 WPushButton {
+    image: url(skin:/buttons_classic/btn__3.svg) no-repeat center center;
+  }
+  #Hotcue4 WPushButton {
+    image: url(skin:/buttons_classic/btn__4.svg) no-repeat center center;
+  }
+  #Hotcue5 WPushButton {
+    image: url(skin:/buttons_classic/btn__5.svg) no-repeat center center;
+  }
+  #Hotcue6 WPushButton {
+    image: url(skin:/buttons_classic/btn__6.svg) no-repeat center center;
+  }
+  #Hotcue7 WPushButton {
+    image: url(skin:/buttons_classic/btn__7.svg) no-repeat center center;
+  }
+  #Hotcue8 WPushButton {
+    image: url(skin:/buttons_classic/btn__8.svg) no-repeat center center;
+  }
+
+#SpecialCueButton_intro_start WPushButton {
+  image: url(skin:/buttons_classic/btn__intro_start.svg) no-repeat center center;
+  }
+  #SpecialCueButton_intro_end WPushButton {
+    image: url(skin:/buttons_classic/btn__intro_end.svg) no-repeat center center;
+  }
+  #SpecialCueButton_outro_start WPushButton {
+    image: url(skin:/buttons_classic/btn__outro_start.svg) no-repeat center center;
+  }
+  #SpecialCueButton_outro_end WPushButton {
+    image: url(skin:/buttons_classic/btn__outro_end.svg) no-repeat center center;
+  }
+
+#PlayDeck {
+  image: url(skin:/buttons_classic/btn__play_deck.svg) no-repeat center center;
+}
+#CueDeck {
+  image: url(skin:/buttons_classic/btn__cue_deck.svg) no-repeat center center;
+}
+#Reverse {
+  image: url(skin:/buttons_classic/btn__reverse.svg) no-repeat center center;
 }
 
-#FxAssignButtonDeck[displayValue="1"] {
-  color: #0e0e0e;
+#QuickEffectButton[displayValue="0"] {
+  image: url(skin:/buttons_classic/btn__star.svg) no-repeat center center;
 }
-/*************** Button labels ***************/
 
+#FxAssignButton_FX1 WPushButton[value="0"] {
+  image: url(skin:/buttons_classic/btn__fx_FX1.svg) no-repeat center center;
+    }
+    #FxAssignButton_FX1 WPushButton[value="1"] {
+      image: url(skin:/buttons_classic/btn__fx_FX1_active.svg) no-repeat center center;
+    }
+  #FxAssignButton_FX2 WPushButton[value="0"] {
+    image: url(skin:/buttons_classic/btn__fx_FX2.svg) no-repeat center center;
+    }
+    #FxAssignButton_FX2 WPushButton[value="1"] {
+      image: url(skin:/buttons_classic/btn__fx_FX2_active.svg) no-repeat center center;
+    }
+  #FxAssignButton_FX3 WPushButton[value="0"] {
+    image: url(skin:/buttons_classic/btn__fx_FX3.svg) no-repeat center center;
+    }
+    #FxAssignButton_FX3 WPushButton[value="1"] {
+      image: url(skin:/buttons_classic/btn__fx_FX3_active.svg) no-repeat center center;
+    }
+  #FxAssignButton_FX4 WPushButton[value="0"] {
+    image: url(skin:/buttons_classic/btn__fx_FX4.svg) no-repeat center center;
+    }
+    #FxAssignButton_FX4 WPushButton[value="1"] {
+      image: url(skin:/buttons_classic/btn__fx_FX4_active.svg) no-repeat center center;
+    }
+  #FxAssignButton_2 WPushButton[value="0"] {
+    image: url(skin:/buttons_classic/btn__fx_2.svg) no-repeat center center;
+    }
+    #FxAssignButton_2 WPushButton[value="1"] {
+      image: url(skin:/buttons_classic/btn__fx_2_active.svg) no-repeat center center;
+    }
+  #FxAssignButton_3 WPushButton[value="0"] {
+    image: url(skin:/buttons_classic/btn__fx_3.svg) no-repeat center center;
+    }
+    #FxAssignButton_3 WPushButton[value="1"] {
+      image: url(skin:/buttons_classic/btn__fx_3_active.svg) no-repeat center center;
+    }
+  #FxAssignButton_4 WPushButton[value="0"] {
+    image: url(skin:/buttons_classic/btn__fx_4.svg) no-repeat center center;
+    }
+    #FxAssignButton_4 WPushButton[value="1"] {
+      image: url(skin:/buttons_classic/btn__fx_4_active.svg) no-repeat center center;
+    }
 
-#GuiToggleButton,
-#BroadcastButton,
-#SettingsButton,
-#RecBox {
-  margin: 2px 3px 2px 2px;
-}
+#SplitCueButton[value="0"] {
+  image: url(skin:/buttons_classic/btn__splitcue.svg) no-repeat center center;
+  }
+  #SplitCueButton[value="1"] {
+    image: url(skin:/buttons_classic/btn__splitcue_active.svg) no-repeat center center;
+  }
 
-#KeyText,
-#PlayPositionText,
-#PlayPositionTextSmall,
-#DurationText,
-#BpmText,
-#BpmTextSmall,
-#RateText,
-WBeatSpinBox,
-QSpinBox,
-WOverview {
-  font-family: "Open Sans";
+#PlayButtonSampler[value="0"],
+#PlayButtonDeckMini[value="0"],
+#PlayButtonPreview[displayValue="0"] {
+  image: url(skin:/buttons_classic/btn__play_sampler.svg) no-repeat center center;
+  }
+  #PlayButtonSampler[value="1"],
+  #PlayButtonDeckMini[value="1"],
+  #PlayButtonPreview[displayValue="1"] {
+    image: url(skin:/buttons_classic/btn__pause_sampler.svg) no-repeat center center;
+  }
+
+#MixModeButton[value="0"] {
+  image: url(skin:/buttons_classic/btn__fx_mixmode_d-w.svg) no-repeat center center;
+  }
+  #MixModeButton[value="1"] {
+    image: url(skin:/buttons_classic/btn__fx_mixmode_d+w.svg) no-repeat center center;
+  }
+
+#FxExpandCollapseButton[value="0"] {
+  image: url(skin:/buttons_classic/btn__fx_sampler_expand.svg) no-repeat center center;
+  }
+  #FxExpandCollapseButton[value="1"] {
+    image: url(skin:/buttons_classic/btn__fx_sampler_collapse.svg) no-repeat center center;
+  }
+
+#FxToggleButton[value="0"] {
+  image: url(skin:/buttons_classic/btn__fx_toggle.svg) no-repeat center center;
+  }
+  #FxToggleButton[value="1"] {
+    image: url(skin:/buttons_classic/btn__fx_toggle_active.svg) no-repeat center center;
+  }
+
+#FxFocusButton[value="0"] {
+  image: url(skin:/buttons_classic/btn__fx_focus.svg) no-repeat center center;
+  }
+  #FxFocusButton[value="1"] {
+    image: url(skin:/buttons_classic/btn__fx_focus_active.svg) no-repeat center center;
+  }
+
+#KeyMatchButton {
+  image: url(skin:/buttons_classic/btn__key_match.svg) no-repeat center center;
+  }
+#KeyUpButton {
+  image: url(skin:/buttons_classic/btn__key_up.svg) no-repeat center center;
+  }
+#KeyDownButton {
+  image: url(skin:/buttons_classic/btn__key_down.svg) no-repeat center center;
+  }
+
+/* deck controls for decks 1-4 and samplers */
+#CurposButton12[displayValue="0"], #CurposButton34[displayValue="0"] {
+  image: url(skin:/buttons_classic/btn__beat_curpos.svg) no-repeat center center;
+  }
+  #CurposButton12[value="1"] {
+    image: url(skin:/buttons_classic/btn__beat_curpos_active_12.svg) no-repeat center center;
+  }
+  #CurposButton34[value="1"] {
+    image: url(skin:/buttons_classic/btn__beat_curpos_active_34.svg) no-repeat center center;
+  }
+
+  #EjectButton12[displayValue="0"], #EjectButton34[displayValue="0"] {
+    image: url(skin:/buttons_classic/btn__eject.svg) no-repeat center center;
+    }
+    #EjectButton12[value="1"] {
+      image: url(skin:/buttons_classic/btn__eject_active_12.svg) no-repeat center center;
+    }
+    #EjectButton34[value="1"] {
+      image: url(skin:/buttons_classic/btn__eject_active_34.svg) no-repeat center center;
+    }
+
+  #RepeatButton12[displayValue="0"], #RepeatButton34[displayValue="0"] {
+    image: url(skin:/buttons_classic/btn__repeat.svg) no-repeat center center;
+    }
+    #RepeatButton12[displayValue="1"] {
+      image: url(skin:/buttons_classic/btn__repeat_active_12.svg) no-repeat center center;
+    }
+    #RepeatButton34[displayValue="1"] {
+      image: url(skin:/buttons_classic/btn__repeat_active_34.svg) no-repeat center center;
+    }
+
+  #QuantizeButton12[displayValue="0"], #QuantizeButton34[displayValue="0"] {
+    image: url(skin:/buttons_classic/btn__quantize.svg) no-repeat center center;
+    }
+    #QuantizeButton12[displayValue="1"] {
+      image: url(skin:/buttons_classic/btn__quantize_active_12.svg) no-repeat center center;
+    }
+    #QuantizeButton34[displayValue="1"] {
+      image: url(skin:/buttons_classic/btn__quantize_active_34.svg) no-repeat center center;
+    }
+
+  #SlipmodeButton12[displayValue="0"], #SlipmodeButton34[displayValue="0"] {
+    image: url(skin:/buttons_classic/btn__slip.svg) no-repeat center center;
+    }
+    #SlipmodeButton12[displayValue="1"] {
+      image: url(skin:/buttons_classic/btn__slip_active_12.svg) no-repeat center center;
+    }
+    #SlipmodeButton34[displayValue="1"] {
+      image: url(skin:/buttons_classic/btn__slip_active_34.svg) no-repeat center center;
+    }
+
+  #KeylockButton12[displayValue="0"], #KeylockButton34[displayValue="0"] {
+    image: url(skin:/buttons_classic/btn__keylock.svg) no-repeat center center;
+    }
+    #KeylockButton12[displayValue="1"] {
+      image: url(skin:/buttons_classic/btn__keylock_active_12.svg) no-repeat center center;
+    }
+    #KeylockButton34[displayValue="1"] {
+      image: url(skin:/buttons_classic/btn__keylock_active_34.svg) no-repeat center center;
+    }
+
+#BeatgridButtonsToggle {
+  border-width: 3px;
+  border-image: url(skin:buttons_classic/btn_embedded_library.svg) 3 3 3 3;
+  image: url(skin:/buttons_classic/btn__beatgrid_buttons_toggle.svg) no-repeat center center;
+  }
+  #BeatCurposLarge {
+    image: url(skin:/buttons_classic/btn__beat_curpos_large.svg) no-repeat center center;
+    }
+    #BeatsEarlier {
+      image: url(skin:/buttons_classic/btn__beats_earlier.svg) no-repeat center center;
+    }
+    #BeatsLater {
+      image: url(skin:/buttons_classic/btn__beats_later.svg) no-repeat center center;
+    }
+    #BeatsSlower {
+      image: url(skin:/buttons_classic/btn__beats_slower.svg) no-repeat center center;
+    }
+    #BeatsFaster {
+      image: url(skin:/buttons_classic/btn__beats_faster.svg) no-repeat center center;
+    }
+
+#MicTalkButton {
+  image: url(skin:/buttons_classic/btn__mic_talk.svg) no-repeat center center;
+}
+#AuxPlayButton {
+  image: url(skin:/buttons_classic/btn__aux_play.svg) no-repeat center center;
 }
+#MicDuckingButton[value="0"] {
+  image: url(skin:/buttons_classic/btn__mic_duck_off.svg) no-repeat center center;
+  }
+  #MicDuckingButton[value="1"] {
+    image: url(skin:/buttons_classic/btn__mic_duck_auto.svg) no-repeat center center;
+  }
+  #MicDuckingButton[value="2"] {
+    image: url(skin:/buttons_classic/btn__mic_duck_manual.svg) no-repeat center center;
+  }
 
-#Deck3 WLabel, #Deck4 WLabel,
-#DeckSmall3 WLabel, #DeckSmall4 WLabel {
-  color: #0bd9d1;
+#RecDot {
+  background: transparent;
+  image: url(skin:/buttons_classic/btn__rec_dot.svg) no-repeat center center;
 }
 
-WLibary QLabel, WLibary QRadioButton,
-WSearchLineEdit,
-#LibraryBPMSpinBox,
-#LibraryBPMButton::item,
-QTableView, QTextBrowser, QTreeView {
-  color: #eece33;
-  selection-color: #eece33;
-}
+#SettingsButton[displayValue="0"] {
+  /* for some reason the alignment isn't rescpected, so the icons
+    have to be sized like available area (76x16px) */
+  image: url(skin:/buttons_classic/btn__settings_off.svg) no-repeat left top;
+  }
+  #SettingsButton[displayValue="1"] {
+    image: url(skin:/buttons_classic/btn__settings_on.svg) no-repeat left top;
+  }
 
-#Deck1 WLabel, #Deck2 WLabel,
-#DeckSmall1 WLabel, #DeckSmall2 WLabel,
-#PreviewLabel, #PreviewDeckText, #PreviewTitle,
-#FxUnitLabel, #MicAuxSubTitle,
-#SamplerTitle, #SamplerTitleSmall, #SamplerBpm,
-QToolTip,
-WStarRating,
-WBeatSpinBox, #DlgAutoDJ QSpinBox,
-QTableView::indicator,
-WEffectSelector, WEffectSelector QAbstractItemView,
-#fadeModeCombobox, #fadeModeCombobox QAbstractItemView,
-#CategoryLabel, #SkinSettingsLabelButton,
-WSearchLineEdit:focus,
-#LatencyLabel, WTime {
-  color: #f0bb2b;
-}
-#PreviewLabel,
-#FxUnitLabel,
-#MicAuxSubTitle,
-#SamplerTitleSmall,
-#Deck1 WLabel, #Deck2 WLabel,
-#Deck3 #KeyText, #Deck4 #KeyText,
-WSearchLineEdit:focus,
-#LatencyLabel,
-WTime {
-  font-weight: bold;
+#ToolbarLogo {
+  image: url(skin:/style_classic/mixxx_logo_small.svg) no-repeat center center;
 }
 
-#SkinContainer {
-  background-color: #0f0f0f;
-  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
-}
+WSearchLineEdit QToolButton:!focus {
+  image: url(skin:/buttons_classic/btn__lib_clear_search.svg);
+  }
+  WSearchLineEdit QToolButton:focus {
+    image: url(skin:/buttons_classic/btn__lib_clear_search_focus.svg);
+  }
+/************** Button icons **************************************************/
+/************** Button styles *************************************************/
+
 
-#ToolBar {
-  qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
-  background-color: #1e1e1e;
-  padding: 2px 0px 2px 2px;
-}
 
-  #ToolBarDivider {
+/************** ToolBar *******************************************************/
+#ToolBar {
+  padding: 1px 0px 2px 2px;
+  }
+  #ToolBar, #ToolBarSection {
+    qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
+    qproperty-layoutSpacing: 2;
+  }
+  #ToolBarSeparator {
     background: transparent;
-    image: url(skin:/style/toolbar_divider.png) no-repeat center center;
-    margin: 0px 5px;
+    image: url(skin:/style_classic/toolbar_separator.png) no-repeat center center;
+    margin: 0px 3px;
   }
 
   #RecBox {
     qproperty-layoutAlignment: 'AlignCenter';
-    border-radius: 2px;
-    background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
-      stop:0 #282828,
-      stop:1 #0e0e0e);
     }
-    #RecDot {
-      background: transparent;
-      image: url(skin:/buttons/rec_dot.svg) no-repeat center center;
-    }
-    #RecDuration {
-      font-size: 10px/12px;
-      color: #ddd;
-    }
-    #RecFeedback[displayValue="0"] {
-      background-color: (x1:0, y1:0, x2:0, y2:1,
-        stop:0 #282828,
-        stop:1 #0e0e0e);
-    }
-    #RecFeedback[displayValue="1"],
-    #RecFeedback[displayValue="2"] {
-      background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
-        stop:0 #840600,
-        stop:1 #AD0800);
-    }
-
-  #ToolbarLogo {
-    background: transparent;
-    margin: 3px 0px;
-    image: url(skin:style/mixxx_logo.svg) no-repeat center center;
-  }
 
   #ClockWidget {
     qproperty-layoutAlignment: 'AlignVCenter | AlignHCenter';
     margin-bottom: 2px;
     }
-    WTime {
-      font-size: 14px/14px;
-    }
 
   #LatencyLabel {
     padding-bottom: 2px;
-    font-size: 10px/10px;
   }
+/************** ToolBar *******************************************************/
+
 
-/********************** Decks **********************/
+
+/************** Decks *********************************************************/
 #DeckRow_1_KeyVinylFx {
   qproperty-layoutAlignment: 'AlignLeft | AlignTop';
-  background-color: #1e1e1e;
-  padding: 0px 0px 1px 1px;
-  border-bottom: 1px solid #080808;
-  border-left: 1px solid #080808;
-}
+  /* parent WidgetGroups already set the bg color,
+  but without it the top border of #DeckRow_2_3_ArtistTitleTime
+  wouldn't show up.... :? */
+  padding: 1px 0px 2px 0px;
+  border-width: 0px 0px 1px 0px;
+  }
+  #KeyText {
+    qproperty-alignment: 'AlignCenter';
+    border-radius: 1px;
+    border-left: 0px;
+  }
+  #KeyTextSmall {
+    border-width: 1px 0px 0px 1px;
+    padding: 0px 1px 0px 0px;
+  }
+  #VinylButtons, #FxAssingButtonsDeck {
+    qproperty-layoutSpacing: 2;
+  }
+  #VinylControls {
+    qproperty-layoutAlignment: 'AlignLeft | AlignTop';
+  }
+  #VinylStatus {
+    border-radius: 5px;
+  }
 
 #DeckRows234 {
 }
 
+#BigSpinnyCoverContainer,
+#SmallSpinnyCoverContainer {
+  border-width: 0px;
+  margin-bottom: 1px;
+}
+
 #DeckRow_2_3_ArtistTitleTime {
-  background-color: #1e1e1e;
-  padding-left: 2px;
-  }
-  #DeckRow_2_3_ArtistTitleTime[highlight="0"] {
-    border-left: none;
-  }
-  /* show left border only with rate controlsy */
-  #DeckRow_2_3_ArtistTitleTime[highlight="1"] {
-    border-left: 1px solid #080808;
+  padding-left: 1px;
+  margin: 2px 0px 2px 0xp;
   }
   #TitleRow {
     qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
-    padding: 2px 3px 2px 0px;
-  }
-  #TimeGutter, #DurationGutter {
-    qproperty-layoutAlignment: 'AlignRight | AlignBottom';
-    padding: 2px;
+    padding: 0px;
   }
   #ArtistRow {
-    border-top: 1px solid #080808;
-    
-  }
+    border-width: 1px 0px 0px 0px;
+    }
+    #ArtistGutter,
+    #TitleGutter {
+      qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
+      padding: 0px 2px 1px 2px;
+      }
+      #ArtistText,
+      #TitleText {
+        /* for some reason the padding/margin is double in the skin...
+        margin-left: 1px;
+        padding-left: 1px; */
+      }
+    #PlayPositionGutter, #DurationGutter {
+      qproperty-layoutAlignment: 'AlignRight | AlignBottom';
+      padding: 0px 2px 1px 2px;
+      }
+      #PlayPositionText,
+      #DurationText {
+      }
 
 #DeckRow_4_OverviewSpinny {
-  background-color: #1e1e1e;
   padding: 0px 0px 1px 0px;
 }
 
+  #SmallSpinnyCoverContainer {
+    border-width: 1px 0px 0px 0px;
+  }
   #Stars {
     qproperty-layoutAlignment: 'AlignCenter';
-    border-radius: 2px;
-    }
-    WStarRating {
-      font-weight: bold;
-      font-size: 20pt;
+    border-radius: 1px;
     }
+  #DeckControlsStars {
+    qproperty-layoutAlignment: 'AlignCenter';
+    border-width: 1px 0px 0px 0px;
+    padding: 2px 1px 1px 2px;
+  }
+  #DeckControlButtons {
+    padding: 0px 2px;
+    qproperty-layoutSpacing: 4;
+  }
 
 #DeckRow_5_LoopCuesTransport {
-  qproperty-layoutAlignment: 'AlignBottom';
-  padding: 2px 1px 1px 2px;
-}
-
-#PlayContainerSmall {
-  padding: 2px 1px 0px 3px;
-}
-
-#DecksAndMixer {
-  background-color: #1e1e1e;
-}
-
-#SpinnyContainer,
-#CoverArtContainer {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
-  background-color: #1e1e1e;
+  qproperty-layoutAlignment: 'AlignRight | AlignBottom';
+  padding: 1px 2px 2px 1px;
   }
-  #SpinnyContainer {
-    border-left: 1px solid #080808;
+  #PlayCueRevHotCues {
+    qproperty-layoutAlignment: 'AlignRight | AlignBottom';
   }
-  #SpinnyContainer[highlight="0"],
-  #CoverArtContainer[highlight="0"] {
-    border-top: 1px solid #080808;
+  #PlayContainerSmall {
+    margin: 1px 0px;
+    padding: 0px 1px 0px 2px;
+    border-width: 0px 0px 0px 1px;
   }
-  #SpinnyContainer[highlight="1"],
-  #CoverArtContainer[highlight="1"] {
-    border-top: none;
+  #MiniDeckSpinnyCoverContainer {
+    margin: 1px 2px 1px 1px;
   }
 
-WSpinny {/*
+WSpinny { /*
   This produces artifacts in spinny bg
   background-color: rgba(1, 1, 1, 10);
   This makes no difference, the spinny loads some default grey bg
@@ -664,304 +1204,213 @@ WCoverArt {
   color: #ACACAC;
 }
 
-#PlayCueRevHotCues {
-  qproperty-layoutAlignment: 'AlignRight | AlignBottom';
-}
-
-#DeckControls {
-  qproperty-layoutAlignment: 'AlignCenter';
-  border-top: 1px solid #080808;
-  padding: 0px 2px;
-}
-
-#KeyText {
-  qproperty-alignment: 'AlignCenter';
-  font-size: 13px/13px;
-  border-radius: 1px;
-  margin: 0px 1px;
-  }
-
-#ArtistGutter,
-#TitleGutter {
-  qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
-  padding: 2px 2px 1px 2px;
-}
 
-#TitleGutter WLabel {
-  font-size: 16px/19px;
-  text-transform: none;
-  text-align: left;
-}
 
-#ArtistText,
-#TitleText {
-  font-size: 18px/20px;
-  /* for some reason the padding/margin is double in the skin...
-  margin-left: 1px;
-  padding-left: 1px; */
-  }
-  #TitleTextSmall,
-  #ArtistTextSmall,
-  #PlayPositionText,
-  #PlayPositionTextSmall,
-  #BpmTextSmall,
-  #FxUnitLabel {
-    font-size: 16px/16px;
-    text-transform: none;
-  }
-  #TitleTextSmall,
-  #ArtistTextSmall {
-    font-weight: bold;
-  }
   #TitleTextSmall {
     padding: 1px 3px 1px 1px;
   }
   #ArtistTextSmall {
-    margin: 0px 1px 0px 1px;
-    padding: 0px 2px 0px 0px;
+    margin: 0px 2px 0px 1px;
+    padding: 0px 1px 0px 0px;
+    border-width: 1px 0px 0px 0px;
   }
   #PlayPositionTextSmall {
-    padding: 0px 1px 2px 2px;
-  }
-  
-  #BpmTextSmall,
-  #KeyTextSmall {
-    border-left: 1px solid #080808;
-    border-top: 1px solid #080808;
+    padding: 0px 3px 2px 2px; /*
+    border-width: 0px 1px 0px 0px;  */
   }
-  #BpmTextSmall {
-    border-right: 1px solid #080808;
-    margin-top
-  }
-  #KeyTextSmall {
-    font-size: 13px/13px;
-    padding: 0px 1px 0px 0px;
-    text-transform: none;
-  }
-
-
-#ArtistText,
-#TitleText,
-#PlayPositionText,
-#PlayPositionTextSmall,
-#KeyText,
-#PreviewTitle {
-  text-transform: none;
-}
-
-#DurationText {
-  font-size: 13px/15px;
-}
-
-#VinylControls {
-  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
-}
-
-#VinylStatus {
-  border-radius: 5px;
-}
 
 #RateContainer {
   qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
   /* for some reason padding-right & margin-right are not applied.
     #RateControls add the right margin. */
-  padding: 4px 0px 2px 0px;
+  padding: 4px 0px 3px 0px;
 }
 
 #BpmContainer {
   qproperty-layoutAlignment: 'AlignCenter';/*
   background-color: #113133;  */
-}
-
-#BpmText {
-  qproperty-alignment: 'AlignCenter';
-  font-size: 18px/18px;
-  font-weight: bold;
-  background-color: transparent;
-  text-align: center;
-  padding: 0px;
-  margin: 0px;
   }
-
-#RateText {
-  qproperty-alignment: 'AlignCenter';
-  font-size: 12px/13px;
-  background-color: transparent;
-  text-align: center;
-  padding: 0px;
-  margin: 0px;/*
-  background-color: #999933;  */
-}
+  #BpmText {
+    qproperty-alignment: 'AlignCenter';
+    padding: 0px;
+    margin: 0px;
+    }
+  #BpmTextSmall {
+    border-width: 1px 0px 0px 1px;
+  }
+  #RateText {
+    qproperty-alignment: 'AlignCenter';
+    padding: 0px;
+    margin: 0px;
+  }
 
 #RateControls {
   qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
-  margin-right: 2px;/*
-  background-color: #313349;  */
-}
-
-#RateSlider {
-  /* no respected since RateSlider has a connection attached
-  margin: 0px 10px 0px 0px;
-  background-color: #113133; */
-}
+  margin-right: 2px;
+  }
+  #RateSlider {
+  }
+  #RateButtons {
+    qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
+  }
 
-#RateButtons {
+#SyncBox {
   qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
+  margin: 2px 1px 1px 0px;
 }
 
-/***************** Loop Controls *****************/
 
-#LoopBeatJumpButton,
-#LoopSizeButton {
-  font-weight: bold;
-  color: #888;
-  background-color: #333;
-  }
-  #LoopSizeButton {
-    font-size: 14px/12px;
-  }
-  #LoopBeatJumpButton:hover,
-  #LoopSizeButton:hover {
-    border: 1px solid #888;
-  }
-  #LoopSizeButton[displayValue="1"] {
-    border: 1px solid #ff8f00;
-    color: #d2d2d2;
-  }
-  #LoopSizeButton[displayValue="1"]:hover {
-    border: 1px solid #eeeeee;
+/***************** Loop Controls *****************/
+WBeatSpinBox,
+#DlgAutoDJ QSpinBox,
+#LibraryBPMSpinBox  {
+  selection-color: #000;
+  selection-background-color: #d2d2d2;
   }
-
-#ReloopButton[displayValue="0"] {
-  background-color: #333;
+  WBeatSpinBox:hover,
+  #DlgAutoDJ QSpinBox:hover {
+    background-color: #0a0a0a;
   }
-  #ReloopButton[displayValue="0"]:hover {
-    border: 1px solid #888;
+  WBeatSpinBox:focus,
+  #DlgAutoDJ QSpinBox:focus {
+    background-color: #000;
   }
-  #ReloopButton[displayValue="1"] {
-  /* See also #LoopIndicator near DeckButtons */
-    background-color: #ff8f00;
+  WBeatSpinBox#Spinbox_embedded {
+    border-width: 3px 19px 2px 3px;
+    border-image: url(skin:buttons_classic/spinbox_embedded_border.svg) 3 19 2 3;
+    margin: 1px 0px 1px 1px;
+    padding: 0px -17px 2px 1px;
+    background-color: #0a0a0a;
     }
-    #ReloopButton[displayValue="1"]:hover {
-      border: 1px solid #eeeeee;
+    WBeatSpinBox#Spinbox_embedded:hover {
+      border-image: url(skin:buttons_classic/spinbox_embedded_border_hover.svg) 3 19 2 3;
+      background-color: #000;
+    }
+    WBeatSpinBox#Spinbox_embedded:focus {
+      border-image: url(skin:buttons_classic/spinbox_embedded_border_focus_orange.svg) 3 19 2 3;
+      background-color: #000;
+    }
+  WBeatSpinBox#Spinbox_elevated {
+    border-width: 2px 19px 2px 2px;
+    border-image: url(skin:buttons_classic/spinbox_elevated_border.svg) 2 19 2 2;
+    margin: 1px 0px 0px 1px;
+    padding: 0px -17px 2px 1px;
+    background-color: #0f0f0f;
+    }
+    WBeatSpinBox#Spinbox_elevated:hover {
+      border-image: url(skin:buttons_classic/spinbox_elevated_border_hover.svg) 2 19 2 2;
+    }
+    WBeatSpinBox#Spinbox_elevated:focus {
+      border-image: url(skin:buttons_classic/spinbox_elevated_border_focus.svg) 2 19 2 2;
     }
-
-WBeatSpinBox,
-#DlgAutoDJ QSpinBox {
-  background-color: #0f0f0f;
-  selection-color: #0f0f0f;
-  selection-background-color: #d2d2d2;
-  font-size: 13px/13px;
-  }
-  WBeatSpinBox {
-    padding: 0px 2px 0px 1px;
-    margin: 0px 0px 1px 0px;
-  }
   #DlgAutoDJ QSpinBox {
-    height: 22px;
-    width: 30px;
-    padding: 0px 2px 0px 0px;
-    margin: 0px 1px 1px 1px;
-  }
+    border-width: 3px 19px 2px 3px;
+    border-image: url(skin:buttons_classic/spinbox_embedded_border.svg) 3 19 2 3;
+    width: 24px;
+    height: 19px;
+    padding: 0px -15px 0px 0px;
+    margin: 0px 2px 3px 5px;
+    }
+    #DlgAutoDJ QSpinBox:hover {
+      border-image: url(skin:buttons_classic/spinbox_embedded_border_hover.svg) 3 19 2 3;
+    }
+    #DlgAutoDJ QSpinBox:focus {
+      border-image: url(skin:buttons_classic/spinbox_embedded_border_focus_orange.svg) 3 19 2 3;
+    }
 
   WBeatSpinBox::up-button,
   WBeatSpinBox::down-button,
   #DlgAutoDJ QSpinBox::up-button,
   #DlgAutoDJ QSpinBox::down-button {
-    subcontrol-origin: padding;
+    subcontrol-origin: content;
     position: relative;
     /* as with spinbox: border is added to size.
       define it with same width as hover border, otherwise size jumps */
-    width: 16px;
-    height: 11px;
-    margin: 0px 0px 0px 0px;
+    width: 17px;
     padding: 0px;
-    border-left: 1px solid #4c4c4c;
-  }
-
-  WBeatSpinBox::up-button,
-  #DlgAutoDJ QSpinBox::up-button {
-    subcontrol-position: top right;
-    image: url(skin:/buttons/btn_beatbox_double.svg) no-repeat;
-    }
-    WBeatSpinBox::up-button:pressed,
-    #DlgAutoDJ QSpinBox::up-button:pressed {
-      image: url(skin:/buttons/btn_beatbox_double_pressed.svg) no-repeat;
-    }
-  WBeatSpinBox::down-button,
-  #DlgAutoDJ QSpinBox::down-button {
-    subcontrol-position: bottom right;
-    image: url(skin:/buttons/btn_beatbox_halve.svg) no-repeat;
     }
-    WBeatSpinBox::down-button:pressed,
-    #DlgAutoDJ QSpinBox::down-button:pressed {
-      image: url(skin:/buttons/btn_beatbox_halve_pressed.svg) no-repeat;
-    }
-/********************** Decks **********************/
+    WBeatSpinBox::up-button,
+    #DlgAutoDJ QSpinBox::up-button {
+      height: 11px;
+      subcontrol-position: top right;
+      image: url(skin:/buttons_classic/spinbox_up.svg) no-repeat;
+      }
+      WBeatSpinBox::up-button {
+        margin: -1px 0px 0px 0px;
+        }
+      #DlgAutoDJ QSpinBox::up-button {
+        margin: -1px -2px 0px 0px;
+        }
+    WBeatSpinBox::down-button,
+    #DlgAutoDJ QSpinBox::down-button {
+      height: 11px;
+      subcontrol-position: bottom right;
+      image: url(skin:/buttons_classic/spinbox_down.svg) no-repeat;
+      }
+      WBeatSpinBox::down-button {
+        margin: 0px 0px -2px 0px;
+        }
+      #DlgAutoDJ QSpinBox::down-button {
+        margin: 0px -2px -1px 0px;
+        }
+
+/********************** Loop Controls **********************/
+/************** Decks  ********************************************************/
 
 
-/********************** Mixer **********************/
+
+/************** Mixer  ********************************************************/
 #MixerContainer {
   qproperty-layoutAlignment: 'AlignTop';
 }
 
 #Mixer {
   qproperty-layoutAlignment: 'AlignLeft | AlignTop';
-  background-color: #1e1e1e;
   padding-top: 3px;
 }
 
-#MixerChannelControls {
-  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
-  padding-bottom: 2px;
-  border-right: 0px;
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-  background-color: #1e1e1e;
-  }
-
 #MasterHeadphoneMixerContainer {
-  background-color: #1e1e1e;
-  padding: 2px;
-  border-left: none;
-  border-bottom-left-radius: 0px;
-  border-top-left-radius: 0px;
-}
-
-#MasterControls {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
-  padding: 2px 2px 2px 2px;
-}
-#HeadphoneControls {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
-  padding: 2px;
-}
+  padding: 2px 2px 2px 0px;
+  }
+  #MasterControls {
+    qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
+    padding: 2px;
+  }
+  #HeadphoneControls {
+    qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
+    padding: 2px;
+  }
+  #MasterHeadphoneSeparator {
+    /* defines the height of the separator gap */
+    padding-top: 2px;
+  }
 
-#MasterHeadphoneDivider {
-  background-color: #1e1e1e;
-}
+#MixerDecks {
+  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
+  padding: 0px 5px 2px 5px;
+  }
+  #MixerChannel_2Decks {
+    qproperty-layoutAlignment: 'AlignHCenter | AlignBottom';
+  }
 
-#MixerChannel_2Decks {
-  qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
-}
+  #MixerChannel_4Decks {
+    qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
+  }
 
-#MixerChannel_4Decks {
-  qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
-}
+  #MixerChannel_2Decks_Left {
+    qproperty-layoutAlignment: 'AlignRight | AlignBottom';
+    margin: 0px 2px;
+  }
 
-#MixerChannel_2Decks_Left {
-  qproperty-layoutAlignment: 'AlignRight | AlignBottom';
-  padding: 0px 2px;
-}
+  #MixerChannel_2Decks_Right {
+    qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
+    margin: 0px 2px;
+  }
 
-#MixerChannel_2Decks_Right {
-  qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
-  padding: 0px 2px;
-}
+  #VuAndSlider4decks {
+    qproperty-layoutAlignment: 'AlignRight | AlignTop';
+  }
 
-#VuAndSlider4decks {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
-}
 
 #PFLVUMeterBox {
   qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
@@ -970,30 +1419,30 @@ WBeatSpinBox,
 
 #VuMeterBox,
 #VuMeterBoxMasterSingle {
-  background-color: #080808;
+  background-color: #040404;
   qproperty-layoutSpacing: 1;
 }
 #VuMeterBox {
   padding: 1px;
-}
-#VuMeterChannel2Decks,
-#VuMeterChannel4Decks,
-#VuMeterMaster2Decks,
-#VuMeterMaster4Decks {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignBottom';
-  }
-  #VuMeterChannel2Decks {
-    margin: 0px 9px 2px 9px;
-  }
-  #VuMeterChannel4Decks {
-    margin: 6px 4px 6px 14px;
-  }
-  #VuMeterMaster2Decks {
-    margin: 0px 0px 2px 0px;
   }
+  #VuMeterChannel2Decks,
+  #VuMeterChannel4Decks,
+  #VuMeterMaster2Decks,
   #VuMeterMaster4Decks {
-    margin: 5px 0px;
-  }
+    qproperty-layoutAlignment: 'AlignHCenter | AlignBottom';
+    }
+    #VuMeterChannel2Decks {
+      margin: 0px 9px 2px 9px;
+    }
+    #VuMeterChannel4Decks {
+      margin: 6px 3px 6px 9px;
+    }
+    #VuMeterMaster2Decks {
+      margin: 0px 0px 2px 0px;
+    }
+    #VuMeterMaster4Decks {
+      margin: 5px 0px;
+    }
 
 #VolumeGain2Decks {
   qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
@@ -1004,35 +1453,28 @@ WBeatSpinBox,
   qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
 }
 
-#KillButtonLeft {
-  qproperty-layoutAlignment: 'AlignRight | AlignVCenter';
-  padding-left: 2px;
-  margin-top: 2px;
+#EQKillButtonBoxLeft {
+  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
 }
-
-#KillButtonRight {
-  qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
-  padding-right: 2px;
-  margin-top: 2px;
+#EQKillButtonBoxRight {
+  qproperty-layoutAlignment: 'AlignRight | AlignTop';
 }
 
-#Crossfader {
-  qproperty-layoutAlignment: 'AlignCenter';/*
-  background-color:yellow;  */
-  padding: 3px 0px 1px 1px;
-}
 #CrossfaderAndSwitches2Decks {
   qproperty-layoutAlignment: 'AlignHCenter';
   padding: 0px;
 }
 #CrossfaderSwitch4Decks {
   qproperty-layoutAlignment: 'AlignRight';
-  margin: 3px 5px 3px 0px;
+  margin: 5px 5px 3px 0px;
+}
+#Crossfader {
+  qproperty-layoutAlignment: 'AlignCenter';
+  padding: 0px 0px 0px 1px;
 }
 
 #CrossfaderButtonContainerDeck {
   padding: 1px;
-  background-color: #0f0f0f;
   border-bottom: 1px solid #333;
   border-right: 1px solid #333;
   border-bottom-right-radius: 1px;
@@ -1040,48 +1482,18 @@ WBeatSpinBox,
 #CrossfaderButtonContainerAux {
   padding: 1px 1px 0px 1px;
   margin-left: 5px;
-  background-color: #0f0f0f;
   border-right: 1px solid #333;
   }
   #CrossfaderButton[value="0"] {
-    background-color: #0f0f0f;
   }
   #CrossfaderButton[value="1"] {
-    background-color: #333;
-  }
-/********************** Mixer **********************/
-
-
-
-#KnobLabel,
-#FxKnobLabel,
-#FxButtonLabel {
-  font: bold 10px/10px;
-  color: #666;
-  text-align: center;
-  qproperty-alignment: 'AlignCenter | AlignBottom';
-  padding-top: -1px;
-  text-transform: uppercase;
-}
-
-#MasterHeadphoneMixer WLabel,
-#FxKnobLabel,
-#FxButtonLabel {
-  padding: 0px;
-  background-color: #101010;
+    background-color: #262626;
   }
-  #FxKnobLabel,
-  #FxButtonLabel {
-    qproperty-alignment: 'AlignLeft | AlignVCenter';
-    }
-
-#FxKnobContainer {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
-}
+/************** Mixer  ********************************************************/
 
 
 
-/********************** PreviewDeck **********************/
+/************** PreviewDeck ***************************************************/
 #PreviewDeck {
   qproperty-layoutAlignment: 'AlignTop';
   padding: 1px 1px 0x 1px;
@@ -1097,48 +1509,42 @@ WBeatSpinBox,
   }
   #PreviewLabel {
     qproperty-alignment: 'AlignVCenter | AlignHCenter';
-    border-right: 1px solid #080808;
-    text-align: center;
+    border-width: 0px 1px 0px 0px;
     padding: 1px 3px 1px 2px;
     margin-bottom: 1px;
   }
   #PreviewDeckText {
     qproperty-layoutAlignment: 'AlignLeft | AlignTop';
-    font-size: 10px/11px;
     padding: 0px;
-    text-align: left;
   }
     #PreviewTitle {
-      font: bold 14px/14px;
-      text-align: left;
       margin: 2px 2px 2px 0px;
     }
     #PreviewBPM {
-      padding: 0px 0px 2px 2px;
+      padding: 4px 0px 2px 2px;
     }
   #PreviewEjectButton {
   }
 
-#PreviewPlay {
-  padding: 3px 1px 1px 2px;
-  margin-right: 1px;
-  border-top: 1px solid #080808;
+#PreviewPlayBox {
+  padding: 0px;
+  margin: 0px 1px 0px 0px;
+  border-width: 0px;
 }
 
 #PreviewVuMeter {
   margin: 0px 0px 0px 2px;
 }
-/********************** PreviewDeck **********************/
+/************** PreviewDeck ***************************************************/
 
 
 
-/********************** SkinSettings **********************/
+/************** SkinSettings **************************************************/
 #SkinSettingsContainer {
 }
 
 #SkinSettings {
   qproperty-layoutAlignment: 'AlignLeft | AlignTop';
-  text-align: left;
   padding: 2px 0px 2px 0px;
   border: 1px solid #585858;
   border-width: 0px 0px 1px 1px;
@@ -1151,334 +1557,271 @@ WBeatSpinBox,
   #SkinSettingsClose {
     margin-bottom: 1px;
     background-color: transparent;
-    image: url(skin:/buttons/btn_skinsettings_close.svg) no-repeat center top;
+    image: url(skin:/buttons_classic/btn__settings_close.svg) no-repeat center top;
   }
 
 #SkinSettingsCategory {
   padding: 3px 8px 10px 9px;
   qproperty-layoutAlignment: 'AlignLeft | AlignTop';
   border: 1px solid #1e1e1e;
-  border-width: 0px 0px 3px 0px;
+  border-width: 0px;
   margin-bottom: 3px;
   }
   #CategoryLabel {
-    font-size: 17px/17px;
-    text-align: left;
     padding: 3px 0px 2px 3px;
   }
+  #SkinSettingsLabelButton {
+    padding: 0px 0px 0px 3px;
+  }
+  #SkinSettingsButton {
+    padding-top: 1px;
+    color: #d2d2d2;
+  }
 
-#SkinSettingsButton {
-  padding-top: 1px;
-  font-size: 12px/14px;
-  color: #d2d2d2;
-}
-
-#SkinSettingsLabelButton {
-  font-size: 17px/21px;
-  text-align: left;
-  padding: 0px 0px 0px 3px;
-}
 
 #SubmenuCover {
   background-color: rgba(15, 15, 15, 180);
 }
-/********************** SkinSettings **********************/
+/************** SkinSettings **************************************************/
 
 
 
-/********************** Mic Aux **********************/
+/************** Mic Aux *******************************************************/
 #MicAuxRack {
-  padding
 }
 
 #MicRack, #AuxRack {
-  background-color: #1e1e1e;
+  qproperty-layoutAlignment: 'AlignRight | AlignTop';
   padding: 2px 3px 1px 4px;
   qproperty-layoutSpacing: 2;
   }
-  #MicRack {
-    qproperty-layoutAlignment: 'AlignRight | AlignTop';
-    margin-left: 3px;
-    margin-right: 5px;
-  }
-  #AuxRack {
-    qproperty-layoutAlignment: 'AlignLeft | AlignTop';
-    margin-left: 5px;
-    margin-right: 3px;
-  }
 
 #MicAuxUnit {
   qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
   }
-  #MicAuxInterior {
-    padding: 2px 1px 0px 1px;
-    border-left: 1px solid #0a0a0a;
-    background-color: transparent;
-    }
-    #MicAuxInteriorBorderTop {
-      background-color: #1e1e1e;
-      border-right: 1px solid #0a0a0a;
-      border-bottom: 1px solid #0a0a0a;
-      border-bottom-right-radius: 2px;
+  #MicAuxMainControlsFrame {
+    border-radius: 1px;
     }
-    #MicAuxInteriorBorderBottom {
-      background-color: #1e1e1e;
-      border-top: 1px solid #333;
+    #MicAuxMainControls {
+      border-radius: 2px;
+      padding: 0px 1px 0px 1px;
+      border-bottom-left-radius: 1px;
       border-top-right-radius: 1px;
-    }
-  #MicAuxFrame {
-    border-left: 0px;
-    border-top-right-radius: 0px;
-    border-top-left-radius: 0px;
-  }
-  #MicAuxMainControls {
-    background-color: #1e1e1e;
-    border-top: 1px solid #333;
-    border-left: 1px solid #333;
-    border-bottom: 1px solid #000;
-    border-right: 1px solid #000;
-    border-radius: 1px;
-    padding: 0px 1px 0px 1px;
-  }
+      }
+      #MicAuxSubTitle {
+        qproperty-alignment: 'AlignCenter | AlignTop';
+        margin: 0px 0px 3px 1px;
+      }
+      #MicAuxPlayButtonBox {
+        margin: 0px 0px 2px 1px;
+      }
 
-#MicAuxSubTitle {
-  qproperty-alignment: 'AlignCenter | AlignTop';
-  font-size: 12px/12px;
-  text-align: center;
-  margin: 0px 0px 2px 1px;
-}
+  #MicAuxSubControlsFrame {
+    margin: 3px 0px;
+    border-radius: 1px;
+    border-right: 0px;
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+    }
+    #MicAuxSubControls {
+      border-width: 0px;
+      padding: 0px 1px 0px 1px;
+      background-color: transparent;
+      }
+      #MicAuxGainPFlContainer {
+        qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
+        padding: 2px 0px 0px 0px;
+        margin: 0px;
+        }
+        #MicAuxGainKnob {
+          qproperty-layoutAlignment: 'AlignCenter';
+        }
+      #MicAuxFxButtons {
+        qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
+        padding: 2px 0px;
+      }
+      #MicAuxVUMeter {
+        qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
+        padding: 1px 1px 1px 1px;
+      }
 
 #MicDuckingContainer {
   qproperty-layoutAlignment: 'AlignCenter | AlignTop';
-  padding: 3px 1px 2px 2px;
+  padding: 1px 1px 3px 2px;
   }
   #MicDuckingStrengthKnob {
-    margin: 2px 0px 3px 0px;
+  qproperty-layoutAlignment: 'AlignHCenter';
+    margin: 2px 0px 3px 1px;
   }
 
-#MicTalkButton {
-  qproperty-alignment: 'AlignCenter';
-  margin: 1px 0px 1px 2px;
-}
-#AuxPlayButton {
-  margin: 1px 0px 3px 2px;
-}
-
-#MicAuxGainPFlContainer {
-  qproperty-layoutAlignment: 'AlignCenter';
-  padding: 0px 0px 0px 5px;
-  margin: 0px;
-}
-
-#MicAuxFxButtons {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
-  padding: 2px 1px;
-}
-
-#MicAuxGainKnob {
-  qproperty-layoutAlignment: 'AlignCenter';
-}
+/************** Mic Aux *******************************************************/
 
-#MicAuxVUMeter {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
-  padding: 1px 1px 1px 1px;
-}
-/******************** /Mic Aux ********************/
 
 
-/******************** Samplers ********************/
+/************** Samplers ******************************************************/
 #SamplerRow {
   qproperty-layoutAlignment: 'AlignTop';
   margin: 0px 3px 5px 3px;
-  qproperty-layoutSpacing: 5;
+  qproperty-layoutSpacing: 3;
 }
 
 #SamplerDeck {
-  padding: 1px 1px 2px 2px;
+  padding: 1px 0px 2px 2px;
 }
 
-#SamplerDeckSmall {
-  background-color: #1e1e1e;
+#SamplerDeckMini {
   padding: 1px;
 }
 
-#SamplerExpand {
+#SamplerExpandButtonBox {
+  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
   padding: 1px 2px 1px 1px;
-  margin-right: 1px;
-  }
-  #SamplerExpandButton {
-  }
+}
 
 #SamplerText {
   qproperty-layoutAlignment: 'AlignLeft | AlignTop';
   padding: 1px 3px 1px 4px;
-  background-color: #1e1e1e;
-  border: 1px solid #080808;
   border-width: 0px 1px 0px 0px;
 }
 
 #SamplerTextSmall {
   qproperty-layoutAlignment: 'AlignLeft';
-  padding: 1px 0px 1px 2px;
+  padding: 0px 0px 0px 3px;
 }
 
-#SamplerTitle {
-  font-size: 16px/18px;
-  text-align: left;
-  text-transform: none;
+#SamplerPlay {
+  padding: 1px 2px 1px 0px;
+  border-width: 1px 0px 0px 0px;
+  border-right: 0px;
+  border-bottom: 0px;
+  border-left: 0px;
 }
 
-#SamplerTitleSmall {
-  font-size: 12px;
-  text-align: left;
-  text-transform: none;
-  padding: 0px;
+#SamplerPlaySmall {
+  padding: 1px;
 }
 
-#SamplerRowTwo {
-  background-color: #1e1e1e;
+#SamplerMiniControls {
+  padding: 0px 0px 0px 2px;
 }
 
 #SamplerButtons {
   qproperty-layoutAlignment: 'AlignVCenter';
-  padding-bottom: 1px;
 }
 
-#SamplerPlay {
-  padding: 3px 1px 1px 0px;
-  border-right: 1px solid #000;
-  border-top: 1px solid #080808;
-  border-right: 0px;
-  border-bottom: 0px;
-  border-left: 0px;
+#SamplerDeck #OverviewBox {
+  margin-bottom: 1px;
 }
 
-#SamplerPlaySmall {
-  padding: 2px 1px 1px 2px;
-  border-top: 0px;
-  border-left: 0px;
-  border-bottom: 0px;
+#SamplerHotcues {
+  padding: 1px 1px 2px 1px;
 }
 
 #SamplerButtonGrid {
-  border: 1px solid #080808;
   border-width: 1px 1px 0px 0px;
-  padding: 1px 0px;
-}
-
-#SmallSamplerButtonGrid {
-  border-top: 0px;
-  border-bottom: 0px;
-}
-
-#SamplerHotcues {
-  qproperty-layoutAlignment: 'AlignRight | AlignVCenter';
-  margin: 2px 0px 0px 2px;
+  padding: 1px 0px 1px 0px;
 }
 
+#SamplerHotcues,
 #SamplerPfl {
-  margin: 2px 1px 0px 0px;
+  qproperty-layoutAlignment: 'AlignRight | AlignVCenter';
 }
 
 #SamplerGain {
   padding: 0px 0px 0px 2px;
-  border: 1px solid #080808;
   border-width: 1px 0px 0px 0px;
 }
 
+#SamplerPfl {
+  qproperty-layoutAlignment: 'AlignRight | AlignBottom';
+  border-width: 1px 1px 0px 0px;
+  padding: 0px 4px 1px 5px;
+}
+
 #SamplerVU {
   padding: 1px 3px 0px 3px;
   qproperty-layoutAlignment: 'AlignCenter';
-  border: 1px solid #080808;
-  border-top: 0px;
-  border-left: 0px;
-  border-bottom: 0px;
-}
-
-#SamplerPitch {
-  padding: 1px 2px 0px 2px;
-  qproperty-layoutAlignment: 'AlignRight | AlignBottom';
+  border-width: 0px 1px 0px 0px;
 }
 
-#SamplerSyncButton {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
-}
+#SamplerRateControls {
+  padding: 0px 1px 1px 0px;
+  }
+  #SamplerPitchSlider {
+    padding: 0px 0px 1px 0px;
+    qproperty-layoutAlignment: 'AlignRight | AlignBottom';
+  }
+/************** Samplers *****************************************************/
 
-#TitleGutter WLabel {
-  font-size: 16px/19px;
-  text-align: left;
-}
 
 
-/********************** Effects **********************/
+/************** Effects ******************************************************/
 #FxRack {
   qproperty-layoutAlignment: 'AlignCenter | AlignTop';
-  background-color: #0e0e0e;
 }
 
 #FxUnit1, #FxUnit2, #FxUnit3, #FxUnit4 {
   qproperty-layoutAlignment: 'AlignRight | AlignTop';
-  padding: 3px;
-  background-color: #1E1E1E;
+  padding: 2px;
 }
 
-#FxRows {
+#FxSlotsCollapsed,
+#FxSlotsExpanded {
   qproperty-layoutAlignment: 'AlignRight | AlignTop';
-  background-color: #101010;
 }
 
-#FxUnitControls {
+#FxUnitControlsExpanded, #FxUnitControlsCollapsed {
   qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
-  background-color: #1e1e1e;
-  padding: 0px 0px 0px 4px;
+  padding: 0px 0px 0px 3px;
 }
 
 #FxUnit1_ExpandCollapseButton,
 #FxUnit2_ExpandCollapseButton,
 #FxUnit3_ExpandCollapseButton,
 #FxUnit4_ExpandCollapseButton {
-}
-#ExpandCollapseButton {
-  border: 1px solid #000;
-}
+  }
+  #ExpandCollapseButton {
+    border: 1px solid #000;
+  }
 
-#FxUnit1_ExpandCollapseButton WPushButton,
-#FxUnit2_ExpandCollapseButton WPushButton,
-#FxUnit3_ExpandCollapseButton WPushButton,
-#FxUnit4_ExpandCollapseButton WPushButton {
-  font-size: 13px/13px;
-  font-weight: bold;
-  padding-top: 10px;
-  color: #bfbfbf;
+#FxUnitControlsCollapsed #FxUnitLabel {
+  margin: 4px 3px 6px 4px;
+}
+#FxUnitControlsExpanded #FxUnitLabel {
+  margin: 2px 0px;
 }
 
-#EmbeddeButtonBox {
-  qproperty-layoutAlignment: 'AlignCenter';
-  border: 1px solid #0a0a0a;
-  border-radius: 1px;
+#FxSlotContainer {
+  margin: 1px;
 }
 
 #FxSlot1,
 #FxSlot2,
 #FxSlot3 {
   qproperty-layoutAlignment: 'AlignRight | AlignVCenter';
-  padding: 2px 3px 1px 5px;
+  padding: 2px 4px 1px 4px;
 }
-
-#FxSlot1[highlight="1"],
-#FxSlot2[highlight="1"],
-#FxSlot3[highlight="1"] {
-  border: 1px solid #248301;
+#FxSlotBorder1[highlight="1"],
+#FxSlotBorder2[highlight="1"],
+#FxSlotBorder3[highlight="1"] {
+  border: 1px solid #d08e00;
+  background-color: rgba(0,0,0,125);
 }
 
-#FxFocusButton {
+#FxFocusButtonBox {
   qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
-  margin: 0px 0px 0px 0px;
+  padding: 0px 0px 0px 4px;
 }
 
-#MetaKnob {
+#FxMetaKnob {
   qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
-  padding: 0px 2px 0px 5px;
+  padding: 1px 4px 2px 4px;
+}
+
+
+
+#FxKnobContainer {
+  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
 }
 
 #FxKnob {
@@ -1486,7 +1829,7 @@ WBeatSpinBox,
   margin-left: 1px;
 }
 
-#FxButton {
+#FxButtonBox {
   qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
 }
 
@@ -1494,65 +1837,41 @@ WBeatSpinBox,
   qproperty-layoutAlignment: 'AlignRight';
   padding: 3px;
 }
-
-WEffectSelector,
-#fadeModeCombobox {
-  font-weight: bold;
-  font-size: 12px/13px;
-  text-transform: uppercase;
-  background-color: #0f0f0f;
+WEffectSelector {
   /* Fixes the white bars on the top/bottom of the popup on Mac OS X */
   min-height: 13px;
-  margin: 0px;
+  margin: 1px 0px 0px 0px;
   /* If you use margin top/bottom 0, the combo box shrinks in width (go figure) and
       names start getting cut off. Adding explicit padding improves this. */
-  padding: 4px 0px 4px 2px;
+  padding: 4px 0px 4px 4px;
   /* The 3D frame on the combo box becomes flat when you give it a border
   border-radius: 3px; */
   }
+#fadeModeCombobox {
+  height: 18px;
+  margin: 0px 0px 3px 1px;
+  padding: 1px 0px 1px 4px;
+  }
   WEffectSelector::drop-down,
   #fadeModeCombobox::drop-down {
     border: 0;
   }
-  #fadeModeCombobox { /*   */
-    height: 20px;
-    padding: 0px 0px 0px 4px;
-    margin: 1px 1px 2px 1px;
-  }
   WEffectSelector::down-arrow,
   #fadeModeCombobox::down-arrow {
-    image: url(skin:/buttons/btn_fx_selector.svg);
+    image: url(skin:/buttons_classic/btn__fx_selector_down.svg);
     border: 0;
     padding: 0;
     margin: 0;
     }
     WEffectSelector::down-arrow:hover,
     #fadeModeCombobox::down-arrow:hover {
-      image: url(skin:/buttons/btn_fx_selector_pressed.svg);
-      border: 0;
-      padding: 0;
-      margin: 0;
+      image: url(skin:/buttons_classic/btn__fx_selector_down_pressed.svg);
     }
 
-  WEffectSelector QAbstractItemView,
-  #fadeModeCombobox QAbstractItemView {
-    background-color: #0f0f0f;
-    /* padding-left: 6px; */
-    font-size: 12px/13px;
-    /* On Linux, this is not applied but font color from WEffectSelector
-    is inherited.
-    On Windows, it must be defined here */
-    border: 1px solid #444;
-    border-radius: 2px;
-    padding: 0px;
-    margin: 0px;
-  }
   WEffectSelector QAbstractItemView,
   #fadeModeCombobox QAbstractItemView {
     width: 142px;
-    background-color: #0f0f0f;
     /* padding-left: 6px; */
-    font-size: 12px/13px;
     /* On Linux, this is not applied but font color from WEffectSelector
     is inherited.
     On Windows, it must be defined here */
@@ -1565,12 +1884,10 @@ WEffectSelector,
   WEffectSelector::checked,
   #fadeModeCombobox::checked {
     /* not applied
-    padding-left: 5px;
-    font-weight: bold;	*/
+    padding-left: 5px;	*/
     padding: 0px;
     margin: 0px;
     color: #eee;
-    background-color: #1e1e1e;
   }
   /* hovered items */
   WEffectSelector::item:selected,
@@ -1595,10 +1912,9 @@ WEffectSelector,
 
 #FxSuperLinkButton,
 #FxSuperLinkInvertButton {
-  border-radius: 1px;
   }
   #FxSuperLinkButton {
-    margin: 0px 2px 0px 2px;
+    margin: 0px 1px 0px 0px;
     }
   #FxSuperLinkInvertButton {
     margin: 0px;
@@ -1608,10 +1924,6 @@ WEffectSelector,
 #FxSuperLinkInvertButton[displayValue="0"] {
   background-color: #4b4b4b;
 }
-#FxSuperLinkButton[value="0"]:hover,
-#FxSuperLinkInvertButton[displayValue="0"]:hover {
-  background-color: #888;
-}
 #FxSuperLinkInvertButton[displayValue="1"] {
   background-color: #9C0900;
   }
@@ -1622,62 +1934,35 @@ WEffectSelector,
 #FxSuperLinkButton[value="1"] {
   background-color: #5b9601;
   }
-  #FxSuperLinkButton[value="1"]:hover {
-    background-color: #CDCDCD;
-  }
 #FxSuperLinkButton[value="2"] {	/*
   a simple way to achieve a partitioning in thirds	*/
   background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
     stop: 0 #5b9601,
     stop: 0.33 #5b9601,
-    stop: 0.34 #4b4b4b,
-    stop: 1 #4b4b4b);
+    stop: 0.34 #333,
+    stop: 1 #333);
   }
-  #FxSuperLinkButton[value="2"]:hover {
-    background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
-      stop: 0 #CDCDCD,
-      stop: 0.33 #CDCDCD,
-      stop: 0.34 #4b4b4b,
-      stop: 1 #4b4b4b);
-    }
 #FxSuperLinkButton[value="3"] {
   background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
-    stop: 0 #4b4b4b,
-    stop: 0.66 #4b4b4b,
+    stop: 0 #333,
+    stop: 0.66 #333,
     stop: 0.67 #5b9601,
     stop: 1 #5b9601);
   }
-  #FxSuperLinkButton[value="3"]:hover {
-    background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
-      stop: 0 #4b4b4b,
-      stop: 0.66 #4b4b4b,
-      stop: 0.67 #CDCDCD,
-      stop: 1 #CDCDCD);
-    }
 #FxSuperLinkButton[value="4"] {
   background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
     stop: 0 #5b9601,
     stop: 0.330000 #5b9601,
-    stop: 0.340000 #4b4b4b,
-    stop: 0.660000 #4b4b4b,
+    stop: 0.340000 #333,
+    stop: 0.660000 #333,
     stop: 0.670000 #5b9601,
     stop: 1 #5b9601);
   }
-  #FxSuperLinkButton[value="4"]:hover {
-    background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
-      stop: 0 #CDCDCD,
-      stop: 0.330000 #CDCDCD,
-      stop: 0.340000 #4b4b4b,
-      stop: 0.660000 #4b4b4b,
-      stop: 0.670000 #CDCDCD,
-      stop: 1 #CDCDCD);
-  }
-/********************** Effects **********************/
-
+/************** Effects *******************************************************/
 
 
 
-/********************** Library **********************/
+/************** Library *******************************************************/
 #LibrarySingleton {
   /* This doesn't work as expected:
   it appears LibrarySingleton is displayed twice, so
@@ -1686,10 +1971,10 @@ WEffectSelector,
   padding-top: 5px;*/
 }
 
-#Library {
+#LibraryContainer {
   /* make a smooth transition from toolbar at the bottom to
     darker skin background at the top.
-    Splitter handles should be transparent for this to work. */
+    Splitter handles should be translucent for this to work. */
   background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
     stop:0 #0f0f0f,
     stop:1 #1e1e1e);
@@ -1707,7 +1992,6 @@ WLibrary,
     stop:1 #1e1e1e);
   border-bottom-right-radius: 0px;
   border-bottom-left-radius: 0px;
-  background-color: #1e1e1e;
 }
 
 QTableView, QTextBrowser, QTreeView {
@@ -1717,13 +2001,12 @@ QTableView, QTextBrowser, QTreeView {
     stop:1 #444);
   border-bottom: 1px solid #444;
   border-left: 1px solid #0a0a0a;
-  background-color: #0f0f0f;
   alternate-background-color: #1a1a1a;
   selection-background-color: #5e4507;
 }
 
 QTableView:focus, QTreeView:focus {
-  border: 1px solid #ff6600;
+  border: 1px solid #d08e00;
 }
 
 /* selected items in Tree and Tracks table */
@@ -1754,7 +2037,7 @@ QTableView::indicator {/*
   }
   QTableView::indicator:checked,
   QTableView::indicator:checked:selected {
-    image: url(skin:/buttons/btn_lib_checkmark.svg);
+    image: url(skin:/buttons_classic/btn__lib_checkmark.svg);
     border: 1px solid #ff6600;
     }
     QTableView::indicator:checked:hover,
@@ -1773,13 +2056,13 @@ QTableView::indicator {/*
 /* Entire BPM cell */
 /* Lock icon at the left */
 #LibraryBPMButton::indicator:checked {
-  image: url(skin:/buttons/btn_lib_bpm_locked.svg);
+  image: url(skin:/buttons_classic/btn__lib_bpm_locked.svg);
   border: 0px;
   margin: 0px;
   padding: 0px;
   }
 #LibraryBPMButton::indicator:unchecked {
-  image: url(skin:/buttons/btn_lib_bpm_unlocked.svg);
+  image: url(skin:/buttons_classic/btn__lib_bpm_unlocked.svg);
   border: 0px;
   margin: 0px;
   padding: 0px;
@@ -1797,9 +2080,6 @@ QTableView::indicator {/*
     background-color: #5e4507;
     }
 #LibraryBPMSpinBox {
-  background-color: #0f0f0f;
-  selection-color: #0f0f0f;
-  selection-background-color: #d2d2d2;
   /* This combination of negative top/bottom padding & margin
     creates a 1px border around the spinbox' text area.
     Increased left/right padding/margin removes the overlap of
@@ -1831,14 +2111,14 @@ QTableView::indicator {/*
   border: 1px solid transparent;
   }
   #LibraryPreviewButton:!checked {
-    image: url(skin:/buttons/btn_lib_preview_play.svg);
+    image: url(skin:/buttons_classic/btn__lib_preview_play.svg);
     }
     #LibraryPreviewButton:!checked:hover {
       border: 1px solid #5e4507;
       background: #0f0f0f;
     }
   #LibraryPreviewButton:checked {
-    image: url(skin:/buttons/btn_lib_preview_pause.svg);
+    image: url(skin:/buttons_classic/btn__lib_preview_pause.svg);
     background-color: #000;
     border: 1px solid #5e4507;
     }
@@ -1847,9 +2127,7 @@ QTableView::indicator {/*
     }
 
 QHeaderView {
-  font-size: 13px/15px;
   color: #bbb;
-  font-weight: bold;
   border-bottom: 1px solid #000;
   }
   QHeaderView::section {
@@ -1868,10 +2146,10 @@ QHeaderView {
     border-right: 1px solid #000;
     }
     QHeaderView::up-arrow {
-      image: url(skin:/style/btn_lib_sort_up.png);
+      image: url(skin:/buttons_classic/btn__lib_sort_up.png);
       }
     QHeaderView::down-arrow {
-      image: url(skin:/style/btn_lib_sort_down.png);
+      image: url(skin:/buttons_classic/btn__lib_sort_down.png);
     }
 
 
@@ -1883,7 +2161,6 @@ QScrollBar {
   border-radius: 2px;
   padding: 1px;
   color: #999999;
-  font-size: 8pt;
   }
   QScrollBar:horizontal {
     min-width: 12px;
@@ -1934,7 +2211,6 @@ QScrollBar {
 
   /* Corner in between two scrollbars */
   QAbstractScrollArea::corner {
-    background-color: #1e1e1e;
   }
 
 /* library search bar */
@@ -1948,28 +2224,22 @@ WSearchLineEdit {
   background: #0f0f0f;
   }
   WSearchLineEdit:focus {
-    padding: 2px;
-    border: 2px solid #FF6600;
+    padding: 2px 0px 2px 2px;
+    border: 2px solid #d08e00;
   }
   /* Clear button */
   WSearchLineEdit QToolButton {
     /* C++ code adds 3px in each dimension.
-       height of search box inside the border: 22px
-       make the button use the available height */
+      height of search box inside the border: 22px
+      make the button use the available height */
     height: 19px;
     width: 19px;
-    margin-right: -3px;
-    }
-    WSearchLineEdit QToolButton:!focus {
-      image: url(skin:/buttons/btn_lib_clear_search.svg);
-    }
-    WSearchLineEdit QToolButton:focus {
-      image: url(skin:/buttons/btn_lib_clear_search_focus.svg);
+    margin-right: -1px;
     }
 
 /* HorizontalSplitter
-   (the splitter itself is horizontal)
-   Used to split
+  (the splitter itself is horizontal)
+  Used to split
   - Waveforms & Decks/FX/etc
   - Library feature & Coverart */
 #HorizontalSplitter {
@@ -1978,25 +2248,26 @@ WSearchLineEdit {
 }
 
 #HorizontalSplitter::handle {
-  image: url(skin:/style/splitter_handle_horizontal_unchecked.png);
+    image: url(skin:/style_classic/splitter_handle_horizontal_unchecked.png); /*
+    border-top: 1px solid #000; */
   }
   #HorizontalSplitter::handle:pressed,
   #HorizontalSplitter::handle:hover {
-    image: url(skin:/style/splitter_handle_horizontal_checked.png);
+    image: url(skin:/style_classic/splitter_handle_horizontal_checked.png);
   }
 #HorizontalSplitter::handle:vertical {
-  height: 10px;
+  height: 9px;
 }
 
 /* VerticalSplitter
-   (the splitter itself is vertical)
-   Used to split Library sidebar & Tracks table */
+  (the splitter itself is vertical)
+  Used to split Library sidebar & Tracks table */
 #VerticalSplitter::handle {
-  image: url(skin:/style/splitter_handle_unchecked.png);
+  image: url(skin:/style_classic/splitter_handle_unchecked.png);
 }
 #VerticalSplitter::handle:pressed,
 #VerticalSplitter::handle:hover {
-  image: url(skin:/style/splitter_handle_checked.png);
+  image: url(skin:/style_classic/splitter_handle_checked.png);
 }
 #VerticalSplitter::handle:vertical {
   /* 'height' works although it's actually the width of the handle */
@@ -2020,11 +2291,11 @@ WLibrary QLabel {
 }
 
 WLibrary QRadioButton::indicator:checked {
-  background: url(skin:/buttons/btn_lib_radio_button_on.svg) center center;
+  background: url(skin:/buttons_classic/btn__lib_radio_button_on_yellow.svg) center center;
 }
 
 WLibrary QRadioButton::indicator:unchecked {
-  background: url(skin:/buttons/btn_lib_radio_button_off.svg) center center;
+  background: url(skin:/buttons_classic/btn__lib_radio_button_off.svg) center center;
 }
 
 /* Library feature pushbuttons
@@ -2036,19 +2307,24 @@ WLibrary QRadioButton::indicator:unchecked {
 #DlgAutoDJ > QPushButton,
 #DlgRecording > QPushButton,
 #DlgAnalysis > QPushButton {
-  margin: 1px 1px 3px 1px;
-  padding: 0px 3px;
-  min-width: 32px;
+  margin: 0px 4px 3px 2px;
+  padding: 0px;
   height: 20px;
   }
+#DlgMissing > QPushButton,
+#DlgHidden > QPushButton,
+#DlgRecording > QPushButton,
+#DlgAnalysis > QPushButton {
+  padding: 0px 5px;
+  }
   /* Focus highlight is set via border-image at the top */
   /* Space in between 'Enable AutoDJ' and transition time spinbox */
   QPushButton#pushButtonAutoDJ {
+    margin-left: 0px;
     min-width: 40px;
   }
   #DlgAutoDJ > #horizontalSpacer {
     width: 100px;
-    background-color: green;
   }
   /* Space in between 'All' radio button and 'Select All' button */
   QPushButton#pushButtonSelectAll {
@@ -2058,71 +2334,70 @@ WLibrary QRadioButton::indicator:unchecked {
 
 /* AutoDJ button icons */
 QPushButton#pushButtonAutoDJ:!checked {
-  image: url(skin:/buttons/btn_autodj_enable_off.svg) no-repeat center center;
+  image: url(skin:/buttons_classic/btn__autodj_enable_off.svg) no-repeat center center;
   }
   QPushButton#pushButtonAutoDJ:checked {
-    image: url(skin:/buttons/btn_autodj_enable_on.svg) no-repeat center center;
+    image: url(skin:/buttons_classic/btn__autodj_enable_on.svg) no-repeat center center;
   }
 
 QPushButton#pushButtonFadeNow:!enabled {
-  image: url(skin:/buttons/btn_autodj_fade_disabled.svg) no-repeat center center;
+  image: url(skin:/buttons_classic/btn__autodj_fade_disabled.svg) no-repeat center center;
   }
   QPushButton#pushButtonFadeNow:enabled {
-    image: url(skin:/buttons/btn_autodj_fade.svg) no-repeat center center;
+    image: url(skin:/buttons_classic/btn__autodj_fade.svg) no-repeat center center;
   }
 
 QPushButton#pushButtonSkipNext:!enabled {
-  image: url(skin:/buttons/btn_autodj_skip_disabled.svg) no-repeat center center;
+  image: url(skin:/buttons_classic/btn__autodj_skip_disabled.svg) no-repeat center center;
   }
   QPushButton#pushButtonSkipNext:enabled {
-    image: url(skin:/buttons/btn_autodj_skip.svg) no-repeat center center;
+    image: url(skin:/buttons_classic/btn__autodj_skip.svg) no-repeat center center;
   }
 
 QPushButton#pushButtonShuffle:enabled {
-  image: url(skin:/buttons/btn_autodj_shuffle.svg) no-repeat center center;
+  image: url(skin:/buttons_classic/btn__autodj_shuffle.svg) no-repeat center center;
 }
 
 QPushButton#pushButtonAddRandom:enabled {
-  image: url(skin:/buttons/btn_autodj_addrandom.svg) no-repeat center center;
+  image: url(skin:/buttons_classic/btn__autodj_addrandom.svg) no-repeat center center;
 }
 
 QPushButton#pushButtonRepeatPlaylist:!checked {
-  image: url(skin:/buttons/btn_autodj_repeat_playlist_off.svg) no-repeat center center;
+  image: url(skin:/buttons_classic/btn__autodj_repeat_playlist_off.svg) no-repeat center center;
   }
   QPushButton#pushButtonRepeatPlaylist:checked {
-    image: url(skin:/buttons/btn_autodj_repeat_playlist_on.svg) no-repeat center center;
+    image: url(skin:/buttons_classic/btn__autodj_repeat_playlist_on.svg) no-repeat center center;
   }
 /* AutoDJ button icons */
 
 
 QTreeView {
   show-decoration-selected: 0;
-  background-color: #0f0f0f;
 }
   /* triangle for closed/opened branches in treeview */
   /*  Suppresses that selected sidebar items branch indicator shows wrong color when out of focus ; lp:880588 */
   QTreeView::branch:has-children:!has-siblings:closed,
   QTreeView::branch:closed:has-children:has-siblings {
     border-image: none;
-    image: url(skin:/style/library_branch_closed.png);
+    image: url(skin:/style_classic/library_branch_closed.png);
   }
   QTreeView::branch:open:has-children:!has-siblings,
   QTreeView::branch:open:has-children:has-siblings {
     border-image: none;
-    image: url(skin:/style/library_branch_open.png);
+    image: url(skin:/style_classic/library_branch_open.png);
   }
   /* closed branch * selected item */
   QTreeView::branch:has-children:!has-siblings:closed:selected,
   QTreeView::branch:closed:has-children:has-siblings:selected {
     border-image: none;
-    image: url(skin:/style/library_branch_closed_selected.png);
+    image: url(skin:/style_classic/library_branch_closed_selected.png);
     background-color: #5e4507;
   }
   /* open branch * selected item */
   QTreeView::branch:open:has-children:!has-siblings:selected,
   QTreeView::branch:open:has-children:has-siblings:selected {
     border-image: none;
-    image: url(skin:/style/library_branch_open_selected.png);
+    image: url(skin:/style_classic/library_branch_open_selected.png);
     background-color: #5e4507;
     }
     /* space left of selected child item */
@@ -2133,11 +2408,11 @@ QTreeView {
       border-image: none;
       background-color: #151515;
     }
-/********************** Library **********************/
+/************** Library *******************************************************/
 
 
 
-/********************** little helpers **********************/
+/************** little helpers ************************************************/
 #AlignLeft {
   qproperty-layoutAlignment: 'AlignLeft';
 }
@@ -2147,7 +2422,7 @@ QTreeView {
 }
 
 #AlignLeftBottom {
-  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
+  qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
 }
 
 #AlignRight {
diff --git a/res/skins/LateNight/style/spinny1_mask.svg b/res/skins/LateNight/style/spinny1_mask.svg
deleted file mode 100644
index 132f338ab714..000000000000
--- a/res/skins/LateNight/style/spinny1_mask.svg
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   enable-background="new"
-   version="1.1"
-   height="100"
-   width="100"
-   id="svg2">
-  <metadata
-     id="metadata17">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4">
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0417 0 0 1.0417 -2.086 2.6121)"
-       r="20.077"
-       cy="45.492"
-       cx="50.003"
-       id="radialGradient3335">
-      <stop
-         offset="0"
-         stop-color="#eece33"
-         id="stop3863" />
-      <stop
-         offset="1"
-         stop-opacity="0"
-         stop-color="#eece33"
-         id="stop3865" />
-    </radialGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0026 0 0 1.0052 1.9567 1.9207)"
-       y2="24.407"
-       y1=".070372"
-       x2="47.827"
-       x1="48.011"
-       id="linearGradient3338">
-      <stop
-         offset="0"
-         stop-color="#eece33"
-         id="stop3853" />
-      <stop
-         offset="1"
-         stop-opacity="0"
-         stop-color="#eece33"
-         id="stop3855" />
-    </linearGradient>
-  </defs>
-  <path
-     opacity=".4"
-     fill="url(#linearGradient3338)"
-     d="m97.917 50a47.917 47.917 0 1 1-95.833 0 47.917 47.917 0 1 1 95.833 0z"
-     id="path3849" />
-  <path
-     opacity=".4"
-     fill="url(#radialGradient3335)"
-     d="m70.913 50a20.913 20.913 0 0 1-41.827 0 20.913 20.913 0 1 1 41.827 0z"
-     id="path3859" />
-  <path
-     d="m54.167 50a4.1667 4.1667 0 0 1-8.3333 0 4.1667 4.1667 0 1 1 8.3333 0z"
-     id="path3830" />
-  <path
-     color="#000000"
-     fill="#1e1e1e"
-     enable-background="accumulate"
-     d="m0 0v100h100v-100zm50 3.125c12.259 0 24.47 5.0688 33.138 13.737 8.6682 8.6682 13.737 20.879 13.737 33.138s-5.0688 24.47-13.737 33.138l-0.09766 0.09766c-8.6622 8.6087-20.828 13.639-33.04 13.639-12.259 0-24.47-5.0688-33.138-13.737l-0.09766-0.09766c-8.6087-8.6622-13.639-20.828-13.639-33.04 0-12.259 5.0688-24.47 13.737-33.138 8.6682-8.6682 20.879-13.737 33.138-13.737z"
-     id="rect3033" />
-  <path
-     fill="none"
-     stroke="#000"
-     enable-background="new"
-     d="m96.875 50a46.875 46.875 0 0 1-93.75 0 46.875 46.875 0 1 1 93.75 0z"
-     id="path4919" />
-</svg>
diff --git a/res/skins/LateNight/style/spinny2_mask.svg b/res/skins/LateNight/style/spinny2_mask.svg
deleted file mode 100644
index 69ca4e7fbe5b..000000000000
--- a/res/skins/LateNight/style/spinny2_mask.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="100" height="100" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><radialGradient id="radialGradient3335" cx="50.003" cy="45.492" r="20.077" gradientTransform="matrix(1.0417 0 0 1.0417 -2.086 2.6121)" gradientUnits="userSpaceOnUse"><stop id="stop3863" stop-color="#eece33" offset="0"/><stop id="stop3865" stop-color="#eece33" stop-opacity="0" offset="1"/></radialGradient><linearGradient id="linearGradient3338" x1="48.011" x2="47.827" y1=".070372" y2="24.407" gradientTransform="matrix(1.0026 0 0 1.0052 1.9567 1.9207)" gradientUnits="userSpaceOnUse"><stop id="stop3853" stop-color="#eece33" offset="0"/><stop id="stop3855" stop-color="#eece33" stop-opacity="0" offset="1"/></linearGradient></defs><path id="path3849" d="m97.917 50a47.917 47.917 0 1 1-95.833 0 47.917 47.917 0 1 1 95.833 0z" fill="url(#linearGradient3338)" opacity=".4"/><path id="path3859" d="m70.913 50a20.913 20.913 0 0 1-41.827 0 20.913 20.913 0 1 1 41.827 0z" fill="url(#radialGradient3335)" opacity=".4"/><path id="path3830" d="m54.167 50a4.1667 4.1667 0 0 1-8.3333 0 4.1667 4.1667 0 1 1 8.3333 0z"/><path id="rect3033" d="m0 0v100h100v-100zm50 3.125c12.259 0 24.47 5.0688 33.138 13.737 8.6682 8.6682 13.737 20.879 13.737 33.138s-5.0688 24.47-13.737 33.138l-0.09766 0.09766c-8.6622 8.6087-20.828 13.639-33.04 13.639-12.259 0-24.47-5.0688-33.138-13.737l-0.09766-0.09766c-8.6087-8.6622-13.639-20.828-13.639-33.04 0-12.259 5.0688-24.47 13.737-33.138 8.6682-8.6682 20.879-13.737 33.138-13.737z" color="#000000" enable-background="accumulate" fill="#1e1e1e"/><path id="path4919" d="m96.875 50a46.875 46.875 0 0 1-93.75 0 46.875 46.875 0 1 1 93.75 0z" enable-background="new" fill="none" stroke="#000"/></svg>
diff --git a/res/skins/LateNight/style/spinny3_mask.svg b/res/skins/LateNight/style/spinny3_mask.svg
deleted file mode 100644
index 9f58ea4d14af..000000000000
--- a/res/skins/LateNight/style/spinny3_mask.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="100" height="100" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><radialGradient id="radialGradient3299" cx="50.003" cy="45.492" r="20.077" gradientTransform="matrix(1.0417 0 0 1.0417 -2.086 2.6121)" gradientUnits="userSpaceOnUse"><stop id="stop3863" stop-color="#09b2ae" offset="0"/><stop id="stop3865" stop-color="#09b2ae" stop-opacity="0" offset="1"/></radialGradient><linearGradient id="linearGradient3302" x1="48.011" x2="47.827" y1=".070372" y2="24.407" gradientTransform="matrix(1.0026 0 0 1.0052 1.9567 1.9207)" gradientUnits="userSpaceOnUse"><stop id="stop3853" stop-color="#09b2ae" offset="0"/><stop id="stop3855" stop-color="#09b2ae" stop-opacity="0" offset="1"/></linearGradient></defs><path id="path3849" d="m97.917 50a47.917 47.917 0 1 1-95.833 0 47.917 47.917 0 1 1 95.833 0z" fill="url(#linearGradient3302)" opacity=".4"/><path id="path3859" d="m70.913 50a20.913 20.913 0 0 1-41.827 0 20.913 20.913 0 1 1 41.827 0z" fill="url(#radialGradient3299)" opacity=".4"/><g id="g8130"><path id="path3830" d="m54.167 50a4.1667 4.1667 0 0 1-8.3333 0 4.1667 4.1667 0 1 1 8.3333 0z" enable-background="new"/><path id="rect3033" d="m0 0v100h100v-100zm50 3.125c12.259 0 24.47 5.0688 33.138 13.737 8.6682 8.6682 13.737 20.879 13.737 33.138s-5.0688 24.47-13.737 33.138l-0.09766 0.09766c-8.6622 8.6087-20.828 13.639-33.04 13.639-12.259 0-24.47-5.0688-33.138-13.737l-0.09766-0.09766c-8.6087-8.6622-13.639-20.828-13.639-33.04 0-12.259 5.0688-24.47 13.737-33.138 8.6682-8.6682 20.879-13.737 33.138-13.737z" color="#000000" enable-background="accumulate" fill="#1e1e1e"/><path id="path4919" d="m96.875 50a46.875 46.875 0 0 1-93.75 0 46.875 46.875 0 1 1 93.75 0z" enable-background="new" fill="none" stroke="#000"/></g></svg>
diff --git a/res/skins/LateNight/style/spinny4_mask.svg b/res/skins/LateNight/style/spinny4_mask.svg
deleted file mode 100644
index 9f58ea4d14af..000000000000
--- a/res/skins/LateNight/style/spinny4_mask.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="100" height="100" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><radialGradient id="radialGradient3299" cx="50.003" cy="45.492" r="20.077" gradientTransform="matrix(1.0417 0 0 1.0417 -2.086 2.6121)" gradientUnits="userSpaceOnUse"><stop id="stop3863" stop-color="#09b2ae" offset="0"/><stop id="stop3865" stop-color="#09b2ae" stop-opacity="0" offset="1"/></radialGradient><linearGradient id="linearGradient3302" x1="48.011" x2="47.827" y1=".070372" y2="24.407" gradientTransform="matrix(1.0026 0 0 1.0052 1.9567 1.9207)" gradientUnits="userSpaceOnUse"><stop id="stop3853" stop-color="#09b2ae" offset="0"/><stop id="stop3855" stop-color="#09b2ae" stop-opacity="0" offset="1"/></linearGradient></defs><path id="path3849" d="m97.917 50a47.917 47.917 0 1 1-95.833 0 47.917 47.917 0 1 1 95.833 0z" fill="url(#linearGradient3302)" opacity=".4"/><path id="path3859" d="m70.913 50a20.913 20.913 0 0 1-41.827 0 20.913 20.913 0 1 1 41.827 0z" fill="url(#radialGradient3299)" opacity=".4"/><g id="g8130"><path id="path3830" d="m54.167 50a4.1667 4.1667 0 0 1-8.3333 0 4.1667 4.1667 0 1 1 8.3333 0z" enable-background="new"/><path id="rect3033" d="m0 0v100h100v-100zm50 3.125c12.259 0 24.47 5.0688 33.138 13.737 8.6682 8.6682 13.737 20.879 13.737 33.138s-5.0688 24.47-13.737 33.138l-0.09766 0.09766c-8.6622 8.6087-20.828 13.639-33.04 13.639-12.259 0-24.47-5.0688-33.138-13.737l-0.09766-0.09766c-8.6087-8.6622-13.639-20.828-13.639-33.04 0-12.259 5.0688-24.47 13.737-33.138 8.6682-8.6682 20.879-13.737 33.138-13.737z" color="#000000" enable-background="accumulate" fill="#1e1e1e"/><path id="path4919" d="m96.875 50a46.875 46.875 0 0 1-93.75 0 46.875 46.875 0 1 1 93.75 0z" enable-background="new" fill="none" stroke="#000"/></g></svg>
diff --git a/res/skins/LateNight/style/spinny_indicator.svg b/res/skins/LateNight/style/spinny_indicator.svg
deleted file mode 100644
index 4583fe7ea1ba..000000000000
--- a/res/skins/LateNight/style/spinny_indicator.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="100"
-   width="100"
-   id="svg2">
-  <metadata
-     id="metadata9">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs7" />
-  <path
-     style="color:#000000;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;text-orientation:mixed;dominant-baseline:auto;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000000;color-rendering:auto;image-rendering:auto;shape-rendering:auto"
-     dominant-baseline="auto"
-     d="m 49.471,4.0067844 c -1.9143,0 -3.4707,1.5564 -3.4707,3.4707 l 0,30.7221356 c 0,1.9143 1.5564,3.4707 3.4707,3.4707 h 1.0586 c 1.9143,0 3.4707,-1.5564 3.4707,-3.4707 l 0,-30.7221356 c 0,-1.9143 -1.5564,-3.4707 -3.4707,-3.4707 z"
-     id="path5574" />
-  <path
-     style="color:#000000;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;text-orientation:mixed;dominant-baseline:auto;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000000;fill:#ffffff;color-rendering:auto;image-rendering:auto;shape-rendering:auto"
-     dominant-baseline="auto"
-     d="m 49.568,5.4462644 h 0.86471 c 1.1515,0 2.0676,1.0929 2.0676,2.4665 l 0,29.8511356 c 0,1.3737 -0.91612,2.4665 -2.0676,2.4665 H 49.568 c -1.1515,0 -2.0676,-1.0929 -2.0676,-2.4665 l 0,-29.8511356 c 0,-1.3737 0.91612,-2.4665 2.0676,-2.4665 z"
-     id="rect4544" />
-</svg>
diff --git a/res/skins/LateNight/style/spinny_indicator_ghost.svg b/res/skins/LateNight/style/spinny_indicator_ghost.svg
deleted file mode 100644
index aaacd32edbe8..000000000000
--- a/res/skins/LateNight/style/spinny_indicator_ghost.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   height="100"
-   width="100"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <path
-     style="color:#000000;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;text-orientation:mixed;dominant-baseline:auto;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000000;fill:#1af000;fill-opacity:0.96651001;stroke-width:0.95523113;color-rendering:auto;image-rendering:auto;shape-rendering:auto"
-     dominant-baseline="auto"
-     d="m 49.999855,5.446264 v 0 c 0,0 2.067589,-0.00263 2.0676,1.250736 l 2.9e-4,32.283 c 1.1e-5,1.253456 -2.06789,1.2504 -2.06789,1.2504 v 0 c 0,0 -2.067299,0.003 -2.06731,-1.2504 l -2.9e-4,-32.283 c -1.1e-5,-1.2534553 2.0676,-1.250736 2.0676,-1.250736 z"
-     id="rect4544" />
-</svg>
diff --git a/res/skins/LateNight/style/vinylcontrol_indicator_horizontal1.png b/res/skins/LateNight/style/vinylcontrol_indicator_horizontal1.png
deleted file mode 100644
index e4c319012920..000000000000
Binary files a/res/skins/LateNight/style/vinylcontrol_indicator_horizontal1.png and /dev/null differ
diff --git a/res/skins/LateNight/style/vinylcontrol_indicator_horizontal2.png b/res/skins/LateNight/style/vinylcontrol_indicator_horizontal2.png
deleted file mode 100644
index 44b621ad84b0..000000000000
Binary files a/res/skins/LateNight/style/vinylcontrol_indicator_horizontal2.png and /dev/null differ
diff --git a/res/skins/LateNight/style/vinylcontrol_indicator_horizontal3.png b/res/skins/LateNight/style/vinylcontrol_indicator_horizontal3.png
deleted file mode 100644
index 5065fed7dd7e..000000000000
Binary files a/res/skins/LateNight/style/vinylcontrol_indicator_horizontal3.png and /dev/null differ
diff --git a/res/skins/LateNight/style/vu_level_sampler.png b/res/skins/LateNight/style/vu_level_sampler.png
deleted file mode 100644
index a853c96230be..000000000000
Binary files a/res/skins/LateNight/style/vu_level_sampler.png and /dev/null differ
diff --git a/res/skins/LateNight/style/vu_level_sampler_over.png b/res/skins/LateNight/style/vu_level_sampler_over.png
deleted file mode 100644
index 979f359e7337..000000000000
Binary files a/res/skins/LateNight/style/vu_level_sampler_over.png and /dev/null differ
diff --git a/res/skins/LateNight/style/background_tile.png b/res/skins/LateNight/style_classic/background_tile.png
similarity index 100%
rename from res/skins/LateNight/style/background_tile.png
rename to res/skins/LateNight/style_classic/background_tile.png
diff --git a/res/skins/LateNight/style/background_tile.svg b/res/skins/LateNight/style_classic/background_tile.svg
similarity index 100%
rename from res/skins/LateNight/style/background_tile.svg
rename to res/skins/LateNight/style_classic/background_tile.svg
diff --git a/res/skins/LateNight/style/background_tile.xcf b/res/skins/LateNight/style_classic/background_tile.xcf
similarity index 100%
rename from res/skins/LateNight/style/background_tile.xcf
rename to res/skins/LateNight/style_classic/background_tile.xcf
diff --git a/res/skins/LateNight/style/background_tile_BAK.png b/res/skins/LateNight/style_classic/background_tile_BAK.png
similarity index 100%
rename from res/skins/LateNight/style/background_tile_BAK.png
rename to res/skins/LateNight/style_classic/background_tile_BAK.png
diff --git a/res/skins/LateNight/style/background_tile_blurred.png b/res/skins/LateNight/style_classic/background_tile_blurred.png
similarity index 100%
rename from res/skins/LateNight/style/background_tile_blurred.png
rename to res/skins/LateNight/style_classic/background_tile_blurred.png
diff --git a/res/skins/LateNight/style_classic/background_tile_bright.png b/res/skins/LateNight/style_classic/background_tile_bright.png
new file mode 100644
index 000000000000..5c1c279e9f85
Binary files /dev/null and b/res/skins/LateNight/style_classic/background_tile_bright.png differ
diff --git a/res/skins/LateNight/style/background_tile_checkers.svg b/res/skins/LateNight/style_classic/background_tile_checkers.svg
similarity index 100%
rename from res/skins/LateNight/style/background_tile_checkers.svg
rename to res/skins/LateNight/style_classic/background_tile_checkers.svg
diff --git a/res/skins/LateNight/style/background_tile_cross_INV.png b/res/skins/LateNight/style_classic/background_tile_cross_INV.png
similarity index 100%
rename from res/skins/LateNight/style/background_tile_cross_INV.png
rename to res/skins/LateNight/style_classic/background_tile_cross_INV.png
diff --git a/res/skins/LateNight/style/background_tile_crossblur.png b/res/skins/LateNight/style_classic/background_tile_crossblur.png
similarity index 100%
rename from res/skins/LateNight/style/background_tile_crossblur.png
rename to res/skins/LateNight/style_classic/background_tile_crossblur.png
diff --git a/res/skins/LateNight/style/background_tile_crossblur_brighter.png b/res/skins/LateNight/style_classic/background_tile_crossblur_brighter.png
similarity index 100%
rename from res/skins/LateNight/style/background_tile_crossblur_brighter.png
rename to res/skins/LateNight/style_classic/background_tile_crossblur_brighter.png
diff --git a/res/skins/LateNight/style/background_tile_fx_focus.png b/res/skins/LateNight/style_classic/background_tile_fx_focus.png
similarity index 100%
rename from res/skins/LateNight/style/background_tile_fx_focus.png
rename to res/skins/LateNight/style_classic/background_tile_fx_focus.png
diff --git a/res/skins/LateNight/style_classic/background_tile_mokka.png b/res/skins/LateNight/style_classic/background_tile_mokka.png
new file mode 100644
index 000000000000..5c1c279e9f85
Binary files /dev/null and b/res/skins/LateNight/style_classic/background_tile_mokka.png differ
diff --git a/res/skins/LateNight/style/background_tile_slashcross.png b/res/skins/LateNight/style_classic/background_tile_slashcross.png
similarity index 100%
rename from res/skins/LateNight/style/background_tile_slashcross.png
rename to res/skins/LateNight/style_classic/background_tile_slashcross.png
diff --git a/res/skins/LateNight/style/background_tile_slashes_NEW.png b/res/skins/LateNight/style_classic/background_tile_slashes_NEW.png
similarity index 100%
rename from res/skins/LateNight/style/background_tile_slashes_NEW.png
rename to res/skins/LateNight/style_classic/background_tile_slashes_NEW.png
diff --git a/res/skins/LateNight/style/background_tile_weave.svg b/res/skins/LateNight/style_classic/background_tile_weave.svg
similarity index 100%
rename from res/skins/LateNight/style/background_tile_weave.svg
rename to res/skins/LateNight/style_classic/background_tile_weave.svg
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_charged.svg b/res/skins/LateNight/style_classic/batt/ic_battery_charged.svg
new file mode 100644
index 000000000000..1ae4d399600e
--- /dev/null
+++ b/res/skins/LateNight/style_classic/batt/ic_battery_charged.svg
@@ -0,0 +1,3 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<path d="m4.0001 27.9999h4v3.332c0 1.4791 1.1882 2.668 2.668 2.668h30.662c1.47 0 2.6699-1.1887 2.6699-2.668v-14.664c0-1.4693-1.1899-2.668-2.6699-2.668h-2.3301v.002l-28.332-.002c-1.4798.01-2.6677 1.1986-2.668 2.6777v3.3223h-4zm10-6h11v-4l15 8h-11v4z" fill="#b4b4b4"/>
+</svg>
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_charging_0.svg b/res/skins/LateNight/style_classic/batt/ic_battery_charging_0.svg
new file mode 100644
index 000000000000..a3614955513a
--- /dev/null
+++ b/res/skins/LateNight/style_classic/batt/ic_battery_charging_0.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24,24)">
+		<path d="m22.236 39.557-.23633.44336v-.44336h-8v1.7734c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-1.7734h-.002z" fill="#f00"/>
+		<path d="m20 4v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v28.889h8v-10.557h-4l8-15v11h4l-7.7637 14.557h11.762l.002-28.889c-.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_charging_1.svg b/res/skins/LateNight/style_classic/batt/ic_battery_charging_1.svg
new file mode 100644
index 000000000000..50830d115f36
--- /dev/null
+++ b/res/skins/LateNight/style_classic/batt/ic_battery_charging_1.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24,24)">
+		<path d="m22 35.111h-8v6.2188c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-6.2188h-9.3926l-2.6074 4.8887z" fill="#ff5c00"/>
+		<path d="m20 4v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v24.443h8v-6.1113h-4l8-15v11h4l-5.3926 10.111h9.3906l.002-24.443c-.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_charging_2.svg b/res/skins/LateNight/style_classic/batt/ic_battery_charging_2.svg
new file mode 100644
index 000000000000..18fee209f34d
--- /dev/null
+++ b/res/skins/LateNight/style_classic/batt/ic_battery_charging_2.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24.00005,24)">
+		<path d="m22 30.668h-8v10.662c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-10.662h-7.0235l-4.9765 9.332z" fill="#ffb108"/>
+		<path d="m20 4v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v20h8v-1.668h-4l8-15v11h4l-3.0234 5.668h7.0215l.002-20c-.010047-1.4798-1.1987-2.6677-2.6778-2.668h-3.3223v-4z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_charging_3.svg b/res/skins/LateNight/style_classic/batt/ic_battery_charging_3.svg
new file mode 100644
index 000000000000..bb4d8fbb5e38
--- /dev/null
+++ b/res/skins/LateNight/style_classic/batt/ic_battery_charging_3.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24,24)">
+		<path d="m19.48 26.223h-5.4805v15.107c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-15.107h-4.6524l-7.3476 13.777v-11h-4z" fill="#b4b4b4"/>
+		<path d="m20 4v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v15.555h5.4805l6.5195-12.223v11h4l-.65234 1.2227h4.6504l.002-15.555c-.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_charging_4.svg b/res/skins/LateNight/style_classic/batt/ic_battery_charging_4.svg
new file mode 100644
index 000000000000..e99b266351cb
--- /dev/null
+++ b/res/skins/LateNight/style_classic/batt/ic_battery_charging_4.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24.0002,24)">
+		<path d="m21.852 21.777h-7.8516v19.553c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-19.553h-8v3.2227h4l-8 15v-11h-4z" fill="#b4b4b4"/>
+		<path d="m20 4v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v11.109h7.8516l4.1484-7.7773v7.7773h7.998l.002-11.109c-.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_charging_5.svg b/res/skins/LateNight/style_classic/batt/ic_battery_charging_5.svg
new file mode 100644
index 000000000000..b92c064bfb1d
--- /dev/null
+++ b/res/skins/LateNight/style_classic/batt/ic_battery_charging_5.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24.00015,24)">
+		<path d="m24.223 17.334h-10.223v23.996c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-23.996h-8v7.666h4l-8 15v-11h-4z" fill="#b4b4b4"/>
+		<path d="m20 4v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v6.666h10.223l1.7773-3.334v3.334h7.998l.002-6.666c-.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_charging_6.svg b/res/skins/LateNight/style_classic/batt/ic_battery_charging_6.svg
new file mode 100644
index 000000000000..5bfd6f0080db
--- /dev/null
+++ b/res/skins/LateNight/style_classic/batt/ic_battery_charging_6.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24,24)">
+		<path d="m14 12.889v28.441c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-28.441h-.002zm12 1.1113v11h4l-8 15v-11h-4z" fill="#b4b4b4"/>
+		<path d="m33.999 12.889.001-2.221c-.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v2.221z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_charging_7.svg b/res/skins/LateNight/style_classic/batt/ic_battery_charging_7.svg
new file mode 100644
index 000000000000..87c47e72bd69
--- /dev/null
+++ b/res/skins/LateNight/style_classic/batt/ic_battery_charging_7.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24,24)">
+		<path d="m16.668 8c-1.4791 0-2.668 1.1882-2.668 2.668v30.662c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-29.33h-.002l.002-1.332c-.01-1.4798-1.1986-2.6677-2.6777-2.668h-11.322zm9.332 6v11h4l-8 15v-11h-4z" fill="#b4b4b4"/>
+		<path d="m20 4v4h8v-4z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_discharging_0.svg b/res/skins/LateNight/style_classic/batt/ic_battery_discharging_0.svg
new file mode 100644
index 000000000000..28e29535c673
--- /dev/null
+++ b/res/skins/LateNight/style_classic/batt/ic_battery_discharging_0.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24,24)">
+		<path d="m14 39.556v1.7741c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-1.7741h-.002.001z" fill="#f00"/>
+		<path d="m33.999 39.556.001-28.888c-.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v28.888z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_discharging_1.svg b/res/skins/LateNight/style_classic/batt/ic_battery_discharging_1.svg
new file mode 100644
index 000000000000..c5989b75a357
--- /dev/null
+++ b/res/skins/LateNight/style_classic/batt/ic_battery_discharging_1.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24,24)">
+		<path d="m14 35.112v6.2181c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-6.2181h-.002.001z" fill="#ff5c00"/>
+		<path d="m33.999 35.112.001-24.444c-.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v24.444z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_discharging_2.svg b/res/skins/LateNight/style_classic/batt/ic_battery_discharging_2.svg
new file mode 100644
index 000000000000..22f78b69e965
--- /dev/null
+++ b/res/skins/LateNight/style_classic/batt/ic_battery_discharging_2.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24,23.99995)">
+		<path d="m14 30.667v10.663c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-10.663h-.002.001z" fill="#ffb108"/>
+		<path d="m33.999 30.667.001-19.999c-.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v19.999z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_discharging_3.svg b/res/skins/LateNight/style_classic/batt/ic_battery_discharging_3.svg
new file mode 100644
index 000000000000..150c1fb9bb21
--- /dev/null
+++ b/res/skins/LateNight/style_classic/batt/ic_battery_discharging_3.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24,23.99995)">
+		<path d="m14 26.223v15.107c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-15.107h-.002.001z" fill="#b4b4b4"/>
+		<path d="m33.999 26.223.001-15.555c-.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v15.555z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_discharging_4.svg b/res/skins/LateNight/style_classic/batt/ic_battery_discharging_4.svg
new file mode 100644
index 000000000000..f4745d4bec19
--- /dev/null
+++ b/res/skins/LateNight/style_classic/batt/ic_battery_discharging_4.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24,23.99995)">
+		<path d="m14 21.778v19.552c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-19.552h-.002.001z" fill="#b4b4b4"/>
+		<path d="m33.999 21.778.001-11.11c-.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v11.11z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_discharging_5.svg b/res/skins/LateNight/style_classic/batt/ic_battery_discharging_5.svg
new file mode 100644
index 000000000000..b477bee1df85
--- /dev/null
+++ b/res/skins/LateNight/style_classic/batt/ic_battery_discharging_5.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24,23.99995)">
+		<path d="m14 17.334v23.996c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-23.996h-.002.001z" fill="#b4b4b4"/>
+		<path d="m33.999 17.334.001-6.666c-.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v6.666z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_discharging_6.svg b/res/skins/LateNight/style_classic/batt/ic_battery_discharging_6.svg
new file mode 100644
index 000000000000..5ac8e715efbd
--- /dev/null
+++ b/res/skins/LateNight/style_classic/batt/ic_battery_discharging_6.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24,23.99995)">
+		<path d="m14 12.889v28.441c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-28.441h-.002.001z" fill="#b4b4b4"/>
+		<path d="m33.999 12.889.001-2.221c-.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v2.221z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_discharging_7.svg b/res/skins/LateNight/style_classic/batt/ic_battery_discharging_7.svg
new file mode 100644
index 000000000000..2505b6edbe48
--- /dev/null
+++ b/res/skins/LateNight/style_classic/batt/ic_battery_discharging_7.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24,23.99995)">
+		<path d="m20 8h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v30.662c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-29.33h-.002l.002-1.332c-.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223z" fill="#b4b4b4"/>
+		<path d="m20 4v4h8v-4z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_unknown.svg b/res/skins/LateNight/style_classic/batt/ic_battery_unknown.svg
new file mode 100644
index 000000000000..6e2b6684edc1
--- /dev/null
+++ b/res/skins/LateNight/style_classic/batt/ic_battery_unknown.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24,24)">
+		<path d="m31.33 8h-3.33v-4h-8v4h-3.33c-1.48 0-2.67 1.18-2.67 2.66v30.67c0 1.47 1.19 2.67 2.67 2.67h14.67c1.47 0 2.66-1.19 2.66-2.67v-30.67c-.01-1.48-1.19-2.6556-2.67-2.66z" fill="#5f5f5f"/>
+		<path d="m24.483051 29.838305s-.711864-.644068-1.20339-1.135593c-.822034-.822034-1.940678-1.40678-2.711864-1.40678v-2.711864c1.406779 0 2.584745.779661 3.381356 1.576271l1.601695 1.576271c.457627.457627 1.09322.745763 1.79661.745763 1.406779 0 2.542373-1.135593 2.542373-2.542373s-1.135594-2.542373-2.542373-2.542373v-2.542373c2.805085 0 5.084746 2.279661 5.084746 5.084746s-2.279661 5.084746-5.084746 5.084746c-1.118644 0-2.135593-.449153-2.864407-1.186441zm-8.915254-2.288135v-3.220339h3.220339v3.220339z" fill="#b4b4b4" stroke-width=".99999994"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_classic/btn__fx_focus_off.svg b/res/skins/LateNight/style_classic/btn__fx_focus_off.svg
new file mode 100644
index 000000000000..63a3e089bd98
--- /dev/null
+++ b/res/skins/LateNight/style_classic/btn__fx_focus_off.svg
@@ -0,0 +1,108 @@
+<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="b">
+			<stop offset="0"/>
+			<stop stop-color="#5a5a5a" offset=".42617449"/>
+			<stop stop-color="#979797" offset="1"/>
+		</linearGradient>
+		<linearGradient id="c" x1="256.73999" x2="484.70999" y1="472.03" y2="472.03" gradientTransform="matrix(-.02689375 -.08131675 .08068125 -.02710559 -17.729844 51.688341)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#060606" offset="0"/>
+			<stop stop-color="#343434" offset="1"/>
+		</linearGradient>
+		<linearGradient id="f" x1=".48967797" x2="19.539619" y1="10.011954" y2="10.011954" gradientTransform="rotate(180 -9.985347 10.011957)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="u" x1="3.5003572" x2="3.5003572" y1="21.247955" y2="-.1809755" gradientTransform="matrix(.91881554 0 0 .91881554 .81288587 -39.139006)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="t" x1=".49674207" x2="19.53257" y1="10.011954" y2="10.011954" gradientTransform="rotate(-90,-9.985344,30.011954)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="e" x1="-5.2630553" x2="19.539619" y1="10.011954" y2="10.011954" gradientTransform="rotate(-90,-9.985345,30.011959)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="d" x1="27.888315" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="q" x1="27.888315" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(1.2970097,0,0,1.29701,-13.068549,-2.9736993)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="o" x1="27.888315" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(.64280627 0 0 .64280627 12.758843 3.576266)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="n" x1="27.888315" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(.59226271 0 0 .59226271 21.332937 4.0823143)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="m" x1="27.888315" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(.58022484 0 0 .58022484 18.470278 7.6543595)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="l" x1="27.888315" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(.61994903 0 0 .61994903 16.722411 .60838196)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="p" x1="27.888315" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(0,-1.2063935,1.206393,0,21.68668,73.693886)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="k" x1="4.4978113" x2="15.295909" y1="-43.891712" y2="-43.891712" gradientTransform="matrix(.88673909 0 0 .88673855 -2.3793616 29.936364)" gradientUnits="userSpaceOnUse" xlink:href="#c"/>
+		<linearGradient id="h" x1="-25.224104" x2="-40.264385" y1="-31.891275" y2="-47.270847" gradientTransform="matrix(1.2055543,0,0,1.2055543,29.452607,50.506638)" gradientUnits="userSpaceOnUse">
+			<stop offset="0"/>
+			<stop stop-color="#5a5a5a" offset=".35063794"/>
+			<stop stop-color="#979797" offset="1"/>
+		</linearGradient>
+		<linearGradient id="j" x1="4.4978113" x2="15.295909" y1="-43.891712" y2="-43.891712" gradientTransform="matrix(.58275237 0 0 .582752 -15.767419 16.224989)" gradientUnits="userSpaceOnUse" xlink:href="#c"/>
+		<linearGradient id="s" x1="7.2461166" x2="16.411036" y1="-6.8960171" y2="2.2689023" gradientTransform="translate(-64.169491,16.277727)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#979797" offset="0"/>
+			<stop stop-color="#5a5a5a" offset=".70143074"/>
+			<stop offset="1"/>
+		</linearGradient>
+		<linearGradient id="i" x1="4.4978113" x2="15.295909" y1="-43.891712" y2="-43.891712" gradientTransform="matrix(.79585423 0 0 .79585374 15.989498 -11.953486)" gradientUnits="userSpaceOnUse" xlink:href="#c"/>
+		<linearGradient id="g" x1="-25.224104" x2="-40.264385" y1="-31.891275" y2="-47.270847" gradientTransform="matrix(1.2829802,0,0,1.2829802,-7.1099335,68.080049)" gradientUnits="userSpaceOnUse">
+			<stop offset="0"/>
+			<stop stop-color="#5a5a5a" offset=".80397099"/>
+			<stop stop-color="#979797" offset="1"/>
+		</linearGradient>
+		<linearGradient id="r" x1="23.589788" x2="-8.4102125" y1="11.769581" y2="11.769581" gradientTransform="translate(0 -.3593684)" gradientUnits="userSpaceOnUse">
+			<stop offset="0"/>
+			<stop stop-color="#5a5a5a" offset=".56143475"/>
+			<stop stop-color="#979797" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g transform="matrix(0 -.96110921 .96110921 0 40.488037 52.184731)" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5999999">
+		<ellipse cx="44.000408" cy="10.012118" rx="4.9541779" ry="4.9541545" style="paint-order:fill markers stroke"/>
+		<path d="m35.257812 10.012119h3.204309"/>
+		<path d="m49.440445 10.012119h3.085171"/>
+		<path d="m44.000407 15.136171v3.379592"/>
+		<path d="m44.000441 1.2779594v3.2730534"/>
+	</g>
+	<path d="m-29.957024 19.529774a1.0000999 1.0000999 0 0 0 .986328-1.013672v-1.390625c3.161365-.444254 5.669029-2.951923 6.113282-6.113281h1.382812a1.0000999 1.0000999 0 1 0 0-2.0000005h-1.382812c-.444253-3.161612-2.951917-5.670726-6.113282-6.115234v-1.388672a1.0000999 1.0000999 0 1 0-1.999999 0v1.388672c-3.161618.444508-5.670728 2.953622-6.115234 6.115234h-1.410157a1.0000999 1.0000999 0 1 0 0 2.0000005h1.410157c.444506 3.161358 2.953616 5.669027 6.115234 6.113281v1.390625a1.0000999 1.0000999 0 0 0 1.013671 1.013672zm.986328-4.423828v-.826172a1.0000999 1.0000999 0 1 0-2 0v.826172c-2.073069-.400054-3.69467-2.021248-4.095703-4.09375h.806642a1.0000999 1.0000999 0 1 0 0-2.0000005h-.806642c.400472-2.073628 2.022065-3.695227 4.095703-4.095703v.828125a1.0000999 1.0000999 0 0 0 1.015625 1.013672 1.0000999 1.0000999 0 0 0 .984375-1.013672v-.828125c2.073326.400476 3.69359 2.022075 4.09375 4.095703h-.833984a1.0000999 1.0000999 0 1 0 0 2.0000005h.833984c-.40072 2.072502-2.020992 3.693696-4.09375 4.09375z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#f)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stroke="url(#t)" stroke-linecap="round" stroke-linejoin="round" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<path d="m9.993863-39.160541c-.0018.000587-.00359.0012-.00538.0018-.045544.0012-.091198.005-.1363867.01077-.7017999.08221-1.2356883.689211-1.2256856 1.396169-6.92e-5.01099-.0001799.02131 0 .0323v.92061c-2.7677663.564383-4.920142 2.718018-5.4841845 5.485975h-.934966c-.7744815-.01058-1.41752.632454-1.40693626 1.406936.00058714.0018.001185.0036.001795.0054.001176.04219.007548.08374.0125619.125619-.006995.05988-.0148499.119118-.0143565.179456-4.57e-6.0012-4.57e-6.0024 0 .0036.001186.0736.0164269.146474.028713.218936-.0128473.0795-.0292109.159786-.028713.240471-4.57e-6.0012-4.57e-6.0024 0 .0036.0103668.769451.63788226 1.410648 1.40693626 1.399758h.929583c.5584729 2.862781 2.7105652 5.100592 5.4895638 5.685171v.974447c-.00594.435147.1638763.823077.4324895 1.073148.268613.250071.6146665.367885.9547061.367885.34004 0 .686094-.117814.954707-.367885.268614-.250071.438425-.638001.43249-1.073148v-.389419l-.0018.01615c.0011-.03262.0011-.06608 0-.0987l.0018.01615v-.518628c.454729-.09564.892654-.235552 1.30955-.415222 2.131013-.918403 3.712537-2.875685 4.180013-5.269949h.929584c.908877.01329 1.578979-.876139 1.365661-1.760465v.218936c.03453-.143463.02608-.291201.01615-.437873.131792-.838347-.530249-1.616673-1.381811-1.604374h-.933173c-.564368-2.768039-2.71794-4.921609-5.485974-5.485975v-.927788l-.0018.01436c.0013-.04496.001-.08971-.0018-.134593-.03364-.634793-.499097-1.169427-1.123396-1.288495h-.0018c-.09145-.01762-.184998-.02659-.278141-.02512zm-1.367456 5.900518v.02153c-.00594.435147.1638763.823077.4324895 1.073148.268613.250071.6146665.367885.9547065.367885s.686094-.117814.954707-.367885c.268614-.250071.438425-.638001.43249-1.073148v-.02153c1.006017.369173 1.801928 1.077731 2.304216 2.044006-.649286.120748-1.180732.628205-1.170054 1.311824.000602.0018.0012.0036.0018.0054.0012.04219.0075.08374.01256.125619-.007.05988-.01485.119118-.01436.179457-1.1e-5.0018-1.1e-5.0036 0 .0054.0013.07261.01659.143852.02871.215347-.01297.08029-.02936.160792-.02871.242266-5e-6.0012-5e-6.0024 0 .0036.01002.65524.505786 1.133249 1.116217 1.277728-.505082.883797-1.276444 1.53498-2.250379 1.878906v-.0341c.0061-.428055-.168013-.810891-.437874-1.053407-.269861-.242518-.613035-.353529-.949323-.353529-.3362889 0-.6794622.111011-.9493231.353529-.269861.242516-.4439223.625352-.4378731 1.053407v.03231c-.9794977-.346706-1.7557454-1.00253-2.2593527-1.895105.7307228-.176279 1.2700296-.850734 1.0839152-1.622284v.218936c.034525-.143462.02608-.291201.016151-.437872.1172839-.746029-.4329732-1.361039-1.1485195-1.496665.5010574-.971612 1.2989038-1.683941 2.3078062-2.054773z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#u)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<g transform="translate(-39.95,-4.0829584)">
+		<g transform="matrix(.76872597 .34140352 -.34140352 .76872597 1.504911 -10.097772)">
+			<g transform="matrix(.10676 0 0 .10676 -19.071124 -31.786292)" opacity=".49300005">
+				<path d="m270.69379 536.40673c20.01433 60.04489 85.31772 92.31846 145.17067 71.75942 60.21816-19.46338 93.09981-84.46428 73.08548-144.50917-78.29686-151.10046-253.52045-44.94758-218.25615 72.74975z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" opacity="1" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+			</g>
+			<g transform="matrix(.10746967 0 0 .10746967 -20.137858 -33.659792)" fill="#050505" opacity=".93999999">
+				<path d="m270.69379 536.40673c20.01433 60.04489 85.31772 92.31846 145.17067 71.75942 60.21816-19.46338 93.09981-84.46428 73.08548-144.50917-20.01433-60.04488-85.31957-92.31785-145.17252-71.7588-60.21816 19.46339-93.09796 84.46366-73.08363 144.50855z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#050505" image-rendering="auto" opacity="1" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+			</g>
+		</g>
+		<path d="m11.186356 1.2636715c-1.3020582-.0916159-2.6422052.0771242-3.9531254.5351562-5.2875947 1.7077135-8.17857564 7.4460999-6.42382826 12.7519533 1.75509276 5.306898 7.49078446 8.151822 12.73828166 6.31836 5.287593-1.707715 8.176622-7.446101 6.421875-12.7519539-1.316639-3.9811374-4.873239-6.5784013-8.783203-6.8535156z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#404040" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<path d="m7.4081644 2.98355a9.1929467 9.2653595 0 1 1 5.8135456 17.578491 9.1929467 9.2653595 0 1 1-5.8135456-17.578491z" fill="url(#c)"/>
+	</g>
+	<g transform="matrix(0 -.96110921 .96110921 0 40.488037 52.184731)" fill="none" stroke="url(#d)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5">
+		<ellipse cx="44.000408" cy="10.012118" rx="4.9541779" ry="4.9541545" style="paint-order:fill markers stroke"/>
+		<path d="m35.257812 10.012119h3.204309"/>
+		<path d="m49.440445 10.012119h3.085171"/>
+		<path d="m44.000407 15.136171v3.379592"/>
+		<path d="m44.000441 1.2779594v3.2730534"/>
+	</g>
+	<path d="m-39.503165 10.040285a1.0000999 1.0000999 0 0 0 1.013672.986328h1.390625c.444254 3.161365 2.951923 5.669029 6.113282 6.113282v1.382812a1.0000999 1.0000999 0 1 0 2 0v-1.382812c3.161612-.444253 5.670726-2.951917 6.115234-6.113282h1.388672a1.0000999 1.0000999 0 1 0 0-1.9999998h-1.388672c-.444508-3.161618-2.953622-5.670728-6.115234-6.115234v-1.410157a1.0000999 1.0000999 0 1 0-2 0v1.410157c-3.161359.444506-5.669028 2.953616-6.113282 6.115234h-1.390625a1.0000999 1.0000999 0 0 0-1.013672 1.0136718zm4.423829.986328h.826171a1.0000999 1.0000999 0 1 0 0-1.9999998h-.826171c.400054-2.07307 2.021247-3.694671 4.09375-4.095703v.806641a1.0000999 1.0000999 0 1 0 2 0v-.806641c2.073628.400472 3.695227 2.022065 4.095703 4.095703h-.828125a1.0000999 1.0000999 0 0 0-1.013672 1.0156248 1.0000999 1.0000999 0 0 0 1.013672.984375h.828125c-.400476 2.073326-2.022075 3.69359-4.095703 4.09375v-.833984a1.0000999 1.0000999 0 1 0-2 0v.833984c-2.072503-.40072-3.693696-2.020992-4.09375-4.09375z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#e)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<g fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.45999312">
+		<path d="m36.860985-1.404988v-3.07969"/>
+		<path d="m28.466504-9.807609h3.145762"/>
+		<path d="m36.860985-15.036047v-2.965186"/>
+		<path d="m41.785759-9.807576h3.248157"/>
+	</g>
+	<circle transform="rotate(-90)" cx="9.7031088" cy="36.75021" r="5.3990488" fill="#010101" style="paint-order:fill markers stroke"/>
+	<ellipse transform="rotate(-90)" cx="9.8075781" cy="36.860985" rx="6.1315255" ry="6.1314979" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.45999312" style="paint-order:fill markers stroke"/>
+	<g transform="matrix(0 -.96110921 .96110921 0 27.238246 32.48162)" fill="none" stroke="url(#d)" stroke-linecap="round" stroke-linejoin="round">
+		<g stroke-width="2.5">
+			<ellipse cx="44.000408" cy="10.012118" rx="6.4256167" ry="6.4255881" stroke="url(#q)" style="paint-order:fill markers stroke"/>
+			<path d="m35.422784 10.012119h2.059751" stroke="url(#o)"/>
+			<path d="m50.614669 10.012119h1.827231" stroke="url(#n)"/>
+		</g>
+		<path d="m44.000407 16.436742v1.960923" stroke="url(#m)" stroke-width="2.49999976"/>
+		<path d="m44.000441 1.4006518v2.0291263" stroke="url(#l)" stroke-width="2.5"/>
+	</g>
+	<ellipse transform="rotate(-90)" cx="-20.713182" cy="33.658024" rx="5.2250476" ry="5.2250443" fill="#0a0500" style="paint-order:fill markers stroke"/>
+	<path d="m33.765764 11.290637c-.973623 0-1.947129.650581-1.935543 1.952555v.504678c-2.377477.673804-4.254986 2.550543-4.929585 4.927698h-.661562c-1.091139-.01494-1.978962.874677-1.962005 1.965786.01648 1.067634.894345 1.919916 1.962005 1.905301h.661562c.674046 2.378165 2.551425 4.255544 4.929585 4.929588v.62943c-.02317 2.60395 3.894258 2.60395 3.871085 0v-.62943c2.377331-.674472 4.253816-2.552009 4.927695-4.929588h.451753c2.603976.0232 2.603976-3.894289 0-3.871087h-.451753c-.674433-2.376569-2.551048-4.253464-4.927695-4.927698v-.504678c.01159-1.301974-.96192-1.952555-1.935542-1.952555zm0 4.508078c2.672462 0 4.812394 2.141803 4.812394 4.814286 0 2.672484-2.139932 4.814288-4.812394 4.814288s-4.814284-2.141804-4.814284-4.814288c0-2.672483 2.141822-4.814286 4.814284-4.814286z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#p)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<g stroke="#000" stroke-linecap="round" stroke-linejoin="round">
+		<path d="m33.765764 11.290637c-.973623 0-1.947129.650581-1.935543 1.952555v.504678c-2.377477.673804-4.254986 2.550543-4.929585 4.927698h-.661562c-1.091139-.01494-1.978962.874677-1.962005 1.965786.01648 1.067634.894345 1.919916 1.962005 1.905301h.661562c.674046 2.378165 2.551425 4.255544 4.929585 4.929588v.62943c-.02317 2.60395 3.894258 2.60395 3.871085 0v-.62943c2.377331-.674472 4.253816-2.552009 4.927695-4.929588h.451753c2.603976.0232 2.603976-3.894289 0-3.871087h-.451753c-.674433-2.376569-2.551048-4.253464-4.927695-4.927698v-.504678c.01159-1.301974-.96192-1.952555-1.935542-1.952555zm0 4.508078c2.672462 0 4.812394 2.141803 4.812394 4.814286 0 2.672484-2.139932 4.814288-4.812394 4.814288s-4.814284-2.141804-4.814284-4.814288c0-2.672483 2.141822-4.814286 4.814284-4.814286z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="none" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stroke-width=".60299999" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<rect transform="rotate(45)" x="-17.354668" y="-4.649344" width="12.959709" height="12.959709" rx=".5" ry=".5" fill="url(#h)" stroke-width=".403" style="paint-order:fill markers stroke"/>
+		<ellipse transform="rotate(-90)" cx="6.3965731" cy="-8.9841108" rx="4.7875476" ry="4.7875447" fill="url(#k)" stroke-width=".40000001" style="paint-order:fill markers stroke"/>
+	</g>
+	<g transform="rotate(90,10,9.4102123)">
+		<path d="m2.4162076 4c-.7190868.0003459-1.168452.7786382-.8092295 1.4015709l7.5837925 13.1335761c.3598428.622625 1.2586164.622625 1.6184594 0l7.583792-13.1335761c.359223-.6229329-.09014-1.4012254-.80923-1.4015709z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="none" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width=".70300001" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<path d="m2.4162076 4c-.7190868.0003459-1.168452.7786382-.8092295 1.4015709l7.5837925 13.1335761c.3598428.622625 1.2586164.622625 1.6184594 0l7.583792-13.1335761c.359223-.6229329-.09014-1.4012254-.80923-1.4015709z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#r)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<ellipse transform="scale(-1)" cx="-10" cy="-9.3529949" rx="3.1463087" ry="3.1463065" fill="url(#j)" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width=".39999998" style="paint-order:fill markers stroke"/>
+	</g>
+	<rect transform="rotate(45)" x="-56.923374" y="9.3817101" width="13.792038" height="13.792038" rx="1" ry="1" fill="url(#g)" style="paint-order:fill markers stroke"/>
+	<ellipse transform="rotate(-90)" cx="23.865957" cy="-46.884872" rx="4.2968559" ry="4.2968531" fill="url(#i)" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width=".39999998" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(45)" x="-56.923374" y="9.3817101" width="13.792038" height="13.792038" rx="1" ry="1" fill="none" stroke="url(#s)" stroke-linecap="round" stroke-linejoin="round" stroke-width=".403" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/style_classic/btn__fx_focus_on.svg b/res/skins/LateNight/style_classic/btn__fx_focus_on.svg
new file mode 100644
index 000000000000..a409dff62d5f
--- /dev/null
+++ b/res/skins/LateNight/style_classic/btn__fx_focus_on.svg
@@ -0,0 +1,152 @@
+<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="c" x1="256.73999" x2="484.70999" y1="472.03" y2="472.03" gradientTransform="matrix(-.02689375 -.08131675 .08068125 -.02710559 -17.729844 51.688341)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#f3870f" offset="0"/>
+			<stop stop-color="#f3e00c" offset="1"/>
+		</linearGradient>
+		<linearGradient id="a" x1="256.73999" x2="484.70999" y1="472.03" y2="472.03" gradientTransform="matrix(-.02689375 -.08131675 .08068125 -.02710559 -17.729844 51.688341)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#3f6405" offset="0"/>
+			<stop stop-color="#659f08" offset="1"/>
+		</linearGradient>
+		<linearGradient id="an" x1="256.73999" x2="484.70999" y1="472.03" y2="472.03" gradientTransform="matrix(.0213346 .06450796 -.06400382 .02150266 32.18486 -21.74836)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#060606" offset="0"/>
+			<stop stop-color="#343434" offset="1"/>
+		</linearGradient>
+		<linearGradient id="n" x1=".48967797" x2="19.539619" y1="10.011954" y2="10.011954" gradientTransform="rotate(-90 -23.029299 .0949595)" gradientUnits="userSpaceOnUse" xlink:href="#j"/>
+		<linearGradient id="j" x1="256.73999" x2="484.70999" y1="472.03" y2="472.03" gradientTransform="matrix(-.02689375 -.08131675 .08068125 -.02710559 -17.729844 51.688341)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#659f08" offset="0"/>
+			<stop stop-color="#3f6405" offset="1"/>
+		</linearGradient>
+		<linearGradient id="m" x1=".48967797" x2="19.539619" y1="10.011954" y2="10.011954" gradientTransform="rotate(-90,-14.0625,31.949219)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="k" x1="256.73999" x2="484.70999" y1="472.03" y2="472.03" gradientTransform="matrix(-.02689375 -.08131675 .08068125 -.02710559 -17.729844 51.688341)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#060606" offset="0"/>
+			<stop stop-color="#343434" offset="1"/>
+		</linearGradient>
+		<linearGradient id="am" x1="3.5003572" x2="3.5003572" y1="21.247955" y2="-.1809755" gradientTransform="matrix(.91881554 0 0 .91881554 -45.201528 -1.2788903)" gradientUnits="userSpaceOnUse" xlink:href="#k"/>
+		<linearGradient id="l" x1=".48967797" x2="19.539619" y1="10.011954" y2="10.011954" gradientTransform="rotate(-90,-23.0625,15.949219)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="al" x1="3.5003572" x2="3.5003572" y1="21.247955" y2="-.1809755" gradientTransform="matrix(.91881554 0 0 .91881554 -38.201528 -26.27889)" gradientUnits="userSpaceOnUse" xlink:href="#k"/>
+		<linearGradient id="ag" x1="2" x2="2" y1="2" y2="18" gradientTransform="translate(-44.126953,-47.5)" gradientUnits="userSpaceOnUse" xlink:href="#j"/>
+		<linearGradient id="ao" x1="33.990009" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="af" x1="33.990009" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="translate(0,-2)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="ae" x1="33.990009" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="translate(2)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="ad" x1="33.990009" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="translate(-2)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="ac" x1="33.990009" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="translate(0,2)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="ab" x1="33.990009" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(1.3910089,0,0,1.3910094,-17.204553,-3.9148319)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="d" x1="33.990009" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(0 -.94208876 .94206997 0 -21.323536 51.452305)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="g" x1="33.990009" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(0 -.94208876 .94206997 0 -21.432117 51.34989)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="aa" x1="33.990009" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(.94208876 0 0 .94206997 -51.45229 -21.432116)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="e" x1="33.990009" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(0 -.94208876 .94206997 0 -21.432118 51.34989)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="z" x1="33.990009" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(.62669224 0 0 .6266781 -37.574716 -18.274375)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="h" x1="33.990009" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="rotate(-90,7.9841315,-20.403278)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="f" x1="33.990009" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="rotate(-90,7.8721475,-20.400004)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="y" x1="33.990009" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="translate(12.419162,28.272153)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="b">
+			<stop offset="0"/>
+			<stop stop-color="#5a5a5a" offset=".42617449"/>
+			<stop stop-color="#979797" offset="1"/>
+		</linearGradient>
+		<linearGradient id="x" x1="27.888315" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(0,-1.2063935,1.206393,0,44.866137,37.360256)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="r" x1="27.888315" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(0 -.59583873 .59583873 0 -27.665572 65.027775)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="s" x1="27.888315" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(0 -.55765945 .55765945 0 -20.893618 63.347884)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="t" x1="27.888315" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(0 -.56922915 .56922915 0 -24.326743 60.596556)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="u" x1="27.888315" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(0 -.61780704 .61780704 0 -24.813111 68.837196)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="v" x1="27.888315" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(1.2465681,0,0,1.2465684,-93.660141,-31.108343)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="o" x1="4.4978113" x2="15.295909" y1="-43.891712" y2="-43.891712" gradientTransform="translate(33.994852,53.788572)" gradientUnits="userSpaceOnUse" xlink:href="#c"/>
+		<linearGradient id="w" x1="27.888315" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(0,-1.2063935,1.206393,0,-64.294506,84.863288)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="q" x1="4.4978113" x2="15.295909" y1="-43.891712" y2="-43.891712" gradientTransform="matrix(.96777188 0 0 .9677713 -41.460488 -9.8460232)" gradientUnits="userSpaceOnUse" xlink:href="#c"/>
+		<linearGradient id="i">
+			<stop offset="0"/>
+			<stop stop-color="#5a5a5a" offset=".80397099"/>
+			<stop stop-color="#979797" offset="1"/>
+		</linearGradient>
+		<linearGradient id="p" x1="6.965601" x2="15.295909" y1="-43.891712" y2="-43.891712" gradientTransform="matrix(.5792604 0 0 .57926005 -15.231469 35.424619)" gradientUnits="userSpaceOnUse" xlink:href="#c"/>
+		<linearGradient id="ah" x1="10.152543" x2="10.152543" y1="25" y2="-1" gradientTransform="translate(0 -.359368)" gradientUnits="userSpaceOnUse" xlink:href="#i"/>
+		<linearGradient id="ak" x1="6.965601" x2="15.295909" y1="-43.891712" y2="-43.891712" gradientTransform="matrix(.81044191 0 0 .81044142 -16.782004 -26.906882)" gradientUnits="userSpaceOnUse" xlink:href="#c"/>
+		<linearGradient id="aj" x1="-25.224104" x2="-40.264385" y1="-31.891275" y2="-47.270847" gradientTransform="matrix(1.3064967,0,0,1.3064967,12.413786,106.02004)" gradientUnits="userSpaceOnUse">
+			<stop offset="0"/>
+			<stop stop-color="#5a5a5a" offset=".35063794"/>
+			<stop stop-color="#979797" offset="1"/>
+		</linearGradient>
+		<linearGradient id="ai" x1="-25.224104" x2="-40.264385" y1="-31.891275" y2="-47.270847" gradientTransform="matrix(1.2829802,0,0,1.2829802,4.9345583,102.17732)" gradientUnits="userSpaceOnUse" xlink:href="#i"/>
+	</defs>
+	<g display="none" opacity=".32000002" stroke-width=".99999994">
+		<path d="m10.670988 1.5205657c-1.096489-.0771516-2.2250641.0649478-3.3290212.4506657-4.4527889 1.4380996-6.88734039 6.2705092-5.4096338 10.7386746 1.4779986 4.469045 6.3081419 6.864812 10.727176 5.320817 4.452787-1.438101 6.885696-6.27051 5.407989-10.7386751-1.108768-3.3525952-4.103852-5.539803-7.39651-5.7714822z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#248301" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<path d="m12.243069 16.88878a7.2926948 7.3501393 0 1 1-4.6118564-13.9448841 7.2926948 7.3501393 0 1 1 4.6118564 13.9448841z" fill="url(#an)"/>
+	</g>
+	<path d="m-34.142578-45.513672a1.0001 1.0001 0 0 0-.857422.513672c-3.464766.402931-6.225773 3.165573-6.626953 6.630859a1.0001 1.0001 0 0 0 0 1.738281c.40118 3.465286 3.162187 6.227929 6.626953 6.63086a1.0001 1.0001 0 0 0 1.746094 0c3.458247-.402173 6.215707-3.155201 6.625-6.611329a1.0001 1.0001 0 0 0 0-1.77539c-.408496-3.45703-3.166111-6.211034-6.625-6.613281a1.0001 1.0001 0 0 0-.888672-.513672zm-.984375 2.552734v2.94336a1.0001 1.0001 0 1 0 2 0v-2.94336c2.272859.409803 4.051135 2.188079 4.460938 4.460938h-2.921876a1.0001 1.0001 0 1 0 0 2h2.921876c-.409803 2.272858-2.188079 4.051135-4.460938 4.460938v-2.943361a1.0001 1.0001 0 0 0-1.015625-1.015625 1.0001 1.0001 0 0 0-.984375 1.015625v2.943361c-2.272859-.409803-4.051135-2.18808-4.460937-4.460939h2.953124a1.0001 1.0001 0 1 0 0-1.999999h-2.953124c.409802-2.272859 2.188078-4.051135 4.460937-4.460938z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="none" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stroke="#020200" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<path d="m10-38v8h-7.999999 7.999999v7.999999-7.999999h8-8z" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="3"/>
+	<circle cx="39.999996" cy="-24.517012" r="6.5538206" fill="none" stroke="#070606" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" style="paint-order:fill markers stroke"/>
+	<path d="m31.008541-24.51701h4.48299" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+	<path d="m44.539791-24.51701h4.48299" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+	<path d="m40-20v4.48299" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+	<path d="m40.000036-33.51701v4.48299" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+	<path d="m-22.630118-32.920668a1.0000999 1.0000999 0 0 0 1.013672.986328h1.390625c.444254 3.161365 2.951923 5.669029 6.113282 6.113282v1.382812a1.0000999 1.0000999 0 1 0 2 0v-1.382812c3.161612-.444253 5.670726-2.951917 6.115234-6.113282h1.388672a1.0000999 1.0000999 0 1 0 0-1.999999h-1.388672c-.444508-3.161618-2.953622-5.670728-6.115234-6.115234v-1.410157a1.0000999 1.0000999 0 1 0-2 0v1.410157c-3.161359.444506-5.669028 2.953616-6.113282 6.115234h-1.390625a1.0000999 1.0000999 0 0 0-1.013672 1.013671zm4.423829.986328h.826171a1.0000999 1.0000999 0 1 0 0-1.999999h-.826171c.400054-2.07307 2.021247-3.694671 4.09375-4.095703v.806641a1.0000999 1.0000999 0 1 0 2 0v-.806641c2.073628.400472 3.695227 2.022065 4.095703 4.095703h-.828125a1.0000999 1.0000999 0 0 0-1.013672 1.015624 1.0000999 1.0000999 0 0 0 1.013672.984375h.828125c-.400476 2.073326-2.022075 3.69359-4.095703 4.09375v-.833984a1.0000999 1.0000999 0 1 0-2 0v.833984c-2.072503-.40072-3.693696-2.020992-4.09375-4.09375z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#n)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<path d="m-22.630118-32.920672a1.0000999 1.0000999 0 0 0 1.013672.986328h1.390625c.444254 3.161365 2.951923 5.669029 6.113282 6.113282v1.382812a1.0000999 1.0000999 0 1 0 2 0v-1.382812c3.161612-.444253 5.670726-2.951917 6.115234-6.113282h1.388672a1.0000999 1.0000999 0 1 0 0-1.999999h-1.388672c-.444508-3.161618-2.953622-5.670728-6.115234-6.115234v-1.410157a1.0000999 1.0000999 0 1 0-2 0v1.410157c-3.161359.444506-5.669028 2.953616-6.113282 6.115234h-1.390625a1.0000999 1.0000999 0 0 0-1.013672 1.013671zm4.423829.986328h.826171a1.0000999 1.0000999 0 1 0 0-1.999999h-.826171c.400054-2.07307 2.021247-3.694671 4.09375-4.095703v.806641a1.0000999 1.0000999 0 1 0 2 0v-.806641c2.073628.400472 3.695227 2.022065 4.095703 4.095703h-.828125a1.0000999 1.0000999 0 0 0-1.013672 1.015624 1.0000999 1.0000999 0 0 0 1.013672.984375h.828125c-.400476 2.073326-2.022075 3.69359-4.095703 4.09375v-.833984a1.0000999 1.0000999 0 1 0-2 0v.833984c-2.072503-.40072-3.693696-2.020992-4.09375-4.09375z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="none" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width=".80000001" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<path d="m-36.020551-1.300425c-.0018.0005873-.0036.00118-.0054.00179-.04554.00121-.0912.00498-.136387.010767-.7018.082208-1.235688.6892104-1.225685 1.396169-7e-5.010989-.00018.021314 0 .032302v.9206097c-2.767767.5643833-4.920142 2.7180176-5.484185 5.4859748h-.934966c-.774481-.010584-1.41752.6324547-1.406936 1.4069361.000587.0018.0012.0036.0018.0054.0012.04219.0075.08374.01256.125619-.007.05988-.01485.119118-.01436.179456-4e-6.0012-4e-6.0024 0 .0036.0012.0736.01643.146474.02871.218936-.01285.0795-.02921.159786-.02871.240471-4e-6.0012-4e-6.0024 0 .0036.01037.769451.637883 1.4106484 1.406937 1.3997584h.929583c.558473 2.862781 2.710565 5.100592 5.489563 5.685171v.974447c-.0059.435147.163877.823077.43249 1.073148s.614666.367885.954706.367885.686094-.117814.954707-.367885c.268614-.250071.438425-.638001.43249-1.073148v-.389419l-.0018.01615c.0011-.03262.0011-.06608 0-.0987l.0018.01615v-.518623c.454729-.09564.892654-.235552 1.30955-.415222 2.131013-.918403 3.712537-2.875685 4.180013-5.269949h.929584c.908877.01329 1.578979-.876139 1.365661-1.760465v.218936c.03453-.143463.02608-.291201.01615-.437873.131812-.8383468-.530229-1.6166724-1.381791-1.6043741h-.933173c-.564368-2.7680387-2.71794-4.9216083-5.485974-5.4859748v-.9277883l-.0018.014357c.0013-.044957.001-.089709-.0018-.1345922-.03364-.634793-.499097-1.1694277-1.123396-1.2884952h-.0018c-.09145-.017617-.184998-.026587-.278141-.025124zm-1.367456 5.9005186v.021534c-.0059.4351468.163876.8230767.43249 1.0731478.268613.2500711.614666.3678851.954706.3678851s.686094-.117814.954707-.3678851c.268614-.2500711.438425-.638001.43249-1.0731478v-.021534c1.006017.3691727 1.801928 1.0777303 2.304216 2.0440057-.649286.1207481-1.180732.6282052-1.170054 1.3118237.000602.0018.0012.0036.0018.0054.0012.04219.0075.08374.01256.125619-.007.05988-.01485.119118-.01436.179457-1.1e-5.0018-1.1e-5.0036 0 .0054.0013.07261.01659.143852.02871.215347-.01297.08029-.02936.160792-.02871.242266-5e-6.0012-5e-6.0024 0 .0036.01002.65524.505786 1.133249 1.116217 1.277728-.505082.883797-1.276444 1.53498-2.250379 1.878906v-.0341c.0061-.428055-.168013-.810891-.437874-1.053407-.269861-.242518-.613035-.353529-.949323-.353529-.336289 0-.679462.111011-.949323.353529-.269861.242516-.443922.625352-.437873 1.053407v.03231c-.979498-.346706-1.755746-1.00253-2.259353-1.895105.730723-.176279 1.27003-.850734 1.083915-1.622284v.218936c.03452-.143462.02608-.291201.01615-.437872.117284-.7460287-.432973-1.3610388-1.148519-1.4966644.501057-.9716125 1.298904-1.6839417 2.307806-2.054773z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#am)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<path d="m-45.517579 7.90039a1.0000999 1.0000999 0 0 0 1.013672.986328h1.390625c.444254 3.161365 2.951923 5.669029 6.113282 6.113282v1.382812a1.0000999 1.0000999 0 1 0 2 0v-1.382812c3.161612-.444253 5.670726-2.951917 6.115234-6.113282h1.388672a1.0000999 1.0000999 0 1 0 0-1.9999994h-1.388672c-.444508-3.161618-2.953622-5.670728-6.115234-6.115234v-1.410157a1.0000999 1.0000999 0 1 0-2 0v1.410157c-3.161359.444506-5.669028 2.953616-6.113282 6.115234h-1.390625a1.0000999 1.0000999 0 0 0-1.013672 1.0136714zm4.423829.986328h.826171a1.0000999 1.0000999 0 1 0 0-1.9999994h-.826171c.400054-2.07307 2.021247-3.694671 4.09375-4.095703v.806641a1.0000999 1.0000999 0 1 0 2 0v-.806641c2.073628.400472 3.695227 2.022065 4.095703 4.095703h-.828125a1.0000999 1.0000999 0 0 0-1.013672 1.0156244 1.0000999 1.0000999 0 0 0 1.013672.984375h.828125c-.400476 2.073326-2.022075 3.69359-4.095703 4.09375v-.833984a1.0000999 1.0000999 0 1 0-2 0v.833984c-2.072503-.40072-3.693696-2.020992-4.09375-4.09375z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#m)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<path d="m-29.020551-26.300425c-.0018.000588-.0036.0012-.0054.0018-.04554.0012-.0912.005-.136387.01077-.7018.08221-1.235688.68921-1.225685 1.396169-6.9e-5.01099-.00018.02131 0 .0323v.920609c-2.767767.564384-4.920142 2.718018-5.484185 5.485975h-.934946c-.774481-.01058-1.41752.632455-1.406936 1.406936.000587.0018.0012.0036.0018.0054.0012.04219.0075.08374.01256.125619-.007.05988-.01485.119118-.01436.179456-4e-6.0012-4e-6.0024 0 .0036.0012.0736.01643.146474.02871.218936-.01285.0795-.02921.159786-.02871.240471-4e-6.0012-4e-6.0024 0 .0036.01037.769451.637883 1.410648 1.406937 1.399758h.929583c.558473 2.862781 2.710565 5.100592 5.489563 5.685171v.974447c-.0059.435147.163877.823077.43249 1.073148s.614666.367885.954706.367885.686094-.117814.954707-.367885c.268614-.250071.438425-.638001.43249-1.073148v-.389419l-.0018.01615c.0011-.03262.0011-.06608 0-.0987l.0018.01615v-.518628c.454729-.09564.892654-.235552 1.30955-.415222 2.131013-.918403 3.712537-2.875685 4.180013-5.269949h.929584c.908877.01329 1.578979-.876139 1.365661-1.760465v.218936c.03453-.143463.02608-.291201.01615-.437873.131792-.838347-.530249-1.616672-1.381811-1.604374h-.933173c-.564368-2.768039-2.71794-4.921608-5.485974-5.485975v-.927788l-.0018.01436c.0013-.04496.001-.08971-.0018-.134592-.03364-.634793-.499097-1.169428-1.123396-1.288495h-.0018c-.09145-.01762-.184998-.02659-.278141-.02513zm-1.367456 5.900519v.02153c-.0059.435147.163876.823077.43249 1.073148.268613.250071.614666.367885.954706.367885s.686094-.117814.954707-.367885c.268614-.250071.438425-.638001.43249-1.073148v-.02153c1.006017.369173 1.801928 1.07773 2.304216 2.044006-.649286.120748-1.180732.628205-1.170054 1.311823.000602.0018.0012.0036.0018.0054.0012.04219.0075.08374.01256.125619-.007.05988-.01485.119118-.01436.179457-1.1e-5.0018-1.1e-5.0036 0 .0054.0013.07261.01659.143852.02871.215347-.01297.08029-.02936.160792-.02871.242266-5e-6.0012-5e-6.0024 0 .0036.01002.65524.505786 1.133249 1.116217 1.277728-.505082.883797-1.276444 1.53498-2.250379 1.878906v-.0341c.0061-.428055-.168013-.810891-.437874-1.053407-.269861-.242518-.613035-.353529-.949323-.353529-.336289 0-.679462.111011-.949323.353529-.269861.242516-.443922.625352-.437873 1.053407v.03231c-.979498-.346706-1.755746-1.00253-2.259353-1.895105.730723-.176279 3.39135-.850734 3.205236-1.622284v.218936c.03452-.143462.02608-.291201.01615-.437872.117284-.746028-2.554294-1.361039-3.26984-1.496664.501057-.971613 1.298904-1.683942 2.307807-2.054773z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#al)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<path d="m-38.517578-17.09961c.0076.552283.461388.993875 1.013671.986328h1.390625c.444254 3.161365 2.951923 5.669029 6.113282 6.113282v1.382812c-.0191 1.352294 2.019096 1.352294 2 0v-1.382812c3.161612-.444253 5.670726-2.951917 6.115234-6.113282h1.388672c1.352341.01914 1.352341-2.019144 0-1.999999h-1.388672c-.444508-3.161618-2.953622-5.670728-6.115234-6.115234v-1.410157c.0191-1.352294-2.019096-1.352294-2 0v1.410157c-3.161359.444506-5.669028 2.953616-6.113282 6.115234h-1.390625c-.562991-.0077-1.021365.45068-1.013671 1.013671zm4.423828.986328c.375985-.907709 2.947492 0 2.947492 0 1.352341.01914 1.352341-2.019144 0-1.999999h-2.947492c.400054-2.07307 2.021247-3.694671 4.09375-4.095703v.806641c-.0191 1.352294 2.019096 1.352294 2 0v-.806641c2.073628.400472 3.695227 2.022065 4.095703 4.095703h-.828125c-.56377-.0077-1.022477.45187-1.013672 1.015624.0086.551516.46214.991928 1.013672.984375h.828125c-.400476 2.073326-2.022075 3.69359-4.095703 4.09375v-.833984c.0191-1.352294-2.019096-1.352294-2 0v.833984c-2.072503-.40072-4.832258-2.310836-4.09375-4.09375z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#l)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<path d="m-34.142578-45.513672a1.0001 1.0001 0 0 0-.857422.513672c-3.464766.402931-6.225773 3.165573-6.626953 6.630859a1.0001 1.0001 0 0 0 0 1.738282c.40118 3.465285 3.162187 6.227928 6.626953 6.630859a1.0001 1.0001 0 0 0 1.746094 0c3.458247-.402173 6.215707-3.155201 6.625-6.611329a1.0001 1.0001 0 0 0 0-1.77539c-.408496-3.457031-3.166111-6.211034-6.625-6.613281a1.0001 1.0001 0 0 0-.888672-.513672zm-.984375 2.552734v2.943359a1.0001 1.0001 0 1 0 2 0v-2.943359c2.272859.409803 4.051135 2.188079 4.460938 4.460937h-2.921876a1.0001 1.0001 0 1 0 0 2h2.921876c-.409803 2.272859-2.188079 4.051136-4.460938 4.460939v-2.943361a1.0001 1.0001 0 0 0-1.015625-1.015625 1.0001 1.0001 0 0 0-.984375 1.015625v2.943361c-2.272859-.409803-4.051135-2.18808-4.460937-4.460939h2.953124a1.0001 1.0001 0 1 0 0-2h-2.953124c.409802-2.272858 2.188078-4.051134 4.460937-4.460937z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#ag)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<circle cx="68.446182" cy="-15" r="6.5538206" fill="none" stroke="#070606" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" style="paint-order:fill markers stroke"/>
+	<path d="m61.454723-15h4.48299" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+	<path d="m70.985972-15h4.48299" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+	<path d="M 68.446182,-12.48299 V -8" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+	<path d="m68.446218-22v4.48299" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+	<g transform="rotate(-90,-6.2365918,-2.4506439)" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5">
+		<ellipse cx="44.000408" cy="10.012118" rx="6.8913059" ry="6.8912754" stroke="url(#ab)" style="paint-order:fill markers stroke"/>
+		<path d="m37.257812 10.012119h3.204309" stroke="url(#ae)"/>
+		<path d="m47.440445 10.012119h3.085171" stroke="url(#ad)"/>
+		<path d="m44.000407 13.136171v3.379592" stroke="url(#af)"/>
+		<path d="m44.000441 3.2779594v3.2730534" stroke="url(#ac)"/>
+	</g>
+	<rect transform="rotate(45)" x="-44.878887" y="43.478981" width="13.792038" height="13.792038" rx="1" ry="1" fill="url(#ai)" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width=".403" style="paint-order:fill markers stroke"/>
+	<rect transform="matrix(.70710678 -.70710678 -.70710678 -.70710678 0 0)" x="-38.312714" y="46.245792" width="14.04484" height="14.04484" rx=".5" ry=".5" fill="url(#aj)" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width=".403" style="paint-order:fill markers stroke"/>
+	<ellipse transform="rotate(-90)" cx="-8.7611713" cy="-62.478542" rx="4.3756156" ry="4.3756127" fill="url(#ak)" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width=".40000001" style="paint-order:fill markers stroke"/>
+	<circle cx="-12" cy="10.000002" r="3" fill="#ecfdd0" style="paint-order:fill markers stroke"/>
+	<g transform="matrix(0 -.94208876 .94206997 0 -21.323535 51.34989)" fill="none" stroke="#101901" stroke-linecap="round" stroke-linejoin="round" stroke-width="4.13977861">
+		<ellipse cx="43.891712" cy="9.8968601" rx="4.9541779" ry="4.9541545" style="paint-order:fill markers stroke"/>
+		<path d="m35.257812 9.89686h3.204309"/>
+		<path d="m49.440445 9.89686h3.085171"/>
+		<path d="m43.891697 15.13617v3.379592"/>
+		<path d="m43.891731 1.2779581v3.2730534"/>
+		<ellipse cx="43.891712" cy="9.8968601" rx="4.9541779" ry="4.9541545" style="paint-order:fill markers stroke"/>
+		<path d="m35.257812 9.89686h3.204309"/>
+		<path d="m49.440445 9.89686h3.085171"/>
+		<path d="m43.891697 15.13617v3.379592"/>
+		<path d="m43.891731 1.2779581v3.2730534"/>
+	</g>
+	<ellipse transform="rotate(-90)" cx="-10.000002" cy="-12" rx="4.6672754" ry="4.66716" fill="none" stroke="url(#aa)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5" style="paint-order:fill markers stroke"/>
+	<path d="m-12 18.133902v-3.018744" fill="none" stroke="url(#g)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5"/>
+	<path d="m-12 4.772603v-2.906505" fill="none" stroke="url(#g)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5"/>
+	<path d="m-7.064203 10.000016h3.183812" fill="none" stroke="url(#d)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5"/>
+	<path d="m-20.119609 9.999984h3.083446" fill="none" stroke="url(#d)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5"/>
+	<ellipse transform="rotate(-90)" cx="-10.000002" cy="-12" rx="3.1047449" ry="3.10466" fill="none" stroke="url(#z)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5" style="paint-order:fill markers stroke"/>
+	<path d="m-12 18.133902v-3.018744" fill="none" stroke="url(#e)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5"/>
+	<path d="m-12 4.772603v-2.906505" fill="none" stroke="url(#e)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5"/>
+	<path d="m-7.064203 10.000016h3.183812" fill="none" stroke="url(#d)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5"/>
+	<path d="m-20.119609 9.999984h3.083446" fill="none" stroke="url(#d)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5"/>
+	<ellipse transform="rotate(-90)" cx="56.419571" cy="38.284271" rx="4.9541779" ry="4.9541545" fill="none" stroke="url(#y)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5" style="paint-order:fill markers stroke"/>
+	<path d="m38.284271-47.785668v-3.204309" fill="none" stroke="url(#f)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5"/>
+	<path d="m38.284271-61.968301v-3.085171" fill="none" stroke="url(#f)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5"/>
+	<path d="m43.523581-56.419553h3.379592" fill="none" stroke="url(#h)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5"/>
+	<path d="m29.665369-56.419587h3.273054" fill="none" stroke="url(#h)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5"/>
+	<path d="m56.945221-25.042993c-.973623 0-1.947129.650581-1.935543 1.952555v.504678c-2.377478.673804-4.254986 2.550543-4.929585 4.927698h-.661562c-1.091139-.01494-1.978962.874677-1.962005 1.965786.01648 1.067634.894345 1.919916 1.962005 1.905301h.661562c.674046 2.378165 2.551425 4.255544 4.929585 4.929588v.62943c-.02317 2.60395 3.894258 2.60395 3.871085 0v-.62943c2.377331-.674472 4.253816-2.552009 4.927695-4.929588h.451753c2.603976.0232 2.603976-3.894289 0-3.871087h-.451753c-.674433-2.376569-2.551048-4.253464-4.927695-4.927698v-.504678c.01159-1.301974-.96192-1.952555-1.935542-1.952555zm0 4.508078c2.672462 0 4.812394 2.141803 4.812394 4.814286 0 2.672484-2.139932 4.814288-4.812394 4.814288s-4.814284-2.141804-4.814284-4.814288c0-2.672483 2.141822-4.814286 4.814284-4.814286z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#x)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<g transform="rotate(-90,27.085814,55.721005)" stroke-width="2.5">
+		<path d="m35.593591 10.007636h3.07969" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.45999312"/>
+		<path d="m43.996212 1.6131552v3.1457618" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.45999312"/>
+		<path d="m49.22465 10.007636h2.965186" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.45999312"/>
+		<path d="m43.996179 14.93241v3.248157" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.45999312"/>
+		<circle cx="43.891712" cy="9.8968601" r="5.3990488" fill="url(#o)" style="paint-order:fill markers stroke"/>
+		<ellipse cx="43.996181" cy="10.007636" rx="6.1315255" ry="6.1314979" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.45999312" style="paint-order:fill markers stroke"/>
+	</g>
+	<ellipse transform="rotate(-90)" cx="-38.810642" cy="-18.627554" rx="6.1757193" ry="6.1756921" fill="none" stroke="url(#v)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.40277314" style="paint-order:fill markers stroke"/>
+	<path d="m-18.627554 47.054673v-1.979646" fill="none" stroke="url(#u)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.40277314"/>
+	<path d="m-18.627554 32.453614v-1.75617" fill="none" stroke="url(#t)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.40277314"/>
+	<path d="m-12.452788 38.810642h1.88466" fill="none" stroke="url(#s)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.4027729"/>
+	<path d="m-26.904114 38.810609h1.950212" fill="none" stroke="url(#r)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.40277314"/>
+	<ellipse transform="rotate(-90)" cx="-31.882584" cy="-52.323158" rx="5.2250476" ry="5.2250443" fill="url(#q)" style="paint-order:fill markers stroke"/>
+	<path d="m-52.215422 22.460039c-.973622 0-1.947129.650581-1.935542 1.952555v.504678c-2.377478.673804-4.254986 2.550543-4.929586 4.927698h-.661562c-1.091139-.01494-1.978962.874677-1.962005 1.965786.01648 1.067634.894345 1.919916 1.962005 1.905301h.661562c.674046 2.378165 2.551425 4.255544 4.929586 4.929588v.62943c-.02317 2.60395 3.894257 2.60395 3.871084 0v-.62943c2.377331-.674472 4.253816-2.552009 4.927695-4.929588h.451753c2.603976.0232 2.603976-3.894289 0-3.871087h-.451753c-.674433-2.376569-2.551048-4.253464-4.927695-4.927698v-.504678c.01159-1.301974-.96192-1.952555-1.935542-1.952555zm0 4.508078c2.672462 0 4.812394 2.141803 4.812394 4.814286 0 2.672484-2.139932 4.814288-4.812394 4.814288s-4.814284-2.141804-4.814284-4.814288c0-2.672483 2.141822-4.814286 4.814284-4.814286z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="none" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width=".903" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<path d="m-52.215422 22.460039c-.973622 0-1.947129.650581-1.935542 1.952555v.504678c-2.377478.673804-4.254986 2.550543-4.929586 4.927698h-.661562c-1.091139-.01494-1.978962.874677-1.962005 1.965786.01648 1.067634.894345 1.919916 1.962005 1.905301h.661562c.674046 2.378165 2.551425 4.255544 4.929586 4.929588v.62943c-.02317 2.60395 3.894257 2.60395 3.871084 0v-.62943c2.377331-.674472 4.253816-2.552009 4.927695-4.929588h.451753c2.603976.0232 2.603976-3.894289 0-3.871087h-.451753c-.674433-2.376569-2.551048-4.253464-4.927695-4.927698v-.504678c.01159-1.301974-.96192-1.952555-1.935542-1.952555zm0 4.508078c2.672462 0 4.812394 2.141803 4.812394 4.814286 0 2.672484-2.139932 4.814288-4.812394 4.814288s-4.814284-2.141804-4.814284-4.814288c0-2.672483 2.141822-4.814286 4.814284-4.814286z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#w)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<path d="m2.4162076 4c-.7190868.000346-1.168452.778638-.8092295 1.401571l7.5837925 13.133576c.3598428.622625 1.2586164.622625 1.6184594 0l7.583792-13.133576c.359223-.622933-.09014-1.401225-.80923-1.401571z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#ah)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<ellipse transform="rotate(-90)" cx="-9.4986095" cy="9.9999027" rx="3.1274555" ry="3.1274533" fill="url(#p)" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width=".40000001" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/style/latency_bg.png b/res/skins/LateNight/style_classic/latency_bg.png
similarity index 100%
rename from res/skins/LateNight/style/latency_bg.png
rename to res/skins/LateNight/style_classic/latency_bg.png
diff --git a/res/skins/LateNight/style/latency_bg.svg b/res/skins/LateNight/style_classic/latency_bg.svg
similarity index 100%
rename from res/skins/LateNight/style/latency_bg.svg
rename to res/skins/LateNight/style_classic/latency_bg.svg
diff --git a/res/skins/LateNight/style/latency_over.png b/res/skins/LateNight/style_classic/latency_over.png
similarity index 100%
rename from res/skins/LateNight/style/latency_over.png
rename to res/skins/LateNight/style_classic/latency_over.png
diff --git a/res/skins/LateNight/style/latency_over.svg b/res/skins/LateNight/style_classic/latency_over.svg
similarity index 100%
rename from res/skins/LateNight/style/latency_over.svg
rename to res/skins/LateNight/style_classic/latency_over.svg
diff --git a/res/skins/LateNight/style/library_branch_closed.png b/res/skins/LateNight/style_classic/library_branch_closed.png
similarity index 100%
rename from res/skins/LateNight/style/library_branch_closed.png
rename to res/skins/LateNight/style_classic/library_branch_closed.png
diff --git a/res/skins/LateNight/style/library_branch_closed_selected.png b/res/skins/LateNight/style_classic/library_branch_closed_selected.png
similarity index 100%
rename from res/skins/LateNight/style/library_branch_closed_selected.png
rename to res/skins/LateNight/style_classic/library_branch_closed_selected.png
diff --git a/res/skins/LateNight/style/library_branch_open.png b/res/skins/LateNight/style_classic/library_branch_open.png
similarity index 100%
rename from res/skins/LateNight/style/library_branch_open.png
rename to res/skins/LateNight/style_classic/library_branch_open.png
diff --git a/res/skins/LateNight/style/library_branch_open_selected.png b/res/skins/LateNight/style_classic/library_branch_open_selected.png
similarity index 100%
rename from res/skins/LateNight/style/library_branch_open_selected.png
rename to res/skins/LateNight/style_classic/library_branch_open_selected.png
diff --git a/res/skins/LateNight/style_classic/mixxx_logo.svg b/res/skins/LateNight/style_classic/mixxx_logo.svg
new file mode 100644
index 000000000000..115f155193c9
--- /dev/null
+++ b/res/skins/LateNight/style_classic/mixxx_logo.svg
@@ -0,0 +1,62 @@
+<svg width="160" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="e" x1="74.993" x2="13.486" y1="-.1462" y2="88.767" gradientTransform="matrix(.4467 0 0 .4487 123.41 .013019)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#39b549" offset=".478"/>
+			<stop stop-color="#1a76bc" offset="1"/>
+		</linearGradient>
+		<linearGradient id="d" x1="74.998" x2="13.488" y1="-.1501" y2="88.767" gradientTransform="matrix(.4467 0 0 .4487 68.726 .013019)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#381f1f" offset="0"/>
+			<stop stop-color="#3a1f20" offset=".0017"/>
+			<stop stop-color="#5b2825" offset=".0376"/>
+			<stop stop-color="#7c2f28" offset=".0757"/>
+			<stop stop-color="#9b2e28" offset=".1173"/>
+			<stop stop-color="#b62c28" offset=".1626"/>
+			<stop stop-color="#cc2626" offset=".2129"/>
+			<stop stop-color="#dc2225" offset=".271"/>
+			<stop stop-color="#e81f25" offset=".3438"/>
+			<stop stop-color="#ed1b26" offset=".478"/>
+			<stop stop-color="#f7921e" offset="1"/>
+		</linearGradient>
+		<linearGradient id="c" x1="74.992" x2="13.485" y1="-.1471" y2="88.766" gradientTransform="matrix(.4467 0 0 .4487 96.071 .013019)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#120e1e" offset="0"/>
+			<stop stop-color="#1b1426" offset=".0231"/>
+			<stop stop-color="#442349" offset=".1446"/>
+			<stop stop-color="#652866" offset=".2552"/>
+			<stop stop-color="#7c287b" offset=".3511"/>
+			<stop stop-color="#8b2589" offset=".4286"/>
+			<stop stop-color="#91268f" offset=".478"/>
+			<stop stop-color="#ed1b26" offset="1"/>
+		</linearGradient>
+		<linearGradient id="a" x2="0" y1=".028" y2="89.146" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#ffd235" offset="0"/>
+			<stop stop-color="#feb30a" offset="1"/>
+		</linearGradient>
+		<linearGradient id="m" x2="0" y1=".028" y2="89.146" gradientTransform="matrix(.4467 0 0 .4487 65.950788 .01288623)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="k" x2="0" y1=".028" y2="89.146" gradientTransform="matrix(.4467 0 0 .4487 93.288828 .01288623)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="i" x2="0" y1=".028" y2="89.146" gradientTransform="matrix(.4467 0 0 .4487 120.63134 .01288623)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="g" x2="0" y1=".028" y2="89.146" gradientTransform="matrix(.4467 0 0 .4487 51.508977 .01288623)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="f" x2="0" y1=".028" y2="89.146" gradientTransform="matrix(.4467 0 0 .4487 0 .01288623)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="l" x2="0" y1=".028000001" y2="89.146004" gradientTransform="matrix(.4467 0 0 .4487 65.950788 .01288623)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="b" x2="0" y1=".028000001" y2="89.146004" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#ffd235" offset="0"/>
+			<stop stop-color="#feb30a" offset="1"/>
+		</linearGradient>
+		<linearGradient id="j" x2="0" y1=".028000001" y2="89.146004" gradientTransform="matrix(.4467 0 0 .4487 93.288828 .01288623)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="h" x2="0" y1=".028000001" y2="89.146004" gradientTransform="matrix(.4467 0 0 .4487 120.63134 .01288623)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+	</defs>
+	<path d="m120.63 40 27.298-39.987h12.066l-27.293 39.987h-12.071z" fill="url(#e)"/>
+	<path d="m65.946 40 27.296-39.987h12.073l-27.293 39.987h-12.076z" fill="url(#d)"/>
+	<path d="m93.291 40 27.298-39.987h12.067l-27.294 39.987h-12.071z" fill="url(#c)"/>
+	<g stroke="#0f0f0f" stroke-width="1.60000002">
+		<path d="m105.31533 40.000133-27.293368-39.98724677h-12.071174l27.291583 39.98724677z" fill="url(#l)"/>
+		<path d="m132.65784 40.000133-27.29828-39.98724677h-12.070732l27.297832 39.98724677z" fill="url(#j)"/>
+		<path d="m160.0008 40.000133-27.29829-39.98724677h-12.07117l27.29828 39.98724677z" fill="url(#h)"/>
+	</g>
+	<g stroke-width=".44769889">
+		<path d="m105.31533 40.000133-27.293368-39.98724677h-12.071174l27.291583 39.98724677z" fill="url(#m)"/>
+		<path d="m132.65784 40.000133-27.29828-39.98724677h-12.070732l27.297832 39.98724677z" fill="url(#k)"/>
+		<path d="m160.0008 40.000133-27.29829-39.98724677h-12.07117l27.29828 39.98724677z" fill="url(#i)"/>
+		<path d="m51.508977.01288623h10.325471v39.98724677h-10.325471z" fill="url(#g)" fill-rule="evenodd"/>
+		<path d="m10.124456 40.000133v-23.416756l13.077589 19.939331h.26668l13.213386-20.142143v23.619568h10.260252v-39.98724677h-11.129977l-12.343661 19.93888177-12.337408-19.93888177h-11.131317v39.98724677z" fill="url(#f)"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_classic/mixxx_logo_small.svg b/res/skins/LateNight/style_classic/mixxx_logo_small.svg
new file mode 100644
index 000000000000..4113679a2eea
--- /dev/null
+++ b/res/skins/LateNight/style_classic/mixxx_logo_small.svg
@@ -0,0 +1,55 @@
+<svg width="72" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="g" x1="74.992996" x2="13.486" y1="-.1462" y2="88.766998" gradientTransform="matrix(.19912877 0 0 .20002033 55.013392 3.0873529)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#39b549" offset=".478"/>
+			<stop stop-color="#1a76bc" offset="1"/>
+		</linearGradient>
+		<linearGradient id="f" x1="74.998001" x2="13.488" y1="-.15009999" y2="88.766998" gradientTransform="matrix(.19912877 0 0 .20002033 30.636499 3.0873529)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#381f1f" offset="0"/>
+			<stop stop-color="#3a1f20" offset=".0017"/>
+			<stop stop-color="#5b2825" offset=".0376"/>
+			<stop stop-color="#7c2f28" offset=".0757"/>
+			<stop stop-color="#9b2e28" offset=".1173"/>
+			<stop stop-color="#b62c28" offset=".1626"/>
+			<stop stop-color="#cc2626" offset=".2129"/>
+			<stop stop-color="#dc2225" offset=".271"/>
+			<stop stop-color="#e81f25" offset=".3438"/>
+			<stop stop-color="#ed1b26" offset=".478"/>
+			<stop stop-color="#f7921e" offset="1"/>
+		</linearGradient>
+		<linearGradient id="e" x1="74.991997" x2="13.485" y1="-.1471" y2="88.765999" gradientTransform="matrix(.19912877 0 0 .20002033 42.826283 3.0873529)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#120e1e" offset="0"/>
+			<stop stop-color="#1b1426" offset=".0231"/>
+			<stop stop-color="#442349" offset=".1446"/>
+			<stop stop-color="#652866" offset=".2552"/>
+			<stop stop-color="#7c287b" offset=".3511"/>
+			<stop stop-color="#8b2589" offset=".4286"/>
+			<stop stop-color="#91268f" offset=".478"/>
+			<stop stop-color="#ed1b26" offset="1"/>
+		</linearGradient>
+		<linearGradient id="a" x2="0" y1=".028000001" y2="89.146004" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#ffd235" offset="0"/>
+			<stop stop-color="#feb30a" offset="1"/>
+		</linearGradient>
+		<linearGradient id="d" x2="0" y1=".028000001" y2="89.146004" gradientTransform="matrix(.4467 0 0 .4487 65.950788 .01288623)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="c" x2="0" y1=".028000001" y2="89.146004" gradientTransform="matrix(.4467 0 0 .4487 93.288828 .01288623)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="b" x2="0" y1=".028000001" y2="89.146004" gradientTransform="matrix(.4467 0 0 .4487 120.63134 .01288623)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="i" x2="0" y1=".028000001" y2="89.146004" gradientTransform="matrix(.4467 0 0 .4487 51.508977 .01288623)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="h" x2="0" y1=".028000001" y2="89.146004" gradientTransform="matrix(.4467 0 0 .4487 0 .01288623)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+	</defs>
+	<path d="m53.77413 20.912646 12.168832-17.8253016h5.378751l-12.166603 17.8253016z" fill="url(#g)" stroke-width=".44577742"/>
+	<path d="m29.397238 20.912646 12.16794-17.8253016h5.381871l-12.166603 17.8253016z" fill="url(#f)" stroke-width=".44577742"/>
+	<path d="m41.587021 20.912646 12.168832-17.8253016h5.379197l-12.167049 17.8253016z" fill="url(#e)" stroke-width=".44577742"/>
+	<g transform="matrix(.44577742 0 0 .44577742 1.2255526e-7 3.0815493)" stroke="#0f0f0f" stroke-width="3.39407052">
+		<path d="m105.31533 40.000133-27.293368-39.98724677h-12.071174l27.291583 39.98724677z" fill="url(#d)"/>
+		<path d="m132.65784 40.000133-27.29828-39.98724677h-12.070732l27.297832 39.98724677z" fill="url(#c)"/>
+		<path d="m160.0008 40.000133-27.29829-39.98724677h-12.07117l27.29828 39.98724677z" fill="url(#b)"/>
+	</g>
+	<g transform="matrix(.44577742 0 0 .44577742 1.2255526e-7 3.0815493)" stroke-width=".44769889">
+		<path d="m105.31533 40.000133-27.293368-39.98724677h-12.071174l27.291583 39.98724677z" fill="url(#d)"/>
+		<path d="m132.65784 40.000133-27.29828-39.98724677h-12.070732l27.297832 39.98724677z" fill="url(#c)"/>
+		<path d="m160.0008 40.000133-27.29829-39.98724677h-12.07117l27.29828 39.98724677z" fill="url(#b)"/>
+		<path d="m51.508977.01288623h10.325471v39.98724677h-10.325471z" fill="url(#i)" fill-rule="evenodd"/>
+		<path d="m10.124456 40.000133v-23.416756l13.077589 19.939331h.26668l13.213386-20.142143v23.619568h10.260252v-39.98724677h-11.129977l-12.343661 19.93888177-12.337408-19.93888177h-11.131317v39.98724677z" fill="url(#h)"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style/progressbar.svg b/res/skins/LateNight/style_classic/progressbar.svg
similarity index 100%
rename from res/skins/LateNight/style/progressbar.svg
rename to res/skins/LateNight/style_classic/progressbar.svg
diff --git a/res/skins/LateNight/style/progressbar_bg.svg b/res/skins/LateNight/style_classic/progressbar_bg.svg
similarity index 100%
rename from res/skins/LateNight/style/progressbar_bg.svg
rename to res/skins/LateNight/style_classic/progressbar_bg.svg
diff --git a/res/skins/LateNight/style_classic/spinny1_mask.svg b/res/skins/LateNight/style_classic/spinny1_mask.svg
new file mode 100644
index 000000000000..b91ba7507453
--- /dev/null
+++ b/res/skins/LateNight/style_classic/spinny1_mask.svg
@@ -0,0 +1,12 @@
+<svg width="100" height="100" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<radialGradient id="a" cx="50.003" cy="45.492" r="20.077" gradientTransform="matrix(1.0417 0 0 1.0417 -2.086 2.6121)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#eece33" offset="0"/>
+			<stop stop-color="#eece33" stop-opacity="0" offset="1"/>
+		</radialGradient>
+	</defs>
+	<path d="m70.913 50a20.913 20.913 0 0 1-41.827 0 20.913 20.913 0 1 1 41.827 0z" fill="url(#a)" opacity=".4"/>
+	<path d="m54.167 50a4.1667 4.1667 0 0 1-8.3333 0 4.1667 4.1667 0 1 1 8.3333 0z"/>
+	<path d="m0 0v100h100v-100zm50 3.125c12.259 0 24.47 5.0688 33.138 13.737 8.6682 8.6682 13.737 20.879 13.737 33.138s-5.0688 24.47-13.737 33.138l-.09766.09766c-8.6622 8.6087-20.828 13.639-33.04 13.639-12.259 0-24.47-5.0688-33.138-13.737l-.09766-.09766c-8.6087-8.6622-13.639-20.828-13.639-33.04 0-12.259 5.0688-24.47 13.737-33.138 8.6682-8.6682 20.879-13.737 33.138-13.737z" color="#000000" enable-background="accumulate" fill="#1e1e1e"/>
+	<path d="m96.875 50a46.875 46.875 0 0 1-93.75 0 46.875 46.875 0 1 1 93.75 0z" enable-background="new" fill="none" stroke="#000"/>
+</svg>
diff --git a/res/skins/LateNight/style_classic/spinny2_mask.svg b/res/skins/LateNight/style_classic/spinny2_mask.svg
new file mode 100644
index 000000000000..b91ba7507453
--- /dev/null
+++ b/res/skins/LateNight/style_classic/spinny2_mask.svg
@@ -0,0 +1,12 @@
+<svg width="100" height="100" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<radialGradient id="a" cx="50.003" cy="45.492" r="20.077" gradientTransform="matrix(1.0417 0 0 1.0417 -2.086 2.6121)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#eece33" offset="0"/>
+			<stop stop-color="#eece33" stop-opacity="0" offset="1"/>
+		</radialGradient>
+	</defs>
+	<path d="m70.913 50a20.913 20.913 0 0 1-41.827 0 20.913 20.913 0 1 1 41.827 0z" fill="url(#a)" opacity=".4"/>
+	<path d="m54.167 50a4.1667 4.1667 0 0 1-8.3333 0 4.1667 4.1667 0 1 1 8.3333 0z"/>
+	<path d="m0 0v100h100v-100zm50 3.125c12.259 0 24.47 5.0688 33.138 13.737 8.6682 8.6682 13.737 20.879 13.737 33.138s-5.0688 24.47-13.737 33.138l-.09766.09766c-8.6622 8.6087-20.828 13.639-33.04 13.639-12.259 0-24.47-5.0688-33.138-13.737l-.09766-.09766c-8.6087-8.6622-13.639-20.828-13.639-33.04 0-12.259 5.0688-24.47 13.737-33.138 8.6682-8.6682 20.879-13.737 33.138-13.737z" color="#000000" enable-background="accumulate" fill="#1e1e1e"/>
+	<path d="m96.875 50a46.875 46.875 0 0 1-93.75 0 46.875 46.875 0 1 1 93.75 0z" enable-background="new" fill="none" stroke="#000"/>
+</svg>
diff --git a/res/skins/LateNight/style_classic/spinny3_mask.svg b/res/skins/LateNight/style_classic/spinny3_mask.svg
new file mode 100644
index 000000000000..8670bf69176d
--- /dev/null
+++ b/res/skins/LateNight/style_classic/spinny3_mask.svg
@@ -0,0 +1,12 @@
+<svg width="100" height="100" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<radialGradient id="a" cx="50.003" cy="45.492" r="20.077" gradientTransform="matrix(1.0417 0 0 1.0417 -2.086 2.6121)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#09b2ae" offset="0"/>
+			<stop stop-color="#09b2ae" stop-opacity="0" offset="1"/>
+		</radialGradient>
+	</defs>
+	<path d="m70.913 50a20.913 20.913 0 0 1-41.827 0 20.913 20.913 0 1 1 41.827 0z" fill="url(#a)" opacity=".4"/>
+	<path d="m54.167 50a4.1667 4.1667 0 0 1-8.3333 0 4.1667 4.1667 0 1 1 8.3333 0z" enable-background="new"/>
+	<path d="m0 0v100h100v-100zm50 3.125c12.259 0 24.47 5.0688 33.138 13.737 8.6682 8.6682 13.737 20.879 13.737 33.138s-5.0688 24.47-13.737 33.138l-.09766.09766c-8.6622 8.6087-20.828 13.639-33.04 13.639-12.259 0-24.47-5.0688-33.138-13.737l-.09766-.09766c-8.6087-8.6622-13.639-20.828-13.639-33.04 0-12.259 5.0688-24.47 13.737-33.138 8.6682-8.6682 20.879-13.737 33.138-13.737z" color="#000000" enable-background="accumulate" fill="#1e1e1e"/>
+	<path d="m96.875 50a46.875 46.875 0 0 1-93.75 0 46.875 46.875 0 1 1 93.75 0z" enable-background="new" fill="none" stroke="#000"/>
+</svg>
diff --git a/res/skins/LateNight/style_classic/spinny4_mask.svg b/res/skins/LateNight/style_classic/spinny4_mask.svg
new file mode 100644
index 000000000000..8670bf69176d
--- /dev/null
+++ b/res/skins/LateNight/style_classic/spinny4_mask.svg
@@ -0,0 +1,12 @@
+<svg width="100" height="100" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<radialGradient id="a" cx="50.003" cy="45.492" r="20.077" gradientTransform="matrix(1.0417 0 0 1.0417 -2.086 2.6121)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#09b2ae" offset="0"/>
+			<stop stop-color="#09b2ae" stop-opacity="0" offset="1"/>
+		</radialGradient>
+	</defs>
+	<path d="m70.913 50a20.913 20.913 0 0 1-41.827 0 20.913 20.913 0 1 1 41.827 0z" fill="url(#a)" opacity=".4"/>
+	<path d="m54.167 50a4.1667 4.1667 0 0 1-8.3333 0 4.1667 4.1667 0 1 1 8.3333 0z" enable-background="new"/>
+	<path d="m0 0v100h100v-100zm50 3.125c12.259 0 24.47 5.0688 33.138 13.737 8.6682 8.6682 13.737 20.879 13.737 33.138s-5.0688 24.47-13.737 33.138l-.09766.09766c-8.6622 8.6087-20.828 13.639-33.04 13.639-12.259 0-24.47-5.0688-33.138-13.737l-.09766-.09766c-8.6087-8.6622-13.639-20.828-13.639-33.04 0-12.259 5.0688-24.47 13.737-33.138 8.6682-8.6682 20.879-13.737 33.138-13.737z" color="#000000" enable-background="accumulate" fill="#1e1e1e"/>
+	<path d="m96.875 50a46.875 46.875 0 0 1-93.75 0 46.875 46.875 0 1 1 93.75 0z" enable-background="new" fill="none" stroke="#000"/>
+</svg>
diff --git a/res/skins/LateNight/style/spinny_bg.svg b/res/skins/LateNight/style_classic/spinny_bg.svg
similarity index 100%
rename from res/skins/LateNight/style/spinny_bg.svg
rename to res/skins/LateNight/style_classic/spinny_bg.svg
diff --git a/res/skins/LateNight/style_classic/spinny_indicator.svg b/res/skins/LateNight/style_classic/spinny_indicator.svg
new file mode 100644
index 000000000000..a7a130439a55
--- /dev/null
+++ b/res/skins/LateNight/style_classic/spinny_indicator.svg
@@ -0,0 +1,8 @@
+<svg width="110" height="110" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g shape-rendering="auto">
+		<path d="m54.20605 3.0989008c-2.87145 0-5.20605-.1267242-5.20605 2.5090193v35.6198829c0 2.635743 2.3346 4.778706 5.20605 4.778706h1.587899c2.871451 0 5.206051-2.142963 5.206051-4.778706v-35.6198829c0-2.6357435-2.3346-2.5090193-5.206051-2.5090193z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill-opacity=".62745098" image-rendering="auto" solid-color="#000000" stroke-width=".99999994" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<path d="m54.4707 3.3479471c-1.9143 0-3.4707 2.9e-6-3.4707 1.6032609v35.235408c0 2.206414 1.5564 4.000313 3.4707 4.000313h1.0586c1.9143 0 3.4707-1.793899 3.4707-4.000313v-35.235408c0-1.603258-1.5564-1.6032609-3.4707-1.6032609z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill-opacity=".62745098" image-rendering="auto" solid-color="#000000" stroke-width=".99999994" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<path d="m54.65411 3.9496929h.69178c.921217 0 1.65411.6460174 1.65411 2.1569774v33.5984117c0 1.51107-.732909 2.71315-1.65411 2.71315h-.69178c-.921217 0-1.65411-1.20219-1.65411-2.71315v-33.5984117c0-1.51107.732909-2.1569774 1.65411-2.1569774z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="none" image-rendering="auto" solid-color="#000000" stroke="#000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<path d="m54.65411 3.9496929h.69178c.921217 0 1.65411.6460176 1.65411 2.1569776v33.5984115c0 1.51107-.732909 2.71315-1.65411 2.71315h-.69178c-.921217 0-1.65411-1.20219-1.65411-2.71315v-33.5984115c0-1.51107.732909-2.1569776 1.65411-2.1569776z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#fff" image-rendering="auto" solid-color="#000000" stroke-width=".99999994" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_classic/spinny_indicator_ghost.svg b/res/skins/LateNight/style_classic/spinny_indicator_ghost.svg
new file mode 100644
index 000000000000..e825c25e47e5
--- /dev/null
+++ b/res/skins/LateNight/style_classic/spinny_indicator_ghost.svg
@@ -0,0 +1,7 @@
+<svg width="110" height="110" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g shape-rendering="auto">
+		<path d="m54.20605 3.0989052c-2.87145 0-5.20605-.1267242-5.20605 2.5090193v35.6198825c0 2.635743 2.3346 4.778706 5.20605 4.778706h1.587899c2.871451 0 5.206051-2.142963 5.206051-4.778706v-35.6198825c0-2.6357435-2.3346-2.5090193-5.206051-2.5090193z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill-opacity=".62745098" image-rendering="auto" solid-color="#000000" stroke-width=".99999994" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<path d="m54.4707 3.3479515c-1.9143 0-3.4707 2.9e-6-3.4707 1.6032609v35.2354076c0 2.206414 1.5564 4.000313 3.4707 4.000313h1.0586c1.9143 0 3.4707-1.793899 3.4707-4.000313v-35.2354076c0-1.603258-1.5564-1.6032609-3.4707-1.6032609z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill-opacity=".62745098" image-rendering="auto" solid-color="#000000" stroke-width=".99999994" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<path d="m54.999859 3.9908904s1.99985-.00289 1.999861 1.3758096l.00028 35.5113c1.1e-5 1.378802-2.000141 1.37544-2.000141 1.37544s-1.999568.0033-1.999579-1.37544l-.00028-35.5113c-1.1e-5-1.3788008 1.999859-1.3758096 1.999859-1.3758096z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#1af000" fill-opacity=".96651001" image-rendering="auto" solid-color="#000000" stroke-width=".95523119" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style/splitter_handle_checked.png b/res/skins/LateNight/style_classic/splitter_handle_checked.png
similarity index 100%
rename from res/skins/LateNight/style/splitter_handle_checked.png
rename to res/skins/LateNight/style_classic/splitter_handle_checked.png
diff --git a/res/skins/LateNight/style/splitter_handle_horizontal_checked.png b/res/skins/LateNight/style_classic/splitter_handle_horizontal_checked.png
similarity index 100%
rename from res/skins/LateNight/style/splitter_handle_horizontal_checked.png
rename to res/skins/LateNight/style_classic/splitter_handle_horizontal_checked.png
diff --git a/res/skins/LateNight/style/splitter_handle_horizontal_unchecked.png b/res/skins/LateNight/style_classic/splitter_handle_horizontal_unchecked.png
similarity index 100%
rename from res/skins/LateNight/style/splitter_handle_horizontal_unchecked.png
rename to res/skins/LateNight/style_classic/splitter_handle_horizontal_unchecked.png
diff --git a/res/skins/LateNight/style_classic/splitter_handle_horizontal_unchecked.svg b/res/skins/LateNight/style_classic/splitter_handle_horizontal_unchecked.svg
new file mode 100644
index 000000000000..107935a6d03f
--- /dev/null
+++ b/res/skins/LateNight/style_classic/splitter_handle_horizontal_unchecked.svg
@@ -0,0 +1,14 @@
+<svg width="1270" height="10" version="1.1" viewBox="0 0 336.02083 2.6458334" xmlns="http://www.w3.org/2000/svg" xmlns:osb="http://www.openswatchbook.org/uri/2009/osb" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="a" x1="-1.4552071" x2="337.47604" y1="293.825" y2="293.825" gradientUnits="userSpaceOnUse">
+			<stop offset="0"/>
+		</linearGradient>
+	</defs>
+	<g transform="translate(0,-294.35416)">
+		<path d="m156.10417 294.61874h3.96875v1.5875h15.875v-1.5875h161.39583v-3.43958h-338.6666654v3.43958h157.4270854" fill="#1e1e1e"/>
+		<path d="m-1.4550781 291.17969v3.70312h157.5585981l3.70481.00013v1.58789h16.40417v-1.58789l161.26406-.00013v-3.70312zm.2636719.26367h338.4023462v3.17578l-161.26406.00013v1.58789h-15.87292v-1.58789l-3.97044-.00013h-157.2949262z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#a)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<rect x="161.39583" y="295.41251" width="13.229167" height=".26458335" style="paint-order:fill markers stroke"/>
+		<rect x="161.39583" y="294.61874" width="13.229167" height=".26458335" style="paint-order:fill markers stroke"/>
+		<path d="m160.07292 294.61874-.26458.26459v1.5875l.26458-.26459z" fill="#333"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style/splitter_handle_unchecked.png b/res/skins/LateNight/style_classic/splitter_handle_unchecked.png
similarity index 100%
rename from res/skins/LateNight/style/splitter_handle_unchecked.png
rename to res/skins/LateNight/style_classic/splitter_handle_unchecked.png
diff --git a/res/skins/LateNight/style/toolbar_divider.png b/res/skins/LateNight/style_classic/toolbar_separator.png
similarity index 100%
rename from res/skins/LateNight/style/toolbar_divider.png
rename to res/skins/LateNight/style_classic/toolbar_separator.png
diff --git a/res/skins/LateNight/style_classic/vinyl_control_0.svg b/res/skins/LateNight/style_classic/vinyl_control_0.svg
new file mode 100644
index 000000000000..f4a5a61bddf0
--- /dev/null
+++ b/res/skins/LateNight/style_classic/vinyl_control_0.svg
@@ -0,0 +1 @@
+<svg id="svg4272" width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path834" d="m10 0a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm0 6a4 4 0 0 1 4 4 4 4 0 0 1-4 4 4 4 0 0 1-4-4 4 4 0 0 1 4-4z" color="#000000" fill="#888"/><path id="path834-6" d="m11 10a1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1 1 1 0 0 1 1 1z" color="#000000" fill="#666"/></svg>
diff --git a/res/skins/LateNight/style/vinyl_control_1.svg b/res/skins/LateNight/style_classic/vinyl_control_1.svg
similarity index 100%
rename from res/skins/LateNight/style/vinyl_control_1.svg
rename to res/skins/LateNight/style_classic/vinyl_control_1.svg
diff --git a/res/skins/LateNight/style/vinyl_control_2.svg b/res/skins/LateNight/style_classic/vinyl_control_2.svg
similarity index 100%
rename from res/skins/LateNight/style/vinyl_control_2.svg
rename to res/skins/LateNight/style_classic/vinyl_control_2.svg
diff --git a/res/skins/LateNight/style/vinyl_control_3.svg b/res/skins/LateNight/style_classic/vinyl_control_3.svg
similarity index 100%
rename from res/skins/LateNight/style/vinyl_control_3.svg
rename to res/skins/LateNight/style_classic/vinyl_control_3.svg
diff --git a/res/skins/LateNight/style/vu_clipping_deck.png b/res/skins/LateNight/style_classic/vu_clipping_deck.png
similarity index 100%
rename from res/skins/LateNight/style/vu_clipping_deck.png
rename to res/skins/LateNight/style_classic/vu_clipping_deck.png
diff --git a/res/skins/LateNight/style/vu_clipping_deck_over.png b/res/skins/LateNight/style_classic/vu_clipping_deck_over.png
similarity index 100%
rename from res/skins/LateNight/style/vu_clipping_deck_over.png
rename to res/skins/LateNight/style_classic/vu_clipping_deck_over.png
diff --git a/res/skins/LateNight/style/vu_clipping_small.png b/res/skins/LateNight/style_classic/vu_clipping_small.png
similarity index 100%
rename from res/skins/LateNight/style/vu_clipping_small.png
rename to res/skins/LateNight/style_classic/vu_clipping_small.png
diff --git a/res/skins/LateNight/style/vu_clipping_small_over.png b/res/skins/LateNight/style_classic/vu_clipping_small_over.png
similarity index 100%
rename from res/skins/LateNight/style/vu_clipping_small_over.png
rename to res/skins/LateNight/style_classic/vu_clipping_small_over.png
diff --git a/res/skins/LateNight/style/vu_level_deck.png b/res/skins/LateNight/style_classic/vu_level_deck.png
similarity index 100%
rename from res/skins/LateNight/style/vu_level_deck.png
rename to res/skins/LateNight/style_classic/vu_level_deck.png
diff --git a/res/skins/LateNight/style/vu_level_deck_over.png b/res/skins/LateNight/style_classic/vu_level_deck_over.png
similarity index 100%
rename from res/skins/LateNight/style/vu_level_deck_over.png
rename to res/skins/LateNight/style_classic/vu_level_deck_over.png
diff --git a/res/skins/LateNight/style_classic/vu_level_sampler.png b/res/skins/LateNight/style_classic/vu_level_sampler.png
new file mode 100644
index 000000000000..901712c3b138
Binary files /dev/null and b/res/skins/LateNight/style_classic/vu_level_sampler.png differ
diff --git a/res/skins/LateNight/style_classic/vu_level_sampler_over.png b/res/skins/LateNight/style_classic/vu_level_sampler_over.png
new file mode 100644
index 000000000000..7d2ff651b617
Binary files /dev/null and b/res/skins/LateNight/style_classic/vu_level_sampler_over.png differ
diff --git a/res/skins/LateNight/style/vu_level_small.png b/res/skins/LateNight/style_classic/vu_level_small.png
similarity index 100%
rename from res/skins/LateNight/style/vu_level_small.png
rename to res/skins/LateNight/style_classic/vu_level_small.png
diff --git a/res/skins/LateNight/style/vu_level_small_over.png b/res/skins/LateNight/style_classic/vu_level_small_over.png
similarity index 100%
rename from res/skins/LateNight/style/vu_level_small_over.png
rename to res/skins/LateNight/style_classic/vu_level_small_over.png
diff --git a/res/skins/LateNight/style_flip.qss b/res/skins/LateNight/style_flip.qss
new file mode 100644
index 000000000000..b6d5a8509fbd
--- /dev/null
+++ b/res/skins/LateNight/style_flip.qss
@@ -0,0 +1,920 @@
+/* LateNight 2.3 */
+
+/************** Backgrounds, 3D borders & margins *****************************
+************** of major GUI containers **************************************/
+
+#SkinContainer,
+QToolTip,
+#CrossfaderButtonContainerDeck, #CrossfaderButtonContainerAux,
+#CrossfaderButton[value="0"],
+WEffectSelector,
+#fadeModeCombobox,
+QTableView, QTextBrowser, QTreeView {
+  background-color: #1e1e1d;
+}
+WEffectSelector QAbstractItemView,
+WEffectSelector QAbstractItemView::item,
+#fadeModeCombobox QAbstractItemView,
+QToolTip {
+  background-color: #0a0a0a;
+}
+
+/* borders of elevated containers */
+#WaveformsContainer,
+#DeckMini1, #DeckMini2, #DeckMini3, #DeckMini4,
+  #RateContainer,
+  #DeckRow_1_KeyVinylFx, #DeckRow_2_3_ArtistTitleTime,
+  #DeckRow_4_OverviewSpinny #OverviewBox, #DeckControlsStars,
+  #DeckRow_5_LoopCuesTransport,
+  #SmallSpinnyCoverContainer, #BigSpinnyCoverContainer,
+#MixerDecks, #MasterControls, #HeadphoneControls,
+#FxUnitControlsExpanded, #FxUnitControlsCollapsed,
+  #FxSlotBorder1[highlight="0"],
+  #FxSlotBorder2[highlight="0"],
+  #FxSlotBorder3[highlight="0"],
+  #FxRackFiller,
+#SamplerDeck, #SamplerDeckMini, #SamplerExpandButtonBox,
+#MicAuxMainControlsFrame, #MicAuxSubControlsFrame,
+#MicDuckingContainer, #MicAuxRackFiller,
+WLibrary, #SidebarBox, #SearchLineBox, #PreviewDeck,
+#SkinSettings {
+  border-top: 1px solid #333;
+  border-left: 1px solid #333;
+  border-bottom: 1px solid #020201;
+  border-right: 1px solid #020201;
+  border-radius: 2px;
+/*  more realistic drop shadow:
+  border-top: 1px solid #333;
+  border-left: 1px solid #222;
+  border-bottom: 1px solid #020201;
+  border-right: 1px solid #0a0a09;
+  alternative: border image
+  border-width: 2px;
+  border-image: url(skin:style_flip/background_border.svg) 2 2 2 2; */
+  background-color: #0f0f0e;
+}
+#ToolBar {
+  background-color: #0f0f0e;
+}
+
+
+#SkinSettings {
+  border-width: 0px 0px 1px 1px;
+  border-bottom-right-radius: 0px;
+}
+
+#KeyText,
+#DeckMini1 #OverviewBox, #DeckMini2 #OverviewBox,
+#DeckMini3 #OverviewBox, #DeckMini4 #OverviewBox,
+#SamplerDeck #OverviewBox,
+#PreviewDeck #OverviewBox,
+WSearchLineEdit {
+  border-top: 1px solid #000;
+  border-left: 1px solid #000;
+  border-bottom: 1px solid #222;
+  border-right: 1px solid #222;
+/* more realistic drop shadow:
+  border-top: 1px solid #000;
+  border-left: 1px solid #050504;
+  border-bottom: 1px solid #333;
+  border-right: 1px solid #11110a;  */
+  border-bottom-left-radius: 1px;
+  border-top-right-radius: 1px;
+}
+
+
+#WaveformsBottomBorder, #WaveformsRightBorder {
+  background-color: #333;
+}
+#WaveformsBottomBorder {
+  padding-top: 0px;
+}
+#WaveformsContainer {
+  /* the right border is necessary only when the skin settings menu is visible */
+  border-width: 0px 1px 1px 0px;
+  padding-bottom: 0px;
+}
+
+/************ separator lines within decks, samplers etc. *********************/
+#BpmTextSmall, #KeyTextSmall, #ArtistTextSmall, #PlayPositionTextSmall,
+#PlayContainerSmall,
+#PreviewLabel, #PreviewPlayBox,
+#SamplerText, #SamplerPlay, #SamplerButtonGrid,
+#SamplerGain, #SamplerVU, #SamplerPfl {
+  border-style: solid;
+  border-color: #0c0c0c;
+}
+
+/*********** common margins & paddings ****************************************/
+#Deck1, #Deck2,
+#Deck3, #Deck4,
+#DeckMini1, #DeckMini2,
+#DeckMini3, #DeckMini4,
+#FxUnit1, #FxUnit3,
+#FxUnit2, #FxUnit4,
+#MicRack, #AuxRack {
+  margin-bottom: 5px;
+}
+#MixerContainer {
+  margin-bottom: 3px;
+}
+
+#Deck1, #Deck2, #Deck3, #Deck4,
+#FxUnit2, #FxUnit2, #FxUnit3, #FxUnit4 {
+  padding: 0px;
+  border: 0px;
+  background-color: transparent;
+}
+#DeckMini1, #DeckMini2,
+#DeckMini3, #DeckMini4 {
+  padding: 1px;
+}
+#DeckMini1, #DeckMini2 {
+  margin-top: 5px;
+}
+
+#Deck1, #DeckMini1, #FxUnit1,
+#Deck3, #DeckMini3, #FxUnit3,
+#MicRack {
+  margin-right: 5px;
+  margin-left: 2px;
+}
+#Deck2, #DeckMini2, #FxUnit2,
+#Deck4, #DeckMini4, #FxUnit4,
+#AuxRack {
+  margin-right: 3px;
+  margin-left: 5px;
+}
+
+/************** Backgrounds, 3D borders & margins *****************************
+************** of major GUI containers **************************************/
+
+
+
+/************** Button styles *************************************************/
+/* all buttons are embedded */
+#RateControls WPushButton[value="0"], #SyncButton[value="0"],
+#PflButton[value="0"],
+#EQKillButton[displayValue="0"],
+#QuickEffectButton[displayValue="0"],
+#FxUnitControlsCollapsed WPushButton, #FxUnitControlsExpanded WPushButton,
+#FxExpandCollapseButton,
+#PlayButtonSampler[displayValue="0"], #PlayButtonDeckMini[displayValue="0"],
+#SamplerSyncButton[displayValue="0"],
+#MicTalkButton[value="0"], #AuxPlayButton[value="0"],
+#MicDuckingButton[value="0"],
+#PlayButtonPreview[displayValue="0"],
+#DlgMissing > QPushButton:enabled:!checked,
+#DlgHidden > QPushButton:enabled:!checked,
+#DlgAutoDJ > QPushButton:enabled:!checked,
+#DlgRecording > QPushButton:enabled:!checked,
+#DlgAnalysis > QPushButton:enabled:!checked,
+#BeatgridButtonsToggle, #BeatgridButtons WPushButton[displayValue="0"],
+#DeckRow_1_KeyVinylFx WPushButton[displayValue="0"],
+#VinylTristateButton[displayValue="1"], #VinylTristateButton[displayValue="2"],
+#GuiToggleButton[displayValue="0"], #RecFeedback[displayValue="0"],
+#BroadcastButton[displayValue="0"], #SettingsButton[displayValue="0"],
+#DeckRow_5_LoopCuesTransport WPushButton[value="0"],
+#HotcueButton[displayValue="0"],
+#FxAssignButton[displayValue="0"], #FxFocusButton[displayValue="0"],
+#FxToggleButton[displayValue="0"], #FxParameterButton[displayValue="0"],
+#SplitCueButton[value="0"],
+#MicAuxGainPFlContainer WPushButton[displayValue="0"] {
+  background-color: #2c2c2c;
+}
+/*
+#BeatgridButtonsToggle {
+  border-width: 3px;
+  border-image: url(skin:buttons_classic/btn_embedded_libary.svg) 3 3 3 3;
+  margin: 3px;
+} */
+
+#SkinSettingsButton {
+  color: #bbb;
+}
+#SkinSettingsCategory {
+  border-width: 0px;
+  }
+
+WBeatSpinBox#Spinbox_embedded:focus,
+#DlgAutoDJ QSpinBox:focus {
+  border-image: url(skin:buttons_classic/spinbox_embedded_border_focus_cyan.svg) 3 19 2 3;
+  background-color: #000;
+}
+/*************** button background colors *************************************/
+
+
+
+/************** Button icons **************************************************/
+#SyncButton {
+  image: url(skin:/buttons_flip/btn__sync_deck.svg) no-repeat center center;
+  }
+  #SamplerSyncButton {
+    image: url(skin:/buttons_flip/btn__sync_sampler.svg) no-repeat center center;
+  }
+  #RatePermUp {
+    image: url(skin:/buttons_flip/btn__plus.svg) no-repeat center center;
+  }
+  #RateTempUp,
+  #JumpForward {
+    image: url(skin:/buttons_flip/btn__arrow_right.svg) no-repeat center center;
+  }
+  #RatePermDown {
+    image: url(skin:/buttons_flip/btn__minus.svg) no-repeat center center;
+  }
+  #RateTempDown,
+  #JumpBack {
+    image: url(skin:/buttons_flip/btn__arrow_left.svg) no-repeat center center;
+  }
+
+#LoopActivate {
+  image: url(skin:/buttons_flip/btn__loop.svg) no-repeat center center;
+  }
+  #Reloop {
+    image: url(skin:/buttons_flip/btn__reloop.svg) no-repeat center center;
+  }
+  #LoopIn {
+    image: url(skin:/buttons_flip/btn__loop_in.svg) no-repeat center center;
+  }
+  #LoopOut {
+    image: url(skin:/buttons_flip/btn__loop_out.svg) no-repeat center center;
+  }
+
+#PflButton {
+  image: url(skin:/buttons_flip/btn__pfl.svg) no-repeat center center;
+}
+
+#Hotcue1 WPushButton {
+  image: url(skin:/buttons_flip/btn__1.svg) no-repeat center center;
+  }
+  #Hotcue2 WPushButton {
+    image: url(skin:/buttons_flip/btn__2.svg) no-repeat center center;
+  }
+  #Hotcue3 WPushButton {
+    image: url(skin:/buttons_flip/btn__3.svg) no-repeat center center;
+  }
+  #Hotcue4 WPushButton {
+    image: url(skin:/buttons_flip/btn__4.svg) no-repeat center center;
+  }
+  #Hotcue5 WPushButton {
+    image: url(skin:/buttons_flip/btn__5.svg) no-repeat center center;
+  }
+  #Hotcue6 WPushButton {
+    image: url(skin:/buttons_flip/btn__6.svg) no-repeat center center;
+  }
+  #Hotcue7 WPushButton {
+    image: url(skin:/buttons_flip/btn__7.svg) no-repeat center center;
+  }
+  #Hotcue8 WPushButton {
+    image: url(skin:/buttons_flip/btn__8.svg) no-repeat center center;
+  }
+
+#SpecialCueButton_intro_start WPushButton {
+  image: url(skin:/buttons_flip/btn__intro_start.svg) no-repeat center center;
+  }
+  #SpecialCueButton_intro_end WPushButton {
+    image: url(skin:/buttons_flip/btn__intro_end.svg) no-repeat center center;
+  }
+  #SpecialCueButton_outro_start WPushButton {
+    image: url(skin:/buttons_flip/btn__outro_start.svg) no-repeat center center;
+  }
+  #SpecialCueButton_outro_end WPushButton {
+    image: url(skin:/buttons_flip/btn__outro_end.svg) no-repeat center center;
+  }
+
+#PlayDeck {
+  image: url(skin:/buttons_flip/btn__play_deck.svg) no-repeat center center;
+}
+#CueDeck {
+  image: url(skin:/buttons_flip/btn__cue_deck.svg) no-repeat center center;
+}
+#Reverse {
+  image: url(skin:/buttons_flip/btn__reverse.svg) no-repeat center center;
+}
+
+#QuickEffectButton[displayValue="0"] {
+  image: url(skin:/buttons_flip/btn__star.svg) no-repeat center center;
+}
+
+#FxAssignButton_FX1 WPushButton[value="0"] {
+  image: url(skin:/buttons_flip/btn__fx_FX1.svg) no-repeat center center;
+    }
+    #FxAssignButton_FX1 WPushButton[value="1"] {
+      image: url(skin:/buttons_flip/btn__fx_FX1_active.svg) no-repeat center center;
+    }
+  #FxAssignButton_FX2 WPushButton[value="0"] {
+    image: url(skin:/buttons_flip/btn__fx_FX2.svg) no-repeat center center;
+    }
+    #FxAssignButton_FX2 WPushButton[value="1"] {
+      image: url(skin:/buttons_flip/btn__fx_FX2_active.svg) no-repeat center center;
+    }
+  #FxAssignButton_FX3 WPushButton[value="0"] {
+    image: url(skin:/buttons_flip/btn__fx_FX3.svg) no-repeat center center;
+    }
+    #FxAssignButton_FX3 WPushButton[value="1"] {
+      image: url(skin:/buttons_flip/btn__fx_FX3_active.svg) no-repeat center center;
+    }
+  #FxAssignButton_FX4 WPushButton[value="0"] {
+    image: url(skin:/buttons_flip/btn__fx_FX4.svg) no-repeat center center;
+    }
+    #FxAssignButton_FX4 WPushButton[value="1"] {
+      image: url(skin:/buttons_flip/btn__fx_FX4_active.svg) no-repeat center center;
+    }
+  #FxAssignButton_2 WPushButton[value="0"] {
+    image: url(skin:/buttons_flip/btn__fx_2.svg) no-repeat center center;
+    }
+    #FxAssignButton_2 WPushButton[value="1"] {
+      image: url(skin:/buttons_flip/btn__fx_2_active.svg) no-repeat center center;
+    }
+  #FxAssignButton_3 WPushButton[value="0"] {
+    image: url(skin:/buttons_flip/btn__fx_3.svg) no-repeat center center;
+    }
+    #FxAssignButton_3 WPushButton[value="1"] {
+      image: url(skin:/buttons_flip/btn__fx_3_active.svg) no-repeat center center;
+    }
+  #FxAssignButton_4 WPushButton[value="0"] {
+    image: url(skin:/buttons_flip/btn__fx_4.svg) no-repeat center center;
+    }
+    #FxAssignButton_4 WPushButton[value="1"] {
+      image: url(skin:/buttons_flip/btn__fx_4_active.svg) no-repeat center center;
+    }
+
+#SplitCueButton[value="0"] {
+  image: url(skin:/buttons_flip/btn__splitcue.svg) no-repeat center center;
+  }
+  #SplitCueButton[value="1"] {
+    image: url(skin:/buttons_flip/btn__splitcue_active.svg) no-repeat center center;
+  }
+
+#PlayButtonSampler[value="0"],
+#PlayButtonDeckMini[value="0"],
+#PlayButtonPreview[displayValue="0"] {
+  image: url(skin:/buttons_flip/btn__play_sampler.svg) no-repeat center center;
+  }
+  #PlayButtonSampler[value="1"],
+  #PlayButtonDeckMini[value="1"],
+  #PlayButtonPreview[displayValue="1"] {
+    image: url(skin:/buttons_flip/btn__pause_sampler.svg) no-repeat center center;
+  }
+
+#MixModeButton[value="0"] {
+  image: url(skin:/buttons_flip/btn__fx_mixmode_d-w.svg) no-repeat center center;
+  }
+  #MixModeButton[value="1"] {
+    image: url(skin:/buttons_flip/btn__fx_mixmode_d+w.svg) no-repeat center center;
+  }
+
+#FxExpandCollapseButton[value="0"] {
+  image: url(skin:/buttons_flip/btn__fx_sampler_expand.svg) no-repeat center center;
+  }
+  #FxExpandCollapseButton[value="1"] {
+    image: url(skin:/buttons_flip/btn__fx_sampler_collapse.svg) no-repeat center center;
+  }
+
+#FxToggleButton[value="0"] {
+  image: url(skin:/buttons_flip/btn__fx_toggle.svg) no-repeat center center;
+  }
+  #FxToggleButton[value="1"] {
+    image: url(skin:/buttons_flip/btn__fx_toggle_active.svg) no-repeat center center;
+  }
+
+#FxFocusButton[value="0"] {
+  image: url(skin:/buttons_flip/btn__fx_focus.svg) no-repeat center center;
+  }
+  #FxFocusButton[value="1"] {
+    image: url(skin:/buttons_flip/btn__fx_focus_active.svg) no-repeat center center;
+  }
+
+#KeyMatchButton {
+  image: url(skin:/buttons_flip/btn__key_match.svg) no-repeat center center;
+  }
+#KeyUpButton {
+  image: url(skin:/buttons_flip/btn__key_up.svg) no-repeat center center;
+  }
+#KeyDownButton {
+  image: url(skin:/buttons_flip/btn__key_down.svg) no-repeat center center;
+  }
+
+/* deck controls for decks 1-4 and samplers */
+#CurposButton12[displayValue="0"], #CurposButton34[displayValue="0"] {
+  image: url(skin:/buttons_flip/btn__beat_curpos.svg) no-repeat center center;
+  }
+  #CurposButton12[value="1"] {
+    image: url(skin:/buttons_flip/btn__beat_curpos_active_12.svg) no-repeat center center;
+  }
+  #CurposButton34[value="1"] {
+    image: url(skin:/buttons_flip/btn__beat_curpos_active_34.svg) no-repeat center center;
+  }
+
+  #EjectButton12[displayValue="0"], #EjectButton34[displayValue="0"] {
+    image: url(skin:/buttons_flip/btn__eject.svg) no-repeat center center;
+    }
+    #EjectButton12[value="1"] {
+      image: url(skin:/buttons_flip/btn__eject_active_12.svg) no-repeat center center;
+    }
+    #EjectButton34[value="1"] {
+      image: url(skin:/buttons_flip/btn__eject_active_34.svg) no-repeat center center;
+    }
+
+  #RepeatButton12[displayValue="0"], #RepeatButton34[displayValue="0"] {
+    image: url(skin:/buttons_flip/btn__repeat.svg) no-repeat center center;
+    }
+    #RepeatButton12[displayValue="1"] {
+      image: url(skin:/buttons_flip/btn__repeat_active_12.svg) no-repeat center center;
+    }
+    #RepeatButton34[displayValue="1"] {
+      image: url(skin:/buttons_flip/btn__repeat_active_34.svg) no-repeat center center;
+    }
+
+  #QuantizeButton12[displayValue="0"], #QuantizeButton34[displayValue="0"] {
+    image: url(skin:/buttons_flip/btn__quantize.svg) no-repeat center center;
+    }
+    #QuantizeButton12[displayValue="1"] {
+      image: url(skin:/buttons_flip/btn__quantize_active_12.svg) no-repeat center center;
+    }
+    #QuantizeButton34[displayValue="1"] {
+      image: url(skin:/buttons_flip/btn__quantize_active_34.svg) no-repeat center center;
+    }
+
+  #SlipmodeButton12[displayValue="0"], #SlipmodeButton34[displayValue="0"] {
+    image: url(skin:/buttons_flip/btn__slip.svg) no-repeat center center;
+    }
+    #SlipmodeButton12[displayValue="1"] {
+      image: url(skin:/buttons_flip/btn__slip_active_12.svg) no-repeat center center;
+    }
+    #SlipmodeButton34[displayValue="1"] {
+      image: url(skin:/buttons_flip/btn__slip_active_34.svg) no-repeat center center;
+    }
+
+  #KeylockButton12[displayValue="0"], #KeylockButton34[displayValue="0"] {
+    image: url(skin:/buttons_flip/btn__keylock.svg) no-repeat center center;
+    }
+    #KeylockButton12[displayValue="1"] {
+      image: url(skin:/buttons_flip/btn__keylock_active_12.svg) no-repeat center center;
+    }
+    #KeylockButton34[displayValue="1"] {
+      image: url(skin:/buttons_flip/btn__keylock_active_34.svg) no-repeat center center;
+    }
+
+#BeatgridButtonsToggle {
+  border-width: 3px;
+  border-image: url(skin:buttons_flip/btn_embedded_library.svg) 3 3 3 3;
+  image: url(skin:/buttons_flip/btn__beatgrid_buttons_toggle.svg) no-repeat center center;
+  }
+  #BeatCurposLarge {
+    image: url(skin:/buttons_flip/btn__beat_curpos_large.svg) no-repeat center center;
+    }
+    #BeatsEarlier {
+      image: url(skin:/buttons_flip/btn__beats_earlier.svg) no-repeat center center;
+    }
+    #BeatsLater {
+      image: url(skin:/buttons_flip/btn__beats_later.svg) no-repeat center center;
+    }
+    #BeatsSlower {
+      image: url(skin:/buttons_flip/btn__beats_slower.svg) no-repeat center center;
+    }
+    #BeatsFaster {
+      image: url(skin:/buttons_flip/btn__beats_faster.svg) no-repeat center center;
+    }
+
+#MicTalkButton {
+  image: url(skin:/buttons_flip/btn__mic_talk.svg) no-repeat center center;
+}
+#AuxPlayButton {
+  image: url(skin:/buttons_flip/btn__aux_play.svg) no-repeat center center;
+}
+#MicDuckingButton[value="0"] {
+  image: url(skin:/buttons_flip/btn__mic_duck_off.svg) no-repeat center center;
+  }
+  #MicDuckingButton[value="1"] {
+    image: url(skin:/buttons_flip/btn__mic_duck_auto.svg) no-repeat center center;
+  }
+  #MicDuckingButton[value="2"] {
+    image: url(skin:/buttons_flip/btn__mic_duck_manual.svg) no-repeat center center;
+  }
+
+#RecDot {
+  background: transparent;
+  image: url(skin:/buttons_flip/btn__rec_dot.svg) no-repeat center center;
+}
+
+#SettingsButton[displayValue="0"] {
+  /* for some reason the alignment isn't rescpected, so the icons
+    have to be sized like available area (76x16px) */
+  image: url(skin:/buttons_flip/btn__settings_off.svg) no-repeat left top;
+  }
+  #SettingsButton[displayValue="1"] {
+    image: url(skin:/buttons_flip/btn__settings_on.svg) no-repeat left top;
+  }
+
+#ToolbarLogo {
+  image: url(skin:/style_classic/mixxx_logo_small.svg) no-repeat center center;
+}
+
+WSearchLineEdit QToolButton:!focus {
+  image: url(skin:/buttons_flip/btn__lib_clear_search.svg);
+  }
+  WSearchLineEdit QToolButton:focus {
+    image: url(skin:/buttons_flip/btn__lib_clear_search_focus.svg);
+  }
+/************** Button icons **************************************************/
+
+
+
+/************** Label styles **************************************************/
+
+WSearchLineEdit,
+#LibraryBPMSpinBox,
+#LibraryBPMButton::item,
+#LibraryContainer QTableView,
+#LibraryContainer QTextBrowser,
+#LibraryContainer QTreeView {
+  color: #f0bb2b;
+  selection-color: #f0bb2b;
+}
+
+/* gold */
+#Deck1 WLabel, #Deck2 WLabel,
+#DeckMini1 WLabel, #DeckMini2 WLabel,
+#Deck1 WStarRating, #Deck2 WStarRating,
+#Deck1 WBeatSpinBox, #Deck2 WBeatSpinBox, #DlgAutoDJ QSpinBox,
+#PreviewLabel, #PreviewDeckText, #PreviewTitle, #PreviewBPM,
+#FxUnitLabel, #MicAuxSubTitle,
+WEffectSelector, WEffectSelector QAbstractItemView,
+#SamplerTitle, #SamplerTitleSmall, #SamplerBpm,
+WLibrary QLabel, WLibrary QRadioButton,
+#fadeModeCombobox, #fadeModeCombobox QAbstractItemView,
+#CategoryLabel, #SkinSettingsLabelButton,
+QToolTip,
+WLibrary QTableView::indicator,
+WSearchLineEdit,
+#LatencyLabel, WTime {
+/*  color: #f0bb2b; */
+  color: #ffaa00;
+}
+
+/* light blue / cyan */
+#Deck3 WLabel, #Deck4 WLabel,
+#DeckMini3 WLabel, #DeckMini4 WLabel,
+#Deck3 WStarRating, #Deck4 WStarRating,
+#Deck3 WBeatSpinBox, #Deck4 WBeatSpinBox {
+  color: #00aaff;
+}
+
+#KnobLabel,
+#FxKnobLabel,
+#FxButtonLabel {
+  color: #666;
+  qproperty-alignment: 'AlignCenter | AlignBottom';
+  padding-top: -1px;
+}
+
+#MasterHeadphoneMixer WLabel,
+#FxKnobLabel,
+#FxButtonLabel {
+  padding: 0px;
+  background-color: #101010;
+  }
+  #FxKnobLabel,
+  #FxButtonLabel {
+    qproperty-alignment: 'AlignLeft | AlignVCenter';
+    }
+/************** Label styles **************************************************/
+
+
+
+/************** Decks *********************************************************/
+#RateContainer {
+  padding: 4px 1px 1px 4px;
+  margin: 0px;
+  }
+  #RateControls {
+    margin: 0px;
+  }
+
+#DeckRow_1_KeyVinylFx {
+  padding: 2px 1px 1px 2px;
+  margin: 0px;
+  }
+  #KeyText {
+    border-left: 0px;
+    margin: 0px 0px 1px 0px;
+  }
+
+#DeckRows234 {
+  }
+  #BigSpinnyCoverContainer {
+    margin: 0px;
+  }
+  #DeckRow_2_3_ArtistTitleTime {
+    margin: 0px;
+    padding: 0px;
+    }
+    #TitleRow {
+      border-width: 0px;
+      margin: 3px 2px;
+    }
+    #ArtistRow {
+      border-width: 0px;
+      margin: 3px 2px 2px 2px;
+    }
+
+  #DeckRow_4_OverviewSpinny {
+    padding: 0px;
+    margin: 0px;
+    }
+    #DeckRow_4_OverviewSpinny #OverviewBox {
+      margin: 0px;
+    }
+    #DeckControlsStars {
+      border-width: 1px;
+    }
+    #SmallSpinnyCoverContainer {
+      margin: 0px;
+    }
+
+  #DeckRow_5_LoopCuesTransport {
+    padding: 2px 1px 1px 2px;
+  }
+
+  #MiniDeckSpinnyCoverContainer {
+    margin: 0px 2px 0px 0px;
+  }
+  #TitleTextSmall,
+  #ArtistTextSmall,
+  #PlayPositionTextSmall,
+  #BpmTextSmall,
+  #KeyTextSmall,
+  #PlayContainerSmall {
+    border-width: 0px;
+  }
+
+#PreviewDeck {
+  margin: 0px 0px 4px 2px;
+}
+/************** Decks *********************************************************/
+
+
+
+/************** Mixer *********************************************************/
+#MixerContainer {
+  background-color: transparent;
+  border: 0px;
+  margin: 0px 2px 4px 2px;
+  }
+
+#MixerDecks {
+  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
+  padding: 4px 4px 1px 5px;
+    }
+  #CrossfaderButtonContainerDeck,
+  #CrossfaderButtonContainerAux,
+  #CrossfaderButton[value="0"] {
+    background-color: #020201;
+  }
+  #CrossfaderButtonContainerDeck {
+    border-bottom: 1px solid #333;
+    border-right: 1px solid #333;
+    }
+  #CrossfaderButtonContainerAux {
+    border-right: 1px solid #333;
+    }
+  #CrossfaderButton[value="1"] {
+    background-color: #151514;
+    }
+  #EQKillButton[displayValue="0"] {
+    color: #aaa;
+  }
+
+#MasterHeadphoneMixerContainer {
+  padding: 0px;
+  margin: 0px;
+  }
+  #MasterHeadphoneSeparator {
+    /* defines the height of the separator gap */
+    padding-top: 0px;
+  }
+/************** Mixer *********************************************************/
+
+
+
+/************** Effects ******************************************************/
+#FxUnit1, #FxUnit2,
+#FxUnit3, #FxUnit4,
+#FxSlotContainer {
+  border: 0px;
+  background-color: transparent;
+  padding: 0px;
+  }
+  #FxUnitControlsCollapsed {
+    padding: 3px 2px 3px 3px;
+  }
+  #FxUnitControlsExpanded {
+    padding: 2px 1px 2px 2px;
+  }
+  #FxSlotsCollapsed,
+  #FxSlotsExpanded {
+    padding: 2px 0px;
+    }
+    #FxSlotsCollapsed #FxSlotContainer {
+      margin: 0px;
+      padding: 0px;
+      }
+      #FxSlotsCollapsed #FxSlot1,
+      #FxSlotsCollapsed #FxSlot2,
+      #FxSlotsCollapsed #FxSlot3 {
+        padding: 1px 4px 1px 6px;
+      }
+    #FxSlotsExpanded #FxSlotContainer {
+      margin: 0px;
+      padding: 0px;
+      }
+      #FxSlotsExpanded #FxSlot1,
+      #FxSlotsExpanded #FxSlot2,
+      #FxSlotsExpanded #FxSlot3 {
+        padding: 3px 5px 0px 5px;
+      }
+    #FxSlotsCollapsed #FxSlotBorder3 {
+      border-top-right-radius: 0px;
+      border-bottom-right-radius: 0px;
+    }
+    #FxSlotsExpanded #FxSlotBorder1 {
+      border-top-right-radius: 0px;
+    }
+    #FxSlotsExpanded #FxSlotBorder3 {
+      border-bottom-right-radius: 0px;
+    }
+    #FxSlotBorder1[highlight="1"],
+    #FxSlotBorder2[highlight="1"],
+    #FxSlotBorder3[highlight="1"] {
+      border: 1px solid #00ffff;
+      background-color: rgba(0,0,0,180);
+    }
+
+#FxMetaKnob {
+  qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
+  padding: 3px 4px 2px 4px;
+}
+
+WEffectSelector {
+  border-width: 2px 2px 2px 2px;
+  border-image: url(skin:buttons_classic/btn_embedded_library.svg) 2 2 2 2;
+}
+
+/************** Effects ******************************************************/
+
+
+
+/************** Samplers ******************************************************/
+#SamplerRow {
+  margin: 0px 3px 5px 2px;
+}
+
+#SamplerDeck {
+  padding: 1px 0px 1px 2px;
+}
+
+#SamplerDeckMini {
+  padding: 1px 0px 0px 1px;
+}
+
+#SamplerExpandButtonBox {
+  padding: 1px 0px 1px 1px;
+  }
+
+#SamplerText, #SamplerPlay, #SamplerGain,
+#SamplerRowTwo, #SamplerButtonGrid,
+#SamplerVU, #SamplerPfl {
+  background-color: transparent;
+  border: 0px;
+}
+#SamplerButtonGrid {
+  padding: 1px 0px 1px 1px;
+}
+#SamplerHotcues {
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+}
+#SamplerPfl {
+  padding: 0px 5px 0px 0px;
+}
+#SamplerRateControls {
+  padding: 0px;
+  }
+  #SamplerPitchSlider {
+    padding: 0px 0px 1px 0px;
+    qproperty-layoutAlignment: 'AlignRight | AlignBottom';
+  }
+
+/************** Samplers ******************************************************/
+
+
+
+/************** Mic Aux *******************************************************/
+/* remove 3D styles from those containers */
+#MicAuxRack, #MicRack, #AuxRack,
+#MicAuxMainControls, #MicAuxSubControls {
+  border: 0px;
+  background-color: transparent;
+  }
+#MicAuxRack, #MicRack, #AuxRack {
+  padding: 0px;
+  margin-top: 0px;
+  qproperty-layoutSpacing: 0px;
+}
+
+  #MicAuxPlayButtonBox {
+    margin: 0px 1px 1px 1px;
+  }
+
+  #MicAuxSubControlsFrame {
+    margin: 2px 0px;
+    border-width: 1px 0px 1px 1px;
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+    }
+    #MicAuxSubControls {
+      padding: 1px 1px 0px 1px;
+      }
+
+#MicDuckingContainer {
+  qproperty-layoutAlignment: 'AlignCenter | AlignTop';
+  padding: 2px 1px 0px 2px;
+  margin-left: 3px;
+  }
+
+/************** Mic Aux *******************************************************/
+
+
+
+/************** Library *******************************************************/
+#LibraryContainer {
+  /* make a smooth transition from toolbar at the bottom to
+    darker skin background at the top.
+    Splitter handles should be translucent for this to work. */
+  background-color: qlineargradient(
+    x1:0, y1:0, x2:0, y2:1,
+    stop:0 #1e1e1d,
+    stop:1 #0f0f0e);
+}
+
+WLibrary,
+#SidebarBox {
+  padding: 2px 2px 0px 2px;
+  border-bottom: 0px;
+  border-left: 1px solid qlineargradient(
+    x1:0, y1:0, x2:0, y2:1,
+    stop:0 #222,
+    stop:1 #0f0f0e);
+  border-right: 1px solid qlineargradient(
+    x1:0, y1:0, x2:0, y2:1,
+    stop:0 #0a0a0a,
+    stop:1 #0f0f0e);
+  border-bottom-right-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+
+QTreeView, QTextBrowser, QTableView,
+WSearchLineEdit, WSearchLineEdit:focus {
+  border-top: 1px solid #000;
+  border-right: 1px solid #222;
+  border-bottom: 1px solid #222;
+  border-left: 1px solid #000;
+  background-color: #050504;
+  alternate-background-color: #0f0f0e;
+  selection-background-color: #5e4507;
+}
+
+/* Flat, dark table headers with dimmed text */
+QHeaderView,
+QHeaderView::section,
+QHeaderView::up-arrow,
+QHeaderView::down-arrow {
+  background-color: #0f0f0e;
+  color: #999;
+}
+
+QTableView:focus,
+QTreeView:focus,
+WSearchLineEdit:focus {
+  border-color: #00ffff;
+}
+
+QHeaderView::up-arrow,
+QHeaderView::down-arrow {
+  width: 13px;
+}
+QHeaderView::up-arrow {
+  image: url(skin:/buttons_classic/btn__lib_sort_up.svg);
+  }
+QHeaderView::down-arrow {
+  image: url(skin:/buttons_classic/btn__lib_sort_down.svg);
+}
+
+WLibrary QRadioButton::indicator:checked {
+  background: url(skin:/buttons_classic/btn__lib_radio_button_on_gold.svg) center center;
+}
+
+
+/************** Library *******************************************************/
diff --git a/res/skins/LateNight/style_flip/background_border.svg b/res/skins/LateNight/style_flip/background_border.svg
new file mode 100644
index 000000000000..919326852268
--- /dev/null
+++ b/res/skins/LateNight/style_flip/background_border.svg
@@ -0,0 +1,12 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g>
+		<rect width="26" height="26" fill="#1e1e1d" style="paint-order:fill markers stroke"/>
+		<path d="M 0,0 0.05508475,25.972358 1,26 1.4121094,24.587891 C 1.1557815,24.331563 1,23.974688 1,23.576172 V 2.4238281 C 1,1.6267949 1.6267949,1 2.4238281,1 H 23.576172 c 0.398516,0 0.755391,0.1557815 1.011719,0.4121094 L 26,0 h -2.423828 z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#2a2a28" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<rect x="1.412109" y="1.412109" width="23.175781" height="23.175781" fill="#0f0f0e" style="paint-order:fill markers stroke"/>
+	</g>
+	<g shape-rendering="auto">
+		<path d="m2.4003906 1c-.7669513 0-1.4003906.6334393-1.4003906 1.4003906v21.1992184c0 .383476.1578806.734053.4121094.988282l.7011718-.701172c-.0713165-.071317-.1132812-.171985-.1132812-.28711v-21.1992184c0-.2302486.170142-.4003906.4003906-.4003906h21.1992184c.115125 0 .215793.0419647.28711.1132812l.701172-.7011718c-.254229-.2542288-.604806-.4121094-.988282-.4121094h-21.1992184z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#444442" image-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<path d="m23.599609 25c.766952 0 1.400391-.633439 1.400391-1.400391v-21.199218c0-.383476-.157881-.734053-.412109-.988282l-.701172.701172c.07132.071317.113281.171985.113281.28711v21.199218c0 .230249-.170142.400391-.400391.400391h-21.1992178c-.115125 0-.215793-.04196-.28711-.113281l-.701172.701172c.254229.254228.604806.412109.988282.412109z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#010100" image-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<path d="m26 26v-26l-1.412109 1.412109c.256328.256328.412109.613203.412109 1.011719v21.152344c0 .797033-.626795 1.423828-1.423828 1.423828h-21.1523438c-.398516 0-.755391-.155781-1.011719-.412109l-.4121092 1.412109z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#0e0e0c" image-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_flip/batt/ic_battery_charged.svg b/res/skins/LateNight/style_flip/batt/ic_battery_charged.svg
new file mode 100644
index 000000000000..1ae4d399600e
--- /dev/null
+++ b/res/skins/LateNight/style_flip/batt/ic_battery_charged.svg
@@ -0,0 +1,3 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<path d="m4.0001 27.9999h4v3.332c0 1.4791 1.1882 2.668 2.668 2.668h30.662c1.47 0 2.6699-1.1887 2.6699-2.668v-14.664c0-1.4693-1.1899-2.668-2.6699-2.668h-2.3301v.002l-28.332-.002c-1.4798.01-2.6677 1.1986-2.668 2.6777v3.3223h-4zm10-6h11v-4l15 8h-11v4z" fill="#b4b4b4"/>
+</svg>
diff --git a/res/skins/LateNight/style_flip/batt/ic_battery_charging_0.svg b/res/skins/LateNight/style_flip/batt/ic_battery_charging_0.svg
new file mode 100644
index 000000000000..a3614955513a
--- /dev/null
+++ b/res/skins/LateNight/style_flip/batt/ic_battery_charging_0.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24,24)">
+		<path d="m22.236 39.557-.23633.44336v-.44336h-8v1.7734c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-1.7734h-.002z" fill="#f00"/>
+		<path d="m20 4v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v28.889h8v-10.557h-4l8-15v11h4l-7.7637 14.557h11.762l.002-28.889c-.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_flip/batt/ic_battery_charging_1.svg b/res/skins/LateNight/style_flip/batt/ic_battery_charging_1.svg
new file mode 100644
index 000000000000..50830d115f36
--- /dev/null
+++ b/res/skins/LateNight/style_flip/batt/ic_battery_charging_1.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24,24)">
+		<path d="m22 35.111h-8v6.2188c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-6.2188h-9.3926l-2.6074 4.8887z" fill="#ff5c00"/>
+		<path d="m20 4v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v24.443h8v-6.1113h-4l8-15v11h4l-5.3926 10.111h9.3906l.002-24.443c-.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_flip/batt/ic_battery_charging_2.svg b/res/skins/LateNight/style_flip/batt/ic_battery_charging_2.svg
new file mode 100644
index 000000000000..18fee209f34d
--- /dev/null
+++ b/res/skins/LateNight/style_flip/batt/ic_battery_charging_2.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24.00005,24)">
+		<path d="m22 30.668h-8v10.662c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-10.662h-7.0235l-4.9765 9.332z" fill="#ffb108"/>
+		<path d="m20 4v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v20h8v-1.668h-4l8-15v11h4l-3.0234 5.668h7.0215l.002-20c-.010047-1.4798-1.1987-2.6677-2.6778-2.668h-3.3223v-4z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_flip/batt/ic_battery_charging_3.svg b/res/skins/LateNight/style_flip/batt/ic_battery_charging_3.svg
new file mode 100644
index 000000000000..bb4d8fbb5e38
--- /dev/null
+++ b/res/skins/LateNight/style_flip/batt/ic_battery_charging_3.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24,24)">
+		<path d="m19.48 26.223h-5.4805v15.107c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-15.107h-4.6524l-7.3476 13.777v-11h-4z" fill="#b4b4b4"/>
+		<path d="m20 4v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v15.555h5.4805l6.5195-12.223v11h4l-.65234 1.2227h4.6504l.002-15.555c-.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_flip/batt/ic_battery_charging_4.svg b/res/skins/LateNight/style_flip/batt/ic_battery_charging_4.svg
new file mode 100644
index 000000000000..e99b266351cb
--- /dev/null
+++ b/res/skins/LateNight/style_flip/batt/ic_battery_charging_4.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24.0002,24)">
+		<path d="m21.852 21.777h-7.8516v19.553c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-19.553h-8v3.2227h4l-8 15v-11h-4z" fill="#b4b4b4"/>
+		<path d="m20 4v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v11.109h7.8516l4.1484-7.7773v7.7773h7.998l.002-11.109c-.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_flip/batt/ic_battery_charging_5.svg b/res/skins/LateNight/style_flip/batt/ic_battery_charging_5.svg
new file mode 100644
index 000000000000..b92c064bfb1d
--- /dev/null
+++ b/res/skins/LateNight/style_flip/batt/ic_battery_charging_5.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24.00015,24)">
+		<path d="m24.223 17.334h-10.223v23.996c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-23.996h-8v7.666h4l-8 15v-11h-4z" fill="#b4b4b4"/>
+		<path d="m20 4v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v6.666h10.223l1.7773-3.334v3.334h7.998l.002-6.666c-.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_flip/batt/ic_battery_charging_6.svg b/res/skins/LateNight/style_flip/batt/ic_battery_charging_6.svg
new file mode 100644
index 000000000000..5bfd6f0080db
--- /dev/null
+++ b/res/skins/LateNight/style_flip/batt/ic_battery_charging_6.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24,24)">
+		<path d="m14 12.889v28.441c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-28.441h-.002zm12 1.1113v11h4l-8 15v-11h-4z" fill="#b4b4b4"/>
+		<path d="m33.999 12.889.001-2.221c-.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v2.221z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_flip/batt/ic_battery_charging_7.svg b/res/skins/LateNight/style_flip/batt/ic_battery_charging_7.svg
new file mode 100644
index 000000000000..87c47e72bd69
--- /dev/null
+++ b/res/skins/LateNight/style_flip/batt/ic_battery_charging_7.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24,24)">
+		<path d="m16.668 8c-1.4791 0-2.668 1.1882-2.668 2.668v30.662c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-29.33h-.002l.002-1.332c-.01-1.4798-1.1986-2.6677-2.6777-2.668h-11.322zm9.332 6v11h4l-8 15v-11h-4z" fill="#b4b4b4"/>
+		<path d="m20 4v4h8v-4z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_flip/batt/ic_battery_discharging_0.svg b/res/skins/LateNight/style_flip/batt/ic_battery_discharging_0.svg
new file mode 100644
index 000000000000..28e29535c673
--- /dev/null
+++ b/res/skins/LateNight/style_flip/batt/ic_battery_discharging_0.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24,24)">
+		<path d="m14 39.556v1.7741c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-1.7741h-.002.001z" fill="#f00"/>
+		<path d="m33.999 39.556.001-28.888c-.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v28.888z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_flip/batt/ic_battery_discharging_1.svg b/res/skins/LateNight/style_flip/batt/ic_battery_discharging_1.svg
new file mode 100644
index 000000000000..c5989b75a357
--- /dev/null
+++ b/res/skins/LateNight/style_flip/batt/ic_battery_discharging_1.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24,24)">
+		<path d="m14 35.112v6.2181c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-6.2181h-.002.001z" fill="#ff5c00"/>
+		<path d="m33.999 35.112.001-24.444c-.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v24.444z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_flip/batt/ic_battery_discharging_2.svg b/res/skins/LateNight/style_flip/batt/ic_battery_discharging_2.svg
new file mode 100644
index 000000000000..22f78b69e965
--- /dev/null
+++ b/res/skins/LateNight/style_flip/batt/ic_battery_discharging_2.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24,23.99995)">
+		<path d="m14 30.667v10.663c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-10.663h-.002.001z" fill="#ffb108"/>
+		<path d="m33.999 30.667.001-19.999c-.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v19.999z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_flip/batt/ic_battery_discharging_3.svg b/res/skins/LateNight/style_flip/batt/ic_battery_discharging_3.svg
new file mode 100644
index 000000000000..150c1fb9bb21
--- /dev/null
+++ b/res/skins/LateNight/style_flip/batt/ic_battery_discharging_3.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24,23.99995)">
+		<path d="m14 26.223v15.107c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-15.107h-.002.001z" fill="#b4b4b4"/>
+		<path d="m33.999 26.223.001-15.555c-.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v15.555z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_flip/batt/ic_battery_discharging_4.svg b/res/skins/LateNight/style_flip/batt/ic_battery_discharging_4.svg
new file mode 100644
index 000000000000..f4745d4bec19
--- /dev/null
+++ b/res/skins/LateNight/style_flip/batt/ic_battery_discharging_4.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24,23.99995)">
+		<path d="m14 21.778v19.552c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-19.552h-.002.001z" fill="#b4b4b4"/>
+		<path d="m33.999 21.778.001-11.11c-.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v11.11z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_flip/batt/ic_battery_discharging_5.svg b/res/skins/LateNight/style_flip/batt/ic_battery_discharging_5.svg
new file mode 100644
index 000000000000..b477bee1df85
--- /dev/null
+++ b/res/skins/LateNight/style_flip/batt/ic_battery_discharging_5.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24,23.99995)">
+		<path d="m14 17.334v23.996c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-23.996h-.002.001z" fill="#b4b4b4"/>
+		<path d="m33.999 17.334.001-6.666c-.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v6.666z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_flip/batt/ic_battery_discharging_6.svg b/res/skins/LateNight/style_flip/batt/ic_battery_discharging_6.svg
new file mode 100644
index 000000000000..5ac8e715efbd
--- /dev/null
+++ b/res/skins/LateNight/style_flip/batt/ic_battery_discharging_6.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24,23.99995)">
+		<path d="m14 12.889v28.441c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-28.441h-.002.001z" fill="#b4b4b4"/>
+		<path d="m33.999 12.889.001-2.221c-.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223v-4h-8v4h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v2.221z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_flip/batt/ic_battery_discharging_7.svg b/res/skins/LateNight/style_flip/batt/ic_battery_discharging_7.svg
new file mode 100644
index 000000000000..2505b6edbe48
--- /dev/null
+++ b/res/skins/LateNight/style_flip/batt/ic_battery_discharging_7.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24,23.99995)">
+		<path d="m20 8h-3.332c-1.4791 0-2.668 1.1882-2.668 2.668v30.662c0 1.47 1.1887 2.6699 2.668 2.6699h14.664c1.4693 0 2.668-1.1899 2.668-2.6699v-29.33h-.002l.002-1.332c-.01-1.4798-1.1986-2.6677-2.6777-2.668h-3.3223z" fill="#b4b4b4"/>
+		<path d="m20 4v4h8v-4z" fill="#5f5f5f"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_flip/batt/ic_battery_unknown.svg b/res/skins/LateNight/style_flip/batt/ic_battery_unknown.svg
new file mode 100644
index 000000000000..6e2b6684edc1
--- /dev/null
+++ b/res/skins/LateNight/style_flip/batt/ic_battery_unknown.svg
@@ -0,0 +1,6 @@
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+	<g transform="rotate(-90,24,24)">
+		<path d="m31.33 8h-3.33v-4h-8v4h-3.33c-1.48 0-2.67 1.18-2.67 2.66v30.67c0 1.47 1.19 2.67 2.67 2.67h14.67c1.47 0 2.66-1.19 2.66-2.67v-30.67c-.01-1.48-1.19-2.6556-2.67-2.66z" fill="#5f5f5f"/>
+		<path d="m24.483051 29.838305s-.711864-.644068-1.20339-1.135593c-.822034-.822034-1.940678-1.40678-2.711864-1.40678v-2.711864c1.406779 0 2.584745.779661 3.381356 1.576271l1.601695 1.576271c.457627.457627 1.09322.745763 1.79661.745763 1.406779 0 2.542373-1.135593 2.542373-2.542373s-1.135594-2.542373-2.542373-2.542373v-2.542373c2.805085 0 5.084746 2.279661 5.084746 5.084746s-2.279661 5.084746-5.084746 5.084746c-1.118644 0-2.135593-.449153-2.864407-1.186441zm-8.915254-2.288135v-3.220339h3.220339v3.220339z" fill="#b4b4b4" stroke-width=".99999994"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_flip/btn__fx_focus_off.svg b/res/skins/LateNight/style_flip/btn__fx_focus_off.svg
new file mode 100644
index 000000000000..63a3e089bd98
--- /dev/null
+++ b/res/skins/LateNight/style_flip/btn__fx_focus_off.svg
@@ -0,0 +1,108 @@
+<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="b">
+			<stop offset="0"/>
+			<stop stop-color="#5a5a5a" offset=".42617449"/>
+			<stop stop-color="#979797" offset="1"/>
+		</linearGradient>
+		<linearGradient id="c" x1="256.73999" x2="484.70999" y1="472.03" y2="472.03" gradientTransform="matrix(-.02689375 -.08131675 .08068125 -.02710559 -17.729844 51.688341)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#060606" offset="0"/>
+			<stop stop-color="#343434" offset="1"/>
+		</linearGradient>
+		<linearGradient id="f" x1=".48967797" x2="19.539619" y1="10.011954" y2="10.011954" gradientTransform="rotate(180 -9.985347 10.011957)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="u" x1="3.5003572" x2="3.5003572" y1="21.247955" y2="-.1809755" gradientTransform="matrix(.91881554 0 0 .91881554 .81288587 -39.139006)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="t" x1=".49674207" x2="19.53257" y1="10.011954" y2="10.011954" gradientTransform="rotate(-90,-9.985344,30.011954)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="e" x1="-5.2630553" x2="19.539619" y1="10.011954" y2="10.011954" gradientTransform="rotate(-90,-9.985345,30.011959)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="d" x1="27.888315" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="q" x1="27.888315" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(1.2970097,0,0,1.29701,-13.068549,-2.9736993)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="o" x1="27.888315" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(.64280627 0 0 .64280627 12.758843 3.576266)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="n" x1="27.888315" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(.59226271 0 0 .59226271 21.332937 4.0823143)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="m" x1="27.888315" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(.58022484 0 0 .58022484 18.470278 7.6543595)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="l" x1="27.888315" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(.61994903 0 0 .61994903 16.722411 .60838196)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="p" x1="27.888315" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(0,-1.2063935,1.206393,0,21.68668,73.693886)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="k" x1="4.4978113" x2="15.295909" y1="-43.891712" y2="-43.891712" gradientTransform="matrix(.88673909 0 0 .88673855 -2.3793616 29.936364)" gradientUnits="userSpaceOnUse" xlink:href="#c"/>
+		<linearGradient id="h" x1="-25.224104" x2="-40.264385" y1="-31.891275" y2="-47.270847" gradientTransform="matrix(1.2055543,0,0,1.2055543,29.452607,50.506638)" gradientUnits="userSpaceOnUse">
+			<stop offset="0"/>
+			<stop stop-color="#5a5a5a" offset=".35063794"/>
+			<stop stop-color="#979797" offset="1"/>
+		</linearGradient>
+		<linearGradient id="j" x1="4.4978113" x2="15.295909" y1="-43.891712" y2="-43.891712" gradientTransform="matrix(.58275237 0 0 .582752 -15.767419 16.224989)" gradientUnits="userSpaceOnUse" xlink:href="#c"/>
+		<linearGradient id="s" x1="7.2461166" x2="16.411036" y1="-6.8960171" y2="2.2689023" gradientTransform="translate(-64.169491,16.277727)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#979797" offset="0"/>
+			<stop stop-color="#5a5a5a" offset=".70143074"/>
+			<stop offset="1"/>
+		</linearGradient>
+		<linearGradient id="i" x1="4.4978113" x2="15.295909" y1="-43.891712" y2="-43.891712" gradientTransform="matrix(.79585423 0 0 .79585374 15.989498 -11.953486)" gradientUnits="userSpaceOnUse" xlink:href="#c"/>
+		<linearGradient id="g" x1="-25.224104" x2="-40.264385" y1="-31.891275" y2="-47.270847" gradientTransform="matrix(1.2829802,0,0,1.2829802,-7.1099335,68.080049)" gradientUnits="userSpaceOnUse">
+			<stop offset="0"/>
+			<stop stop-color="#5a5a5a" offset=".80397099"/>
+			<stop stop-color="#979797" offset="1"/>
+		</linearGradient>
+		<linearGradient id="r" x1="23.589788" x2="-8.4102125" y1="11.769581" y2="11.769581" gradientTransform="translate(0 -.3593684)" gradientUnits="userSpaceOnUse">
+			<stop offset="0"/>
+			<stop stop-color="#5a5a5a" offset=".56143475"/>
+			<stop stop-color="#979797" offset="1"/>
+		</linearGradient>
+	</defs>
+	<g transform="matrix(0 -.96110921 .96110921 0 40.488037 52.184731)" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5999999">
+		<ellipse cx="44.000408" cy="10.012118" rx="4.9541779" ry="4.9541545" style="paint-order:fill markers stroke"/>
+		<path d="m35.257812 10.012119h3.204309"/>
+		<path d="m49.440445 10.012119h3.085171"/>
+		<path d="m44.000407 15.136171v3.379592"/>
+		<path d="m44.000441 1.2779594v3.2730534"/>
+	</g>
+	<path d="m-29.957024 19.529774a1.0000999 1.0000999 0 0 0 .986328-1.013672v-1.390625c3.161365-.444254 5.669029-2.951923 6.113282-6.113281h1.382812a1.0000999 1.0000999 0 1 0 0-2.0000005h-1.382812c-.444253-3.161612-2.951917-5.670726-6.113282-6.115234v-1.388672a1.0000999 1.0000999 0 1 0-1.999999 0v1.388672c-3.161618.444508-5.670728 2.953622-6.115234 6.115234h-1.410157a1.0000999 1.0000999 0 1 0 0 2.0000005h1.410157c.444506 3.161358 2.953616 5.669027 6.115234 6.113281v1.390625a1.0000999 1.0000999 0 0 0 1.013671 1.013672zm.986328-4.423828v-.826172a1.0000999 1.0000999 0 1 0-2 0v.826172c-2.073069-.400054-3.69467-2.021248-4.095703-4.09375h.806642a1.0000999 1.0000999 0 1 0 0-2.0000005h-.806642c.400472-2.073628 2.022065-3.695227 4.095703-4.095703v.828125a1.0000999 1.0000999 0 0 0 1.015625 1.013672 1.0000999 1.0000999 0 0 0 .984375-1.013672v-.828125c2.073326.400476 3.69359 2.022075 4.09375 4.095703h-.833984a1.0000999 1.0000999 0 1 0 0 2.0000005h.833984c-.40072 2.072502-2.020992 3.693696-4.09375 4.09375z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#f)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stroke="url(#t)" stroke-linecap="round" stroke-linejoin="round" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<path d="m9.993863-39.160541c-.0018.000587-.00359.0012-.00538.0018-.045544.0012-.091198.005-.1363867.01077-.7017999.08221-1.2356883.689211-1.2256856 1.396169-6.92e-5.01099-.0001799.02131 0 .0323v.92061c-2.7677663.564383-4.920142 2.718018-5.4841845 5.485975h-.934966c-.7744815-.01058-1.41752.632454-1.40693626 1.406936.00058714.0018.001185.0036.001795.0054.001176.04219.007548.08374.0125619.125619-.006995.05988-.0148499.119118-.0143565.179456-4.57e-6.0012-4.57e-6.0024 0 .0036.001186.0736.0164269.146474.028713.218936-.0128473.0795-.0292109.159786-.028713.240471-4.57e-6.0012-4.57e-6.0024 0 .0036.0103668.769451.63788226 1.410648 1.40693626 1.399758h.929583c.5584729 2.862781 2.7105652 5.100592 5.4895638 5.685171v.974447c-.00594.435147.1638763.823077.4324895 1.073148.268613.250071.6146665.367885.9547061.367885.34004 0 .686094-.117814.954707-.367885.268614-.250071.438425-.638001.43249-1.073148v-.389419l-.0018.01615c.0011-.03262.0011-.06608 0-.0987l.0018.01615v-.518628c.454729-.09564.892654-.235552 1.30955-.415222 2.131013-.918403 3.712537-2.875685 4.180013-5.269949h.929584c.908877.01329 1.578979-.876139 1.365661-1.760465v.218936c.03453-.143463.02608-.291201.01615-.437873.131792-.838347-.530249-1.616673-1.381811-1.604374h-.933173c-.564368-2.768039-2.71794-4.921609-5.485974-5.485975v-.927788l-.0018.01436c.0013-.04496.001-.08971-.0018-.134593-.03364-.634793-.499097-1.169427-1.123396-1.288495h-.0018c-.09145-.01762-.184998-.02659-.278141-.02512zm-1.367456 5.900518v.02153c-.00594.435147.1638763.823077.4324895 1.073148.268613.250071.6146665.367885.9547065.367885s.686094-.117814.954707-.367885c.268614-.250071.438425-.638001.43249-1.073148v-.02153c1.006017.369173 1.801928 1.077731 2.304216 2.044006-.649286.120748-1.180732.628205-1.170054 1.311824.000602.0018.0012.0036.0018.0054.0012.04219.0075.08374.01256.125619-.007.05988-.01485.119118-.01436.179457-1.1e-5.0018-1.1e-5.0036 0 .0054.0013.07261.01659.143852.02871.215347-.01297.08029-.02936.160792-.02871.242266-5e-6.0012-5e-6.0024 0 .0036.01002.65524.505786 1.133249 1.116217 1.277728-.505082.883797-1.276444 1.53498-2.250379 1.878906v-.0341c.0061-.428055-.168013-.810891-.437874-1.053407-.269861-.242518-.613035-.353529-.949323-.353529-.3362889 0-.6794622.111011-.9493231.353529-.269861.242516-.4439223.625352-.4378731 1.053407v.03231c-.9794977-.346706-1.7557454-1.00253-2.2593527-1.895105.7307228-.176279 1.2700296-.850734 1.0839152-1.622284v.218936c.034525-.143462.02608-.291201.016151-.437872.1172839-.746029-.4329732-1.361039-1.1485195-1.496665.5010574-.971612 1.2989038-1.683941 2.3078062-2.054773z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#u)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<g transform="translate(-39.95,-4.0829584)">
+		<g transform="matrix(.76872597 .34140352 -.34140352 .76872597 1.504911 -10.097772)">
+			<g transform="matrix(.10676 0 0 .10676 -19.071124 -31.786292)" opacity=".49300005">
+				<path d="m270.69379 536.40673c20.01433 60.04489 85.31772 92.31846 145.17067 71.75942 60.21816-19.46338 93.09981-84.46428 73.08548-144.50917-78.29686-151.10046-253.52045-44.94758-218.25615 72.74975z" color="#000000" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" opacity="1" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+			</g>
+			<g transform="matrix(.10746967 0 0 .10746967 -20.137858 -33.659792)" fill="#050505" opacity=".93999999">
+				<path d="m270.69379 536.40673c20.01433 60.04489 85.31772 92.31846 145.17067 71.75942 60.21816-19.46338 93.09981-84.46428 73.08548-144.50917-20.01433-60.04488-85.31957-92.31785-145.17252-71.7588-60.21816 19.46339-93.09796 84.46366-73.08363 144.50855z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#050505" image-rendering="auto" opacity="1" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+			</g>
+		</g>
+		<path d="m11.186356 1.2636715c-1.3020582-.0916159-2.6422052.0771242-3.9531254.5351562-5.2875947 1.7077135-8.17857564 7.4460999-6.42382826 12.7519533 1.75509276 5.306898 7.49078446 8.151822 12.73828166 6.31836 5.287593-1.707715 8.176622-7.446101 6.421875-12.7519539-1.316639-3.9811374-4.873239-6.5784013-8.783203-6.8535156z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#404040" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<path d="m7.4081644 2.98355a9.1929467 9.2653595 0 1 1 5.8135456 17.578491 9.1929467 9.2653595 0 1 1-5.8135456-17.578491z" fill="url(#c)"/>
+	</g>
+	<g transform="matrix(0 -.96110921 .96110921 0 40.488037 52.184731)" fill="none" stroke="url(#d)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5">
+		<ellipse cx="44.000408" cy="10.012118" rx="4.9541779" ry="4.9541545" style="paint-order:fill markers stroke"/>
+		<path d="m35.257812 10.012119h3.204309"/>
+		<path d="m49.440445 10.012119h3.085171"/>
+		<path d="m44.000407 15.136171v3.379592"/>
+		<path d="m44.000441 1.2779594v3.2730534"/>
+	</g>
+	<path d="m-39.503165 10.040285a1.0000999 1.0000999 0 0 0 1.013672.986328h1.390625c.444254 3.161365 2.951923 5.669029 6.113282 6.113282v1.382812a1.0000999 1.0000999 0 1 0 2 0v-1.382812c3.161612-.444253 5.670726-2.951917 6.115234-6.113282h1.388672a1.0000999 1.0000999 0 1 0 0-1.9999998h-1.388672c-.444508-3.161618-2.953622-5.670728-6.115234-6.115234v-1.410157a1.0000999 1.0000999 0 1 0-2 0v1.410157c-3.161359.444506-5.669028 2.953616-6.113282 6.115234h-1.390625a1.0000999 1.0000999 0 0 0-1.013672 1.0136718zm4.423829.986328h.826171a1.0000999 1.0000999 0 1 0 0-1.9999998h-.826171c.400054-2.07307 2.021247-3.694671 4.09375-4.095703v.806641a1.0000999 1.0000999 0 1 0 2 0v-.806641c2.073628.400472 3.695227 2.022065 4.095703 4.095703h-.828125a1.0000999 1.0000999 0 0 0-1.013672 1.0156248 1.0000999 1.0000999 0 0 0 1.013672.984375h.828125c-.400476 2.073326-2.022075 3.69359-4.095703 4.09375v-.833984a1.0000999 1.0000999 0 1 0-2 0v.833984c-2.072503-.40072-3.693696-2.020992-4.09375-4.09375z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#e)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<g fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.45999312">
+		<path d="m36.860985-1.404988v-3.07969"/>
+		<path d="m28.466504-9.807609h3.145762"/>
+		<path d="m36.860985-15.036047v-2.965186"/>
+		<path d="m41.785759-9.807576h3.248157"/>
+	</g>
+	<circle transform="rotate(-90)" cx="9.7031088" cy="36.75021" r="5.3990488" fill="#010101" style="paint-order:fill markers stroke"/>
+	<ellipse transform="rotate(-90)" cx="9.8075781" cy="36.860985" rx="6.1315255" ry="6.1314979" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.45999312" style="paint-order:fill markers stroke"/>
+	<g transform="matrix(0 -.96110921 .96110921 0 27.238246 32.48162)" fill="none" stroke="url(#d)" stroke-linecap="round" stroke-linejoin="round">
+		<g stroke-width="2.5">
+			<ellipse cx="44.000408" cy="10.012118" rx="6.4256167" ry="6.4255881" stroke="url(#q)" style="paint-order:fill markers stroke"/>
+			<path d="m35.422784 10.012119h2.059751" stroke="url(#o)"/>
+			<path d="m50.614669 10.012119h1.827231" stroke="url(#n)"/>
+		</g>
+		<path d="m44.000407 16.436742v1.960923" stroke="url(#m)" stroke-width="2.49999976"/>
+		<path d="m44.000441 1.4006518v2.0291263" stroke="url(#l)" stroke-width="2.5"/>
+	</g>
+	<ellipse transform="rotate(-90)" cx="-20.713182" cy="33.658024" rx="5.2250476" ry="5.2250443" fill="#0a0500" style="paint-order:fill markers stroke"/>
+	<path d="m33.765764 11.290637c-.973623 0-1.947129.650581-1.935543 1.952555v.504678c-2.377477.673804-4.254986 2.550543-4.929585 4.927698h-.661562c-1.091139-.01494-1.978962.874677-1.962005 1.965786.01648 1.067634.894345 1.919916 1.962005 1.905301h.661562c.674046 2.378165 2.551425 4.255544 4.929585 4.929588v.62943c-.02317 2.60395 3.894258 2.60395 3.871085 0v-.62943c2.377331-.674472 4.253816-2.552009 4.927695-4.929588h.451753c2.603976.0232 2.603976-3.894289 0-3.871087h-.451753c-.674433-2.376569-2.551048-4.253464-4.927695-4.927698v-.504678c.01159-1.301974-.96192-1.952555-1.935542-1.952555zm0 4.508078c2.672462 0 4.812394 2.141803 4.812394 4.814286 0 2.672484-2.139932 4.814288-4.812394 4.814288s-4.814284-2.141804-4.814284-4.814288c0-2.672483 2.141822-4.814286 4.814284-4.814286z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#p)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<g stroke="#000" stroke-linecap="round" stroke-linejoin="round">
+		<path d="m33.765764 11.290637c-.973623 0-1.947129.650581-1.935543 1.952555v.504678c-2.377477.673804-4.254986 2.550543-4.929585 4.927698h-.661562c-1.091139-.01494-1.978962.874677-1.962005 1.965786.01648 1.067634.894345 1.919916 1.962005 1.905301h.661562c.674046 2.378165 2.551425 4.255544 4.929585 4.929588v.62943c-.02317 2.60395 3.894258 2.60395 3.871085 0v-.62943c2.377331-.674472 4.253816-2.552009 4.927695-4.929588h.451753c2.603976.0232 2.603976-3.894289 0-3.871087h-.451753c-.674433-2.376569-2.551048-4.253464-4.927695-4.927698v-.504678c.01159-1.301974-.96192-1.952555-1.935542-1.952555zm0 4.508078c2.672462 0 4.812394 2.141803 4.812394 4.814286 0 2.672484-2.139932 4.814288-4.812394 4.814288s-4.814284-2.141804-4.814284-4.814288c0-2.672483 2.141822-4.814286 4.814284-4.814286z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="none" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stroke-width=".60299999" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<rect transform="rotate(45)" x="-17.354668" y="-4.649344" width="12.959709" height="12.959709" rx=".5" ry=".5" fill="url(#h)" stroke-width=".403" style="paint-order:fill markers stroke"/>
+		<ellipse transform="rotate(-90)" cx="6.3965731" cy="-8.9841108" rx="4.7875476" ry="4.7875447" fill="url(#k)" stroke-width=".40000001" style="paint-order:fill markers stroke"/>
+	</g>
+	<g transform="rotate(90,10,9.4102123)">
+		<path d="m2.4162076 4c-.7190868.0003459-1.168452.7786382-.8092295 1.4015709l7.5837925 13.1335761c.3598428.622625 1.2586164.622625 1.6184594 0l7.583792-13.1335761c.359223-.6229329-.09014-1.4012254-.80923-1.4015709z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="none" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width=".70300001" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<path d="m2.4162076 4c-.7190868.0003459-1.168452.7786382-.8092295 1.4015709l7.5837925 13.1335761c.3598428.622625 1.2586164.622625 1.6184594 0l7.583792-13.1335761c.359223-.6229329-.09014-1.4012254-.80923-1.4015709z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#r)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<ellipse transform="scale(-1)" cx="-10" cy="-9.3529949" rx="3.1463087" ry="3.1463065" fill="url(#j)" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width=".39999998" style="paint-order:fill markers stroke"/>
+	</g>
+	<rect transform="rotate(45)" x="-56.923374" y="9.3817101" width="13.792038" height="13.792038" rx="1" ry="1" fill="url(#g)" style="paint-order:fill markers stroke"/>
+	<ellipse transform="rotate(-90)" cx="23.865957" cy="-46.884872" rx="4.2968559" ry="4.2968531" fill="url(#i)" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width=".39999998" style="paint-order:fill markers stroke"/>
+	<rect transform="rotate(45)" x="-56.923374" y="9.3817101" width="13.792038" height="13.792038" rx="1" ry="1" fill="none" stroke="url(#s)" stroke-linecap="round" stroke-linejoin="round" stroke-width=".403" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/style_flip/btn__fx_focus_on.svg b/res/skins/LateNight/style_flip/btn__fx_focus_on.svg
new file mode 100644
index 000000000000..a409dff62d5f
--- /dev/null
+++ b/res/skins/LateNight/style_flip/btn__fx_focus_on.svg
@@ -0,0 +1,152 @@
+<svg width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="c" x1="256.73999" x2="484.70999" y1="472.03" y2="472.03" gradientTransform="matrix(-.02689375 -.08131675 .08068125 -.02710559 -17.729844 51.688341)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#f3870f" offset="0"/>
+			<stop stop-color="#f3e00c" offset="1"/>
+		</linearGradient>
+		<linearGradient id="a" x1="256.73999" x2="484.70999" y1="472.03" y2="472.03" gradientTransform="matrix(-.02689375 -.08131675 .08068125 -.02710559 -17.729844 51.688341)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#3f6405" offset="0"/>
+			<stop stop-color="#659f08" offset="1"/>
+		</linearGradient>
+		<linearGradient id="an" x1="256.73999" x2="484.70999" y1="472.03" y2="472.03" gradientTransform="matrix(.0213346 .06450796 -.06400382 .02150266 32.18486 -21.74836)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#060606" offset="0"/>
+			<stop stop-color="#343434" offset="1"/>
+		</linearGradient>
+		<linearGradient id="n" x1=".48967797" x2="19.539619" y1="10.011954" y2="10.011954" gradientTransform="rotate(-90 -23.029299 .0949595)" gradientUnits="userSpaceOnUse" xlink:href="#j"/>
+		<linearGradient id="j" x1="256.73999" x2="484.70999" y1="472.03" y2="472.03" gradientTransform="matrix(-.02689375 -.08131675 .08068125 -.02710559 -17.729844 51.688341)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#659f08" offset="0"/>
+			<stop stop-color="#3f6405" offset="1"/>
+		</linearGradient>
+		<linearGradient id="m" x1=".48967797" x2="19.539619" y1="10.011954" y2="10.011954" gradientTransform="rotate(-90,-14.0625,31.949219)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="k" x1="256.73999" x2="484.70999" y1="472.03" y2="472.03" gradientTransform="matrix(-.02689375 -.08131675 .08068125 -.02710559 -17.729844 51.688341)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#060606" offset="0"/>
+			<stop stop-color="#343434" offset="1"/>
+		</linearGradient>
+		<linearGradient id="am" x1="3.5003572" x2="3.5003572" y1="21.247955" y2="-.1809755" gradientTransform="matrix(.91881554 0 0 .91881554 -45.201528 -1.2788903)" gradientUnits="userSpaceOnUse" xlink:href="#k"/>
+		<linearGradient id="l" x1=".48967797" x2="19.539619" y1="10.011954" y2="10.011954" gradientTransform="rotate(-90,-23.0625,15.949219)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="al" x1="3.5003572" x2="3.5003572" y1="21.247955" y2="-.1809755" gradientTransform="matrix(.91881554 0 0 .91881554 -38.201528 -26.27889)" gradientUnits="userSpaceOnUse" xlink:href="#k"/>
+		<linearGradient id="ag" x1="2" x2="2" y1="2" y2="18" gradientTransform="translate(-44.126953,-47.5)" gradientUnits="userSpaceOnUse" xlink:href="#j"/>
+		<linearGradient id="ao" x1="33.990009" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="af" x1="33.990009" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="translate(0,-2)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="ae" x1="33.990009" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="translate(2)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="ad" x1="33.990009" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="translate(-2)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="ac" x1="33.990009" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="translate(0,2)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="ab" x1="33.990009" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(1.3910089,0,0,1.3910094,-17.204553,-3.9148319)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="d" x1="33.990009" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(0 -.94208876 .94206997 0 -21.323536 51.452305)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="g" x1="33.990009" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(0 -.94208876 .94206997 0 -21.432117 51.34989)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="aa" x1="33.990009" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(.94208876 0 0 .94206997 -51.45229 -21.432116)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="e" x1="33.990009" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(0 -.94208876 .94206997 0 -21.432118 51.34989)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="z" x1="33.990009" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(.62669224 0 0 .6266781 -37.574716 -18.274375)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="h" x1="33.990009" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="rotate(-90,7.9841315,-20.403278)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="f" x1="33.990009" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="rotate(-90,7.8721475,-20.400004)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="y" x1="33.990009" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="translate(12.419162,28.272153)" gradientUnits="userSpaceOnUse" xlink:href="#a"/>
+		<linearGradient id="b">
+			<stop offset="0"/>
+			<stop stop-color="#5a5a5a" offset=".42617449"/>
+			<stop stop-color="#979797" offset="1"/>
+		</linearGradient>
+		<linearGradient id="x" x1="27.888315" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(0,-1.2063935,1.206393,0,44.866137,37.360256)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="r" x1="27.888315" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(0 -.59583873 .59583873 0 -27.665572 65.027775)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="s" x1="27.888315" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(0 -.55765945 .55765945 0 -20.893618 63.347884)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="t" x1="27.888315" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(0 -.56922915 .56922915 0 -24.326743 60.596556)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="u" x1="27.888315" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(0 -.61780704 .61780704 0 -24.813111 68.837196)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="v" x1="27.888315" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(1.2465681,0,0,1.2465684,-93.660141,-31.108343)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="o" x1="4.4978113" x2="15.295909" y1="-43.891712" y2="-43.891712" gradientTransform="translate(33.994852,53.788572)" gradientUnits="userSpaceOnUse" xlink:href="#c"/>
+		<linearGradient id="w" x1="27.888315" x2="53.793419" y1="9.8968611" y2="9.8968611" gradientTransform="matrix(0,-1.2063935,1.206393,0,-64.294506,84.863288)" gradientUnits="userSpaceOnUse" xlink:href="#b"/>
+		<linearGradient id="q" x1="4.4978113" x2="15.295909" y1="-43.891712" y2="-43.891712" gradientTransform="matrix(.96777188 0 0 .9677713 -41.460488 -9.8460232)" gradientUnits="userSpaceOnUse" xlink:href="#c"/>
+		<linearGradient id="i">
+			<stop offset="0"/>
+			<stop stop-color="#5a5a5a" offset=".80397099"/>
+			<stop stop-color="#979797" offset="1"/>
+		</linearGradient>
+		<linearGradient id="p" x1="6.965601" x2="15.295909" y1="-43.891712" y2="-43.891712" gradientTransform="matrix(.5792604 0 0 .57926005 -15.231469 35.424619)" gradientUnits="userSpaceOnUse" xlink:href="#c"/>
+		<linearGradient id="ah" x1="10.152543" x2="10.152543" y1="25" y2="-1" gradientTransform="translate(0 -.359368)" gradientUnits="userSpaceOnUse" xlink:href="#i"/>
+		<linearGradient id="ak" x1="6.965601" x2="15.295909" y1="-43.891712" y2="-43.891712" gradientTransform="matrix(.81044191 0 0 .81044142 -16.782004 -26.906882)" gradientUnits="userSpaceOnUse" xlink:href="#c"/>
+		<linearGradient id="aj" x1="-25.224104" x2="-40.264385" y1="-31.891275" y2="-47.270847" gradientTransform="matrix(1.3064967,0,0,1.3064967,12.413786,106.02004)" gradientUnits="userSpaceOnUse">
+			<stop offset="0"/>
+			<stop stop-color="#5a5a5a" offset=".35063794"/>
+			<stop stop-color="#979797" offset="1"/>
+		</linearGradient>
+		<linearGradient id="ai" x1="-25.224104" x2="-40.264385" y1="-31.891275" y2="-47.270847" gradientTransform="matrix(1.2829802,0,0,1.2829802,4.9345583,102.17732)" gradientUnits="userSpaceOnUse" xlink:href="#i"/>
+	</defs>
+	<g display="none" opacity=".32000002" stroke-width=".99999994">
+		<path d="m10.670988 1.5205657c-1.096489-.0771516-2.2250641.0649478-3.3290212.4506657-4.4527889 1.4380996-6.88734039 6.2705092-5.4096338 10.7386746 1.4779986 4.469045 6.3081419 6.864812 10.727176 5.320817 4.452787-1.438101 6.885696-6.27051 5.407989-10.7386751-1.108768-3.3525952-4.103852-5.539803-7.39651-5.7714822z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#248301" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<path d="m12.243069 16.88878a7.2926948 7.3501393 0 1 1-4.6118564-13.9448841 7.2926948 7.3501393 0 1 1 4.6118564 13.9448841z" fill="url(#an)"/>
+	</g>
+	<path d="m-34.142578-45.513672a1.0001 1.0001 0 0 0-.857422.513672c-3.464766.402931-6.225773 3.165573-6.626953 6.630859a1.0001 1.0001 0 0 0 0 1.738281c.40118 3.465286 3.162187 6.227929 6.626953 6.63086a1.0001 1.0001 0 0 0 1.746094 0c3.458247-.402173 6.215707-3.155201 6.625-6.611329a1.0001 1.0001 0 0 0 0-1.77539c-.408496-3.45703-3.166111-6.211034-6.625-6.613281a1.0001 1.0001 0 0 0-.888672-.513672zm-.984375 2.552734v2.94336a1.0001 1.0001 0 1 0 2 0v-2.94336c2.272859.409803 4.051135 2.188079 4.460938 4.460938h-2.921876a1.0001 1.0001 0 1 0 0 2h2.921876c-.409803 2.272858-2.188079 4.051135-4.460938 4.460938v-2.943361a1.0001 1.0001 0 0 0-1.015625-1.015625 1.0001 1.0001 0 0 0-.984375 1.015625v2.943361c-2.272859-.409803-4.051135-2.18808-4.460937-4.460939h2.953124a1.0001 1.0001 0 1 0 0-1.999999h-2.953124c.409802-2.272859 2.188078-4.051135 4.460937-4.460938z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="none" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stroke="#020200" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<path d="m10-38v8h-7.999999 7.999999v7.999999-7.999999h8-8z" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="3"/>
+	<circle cx="39.999996" cy="-24.517012" r="6.5538206" fill="none" stroke="#070606" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" style="paint-order:fill markers stroke"/>
+	<path d="m31.008541-24.51701h4.48299" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+	<path d="m44.539791-24.51701h4.48299" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+	<path d="m40-20v4.48299" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+	<path d="m40.000036-33.51701v4.48299" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+	<path d="m-22.630118-32.920668a1.0000999 1.0000999 0 0 0 1.013672.986328h1.390625c.444254 3.161365 2.951923 5.669029 6.113282 6.113282v1.382812a1.0000999 1.0000999 0 1 0 2 0v-1.382812c3.161612-.444253 5.670726-2.951917 6.115234-6.113282h1.388672a1.0000999 1.0000999 0 1 0 0-1.999999h-1.388672c-.444508-3.161618-2.953622-5.670728-6.115234-6.115234v-1.410157a1.0000999 1.0000999 0 1 0-2 0v1.410157c-3.161359.444506-5.669028 2.953616-6.113282 6.115234h-1.390625a1.0000999 1.0000999 0 0 0-1.013672 1.013671zm4.423829.986328h.826171a1.0000999 1.0000999 0 1 0 0-1.999999h-.826171c.400054-2.07307 2.021247-3.694671 4.09375-4.095703v.806641a1.0000999 1.0000999 0 1 0 2 0v-.806641c2.073628.400472 3.695227 2.022065 4.095703 4.095703h-.828125a1.0000999 1.0000999 0 0 0-1.013672 1.015624 1.0000999 1.0000999 0 0 0 1.013672.984375h.828125c-.400476 2.073326-2.022075 3.69359-4.095703 4.09375v-.833984a1.0000999 1.0000999 0 1 0-2 0v.833984c-2.072503-.40072-3.693696-2.020992-4.09375-4.09375z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#n)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<path d="m-22.630118-32.920672a1.0000999 1.0000999 0 0 0 1.013672.986328h1.390625c.444254 3.161365 2.951923 5.669029 6.113282 6.113282v1.382812a1.0000999 1.0000999 0 1 0 2 0v-1.382812c3.161612-.444253 5.670726-2.951917 6.115234-6.113282h1.388672a1.0000999 1.0000999 0 1 0 0-1.999999h-1.388672c-.444508-3.161618-2.953622-5.670728-6.115234-6.115234v-1.410157a1.0000999 1.0000999 0 1 0-2 0v1.410157c-3.161359.444506-5.669028 2.953616-6.113282 6.115234h-1.390625a1.0000999 1.0000999 0 0 0-1.013672 1.013671zm4.423829.986328h.826171a1.0000999 1.0000999 0 1 0 0-1.999999h-.826171c.400054-2.07307 2.021247-3.694671 4.09375-4.095703v.806641a1.0000999 1.0000999 0 1 0 2 0v-.806641c2.073628.400472 3.695227 2.022065 4.095703 4.095703h-.828125a1.0000999 1.0000999 0 0 0-1.013672 1.015624 1.0000999 1.0000999 0 0 0 1.013672.984375h.828125c-.400476 2.073326-2.022075 3.69359-4.095703 4.09375v-.833984a1.0000999 1.0000999 0 1 0-2 0v.833984c-2.072503-.40072-3.693696-2.020992-4.09375-4.09375z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="none" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width=".80000001" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<path d="m-36.020551-1.300425c-.0018.0005873-.0036.00118-.0054.00179-.04554.00121-.0912.00498-.136387.010767-.7018.082208-1.235688.6892104-1.225685 1.396169-7e-5.010989-.00018.021314 0 .032302v.9206097c-2.767767.5643833-4.920142 2.7180176-5.484185 5.4859748h-.934966c-.774481-.010584-1.41752.6324547-1.406936 1.4069361.000587.0018.0012.0036.0018.0054.0012.04219.0075.08374.01256.125619-.007.05988-.01485.119118-.01436.179456-4e-6.0012-4e-6.0024 0 .0036.0012.0736.01643.146474.02871.218936-.01285.0795-.02921.159786-.02871.240471-4e-6.0012-4e-6.0024 0 .0036.01037.769451.637883 1.4106484 1.406937 1.3997584h.929583c.558473 2.862781 2.710565 5.100592 5.489563 5.685171v.974447c-.0059.435147.163877.823077.43249 1.073148s.614666.367885.954706.367885.686094-.117814.954707-.367885c.268614-.250071.438425-.638001.43249-1.073148v-.389419l-.0018.01615c.0011-.03262.0011-.06608 0-.0987l.0018.01615v-.518623c.454729-.09564.892654-.235552 1.30955-.415222 2.131013-.918403 3.712537-2.875685 4.180013-5.269949h.929584c.908877.01329 1.578979-.876139 1.365661-1.760465v.218936c.03453-.143463.02608-.291201.01615-.437873.131812-.8383468-.530229-1.6166724-1.381791-1.6043741h-.933173c-.564368-2.7680387-2.71794-4.9216083-5.485974-5.4859748v-.9277883l-.0018.014357c.0013-.044957.001-.089709-.0018-.1345922-.03364-.634793-.499097-1.1694277-1.123396-1.2884952h-.0018c-.09145-.017617-.184998-.026587-.278141-.025124zm-1.367456 5.9005186v.021534c-.0059.4351468.163876.8230767.43249 1.0731478.268613.2500711.614666.3678851.954706.3678851s.686094-.117814.954707-.3678851c.268614-.2500711.438425-.638001.43249-1.0731478v-.021534c1.006017.3691727 1.801928 1.0777303 2.304216 2.0440057-.649286.1207481-1.180732.6282052-1.170054 1.3118237.000602.0018.0012.0036.0018.0054.0012.04219.0075.08374.01256.125619-.007.05988-.01485.119118-.01436.179457-1.1e-5.0018-1.1e-5.0036 0 .0054.0013.07261.01659.143852.02871.215347-.01297.08029-.02936.160792-.02871.242266-5e-6.0012-5e-6.0024 0 .0036.01002.65524.505786 1.133249 1.116217 1.277728-.505082.883797-1.276444 1.53498-2.250379 1.878906v-.0341c.0061-.428055-.168013-.810891-.437874-1.053407-.269861-.242518-.613035-.353529-.949323-.353529-.336289 0-.679462.111011-.949323.353529-.269861.242516-.443922.625352-.437873 1.053407v.03231c-.979498-.346706-1.755746-1.00253-2.259353-1.895105.730723-.176279 1.27003-.850734 1.083915-1.622284v.218936c.03452-.143462.02608-.291201.01615-.437872.117284-.7460287-.432973-1.3610388-1.148519-1.4966644.501057-.9716125 1.298904-1.6839417 2.307806-2.054773z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#am)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<path d="m-45.517579 7.90039a1.0000999 1.0000999 0 0 0 1.013672.986328h1.390625c.444254 3.161365 2.951923 5.669029 6.113282 6.113282v1.382812a1.0000999 1.0000999 0 1 0 2 0v-1.382812c3.161612-.444253 5.670726-2.951917 6.115234-6.113282h1.388672a1.0000999 1.0000999 0 1 0 0-1.9999994h-1.388672c-.444508-3.161618-2.953622-5.670728-6.115234-6.115234v-1.410157a1.0000999 1.0000999 0 1 0-2 0v1.410157c-3.161359.444506-5.669028 2.953616-6.113282 6.115234h-1.390625a1.0000999 1.0000999 0 0 0-1.013672 1.0136714zm4.423829.986328h.826171a1.0000999 1.0000999 0 1 0 0-1.9999994h-.826171c.400054-2.07307 2.021247-3.694671 4.09375-4.095703v.806641a1.0000999 1.0000999 0 1 0 2 0v-.806641c2.073628.400472 3.695227 2.022065 4.095703 4.095703h-.828125a1.0000999 1.0000999 0 0 0-1.013672 1.0156244 1.0000999 1.0000999 0 0 0 1.013672.984375h.828125c-.400476 2.073326-2.022075 3.69359-4.095703 4.09375v-.833984a1.0000999 1.0000999 0 1 0-2 0v.833984c-2.072503-.40072-3.693696-2.020992-4.09375-4.09375z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#m)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<path d="m-29.020551-26.300425c-.0018.000588-.0036.0012-.0054.0018-.04554.0012-.0912.005-.136387.01077-.7018.08221-1.235688.68921-1.225685 1.396169-6.9e-5.01099-.00018.02131 0 .0323v.920609c-2.767767.564384-4.920142 2.718018-5.484185 5.485975h-.934946c-.774481-.01058-1.41752.632455-1.406936 1.406936.000587.0018.0012.0036.0018.0054.0012.04219.0075.08374.01256.125619-.007.05988-.01485.119118-.01436.179456-4e-6.0012-4e-6.0024 0 .0036.0012.0736.01643.146474.02871.218936-.01285.0795-.02921.159786-.02871.240471-4e-6.0012-4e-6.0024 0 .0036.01037.769451.637883 1.410648 1.406937 1.399758h.929583c.558473 2.862781 2.710565 5.100592 5.489563 5.685171v.974447c-.0059.435147.163877.823077.43249 1.073148s.614666.367885.954706.367885.686094-.117814.954707-.367885c.268614-.250071.438425-.638001.43249-1.073148v-.389419l-.0018.01615c.0011-.03262.0011-.06608 0-.0987l.0018.01615v-.518628c.454729-.09564.892654-.235552 1.30955-.415222 2.131013-.918403 3.712537-2.875685 4.180013-5.269949h.929584c.908877.01329 1.578979-.876139 1.365661-1.760465v.218936c.03453-.143463.02608-.291201.01615-.437873.131792-.838347-.530249-1.616672-1.381811-1.604374h-.933173c-.564368-2.768039-2.71794-4.921608-5.485974-5.485975v-.927788l-.0018.01436c.0013-.04496.001-.08971-.0018-.134592-.03364-.634793-.499097-1.169428-1.123396-1.288495h-.0018c-.09145-.01762-.184998-.02659-.278141-.02513zm-1.367456 5.900519v.02153c-.0059.435147.163876.823077.43249 1.073148.268613.250071.614666.367885.954706.367885s.686094-.117814.954707-.367885c.268614-.250071.438425-.638001.43249-1.073148v-.02153c1.006017.369173 1.801928 1.07773 2.304216 2.044006-.649286.120748-1.180732.628205-1.170054 1.311823.000602.0018.0012.0036.0018.0054.0012.04219.0075.08374.01256.125619-.007.05988-.01485.119118-.01436.179457-1.1e-5.0018-1.1e-5.0036 0 .0054.0013.07261.01659.143852.02871.215347-.01297.08029-.02936.160792-.02871.242266-5e-6.0012-5e-6.0024 0 .0036.01002.65524.505786 1.133249 1.116217 1.277728-.505082.883797-1.276444 1.53498-2.250379 1.878906v-.0341c.0061-.428055-.168013-.810891-.437874-1.053407-.269861-.242518-.613035-.353529-.949323-.353529-.336289 0-.679462.111011-.949323.353529-.269861.242516-.443922.625352-.437873 1.053407v.03231c-.979498-.346706-1.755746-1.00253-2.259353-1.895105.730723-.176279 3.39135-.850734 3.205236-1.622284v.218936c.03452-.143462.02608-.291201.01615-.437872.117284-.746028-2.554294-1.361039-3.26984-1.496664.501057-.971613 1.298904-1.683942 2.307807-2.054773z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#al)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<path d="m-38.517578-17.09961c.0076.552283.461388.993875 1.013671.986328h1.390625c.444254 3.161365 2.951923 5.669029 6.113282 6.113282v1.382812c-.0191 1.352294 2.019096 1.352294 2 0v-1.382812c3.161612-.444253 5.670726-2.951917 6.115234-6.113282h1.388672c1.352341.01914 1.352341-2.019144 0-1.999999h-1.388672c-.444508-3.161618-2.953622-5.670728-6.115234-6.115234v-1.410157c.0191-1.352294-2.019096-1.352294-2 0v1.410157c-3.161359.444506-5.669028 2.953616-6.113282 6.115234h-1.390625c-.562991-.0077-1.021365.45068-1.013671 1.013671zm4.423828.986328c.375985-.907709 2.947492 0 2.947492 0 1.352341.01914 1.352341-2.019144 0-1.999999h-2.947492c.400054-2.07307 2.021247-3.694671 4.09375-4.095703v.806641c-.0191 1.352294 2.019096 1.352294 2 0v-.806641c2.073628.400472 3.695227 2.022065 4.095703 4.095703h-.828125c-.56377-.0077-1.022477.45187-1.013672 1.015624.0086.551516.46214.991928 1.013672.984375h.828125c-.400476 2.073326-2.022075 3.69359-4.095703 4.09375v-.833984c.0191-1.352294-2.019096-1.352294-2 0v.833984c-2.072503-.40072-4.832258-2.310836-4.09375-4.09375z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#l)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<path d="m-34.142578-45.513672a1.0001 1.0001 0 0 0-.857422.513672c-3.464766.402931-6.225773 3.165573-6.626953 6.630859a1.0001 1.0001 0 0 0 0 1.738282c.40118 3.465285 3.162187 6.227928 6.626953 6.630859a1.0001 1.0001 0 0 0 1.746094 0c3.458247-.402173 6.215707-3.155201 6.625-6.611329a1.0001 1.0001 0 0 0 0-1.77539c-.408496-3.457031-3.166111-6.211034-6.625-6.613281a1.0001 1.0001 0 0 0-.888672-.513672zm-.984375 2.552734v2.943359a1.0001 1.0001 0 1 0 2 0v-2.943359c2.272859.409803 4.051135 2.188079 4.460938 4.460937h-2.921876a1.0001 1.0001 0 1 0 0 2h2.921876c-.409803 2.272859-2.188079 4.051136-4.460938 4.460939v-2.943361a1.0001 1.0001 0 0 0-1.015625-1.015625 1.0001 1.0001 0 0 0-.984375 1.015625v2.943361c-2.272859-.409803-4.051135-2.18808-4.460937-4.460939h2.953124a1.0001 1.0001 0 1 0 0-2h-2.953124c.409802-2.272858 2.188078-4.051134 4.460937-4.460937z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#ag)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<circle cx="68.446182" cy="-15" r="6.5538206" fill="none" stroke="#070606" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" style="paint-order:fill markers stroke"/>
+	<path d="m61.454723-15h4.48299" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+	<path d="m70.985972-15h4.48299" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+	<path d="M 68.446182,-12.48299 V -8" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+	<path d="m68.446218-22v4.48299" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+	<g transform="rotate(-90,-6.2365918,-2.4506439)" fill="none" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5">
+		<ellipse cx="44.000408" cy="10.012118" rx="6.8913059" ry="6.8912754" stroke="url(#ab)" style="paint-order:fill markers stroke"/>
+		<path d="m37.257812 10.012119h3.204309" stroke="url(#ae)"/>
+		<path d="m47.440445 10.012119h3.085171" stroke="url(#ad)"/>
+		<path d="m44.000407 13.136171v3.379592" stroke="url(#af)"/>
+		<path d="m44.000441 3.2779594v3.2730534" stroke="url(#ac)"/>
+	</g>
+	<rect transform="rotate(45)" x="-44.878887" y="43.478981" width="13.792038" height="13.792038" rx="1" ry="1" fill="url(#ai)" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width=".403" style="paint-order:fill markers stroke"/>
+	<rect transform="matrix(.70710678 -.70710678 -.70710678 -.70710678 0 0)" x="-38.312714" y="46.245792" width="14.04484" height="14.04484" rx=".5" ry=".5" fill="url(#aj)" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width=".403" style="paint-order:fill markers stroke"/>
+	<ellipse transform="rotate(-90)" cx="-8.7611713" cy="-62.478542" rx="4.3756156" ry="4.3756127" fill="url(#ak)" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width=".40000001" style="paint-order:fill markers stroke"/>
+	<circle cx="-12" cy="10.000002" r="3" fill="#ecfdd0" style="paint-order:fill markers stroke"/>
+	<g transform="matrix(0 -.94208876 .94206997 0 -21.323535 51.34989)" fill="none" stroke="#101901" stroke-linecap="round" stroke-linejoin="round" stroke-width="4.13977861">
+		<ellipse cx="43.891712" cy="9.8968601" rx="4.9541779" ry="4.9541545" style="paint-order:fill markers stroke"/>
+		<path d="m35.257812 9.89686h3.204309"/>
+		<path d="m49.440445 9.89686h3.085171"/>
+		<path d="m43.891697 15.13617v3.379592"/>
+		<path d="m43.891731 1.2779581v3.2730534"/>
+		<ellipse cx="43.891712" cy="9.8968601" rx="4.9541779" ry="4.9541545" style="paint-order:fill markers stroke"/>
+		<path d="m35.257812 9.89686h3.204309"/>
+		<path d="m49.440445 9.89686h3.085171"/>
+		<path d="m43.891697 15.13617v3.379592"/>
+		<path d="m43.891731 1.2779581v3.2730534"/>
+	</g>
+	<ellipse transform="rotate(-90)" cx="-10.000002" cy="-12" rx="4.6672754" ry="4.66716" fill="none" stroke="url(#aa)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5" style="paint-order:fill markers stroke"/>
+	<path d="m-12 18.133902v-3.018744" fill="none" stroke="url(#g)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5"/>
+	<path d="m-12 4.772603v-2.906505" fill="none" stroke="url(#g)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5"/>
+	<path d="m-7.064203 10.000016h3.183812" fill="none" stroke="url(#d)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5"/>
+	<path d="m-20.119609 9.999984h3.083446" fill="none" stroke="url(#d)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5"/>
+	<ellipse transform="rotate(-90)" cx="-10.000002" cy="-12" rx="3.1047449" ry="3.10466" fill="none" stroke="url(#z)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5" style="paint-order:fill markers stroke"/>
+	<path d="m-12 18.133902v-3.018744" fill="none" stroke="url(#e)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5"/>
+	<path d="m-12 4.772603v-2.906505" fill="none" stroke="url(#e)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5"/>
+	<path d="m-7.064203 10.000016h3.183812" fill="none" stroke="url(#d)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5"/>
+	<path d="m-20.119609 9.999984h3.083446" fill="none" stroke="url(#d)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5"/>
+	<ellipse transform="rotate(-90)" cx="56.419571" cy="38.284271" rx="4.9541779" ry="4.9541545" fill="none" stroke="url(#y)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5" style="paint-order:fill markers stroke"/>
+	<path d="m38.284271-47.785668v-3.204309" fill="none" stroke="url(#f)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5"/>
+	<path d="m38.284271-61.968301v-3.085171" fill="none" stroke="url(#f)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5"/>
+	<path d="m43.523581-56.419553h3.379592" fill="none" stroke="url(#h)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5"/>
+	<path d="m29.665369-56.419587h3.273054" fill="none" stroke="url(#h)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.5"/>
+	<path d="m56.945221-25.042993c-.973623 0-1.947129.650581-1.935543 1.952555v.504678c-2.377478.673804-4.254986 2.550543-4.929585 4.927698h-.661562c-1.091139-.01494-1.978962.874677-1.962005 1.965786.01648 1.067634.894345 1.919916 1.962005 1.905301h.661562c.674046 2.378165 2.551425 4.255544 4.929585 4.929588v.62943c-.02317 2.60395 3.894258 2.60395 3.871085 0v-.62943c2.377331-.674472 4.253816-2.552009 4.927695-4.929588h.451753c2.603976.0232 2.603976-3.894289 0-3.871087h-.451753c-.674433-2.376569-2.551048-4.253464-4.927695-4.927698v-.504678c.01159-1.301974-.96192-1.952555-1.935542-1.952555zm0 4.508078c2.672462 0 4.812394 2.141803 4.812394 4.814286 0 2.672484-2.139932 4.814288-4.812394 4.814288s-4.814284-2.141804-4.814284-4.814288c0-2.672483 2.141822-4.814286 4.814284-4.814286z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#x)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<g transform="rotate(-90,27.085814,55.721005)" stroke-width="2.5">
+		<path d="m35.593591 10.007636h3.07969" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.45999312"/>
+		<path d="m43.996212 1.6131552v3.1457618" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.45999312"/>
+		<path d="m49.22465 10.007636h2.965186" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.45999312"/>
+		<path d="m43.996179 14.93241v3.248157" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.45999312"/>
+		<circle cx="43.891712" cy="9.8968601" r="5.3990488" fill="url(#o)" style="paint-order:fill markers stroke"/>
+		<ellipse cx="43.996181" cy="10.007636" rx="6.1315255" ry="6.1314979" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.45999312" style="paint-order:fill markers stroke"/>
+	</g>
+	<ellipse transform="rotate(-90)" cx="-38.810642" cy="-18.627554" rx="6.1757193" ry="6.1756921" fill="none" stroke="url(#v)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.40277314" style="paint-order:fill markers stroke"/>
+	<path d="m-18.627554 47.054673v-1.979646" fill="none" stroke="url(#u)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.40277314"/>
+	<path d="m-18.627554 32.453614v-1.75617" fill="none" stroke="url(#t)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.40277314"/>
+	<path d="m-12.452788 38.810642h1.88466" fill="none" stroke="url(#s)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.4027729"/>
+	<path d="m-26.904114 38.810609h1.950212" fill="none" stroke="url(#r)" stroke-linecap="round" stroke-linejoin="round" stroke-width="2.40277314"/>
+	<ellipse transform="rotate(-90)" cx="-31.882584" cy="-52.323158" rx="5.2250476" ry="5.2250443" fill="url(#q)" style="paint-order:fill markers stroke"/>
+	<path d="m-52.215422 22.460039c-.973622 0-1.947129.650581-1.935542 1.952555v.504678c-2.377478.673804-4.254986 2.550543-4.929586 4.927698h-.661562c-1.091139-.01494-1.978962.874677-1.962005 1.965786.01648 1.067634.894345 1.919916 1.962005 1.905301h.661562c.674046 2.378165 2.551425 4.255544 4.929586 4.929588v.62943c-.02317 2.60395 3.894257 2.60395 3.871084 0v-.62943c2.377331-.674472 4.253816-2.552009 4.927695-4.929588h.451753c2.603976.0232 2.603976-3.894289 0-3.871087h-.451753c-.674433-2.376569-2.551048-4.253464-4.927695-4.927698v-.504678c.01159-1.301974-.96192-1.952555-1.935542-1.952555zm0 4.508078c2.672462 0 4.812394 2.141803 4.812394 4.814286 0 2.672484-2.139932 4.814288-4.812394 4.814288s-4.814284-2.141804-4.814284-4.814288c0-2.672483 2.141822-4.814286 4.814284-4.814286z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="none" image-rendering="auto" shape-rendering="auto" solid-color="#000000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width=".903" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<path d="m-52.215422 22.460039c-.973622 0-1.947129.650581-1.935542 1.952555v.504678c-2.377478.673804-4.254986 2.550543-4.929586 4.927698h-.661562c-1.091139-.01494-1.978962.874677-1.962005 1.965786.01648 1.067634.894345 1.919916 1.962005 1.905301h.661562c.674046 2.378165 2.551425 4.255544 4.929586 4.929588v.62943c-.02317 2.60395 3.894257 2.60395 3.871084 0v-.62943c2.377331-.674472 4.253816-2.552009 4.927695-4.929588h.451753c2.603976.0232 2.603976-3.894289 0-3.871087h-.451753c-.674433-2.376569-2.551048-4.253464-4.927695-4.927698v-.504678c.01159-1.301974-.96192-1.952555-1.935542-1.952555zm0 4.508078c2.672462 0 4.812394 2.141803 4.812394 4.814286 0 2.672484-2.139932 4.814288-4.812394 4.814288s-4.814284-2.141804-4.814284-4.814288c0-2.672483 2.141822-4.814286 4.814284-4.814286z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#w)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<path d="m2.4162076 4c-.7190868.000346-1.168452.778638-.8092295 1.401571l7.5837925 13.133576c.3598428.622625 1.2586164.622625 1.6184594 0l7.583792-13.133576c.359223-.622933-.09014-1.401225-.80923-1.401571z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#ah)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;paint-order:fill markers stroke;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	<ellipse transform="rotate(-90)" cx="-9.4986095" cy="9.9999027" rx="3.1274555" ry="3.1274533" fill="url(#p)" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width=".40000001" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/style_flip/btn_lib_sort_down.png b/res/skins/LateNight/style_flip/btn_lib_sort_down.png
new file mode 100644
index 000000000000..85a8f9726a3e
Binary files /dev/null and b/res/skins/LateNight/style_flip/btn_lib_sort_down.png differ
diff --git a/res/skins/LateNight/style_flip/btn_lib_sort_up.png b/res/skins/LateNight/style_flip/btn_lib_sort_up.png
new file mode 100644
index 000000000000..ae53038219a0
Binary files /dev/null and b/res/skins/LateNight/style_flip/btn_lib_sort_up.png differ
diff --git a/res/skins/LateNight/style_flip/cover_default.svg b/res/skins/LateNight/style_flip/cover_default.svg
new file mode 100644
index 000000000000..020d7aab7a18
--- /dev/null
+++ b/res/skins/LateNight/style_flip/cover_default.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   width="444"
+   height="444"
+   version="1.1"
+   sodipodi:docname="cover_default.svg"
+   inkscape:version="0.92.4 (unknown)">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="740"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="2.1261261"
+     inkscape:cx="191.09175"
+     inkscape:cy="264.72008"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     id="path10"
+     d="m222 124.28c-53.967 0-97.716 43.749-97.716 97.716 0 53.967 43.749 97.716 97.716 97.716 53.967 0 97.716-43.749 97.716-97.716 0-53.967-43.749-97.716-97.716-97.716z"
+     fill="#696969"
+     style="fill:#696969;fill-opacity:0.52020204" />
+  <path
+     id="path12"
+     d="m227.56 222c0 3.07-2.4887 5.5587-5.5588 5.5587-3.07 0-5.5588-2.4888-5.5588-5.5587 0-3.07 2.4887-5.5588 5.5588-5.5588 3.07 0 5.5588 2.4888 5.5588 5.5588z"
+     fill="#1a1a1a"
+     style="fill:#030303;fill-opacity:1" />
+</svg>
diff --git a/res/skins/LateNight/style_flip/latency_bg.png b/res/skins/LateNight/style_flip/latency_bg.png
new file mode 100644
index 000000000000..c3d120b33147
Binary files /dev/null and b/res/skins/LateNight/style_flip/latency_bg.png differ
diff --git a/res/skins/LateNight/style_flip/latency_bg.svg b/res/skins/LateNight/style_flip/latency_bg.svg
new file mode 100644
index 000000000000..f7327adf15cc
--- /dev/null
+++ b/res/skins/LateNight/style_flip/latency_bg.svg
@@ -0,0 +1,3 @@
+<svg width="63" height="7" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m0 0v7h63v-7zm1 1h61v5h-61z" color="#000000"/>
+</svg>
diff --git a/res/skins/LateNight/style_flip/latency_over.png b/res/skins/LateNight/style_flip/latency_over.png
new file mode 100644
index 000000000000..805a1ca23dff
Binary files /dev/null and b/res/skins/LateNight/style_flip/latency_over.png differ
diff --git a/res/skins/LateNight/style_flip/latency_over.svg b/res/skins/LateNight/style_flip/latency_over.svg
new file mode 100644
index 000000000000..5f7a98aeac42
--- /dev/null
+++ b/res/skins/LateNight/style_flip/latency_over.svg
@@ -0,0 +1 @@
+<svg id="svg3248" width="63" height="7" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs id="defs3250"><linearGradient id="linearGradient5486-6" x1="46" x2="61" y1="1048.9" y2="1048.9" gradientUnits="userSpaceOnUse"><stop id="stop5482-5" stop-color="#e72904" offset="0"/><stop id="stop5484-3" stop-color="#9f250d" offset="1"/></linearGradient><linearGradient id="linearGradient5478-5" x1="26" x2="45" y1="1048.9" y2="1048.9" gradientUnits="userSpaceOnUse"><stop id="stop5474-2" stop-color="#b2cb08" offset="0"/><stop id="stop5476-9" stop-color="#d0f103" offset="1"/></linearGradient><linearGradient id="linearGradient6106" x1="2" x2="25" y1="1048.9" y2="1048.9" gradientUnits="userSpaceOnUse"><stop id="stop5444-7" stop-color="#127a12" offset="0"/><stop id="stop5446-0" stop-color="#08c408" offset="1"/></linearGradient></defs><g id="g5428" transform="translate(0 -1045.4)" fill="url(#linearGradient6106)"><rect id="use5308" x="2" y="1047.4" width="1" height="3" color="#000000"/><rect id="use5310" x="4" y="1047.4" width="1" height="3" color="#000000"/><rect id="use5312" x="6" y="1047.4" width="1" height="3" color="#000000"/><rect id="use5314" x="8" y="1047.4" width="1" height="3" color="#000000"/><rect id="use5316" x="10" y="1047.4" width="1" height="3" color="#000000"/><rect id="use5318" x="12" y="1047.4" width="1" height="3" color="#000000"/><rect id="use5320" x="14" y="1047.4" width="1" height="3" color="#000000"/><rect id="use5322" x="16" y="1047.4" width="1" height="3" color="#000000"/><rect id="use5324" x="18" y="1047.4" width="1" height="3" color="#000000"/><rect id="use5326" x="20" y="1047.4" width="1" height="3" color="#000000"/><rect id="use5328" x="22" y="1047.4" width="1" height="3" color="#000000"/><rect id="use5330" x="24" y="1047.4" width="1" height="3" color="#000000"/></g><g id="g5450" transform="translate(0 -1045.4)" fill="url(#linearGradient5478-5)"><rect id="use5332" x="26" y="1047.4" width="1" height="3" color="#000000"/><rect id="use5334" x="28" y="1047.4" width="1" height="3" color="#000000"/><rect id="use5336" x="30" y="1047.4" width="1" height="3" color="#000000"/><rect id="use5338" x="32" y="1047.4" width="1" height="3" color="#000000"/><rect id="use5340" x="34" y="1047.4" width="1" height="3" color="#000000"/><rect id="use5342" x="36" y="1047.4" width="1" height="3" color="#000000"/><rect id="use5344" x="38" y="1047.4" width="1" height="3" color="#000000"/><rect id="use5346" x="40" y="1047.4" width="1" height="3" color="#000000"/><rect id="use5348" x="42" y="1047.4" width="1" height="3" color="#000000"/><rect id="use5350" x="44" y="1047.4" width="1" height="3" color="#000000"/></g><g id="g5462" transform="translate(0 -1045.4)" fill="url(#linearGradient5486-6)"><rect id="use5352" x="46" y="1047.4" width="1" height="3" color="#000000"/><rect id="use5354" x="48" y="1047.4" width="1" height="3" color="#000000"/><rect id="use5356" x="50" y="1047.4" width="1" height="3" color="#000000"/><rect id="use5358" x="52" y="1047.4" width="1" height="3" color="#000000"/><rect id="use5360" x="54" y="1047.4" width="1" height="3" color="#000000"/><rect id="use5362" x="56" y="1047.4" width="1" height="3" color="#000000"/><rect id="use5364" x="58" y="1047.4" width="1" height="3" color="#000000"/><rect id="use5366" x="60" y="1047.4" width="1" height="3" color="#000000"/></g></svg>
diff --git a/res/skins/LateNight/style_flip/library_branch_closed.png b/res/skins/LateNight/style_flip/library_branch_closed.png
new file mode 100644
index 000000000000..aac367c5b22a
Binary files /dev/null and b/res/skins/LateNight/style_flip/library_branch_closed.png differ
diff --git a/res/skins/LateNight/style_flip/library_branch_closed_selected.png b/res/skins/LateNight/style_flip/library_branch_closed_selected.png
new file mode 100644
index 000000000000..d55311cfc0d6
Binary files /dev/null and b/res/skins/LateNight/style_flip/library_branch_closed_selected.png differ
diff --git a/res/skins/LateNight/style_flip/library_branch_open.png b/res/skins/LateNight/style_flip/library_branch_open.png
new file mode 100644
index 000000000000..56ae3993ef5d
Binary files /dev/null and b/res/skins/LateNight/style_flip/library_branch_open.png differ
diff --git a/res/skins/LateNight/style_flip/library_branch_open_selected.png b/res/skins/LateNight/style_flip/library_branch_open_selected.png
new file mode 100644
index 000000000000..ee4730690ed3
Binary files /dev/null and b/res/skins/LateNight/style_flip/library_branch_open_selected.png differ
diff --git a/res/skins/LateNight/style/mixxx_logo.svg b/res/skins/LateNight/style_flip/mixxx_logo.svg
similarity index 100%
rename from res/skins/LateNight/style/mixxx_logo.svg
rename to res/skins/LateNight/style_flip/mixxx_logo.svg
diff --git a/res/skins/LateNight/style_flip/progressbar.svg b/res/skins/LateNight/style_flip/progressbar.svg
new file mode 100644
index 000000000000..b0b7340af80d
--- /dev/null
+++ b/res/skins/LateNight/style_flip/progressbar.svg
@@ -0,0 +1 @@
+<svg id="svg2" width="164" height="5" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient16280" x1="1" x2="164" y1="2.5" y2="2.5" gradientUnits="userSpaceOnUse"><stop id="stop14328" stop-color="#00a500" offset="0"/><stop id="stop14330" stop-color="#04f005" offset="1"/></linearGradient></defs><g id="layer2"><g id="g5667" fill="url(#linearGradient16280)"><rect id="use5185" x="1" width="1" height="5" color="#000000"/><rect id="use5187" x="3" width="1" height="5" color="#000000"/><rect id="use5189" x="5" width="1" height="5" color="#000000"/><rect id="use5191" x="7" width="1" height="5" color="#000000"/><rect id="use5193" x="9" width="1" height="5" color="#000000"/><rect id="use5195" x="11" width="1" height="5" color="#000000"/><rect id="use5197" x="13" width="1" height="5" color="#000000"/><rect id="use5199" x="15" width="1" height="5" color="#000000"/><rect id="use5201" x="17" width="1" height="5" color="#000000"/><rect id="use5203" x="19" width="1" height="5" color="#000000"/><rect id="use5205" x="21" width="1" height="5" color="#000000"/><rect id="use5207" x="23" width="1" height="5" color="#000000"/><rect id="use5209" x="25" width="1" height="5" color="#000000"/><rect id="use5211" x="27" width="1" height="5" color="#000000"/><rect id="use5213" x="29" width="1" height="5" color="#000000"/><rect id="use5215" x="31" width="1" height="5" color="#000000"/><rect id="use5217" x="33" width="1" height="5" color="#000000"/><rect id="use5219" x="35" width="1" height="5" color="#000000"/><rect id="use5221" x="37" width="1" height="5" color="#000000"/><rect id="use5223" x="39" width="1" height="5" color="#000000"/><rect id="use5225" x="41" width="1" height="5" color="#000000"/><rect id="use5227" x="43" width="1" height="5" color="#000000"/><rect id="use5229" x="45" width="1" height="5" color="#000000"/><rect id="use5231" x="47" width="1" height="5" color="#000000"/><rect id="use5233" x="49" width="1" height="5" color="#000000"/><rect id="use5235" x="51" width="1" height="5" color="#000000"/><rect id="use5237" x="53" width="1" height="5" color="#000000"/><rect id="use5239" x="55" width="1" height="5" color="#000000"/><rect id="use5241" x="57" width="1" height="5" color="#000000"/><rect id="use5243" x="59" width="1" height="5" color="#000000"/><rect id="use5245" x="61" width="1" height="5" color="#000000"/><rect id="use5247" x="63" width="1" height="5" color="#000000"/><rect id="use5249" x="65" width="1" height="5" color="#000000"/><rect id="use5251" x="67" width="1" height="5" color="#000000"/><rect id="use5253" x="69" width="1" height="5" color="#000000"/><rect id="use5255" x="71" width="1" height="5" color="#000000"/><rect id="use5257" x="73" width="1" height="5" color="#000000"/><rect id="use5259" x="75" width="1" height="5" color="#000000"/><rect id="use5261" x="77" width="1" height="5" color="#000000"/><rect id="use5263" x="79" width="1" height="5" color="#000000"/><rect id="use5265" x="81" width="1" height="5" color="#000000"/><rect id="use5267" x="83" width="1" height="5" color="#000000"/><rect id="use5269" x="85" width="1" height="5" color="#000000"/><rect id="use5271" x="87" width="1" height="5" color="#000000"/><rect id="use5273" x="89" width="1" height="5" color="#000000"/><rect id="use5275" x="91" width="1" height="5" color="#000000"/><rect id="use5277" x="93" width="1" height="5" color="#000000"/><rect id="use5279" x="95" width="1" height="5" color="#000000"/><rect id="use5281" x="97" width="1" height="5" color="#000000"/><rect id="use5283" x="99" width="1" height="5" color="#000000"/><rect id="use5285" x="101" width="1" height="5" color="#000000"/><rect id="use5287" x="103" width="1" height="5" color="#000000"/><rect id="use5289" x="105" width="1" height="5" color="#000000"/><rect id="use5291" x="107" width="1" height="5" color="#000000"/><rect id="use5293" x="109" width="1" height="5" color="#000000"/><rect id="use5295" x="111" width="1" height="5" color="#000000"/><rect id="use5297" x="113" width="1" height="5" color="#000000"/><rect id="use5299" x="115" width="1" height="5" color="#000000"/><rect id="use5301" x="117" width="1" height="5" color="#000000"/><rect id="use5303" x="119" width="1" height="5" color="#000000"/><rect id="use5305" x="121" width="1" height="5" color="#000000"/><rect id="use5307" x="123" width="1" height="5" color="#000000"/><rect id="use5309" x="125" width="1" height="5" color="#000000"/><rect id="use5311" x="127" width="1" height="5" color="#000000"/><rect id="use5313" x="129" width="1" height="5" color="#000000"/><rect id="use5315" x="131" width="1" height="5" color="#000000"/><rect id="use5317" x="133" width="1" height="5" color="#000000"/><rect id="use5319" x="135" width="1" height="5" color="#000000"/><rect id="use5321" x="137" width="1" height="5" color="#000000"/><rect id="use5323" x="139" width="1" height="5" color="#000000"/><rect id="use5325" x="141" width="1" height="5" color="#000000"/><rect id="use5327" x="143" width="1" height="5" color="#000000"/><rect id="use5329" x="145" width="1" height="5" color="#000000"/><rect id="use5331" x="147" width="1" height="5" color="#000000"/><rect id="use5333" x="149" width="1" height="5" color="#000000"/><rect id="use5335" x="151" width="1" height="5" color="#000000"/><rect id="use5337" x="153" width="1" height="5" color="#000000"/><rect id="use5339" x="155" width="1" height="5" color="#000000"/><rect id="use5341" x="157" width="1" height="5" color="#000000"/><rect id="use5343" x="159" width="1" height="5" color="#000000"/><rect id="use5345" x="161" width="1" height="5" color="#000000"/><rect id="use5347" x="163" width="1" height="5" color="#000000"/></g></g></svg>
diff --git a/res/skins/LateNight/style_flip/progressbar_bg.svg b/res/skins/LateNight/style_flip/progressbar_bg.svg
new file mode 100644
index 000000000000..c9f10c1a3688
--- /dev/null
+++ b/res/skins/LateNight/style_flip/progressbar_bg.svg
@@ -0,0 +1 @@
+<svg id="svg2" width="164" height="5" version="1.1" xmlns="http://www.w3.org/2000/svg"><g id="layer4"><rect id="use5185-3" width="164" height="5" color="#000000"/><g id="g11605" fill="#333"><rect id="use5185" x="1" width="1" height="5" color="#000000"/><rect id="use5187" x="3" width="1" height="5" color="#000000"/><rect id="use5189" x="5" width="1" height="5" color="#000000"/><rect id="use5191" x="7" width="1" height="5" color="#000000"/><rect id="use5193" x="9" width="1" height="5" color="#000000"/><rect id="use5195" x="11" width="1" height="5" color="#000000"/><rect id="use5197" x="13" width="1" height="5" color="#000000"/><rect id="use5199" x="15" width="1" height="5" color="#000000"/><rect id="use5201" x="17" width="1" height="5" color="#000000"/><rect id="use5203" x="19" width="1" height="5" color="#000000"/><rect id="use5205" x="21" width="1" height="5" color="#000000"/><rect id="use5207" x="23" width="1" height="5" color="#000000"/><rect id="use5209" x="25" width="1" height="5" color="#000000"/><rect id="use5211" x="27" width="1" height="5" color="#000000"/><rect id="use5213" x="29" width="1" height="5" color="#000000"/><rect id="use5215" x="31" width="1" height="5" color="#000000"/><rect id="use5217" x="33" width="1" height="5" color="#000000"/><rect id="use5219" x="35" width="1" height="5" color="#000000"/><rect id="use5221" x="37" width="1" height="5" color="#000000"/><rect id="use5223" x="39" width="1" height="5" color="#000000"/><rect id="use5225" x="41" width="1" height="5" color="#000000"/><rect id="use5227" x="43" width="1" height="5" color="#000000"/><rect id="use5229" x="45" width="1" height="5" color="#000000"/><rect id="use5231" x="47" width="1" height="5" color="#000000"/><rect id="use5233" x="49" width="1" height="5" color="#000000"/><rect id="use5235" x="51" width="1" height="5" color="#000000"/><rect id="use5237" x="53" width="1" height="5" color="#000000"/><rect id="use5239" x="55" width="1" height="5" color="#000000"/><rect id="use5241" x="57" width="1" height="5" color="#000000"/><rect id="use5243" x="59" width="1" height="5" color="#000000"/><rect id="use5245" x="61" width="1" height="5" color="#000000"/><rect id="use5247" x="63" width="1" height="5" color="#000000"/><rect id="use5249" x="65" width="1" height="5" color="#000000"/><rect id="use5251" x="67" width="1" height="5" color="#000000"/><rect id="use5253" x="69" width="1" height="5" color="#000000"/><rect id="use5255" x="71" width="1" height="5" color="#000000"/><rect id="use5257" x="73" width="1" height="5" color="#000000"/><rect id="use5259" x="75" width="1" height="5" color="#000000"/><rect id="use5261" x="77" width="1" height="5" color="#000000"/><rect id="use5263" x="79" width="1" height="5" color="#000000"/><rect id="use5265" x="81" width="1" height="5" color="#000000"/><rect id="use5267" x="83" width="1" height="5" color="#000000"/><rect id="use5269" x="85" width="1" height="5" color="#000000"/><rect id="use5271" x="87" width="1" height="5" color="#000000"/><rect id="use5273" x="89" width="1" height="5" color="#000000"/><rect id="use5275" x="91" width="1" height="5" color="#000000"/><rect id="use5277" x="93" width="1" height="5" color="#000000"/><rect id="use5279" x="95" width="1" height="5" color="#000000"/><rect id="use5281" x="97" width="1" height="5" color="#000000"/><rect id="use5283" x="99" width="1" height="5" color="#000000"/><rect id="use5285" x="101" width="1" height="5" color="#000000"/><rect id="use5287" x="103" width="1" height="5" color="#000000"/><rect id="use5289" x="105" width="1" height="5" color="#000000"/><rect id="use5291" x="107" width="1" height="5" color="#000000"/><rect id="use5293" x="109" width="1" height="5" color="#000000"/><rect id="use5295" x="111" width="1" height="5" color="#000000"/><rect id="use5297" x="113" width="1" height="5" color="#000000"/><rect id="use5299" x="115" width="1" height="5" color="#000000"/><rect id="use5301" x="117" width="1" height="5" color="#000000"/><rect id="use5303" x="119" width="1" height="5" color="#000000"/><rect id="use5305" x="121" width="1" height="5" color="#000000"/><rect id="use5307" x="123" width="1" height="5" color="#000000"/><rect id="use5309" x="125" width="1" height="5" color="#000000"/><rect id="use5311" x="127" width="1" height="5" color="#000000"/><rect id="use5313" x="129" width="1" height="5" color="#000000"/><rect id="use5315" x="131" width="1" height="5" color="#000000"/><rect id="use5317" x="133" width="1" height="5" color="#000000"/><rect id="use5319" x="135" width="1" height="5" color="#000000"/><rect id="use5321" x="137" width="1" height="5" color="#000000"/><rect id="use5323" x="139" width="1" height="5" color="#000000"/><rect id="use5325" x="141" width="1" height="5" color="#000000"/><rect id="use5327" x="143" width="1" height="5" color="#000000"/><rect id="use5329" x="145" width="1" height="5" color="#000000"/><rect id="use5331" x="147" width="1" height="5" color="#000000"/><rect id="use5333" x="149" width="1" height="5" color="#000000"/><rect id="use5335" x="151" width="1" height="5" color="#000000"/><rect id="use5337" x="153" width="1" height="5" color="#000000"/><rect id="use5339" x="155" width="1" height="5" color="#000000"/><rect id="use5341" x="157" width="1" height="5" color="#000000"/><rect id="use5343" x="159" width="1" height="5" color="#000000"/><rect id="use5345" x="161" width="1" height="5" color="#000000"/><rect id="use5347" x="163" width="1" height="5" color="#000000"/></g></g></svg>
diff --git a/res/skins/LateNight/style_flip/spinny1_mask.svg b/res/skins/LateNight/style_flip/spinny1_mask.svg
new file mode 100644
index 000000000000..a433d6fef144
--- /dev/null
+++ b/res/skins/LateNight/style_flip/spinny1_mask.svg
@@ -0,0 +1,12 @@
+<svg width="100" height="100" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<radialGradient id="a" cx="50.003" cy="45.492" r="20.077" gradientTransform="matrix(1.0417 0 0 1.0417 -2.086 2.6121)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#eece33" offset="0"/>
+			<stop stop-color="#eece33" stop-opacity="0" offset="1"/>
+		</radialGradient>
+	</defs>
+	<path d="m70.913 50a20.913 20.913 0 0 1-41.827 0 20.913 20.913 0 1 1 41.827 0z" fill="url(#a)" opacity=".4"/>
+	<path d="m54.167 50a4.1667 4.1667 0 0 1-8.3333 0 4.1667 4.1667 0 1 1 8.3333 0z"/>
+	<path d="m0 0v100h100v-100zm50 3.125c12.259 0 24.47 5.0688 33.138 13.737 8.6682 8.6682 13.737 20.879 13.737 33.138s-5.0688 24.47-13.737 33.138l-.09766.09766c-8.6622 8.6087-20.828 13.639-33.04 13.639-12.259 0-24.47-5.0688-33.138-13.737l-.09766-.09766c-8.6087-8.6622-13.639-20.828-13.639-33.04 0-12.259 5.0688-24.47 13.737-33.138 8.6682-8.6682 20.879-13.737 33.138-13.737z" color="#000000" enable-background="accumulate" fill="#0f0f0e"/>
+	<path d="m96.875 50a46.875 46.875 0 0 1-93.75 0 46.875 46.875 0 1 1 93.75 0z" enable-background="new" fill="none" stroke="#000"/>
+</svg>
diff --git a/res/skins/LateNight/style_flip/spinny2_mask.svg b/res/skins/LateNight/style_flip/spinny2_mask.svg
new file mode 100644
index 000000000000..a433d6fef144
--- /dev/null
+++ b/res/skins/LateNight/style_flip/spinny2_mask.svg
@@ -0,0 +1,12 @@
+<svg width="100" height="100" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<radialGradient id="a" cx="50.003" cy="45.492" r="20.077" gradientTransform="matrix(1.0417 0 0 1.0417 -2.086 2.6121)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#eece33" offset="0"/>
+			<stop stop-color="#eece33" stop-opacity="0" offset="1"/>
+		</radialGradient>
+	</defs>
+	<path d="m70.913 50a20.913 20.913 0 0 1-41.827 0 20.913 20.913 0 1 1 41.827 0z" fill="url(#a)" opacity=".4"/>
+	<path d="m54.167 50a4.1667 4.1667 0 0 1-8.3333 0 4.1667 4.1667 0 1 1 8.3333 0z"/>
+	<path d="m0 0v100h100v-100zm50 3.125c12.259 0 24.47 5.0688 33.138 13.737 8.6682 8.6682 13.737 20.879 13.737 33.138s-5.0688 24.47-13.737 33.138l-.09766.09766c-8.6622 8.6087-20.828 13.639-33.04 13.639-12.259 0-24.47-5.0688-33.138-13.737l-.09766-.09766c-8.6087-8.6622-13.639-20.828-13.639-33.04 0-12.259 5.0688-24.47 13.737-33.138 8.6682-8.6682 20.879-13.737 33.138-13.737z" color="#000000" enable-background="accumulate" fill="#0f0f0e"/>
+	<path d="m96.875 50a46.875 46.875 0 0 1-93.75 0 46.875 46.875 0 1 1 93.75 0z" enable-background="new" fill="none" stroke="#000"/>
+</svg>
diff --git a/res/skins/LateNight/style_flip/spinny3_mask.svg b/res/skins/LateNight/style_flip/spinny3_mask.svg
new file mode 100644
index 000000000000..04fb55fe958b
--- /dev/null
+++ b/res/skins/LateNight/style_flip/spinny3_mask.svg
@@ -0,0 +1,12 @@
+<svg width="100" height="100" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<radialGradient id="a" cx="50.003" cy="45.492" r="20.077" gradientTransform="matrix(1.0417 0 0 1.0417 -2.086 2.6121)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#09b2ae" offset="0"/>
+			<stop stop-color="#09b2ae" stop-opacity="0" offset="1"/>
+		</radialGradient>
+	</defs>
+	<path d="m70.913 50a20.913 20.913 0 0 1-41.827 0 20.913 20.913 0 1 1 41.827 0z" fill="url(#a)" opacity=".4"/>
+	<path d="m54.167 50a4.1667 4.1667 0 0 1-8.3333 0 4.1667 4.1667 0 1 1 8.3333 0z" enable-background="new"/>
+	<path d="m0 0v100h100v-100zm50 3.125c12.259 0 24.47 5.0688 33.138 13.737 8.6682 8.6682 13.737 20.879 13.737 33.138s-5.0688 24.47-13.737 33.138l-.09766.09766c-8.6622 8.6087-20.828 13.639-33.04 13.639-12.259 0-24.47-5.0688-33.138-13.737l-.09766-.09766c-8.6087-8.6622-13.639-20.828-13.639-33.04 0-12.259 5.0688-24.47 13.737-33.138 8.6682-8.6682 20.879-13.737 33.138-13.737z" color="#000000" enable-background="accumulate" fill="#0f0f0e"/>
+	<path d="m96.875 50a46.875 46.875 0 0 1-93.75 0 46.875 46.875 0 1 1 93.75 0z" enable-background="new" fill="none" stroke="#000"/>
+</svg>
diff --git a/res/skins/LateNight/style_flip/spinny4_mask.svg b/res/skins/LateNight/style_flip/spinny4_mask.svg
new file mode 100644
index 000000000000..04fb55fe958b
--- /dev/null
+++ b/res/skins/LateNight/style_flip/spinny4_mask.svg
@@ -0,0 +1,12 @@
+<svg width="100" height="100" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<defs>
+		<radialGradient id="a" cx="50.003" cy="45.492" r="20.077" gradientTransform="matrix(1.0417 0 0 1.0417 -2.086 2.6121)" gradientUnits="userSpaceOnUse">
+			<stop stop-color="#09b2ae" offset="0"/>
+			<stop stop-color="#09b2ae" stop-opacity="0" offset="1"/>
+		</radialGradient>
+	</defs>
+	<path d="m70.913 50a20.913 20.913 0 0 1-41.827 0 20.913 20.913 0 1 1 41.827 0z" fill="url(#a)" opacity=".4"/>
+	<path d="m54.167 50a4.1667 4.1667 0 0 1-8.3333 0 4.1667 4.1667 0 1 1 8.3333 0z" enable-background="new"/>
+	<path d="m0 0v100h100v-100zm50 3.125c12.259 0 24.47 5.0688 33.138 13.737 8.6682 8.6682 13.737 20.879 13.737 33.138s-5.0688 24.47-13.737 33.138l-.09766.09766c-8.6622 8.6087-20.828 13.639-33.04 13.639-12.259 0-24.47-5.0688-33.138-13.737l-.09766-.09766c-8.6087-8.6622-13.639-20.828-13.639-33.04 0-12.259 5.0688-24.47 13.737-33.138 8.6682-8.6682 20.879-13.737 33.138-13.737z" color="#000000" enable-background="accumulate" fill="#0f0f0e"/>
+	<path d="m96.875 50a46.875 46.875 0 0 1-93.75 0 46.875 46.875 0 1 1 93.75 0z" enable-background="new" fill="none" stroke="#000"/>
+</svg>
diff --git a/res/skins/LateNight/style_flip/spinny_bg.svg b/res/skins/LateNight/style_flip/spinny_bg.svg
new file mode 100644
index 000000000000..8c720b95aada
--- /dev/null
+++ b/res/skins/LateNight/style_flip/spinny_bg.svg
@@ -0,0 +1 @@
+<svg width="96" height="96" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect y="-2.057e-7" width="96" height="96" color="#000000" enable-background="accumulate" fill="#020202"/></svg>
diff --git a/res/skins/LateNight/style_flip/spinny_indicator.svg b/res/skins/LateNight/style_flip/spinny_indicator.svg
new file mode 100644
index 000000000000..a7a130439a55
--- /dev/null
+++ b/res/skins/LateNight/style_flip/spinny_indicator.svg
@@ -0,0 +1,8 @@
+<svg width="110" height="110" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g shape-rendering="auto">
+		<path d="m54.20605 3.0989008c-2.87145 0-5.20605-.1267242-5.20605 2.5090193v35.6198829c0 2.635743 2.3346 4.778706 5.20605 4.778706h1.587899c2.871451 0 5.206051-2.142963 5.206051-4.778706v-35.6198829c0-2.6357435-2.3346-2.5090193-5.206051-2.5090193z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill-opacity=".62745098" image-rendering="auto" solid-color="#000000" stroke-width=".99999994" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<path d="m54.4707 3.3479471c-1.9143 0-3.4707 2.9e-6-3.4707 1.6032609v35.235408c0 2.206414 1.5564 4.000313 3.4707 4.000313h1.0586c1.9143 0 3.4707-1.793899 3.4707-4.000313v-35.235408c0-1.603258-1.5564-1.6032609-3.4707-1.6032609z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill-opacity=".62745098" image-rendering="auto" solid-color="#000000" stroke-width=".99999994" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<path d="m54.65411 3.9496929h.69178c.921217 0 1.65411.6460174 1.65411 2.1569774v33.5984117c0 1.51107-.732909 2.71315-1.65411 2.71315h-.69178c-.921217 0-1.65411-1.20219-1.65411-2.71315v-33.5984117c0-1.51107.732909-2.1569774 1.65411-2.1569774z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="none" image-rendering="auto" solid-color="#000000" stroke="#000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<path d="m54.65411 3.9496929h.69178c.921217 0 1.65411.6460176 1.65411 2.1569776v33.5984115c0 1.51107-.732909 2.71315-1.65411 2.71315h-.69178c-.921217 0-1.65411-1.20219-1.65411-2.71315v-33.5984115c0-1.51107.732909-2.1569776 1.65411-2.1569776z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#fff" image-rendering="auto" solid-color="#000000" stroke-width=".99999994" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_flip/spinny_indicator_ghost.svg b/res/skins/LateNight/style_flip/spinny_indicator_ghost.svg
new file mode 100644
index 000000000000..e825c25e47e5
--- /dev/null
+++ b/res/skins/LateNight/style_flip/spinny_indicator_ghost.svg
@@ -0,0 +1,7 @@
+<svg width="110" height="110" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g shape-rendering="auto">
+		<path d="m54.20605 3.0989052c-2.87145 0-5.20605-.1267242-5.20605 2.5090193v35.6198825c0 2.635743 2.3346 4.778706 5.20605 4.778706h1.587899c2.871451 0 5.206051-2.142963 5.206051-4.778706v-35.6198825c0-2.6357435-2.3346-2.5090193-5.206051-2.5090193z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill-opacity=".62745098" image-rendering="auto" solid-color="#000000" stroke-width=".99999994" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<path d="m54.4707 3.3479515c-1.9143 0-3.4707 2.9e-6-3.4707 1.6032609v35.2354076c0 2.206414 1.5564 4.000313 3.4707 4.000313h1.0586c1.9143 0 3.4707-1.793899 3.4707-4.000313v-35.2354076c0-1.603258-1.5564-1.6032609-3.4707-1.6032609z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill-opacity=".62745098" image-rendering="auto" solid-color="#000000" stroke-width=".99999994" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<path d="m54.999859 3.9908904s1.99985-.00289 1.999861 1.3758096l.00028 35.5113c1.1e-5 1.378802-2.000141 1.37544-2.000141 1.37544s-1.999568.0033-1.999579-1.37544l-.00028-35.5113c-1.1e-5-1.3788008 1.999859-1.3758096 1.999859-1.3758096z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#1af000" fill-opacity=".96651001" image-rendering="auto" solid-color="#000000" stroke-width=".95523119" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_flip/splitter_handle_checked.png b/res/skins/LateNight/style_flip/splitter_handle_checked.png
new file mode 100644
index 000000000000..1635a9601973
Binary files /dev/null and b/res/skins/LateNight/style_flip/splitter_handle_checked.png differ
diff --git a/res/skins/LateNight/style_flip/splitter_handle_horizontal_checked.png b/res/skins/LateNight/style_flip/splitter_handle_horizontal_checked.png
new file mode 100644
index 000000000000..14060ce6afdf
Binary files /dev/null and b/res/skins/LateNight/style_flip/splitter_handle_horizontal_checked.png differ
diff --git a/res/skins/LateNight/style_flip/splitter_handle_horizontal_unchecked.png b/res/skins/LateNight/style_flip/splitter_handle_horizontal_unchecked.png
new file mode 100644
index 000000000000..df271fa67663
Binary files /dev/null and b/res/skins/LateNight/style_flip/splitter_handle_horizontal_unchecked.png differ
diff --git a/res/skins/LateNight/style_flip/splitter_handle_horizontal_unchecked.svg b/res/skins/LateNight/style_flip/splitter_handle_horizontal_unchecked.svg
new file mode 100644
index 000000000000..107935a6d03f
--- /dev/null
+++ b/res/skins/LateNight/style_flip/splitter_handle_horizontal_unchecked.svg
@@ -0,0 +1,14 @@
+<svg width="1270" height="10" version="1.1" viewBox="0 0 336.02083 2.6458334" xmlns="http://www.w3.org/2000/svg" xmlns:osb="http://www.openswatchbook.org/uri/2009/osb" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs>
+		<linearGradient id="a" x1="-1.4552071" x2="337.47604" y1="293.825" y2="293.825" gradientUnits="userSpaceOnUse">
+			<stop offset="0"/>
+		</linearGradient>
+	</defs>
+	<g transform="translate(0,-294.35416)">
+		<path d="m156.10417 294.61874h3.96875v1.5875h15.875v-1.5875h161.39583v-3.43958h-338.6666654v3.43958h157.4270854" fill="#1e1e1e"/>
+		<path d="m-1.4550781 291.17969v3.70312h157.5585981l3.70481.00013v1.58789h16.40417v-1.58789l161.26406-.00013v-3.70312zm.2636719.26367h338.4023462v3.17578l-161.26406.00013v1.58789h-15.87292v-1.58789l-3.97044-.00013h-157.2949262z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="url(#a)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<rect x="161.39583" y="295.41251" width="13.229167" height=".26458335" style="paint-order:fill markers stroke"/>
+		<rect x="161.39583" y="294.61874" width="13.229167" height=".26458335" style="paint-order:fill markers stroke"/>
+		<path d="m160.07292 294.61874-.26458.26459v1.5875l.26458-.26459z" fill="#333"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/style_flip/splitter_handle_unchecked.png b/res/skins/LateNight/style_flip/splitter_handle_unchecked.png
new file mode 100644
index 000000000000..2d1f1de98979
Binary files /dev/null and b/res/skins/LateNight/style_flip/splitter_handle_unchecked.png differ
diff --git a/res/skins/LateNight/style_flip/toolbar_separator.png b/res/skins/LateNight/style_flip/toolbar_separator.png
new file mode 100644
index 000000000000..1aeee90ae580
Binary files /dev/null and b/res/skins/LateNight/style_flip/toolbar_separator.png differ
diff --git a/res/skins/LateNight/style_flip/vinyl_control_0.svg b/res/skins/LateNight/style_flip/vinyl_control_0.svg
new file mode 100644
index 000000000000..f4a5a61bddf0
--- /dev/null
+++ b/res/skins/LateNight/style_flip/vinyl_control_0.svg
@@ -0,0 +1 @@
+<svg id="svg4272" width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path834" d="m10 0a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm0 6a4 4 0 0 1 4 4 4 4 0 0 1-4 4 4 4 0 0 1-4-4 4 4 0 0 1 4-4z" color="#000000" fill="#888"/><path id="path834-6" d="m11 10a1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1 1 1 0 0 1 1 1z" color="#000000" fill="#666"/></svg>
diff --git a/res/skins/LateNight/style_flip/vinyl_control_1.svg b/res/skins/LateNight/style_flip/vinyl_control_1.svg
new file mode 100644
index 000000000000..44abfb9fece7
--- /dev/null
+++ b/res/skins/LateNight/style_flip/vinyl_control_1.svg
@@ -0,0 +1 @@
+<svg id="svg4272" width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path834" d="m10 0a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm0 6a4 4 0 0 1 4 4 4 4 0 0 1-4 4 4 4 0 0 1-4-4 4 4 0 0 1 4-4z" color="#000000" fill="#26a803"/><path id="path834-6" d="m11 10a1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1 1 1 0 0 1 1 1z" color="#000000" fill="#26a803"/></svg>
diff --git a/res/skins/LateNight/style_flip/vinyl_control_2.svg b/res/skins/LateNight/style_flip/vinyl_control_2.svg
new file mode 100644
index 000000000000..89055e6bac78
--- /dev/null
+++ b/res/skins/LateNight/style_flip/vinyl_control_2.svg
@@ -0,0 +1 @@
+<svg id="svg4272" width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path834" d="m10 0a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm0 6a4 4 0 0 1 4 4 4 4 0 0 1-4 4 4 4 0 0 1-4-4 4 4 0 0 1 4-4z" color="#000000" fill="#ffe815"/><path id="path834-6" d="m11 10a1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1 1 1 0 0 1 1 1z" color="#000000" fill="#ffe815"/></svg>
diff --git a/res/skins/LateNight/style_flip/vinyl_control_3.svg b/res/skins/LateNight/style_flip/vinyl_control_3.svg
new file mode 100644
index 000000000000..5fca7aa2b9fb
--- /dev/null
+++ b/res/skins/LateNight/style_flip/vinyl_control_3.svg
@@ -0,0 +1 @@
+<svg id="svg4272" width="20" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path834" d="m10 0a10 10 0 0 0-10 10 10 10 0 0 0 10 10 10 10 0 0 0 10-10 10 10 0 0 0-10-10zm0 6a4 4 0 0 1 4 4 4 4 0 0 1-4 4 4 4 0 0 1-4-4 4 4 0 0 1 4-4z" color="#000000" fill="#e602cd"/><path id="path834-6" d="m11 10a1 1 0 0 1-1 1 1 1 0 0 1-1-1 1 1 0 0 1 1-1 1 1 0 0 1 1 1z" color="#000000" fill="#e602cd"/></svg>
diff --git a/res/skins/LateNight/style_flip/vu_clipping_deck.png b/res/skins/LateNight/style_flip/vu_clipping_deck.png
new file mode 100644
index 000000000000..fe190c376af1
Binary files /dev/null and b/res/skins/LateNight/style_flip/vu_clipping_deck.png differ
diff --git a/res/skins/LateNight/style_flip/vu_clipping_deck_over.png b/res/skins/LateNight/style_flip/vu_clipping_deck_over.png
new file mode 100644
index 000000000000..83f7ce460dc4
Binary files /dev/null and b/res/skins/LateNight/style_flip/vu_clipping_deck_over.png differ
diff --git a/res/skins/LateNight/style_flip/vu_clipping_small.png b/res/skins/LateNight/style_flip/vu_clipping_small.png
new file mode 100644
index 000000000000..1a9bf44ff13d
Binary files /dev/null and b/res/skins/LateNight/style_flip/vu_clipping_small.png differ
diff --git a/res/skins/LateNight/style_flip/vu_clipping_small_over.png b/res/skins/LateNight/style_flip/vu_clipping_small_over.png
new file mode 100644
index 000000000000..94442d3066a5
Binary files /dev/null and b/res/skins/LateNight/style_flip/vu_clipping_small_over.png differ
diff --git a/res/skins/LateNight/style_flip/vu_level_deck.png b/res/skins/LateNight/style_flip/vu_level_deck.png
new file mode 100644
index 000000000000..d06e5baec76b
Binary files /dev/null and b/res/skins/LateNight/style_flip/vu_level_deck.png differ
diff --git a/res/skins/LateNight/style_flip/vu_level_deck_over.png b/res/skins/LateNight/style_flip/vu_level_deck_over.png
new file mode 100644
index 000000000000..37822643e069
Binary files /dev/null and b/res/skins/LateNight/style_flip/vu_level_deck_over.png differ
diff --git a/res/skins/LateNight/style_flip/vu_level_sampler.png b/res/skins/LateNight/style_flip/vu_level_sampler.png
new file mode 100644
index 000000000000..3db3f3e619c1
Binary files /dev/null and b/res/skins/LateNight/style_flip/vu_level_sampler.png differ
diff --git a/res/skins/LateNight/style_flip/vu_level_sampler_over.png b/res/skins/LateNight/style_flip/vu_level_sampler_over.png
new file mode 100644
index 000000000000..7d2ff651b617
Binary files /dev/null and b/res/skins/LateNight/style_flip/vu_level_sampler_over.png differ
diff --git a/res/skins/LateNight/style_flip/vu_level_small.png b/res/skins/LateNight/style_flip/vu_level_small.png
new file mode 100644
index 000000000000..8ed482774aa1
Binary files /dev/null and b/res/skins/LateNight/style_flip/vu_level_small.png differ
diff --git a/res/skins/LateNight/style_flip/vu_level_small_over.png b/res/skins/LateNight/style_flip/vu_level_small_over.png
new file mode 100644
index 000000000000..ebd0e658294d
Binary files /dev/null and b/res/skins/LateNight/style_flip/vu_level_small_over.png differ
diff --git a/res/skins/LateNight/toolbar.xml b/res/skins/LateNight/toolbar.xml
index 0019d1ff59e7..eec007227941 100644
--- a/res/skins/LateNight/toolbar.xml
+++ b/res/skins/LateNight/toolbar.xml
@@ -8,26 +8,27 @@
       <Template src="skin:button_2state.xml">
         <SetVariable name="TooltipId">maximize_library</SetVariable>
         <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
-        <SetVariable name="Size">84f,24f</SetVariable>
+        <SetVariable name="Size">84f,20f</SetVariable>
         <SetVariable name="state_0_text">BIG LIBRARY</SetVariable>
         <SetVariable name="state_1_text">BIG LIBRARY</SetVariable>
         <SetVariable name="ConfigKey">[Master],maximize_library</SetVariable>
       </Template>
 
       <WidgetGroup>
+        <ObjectName>ToolBarSection</ObjectName>
         <SizePolicy>min,min</SizePolicy>
         <Layout>horizontal</Layout>
         <Children>
 
           <WidgetGroup>
-            <ObjectName>ToolBarDivider</ObjectName>
+            <ObjectName>ToolBarSeparator</ObjectName>
             <Size>13f,9min</Size>
           </WidgetGroup>
 
           <Template src="skin:button_2state_persist.xml">
             <SetVariable name="TooltipId">show_mixer</SetVariable>
             <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
-            <SetVariable name="Size">48f,24f</SetVariable>
+            <SetVariable name="Size">48f,20f</SetVariable>
             <SetVariable name="state_0_text">MIXER</SetVariable>
             <SetVariable name="state_1_text">MIXER</SetVariable>
             <SetVariable name="ConfigKey">[Master],show_mixer</SetVariable>
@@ -36,7 +37,7 @@
           <Template src="skin:button_2state_persist.xml">
             <SetVariable name="TooltipId">show_effects</SetVariable>
             <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
-            <SetVariable name="Size">59f,24f</SetVariable>
+            <SetVariable name="Size">59f,20f</SetVariable>
             <SetVariable name="state_0_text">EFFECTS</SetVariable>
             <SetVariable name="state_1_text">EFFECTS</SetVariable>
             <SetVariable name="ConfigKey">[EffectRack1],show</SetVariable>
@@ -45,7 +46,7 @@
           <Template src="skin:button_2state_persist.xml">
             <SetVariable name="TooltipId">show_samplers</SetVariable>
             <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
-            <SetVariable name="Size">71f,24f</SetVariable>
+            <SetVariable name="Size">71f,20f</SetVariable>
             <SetVariable name="state_0_text">SAMPLERS</SetVariable>
             <SetVariable name="state_1_text">SAMPLERS</SetVariable>
             <SetVariable name="ConfigKey">[Samplers],show_samplers</SetVariable>
@@ -54,7 +55,7 @@
           <Template src="skin:button_2state_persist.xml">
             <SetVariable name="TooltipId">show_microphone</SetVariable>
             <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
-            <SetVariable name="Size">61f,24f</SetVariable>
+            <SetVariable name="Size">61f,20f</SetVariable>
             <SetVariable name="state_0_text">MIC/AUX</SetVariable>
             <SetVariable name="state_1_text">MIC/AUX</SetVariable>
             <SetVariable name="ConfigKey">[Microphone],show_microphone</SetVariable>
@@ -78,7 +79,7 @@
       <WidgetGroup><!-- Recording button & recording duration label -->
         <ObjectName>RecBox</ObjectName>
         <Layout>stacked</Layout>
-        <Size>72f,24f</Size>
+        <Size>72f,20f</Size>
         <!-- minus 1px border
             = 70x18 available for text -->
         <Children>
@@ -92,18 +93,22 @@
 
           <WidgetGroup><!-- Rec dot + RecDuration -->
             <Layout>horizontal</Layout>
-            <Size>68f,18f</Size>
+            <Size>68f,20f</Size>
             <Children>
               <Label>
                 <ObjectName>RecDot</ObjectName>
-                <Size>15f,18f</Size>
+                <Size>15f,20f</Size>
               </Label>  
 
               <RecordingDuration>
                 <ObjectName>RecDuration</ObjectName>
-                <Size>53f,18f</Size>
+                <Size>53f,20f</Size>
                 <InactiveText>REC</InactiveText>
                 <Alignment>center</Alignment>
+                <Connection>
+                  <ConfigKey>[Recording],status</ConfigKey>
+                  <BindProperty>highlight</BindProperty>
+                </Connection>
               </RecordingDuration>
             </Children>
           </WidgetGroup><!-- /Rec dot + RecDuration -->
@@ -112,7 +117,7 @@
           <Template src="skin:button_3state_display.xml">
             <SetVariable name="ObjectName">RecFeedback</SetVariable>
             <SetVariable name="TooltipId">toggle_recording</SetVariable>
-            <SetVariable name="Size">65f,18f</SetVariable>
+            <SetVariable name="Size">72f,20f</SetVariable>
             <SetVariable name="ConfigKey">[Recording],toggle_recording</SetVariable>
             <SetVariable name="ConfigKeyDisp">[Recording],status</SetVariable>
           </Template>
@@ -120,25 +125,25 @@
       </WidgetGroup><!-- /Recording button & recording duration label -->
 
       <PushButton>
-        <Size>82f,24f</Size>
+        <Size>82f,20f</Size>
         <TooltipId>skin_settings</TooltipId>
         <ObjectName>BroadcastButton</ObjectName>
         <NumberStates>4</NumberStates>
-        <State>
+        <State><!-- Off -->
           <Number>0</Number>
           <Text>Broadcast</Text>
         </State>
         <State>
           <Number>1</Number>
-          <Text>Broadcast</Text>
+          <Text>Connecting...</Text>
         </State>
         <State>
           <Number>2</Number>
-          <Text>Broadcast</Text>
+          <Text>ON AIR</Text>
         </State>
         <State>
           <Number>3</Number>
-          <Text>Broadcast</Text>
+          <Text>Conn. Failed</Text>
         </State>
         <Connection>
           <ConfigKey persist="true">[Shoutcast],enabled</ConfigKey>
@@ -150,12 +155,12 @@
       </PushButton>
 
       <WidgetGroup>
-        <ObjectName>ToolBarDivider</ObjectName>
+        <ObjectName>ToolBarSeparator</ObjectName>
         <Size>13f,9min</Size>
       </WidgetGroup>
 
       <PushButton>
-        <Size>80f,24f</Size>
+        <Size>80f,20f</Size>
         <TooltipId>skin_settings</TooltipId>
         <ObjectName>SettingsButton</ObjectName>
         <NumberStates>2</NumberStates>
@@ -216,8 +221,8 @@
             <TooltipId>audio_latency_usage</TooltipId>
             <ObjectName>LatencyMeter</ObjectName>
             <Size>63f,7f</Size>
-            <PathBack>style/latency_bg.svg</PathBack>
-            <PathVu>style/latency_over.svg</PathVu>
+            <PathBack>skin:/style_<Variable name="style_scheme"/>/latency_bg.svg</PathBack>
+            <PathVu>skin:/style_<Variable name="style_scheme"/>/latency_over.svg</PathVu>
             <Horizontal>true</Horizontal>
             <PeakHoldSize>5</PeakHoldSize>
             <PeakHoldTime>1000</PeakHoldTime>
@@ -233,15 +238,62 @@
             <ObjectName>Battery</ObjectName>
             <Size>24,24</Size>
             <SizePolicy>f,f</SizePolicy>
-            <PixmapUnknown scalemode="STRETCH_ASPECT">graphics/batt/ic_battery_unknown.svg</PixmapUnknown>
-            <PixmapCharged scalemode="STRETCH_ASPECT">graphics/batt/ic_battery_charged.svg</PixmapCharged>
+            <PixmapUnknown scalemode="STRETCH_ASPECT">skin:/style_<Variable name="style_scheme"/>/batt/ic_battery_unknown.svg</PixmapUnknown>
+            <PixmapCharged scalemode="STRETCH_ASPECT">skin:/style_<Variable name="style_scheme"/>/batt/ic_battery_charged.svg</PixmapCharged>
             <NumberStates>8</NumberStates>
-            <PixmapsCharging scalemode="STRETCH_ASPECT">graphics/batt/ic_battery_charging_%1.svg</PixmapsCharging>
-            <PixmapsDischarging scalemode="STRETCH_ASPECT">graphics/batt/ic_battery_discharging_%1.svg</PixmapsDischarging>
+            <PixmapsCharging scalemode="STRETCH_ASPECT">skin:/style_<Variable name="style_scheme"/>/batt/ic_battery_charging_%1.svg</PixmapsCharging>
+            <PixmapsDischarging scalemode="STRETCH_ASPECT">skin:/style_<Variable name="style_scheme"/>/batt/ic_battery_discharging_%1.svg</PixmapsDischarging>
           </Battery>
         </Children>
       </WidgetGroup>
 
+      <!-- A hack involving a SizeAwareStack and WidgetStacks
+        that toggles [LateNight],no_spinny_no_cover when both
+        [Skin],show_spinnies and [Skin],show_coverart are 0 -->
+      <WidgetGroup>
+        <Size>0f,3f</Size>
+        <Layout>vertical</Layout>
+        <Children>
+          <WidgetGroup>
+            <Size>0f,1f</Size>
+            <Connection>
+              <ConfigKey persist="true">[Skin],show_spinnies</ConfigKey>
+              <Transform><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+          <WidgetGroup>
+            <Size>0f,1f</Size>
+            <Connection>
+              <ConfigKey persist="true">[Skin],show_coverart</ConfigKey>
+              <Transform><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+          <!-- "Toggle" -->
+          <SizeAwareStack>
+            <Children>
+              <WidgetStack>
+                <SizePolicy>f,me</SizePolicy>
+                <MaximumSize>0,1</MaximumSize>
+                <Children>
+                  <WidgetGroup trigger="[LateNight],no_spinny_no_cover"><Size>1f,0f</Size></WidgetGroup>
+                  <WidgetGroup trigger="[LateNight],show_spinny_cover"><Size>1f,0f</Size></WidgetGroup>
+                </Children>
+              </WidgetStack>
+              <WidgetStack>
+                <SizePolicy>f,me</SizePolicy>
+                <MinimumSize>0,2</MinimumSize>
+                <Children>
+                  <WidgetGroup trigger="[LateNight],show_spinny_cover"><Size>1f,0f</Size></WidgetGroup>
+                  <WidgetGroup trigger="[LateNight],no_spinny_no_cover"><Size>1f,0f</Size></WidgetGroup>
+                </Children>
+              </WidgetStack>
+            </Children>
+          </SizeAwareStack>
+        </Children>
+      </WidgetGroup>
+
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/vumeter_channel.xml b/res/skins/LateNight/vumeter_channel.xml
index e0ffe1c12c4f..05f41d9af46a 100644
--- a/res/skins/LateNight/vumeter_channel.xml
+++ b/res/skins/LateNight/vumeter_channel.xml
@@ -19,16 +19,16 @@
     <Children>
       <StatusLight>
         <TooltipId>channel_PeakIndicator</TooltipId>
-        <PathStatusLight>style/vu_clipping_deck_over.png</PathStatusLight>
-        <PathBack>style/vu_clipping_deck.png</PathBack>
+        <PathStatusLight>skin:/style_<Variable name="style_scheme"/>/vu_clipping_deck_over.png</PathStatusLight>
+        <PathBack>skin:/style_<Variable name="style_scheme"/>/vu_clipping_deck.png</PathBack>
         <Connection>
           <ConfigKey><Variable name="group"/>,PeakIndicator</ConfigKey>
         </Connection>
       </StatusLight>
       <VuMeter>
         <TooltipId>channel_VuMeter</TooltipId>
-        <PathVu>style/vu_level_deck_over.png</PathVu>
-        <PathBack>style/vu_level_deck.png</PathBack>
+        <PathVu>skin:/style_<Variable name="style_scheme"/>/vu_level_deck_over.png</PathVu>
+        <PathBack>skin:/style_<Variable name="style_scheme"/>/vu_level_deck.png</PathBack>
         <Horizontal>false</Horizontal>
         <PeakHoldSize>5</PeakHoldSize>
         <PeakHoldTime>500</PeakHoldTime>
diff --git a/res/skins/LateNight/vumeter_latency.xml b/res/skins/LateNight/vumeter_latency.xml
index acf59712dab4..e6d28f2eff78 100644
--- a/res/skins/LateNight/vumeter_latency.xml
+++ b/res/skins/LateNight/vumeter_latency.xml
@@ -17,8 +17,8 @@
         <TooltipId><Variable name="TooltipId"/></TooltipId>
         <MinimumSize>64,4</MinimumSize>
         <MaximumSize>64,4</MaximumSize>
-        <PathVu>style/vumeter_latency_over.png</PathVu>
-        <PathBack>style/vumeter_latency_bg.png</PathBack>
+        <PathVu>skin:/style_<Variable name="style_scheme"/>/vumeter_latency_over.png</PathVu>
+        <PathBack>skin:/style_<Variable name="style_scheme"/>/vumeter_latency_bg.png</PathBack>
         <Horizontal>true</Horizontal>
         <PeakHoldSize>5</PeakHoldSize>
         <PeakHoldTime>1000</PeakHoldTime>
diff --git a/res/skins/LateNight/vumeter_master.xml b/res/skins/LateNight/vumeter_master.xml
index 2de42a2bebce..4cd2d854a739 100644
--- a/res/skins/LateNight/vumeter_master.xml
+++ b/res/skins/LateNight/vumeter_master.xml
@@ -24,16 +24,16 @@
         <Children>
           <StatusLight>
             <TooltipId>master_PeakIndicatorL</TooltipId>
-            <PathStatusLight>style/vu_clipping_deck_over.png</PathStatusLight>
-            <PathBack>style/vu_clipping_deck.png</PathBack>
+            <PathStatusLight>skin:/style_<Variable name="style_scheme"/>/vu_clipping_deck_over.png</PathStatusLight>
+            <PathBack>skin:/style_<Variable name="style_scheme"/>/vu_clipping_deck.png</PathBack>
             <Connection>
               <ConfigKey>[Master],PeakIndicatorL</ConfigKey>
             </Connection>
           </StatusLight>
           <VuMeter>
             <TooltipId>master_VuMeterL</TooltipId>
-            <PathVu>style/vu_level_deck_over.png</PathVu>
-            <PathBack>style/vu_level_deck.png</PathBack>
+            <PathVu>skin:/style_<Variable name="style_scheme"/>/vu_level_deck_over.png</PathVu>
+            <PathBack>skin:/style_<Variable name="style_scheme"/>/vu_level_deck.png</PathBack>
             <Horizontal>false</Horizontal>
             <PeakHoldSize>5</PeakHoldSize>
             <PeakHoldTime>500</PeakHoldTime>
@@ -52,16 +52,16 @@
         <Children>
           <StatusLight>
             <TooltipId>master_PeakIndicatorR</TooltipId>
-            <PathStatusLight>style/vu_clipping_deck_over.png</PathStatusLight>
-            <PathBack>style/vu_clipping_deck.png</PathBack>
+            <PathStatusLight>skin:/style_<Variable name="style_scheme"/>/vu_clipping_deck_over.png</PathStatusLight>
+            <PathBack>skin:/style_<Variable name="style_scheme"/>/vu_clipping_deck.png</PathBack>
             <Connection>
               <ConfigKey>[Master],PeakIndicatorR</ConfigKey>
             </Connection>
           </StatusLight>
           <VuMeter>
             <TooltipId>master_VuMeterR</TooltipId>
-            <PathVu>style/vu_level_deck_over.png</PathVu>
-            <PathBack>style/vu_level_deck.png</PathBack>
+            <PathVu>skin:/style_<Variable name="style_scheme"/>/vu_level_deck_over.png</PathVu>
+            <PathBack>skin:/style_<Variable name="style_scheme"/>/vu_level_deck.png</PathBack>
             <Horizontal>false</Horizontal>
             <PeakHoldSize>5</PeakHoldSize>
             <PeakHoldTime>500</PeakHoldTime>
diff --git a/res/skins/LateNight/vumeter_small.xml b/res/skins/LateNight/vumeter_small.xml
index 7b6e4f73b991..ce413bb08dd2 100644
--- a/res/skins/LateNight/vumeter_small.xml
+++ b/res/skins/LateNight/vumeter_small.xml
@@ -19,16 +19,16 @@
     <Children>
       <StatusLight>
         <TooltipId><Variable name="GroupType"/>_PeakIndicator</TooltipId>
-        <PathStatusLight>style/vu_clipping_small_over.png</PathStatusLight>
-        <PathBack>style/vu_clipping_small.png</PathBack>
+        <PathStatusLight>skin:/style_<Variable name="style_scheme"/>/vu_clipping_small_over.png</PathStatusLight>
+        <PathBack>skin:/style_<Variable name="style_scheme"/>/vu_clipping_small.png</PathBack>
         <Connection>
           <ConfigKey><Variable name="group"/>,PeakIndicator</ConfigKey>
         </Connection>
       </StatusLight>
       <VuMeter>
         <TooltipId><Variable name="GroupType"/>_VuMeter</TooltipId>
-        <PathVu>style/vu_level_small_over.png</PathVu>
-        <PathBack>style/vu_level_small.png</PathBack>
+        <PathVu>skin:/style_<Variable name="style_scheme"/>/vu_level_small_over.png</PathVu>
+        <PathBack>skin:/style_<Variable name="style_scheme"/>/vu_level_small.png</PathBack>
         <Horizontal>false</Horizontal>
         <PeakHoldSize>5</PeakHoldSize>
         <PeakHoldTime>500</PeakHoldTime>
diff --git a/res/skins/LateNight/waveform.xml b/res/skins/LateNight/waveform.xml
index 0076a004cd4f..85463c94b16b 100644
--- a/res/skins/LateNight/waveform.xml
+++ b/res/skins/LateNight/waveform.xml
@@ -1,5 +1,8 @@
 <Template>
+  <SetVariable name="btn_type">embedded</SetVariable>
+  <SetVariable name="btn_format">square</SetVariable>
   <SetVariable name="group">[Channel<Variable name="channum"/>]</SetVariable>
+
   <WidgetGroup>
     <ObjectName>Waveform</ObjectName>
     <Layout>horizontal</Layout>
@@ -9,16 +12,17 @@
         <TooltipId>waveform_display</TooltipId>
         <Channel><Variable name="channum"/></Channel>
         <BgColor><Variable name="SignalBgColor"/></BgColor>
-        <SignalColor><Variable name="signal_color"/></SignalColor>
+        <SignalColor><Variable name="SignalColor"/></SignalColor>
         <SignalRGBLowColor><Variable name="SignalRGBLowColor"/></SignalRGBLowColor>
         <SignalRGBMidColor><Variable name="SignalRGBMidColor"/></SignalRGBMidColor>
         <SignalRGBHighColor><Variable name="SignalRGBHighColor"/></SignalRGBHighColor>
-        <BeatColor>#ffffff</BeatColor>
+        <BeatColor><Variable name="BeatColor"/></BeatColor>
+        <AxesColor><Variable name="AxesColor"/></AxesColor>
         <BeatHighlightColor></BeatHighlightColor>
         <PlayPosColor>#00FF00</PlayPosColor>
-        <EndOfTrackColor>#EA0000</EndOfTrackColor>
+        <EndOfTrackColor><Variable name="EndOfTrackColor"/></EndOfTrackColor>
         <DefaultMark>
-          <Align>top|right</Align>
+          <Align>bottom|right</Align>
           <Color>#FF0000</Color>
           <TextColor>#FFFFFF</TextColor>
           <Text> %1 </Text>
@@ -33,14 +37,14 @@
         <Mark>
           <Control>loop_start_position</Control>
           <Text>IN</Text>
-          <Align>bottom</Align>
+          <Align>bottom|left</Align>
           <Color>#00FF00</Color>
           <TextColor>#FFFFFF</TextColor>
         </Mark>
         <Mark>
           <Control>loop_end_position</Control>
           <Text>OUT</Text>
-          <Align>bottom</Align>
+          <Align>bottom|right</Align>
           <Color>#00FF00</Color>
           <TextColor>#FFFFFF</TextColor>
         </Mark>
@@ -59,7 +63,7 @@
         <Mark>
           <Control>intro_start_position</Control>
           <Text>|&#9698;</Text>
-          <Align>bottom</Align>
+          <Align>bottom|left</Align>
           <Color>#0000FF</Color>
           <TextColor>#FFFFFF</TextColor>
           <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
@@ -67,7 +71,7 @@
         <Mark>
           <Control>intro_end_position</Control>
           <Text>&#9698;|</Text>
-          <Align>bottom</Align>
+          <Align>bottom|right</Align>
           <Color>#0000FF</Color>
           <TextColor>#FFFFFF</TextColor>
           <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
@@ -75,7 +79,7 @@
         <Mark>
           <Control>outro_start_position</Control>
           <Text>|&#9699;</Text>
-          <Align>bottom</Align>
+          <Align>bottom|left</Align>
           <Color>#0000FF</Color>
           <TextColor>#FFFFFF</TextColor>
           <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
@@ -83,7 +87,7 @@
         <Mark>
           <Control>outro_end_position</Control>
           <Text>&#9699;|</Text>
-          <Align>bottom</Align>
+          <Align>bottom|right</Align>
           <Color>#0000FF</Color>
           <TextColor>#FFFFFF</TextColor>
           <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
@@ -96,13 +100,20 @@
         <Mark>
           <Control>cue_point</Control>
           <Text>CUE</Text>
-          <Align>top</Align>
+          <Align>top|right</Align>
           <Color>#FF001C</Color>
           <TextColor>#FFFFFF</TextColor>
         </Mark>
       </Visual>
 
-      <WidgetGroup><!-- Transparent container for beatgrid buttons -->
+      <!-- 3D border like in all embedded containers.
+            Bottom border is created in waveforms_container.xml -->
+      <WidgetGroup>
+        <ObjectName>WaveformsRightBorder</ObjectName>
+        <Size><Variable name="SeparatorWidth"/>f,0min</Size>
+      </WidgetGroup>
+
+      <WidgetGroup>
         <ObjectName>BeatgridButtons</ObjectName>
         <Layout>vertical</Layout>
         <!-- Horizontal size is 82px and we'll add the WaveformContainer's negative margin
@@ -112,16 +123,14 @@
           <WidgetGroup><Size>1me,0me</Size></WidgetGroup>
 
           <WidgetGroup><!-- beat grid buttons row -->
-            <ObjectName>Spacer0f</ObjectName>
             <Layout>horizontal</Layout>
             <SizePolicy>f,f</SizePolicy>
             <Children>
               <Template src="skin:button_1state_right.xml">
                 <SetVariable name="TooltipId">beats_translate_curpos</SetVariable>
-                <SetVariable name="ObjectName">BeatGridButton</SetVariable>
-                <SetVariable name="state_0_pressed">beat_curpos_large_down</SetVariable>
-                <SetVariable name="state_0_unpressed">beat_curpos_large</SetVariable>
+                <SetVariable name="ObjectName">BeatCurposLarge</SetVariable>
                 <SetVariable name="Size">26f,52f</SetVariable>
+                <SetVariable name="btn_format">tall</SetVariable>
                 <SetVariable name="ConfigKey"><Variable name="group"/>,beats_translate_curpos</SetVariable>
                 <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beats_translate_match_alignment</SetVariable>
               </Template>
@@ -132,16 +141,14 @@
                 <Children>
                   <Template src="skin:button_1state.xml">
                     <SetVariable name="TooltipId">beats_translate_earlier</SetVariable>
-                    <SetVariable name="ObjectName">BeatGridButton</SetVariable>
-                    <SetVariable name="Icon">beats_earlier</SetVariable>
+                    <SetVariable name="ObjectName">BeatsEarlier</SetVariable>
                     <SetVariable name="Size">26f,26f</SetVariable>
                     <SetVariable name="ConfigKey"><Variable name="group"/>,beats_translate_earlier</SetVariable>
                   </Template>
 
                   <Template src="skin:button_1state.xml">
                     <SetVariable name="TooltipId">beats_adjust_faster</SetVariable>
-                    <SetVariable name="ObjectName">BeatGridButton</SetVariable>
-                    <SetVariable name="Icon">beats_faster</SetVariable>
+                    <SetVariable name="ObjectName">BeatsFaster</SetVariable>
                     <SetVariable name="Size">26f,26f</SetVariable>
                     <SetVariable name="ConfigKey"><Variable name="group"/>,beats_adjust_faster</SetVariable>
                   </Template>
@@ -154,15 +161,14 @@
                 <Children>
                   <Template src="skin:button_1state.xml">
                     <SetVariable name="TooltipId">beats_translate_later</SetVariable>
-                    <SetVariable name="ObjectName">BeatGridButton</SetVariable>
-                    <SetVariable name="Icon">beats_later</SetVariable>
+                    <SetVariable name="ObjectName">BeatsLater</SetVariable>
                     <SetVariable name="Size">26f,26f</SetVariable>
                     <SetVariable name="ConfigKey"><Variable name="group"/>,beats_translate_later</SetVariable>
                   </Template>
 
                   <Template src="skin:button_1state.xml">
                     <SetVariable name="TooltipId">beats_adjust_slower</SetVariable>
-                    <SetVariable name="ObjectName">BeatGridButton</SetVariable>
+                    <SetVariable name="ObjectName">BeatsSlower</SetVariable>
                     <SetVariable name="Icon">beats_slower</SetVariable>
                     <SetVariable name="Size">26f,26f</SetVariable>
                     <SetVariable name="ConfigKey"><Variable name="group"/>,beats_adjust_slower</SetVariable>
diff --git a/res/skins/LateNight/waveforms_container.xml b/res/skins/LateNight/waveforms_container.xml
index 284555e05d7e..e55afc609789 100644
--- a/res/skins/LateNight/waveforms_container.xml
+++ b/res/skins/LateNight/waveforms_container.xml
@@ -4,87 +4,117 @@
     <SizePolicy>me,min</SizePolicy>
     <Children>
 
-      <WidgetGroup><!-- Waveforms -->
-        <Layout>vertical</Layout>
-        <Size>100me,40me</Size>
+      <WidgetGroup>
+        <ObjectName>WaveformsContainer</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>me,min</SizePolicy>
         <Children>
 
-          <WidgetGroup><!-- Waveform 3 -->
-            <Layout>horizontal</Layout>
-            <SizePolicy>me,me</SizePolicy>
+          <WidgetGroup><!-- Waveforms -->
+            <Layout>vertical</Layout>
+            <Size>100me,40me</Size>
             <Children>
-              <Template src="skin:waveform.xml">
-                <SetVariable name="channum">3</SetVariable>
-                <SetVariable name="signal_color">#09B2AE</SetVariable>
-                <SetVariable name="SignalBgColor">#012322</SetVariable>
-                <SetVariable name="SignalRGBLowColor">#cb3433</SetVariable>
-                <SetVariable name="SignalRGBMidColor">#00ff33</SetVariable>
-                <SetVariable name="SignalRGBHighColor">#0034fe</SetVariable>
-              </Template>
-            </Children>
-            <Connection>
-              <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup><!-- Waveform 3 -->
 
-          <WidgetGroup><!-- Waveform 1 -->
-            <Layout>horizontal</Layout>
-            <SizePolicy>me,me</SizePolicy>
-            <Children>
-              <Template src="skin:waveform.xml">
-                <SetVariable name="channum">1</SetVariable>
-                <SetVariable name="signal_color">#E7C413</SetVariable>
-                <SetVariable name="SignalBgColor">#2f290a</SetVariable>
-                <SetVariable name="SignalRGBLowColor">#ff2a00</SetVariable>
-                <SetVariable name="SignalRGBMidColor">#33f600</SetVariable>
-                <SetVariable name="SignalRGBHighColor">#332acc</SetVariable>
-              </Template>
-            </Children>
-          </WidgetGroup>
+              <WidgetGroup><!-- Waveform 3 -->
+                <Layout>horizontal</Layout>
+                <SizePolicy>me,me</SizePolicy>
+                <Children>
+                  <Template src="skin:waveform.xml">
+                    <SetVariable name="channum">3</SetVariable>
+                    <SetVariable name="SignalColor"><Variable name="SignalColor_34"/></SetVariable>
+                    <SetVariable name="SignalBgColor"><Variable name="SignalBgColor_34"/></SetVariable>
+                    <SetVariable name="SignalRGBLowColor">#cb3433</SetVariable>
+                    <SetVariable name="SignalRGBMidColor">#00ff33</SetVariable>
+                    <SetVariable name="SignalRGBHighColor">#0034fe</SetVariable>
+                  </Template>
+                </Children>
+                <Connection>
+                  <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup><!-- Waveform 3 -->
 
-          <WidgetGroup><!-- Waveform 2 -->
-            <Layout>horizontal</Layout>
-            <SizePolicy>me,me</SizePolicy>
-            <Children>
-              <Template src="skin:waveform.xml">
-                <SetVariable name="channum">2</SetVariable>
-                <SetVariable name="signal_color">#E7C413</SetVariable>
-                <SetVariable name="SignalBgColor">#2f290a</SetVariable>
-                <SetVariable name="SignalRGBLowColor">#ff2a00</SetVariable>
-                <SetVariable name="SignalRGBMidColor">#33f600</SetVariable>
-                <SetVariable name="SignalRGBHighColor">#332acc</SetVariable>
-              </Template>
-            </Children>
-          </WidgetGroup><!-- Waveform 2 -->
+              <WidgetGroup><!-- Waveform 1 -->
+                <Layout>horizontal</Layout>
+                <SizePolicy>me,me</SizePolicy>
+                <Children>
+                  <Template src="skin:waveform.xml">
+                    <SetVariable name="channum">1</SetVariable>
+                    <SetVariable name="SignalColor"><Variable name="SignalColor_12"/></SetVariable>
+                    <SetVariable name="SignalBgColor"><Variable name="SignalBgColor_12"/></SetVariable>
+                    <SetVariable name="SignalRGBLowColor">#ff2a00</SetVariable>
+                    <SetVariable name="SignalRGBMidColor">#33f600</SetVariable>
+                    <SetVariable name="SignalRGBHighColor">#332acc</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup><!-- Waveform 2 -->
+                <Layout>horizontal</Layout>
+                <SizePolicy>me,me</SizePolicy>
+                <Children>
+                  <Template src="skin:waveform.xml">
+                    <SetVariable name="channum">2</SetVariable>
+                    <SetVariable name="SignalColor"><Variable name="SignalColor_12"/></SetVariable>
+                    <SetVariable name="SignalBgColor"><Variable name="SignalBgColor_12"/></SetVariable>
+                    <SetVariable name="SignalRGBLowColor">#ff2a00</SetVariable>
+                    <SetVariable name="SignalRGBMidColor">#33f600</SetVariable>
+                    <SetVariable name="SignalRGBHighColor">#332acc</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup><!-- Waveform 2 -->
+
+              <WidgetGroup><!-- Waveform 4 -->
+                <Layout>horizontal</Layout>
+                <SizePolicy>me,me</SizePolicy>
+                <Children>
+                  <Template src="skin:waveform.xml">
+                    <SetVariable name="channum">4</SetVariable>
+                    <SetVariable name="SignalColor"><Variable name="SignalColor_34"/></SetVariable>
+                    <SetVariable name="SignalBgColor"><Variable name="SignalBgColor_34"/></SetVariable>
+                    <SetVariable name="SignalRGBLowColor">#cb3433</SetVariable>
+                    <SetVariable name="SignalRGBMidColor">#00ff33</SetVariable>
+                    <SetVariable name="SignalRGBHighColor">#0034fe</SetVariable>
+                  </Template>
+                </Children>
+                <Connection>
+                  <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup><!-- Waveform 4 -->
+
+              <!-- 3D border like in all embedded containers.
+                   Right border is a similar widget in each instance of waveform.xml -->
+              <WidgetGroup>
+                <ObjectName>WaveformsBottomBorder</ObjectName>
+                <Size>0me,0min</Size>
+              </WidgetGroup>
 
-          <WidgetGroup><!-- Waveform 4 -->
-            <Layout>horizontal</Layout>
-            <SizePolicy>me,me</SizePolicy>
-            <Children>
-              <Template src="skin:waveform.xml">
-                <SetVariable name="channum">4</SetVariable>
-                <SetVariable name="signal_color">#09B2AE</SetVariable>
-                <SetVariable name="SignalBgColor">#012322</SetVariable>
-                <SetVariable name="SignalRGBLowColor">#cb3433</SetVariable>
-                <SetVariable name="SignalRGBMidColor">#00ff33</SetVariable>
-                <SetVariable name="SignalRGBHighColor">#0034fe</SetVariable>
-              </Template>
             </Children>
+          </WidgetGroup><!-- /Waveforms -->
+
+          <Template src="skin:button_2state_persist.xml">
+            <SetVariable name="ObjectName">BeatgridButtonsToggle</SetVariable>
+            <SetVariable name="Size">26f,40me</SetVariable>
+            <SetVariable name="btn_type"></SetVariable>
+            <SetVariable name="btn_format"></SetVariable>
+            <SetVariable name="ConfigKey">[Skin],beatgrid_buttons</SetVariable>
+          </Template>
+
+          <WidgetGroup>
+            <Size>2f,1min</Size>
             <Connection>
-              <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
+              <ConfigKey>[Master],skin_settings</ConfigKey>
               <BindProperty>visible</BindProperty>
             </Connection>
-          </WidgetGroup><!-- Waveform 4 -->
+          </WidgetGroup>
 
         </Children>
-      </WidgetGroup><!-- /Waveforms -->
-
-      <Template src="skin:button_2state_persist.xml">
-        <SetVariable name="ObjectName">BeatgridButtonsToggle</SetVariable>
-        <SetVariable name="Size">28f,40me</SetVariable>
-        <SetVariable name="ConfigKey">[Skin],beatgrid_buttons</SetVariable>
-      </Template>
+        <Connection>
+          <ConfigKey>[Master],skin_settings</ConfigKey>
+          <BindProperty>highlight</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- WaveformsContainer -->
 
       <WidgetGroup>
         <Size>5f,1min</Size>