diff --git a/res/fonts/OpenSans-Semibold.ttf b/res/fonts/OpenSans-Semibold.ttf
new file mode 100644
index 000000000000..1a7679e3949f
Binary files /dev/null and b/res/fonts/OpenSans-Semibold.ttf differ
diff --git a/res/skins/LateNight/aux_unit.xml b/res/skins/LateNight/aux_unit.xml
deleted file mode 100644
index 707274a882f8..000000000000
--- a/res/skins/LateNight/aux_unit.xml
+++ /dev/null
@@ -1,185 +0,0 @@
-<Template>
-  <SetVariable name="btn_type"><Variable name="TopRegion_btn_type"/></SetVariable>
-  <SetVariable name="group">[Auxiliary<Variable name="auxnum"/>]</SetVariable>
-  <SetVariable name="Type">auxiliary</SetVariable>
-
-  <!-- input device is configured -->
-  <WidgetGroup>
-    <ObjectName>MicAuxUnit</ObjectName>
-    <Layout>horizontal</Layout>
-    <SizePolicy>min,max</SizePolicy>
-    <MaximumSize>170,</MaximumSize>
-    <Children>
-
-      <WidgetGroup>
-        <ObjectName>MicAuxSubControlsFrame</ObjectName>
-        <Layout>stacked</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-
-          <WidgetGroup><!-- Gain, Pfl, FX buttons, VU -->
-            <ObjectName>MicAuxSubControls</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,me</SizePolicy>
-            <Children>
-
-              <WidgetGroup><!-- Gain, Pfl, FX buttons -->
-                <Layout>vertical</Layout>
-                <SizePolicy>min,me</SizePolicy>
-                <Children>
-                  <WidgetGroup>
-                    <ObjectName>MicAuxGainPFlContainer</ObjectName>
-                    <Layout>horizontal</Layout>
-                    <SizePolicy>min,me</SizePolicy>
-                    <Children>
-                      <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">auxiliary_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,min</SizePolicy>
-                        <Children>
-                          <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>
-                        </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">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>
-                        <Connection>
-                          <ConfigKey persist="true">[Skin],show_4effectunits</ConfigKey>
-                          <BindProperty>visible</BindProperty>
-                        </Connection>
-                      </WidgetGroup><!-- /FX buttons 1-4 -->
-                    </Children>
-                  </WidgetGroup><!-- MicAuxFxButtons * 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">auxiliary</SetVariable>
-                  </Template>
-                </Children>
-              </WidgetGroup>
-            </Children>
-          </WidgetGroup><!-- MicAuxSubControls -->
-
-          <!-- Background tile underneath controls container -->
-          <WidgetGroup>
-            <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>,21f</Size>
-                <Text>Aux <Variable name="auxnum"/></Text>
-                <Alignment>center</Alignment>
-              </Label>
-
-              <WidgetGroup>
-                <ObjectName>MicAuxPlayBox</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,me</SizePolicy>
-                <Children>
-                  <Template src="skin:button_2state.xml">
-                    <SetVariable name="TooltipId">master_enable</SetVariable>
-                    <SetVariable name="ObjectName">PlayAux</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"/>,master</SetVariable>
-                  </Template>
-                </Children>
-              </WidgetGroup>
-
-              <Template src="skin:button_xfader_aux.xml"/>
-
-            </Children>
-          </WidgetGroup><!-- MicAuxMainControls -->
-        </Children>
-      </WidgetGroup><!-- MicAuxMainControlsFrame  -->
-
-    </Children>
-    <Connection>
-      <ConfigKey><Variable name="group"/>,enabled</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
-  </WidgetGroup><!-- /MicAuxUnit -->
-</Template>
diff --git a/res/skins/LateNight/aux_unit_unconfigured.xml b/res/skins/LateNight/aux_unit_unconfigured.xml
deleted file mode 100644
index b39999ed7095..000000000000
--- a/res/skins/LateNight/aux_unit_unconfigured.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<Template>
-  <SetVariable name="btn_type"><Variable name="TopRegion_btn_type"/></SetVariable>
-  <SetVariable name="group">[Auxiliary<Variable name="auxnum"/>]</SetVariable>
-  <SetVariable name="Type">auxiliary</SetVariable>
-
-  <!-- input device is NOT configured -->
-  <WidgetGroup>
-    <ObjectName>MicAuxUnit</ObjectName>
-    <Layout>horizontal</Layout>
-    <SizePolicy>min,max</SizePolicy>
-    <MaximumSize>50,</MaximumSize>
-    <Children>
-
-      <WidgetGroup>
-        <ObjectName>MicAuxMainControlsFrame</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>me,me</SizePolicy>
-        <Children>
-          <WidgetGroup>
-            <ObjectName>MicAuxMainControls</ObjectName>
-            <Layout>vertical</Layout>
-            <SizePolicy>me,me</SizePolicy>
-            <Children>
-
-              <Label>
-                <ObjectName>MicAuxSubTitle</ObjectName>
-                <Size>,21f</Size>
-                <Text>Aux <Variable name="auxnum"/></Text>
-                <Alignment>center</Alignment>
-              </Label>
-
-              <WidgetGroup>
-                <ObjectName>MicAuxAddBox</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,me</SizePolicy>
-                <Children>
-                  <Template src="skin:button_1state.xml">
-                    <SetVariable name="TooltipId">configure_input</SetVariable>
-                    <SetVariable name="ObjectName">MicAuxAddButton</SetVariable>
-                    <SetVariable name="Size">26f,26f</SetVariable>
-                    <SetVariable name="btn_type">embedded</SetVariable>
-                    <SetVariable name="btn_format">square</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="group"/>,master</SetVariable>
-                  </Template>
-                </Children>
-              </WidgetGroup>
-
-            </Children>
-          </WidgetGroup><!-- MicAuxMainControls -->
-        </Children>
-      </WidgetGroup><!-- MicAuxMainControlsFrame -->
-
-    </Children>
-    <Connection>
-      <ConfigKey><Variable name="group"/>,enabled</ConfigKey>
-      <Transform><Not/></Transform>
-      <BindProperty>visible</BindProperty>
-    </Connection>
-  </WidgetGroup><!-- /MicAuxUnit -->
-</Template>
diff --git a/res/skins/LateNight/button_2state.xml b/res/skins/LateNight/button_2state.xml
deleted file mode 100644
index 0ce610fc2314..000000000000
--- a/res/skins/LateNight/button_2state.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-Description:
-  A button that has click or display controls.
-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>
-      <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>
-      <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>
-      <ButtonState>LeftButton</ButtonState>
-    </Connection>
-  </PushButton>
-</Template>
diff --git a/res/skins/LateNight/button_2state_persist.xml b/res/skins/LateNight/button_2state_persist.xml
deleted file mode 100644
index 6ef60b923c8e..000000000000
--- a/res/skins/LateNight/button_2state_persist.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<!--
-Description:
-  A button that has click or display controls.
-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>
-      <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>
-      <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>
-      <ButtonState>LeftButton</ButtonState>
-    </Connection>
-  </PushButton>
-</Template>
diff --git a/res/skins/LateNight/button_2state_right.xml b/res/skins/LateNight/button_2state_right.xml
deleted file mode 100644
index a25b82b4778d..000000000000
--- a/res/skins/LateNight/button_2state_right.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
-Description:
-  A button that has click or display controls.
-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
-  ConfigKeyRight    : right-click control
--->
-<Template>
-  <PushButton>
-    <TooltipId><Variable name="TooltipId"/></TooltipId>
-    <ObjectName><Variable name="ObjectName"/></ObjectName>
-    <Size><Variable name="Size"/></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"/>_<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>
-      <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>
-      <ButtonState>LeftButton</ButtonState>
-    </Connection>
-    <Connection>
-      <ConfigKey><Variable name="ConfigKeyRight"/></ConfigKey>
-      <ButtonState>RightButton</ButtonState>
-    </Connection>
-  </PushButton>
-</Template>
diff --git a/res/skins/LateNight/button_2state_right_display.xml b/res/skins/LateNight/button_2state_right_display.xml
deleted file mode 100644
index dea9f56a2dfd..000000000000
--- a/res/skins/LateNight/button_2state_right_display.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--
-Description:
-  A button that has click or display controls.
-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
-  ConfigKeyRight    : right-click control
-  ConfigKeyDisp     : display control
--->
-<Template>
-  <PushButton>
-    <TooltipId><Variable name="TooltipId"/></TooltipId>
-    <ObjectName><Variable name="ObjectName"/></ObjectName>
-    <Size><Variable name="Size"/></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"/>_<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>
-      <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>
-      <ButtonState>LeftButton</ButtonState>
-    </Connection>
-    <Connection>
-      <ConfigKey><Variable name="ConfigKeyRight"/></ConfigKey>
-      <ButtonState>RightButton</ButtonState>
-    </Connection>
-    <Connection>
-      <ConfigKey><Variable name="ConfigKeyDisp"/></ConfigKey>
-      <ConnectValueFromWidget>false</ConnectValueFromWidget>
-    </Connection>
-  </PushButton>
-</Template>
diff --git a/res/skins/LateNight/button_3state.xml b/res/skins/LateNight/button_3state.xml
deleted file mode 100644
index bad1b18b6943..000000000000
--- a/res/skins/LateNight/button_3state.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
-Description:
-  A button that has click or display controls.
-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
-  ConfigKeyDisp     : display control
--->
-<Template>
-  <PushButton>
-    <TooltipId><Variable name="TooltipId"/></TooltipId>
-    <ObjectName><Variable name="ObjectName"/></ObjectName>
-    <Size><Variable name="Size"/></Size>
-    <NumberStates>3</NumberStates>
-    <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"/>_<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>
-      <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>
-      <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>
-      <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-      <ButtonState>LeftButton</ButtonState>
-    </Connection>
-  </PushButton>
-</Template>
diff --git a/res/skins/LateNight/button_3state_display.xml b/res/skins/LateNight/button_3state_display.xml
deleted file mode 100644
index 0992c9523586..000000000000
--- a/res/skins/LateNight/button_3state_display.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
-Description:
-  A button that has click or display controls.
-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
-  ConfigKeyDisp     : display control
--->
-<Template>
-  <PushButton>
-    <TooltipId><Variable name="TooltipId"/></TooltipId>
-    <ObjectName><Variable name="ObjectName"/></ObjectName>
-    <Size><Variable name="Size"/></Size>
-    <NumberStates>3</NumberStates>
-    <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"/>_<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>
-      <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>
-      <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>
-      <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-      <ButtonState>LeftButton</ButtonState>
-    </Connection>
-    <Connection>
-      <ConfigKey><Variable name="ConfigKeyDisp"/></ConfigKey>
-      <ConnectValueFromWidget>false</ConnectValueFromWidget>
-    </Connection>
-  </PushButton>
-</Template>
diff --git a/res/skins/LateNight/button_3state_persist.xml b/res/skins/LateNight/button_3state_persist.xml
deleted file mode 100644
index 6d24caab223b..000000000000
--- a/res/skins/LateNight/button_3state_persist.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
-Description:
-  A button that has click or display controls.
-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
-  ConfigKeyDisp     : display control
--->
-<Template>
-  <PushButton>
-    <TooltipId><Variable name="TooltipId"/></TooltipId>
-    <ObjectName><Variable name="ObjectName"/></ObjectName>
-    <Size><Variable name="Size"/></Size>
-    <NumberStates>3</NumberStates>
-    <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"/>_<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>
-      <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>
-      <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>
-      <ButtonState>LeftButton</ButtonState>
-    </Connection>
-  </PushButton>
-</Template>
diff --git a/res/skins/LateNight/button_5state.xml b/res/skins/LateNight/button_5state.xml
deleted file mode 100644
index 78dbce113451..000000000000
--- a/res/skins/LateNight/button_5state.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<!--
-Description:
-  A button that has click or display controls.
-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>5</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"/>_<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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-      <ButtonState>LeftButton</ButtonState>
-    </Connection>
-  </PushButton>
-</Template>
diff --git a/res/skins/LateNight/button_hotcue.xml b/res/skins/LateNight/button_hotcue.xml
deleted file mode 100644
index dd4eb7d197cc..000000000000
--- a/res/skins/LateNight/button_hotcue.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!-- A hotcue button. The only variable that needs to be specified is "number" -->
-<Template>
-  <WidgetGroup>
-    <ObjectName>Hotcue<Variable name="number"/></ObjectName>
-    <MinimumSize>26,26</MinimumSize>
-    <MaximumSize>26,26</MaximumSize>
-    <SizePolicy>me,f</SizePolicy>
-    <Layout>horizontal</Layout>
-    <Children>
-      <HotcueButton>
-        <TooltipId>hotcue</TooltipId>
-        <ObjectName>HotcueButton</ObjectName>
-        <MinimumSize>26,26</MinimumSize>
-        <MaximumSize>26,26</MaximumSize>
-        <SizePolicy>me,f</SizePolicy>
-        <Group><Variable name="group"/></Group>
-        <Hotcue><Variable name="number"/></Hotcue>
-        <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>
-      </HotcueButton>
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/button_special_cue.xml b/res/skins/LateNight/button_special_cue.xml
deleted file mode 100644
index da95ad97cb65..000000000000
--- a/res/skins/LateNight/button_special_cue.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
-Description:
-  A special cue button to mark intro and outro sections in a track
-Variables:
-  group: The group for the controls.
-  cue_type: Prefix for COs.
-  label: Button text.
--->
-<Template>
-  <WidgetGroup>
-    <ObjectName>SpecialCueButton_<Variable name="cue_type"/></ObjectName>
-    <MinimumSize>22,26</MinimumSize>
-    <MaximumSize>26,26</MaximumSize>
-    <SizePolicy>me,f</SizePolicy>
-    <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
deleted file mode 100644
index 57b696e38496..000000000000
--- a/res/skins/LateNight/button_xfader_aux.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    A row of three buttons which set the deck's crossfader
-    orientation directly: L | M | R
-  Variables:
-    group:
-    xfaderLeft, xfaderRight: default | warning | off
-          Picks a colored icon for L,M,R depending on whether
-          the deck's orientation is the default, set to Master
-          or to the opposite side
--->
-<Template>
-  <WidgetGroup>
-    <ObjectName>CrossfaderButtonContainerAux</ObjectName>
-    <Layout>horizontal</Layout>
-    <SizePolicy>max,min</SizePolicy>
-    <Children>
-<!-- L -->
-      <PushButton>
-        <ObjectName>CrossfaderButton</ObjectName>
-        <TooltipId>orientation</TooltipId>
-        <Size>11f,13f</Size>
-        <NumberStates>2</NumberStates>
-        <RightClickIsPushButton>false</RightClickIsPushButton>
-        <State>
-          <Number>0</Number>
-          <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_<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>
-          <Transform>
-            <IsEqual>0</IsEqual>
-          </Transform>
-          <ButtonState>LeftButton</ButtonState>
-        </Connection>
-      </PushButton>
-<!-- M -->
-      <PushButton>
-        <ObjectName>CrossfaderButton</ObjectName>
-        <TooltipId>orientation</TooltipId>
-        <Size>11f,13f</Size>
-        <NumberStates>2</NumberStates>
-        <RightClickIsPushButton>false</RightClickIsPushButton>
-        <State>
-          <Number>0</Number>
-          <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_<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>
-          <Transform>
-            <Add>-1</Add>
-            <IsEqual>0</IsEqual>
-          </Transform>
-          <ButtonState>LeftButton</ButtonState>
-        </Connection>
-      </PushButton>
-<!-- R -->
-      <PushButton>
-        <ObjectName>CrossfaderButton</ObjectName>
-        <TooltipId>orientation</TooltipId>
-        <Size>11f,13f</Size>
-        <NumberStates>2</NumberStates>
-        <RightClickIsPushButton>false</RightClickIsPushButton>
-        <State>
-          <Number>0</Number>
-          <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_<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>
-          <Transform>
-            <Add>-2</Add>
-            <IsEqual>0</IsEqual>
-          </Transform>
-          <ButtonState>LeftButton</ButtonState>
-        </Connection>
-      </PushButton>
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/button_xfader_deck.xml b/res/skins/LateNight/button_xfader_deck.xml
deleted file mode 100644
index ef5035eee4ce..000000000000
--- a/res/skins/LateNight/button_xfader_deck.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    A row of three buttons which set the deck's crossfader
-    orientation directly: L | M | R
-  Variables:
-    group:
-    xfaderLeft, xfaderRight: default | warning | off
-          Picks a colored icon for L,M,R depending on whether
-          the deck's orientation is the default, set to Master
-          or to the opposite side
--->
-<Template>
-  <WidgetGroup>
-    <ObjectName>CrossfaderButtonContainerDeck</ObjectName>
-    <Layout>horizontal</Layout>
-    <SizePolicy>min,min</SizePolicy>
-    <Children>
-<!-- L -->
-      <PushButton>
-        <ObjectName>CrossfaderButton</ObjectName>
-        <TooltipId>orientation</TooltipId>
-        <Size>11f,15f</Size>
-        <NumberStates>2</NumberStates>
-        <RightClickIsPushButton>false</RightClickIsPushButton>
-        <State>
-          <Number>0</Number>
-          <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_<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>
-          <Transform>
-            <IsEqual>0</IsEqual>
-          </Transform>
-          <ButtonState>LeftButton</ButtonState>
-        </Connection>
-      </PushButton>
-<!-- M -->
-      <PushButton>
-        <ObjectName>CrossfaderButton</ObjectName>
-        <TooltipId>orientation</TooltipId>
-        <Size>11f,15f</Size>
-        <NumberStates>2</NumberStates>
-        <RightClickIsPushButton>false</RightClickIsPushButton>
-        <State>
-          <Number>0</Number>
-          <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_<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>
-          <Transform>
-            <Add>-1</Add>
-            <IsEqual>0</IsEqual>
-          </Transform>
-          <ButtonState>LeftButton</ButtonState>
-        </Connection>
-      </PushButton>
-<!-- R -->
-      <PushButton>
-        <ObjectName>CrossfaderButton</ObjectName>
-        <TooltipId>orientation</TooltipId>
-        <Size>11f,15f</Size>
-        <NumberStates>2</NumberStates>
-        <RightClickIsPushButton>false</RightClickIsPushButton>
-        <State>
-          <Number>0</Number>
-          <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_<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>
-          <Transform>
-            <Add>-2</Add>
-            <IsEqual>0</IsEqual>
-          </Transform>
-          <ButtonState>LeftButton</ButtonState>
-        </Connection>
-      </PushButton>
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/buttons_classic/btn__1.svg b/res/skins/LateNight/buttons_classic/btn__1.svg
deleted file mode 100644
index 3f112a2f8953..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__1.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index cd09dd19cca0..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__2.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index f0abdd89ec56..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__3.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index 3d6f98081ab4..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__4.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index 34dd7b0b4479..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__5.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index 677aec06cb36..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__6.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index d7b906f48018..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__7.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index cc7dd1d678b6..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__8.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index f64bd35deee4..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__arrow_left.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index 7f319803274a..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__arrow_right.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index 3cf8575bc38b..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__autodj_addrandom.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<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
deleted file mode 100644
index bb5e5916f573..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__autodj_enable_off.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<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
deleted file mode 100644
index cfc8befa14bc..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__autodj_enable_on.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<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
deleted file mode 100644
index 32fdc0a99861..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__autodj_fade.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index 12dd0b9b2c19..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__autodj_fade_disabled.svg
+++ /dev/null
@@ -1,4 +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_classic/btn__autodj_repeat_playlist_off.svg b/res/skins/LateNight/buttons_classic/btn__autodj_repeat_playlist_off.svg
deleted file mode 100644
index 4cbcd0694ebd..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__autodj_repeat_playlist_off.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index 7738efacd3ba..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__autodj_repeat_playlist_on.svg
+++ /dev/null
@@ -1,4 +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_classic/btn__autodj_shuffle.svg b/res/skins/LateNight/buttons_classic/btn__autodj_shuffle.svg
deleted file mode 100644
index 25b3f3410bdd..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__autodj_shuffle.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<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__aux_play.svg b/res/skins/LateNight/buttons_classic/btn__aux_play.svg
deleted file mode 100644
index 3d3a8cc51a3a..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__aux_play.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<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_large.svg b/res/skins/LateNight/buttons_classic/btn__beat_curpos_large.svg
deleted file mode 100644
index 374298e37e37..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__beat_curpos_large.svg
+++ /dev/null
@@ -1,51 +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="svg16"
-   version="1.1"
-   height="24"
-   width="24">
-  <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="defs20" />
-  <g
-     id="g14"
-     transform="translate(1,-10)">
-    <g
-       style="fill:#888886"
-       id="g8">
-      <path
-         id="path2"
-         d="m 8,31 h 2 V 13 H 8 Z" />
-      <path
-         id="path4"
-         d="m 13,31 h 2 V 13 h -2 z" />
-      <path
-         id="path6"
-         d="m 18,31 h 2 V 13 h -2 z" />
-    </g>
-    <path
-       style="fill:#bfbfbe"
-       id="path10"
-       d="M 3,27 H 5 V 13 H 3 Z" />
-    <path
-       style="fill:#d3d3d1"
-       id="path12"
-       d="M 3,31 H 5 V 29 H 3 Z" />
-  </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
deleted file mode 100644
index 67faac9f64ac..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__beatgrid_buttons_toggle.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<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__cue_deck.svg b/res/skins/LateNight/buttons_classic/btn__cue_deck.svg
deleted file mode 100644
index 3657edc4a09b..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__cue_deck.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index 70449e3a7b93..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__effectselector_border.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<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_classic/btn__eject.svg b/res/skins/LateNight/buttons_classic/btn__eject.svg
deleted file mode 100644
index 33b5e06318d3..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__eject.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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_classic/btn__eject_active_12.svg b/res/skins/LateNight/buttons_classic/btn__eject_active_12.svg
deleted file mode 100644
index ee531a973ec4..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__eject_active_12.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index 784c6ad2ba63..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__eject_active_34.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index af881d69e644..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__fx_2.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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_3.svg b/res/skins/LateNight/buttons_classic/btn__fx_3.svg
deleted file mode 100644
index cc618c49a2db..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__fx_3.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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_4.svg b/res/skins/LateNight/buttons_classic/btn__fx_4.svg
deleted file mode 100644
index 871b467b4205..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__fx_4.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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_FX1.svg b/res/skins/LateNight/buttons_classic/btn__fx_FX1.svg
deleted file mode 100644
index a30df4184494..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__fx_FX1.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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_FX2.svg b/res/skins/LateNight/buttons_classic/btn__fx_FX2.svg
deleted file mode 100644
index ede68751320c..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__fx_FX2.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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_FX3.svg b/res/skins/LateNight/buttons_classic/btn__fx_FX3.svg
deleted file mode 100644
index b8213d06605f..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__fx_FX3.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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_FX4.svg b/res/skins/LateNight/buttons_classic/btn__fx_FX4.svg
deleted file mode 100644
index 1ee43fbb46e1..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__fx_FX4.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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_focus.svg b/res/skins/LateNight/buttons_classic/btn__fx_focus.svg
deleted file mode 100644
index 5c82284c1499..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__fx_focus.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index de4880bd7f06..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__fx_focus_active.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<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_sampler_collapse.svg b/res/skins/LateNight/buttons_classic/btn__fx_sampler_collapse.svg
deleted file mode 100644
index 655f83ba26e7..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__fx_sampler_collapse.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<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
deleted file mode 100644
index b89030431aed..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__fx_sampler_expand.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index 18a996c5b2bd..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__fx_selector_down.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index 72d8a1ac27f2..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__fx_selector_down_pressed.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index c1254d707cf6..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__fx_toggle.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<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__hotcues_earlier.svg b/res/skins/LateNight/buttons_classic/btn__hotcues_earlier.svg
deleted file mode 100644
index 4914c7a025a7..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__hotcues_earlier.svg
+++ /dev/null
@@ -1,38 +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="svg14"
-   version="1.1"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata20">
-    <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="defs18" />
-  <path
-     d="m 12,16 h -2 v 3 l -7,-4 7,-4 v 3 h 2 z"
-     id="path6"
-     style="fill:#bfbfbe" />
-  <path
-     id="path833"
-     d="m 20,3 h -8 v 7 h 6 v 11 h 2 z M 19,9 H 13 V 4 h 6 z"
-     style="fill:#888888;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-  <path
-     style="opacity:1;fill:#555555;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 13,4 h 6 v 5 h -6 z"
-     id="rect835" />
-</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__hotcues_later.svg b/res/skins/LateNight/buttons_classic/btn__hotcues_later.svg
deleted file mode 100644
index a52115988896..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__hotcues_later.svg
+++ /dev/null
@@ -1,38 +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="svg14"
-   version="1.1"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata20">
-    <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="defs18" />
-  <path
-     d="m 13,16 h 2 v 3 l 7,-4 -7,-4 v 3 h -2 z"
-     id="path6"
-     style="fill:#bfbfbe" />
-  <path
-     id="path833"
-     d="M 12,3 H 4 v 7 h 6 v 11 h 2 z M 11,9 H 5 V 4 h 6 z"
-     style="fill:#888888;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-  <path
-     style="opacity:1;fill:#555555;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 5,4 h 6 V 9 H 5 Z"
-     id="rect835" />
-</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__intro_end.svg b/res/skins/LateNight/buttons_classic/btn__intro_end.svg
deleted file mode 100644
index 7cf7876d9bfe..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__intro_end.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<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
deleted file mode 100644
index e6c7d49b670d..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__intro_start.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<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
deleted file mode 100644
index b154682ce020..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__key_down.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index 4cf38407327b..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__key_match.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<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
deleted file mode 100644
index 776fa24e6491..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__key_up.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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_classic/btn__keylock.svg b/res/skins/LateNight/buttons_classic/btn__keylock.svg
deleted file mode 100644
index f0f0d577a521..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__keylock.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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_classic/btn__keylock_active_12.svg b/res/skins/LateNight/buttons_classic/btn__keylock_active_12.svg
deleted file mode 100644
index 2702af4a6d9b..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__keylock_active_12.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index f5282e6cd194..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__keylock_active_34.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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_classic/btn__lib_bpm_locked_black.svg b/res/skins/LateNight/buttons_classic/btn__lib_bpm_locked_black.svg
deleted file mode 100644
index db0301ab4826..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__lib_bpm_locked_black.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="10" height="12" version="1.1" xmlns="http://www.w3.org/2000/svg">
-	<path d="m4.9765625 0c-1.4489106.00994182-2.441829.65947319-2.9335937 1.4238281-.491765.764355-.5464175 1.549471-.5429688 1.9726563.0047842.5863697.0007237 2.2786766 0 2.6035156h-.66601562c-.41667001 0-.83398438.4149781-.83398438.8300781v4.3398439c0 .4151.41732437.830078.83398438.830078h8.33203122c.41667 0 .8339844-.414978.8339844-.830078v-4.3398439c0-.4151-.4173244-.8300781-.8339844-.8300781h-.6660156c.000169-.2983616.0009685-1.5773226 0-2.171875-.0010016-.6121197-.0602547-1.5109887-.5585938-2.3417969-.4983389-.83080816-1.5189215-1.49626715-2.9648437-1.4863281zm.0097656 1.5c1.0446779-.007181 1.4069609.3194157 1.6699219.7578125s.3429516 1.0862385.34375 1.5742187c.0009639.5890622.0001684 1.8689344 0 2.1679688h-4c.0007682-.324936.0050349-1.9972105 0-2.6152344-.0019313-.2369985.0561849-.7641406.3046875-1.1503906s.6238412-.7271168 1.6816406-.734375zm-2.9863281 6.5h6c.277 0 .5.223.5.5s-.223.5-.5.5h-6c-.277 0-.5-.223-.5-.5s.223-.5.5-.5zm0 2h6c.277 0 .5.223.5.5s-.223.5-.5.5h-6c-.277 0-.5-.223-.5-.5s.223-.5.5-.5z" 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__lib_bpm_locked_orange.svg b/res/skins/LateNight/buttons_classic/btn__lib_bpm_locked_orange.svg
deleted file mode 100644
index c0ceaebf8f8b..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__lib_bpm_locked_orange.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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_classic/btn__lib_bpm_unlocked_black.svg b/res/skins/LateNight/buttons_classic/btn__lib_bpm_unlocked_black.svg
deleted file mode 100644
index eaeb6c108981..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__lib_bpm_unlocked_black.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="10" height="12" version="1.1" xmlns="http://www.w3.org/2000/svg">
-	<g transform="translate(0,-20)">
-		<path transform="translate(0,20)" d="m4.9766 0c-1.4489.01-2.4418.65947-2.9336 1.4238l1.26172.81059c.2485-.38625.62385-.7271 1.6816-.73438 1.0447-.00718 1.407.31941 1.6699.75781.26297.4384.34296 1.0862.34375 1.5742.0009639.58906.0001684 1.8689 0 2.168h-6.166c-.41667 0-.83398.41498-.83398.83008v4.3398c0 .4151.41732.83008.83398.83008h8.332c.41667 0 .83398-.41498.83398-.83008v-4.3398c0-.4151-.41732-.83008-.83398-.83008h-.66602c.000169-.29836.0009685-1.5773 0-2.1719-.0009966-.61214-.060246-1.5129-.55859-2.3438-.49835-.83081-1.5189-1.4943-2.9648-1.4844zm-2.9766 8h6c.277 0 .5.223.5.5s-.223.5-.5.5h-6c-.277 0-.5-.223-.5-.5s.223-.5.5-.5zm0 2h6c.277 0 .5.223.5.5s-.223.5-.5.5h-6c-.277 0-.5-.223-.5-.5s.223-.5.5-.5z" 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_classic/btn__lib_bpm_unlocked_grey.svg b/res/skins/LateNight/buttons_classic/btn__lib_bpm_unlocked_grey.svg
deleted file mode 100644
index 6e03769d94d8..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__lib_bpm_unlocked_grey.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="10" height="12" version="1.1" xmlns="http://www.w3.org/2000/svg">
-	<g transform="translate(0,-20)">
-		<path transform="translate(0,20)" d="m4.9766 0c-1.4489.01-2.4418.65947-2.9336 1.4238l1.26172.81059c.2485-.38625.62385-.7271 1.6816-.73438 1.0447-.00718 1.407.31941 1.6699.75781.26297.4384.34296 1.0862.34375 1.5742.0009639.58906.0001684 1.8689 0 2.168h-6.166c-.41667 0-.83398.41498-.83398.83008v4.3398c0 .4151.41732.83008.83398.83008h8.332c.41667 0 .83398-.41498.83398-.83008v-4.3398c0-.4151-.41732-.83008-.83398-.83008h-.66602c.000169-.29836.0009685-1.5773 0-2.1719-.0009966-.61214-.060246-1.5129-.55859-2.3438-.49835-.83081-1.5189-1.4943-2.9648-1.4844zm-2.9766 8h6c.277 0 .5.223.5.5s-.223.5-.5.5h-6c-.277 0-.5-.223-.5-.5s.223-.5.5-.5zm0 2h6c.277 0 .5.223.5.5s-.223.5-.5.5h-6c-.277 0-.5-.223-.5-.5s.223-.5.5-.5z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#979797" fill-opacity=".50196007" 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_classic/btn__lib_checkmark_black.svg b/res/skins/LateNight/buttons_classic/btn__lib_checkmark_black.svg
deleted file mode 100644
index f085d12ee429..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__lib_checkmark_black.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="10" height="10" version="1.1" xmlns="http://www.w3.org/2000/svg">
-	<g transform="translate(0,-22)" fill="none" stroke="#000">
-		<g transform="matrix(.4151 0 0 .4151 -1.6604 19.547)" fill="none" stroke="#000">
-			<path d="m8.8184 20.364 4.8181 4.8181 9.6363-14.454" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="4.81809998"/>
-		</g>
-	</g>
-</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__lib_clear_search.svg b/res/skins/LateNight/buttons_classic/btn__lib_clear_search.svg
deleted file mode 100644
index 07c0c5fd03e7..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__lib_clear_search.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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_classic/btn__lib_clear_search_focus.svg b/res/skins/LateNight/buttons_classic/btn__lib_clear_search_focus.svg
deleted file mode 100644
index 0ac219cd30a9..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__lib_clear_search_focus.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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_classic/btn__lib_preview_pause.svg b/res/skins/LateNight/buttons_classic/btn__lib_preview_pause.svg
deleted file mode 100644
index 0d305de0930e..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__lib_preview_pause.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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_classic/btn__lib_preview_play_grey.svg b/res/skins/LateNight/buttons_classic/btn__lib_preview_play_grey.svg
deleted file mode 100644
index 2018ab6b723a..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__lib_preview_play_grey.svg
+++ /dev/null
@@ -1,87 +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"
-   width="30"
-   height="18"
-   version="1.1"
-   id="svg10"
-   sodipodi:docname="btn__lib_preview_play_grey.svg"
-   inkscape:version="0.92.4 (unknown)">
-  <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="defs14" />
-  <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.9"
-     inkscape:cx="1.7171717"
-     inkscape:cy="4.959596"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg10" />
-  <g
-     transform="translate(1.9999999e-8,-14)"
-     id="g8-3"
-     style="stroke:#000000;stroke-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none">
-    <g
-       transform="matrix(0.4151,0,0,0.4151,-1.6604,19.547)"
-       id="g6-6"
-       style="fill:#979797;fill-opacity:0.50196054;stroke:#000000;stroke-opacity:1;stroke-width:2.40905806;stroke-miterlimit:4;stroke-dasharray:none">
-      <path
-         transform="matrix(0,1.0073,-0.99696,0,665.47,-566.48)"
-         d="m 582.29,615.16 h -23.318 l 11.659,-20.194 z"
-         id="path2-7"
-         inkscape:connector-curvature="0"
-         style="stroke:#000000;stroke-opacity:1;stroke-width:2.40396966;stroke-miterlimit:4;stroke-dasharray:none" />
-      <path
-         d="m 28.091,-5.2913 c -7.6146,0 -14.009,6.184 -14.009,13.799 0,0.081419 -0.0018,0.15673 0,0.25552 v 0.44717 c -1.5498,1.3124 -2.5552,3.24 -2.5552,5.4298 0,3.9514 2.9756,7.1547 6.927,7.1547 v -14.309 c -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.12776 v 14.309 c 3.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.799 z"
-         style="color:#000000;text-indent:0;text-transform:none;stroke:#000000;stroke-width:2.40905806;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path4-5"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-  <g
-     style="fill:#535353;fill-opacity:1"
-     id="g6"
-     transform="matrix(0.4151,0,0,0.4151,-1.6604,5.547)">
-    <path
-       inkscape:connector-curvature="0"
-       id="path2"
-       d="m 582.29,615.16 h -23.318 l 11.659,-20.194 z"
-       transform="matrix(0,1.0073,-0.99696,0,665.47,-566.48)"
-       style="fill:#535353;fill-opacity:1" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4"
-       style="color:#000000;text-indent:0;text-transform:none;stroke-width:2.40910006;fill:#535353;fill-opacity:1"
-       d="m 28.091,-5.2913 c -7.6146,0 -14.009,6.184 -14.009,13.799 0,0.081419 -0.0018,0.15673 0,0.25552 v 0.44717 c -1.5498,1.3124 -2.5552,3.24 -2.5552,5.4298 0,3.9514 2.9756,7.1547 6.927,7.1547 v -14.309 c -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.12776 v 14.309 c 3.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.799 z" />
-  </g>
-</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__lib_sort_down.png b/res/skins/LateNight/buttons_classic/btn__lib_sort_down.png
deleted file mode 100644
index 85a8f9726a3e..000000000000
Binary files a/res/skins/LateNight/buttons_classic/btn__lib_sort_down.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons_classic/btn__lib_sort_down.svg b/res/skins/LateNight/buttons_classic/btn__lib_sort_down.svg
deleted file mode 100644
index 04c2d3335097..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__lib_sort_down.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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_classic/btn__lib_sort_up.png b/res/skins/LateNight/buttons_classic/btn__lib_sort_up.png
deleted file mode 100644
index ae53038219a0..000000000000
Binary files a/res/skins/LateNight/buttons_classic/btn__lib_sort_up.png and /dev/null differ
diff --git a/res/skins/LateNight/buttons_classic/btn__lib_sort_up.svg b/res/skins/LateNight/buttons_classic/btn__lib_sort_up.svg
deleted file mode 100644
index c1b71cdb27f3..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__lib_sort_up.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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__lib_spinbox_down_black.svg b/res/skins/LateNight/buttons_classic/btn__lib_spinbox_down_black.svg
deleted file mode 100644
index d4437ce44e71..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__lib_spinbox_down_black.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="13" height="10" version="1.1" xmlns="http://www.w3.org/2000/svg">
-	<path d="m2.6574 2.8965256 3.8426 3.7618 3.8426-3.7618" fill="none" stroke="#000" stroke-width="1.29999995"/>
-</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__lib_spinbox_up_black.svg b/res/skins/LateNight/buttons_classic/btn__lib_spinbox_up_black.svg
deleted file mode 100644
index f20f883650be..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__lib_spinbox_up_black.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="13" height="10" version="1.1" xmlns="http://www.w3.org/2000/svg">
-	<path d="m2.6574 7.1034743 3.8426-3.7618 3.8426 3.7618" fill="none" stroke="#000" stroke-width="1.29999995"/>
-</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__loop.svg b/res/skins/LateNight/buttons_classic/btn__loop.svg
deleted file mode 100644
index 4d9c2bc4f26f..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__loop.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<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
deleted file mode 100644
index 5f727baad3c8..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__loop_in.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index 6434e30d2fdf..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__loop_out.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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_classic/btn__mic_duck_auto.svg b/res/skins/LateNight/buttons_classic/btn__mic_duck_auto.svg
deleted file mode 100644
index 4c83f74b8852..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__mic_duck_auto.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<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
deleted file mode 100644
index 1ec77e0c12df..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__mic_duck_manual.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<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
deleted file mode 100644
index 6accd37ae6cd..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__mic_duck_off.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index 521ba4937ee4..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__mic_talk.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index 041db478fa9f..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__minus.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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_classic/btn__outro_end.svg b/res/skins/LateNight/buttons_classic/btn__outro_end.svg
deleted file mode 100644
index 9729703d1a2f..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__outro_end.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<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
deleted file mode 100644
index f93765b1956d..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__outro_start.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<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
deleted file mode 100644
index 6d4f69bb4690..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__pause_preview.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<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
deleted file mode 100644
index 560f56d3e03d..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__pause_sampler.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<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
deleted file mode 100644
index 2df575d24e76..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__pfl.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index ea7547d40ca0..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__play_deck.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index 97f27621d834..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__play_preview.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index 664b69ff8056..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__play_sampler.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index d4df6f7d746a..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__plus.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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_classic/btn__quantize_active_12.svg b/res/skins/LateNight/buttons_classic/btn__quantize_active_12.svg
deleted file mode 100644
index 231618e541b7..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__quantize_active_12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<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
deleted file mode 100644
index 4b3cb69b7ee3..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__quantize_active_34.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<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
deleted file mode 100644
index 674a41ab5a24..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__rec_dot.svg
+++ /dev/null
@@ -1,3 +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="#bfbfbe"/>
-</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__reloop.svg b/res/skins/LateNight/buttons_classic/btn__reloop.svg
deleted file mode 100644
index bccc537141e6..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__reloop.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index df993a17bb34..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__repeat.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<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
deleted file mode 100644
index 53f7abec28d0..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__repeat_active_12.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<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
deleted file mode 100644
index bab87e7e4e86..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__repeat_active_34.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<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
deleted file mode 100644
index 7569855a0264..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__reverse.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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_classic/btn__settings.svg b/res/skins/LateNight/buttons_classic/btn__settings.svg
deleted file mode 100644
index d00f3c0ec80b..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__settings.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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_classic/btn__settings_off.svg b/res/skins/LateNight/buttons_classic/btn__settings_off.svg
deleted file mode 100644
index 0c700c92c883..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__settings_off.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<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
deleted file mode 100644
index 9c38e6aef1fc..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__settings_on.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<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
deleted file mode 100644
index c27c27228748..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__slip.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index 8421042da9cd..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__slip_active_12.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index aa2af6f73e29..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__slip_active_34.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index 9e4aa78c3e0e..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__splitcue.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<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
deleted file mode 100644
index 007585e13d74..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__splitcue_active.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index 891ca96f8a83..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__star.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<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
deleted file mode 100644
index d6726bd62546..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__sync_deck.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index bf062f67b0a6..000000000000
--- a/res/skins/LateNight/buttons_classic/btn__sync_sampler.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<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_border_image_qpushbutton_active_grey.svg b/res/skins/LateNight/buttons_classic/btn_border_image_qpushbutton_active_grey.svg
deleted file mode 100644
index 38ddccdb5b76..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_border_image_qpushbutton_active_grey.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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_classic/btn_border_image_qpushbutton_checked_focus.svg b/res/skins/LateNight/buttons_classic/btn_border_image_qpushbutton_checked_focus.svg
deleted file mode 100644
index 58dce9f7a338..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_border_image_qpushbutton_checked_focus.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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_classic/btn_border_image_qpushbutton_focus.svg b/res/skins/LateNight/buttons_classic/btn_border_image_qpushbutton_focus.svg
deleted file mode 100644
index c71e5e2de6c7..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_border_image_qpushbutton_focus.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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_active.svg b/res/skins/LateNight/buttons_classic/btn_elevated_fx_active.svg
deleted file mode 100644
index 44f9af4dd1a5..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_elevated_fx_active.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<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_active.svg b/res/skins/LateNight/buttons_classic/btn_elevated_fx_focus_active.svg
deleted file mode 100644
index 7c200ca6acf4..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_elevated_fx_focus_active.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<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_embedded_combobox.svg b/res/skins/LateNight/buttons_classic/btn_embedded_combobox.svg
deleted file mode 100644
index 2cc7a48b8d10..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_embedded_combobox.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"
-   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
-     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"
-     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
-     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"
-     id="path19" />
-</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_embedded_combobox_focus.svg b/res/skins/LateNight/buttons_classic/btn_embedded_combobox_focus.svg
deleted file mode 100644
index c71e5e2de6c7..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_embedded_combobox_focus.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index 80678f52403a..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_embedded_eqkill.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<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
deleted file mode 100644
index 2e2e1add7cf4..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_embedded_eqkill_active.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index f102f367ff41..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_embedded_fx.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<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
deleted file mode 100644
index 5d308018fa03..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_embedded_fx_active.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index b5015f132c48..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_embedded_fx_focus.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<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
deleted file mode 100644
index db31acd42136..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_embedded_fx_focus_active.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index c8852c76c247..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_embedded_fx_set.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<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
deleted file mode 100644
index 66399df128f2..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_embedded_library.svg
+++ /dev/null
@@ -1,136 +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"
-   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
deleted file mode 100644
index 672a9daac517..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_embedded_library_active.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index 344a13a93138..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_embedded_library_focus.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<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
deleted file mode 100644
index 3bfd062075a3..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_embedded_medium.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<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
deleted file mode 100644
index ec579def443c..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_embedded_medium_active.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index 9795277057cf..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_embedded_medium_set.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<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
deleted file mode 100644
index d098c20a88b8..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_embedded_play.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index c1a3bfdb7417..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_embedded_play_active.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index 4443297375c5..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_embedded_square.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<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
deleted file mode 100644
index 4fd91ad22889..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_embedded_square_active.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index c34935016d5c..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_embedded_square_big.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<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
deleted file mode 100644
index 2bbcc9b12d9a..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_embedded_square_big_active.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index 6d86eb0599e2..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_embedded_square_set.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<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
deleted file mode 100644
index 59dcea8a6003..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_embedded_tall.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<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
deleted file mode 100644
index ea27ed20c1a5..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_embedded_tall_active.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index 4b7b9544e969..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_embedded_wide.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<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
deleted file mode 100644
index 01474535afaa..000000000000
--- a/res/skins/LateNight/buttons_classic/btn_embedded_wide_active.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index b7394f5ac389..000000000000
--- a/res/skins/LateNight/buttons_classic/spinbox_down.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<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_classic/spinbox_down_pressed.svg b/res/skins/LateNight/buttons_classic/spinbox_down_pressed.svg
deleted file mode 100644
index 44ced2b96347..000000000000
--- a/res/skins/LateNight/buttons_classic/spinbox_down_pressed.svg
+++ /dev/null
@@ -1,106 +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="svg3063"
-   width="16"
-   height="11"
-   version="1.1">
-  <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="defs3071">
-    <linearGradient
-       id="linearGradient4263"
-       x1="12.551"
-       x2="12.525"
-       y1="21.841"
-       y2="1.1144"
-       gradientTransform="matrix(1.032,0,0,1.0145,0.5,-9.9667)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop5422-3-0"
-         stop-color="#101010"
-         offset="0" />
-      <stop
-         id="stop5424-5-9"
-         stop-color="#242424"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6970"
-       x1="12.551"
-       x2="12.525"
-       y1="21.841"
-       y2="1.1144"
-       gradientTransform="matrix(0.96801856,0,0,-1.0311015,0.93759913,23.387575)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop5422-3"
-         stop-color="#101010"
-         offset="0" />
-      <stop
-         id="stop5424-5"
-         stop-color="#242424"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       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"
-       x2="12.585544"
-       y1="32.356445"
-       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-6" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop5422-3-3-7" />
-    </linearGradient>
-  </defs>
-  <path
-     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"
-     style="color:#000000;text-indent:0;text-transform:none;fill:url(#linearGradient6970-5-3);fill-opacity:1;stroke-width:0.94349116" />
-  <path
-     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_classic/spinbox_embedded_border.svg b/res/skins/LateNight/buttons_classic/spinbox_embedded_border.svg
deleted file mode 100644
index 1a156148d8c7..000000000000
--- a/res/skins/LateNight/buttons_classic/spinbox_embedded_border.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<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_up.svg b/res/skins/LateNight/buttons_classic/spinbox_up.svg
deleted file mode 100644
index d41da6790053..000000000000
--- a/res/skins/LateNight/buttons_classic/spinbox_up.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<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_classic/spinbox_up_pressed.svg b/res/skins/LateNight/buttons_classic/spinbox_up_pressed.svg
deleted file mode 100644
index 76543576a028..000000000000
--- a/res/skins/LateNight/buttons_classic/spinbox_up_pressed.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="11"
-   width="16"
-   id="svg3063">
-  <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="defs3071">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96801856,0,0,1.0311015,0.97056616,-11.387575)"
-       y2="1.1144"
-       y1="21.841"
-       x2="12.525"
-       x1="12.551"
-       id="linearGradient6970">
-      <stop
-         offset="0"
-         stop-color="#101010"
-         id="stop5422-3" />
-      <stop
-         offset="1"
-         stop-color="#242424"
-         id="stop5424-5" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96801856,0,0,1.0311015,0.93759913,-11.387575)"
-       y2="1.1144"
-       y1="21.841"
-       x2="12.525"
-       x1="12.551"
-       id="linearGradient6970-3">
-      <stop
-         offset="0"
-         stop-color="#101010"
-         id="stop5422-3-6" />
-      <stop
-         offset="1"
-         stop-color="#242424"
-         id="stop5424-5-7" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96801856,0,0,1.0311015,0.93759913,-11.387575)"
-       y2="1.1144"
-       y1="21.841"
-       x2="12.525"
-       x1="12.551"
-       id="linearGradient6970-5">
-      <stop
-         offset="0"
-         stop-color="#101010"
-         id="stop5422-3-3" />
-      <stop
-         offset="1"
-         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
-     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"
-     style="color:#000000;text-indent:0;text-transform:none;fill:url(#linearGradient6970-3-3);stroke-width:0.94349116" />
-  <path
-     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_flip/btn__1.svg b/res/skins/LateNight/buttons_flip/btn__1.svg
deleted file mode 100644
index 3f112a2f8953..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__1.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index cd09dd19cca0..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__2.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index f0abdd89ec56..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__3.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index 3d6f98081ab4..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__4.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index 34dd7b0b4479..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__5.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index 677aec06cb36..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__6.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index d7b906f48018..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__7.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index cc7dd1d678b6..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__8.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index f64bd35deee4..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__arrow_left.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index 7f319803274a..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__arrow_right.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index 3cf8575bc38b..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__autodj_addrandom.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<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
deleted file mode 100644
index bb5e5916f573..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__autodj_enable_off.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<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
deleted file mode 100644
index cfc8befa14bc..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__autodj_enable_on.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<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
deleted file mode 100644
index 32fdc0a99861..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__autodj_fade.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index 12dd0b9b2c19..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__autodj_fade_disabled.svg
+++ /dev/null
@@ -1,4 +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_flip/btn__autodj_repeat_playlist_off.svg b/res/skins/LateNight/buttons_flip/btn__autodj_repeat_playlist_off.svg
deleted file mode 100644
index 4cbcd0694ebd..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__autodj_repeat_playlist_off.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index 7738efacd3ba..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__autodj_repeat_playlist_on.svg
+++ /dev/null
@@ -1,4 +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_flip/btn__autodj_shuffle.svg b/res/skins/LateNight/buttons_flip/btn__autodj_shuffle.svg
deleted file mode 100644
index 25b3f3410bdd..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__autodj_shuffle.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<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
deleted file mode 100644
index 32c65f92ee24..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__autodj_skip.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<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
deleted file mode 100644
index 1de2abb02858..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__autodj_skip_disabled.svg
+++ /dev/null
@@ -1,7 +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_flip/btn__aux_play.svg b/res/skins/LateNight/buttons_flip/btn__aux_play.svg
deleted file mode 100644
index 3d3a8cc51a3a..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__aux_play.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<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_active_12.svg b/res/skins/LateNight/buttons_flip/btn__beat_curpos_active_12.svg
deleted file mode 100644
index 25afbf8a2550..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__beat_curpos_active_12.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<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
deleted file mode 100644
index c47b2d8ef954..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__beat_curpos_active_34.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<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
deleted file mode 100644
index 598c4647584c..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__beat_curpos_large.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<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
deleted file mode 100644
index 67faac9f64ac..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__beatgrid_buttons_toggle.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<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
deleted file mode 100644
index ad3ed6e4a314..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__beats_earlier.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<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
deleted file mode 100644
index 9d37a0233d6d..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__beats_faster.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<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
deleted file mode 100644
index 123a52f2e512..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__beats_later.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index 9465b259c2cb..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__beats_slower.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<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
deleted file mode 100644
index 3657edc4a09b..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__cue_deck.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index 70449e3a7b93..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__effectselector_border.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<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
deleted file mode 100644
index 33b5e06318d3..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__eject.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index 007269f6b634..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__eject_active_12.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index b66cc42f5bda..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__eject_active_34.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index af881d69e644..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__fx_2.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index 8d693355e6ca..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__fx_2_active.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<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
deleted file mode 100644
index cc618c49a2db..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__fx_3.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index 43f3fb10c6e7..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__fx_3_active.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<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
deleted file mode 100644
index 871b467b4205..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__fx_4.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index a039bce0d1d6..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__fx_4_active.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<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
deleted file mode 100644
index a30df4184494..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__fx_FX1.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index f0fb0fc9c8c0..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__fx_FX1_active.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<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
deleted file mode 100644
index ede68751320c..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__fx_FX2.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index b26ae578a38b..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__fx_FX2_active.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<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
deleted file mode 100644
index b8213d06605f..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__fx_FX3.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index eb026958dfb8..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__fx_FX3_active.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<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
deleted file mode 100644
index 1ee43fbb46e1..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__fx_FX4.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index 79cd7ec5d8c8..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__fx_FX4_active.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<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
deleted file mode 100644
index 5c82284c1499..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__fx_focus.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index de4880bd7f06..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__fx_focus_active.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<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
deleted file mode 100644
index 89231d14cdc5..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__fx_mixmode_d+w.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<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
deleted file mode 100644
index 3d9d9826e7d2..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__fx_mixmode_d-w.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<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
deleted file mode 100644
index 655f83ba26e7..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__fx_sampler_collapse.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<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
deleted file mode 100644
index b89030431aed..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__fx_sampler_expand.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index 18a996c5b2bd..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__fx_selector_down.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index 72d8a1ac27f2..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__fx_selector_down_pressed.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index c1254d707cf6..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__fx_toggle.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<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__hotcues_earlier.svg b/res/skins/LateNight/buttons_flip/btn__hotcues_earlier.svg
deleted file mode 100644
index 4914c7a025a7..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__hotcues_earlier.svg
+++ /dev/null
@@ -1,38 +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="svg14"
-   version="1.1"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata20">
-    <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="defs18" />
-  <path
-     d="m 12,16 h -2 v 3 l -7,-4 7,-4 v 3 h 2 z"
-     id="path6"
-     style="fill:#bfbfbe" />
-  <path
-     id="path833"
-     d="m 20,3 h -8 v 7 h 6 v 11 h 2 z M 19,9 H 13 V 4 h 6 z"
-     style="fill:#888888;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-  <path
-     style="opacity:1;fill:#555555;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 13,4 h 6 v 5 h -6 z"
-     id="rect835" />
-</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__hotcues_later.svg b/res/skins/LateNight/buttons_flip/btn__hotcues_later.svg
deleted file mode 100644
index a52115988896..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__hotcues_later.svg
+++ /dev/null
@@ -1,38 +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="svg14"
-   version="1.1"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata20">
-    <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="defs18" />
-  <path
-     d="m 13,16 h 2 v 3 l 7,-4 -7,-4 v 3 h -2 z"
-     id="path6"
-     style="fill:#bfbfbe" />
-  <path
-     id="path833"
-     d="M 12,3 H 4 v 7 h 6 v 11 h 2 z M 11,9 H 5 V 4 h 6 z"
-     style="fill:#888888;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-  <path
-     style="opacity:1;fill:#555555;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 5,4 h 6 V 9 H 5 Z"
-     id="rect835" />
-</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__intro_end.svg b/res/skins/LateNight/buttons_flip/btn__intro_end.svg
deleted file mode 100644
index 7cf7876d9bfe..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__intro_end.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<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
deleted file mode 100644
index e6c7d49b670d..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__intro_start.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<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
deleted file mode 100644
index b154682ce020..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__key_down.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index 4cf38407327b..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__key_match.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<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
deleted file mode 100644
index 776fa24e6491..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__key_up.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index f0f0d577a521..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__keylock.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index 051460f438ec..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__keylock_active_12.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<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
deleted file mode 100644
index 53a30b3faefd..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__keylock_active_34.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<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
deleted file mode 100644
index c0ceaebf8f8b..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__lib_bpm_locked.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index f04470ae9495..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__lib_bpm_unlocked.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index d18dbba1ef6a..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__lib_checkmark.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index 07c0c5fd03e7..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__lib_clear_search.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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_blue.svg b/res/skins/LateNight/buttons_flip/btn__lib_clear_search_focus_blue.svg
deleted file mode 100644
index ca3629036654..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__lib_clear_search_focus_blue.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="19" height="19" version="1.1" xmlns="http://www.w3.org/2000/svg">
-	<title>Mixxx 1.12+ iconset</title>
-	<g transform="matrix(.4151 0 0 .4151 -1.6604 6.547)" fill="#009fb4">
-		<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 0s.8089 2.0949 0 2.9038l-4.3879 4.3879 4.3879 4.3879c.8089.8089.8089 2.0949 0 2.9038s-2.0949.8089-2.9038 0l-4.3879-4.3879-4.3879 4.3879c-.8089.8089-2.0949.8089-2.9038 0s-.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="#009fb4" stroke-width="0"/>
-	</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
deleted file mode 100644
index 0d305de0930e..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__lib_preview_pause.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index be70beb88001..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__lib_preview_play.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index 271857a10b70..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__lib_radio_button_gold_on.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index 680fb2316fd8..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__lib_radio_button_off.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index c82ccf9677f7..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__lib_radio_button_on_gold.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index b077114da826..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__lib_radio_button_on_yellow.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index 8f8cccef4340..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__lib_radio_button_yellow_on.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index 85a8f9726a3e..000000000000
Binary files a/res/skins/LateNight/buttons_flip/btn__lib_sort_down.png and /dev/null 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
deleted file mode 100644
index 04c2d3335097..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__lib_sort_down.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index ae53038219a0..000000000000
Binary files a/res/skins/LateNight/buttons_flip/btn__lib_sort_up.png and /dev/null 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
deleted file mode 100644
index c1b71cdb27f3..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__lib_sort_up.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index 4d9c2bc4f26f..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__loop.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<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
deleted file mode 100644
index 5f727baad3c8..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__loop_in.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index 6434e30d2fdf..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__loop_out.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index f6e2e14df47a..000000000000
Binary files a/res/skins/LateNight/buttons_flip/btn__mastersync_master_off.png and /dev/null 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
deleted file mode 100644
index 5dbe9c7a70e5..000000000000
Binary files a/res/skins/LateNight/buttons_flip/btn__mastersync_master_on.png and /dev/null 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
deleted file mode 100644
index 4c83f74b8852..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__mic_duck_auto.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<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
deleted file mode 100644
index 1ec77e0c12df..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__mic_duck_manual.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<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
deleted file mode 100644
index 6accd37ae6cd..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__mic_duck_off.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index 521ba4937ee4..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__mic_talk.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index 041db478fa9f..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__minus.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index b846e1a0f5f1..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__next.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index 9729703d1a2f..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__outro_end.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<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
deleted file mode 100644
index f93765b1956d..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__outro_start.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<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
deleted file mode 100644
index 6d4f69bb4690..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__pause_preview.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<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
deleted file mode 100644
index 560f56d3e03d..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__pause_sampler.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<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
deleted file mode 100644
index 2df575d24e76..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__pfl.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index ea7547d40ca0..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__play_deck.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index 97f27621d834..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__play_preview.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index 664b69ff8056..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__play_sampler.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index d4df6f7d746a..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__plus.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index e021190ad2da..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__prev.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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_active_12.svg b/res/skins/LateNight/buttons_flip/btn__quantize_active_12.svg
deleted file mode 100644
index 36c596a6dd7c..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__quantize_active_12.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<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
deleted file mode 100644
index 7077953f1587..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__quantize_active_34.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<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
deleted file mode 100644
index 674a41ab5a24..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__rec_dot.svg
+++ /dev/null
@@ -1,3 +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="#bfbfbe"/>
-</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__reloop.svg b/res/skins/LateNight/buttons_flip/btn__reloop.svg
deleted file mode 100644
index bccc537141e6..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__reloop.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index df993a17bb34..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__repeat.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<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
deleted file mode 100644
index 91574f38027f..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__repeat_active_12.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<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
deleted file mode 100644
index dcf16208c658..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__repeat_active_34.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<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
deleted file mode 100644
index 7569855a0264..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__reverse.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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_flip/btn__settings.svg b/res/skins/LateNight/buttons_flip/btn__settings.svg
deleted file mode 100644
index d00f3c0ec80b..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__settings.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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_flip/btn__settings_close.svg b/res/skins/LateNight/buttons_flip/btn__settings_close.svg
deleted file mode 100644
index f04edc298edc..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__settings_close.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index 0c700c92c883..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__settings_off.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<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
deleted file mode 100644
index 9c38e6aef1fc..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__settings_on.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<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
deleted file mode 100644
index c27c27228748..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__slip.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index 3a3cf81ac2f4..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__slip_active_12.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index ef783dbd1755..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__slip_active_34.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<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
deleted file mode 100644
index 9e4aa78c3e0e..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__splitcue.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<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
deleted file mode 100644
index 007585e13d74..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__splitcue_active.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index 81f3e740bcbd..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__star.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<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
deleted file mode 100644
index d6726bd62546..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__sync_deck.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index bf062f67b0a6..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__sync_sampler.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index da5b928d80c6..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__xfader_aux_left.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index c15d77c4bc00..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__xfader_aux_left_off.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index 71a9f0487850..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__xfader_aux_mid.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index e8c9e7490b18..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__xfader_aux_mid_off.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index 1c91063e788a..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__xfader_aux_right.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index b8b6290eee59..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__xfader_aux_right_off.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index 97c1a08df78e..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__xfader_deck_left_default.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index 71a6d97b8664..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__xfader_deck_left_off.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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_flip/btn__xfader_deck_left_warning.svg b/res/skins/LateNight/buttons_flip/btn__xfader_deck_left_warning.svg
deleted file mode 100644
index 52a1e3225b62..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__xfader_deck_left_warning.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index ec87f75be5ee..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__xfader_deck_mid_off.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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_flip/btn__xfader_deck_mid_warning.svg b/res/skins/LateNight/buttons_flip/btn__xfader_deck_mid_warning.svg
deleted file mode 100644
index eb0d70aafa37..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__xfader_deck_mid_warning.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="15"
-   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
-     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
deleted file mode 100644
index d590c5ab6b61..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__xfader_deck_right_default.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index 6224588d3d2a..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__xfader_deck_right_off.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index dedd1075ff2f..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__xfader_deck_right_warning.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index 7dd52debae55..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__xfader_sampler_left.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<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
deleted file mode 100644
index 6eb53f82c3a7..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__xfader_sampler_master.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<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
deleted file mode 100644
index 2a67bf6a43f0..000000000000
--- a/res/skins/LateNight/buttons_flip/btn__xfader_sampler_right.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<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
deleted file mode 100644
index 38ddccdb5b76..000000000000
--- a/res/skins/LateNight/buttons_flip/btn_border_image_qpushbutton_active_grey.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index 58dce9f7a338..000000000000
--- a/res/skins/LateNight/buttons_flip/btn_border_image_qpushbutton_checked_focus.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index c71e5e2de6c7..000000000000
--- a/res/skins/LateNight/buttons_flip/btn_border_image_qpushbutton_focus.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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_combobox.svg b/res/skins/LateNight/buttons_flip/btn_embedded_combobox.svg
deleted file mode 100644
index 2cc7a48b8d10..000000000000
--- a/res/skins/LateNight/buttons_flip/btn_embedded_combobox.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"
-   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
-     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"
-     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
-     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"
-     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
deleted file mode 100644
index c71e5e2de6c7..000000000000
--- a/res/skins/LateNight/buttons_flip/btn_embedded_combobox_focus.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index 80678f52403a..000000000000
--- a/res/skins/LateNight/buttons_flip/btn_embedded_eqkill.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<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
deleted file mode 100644
index 2e2e1add7cf4..000000000000
--- a/res/skins/LateNight/buttons_flip/btn_embedded_eqkill_active.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index f102f367ff41..000000000000
--- a/res/skins/LateNight/buttons_flip/btn_embedded_fx.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<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
deleted file mode 100644
index 5d308018fa03..000000000000
--- a/res/skins/LateNight/buttons_flip/btn_embedded_fx_active.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index b5015f132c48..000000000000
--- a/res/skins/LateNight/buttons_flip/btn_embedded_fx_focus.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<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
deleted file mode 100644
index db31acd42136..000000000000
--- a/res/skins/LateNight/buttons_flip/btn_embedded_fx_focus_active.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index c8852c76c247..000000000000
--- a/res/skins/LateNight/buttons_flip/btn_embedded_fx_set.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<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
deleted file mode 100644
index 66399df128f2..000000000000
--- a/res/skins/LateNight/buttons_flip/btn_embedded_library.svg
+++ /dev/null
@@ -1,136 +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"
-   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
deleted file mode 100644
index 672a9daac517..000000000000
--- a/res/skins/LateNight/buttons_flip/btn_embedded_library_active.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index 344a13a93138..000000000000
--- a/res/skins/LateNight/buttons_flip/btn_embedded_library_focus.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<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
deleted file mode 100644
index 3bfd062075a3..000000000000
--- a/res/skins/LateNight/buttons_flip/btn_embedded_medium.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<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
deleted file mode 100644
index ec579def443c..000000000000
--- a/res/skins/LateNight/buttons_flip/btn_embedded_medium_active.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index 9795277057cf..000000000000
--- a/res/skins/LateNight/buttons_flip/btn_embedded_medium_set.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<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
deleted file mode 100644
index d098c20a88b8..000000000000
--- a/res/skins/LateNight/buttons_flip/btn_embedded_play.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index c1a3bfdb7417..000000000000
--- a/res/skins/LateNight/buttons_flip/btn_embedded_play_active.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index 4443297375c5..000000000000
--- a/res/skins/LateNight/buttons_flip/btn_embedded_square.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<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
deleted file mode 100644
index 4fd91ad22889..000000000000
--- a/res/skins/LateNight/buttons_flip/btn_embedded_square_active.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index c34935016d5c..000000000000
--- a/res/skins/LateNight/buttons_flip/btn_embedded_square_big.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<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
deleted file mode 100644
index 2bbcc9b12d9a..000000000000
--- a/res/skins/LateNight/buttons_flip/btn_embedded_square_big_active.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index 6d86eb0599e2..000000000000
--- a/res/skins/LateNight/buttons_flip/btn_embedded_square_set.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<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
deleted file mode 100644
index 59dcea8a6003..000000000000
--- a/res/skins/LateNight/buttons_flip/btn_embedded_tall.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<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
deleted file mode 100644
index ea27ed20c1a5..000000000000
--- a/res/skins/LateNight/buttons_flip/btn_embedded_tall_active.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index 4b7b9544e969..000000000000
--- a/res/skins/LateNight/buttons_flip/btn_embedded_wide.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<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
deleted file mode 100644
index 01474535afaa..000000000000
--- a/res/skins/LateNight/buttons_flip/btn_embedded_wide_active.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index b7394f5ac389..000000000000
--- a/res/skins/LateNight/buttons_flip/spinbox_down.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<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_flip/spinbox_down_pressed.svg b/res/skins/LateNight/buttons_flip/spinbox_down_pressed.svg
deleted file mode 100644
index 44ced2b96347..000000000000
--- a/res/skins/LateNight/buttons_flip/spinbox_down_pressed.svg
+++ /dev/null
@@ -1,106 +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="svg3063"
-   width="16"
-   height="11"
-   version="1.1">
-  <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="defs3071">
-    <linearGradient
-       id="linearGradient4263"
-       x1="12.551"
-       x2="12.525"
-       y1="21.841"
-       y2="1.1144"
-       gradientTransform="matrix(1.032,0,0,1.0145,0.5,-9.9667)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop5422-3-0"
-         stop-color="#101010"
-         offset="0" />
-      <stop
-         id="stop5424-5-9"
-         stop-color="#242424"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6970"
-       x1="12.551"
-       x2="12.525"
-       y1="21.841"
-       y2="1.1144"
-       gradientTransform="matrix(0.96801856,0,0,-1.0311015,0.93759913,23.387575)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop5422-3"
-         stop-color="#101010"
-         offset="0" />
-      <stop
-         id="stop5424-5"
-         stop-color="#242424"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       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"
-       x2="12.585544"
-       y1="32.356445"
-       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-6" />
-      <stop
-         offset="1"
-         stop-color="#101010"
-         id="stop5422-3-3-7" />
-    </linearGradient>
-  </defs>
-  <path
-     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"
-     style="color:#000000;text-indent:0;text-transform:none;fill:url(#linearGradient6970-5-3);fill-opacity:1;stroke-width:0.94349116" />
-  <path
-     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_embedded_border.svg b/res/skins/LateNight/buttons_flip/spinbox_embedded_border.svg
deleted file mode 100644
index 1a156148d8c7..000000000000
--- a/res/skins/LateNight/buttons_flip/spinbox_embedded_border.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<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_blue.svg b/res/skins/LateNight/buttons_flip/spinbox_embedded_border_focus_blue.svg
deleted file mode 100644
index bb84a4bc689f..000000000000
--- a/res/skins/LateNight/buttons_flip/spinbox_embedded_border_focus_blue.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<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="#009fb4" 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_hover.svg b/res/skins/LateNight/buttons_flip/spinbox_embedded_border_hover.svg
deleted file mode 100644
index b206a41179a4..000000000000
--- a/res/skins/LateNight/buttons_flip/spinbox_embedded_border_hover.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<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
deleted file mode 100644
index d41da6790053..000000000000
--- a/res/skins/LateNight/buttons_flip/spinbox_up.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<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_flip/spinbox_up_pressed.svg b/res/skins/LateNight/buttons_flip/spinbox_up_pressed.svg
deleted file mode 100644
index 76543576a028..000000000000
--- a/res/skins/LateNight/buttons_flip/spinbox_up_pressed.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="11"
-   width="16"
-   id="svg3063">
-  <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="defs3071">
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96801856,0,0,1.0311015,0.97056616,-11.387575)"
-       y2="1.1144"
-       y1="21.841"
-       x2="12.525"
-       x1="12.551"
-       id="linearGradient6970">
-      <stop
-         offset="0"
-         stop-color="#101010"
-         id="stop5422-3" />
-      <stop
-         offset="1"
-         stop-color="#242424"
-         id="stop5424-5" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96801856,0,0,1.0311015,0.93759913,-11.387575)"
-       y2="1.1144"
-       y1="21.841"
-       x2="12.525"
-       x1="12.551"
-       id="linearGradient6970-3">
-      <stop
-         offset="0"
-         stop-color="#101010"
-         id="stop5422-3-6" />
-      <stop
-         offset="1"
-         stop-color="#242424"
-         id="stop5424-5-7" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96801856,0,0,1.0311015,0.93759913,-11.387575)"
-       y2="1.1144"
-       y1="21.841"
-       x2="12.525"
-       x1="12.551"
-       id="linearGradient6970-5">
-      <stop
-         offset="0"
-         stop-color="#101010"
-         id="stop5422-3-3" />
-      <stop
-         offset="1"
-         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
-     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"
-     style="color:#000000;text-indent:0;text-transform:none;fill:url(#linearGradient6970-3-3);stroke-width:0.94349116" />
-  <path
-     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_classic/btn_.svg b/res/skins/LateNight/classic/buttons/btn__.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn_.svg
rename to res/skins/LateNight/classic/buttons/btn__.svg
diff --git a/res/skins/LateNight/classic/buttons/btn__1.svg b/res/skins/LateNight/classic/buttons/btn__1.svg
new file mode 100644
index 000000000000..365e088f60b5
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__1.svg
@@ -0,0 +1,34 @@
+<?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="svg6"
+   version="1.1"
+   height="24"
+   width="20">
+  <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" />
+  <path
+     style="stroke:#000001;stroke-width:1.60000002"
+     id="path2"
+     d="M 7.2627119,8 11,8 v 7 H 9 V 9 L 7.2627119,9 Z" />
+  <path
+     style="fill:#d2d2d1"
+     id="path4"
+     d="M 7.2627119,8 11,8 v 7 H 9 V 9 L 7.2627119,9 V 8" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__2.svg b/res/skins/LateNight/classic/buttons/btn__2.svg
new file mode 100644
index 000000000000..a5944b6c2f63
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__2.svg
@@ -0,0 +1,34 @@
+<?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="svg18"
+   version="1.1"
+   height="24"
+   width="20">
+  <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="defs22" />
+  <path
+     style="fill:none;stroke:#000001;stroke-width:1.60000002;stroke-linecap:square"
+     id="path14"
+     d="m 7,8 h 7 v 4 H 9 v 2 h 5 v 1 H 7 v -4 h 5 V 9 H 7 V 8" />
+  <path
+     style="fill:#d2d2d1"
+     id="path16"
+     d="m 7,8 h 7 v 4 H 9 v 2 h 5 v 1 H 7 v -4 h 5 V 9 H 7 V 8" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__3.svg b/res/skins/LateNight/classic/buttons/btn__3.svg
new file mode 100644
index 000000000000..0543822b1bdc
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__3.svg
@@ -0,0 +1,34 @@
+<?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="24"
+   version="1.1"
+   id="svg18">
+  <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="defs22" />
+  <path
+     d="m 6,8 h 7 v 7 H 6 v -1 h 5 V 12 H 7.4491525 V 11 H 11 V 9 H 6 Z"
+     id="path14"
+     style="stroke:#000001;stroke-width:1.60000002" />
+  <path
+     d="m 6,8 h 7 v 7 H 6 v -1 h 5 V 12 H 7.4491525 V 11 H 11 V 9 H 6 V 8"
+     id="path16"
+     style="fill:#d2d2d1" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__4.svg b/res/skins/LateNight/classic/buttons/btn__4.svg
new file mode 100644
index 000000000000..a6f0aad608b7
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__4.svg
@@ -0,0 +1,34 @@
+<?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="svg30"
+   version="1.1"
+   height="24"
+   width="20">
+  <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="defs34" />
+  <path
+     style="stroke:#000001;stroke-width:1.60000002"
+     id="path26"
+     d="m 6,9 v 3 h 5 v 3 h 2 V 8 h -2 v 3 H 8 V 9 Z" />
+  <path
+     style="fill:#d2d2d1"
+     id="path28"
+     d="m 6,9 v 3 h 5 v 3 h 2 V 8 h -2 v 3 H 8 V 9 H 6" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__5.svg b/res/skins/LateNight/classic/buttons/btn__5.svg
new file mode 100644
index 000000000000..626ab3a186b2
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__5.svg
@@ -0,0 +1,34 @@
+<?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="svg42"
+   version="1.1"
+   height="24"
+   width="20">
+  <metadata
+     id="metadata48">
+    <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="defs46" />
+  <path
+     style="stroke:#000001;stroke-width:1.60000002"
+     id="path38"
+     d="M 13,8 H 7 v 4 h 4 v 2 H 6 v 1 h 7 V 11 H 8 V 9 h 5 z" />
+  <path
+     style="fill:#d2d2d1"
+     id="path40"
+     d="M 13,8 H 7 v 4 h 4 v 2 H 6 v 1 h 7 V 11 H 8 V 9 h 5 V 8" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__6.svg b/res/skins/LateNight/classic/buttons/btn__6.svg
new file mode 100644
index 000000000000..9a95353b4fb4
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__6.svg
@@ -0,0 +1,34 @@
+<?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="svg54"
+   version="1.1"
+   height="24"
+   width="20">
+  <metadata
+     id="metadata60">
+    <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="defs58" />
+  <path
+     style="stroke:#000001;stroke-width:1.60000002"
+     id="path50"
+     d="m 7,8 v 7 h 7 V 11 H 9 V 9.0000003 h 4 V 8 Z m 2,4 h 4 v 2 H 9 Z" />
+  <path
+     style="fill:#d2d2d1"
+     id="path52"
+     d="m 7,8 v 7 h 7 V 11 H 9 V 9.0000003 h 4 V 8 Z m 2,4 h 4 v 2 H 9 Z" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__7.svg b/res/skins/LateNight/classic/buttons/btn__7.svg
new file mode 100644
index 000000000000..8aeaea2d1d2a
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__7.svg
@@ -0,0 +1,34 @@
+<?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="svg66"
+   version="1.1"
+   height="24"
+   width="20">
+  <metadata
+     id="metadata72">
+    <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="defs70" />
+  <path
+     style="stroke:#000001;stroke-width:1.60000002"
+     id="path62"
+     d="m 7,8 h 6 l 0.031,4 h 1 v 1 h -1 v 2 h -2 v -2 h -2 v -1 h 2 L 11,9 H 7 Z" />
+  <path
+     style="fill:#d2d2d1"
+     id="path64"
+     d="m 7,8 h 6 l 0.031,4 h 1 v 1 h -1 v 2 h -2 v -2 h -2 v -1 h 2 L 11,9 H 7 V 8" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__8.svg b/res/skins/LateNight/classic/buttons/btn__8.svg
new file mode 100644
index 000000000000..01cdb08bee5a
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__8.svg
@@ -0,0 +1,34 @@
+<?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="svg78"
+   version="1.1"
+   height="24"
+   width="20">
+  <metadata
+     id="metadata84">
+    <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="defs82" />
+  <path
+     style="stroke:#000001;stroke-width:1.60000002"
+     id="path74"
+     d="m 7,8 v 3 H 6 v 4 h 7 V 11 H 12 V 8 Z m 2,1 h 2 v 2 H 9 Z m -1,3 h 4 v 2 H 8 Z" />
+  <path
+     style="fill:#d2d2d1"
+     id="path76"
+     d="m 7,8 v 3 H 6 v 4 h 7 V 11 H 12 V 8 Z m 2,1 h 2 v 2 H 9 Z m -1,3 h 4 v 2 H 8 Z" />
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn_.svg b/res/skins/LateNight/classic/buttons/btn___.svg
similarity index 100%
rename from res/skins/LateNight/buttons_flip/btn_.svg
rename to res/skins/LateNight/classic/buttons/btn___.svg
diff --git a/res/skins/LateNight/classic/buttons/btn___active.svg b/res/skins/LateNight/classic/buttons/btn___active.svg
new file mode 100644
index 000000000000..fb66ea1ba227
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn___active.svg
@@ -0,0 +1 @@
+<svg width="1" height="1" version="1.1" xmlns="http://www.w3.org/2000/svg"></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn___pressed.svg b/res/skins/LateNight/classic/buttons/btn___pressed.svg
new file mode 100644
index 000000000000..fb66ea1ba227
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn___pressed.svg
@@ -0,0 +1 @@
+<svg width="1" height="1" version="1.1" xmlns="http://www.w3.org/2000/svg"></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__arrow_left_down.svg b/res/skins/LateNight/classic/buttons/btn__arrow_left_down.svg
new file mode 100644
index 000000000000..fd5381fe36e2
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__arrow_left_down.svg
@@ -0,0 +1,34 @@
+<?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="svg6"
+   version="1.1"
+   height="24"
+   width="24">
+  <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" />
+  <path
+     style="fill:none;stroke:#000001;stroke-width:1.60000002"
+     id="path2"
+     d="M 11.5,11.5 8,8 v 9 h 9 L 13.5,13.5 17,10 15,8 Z" />
+  <path
+     style="fill:#d2d2d1"
+     id="path4"
+     d="M 11.5,11.5 8,8 v 9 h 9 L 13.5,13.5 17,10 15,8 Z" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__arrow_left_up.svg b/res/skins/LateNight/classic/buttons/btn__arrow_left_up.svg
new file mode 100644
index 000000000000..09a8d6866eac
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__arrow_left_up.svg
@@ -0,0 +1,34 @@
+<?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="svg6"
+   version="1.1"
+   height="24"
+   width="24">
+  <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" />
+  <path
+     style="fill:none;stroke:#000001;stroke-width:1.60000002"
+     id="path2"
+     d="M 11.5,12.5 8,16 V 7 h 9 l -3.5,3.5 3.5,3.5 -2,2 z" />
+  <path
+     style="fill:#d2d2d1"
+     id="path4"
+     d="M 11.5,12.5 8,16 V 7 h 9 l -3.5,3.5 3.5,3.5 -2,2 z" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__arrow_right_down.svg b/res/skins/LateNight/classic/buttons/btn__arrow_right_down.svg
new file mode 100644
index 000000000000..5d08e4b10dd4
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__arrow_right_down.svg
@@ -0,0 +1,34 @@
+<?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="svg6"
+   version="1.1"
+   height="24"
+   width="24">
+  <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" />
+  <path
+     style="fill:none;stroke:#000001;stroke-width:1.60000002"
+     id="path2"
+     d="M 12.5,11.5 16,7.9999999 V 17 H 6.9999999 L 10.5,13.5 6.9999999,10 9,7.9999999 Z" />
+  <path
+     style="fill:#d2d2d1"
+     id="path4"
+     d="M 12.5,11.5 16,7.9999999 V 17 H 6.9999999 L 10.5,13.5 6.9999999,10 9,7.9999999 Z" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__arrow_right_up.svg b/res/skins/LateNight/classic/buttons/btn__arrow_right_up.svg
new file mode 100644
index 000000000000..f881b330867b
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__arrow_right_up.svg
@@ -0,0 +1,34 @@
+<?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="svg6"
+   version="1.1"
+   height="24"
+   width="24">
+  <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" />
+  <path
+     style="fill:none;stroke:#000001;stroke-width:1.60000002"
+     id="path2"
+     d="M 12.5,12.5 16,16 V 7 H 6.9999999 L 10.5,10.5 6.9999999,14 9,16 Z" />
+  <path
+     style="fill:#d2d2d1"
+     id="path4"
+     d="M 12.5,12.5 16,16 V 7 H 6.9999999 L 10.5,10.5 6.9999999,14 9,16 Z" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__autodj_addrandom.svg b/res/skins/LateNight/classic/buttons/btn__autodj_addrandom.svg
new file mode 100644
index 000000000000..b1252b840841
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000001" 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:#000001;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/classic/buttons/btn__autodj_enable_off.svg b/res/skins/LateNight/classic/buttons/btn__autodj_enable_off.svg
new file mode 100644
index 000000000000..7c6f1aa799bc
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001"/>
+		<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="#000001"/>
+		<path d="m25 8v6.4219c0 .32317.223.57812.5.57812h7c.277 0 .5-.25496.5-.57812v-6.4219h-7.5z" color="#000001"/>
+		<rect x="34" y="8" width="2" height="5" rx="1" ry="1" color="#000001"/>
+		<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="#000001" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000001" 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:#000001;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="#000001" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000001" 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:#000001;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/classic/buttons/btn__autodj_enable_on.svg b/res/skins/LateNight/classic/buttons/btn__autodj_enable_on.svg
new file mode 100644
index 000000000000..d5ad1aa5988b
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001"/>
+	<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="#000001"/>
+	<path d="m25 8v6.4219c0 .32317.223.57812.5.57812h7c.277 0 .5-.25496.5-.57812v-6.4219h-7.5z" color="#000001"/>
+	<rect x="34" y="8" width="2" height="5" rx="1" ry="1" color="#000001"/>
+	<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="#000001" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000001" 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:#000001;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="#000001" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000001" 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:#000001;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/classic/buttons/btn__autodj_fade.svg b/res/skins/LateNight/classic/buttons/btn__autodj_fade.svg
new file mode 100644
index 000000000000..9e3a1e6be6d7
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" color-rendering="auto" dominant-baseline="auto" fill="url(#c)" image-rendering="auto" shape-rendering="auto" solid-color="#000001" 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:#000001;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="#000001" color-rendering="auto" dominant-baseline="auto" fill="url(#b)" image-rendering="auto" shape-rendering="auto" solid-color="#000001" 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:#000001;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/classic/buttons/btn__autodj_fade_disabled.svg b/res/skins/LateNight/classic/buttons/btn__autodj_fade_disabled.svg
new file mode 100644
index 000000000000..c04b92a16c06
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" color-rendering="auto" dominant-baseline="auto" fill="#666" image-rendering="auto" shape-rendering="auto" solid-color="#000001" 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:#000001;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="#000001" color-rendering="auto" dominant-baseline="auto" fill="#666" image-rendering="auto" shape-rendering="auto" solid-color="#000001" 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:#000001;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/classic/buttons/btn__autodj_repeat_playlist_off.svg b/res/skins/LateNight/classic/buttons/btn__autodj_repeat_playlist_off.svg
new file mode 100644
index 000000000000..78105883d6e7
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001"/>
+		<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="#000001"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__autodj_repeat_playlist_on.svg b/res/skins/LateNight/classic/buttons/btn__autodj_repeat_playlist_on.svg
new file mode 100644
index 000000000000..fb992a016f7c
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001"/>
+	<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="#000001"/>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__autodj_shuffle.svg b/res/skins/LateNight/classic/buttons/btn__autodj_shuffle.svg
new file mode 100644
index 000000000000..f8919cb86d78
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" solid-color="#000001" 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:#000001;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="#000001" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" solid-color="#000001" 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:#000001;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/classic/buttons/btn__autodj_skip.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__autodj_skip.svg
rename to res/skins/LateNight/classic/buttons/btn__autodj_skip.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__autodj_skip_disabled.svg b/res/skins/LateNight/classic/buttons/btn__autodj_skip_disabled.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__autodj_skip_disabled.svg
rename to res/skins/LateNight/classic/buttons/btn__autodj_skip_disabled.svg
diff --git a/res/skins/LateNight/classic/buttons/btn__aux_play.svg b/res/skins/LateNight/classic/buttons/btn__aux_play.svg
new file mode 100644
index 000000000000..22e5e1a18d20
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__aux_play.svg
@@ -0,0 +1,14 @@
+<svg width="40" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+		<g fill="none" stroke="#000001">
+				<path d="m20 7v7h2v-3h3v3h2v-7zm2 1h3v2h-3z" stroke-width="1.6"/>
+				<path d="m12 7v7h7v-1h-5v-6z" stroke-width="1.60000002"/>
+				<path d="m5 7v7h2v-3h4v-4zm2 1h3v2h-3z" stroke-width="1.6"/>
+				<path d="m31 14v-3.5l-3-3v-.5h1.5l2.5 2.5 2.5-2.5h1.5v.5l-3 3v3.5z" stroke-width="1.6"/>
+		</g>
+		<g fill="#d2d2d1">
+				<path d="m20 7v7h2v-3h3v3h2v-7zm2 1h3v2h-3z"/>
+				<path d="m12 7v7h7v-1h-5v-6z"/>
+				<path d="m5 7v7h2v-3h4v-4zm2 1h3v2h-3z"/>
+				<path d="m31 14v-3.5l-3-3v-.5h1.5l2.5 2.5 2.5-2.5h1.5v.5l-3 3v3.5z"/>
+		</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__beat_curpos.svg b/res/skins/LateNight/classic/buttons/btn__beat_curpos.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__beat_curpos.svg
rename to res/skins/LateNight/classic/buttons/btn__beat_curpos.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__beat_curpos_active_12.svg b/res/skins/LateNight/classic/buttons/btn__beat_curpos_active_12.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__beat_curpos_active_12.svg
rename to res/skins/LateNight/classic/buttons/btn__beat_curpos_active_12.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__beat_curpos_active_34.svg b/res/skins/LateNight/classic/buttons/btn__beat_curpos_active_34.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__beat_curpos_active_34.svg
rename to res/skins/LateNight/classic/buttons/btn__beat_curpos_active_34.svg
diff --git a/res/skins/LateNight/classic/buttons/btn__beat_curpos_large.svg b/res/skins/LateNight/classic/buttons/btn__beat_curpos_large.svg
new file mode 100644
index 000000000000..7549be191a87
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__beat_curpos_large.svg
@@ -0,0 +1,22 @@
+<?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="svg16" version="1.1" height="24" width="24">
+  <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/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs20"/>
+  <g id="g14" transform="translate(1,-10)">
+    <g style="fill:#888886" id="g8">
+      <path id="path2" d="m 8,31 h 2 V 13 H 8 Z"/>
+      <path id="path4" d="m 13,31 h 2 V 13 h -2 z"/>
+      <path id="path6" d="m 18,31 h 2 V 13 h -2 z"/>
+    </g>
+    <path style="fill:#bfbfbe" id="path10" d="M 3,27 H 5 V 13 H 3 Z"/>
+    <path style="fill:#d3d3d1" id="path12" d="M 3,31 H 5 V 29 H 3 Z"/>
+  </g>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__beatgrid_controls_collapse.svg b/res/skins/LateNight/classic/buttons/btn__beatgrid_controls_collapse.svg
new file mode 100644
index 000000000000..462694904e16
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__beatgrid_controls_collapse.svg
@@ -0,0 +1,104 @@
+<?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="26"
+   height="52"
+   version="1.1"
+   id="svg16">
+  <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="defs20" />
+  <g
+     transform="matrix(-0.5112,0.44559,-0.50559,-0.58003,28.908684,44.828444)"
+     id="g4"
+     style="fill:#bfbfbe;stroke:#000001;stroke-width:2.21497655;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+    <path
+       transform="matrix(-1.4588,0,0,1.2857,27.506,3.1429)"
+       d="M 12,3 C 10.7163,3 9.666,4.0503 9.666,5.334 v 11.797 c -1.6125,0.8501 -2.7305,2.5239 -2.7305,4.4648 0,1.9422 1.1183,3.6174 2.7324,4.4668 V 22.867 c 0,-1.2837 1.0503,-2.334 2.334,-2.334 1.2837,0 2.332,1.0503 2.332,2.334 v 3.1956 c 1.6141,-0.84939 2.7324,-2.5246 2.7324,-4.4668 0,-1.9425 -1.1184,-3.6174 -2.7324,-4.4668 V 5.334 C 14.3339,4.0503 13.2836,3 11.9999,3 Z"
+       id="path2"
+       style="color:#000001;fill:#bfbfbe;stroke:#000001;stroke-width:1.61734033;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+  <g
+     transform="translate(2,26)"
+     id="g14"
+     style="fill:#7c7c7a;stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+    <path
+       d="m 6.9996834,11.363444 v 7.6375 h 2 v -5.3425 z"
+       id="path6"
+       style="stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="m 11.999684,1.0004446 v 5.9864 l 2,2.2948997 V 1.0004446 Z"
+       id="path8"
+       style="stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 16.999684,1.0004446 V 12.725444 l 2,2.293 V 1.0004446 Z"
+       id="path10"
+       style="stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="m 1.9996834,9.7134443 v 9.2873997 h 2 v -7.9846 c -0.73826,-0.26909 -1.4212,-0.69782 -2,-1.3026997 z"
+       id="path12"
+       style="stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+  <g
+     transform="translate(2,26)"
+     id="g14-3"
+     style="fill:#7c7c7a">
+    <path
+       d="m 6.9996834,11.363444 v 7.6375 h 2 v -5.3425 z"
+       id="path6-5" />
+    <path
+       d="m 11.999684,1.0004446 v 5.9864 l 2,2.2948997 V 1.0004446 Z"
+       id="path8-6" />
+    <path
+       d="M 16.999684,1.0004446 V 12.725444 l 2,2.293 V 1.0004446 Z"
+       id="path10-2" />
+    <path
+       d="m 1.9996834,9.7134443 v 9.2873997 h 2 v -7.9846 c -0.73826,-0.26909 -1.4212,-0.69782 -2,-1.3026997 z"
+       id="path12-9" />
+  </g>
+  <g
+     transform="matrix(-0.5112,0.44559,-0.50559,-0.58003,28.908684,44.828444)"
+     id="g4-1"
+     style="fill:#bfbfbe;stroke-width:1.0108">
+    <path
+       transform="matrix(-1.4588,0,0,1.2857,27.506,3.1429)"
+       d="M 12,3 C 10.7163,3 9.666,4.0503 9.666,5.334 v 11.797 c -1.6125,0.8501 -2.7305,2.5239 -2.7305,4.4648 0,1.9422 1.1183,3.6174 2.7324,4.4668 V 22.867 c 0,-1.2837 1.0503,-2.334 2.334,-2.334 1.2837,0 2.332,1.0503 2.332,2.334 v 3.1956 c 1.6141,-0.84939 2.7324,-2.5246 2.7324,-4.4668 0,-1.9425 -1.1184,-3.6174 -2.7324,-4.4668 V 5.334 C 14.3339,4.0503 13.2836,3 11.9999,3 Z"
+       id="path2-2"
+       style="color:#000001;fill:#bfbfbe" />
+  </g>
+  <g
+     id="g970"
+     transform="rotate(-90,-3.000436,26.000101)">
+    <path
+       id="path2-7"
+       d="M 14.424869,48.636 9.9997049,44.210741 5.57454,48.636 4.4682489,47.529614 l 5.531456,-5.531549 5.5314561,5.531549 z"
+       style="fill:none;stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round" />
+    <path
+       id="path4-0"
+       d="m 14.424869,33.364201 -4.4252581,4.425258 -4.4252589,-4.425258 -1.1063851,1.106385 5.53155,5.53155 5.5315501,-5.53155 -1.106385,-1.106385 z"
+       style="fill:none;stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round" />
+    <path
+       id="path6-9"
+       d="M 14.424869,48.636 9.9997049,44.210741 5.57454,48.636 4.4682489,47.529614 l 5.531456,-5.531549 5.5314561,5.531549 z"
+       style="fill:#bbbbbb;stroke-width:0.93992448" />
+    <path
+       id="path8-3"
+       d="M 14.424869,33.364201 9.9996109,37.78946 5.574352,33.364201 l -1.1063851,1.106386 5.53155,5.531549 5.5315501,-5.531549 -1.106385,-1.106386 z"
+       style="fill:#bbbbbb;stroke-width:0.93992448" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__beatgrid_controls_expand.svg b/res/skins/LateNight/classic/buttons/btn__beatgrid_controls_expand.svg
new file mode 100644
index 000000000000..ab5630de1042
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__beatgrid_controls_expand.svg
@@ -0,0 +1,111 @@
+<?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="26"
+   height="52"
+   version="1.1"
+   id="svg16">
+  <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="defs20" />
+  <g
+     transform="matrix(-0.5112,0.44559,-0.50559,-0.58003,28.908684,44.828444)"
+     id="g4"
+     style="fill:#bfbfbe;stroke:#000001;stroke-width:2.21497655;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+    <path
+       transform="matrix(-1.4588,0,0,1.2857,27.506,3.1429)"
+       d="M 12,3 C 10.7163,3 9.666,4.0503 9.666,5.334 v 11.797 c -1.6125,0.8501 -2.7305,2.5239 -2.7305,4.4648 0,1.9422 1.1183,3.6174 2.7324,4.4668 V 22.867 c 0,-1.2837 1.0503,-2.334 2.334,-2.334 1.2837,0 2.332,1.0503 2.332,2.334 v 3.1956 c 1.6141,-0.84939 2.7324,-2.5246 2.7324,-4.4668 0,-1.9425 -1.1184,-3.6174 -2.7324,-4.4668 V 5.334 C 14.3339,4.0503 13.2836,3 11.9999,3 Z"
+       id="path2"
+       style="color:#000001;fill:#bfbfbe;stroke:#000001;stroke-width:1.61734033;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+  <g
+     transform="translate(2,26)"
+     id="g14"
+     style="fill:#7c7c7a;stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+    <path
+       d="m 6.9996834,11.363444 v 7.6375 h 2 v -5.3425 z"
+       id="path6"
+       style="stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="m 11.999684,1.0004446 v 5.9864 l 2,2.2948997 V 1.0004446 Z"
+       id="path8"
+       style="stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 16.999684,1.0004446 V 12.725444 l 2,2.293 V 1.0004446 Z"
+       id="path10"
+       style="stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="m 1.9996834,9.7134443 v 9.2873997 h 2 v -7.9846 c -0.73826,-0.26909 -1.4212,-0.69782 -2,-1.3026997 z"
+       id="path12"
+       style="stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+  <g
+     style="fill:none;stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round"
+     transform="rotate(-90,12.681063,11.681048)"
+     id="g8">
+    <g
+       style="fill:none;stroke:#000001;stroke-width:1.70226443;stroke-linejoin:round"
+       transform="matrix(0.93992449,0,0,0.93992449,1.6003517,1.6003969)"
+       id="g6">
+      <path
+         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"
+         id="path2-3" />
+      <path
+         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"
+         id="path4" />
+    </g>
+  </g>
+  <g
+     style="fill:#bbbbbb"
+     transform="matrix(0,-0.93992449,0.93992449,0,2.6004124,22.761759)"
+     id="g14-6">
+    <path
+       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"
+       id="path10-7" />
+    <path
+       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"
+       id="path12-5" />
+  </g>
+  <g
+     transform="translate(2,26)"
+     id="g14-3"
+     style="fill:#7c7c7a">
+    <path
+       d="m 6.9996834,11.363444 v 7.6375 h 2 v -5.3425 z"
+       id="path6-5" />
+    <path
+       d="m 11.999684,1.0004446 v 5.9864 l 2,2.2948997 V 1.0004446 Z"
+       id="path8-6" />
+    <path
+       d="M 16.999684,1.0004446 V 12.725444 l 2,2.293 V 1.0004446 Z"
+       id="path10-2" />
+    <path
+       d="m 1.9996834,9.7134443 v 9.2873997 h 2 v -7.9846 c -0.73826,-0.26909 -1.4212,-0.69782 -2,-1.3026997 z"
+       id="path12-9" />
+  </g>
+  <g
+     transform="matrix(-0.5112,0.44559,-0.50559,-0.58003,28.908684,44.828444)"
+     id="g4-1"
+     style="fill:#bfbfbe;stroke-width:1.0108">
+    <path
+       transform="matrix(-1.4588,0,0,1.2857,27.506,3.1429)"
+       d="M 12,3 C 10.7163,3 9.666,4.0503 9.666,5.334 v 11.797 c -1.6125,0.8501 -2.7305,2.5239 -2.7305,4.4648 0,1.9422 1.1183,3.6174 2.7324,4.4668 V 22.867 c 0,-1.2837 1.0503,-2.334 2.334,-2.334 1.2837,0 2.332,1.0503 2.332,2.334 v 3.1956 c 1.6141,-0.84939 2.7324,-2.5246 2.7324,-4.4668 0,-1.9425 -1.1184,-3.6174 -2.7324,-4.4668 V 5.334 C 14.3339,4.0503 13.2836,3 11.9999,3 Z"
+       id="path2-2"
+       style="color:#000001;fill:#bfbfbe" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__beats_earlier.svg b/res/skins/LateNight/classic/buttons/btn__beats_earlier.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__beats_earlier.svg
rename to res/skins/LateNight/classic/buttons/btn__beats_earlier.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__beats_faster.svg b/res/skins/LateNight/classic/buttons/btn__beats_faster.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__beats_faster.svg
rename to res/skins/LateNight/classic/buttons/btn__beats_faster.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__beats_later.svg b/res/skins/LateNight/classic/buttons/btn__beats_later.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__beats_later.svg
rename to res/skins/LateNight/classic/buttons/btn__beats_later.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__beats_slower.svg b/res/skins/LateNight/classic/buttons/btn__beats_slower.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__beats_slower.svg
rename to res/skins/LateNight/classic/buttons/btn__beats_slower.svg
diff --git a/res/skins/LateNight/classic/buttons/btn__collapse.svg b/res/skins/LateNight/classic/buttons/btn__collapse.svg
new file mode 100644
index 000000000000..078444b9758b
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__collapse.svg
@@ -0,0 +1,50 @@
+<?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="14"
+   height="18"
+   version="1.1"
+   id="svg10">
+  <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="defs14" />
+  <g
+     style="fill:#999998;fill-opacity:1"
+     id="g825">
+    <path
+       style="fill:#999998;stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round;fill-opacity:1"
+       id="path2"
+       d="M 11.425164,16.637935 7,12.212676 2.574835,16.637935 1.4685439,15.531549 7,10 l 5.531456,5.531549 z" />
+    <path
+       style="fill:#999998;stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round;fill-opacity:1"
+       id="path4"
+       d="M 11.425164,1.3661361 6.999906,5.7913942 2.574647,1.3661361 1.4682619,2.4725212 6.999812,8.004071 12.531362,2.4725212 11.424977,1.3661361 Z" />
+  </g>
+  <g
+     style="fill:#999998;fill-opacity:1"
+     id="g821">
+    <path
+       style="fill:#999998;stroke-width:0.93992448;fill-opacity:1"
+       id="path6"
+       d="M 11.425164,16.637935 7,12.212676 2.574835,16.637935 1.4685439,15.531549 7,10 l 5.531456,5.531549 z" />
+    <path
+       style="fill:#999998;stroke-width:0.93992448;fill-opacity:1"
+       id="path8"
+       d="M 11.425164,1.3661365 6.999906,5.7913946 2.574647,1.3661365 1.4682619,2.4725216 6.999812,8.004071 12.531362,2.4725216 11.424977,1.3661365 Z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__collapse_dim.svg b/res/skins/LateNight/classic/buttons/btn__collapse_dim.svg
new file mode 100644
index 000000000000..e803bd217c2e
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__collapse_dim.svg
@@ -0,0 +1,49 @@
+<?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="14"
+   height="18"
+   version="1.1"
+   id="svg10">
+  <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="defs14" />
+  <g
+     id="g825">
+    <path
+       style="fill:none;stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round"
+       id="path2"
+       d="M 11.425164,16.637935 7,12.212676 2.574835,16.637935 1.4685439,15.531549 7,10 l 5.531456,5.531549 z" />
+    <path
+       style="fill:none;stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round"
+       id="path4"
+       d="M 11.425164,1.3661361 6.999906,5.7913942 2.574647,1.3661361 1.4682619,2.4725212 6.999812,8.004071 12.531362,2.4725212 11.424977,1.3661361 Z" />
+  </g>
+  <g
+     style="fill:#777777;fill-opacity:1"
+     id="g821">
+    <path
+       style="fill:#777777;stroke-width:0.93992448;fill-opacity:1"
+       id="path6"
+       d="M 11.425164,16.637935 7,12.212676 2.574835,16.637935 1.4685439,15.531549 7,10 l 5.531456,5.531549 z" />
+    <path
+       style="fill:#777777;stroke-width:0.93992448;fill-opacity:1"
+       id="path8"
+       d="M 11.425164,1.3661365 6.999906,5.7913946 2.574647,1.3661365 1.4682619,2.4725216 6.999812,8.004071 12.531362,2.4725216 11.424977,1.3661365 Z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__cue_deck.svg b/res/skins/LateNight/classic/buttons/btn__cue_deck.svg
new file mode 100644
index 000000000000..f06846a35441
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">
+				<path d="m20 8h-7v7h7v-1h-5v-5h5z"/>
+				<path d="m22 8v7h7v-7h-2v6h-3v-6z"/>
+				<path d="m31 8v7h7v-1h-5v-3h4v-1h-4v-1h5v-1z"/>
+		</g>
+		<g transform="translate(-6)" fill="#d2d2d1">
+				<path d="m20 8h-7v7h7v-1h-5v-5h5z"/>
+				<path d="m22 8v7h7v-7h-2v6h-3v-6z"/>
+				<path d="m31 8v7h7v-1h-5v-3h4v-1h-4v-1h5v-1z"/>
+		</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__delete.svg b/res/skins/LateNight/classic/buttons/btn__delete.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__delete.svg
rename to res/skins/LateNight/classic/buttons/btn__delete.svg
diff --git a/res/skins/LateNight/classic/buttons/btn__effectselector_border.svg b/res/skins/LateNight/classic/buttons/btn__effectselector_border.svg
new file mode 100644
index 000000000000..cc6c46456646
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" 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/classic/buttons/btn__eject.svg b/res/skins/LateNight/classic/buttons/btn__eject.svg
new file mode 100644
index 000000000000..ca7d2b8883d3
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" fill="#585858"/></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__eject_active_12.svg b/res/skins/LateNight/classic/buttons/btn__eject_active_12.svg
new file mode 100644
index 000000000000..a5b1bdaf835b
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__eject_active_12.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="#f0bb2b"/><rect id="rect4195" x="4" y="12" width="13" height="3" color="#000001" fill="#f0bb2b"/></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__eject_active_34.svg b/res/skins/LateNight/classic/buttons/btn__eject_active_34.svg
new file mode 100644
index 000000000000..1b24b74135c6
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" fill="#0bd9d1"/></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__eq_kill_high.svg b/res/skins/LateNight/classic/buttons/btn__eq_kill_high.svg
new file mode 100644
index 000000000000..cc38e50b6c71
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__eq_kill_high.svg
@@ -0,0 +1,68 @@
+<?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="18"
+   height="18"
+   version="1.1"
+   id="svg17">
+  <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="defs9">
+    <linearGradient
+       id="a"
+       x1="2"
+       x2="24"
+       y1="12"
+       y2="12"
+       gradientTransform="matrix(.69565216 0 0 .69565216 -.04349915 -16.652173)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-opacity=".0047619"
+         offset="0"
+         id="stop2" />
+      <stop
+         stop-opacity="0"
+         offset=".5"
+         id="stop4" />
+      <stop
+         stop-opacity=".47451"
+         offset="1"
+         id="stop6" />
+    </linearGradient>
+  </defs>
+  <text
+     id="text838"
+     y="14.63623"
+     x="3.9139636"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:13.33333302px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       y="14.63623"
+       x="3.9139636"
+       id="tspan836">H</tspan></text>
+  <text
+     id="text838-3"
+     y="14.63623"
+     x="3.9139636"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#bbb;fill-opacity:1;stroke:none"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:13.33333302px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:#bbb;fill-opacity:1"
+       y="14.63623"
+       x="3.9139636"
+       id="tspan836-6">H</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__eq_kill_low.svg b/res/skins/LateNight/classic/buttons/btn__eq_kill_low.svg
new file mode 100644
index 000000000000..84bc12f90804
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__eq_kill_low.svg
@@ -0,0 +1,68 @@
+<?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="18"
+   height="18"
+   version="1.1"
+   id="svg17">
+  <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="defs9">
+    <linearGradient
+       id="a"
+       x1="2"
+       x2="24"
+       y1="12"
+       y2="12"
+       gradientTransform="matrix(.69565216 0 0 .69565216 -.04349915 -16.652173)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-opacity=".0047619"
+         offset="0"
+         id="stop2" />
+      <stop
+         stop-opacity="0"
+         offset=".5"
+         id="stop4" />
+      <stop
+         stop-opacity=".47451"
+         offset="1"
+         id="stop6" />
+    </linearGradient>
+  </defs>
+  <text
+     id="text838"
+     y="14.63623"
+     x="5.1662478"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:13.33333302px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       y="14.63623"
+       x="5.1662478"
+       id="tspan836">L</tspan></text>
+  <text
+     id="text838-3"
+     y="14.63623"
+     x="5.1662478"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#bbb;fill-opacity:1;stroke:none"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:13.33333302px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:#bbb;fill-opacity:1"
+       y="14.63623"
+       x="5.1662478"
+       id="tspan836-6">L</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__eq_kill_mid.svg b/res/skins/LateNight/classic/buttons/btn__eq_kill_mid.svg
new file mode 100644
index 000000000000..305912dd65e0
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__eq_kill_mid.svg
@@ -0,0 +1,68 @@
+<?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="18"
+   height="18"
+   version="1.1"
+   id="svg17">
+  <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="defs9">
+    <linearGradient
+       id="a"
+       x1="2"
+       x2="24"
+       y1="12"
+       y2="12"
+       gradientTransform="matrix(.69565216 0 0 .69565216 -.04349915 -16.652173)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-opacity=".0047619"
+         offset="0"
+         id="stop2" />
+      <stop
+         stop-opacity="0"
+         offset=".5"
+         id="stop4" />
+      <stop
+         stop-opacity=".47451"
+         offset="1"
+         id="stop6" />
+    </linearGradient>
+  </defs>
+  <text
+     id="text838"
+     y="14.63623"
+     x="2.7904694"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:13.33333302px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       y="14.63623"
+       x="2.7904694"
+       id="tspan836">M</tspan></text>
+  <text
+     id="text838-3"
+     y="14.63623"
+     x="2.7904694"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#bbb;fill-opacity:1;stroke:none"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:13.33333302px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:#bbb;fill-opacity:1"
+       y="14.63623"
+       x="2.7904694"
+       id="tspan836-6">M</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__expand.svg b/res/skins/LateNight/classic/buttons/btn__expand.svg
new file mode 100644
index 000000000000..4aa24238a304
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__expand.svg
@@ -0,0 +1,53 @@
+<?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="svg16"
+   version="1.1"
+   height="18"
+   width="14">
+  <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="defs20" />
+  <g
+     style="fill:none;stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round"
+     id="g8"
+     transform="translate(-3.9997376,-1.989)">
+    <g
+       style="fill:none;stroke:#000001;stroke-width:1.70226443;stroke-linejoin:round"
+       id="g6"
+       transform="matrix(0.93992449,0,0,0.93992449,1.6003517,1.6003969)">
+      <path
+         id="path2"
+         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" />
+      <path
+         id="path4"
+         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" />
+    </g>
+  </g>
+  <g
+     style="fill:#999998"
+     id="g14"
+     transform="matrix(0.93992449,0,0,0.93992449,-2.3993859,-0.3886031)">
+    <path
+       id="path10"
+       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" />
+    <path
+       id="path12"
+       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" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__expand_dim.svg b/res/skins/LateNight/classic/buttons/btn__expand_dim.svg
new file mode 100644
index 000000000000..d6bb246979e3
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__expand_dim.svg
@@ -0,0 +1,55 @@
+<?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="14"
+   height="18"
+   version="1.1"
+   id="svg16">
+  <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="defs20" />
+  <g
+     transform="translate(-3.9997376,-1.989)"
+     id="g8"
+     style="fill:none;stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round">
+    <g
+       transform="matrix(0.93992449,0,0,0.93992449,1.6003517,1.6003969)"
+       id="g6"
+       style="fill:none;stroke:#000001;stroke-width:1.70226443;stroke-linejoin:round">
+      <path
+         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"
+         id="path2" />
+      <path
+         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"
+         id="path4" />
+    </g>
+  </g>
+  <g
+     transform="matrix(0.93992449,0,0,0.93992449,-2.3993859,-0.3886031)"
+     id="g14"
+     style="fill:#777777;fill-opacity:1">
+    <path
+       style="fill:#777777;fill-opacity:1"
+       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"
+       id="path10" />
+    <path
+       style="fill:#777777;fill-opacity:1"
+       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"
+       id="path12" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_2.svg b/res/skins/LateNight/classic/buttons/btn__fx_2.svg
new file mode 100644
index 000000000000..5868f1e37254
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" stroke-linecap="square" stroke-width="1.6"/>
+	<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/classic/buttons/btn__fx_2_active.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__fx_2_active.svg
rename to res/skins/LateNight/classic/buttons/btn__fx_2_active.svg
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_3.svg b/res/skins/LateNight/classic/buttons/btn__fx_3.svg
new file mode 100644
index 000000000000..f85178c69abc
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" stroke-width="1.6"/>
+	<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/classic/buttons/btn__fx_3_active.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__fx_3_active.svg
rename to res/skins/LateNight/classic/buttons/btn__fx_3_active.svg
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_4.svg b/res/skins/LateNight/classic/buttons/btn__fx_4.svg
new file mode 100644
index 000000000000..b03b4e9dd4b4
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" stroke-width="1.6"/>
+	<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/classic/buttons/btn__fx_4_active.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__fx_4_active.svg
rename to res/skins/LateNight/classic/buttons/btn__fx_4_active.svg
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_FX1.svg b/res/skins/LateNight/classic/buttons/btn__fx_FX1.svg
new file mode 100644
index 000000000000..72f260009df3
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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.6">
+		<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/classic/buttons/btn__fx_FX1_active.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__fx_FX1_active.svg
rename to res/skins/LateNight/classic/buttons/btn__fx_FX1_active.svg
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_FX2.svg b/res/skins/LateNight/classic/buttons/btn__fx_FX2.svg
new file mode 100644
index 000000000000..243194172397
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" stroke-linecap="square" stroke-width="1.6">
+		<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/classic/buttons/btn__fx_FX2_active.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__fx_FX2_active.svg
rename to res/skins/LateNight/classic/buttons/btn__fx_FX2_active.svg
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_FX3.svg b/res/skins/LateNight/classic/buttons/btn__fx_FX3.svg
new file mode 100644
index 000000000000..071ea2b965a5
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" stroke-linecap="square" stroke-width="1.6">
+		<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/classic/buttons/btn__fx_FX3_active.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__fx_FX3_active.svg
rename to res/skins/LateNight/classic/buttons/btn__fx_FX3_active.svg
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_FX4.svg b/res/skins/LateNight/classic/buttons/btn__fx_FX4.svg
new file mode 100644
index 000000000000..6d42ce787bad
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" stroke-width="1.6">
+		<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/classic/buttons/btn__fx_FX4_active.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__fx_FX4_active.svg
rename to res/skins/LateNight/classic/buttons/btn__fx_FX4_active.svg
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_focus.svg b/res/skins/LateNight/classic/buttons/btn__fx_focus.svg
new file mode 100644
index 000000000000..0277d12a656d
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__fx_focus.svg
@@ -0,0 +1,32 @@
+<?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="svg22"
+   version="1.1"
+   height="18"
+   width="18">
+  <metadata
+     id="metadata28">
+    <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="defs26" />
+  <circle
+     r="7"
+     cy="9"
+     cx="9"
+     id="path1001"
+     style="opacity:1;fill:#151515;fill-opacity:1;stroke:#666666;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_focus_active.svg b/res/skins/LateNight/classic/buttons/btn__fx_focus_active.svg
new file mode 100644
index 000000000000..718d60397555
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__fx_focus_active.svg
@@ -0,0 +1,60 @@
+<?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="svg32"
+   version="1.1"
+   height="18"
+   width="18">
+  <metadata
+     id="metadata38">
+    <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="defs36">
+    <linearGradient
+       id="linearGradient1005">
+      <stop
+         id="stop1001"
+         offset="0"
+         style="stop-color:#d08e00;stop-opacity:1" />
+      <stop
+         id="stop1003"
+         offset="1"
+         style="stop-color:#8f6200;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.82536346,0,0,0.82536346,1.5717289,1.5717289)"
+       gradientUnits="userSpaceOnUse"
+       y2="16.269526"
+       x2="11.423175"
+       y1="2.9420629"
+       x1="7.0999489"
+       id="linearGradient1007-3"
+       xlink:href="#linearGradient1005" />
+  </defs>
+  <circle
+     r="7"
+     cy="9"
+     cx="9"
+     id="path1001"
+     style="opacity:1;fill:#0f0f0f;fill-opacity:1;stroke:#666666;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <circle
+     r="5.777544"
+     cy="9"
+     cx="9"
+     id="path1001-5"
+     style="opacity:1;fill:url(#linearGradient1007-3);fill-opacity:1;stroke:none;stroke-width:0.82536346;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__fx_mixmode_d+w.svg b/res/skins/LateNight/classic/buttons/btn__fx_mixmode_d+w.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__fx_mixmode_d+w.svg
rename to res/skins/LateNight/classic/buttons/btn__fx_mixmode_d+w.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__fx_mixmode_d-w.svg b/res/skins/LateNight/classic/buttons/btn__fx_mixmode_d-w.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__fx_mixmode_d-w.svg
rename to res/skins/LateNight/classic/buttons/btn__fx_mixmode_d-w.svg
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_selector_down.svg b/res/skins/LateNight/classic/buttons/btn__fx_selector_down.svg
new file mode 100644
index 000000000000..23215c8710d8
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" stroke-width="1.6"/>
+	<path d="m8 15.918 4.5715-7.9181h-9.143z" fill="#888"/>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_selector_down_pressed.svg b/res/skins/LateNight/classic/buttons/btn__fx_selector_down_pressed.svg
new file mode 100644
index 000000000000..1fb9b0abcb33
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" stroke-width="1.6"/>
+	<path d="m8 15.918 4.5715-7.9181h-9.143z" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__fx_toggle.svg b/res/skins/LateNight/classic/buttons/btn__fx_toggle.svg
new file mode 100644
index 000000000000..1f1524a6ca0f
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" stroke-width="1.6">
+		<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/classic/buttons/btn__fx_toggle_active.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__fx_toggle_active.svg
rename to res/skins/LateNight/classic/buttons/btn__fx_toggle_active.svg
diff --git a/res/skins/LateNight/classic/buttons/btn__hotcues_earlier.svg b/res/skins/LateNight/classic/buttons/btn__hotcues_earlier.svg
new file mode 100644
index 000000000000..3581ce4378c5
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__hotcues_earlier.svg
@@ -0,0 +1,38 @@
+<?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="24"
+   height="24"
+   version="1.1"
+   id="svg14">
+  <metadata
+     id="metadata20">
+    <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="defs18" />
+  <path
+     style="fill:#bfbfbe"
+     id="path6"
+     d="m 12,16 h -2 v 3 l -7,-4 7,-4 v 3 h 2 z" />
+  <path
+     style="fill:#888888;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 20,3 h -8 v 7 h 6 v 11 h 2 z M 19,9 H 13 V 4 h 6 z"
+     id="path833" />
+  <path
+     id="rect835"
+     d="m 13,4 h 6 v 5 h -6 z"
+     style="opacity:1;fill:#555555;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__hotcues_later.svg b/res/skins/LateNight/classic/buttons/btn__hotcues_later.svg
new file mode 100644
index 000000000000..0afe983d177d
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__hotcues_later.svg
@@ -0,0 +1,16 @@
+<?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="svg14" version="1.1" height="24" width="24">
+  <metadata id="metadata20">
+    <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>
+  <defs id="defs18"/>
+  <path d="m 13,16 h 2 v 3 l 7,-4 -7,-4 v 3 h -2 z" id="path6" style="fill:#bfbfbe"/>
+  <path id="path833" d="M 12,3 H 4 v 7 h 6 v 11 h 2 z M 11,9 H 5 V 4 h 6 z" style="fill:#888888;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
+  <path style="opacity:1;fill:#555555;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 5,4 h 6 V 9 H 5 Z" id="rect835"/>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__intro_end.svg b/res/skins/LateNight/classic/buttons/btn__intro_end.svg
new file mode 100644
index 000000000000..ff3317eb7272
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" stroke-linecap="square" stroke-width="1.6">
+		<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/classic/buttons/btn__intro_start.svg b/res/skins/LateNight/classic/buttons/btn__intro_start.svg
new file mode 100644
index 000000000000..b0ebbb8369d1
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" stroke-linecap="square" stroke-width="1.6">
+		<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/classic/buttons/btn__jump_left.svg b/res/skins/LateNight/classic/buttons/btn__jump_left.svg
new file mode 100644
index 000000000000..033733a758a2
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__jump_left.svg
@@ -0,0 +1,10 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+		<g transform="matrix(-1,0,0,1,24.001,0)" fill="none" stroke="#000001">
+				<path d="m17 7v10h1v-10z" stroke-linecap="square" stroke-width="1.6"/>
+				<path d="M 6.0104936,6.6784736 14.001,12.005731 6.0104936,17.33299 V 6.6784736" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5999999"/>
+		</g>
+		<g transform="matrix(-1,0,0,1,24.001,0)" fill="#d2d2d1">
+				<path d="m17 7v10h1v-10"/>
+				<path d="M 6.0104936,6.6733845 14.001,12.000642 6.0104936,17.327901 V 6.6733845" stroke-width=".99999994"/>
+		</g>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__jump_right.svg b/res/skins/LateNight/classic/buttons/btn__jump_right.svg
new file mode 100644
index 000000000000..35fa417bdce3
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__jump_right.svg
@@ -0,0 +1,10 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+		<g fill="none" stroke="#000001">
+				<path d="m17 7v10h1v-10z" stroke-linecap="square" stroke-width="1.6"/>
+				<path d="M 6.0104936,6.6784736 14.001,12.005731 6.0104936,17.33299 V 6.6784736" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5999999"/>
+		</g>
+		<g fill="#d2d2d1">
+				<path d="m17 7v10h1v-10"/>
+				<path d="M 6.0104936,6.6733845 14.001,12.000642 6.0104936,17.327901 V 6.6733845" stroke-width=".99999994"/>
+		</g>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__key_down.svg b/res/skins/LateNight/classic/buttons/btn__key_down.svg
new file mode 100644
index 000000000000..753b2af4aea1
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__key_down.svg
@@ -0,0 +1,4 @@
+<svg width="10" height="9" version="1.1" xmlns="http://www.w3.org/2000/svg">
+		<path d="m5.0000515 8.00008-3.4641429-6h6.9281999z" fill="none" stroke="#000001" stroke-linejoin="round" stroke-width="1.60000002"/>
+		<path d="m5.0000515 8.00008-3.4641429-6h6.9281999z" fill="#bfbfbe" stroke-width=".85714287"/>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__key_match.svg b/res/skins/LateNight/classic/buttons/btn__key_match.svg
new file mode 100644
index 000000000000..7f77bd675cd3
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" 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="#000001" 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/classic/buttons/btn__key_up.svg b/res/skins/LateNight/classic/buttons/btn__key_up.svg
new file mode 100644
index 000000000000..4821f68e91b8
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__key_up.svg
@@ -0,0 +1,4 @@
+<svg width="10" height="9" version="1.1" xmlns="http://www.w3.org/2000/svg">
+		<path d="M 5.0000515,0.99999999 1.5359086,7 h 6.9281999 z" fill="none" stroke="#000001" stroke-linejoin="round" stroke-width="1.60000002"/>
+		<path d="M 5.0000515,0.99999999 1.5359086,7 h 6.9281999 z" fill="#bfbfbe" stroke-width=".85714287"/>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__keylock.svg b/res/skins/LateNight/classic/buttons/btn__keylock.svg
new file mode 100644
index 000000000000..f403f41b4dd0
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" fill="#585858"/></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__keylock_active_12.svg b/res/skins/LateNight/classic/buttons/btn__keylock_active_12.svg
new file mode 100644
index 000000000000..c75e8ce42068
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__keylock_active_12.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="#000001" fill="#f0bb2b"/></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__keylock_active_34.svg b/res/skins/LateNight/classic/buttons/btn__keylock_active_34.svg
new file mode 100644
index 000000000000..69fe30027bd7
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" fill="#0bd9d1"/></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_bpm_down.svg b/res/skins/LateNight/classic/buttons/btn__lib_bpm_down.svg
new file mode 100644
index 000000000000..10c4bc4a3f47
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__lib_bpm_down.svg
@@ -0,0 +1,30 @@
+<?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="12"
+   height="10"
+   version="1.1"
+   id="svg4">
+  <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
+     d="M 6.0000585,8 1.9585587,1 h 8.0828993 z"
+     id="path35"
+     style="fill:#eeeeef;fill-opacity:1;stroke-width:0.99999994" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_bpm_locked_orange.svg b/res/skins/LateNight/classic/buttons/btn__lib_bpm_locked_orange.svg
new file mode 100644
index 000000000000..e19a86e209c2
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__lib_bpm_locked_orange.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="#000001" fill="#ff6600" style="text-decoration-line:none;text-indent:0;text-transform:none"/></g></g></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_bpm_unlocked_grey.svg b/res/skins/LateNight/classic/buttons/btn__lib_bpm_unlocked_grey.svg
new file mode 100644
index 000000000000..ba6ce4268945
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__lib_bpm_unlocked_grey.svg
@@ -0,0 +1,5 @@
+<svg width="10" height="12" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(0,-20)">
+		<path transform="translate(0,20)" d="m4.9766 0c-1.4489.01-2.4418.65947-2.9336 1.4238l1.26172.81059c.2485-.38625.62385-.7271 1.6816-.73438 1.0447-.00718 1.407.31941 1.6699.75781.26297.4384.34296 1.0862.34375 1.5742.0009639.58906.0001684 1.8689 0 2.168h-6.166c-.41667 0-.83398.41498-.83398.83008v4.3398c0 .4151.41732.83008.83398.83008h8.332c.41667 0 .83398-.41498.83398-.83008v-4.3398c0-.4151-.41732-.83008-.83398-.83008h-.66602c.000169-.29836.0009685-1.5773 0-2.1719-.0009966-.61214-.060246-1.5129-.55859-2.3438-.49835-.83081-1.5189-1.4943-2.9648-1.4844zm-2.9766 8h6c.277 0 .5.223.5.5s-.223.5-.5.5h-6c-.277 0-.5-.223-.5-.5s.223-.5.5-.5zm0 2h6c.277 0 .5.223.5.5s-.223.5-.5.5h-6c-.277 0-.5-.223-.5-.5s.223-.5.5-.5z" color="#000001" color-rendering="auto" dominant-baseline="auto" fill="#979797" fill-opacity=".50196007" image-rendering="auto" shape-rendering="auto" solid-color="#000001" 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:#000001;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/classic/buttons/btn__lib_bpm_up.svg b/res/skins/LateNight/classic/buttons/btn__lib_bpm_up.svg
new file mode 100644
index 000000000000..30e180f61846
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__lib_bpm_up.svg
@@ -0,0 +1,30 @@
+<?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="10"
+   width="12">
+  <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:#eeeeef;fill-opacity:1;stroke-width:0.99999994"
+     id="path35"
+     d="M 6.0000585,2 1.9585587,9 h 8.0828993 z" />
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__lib_checkmark_orange.svg b/res/skins/LateNight/classic/buttons/btn__lib_checkmark_orange.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__lib_checkmark_orange.svg
rename to res/skins/LateNight/classic/buttons/btn__lib_checkmark_orange.svg
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_clear_search.svg b/res/skins/LateNight/classic/buttons/btn__lib_clear_search.svg
new file mode 100644
index 000000000000..a3b4764f56f9
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" fill="#b3b3b3" stroke-width="0"/></g></g></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_clear_search_focus.svg b/res/skins/LateNight/classic/buttons/btn__lib_clear_search_focus.svg
new file mode 100644
index 000000000000..88ffba76540b
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" fill="#f60" stroke-width="0"/></g></g></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_preview_pause.svg b/res/skins/LateNight/classic/buttons/btn__lib_preview_pause.svg
new file mode 100644
index 000000000000..ecd76912ea08
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__lib_preview_pause.svg
@@ -0,0 +1,87 @@
+<?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="30"
+   id="svg2">
+  <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" />
+  <g
+     style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none"
+     transform="translate(0,-14)"
+     id="ic_library_crates">
+    <g
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:2.40905806;stroke-miterlimit:4;stroke-dasharray:none"
+       fill="#f60"
+       transform="matrix(.4151 0 0 .4151 -1.6604 19.547)"
+       id="ic_library_unchecked">
+      <rect
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:2.40905806;stroke-miterlimit:4;stroke-dasharray:none"
+         color="#000001"
+         height="19.273"
+         width="4.818"
+         y="-1.3179"
+         x="54.591"
+         id="rect3370" />
+      <rect
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:2.40905806;stroke-miterlimit:4;stroke-dasharray:none"
+         color="#000001"
+         height="19.273"
+         width="4.818"
+         y="-1.3179"
+         x="64.227"
+         id="rect3372" />
+      <path
+         style="text-indent:0;text-transform:none;fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:2.40905806;stroke-miterlimit:4;stroke-dasharray:none"
+         stroke-width="2.4091"
+         color="#000001"
+         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"
+         id="path9863-1-2-3" />
+    </g>
+  </g>
+  <g
+     style="fill:#ffffff;fill-opacity:1"
+     transform="translate(1.9999999e-8,-14)"
+     id="ic_library_crates-3">
+    <g
+       style="fill:#ffffff;fill-opacity:1"
+       transform="matrix(0.4151,0,0,0.4151,-1.6604,19.547)"
+       id="ic_library_unchecked-6">
+      <rect
+         style="color:#000001;fill:#ffffff;fill-opacity:1"
+         height="19.273001"
+         width="4.8179998"
+         y="-1.3178999"
+         x="54.591"
+         id="rect3370-7" />
+      <rect
+         style="color:#000001;fill:#ffffff;fill-opacity:1"
+         height="19.273001"
+         width="4.8179998"
+         y="-1.3178999"
+         x="64.226997"
+         id="rect3372-5" />
+      <path
+         style="color:#000001;text-indent:0;text-transform:none;fill:#ffffff;fill-opacity:1;stroke-width:2.40910006"
+         d="m 28.091,-5.2913 c -7.6146,0 -14.009,6.184 -14.009,13.799 0,0.081419 -0.0018,0.15673 0,0.25552 v 0.44717 c -1.5498,1.3124 -2.5552,3.24 -2.5552,5.4298 0,3.9514 2.9756,7.1547 6.927,7.1547 v -14.309 c -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.12776 v 14.309 c 3.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.799 z"
+         id="path9863-1-2-3-3" />
+    </g>
+  </g>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_preview_play.svg b/res/skins/LateNight/classic/buttons/btn__lib_preview_play.svg
new file mode 100644
index 000000000000..7bb79b163b05
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__lib_preview_play.svg
@@ -0,0 +1,39 @@
+<?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="30"
+   height="18"
+   version="1.1"
+   id="svg10">
+  <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="defs14" />
+  <g
+     style="fill:#f0bb2b;fill-opacity:1"
+     id="g6"
+     transform="matrix(0.4151,0,0,0.4151,-1.6604,5.547)">
+    <path
+       id="path2"
+       d="M 54.590219,18.654796 V -2.021583 L 72.312697,8.3166063 Z"
+       style="fill:#f0bb2b;fill-opacity:1;stroke-width:0.88215041" />
+    <path
+       id="path4"
+       style="color:#000001;text-indent:0;text-transform:none;stroke-width:2.40910006;fill:#f0bb2b;fill-opacity:1"
+       d="m 28.091,-5.2913 c -7.6146,0 -14.009,6.184 -14.009,13.799 0,0.081419 -0.0018,0.15673 0,0.25552 v 0.44717 c -1.5498,1.3124 -2.5552,3.24 -2.5552,5.4298 0,3.9514 2.9756,7.1547 6.927,7.1547 v -14.309 c -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.12776 v 14.309 c 3.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.799 z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__lib_radio_button_gold_on.svg b/res/skins/LateNight/classic/buttons/btn__lib_radio_button_gold_on.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__lib_radio_button_gold_on.svg
rename to res/skins/LateNight/classic/buttons/btn__lib_radio_button_gold_on.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__lib_radio_button_off.svg b/res/skins/LateNight/classic/buttons/btn__lib_radio_button_off.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__lib_radio_button_off.svg
rename to res/skins/LateNight/classic/buttons/btn__lib_radio_button_off.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__lib_radio_button_on_yellow.svg b/res/skins/LateNight/classic/buttons/btn__lib_radio_button_on_yellow.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__lib_radio_button_on_yellow.svg
rename to res/skins/LateNight/classic/buttons/btn__lib_radio_button_on_yellow.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__lib_radio_button_yellow_on.svg b/res/skins/LateNight/classic/buttons/btn__lib_radio_button_yellow_on.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__lib_radio_button_yellow_on.svg
rename to res/skins/LateNight/classic/buttons/btn__lib_radio_button_yellow_on.svg
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_sort_down.svg b/res/skins/LateNight/classic/buttons/btn__lib_sort_down.svg
new file mode 100644
index 000000000000..4b8f3c5ad263
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" stroke-width="1.6"/>
+	<path d="m6 9.5590477 4.5715-7.9181h-9.143z" fill="#fa0"/>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__lib_sort_up.svg b/res/skins/LateNight/classic/buttons/btn__lib_sort_up.svg
new file mode 100644
index 000000000000..b24794ca5e39
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" stroke-width="1.6"/>
+	<path d="m6 2.4409522 4.5715 7.9180998h-9.143z" fill="#fa0"/>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__loop.svg b/res/skins/LateNight/classic/buttons/btn__loop.svg
new file mode 100644
index 000000000000..b8fe8a743f95
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" stroke-width="1.6">
+				<path d="m20 18v-12h-5v-3l-7 3.75 7 3.75-1e-4-2.9999 3.5001-1e-4v9l-1.5-1e-4v1.5001z" color="#000001"/>
+				<path d="m4 6v12h5v3l7-3.75-7-3.75 1e-4 2.9999-3.5001 1e-4v-9l1.5 1e-4v-1.5001z" color="#000001"/>
+		</g>
+		<g fill="#d2d2d1">
+				<path d="m20 18v-12h-5v-3l-7 3.75 7 3.75-1e-4-2.9999 3.5001-1e-4v9l-1.5-1e-4v1.5001z" color="#000001"/>
+				<path d="m4 6v12h5v3l7-3.75-7-3.75 1e-4 2.9999-3.5001 1e-4v-9l1.5 1e-4v-1.5001z" color="#000001"/>
+		</g>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__loop_in.svg b/res/skins/LateNight/classic/buttons/btn__loop_in.svg
new file mode 100644
index 000000000000..e581d4e3e49e
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" stroke-linecap="square" stroke-width="1.6"/>
+		<path d="m9 6h5v13h-1v-7h-4v-6" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__loop_out.svg b/res/skins/LateNight/classic/buttons/btn__loop_out.svg
new file mode 100644
index 000000000000..45d200db6d24
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" stroke-linecap="square" stroke-width="1.6"/>
+		<path d="m14 6h-5v13h1v-7h4v-6" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__mic_duck_auto.svg b/res/skins/LateNight/classic/buttons/btn__mic_duck_auto.svg
new file mode 100644
index 000000000000..f0d8e622b540
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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 9v7h2v-3h3v3h2v-7zm2 1h3v2h-3z"/>
+				<path d="m29 9v7h7v-7h-2v6h-3v-6h-2"/>
+				<path d="m37 9h6v1h-2v6h-2v-6h-2v-1"/>
+				<path d="m44 9v7h7v-7m-2 6h-3v-5h3z"/>
+		</g>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__mic_duck_manual.svg b/res/skins/LateNight/classic/buttons/btn__mic_duck_manual.svg
new file mode 100644
index 000000000000..d5d6e4eb6299
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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 7v7h2v-3h3v3h2v-7zm2 1h3v2h-3z"/>
+				<path d="m9 7v7h2v-6h3v6h2v-6h2v6h1v-7h-5z"/>
+				<path d="m29 7v7h2v-6h2v6h2v-7z"/>
+		</g>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__mic_duck_off.svg b/res/skins/LateNight/classic/buttons/btn__mic_duck_off.svg
new file mode 100644
index 000000000000..e45bffdbe480
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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 fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">
+				<path d="m28 7h-7v7h7v-1h-5v-5h5z"/>
+				<path d="m13 7v7h7v-7h-2v6h-3v-6z"/>
+				<path d="m5 7v7h7v-5.5l-1.5-1.5zm2 1h2.7l1.3 1.3v3.7h-4z"/>
+				<path d="m29 7v7h2v-3h.5l3 3h1.5v-.5l-3-3 3-3v-.5h-1.5l-3 3h-.5v-3z"/>
+		</g>
+		<g fill="#d2d2d1">
+				<path d="m28 7h-7v7h7v-1h-5v-5h5z"/>
+				<path d="m13 7v7h7v-7h-2v6h-3v-6z"/>
+				<path d="m5 7v7h7v-5.5l-1.5-1.5zm2 1h2.7l1.3 1.3v3.7h-4z"/>
+				<path d="m29 7v7h2v-3h.5l3 3h1.5v-.5l-3-3 3-3v-.5h-1.5l-3 3h-.5v-3z"/>
+		</g>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__mic_talk.svg b/res/skins/LateNight/classic/buttons/btn__mic_talk.svg
new file mode 100644
index 000000000000..3637edf35d70
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">
+				<path d="m2 6h8v1h-3v6h-2v-6h-3z"/>
+				<path d="m11 6v7h2v-3h3v3h2v-7zm2 1h3v2h-3z"/>
+				<path d="m19 6v7h7v-1h-5v-6z"/>
+				<path d="m27 6v7h2v-3h.5l3 3h1.5v-.5l-3-3 3-3v-.5h-1.5l-3 3h-.5v-3z"/>
+		</g>
+		<g transform="translate(2,1)" fill="#d2d2d1">
+				<path d="m2 6h8v1h-3v6h-2v-6h-3z"/>
+				<path d="m11 6v7h2v-3h3v3h2v-7zm2 1h3v2h-3z"/>
+				<path d="m19 6v7h7v-1h-5v-6z"/>
+				<path d="m27 6v7h2v-3h.5l3 3h1.5v-.5l-3-3 3-3v-.5h-1.5l-3 3h-.5v-3z"/>
+		</g>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__minus.svg b/res/skins/LateNight/classic/buttons/btn__minus.svg
new file mode 100644
index 000000000000..54ce8b525326
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" stroke-linecap="square" stroke-width="1.6"/>
+		<path d="m8 10h9v3h-9v-3" fill="#d2d2d1"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__next.svg b/res/skins/LateNight/classic/buttons/btn__next.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__next.svg
rename to res/skins/LateNight/classic/buttons/btn__next.svg
diff --git a/res/skins/LateNight/classic/buttons/btn__outro_end.svg b/res/skins/LateNight/classic/buttons/btn__outro_end.svg
new file mode 100644
index 000000000000..d276b287863b
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" stroke-linecap="square" stroke-width="1.6">
+		<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/classic/buttons/btn__outro_start.svg b/res/skins/LateNight/classic/buttons/btn__outro_start.svg
new file mode 100644
index 000000000000..39516432b61b
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" stroke-linecap="square" stroke-width="1.6">
+		<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/classic/buttons/btn__pause_deck_mini.svg b/res/skins/LateNight/classic/buttons/btn__pause_deck_mini.svg
new file mode 100644
index 000000000000..c7acab409260
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__pause_deck_mini.svg
@@ -0,0 +1,56 @@
+<?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="svg8"
+   version="1.1"
+   height="24"
+   width="40">
+  <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="defs12" />
+  <g
+     style="stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none"
+     fill="#000001"
+     stroke-width="1.6"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     id="g6"
+     transform="translate(0,2)">
+    <path
+       style="stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path2"
+       d="m14.000494 4h4v12h-4v-12" />
+    <path
+       style="stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path4"
+       d="m22.000394 4v12h4v-12h-4" />
+  </g>
+  <g
+     id="g6-3"
+     transform="translate(0,2)"
+     style="fill:#d2d2d1;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;fill-opacity:1">
+    <path
+       style="fill:#d2d2d1;fill-opacity:1"
+       id="path2-6"
+       d="m 14.000494,4 h 4 v 12 h -4 V 4" />
+    <path
+       style="fill:#d2d2d1;fill-opacity:1"
+       id="path4-7"
+       d="m 22.000394,4 v 12 h 4 V 4 h -4" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__pause_preview.svg b/res/skins/LateNight/classic/buttons/btn__pause_preview.svg
new file mode 100644
index 000000000000..2e54f3420470
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" stroke-linecap="square" stroke-width="1.6">
+		<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/classic/buttons/btn__pause_sampler.svg b/res/skins/LateNight/classic/buttons/btn__pause_sampler.svg
new file mode 100644
index 000000000000..61f9760d1968
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__pause_sampler.svg
@@ -0,0 +1,55 @@
+<?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="32"
+   width="32">
+  <metadata
+     id="metadata49">
+    <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="defs47" />
+  <g
+     style="stroke:#000001;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none"
+     id="g41"
+     stroke-width="1.6"
+     stroke-linecap="square"
+     fill="#000001"
+     transform="translate(1,1)">
+    <path
+       style="stroke:#000001;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path37"
+       d="m8 7h5v15h-5v-15" />
+    <path
+       style="stroke:#000001;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path39"
+       d="m17 7v15h5v-15h-5" />
+  </g>
+  <g
+     id="g41-3"
+     transform="translate(1,1)"
+     style="fill:#d2d2d1;stroke-width:1.60000002;stroke-linecap:square;fill-opacity:1">
+    <path
+       style="fill:#d2d2d1;fill-opacity:1"
+       id="path37-6"
+       d="m 8,7 h 5 V 22 H 8 V 7" />
+    <path
+       style="fill:#d2d2d1;fill-opacity:1"
+       id="path39-7"
+       d="m 17,7 v 15 h 5 V 7 h -5" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__pfl.svg b/res/skins/LateNight/classic/buttons/btn__pfl.svg
new file mode 100644
index 000000000000..12d464e989b8
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6" 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="#000001" fill="#d2d2d1" style="text-indent:0;text-transform:none"/>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__play_deck.svg b/res/skins/LateNight/classic/buttons/btn__play_deck.svg
new file mode 100644
index 000000000000..fd2caec629ee
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">
+				<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/classic/buttons/btn__play_deck_mini.svg b/res/skins/LateNight/classic/buttons/btn__play_deck_mini.svg
new file mode 100644
index 000000000000..bf29e05c60c8
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__play_deck_mini.svg
@@ -0,0 +1,8 @@
+<svg width="40" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+		<g transform="translate(0,2)" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">
+				<path d="m16.000494 4 8.9995 6-8.9995 6v-12"/>
+		</g>
+		<g transform="translate(5.0004937 .99999999)" fill="#d2d2d1">
+				<path d="m11 5 8.9995 6-8.9995 6v-12"/>
+		</g>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__play_sampler.svg b/res/skins/LateNight/classic/buttons/btn__play_sampler.svg
new file mode 100644
index 000000000000..f88d8c36b684
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" stroke-linecap="round" stroke-linejoin="round" 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/classic/buttons/btn__plus.svg b/res/skins/LateNight/classic/buttons/btn__plus.svg
new file mode 100644
index 000000000000..7ab60a0937cd
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" 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/classic/buttons/btn__plus_flat.svg b/res/skins/LateNight/classic/buttons/btn__plus_flat.svg
new file mode 100644
index 000000000000..ba62d28cb4d2
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__plus_flat.svg
@@ -0,0 +1,3 @@
+<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="#d2d2d1" opacity=".59898478"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__prev.svg b/res/skins/LateNight/classic/buttons/btn__prev.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__prev.svg
rename to res/skins/LateNight/classic/buttons/btn__prev.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__quantize.svg b/res/skins/LateNight/classic/buttons/btn__quantize.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__quantize.svg
rename to res/skins/LateNight/classic/buttons/btn__quantize.svg
diff --git a/res/skins/LateNight/classic/buttons/btn__quantize_active_12.svg b/res/skins/LateNight/classic/buttons/btn__quantize_active_12.svg
new file mode 100644
index 000000000000..3c3cf124c080
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__quantize_active_12.svg
@@ -0,0 +1,5 @@
+<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+		<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" fill="#f0bb2b"/>
+		<path d="m17 11h-3v3h3z" fill="#fff"/>
+		<path d="m17 4h-2.9896v3h2.9896z" fill="#fff"/>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__quantize_active_34.svg b/res/skins/LateNight/classic/buttons/btn__quantize_active_34.svg
new file mode 100644
index 000000000000..a6fc40198475
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__quantize_active_34.svg
@@ -0,0 +1,5 @@
+<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+		<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" fill="#0bd9d1"/>
+		<path d="m17 11h-3v3h3z" fill="#fff"/>
+		<path d="m17 4h-2.9896v3h2.9896z" fill="#fff"/>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__rec_dot.svg b/res/skins/LateNight/classic/buttons/btn__rec_dot.svg
new file mode 100644
index 000000000000..cf444682da66
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" fill="#bfbfbe"/>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__rec_dot_active.svg b/res/skins/LateNight/classic/buttons/btn__rec_dot_active.svg
new file mode 100644
index 000000000000..a226d0000d61
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__rec_dot_active.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="#000001" fill="#000001"/>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__reloop.svg b/res/skins/LateNight/classic/buttons/btn__reloop.svg
new file mode 100644
index 000000000000..93d5fb4cdc0c
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__reloop.svg
@@ -0,0 +1,12 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+		<g fill="none" stroke="#000001" stroke-width="1.6">
+				<path d="m11 3h2v6h-2z" color="#000001"/>
+				<path d="m20 5v13h-3l5e-4-1.5001 1.4995 1e-4v-10l-3.4999.000149.000125-1.5001z" color="#000001"/>
+				<path d="m4 5v13h5v3l7-3.75-7-3.75 1e-4 2.9999-3.5001 1e-4v-10l3.5 1e-4v-1.5001z" color="#000001"/>
+		</g>
+		<g fill="#d2d2d1">
+				<path d="m11 3h2v6h-2z" color="#000001"/>
+				<path d="m20 5v13h-3l5e-4-1.5001 1.4995 1e-4v-10l-3.4999.000149.000125-1.5001z" color="#000001"/>
+				<path d="m4 5v13h5v3l7-3.75-7-3.75 1e-4 2.9999-3.5001 1e-4v-10l3.5 1e-4v-1.5001z" color="#000001"/>
+		</g>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__repeat.svg b/res/skins/LateNight/classic/buttons/btn__repeat.svg
new file mode 100644
index 000000000000..ab2853625d59
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__repeat.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="M 13,1.4492188 V 4 H 6.9003906 C 4.1893262,4 2,6.2607148 2,9 2,9.3724736 2.0482349,9.7336886 2.125,10.083984 L 4,9 C 4,7.3072852 5.2902549,6 6.9003906,6 H 13 v 3 l 6.541016,-3.7753906 z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#585858" 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 18.876953,7.9179688 17,9 c 0,1.692715 -1.290255,3 -2.900391,3 H 8 V 9 L 1.4589844,12.775391 8,16.552734 V 14 h 6.099609 C 16.810674,14 19,11.739285 19,9 19,8.6283798 18.953376,8.2675235 18.876953,7.9179688 Z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#585858" 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"/>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__repeat_active_12.svg b/res/skins/LateNight/classic/buttons/btn__repeat_active_12.svg
new file mode 100644
index 000000000000..6df9c3d02163
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__repeat_active_12.svg
@@ -0,0 +1,6 @@
+<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+		<g fill="#f0bb2b" shape-rendering="auto">
+				<path d="M 13,1.4492188 V 4 H 6.9003906 C 4.1893262,4 2,6.2607148 2,9 2,9.3724736 2.0482349,9.7336886 2.125,10.083984 L 4,9 C 4,7.3072852 5.2902549,6 6.9003906,6 H 13 v 3 l 6.541016,-3.7753906 z" 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;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 18.876953,7.9179688 17,9 c 0,1.692715 -1.290255,3 -2.900391,3 H 8 V 9 L 1.4589844,12.775391 8,16.552734 V 14 h 6.099609 C 16.810674,14 19,11.739285 19,9 19,8.6283798 18.953376,8.2675235 18.876953,7.9179688 Z" 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;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/classic/buttons/btn__repeat_active_34.svg b/res/skins/LateNight/classic/buttons/btn__repeat_active_34.svg
new file mode 100644
index 000000000000..1e1d7221487c
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__repeat_active_34.svg
@@ -0,0 +1,6 @@
+<svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
+		<g fill="#0bd9d1" shape-rendering="auto">
+				<path d="M 13,1.4492188 V 4 H 6.9003906 C 4.1893262,4 2,6.2607148 2,9 2,9.3724736 2.0482349,9.7336886 2.125,10.083984 L 4,9 C 4,7.3072852 5.2902549,6 6.9003906,6 H 13 v 3 l 6.541016,-3.7753906 z" 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;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 18.876953,7.9179688 17,9 c 0,1.692715 -1.290255,3 -2.900391,3 H 8 V 9 L 1.4589844,12.775391 8,16.552734 V 14 h 6.099609 C 16.810674,14 19,11.739285 19,9 19,8.6283798 18.953376,8.2675235 18.876953,7.9179688 Z" 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;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/classic/buttons/btn__reverse.svg b/res/skins/LateNight/classic/buttons/btn__reverse.svg
new file mode 100644
index 000000000000..9c31255cf64e
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" 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/classic/buttons/btn__settings.svg b/res/skins/LateNight/classic/buttons/btn__settings.svg
new file mode 100644
index 000000000000..d81bab3122bd
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__settings.svg
@@ -0,0 +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="#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="#000001" 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="#000001" fill="#1a1a1a"/></g></svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__settings_close.svg b/res/skins/LateNight/classic/buttons/btn__settings_close.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__settings_close.svg
rename to res/skins/LateNight/classic/buttons/btn__settings_close.svg
diff --git a/res/skins/LateNight/classic/buttons/btn__settings_off.svg b/res/skins/LateNight/classic/buttons/btn__settings_off.svg
new file mode 100644
index 000000000000..965cddfdcf3e
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" fill="#d2d2d1"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__settings_on.svg b/res/skins/LateNight/classic/buttons/btn__settings_on.svg
new file mode 100644
index 000000000000..2ed1e10a1be4
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" stroke-width="1.12734854"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__slip.svg b/res/skins/LateNight/classic/buttons/btn__slip.svg
new file mode 100644
index 000000000000..656eb3c5bde3
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" 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="#000001" fill="#585858"/>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__slip_active_12.svg b/res/skins/LateNight/classic/buttons/btn__slip_active_12.svg
new file mode 100644
index 000000000000..2c568c3dfea5
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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.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="#000001" fill="#fff"/>
+		<path d="m7.33344 14.96998-6.3333447-10.96968 12.6663237-3e-7z" color="#000001" fill="#f0bb2b" stroke-width=".91413999"/>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__slip_active_34.svg b/res/skins/LateNight/classic/buttons/btn__slip_active_34.svg
new file mode 100644
index 000000000000..780e23dd36e8
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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.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="#000001" fill="#fff"/>
+		<path d="m7.33344 14.96998-6.3333447-10.96968 12.6663237-3e-7z" color="#000001" fill="#0bd9d1" stroke-width=".91413999"/>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__split.svg b/res/skins/LateNight/classic/buttons/btn__split.svg
new file mode 100644
index 000000000000..075321bbb2f9
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__split.svg
@@ -0,0 +1,16 @@
+<svg width="46" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg">
+		<g transform="translate(4)" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">
+				<path d="m10 6h-7v4h5v2h-5v1h7v-4h-5v-2h5z"/>
+				<path d="m18 6v7h6v-1h-4v-6z"/>
+				<path d="m11 6v7h2v-3h4v-4zm2 1h3v2h-3z"/>
+				<path d="m28 6h8v1h-3v6h-2v-6h-3z"/>
+				<path d="m25 6h2v7h-2z" style="paint-order:fill markers stroke"/>
+		</g>
+		<g transform="translate(4)" fill="#d2d2d1">
+				<path d="m10 6h-7v4h5v2h-5v1h7v-4h-5v-2h5z"/>
+				<path d="m18 6v7h6v-1h-4v-6z"/>
+				<path d="m11 6v7h2v-3h4v-4zm2 1h3v2h-3z"/>
+				<path d="m28 6h8v1h-3v6h-2v-6h-3z"/>
+				<path d="m25 6h2v7h-2z" style="paint-order:fill markers stroke"/>
+		</g>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__split_active.svg b/res/skins/LateNight/classic/buttons/btn__split_active.svg
new file mode 100644
index 000000000000..ebda12692537
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__split_active.svg
@@ -0,0 +1,52 @@
+<?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="svg26"
+   version="1.1"
+   height="20"
+   width="46">
+  <metadata
+     id="metadata32">
+    <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="defs30" />
+  <g
+     style="fill:#000000;fill-opacity:1"
+     id="g24"
+     fill="#d2d2d1"
+     transform="translate(4)">
+    <path
+       style="fill:#000000;fill-opacity:1"
+       id="path14"
+       d="m10 6h-7v4h5v2h-5v1h7v-4h-5v-2h5z" />
+    <path
+       style="fill:#000000;fill-opacity:1"
+       id="path16"
+       d="m18 6v7h6v-1h-4v-6z" />
+    <path
+       style="fill:#000000;fill-opacity:1"
+       id="path18"
+       d="m11 6v7h2v-3h4v-4zm2 1h3v2h-3z" />
+    <path
+       style="fill:#000000;fill-opacity:1"
+       id="path20"
+       d="m28 6h8v1h-3v6h-2v-6h-3z" />
+    <path
+       id="path22"
+       style="paint-order:fill markers stroke;fill:#000000;fill-opacity:1"
+       d="m25 6h2v7h-2z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__star.svg b/res/skins/LateNight/classic/buttons/btn__star.svg
new file mode 100644
index 000000000000..3d03d7bd0853
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#aaa" stroke-linecap="round" stroke-width="2.65781951" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__sync_deck.svg b/res/skins/LateNight/classic/buttons/btn__sync_deck.svg
new file mode 100644
index 000000000000..ff5cf28fd94e
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn__sync_deck.svg
@@ -0,0 +1,117 @@
+<?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="46"
+   height="20"
+   version="1.1"
+   id="svg32"
+   sodipodi:docname="btn__sync_deck.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata38">
+    <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="defs36" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1056"
+     id="namedview34"
+     showgrid="true"
+     inkscape:zoom="128"
+     inkscape:cx="35.786582"
+     inkscape:cy="7.2929698"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg32">
+    <inkscape:grid
+       type="xygrid"
+       id="grid854" />
+  </sodipodi:namedview>
+  <g
+     id="g10"
+     style="fill:none"
+     transform="translate(-2,-2)">
+    <path
+       d="M 16,8 H 9 v 4 h 5 v 2 H 9 v 1 h 7 V 11 H 11 V 9 h 5 V 8"
+       id="path2"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 26,8 v 7 h 2 V 9 h 3 v 6 h 2 V 8 h -7"
+       id="path4"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 34,8 v 7 h 7 V 14 H 36 V 9 h 5 V 8 h -7"
+       id="path6"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 20,15 v -3.5 l -3,-3 V 8 h 1.5 L 21,10.5 23.5,8 H 25 v 0.5 l -3,3 V 15 h -2"
+       id="path8"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g20"
+     style="fill:none;stroke:#000001;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round"
+     transform="translate(-2,-2)">
+    <path
+       d="M 16,8 H 9 v 4 h 5 v 2 H 9 v 1 h 7 V 11 H 11 V 9 h 5 z"
+       id="path12"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 26,8 v 7 h 2 V 9 h 3 v 6 h 2 V 8 Z"
+       id="path14"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 34,8 v 7 h 7 V 14 H 36 V 9 h 5 V 8 Z"
+       id="path16"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 20,15 v -3.5 l -3,-3 V 8 h 1.5 L 21,10.5 23.5,8 H 25 v 0.5 l -3,3 V 15 Z"
+       id="path18"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g30"
+     style="fill:#d2d2d1"
+     transform="translate(-2,-2)">
+    <path
+       d="M 16,8 H 9 v 4 h 5 v 2 H 9 v 1 h 7 V 11 H 11 V 9 h 5 z"
+       id="path22"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 26,8 v 7 h 2 V 9 h 3 v 6 h 2 V 8 Z"
+       id="path24"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 34,8 v 7 h 7 V 14 H 36 V 9 h 5 V 8 Z"
+       id="path26"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 20,15 v -3.5 l -3,-3 V 8 h 1.5 L 21,10.5 23.5,8 H 25 v 0.5 l -3,3 V 15 Z"
+       id="path28"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn__sync_sampler.svg b/res/skins/LateNight/classic/buttons/btn__sync_sampler.svg
new file mode 100644
index 000000000000..2071e7bb7795
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">
+				<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/classic/buttons/btn__xfader_aux_left.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__xfader_aux_left.svg
rename to res/skins/LateNight/classic/buttons/btn__xfader_aux_left.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__xfader_aux_left_off.svg b/res/skins/LateNight/classic/buttons/btn__xfader_aux_left_off.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__xfader_aux_left_off.svg
rename to res/skins/LateNight/classic/buttons/btn__xfader_aux_left_off.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__xfader_aux_mid.svg b/res/skins/LateNight/classic/buttons/btn__xfader_aux_mid.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__xfader_aux_mid.svg
rename to res/skins/LateNight/classic/buttons/btn__xfader_aux_mid.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__xfader_aux_mid_off.svg b/res/skins/LateNight/classic/buttons/btn__xfader_aux_mid_off.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__xfader_aux_mid_off.svg
rename to res/skins/LateNight/classic/buttons/btn__xfader_aux_mid_off.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__xfader_aux_right.svg b/res/skins/LateNight/classic/buttons/btn__xfader_aux_right.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__xfader_aux_right.svg
rename to res/skins/LateNight/classic/buttons/btn__xfader_aux_right.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__xfader_aux_right_off.svg b/res/skins/LateNight/classic/buttons/btn__xfader_aux_right_off.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__xfader_aux_right_off.svg
rename to res/skins/LateNight/classic/buttons/btn__xfader_aux_right_off.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__xfader_deck_left_default.svg b/res/skins/LateNight/classic/buttons/btn__xfader_deck_left_default.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__xfader_deck_left_default.svg
rename to res/skins/LateNight/classic/buttons/btn__xfader_deck_left_default.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__xfader_deck_left_off.svg b/res/skins/LateNight/classic/buttons/btn__xfader_deck_left_off.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__xfader_deck_left_off.svg
rename to res/skins/LateNight/classic/buttons/btn__xfader_deck_left_off.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__xfader_deck_left_warning.svg b/res/skins/LateNight/classic/buttons/btn__xfader_deck_left_warning.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__xfader_deck_left_warning.svg
rename to res/skins/LateNight/classic/buttons/btn__xfader_deck_left_warning.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__xfader_deck_mid_off.svg b/res/skins/LateNight/classic/buttons/btn__xfader_deck_mid_off.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__xfader_deck_mid_off.svg
rename to res/skins/LateNight/classic/buttons/btn__xfader_deck_mid_off.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__xfader_deck_mid_warning.svg b/res/skins/LateNight/classic/buttons/btn__xfader_deck_mid_warning.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__xfader_deck_mid_warning.svg
rename to res/skins/LateNight/classic/buttons/btn__xfader_deck_mid_warning.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__xfader_deck_right_default.svg b/res/skins/LateNight/classic/buttons/btn__xfader_deck_right_default.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__xfader_deck_right_default.svg
rename to res/skins/LateNight/classic/buttons/btn__xfader_deck_right_default.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__xfader_deck_right_off.svg b/res/skins/LateNight/classic/buttons/btn__xfader_deck_right_off.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__xfader_deck_right_off.svg
rename to res/skins/LateNight/classic/buttons/btn__xfader_deck_right_off.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__xfader_deck_right_warning.svg b/res/skins/LateNight/classic/buttons/btn__xfader_deck_right_warning.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__xfader_deck_right_warning.svg
rename to res/skins/LateNight/classic/buttons/btn__xfader_deck_right_warning.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__xfader_sampler_left.svg b/res/skins/LateNight/classic/buttons/btn__xfader_sampler_left.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__xfader_sampler_left.svg
rename to res/skins/LateNight/classic/buttons/btn__xfader_sampler_left.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__xfader_sampler_master.svg b/res/skins/LateNight/classic/buttons/btn__xfader_sampler_master.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__xfader_sampler_master.svg
rename to res/skins/LateNight/classic/buttons/btn__xfader_sampler_master.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__xfader_sampler_right.svg b/res/skins/LateNight/classic/buttons/btn__xfader_sampler_right.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__xfader_sampler_right.svg
rename to res/skins/LateNight/classic/buttons/btn__xfader_sampler_right.svg
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_fx.svg b/res/skins/LateNight/classic/buttons/btn_elevated_fx.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn_elevated_fx.svg
rename to res/skins/LateNight/classic/buttons/btn_elevated_fx.svg
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_fx_focus.svg b/res/skins/LateNight/classic/buttons/btn_elevated_fx_focus.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn_elevated_fx_focus.svg
rename to res/skins/LateNight/classic/buttons/btn_elevated_fx_focus.svg
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_fx_selector.svg b/res/skins/LateNight/classic/buttons/btn_elevated_fx_selector.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn_elevated_fx_selector.svg
rename to res/skins/LateNight/classic/buttons/btn_elevated_fx_selector.svg
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_fx_selector_open.svg b/res/skins/LateNight/classic/buttons/btn_elevated_fx_selector_open.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn_elevated_fx_selector_open.svg
rename to res/skins/LateNight/classic/buttons/btn_elevated_fx_selector_open.svg
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_medium.svg b/res/skins/LateNight/classic/buttons/btn_elevated_medium.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn_elevated_medium.svg
rename to res/skins/LateNight/classic/buttons/btn_elevated_medium.svg
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_medium_active.svg b/res/skins/LateNight/classic/buttons/btn_elevated_medium_active.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn_elevated_medium_active.svg
rename to res/skins/LateNight/classic/buttons/btn_elevated_medium_active.svg
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_medium_set.svg b/res/skins/LateNight/classic/buttons/btn_elevated_medium_set.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn_elevated_medium_set.svg
rename to res/skins/LateNight/classic/buttons/btn_elevated_medium_set.svg
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_play.svg b/res/skins/LateNight/classic/buttons/btn_elevated_play.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn_elevated_play.svg
rename to res/skins/LateNight/classic/buttons/btn_elevated_play.svg
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_play_active.svg b/res/skins/LateNight/classic/buttons/btn_elevated_play_active.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn_elevated_play_active.svg
rename to res/skins/LateNight/classic/buttons/btn_elevated_play_active.svg
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_square.svg b/res/skins/LateNight/classic/buttons/btn_elevated_square.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn_elevated_square.svg
rename to res/skins/LateNight/classic/buttons/btn_elevated_square.svg
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_square_active.svg b/res/skins/LateNight/classic/buttons/btn_elevated_square_active.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn_elevated_square_active.svg
rename to res/skins/LateNight/classic/buttons/btn_elevated_square_active.svg
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_square_big.svg b/res/skins/LateNight/classic/buttons/btn_elevated_square_big.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn_elevated_square_big.svg
rename to res/skins/LateNight/classic/buttons/btn_elevated_square_big.svg
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_square_big_active.svg b/res/skins/LateNight/classic/buttons/btn_elevated_square_big_active.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn_elevated_square_big_active.svg
rename to res/skins/LateNight/classic/buttons/btn_elevated_square_big_active.svg
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_square_set.svg b/res/skins/LateNight/classic/buttons/btn_elevated_square_set.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn_elevated_square_set.svg
rename to res/skins/LateNight/classic/buttons/btn_elevated_square_set.svg
diff --git a/res/skins/LateNight/classic/buttons/btn_elevated_sync.svg b/res/skins/LateNight/classic/buttons/btn_elevated_sync.svg
new file mode 100644
index 000000000000..aa720c6a504c
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn_elevated_sync.svg
@@ -0,0 +1,87 @@
+<?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="svg26"
+   version="1.1"
+   height="22"
+   width="48">
+  <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="defs16">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-3.99997,-26.00003)"
+       y2="19.699568"
+       y1="19.699568"
+       x2="24.143082"
+       x1="4.99997"
+       id="b">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-color="#393939" />
+      <stop
+         id="stop4"
+         offset=".30102351"
+         stop-color="#393939" />
+      <stop
+         id="stop6"
+         offset="1"
+         stop-color="#141414" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-4,-24)"
+       y2="12"
+       y1="12"
+       x2="24"
+       x1="6"
+       id="a">
+      <stop
+         id="stop9"
+         offset="0"
+         stop-opacity=".0047619" />
+      <stop
+         id="stop11"
+         offset=".5"
+         stop-opacity="0" />
+      <stop
+         id="stop13"
+         offset="1"
+         stop-opacity=".47451" />
+    </linearGradient>
+  </defs>
+  <path
+     id="path18"
+     d="M 47,2.7089616 V 19.999992 c 0,0.545351 -0.454649,1 -1,1 L 2,21 C 1.956626,21 1.926809,21.0036 1.8847656,20.998 2.1739751,21.569048 2.6797603,22 3.5,22 l 42,-8e-6 c 1.108,0 2,-0.892 2,-2 V 3.9999772 C 47.5,3.5001153 47.30179,3.0579663 47,2.7089616 Z" />
+  <path
+     id="rect20"
+     d="M 3.0000076,-46.5 H 19.000022 c 0.831,0 1.5,0.669 1.5,1.5 l 8e-6,42 c 0,0.831 -0.669,1.5 -1.5,1.5 H 3.0000152 c -0.831,0 -1.4999998,-0.669 -1.5,-1.5 l -7.6e-6,-42 c -2e-7,-0.831 0.669,-1.5 1.5,-1.5 z"
+     style="color:#000000;fill:url(#a)"
+     transform="rotate(90)" />
+  <path
+     id="rect22"
+     d="M 1.8000077,-46.5 H 20.200022 c 0.1662,0 0.3,0.1338 0.3,0.3 l 8e-6,44.4 c 0,0.1662 -0.1338,0.3 -0.3,0.3 H 1.8000153 c -0.1662001,0 -0.3000001,-0.1338 -0.3000001,-0.3 l -7.6e-6,-44.4 c 0,-0.1662 0.1338,-0.3 0.3000001,-0.3 z"
+     style="fill:none;stroke:url(#b);stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke"
+     transform="rotate(90)" />
+  <path
+     id="rect24"
+     d="M 1.9999776,-46 H 19.999992 L 20,-2 H 1.9999852 Z"
+     style="color:#000000;fill-opacity:0.09019608"
+     transform="rotate(90)" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn_elevated_sync_active.svg b/res/skins/LateNight/classic/buttons/btn_elevated_sync_active.svg
new file mode 100644
index 000000000000..bc18e1239bca
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn_elevated_sync_active.svg
@@ -0,0 +1,52 @@
+<?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="svg13"
+   version="1.1"
+   height="22"
+   width="48">
+  <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="defs9">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.95652174,-0.95652174,0,0.56521739,21.434811)"
+       y2="-13"
+       y1="-13"
+       x2="-1.5000305"
+       x1="-24.500031"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-opacity=".39215687" />
+      <stop
+         id="stop4"
+         offset=".50727087"
+         stop-opacity="0" />
+      <stop
+         id="stop6"
+         offset="1"
+         stop-opacity=".0047619" />
+    </linearGradient>
+  </defs>
+  <path
+     id="rect11"
+     d="m 46,2.5 v 17 C 46,19.777 45.777,20 45.5,20 H 2.5 C 2.223,20 2,19.777 2,19.5 V 2.5 C 2,2.223 2.223,2 2.5,2 h 43 C 45.777,2 46,2.223 46,2.5 Z"
+     style="color:#000000;fill:url(#a)" />
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_wide.svg b/res/skins/LateNight/classic/buttons/btn_elevated_wide.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn_elevated_wide.svg
rename to res/skins/LateNight/classic/buttons/btn_elevated_wide.svg
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_wide_active.svg b/res/skins/LateNight/classic/buttons/btn_elevated_wide_active.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn_elevated_wide_active.svg
rename to res/skins/LateNight/classic/buttons/btn_elevated_wide_active.svg
diff --git a/res/skins/LateNight/buttons_classic/btn_elevated_wide_set.svg b/res/skins/LateNight/classic/buttons/btn_elevated_wide_set.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn_elevated_wide_set.svg
rename to res/skins/LateNight/classic/buttons/btn_elevated_wide_set.svg
diff --git a/res/skins/LateNight/classic/buttons/btn_embedded_.svg b/res/skins/LateNight/classic/buttons/btn_embedded_.svg
new file mode 100644
index 000000000000..fb66ea1ba227
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn_embedded_.svg
@@ -0,0 +1 @@
+<svg width="1" height="1" version="1.1" xmlns="http://www.w3.org/2000/svg"></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn_embedded__active.svg b/res/skins/LateNight/classic/buttons/btn_embedded__active.svg
new file mode 100644
index 000000000000..fb66ea1ba227
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn_embedded__active.svg
@@ -0,0 +1 @@
+<svg width="1" height="1" version="1.1" xmlns="http://www.w3.org/2000/svg"></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn_embedded__pressed.svg b/res/skins/LateNight/classic/buttons/btn_embedded__pressed.svg
new file mode 100644
index 000000000000..fb66ea1ba227
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn_embedded__pressed.svg
@@ -0,0 +1 @@
+<svg width="1" height="1" version="1.1" xmlns="http://www.w3.org/2000/svg"></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn_embedded_combobox.svg b/res/skins/LateNight/classic/buttons/btn_embedded_combobox.svg
new file mode 100644
index 000000000000..4bbc9b84b8ac
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn_embedded_combobox.svg
@@ -0,0 +1,198 @@
+<?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
+     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:#000001;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"
+     id="g27"
+     display="none">
+    <g
+       style="display:inline"
+       id="g25"
+       display="inline">
+      <path
+         style="fill:#333334"
+         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:#333334"
+         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:#333334"
+         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:#333334"
+         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:#333334"
+         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:#333334"
+         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:#333334"
+       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
+     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:#000001;text-indent:0;text-transform:none;fill:#444444;fill-opacity:1"
+     id="path19" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn_embedded_combobox_focus.svg b/res/skins/LateNight/classic/buttons/btn_embedded_combobox_focus.svg
new file mode 100644
index 000000000000..9cf45d57342e
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" fill="url(#a)"/><g transform="translate(0,-1)" display="none"><g display="inline"><path d="m10 10h7v4h-5v1h5v1h-7v-3h5v-2h-5v-1" fill="#333334"/><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="#333334"/><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="#333334"/><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="#333334"/><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="#333334"/><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="#333334"/><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="#333334"/><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="#000001" fill="#f60" style="text-indent:0;text-transform:none"/></svg>
diff --git a/res/skins/LateNight/classic/buttons/btn_embedded_effectselector_active.svg b/res/skins/LateNight/classic/buttons/btn_embedded_effectselector_active.svg
new file mode 100644
index 000000000000..c1abdfd47f5a
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn_embedded_effectselector_active.svg
@@ -0,0 +1,13 @@
+<svg width="24" height="24" 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 -.4348113 -22.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" y="-23" width="22" height="22" color="#000001" fill="url(#a)"/>
+		<rect transform="rotate(90)" x="1" y="-23" width="22" height="22" color="#000001" fill-opacity=".09019608"/>
+		<rect x=".5" y=".5" 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="1.24997" y="-22.75" width="21.5" height="21.5" fill="none" stroke="#d2d2d2" stroke-linecap="round" stroke-width=".5" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn_embedded_eqkill.svg b/res/skins/LateNight/classic/buttons/btn_embedded_eqkill.svg
new file mode 100644
index 000000000000..9cb3b90b7c32
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn_embedded_eqkill.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="2" x2="24" y1="12" y2="12" gradientTransform="matrix(.69565216 0 0 .69565216 -.04349915 -16.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=".99999988" y="-17" width="15.999999" height="15.999999" color="#000001" fill="url(#a)"/>
+		<rect x=".5" y=".50000006" width="17" height="17" rx=".30000001" ry=".30000001" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+		<rect x=".5" y=".50000006" width="17" height="17" 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/classic/buttons/btn_embedded_eqkill_active.svg b/res/skins/LateNight/classic/buttons/btn_embedded_eqkill_active.svg
new file mode 100644
index 000000000000..b73a1daaa79a
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" 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/classic/buttons/btn_embedded_fx_focus.svg b/res/skins/LateNight/classic/buttons/btn_embedded_fx_focus.svg
new file mode 100644
index 000000000000..c92329cafe32
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn_embedded_fx_focus.svg
@@ -0,0 +1,12 @@
+<svg width="18" 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 .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.5000292" y="-16.5" width="22.999998" height="15" rx="1.6428571" ry=".57692313" color="#000001" fill="url(#a)" stroke-width=".99999994"/>
+		<rect x="1.5" y="1.50003" width="15" height="23" rx=".30000001" ry=".30000001" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+		<rect x="1.5" y="1.50003" width="15" 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/classic/buttons/btn_embedded_fx_focus_active.svg b/res/skins/LateNight/classic/buttons/btn_embedded_fx_focus_active.svg
new file mode 100644
index 000000000000..1fe21fab5e63
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" 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/classic/buttons/btn_embedded_fx_parameter.svg b/res/skins/LateNight/classic/buttons/btn_embedded_fx_parameter.svg
new file mode 100644
index 000000000000..ca0cf42e31b0
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn_embedded_fx_parameter.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="2" x2="24" y1="12" y2="12" gradientTransform="matrix(.71567746 0 0 1.3913044 .96591082 -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="2.0394485" y="-33.5" width="16.460581" height="32" rx="1.0714285" ry="1.2307693" color="#000001" fill="url(#a)"/>
+		<rect x="1.5" y="1.5000299" width="32" height="17" rx=".30000001" ry=".30000001" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+		<rect x="1.5" y="1.5000299" width="32" height="17" 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/classic/buttons/btn_embedded_fx_parameter_active.svg b/res/skins/LateNight/classic/buttons/btn_embedded_fx_parameter_active.svg
new file mode 100644
index 000000000000..f12f0170ee9a
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn_embedded_fx_parameter_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="#000001" 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/classic/buttons/btn_embedded_library.svg b/res/skins/LateNight/classic/buttons/btn_embedded_library.svg
new file mode 100644
index 000000000000..6a755fe5bd39
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn_embedded_library.svg
@@ -0,0 +1,95 @@
+<?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="svg26"
+   version="1.1"
+   height="26"
+   width="26">
+  <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="defs16">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.93478259,-0.93478259,0,24.152202,-40.152204)"
+       y2="18.657106"
+       y1="18.657106"
+       x2="23.988836"
+       x1="1.8333464"
+       id="b">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-color="#393939" />
+      <stop
+         id="stop4"
+         offset=".49880221"
+         stop-color="#393939" />
+      <stop
+         id="stop6"
+         offset="1"
+         stop-color="#121212" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.95652174,-0.95652174,0,22.521739,-0.434811)"
+       y2="12"
+       y1="12"
+       x2="24"
+       x1="2"
+       id="a">
+      <stop
+         id="stop9"
+         offset="0"
+         stop-opacity=".0047619" />
+      <stop
+         id="stop11"
+         offset=".5"
+         stop-opacity="0" />
+      <stop
+         id="stop13"
+         offset="1"
+         stop-opacity=".47451" />
+    </linearGradient>
+    <linearGradient
+       y2="18.657106"
+       x2="23.988836"
+       y1="18.657106"
+       x1="1.8333464"
+       gradientTransform="matrix(0,0.93478259,-0.93478259,0,24.152202,-0.152204)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient873"
+       xlink:href="#b" />
+  </defs>
+  <path
+     id="path859"
+     d="M 0.80078125,0 C 0.36622985,0 0,0.36622985 0,0.80078125 V 25.199219 C 0,25.63377 0.36622987,26 0.80078125,26 H 25.199219 C 25.63377,26 26,25.63377 26,25.199219 V 0.80078125 C 26,0.36622987 25.63377,0 25.199219,0 Z M 1.5,1.5 h 23 v 23 h -23 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-variant-east-asian:normal;font-feature-settings:normal;font-variation-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;shape-margin:0;inline-size: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:#020201;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-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-variant-east-asian:normal;font-feature-settings:normal;font-variation-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;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#a);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;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;stop-color:#000000"
+     d="M 25,1 V 25 H 1 V 1 Z"
+     id="path847" />
+  <path
+     id="path863"
+     d="M 25,1 H 24.75 1 v 24 h 24 z m -0.5,0.5 v 23 h -23 v -23 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-variant-east-asian:normal;font-feature-settings:normal;font-variation-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;shape-margin:0;inline-size: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(#linearGradient873);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1" />
+  <path
+     id="path853-6"
+     d="M 25,1 V 25 H 1 V 1 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-variant-east-asian:normal;font-feature-settings:normal;font-variation-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;shape-margin:0;inline-size: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:0.0901961;fill-rule:nonzero;stroke:none;stroke-width:1.04447;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;stop-color:#000000;stop-opacity:1" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn_embedded_library_active.svg b/res/skins/LateNight/classic/buttons/btn_embedded_library_active.svg
new file mode 100644
index 000000000000..9fb30b47da99
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn_embedded_library_active.svg
@@ -0,0 +1,57 @@
+<?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="svg17"
+   version="1.1"
+   height="26"
+   width="26">
+  <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="defs9">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.91304352,0,0,0.42857142,-0.13037539,-11.142857)"
+       y2="12"
+       y1="12"
+       x2="24.405561"
+       x1="0.5"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-opacity=".47451" />
+      <stop
+         id="stop4"
+         offset=".50727087"
+         stop-opacity="0" />
+      <stop
+         id="stop6"
+         offset="1"
+         stop-opacity=".0047619" />
+    </linearGradient>
+  </defs>
+  <path
+     d="M 0,0 V 26.000016 H 26.1 V 0 Z m 2,1 h 22.1 c 0.562649,0 1,0.4373514 1,1 v 22.000016 c 0,0.562649 -0.437351,1 -1,1 H 2 c -0.5626486,0 -1,-0.437351 -1,-1 V 2 C 1,1.4373514 1.4373514,1 2,1 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-variant-east-asian:normal;font-feature-settings:normal;font-variation-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;shape-margin:0;inline-size: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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+     id="path854" />
+  <path
+     d="m -22.999984,-24.6 h 20.0000165 c 0.831,0 1.4999999,0.669 1.4999999,1.5 V -3 c 0,0.831 -0.6689999,1.5 -1.4999999,1.5 H -22.999984 c -0.831,0 -1.5,-0.669 -1.5,-1.5 v -20.1 c 0,-0.831 0.669,-1.5 1.5,-1.5 z"
+     style="color:#000001;fill:url(#a)"
+     transform="matrix(0,-1,-1,0,0,0)"
+     id="rect15" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn_embedded_library_focus.svg b/res/skins/LateNight/classic/buttons/btn_embedded_library_focus.svg
new file mode 100644
index 000000000000..3ef80a033ba4
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" fill="url(#f)"/>
+	<rect transform="rotate(90)" x="1" y="-23" width="22" height="22" color="#000001" fill-opacity=".09019608"/>
+	<g fill="none" stroke-linecap="round">
+		<rect x=".5" y=".5" width="23" height="23" rx=".30000001" ry=".30000001" stroke="#000001" 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/classic/buttons/btn_embedded_library_tall.svg b/res/skins/LateNight/classic/buttons/btn_embedded_library_tall.svg
new file mode 100644
index 000000000000..106a9958bb18
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn_embedded_library_tall.svg
@@ -0,0 +1,95 @@
+<?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="26"
+   height="52"
+   version="1.1"
+   id="svg26">
+  <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="defs16">
+    <linearGradient
+       id="b"
+       x1="1.8333464"
+       x2="23.988836"
+       y1="18.657106"
+       y2="18.657106"
+       gradientTransform="matrix(0,0.93478259,-0.93478259,0,24.152202,-40.152204)"
+       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="52.808575"
+       y1="12"
+       y2="12"
+       gradientTransform="matrix(0,0.95652174,-0.95652174,0,22.521739,-0.434811)"
+       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>
+    <linearGradient
+       xlink:href="#b"
+       id="linearGradient873"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.93478259,-0.93478259,0,24.152202,-0.152204)"
+       x1="1.8333464"
+       y1="18.657106"
+       x2="53.536076"
+       y2="18.657106" />
+  </defs>
+  <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-variant-east-asian:normal;font-feature-settings:normal;font-variation-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;shape-margin:0;inline-size: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:#020201;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+     d="M 0.80078125,0 C 0.36622985,0 0,0.36622985 0,0.80078125 V 51.199219 C 0,51.63377 0.36622987,52 0.80078125,52 H 25.199219 C 25.63377,52 26,51.63377 26,51.199219 V 0.80078125 C 26,0.36622987 25.63377,0 25.199219,0 Z M 1.5,1.5 h 23 v 49 h -23 z"
+     id="path859" />
+  <path
+     id="path847"
+     d="M 25,1 V 51 H 1 V 1 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-variant-east-asian:normal;font-feature-settings:normal;font-variation-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;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#a);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;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;stop-color:#000000" />
+  <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-variant-east-asian:normal;font-feature-settings:normal;font-variation-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;shape-margin:0;inline-size: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(#linearGradient873);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+     d="M 25,1 H 24.75 1 v 50 h 24 z m -0.5,0.5 v 49 h -23 v -49 z"
+     id="path863" />
+  <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-variant-east-asian:normal;font-feature-settings:normal;font-variation-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;shape-margin:0;inline-size: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:0.0901961;fill-rule:nonzero;stroke:none;stroke-width:1.04447;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;stop-color:#000000;stop-opacity:1"
+     d="M 25,1 V 51 H 1 V 1 Z"
+     id="path853-6" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn_embedded_library_tall_active.svg b/res/skins/LateNight/classic/buttons/btn_embedded_library_tall_active.svg
new file mode 100644
index 000000000000..a03612358667
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn_embedded_library_tall_active.svg
@@ -0,0 +1,57 @@
+<?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="26"
+   height="52"
+   version="1.1"
+   id="svg17">
+  <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="defs9">
+    <linearGradient
+       id="a"
+       x1="0.5"
+       x2="55.225464"
+       y1="12"
+       y2="12"
+       gradientTransform="matrix(-0.91304352,0,0,0.42857142,-0.13037539,-11.142857)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-opacity=".47451"
+         offset="0"
+         id="stop2" />
+      <stop
+         stop-opacity="0"
+         offset=".50727087"
+         id="stop4" />
+      <stop
+         stop-opacity=".0047619"
+         offset="1"
+         id="stop6" />
+    </linearGradient>
+  </defs>
+  <path
+     id="path854"
+     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-variant-east-asian:normal;font-feature-settings:normal;font-variation-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;shape-margin:0;inline-size: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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+     d="M 0,0 V 52.000016 H 26.1 V 0 Z m 2,1 h 22.1 c 0.562649,0 1,0.4373514 1,1 v 48.000016 c 0,0.562649 -0.437351,1 -1,1 H 2 c -0.5626486,0 -1,-0.437351 -1,-1 V 2 C 1,1.4373514 1.4373514,1 2,1 Z" />
+  <path
+     id="rect15"
+     transform="matrix(0,-1,-1,0,0,0)"
+     style="color:#000001;fill:url(#a)"
+     d="m -48.999984,-24.6 h 46.0000165 c 0.831,0 1.4999999,0.669 1.4999999,1.5 V -3 c 0,0.831 -0.6689999,1.5 -1.4999999,1.5 H -48.999984 c -0.831,0 -1.5,-0.669 -1.5,-1.5 v -20.1 c 0,-0.831 0.669,-1.5 1.5,-1.5 z" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn_embedded_library_wide.svg b/res/skins/LateNight/classic/buttons/btn_embedded_library_wide.svg
new file mode 100644
index 000000000000..a4ee12d28e46
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn_embedded_library_wide.svg
@@ -0,0 +1,95 @@
+<?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="52"
+   height="26"
+   version="1.1"
+   id="svg26">
+  <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="defs16">
+    <linearGradient
+       id="b"
+       x1="1.8333464"
+       x2="23.988836"
+       y1="18.657106"
+       y2="18.657106"
+       gradientTransform="matrix(0,0.93478259,-0.93478259,0,24.152202,-40.152204)"
+       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(0,0.95652174,-0.95652174,0,22.521739,-0.434811)"
+       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>
+    <linearGradient
+       xlink:href="#b"
+       id="linearGradient873"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,0.93478259,-0.93478259,0,24.152202,-0.152204)"
+       x1="1.8333464"
+       y1="18.657106"
+       x2="23.988836"
+       y2="18.657106" />
+  </defs>
+  <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-variant-east-asian:normal;font-feature-settings:normal;font-variation-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;shape-margin:0;inline-size: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:#020201;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+     d="M 0.80078125,0 C 0.36622985,0 0,0.36622985 0,0.80078125 V 25.199219 C 0,25.63377 0.36622987,26 0.80078125,26 H 51.199219 C 51.63377,26 52,25.63377 52,25.199219 V 0.80078125 C 52,0.36622987 51.63377,0 51.199219,0 Z M 1.5,1.5 h 49 v 23 h -49 z"
+     id="path859" />
+  <path
+     id="path847"
+     d="M 51,1 V 25 H 1 V 1 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-variant-east-asian:normal;font-feature-settings:normal;font-variation-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;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:url(#a);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;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;stop-color:#000000" />
+  <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-variant-east-asian:normal;font-feature-settings:normal;font-variation-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;shape-margin:0;inline-size: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(#linearGradient873);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+     d="M 51,1 H 50.75 1 v 24 h 50 z m -0.5,0.5 v 23 h -49 v -23 z"
+     id="path863" />
+  <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-variant-east-asian:normal;font-feature-settings:normal;font-variation-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;shape-margin:0;inline-size: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:0.0901961;fill-rule:nonzero;stroke:none;stroke-width:1.04447;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;stop-color:#000000;stop-opacity:1"
+     d="M 51,1 V 25 H 1 V 1 Z"
+     id="path853-6" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn_embedded_library_wide_active.svg b/res/skins/LateNight/classic/buttons/btn_embedded_library_wide_active.svg
new file mode 100644
index 000000000000..190f9bb2e9a4
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn_embedded_library_wide_active.svg
@@ -0,0 +1,57 @@
+<?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="svg17"
+   version="1.1"
+   height="26"
+   width="52">
+  <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="defs9">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.91304352,0,0,0.42857142,-0.13037539,-11.142857)"
+       y2="12"
+       y1="12"
+       x2="26.341297"
+       x1="0.5"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-opacity=".47451" />
+      <stop
+         id="stop4"
+         offset=".50727087"
+         stop-opacity="0" />
+      <stop
+         id="stop6"
+         offset="1"
+         stop-opacity=".0047619" />
+    </linearGradient>
+  </defs>
+  <path
+     d="m 0,0 v 26.000016 l 52.1,-8e-6 V -8e-6 Z m 2,1 48.1,-8e-6 c 0.562649,-9e-8 1,0.4373514 1,1 v 22.000016 c 0,0.562649 -0.437351,1 -1,1 l -48.1,8e-6 c -0.5626486,0 -1,-0.437351 -1,-1 V 2 C 1,1.4373514 1.4373514,1.0000001 2,1 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-variant-east-asian:normal;font-feature-settings:normal;font-variation-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;shape-margin:0;inline-size: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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+     id="path854" />
+  <path
+     d="m -22.999976,-50.6 h 20.0000165 c 0.831,0 1.5,0.669 1.4999999,1.5 l -8e-6,46.1 c -1e-7,0.831 -0.6689999,1.5 -1.4999999,1.5 H -22.999984 c -0.831,0 -1.5,-0.669 -1.5,-1.5 l 8e-6,-46.1 c 0,-0.831 0.669,-1.5 1.5,-1.5 z"
+     style="color:#000001;fill:url(#a)"
+     transform="matrix(0,-1,-1,0,0,0)"
+     id="rect15" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn_embedded_medium.svg b/res/skins/LateNight/classic/buttons/btn_embedded_medium.svg
new file mode 100644
index 000000000000..1a67b0b8a58d
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn_embedded_medium.svg
@@ -0,0 +1,12 @@
+<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.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="1.5000297" y="-40.5" width="23" height="39" rx="1.5" ry="1.5" color="#000001" fill="url(#a)"/>
+		<rect x="1.5" y="1.50003" width="39" height="23" rx=".30000001" ry=".30000001" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+		<rect x="1.5" y="1.50003" width="39" 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/classic/buttons/btn_embedded_medium_active.svg b/res/skins/LateNight/classic/buttons/btn_embedded_medium_active.svg
new file mode 100644
index 000000000000..36fd968072cb
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" 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/classic/buttons/btn_embedded_medium_set.svg b/res/skins/LateNight/classic/buttons/btn_embedded_medium_set.svg
new file mode 100644
index 000000000000..56ceed849492
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn_embedded_medium_set.svg
@@ -0,0 +1,12 @@
+<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="#000001" fill="url(#a)"/>
+		<rect x="1.5" y="1.50003" width="39" height="23" rx=".30000001" ry=".30000001" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+		<rect x="1.5" y="1.50003" width="39" 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/classic/buttons/btn_embedded_mixmode.svg b/res/skins/LateNight/classic/buttons/btn_embedded_mixmode.svg
new file mode 100644
index 000000000000..d3542cc12bf5
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn_embedded_mixmode.svg
@@ -0,0 +1,12 @@
+<svg width="32" 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.2608696,-3.279503e-7,-29.869566)" 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.5000297" y="-30.5" width="23" height="29" rx="1.5" ry="1.5000001" color="#000001" fill="url(#a)"/>
+		<rect x="1.5" y="1.50003" width="29" height="23" rx=".30000001" ry=".30000001" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+		<rect x="1.5" y="1.50003" width="29" height="23" rx="1.5000001" ry="1.5" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn_embedded_mixmode_active.svg b/res/skins/LateNight/classic/buttons/btn_embedded_mixmode_active.svg
new file mode 100644
index 000000000000..3008dd5d406f
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn_embedded_mixmode_active.svg
@@ -0,0 +1,12 @@
+<svg width="32" 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 .55102041 -1.1304082 -14.897959)" 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="-23.500004" y="-29.5" width="21" height="27" color="#000001" fill="url(#a)"/>
+		<rect x="1.4999999" y="1.50003" width="29" height="23" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+		<rect x="1.4999999" y="1.50003" width="29" height="23" rx="1.5000001" ry="1.5" fill="none" stroke="#020201" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn_embedded_play.svg b/res/skins/LateNight/classic/buttons/btn_embedded_play.svg
new file mode 100644
index 000000000000..85c771ee6e6d
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn_embedded_play.svg
@@ -0,0 +1,13 @@
+<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>
+		<rect transform="rotate(90)" x="2" y="-66" width="22" height="64" color="#000001" fill-opacity=".09019608"/>
+		<rect transform="rotate(90)" x="2" y="-66" width="22" height="64" color="#000001" fill="url(#a)"/>
+		<rect x="1.5000001" y="1.50003" width="65" height="23" rx=".30000001" ry=".30000001" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+		<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"/>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn_embedded_play_active.svg b/res/skins/LateNight/classic/buttons/btn_embedded_play_active.svg
new file mode 100644
index 000000000000..cd551fdaf448
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" 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/classic/buttons/btn_embedded_square.svg b/res/skins/LateNight/classic/buttons/btn_embedded_square.svg
new file mode 100644
index 000000000000..539303825ded
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn_embedded_square.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="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="#000001" fill="url(#a)"/>
+		<rect x="1.5" y="1.50003" width="23" height="23" rx=".30000001" ry=".30000001" fill="none" stroke="#000001" 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/classic/buttons/btn_embedded_square_active.svg b/res/skins/LateNight/classic/buttons/btn_embedded_square_active.svg
new file mode 100644
index 000000000000..d7da1b36c4ae
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" 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/classic/buttons/btn_embedded_square_big.svg b/res/skins/LateNight/classic/buttons/btn_embedded_square_big.svg
new file mode 100644
index 000000000000..85d1e0deb6c0
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" fill-opacity=".09019608"/>
+	<rect transform="rotate(90)" x="1.5000298" y="-32.5" width="31" height="31" rx="1.5" ry="1.5" color="#000001" 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/classic/buttons/btn_embedded_square_big_active.svg b/res/skins/LateNight/classic/buttons/btn_embedded_square_big_active.svg
new file mode 100644
index 000000000000..144e4c2558af
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" 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/classic/buttons/btn_embedded_square_set.svg b/res/skins/LateNight/classic/buttons/btn_embedded_square_set.svg
new file mode 100644
index 000000000000..7f88ea94ec38
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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(.95652169 0 0 .95652169 .56518867 -23.521738)" 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.9999999" y="-23.999998" width="21.999998" height="21.999998" rx=".99999994" ry=".99999994" color="#000001" fill-opacity=".09019608" stroke-width=".99999988"/>
+		<rect transform="rotate(90)" x="1.9999999" y="-23.999998" width="21.999998" height="21.999998" rx=".99999994" ry=".99999994" color="#000001" fill="url(#a)" stroke-width=".99999988"/>
+		<rect x="1.5" y="1.50003" width="23" height="23" rx=".30000001" ry=".30000001" fill="none" stroke="#000001" 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/classic/buttons/btn_embedded_sync.svg b/res/skins/LateNight/classic/buttons/btn_embedded_sync.svg
new file mode 100644
index 000000000000..783c354c89a1
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn_embedded_sync.svg
@@ -0,0 +1,12 @@
+<svg width="48" height="22" version="1.1" xmlns="http://www.w3.org/2000/svg">
+		<defs>
+				<linearGradient id="a" x1="2" x2="24" y1="12" y2="12" gradientTransform="matrix(.7826087 0 0 1.9130435 .82606344 -45.043478)" 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="-46" width="18" height="44" color="#000001" fill="url(#a)"/>
+		<rect x="1.5000001" y="1.50003" width="45" height="19" rx=".30000004" ry=".30000001" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width=".99999994" style="paint-order:fill markers stroke"/>
+		<rect x="1.5000001" y="1.50003" width="45" height="19" rx="1.5" ry="1.5" fill="none" stroke="#020201" stroke-linecap="square" stroke-width=".99999994" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn_embedded_sync_active.svg b/res/skins/LateNight/classic/buttons/btn_embedded_sync_active.svg
new file mode 100644
index 000000000000..32bd9e25dd9a
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn_embedded_sync_active.svg
@@ -0,0 +1,12 @@
+<svg width="48" height="22" 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(-.73913044 0 0 .87755103 -1.3912827 -22.244898)" 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.5000001" y="1.50003" width="45" height="19" fill="none" stroke="#020201" stroke-linecap="square" stroke-width=".99999988" style="paint-order:fill markers stroke"/>
+		<rect transform="matrix(0,-1,-1,0,0,0)" x="-19.5" y="-45.5" width="17" height="43" rx="1.5" ry="1.5" color="#000001" fill="url(#a)"/>
+		<rect x="1.5000001" y="1.50003" width="45" height="19" rx="1.5" ry="1.5" fill="none" stroke="#020201" stroke-linecap="square" stroke-width=".99999988" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn_embedded_tall.svg b/res/skins/LateNight/classic/buttons/btn_embedded_tall.svg
new file mode 100644
index 000000000000..79af30ba3554
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn_embedded_tall.svg
@@ -0,0 +1,12 @@
+<svg width="26" height="52" version="1.1" xmlns="http://www.w3.org/2000/svg">
+		<defs>
+				<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="#000001" fill="url(#a)" stroke-width=".99999988"/>
+		<rect x="1.5" y="1.500031" width="23" height="49" rx=".30000001" ry=".30000001" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" 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"/>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn_embedded_tall_active.svg b/res/skins/LateNight/classic/buttons/btn_embedded_tall_active.svg
new file mode 100644
index 000000000000..43bf8516868f
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" 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/classic/buttons/btn_embedded_wide.svg b/res/skins/LateNight/classic/buttons/btn_embedded_wide.svg
new file mode 100644
index 000000000000..856601e62664
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn_embedded_wide.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="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="1.50003" y="-50.5" width="23" height="49" rx="1.5" ry="1.5" color="#000001" fill="url(#a)"/>
+		<rect x="1.5000001" y="1.50003" width="49" height="23" rx=".30000001" ry=".30000001" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+		<rect x="1.5000001" y="1.50003" width="49" height="23" rx="1.5000001" ry="1.5" fill="none" stroke="#020201" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/btn_embedded_wide_active.svg b/res/skins/LateNight/classic/buttons/btn_embedded_wide_active.svg
new file mode 100644
index 000000000000..3e8d7e14e0c8
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/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="#000001" 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/classic/buttons/btn_flat_square.svg b/res/skins/LateNight/classic/buttons/btn_flat_square.svg
new file mode 100644
index 000000000000..2d4b23d53878
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/btn_flat_square.svg
@@ -0,0 +1,3 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+		<rect x="1.5" y="1.50003" width="23" height="23" rx=".30000001" ry=".30000001" fill="none" opacity=".7461929" stroke="#020201" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/spinbox_down.svg b/res/skins/LateNight/classic/buttons/spinbox_down.svg
new file mode 100644
index 000000000000..132c90874835
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/spinbox_down.svg
@@ -0,0 +1,85 @@
+<?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="svg21"
+   version="1.1"
+   height="11"
+   width="17">
+  <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="defs9">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6956521,-13.50003,-38.152173)"
+       y2="12"
+       y1="12"
+       x2="24"
+       x1="2"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-opacity=".0047619" />
+      <stop
+         id="stop4"
+         offset=".5"
+         stop-opacity="0" />
+      <stop
+         id="stop6"
+         offset="1"
+         stop-opacity=".47451" />
+    </linearGradient>
+  </defs>
+  <rect
+     id="rect11"
+     style="paint-order:fill markers stroke;fill:#262626;fill-opacity:1"
+     fill="#3c3c3c"
+     ry="1.5"
+     rx="1.5"
+     height="16.573771"
+     width="20.455738"
+     y="-5.57377"
+     x="-3.4557388" />
+  <rect
+     id="rect13"
+     fill="url(#a)"
+     color="#000001"
+     height="39"
+     width="23"
+     y="-39"
+     x="-12"
+     transform="rotate(90)" />
+  <path
+     id="path15"
+     stroke-width="1.6"
+     stroke="#000001"
+     fill="none"
+     d="m9 7.9999994-3.4641429-6h6.9281999z" />
+  <path
+     id="path17"
+     stroke-width=".85714287"
+     fill="#bfbfbe"
+     d="m9 7.9999994-3.4641429-6h6.9281999z" />
+  <rect
+     id="rect19"
+     style="paint-order:fill markers stroke"
+     fill="#333334"
+     height="24.007122"
+     width="1"
+     y="-13.007122" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/spinbox_down_pressed.svg b/res/skins/LateNight/classic/buttons/spinbox_down_pressed.svg
new file mode 100644
index 000000000000..ae2f639884e1
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/spinbox_down_pressed.svg
@@ -0,0 +1,14 @@
+<svg width="17" height="11" 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,-13.50003,-38.152173)" gradientUnits="userSpaceOnUse">
+						<stop stop-opacity=".0047619" offset="0"/>
+						<stop stop-opacity="0" offset=".5"/>
+						<stop stop-opacity=".47451" offset="1"/>
+				</linearGradient>
+		</defs>
+		<rect x="-3.4557388" y="-5.57377" width="20.455738" height="16.573771" rx="1.5" ry="1.5" fill="#db0000" style="paint-order:fill markers stroke"/>
+		<rect transform="rotate(90)" x="-12" y="-39" width="23" height="39" color="#000001" fill="url(#a)"/>
+		<path d="m9 7.9999994-3.4641429-6h6.9281999z" fill="none" stroke="#000001" stroke-width="1.6"/>
+		<path d="m9 7.9999994-3.4641429-6h6.9281999z" fill="#bfbfbe" stroke-width=".85714287"/>
+		<rect y="-13.007122" width="1" height="24.007122" fill="#333334" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/spinbox_elevated_border.svg b/res/skins/LateNight/classic/buttons/spinbox_elevated_border.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/spinbox_elevated_border.svg
rename to res/skins/LateNight/classic/buttons/spinbox_elevated_border.svg
diff --git a/res/skins/LateNight/buttons_classic/spinbox_elevated_border_focus.svg b/res/skins/LateNight/classic/buttons/spinbox_elevated_border_focus.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/spinbox_elevated_border_focus.svg
rename to res/skins/LateNight/classic/buttons/spinbox_elevated_border_focus.svg
diff --git a/res/skins/LateNight/buttons_classic/spinbox_elevated_border_hover.svg b/res/skins/LateNight/classic/buttons/spinbox_elevated_border_hover.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/spinbox_elevated_border_hover.svg
rename to res/skins/LateNight/classic/buttons/spinbox_elevated_border_hover.svg
diff --git a/res/skins/LateNight/classic/buttons/spinbox_embedded_border.svg b/res/skins/LateNight/classic/buttons/spinbox_embedded_border.svg
new file mode 100644
index 000000000000..c4ffedf67da2
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/spinbox_embedded_border.svg
@@ -0,0 +1,18 @@
+<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="c" x1="2" x2="22" y1="2" y2="22" gradientTransform="matrix(1.0476191 0 0 1.0476191 .92857134 .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>
+		<rect x=".75" y=".75" width="24.5" height="24.5" rx=".30000007" ry=".30000007" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" style="paint-order:fill markers stroke"/>
+		<path d="m24 1-22.5-.0078125c-.2761309 2.761e-5-.4999724.2238691-.5.5v23.5000005h1v-23.0000005h22" color="#000001" color-rendering="auto" dominant-baseline="auto" fill="url(#b)" image-rendering="auto" shape-rendering="auto" solid-color="#000001" 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:#000001;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<rect x="2.5" y="2.4999981" width="22" height="22.000002" fill="none" stroke="url(#c)" stroke-linecap="square" 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/classic/buttons/spinbox_embedded_border_focus_orange.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/spinbox_embedded_border_focus_orange.svg
rename to res/skins/LateNight/classic/buttons/spinbox_embedded_border_focus_orange.svg
diff --git a/res/skins/LateNight/classic/buttons/spinbox_embedded_border_focus_orange.svg.svg b/res/skins/LateNight/classic/buttons/spinbox_embedded_border_focus_orange.svg.svg
new file mode 100644
index 000000000000..64c9c7aa5b4b
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/spinbox_embedded_border_focus_orange.svg.svg
@@ -0,0 +1,34 @@
+<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="h" x1="2" x2="22" y1="2" y2="22" gradientTransform="matrix(1.0476191 0 0 1.0476191 .92857134 .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="f" 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="d" x1="-1" x2="-1" y1="2" y2="25" gradientTransform="translate(2.50005 -.507121)" gradientUnits="userSpaceOnUse" xlink:href="#f"/>
+				<linearGradient id="e" 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>
+				<linearGradient id="g" 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>
+		</defs>
+		<rect x=".75" y=".75" width="24.5" height="24.5" rx=".30000007" ry=".30000007" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" style="paint-order:fill markers stroke"/>
+		<path d="m24 1-22.5-.0078125c-.2761309 2.761e-5-.4999724.2238691-.5.5v23.5000005h1v-23.0000005h22" color="#000001" color-rendering="auto" dominant-baseline="auto" fill="url(#d)" image-rendering="auto" shape-rendering="auto" solid-color="#000001" 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:#000001;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/>
+		<rect x="2.5" y="2.4999981" width="22" height="22.000002" fill="none" stroke="url(#h)" stroke-linecap="square" style="paint-order:fill markers stroke"/>
+		<g fill="none">
+				<rect x=".75" y=".75" width="24.5" height="24.5" rx=".30000007" ry=".30000007" stroke="url(#e)" 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(#g)" 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>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/spinbox_embedded_border_hover.svg b/res/skins/LateNight/classic/buttons/spinbox_embedded_border_hover.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/spinbox_embedded_border_hover.svg
rename to res/skins/LateNight/classic/buttons/spinbox_embedded_border_hover.svg
diff --git a/res/skins/LateNight/classic/buttons/spinbox_up.svg b/res/skins/LateNight/classic/buttons/spinbox_up.svg
new file mode 100644
index 000000000000..e9c777fb4e4f
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/spinbox_up.svg
@@ -0,0 +1,121 @@
+<?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="svg39"
+   version="1.1"
+   height="11"
+   width="17">
+  <metadata
+     id="metadata43">
+    <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="defs21">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(.96801856 0 0 1.0311015 -18.062401 -11.387575)"
+       y2="11.044087"
+       y1="32.380493"
+       x2="12.460919"
+       x1="12.460919"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-color="#141414" />
+      <stop
+         id="stop4"
+         offset="1"
+         stop-color="#262626" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-24.5,-1.5)"
+       y2="24.007122"
+       x2="1"
+       x1="1"
+       id="b">
+      <stop
+         id="stop7"
+         offset="0"
+         stop-color="#393939" />
+      <stop
+         id="stop9"
+         offset=".30102351"
+         stop-color="#393939" />
+      <stop
+         id="stop11"
+         offset="1"
+         stop-color="#141414" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6956521,-1.50003,-38.152173)"
+       y2="12"
+       y1="12"
+       x2="24"
+       x1="2"
+       id="c">
+      <stop
+         id="stop14"
+         offset="0"
+         stop-opacity=".0047619" />
+      <stop
+         id="stop16"
+         offset=".5"
+         stop-opacity="0" />
+      <stop
+         id="stop18"
+         offset="1"
+         stop-opacity=".47451" />
+    </linearGradient>
+  </defs>
+  <rect
+     id="rect23"
+     style="paint-order:fill markers stroke;fill:#262626;fill-opacity:1"
+     fill="#3c3c3c"
+     ry="1.5"
+     rx="1.5"
+     height="16.573771"
+     width="20.455738"
+     x="-3.4557376" />
+  <rect
+     id="rect27"
+     fill="url(#c)"
+     color="#000001"
+     height="39"
+     width="23"
+     y="-39"
+     x="1.0817554e-18"
+     transform="rotate(90)" />
+  <path
+     id="path33"
+     stroke-width="1.6"
+     stroke="#000001"
+     fill="none"
+     d="M 9.0050588,2.9999997 5.5409159,9 h 6.9282001 z" />
+  <path
+     id="path35"
+     stroke-width=".85714287"
+     fill="#bfbfbe"
+     d="M 9.0050588,2.9999997 5.5409159,9 h 6.9282001 z" />
+  <rect
+     id="rect37"
+     style="paint-order:fill markers stroke"
+     fill="#333334"
+     height="24.007122"
+     width="1"
+     y="-13.007122" />
+</svg>
diff --git a/res/skins/LateNight/classic/buttons/spinbox_up_pressed.svg b/res/skins/LateNight/classic/buttons/spinbox_up_pressed.svg
new file mode 100644
index 000000000000..0356b0c6b029
--- /dev/null
+++ b/res/skins/LateNight/classic/buttons/spinbox_up_pressed.svg
@@ -0,0 +1,14 @@
+<svg width="17" height="11" 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,-1.50003,-38.152173)" gradientUnits="userSpaceOnUse">
+						<stop stop-opacity=".0047619" offset="0"/>
+						<stop stop-opacity="0" offset=".5"/>
+						<stop stop-opacity=".47451" offset="1"/>
+				</linearGradient>
+		</defs>
+		<rect x="-3.4557376" width="20.455738" height="16.573771" rx="1.5" ry="1.5" fill="#db0000" style="paint-order:fill markers stroke"/>
+		<rect transform="rotate(90)" x="1.0817554e-18" y="-39" width="23" height="39" color="#000001" fill="url(#a)"/>
+		<path d="M 9.0050588,2.9999997 5.5409159,9 h 6.9282001 z" fill="none" stroke="#000001" stroke-width="1.6"/>
+		<path d="M 9.0050588,2.9999997 5.5409159,9 h 6.9282001 z" fill="#bfbfbe" stroke-width=".85714287"/>
+		<rect y="-13.007122" width="1" height="24.007122" fill="#333334" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/knobs_classic/knob_bg_fx.svg b/res/skins/LateNight/classic/knobs/knob_bg_fx.svg
similarity index 100%
rename from res/skins/LateNight/knobs_classic/knob_bg_fx.svg
rename to res/skins/LateNight/classic/knobs/knob_bg_fx.svg
diff --git a/res/skins/LateNight/knobs_classic/knob_bg_small.svg b/res/skins/LateNight/classic/knobs/knob_bg_master.svg
similarity index 100%
rename from res/skins/LateNight/knobs_classic/knob_bg_small.svg
rename to res/skins/LateNight/classic/knobs/knob_bg_master.svg
diff --git a/res/skins/LateNight/knobs_classic/knob_bg_regular.svg b/res/skins/LateNight/classic/knobs/knob_bg_regular.svg
similarity index 100%
rename from res/skins/LateNight/knobs_classic/knob_bg_regular.svg
rename to res/skins/LateNight/classic/knobs/knob_bg_regular.svg
diff --git a/res/skins/LateNight/classic/knobs/knob_bg_small.svg b/res/skins/LateNight/classic/knobs/knob_bg_small.svg
new file mode 100644
index 000000000000..2e1815cad773
--- /dev/null
+++ b/res/skins/LateNight/classic/knobs/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/classic/knobs/knob_indicator_fx_blue.svg b/res/skins/LateNight/classic/knobs/knob_indicator_fx_blue.svg
new file mode 100644
index 000000000000..dcdce3a19331
--- /dev/null
+++ b/res/skins/LateNight/classic/knobs/knob_indicator_fx_blue.svg
@@ -0,0 +1,22 @@
+<svg width="25" height="25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+		<defs>
+				<filter id="c" color-interpolation-filters="sRGB">
+						<feGaussianBlur stdDeviation="0.42678198"/>
+				</filter>
+				<linearGradient id="b" x1="12.517106" x2="12.517106" y1="3.714606" y2="11.924352" gradientTransform="matrix(1.2573 0 0 .86853 -234.59 -542.44)" gradientUnits="userSpaceOnUse">
+						<stop stop-color="#05c4e1" offset="0"/>
+						<stop stop-color="#007b8c" offset="1"/>
+				</linearGradient>
+				<radialGradient id="a" cx="366.93451" cy="355.35999" r="25.759201" gradientTransform="matrix(1 0 0 .99495877 0 1.7914509)" gradientUnits="userSpaceOnUse">
+						<stop stop-color="#a7ebf7" stop-opacity=".94901961" offset="0"/>
+						<stop stop-color="#5de6ff" stop-opacity=".81960785" offset=".61062"/>
+						<stop stop-color="#02b0d0" stop-opacity="0" offset="1"/>
+				</radialGradient>
+		</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(#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 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(#a)" filter="url(#c)" opacity=".772" stroke-width="1.26455235"/>
+</svg>
diff --git a/res/skins/LateNight/knobs_classic/knob_indicator_fx_green.svg b/res/skins/LateNight/classic/knobs/knob_indicator_fx_green.svg
similarity index 100%
rename from res/skins/LateNight/knobs_classic/knob_indicator_fx_green.svg
rename to res/skins/LateNight/classic/knobs/knob_indicator_fx_green.svg
diff --git a/res/skins/LateNight/knobs_classic/knob_indicator_fx_white.svg b/res/skins/LateNight/classic/knobs/knob_indicator_fx_white.svg
similarity index 100%
rename from res/skins/LateNight/knobs_classic/knob_indicator_fx_white.svg
rename to res/skins/LateNight/classic/knobs/knob_indicator_fx_white.svg
diff --git a/res/skins/LateNight/knobs_classic/knob_indicator_small_orange.svg b/res/skins/LateNight/classic/knobs/knob_indicator_master_orange.svg
similarity index 100%
rename from res/skins/LateNight/knobs_classic/knob_indicator_small_orange.svg
rename to res/skins/LateNight/classic/knobs/knob_indicator_master_orange.svg
diff --git a/res/skins/LateNight/knobs_classic/knob_indicator_small_red.svg b/res/skins/LateNight/classic/knobs/knob_indicator_master_red.svg
similarity index 100%
rename from res/skins/LateNight/knobs_classic/knob_indicator_small_red.svg
rename to res/skins/LateNight/classic/knobs/knob_indicator_master_red.svg
diff --git a/res/skins/LateNight/classic/knobs/knob_indicator_regular_blue.svg b/res/skins/LateNight/classic/knobs/knob_indicator_regular_blue.svg
new file mode 100644
index 000000000000..40c4fda80215
--- /dev/null
+++ b/res/skins/LateNight/classic/knobs/knob_indicator_regular_blue.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="#05c4e1" offset="0"/>
+						<stop stop-color="#007b8c" 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="#a7ebf7" stop-opacity=".94901961" offset="0"/>
+						<stop stop-color="#5de6ff" stop-opacity=".81960785" offset=".61062"/>
+						<stop stop-color="#02b0d0" 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_green.svg b/res/skins/LateNight/classic/knobs/knob_indicator_regular_green.svg
similarity index 100%
rename from res/skins/LateNight/knobs_classic/knob_indicator_regular_green.svg
rename to res/skins/LateNight/classic/knobs/knob_indicator_regular_green.svg
diff --git a/res/skins/LateNight/knobs_classic/knob_indicator_regular_orange.svg b/res/skins/LateNight/classic/knobs/knob_indicator_regular_orange.svg
similarity index 100%
rename from res/skins/LateNight/knobs_classic/knob_indicator_regular_orange.svg
rename to res/skins/LateNight/classic/knobs/knob_indicator_regular_orange.svg
diff --git a/res/skins/LateNight/knobs_classic/knob_indicator_regular_red.svg b/res/skins/LateNight/classic/knobs/knob_indicator_regular_red.svg
similarity index 100%
rename from res/skins/LateNight/knobs_classic/knob_indicator_regular_red.svg
rename to res/skins/LateNight/classic/knobs/knob_indicator_regular_red.svg
diff --git a/res/skins/LateNight/classic/knobs/knob_indicator_regular_white.svg b/res/skins/LateNight/classic/knobs/knob_indicator_regular_white.svg
new file mode 100644
index 000000000000..e94fa44276bd
--- /dev/null
+++ b/res/skins/LateNight/classic/knobs/knob_indicator_regular_white.svg
@@ -0,0 +1,22 @@
+<svg width="40" height="34" version="1.1" xmlns="http://www.w3.org/2000/svg">
+		<defs>
+				<filter id="d" x="-.0059850195" y="-.0060153441" width="1.01197" height="1.0120307" color-interpolation-filters="sRGB">
+						<feGaussianBlur stdDeviation="0.10706202"/>
+				</filter>
+				<linearGradient id="e" x1="22" x2="22" y1="-5.5580931" y2="10.5775" gradientTransform="translate(-8.5243688e-8,8.9999999)" gradientUnits="userSpaceOnUse">
+						<stop stop-color="#bebfbd" offset="0"/>
+						<stop stop-color="#878787" offset="1"/>
+				</linearGradient>
+				<radialGradient id="f" cx="366.93451" cy="355.35999" r="25.759201" gradientTransform="matrix(1 0 0 .99495877 0 1.7914509)" gradientUnits="userSpaceOnUse">
+						<stop stop-color="#fefefe" stop-opacity=".94901961" offset="0"/>
+						<stop stop-color="#e0e0dc" stop-opacity=".71428573" offset=".61062"/>
+						<stop stop-color="#a3a4a2" stop-opacity=".02352941" 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)" style=""/>
+</svg>
diff --git a/res/skins/LateNight/classic/knobs/knob_indicator_small_blue.svg b/res/skins/LateNight/classic/knobs/knob_indicator_small_blue.svg
new file mode 100644
index 000000000000..abc689ce6fd6
--- /dev/null
+++ b/res/skins/LateNight/classic/knobs/knob_indicator_small_blue.svg
@@ -0,0 +1,154 @@
+<?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="svg29"
+   version="1.1"
+   height="34"
+   width="40">
+  <metadata
+     id="metadata33">
+    <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="defs17">
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1 0 0 .98824 -5.7382e-7 4.1807)"
+       r="21.466"
+       cy="355.35999"
+       cx="366.94"
+       id="f">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-opacity=".94902"
+         stop-color="#def7a7" />
+      <stop
+         id="stop4"
+         offset=".38035452"
+         stop-opacity=".81961"
+         stop-color="#c0ff5d" />
+      <stop
+         id="stop6"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#7bd002" />
+    </radialGradient>
+    <filter
+       color-interpolation-filters="sRGB"
+       id="d">
+      <feGaussianBlur
+         id="feGaussianBlur9"
+         stdDeviation="0.42678198" />
+    </filter>
+    <linearGradient
+       xlink:href="#b"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2573,0,0,0.86853,-234.58976,-533.43991)"
+       y2="634.37"
+       y1="623.47998"
+       x2="202.49001"
+       x1="202.39"
+       id="e">
+      <stop
+         id="stop12"
+         offset="0"
+         stop-color="#77c305" />
+      <stop
+         id="stop14"
+         offset="1"
+         stop-color="#457600" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.99495877,0,1.7914509)"
+       r="25.759201"
+       cy="355.35999"
+       cx="366.93451"
+       id="a">
+      <stop
+         id="stop10"
+         offset="0"
+         stop-opacity=".94901961"
+         stop-color="#a7ebf7" />
+      <stop
+         id="stop12-3"
+         offset=".61062"
+         stop-opacity=".81960785"
+         stop-color="#5de6ff" />
+      <stop
+         id="stop14-6"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#02b0d0" />
+    </radialGradient>
+    <filter
+       id="c"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur2"
+         stdDeviation="0.42678198" />
+    </filter>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2573,0,0,0.86853,-234.59,-533.44)"
+       y2="11.924352"
+       y1="3.714606"
+       x2="12.517106"
+       x1="12.517106"
+       id="b">
+      <stop
+         id="stop5"
+         offset="0"
+         stop-color="#05c4e1" />
+      <stop
+         id="stop7"
+         offset="1"
+         stop-color="#007b8c" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="17.576271"
+       x2="19.809322"
+       y1="8.0677967"
+       x1="19.809322"
+       id="linearGradient879"
+       xlink:href="#b" />
+  </defs>
+  <g
+     id="g23"
+     stroke="#000"
+     fill="none"
+     transform="translate(-7.175043)">
+    <path
+       id="path19"
+       stroke-width="1.60000002"
+       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" />
+    <path
+       id="path21"
+       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
+     fill="url(#e)"
+     style="fill-opacity:1;fill:url(#linearGradient879)"
+     id="path25"
+     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" />
+  <path
+     id="path27-5"
+     d="m 388.4,355.36 a 21.466,21.213 0 1 1 -42.931,0 21.466,21.213 0 1 1 42.931,0 z"
+     transform="matrix(0.06987957,0,0,0.07008943,-5.6412252,-19.336546)"
+     style="opacity:0.772;fill:url(#a);stroke-width:1.26455235;filter:url(#c)" />
+</svg>
diff --git a/res/skins/LateNight/knobs_classic/knob_indicator_small_green.svg b/res/skins/LateNight/classic/knobs/knob_indicator_small_green.svg
similarity index 100%
rename from res/skins/LateNight/knobs_classic/knob_indicator_small_green.svg
rename to res/skins/LateNight/classic/knobs/knob_indicator_small_green.svg
diff --git a/res/skins/LateNight/classic/knobs/knob_indicator_small_orange.svg b/res/skins/LateNight/classic/knobs/knob_indicator_small_orange.svg
new file mode 100644
index 000000000000..1ea1fa2f0f78
--- /dev/null
+++ b/res/skins/LateNight/classic/knobs/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/classic/knobs/knob_indicator_small_red.svg b/res/skins/LateNight/classic/knobs/knob_indicator_small_red.svg
new file mode 100644
index 000000000000..b3e41fb47dd3
--- /dev/null
+++ b/res/skins/LateNight/classic/knobs/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/classic/sliders/knob_crossfader.svg b/res/skins/LateNight/classic/sliders/knob_crossfader.svg
new file mode 100644
index 000000000000..4aa88c93e628
--- /dev/null
+++ b/res/skins/LateNight/classic/sliders/knob_crossfader.svg
@@ -0,0 +1,62 @@
+<?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="19"
+   height="40"
+   version="1.1"
+   id="svg22">
+  <metadata
+     id="metadata28">
+    <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="defs26" />
+  <path
+     id="path2"
+     d="m 5.438,37.5618 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 6.9123,38.999267 5.9638,38.42436 5.438,37.5618 Z"
+     style="color:#000000;opacity:0.15" />
+  <path
+     id="path4"
+     d="m 4.938,36.5618 c 0.45484,0.27725 0.98869,0.437484 1.5625,0.4375 l 5.397748,1.5e-4 C 14,36.999508 15,35.346917 15,33.9998 V 4.99965 C 15,4.42584 14.801504,3.707514 14.419677,3.221956 15.282237,3.747736 15.5005,4.9111 15.5005,5.9993 v 29.00015 c 0,1.662 -1.338,3.00005 -3,3 l -5,-1.5e-4 C 6.4123,37.999267 5.4638,37.42436 4.938,36.5618 Z"
+     style="color:#000000;opacity:0.5" />
+  <path
+     id="path6"
+     d="M 4,4.99985 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 5 C 15,3.338 13.662,2.0000499 12,2 L 7,1.99985 c -1.662,-4.99e-5 -3,1.338 -3,3 z"
+     style="color:#000000;opacity:0.8" />
+  <path
+     id="path8"
+     d="M 7,2 C 5.338,2 4,3.338 4,5 v 28 c 0,0.831 0.33275,1.5828 0.875,2.125 L 6,34 13,4 14.125,2.875 C 13.58275,2.33275 12.831,2 12,2 Z"
+     style="color:#000000;fill:#444444" />
+  <path
+     id="path10"
+     d="M 14.125,2.875 13,4 6,34 4.875,35.125 C 5.41725,35.66725 6.169,36 7,36 h 5 c 1.662,0 3,-1.338 3,-3 V 5 C 15,4.169 14.66725,3.4172 14.125,2.875 Z"
+     style="color:#000000;fill:#1a1a1a" />
+  <path
+     id="path12"
+     d="m 7,3 h 5 c 1.108,0 2,0.892 2,2 v 28 c 0,1.108 -0.892,2 -2,2 H 7 C 5.892,35 5,34.108 5,33 V 5 C 5,3.892 5.892,3 7,3 Z"
+     style="color:#000000;fill:#333333" />
+  <path
+     id="path14"
+     d="M 8,3 H 9 V 35 H 8 Z"
+     style="color:#000000;fill:#282828" />
+  <path
+     id="path16"
+     d="m 9,3 h 1 V 35 H 9 Z"
+     style="color:#000000;fill:#ea0000" />
+  <path
+     id="path18"
+     d="m 10,3 h 1 v 32 h -1 z"
+     style="color:#000000;fill:#414141" />
+</svg>
diff --git a/res/skins/LateNight/classic/sliders/knob_pitch_deck.svg b/res/skins/LateNight/classic/sliders/knob_pitch_deck.svg
new file mode 100644
index 000000000000..46fecb52227c
--- /dev/null
+++ b/res/skins/LateNight/classic/sliders/knob_pitch_deck.svg
@@ -0,0 +1,62 @@
+<?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="40"
+   height="17"
+   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-3"
+     d="m 3.7942,15.14832 c 0.60561,0.57244 1.4882,0.85239 2.062,0.85238 L 35.5134,16 c 1.4154,3.5e-4 2.7757,-1.0248 2.9852,-2.6991 C 38.50965,15.438 38.07311,17 36.168,17 H 6.3568 C 5.2686,17 4.0076,16.37026 3.7943,15.1483 Z"
+     style="color:#000000;opacity:0.15" />
+  <path
+     id="path4-6"
+     d="m 3.2942,14.18332 c 0.69268,0.64195 1.4882,0.81723 2.062,0.81722 l 29.5552,-7e-4 c 2.1018,-5e-5 3.1018,-1.6525 3.1018,-2.9996 v -5 c 0,-0.57381 -0.1985,-1.2921 -0.58032,-1.7777 0.86256,0.52578 1.0808,1.6891 1.0808,2.7773 v 5 c 0,1.662 -1.338,3 -3,3 H 5.85648 c -1.0882,0 -2.5339,-0.85452 -2.5625,-1.8165 z"
+     style="color:#000000;opacity:0.5" />
+  <path
+     id="path6-7"
+     d="m 2.3562,7.00102 v 5 c 0,1.662 1.338,3 3,3 h 29.6572 c 1.662,0 3,-1.338 3,-3 v -5 c 0,-1.662 -1.338,-3 -3,-3 H 5.3562 c -1.662,0 -3,1.338 -3,3 z"
+     style="color:#000000;opacity:0.8" />
+  <path
+     id="path8-5"
+     d="m 2,6.00072 c 0,-1.662 1.338,-3 3,-3 l 30.0002,-7.5e-5 c 0.831,-2.1e-6 1.5828,0.33275 2.125,0.875 l -1.125,1.125 -32.0002,7.0001 -1.125,1.125 C 2.33275,12.583495 2,11.831745 2,11.000745 Z"
+     style="color:#000000;fill:#444444" />
+  <path
+     id="path10-3"
+     d="m 2.875,13.12532 1.125,-1.125 32.0002,-7.0001 1.125,-1.125 c 0.54225,0.54225 0.875,1.294 0.875,2.125 v 5 c 0,1.662 -1.338,3 -3,3 L 5,14.000295 c -0.831,2e-6 -1.5828,-0.33275 -2.125,-0.875 z"
+     style="color:#000000;fill:#1a1a1a" />
+  <path
+     id="path12-5"
+     d="m 3,6.00072 v 5 c 0,1.108 0.892,2 2,2 l 30.0002,-7.5e-5 c 1.108,-3e-6 2,-0.892 2,-2 v -5 c 0,-1.108 -0.892,-2 -2,-2 L 5,4.00072 c -1.108,2.8e-6 -2,0.892 -2,2 z"
+     style="color:#000000;fill:#262626;fill-opacity:1" />
+  <path
+     id="path14-6"
+     d="m 3,8.000075 v 1 L 37.0002,9 V 8 Z"
+     style="color:#000000;fill:#b40000;fill-opacity:1" />
+  <path
+     id="path18-9"
+     d="m 3,9.000075 v 1 L 37.0002,10 V 9 Z"
+     style="color:#000000;fill:#ea0000" />
+  <path
+     id="path20"
+     d="m 3,6.999555 v 1 l 34.0002,-7.5e-5 v -1 z"
+     style="color:#000000;fill:#191919;fill-opacity:1" />
+</svg>
diff --git a/res/skins/LateNight/classic/sliders/knob_pitch_sampler.svg b/res/skins/LateNight/classic/sliders/knob_pitch_sampler.svg
new file mode 100644
index 000000000000..4f4b6e7f26bd
--- /dev/null
+++ b/res/skins/LateNight/classic/sliders/knob_pitch_sampler.svg
@@ -0,0 +1,58 @@
+<?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="30"
+   height="13"
+   version="1.1"
+   id="svg22">
+  <metadata
+     id="metadata28">
+    <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="defs26" />
+  <path
+     style="color:#000000;opacity:0.5"
+     d="m 3.29375,11.18361 c 0.504291,0.413239 1.075229,0.816575 2.205357,0.816565 L 24.897874,12 c 2.101752,-1.9e-5 3.101864,-1.652533 3.101752,-2.99965 L 27.999376,6 C 27.999328,5.42619 27.80088,4.7078645 27.419053,4.2223066 28.281613,4.7480866 28.499785,5.91145 28.499876,6.99965 L 28.500126,10 c 1.38e-4,1.662 -1.338,2.999985 -3,3 L 5.85625,13.000175 c -1.0882,10e-6 -2.27159,-0.138071 -2.5625,-1.816565 z"
+     id="path2-3" />
+  <path
+     style="color:#000000;opacity:0.8"
+     d="m 2.3555,6.000525 2.5e-4,3.00035 c 1.39e-4,1.662 1.338,3.000015 3,3 L 24.999626,12.0007 c 1.662,-1.5e-5 3.000138,-1.338 3,-3 l -2.5e-4,-3.00035 c -1.38e-4,-1.662 -1.338,-3.0000148 -3,-3 L 5.3555,3.000525 c -1.662,1.48e-5 -3.000138,1.338 -3,3 z"
+     id="path4-6" />
+  <path
+     id="path8-5-5"
+     d="m 2,5.000075 c 0,-1.662 1.338,-3 3,-3 L 25,2 c 0.831,-3.1e-6 1.5828,0.33275 2.125,0.875 L 26,4 4,9.000745 l -1.125,1.125 C 2.33275,9.583495 2,8.831745 2,8.000745 Z"
+     style="color:#000000;fill:#444444" />
+  <path
+     id="path10-3-3"
+     d="M 2.875,10.12532 4,9.00032 26,3.999575 l 1.125,-1.125 c 0.54225,0.54225 0.875,1.294 0.875,2.125 V 8.00022 c 0,1.662 -1.338,3 -3,3 l -20,7.5e-5 c -0.831,3e-6 -1.5828,-0.33275 -2.125,-0.875 z"
+     style="color:#000000;fill:#1a1a1a" />
+  <path
+     id="path12-5-5"
+     d="M 3,5.000075 V 8.00072 c 0,1.108 0.892,2 2,2 l 20,-7.5e-5 c 1.108,-4e-6 2,-0.892 2,-2 V 5 C 27,3.892 26.108,3 25,3 l -20,7.5e-5 c -1.108,4.2e-6 -2,0.892 -2,2 z"
+     style="color:#000000;fill:#262626;fill-opacity:1" />
+  <path
+     id="path14-6-6"
+     d="m 3,6.0007203 v 1 l 24,-7.5e-5 v -1 z"
+     style="color:#000000;fill:#b40000;fill-opacity:1" />
+  <path
+     id="path18-9"
+     d="m 3,7.0007203 v 1 l 24,-7.5e-5 v -1 z"
+     style="color:#000000;fill:#ea0000" />
+  <path
+     id="path20"
+     d="M 3.2658829,5.0002 3,6.0002003 27,6.0001253 26.733722,5.000125 Z"
+     style="color:#000000;fill:#191919;fill-opacity:1" />
+</svg>
diff --git a/res/skins/LateNight/classic/sliders/knob_volume_deck.svg b/res/skins/LateNight/classic/sliders/knob_volume_deck.svg
new file mode 100644
index 000000000000..eb61612c9fb7
--- /dev/null
+++ b/res/skins/LateNight/classic/sliders/knob_volume_deck.svg
@@ -0,0 +1,62 @@
+<?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="svg22"
+   version="1.1"
+   height="19"
+   width="42">
+  <metadata
+     id="metadata28">
+    <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="defs26" />
+  <path
+     style="color:#000000;opacity:0.15"
+     d="m 4.794,16.14832 c 0.60561,0.57244 1.4882,0.85239 2.062,0.85238 L 36.5132,17 c 1.4154,3.5e-4 2.7757,-1.0248 2.9852,-2.6991 C 39.50945,16.438 39.07291,18 37.1678,18 H 7.3566 C 6.2684,18 5.0074,17.37026 4.7941,16.1483 Z"
+     id="path2-3" />
+  <path
+     style="color:#000000;opacity:0.5"
+     d="m 4.294,15.18332 c 0.69268,0.64195 1.4882,0.81723 2.062,0.81722 l 29.5552,-7e-4 c 2.1018,-5e-5 3.1018,-1.6525 3.1018,-2.9996 v -5 c 0,-0.57381 -0.1985,-1.2921 -0.58032,-1.7777 0.86256,0.52578 1.0808,1.6891 1.0808,2.7773 v 5 c 0,1.662 -1.338,3 -3,3 H 6.85628 c -1.0882,0 -2.5339,-0.85452 -2.5625,-1.8165 z"
+     id="path4-6" />
+  <path
+     style="color:#000000;opacity:0.8"
+     d="m 3.356,8.00102 v 5 c 0,1.662 1.338,3 3,3 l 29.6572,0 c 1.662,0 3,-1.338 3,-3 v -5 c 0,-1.662 -1.338,-3 -3,-3 l -29.6572,0 c -1.662,0 -3,1.338 -3,3 z"
+     id="path6-7" />
+  <path
+     style="color:#000000;fill:#444444"
+     d="m 2.9998,7.00072 c 0,-1.662 1.338,-3 3,-3 L 36,4.000645 c 0.831,-2.1e-6 1.5828,0.33275 2.125,0.875 l -1.125,1.125 -32.0002,7.0001 -1.125,1.125 c -0.54225,-0.54225 -0.875,-1.294 -0.875,-2.125 z"
+     id="path8-5" />
+  <path
+     style="color:#000000;fill:#1a1a1a"
+     d="m 3.8748,14.12532 1.125,-1.125 L 37,6.00022 38.125,4.87522 C 38.66725,5.41747 39,6.16922 39,7.00022 v 5 c 0,1.662 -1.338,3 -3,3 l -30.0002,7.5e-5 c -0.831,2e-6 -1.5828,-0.33275 -2.125,-0.875 z"
+     id="path10-3" />
+  <path
+     style="color:#000000;fill:#262626;fill-opacity:1"
+     d="m 3.9998,7.00072 v 5 c 0,1.108 0.892,2 2,2 L 36,14.000645 c 1.108,-3e-6 2,-0.892 2,-2 v -5 c 0,-1.108 -0.892,-2 -2,-2 L 5.9998,5.00072 c -1.108,2.8e-6 -2,0.892 -2,2 z"
+     id="path12-5" />
+  <path
+     style="color:#000000;fill:#b40000;fill-opacity:1"
+     d="m 3.9998,9.000075 v 1 L 38,10 V 9 Z"
+     id="path14-6" />
+  <path
+     style="color:#000000;fill:#ea0000"
+     d="m 3.9998,10.000075 v 1 L 38,11 v -1 z"
+     id="path18-9" />
+  <path
+     style="color:#000000;fill:#690000;fill-opacity:1"
+     d="m 3.9998,7.999555 v 1 L 38,8.99948 v -1 z"
+     id="path20" />
+</svg>
diff --git a/res/skins/LateNight/sliders_classic/knob_volume_previewdeck.svg b/res/skins/LateNight/classic/sliders/knob_volume_previewdeck.svg
similarity index 100%
rename from res/skins/LateNight/sliders_classic/knob_volume_previewdeck.svg
rename to res/skins/LateNight/classic/sliders/knob_volume_previewdeck.svg
diff --git a/res/skins/LateNight/classic/sliders/slider_crossfader.svg b/res/skins/LateNight/classic/sliders/slider_crossfader.svg
new file mode 100644
index 000000000000..1017a640893f
--- /dev/null
+++ b/res/skins/LateNight/classic/sliders/slider_crossfader.svg
@@ -0,0 +1,114 @@
+<?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="115"
+   height="40"
+   version="1.1"
+   id="svg46">
+  <metadata
+     id="metadata52">
+    <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="defs50" />
+  <path
+     d="m 57.999797,23 -2e-4,9 h -0.999596 l 2e-4,-9 z"
+     id="path2"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 57.999797,5 -2e-4,9 h -0.999596 l 2e-4,-9 z"
+     id="path4"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 7.999796,23 -2e-4,9 H 7 l 2e-4,-9 z"
+     id="path6"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 7.999796,5 -2e-4,9 H 7 l 2e-4,-9 z"
+     id="path8"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 107.9998,23 -2e-4,9 H 107 l 2e-4,-9 z"
+     id="path10"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 107.9998,5 -2e-4,9 H 107 l 2e-4,-9 z"
+     id="path12"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 44.999797,23 2e-6,7 h -0.999596 l -2e-6,-7 z"
+     id="path14"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 44.999999,7 -4.02e-4,7 h -0.999596 l 4.02e-4,-7 z"
+     id="path16"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 70.999797,23 2e-6,7 h -0.999596 l -2e-6,-7 z"
+     id="path18"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 70.999999,7 -4.02e-4,7 h -0.999596 l 4.02e-4,-7 z"
+     id="path20"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 57.999898,6 -2e-4,9 h -0.999596 l 2e-4,-9 z"
+     id="path22"
+     style="color:#000000;fill:#636363;stroke-width:0.99979782" />
+  <path
+     d="m 57.999597,33 2e-4,-9 h -0.999596 l -2e-4,9 z"
+     id="path24"
+     style="color:#000000;fill:#636363;stroke-width:0.99979782" />
+  <path
+     d="m 7.999796,6 -2e-4,9 H 7 l 2e-4,-9 z"
+     id="path26"
+     style="color:#000000;fill:#4b4b4b;stroke-width:0.99979782" />
+  <path
+     d="m 7.999596,33 2e-4,-9 H 7.0002 L 7,33 Z"
+     id="path28"
+     style="color:#000000;fill:#4b4b4b;stroke-width:0.99979782" />
+  <path
+     d="m 107.9998,6 -2e-4,9 H 107 l 2e-4,-9 z"
+     id="path30"
+     style="color:#000000;fill:#4b4b4b;stroke-width:0.99979782" />
+  <path
+     d="m 107.9996,33 2e-4,-9 h -0.9996 L 107,33 Z"
+     id="path32"
+     style="color:#000000;fill:#4b4b4b;stroke-width:0.99979782" />
+  <path
+     d="m 44.999999,8 -4.02e-4,7 h -0.999596 l 4.02e-4,-7 z"
+     id="path34"
+     style="color:#000000;fill:#4b4b4b;stroke-width:0.99979782" />
+  <path
+     d="m 44.999799,31 -2e-6,-7 h -0.999596 l 2e-6,7 z"
+     id="path36"
+     style="color:#000000;fill:#4b4b4b;stroke-width:0.99979782" />
+  <path
+     d="m 70.999999,8 -4.02e-4,7 h -0.999596 l 4.02e-4,-7 z"
+     id="path38"
+     style="color:#000000;fill:#4b4b4b;stroke-width:0.99979782" />
+  <path
+     d="m 70.999799,31 -2e-6,-7 h -0.999596 l 2e-6,7 z"
+     id="path40"
+     style="color:#000000;fill:#4b4b4b;stroke-width:0.99979782" />
+  <path
+     d="m 108,17 v 4 H 7 v -4 z"
+     id="path42"
+     style="color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.65253747;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="path26-3"
+     style="fill:#4b4b4b;paint-order:fill markers stroke"
+     d="m 6,16 v 6 h 103 v -6 z m 1,1 h 101 v 4 H 7 Z" />
+</svg>
diff --git a/res/skins/LateNight/classic/sliders/slider_crossfader_small.svg b/res/skins/LateNight/classic/sliders/slider_crossfader_small.svg
new file mode 100644
index 000000000000..254427ff9b25
--- /dev/null
+++ b/res/skins/LateNight/classic/sliders/slider_crossfader_small.svg
@@ -0,0 +1,154 @@
+<?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="svg46"
+   version="1.1"
+   height="42"
+   width="85">
+  <metadata
+     id="metadata52">
+    <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="defs50" />
+  <path
+     id="path2"
+     stroke-width=".99979782"
+     fill="#050505"
+     color="#000000"
+     d="m42.999797 24-2e-4 9h-.999596l2e-4-9z" />
+  <path
+     id="path4"
+     stroke-width=".99979782"
+     fill="#050505"
+     color="#000000"
+     d="m42.999797 6-2e-4 9h-.999596l2e-4-9z" />
+  <path
+     id="path6"
+     stroke-width=".99979782"
+     fill="#050505"
+     color="#000000"
+     d="m7.999796 24-2e-4 9h-.999596l2e-4-9z" />
+  <path
+     id="path8"
+     stroke-width=".99979782"
+     fill="#050505"
+     color="#000000"
+     d="m7.999796 6-2e-4 9h-.999596l2e-4-9z" />
+  <path
+     id="path10"
+     stroke-width=".99979782"
+     fill="#050505"
+     color="#000000"
+     d="m77.9998 24-2e-4 9h-.9996l2e-4-9z" />
+  <path
+     id="path12"
+     stroke-width=".99979782"
+     fill="#050505"
+     color="#000000"
+     d="m77.9998 6-2e-4 9h-.9996l2e-4-9z" />
+  <path
+     id="path14"
+     stroke-width=".99979782"
+     fill="#050505"
+     color="#000000"
+     d="m31.999797 24 2e-6 7h-.999596l-2e-6-7z" />
+  <path
+     id="path16"
+     stroke-width=".99979782"
+     fill="#050505"
+     color="#000000"
+     d="m31.999999 8-.000402 7h-.999596l.000402-7z" />
+  <path
+     id="path18"
+     stroke-width=".99979782"
+     fill="#050505"
+     color="#000000"
+     d="m53.999797 24 2e-6 7h-.999596l-2e-6-7z" />
+  <path
+     id="path20"
+     stroke-width=".99979782"
+     fill="#050505"
+     color="#000000"
+     d="m53.999999 8-.000402 7h-.999596l.000402-7z" />
+  <path
+     id="path22"
+     stroke-width=".99979782"
+     fill="#636363"
+     color="#000000"
+     d="m42.999898 7-2e-4 9h-.999596l2e-4-9z" />
+  <path
+     id="path24"
+     stroke-width=".99979782"
+     fill="#636363"
+     color="#000000"
+     d="m42.999597 34 2e-4-9h-.999596l-2e-4 9z" />
+  <path
+     id="path26"
+     stroke-width=".99979782"
+     fill="#4b4b4b"
+     color="#000000"
+     d="m7.999796 7-2e-4 9h-.999596l2e-4-9z" />
+  <path
+     id="path28"
+     stroke-width=".99979782"
+     fill="#4b4b4b"
+     color="#000000"
+     d="m7.999596 34 2e-4-9h-.999596l-2e-4 9z" />
+  <path
+     id="path30"
+     stroke-width=".99979782"
+     fill="#4b4b4b"
+     color="#000000"
+     d="m77.9998 7-2e-4 9h-.9996l2e-4-9z" />
+  <path
+     id="path32"
+     stroke-width=".99979782"
+     fill="#4b4b4b"
+     color="#000000"
+     d="m77.9996 34 2e-4-9h-.9996l-2e-4 9z" />
+  <path
+     id="path34"
+     stroke-width=".99979782"
+     fill="#4b4b4b"
+     color="#000000"
+     d="m31.999999 9-.000402 7h-.999596l.000402-7z" />
+  <path
+     id="path36"
+     stroke-width=".99979782"
+     fill="#4b4b4b"
+     color="#000000"
+     d="m31.999799 32-2e-6-7h-.999596l2e-6 7z" />
+  <path
+     id="path38"
+     stroke-width=".99979782"
+     fill="#4b4b4b"
+     color="#000000"
+     d="m53.999999 9-.000402 7h-.999596l.000402-7z" />
+  <path
+     id="path40"
+     stroke-width=".99979782"
+     fill="#4b4b4b"
+     color="#000000"
+     d="m53.999799 32-2e-6-7h-.999596l2e-6 7z" />
+  <path
+     d="m 78.00001,18 v 4 H 7 v -4 z"
+     id="path2-3"
+     style="color:#000000;fill:#050505;stroke-width:0.99999994" />
+  <path
+     d="m 6,17 v 6 h 73 v -6 z m 1,1 h 71 v 4 H 7 Z"
+     style="fill:#4b4b4b;paint-order:fill markers stroke"
+     id="path28-6" />
+</svg>
diff --git a/res/skins/LateNight/classic/sliders/slider_pitch_deck.svg b/res/skins/LateNight/classic/sliders/slider_pitch_deck.svg
new file mode 100644
index 000000000000..a69e9fd18003
--- /dev/null
+++ b/res/skins/LateNight/classic/sliders/slider_pitch_deck.svg
@@ -0,0 +1,193 @@
+<?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="40"
+   height="113"
+   version="1.1"
+   id="svg84">
+  <metadata
+     id="metadata90">
+    <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="defs88" />
+  <g
+     fill="#050505"
+     stroke-width=".99979782"
+     id="g38">
+    <path
+       d="m8 20.500564h8v.999596h-8z"
+       color="#000000"
+       id="path2" />
+    <path
+       d="m8 32.500511h8v.999596h-8z"
+       color="#000000"
+       id="path4" />
+    <path
+       d="m8 44.500457h8v.999596h-8z"
+       color="#000000"
+       id="path6" />
+    <path
+       d="m6 56.500404h10v.999596h-10z"
+       color="#000000"
+       id="path8" />
+    <path
+       d="m8 68.500361h8v.999596h-8z"
+       color="#000000"
+       id="path10" />
+    <path
+       d="m8 80.500308h8v.999596h-8z"
+       color="#000000"
+       id="path12" />
+    <path
+       d="m8 92.500254h8v.999596h-8z"
+       color="#000000"
+       id="path14" />
+    <path
+       d="m32 20.500564h-8v.999596h8z"
+       color="#000000"
+       id="path16" />
+    <path
+       d="m32 32.500511h-8v.999596h8z"
+       color="#000000"
+       id="path18" />
+    <path
+       d="m32 44.500457h-8v.999596h8z"
+       color="#000000"
+       id="path20" />
+    <path
+       d="m34 56.500404h-10v.999596h10z"
+       color="#000000"
+       id="path22" />
+    <path
+       d="m32 68.500361h-8v.999596h8z"
+       color="#000000"
+       id="path24" />
+    <path
+       d="m32 80.500308h-8v.999596h8z"
+       color="#000000"
+       id="path26" />
+    <path
+       d="m32 92.500254h-8v.999596h8z"
+       color="#000000"
+       id="path28" />
+    <path
+       d="m8 6.500564h8v.999596h-8z"
+       color="#000000"
+       id="path30" />
+    <path
+       d="m32 6.500564h-8v.999596h8z"
+       color="#000000"
+       id="path32" />
+    <path
+       d="m8 104.50025h8v.9996h-8z"
+       color="#000000"
+       id="path34" />
+    <path
+       d="m32 104.50025h-8v.9996h8z"
+       color="#000000"
+       id="path36" />
+  </g>
+  <g
+     fill="#636363"
+     stroke-width=".99979782"
+     id="g44">
+    <path
+       d="m6 57.000404h10v.999596h-10z"
+       color="#000000"
+       id="path40" />
+    <path
+       d="m34 57.000404h-10v.999596h10z"
+       color="#000000"
+       id="path42" />
+  </g>
+  <g
+     fill="#404040"
+     stroke-width=".99979782"
+     id="g78">
+    <path
+       d="m8 21.000564h8v.999596h-8z"
+       color="#000000"
+       id="path46" />
+    <path
+       d="m8 33.000511h8v.999596h-8z"
+       color="#000000"
+       id="path48" />
+    <path
+       d="m8 45.000457h8v.999596h-8z"
+       color="#000000"
+       id="path50" />
+    <path
+       d="m8 69.000361h8v.999596h-8z"
+       color="#000000"
+       id="path52" />
+    <path
+       d="m8 81.000308h8v.999596h-8z"
+       color="#000000"
+       id="path54" />
+    <path
+       d="m8 93.000254h8v.999596h-8z"
+       color="#000000"
+       id="path56" />
+    <path
+       d="m32 21.000564h-8v.999596h8z"
+       color="#000000"
+       id="path58" />
+    <path
+       d="m32 33.000511h-8v.999596h8z"
+       color="#000000"
+       id="path60" />
+    <path
+       d="m32 45.000457h-8v.999596h8z"
+       color="#000000"
+       id="path62" />
+    <path
+       d="m32 69.000361h-8v.999596h8z"
+       color="#000000"
+       id="path64" />
+    <path
+       d="m32 81.000308h-8v.999596h8z"
+       color="#000000"
+       id="path66" />
+    <path
+       d="m32 93.000254h-8v.999596h8z"
+       color="#000000"
+       id="path68" />
+    <path
+       d="m8 7.000564h8v.999596h-8z"
+       color="#000000"
+       id="path70" />
+    <path
+       d="m32 7.000564h-8v.999596h8z"
+       color="#000000"
+       id="path72" />
+    <path
+       d="m8 105.00025h8v.9996h-8z"
+       color="#000000"
+       id="path74" />
+    <path
+       d="m32 105.00025h-8v.9996h8z"
+       color="#000000"
+       id="path76" />
+  </g>
+  <path
+     id="path40-3"
+     d="m 18,7 h 4 v 99 h -4 z"
+     style="color:#000000;fill:#050505;stroke-width:0.99999994" />
+  <path
+     id="path42-6"
+     style="fill:#505050;paint-order:fill markers stroke"
+     d="m 17,107 h 6 V 6 h -6 z m 1,-1 V 7.000001 h 4 V 106 Z" />
+</svg>
diff --git a/res/skins/LateNight/classic/sliders/slider_pitch_deck_compact.svg b/res/skins/LateNight/classic/sliders/slider_pitch_deck_compact.svg
new file mode 100644
index 000000000000..f81633c59fe1
--- /dev/null
+++ b/res/skins/LateNight/classic/sliders/slider_pitch_deck_compact.svg
@@ -0,0 +1,183 @@
+<?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="40"
+   height="95"
+   version="1.1"
+   id="svg84">
+  <metadata
+     id="metadata90">
+    <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="defs88" />
+  <path
+     id="path4"
+     d="m 8,6.49985 h 8 V 7.6090008 H 8 Z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path8"
+     d="m 6,46.445298 h 10 v 1.109151 H 6 Z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path10"
+     d="m 8,56.43169 h 8 v 1.109151 H 8 Z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path12"
+     d="m 8,66.418082 h 8 v 1.109151 H 8 Z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path14"
+     d="m 8,76.404474 h 8 v 1.109151 H 8 Z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path22"
+     d="M 34,46.500404 H 24 V 47.5 h 10 z"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     id="path34"
+     d="m 8,86.390695 h 8 V 87.49985 H 8 Z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <g
+     transform="translate(0,-10)"
+     style="fill:#636363;stroke-width:0.99979782"
+     id="g44">
+    <path
+       style="color:#000000"
+       d="M 6,57.000404 H 16 V 58 H 6 Z"
+       id="path40" />
+    <path
+       style="color:#000000"
+       d="M 34,57.000404 H 24 V 58 h 10 z"
+       id="path42" />
+  </g>
+  <path
+     id="path48"
+     d="m 8,6.99985 h 8 V 8.1090008 H 8 Z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     id="path52"
+     d="m 8,56.93169 h 8 v 1.109151 H 8 Z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     id="path54"
+     d="m 8,66.917998 h 8 v 1.109151 H 8 Z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     id="path56"
+     d="m 8,76.904474 h 8 v 1.109151 H 8 Z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     id="path74"
+     d="m 8,86.890695 h 8 V 87.99985 H 8 Z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     id="path10-3"
+     d="m 8,16.486123 h 8 v 1.109151 H 8 Z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path12-6"
+     d="m 8,26.472515 h 8 v 1.109151 H 8 Z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path14-7"
+     d="m 8,36.458907 h 8 v 1.10915 H 8 Z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path52-6"
+     d="m 8,16.986123 h 8 v 1.109151 H 8 Z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     id="path54-2"
+     d="m 8,26.972431 h 8 v 1.10915 H 8 Z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     id="path56-9"
+     d="m 8,36.958907 h 8 v 1.10915 H 8 Z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     id="path4-1"
+     d="m 24,6.49985 h 8 v 1.1091508 h -8 z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path10-8"
+     d="m 24,56.43169 h 8 v 1.109151 h -8 z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path12-7"
+     d="m 24,66.418082 h 8 v 1.109151 h -8 z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path14-9"
+     d="m 24,76.404474 h 8 v 1.109151 h -8 z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path34-2"
+     d="m 24,86.390695 h 8 v 1.109155 h -8 z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path48-0"
+     d="m 24,6.99985 h 8 v 1.1091508 h -8 z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     id="path52-2"
+     d="m 24,56.93169 h 8 v 1.109151 h -8 z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     id="path54-3"
+     d="m 24,66.917998 h 8 v 1.109151 h -8 z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     id="path56-7"
+     d="m 24,76.904474 h 8 v 1.109151 h -8 z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     id="path74-5"
+     d="m 24,86.890695 h 8 v 1.109155 h -8 z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     id="path10-3-9"
+     d="m 24,16.486123 h 8 v 1.109151 h -8 z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path12-6-2"
+     d="m 24,26.472515 h 8 v 1.109151 h -8 z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path14-7-2"
+     d="m 24,36.458907 h 8 v 1.10915 h -8 z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path52-6-8"
+     d="m 24,16.986123 h 8 v 1.109151 h -8 z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     id="path54-2-9"
+     d="m 24,26.972431 h 8 v 1.10915 h -8 z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     id="path56-9-7"
+     d="m 24,36.958907 h 8 v 1.10915 h -8 z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99999994"
+     d="m 18,6 h 4 v 82 h -4 z"
+     id="path40-3" />
+  <path
+     d="m 17,89 h 6 V 5 h -6 z m 1,-1 V 6.000001 h 4 V 88 Z"
+     style="fill:#505050;paint-order:fill markers stroke"
+     id="path42-6" />
+</svg>
diff --git a/res/skins/LateNight/classic/sliders/slider_pitch_deck_compact_sync.svg b/res/skins/LateNight/classic/sliders/slider_pitch_deck_compact_sync.svg
new file mode 100644
index 000000000000..51f95dcc5fb6
--- /dev/null
+++ b/res/skins/LateNight/classic/sliders/slider_pitch_deck_compact_sync.svg
@@ -0,0 +1,183 @@
+<?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="svg84"
+   version="1.1"
+   height="79"
+   width="40">
+  <metadata
+     id="metadata90">
+    <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="defs88" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="m 8,6.5004044 h 8 v 0.999596 H 8 Z"
+     id="path4" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="M 6,38.500404 H 16 V 39.5 H 6 Z"
+     id="path8" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="m 8,46.500404 h 8 V 47.5 H 8 Z"
+     id="path10" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="m 8,54.500404 h 8 V 55.5 H 8 Z"
+     id="path12" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="m 8,62.500404 h 8 V 63.5 H 8 Z"
+     id="path14" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="M 34,38.500404 H 24 V 39.5 h 10 z"
+     id="path22" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="M 32,46.500404 H 24 V 47.5 h 8 z"
+     id="path24" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="M 32,54.500404 H 24 V 55.5 h 8 z"
+     id="path26" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="M 32,62.500404 H 24 V 63.5 h 8 z"
+     id="path28" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="m 8,70.500254 h 8 v 0.9996 H 8 Z"
+     id="path34" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="m 32,70.500254 h -8 v 0.9996 h 8 z"
+     id="path36" />
+  <g
+     id="g44"
+     style="fill:#636363;stroke-width:0.99979782"
+     transform="translate(0,-18.000072)">
+    <path
+       id="path40"
+       d="M 6,57.000404 H 16 V 58 H 6 Z"
+       style="color:#000000" />
+    <path
+       id="path42"
+       d="M 34,57.000404 H 24 V 58 h 10 z"
+       style="color:#000000" />
+  </g>
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="m 8,7.0004044 h 8 v 0.999596 H 8 Z"
+     id="path48" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="m 8,47.000312 h 8 v 0.999596 H 8 Z"
+     id="path52" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="m 8,55.000294 h 8 V 55.99989 H 8 Z"
+     id="path54" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="m 8,63.000276 h 8 v 0.999596 H 8 Z"
+     id="path56" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="M 32,47.000404 H 24 V 48 h 8 z"
+     id="path64" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="M 32,55.000404 H 24 V 56 h 8 z"
+     id="path66" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="M 32,63.000404 H 24 V 64 h 8 z"
+     id="path68" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="m 8,71.000254 h 8 v 0.9996 H 8 Z"
+     id="path74" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="m 32,71.000254 h -8 v 0.9996 h 8 z"
+     id="path76" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="m 8,14.500404 h 8 V 15.5 H 8 Z"
+     id="path10-3" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="m 8,22.50048 h 8 v 0.999596 H 8 Z"
+     id="path12-6" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="m 8,30.500404 h 8 V 31.5 H 8 Z"
+     id="path14-7" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="m 8,15.000385 h 8 v 0.999596 H 8 Z"
+     id="path52-6" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="m 8,23.000366 h 8 v 0.999596 H 8 Z"
+     id="path54-2" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="m 8,31.000351 h 8 v 0.999596 H 8 Z"
+     id="path56-9" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="m 24,6.5004044 h 8 v 0.999596 h -8 z"
+     id="path4-0" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="m 24,7.0004044 h 8 v 0.999596 h -8 z"
+     id="path48-9" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="m 24,14.500404 h 8 V 15.5 h -8 z"
+     id="path10-3-3" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="m 24,22.50048 h 8 v 0.999596 h -8 z"
+     id="path12-6-6" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="m 24,30.500404 h 8 V 31.5 h -8 z"
+     id="path14-7-0" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="m 24,15.000385 h 8 v 0.999596 h -8 z"
+     id="path52-6-6" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="m 24,23.000366 h 8 v 0.999596 h -8 z"
+     id="path54-2-2" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="m 24,31.000351 h 8 v 0.999596 h -8 z"
+     id="path56-9-6" />
+  <path
+     id="path40-3"
+     d="m 18,6 h 4 v 66 h -4 z"
+     style="color:#000000;fill:#050505;stroke-width:0.99999994" />
+  <path
+     id="path42-6"
+     style="fill:#505050;paint-order:fill markers stroke"
+     d="m 17,73 h 6 V 5 h -6 z m 1,-1 V 6.000001 h 4 V 72 Z" />
+</svg>
diff --git a/res/skins/LateNight/classic/sliders/slider_pitch_sampler.svg b/res/skins/LateNight/classic/sliders/slider_pitch_sampler.svg
new file mode 100644
index 000000000000..5a106dd38431
--- /dev/null
+++ b/res/skins/LateNight/classic/sliders/slider_pitch_sampler.svg
@@ -0,0 +1,158 @@
+<?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="svg70"
+   version="1.1"
+   height="65"
+   width="30">
+  <metadata
+     id="metadata76">
+    <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="defs74" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path4"
+     d="m 6,4.500412 h 6 V 5.500008 H 6 Z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path6"
+     d="m 6,13.500404 h 6 V 14.5 H 6 Z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path8"
+     d="m 4,31.500404 h 8 V 32.5 H 4 Z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path10"
+     d="m 6,22.500404 h 6 V 23.5 H 6 Z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path12"
+     d="m 6,40.500352 h 6 v 0.999596 H 6 Z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path14"
+     d="m 6,58.500254 h 6 V 59.49985 H 6 Z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path16"
+     d="m 6,49.500303 h 6 v 0.999596 H 6 Z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path18"
+     d="m 24,4.500412 h -6 v 0.999596 h 6 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path20"
+     d="M 24,13.500404 H 18 V 14.5 h 6 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path22"
+     d="M 26,31.500404 H 18 V 32.5 h 8 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path24"
+     d="M 24,22.500404 H 18 V 23.5 h 6 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path26"
+     d="m 24,40.500352 h -6 v 0.999596 h 6 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path28"
+     d="m 24,58.500254 h -6 v 0.999596 h 6 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path30"
+     d="m 24,49.500303 h -6 v 0.999596 h 6 z" />
+  <g
+     id="g42"
+     stroke-width=".99979782"
+     fill="#636363"
+     transform="translate(2)">
+    <path
+       id="path38"
+       color="#000000"
+       d="m2 32.000404h8v.999596h-8z" />
+    <path
+       id="path40"
+       color="#000000"
+       d="m24 32.000404h-8v.999596h8z" />
+  </g>
+  <g
+     id="g68"
+     stroke-width=".99979782"
+     fill="#404040"
+     transform="translate(2)">
+    <path
+       id="path44"
+       color="#000000"
+       d="m4 5.000412h6v.999596h-6z" />
+    <path
+       id="path46"
+       color="#000000"
+       d="m4 14.000404h6v.999596h-6z" />
+    <path
+       id="path48"
+       color="#000000"
+       d="m4 23.000404h6v.999596h-6z" />
+    <path
+       id="path50"
+       color="#000000"
+       d="m4 41.000352h6v.999596h-6z" />
+    <path
+       id="path52"
+       color="#000000"
+       d="m4 59.000254h6v.999596h-6z" />
+    <path
+       id="path54"
+       color="#000000"
+       d="m4 50.000303h6v.999596h-6z" />
+    <path
+       id="path56"
+       color="#000000"
+       d="m22 5.000412h-6v.999596h6z" />
+    <path
+       id="path58"
+       color="#000000"
+       d="m22 14.000404h-6v.999596h6z" />
+    <path
+       id="path60"
+       color="#000000"
+       d="m22 23.000404h-6v.999596h6z" />
+    <path
+       id="path62"
+       color="#000000"
+       d="m22 41.000352h-6v.999596h6z" />
+    <path
+       id="path64"
+       color="#000000"
+       d="m22 59.000254h-6v.999596h6z" />
+    <path
+       id="path66"
+       color="#000000"
+       d="m22 50.000303h-6v.999596h6z" />
+  </g>
+  <path
+     id="path2"
+     d="m 14,4.999999 h 2 V 60 h -2 z"
+     style="color:#000000;stroke-width:0.99999994" />
+  <path
+     id="path36"
+     style="fill:#505050;paint-order:fill markers stroke"
+     d="m 13,61 h 4 V 3.999999 h -4 z m 1,-1 V 5 h 2 v 55 z" />
+</svg>
diff --git a/res/skins/LateNight/classic/sliders/slider_volume_deck.svg b/res/skins/LateNight/classic/sliders/slider_volume_deck.svg
new file mode 100644
index 000000000000..09f5dc16b69c
--- /dev/null
+++ b/res/skins/LateNight/classic/sliders/slider_volume_deck.svg
@@ -0,0 +1,194 @@
+<?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="svg94"
+   version="1.1"
+   height="107"
+   width="42">
+  <metadata
+     id="metadata100">
+    <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="defs98" />
+  <path
+     d="m 9,57.500804 h 8 V 58.5004 H 9 Z"
+     id="path4"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 9,67.500956 h 8 v 0.999596 H 9 Z"
+     id="path6"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 9,77.500705 h 8 v 0.999596 H 9 Z"
+     id="path8"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 9,87.500454 h 8 V 88.50005 H 9 Z"
+     id="path10"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 9,17.499953 h 8 v 0.999596 H 9 Z"
+     id="path12"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 9,27.501559 h 8 v 0.999596 H 9 Z"
+     id="path14"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 9,37.501307 h 8 v 0.999596 H 9 Z"
+     id="path16"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 9,47.501055 h 8 v 0.999596 H 9 Z"
+     id="path18"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 8,7.500404 9,-2.025e-4 v 0.999596 L 8,8.5 Z"
+     id="path20"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 8,97.500405 9,-2.03e-4 v 0.999595 L 8,98.5 Z"
+     id="path22"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 25,57.500804 8,2.53e-4 v 0.999596 L 25,58.5004 Z"
+     id="path24"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 25,67.500956 8,2.53e-4 v 0.999596 l -8,-2.53e-4 z"
+     id="path26"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 25,77.500705 8,2.53e-4 v 0.999596 l -8,-2.53e-4 z"
+     id="path28"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 25,87.500454 8,2.52e-4 v 0.999596 l -8,-2.52e-4 z"
+     id="path30"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 25,17.499953 8,2.52e-4 v 0.999596 l -8,-2.52e-4 z"
+     id="path32"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 25,27.501559 8,2.53e-4 v 0.999596 l -8,-2.53e-4 z"
+     id="path34"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 25,37.501307 8,2.53e-4 v 0.999596 l -8,-2.53e-4 z"
+     id="path36"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 25,47.501055 8,2.53e-4 v 0.999596 l -8,-2.53e-4 z"
+     id="path38"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     id="path42"
+     d="m 9,58.000552 h 8 v 0.999596 H 9 Z" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     id="path44"
+     d="m 9,68.000704 h 8 V 69.0003 H 9 Z" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     id="path46"
+     d="m 9,78.000453 h 8 v 0.999596 H 9 Z" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     id="path48"
+     d="m 9,88.000202 h 8 v 0.999596 H 9 Z" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     id="path50"
+     d="m 9,17.999701 h 8 v 0.999596 H 9 Z" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     id="path52"
+     d="m 9,28.001307 h 8 v 0.999596 H 9 Z" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     id="path54"
+     d="m 9,38.001055 h 8 v 0.999596 H 9 Z" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     id="path56"
+     d="m 9,48.000803 h 8 v 0.999596 H 9 Z" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     id="path58"
+     d="m 25,58.000552 8,2.53e-4 v 0.999596 l -8,-2.53e-4 z" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     id="path60"
+     d="m 25,68.000704 8,2.03e-4 v 0.999596 L 25,69.0003 Z" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     id="path62"
+     d="m 25,78.000453 8,2.03e-4 v 0.999596 l -8,-2.03e-4 z" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     id="path64"
+     d="m 25,88.000202 8,2.02e-4 V 89 l -8,-2.02e-4 z" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     id="path66"
+     d="m 25,17.999701 8,2.02e-4 v 0.999596 l -8,-2.02e-4 z" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     id="path68"
+     d="m 25,28.001307 8,2.03e-4 v 0.999596 l -8,-2.03e-4 z" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     id="path70"
+     d="m 25,38.001055 8,2.03e-4 v 0.999596 l -8,-2.03e-4 z" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     id="path72"
+     d="m 25,48.000803 8,2.03e-4 v 0.999596 l -8,-2.03e-4 z" />
+  <path
+     d="m 25,7.4999495 9,2.525e-4 v 0.999596 l -9,-2.525e-4 z"
+     id="path76"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 25,97.49995 9,2.52e-4 v 0.999596 l -9,-2.53e-4 z"
+     id="path78"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 8,8.000404 9,-2.025e-4 v 0.999596 L 8,9 Z"
+     id="path84"
+     style="color:#000000;fill:#505050;stroke-width:0.99979782" />
+  <path
+     d="m 8,98.000405 9,-2.03e-4 v 0.999595 L 8,99 Z"
+     id="path86"
+     style="color:#000000;fill:#505050;stroke-width:0.99979782" />
+  <path
+     d="m 25,8.0002015 9,2.025e-4 V 9 l -9,-2.025e-4 z"
+     id="path88"
+     style="color:#000000;fill:#505050;stroke-width:0.99979788" />
+  <path
+     d="m 25,98.000202 9,2.02e-4 V 99 l -9,-2.03e-4 z"
+     id="path90"
+     style="color:#000000;fill:#505050;stroke-width:0.99979788" />
+  <path
+     id="path2"
+     d="m 19,8 h 4 v 91 h -4 z"
+     style="color:#000000;stroke-width:0.99999994" />
+  <path
+     id="path84-3"
+     style="paint-order:fill markers stroke;fill:#505050;fill-opacity:1"
+     d="m 18,100 h 6 V 7 h -6 z m 1,-0.999999 V 8.0000014 h 4 V 99.000001 Z" />
+</svg>
diff --git a/res/skins/LateNight/sliders_classic/slider_volume_previewdeck.svg b/res/skins/LateNight/classic/sliders/slider_volume_previewdeck.svg
similarity index 100%
rename from res/skins/LateNight/sliders_classic/slider_volume_previewdeck.svg
rename to res/skins/LateNight/classic/sliders/slider_volume_previewdeck.svg
diff --git a/res/skins/LateNight/style_classic/background_tile.png b/res/skins/LateNight/classic/style/background_tile.png
similarity index 100%
rename from res/skins/LateNight/style_classic/background_tile.png
rename to res/skins/LateNight/classic/style/background_tile.png
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_charged.svg b/res/skins/LateNight/classic/style/batt/ic_battery_charged.svg
similarity index 100%
rename from res/skins/LateNight/style_classic/batt/ic_battery_charged.svg
rename to res/skins/LateNight/classic/style/batt/ic_battery_charged.svg
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_charging_0.svg b/res/skins/LateNight/classic/style/batt/ic_battery_charging_0.svg
similarity index 100%
rename from res/skins/LateNight/style_classic/batt/ic_battery_charging_0.svg
rename to res/skins/LateNight/classic/style/batt/ic_battery_charging_0.svg
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_charging_1.svg b/res/skins/LateNight/classic/style/batt/ic_battery_charging_1.svg
similarity index 100%
rename from res/skins/LateNight/style_classic/batt/ic_battery_charging_1.svg
rename to res/skins/LateNight/classic/style/batt/ic_battery_charging_1.svg
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_charging_2.svg b/res/skins/LateNight/classic/style/batt/ic_battery_charging_2.svg
similarity index 100%
rename from res/skins/LateNight/style_classic/batt/ic_battery_charging_2.svg
rename to res/skins/LateNight/classic/style/batt/ic_battery_charging_2.svg
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_charging_3.svg b/res/skins/LateNight/classic/style/batt/ic_battery_charging_3.svg
similarity index 100%
rename from res/skins/LateNight/style_classic/batt/ic_battery_charging_3.svg
rename to res/skins/LateNight/classic/style/batt/ic_battery_charging_3.svg
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_charging_4.svg b/res/skins/LateNight/classic/style/batt/ic_battery_charging_4.svg
similarity index 100%
rename from res/skins/LateNight/style_classic/batt/ic_battery_charging_4.svg
rename to res/skins/LateNight/classic/style/batt/ic_battery_charging_4.svg
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_charging_5.svg b/res/skins/LateNight/classic/style/batt/ic_battery_charging_5.svg
similarity index 100%
rename from res/skins/LateNight/style_classic/batt/ic_battery_charging_5.svg
rename to res/skins/LateNight/classic/style/batt/ic_battery_charging_5.svg
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_charging_6.svg b/res/skins/LateNight/classic/style/batt/ic_battery_charging_6.svg
similarity index 100%
rename from res/skins/LateNight/style_classic/batt/ic_battery_charging_6.svg
rename to res/skins/LateNight/classic/style/batt/ic_battery_charging_6.svg
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_charging_7.svg b/res/skins/LateNight/classic/style/batt/ic_battery_charging_7.svg
similarity index 100%
rename from res/skins/LateNight/style_classic/batt/ic_battery_charging_7.svg
rename to res/skins/LateNight/classic/style/batt/ic_battery_charging_7.svg
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_discharging_0.svg b/res/skins/LateNight/classic/style/batt/ic_battery_discharging_0.svg
similarity index 100%
rename from res/skins/LateNight/style_classic/batt/ic_battery_discharging_0.svg
rename to res/skins/LateNight/classic/style/batt/ic_battery_discharging_0.svg
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_discharging_1.svg b/res/skins/LateNight/classic/style/batt/ic_battery_discharging_1.svg
similarity index 100%
rename from res/skins/LateNight/style_classic/batt/ic_battery_discharging_1.svg
rename to res/skins/LateNight/classic/style/batt/ic_battery_discharging_1.svg
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_discharging_2.svg b/res/skins/LateNight/classic/style/batt/ic_battery_discharging_2.svg
similarity index 100%
rename from res/skins/LateNight/style_classic/batt/ic_battery_discharging_2.svg
rename to res/skins/LateNight/classic/style/batt/ic_battery_discharging_2.svg
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_discharging_3.svg b/res/skins/LateNight/classic/style/batt/ic_battery_discharging_3.svg
similarity index 100%
rename from res/skins/LateNight/style_classic/batt/ic_battery_discharging_3.svg
rename to res/skins/LateNight/classic/style/batt/ic_battery_discharging_3.svg
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_discharging_4.svg b/res/skins/LateNight/classic/style/batt/ic_battery_discharging_4.svg
similarity index 100%
rename from res/skins/LateNight/style_classic/batt/ic_battery_discharging_4.svg
rename to res/skins/LateNight/classic/style/batt/ic_battery_discharging_4.svg
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_discharging_5.svg b/res/skins/LateNight/classic/style/batt/ic_battery_discharging_5.svg
similarity index 100%
rename from res/skins/LateNight/style_classic/batt/ic_battery_discharging_5.svg
rename to res/skins/LateNight/classic/style/batt/ic_battery_discharging_5.svg
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_discharging_6.svg b/res/skins/LateNight/classic/style/batt/ic_battery_discharging_6.svg
similarity index 100%
rename from res/skins/LateNight/style_classic/batt/ic_battery_discharging_6.svg
rename to res/skins/LateNight/classic/style/batt/ic_battery_discharging_6.svg
diff --git a/res/skins/LateNight/style_classic/batt/ic_battery_discharging_7.svg b/res/skins/LateNight/classic/style/batt/ic_battery_discharging_7.svg
similarity index 100%
rename from res/skins/LateNight/style_classic/batt/ic_battery_discharging_7.svg
rename to res/skins/LateNight/classic/style/batt/ic_battery_discharging_7.svg
diff --git a/res/skins/LateNight/classic/style/cover_default.svg b/res/skins/LateNight/classic/style/cover_default.svg
new file mode 100644
index 000000000000..83c29ac0b074
--- /dev/null
+++ b/res/skins/LateNight/classic/style/cover_default.svg
@@ -0,0 +1,70 @@
+<?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="444"
+   height="444"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="cover_default.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <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="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1056"
+     id="namedview10"
+     showgrid="false"
+     inkscape:zoom="1.5033982"
+     inkscape:cx="414.62105"
+     inkscape:cy="258.67775"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8" />
+  <rect
+     width="444"
+     height="444"
+     fill="#696969"
+     fill-opacity=".52156866"
+     opacity=".5"
+     stroke="#000"
+     stroke-linecap="round"
+     stroke-width="1.10000002"
+     style="paint-order:fill markers stroke;stroke:none"
+     id="rect2" />
+  <path
+     d="m222 124.28c-53.967 0-97.716 43.749-97.716 97.716s43.749 97.716 97.716 97.716 97.716-43.749 97.716-97.716-43.749-97.716-97.716-97.716z"
+     fill="#696969"
+     fill-opacity=".52020204"
+     id="path4" />
+  <path
+     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="#030303"
+     id="path6" />
+</svg>
diff --git a/res/skins/LateNight/classic/style/fx_separator.png b/res/skins/LateNight/classic/style/fx_separator.png
new file mode 100644
index 000000000000..1d357f983a57
Binary files /dev/null and b/res/skins/LateNight/classic/style/fx_separator.png differ
diff --git a/res/skins/LateNight/classic/style/latency_bg.png b/res/skins/LateNight/classic/style/latency_bg.png
new file mode 100644
index 000000000000..ed8a3cc9930f
Binary files /dev/null and b/res/skins/LateNight/classic/style/latency_bg.png differ
diff --git a/res/skins/LateNight/classic/style/latency_over.png b/res/skins/LateNight/classic/style/latency_over.png
new file mode 100644
index 000000000000..627bb5df17cd
Binary files /dev/null and b/res/skins/LateNight/classic/style/latency_over.png differ
diff --git a/res/skins/LateNight/style_classic/library_branch_closed_grey.png b/res/skins/LateNight/classic/style/library_branch_closed_grey.png
similarity index 100%
rename from res/skins/LateNight/style_classic/library_branch_closed_grey.png
rename to res/skins/LateNight/classic/style/library_branch_closed_grey.png
diff --git a/res/skins/LateNight/style_classic/library_branch_closed_selected_white.png b/res/skins/LateNight/classic/style/library_branch_closed_selected_white.png
similarity index 100%
rename from res/skins/LateNight/style_classic/library_branch_closed_selected_white.png
rename to res/skins/LateNight/classic/style/library_branch_closed_selected_white.png
diff --git a/res/skins/LateNight/style_classic/library_branch_open_grey.png b/res/skins/LateNight/classic/style/library_branch_open_grey.png
similarity index 100%
rename from res/skins/LateNight/style_classic/library_branch_open_grey.png
rename to res/skins/LateNight/classic/style/library_branch_open_grey.png
diff --git a/res/skins/LateNight/style_classic/library_branch_open_selected_white.png b/res/skins/LateNight/classic/style/library_branch_open_selected_white.png
similarity index 100%
rename from res/skins/LateNight/style_classic/library_branch_open_selected_white.png
rename to res/skins/LateNight/classic/style/library_branch_open_selected_white.png
diff --git a/res/skins/LateNight/classic/style/library_splitter_handle_unchecked.svg b/res/skins/LateNight/classic/style/library_splitter_handle_unchecked.svg
new file mode 100644
index 000000000000..9029ae064142
--- /dev/null
+++ b/res/skins/LateNight/classic/style/library_splitter_handle_unchecked.svg
@@ -0,0 +1,6 @@
+<svg width="6" height="60" version="1.1" viewBox="0 0 1.5875002 15.875002" xmlns="http://www.w3.org/2000/svg">
+		<path d="m1e-8.26458335h1.58750019l-1e-7 6.87916785-.2645833-.2645834-1.05833343 2e-7-.26458337.2645833z" fill="#1e1e1e" style="paint-order:fill markers stroke"/>
+		<path d="m0 0h1.5875002v.26458335h-1.5875002z" fill="#333" style="paint-order:fill markers stroke"/>
+		<path d="m.79375007 6.8791678c.39575673.0002726.79252633.3865376.79270843.7937501l.0006509.9260411h.265625l-.0006509-.9260411c-.0004143-.5894163-.487626-1.0624923-1.05833343-1.057422z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#0a0a0a" 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.7937501 6.8782565c-.3957567.0002725-.79242218.3865377-.7927084.7937501l-.0006509.9260411h-.26562503l.0006509-.9260411c.00041429-.5894163.48762603-1.0624923 1.05833343-1.057422z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#0a0a0a" 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"/>
+</svg>
diff --git a/res/skins/LateNight/style_classic/menu_arrow_gold.svg b/res/skins/LateNight/classic/style/menu_arrow_gold.svg
similarity index 100%
rename from res/skins/LateNight/style_classic/menu_arrow_gold.svg
rename to res/skins/LateNight/classic/style/menu_arrow_gold.svg
diff --git a/res/skins/LateNight/style_classic/menu_arrow_white.svg b/res/skins/LateNight/classic/style/menu_arrow_white.svg
similarity index 100%
rename from res/skins/LateNight/style_classic/menu_arrow_white.svg
rename to res/skins/LateNight/classic/style/menu_arrow_white.svg
diff --git a/res/skins/LateNight/style_classic/menu_arrow_yellow.svg b/res/skins/LateNight/classic/style/menu_arrow_yellow.svg
similarity index 100%
rename from res/skins/LateNight/style_classic/menu_arrow_yellow.svg
rename to res/skins/LateNight/classic/style/menu_arrow_yellow.svg
diff --git a/res/skins/LateNight/style_classic/mixxx_logo.svg b/res/skins/LateNight/classic/style/mixxx_logo.svg
similarity index 100%
rename from res/skins/LateNight/style_classic/mixxx_logo.svg
rename to res/skins/LateNight/classic/style/mixxx_logo.svg
diff --git a/res/skins/LateNight/classic/style/mixxx_logo_small.svg b/res/skins/LateNight/classic/style/mixxx_logo_small.svg
new file mode 100644
index 000000000000..7fe96eaf1b20
--- /dev/null
+++ b/res/skins/LateNight/classic/style/mixxx_logo_small.svg
@@ -0,0 +1,498 @@
+<?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="svg85"
+   version="1.1"
+   height="24"
+   width="74">
+  <metadata
+     id="metadata89">
+    <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="defs57">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.19912877,0,0,0.20002033,56.013392,3.0873529)"
+       y2="88.766998"
+       y1="-0.1462"
+       x2="13.486"
+       x1="74.992996"
+       id="g">
+      <stop
+         id="stop2"
+         offset=".478"
+         stop-color="#39b549" />
+      <stop
+         id="stop4"
+         offset="1"
+         stop-color="#1a76bc" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.19912877,0,0,0.20002033,31.636499,3.0873529)"
+       y2="88.766998"
+       y1="-0.15009999"
+       x2="13.488"
+       x1="74.998001"
+       id="f">
+      <stop
+         id="stop7"
+         offset="0"
+         stop-color="#381f1f" />
+      <stop
+         id="stop9"
+         offset=".0017"
+         stop-color="#3a1f20" />
+      <stop
+         id="stop11"
+         offset=".0376"
+         stop-color="#5b2825" />
+      <stop
+         id="stop13"
+         offset=".0757"
+         stop-color="#7c2f28" />
+      <stop
+         id="stop15"
+         offset=".1173"
+         stop-color="#9b2e28" />
+      <stop
+         id="stop17"
+         offset=".1626"
+         stop-color="#b62c28" />
+      <stop
+         id="stop19"
+         offset=".2129"
+         stop-color="#cc2626" />
+      <stop
+         id="stop21"
+         offset=".271"
+         stop-color="#dc2225" />
+      <stop
+         id="stop23"
+         offset=".3438"
+         stop-color="#e81f25" />
+      <stop
+         id="stop25"
+         offset=".478"
+         stop-color="#ed1b26" />
+      <stop
+         id="stop27"
+         offset="1"
+         stop-color="#f7921e" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.19912877,0,0,0.20002033,43.826283,3.0873529)"
+       y2="88.765999"
+       y1="-0.1471"
+       x2="13.485"
+       x1="74.991997"
+       id="e">
+      <stop
+         id="stop30"
+         offset="0"
+         stop-color="#120e1e" />
+      <stop
+         id="stop32"
+         offset=".0231"
+         stop-color="#1b1426" />
+      <stop
+         id="stop34"
+         offset=".1446"
+         stop-color="#442349" />
+      <stop
+         id="stop36"
+         offset=".2552"
+         stop-color="#652866" />
+      <stop
+         id="stop38"
+         offset=".3511"
+         stop-color="#7c287b" />
+      <stop
+         id="stop40"
+         offset=".4286"
+         stop-color="#8b2589" />
+      <stop
+         id="stop42"
+         offset=".478"
+         stop-color="#91268f" />
+      <stop
+         id="stop44"
+         offset="1"
+         stop-color="#ed1b26" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="89.146004"
+       y1="0.028000001"
+       x2="0"
+       id="a">
+      <stop
+         id="stop47"
+         offset="0"
+         stop-color="#ffd235" />
+      <stop
+         id="stop49"
+         offset="1"
+         stop-color="#feb30a" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4467,0,0,0.4487,65.950788,0.01288623)"
+       y2="89.146004"
+       y1="0.028000001"
+       x2="0"
+       id="d" />
+    <linearGradient
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4467,0,0,0.4487,93.288828,0.01288623)"
+       y2="89.146004"
+       y1="0.028000001"
+       x2="0"
+       id="c" />
+    <linearGradient
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4467,0,0,0.4487,120.63134,0.01288623)"
+       y2="89.146004"
+       y1="0.028000001"
+       x2="0"
+       id="b" />
+    <linearGradient
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4467,0,0,0.4487,51.508977,0.01288623)"
+       y2="89.146004"
+       y1="0.028000001"
+       x2="0"
+       id="i" />
+    <linearGradient
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4467,0,0,0.4487,0,0.01288623)"
+       y2="89.146004"
+       y1="0.028000001"
+       x2="0"
+       id="h" />
+    <linearGradient
+       xlink:href="#a-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4467,0,0,0.4487,65.950788,0.01288623)"
+       y2="89.146004"
+       y1="0.028000001"
+       x2="0"
+       id="d-3" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="89.146004"
+       y1="0.028000001"
+       x2="0"
+       id="a-6">
+      <stop
+         id="stop47-7"
+         offset="0"
+         stop-color="#ffd235" />
+      <stop
+         id="stop49-5"
+         offset="1"
+         stop-color="#feb30a" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#a-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4467,0,0,0.4487,93.288828,0.01288623)"
+       y2="89.146004"
+       y1="0.028000001"
+       x2="0"
+       id="c-3" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="89.146004"
+       y1="0.028000001"
+       x2="0"
+       id="linearGradient919">
+      <stop
+         id="stop915"
+         offset="0"
+         stop-color="#ffd235" />
+      <stop
+         id="stop917"
+         offset="1"
+         stop-color="#feb30a" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#a-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4467,0,0,0.4487,120.63134,0.01288623)"
+       y2="89.146004"
+       y1="0.028000001"
+       x2="0"
+       id="b-5" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="89.146004"
+       y1="0.028000001"
+       x2="0"
+       id="linearGradient926">
+      <stop
+         id="stop922"
+         offset="0"
+         stop-color="#ffd235" />
+      <stop
+         id="stop924"
+         offset="1"
+         stop-color="#feb30a" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#a-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4467,0,0,0.4487,51.508977,0.01288623)"
+       y2="89.146004"
+       y1="0.028000001"
+       x2="0"
+       id="i-6" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="89.146004"
+       y1="0.028000001"
+       x2="0"
+       id="linearGradient933">
+      <stop
+         id="stop929"
+         offset="0"
+         stop-color="#ffd235" />
+      <stop
+         id="stop931"
+         offset="1"
+         stop-color="#feb30a" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#a-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.4467,0,0,0.4487,0,0.01288623)"
+       y2="89.146004"
+       y1="0.028000001"
+       x2="0"
+       id="h-2" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="89.146004"
+       y1="0.028000001"
+       x2="0"
+       id="linearGradient940">
+      <stop
+         id="stop936"
+         offset="0"
+         stop-color="#ffd235" />
+      <stop
+         id="stop938"
+         offset="1"
+         stop-color="#feb30a" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.19912877,0,0,0.20002033,56.013392,3.0873525)"
+       y2="88.766998"
+       y1="-0.1462"
+       x2="13.486"
+       x1="74.992996"
+       id="g-3">
+      <stop
+         id="stop2-6"
+         offset=".478"
+         stop-color="#39b549" />
+      <stop
+         id="stop4-0"
+         offset="1"
+         stop-color="#1a76bc" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.19912877,0,0,0.20002033,31.636499,3.0873525)"
+       y2="88.766998"
+       y1="-0.15009999"
+       x2="13.488"
+       x1="74.998001"
+       id="f-6">
+      <stop
+         id="stop7-2"
+         offset="0"
+         stop-color="#381f1f" />
+      <stop
+         id="stop9-6"
+         offset=".0017"
+         stop-color="#3a1f20" />
+      <stop
+         id="stop11-1"
+         offset=".0376"
+         stop-color="#5b2825" />
+      <stop
+         id="stop13-8"
+         offset=".0757"
+         stop-color="#7c2f28" />
+      <stop
+         id="stop15-7"
+         offset=".1173"
+         stop-color="#9b2e28" />
+      <stop
+         id="stop17-9"
+         offset=".1626"
+         stop-color="#b62c28" />
+      <stop
+         id="stop19-2"
+         offset=".2129"
+         stop-color="#cc2626" />
+      <stop
+         id="stop21-0"
+         offset=".271"
+         stop-color="#dc2225" />
+      <stop
+         id="stop23-2"
+         offset=".3438"
+         stop-color="#e81f25" />
+      <stop
+         id="stop25-3"
+         offset=".478"
+         stop-color="#ed1b26" />
+      <stop
+         id="stop27-7"
+         offset="1"
+         stop-color="#f7921e" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.19912877,0,0,0.20002033,43.826283,3.0873525)"
+       y2="88.765999"
+       y1="-0.1471"
+       x2="13.485"
+       x1="74.991997"
+       id="e-5">
+      <stop
+         id="stop30-9"
+         offset="0"
+         stop-color="#120e1e" />
+      <stop
+         id="stop32-2"
+         offset=".0231"
+         stop-color="#1b1426" />
+      <stop
+         id="stop34-2"
+         offset=".1446"
+         stop-color="#442349" />
+      <stop
+         id="stop36-8"
+         offset=".2552"
+         stop-color="#652866" />
+      <stop
+         id="stop38-9"
+         offset=".3511"
+         stop-color="#7c287b" />
+      <stop
+         id="stop40-7"
+         offset=".4286"
+         stop-color="#8b2589" />
+      <stop
+         id="stop42-3"
+         offset=".478"
+         stop-color="#91268f" />
+      <stop
+         id="stop44-6"
+         offset="1"
+         stop-color="#ed1b26" />
+    </linearGradient>
+  </defs>
+  <g
+     style="fill:none;stroke:#0f0f0f;stroke-opacity:1;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+     id="g1121">
+    <path
+       d="M 54.77413,20.912646 66.942962,3.087344 h 5.378751 L 60.15511,20.912646 Z"
+       id="path59-1"
+       style="fill:none;stroke-width:1.5;stroke:#0f0f0f;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" />
+    <path
+       d="M 30.397238,20.912646 42.565178,3.087344 h 5.381871 L 35.780446,20.912646 Z"
+       id="path61-2"
+       style="fill:none;stroke-width:1.5;stroke:#0f0f0f;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" />
+    <path
+       d="M 42.587021,20.912646 54.755853,3.087344 H 60.13505 L 47.968001,20.912646 Z"
+       id="path63-9"
+       style="fill:none;stroke-width:1.5;stroke:#0f0f0f;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" />
+  </g>
+  <path
+     style="fill:url(#g);stroke-width:0.44577742"
+     id="path59"
+     d="M 54.77413,20.912646 66.942962,3.0873444 h 5.378751 L 60.15511,20.912646 Z" />
+  <path
+     style="fill:url(#f);stroke-width:0.44577742"
+     id="path61"
+     d="M 30.397238,20.912646 42.565178,3.0873444 h 5.381871 L 35.780446,20.912646 Z" />
+  <path
+     style="fill:url(#e);stroke-width:0.44577742"
+     id="path63"
+     d="M 42.587021,20.912646 54.755853,3.0873444 H 60.13505 L 47.968001,20.912646 Z" />
+  <g
+     style="fill:none;stroke:#0f0f0f;stroke-width:3.36490798;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;stroke-linejoin:round"
+     id="g83"
+     transform="matrix(0.44577742,0,0,0.44577742,1,3.0815493)">
+    <path
+       style="fill:none;stroke:#0f0f0f;stroke-width:3.36490798;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;stroke-linejoin:round"
+       id="path73"
+       d="M 105.31533,40.000133 78.021962,0.01288623 H 65.950788 L 93.242371,40.000133 Z" />
+    <path
+       style="fill:none;stroke:#0f0f0f;stroke-width:3.36490798;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;stroke-linejoin:round"
+       id="path75"
+       d="M 132.65784,40.000133 105.35956,0.01288623 H 93.288828 L 120.58666,40.000133 Z" />
+    <path
+       style="fill:none;stroke:#0f0f0f;stroke-width:3.36490798;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;stroke-linejoin:round"
+       id="path77"
+       d="M 160.0008,40.000133 132.70251,0.01288623 H 120.63134 L 147.92962,40.000133 Z" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#0f0f0f;stroke-width:3.36490798;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;stroke-linejoin:round"
+       id="path79"
+       d="M 51.508977,0.01288623 H 61.834448 V 40.000133 H 51.508977 Z" />
+    <path
+       style="fill:none;stroke:#0f0f0f;stroke-width:3.36490798;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;stroke-linejoin:round"
+       id="path81"
+       d="M 10.124456,40.000133 V 16.583377 l 13.077589,19.939331 h 0.26668 L 36.682111,16.380565 V 40.000133 H 46.942363 V 0.01288623 H 35.812386 L 23.468725,19.951768 11.131317,0.01288623 H 0 V 40.000133 Z" />
+  </g>
+  <g
+     id="g83-9"
+     transform="matrix(0.44577742,0,0,0.44577742,1,3.0815496)"
+     style="stroke-width:0.44769889">
+    <path
+       id="path73-1"
+       d="M 105.31533,40.000133 78.021962,0.01288623 H 65.950788 L 93.242371,40.000133 Z"
+       style="fill:url(#d-3)" />
+    <path
+       id="path75-2"
+       d="M 132.65784,40.000133 105.35956,0.01288623 H 93.288828 L 120.58666,40.000133 Z"
+       style="fill:url(#c-3)" />
+    <path
+       id="path77-7"
+       d="M 160.0008,40.000133 132.70251,0.01288623 H 120.63134 L 147.92962,40.000133 Z"
+       style="fill:url(#b-5)" />
+    <path
+       id="path79-0"
+       d="M 51.508977,0.01288623 H 61.834448 V 40.000133 H 51.508977 Z"
+       style="fill:url(#i-6);fill-rule:evenodd" />
+    <path
+       id="path81-9"
+       d="M 10.124456,40.000133 V 16.583377 l 13.077589,19.939331 h 0.26668 L 36.682111,16.380565 V 40.000133 H 46.942363 V 0.01288623 H 35.812386 L 23.468725,19.951768 11.131317,0.01288623 H 0 V 40.000133 Z"
+       style="fill:url(#h-2)" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/style_classic/progressbar.svg b/res/skins/LateNight/classic/style/progressbar.svg
similarity index 100%
rename from res/skins/LateNight/style_classic/progressbar.svg
rename to res/skins/LateNight/classic/style/progressbar.svg
diff --git a/res/skins/LateNight/style_classic/progressbar_bg.svg b/res/skins/LateNight/classic/style/progressbar_bg.svg
similarity index 100%
rename from res/skins/LateNight/style_classic/progressbar_bg.svg
rename to res/skins/LateNight/classic/style/progressbar_bg.svg
diff --git a/res/skins/LateNight/style_classic/spinny_bg.svg b/res/skins/LateNight/classic/style/spinny_bg.svg
similarity index 100%
rename from res/skins/LateNight/style_classic/spinny_bg.svg
rename to res/skins/LateNight/classic/style/spinny_bg.svg
diff --git a/res/skins/LateNight/classic/style/spinny_indicator.svg b/res/skins/LateNight/classic/style/spinny_indicator.svg
new file mode 100644
index 000000000000..03cd3fed2d61
--- /dev/null
+++ b/res/skins/LateNight/classic/style/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/classic/style/spinny_indicator_ghost.svg b/res/skins/LateNight/classic/style/spinny_indicator_ghost.svg
new file mode 100644
index 000000000000..9b587524ce5d
--- /dev/null
+++ b/res/skins/LateNight/classic/style/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/classic/style/spinny_mask_12.svg b/res/skins/LateNight/classic/style/spinny_mask_12.svg
new file mode 100644
index 000000000000..bb069c380a6f
--- /dev/null
+++ b/res/skins/LateNight/classic/style/spinny_mask_12.svg
@@ -0,0 +1,16 @@
+<svg width="100" height="100" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+		<defs>
+				<radialGradient id="c" 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>
+				<linearGradient id="b" x1="2.625" x2="97.375" y1="50" y2="50" gradientTransform="rotate(74.623253,50,50)" gradientUnits="userSpaceOnUse">
+						<stop offset="0"/>
+						<stop stop-color="#dedede" stop-opacity=".5714286" offset="1"/>
+				</linearGradient>
+		</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(#c)" opacity=".4"/>
+		<path d="m52.66891 49.99266a2.6685924 2.6685924 0 0 1-5.337121 0 2.6685924 2.6685924 0 1 1 5.337121 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="m62.429601 95.19702a46.875 46.875 0 0 1-24.859202-90.3940403 46.875 46.875 0 1 1 24.859202 90.3940403z" enable-background="new" fill="none" stroke="url(#b)" stroke-width=".69999999"/>
+</svg>
diff --git a/res/skins/LateNight/classic/style/spinny_mask_34.svg b/res/skins/LateNight/classic/style/spinny_mask_34.svg
new file mode 100644
index 000000000000..cb26d334d91a
--- /dev/null
+++ b/res/skins/LateNight/classic/style/spinny_mask_34.svg
@@ -0,0 +1,16 @@
+<svg width="100" height="100" enable-background="new" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+		<defs>
+				<linearGradient id="a" x1="2.625" x2="97.375" y1="50" y2="50" gradientTransform="rotate(74.623253,50,50)" gradientUnits="userSpaceOnUse">
+						<stop offset="0"/>
+						<stop stop-color="#dedede" stop-opacity=".5714286" offset="1"/>
+				</linearGradient>
+				<radialGradient id="b" cx="50.002998" cy="45.492001" 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.9135 20.9135 0 0 1-41.827 0 20.9135 20.9135 0 1 1 41.827 0z" fill="url(#b)" opacity=".4"/>
+		<path d="m52.66891 49.99266a2.6685924 2.6685924 0 0 1-5.337121 0 2.6685924 2.6685924 0 1 1 5.337121 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="m62.429601 95.19702a46.875 46.875 0 0 1-24.859202-90.3940403 46.875 46.875 0 1 1 24.859202 90.3940403z" enable-background="new" fill="none" stroke="url(#a)" stroke-width=".69999999"/>
+</svg>
diff --git a/res/skins/LateNight/style_classic/splitter_handle_horizontal_checked.png b/res/skins/LateNight/classic/style/splitter_handle_horizontal_checked.png
similarity index 100%
rename from res/skins/LateNight/style_classic/splitter_handle_horizontal_checked.png
rename to res/skins/LateNight/classic/style/splitter_handle_horizontal_checked.png
diff --git a/res/skins/LateNight/style_classic/splitter_handle_horizontal_unchecked.png b/res/skins/LateNight/classic/style/splitter_handle_horizontal_unchecked.png
similarity index 100%
rename from res/skins/LateNight/style_classic/splitter_handle_horizontal_unchecked.png
rename to res/skins/LateNight/classic/style/splitter_handle_horizontal_unchecked.png
diff --git a/res/skins/LateNight/classic/style/splitter_handle_vertical_checked.png b/res/skins/LateNight/classic/style/splitter_handle_vertical_checked.png
new file mode 100644
index 000000000000..0c0af2be814b
Binary files /dev/null and b/res/skins/LateNight/classic/style/splitter_handle_vertical_checked.png differ
diff --git a/res/skins/LateNight/classic/style/splitter_handle_vertical_unchecked.png b/res/skins/LateNight/classic/style/splitter_handle_vertical_unchecked.png
new file mode 100644
index 000000000000..0741fc82196b
Binary files /dev/null and b/res/skins/LateNight/classic/style/splitter_handle_vertical_unchecked.png differ
diff --git a/res/skins/LateNight/style_classic/toolbar_separator.png b/res/skins/LateNight/classic/style/toolbar_separator.png
similarity index 100%
rename from res/skins/LateNight/style_classic/toolbar_separator.png
rename to res/skins/LateNight/classic/style/toolbar_separator.png
diff --git a/res/skins/LateNight/style_classic/vinyl_control_0.svg b/res/skins/LateNight/classic/style/vinyl_control_0.svg
similarity index 100%
rename from res/skins/LateNight/style_classic/vinyl_control_0.svg
rename to res/skins/LateNight/classic/style/vinyl_control_0.svg
diff --git a/res/skins/LateNight/style_classic/vinyl_control_1.svg b/res/skins/LateNight/classic/style/vinyl_control_1.svg
similarity index 100%
rename from res/skins/LateNight/style_classic/vinyl_control_1.svg
rename to res/skins/LateNight/classic/style/vinyl_control_1.svg
diff --git a/res/skins/LateNight/style_classic/vinyl_control_2.svg b/res/skins/LateNight/classic/style/vinyl_control_2.svg
similarity index 100%
rename from res/skins/LateNight/style_classic/vinyl_control_2.svg
rename to res/skins/LateNight/classic/style/vinyl_control_2.svg
diff --git a/res/skins/LateNight/style_classic/vinyl_control_3.svg b/res/skins/LateNight/classic/style/vinyl_control_3.svg
similarity index 100%
rename from res/skins/LateNight/style_classic/vinyl_control_3.svg
rename to res/skins/LateNight/classic/style/vinyl_control_3.svg
diff --git a/res/skins/LateNight/style_classic/vu_clipping_deck_over.png b/res/skins/LateNight/classic/style/vu_deck_clipping_active.png
similarity index 100%
rename from res/skins/LateNight/style_classic/vu_clipping_deck_over.png
rename to res/skins/LateNight/classic/style/vu_deck_clipping_active.png
diff --git a/res/skins/LateNight/style_classic/vu_clipping_deck.png b/res/skins/LateNight/classic/style/vu_deck_clipping_bg_dark.png
similarity index 100%
rename from res/skins/LateNight/style_classic/vu_clipping_deck.png
rename to res/skins/LateNight/classic/style/vu_deck_clipping_bg_dark.png
diff --git a/res/skins/LateNight/classic/style/vu_deck_clipping_bg_light.png b/res/skins/LateNight/classic/style/vu_deck_clipping_bg_light.png
new file mode 100644
index 000000000000..8fcc46594fde
Binary files /dev/null and b/res/skins/LateNight/classic/style/vu_deck_clipping_bg_light.png differ
diff --git a/res/skins/LateNight/style_classic/vu_level_deck_over.png b/res/skins/LateNight/classic/style/vu_deck_level_active.png
similarity index 100%
rename from res/skins/LateNight/style_classic/vu_level_deck_over.png
rename to res/skins/LateNight/classic/style/vu_deck_level_active.png
diff --git a/res/skins/LateNight/style_classic/vu_level_deck.png b/res/skins/LateNight/classic/style/vu_deck_level_bg_dark.png
similarity index 100%
rename from res/skins/LateNight/style_classic/vu_level_deck.png
rename to res/skins/LateNight/classic/style/vu_deck_level_bg_dark.png
diff --git a/res/skins/LateNight/classic/style/vu_deck_level_bg_light.png b/res/skins/LateNight/classic/style/vu_deck_level_bg_light.png
new file mode 100644
index 000000000000..11525c68755b
Binary files /dev/null and b/res/skins/LateNight/classic/style/vu_deck_level_bg_light.png differ
diff --git a/res/skins/LateNight/style_classic/vu_clipping_small_over.png b/res/skins/LateNight/classic/style/vu_micaux_clipping_active.png
similarity index 100%
rename from res/skins/LateNight/style_classic/vu_clipping_small_over.png
rename to res/skins/LateNight/classic/style/vu_micaux_clipping_active.png
diff --git a/res/skins/LateNight/style_classic/vu_clipping_small.png b/res/skins/LateNight/classic/style/vu_micaux_clipping_bg_.png
similarity index 100%
rename from res/skins/LateNight/style_classic/vu_clipping_small.png
rename to res/skins/LateNight/classic/style/vu_micaux_clipping_bg_.png
diff --git a/res/skins/LateNight/style_classic/vu_level_small_over.png b/res/skins/LateNight/classic/style/vu_micaux_level_active.png
similarity index 100%
rename from res/skins/LateNight/style_classic/vu_level_small_over.png
rename to res/skins/LateNight/classic/style/vu_micaux_level_active.png
diff --git a/res/skins/LateNight/style_classic/vu_level_small.png b/res/skins/LateNight/classic/style/vu_micaux_level_bg_.png
similarity index 100%
rename from res/skins/LateNight/style_classic/vu_level_small.png
rename to res/skins/LateNight/classic/style/vu_micaux_level_bg_.png
diff --git a/res/skins/LateNight/style_flip/vu_clipping_small_over.png b/res/skins/LateNight/classic/style/vu_preview_clipping_active.png
similarity index 100%
rename from res/skins/LateNight/style_flip/vu_clipping_small_over.png
rename to res/skins/LateNight/classic/style/vu_preview_clipping_active.png
diff --git a/res/skins/LateNight/classic/style/vu_preview_clipping_bg_.png b/res/skins/LateNight/classic/style/vu_preview_clipping_bg_.png
new file mode 100644
index 000000000000..96ff63a574fe
Binary files /dev/null and b/res/skins/LateNight/classic/style/vu_preview_clipping_bg_.png differ
diff --git a/res/skins/LateNight/style_flip/vu_level_small_over.png b/res/skins/LateNight/classic/style/vu_preview_level_active.png
similarity index 100%
rename from res/skins/LateNight/style_flip/vu_level_small_over.png
rename to res/skins/LateNight/classic/style/vu_preview_level_active.png
diff --git a/res/skins/LateNight/classic/style/vu_preview_level_bg_.png b/res/skins/LateNight/classic/style/vu_preview_level_bg_.png
new file mode 100644
index 000000000000..9debcde43007
Binary files /dev/null and b/res/skins/LateNight/classic/style/vu_preview_level_bg_.png differ
diff --git a/res/skins/LateNight/classic/style/vu_sampler_clipping_active.png b/res/skins/LateNight/classic/style/vu_sampler_clipping_active.png
new file mode 100644
index 000000000000..94442d3066a5
Binary files /dev/null and b/res/skins/LateNight/classic/style/vu_sampler_clipping_active.png differ
diff --git a/res/skins/LateNight/classic/style/vu_sampler_clipping_bg_.png b/res/skins/LateNight/classic/style/vu_sampler_clipping_bg_.png
new file mode 100644
index 000000000000..96ff63a574fe
Binary files /dev/null and b/res/skins/LateNight/classic/style/vu_sampler_clipping_bg_.png differ
diff --git a/res/skins/LateNight/classic/style/vu_sampler_level_active.png b/res/skins/LateNight/classic/style/vu_sampler_level_active.png
new file mode 100644
index 000000000000..cca10939a1de
Binary files /dev/null and b/res/skins/LateNight/classic/style/vu_sampler_level_active.png differ
diff --git a/res/skins/LateNight/classic/style/vu_sampler_level_bg_.png b/res/skins/LateNight/classic/style/vu_sampler_level_bg_.png
new file mode 100644
index 000000000000..cbcbebbaff9b
Binary files /dev/null and b/res/skins/LateNight/classic/style/vu_sampler_level_bg_.png differ
diff --git a/res/skins/LateNight/classic/template__fx_focus_.svg b/res/skins/LateNight/classic/template__fx_focus_.svg
new file mode 100644
index 000000000000..b9f8b89ab4f0
--- /dev/null
+++ b/res/skins/LateNight/classic/template__fx_focus_.svg
@@ -0,0 +1,137 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="18"
+   height="18"
+   version="1.1"
+   id="svg32"
+   sodipodi:docname="template__fx_focus_.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <metadata
+     id="metadata38">
+    <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="defs36">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1005">
+      <stop
+         style="stop-color:#d08e00;stop-opacity:1"
+         offset="0"
+         id="stop1001" />
+      <stop
+         style="stop-color:#8f6200;stop-opacity:1"
+         offset="1"
+         id="stop1003" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1005"
+       id="linearGradient1007-3"
+       x1="7.0999489"
+       y1="2.9420629"
+       x2="11.423175"
+       y2="16.269526"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.82536346,0,0,0.82536346,1.5717289,1.5717289)" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1056"
+     id="namedview34"
+     showgrid="true"
+     inkscape:zoom="9.8333333"
+     inkscape:cx="43.861204"
+     inkscape:cy="10.18401"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg32">
+    <inkscape:grid
+       type="xygrid"
+       id="grid867" />
+  </sodipodi:namedview>
+  <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:#d08e00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99542123;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 20,0 V 18 H 38 V 0 Z m 1,1 H 37 V 17 H 21 Z"
+     id="rect869"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccccc" />
+  <path
+     style="fill:#d08e00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 41,9 4,-4 v 3 h 7 v 2 h -7 v 3 z"
+     id="path959"
+     inkscape:connector-curvature="0" />
+  <circle
+     style="opacity:1;fill:#0f0f0f;fill-opacity:1;stroke:#666666;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path1001"
+     cx="9"
+     cy="9"
+     r="7" />
+  <circle
+     style="opacity:1;fill:url(#linearGradient1007-3);fill-opacity:1;stroke:none;stroke-width:0.82536346;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path1001-5"
+     cx="9"
+     cy="9"
+     r="5.777544" />
+  <path
+     style="fill:#b9b9b9;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 20,-12 h 1 v -7 h 7 v -1 h -8 z"
+     id="path837"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccc" />
+  <path
+     style="fill:#b9b9b9;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 38,-12 h -1 v -7 h -7 v -1 h 8 z"
+     id="path837-3"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccc" />
+  <path
+     style="fill:#b9b9b9;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 20,-10 h 1 v 7 h 7 v 1 h -8 z"
+     id="path837-6"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccc" />
+  <path
+     style="fill:#b9b9b9;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 38,-10 h -1 v 7 h -7 v 1 h 8 z"
+     id="path837-3-7"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccc" />
+  <path
+     style="fill:#888888;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 41,-11 8,-5 v 4 h 7 v 2 h -7 v 4 z"
+     id="path959-3"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccc" />
+  <circle
+     style="opacity:1;fill:#151515;fill-opacity:1;stroke:#666666;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path1001-56"
+     cx="9"
+     cy="-11"
+     r="7" />
+</svg>
diff --git a/res/skins/LateNight/button_1state.xml b/res/skins/LateNight/controls/button_1state.xml
similarity index 76%
rename from res/skins/LateNight/button_1state.xml
rename to res/skins/LateNight/controls/button_1state.xml
index cd6660584f02..b8c4de525b65 100644
--- a/res/skins/LateNight/button_1state.xml
+++ b/res/skins/LateNight/controls/button_1state.xml
@@ -22,8 +22,8 @@ Variables:
       <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"/>_<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>
+      <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Pressed>
     </State>
     <Connection>
       <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
diff --git a/res/skins/LateNight/button_1state_right.xml b/res/skins/LateNight/controls/button_1state_right.xml
similarity index 80%
rename from res/skins/LateNight/button_1state_right.xml
rename to res/skins/LateNight/controls/button_1state_right.xml
index 0ac0335ef159..78de2bc80580 100644
--- a/res/skins/LateNight/button_1state_right.xml
+++ b/res/skins/LateNight/controls/button_1state_right.xml
@@ -24,8 +24,8 @@ Variables:
       <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"/>_<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>
+      <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Pressed>
     </State>
     <Connection>
       <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
diff --git a/res/skins/LateNight/controls/button_2state.xml b/res/skins/LateNight/controls/button_2state.xml
new file mode 100644
index 000000000000..a46ba27e08c9
--- /dev/null
+++ b/res/skins/LateNight/controls/button_2state.xml
@@ -0,0 +1,41 @@
+<!--
+Description:
+  A button that has click or display controls.
+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>
+      <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Pressed>
+    </State>
+    <State>
+      <Number>1</Number>
+      <Text><Variable name="state_1_text"/></Text>
+      <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Pressed>
+    </State>
+    <Connection>
+      <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
+      <ButtonState>LeftButton</ButtonState>
+    </Connection>
+  </PushButton>
+</Template>
diff --git a/res/skins/LateNight/controls/button_2state_persist.xml b/res/skins/LateNight/controls/button_2state_persist.xml
new file mode 100644
index 000000000000..13afad421360
--- /dev/null
+++ b/res/skins/LateNight/controls/button_2state_persist.xml
@@ -0,0 +1,41 @@
+<!--
+Description:
+  A button that has click or display controls.
+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>
+      <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_pressed.svg</Pressed>
+    </State>
+    <State>
+      <Number>1</Number>
+      <Text><Variable name="state_1_text"/></Text>
+      <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_pressed.svg</Pressed>
+    </State>
+    <Connection>
+      <ConfigKey persist="true"><Variable name="ConfigKey"/></ConfigKey>
+      <ButtonState>LeftButton</ButtonState>
+    </Connection>
+  </PushButton>
+</Template>
diff --git a/res/skins/LateNight/controls/button_2state_right.xml b/res/skins/LateNight/controls/button_2state_right.xml
new file mode 100644
index 000000000000..894e67a7febf
--- /dev/null
+++ b/res/skins/LateNight/controls/button_2state_right.xml
@@ -0,0 +1,46 @@
+<!--
+Description:
+  A button that has click or display controls.
+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
+  ConfigKeyRight    : right-click control
+-->
+<Template>
+  <PushButton>
+    <TooltipId><Variable name="TooltipId"/></TooltipId>
+    <ObjectName><Variable name="ObjectName"/></ObjectName>
+    <Size><Variable name="Size"/></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:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Pressed>
+    </State>
+    <State>
+      <Number>1</Number>
+      <Text><Variable name="state_1_text"/></Text>
+      <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Pressed>
+    </State>
+    <Connection>
+      <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
+      <ButtonState>LeftButton</ButtonState>
+    </Connection>
+    <Connection>
+      <ConfigKey><Variable name="ConfigKeyRight"/></ConfigKey>
+      <ButtonState>RightButton</ButtonState>
+    </Connection>
+  </PushButton>
+</Template>
diff --git a/res/skins/LateNight/controls/button_2state_right_display.xml b/res/skins/LateNight/controls/button_2state_right_display.xml
new file mode 100644
index 000000000000..76fbfaa5ea02
--- /dev/null
+++ b/res/skins/LateNight/controls/button_2state_right_display.xml
@@ -0,0 +1,51 @@
+<!--
+Description:
+  A button that has click or display controls.
+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
+  ConfigKeyRight    : right-click control
+  ConfigKeyDisp     : display control
+-->
+<Template>
+  <PushButton>
+    <TooltipId><Variable name="TooltipId"/></TooltipId>
+    <ObjectName><Variable name="ObjectName"/></ObjectName>
+    <Size><Variable name="Size"/></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:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Pressed>
+    </State>
+    <State>
+      <Number>1</Number>
+      <Text><Variable name="state_1_text"/></Text>
+      <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Pressed>
+    </State>
+    <Connection>
+      <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
+      <ButtonState>LeftButton</ButtonState>
+    </Connection>
+    <Connection>
+      <ConfigKey><Variable name="ConfigKeyRight"/></ConfigKey>
+      <ButtonState>RightButton</ButtonState>
+    </Connection>
+    <Connection>
+      <ConfigKey><Variable name="ConfigKeyDisp"/></ConfigKey>
+      <ConnectValueFromWidget>false</ConnectValueFromWidget>
+    </Connection>
+  </PushButton>
+</Template>
diff --git a/res/skins/LateNight/controls/button_3state.xml b/res/skins/LateNight/controls/button_3state.xml
new file mode 100644
index 000000000000..3c4cc6612284
--- /dev/null
+++ b/res/skins/LateNight/controls/button_3state.xml
@@ -0,0 +1,49 @@
+<!--
+Description:
+  A button that has click or display controls.
+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
+  ConfigKeyDisp     : display control
+-->
+<Template>
+  <PushButton>
+    <TooltipId><Variable name="TooltipId"/></TooltipId>
+    <ObjectName><Variable name="ObjectName"/></ObjectName>
+    <Size><Variable name="Size"/></Size>
+    <NumberStates>3</NumberStates>
+    <State>
+      <Number>0</Number>
+      <Text><Variable name="state_0_text"/></Text>
+      <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Pressed>
+    </State>
+    <State>
+      <Number>1</Number>
+      <Text><Variable name="state_1_text"/></Text>
+      <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Pressed>
+    </State>
+    <State>
+      <Number>2</Number>
+      <Text><Variable name="state_2_text"/></Text>
+      <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Pressed>
+    </State>
+    <Connection>
+      <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
+      <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+      <ButtonState>LeftButton</ButtonState>
+    </Connection>
+  </PushButton>
+</Template>
diff --git a/res/skins/LateNight/controls/button_3state_display.xml b/res/skins/LateNight/controls/button_3state_display.xml
new file mode 100644
index 000000000000..3fc21d2c896f
--- /dev/null
+++ b/res/skins/LateNight/controls/button_3state_display.xml
@@ -0,0 +1,53 @@
+<!--
+Description:
+  A button that has click or display controls.
+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
+  ConfigKeyDisp     : display control
+-->
+<Template>
+  <PushButton>
+    <TooltipId><Variable name="TooltipId"/></TooltipId>
+    <ObjectName><Variable name="ObjectName"/></ObjectName>
+    <Size><Variable name="Size"/></Size>
+    <NumberStates>3</NumberStates>
+    <State>
+      <Number>0</Number>
+      <Text><Variable name="state_0_text"/></Text>
+      <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Pressed>
+    </State>
+    <State>
+      <Number>1</Number>
+      <Text><Variable name="state_1_text"/></Text>
+      <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Pressed>
+    </State>
+    <State>
+      <Number>2</Number>
+      <Text><Variable name="state_2_text"/></Text>
+      <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Pressed>
+    </State>
+    <Connection>
+      <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
+      <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+      <ButtonState>LeftButton</ButtonState>
+    </Connection>
+    <Connection>
+      <ConfigKey><Variable name="ConfigKeyDisp"/></ConfigKey>
+      <ConnectValueFromWidget>false</ConnectValueFromWidget>
+    </Connection>
+  </PushButton>
+</Template>
diff --git a/res/skins/LateNight/controls/button_3state_persist.xml b/res/skins/LateNight/controls/button_3state_persist.xml
new file mode 100644
index 000000000000..0960b485e664
--- /dev/null
+++ b/res/skins/LateNight/controls/button_3state_persist.xml
@@ -0,0 +1,48 @@
+<!--
+Description:
+  A button that has click or display controls.
+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
+  ConfigKeyDisp     : display control
+-->
+<Template>
+  <PushButton>
+    <TooltipId><Variable name="TooltipId"/></TooltipId>
+    <ObjectName><Variable name="ObjectName"/></ObjectName>
+    <Size><Variable name="Size"/></Size>
+    <NumberStates>3</NumberStates>
+    <State>
+      <Number>0</Number>
+      <Text><Variable name="state_0_text"/></Text>
+      <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Pressed>
+    </State>
+    <State>
+      <Number>1</Number>
+      <Text><Variable name="state_1_text"/></Text>
+      <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Pressed>
+    </State>
+    <State>
+      <Number>2</Number>
+      <Text><Variable name="state_2_text"/></Text>
+      <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Pressed>
+    </State>
+    <Connection>
+      <ConfigKey persist="true"><Variable name="ConfigKey"/></ConfigKey>
+      <ButtonState>LeftButton</ButtonState>
+    </Connection>
+  </PushButton>
+</Template>
diff --git a/res/skins/LateNight/controls/button_5state.xml b/res/skins/LateNight/controls/button_5state.xml
new file mode 100644
index 000000000000..35ff006158b5
--- /dev/null
+++ b/res/skins/LateNight/controls/button_5state.xml
@@ -0,0 +1,63 @@
+<!--
+Description:
+  A button that has click or display controls.
+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>5</NumberStates>
+    <RightClickIsPushButton>true</RightClickIsPushButton>
+    <State>
+      <Number>0</Number>
+      <Text><Variable name="state_0_text"/></Text>
+      <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Pressed>
+    </State>
+    <State>
+      <Number>1</Number>
+      <Text><Variable name="state_1_text"/></Text>
+      <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Pressed>
+    </State>
+    <State>
+      <Number>2</Number>
+      <Text><Variable name="state_2_text"/></Text>
+      <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Pressed>
+    </State>
+    <State>
+      <Number>3</Number>
+      <Text><Variable name="state_3_text"/></Text>
+      <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Pressed>
+    </State>
+    <State>
+      <Number>4</Number>
+      <Text><Variable name="state_4_text"/></Text>
+      <Alignment><Variable name="Align"/></Alignment>
+      <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_<Variable name="BtnSize"/>_active.svg</Pressed>
+    </State>
+    <Connection>
+      <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
+      <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+      <ButtonState>LeftButton</ButtonState>
+    </Connection>
+  </PushButton>
+</Template>
diff --git a/res/skins/LateNight/controls/button_hotcue.xml b/res/skins/LateNight/controls/button_hotcue.xml
new file mode 100644
index 000000000000..fe8d3163823b
--- /dev/null
+++ b/res/skins/LateNight/controls/button_hotcue.xml
@@ -0,0 +1,32 @@
+<!-- A hotcue button. The only variable that needs to be specified is "number" -->
+<Template>
+  <WidgetGroup>
+    <ObjectName>Hotcue<Variable name="number"/></ObjectName>
+    <MinimumSize>26,26</MinimumSize>
+    <MaximumSize>26,26</MaximumSize>
+    <SizePolicy>me,f</SizePolicy>
+    <Layout>horizontal</Layout>
+    <Children>
+      <HotcueButton>
+        <TooltipId>hotcue</TooltipId>
+        <ObjectName>HotcueButton</ObjectName>
+        <MinimumSize>26,26</MinimumSize>
+        <MaximumSize>26,26</MaximumSize>
+        <SizePolicy>me,f</SizePolicy>
+        <Group><Variable name="Group"/></Group>
+        <Hotcue><Variable name="number"/></Hotcue>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_square.svg</Unpressed>
+          <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_square_active.svg</Pressed>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_square_set.svg</Unpressed>
+          <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_square_active.svg</Pressed>
+        </State>
+      </HotcueButton>
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/controls/button_hotcue_inlne_style.xml b/res/skins/LateNight/controls/button_hotcue_inlne_style.xml
new file mode 100644
index 000000000000..f9ec442e5baa
--- /dev/null
+++ b/res/skins/LateNight/controls/button_hotcue_inlne_style.xml
@@ -0,0 +1,81 @@
+<!-- ToDo (ronso0)
+      make inline <Style> accept <Variable> -->
+<!-- A hotcue button. The only variable that needs to be specified is "number" -->
+<Template>
+
+  <WidgetGroup>
+    <MinimumSize>26,26</MinimumSize>
+    <MaximumSize>26,26</MaximumSize>
+    <SizePolicy>me,f</SizePolicy>
+    <Layout>horizontal</Layout>
+    <Style>
+      #HotcueButton[displayValue="0"] {
+        image: url(skin:/palemoon/buttons/btn__<Variable name="number"/>.svg) no-repeat center center;
+      }
+      #HotcueButton[displayValue="1"] {
+        image: url(skin:/<Variable name="BtnScheme"/>/buttons/btn__1_active.svg) no-repeat center center;
+      }
+    </Style>
+    <Children>
+      <HotcueButton>
+        <TooltipId>hotcue</TooltipId>
+        <ObjectName>HotcueButton</ObjectName>
+        <MinimumSize>26,26</MinimumSize>
+        <MaximumSize>26,26</MaximumSize>
+        <SizePolicy>me,f</SizePolicy>
+        <Group><Variable name="Group"/></Group>
+        <Hotcue><Variable name="number"/></Hotcue>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_square.svg</Unpressed>
+          <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_square_active.svg</Pressed>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_square_set.svg</Unpressed>
+          <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_square_active.svg</Pressed>
+        </State>
+      </HotcueButton>
+    </Children>
+  </WidgetGroup>
+
+    <!--SetVariable name="bttnn">skin:/<Variable name="BtnScheme"/>/buttons/btn__<Variable name="number"/>.svg</SetVariable>
+  <WidgetGroup>
+    <Style>
+      #HotcueButton[displayValue="0"] {
+        image: url(<Variable name="bttnn"/>) no-repeat center center;
+      }
+      #HotcueButton[displayValue="1"] {
+        image: url(skin:/<Variable name="BtnScheme"/>/buttons/btn__1_active.svg) no-repeat center center;
+      }
+    </Style>
+    <MinimumSize>260,26</MinimumSize>
+    <MaximumSize>260,26</MaximumSize>
+    <SizePolicy>me,f</SizePolicy>
+    <Layout>horizontal</Layout>
+    <Children>
+      <HotcueButton>
+        <TooltipId>hotcue</TooltipId>
+        <ObjectName>HotcueButton</ObjectName>
+        <MinimumSize>260,26</MinimumSize>
+        <MaximumSize>260,26</MaximumSize>
+        <SizePolicy>me,f</SizePolicy>
+        <Group><Variable name="Group"/></Group>
+        <Hotcue><Variable name="number"/></Hotcue>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_square.svg</Unpressed>
+          <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_square_active.svg</Pressed>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_square_set.svg</Unpressed>
+          <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_square_active.svg</Pressed>
+          <Text><Variable name="bttnn"/></Text>
+        </State>
+      </HotcueButton>
+    </Children>
+  </WidgetGroup-->
+</Template>
diff --git a/res/skins/LateNight/controls/button_special_cue.xml b/res/skins/LateNight/controls/button_special_cue.xml
new file mode 100644
index 000000000000..f5d0e9c355c4
--- /dev/null
+++ b/res/skins/LateNight/controls/button_special_cue.xml
@@ -0,0 +1,49 @@
+<!--
+Description:
+  A special cue button to mark intro and outro sections in a track
+Variables:
+  group: The group for the controls.
+  cue_type: Prefix for COs.
+  label: Button text.
+-->
+<Template>
+  <WidgetGroup>
+    <ObjectName>SpecialCueButton_<Variable name="CueType"/></ObjectName>
+    <MinimumSize>22,26</MinimumSize>
+    <MaximumSize>26,26</MaximumSize>
+    <SizePolicy>me,f</SizePolicy>
+    <Layout>horizontal</Layout>
+    <Children>
+      <PushButton>
+        <TooltipId><Variable name="CueType"/></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:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_square.svg</Unpressed>
+          <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_square_active.svg</Pressed>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_square_set.svg</Unpressed>
+          <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_square_active.svg</Pressed>
+        </State>
+        <Connection>
+          <ConfigKey><Variable name="Group"/>,<Variable name="CueType"/>_activate</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey><Variable name="Group"/>,<Variable name="CueType"/>_clear</ConfigKey>
+          <ButtonState>RightButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey><Variable name="Group"/>,<Variable name="CueType"/>_enabled</ConfigKey>
+          <ConnectValueFromWidget>false</ConnectValueFromWidget>
+        </Connection>
+      </PushButton>
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/controls/button_xfader_aux.xml b/res/skins/LateNight/controls/button_xfader_aux.xml
new file mode 100644
index 000000000000..8b1fe88615aa
--- /dev/null
+++ b/res/skins/LateNight/controls/button_xfader_aux.xml
@@ -0,0 +1,98 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    A row of three buttons which set the deck's crossfader
+    orientation directly: L | M | R
+  Variables:
+    group:
+    xfaderLeft, xfaderRight: default | warning | off
+          Picks a colored icon for L,M,R depending on whether
+          the deck's orientation is the default, set to Master
+          or to the opposite side
+-->
+<Template>
+  <WidgetGroup>
+    <ObjectName>CrossfaderButtonContainer_Aux</ObjectName>
+    <Layout>horizontal</Layout>
+    <SizePolicy>max,min</SizePolicy>
+    <Children>
+<!-- L -->
+      <PushButton>
+        <ObjectName>CrossfaderButton</ObjectName>
+        <TooltipId>orientation</TooltipId>
+        <Size>11f,13f</Size>
+        <NumberStates>2</NumberStates>
+        <RightClickIsPushButton>false</RightClickIsPushButton>
+        <State>
+          <Number>0</Number>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_aux_left_off.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_aux_left_off.svg</Unpressed>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_aux_left.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_aux_left.svg</Unpressed>
+        </State>
+        <Connection>
+          <ConfigKey><Variable name="Group"/>,orientation</ConfigKey>
+          <Transform>
+            <IsEqual>0</IsEqual>
+          </Transform>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+      </PushButton>
+<!-- M -->
+      <PushButton>
+        <ObjectName>CrossfaderButton</ObjectName>
+        <TooltipId>orientation</TooltipId>
+        <Size>11f,13f</Size>
+        <NumberStates>2</NumberStates>
+        <RightClickIsPushButton>false</RightClickIsPushButton>
+        <State>
+          <Number>0</Number>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_aux_mid_off.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_aux_mid_off.svg</Unpressed>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_aux_mid.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_aux_mid.svg</Unpressed>
+        </State>
+        <Connection>
+          <ConfigKey><Variable name="Group"/>,orientation</ConfigKey>
+          <Transform>
+            <Add>-1</Add>
+            <IsEqual>0</IsEqual>
+          </Transform>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+      </PushButton>
+<!-- R -->
+      <PushButton>
+        <ObjectName>CrossfaderButton</ObjectName>
+        <TooltipId>orientation</TooltipId>
+        <Size>11f,13f</Size>
+        <NumberStates>2</NumberStates>
+        <RightClickIsPushButton>false</RightClickIsPushButton>
+        <State>
+          <Number>0</Number>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_aux_right_off.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_aux_right_off.svg</Unpressed>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_aux_right.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_aux_right.svg</Unpressed>
+        </State>
+        <Connection>
+          <ConfigKey><Variable name="Group"/>,orientation</ConfigKey>
+          <Transform>
+            <Add>-2</Add>
+            <IsEqual>0</IsEqual>
+          </Transform>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+      </PushButton>
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/controls/button_xfader_deck.xml b/res/skins/LateNight/controls/button_xfader_deck.xml
new file mode 100644
index 000000000000..b7efce6f9c52
--- /dev/null
+++ b/res/skins/LateNight/controls/button_xfader_deck.xml
@@ -0,0 +1,96 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    A row of three buttons which set the deck's crossfader
+    orientation directly: L | M | R
+  Variables:
+    group:
+    xfaderLeft, xfaderRight: default | warning | off
+          Picks a colored icon for L,M,R depending on whether
+          the deck's orientation is the default, set to Master
+          or to the opposite side
+-->
+<Template>
+  <WidgetGroup>
+    <ObjectName>CrossfaderButtonContainer_Deck</ObjectName>
+    <Layout>horizontal</Layout>
+    <SizePolicy>min,min</SizePolicy>
+    <Children>
+      <!-- L -->
+      <PushButton>
+        <ObjectName>CrossfaderButton</ObjectName>
+        <TooltipId>orientation</TooltipId>
+        <Size>11f,15f</Size>
+        <NumberStates>2</NumberStates>
+        <RightClickIsPushButton>false</RightClickIsPushButton>
+        <State>
+          <Number>0</Number>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_deck_left_off.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_deck_left_off.svg</Unpressed>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_deck_left_<Variable name="xfaderLeft"/>.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_deck_left_<Variable name="xfaderLeft"/>.svg</Unpressed>
+        </State>
+        <Connection>
+          <ConfigKey><Variable name="Group"/>,orientation</ConfigKey>
+          <Transform>
+            <IsEqual>0</IsEqual>
+          </Transform>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+      </PushButton>
+      <!-- M -->
+      <PushButton>
+        <ObjectName>CrossfaderButton</ObjectName>
+        <TooltipId>orientation</TooltipId>
+        <Size>11f,15f</Size>
+        <NumberStates>2</NumberStates>
+        <RightClickIsPushButton>false</RightClickIsPushButton>
+        <State>
+          <Number>0</Number>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_deck_mid_off.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_deck_mid_off.svg</Unpressed>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_deck_mid_warning.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_deck_mid_warning.svg</Unpressed>
+        </State>
+        <Connection>
+          <ConfigKey><Variable name="Group"/>,orientation</ConfigKey>
+          <Transform>
+            <IsEqual>1</IsEqual>
+          </Transform>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+      </PushButton>
+      <!-- R -->
+      <PushButton>
+        <ObjectName>CrossfaderButton</ObjectName>
+        <TooltipId>orientation</TooltipId>
+        <Size>11f,15f</Size>
+        <NumberStates>2</NumberStates>
+        <RightClickIsPushButton>false</RightClickIsPushButton>
+        <State>
+          <Number>0</Number>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_deck_right_off.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_deck_right_off.svg</Unpressed>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Pressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_deck_right_<Variable name="xfaderRight"/>.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_deck_right_<Variable name="xfaderRight"/>.svg</Unpressed>
+        </State>
+        <Connection>
+          <ConfigKey><Variable name="Group"/>,orientation</ConfigKey>
+          <Transform>
+            <IsEqual>2</IsEqual>
+          </Transform>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+      </PushButton>
+    </Children>
+  </WidgetGroup><!-- CrossfaderButtonContainer_Deck -->
+</Template>
diff --git a/res/skins/LateNight/controls/knob.xml b/res/skins/LateNight/controls/knob.xml
new file mode 100644
index 000000000000..77361d3c4949
--- /dev/null
+++ b/res/skins/LateNight/controls/knob.xml
@@ -0,0 +1,50 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    A standard knob.
+  Variables:
+    group
+    control: The control to connect to
+    label
+    Size
+    TooltipId
+    PotiMinAngle
+    PotiMaxAngle
+-->
+<Template>
+  <WidgetGroup>
+    <Layout>vertical</Layout>
+    <SizePolicy>min,min</SizePolicy>
+    <Children>
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <ObjectName>KnobCentered</ObjectName>
+        <Children>
+
+          <KnobComposed>
+            <TooltipId><Variable name="TooltipId"/></TooltipId>
+            <Size><Variable name="Size"/></Size>
+            <Knob>skin:/<Variable name="KnobScheme"/>/knobs/knob_indicator_<Variable name="KnobIndicator"/>_<Variable name="Color"/>.svg</Knob>
+            <BackPath>skin:/<Variable name="KnobScheme"/>/knobs/knob_bg_<Variable name="KnobBg"/>.svg</BackPath>
+            <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
+            <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
+            <ArcColor>#ff8800</ArcColor>
+            <ArcBgColor>#fff</ArcBgColor>
+            <ArcThickness>5</ArcThickness>
+            <ArcBgThickness>3</ArcBgThickness>
+            <KnobCenterYOffset>1.602</KnobCenterYOffset>
+            <Connection>
+              <ConfigKey><Variable name="Group"/>,<Variable name="Control"/></ConfigKey>
+            </Connection>
+          </KnobComposed>
+        </Children>
+      </WidgetGroup>
+
+      <Label>
+        <ObjectName>KnobLabel</ObjectName>
+        <Text><Variable name="Label"/></Text>
+      </Label>
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/controls/knob_textless.xml b/res/skins/LateNight/controls/knob_textless.xml
new file mode 100644
index 000000000000..27687bd140da
--- /dev/null
+++ b/res/skins/LateNight/controls/knob_textless.xml
@@ -0,0 +1,35 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    A standard knob.
+  Variables:
+    control: The control to connect to.
+-->
+<Template>
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <ObjectName><Variable name="ObjectName"/></ObjectName>
+    <Children>
+      <KnobComposed>
+        <TooltipId><Variable name="TooltipId"/></TooltipId>
+        <Size><Variable name="Size"/></Size>
+        <Knob>skin:/<Variable name="KnobScheme"/>/knobs/knob_indicator_<Variable name="KnobIndicator"/>_<Variable name="KnobColor"/>.svg</Knob>
+        <BackPath>skin:/<Variable name="KnobScheme"/>/knobs/knob_bg_<Variable name="KnobBg"/>.svg</BackPath>
+        <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
+        <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
+        <ArcRadius><Variable name="ArcRadius"/></ArcRadius>
+        <ArcUnipolar><Variable name="ArcUnipolar"/></ArcUnipolar>
+        <ArcReversed><Variable name="ArcReversed"/></ArcReversed>
+        <ArcColor><Variable name="ArcColor"/></ArcColor>
+        <ArcBgColor><Variable name="ArcBgColor"/></ArcBgColor>
+        <ArcThickness><Variable name="ArcThickness"/></ArcThickness>
+        <ArcBgThickness><Variable name="ArcBgThickness"/></ArcBgThickness>
+        <ArcRoundCaps><Variable name="ArcRoundCaps"/></ArcRoundCaps>
+        <KnobCenterYOffset>1.598</KnobCenterYOffset>
+        <Connection>
+          <ConfigKey><Variable name="Group"/>,<Variable name="Control"/></ConfigKey>
+        </Connection>
+      </KnobComposed>
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/deck.xml b/res/skins/LateNight/deck.xml
deleted file mode 100644
index 4f648cdb8e7b..000000000000
--- a/res/skins/LateNight/deck.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<Template>
-  <SetVariable name="group">[Channel<Variable name="channum"/>]</SetVariable>
-  <WidgetGroup>
-    <ObjectName>Deck<Variable name="channum" /></ObjectName>
-    <Layout>horizontal</Layout>
-    <SizePolicy>me,min</SizePolicy>
-    <Children>
-
-      <Template src="skin:deck_rate_controls.xml"/>
-
-      <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 /cover -->
-                <SizePolicy>min,min</SizePolicy>
-                <Layout>horizontal</Layout>
-                <Children>
-                  <WidgetGroup>
-                    <SizePolicy>min,min</SizePolicy>
-                    <Layout>horizontal</Layout>
-                    <Children>
-                      <!-- 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 /cover -->
-
-              <WidgetGroup>
-                <SizePolicy>me,min</SizePolicy>
-                <Layout>vertical</Layout>
-                <Children>
-                  <Template src="skin:deck_row_2_3_TitleArtistTime.xml" />
-                  <Template src="skin:deck_row_4_overviewSpinny.xml" />
-                </Children>
-              </WidgetGroup>
-            </Children>
-          </WidgetGroup><!-- DeckRows234 -->
-
-          <Template src="skin:deck_row_5_transportLoopJump.xml" />
-        </Children>
-      </WidgetGroup> <!-- /Deck Channel1 -->
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/deck_mini.xml b/res/skins/LateNight/deck_mini.xml
deleted file mode 100644
index 67424c818226..000000000000
--- a/res/skins/LateNight/deck_mini.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<Template>
-  <SetVariable name="group">[Channel<Variable name="channum"/>]</SetVariable>
-
-  <WidgetGroup>
-    <ObjectName>DeckMini<Variable name="channum" /></ObjectName>
-    <Layout>vertical</Layout>
-    <SizePolicy>me,min</SizePolicy>
-    <Children>
-
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <SizePolicy>i,min</SizePolicy>
-        <Children>
-
-          <!-- Small spinny / cover art -->
-          <WidgetGroup>
-            <Size><Variable name="MiniDeckSpinnySize"/></Size>
-            <Layout>horizontal</Layout>
-            <Children>
-              <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>
-            <ObjectName>OverviewBox</ObjectName>
-            <SizePolicy>me,min</SizePolicy>
-            <MinimumSize>200,46</MinimumSize>
-            <MaximumSize>250,46</MaximumSize>
-            <Layout>horizontal</Layout>
-            <Children>
-              <SingletonContainer>
-                <ObjectName>DeckOverview<Variable name="channum"/></ObjectName>
-              </SingletonContainer>
-            </Children>
-          </WidgetGroup>
-
-          <WidgetGroup><!-- DeckMini_TitlePlayPosKeyBPM -->
-            <Layout>vertical</Layout>
-            <Size>200min,46f</Size>
-            <Children>
-
-              <WidgetGroup>
-                <Layout>horizontal</Layout>
-                <Size>200min,23f</Size>
-                <Children>
-                  <TrackProperty>
-                    <TooltipId>track_title</TooltipId>
-                    <ObjectName>TitleTextSmall</ObjectName>
-                    <Size>100me,23f</Size>
-                    <Property>titleInfo</Property>
-                    <Alignment>left</Alignment>
-                    <Elide>right</Elide>
-                    <Channel><Variable name="channum"/></Channel>
-                  </TrackProperty>
-
-                  <NumberPos>
-                    <TooltipId>track_time</TooltipId>
-                    <ObjectName>PlayPositionTextSmall</ObjectName>
-                    <SizePolicy>min,f</SizePolicy>
-                    <MinimumSize>,23</MinimumSize>
-                    <Alignment>center</Alignment>
-                    <Channel><Variable name="channum"/></Channel>
-                    <Connection>
-                      <ConfigKey><Variable name="group"/>,playposition</ConfigKey>
-                    </Connection>
-                  </NumberPos>
-                </Children>
-              </WidgetGroup><!-- Title / PlayPos -->
-
-              <WidgetGroup><!-- Artist / Key / BPM -->
-                <Layout>horizontal</Layout>
-                <Size>200min,22f</Size>
-                <Children>
-                  <TrackProperty>
-                    <TooltipId>track_title</TooltipId>
-                    <ObjectName>ArtistTextSmall</ObjectName>
-                    <Size>96me,22f</Size>
-                    <Property>artist</Property>
-                    <Alignment>left</Alignment>
-                    <Elide>right</Elide>
-                    <Channel><Variable name="channum"/></Channel>
-                  </TrackProperty>
-
-                  <Key>
-                    <TooltipId>visual_key</TooltipId>
-                    <ObjectName>KeyTextSmall</ObjectName>
-                    <Channel><Variable name="channum"/></Channel>
-                    <Size>44min,22f</Size>
-                    <Alignment>center</Alignment>
-                    <Elide>right</Elide>
-                    <Connection>
-                      <ConfigKey><Variable name="group"/>,visual_key</ConfigKey>
-                    </Connection>
-                  </Key>
-
-                  <NumberBpm>
-                    <ObjectName>BpmTextSmall</ObjectName>
-                    <TooltipId>visual_bpm</TooltipId>
-                    <Size>60f,22f</Size>
-                    <Alignment>center</Alignment>
-                    <Channel><Variable name="channum" /></Channel>
-                    <NumberOfDigits>2</NumberOfDigits>
-                    <Connection>
-                      <ConfigKey><Variable name="group"/>,visual_bpm</ConfigKey>
-                    </Connection>
-                  </NumberBpm>
-
-                </Children>
-              </WidgetGroup><!-- Artist / Key / BPM -->
-
-            </Children>
-          </WidgetGroup><!-- DeckMini_TitlePlayPosKeyBPM -->
-
-          <WidgetGroup>
-            <ObjectName>PlayContainerSmall</ObjectName>
-            <Layout>stacked</Layout>
-            <Size>37f,46f</Size>
-            <Children>
-              <Template src="skin:button_2state_right_display.xml">
-                <SetVariable name="TooltipId">play_cue_default</SetVariable>
-                <SetVariable name="ObjectName">PlayDeckMini</SetVariable>
-                <SetVariable name="Size">34f,34f</SetVariable>
-                <SetVariable name="btn_type"><Variable name="TopRegion_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_default</SetVariable>
-              </Template>
-              <PushButton>
-                <ObjectName>PlayIndicator</ObjectName>
-                <Size>34f,34f</Size>
-                <NumberStates>2</NumberStates>
-                <RightClickIsPushButton>false</RightClickIsPushButton>
-                <State>
-                  <Number>0</Number>
-                </State>
-                <State>
-                  <Number>1</Number>
-                </State>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,play_indicator</ConfigKey>
-                </Connection>
-              </PushButton>
-              <WidgetGroup>
-                <ObjectName>PlayBg</ObjectName>
-                <Size>34f,34f</Size>
-              </WidgetGroup>
-            </Children>
-          </WidgetGroup><!-- PlayContainerSmall -->
-
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </WidgetGroup><!-- DeckMini -->
-</Template>
diff --git a/res/skins/LateNight/deck_overview.xml b/res/skins/LateNight/deck_overview.xml
deleted file mode 100644
index 5b957c2ec6e3..000000000000
--- a/res/skins/LateNight/deck_overview.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<Template>
-  <SetVariable name="group">[Channel<Variable name="channum"/>]</SetVariable>
-  <Overview>
-    <TooltipId>waveform_overview</TooltipId>
-    <Channel><Variable name="channum"/></Channel>
-    <Size>150me,40me</Size>
-    <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><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>
-      <TextColor>#FFFFFF</TextColor>
-      <Text> %1 </Text>
-    </DefaultMark>
-    <MarkRange>
-      <StartControl>loop_start_position</StartControl>
-      <EndControl>loop_end_position</EndControl>
-      <EnabledControl>loop_enabled</EnabledControl>
-      <Color>#00FF00</Color>
-      <DisabledColor>#FFFFFF</DisabledColor>
-    </MarkRange>
-    <!--
-    <Mark>
-      <Control>loop_start_position</Control>
-      <Text>IN</Text>
-      <Align>bottom|right</Align>
-      <Color>#00FF00</Color>
-      <TextColor>#FFFFFF</TextColor>
-    </Mark>
-    <Mark>
-      <Control>loop_end_position</Control>
-      <Text>OUT</Text>
-      <Align>bottom|right</Align>
-      <Color>#00FF00</Color>
-      <TextColor>#FFFFFF</TextColor>
-    </Mark>
-    -->
-    <MarkRange>
-      <StartControl>intro_start_position</StartControl>
-      <EndControl>intro_end_position</EndControl>
-      <Color>#0000FF</Color>
-      <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
-      <DurationTextColor>#ffffff</DurationTextColor>
-      <DurationTextLocation>after</DurationTextLocation>
-    </MarkRange>
-    <MarkRange>
-      <StartControl>outro_start_position</StartControl>
-      <EndControl>outro_end_position</EndControl>
-      <Color>#0000FF</Color>
-      <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
-      <DurationTextColor>#ffffff</DurationTextColor>
-      <DurationTextLocation>before</DurationTextLocation>
-    </MarkRange>
-    <Mark>
-      <Control>intro_start_position</Control>
-      <Text></Text>
-      <Align>top|right</Align>
-      <Color>#0000FF</Color>
-      <TextColor>#FFFFFF</TextColor>
-      <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
-    </Mark>
-    <Mark>
-      <Control>intro_end_position</Control>
-      <Text>&#9698;</Text>
-      <Align>top|left</Align>
-      <Color>#0000FF</Color>
-      <TextColor>#FFFFFF</TextColor>
-      <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
-    </Mark>
-    <Mark>
-      <Control>outro_start_position</Control>
-      <Text>&#9699;</Text>
-      <Align>top|right</Align>
-      <Color>#0000FF</Color>
-      <TextColor>#FFFFFF</TextColor>
-      <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
-    </Mark>
-    <Mark>
-      <Control>outro_end_position</Control>
-      <Text></Text>
-      <Align>top|left</Align>
-      <Color>#0000FF</Color>
-      <TextColor>#FFFFFF</TextColor>
-      <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
-    </Mark>
-    <Mark>
-      <Control>cue_point</Control>
-      <Text> C </Text>
-      <Align>top|right</Align>
-      <Color>#FF001C</Color>
-      <TextColor>#FFFFFF</TextColor>
-    </Mark>
-    <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>
-</Template>
diff --git a/res/skins/LateNight/deck_rate_controls.xml b/res/skins/LateNight/deck_rate_controls.xml
deleted file mode 100644
index 200648b768b7..000000000000
--- a/res/skins/LateNight/deck_rate_controls.xml
+++ /dev/null
@@ -1,205 +0,0 @@
-<Template>
-  <SetVariable name="btn_type"><Variable name="TopRegion_btn_type"/></SetVariable>
-  <SetVariable name="btn_format">square</SetVariable>
-
-  <WidgetGroup>
-    <Layout>vertical</Layout>
-    <SizePolicy>min,me</SizePolicy>
-    <Children>
-      <WidgetGroup>
-        <ObjectName>RateContainer</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>min,me</SizePolicy>
-        <Children>
-
-          <WidgetGroup><!-- BPM + rate -->
-            <ObjectName>BpmContainer</ObjectName>
-            <Layout>vertical</Layout>
-            <SizePolicy>min,me</SizePolicy>
-            <MaximumSize>,46</MaximumSize>
-            <Children>
-              <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>
-              </NumberRate>
-            </Children>
-          </WidgetGroup><!-- BPM + rate -->
-
-          <WidgetGroup>
-            <ObjectName>RateControls</ObjectName>
-            <SizePolicy>min,me</SizePolicy>
-            <Layout>horizontal</Layout>
-            <Children>
-              <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>
-                  <WidgetGroup><Size>0min,1f</Size></WidgetGroup>
-                  <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="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="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="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="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="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="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="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>[Skin],show_rate_control_buttons</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup><!-- RateButtons for different rate directions -->
-            </Children>
-          </WidgetGroup><!-- RateControls -->
-
-          <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>
-    <Connection>
-      <ConfigKey persist="true">[Skin],show_rate_controls</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/deck_row_1_keyVinylFx.xml b/res/skins/LateNight/deck_row_1_keyVinylFx.xml
deleted file mode 100644
index f039572d6665..000000000000
--- a/res/skins/LateNight/deck_row_1_keyVinylFx.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<Template>
-  <SetVariable name="Type">group</SetVariable>
-  <WidgetGroup>
-    <ObjectName>DeckRow_1_KeyVinylFx</ObjectName>
-    <Layout>horizontal</Layout>
-    <SizePolicy>me,min</SizePolicy>
-    <Children>
-
-      <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>
-
-          <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>
-
-          <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_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>
-        <SizePolicy>min,min</SizePolicy>
-        <MinimumSize>3,0</MinimumSize>
-      </WidgetGroup>
-
-      <Template src="skin:deck_vinyl_controls.xml"/>
-
-      <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>
-        <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 -->
-</Template>
diff --git a/res/skins/LateNight/deck_row_2_3_TitleArtistTime.xml b/res/skins/LateNight/deck_row_2_3_TitleArtistTime.xml
deleted file mode 100644
index 2ae390c394be..000000000000
--- a/res/skins/LateNight/deck_row_2_3_TitleArtistTime.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<Template>
-  <WidgetGroup>
-    <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>DeckRow_2_3_ArtistTitleTime</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>i,min</SizePolicy>
-        <Children>
-
-          <WidgetGroup>
-            <ObjectName>TitleRow</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>i,min</SizePolicy>
-            <Children>
-              <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>titleInfo</Property>
-                    <Alignment>Left</Alignment>
-                    <Elide>right</Elide>
-                    <Channel><Variable name="channum"/></Channel>
-                  </TrackProperty>
-                </Children>
-              </WidgetGroup><!-- TitleGutter -->
-
-              <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><!-- TitleRow -->
-
-          <WidgetGroup>
-            <ObjectName>ArtistRow</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>me,min</SizePolicy>
-            <Children>
-              <WidgetGroup>
-                <ObjectName>ArtistGutter</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>me,min</SizePolicy>
-                <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><!-- ArtistRow -->
-        </Children>
-      </WidgetGroup><!-- DeckRow_2_3_ArtistTitleTime -->
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/deck_row_4_overviewSpinny.xml b/res/skins/LateNight/deck_row_4_overviewSpinny.xml
deleted file mode 100644
index c423ea33fbca..000000000000
--- a/res/skins/LateNight/deck_row_4_overviewSpinny.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<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>
-        <Layout>horizontal</Layout>
-        <Children>
-          <WidgetGroup>
-            <SizePolicy>min,me</SizePolicy>
-            <Layout>horizontal</Layout>
-            <Children>
-              <!-- 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>
-          <ConfigKey persist="true">[Skin],show_big_spinny_coverart</ConfigKey>
-          <Transform><Not/></Transform>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup><!-- Small spinny / cover art -->
-
-      <WidgetGroup>
-        <ObjectName>OverviewBox</ObjectName>
-        <SizePolicy>min,me</SizePolicy>
-        <Layout>horizontal</Layout>
-        <Children>
-          <SingletonContainer>
-            <ObjectName>DeckOverview<Variable name="channum"/></ObjectName>
-          </SingletonContainer>
-        </Children>
-      </WidgetGroup>
-
-      <WidgetGroup>
-        <ObjectName>DeckControlsStars</ObjectName>
-        <Layout>vertical</Layout>
-        <Children>
-
-          <WidgetGroup><Size>0min,0me</Size></WidgetGroup>
-
-          <WidgetGroup>
-            <ObjectName>Stars</ObjectName>
-            <Layout>vertical</Layout>
-            <Size>0min,15f</Size>
-            <Children>
-              <StarRating>
-                <Size>0min,15f</Size>
-                <Alignment>center</Alignment>
-                <TooltipId>starrating</TooltipId>
-                <Channel><Variable name="channum"/></Channel>
-              </StarRating>
-            </Children>
-          </WidgetGroup>
-
-          <WidgetGroup><Size>0min,1f</Size></WidgetGroup>
-
-          <WidgetGroup>
-            <ObjectName>DeckControlButtons</ObjectName>
-            <Layout>horizontal</Layout>
-            <Children>
-
-              <Template src="skin:button_2state.xml">
-                <SetVariable name="TooltipId">slip_mode</SetVariable>
-                <SetVariable name="ObjectName">SlipmodeButton<Variable name="decks_group"/></SetVariable>
-                <SetVariable name="ConfigKey"><Variable name="group"/>,slip_enabled</SetVariable>
-                <SetVariable name="Size">21f,18f</SetVariable>
-              </Template>
-
-              <Template src="skin:button_2state.xml">
-                <SetVariable name="TooltipId">quantize</SetVariable>
-                <SetVariable name="ObjectName">QuantizeButton<Variable name="decks_group"/></SetVariable>
-                <SetVariable name="ConfigKey"><Variable name="group"/>,quantize</SetVariable>
-                <SetVariable name="Size">21f,18f</SetVariable>
-              </Template>
-
-              <Template src="skin:button_1state_right.xml">
-                <SetVariable name="TooltipId">beats_translate_curpos</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">21f,18f</SetVariable>
-              </Template>
-
-            </Children>
-          </WidgetGroup><!-- DeckControlButtons row 1 -->
-
-          <WidgetGroup>
-            <ObjectName>DeckControlButtons</ObjectName>
-            <Layout>horizontal</Layout>
-            <Children>
-              <Template src="skin:button_1state.xml">
-                <SetVariable name="TooltipId">eject</SetVariable>
-                <SetVariable name="ObjectName">EjectButton<Variable name="decks_group"/></SetVariable>
-                <SetVariable name="ConfigKey"><Variable name="group"/>,eject</SetVariable>
-                <SetVariable name="Size">21f,18f</SetVariable>
-              </Template>
-
-              <Template src="skin:button_2state.xml">
-                <SetVariable name="TooltipId">repeat</SetVariable>
-                <SetVariable name="ObjectName">RepeatButton<Variable name="decks_group"/></SetVariable>
-                <SetVariable name="ConfigKey"><Variable name="group"/>,repeat</SetVariable>
-                <SetVariable name="Size">21f,18f</SetVariable>
-              </Template>
-
-              <Template src="skin:button_2state.xml">
-                <SetVariable name="TooltipId">keylock</SetVariable>
-                <SetVariable name="ObjectName">KeylockButton<Variable name="decks_group"/></SetVariable>
-                <SetVariable name="ConfigKey"><Variable name="group"/>,keylock</SetVariable>
-                <SetVariable name="Size">21f,18f</SetVariable>
-              </Template>
-
-            </Children>
-          </WidgetGroup><!-- /DeckControlButtons row 2 -->
-
-          <WidgetGroup><Size>0min,0me</Size></WidgetGroup>
-
-        </Children>
-      </WidgetGroup><!-- DeckControlsStars -->
-    </Children>
-  </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
deleted file mode 100644
index e8506e8dc2ef..000000000000
--- a/res/skins/LateNight/deck_row_5_transportLoopJump.xml
+++ /dev/null
@@ -1,357 +0,0 @@
-<Template>
-  <SetVariable name="btn_type"><Variable name="SubRegion_btn_type"/></SetVariable>
-  <SetVariable name="btn_format">square</SetVariable>
-
-  <WidgetGroup>
-    <BackPath><Variable name="BgTile"/></BackPath>
-    <SizePolicy>min,min</SizePolicy>
-    <Layout>horizontal</Layout>
-    <Children>
-      <WidgetGroup>
-        <ObjectName>DeckRow_5_LoopCuesTransport</ObjectName>
-        <SizePolicy>me,min</SizePolicy>
-        <Layout>horizontal</Layout>
-        <Children>
-
-          <WidgetGroup><Size>2f,0min</Size></WidgetGroup>
-          <WidgetGroup><SizePolicy>i,min</SizePolicy></WidgetGroup>
-
-          <WidgetGroup><!-- Loop buttons + beatloop size spinbox -->
-            <ObjectName>LoopControls</ObjectName>
-            <Layout>vertical</Layout>
-            <SizePolicy>min,min</SizePolicy>
-            <MinimumSize>78,52</MinimumSize>
-            <MaximumSize>86,52</MaximumSize>
-            <Children>
-              <WidgetGroup><!-- loop enable + beatloop size -->
-                <ObjectName>AlignLeftTop</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>min,max</SizePolicy>
-                <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="ConfigKey"><Variable name="group"/>,beatloop_activate</SetVariable>
-                    <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beatlooproll_activate</SetVariable>
-                  </Template>
-
-                  <BeatSpinBox>
-                    <TooltipId>beatloop_size</TooltipId>
-                    <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>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <ObjectName>AlignLeftTop</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>min,max</SizePolicy>
-                <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="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>
-                  </Template>
-
-                  <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="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="ConfigKey"><Variable name="group"/>,loop_out</SetVariable>
-                    <SetVariable name="ConfigKeyRight"><Variable name="group"/>,loop_out_goto</SetVariable>
-                  </Template>
-                </Children>
-              </WidgetGroup>
-            </Children>
-          </WidgetGroup><!-- /Loop buttons + beatloop size spinbox -->
-
-          <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>BeatjumpControls</ObjectName>
-            <Layout>vertical</Layout>
-            <SizePolicy>min,min</SizePolicy>
-            <MinimumSize>52,52</MinimumSize>
-            <MaximumSize>60,52</MaximumSize>
-            <Children>
-              <WidgetGroup><!-- beatjump size -->
-                <ObjectName>AlignLeftTop</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>0min,26f</SizePolicy>
-                <Children>
-                  <!-- put this spacer here so BeatSpinBox expands with HiDPI scaling
-                  <WidgetGroup><Size>0f,26f</Size></WidgetGroup> -->
-                  <BeatSpinBox>
-                    <TooltipId>beatjump_size</TooltipId>
-                    <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>
-              </WidgetGroup>
-              <WidgetGroup>
-                <ObjectName>AlignLeftTop</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>min,max</SizePolicy>
-                <Children>
-
-                  <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="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="ConfigKey"><Variable name="group"/>,beatjump_forward</SetVariable>
-                    <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beatjump_1_forward</SetVariable>
-                  </Template>
-                </Children>
-              </WidgetGroup>
-            </Children>
-          </WidgetGroup><!-- /Jump buttons + beatjump size spinbox -->
-
-          <WidgetGroup><Size>2f,0min</Size></WidgetGroup><!--  = 2-80px wide -->
-          <WidgetGroup><SizePolicy>i,min</SizePolicy><MaximumSize>80,</MaximumSize></WidgetGroup>
-
-          <WidgetGroup><!-- Intro + Outro -->
-            <Layout>vertical</Layout>
-            <SizePolicy>me,min</SizePolicy>
-            <MaximumSize>52,52</MaximumSize>
-            <Children>
-              <WidgetGroup><!-- Intro -->
-                <ObjectName>AlignLeftTop</ObjectName>
-                <SizePolicy>me,min</SizePolicy>
-                <Layout>horizontal</Layout>
-                <Children>
-                  <Template src="skin:button_special_cue.xml">
-                    <SetVariable name="cue_type">intro_start</SetVariable>
-                  </Template>
-
-                  <Template src="skin:button_special_cue.xml">
-                    <SetVariable name="cue_type">intro_end</SetVariable>
-                  </Template>
-                </Children>
-              </WidgetGroup>
-              <WidgetGroup><!-- Outro -->
-                <ObjectName>AlignLeftTop</ObjectName>
-                <SizePolicy>me,min</SizePolicy>
-                <Layout>horizontal</Layout>
-                <Children>
-                  <Template src="skin:button_special_cue.xml">
-                    <SetVariable name="cue_type">outro_start</SetVariable>
-                  </Template>
-
-                  <Template src="skin:button_special_cue.xml">
-                    <SetVariable name="cue_type">outro_end</SetVariable>
-                  </Template>
-                </Children>
-              </WidgetGroup>
-            </Children>
-            <Connection>
-              <ConfigKey>[Skin],show_intro_outro_cues</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup><!-- / Intro + Outro -->
-
-          <WidgetGroup><Size>2f,0min</Size></WidgetGroup><!--  = 2-8px wide -->
-          <WidgetGroup><SizePolicy>i,min</SizePolicy><MaximumSize>8,</MaximumSize></WidgetGroup>
-
-          <WidgetGroup><!-- HotCues -->
-            <Layout>vertical</Layout>
-            <SizePolicy>max,min</SizePolicy>
-            <Children>
-              <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>
-
-                  <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>
-                    <Connection>
-                      <ConfigKey>[Skin],show_8_hotcues</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup>
-                </Children>
-              </WidgetGroup><!-- HotCues 1-2 / 1-4 -->
-
-              <!-- 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>
-                <Connection>
-                  <ConfigKey>[Skin],show_8_hotcues</ConfigKey>
-                  <Transform><Not/></Transform>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
-
-              <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><Size>2f,0min</Size></WidgetGroup><!--  = 2-8px wide -->
-          <WidgetGroup><SizePolicy>i,min</SizePolicy><MaximumSize>8,</MaximumSize></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="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>
-
-                  <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><!-- Reverse | Cue -->
-
-              <WidgetGroup><!-- Play + PlayBlink + default grey background -->
-                <Layout>stacked</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                  <Template src="skin:button_2state_right.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>
-                  </Template>
-                  <PushButton>
-                    <ObjectName>PlayIndicator</ObjectName>
-                    <Size>68f,26f</Size>
-                    <NumberStates>2</NumberStates>
-                    <RightClickIsPushButton>false</RightClickIsPushButton>
-                    <State>
-                      <Number>0</Number>
-                    </State>
-                    <State>
-                      <Number>1</Number>
-                    </State>
-                    <Connection>
-                      <ConfigKey><Variable name="group"/>,play_indicator</ConfigKey>
-                    </Connection>
-                  </PushButton>
-                  <WidgetGroup>
-                    <ObjectName>PlayBg</ObjectName>
-                    <Size>68f,26f</Size>
-                  </WidgetGroup>
-                </Children>
-              </WidgetGroup><!-- Play + PlayBlink + default grey background -->
-
-            </Children>
-          </WidgetGroup><!-- /HotCues, Play, Cue, Reverse -->
-        </Children>
-      </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
deleted file mode 100644
index 710421bb4425..000000000000
--- a/res/skins/LateNight/deck_vinyl_controls.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<Template>
-  <WidgetGroup>
-    <ObjectName>VinylControls</ObjectName>
-    <Layout>horizontal</Layout>
-    <SizePolicy>min,f</SizePolicy>
-    <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><Variable name="group"/>,vinylcontrol_status</ConfigKey>
-        </Connection>
-      </StatusLight>
-
-      <!-- increase margin -->
-      <WidgetGroup><Size>3f,0min</Size></WidgetGroup>
-
-      <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,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">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>
-      <ConfigKey persist="true">[VinylControl],show_vinylcontrol</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/decks/deck.xml b/res/skins/LateNight/decks/deck.xml
new file mode 100644
index 000000000000..fb85409fc55b
--- /dev/null
+++ b/res/skins/LateNight/decks/deck.xml
@@ -0,0 +1,54 @@
+<Template>
+
+  <WidgetGroup>
+    <Layout>vertical</Layout>
+    <MaximumSize>,208</MaximumSize>
+    <Children>
+
+      <Template src="skin:/decks/deck_singletons.xml">
+        <SetVariable name="Type">deck</SetVariable>
+        <SetVariable name="Group">[Channel<Variable name="ChanNum"/>]</SetVariable>
+      </Template>
+
+      <WidgetGroup>
+        <Connection>
+          <ConfigKey>[LateNight],show_mini_deck</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+        <Layout>horizontal</Layout>
+        <Children>
+          <SingletonContainer>
+            <ObjectName>Deck<Variable name="ChanNum"/>_Mini</ObjectName>
+          </SingletonContainer>
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <Connection>
+          <ConfigKey>[LateNight],show_compact_deck</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+        <Layout>horizontal</Layout>
+        <Children>
+          <SingletonContainer>
+            <ObjectName>Deck<Variable name="ChanNum"/>_Compact</ObjectName>
+          </SingletonContainer>
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <Connection>
+          <ConfigKey>[LateNight],show_full_deck</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+        <Layout>horizontal</Layout>
+        <Children>
+          <SingletonContainer>
+            <ObjectName>Deck<Variable name="ChanNum"/>_Full</ObjectName>
+          </SingletonContainer>
+        </Children>
+      </WidgetGroup>
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/decks/deck_compact.xml b/res/skins/LateNight/decks/deck_compact.xml
new file mode 100644
index 000000000000..f09664309f9c
--- /dev/null
+++ b/res/skins/LateNight/decks/deck_compact.xml
@@ -0,0 +1,81 @@
+<Template>
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,min</SizePolicy>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>DeckCompact<Variable name="ChanNum" /></ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>me,min</SizePolicy>
+        <Children>
+
+          <WidgetGroup>
+            <ObjectName>DeckRows2345</ObjectName>
+            <SizePolicy>me,min</SizePolicy>
+            <Layout>vertical</Layout>
+            <Children>
+              <WidgetGroup>
+                <ObjectName>DeckRows234</ObjectName>
+                <SizePolicy>me,min</SizePolicy>
+                <Layout>horizontal</Layout>
+                <Children>
+
+                  <WidgetGroup>
+                    <ObjectName>SpinnyCoverContainer_BigCompact</ObjectName>
+                    <Layout>horizontal</Layout>
+                    <SizePolicy>f,f</SizePolicy>
+                    <Children>
+                      <SingletonContainer>
+                        <ObjectName>SpinnyCoverart<Variable name="ChanNum"/></ObjectName>
+                      </SingletonContainer>
+                    </Children>
+                    <Connection>
+                      <ConfigKey>[LateNight],show_big_spinny_cover</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup><!-- SpinnyCoverContainer_BigCompact -->
+
+                  <WidgetGroup>
+                    <SizePolicy>me,min</SizePolicy>
+                    <Layout>vertical</Layout>
+                    <Children>
+                      <Template src="skin:/decks/row_2_3_TitleArtistTime_compact.xml" />
+                      <Template src="skin:/decks/row_4_overviewSpinny_compact.xml" />
+                    </Children>
+                  </WidgetGroup>
+
+                  <WidgetGroup>
+                    <Size>1f,0min</Size>
+                    <Connection>
+                      <ConfigKey persist="true">[Skin],show_rate_key_controls_compact</ConfigKey>
+                      <Transform><Not/></Transform>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup>
+
+                </Children>
+              </WidgetGroup><!-- DeckRows234 -->
+
+              <Template src="skin:/decks/row_5_transportLoopJump_compact.xml" />
+
+            </Children>
+          </WidgetGroup><!-- DeckRows2345 -->
+
+          <Template src="skin:/decks/rate_controls_compact.xml"/>
+
+        </Children>
+        <!-- This is supposed to reduce margin and eliminate the border that
+          touches the optional VU meters when they're visible.
+          Unfortunately it is buggy and works only for the state that is
+          active while the skin is loaded. If the highlight value changes the
+          layout may be screwed and inner widgets overlap the outer border.. wtf?
+        <Connection>
+          <ConfigKey persist="true">[LateNight],show_vumeters_compact</ConfigKey>
+          <BindProperty>highlight</BindProperty>
+        </Connection> -->
+      </WidgetGroup><!-- DeckCompactN -->
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/decks/deck_full.xml b/res/skins/LateNight/decks/deck_full.xml
new file mode 100644
index 000000000000..de993da5221a
--- /dev/null
+++ b/res/skins/LateNight/decks/deck_full.xml
@@ -0,0 +1,69 @@
+<Template>
+  <WidgetGroup>
+    <ObjectName>DeckContainer</ObjectName>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,min</SizePolicy>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>Deck<Variable name="ChanNum"/></ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>me,min</SizePolicy>
+        <Children>
+
+          <WidgetGroup>
+            <ObjectName>DeckRows12345</ObjectName>
+            <SizePolicy>me,min</SizePolicy>
+            <Layout>vertical</Layout>
+            <Children>
+
+              <Template src="skin:/decks/row_1_keyVinylFx.xml"/>
+
+              <WidgetGroup>
+                <ObjectName>DeckRows234</ObjectName>
+                <SizePolicy>me,min</SizePolicy>
+                <Layout>horizontal</Layout>
+                <Children>
+
+                  <WidgetGroup>
+                    <ObjectName>SpinnyCoverContainer_Big</ObjectName>
+                    <Layout>horizontal</Layout>
+                    <SizePolicy>f,f</SizePolicy>
+                    <Children>
+                      <SingletonContainer>
+                        <ObjectName>SpinnyCoverart<Variable name="ChanNum"/></ObjectName>
+                      </SingletonContainer>
+                    </Children>
+                    <Connection>
+                      <ConfigKey>[LateNight],show_big_spinny_cover</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup><!-- SpinnyCoverContainer_Big -->
+
+                  <WidgetGroup>
+                    <SizePolicy>me,min</SizePolicy>
+                    <Layout>vertical</Layout>
+                    <Children>
+                      <Template src="skin:/decks/row_2_3_TitleArtistTime.xml" />
+                      <Template src="skin:/decks/row_4_overviewSpinny.xml" />
+                    </Children>
+                  </WidgetGroup>
+
+                </Children>
+              </WidgetGroup><!-- DeckRows234 -->
+
+              <Template src="skin:/decks/row_5_transportLoopJump.xml" />
+
+            </Children>
+            <Connection>
+              <ConfigKey persist="true">[Skin],show_rate_controls</ConfigKey>
+              <BindProperty>highlight</BindProperty>
+            </Connection>
+          </WidgetGroup> <!-- DeckRows12345 -->
+
+          <Template src="skin:/decks/rate_controls.xml"/>
+        </Children>
+      </WidgetGroup><!-- DeckN -->
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/decks/deck_mini.xml b/res/skins/LateNight/decks/deck_mini.xml
new file mode 100644
index 000000000000..764bedc81f46
--- /dev/null
+++ b/res/skins/LateNight/decks/deck_mini.xml
@@ -0,0 +1,215 @@
+<Template>
+  <SetVariable name="BtnType"><Variable name="TopRegion_BtnType"/></SetVariable>
+
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,min</SizePolicy>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>DeckMini<Variable name="ChanNum" /></ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>me,min</SizePolicy>
+        <Children>
+
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <SizePolicy>i,min</SizePolicy>
+            <Children>
+
+              <WidgetGroup>
+                <ObjectName>PlayCueMini</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,f</SizePolicy>
+                <Children>
+                  <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:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_medium.svg</Unpressed>
+                      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_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:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_medium_set.svg</Unpressed>
+                      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_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>
+
+                  <WidgetGroup><!-- Play + PlayBlink + default grey background -->
+                    <Layout>stacked</Layout>
+                    <Size>42f,26f</Size>
+                    <Children>
+                      <Template src="skin:/controls/button_2state_right_display.xml">
+                        <SetVariable name="TooltipId">play_cue_default</SetVariable>
+                        <SetVariable name="ObjectName">PlayDeckMini</SetVariable>
+                        <SetVariable name="Size">42f,26f</SetVariable>
+                        <SetVariable name="BtnSize">medium</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="Group"/>,play</SetVariable>
+                        <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,cue_default</SetVariable>
+                      </Template>
+                      <PushButton>
+                        <ObjectName>PlayIndicator</ObjectName>
+                        <Size>42f,26f</Size>
+                        <NumberStates>2</NumberStates>
+                        <RightClickIsPushButton>false</RightClickIsPushButton>
+                        <State>
+                          <Number>0</Number>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                        </State>
+                        <Connection>
+                          <ConfigKey><Variable name="Group"/>,play_indicator</ConfigKey>
+                        </Connection>
+                      </PushButton>
+                      <WidgetGroup>
+                        <ObjectName>PlayBg</ObjectName>
+                        <Size>42f,26f</Size>
+                      </WidgetGroup>
+                    </Children>
+                  </WidgetGroup><!-- Play + PlayBlink + default grey background -->
+
+                </Children>
+              </WidgetGroup><!-- PlayCueSmall -->
+
+              <WidgetGroup>
+                <ObjectName>OverviewBoxMini</ObjectName>
+                <SizePolicy>me,min</SizePolicy>
+                <MinimumSize>250,46</MinimumSize>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:/decks/overview.xml">
+                    <SetVariable name="OverviewFontSize"><Variable name="OverviewFontSizeDeckMini"/></SetVariable>
+                  </Template>
+                </Children>
+                <Connection>
+                  <ConfigKey><Variable name="Group"/>,track_loaded</ConfigKey>
+                  <BindProperty>highlight</BindProperty>
+                </Connection>
+              </WidgetGroup><!-- OverviewBoxMini -->
+
+              <WidgetGroup>
+                <ObjectName>SpinnyCoverContainer_MiniDeck</ObjectName>
+                <SizePolicy>f,f</SizePolicy>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <SingletonContainer>
+                    <ObjectName>SpinnyCoverart<Variable name="ChanNum"/></ObjectName>
+                  </SingletonContainer>
+                </Children>
+                <Connection>
+                  <ConfigKey persist="true">[LateNight],show_spinny_cover</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup><!-- SpinnyCoverContainer_MiniDeck -->
+
+              <WidgetGroup>
+                <ObjectName>DeckMini_TitlePlayPosKeyBPM</ObjectName>
+                <Layout>vertical</Layout>
+                <Size>200me,46me</Size>
+                <Children>
+
+                  <WidgetGroup>
+                    <Layout>horizontal</Layout>
+                    <Size>200me,23me</Size>
+                    <Children>
+                      <TrackProperty>
+                        <TooltipId>track_title</TooltipId>
+                        <ObjectName>TitleTextSmall</ObjectName>
+                        <Size>100me,23me</Size>
+                        <Property>title</Property>
+                        <Alignment>left</Alignment>
+                        <Elide>right</Elide>
+                        <Channel><Variable name="ChanNum"/></Channel>
+                      </TrackProperty>
+
+                      <NumberPos>
+                        <TooltipId>track_time</TooltipId>
+                        <ObjectName>PlayPositionTextSmall</ObjectName>
+                        <SizePolicy>min,me</SizePolicy>
+                        <MinimumSize>,23</MinimumSize>
+                        <Alignment>center</Alignment>
+                        <Channel><Variable name="ChanNum"/></Channel>
+                        <Connection>
+                          <ConfigKey><Variable name="Group"/>,playposition</ConfigKey>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey><Variable name="Group"/>,track_loaded</ConfigKey>
+                          <BindProperty>visible</BindProperty>
+                        </Connection>
+                      </NumberPos>
+                    </Children>
+                  </WidgetGroup><!-- Title / PlayPos -->
+
+                  <WidgetGroup><!-- Artist / Key / BPM -->
+                    <Layout>horizontal</Layout>
+                    <Size>200me,25f</Size>
+                    <Children>
+                      <TrackProperty>
+                        <TooltipId>track_title</TooltipId>
+                        <ObjectName>ArtistTextSmall</ObjectName>
+                        <Size>96me,25f</Size>
+                        <Property>artist</Property>
+                        <Alignment>left</Alignment>
+                        <Elide>right</Elide>
+                        <Channel><Variable name="ChanNum"/></Channel>
+                      </TrackProperty>
+
+                      <Key>
+                        <TooltipId>visual_key</TooltipId>
+                        <ObjectName>KeyTextSmall</ObjectName>
+                        <Channel><Variable name="ChanNum"/></Channel>
+                        <Size>44min,25f</Size>
+                        <Alignment>center</Alignment>
+                        <Elide>right</Elide>
+                        <Connection>
+                          <ConfigKey><Variable name="Group"/>,visual_key</ConfigKey>
+                        </Connection>
+                      </Key>
+
+                      <NumberBpm>
+                        <ObjectName>BpmTextSmall</ObjectName>
+                        <TooltipId>visual_bpm</TooltipId>
+                        <Size>60f,25f</Size>
+                        <Alignment>right</Alignment>
+                        <Channel><Variable name="ChanNum" /></Channel>
+                        <NumberOfDigits>2</NumberOfDigits>
+                        <Connection>
+                          <ConfigKey><Variable name="Group"/>,visual_bpm</ConfigKey>
+                        </Connection>
+                      </NumberBpm>
+
+                    </Children>
+                  </WidgetGroup><!-- Artist / Key / BPM -->
+
+                </Children>
+              </WidgetGroup><!-- DeckMini_TitlePlayPosKeyBPM -->
+
+            </Children>
+          </WidgetGroup>
+        </Children>
+      </WidgetGroup><!-- DeckMiniN -->
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/decks/deck_settings.xml b/res/skins/LateNight/decks/deck_settings.xml
new file mode 100644
index 000000000000..362501e0a664
--- /dev/null
+++ b/res/skins/LateNight/decks/deck_settings.xml
@@ -0,0 +1,93 @@
+<Template>
+  <WidgetGroup>
+    <Layout>vertical</Layout>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>DeckSettings</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>f,min</SizePolicy>
+        <Children>
+
+          <WidgetGroup><Size>0min,0me</Size></WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>Stars</ObjectName>
+            <Layout>vertical</Layout>
+            <Size>0min,15f</Size>
+            <Children>
+              <StarRating>
+                <Size>0min,15f</Size>
+                <Alignment>center</Alignment>
+                <TooltipId>starrating</TooltipId>
+                <Channel><Variable name="ChanNum"/></Channel>
+              </StarRating>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup><Size>0min,1me</Size></WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>DeckSettingsGrid</ObjectName>
+            <Layout>horizontal</Layout>
+            <Children>
+
+              <Template src="skin:/controls/button_2state.xml">
+                <SetVariable name="TooltipId">slip_mode</SetVariable>
+                <SetVariable name="ObjectName">SlipmodeButton<Variable name="DeckGroup"/></SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="Group"/>,slip_enabled</SetVariable>
+                <SetVariable name="Size">21f,18f</SetVariable>
+              </Template>
+
+              <Template src="skin:/controls/button_2state.xml">
+                <SetVariable name="TooltipId">quantize</SetVariable>
+                <SetVariable name="ObjectName">QuantizeButton<Variable name="DeckGroup"/></SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="Group"/>,quantize</SetVariable>
+                <SetVariable name="Size">21f,18f</SetVariable>
+              </Template>
+
+              <Template src="skin:/controls/button_1state_right.xml">
+                <SetVariable name="TooltipId">beats_translate_curpos</SetVariable>
+                <SetVariable name="ObjectName">CurposButton<Variable name="DeckGroup"/></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">21f,18f</SetVariable>
+              </Template>
+
+            </Children>
+          </WidgetGroup><!-- DeckSettingsGrid row 1 -->
+
+          <WidgetGroup>
+            <ObjectName>DeckSettingsGrid</ObjectName>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Template src="skin:/controls/button_1state.xml">
+                <SetVariable name="TooltipId">eject</SetVariable>
+                <SetVariable name="ObjectName">EjectButton<Variable name="DeckGroup"/></SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="Group"/>,eject</SetVariable>
+                <SetVariable name="Size">21f,18f</SetVariable>
+              </Template>
+
+              <Template src="skin:/controls/button_2state.xml">
+                <SetVariable name="TooltipId">repeat</SetVariable>
+                <SetVariable name="ObjectName">RepeatButton<Variable name="DeckGroup"/></SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="Group"/>,repeat</SetVariable>
+                <SetVariable name="Size">21f,18f</SetVariable>
+              </Template>
+
+              <Template src="skin:/controls/button_2state.xml">
+                <SetVariable name="TooltipId">keylock</SetVariable>
+                <SetVariable name="ObjectName">KeylockButton<Variable name="DeckGroup"/></SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="Group"/>,keylock</SetVariable>
+                <SetVariable name="Size">21f,18f</SetVariable>
+              </Template>
+
+            </Children>
+          </WidgetGroup><!-- /DeckSettingsGrid row 2 -->
+
+          <WidgetGroup><Size>0min,0me</Size></WidgetGroup>
+
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/decks/deck_singletons.xml b/res/skins/LateNight/decks/deck_singletons.xml
new file mode 100644
index 000000000000..453811903ab9
--- /dev/null
+++ b/res/skins/LateNight/decks/deck_singletons.xml
@@ -0,0 +1,63 @@
+<Template>
+
+<!-- We need these singletons first because they're -->
+    <!-- used in all three deck variants -->
+    <SingletonDefinition>
+      <ObjectName>SpinnyCoverart<Variable name="ChanNum"/></ObjectName>
+      <Children>
+        <Template src="skin:spinny_coverart.xml"/>
+      </Children>
+    </SingletonDefinition>
+
+    <!-- ...used in full & compact deck, minimal deck has its own instance
+         with smaller labels. -->
+    <SingletonDefinition>
+      <ObjectName>DeckOverview<Variable name="ChanNum"/></ObjectName>
+      <Children>
+        <Template src="skin:/decks/overview.xml">
+          <SetVariable name="OverviewFontSize"><Variable name="OverviewFontSizeDeck"/></SetVariable>
+        </Template>
+      </Children>
+    </SingletonDefinition>
+
+    <!-- ...used in full & compact deck. -->
+    <SingletonDefinition>
+      <ObjectName>DeckSettings<Variable name="ChanNum"/></ObjectName>
+      <Children>
+        <Template src="skin:/decks/deck_settings.xml"/>
+      </Children>
+    </SingletonDefinition>
+
+    <!-- ...used in full & compact deck -->
+    <SingletonDefinition>
+      <ObjectName>KeyControls<Variable name="ChanNum"/></ObjectName>
+      <Children>
+        <Template src="skin:/decks/key_controls.xml"/>
+      </Children>
+    </SingletonDefinition>
+
+<!-- Decks -->
+    <!-- minimal deck. used in deck stack and above library -->
+    <SingletonDefinition>
+      <ObjectName>Deck<Variable name="ChanNum"/>_Mini</ObjectName>
+      <Children>
+        <Template src="skin:/decks/deck_mini.xml"/>
+      </Children>
+    </SingletonDefinition>
+
+    <!-- Compact deck. used once in deck stack -->
+    <SingletonDefinition>
+      <ObjectName>Deck<Variable name="ChanNum"/>_Compact</ObjectName>
+      <Children>
+        <Template src="skin:/decks/deck_compact.xml"/>
+      </Children>
+    </SingletonDefinition>
+
+    <!-- Minimal deck, used in deck stack and above library -->
+    <SingletonDefinition>
+      <ObjectName>Deck<Variable name="ChanNum"/>_Full</ObjectName>
+      <Children>
+        <Template src="skin:/decks/deck_full.xml"/>
+      </Children>
+  </SingletonDefinition>
+</Template>
diff --git a/res/skins/LateNight/decks/decks_left.xml b/res/skins/LateNight/decks/decks_left.xml
new file mode 100644
index 000000000000..8b44b3f82491
--- /dev/null
+++ b/res/skins/LateNight/decks/decks_left.xml
@@ -0,0 +1,29 @@
+<Template>
+  <SetVariable name="Type">deck</SetVariable>
+  <WidgetGroup>
+    <ObjectName>DecksLeft</ObjectName>
+    <Layout>vertical</Layout>
+    <SizePolicy>me,min</SizePolicy>
+    <Children>
+
+      <SingletonContainer>
+        <ObjectName>Deck1_Src</ObjectName>
+      </SingletonContainer>
+
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <SizePolicy>me,min</SizePolicy>
+        <Children>
+          <SingletonContainer>
+            <ObjectName>Deck3_Src</ObjectName>
+          </SingletonContainer>
+        </Children>
+        <Connection>
+          <ConfigKey>[Skin],show_4decks</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/decks/decks_right.xml b/res/skins/LateNight/decks/decks_right.xml
new file mode 100644
index 000000000000..06d11042b2d4
--- /dev/null
+++ b/res/skins/LateNight/decks/decks_right.xml
@@ -0,0 +1,29 @@
+<Template>
+  <SetVariable name="Type">deck</SetVariable>
+  <WidgetGroup>
+    <ObjectName>DecksRight</ObjectName>
+    <Layout>vertical</Layout>
+    <SizePolicy>me,min</SizePolicy>
+    <Children>
+
+      <SingletonContainer>
+        <ObjectName>Deck2_Src</ObjectName>
+      </SingletonContainer>
+
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <SizePolicy>me,min</SizePolicy>
+        <Children>
+          <SingletonContainer>
+            <ObjectName>Deck4_Src</ObjectName>
+          </SingletonContainer>
+        </Children>
+        <Connection>
+          <ConfigKey>[Skin],show_4decks</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+    </Children>
+  </WidgetGroup><!-- DecksRight -->
+</Template>
diff --git a/res/skins/LateNight/decks/key_controls.xml b/res/skins/LateNight/decks/key_controls.xml
new file mode 100644
index 000000000000..32172a08355d
--- /dev/null
+++ b/res/skins/LateNight/decks/key_controls.xml
@@ -0,0 +1,99 @@
+<Template>
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <SizePolicy>p,min</SizePolicy>
+    <MaximumSize>111,</MaximumSize>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>KeyControls</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>me,min</SizePolicy>
+        <MaximumSize>111,</MaximumSize>
+        <Children>
+          <Template src="skin:/controls/button_2state_right.xml">
+            <SetVariable name="TooltipId">sync_reset_key</SetVariable>
+            <SetVariable name="ObjectName">KeyMatchReset</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>
+
+          <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 can't be used to highlight if the key is
+                offset from original file key
+            <Connection>
+              <ConfigKey><Variable name="Group"/>,visual_key</ConfigKey>
+              <Transform><Not><Variable name="Group"/>,file_key</Not></Transform>
+              <BindProperty>highlight</BindProperty>
+            </Connection> -->
+          </Key>
+
+          <!-- Another idea to group all keycontrols
+          <WidgetGroup>
+            <ObjectName>KeyTextBox</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>me,f</SizePolicy>
+            <MinimumSize>30,20</MinimumSize>
+            <MaximumSize>65,20</MaximumSize>
+            <Children>
+              <Key>
+                <ObjectName>KeyText</ObjectName>
+                <TooltipId>track_key</TooltipId>
+                <Group><Variable name="Group"/></Group>
+                <MinimumSize>30,18</MinimumSize>
+                <MaximumSize>65,18</MaximumSize>
+                <SizePolicy>me,f</SizePolicy>
+                <Elide>right</Elide>
+                <Connection>
+                  <ConfigKey><Variable name="Group"/>,visual_key</ConfigKey>
+                </Connection>
+                <Connection>
+                  <ConfigKey><Variable name="Group"/>,visual_key</ConfigKey>
+                  <Transform><Not><Variable name="Group"/>,file_key</Not></Transform>
+                  <BindProperty>highlight</BindProperty>
+                </Connection>
+              </Key>
+            </Children>
+          </WidgetGroup>KeyTextBox -->
+
+          <WidgetGroup>
+            <ObjectName>KeyUpDown</ObjectName>
+            <Layout>vertical</Layout>
+            <Size>20f,20f</Size>
+            <Children>
+              <Template src="skin:/controls/button_2state_right.xml">
+                <SetVariable name="TooltipId">pitch_up</SetVariable>
+                <SetVariable name="ObjectName">KeyUp</SetVariable>
+                <SetVariable name="Size">20f,10f</SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="Group"/>,pitch_up</SetVariable>
+                <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,pitch_up_small</SetVariable>
+              </Template>
+
+              <Template src="skin:/controls/button_2state_right.xml">
+                <SetVariable name="TooltipId">pitch_down</SetVariable>
+                <SetVariable name="ObjectName">KeyDown</SetVariable>
+                <SetVariable name="Size">20f,10f</SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="Group"/>,pitch_down</SetVariable>
+                <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,pitch_down_small</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup><!-- KeyUpDown -->
+
+        </Children>
+      </WidgetGroup><!-- KeyControls -->
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/decks/overview.xml b/res/skins/LateNight/decks/overview.xml
new file mode 100644
index 000000000000..a863a986f0f3
--- /dev/null
+++ b/res/skins/LateNight/decks/overview.xml
@@ -0,0 +1,110 @@
+<Template>
+  <Overview>
+    <TooltipId>waveform_overview</TooltipId>
+    <Size>150me,20me</Size>
+    <Group><Variable name="Group"/></Group>
+    <Connection>
+      <ConfigKey><Variable name="Group"/>,playposition</ConfigKey>
+    </Connection>
+    <BgColor><Variable name="BgColor"/></BgColor>
+    <SignalColor><Variable name="SignalColor"/></SignalColor>
+    <SignalRGBHighColor><Variable name="SignalRGBHighColor"/></SignalRGBHighColor>
+    <SignalRGBMidColor><Variable name="SignalRGBMidColor"/></SignalRGBMidColor>
+    <SignalRGBLowColor><Variable name="SignalRGBLowColor"/></SignalRGBLowColor>
+    <PlayedOverlayColor><Variable name="PlayedOverlayColor"/></PlayedOverlayColor>
+    <PlayPosColor><Variable name="PlayPosColor"/></PlayPosColor>
+    <EndOfTrackColor><Variable name="EndOfTrackColor"/></EndOfTrackColor>
+    <LabelFontSize><Variable name="OverviewFontSize"/></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>
+      <TextColor>#FFFFFF</TextColor>
+      <Text> %1 </Text>
+    </DefaultMark>
+    <!-- Cue -->
+    <Mark>
+      <Control>cue_point</Control>
+      <Text> C </Text>
+      <Align>top|right</Align>
+      <Color><Variable name="CueColor"/></Color>
+      <TextColor>#FFFFFF</TextColor>
+    </Mark>
+    <!-- Loop -->
+    <MarkRange>
+      <StartControl>loop_start_position</StartControl>
+      <EndControl>loop_end_position</EndControl>
+      <EnabledControl>loop_enabled</EnabledControl>
+      <Color><Variable name="LoopColor"/></Color>
+      <DisabledColor>#FFFFFF</DisabledColor>
+    </MarkRange>
+    <Mark>
+      <Control>loop_start_position</Control>
+      <!--Text>IN</Text-->
+      <Align>bottom|right</Align>
+      <Color><Variable name="LoopColor"/></Color>
+      <TextColor>#FFFFFF</TextColor>
+    </Mark>
+    <Mark>
+      <Control>loop_end_position</Control>
+      <!--Text>OUT</Text-->
+      <Align>bottom|right</Align>
+      <Color><Variable name="LoopColor"/></Color>
+      <TextColor>#FFFFFF</TextColor>
+    </Mark>
+    <!-- Intro -->
+    <MarkRange>
+      <StartControl>intro_start_position</StartControl>
+      <EndControl>intro_end_position</EndControl>
+      <Color><Variable name="IntroOutroColor"/></Color>
+      <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
+      <DurationTextColor>#ffffff</DurationTextColor>
+      <DurationTextLocation>after</DurationTextLocation>
+    </MarkRange>
+    <Mark>
+      <Control>intro_start_position</Control>
+      <Text></Text>
+      <Align>top|right</Align>
+      <Color><Variable name="IntroOutroColor"/></Color>
+      <TextColor>#FFFFFF</TextColor>
+      <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
+    </Mark>
+    <Mark>
+      <Control>intro_end_position</Control>
+      <Text>&#9698;</Text>
+      <Align>top|left</Align>
+      <Color><Variable name="IntroOutroColor"/></Color>
+      <TextColor>#FFFFFF</TextColor>
+      <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
+    </Mark>
+    <!-- Outro -->
+    <MarkRange>
+      <StartControl>outro_start_position</StartControl>
+      <EndControl>outro_end_position</EndControl>
+      <Color><Variable name="IntroOutroColor"/></Color>
+      <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
+      <DurationTextColor>#ffffff</DurationTextColor>
+      <DurationTextLocation>before</DurationTextLocation>
+    </MarkRange>
+    <Mark>
+      <Control>outro_start_position</Control>
+      <Text>&#9699;</Text>
+      <Align>top|right</Align>
+      <Color><Variable name="IntroOutroColor"/></Color>
+      <TextColor>#FFFFFF</TextColor>
+      <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
+    </Mark>
+    <Mark>
+      <Control>outro_end_position</Control>
+      <Text></Text>
+      <Align>top|left</Align>
+      <Color><Variable name="IntroOutroColor"/></Color>
+      <TextColor>#FFFFFF</TextColor>
+      <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
+    </Mark>
+  </Overview>
+</Template>
diff --git a/res/skins/LateNight/decks/preview_deck.xml b/res/skins/LateNight/decks/preview_deck.xml
new file mode 100644
index 000000000000..98685ce88a12
--- /dev/null
+++ b/res/skins/LateNight/decks/preview_deck.xml
@@ -0,0 +1,173 @@
+<Template>
+  <SetVariable name="Group">[PreviewDeck1]</SetVariable>
+  <SetVariable name="Type">preview</SetVariable>
+
+  <!-- This wrapper makes the PreviewDeck borders work correctly -->
+  <WidgetGroup>
+    <Layout>vertical</Layout>
+    <SizePolicy>me,max</SizePolicy>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>PreviewDeck</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <MinimumSize>100,</MinimumSize>
+        <Children>
+
+          <WidgetGroup>
+            <ObjectName>PreviewDeckLeftPart</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+
+              <WidgetGroup>
+                <ObjectName>PreviewTitleEjectRow</ObjectName>
+                <Layout>horizontal</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+
+                  <WidgetGroup>
+                    <ObjectName>PreviewDeckTextBoxBox</ObjectName>
+                    <Layout>stacked</Layout>
+                    <SizePolicy>i,min</SizePolicy>
+                    <Children>
+                      <WidgetGroup><!-- Title + BPM -->
+                        <Layout>horizontal</Layout>
+                        <SizePolicy>min,min</SizePolicy>
+                        <Children>
+                          <Text>
+                            <ObjectName>PreviewTitle</ObjectName>
+                            <TooltipId>text</TooltipId>
+                            <Size>0me,20f</Size>
+                            <Group><Variable name="Group"/></Group>
+                            <Elide>right</Elide>
+                          </Text>
+                          <Number>
+                            <ObjectName>PreviewBPM</ObjectName>
+                            <TooltipId>visual_bpm</TooltipId>
+                            <Size>45f,20f</Size>
+                            <Group><Variable name="Group"/></Group>
+                            <!--CSS alignments not respected, bug lp:605530 -->
+                            <Alignment>right</Alignment>
+                            <Connection>
+                              <ConfigKey><Variable name="Group"/>,visual_bpm</ConfigKey>
+                            </Connection>
+                            <Connection>
+                              <ConfigKey><Variable name="Group"/>,track_loaded</ConfigKey>
+                              <BindProperty>visible</BindProperty>
+                            </Connection>
+                          </Number>
+                        </Children>
+                      </WidgetGroup>
+                      <!-- "Preview" label when preview deck is empty.
+                        It's underneath so the empty title is still drag'n'drop target -->
+                      <Label>
+                        <ObjectName>PreviewLabel</ObjectName>
+                        <Size>0me,20f</Size>
+                        <Text>Preview</Text>
+                        <Connection>
+                          <ConfigKey><Variable name="Group"/>,track_loaded</ConfigKey>
+                          <Transform><Not/></Transform>
+                          <BindProperty>visible</BindProperty>
+                        </Connection>
+                      </Label>
+                    </Children>
+                  </WidgetGroup><!-- PreviewDeckTextBox -->
+
+                  <WidgetGroup>
+                    <ObjectName>PreviewEjectBox</ObjectName>
+                    <Layout>horizontal</Layout>
+                    <SizePolicy>min,min</SizePolicy>
+                    <Children>
+                      <Template src="skin:/controls/button_1state.xml">
+                        <SetVariable name="TooltipId">eject</SetVariable>
+                        <SetVariable name="ObjectName">EjectButton12</SetVariable>
+                        <SetVariable name="BtnType"></SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="Group"/>,eject</SetVariable>
+                        <SetVariable name="Size">21f,18f</SetVariable>
+                      </Template>
+                    </Children>
+                    <Connection>
+                      <ConfigKey><Variable name="Group"/>,track_loaded</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup><!-- PreviewEjectBox -->
+                </Children>
+              </WidgetGroup><!-- PreviewTitleEjectRow -->
+
+              <WidgetGroup>
+                <ObjectName>PreviewPlayOverview</ObjectName>
+                <Layout>horizontal</Layout>
+                <SizePolicy>me,me</SizePolicy>
+                <Children>
+                  <WidgetGroup>
+                    <ObjectName>PreviewPlayBox</ObjectName>
+                    <Layout>horizontal</Layout>
+                    <SizePolicy>min,min</SizePolicy>
+                    <Children>
+                      <Template src="skin:/controls/button_2state_right_display.xml">
+                        <SetVariable name="TooltipId">cue_gotoandplay_cue_default</SetVariable>
+                        <SetVariable name="ObjectName">PlayPreview</SetVariable>
+                        <SetVariable name="Size">34f,34f</SetVariable>
+                        <SetVariable name="BtnType">embedded</SetVariable>
+                        <SetVariable name="BtnSize">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><!-- PreviewPlayBox -->
+
+                  <WidgetGroup>
+                    <ObjectName>OverviewBox</ObjectName>
+                    <Layout>vertical</Layout>
+                    <Size>0me,34f</Size>
+                    <Children>
+                      <Template src="skin:/decks/overview.xml">
+                        <SetVariable name="OverviewFontSize"><Variable name="OverviewFontSizePreview"/></SetVariable>
+                      </Template>
+                    </Children>
+                    <Connection>
+                      <ConfigKey><Variable name="Group"/>,track_loaded</ConfigKey>
+                      <BindProperty>highlight</BindProperty>
+                    </Connection>
+                  </WidgetGroup><!-- OverviewBox -->
+                </Children>
+              </WidgetGroup><!-- PreviewPlayOverview -->
+            </Children>
+          </WidgetGroup><!-- PreviewDeckLeftPart -->
+
+          <WidgetGroup>
+            <ObjectName>PreviewVuMeter</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <Template src="skin:/mixer/vumeter_single.xml">
+                <SetVariable name="ChannelType">preview</SetVariable>
+                <SetVariable name="VuSize">preview</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+          <SliderComposed>
+            <TooltipId>pregain</TooltipId>
+            <Size>10f,54f</Size>
+            <Handle scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/knob_volume_previewdeck.svg</Handle>
+            <Slider>skin:/<Variable name="SliderScheme"/>/sliders/slider_volume_previewdeck.svg</Slider>
+            <Horizontal>false</Horizontal>
+            <Connection>
+              <ConfigKey><Variable name="Group"/>,pregain</ConfigKey>
+            </Connection>
+          </SliderComposed>
+
+        </Children>
+      </WidgetGroup><!-- PreviewDeck -->
+
+    </Children>
+    <Connection>
+      <ConfigKey>[PreviewDeck],show_previewdeck</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/decks/rate_controls.xml b/res/skins/LateNight/decks/rate_controls.xml
new file mode 100644
index 000000000000..540fdfd6d960
--- /dev/null
+++ b/res/skins/LateNight/decks/rate_controls.xml
@@ -0,0 +1,242 @@
+<Template>
+  <SetVariable name="BtnType"><Variable name="TopRegion_BtnType"/></SetVariable>
+  <SetVariable name="BtnSize">square</SetVariable>
+
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <SizePolicy>min,me</SizePolicy>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>DeckRateSeparator</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,me</SizePolicy>
+        <Children/>
+       </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>RateContainer</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,me</SizePolicy>
+        <Children>
+
+          <WidgetGroup><!-- BPM + rate -->
+            <ObjectName>BpmContainer</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,me</SizePolicy>
+            <MaximumSize>,46</MaximumSize>
+            <Children>
+              <WidgetGroup><!-- BpmContainer + Tap overlay -->
+                <ObjectName>AlignCenter</ObjectName>
+                <Layout>stacked</Layout>
+                <Size>56f,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>
+                    <ObjectName>BpmTap</ObjectName>
+                    <Size>56f,22f</Size>
+                    <NumberStates>1</NumberStates>
+                    <State>
+                      <Number>0</Number>
+                    </State>
+                    <State>
+                      <Number>1</Number>
+                    </State>
+                    <Connection>
+                      <ConfigKey><Variable name="Group"/>,bpm_tap</ConfigKey>
+                    </Connection>
+                  </PushButton>
+                  <NumberBpm>
+                    <ObjectName>BpmText</ObjectName>
+                    <TooltipId>visual_bpm</TooltipId>
+                    <Size>56f,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>
+              </NumberRate>
+            </Children>
+          </WidgetGroup><!-- BPM + rate -->
+
+          <WidgetGroup>
+            <ObjectName>SyncBox</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <Template src="skin:/controls/button_2state_right.xml">
+                <SetVariable name="TooltipId">sync_enabled</SetVariable>
+                <SetVariable name="ObjectName">SyncDeck</SetVariable>
+                <SetVariable name="Size">48f,22f</SetVariable>
+                <SetVariable name="BtnSize">sync</SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="Group"/>,sync_enabled</SetVariable>
+                <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,beatsync_tempo</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup><Size>0min,0me</Size></WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>RateControls</ObjectName>
+            <SizePolicy>min,min</SizePolicy>
+            <Layout>horizontal</Layout>
+            <Children>
+              <WidgetGroup>
+                <ObjectName></ObjectName>
+                <Size>50f,113f</Size>
+                <Children>
+                  <Label>
+                    <ObjectName>RateCenter</ObjectName>
+                    <Size>5f,5f</Size>
+                    <Pos>2,55</Pos>
+                    <Connection>
+                      <ConfigKey><Variable name="Group"/>,rate</ConfigKey>
+                      <Transform><IsEqual>0.5</IsEqual></Transform>
+                      <BindProperty>highlight</BindProperty>
+                    </Connection>
+                  </Label>
+                  <SliderComposed>
+                    <ObjectName>RateSlider</ObjectName>
+                    <Size>40f,113f</Size>
+                    <Pos>5,0</Pos>
+                    <TooltipId>rate</TooltipId>
+                    <Handle scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/knob_pitch_deck.svg</Handle>
+                    <Slider scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/slider_pitch_deck.svg</Slider>
+                    <Horizontal>false</Horizontal>
+                    <BarWidth><Variable name="BarWidth"/></BarWidth>
+                    <BarMargins><Variable name="BarMarginPitch"/></BarMargins>
+                    <BarColor><Variable name="BarColorPitch"/>
+                    </BarColor><BarRoundCaps>true</BarRoundCaps>
+                    <BarAxisPos>20.0</BarAxisPos>
+                    <BarUnipolar>false</BarUnipolar>
+                    <Connection>
+                      <ConfigKey><Variable name="Group"/>,rate</ConfigKey>
+                    </Connection>
+                  </SliderComposed>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup><!-- RateButtons for different rate directions -->
+                <ObjectName>RateButtons</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                  <WidgetGroup><Size>0min,1f</Size></WidgetGroup>
+                  <WidgetGroup><!-- Up = faster -->
+                    <ObjectName>AlignLeft</ObjectName>
+                    <Layout>vertical</Layout>
+                    <SizePolicy>min,min</SizePolicy>
+                    <Children>
+                      <Template src="skin:/controls/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:/controls/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:/controls/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:/controls/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><!-- Up = slower -->
+                    <Layout>vertical</Layout>
+                    <SizePolicy>min,min</SizePolicy>
+                    <Children>
+                      <Template src="skin:/controls/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:/controls/button_1state_right.xml">
+                        <SetVariable name="TooltipId">rate_temp_down_rate_temp_down_small</SetVariable>
+                        <SetVariable name="ObjectName">RateTempDownRev</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:/controls/button_1state_right.xml">
+                        <SetVariable name="TooltipId">rate_temp_up_rate_temp_up_small</SetVariable>
+                        <SetVariable name="ObjectName">RateTempUpRev</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:/controls/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>[Skin],show_rate_control_buttons</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup><!-- RateButtons for different rate directions -->
+            </Children>
+          </WidgetGroup><!-- RateControls -->
+
+          <WidgetGroup><Size>0min,0me</Size></WidgetGroup>
+
+        </Children>
+      </WidgetGroup><!-- RateContainer -->
+
+    </Children>
+    <Connection>
+      <ConfigKey persist="true">[Skin],show_rate_controls</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/decks/rate_controls_compact.xml b/res/skins/LateNight/decks/rate_controls_compact.xml
new file mode 100644
index 000000000000..7750606703bc
--- /dev/null
+++ b/res/skins/LateNight/decks/rate_controls_compact.xml
@@ -0,0 +1,210 @@
+<Template>
+  <SetVariable name="BtnType"><Variable name="TopRegion_BtnType"/></SetVariable>
+  <SetVariable name="BtnSize">square</SetVariable>
+
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <SizePolicy>min,min</SizePolicy>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>DeckRateSeparator</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,me</SizePolicy>
+        <Children/>
+       </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>RateContainerCompact</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+
+          <WidgetGroup><!-- BPM + rate -->
+            <ObjectName>BpmContainer</ObjectName>
+            <Layout>vertical</Layout>
+            <Size>60f,39f</Size>
+            <Children>
+              <WidgetGroup><!-- BpmContainer + Tap overlay -->
+                <ObjectName>AlignCenter</ObjectName>
+                <Layout>stacked</Layout>
+                <Size>60f,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>
+                    <ObjectName>BpmTap</ObjectName>
+                    <Size>60f,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>60f,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>
+              </NumberRate>
+            </Children>
+          </WidgetGroup><!-- BPM + rate -->
+
+          <WidgetGroup><Size>0min,0me</Size></WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>RateControls</ObjectName>
+            <SizePolicy>min,min</SizePolicy>
+            <Layout>horizontal</Layout>
+            <Children>
+              <!-- show_sync_button_compact -->
+              <WidgetGroup>
+                <Connection>
+                  <ConfigKey persist="true">[LateNight],show_sync_button_compact</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+                <SizePolicy>min,min</SizePolicy>
+                <Layout>vertical</Layout>
+                <Children>
+
+                  <WidgetGroup>
+                    <ObjectName>SyncBoxCompact</ObjectName>
+                    <Layout>horizontal</Layout>
+                    <SizePolicy>min,min</SizePolicy>
+                    <Children>
+                      <Template src="skin:/controls/button_2state_right.xml">
+                        <SetVariable name="TooltipId">sync_enabled</SetVariable>
+                        <SetVariable name="ObjectName">SyncDeck</SetVariable>
+                        <SetVariable name="Size">48f,22f</SetVariable>
+                        <SetVariable name="BtnType"><Variable name="TopRegion_BtnType"/></SetVariable>
+                        <SetVariable name="BtnSize">sync</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="Group"/>,sync_enabled</SetVariable>
+                        <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,beatsync_tempo</SetVariable>
+                      </Template>
+                    </Children>
+                  </WidgetGroup>
+
+                  <WidgetGroup>
+                    <ObjectName>AlignCenter</ObjectName>
+                    <SizePolicy>min,min</SizePolicy>
+                    <Layout>vertical</Layout>
+                    <Children>
+                      <WidgetGroup><!-- Rate slider + center indicator -->
+                        <ObjectName></ObjectName>
+                        <Size>50f,79f</Size>
+                        <Children>
+                          <Label>
+                            <ObjectName>RateCenter</ObjectName>
+                            <Size>5f,5f</Size>
+                            <Pos>2,37</Pos>
+                            <Connection>
+                              <ConfigKey><Variable name="Group"/>,rate</ConfigKey>
+                              <Transform><IsEqual>0.5</IsEqual></Transform>
+                              <BindProperty>highlight</BindProperty>
+                            </Connection>
+                          </Label>
+                          <SliderComposed>
+                            <ObjectName>RateSlider</ObjectName>
+                            <Size>40f,79f</Size>
+                            <Pos>5,0</Pos>
+                            <TooltipId>rate</TooltipId>
+                            <Handle scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/knob_pitch_deck.svg</Handle>
+                            <Slider scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/slider_pitch_deck_compact_sync.svg</Slider>
+                            <Horizontal>false</Horizontal>
+                            <BarWidth><Variable name="BarWidth"/></BarWidth>
+                            <BarMargins><Variable name="BarMarginPitch"/></BarMargins>
+                            <BarColor><Variable name="BarColorPitch"/></BarColor>
+                            <BarRoundCaps>true</BarRoundCaps>
+                            <BarAxisPos>20.0</BarAxisPos>
+                            <BarUnipolar>false</BarUnipolar>
+                            <Connection>
+                              <ConfigKey><Variable name="Group"/>,rate</ConfigKey>
+                            </Connection>
+                          </SliderComposed>
+                        </Children>
+                      </WidgetGroup><!-- Rate slider + center indicator -->
+                    </Children>
+                  </WidgetGroup>
+                </Children>
+              </WidgetGroup><!-- show_sync_button_compact -->
+
+              <WidgetGroup><!-- !show_sync_button_compact -->
+                <ObjectName>AlignCenter</ObjectName>
+                <Connection>
+                  <ConfigKey persist="true">[LateNight],show_sync_button_compact</ConfigKey>
+                  <Transform><Not/></Transform>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+                <SizePolicy>min,min</SizePolicy>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <WidgetGroup><!-- Rate slider + center indicator -->
+                    <ObjectName></ObjectName>
+                    <Size>50f,95f</Size>
+                    <Children>
+                      <Label>
+                        <ObjectName>RateCenter</ObjectName>
+                        <Size>5f,5f</Size>
+                        <Pos>2,45</Pos>
+                        <Connection>
+                          <ConfigKey><Variable name="Group"/>,rate</ConfigKey>
+                          <Transform><IsEqual>0.5</IsEqual></Transform>
+                          <BindProperty>highlight</BindProperty>
+                        </Connection>
+                      </Label>
+
+                      <SliderComposed>
+                        <ObjectName>RateSlider</ObjectName>
+                        <Size>40f,95f</Size>
+                        <Pos>5,0</Pos>
+                        <TooltipId>rate</TooltipId>
+                        <Handle scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/knob_pitch_deck.svg</Handle>
+                        <Slider scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/slider_pitch_deck_compact.svg</Slider>
+                        <Horizontal>false</Horizontal>
+                        <BarWidth><Variable name="BarWidth"/></BarWidth>
+                        <BarMargins><Variable name="BarMarginPitch"/></BarMargins>
+                        <BarColor><Variable name="BarColorPitch"/></BarColor>
+                        <BarRoundCaps>true</BarRoundCaps>
+                        <BarAxisPos>20.0</BarAxisPos>
+                        <BarUnipolar>false</BarUnipolar>
+                        <Connection>
+                          <ConfigKey><Variable name="Group"/>,rate</ConfigKey>
+                        </Connection>
+                      </SliderComposed>
+                    </Children>
+                  </WidgetGroup><!-- Rate slider + center indicator -->
+                </Children>
+              </WidgetGroup><!-- !show_sync_button_compact -->
+            </Children>
+          </WidgetGroup><!-- RateControls -->
+
+          <WidgetGroup><Size>0min,0me</Size></WidgetGroup>
+
+        </Children>
+      </WidgetGroup>
+    </Children>
+    <Connection>
+      <ConfigKey persist="true">[Skin],show_rate_controls_compact</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/decks/row_1_keyVinylFx.xml b/res/skins/LateNight/decks/row_1_keyVinylFx.xml
new file mode 100644
index 000000000000..a2634b724ab4
--- /dev/null
+++ b/res/skins/LateNight/decks/row_1_keyVinylFx.xml
@@ -0,0 +1,46 @@
+<Template>
+  <WidgetGroup>
+    <ObjectName>DeckRow_1_KeyVinylFx</ObjectName>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,max</SizePolicy>
+    <Children>
+
+      <Template src="skin:/fx/assign_buttons.xml"/>
+
+      <WidgetGroup><Size>2f,0min</Size></WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>ExpandingBottomBorder</ObjectName>
+        <SizePolicy>me,me</SizePolicy>
+        <MinimumSize>2,1</MinimumSize>
+        <Children/>
+      </WidgetGroup>
+
+      <Template src="skin:/decks/vinyl_controls.xml"/>
+
+      <WidgetGroup>
+        <ObjectName>ExpandingBottomBorder</ObjectName>
+        <SizePolicy>me,me</SizePolicy>
+        <MinimumSize>2,1</MinimumSize>
+      </WidgetGroup>
+
+      <WidgetGroup><Size>2f,0me</Size></WidgetGroup>
+
+      <WidgetGroup>
+        <SizePolicy>me,min</SizePolicy>
+        <MaximumSize>111,</MaximumSize>
+        <Layout>vertical</Layout>
+        <Children>
+          <SingletonContainer>
+            <ObjectName>KeyControls<Variable name="ChanNum"/></ObjectName>
+          </SingletonContainer>
+        </Children>
+        <Connection>
+          <ConfigKey persist="true">[Skin],show_key_controls</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+    </Children>
+  </WidgetGroup><!-- DeckRow_1_KeyVinylFx -->
+</Template>
diff --git a/res/skins/LateNight/decks/row_2_3_TitleArtistTime.xml b/res/skins/LateNight/decks/row_2_3_TitleArtistTime.xml
new file mode 100644
index 000000000000..4809479eaeb6
--- /dev/null
+++ b/res/skins/LateNight/decks/row_2_3_TitleArtistTime.xml
@@ -0,0 +1,108 @@
+<Template>
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,min</SizePolicy>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>DeckRow_2_3_ArtistTitleTime</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>i,min</SizePolicy>
+        <Children>
+
+          <WidgetGroup>
+            <ObjectName>TitleRow</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>i,min</SizePolicy>
+            <Children>
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <SizePolicy>i,min</SizePolicy>
+                <Children>
+                  <TrackProperty>
+                    <ObjectName>TitleText</ObjectName>
+                    <Size>0me,24me</Size>
+                    <TooltipId>track_title</TooltipId>
+                    <Property>titleInfo</Property>
+                    <Alignment>Left</Alignment>
+                    <Elide>right</Elide>
+                    <Channel><Variable name="ChanNum"/></Channel>
+                  </TrackProperty>
+                </Children>
+              </WidgetGroup>
+
+              <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,24me</Size>
+                    <Alignment>right</Alignment>
+                    <Channel><Variable name="ChanNum"/></Channel>
+                    <Connection>
+                      <ConfigKey><Variable name="Group"/>,playposition</ConfigKey>
+                    </Connection>
+                  </NumberPos>
+                </Children>
+                <Connection>
+                  <ConfigKey><Variable name="Group"/>,track_loaded</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup><!-- TitleRow -->
+
+          <WidgetGroup>
+            <ObjectName>ArtistRow</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>me,min</SizePolicy>
+            <Children>
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <SizePolicy>me,min</SizePolicy>
+                <Children>
+                  <TrackProperty>
+                    <ObjectName>ArtistText</ObjectName>
+                    <Size>0me,24me</Size>
+                    <TooltipId>track_artist</TooltipId>
+                    <Property>artist</Property>
+                    <Elide>right</Elide>
+                    <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>
+                    <Size>0min,24me</Size>
+                    <Property>durationFormatted</Property>
+                    <Channel>
+                      <Variable name="ChanNum"/>
+                    </Channel>
+                  </TrackProperty>
+                </Children>
+              </WidgetGroup>
+
+            </Children>
+          </WidgetGroup><!-- ArtistRow -->
+
+        </Children>
+        <Connection>
+          <ConfigKey persist="true">[Skin],show_rate_controls</ConfigKey>
+          <BindProperty>highlight</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- DeckRow_2_3_ArtistTitleTime -->
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/decks/row_2_3_TitleArtistTime_compact.xml b/res/skins/LateNight/decks/row_2_3_TitleArtistTime_compact.xml
new file mode 100644
index 000000000000..1baea80adf76
--- /dev/null
+++ b/res/skins/LateNight/decks/row_2_3_TitleArtistTime_compact.xml
@@ -0,0 +1,110 @@
+<Template>
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,min</SizePolicy>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>DeckRow_2_3_ArtistTitleTime</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>i,min</SizePolicy>
+        <Children>
+
+          <WidgetGroup>
+            <ObjectName>TitleRow</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>i,me</SizePolicy>
+            <Children>
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <SizePolicy>i,me</SizePolicy>
+                <Children>
+                  <TrackProperty>
+                    <ObjectName>TitleText</ObjectName>
+                    <Size>0me,23f</Size>
+                    <TooltipId>track_title</TooltipId>
+                    <Property>title</Property>
+                    <Alignment>Left</Alignment>
+                    <Elide>right</Elide>
+                    <Channel><Variable name="ChanNum"/></Channel>
+                  </TrackProperty>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <ObjectName>PlayPositionGutter</ObjectName>
+                <Layout>horizontal</Layout>
+                <SizePolicy>p,mme</SizePolicy>
+                <MinimumSize>80,</MinimumSize>
+                <Children>
+                  <NumberPos>
+                    <ObjectName>PlayPositionText</ObjectName>
+                    <TooltipId>track_time</TooltipId>
+                    <Size>0min,23f</Size>
+                    <Alignment>right</Alignment>
+                    <Channel><Variable name="ChanNum"/></Channel>
+                    <Connection>
+                      <ConfigKey><Variable name="Group"/>,playposition</ConfigKey>
+                    </Connection>
+                  </NumberPos>
+                </Children>
+                <Connection>
+                  <ConfigKey><Variable name="Group"/>,track_loaded</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+
+            </Children>
+          </WidgetGroup><!-- TitleRow -->
+
+          <WidgetGroup>
+            <ObjectName>ArtistRow</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>me,me</SizePolicy>
+            <Children>
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <SizePolicy>me,me</SizePolicy>
+                <Children>
+                  <TrackProperty>
+                    <ObjectName>ArtistText</ObjectName>
+                    <Size>0me,23f</Size>
+                    <TooltipId>track_artist</TooltipId>
+                    <Property>artist</Property>
+                    <Elide>right</Elide>
+                    <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>
+                    <Size>0min,23f</Size>
+                    <Property>durationFormatted</Property>
+                    <Channel>
+                      <Variable name="ChanNum"/>
+                    </Channel>
+                  </TrackProperty>
+                </Children>
+              </WidgetGroup>
+
+            </Children>
+          </WidgetGroup><!-- ArtistRow -->
+        </Children>
+        <Connection>
+          <ConfigKey persist="true">[Skin],show_rate_key_controls_compact</ConfigKey>
+          <BindProperty>highlight</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- DeckRow_2_3_ArtistTitleTime -->
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/decks/row_4_overviewSpinny.xml b/res/skins/LateNight/decks/row_4_overviewSpinny.xml
new file mode 100644
index 000000000000..3e1645cb282e
--- /dev/null
+++ b/res/skins/LateNight/decks/row_4_overviewSpinny.xml
@@ -0,0 +1,57 @@
+<Template>
+  <SetVariable name="BtnType"></SetVariable>
+
+  <WidgetGroup>
+    <ObjectName>DeckRow_4_OverviewSpinny</ObjectName>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,me</SizePolicy>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>SpinnyCoverContainer_Small</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>f,f</SizePolicy>
+        <Children>
+          <SingletonContainer>
+            <ObjectName>SpinnyCoverart<Variable name="ChanNum"/></ObjectName>
+          </SingletonContainer>
+        </Children>
+        <Connection>
+          <ConfigKey>[LateNight],show_small_spinny_cover</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- SpinnyCoverContainer_Small -->
+
+      <WidgetGroup>
+        <ObjectName>OverviewBox</ObjectName>
+        <Size>min,63me</Size>
+        <Layout>horizontal</Layout>
+        <Children>
+          <SingletonContainer>
+            <ObjectName>DeckOverview<Variable name="ChanNum"/></ObjectName>
+          </SingletonContainer>
+        </Children>
+        <Connection>
+          <ConfigKey><Variable name="Group"/>,track_loaded</ConfigKey>
+          <BindProperty>highlight</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>DeckSettingsContainer</ObjectName>
+        <SizePolicy>min,me</SizePolicy>
+        <Layout>horizontal</Layout>
+        <Children>
+          <SingletonContainer>
+            <ObjectName>DeckSettings<Variable name="ChanNum"/></ObjectName>
+          </SingletonContainer>
+        </Children>
+        <Connection>
+          <ConfigKey persist="true">[Skin],show_rate_controls</ConfigKey>
+          <BindProperty>highlight</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+    </Children>
+  </WidgetGroup><!-- DeckRow_4_OverviewSpinny -->
+</Template>
diff --git a/res/skins/LateNight/decks/row_4_overviewSpinny_compact.xml b/res/skins/LateNight/decks/row_4_overviewSpinny_compact.xml
new file mode 100644
index 000000000000..bddf9d341345
--- /dev/null
+++ b/res/skins/LateNight/decks/row_4_overviewSpinny_compact.xml
@@ -0,0 +1,57 @@
+<Template>
+  <SetVariable name="BtnType"></SetVariable>
+
+  <WidgetGroup>
+    <ObjectName>DeckRow_4_OverviewSpinny</ObjectName>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,min</SizePolicy>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>SpinnyCoverContainer_SmallCompact</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>f,f</SizePolicy>
+        <Children>
+          <SingletonContainer>
+            <ObjectName>SpinnyCoverart<Variable name="ChanNum"/></ObjectName>
+          </SingletonContainer>
+        </Children>
+        <Connection>
+          <ConfigKey>[LateNight],show_small_spinny_cover</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- SpinnyCoverContainer_SmallCompact -->
+
+      <WidgetGroup>
+        <ObjectName>OverviewBox</ObjectName>
+        <Size>min,64me</Size>
+        <Layout>horizontal</Layout>
+        <Children>
+          <SingletonContainer>
+            <ObjectName>DeckOverview<Variable name="ChanNum"/></ObjectName>
+          </SingletonContainer>
+        </Children>
+        <Connection>
+          <ConfigKey><Variable name="Group"/>,track_loaded</ConfigKey>
+          <BindProperty>highlight</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>DeckSettingsContainerCompact</ObjectName>
+        <SizePolicy>min,me</SizePolicy>
+        <Layout>horizontal</Layout>
+        <Children>
+          <SingletonContainer>
+            <ObjectName>DeckSettings<Variable name="ChanNum"/></ObjectName>
+          </SingletonContainer>
+        </Children>
+        <Connection>
+          <ConfigKey persist="true">[Skin],show_rate_key_controls_compact</ConfigKey>
+          <BindProperty>highlight</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+    </Children>
+  </WidgetGroup><!-- DeckRow_4_OverviewSpinny -->
+</Template>
diff --git a/res/skins/LateNight/decks/row_5_transportLoopJump.xml b/res/skins/LateNight/decks/row_5_transportLoopJump.xml
new file mode 100644
index 000000000000..fe7d95b1f395
--- /dev/null
+++ b/res/skins/LateNight/decks/row_5_transportLoopJump.xml
@@ -0,0 +1,356 @@
+<Template>
+  <SetVariable name="BtnType"><Variable name="SubRegion_BtnType"/></SetVariable>
+  <SetVariable name="BtnSize">square</SetVariable>
+
+  <WidgetGroup>
+    <SizePolicy>me,min</SizePolicy>
+    <Layout>horizontal</Layout>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>DeckRow_5_LoopCuesTransport</ObjectName>
+        <SizePolicy>me,min</SizePolicy>
+        <Layout>horizontal</Layout>
+        <Children>
+
+          <WidgetGroup><!-- Play, Cue, Reverse -->
+            <Layout>vertical</Layout>
+            <SizePolicy>max,min</SizePolicy>
+            <Children>
+              <WidgetGroup><!-- Reverse | Cue -->
+                <Layout>horizontal</Layout>
+                <Children>
+
+                  <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:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_medium.svg</Unpressed>
+                      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_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:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_medium_set.svg</Unpressed>
+                      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_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>
+
+                  <Template src="skin:/controls/button_1state_right.xml">
+                    <SetVariable name="TooltipId">reverse</SetVariable>
+                    <SetVariable name="ObjectName">Reverse</SetVariable>
+                    <SetVariable name="Size">26f,26f</SetVariable>
+                    <SetVariable name="BtnSize">square</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="Group"/>,reverse</SetVariable>
+                    <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,reverseroll</SetVariable>
+                  </Template>
+
+                </Children>
+              </WidgetGroup><!-- Reverse | Cue -->
+
+              <WidgetGroup><!-- Play + PlayBlink + default grey background -->
+                <Layout>stacked</Layout>
+                <Size>68f,26f</Size>
+                <Children>
+                  <Template src="skin:/controls/button_2state_right.xml">
+                    <SetVariable name="TooltipId">play_cue_set</SetVariable>
+                    <SetVariable name="ObjectName">PlayDeck</SetVariable>
+                    <SetVariable name="Size">68f,26f</SetVariable>
+                    <SetVariable name="BtnSize">play</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="Group"/>,play</SetVariable>
+                    <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,cue_set</SetVariable>
+                  </Template>
+                  <PushButton>
+                    <ObjectName>PlayIndicator</ObjectName>
+                    <Size>68f,26f</Size>
+                    <NumberStates>2</NumberStates>
+                    <Connection>
+                      <ConfigKey><Variable name="Group"/>,play_indicator</ConfigKey>
+                    </Connection>
+                  </PushButton>
+                  <WidgetGroup>
+                    <ObjectName>PlayBg</ObjectName>
+                    <Size>68f,26f</Size>
+                  </WidgetGroup>
+                </Children>
+              </WidgetGroup><!-- Play + PlayBlink + default grey background -->
+
+            </Children>
+          </WidgetGroup><!-- Play, Cue, Reverse -->
+
+          <WidgetGroup><Size>2f,0min</Size></WidgetGroup><!--  = 2-10px wide -->
+          <WidgetGroup><SizePolicy>i,min</SizePolicy><MaximumSize>8,</MaximumSize></WidgetGroup>
+
+          <WidgetGroup><!-- HotCues -->
+            <Layout>vertical</Layout>
+            <SizePolicy>max,min</SizePolicy>
+            <Children>
+              <WidgetGroup><!-- HotCues 1-2 / 1-4 -->
+                <Layout>horizontal</Layout>
+                <Children>
+
+                  <Template src="skin:/controls/button_hotcue.xml">
+                    <SetVariable name="number">1</SetVariable>
+                  </Template>
+                  <Template src="skin:/controls/button_hotcue.xml">
+                    <SetVariable name="number">2</SetVariable>
+                  </Template>
+
+                  <WidgetGroup>
+                    <Layout>horizontal</Layout>
+                    <Children>
+                      <Template src="skin:/controls/button_hotcue.xml">
+                        <SetVariable name="number">3</SetVariable>
+                      </Template>
+                      <Template src="skin:/controls/button_hotcue.xml">
+                        <SetVariable name="number">4</SetVariable>
+                      </Template>
+                    </Children>
+                    <Connection>
+                      <ConfigKey>[Skin],show_8_hotcues</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup>
+                </Children>
+              </WidgetGroup><!-- HotCues 1-2 / 1-4 -->
+
+              <!-- HotCues (3-4 / 5-8) -->
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:/controls/button_hotcue.xml">
+                    <SetVariable name="number">3</SetVariable>
+                  </Template>
+                  <Template src="skin:/controls/button_hotcue.xml">
+                    <SetVariable name="number">4</SetVariable>
+                  </Template>
+                </Children>
+                <Connection>
+                  <ConfigKey>[Skin],show_8_hotcues</ConfigKey>
+                  <Transform><Not/></Transform>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:/controls/button_hotcue.xml">
+                    <SetVariable name="number">5</SetVariable>
+                  </Template>
+                  <Template src="skin:/controls/button_hotcue.xml">
+                    <SetVariable name="number">6</SetVariable>
+                  </Template>
+                  <Template src="skin:/controls/button_hotcue.xml">
+                    <SetVariable name="number">7</SetVariable>
+                  </Template>
+                  <Template src="skin:/controls/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><Size>2f,0min</Size></WidgetGroup><!--  = 2-8px wide -->
+          <WidgetGroup><SizePolicy>i,min</SizePolicy><MaximumSize>8,</MaximumSize></WidgetGroup>
+
+          <WidgetGroup><!-- Intro + Outro -->
+            <Layout>vertical</Layout>
+            <SizePolicy>me,min</SizePolicy>
+            <MaximumSize>52,52</MaximumSize>
+            <Children>
+              <WidgetGroup><!-- Intro -->
+                <ObjectName>AlignLeftTop</ObjectName>
+                <SizePolicy>me,min</SizePolicy>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:/controls/button_special_cue.xml">
+                    <SetVariable name="CueType">intro_start</SetVariable>
+                  </Template>
+
+                  <Template src="skin:/controls/button_special_cue.xml">
+                    <SetVariable name="CueType">intro_end</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+              <WidgetGroup><!-- Outro -->
+                <ObjectName>AlignLeftTop</ObjectName>
+                <SizePolicy>me,min</SizePolicy>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:/controls/button_special_cue.xml">
+                    <SetVariable name="CueType">outro_start</SetVariable>
+                  </Template>
+
+                  <Template src="skin:/controls/button_special_cue.xml">
+                    <SetVariable name="CueType">outro_end</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+            </Children>
+            <Connection>
+              <ConfigKey>[Skin],show_intro_outro_cues</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup><!-- / Intro + Outro -->
+
+          <WidgetGroup><Size>2f,0min</Size></WidgetGroup><!--  = 2-8px wide -->
+          <WidgetGroup><SizePolicy>i,min</SizePolicy><MaximumSize>80,</MaximumSize></WidgetGroup>
+
+          <WidgetGroup><!-- Loop buttons + beatloop size spinbox -->
+            <ObjectName>LoopControls</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <MinimumSize>78,52</MinimumSize>
+            <MaximumSize>86,52</MaximumSize>
+            <Children>
+              <WidgetGroup><!-- loop enable + beatloop size -->
+                <ObjectName>AlignLeftTop</ObjectName>
+                <Layout>horizontal</Layout>
+                <SizePolicy>min,max</SizePolicy>
+                <Children>
+                  <Template src="skin:/controls/button_2state_right.xml">
+                    <SetVariable name="TooltipId">beatloop_activate</SetVariable>
+                    <SetVariable name="ObjectName">LoopActivate</SetVariable>
+                    <SetVariable name="Size">26f,26f</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>
+                    <ObjectName>Spinbox_<Variable name="BtnType"/></ObjectName>
+                    <SizePolicy>me,min</SizePolicy>
+                    <MinimumSize>46,26</MinimumSize>
+                    <MaximumSize>72,26</MaximumSize>
+                    <Value><Variable name="Group"/>,beatloop_size</Value>
+                    <Connection>
+                      <ConfigKey><Variable name="Group"/>,track_loaded</ConfigKey>
+                      <BindProperty>highlight</BindProperty>
+                    </Connection>
+                  </BeatSpinBox>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <ObjectName>AlignLeftTop</ObjectName>
+                <Layout>horizontal</Layout>
+                <SizePolicy>min,max</SizePolicy>
+                <Children>
+                  <Template src="skin:/controls/button_2state_right_display.xml">
+                    <SetVariable name="TooltipId">reloop_toggle</SetVariable>
+                    <SetVariable name="ObjectName">Reloop</SetVariable>
+                    <SetVariable name="Size">26f,26f</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>
+                  </Template>
+
+                  <Template src="skin:/controls/button_1state_right.xml">
+                    <SetVariable name="TooltipId">loop_in</SetVariable>
+                    <SetVariable name="ObjectName">LoopIn</SetVariable>
+                    <SetVariable name="Size">26f,26f</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="Group"/>,loop_in</SetVariable>
+                    <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,loop_in_goto</SetVariable>
+                  </Template>
+
+                  <Template src="skin:/controls/button_1state_right.xml">
+                    <SetVariable name="TooltipId">loop_out</SetVariable>
+                    <SetVariable name="ObjectName">LoopOut</SetVariable>
+                    <SetVariable name="Size">26f,26f</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="Group"/>,loop_out</SetVariable>
+                    <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,loop_out_goto</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup><!-- /Loop buttons + beatloop size spinbox -->
+
+          <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>BeatjumpControls</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <MinimumSize>52,52</MinimumSize>
+            <MaximumSize>60,52</MaximumSize>
+            <Children>
+              <WidgetGroup><!-- beatjump size -->
+                <ObjectName>AlignLeftTop</ObjectName>
+                <Layout>horizontal</Layout>
+                <SizePolicy>0min,26f</SizePolicy>
+                <Children>
+                  <!-- put this spacer here so BeatSpinBox expands with HiDPI scaling
+                  <WidgetGroup><Size>0f,26f</Size></WidgetGroup> -->
+                  <BeatSpinBox>
+                    <TooltipId>beatjump_size</TooltipId>
+                    <ObjectName>Spinbox_<Variable name="BtnType"/></ObjectName>
+                    <SizePolicy>me,min</SizePolicy>
+                    <MinimumSize>46,26</MinimumSize>
+                    <MaximumSize>72,26</MaximumSize>
+                    <Value><Variable name="Group"/>,beatjump_size</Value>
+                    <Connection>
+                      <ConfigKey><Variable name="Group"/>,track_loaded</ConfigKey>
+                      <BindProperty>highlight</BindProperty>
+                    </Connection>
+                  </BeatSpinBox>
+                </Children>
+              </WidgetGroup>
+              <WidgetGroup>
+                <ObjectName>AlignLeftTop</ObjectName>
+                <Layout>horizontal</Layout>
+                <SizePolicy>min,max</SizePolicy>
+                <Children>
+
+                  <Template src="skin:/controls/button_1state_right.xml">
+                    <SetVariable name="TooltipId">beatjump_backward</SetVariable>
+                    <SetVariable name="ObjectName">JumpBack</SetVariable>
+                    <SetVariable name="Size">26f,26f</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="Group"/>,beatjump_backward</SetVariable>
+                    <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,beatjump_1_backward</SetVariable>
+                  </Template>
+
+                  <Template src="skin:/controls/button_1state_right.xml">
+                    <SetVariable name="TooltipId">beatjump_forward</SetVariable>
+                    <SetVariable name="ObjectName">JumpForward</SetVariable>
+                    <SetVariable name="Size">26f,26f</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="Group"/>,beatjump_forward</SetVariable>
+                    <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,beatjump_1_forward</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup><!-- /Jump buttons + beatjump size spinbox -->
+
+          <WidgetGroup><Size>2f,0min</Size></WidgetGroup>
+          <WidgetGroup><SizePolicy>i,min</SizePolicy></WidgetGroup>
+        </Children>
+      </WidgetGroup><!-- DeckRow_5_LoopCuesTransport -->
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/decks/row_5_transportLoopJump_compact.xml b/res/skins/LateNight/decks/row_5_transportLoopJump_compact.xml
new file mode 100644
index 000000000000..dc87b3cd17fc
--- /dev/null
+++ b/res/skins/LateNight/decks/row_5_transportLoopJump_compact.xml
@@ -0,0 +1,188 @@
+<Template>
+  <SetVariable name="BtnType"><Variable name="SubRegion_BtnType"/></SetVariable>
+
+  <WidgetGroup>
+    <ObjectName>DeckRow_5_Compact</ObjectName>
+    <SizePolicy>me,min</SizePolicy>
+    <Layout>horizontal</Layout>
+    <Children>
+
+      <WidgetGroup><!-- Play, Cue, Loop, Jump, Fx1-4, VinylControls -->
+        <ObjectName>DeckRow_5_LoopCuesTransportCompact</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>p,max</SizePolicy>
+        <MaximumSize>360,</MaximumSize>
+        <Children>
+
+          <WidgetGroup><!-- Play + PlayBlink + default grey background -->
+            <Layout>stacked</Layout>
+            <Size>52f,26f</Size>
+            <Children>
+              <Template src="skin:/controls/button_2state_right_display.xml">
+                <SetVariable name="TooltipId">play_cue_default</SetVariable>
+                <SetVariable name="ObjectName">PlayDeck</SetVariable>
+                <SetVariable name="Size">52f,26f</SetVariable>
+                <SetVariable name="BtnSize">wide</SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="Group"/>,play</SetVariable>
+                <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,cue_default</SetVariable>
+              </Template>
+              <PushButton>
+                <ObjectName>PlayIndicator</ObjectName>
+                <Size>52f,26f</Size>
+                <NumberStates>2</NumberStates>
+                <Connection>
+                  <ConfigKey><Variable name="Group"/>,play_indicator</ConfigKey>
+                </Connection>
+              </PushButton>
+              <WidgetGroup>
+                <ObjectName>PlayBg</ObjectName>
+                <Size>52f,26f</Size>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup><!-- Play + PlayBlink + default grey background -->
+
+          <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:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_medium.svg</Unpressed>
+              <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_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:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_medium_set.svg</Unpressed>
+              <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_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>
+
+          <WidgetGroup>
+            <SizePolicy>me,min</SizePolicy>
+            <MinimumSize>2,</MinimumSize>
+            <MaximumSize>40,</MaximumSize>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>LoopControls</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>me,min</SizePolicy>
+            <Children>
+              <Template src="skin:/controls/button_2state_right_display.xml">
+                <SetVariable name="TooltipId">beatloop_activate</SetVariable>
+                <SetVariable name="ObjectName">LoopActivate</SetVariable>
+                <SetVariable name="Size">26f,26f</SetVariable>
+                <SetVariable name="BtnSize">square</SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="Group"/>,beatloop_activate</SetVariable>
+                <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,reloop_toggle</SetVariable>
+                <SetVariable name="ConfigKeyDisp"><Variable name="Group"/>,loop_enabled</SetVariable>
+              </Template>
+
+              <BeatSpinBox>
+                <TooltipId>beatloop_size</TooltipId>
+                <ObjectName>Spinbox_<Variable name="BtnType"/></ObjectName>
+                <SizePolicy>me,min</SizePolicy>
+                <MinimumSize>46,26</MinimumSize>
+                <MaximumSize>72,26</MaximumSize>
+                <Value><Variable name="Group"/>,beatloop_size</Value>
+                <Connection>
+                  <ConfigKey><Variable name="Group"/>,track_loaded</ConfigKey>
+                  <BindProperty>highlight</BindProperty>
+                </Connection>
+              </BeatSpinBox>
+
+              <WidgetGroup>
+                <SizePolicy>me,min</SizePolicy>
+                <MinimumSize>2,</MinimumSize>
+                <MaximumSize>20,</MaximumSize>
+              </WidgetGroup>
+
+              <BeatSpinBox>
+                <TooltipId>beatjump_size</TooltipId>
+                <ObjectName>Spinbox_<Variable name="BtnType"/></ObjectName>
+                <SizePolicy>me,min</SizePolicy>
+                <MinimumSize>46,26</MinimumSize>
+                <MaximumSize>72,26</MaximumSize>
+                <Align>center</Align>
+                <Alignment>center</Alignment>
+                <Value><Variable name="Group"/>,beatjump_size</Value>
+                <Connection>
+                  <ConfigKey><Variable name="Group"/>,track_loaded</ConfigKey>
+                  <BindProperty>highlight</BindProperty>
+                </Connection>
+              </BeatSpinBox>
+            </Children>
+            <Connection>
+              <ConfigKey persist="true">[LateNight],show_loopjump_controls_compact</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+        </Children>
+      </WidgetGroup><!-- DeckRow_5_LoopCuesTransportCompact -->
+
+      <WidgetGroup><Size>1f,0min</Size></WidgetGroup>
+      <WidgetGroup><SizePolicy>min,min</SizePolicy></WidgetGroup>
+      <WidgetGroup><Size>1f,0min</Size></WidgetGroup>
+
+      <Template src="skin:/decks/vinyl_controls.xml"/>
+
+      <WidgetGroup>
+        <SizePolicy>me,min</SizePolicy>
+        <MinimumSize>2,</MinimumSize>
+        <MaximumSize>40,</MaximumSize>
+      </WidgetGroup>
+
+      <Template src="skin:/fx/assign_buttons.xml"/>
+
+      <WidgetGroup>
+        <SizePolicy>me,min</SizePolicy>
+        <MinimumSize>2,</MinimumSize>
+        <MaximumSize>40,</MaximumSize>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <SizePolicy>me,min</SizePolicy>
+        <MaximumSize>111,</MaximumSize>
+        <Layout>vertical</Layout>
+        <Children>
+          <SingletonContainer>
+            <ObjectName>KeyControls<Variable name="ChanNum"/></ObjectName>
+          </SingletonContainer>
+        </Children>
+        <Connection>
+          <ConfigKey persist="true">[Skin],show_key_controls_compact</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+      <WidgetGroup><Size>2f,0min</Size></WidgetGroup>
+      <WidgetGroup>
+        <SizePolicy>i,min</SizePolicy>
+        <MaximumSize>5,</MaximumSize>
+      </WidgetGroup>
+
+    </Children>
+    <Connection>
+      <ConfigKey persist="true">[Skin],show_rate_key_controls_compact</ConfigKey>
+      <BindProperty>highlight</BindProperty>
+    </Connection>
+  </WidgetGroup><!-- DeckRow_5_Compact -->
+</Template>
diff --git a/res/skins/LateNight/decks/spinny_coverart.xml b/res/skins/LateNight/decks/spinny_coverart.xml
new file mode 100644
index 000000000000..f8c966241717
--- /dev/null
+++ b/res/skins/LateNight/decks/spinny_coverart.xml
@@ -0,0 +1,101 @@
+<Template>
+  <SetVariable name="Group">[Channel<Variable name="ChanNum"/>]</SetVariable>
+
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <Children>
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <SizePolicy>me,me</SizePolicy>
+        <Children>
+
+          <WidgetGroup>
+            <ObjectName>SpinnyContainer</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,me</SizePolicy>
+            <Children>
+
+              <Spinny>
+                <TooltipId>spinny</TooltipId>
+                <SizePolicy>me,me</SizePolicy>
+                <MinimumSize>40,40</MinimumSize>
+                <Group><Variable name="Group"/></Group>
+                <PathBackground scalemode="STRETCH_ASPECT">skin:/<Variable name="StyleScheme"/>/style/spinny_bg.svg</PathBackground>
+                <PathMask scalemode="STRETCH_ASPECT">skin:/<Variable name="StyleScheme"/>/style/spinny_mask_<Variable name="DeckGroup"/>.svg</PathMask>
+                <PathForeground>skin:/<Variable name="StyleScheme"/>/style/spinny_indicator.svg</PathForeground>
+                <PathGhost>skin:/<Variable name="StyleScheme"/>/style/spinny_indicator_ghost.svg</PathGhost>
+                <ShowCover>false</ShowCover>
+                <Connection>
+                  <ConfigKey persist="true">[Skin],show_coverart</ConfigKey>
+                  <Transform><Not/></Transform>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </Spinny>
+
+              <Spinny>
+                <TooltipId>spinny</TooltipId>
+                <SizePolicy>me,me</SizePolicy>
+                <MinimumSize>40,40</MinimumSize>
+                <Group><Variable name="Group"/></Group>
+                <PathBackground scalemode="STRETCH_ASPECT">skin:/<Variable name="StyleScheme"/>/style/spinny_bg.svg</PathBackground>
+                <PathMask scalemode="STRETCH_ASPECT">skin:/<Variable name="StyleScheme"/>/style/spinny_mask_<Variable name="DeckGroup"/>.svg</PathMask>
+                <PathForeground>skin:/<Variable name="StyleScheme"/>/style/spinny_indicator.svg</PathForeground>
+                <PathGhost>skin:/<Variable name="StyleScheme"/>/style/spinny_indicator_ghost.svg</PathGhost>
+                <ShowCover>true</ShowCover>
+                <Connection>
+                  <ConfigKey persist="true">[Skin],show_coverart</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </Spinny>
+
+            </Children>
+          </WidgetGroup>
+        </Children>
+        <Connection>
+          <ConfigKey persist="true">[Skin],show_spinnies</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <WidgetGroup>
+                <ObjectName>CoverArtContainer</ObjectName>
+                <Layout>horizontal</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                  <CoverArt>
+                    <TooltipId>coverart</TooltipId>
+                    <SizePolicy>me,me</SizePolicy>
+                    <MinimumSize>40,40</MinimumSize>
+                    <Group><Variable name="Group"/></Group>
+                    <DefaultCover>skin:/<Variable name="StyleScheme"/>/style/cover_default.svg</DefaultCover>
+                  </CoverArt>
+                </Children>
+              </WidgetGroup>
+            </Children>
+            <Connection>
+              <ConfigKey persist="true">[Skin],show_coverart</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+
+        </Children>
+        <Connection>
+          <ConfigKey persist="true">[Skin],show_spinnies</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+    </Children>
+  </WidgetGroup>
+
+</Template>
diff --git a/res/skins/LateNight/decks/vinyl_controls.xml b/res/skins/LateNight/decks/vinyl_controls.xml
new file mode 100644
index 000000000000..badc3532201e
--- /dev/null
+++ b/res/skins/LateNight/decks/vinyl_controls.xml
@@ -0,0 +1,89 @@
+<Template>
+  <SetVariable name="BtnType"></SetVariable>
+
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <SizePolicy>max,f</SizePolicy>
+    <Children>
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <SizePolicy>f,f</SizePolicy>
+        <Children>
+
+          <WidgetGroup><Size>2f,0min</Size></WidgetGroup>
+
+          <StatusLight>
+            <ObjectName>VinylStatus</ObjectName>
+            <Size>18f,18f</Size>
+            <TooltipId>vinylcontrol_status</TooltipId>
+            <PathStatusLight0 scalemode="STRETCH_ASPECT">skin:/<Variable name="StyleScheme"/>/style/vinyl_control_0.svg</PathStatusLight0>
+            <PathStatusLight1 scalemode="STRETCH_ASPECT">skin:/<Variable name="StyleScheme"/>/style/vinyl_control_1.svg</PathStatusLight1>
+            <PathStatusLight2 scalemode="STRETCH_ASPECT">skin:/<Variable name="StyleScheme"/>/style/vinyl_control_2.svg</PathStatusLight2>
+            <PathStatusLight3 scalemode="STRETCH_ASPECT">skin:/<Variable name="StyleScheme"/>/style/vinyl_control_3.svg</PathStatusLight3>
+            <Connection>
+              <ConfigKey><Variable name="Group"/>,vinylcontrol_status</ConfigKey>
+            </Connection>
+          </StatusLight>
+
+          <!-- increase margin -->
+          <WidgetGroup><Size>3f,0min</Size></WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>VinylControls</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:/controls/button_2state.xml">
+                <SetVariable name="TooltipId">vinylcontrol_enabled</SetVariable>
+                <SetVariable name="ObjectName">VinylButton</SetVariable>
+                <SetVariable name="Size">40f,20f</SetVariable>
+                <SetVariable name="state_0_text">&#8202;VINYL&#8202;</SetVariable>
+                <SetVariable name="state_1_text">&#8202;VINYL&#8202;</SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="Group"/>,vinylcontrol_enabled</SetVariable>
+              </Template>
+
+              <Template src="skin:/controls/button_3state_persist.xml">
+                <SetVariable name="TooltipId">vinylcontrol_mode</SetVariable>
+                <SetVariable name="ObjectName">VinylModeButton</SetVariable>
+                <SetVariable name="Size">44f,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:/controls/button_3state_persist.xml">
+                <SetVariable name="TooltipId">vinylcontrol_cueing</SetVariable>
+                <SetVariable name="ObjectName">VinylCueButton</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:/controls/button_2state.xml">
+                <SetVariable name="TooltipId">passthrough_enabled</SetVariable>
+                <SetVariable name="ObjectName">VinylButton</SetVariable>
+                <SetVariable name="Size">35f,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>
+
+          <WidgetGroup><Size>2f,0min</Size></WidgetGroup>
+
+        </Children>
+        <Connection>
+          <ConfigKey persist="true">[VinylControl],show_vinylcontrol</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/decks_left.xml b/res/skins/LateNight/decks_left.xml
deleted file mode 100644
index 830bd9f4bcd9..000000000000
--- a/res/skins/LateNight/decks_left.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<Template>
-  <WidgetGroup>
-    <ObjectName>DecksSizer</ObjectName>
-    <Layout>vertical</Layout>
-    <SizePolicy>me,min</SizePolicy>
-    <Children>
-      <WidgetGroup>
-        <Layout>vertical</Layout>
-        <SizePolicy>me,min</SizePolicy>
-        <Children>
-          <Template src="skin:deck.xml">
-            <SetVariable name="channum">1</SetVariable>
-            <SetVariable name="decks_group">12</SetVariable>
-          </Template>
-
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <SizePolicy>me,min</SizePolicy>
-            <Children>
-              <Template src="skin:deck.xml">
-                <SetVariable name="channum">3</SetVariable>
-                <SetVariable name="decks_group">34</SetVariable>
-              </Template>
-            </Children>
-            <Connection>
-              <ConfigKey>[Skin],show_4decks</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/decks_mini.xml b/res/skins/LateNight/decks_mini.xml
deleted file mode 100644
index 81120e1fe9a8..000000000000
--- a/res/skins/LateNight/decks_mini.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<Template>
-  <WidgetGroup>
-    <ObjectName>DecksSizer</ObjectName>
-    <Layout>vertical</Layout>
-    <SizePolicy>me,max</SizePolicy>
-    <Children>
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <SizePolicy>me,min</SizePolicy>
-        <Children>
-          <Template src="skin:deck_mini.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>
-
-          <Template src="skin:deck_mini.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>
-
-          <WidgetGroup>
-            <Size>5f,1min</Size>
-            <Connection>
-              <ConfigKey>[Master],skin_settings</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup>
-        </Children>
-      </WidgetGroup>
-
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <SizePolicy>me,min</SizePolicy>
-        <Children>
-          <Template src="skin:deck_mini.xml">
-            <SetVariable name="channum">3</SetVariable>
-            <SetVariable name="signal_color">#09B2AE</SetVariable>
-            <SetVariable name="SignalBgColor">#2f290a</SetVariable>
-            <SetVariable name="SignalRGBLowColor">#ff2a00</SetVariable>
-            <SetVariable name="SignalRGBMidColor">#33f600</SetVariable>
-            <SetVariable name="SignalRGBHighColor">#332acc</SetVariable>
-          </Template>
-
-          <Template src="skin:deck_mini.xml">
-            <SetVariable name="channum">4</SetVariable>
-            <SetVariable name="signal_color">#09B2AE</SetVariable>
-            <SetVariable name="SignalBgColor">#2f290a</SetVariable>
-            <SetVariable name="SignalRGBLowColor">#ff2a00</SetVariable>
-            <SetVariable name="SignalRGBMidColor">#33f600</SetVariable>
-            <SetVariable name="SignalRGBHighColor">#332acc</SetVariable>
-          </Template>
-
-          <WidgetGroup>
-            <Size>5f,1min</Size>
-            <Connection>
-              <ConfigKey>[Master],skin_settings</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup>
-        </Children>
-        <Connection>
-          <ConfigKey>[Skin],show_4decks</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup>
-
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/decks_right.xml b/res/skins/LateNight/decks_right.xml
deleted file mode 100644
index fa97401c4eee..000000000000
--- a/res/skins/LateNight/decks_right.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<Template>
-  <WidgetGroup>
-    <ObjectName>DecksSizer</ObjectName>
-    <Layout>horizontal</Layout>
-    <SizePolicy>me,min</SizePolicy>
-    <Children>
-      <WidgetGroup>
-        <ObjectName>DecksRightContainer</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>me,min</SizePolicy>
-        <Children>
-          <Template src="skin:deck.xml">
-            <SetVariable name="channum">2</SetVariable>
-            <SetVariable name="decks_group">12</SetVariable>
-          </Template>
-
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <SizePolicy>me,min</SizePolicy>
-            <Children>
-              <Template src="skin:deck.xml">
-                <SetVariable name="channum">4</SetVariable>
-                <SetVariable name="decks_group">34</SetVariable>
-              </Template>
-            </Children>
-            <Connection>
-              <ConfigKey>[Skin],show_4decks</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup>
-
-        </Children>
-      </WidgetGroup>
-
-      <WidgetGroup>
-        <Size>2f,1min</Size>
-        <Connection>
-          <ConfigKey>[Master],skin_settings</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup>
-
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/eq_knob_4decks.xml b/res/skins/LateNight/eq_knob_4decks.xml
deleted file mode 100644
index bc0ff6834466..000000000000
--- a/res/skins/LateNight/eq_knob_4decks.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<!DOCTYPE template>
-<Template>
-  <SetVariable name="FxNum">1</SetVariable>
-  <SetVariable name="FxRack_FxUnit_FxNum">[EqualizerRack1_<Variable name="group"/>_Effect1]</SetVariable>
-
-  <WidgetGroup>
-    <ObjectName>AlignRight</ObjectName>
-    <Layout>horizontal</Layout>
-    <SizePolicy>min,min</SizePolicy>
-    <Children>
-      <WidgetGroup><Size>4f,0min</Size></WidgetGroup>
-
-      <WidgetGroup>
-        <ObjectName>AlignRight</ObjectName>
-        <Layout>horizontal</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-
-          <!-- Kill button -->
-          <WidgetGroup>
-            <ObjectName>EQKillButtonBox4Decks</ObjectName>
-            <Layout>vertical</Layout>
-            <Size>20f,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><Variable name="FxRack_FxUnit_FxNum"/>,button_parameter<Variable name="FxParameter"/></ConfigKey>
-                  <ButtonState>LeftButton</ButtonState>
-                </Connection>
-              </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 -->
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <SizePolicy>me,min</SizePolicy>
-            <Children>
-              <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>
-          </WidgetGroup>
-
-          <WidgetGroup><Size>2f,0min</Size></WidgetGroup>
-
-        </Children>
-        <Connection>
-          <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_loaded</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup>
-
-    </Children>
-    <Connection>
-      <ConfigKey>[Skin],show_eq_knobs</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/eq_knob_left.xml b/res/skins/LateNight/eq_knob_left.xml
deleted file mode 100644
index 583e4672fcfc..000000000000
--- a/res/skins/LateNight/eq_knob_left.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE template>
-<Template>
-  <SetVariable name="FxNum">1</SetVariable>
-  <SetVariable name="FxRack_FxUnit_FxNum">[EqualizerRack1_<Variable name="group"/>_Effect1]</SetVariable>
-
-  <WidgetGroup>
-    <Layout>horizontal</Layout>
-    <SizePolicy>min,min</SizePolicy>
-    <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><Variable name="FxRack_FxUnit_FxNum"/>,button_parameter<Variable name="FxParameter"/></ConfigKey>
-              <ButtonState>LeftButton</ButtonState>
-            </Connection>
-          </EffectPushButton>
-        </Children>
-        <Connection>
-          <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><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_loaded</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/eq_knob_right.xml b/res/skins/LateNight/eq_knob_right.xml
deleted file mode 100644
index 656943e04c1b..000000000000
--- a/res/skins/LateNight/eq_knob_right.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<!DOCTYPE template>
-<Template>
-  <SetVariable name="FxNum">1</SetVariable>
-  <SetVariable name="FxRack_FxUnit_FxNum">[EqualizerRack1_<Variable name="group"/>_Effect1]</SetVariable>
-
-  <WidgetGroup>
-    <Layout>horizontal</Layout>
-    <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>
-        <Size>2f,34f</Size>
-        <Connection>
-          <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup>
-
-      <!-- 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><Variable name="FxRack_FxUnit_FxNum"/>,button_parameter<Variable name="FxParameter"/></ConfigKey>
-              <ButtonState>LeftButton</ButtonState>
-            </Connection>
-          </EffectPushButton>
-        </Children>
-        <Connection>
-          <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup>
-
-    </Children>
-    <Connection>
-      <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_loaded</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/fx/assign_button.xml b/res/skins/LateNight/fx/assign_button.xml
new file mode 100644
index 000000000000..cccff1f72f1a
--- /dev/null
+++ b/res/skins/LateNight/fx/assign_button.xml
@@ -0,0 +1,37 @@
+<!--
+Description:
+  A button that has click or display controls.
+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>EffectUnit_<Variable name="Type"/>_enabled</TooltipId>
+    <ObjectName>FxAssignButton<Variable name="FxUnit"/></ObjectName>
+    <Size><Variable name="Width"/>f,20f</Size>
+    <NumberStates>2</NumberStates>
+    <RightClickIsPushButton>false</RightClickIsPushButton>
+    <State>
+      <Number>0</Number>
+      <Text><Variable name="Text"/><Variable name="FxUnit"/></Text>
+      <Alignment>center</Alignment>
+    </State>
+    <State>
+      <Number>1</Number>
+      <Text><Variable name="Text"/><Variable name="FxUnit"/></Text>
+      <Alignment>center</Alignment>
+    </State>
+    <Connection>
+      <ConfigKey>[EffectRack1_EffectUnit<Variable name="FxUnit"/>],group_<Variable name="Group"/>_enable</ConfigKey>
+      <ButtonState>LeftButton</ButtonState>
+    </Connection>
+  </PushButton>
+</Template>
diff --git a/res/skins/LateNight/fx/assign_buttons.xml b/res/skins/LateNight/fx/assign_buttons.xml
new file mode 100644
index 000000000000..f2dca984518c
--- /dev/null
+++ b/res/skins/LateNight/fx/assign_buttons.xml
@@ -0,0 +1,76 @@
+<!--
+Description:
+  A button that has click or display controls.
+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>
+  <SetVariable name="BtnType"></SetVariable>
+
+  <WidgetGroup>
+    <ObjectName>AlignLeft</ObjectName>
+    <Layout>vertical</Layout>
+    <SizePolicy>max,max</SizePolicy>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>FxAssignButtons</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>f,min</SizePolicy>
+        <Children>
+          <Template src="skin:/fx/assign_button.xml">
+            <SetVariable name="FxUnit">1</SetVariable>
+            <SetVariable name="Width">26</SetVariable>
+            <SetVariable name="Text">&#8202;FX</SetVariable>
+          </Template>
+          <Template src="skin:/fx/assign_button.xml">
+            <SetVariable name="FxUnit">2</SetVariable>
+            <SetVariable name="Width">26</SetVariable>
+            <SetVariable name="Text">&#8202;FX</SetVariable>
+          </Template>
+        </Children>
+        <Connection>
+          <ConfigKey>[Skin],show_4effectunits</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>FxAssignButtons</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>f,min</SizePolicy>
+        <Children>
+          <Template src="skin:/fx/assign_button.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.xml">
+            <SetVariable name="FxUnit">2</SetVariable>
+            <SetVariable name="Width">20</SetVariable>
+          </Template>
+          <Template src="skin:/fx/assign_button.xml">
+            <SetVariable name="FxUnit">3</SetVariable>
+            <SetVariable name="Width">20</SetVariable>
+          </Template>
+          <Template src="skin:/fx/assign_button.xml">
+            <SetVariable name="FxUnit">4</SetVariable>
+            <SetVariable name="Width">20</SetVariable>
+          </Template>
+        </Children>
+        <Connection>
+          <ConfigKey>[Skin],show_4effectunits</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/fx/focus_button.xml b/res/skins/LateNight/fx/focus_button.xml
new file mode 100644
index 000000000000..09f230ccde61
--- /dev/null
+++ b/res/skins/LateNight/fx/focus_button.xml
@@ -0,0 +1,54 @@
+<!--
+Description:
+  A button that displays focus state of an effect slot.
+  Left-click sets focus, right-click removes focus from all effects.
+  If focused, left-click also removes focus.
+Variables:
+  FxRack_FxUnit : [EffectRack1_EffectUnitN]
+  FxNum   : effect number
+-->
+<Template>
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <SizePolicy>min,min</SizePolicy>
+    <Children>
+      <!-- wrapper to apply padding -->
+      <WidgetGroup>
+        <ObjectName>FxFocusButtonBox</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <PushButton>
+            <TooltipId>EffectSlot_focus</TooltipId>
+            <ObjectName>FxFocusButton</ObjectName>
+            <Size>18f,18f</Size>
+            <NumberStates>2</NumberStates>
+            <RightClickIsPushButton>true</RightClickIsPushButton>
+            <State>
+              <Number>0</Number>
+            </State>
+            <State>
+              <Number>1</Number>
+            </State>
+            <Connection>
+              <ConfigKey>[<Variable name="FxRack_FxUnit"/>],focused_effect</ConfigKey>
+              <ButtonState>LeftButton</ButtonState>
+              <Transform><IsEqual><Variable name="FxNum"/></IsEqual></Transform>
+            </Connection>
+            <Connection>
+              <!-- right click > unfocus -->
+              <ConfigKey>[<Variable name="FxRack_FxUnit"/>],focused_effect</ConfigKey>
+              <ButtonState>RightButton</ButtonState>
+              <EmitOnDownPress>true</EmitOnDownPress>
+              <Transform><IsEqual><Variable name="FxNum"/></IsEqual><Not/></Transform>
+            </Connection>
+          </PushButton>
+        </Children>
+      </WidgetGroup>
+    </Children>
+    <Connection>
+      <ConfigKey>[<Variable name="FxRack_FxUnit"/>],show_focus</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/fx/meta_knob.xml b/res/skins/LateNight/fx/meta_knob.xml
new file mode 100644
index 000000000000..136238e29026
--- /dev/null
+++ b/res/skins/LateNight/fx/meta_knob.xml
@@ -0,0 +1,32 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    A standard knob used for Meta parameter of effect units.
+  Variables:
+    FxRack_FxUnit_FxNum : [EffectRack1_EffectUnitX_EffectY]
+-->
+<Template>
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <ObjectName>FxMetaKnob</ObjectName>
+    <SizePolicy>f,max</SizePolicy>
+    <Children>
+      <KnobComposed>
+        <TooltipId>EffectSlot_metaknob</TooltipId>
+        <Size>35f,30f</Size>
+        <Knob>skin:/<Variable name="KnobScheme"/>/knobs/knob_indicator_small_<Variable name="KnobColor"/>.svg</Knob>
+        <BackPath>skin:/<Variable name="KnobScheme"/>/knobs/knob_bg_small.svg</BackPath>
+        <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
+        <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
+        <KnobCenterYOffset>1.598</KnobCenterYOffset>
+        <ArcRadius><Variable name="ArcRadius"/></ArcRadius>
+        <ArcThickness><Variable name="ArcThickness"/></ArcThickness>
+        <ArcColor><Variable name="ArcColorSuper"/></ArcColor>
+        <ArcUnipolar>true</ArcUnipolar>
+        <Connection>
+          <ConfigKey>[<Variable name="FxRack_FxUnit_FxNum"/>],meta</ConfigKey>
+        </Connection>
+      </KnobComposed>
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/fx/parameter_button.xml b/res/skins/LateNight/fx/parameter_button.xml
new file mode 100644
index 000000000000..3175bf4448ac
--- /dev/null
+++ b/res/skins/LateNight/fx/parameter_button.xml
@@ -0,0 +1,78 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    An effect parameter knob.
+  Variables:
+    EffectRack: the rack
+    EffectUnit: the unit
+    Effect: the effect
+    EffectParameter: the parameter
+-->
+<Template>
+  <SetVariable name="FxRack_FxUnit_FxNum">[<Variable name="FxRack_FxUnit"/>_Effect<Variable name="FxNum"/>]</SetVariable>
+
+  <WidgetGroup>
+    <Layout>vertical</Layout>
+    <MinimumSize>55,35</MinimumSize>
+    <MaximumSize>60,</MaximumSize>
+    <SizePolicy>me,min</SizePolicy>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>FxParameterButtonBox</ObjectName>
+        <Layout>horizontal</Layout>
+        <Size>40me,20f</Size>
+        <Children>
+          <EffectPushButton>
+            <ObjectName>FxParameterButton</ObjectName>
+            <Size>35f,20f</Size>
+            <NumberStates>2</NumberStates>
+            <RightClickIsPushButton>false</RightClickIsPushButton>
+            <State>
+              <Number>0</Number>
+              <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_fx_parameter.svg</Unpressed>
+              <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_fx_parameter_active.svg</Pressed>
+            </State>
+            <State>
+              <Number>1</Number>
+              <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_fx_parameter_active.svg</Unpressed>
+              <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_fx_parameter_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,10</MinimumSize>
+        <MaximumSize>58,10</MaximumSize>
+        <Children>
+          <WidgetGroup><Size>1me,0min</Size></WidgetGroup>
+          <EffectButtonParameterName>
+            <ObjectName>FxButtonLabel</ObjectName>
+            <EffectRack>1</EffectRack>
+            <EffectUnit><Variable name="FxUnit"/></EffectUnit>
+            <Effect><Variable name="FxNum"/></Effect>
+            <EffectButtonParameter><Variable name="FxParameter"/></EffectButtonParameter>
+            <Alignment>center</Alignment>
+          </EffectButtonParameterName>
+          <WidgetGroup><Size>1me,0min</Size></WidgetGroup>
+        </Children>
+      </WidgetGroup>
+
+
+    </Children>
+    <Connection>
+      <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,button_parameter<Variable name="FxParameter"/>_loaded</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/fx/parameter_knob.xml b/res/skins/LateNight/fx/parameter_knob.xml
new file mode 100644
index 000000000000..69124f28f942
--- /dev/null
+++ b/res/skins/LateNight/fx/parameter_knob.xml
@@ -0,0 +1,94 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    An effect parameter knob.
+  Variables:
+    EffectRack: the rack
+    EffectUnit: the unit
+    Effect: the effect
+    EffectParameter: the parameter
+-->
+<Template>
+  <SetVariable name="FxRack_FxUnit_FxNum"><Variable name="FxRack_FxUnit"/>_Effect<Variable name="FxNum"/></SetVariable>
+
+  <WidgetGroup>
+    <ObjectName>FxParameterKnobBox</ObjectName>
+    <Layout>vertical</Layout>
+    <MinimumSize>40,35</MinimumSize>
+    <MaximumSize>60,</MaximumSize>
+    <SizePolicy>me,min</SizePolicy>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>FxParameterKnob</ObjectName>
+        <Layout>horizontal</Layout>
+        <Size>26me,26f</Size>
+        <Children>
+          <EffectParameterKnobComposed>
+            <Size>26f,26f</Size>
+            <Knob>skin:/<Variable name="KnobScheme"/>/knobs/knob_indicator_fx_<Variable name="KnobColorFxParameter"/>.svg</Knob>
+            <BackPath>skin:/<Variable name="KnobScheme"/>/knobs/knob_bg_fx.svg</BackPath>
+            <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
+            <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
+            <ArcRadius><Variable name="ArcRadius"/></ArcRadius>
+            <ArcColor><Variable name="ArcColorFxParameter"/></ArcColor>
+            <ArcThickness><Variable name="ArcThickness"/></ArcThickness>
+            <ArcUnipolar>true</ArcUnipolar>
+            <Connection>
+              <ConfigKey>[<Variable name="FxRack_FxUnit_FxNum"/>],parameter<Variable name="FxParameter"/></ConfigKey>
+            </Connection>
+          </EffectParameterKnobComposed>
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>AlignBottom</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>me,f</SizePolicy>
+        <MinimumSize>40,10</MinimumSize>
+        <MaximumSize>58,10</MaximumSize>
+        <Children>
+          <WidgetGroup><Size>1me,0min</Size></WidgetGroup>
+          <EffectParameterName>
+            <ObjectName>FxKnobLabel</ObjectName>
+            <EffectRack>1</EffectRack>
+            <EffectUnit><Variable name="FxUnit"/></EffectUnit>
+            <Effect><Variable name="FxNum"/></Effect>
+            <EffectParameter><Variable name="FxParameter"/></EffectParameter>
+            <Alignment>center</Alignment>
+          </EffectParameterName>
+          <WidgetGroup><Size>1me,0min</Size></WidgetGroup>
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>FxLinkButtons</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <WidgetGroup><Size>0min,0min</Size></WidgetGroup>
+          <!-- Meta knob link invert button -->
+          <Template src="skin:/controls/button_2state.xml">
+            <SetVariable name="TooltipId">EffectSlot_parameter_inversion</SetVariable>
+            <SetVariable name="ObjectName">FxSuperLinkInvertButton</SetVariable>
+            <SetVariable name="Size">8f,7f</SetVariable>
+            <SetVariable name="ConfigKey">[<Variable name="FxRack_FxUnit_FxNum"/>],parameter<Variable name="FxParameter"/>_link_inverse</SetVariable>
+          </Template>
+
+          <!-- Meta knob link button -->
+          <Template src="skin:/controls/button_5state.xml">
+            <SetVariable name="TooltipId">EffectSlot_parameter_link_type</SetVariable>
+            <SetVariable name="ObjectName">FxSuperLinkButton</SetVariable>
+            <SetVariable name="Size">34,7f</SetVariable>
+            <SetVariable name="ConfigKey">[<Variable name="FxRack_FxUnit_FxNum"/>],parameter<Variable name="FxParameter"/>_link_type</SetVariable>
+          </Template>
+          <WidgetGroup><Size>0min,0min</Size></WidgetGroup>
+        </Children>
+      </WidgetGroup>
+
+    </Children>
+    <Connection>
+      <ConfigKey>[<Variable name="FxRack_FxUnit_FxNum"/>],parameter<Variable name="FxParameter"/>_loaded</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/fx/singletons.xml b/res/skins/LateNight/fx/singletons.xml
new file mode 100644
index 000000000000..8b1d80f980e4
--- /dev/null
+++ b/res/skins/LateNight/fx/singletons.xml
@@ -0,0 +1,229 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    An effect unit widget hosting all effect controls for both collapsed
+    and expanded state ([FxUnitN],show_parameters)
+  Variables:
+    group: The group for the controls.
+    FxRack
+    FxUnit
+    FxNum
+-->
+<Template>
+  <SetVariable name="FxRack_FxUnit">EffectRack1_EffectUnit<Variable name="FxUnit"/></SetVariable>
+  <SetVariable name="BtnType"><Variable name="TopRegion_BtnType"/></SetVariable>
+
+
+  <SingletonDefinition>
+    <ObjectName>FxUnit<Variable name="FxUnit"/>_Header</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <SizePolicy>me,min</SizePolicy>
+        <Layout>horizontal</Layout>
+        <Children>
+          <!-- transparent expand button on top of Fx label & icon -->
+          <WidgetGroup>
+            <ObjectName></ObjectName>
+            <SizePolicy>me,min</SizePolicy>
+            <Layout>stacked</Layout>
+            <Children>
+
+              <!-- transparent expand button -->
+              <PushButton>
+                <TooltipId>EffectUnit_show_parameters</TooltipId>
+                <ObjectName>FxExpandOverlay</ObjectName>
+                <Size>0me,0me</Size>
+                <NumberStates>2</NumberStates>
+                <State>
+                  <Number>0</Number>
+                </State>
+                <State>
+                  <Number>1</Number>
+                </State>
+                <Connection>
+                  <ConfigKey>[<Variable name="FxRack_FxUnit"/>],show_parameters</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+              </PushButton><!-- transparent expand button -->
+
+              <!-- Fx label & icon -->
+              <WidgetGroup>
+                <ObjectName>FxUnitHeader</ObjectName>
+                <SizePolicy>me,min</SizePolicy>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <WidgetGroup>
+                    <SizePolicy>me,min</SizePolicy>
+                    <MinimumSize>1,0</MinimumSize>
+                  </WidgetGroup>
+                  <Label>
+                    <ObjectName>FxUnitLabel</ObjectName>
+                    <SizePolicy>min,me</SizePolicy>
+                    <MinimunSize>30,20</MinimunSize>
+                    <MaximumSize>38,</MaximumSize>
+                    <Text>FX&#8202;<Variable name="FxUnit"/></Text>
+                  </Label>
+                  <WidgetGroup>
+                    <SizePolicy>me,min</SizePolicy>
+                    <MinimumSize>1,0</MinimumSize>
+                  </WidgetGroup>
+                  <PushButton>
+                    <ObjectName>FxExpand</ObjectName>
+                    <Size>16f,18me</Size>
+                    <NumberStates>2</NumberStates>
+                    <State>
+                      <Number>0</Number>
+                    </State>
+                    <State>
+                      <Number>1</Number>
+                    </State>
+                    <Connection>
+                      <ConfigKey>[<Variable name="FxRack_FxUnit"/>],show_parameters</ConfigKey>
+                      <ButtonState>LeftButton</ButtonState>
+                    </Connection>
+                  </PushButton>
+                </Children>
+              </WidgetGroup><!-- Fx label & icon -->
+            </Children>
+          </WidgetGroup><!-- transparent expand button on top of Fx label & icon -->
+        </Children>
+      </WidgetGroup><!-- FxUnitHeader -->
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>FxUnit<Variable name="FxUnit"/>_MixmodePfl</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>MixmodePflContainer</ObjectName>
+        <SizePolicy>max,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:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_mixmode.svg</Unpressed>
+              <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_mixmode_active.svg</Pressed>
+            </State>
+            <State>
+              <Number>1</Number>
+              <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_mixmode.svg</Unpressed>
+              <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_mixmode_active.svg</Pressed>
+            </State>
+            <Connection>
+              <ConfigKey>[<Variable name="FxRack_FxUnit"/>],mix_mode</ConfigKey>
+              <ButtonState>LeftButton</ButtonState>
+            </Connection>
+          </PushButton>
+          <Template src="skin:/controls/button_2state.xml">
+            <SetVariable name="TooltipId">pfl</SetVariable>
+            <SetVariable name="ObjectName">PflButton</SetVariable>
+            <SetVariable name="Size">26f,26f</SetVariable>
+            <SetVariable name="BtnSize">square</SetVariable>
+            <SetVariable name="ConfigKey">[<Variable name="FxRack_FxUnit"/>],group_[Headphone]_enable</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>FxUnit<Variable name="FxUnit"/>_SuperKnob</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <SizePolicy>me,min</SizePolicy>
+        <Layout>vertical</Layout>
+        <Children>
+          <Template src="skin:/controls/knob_textless.xml">
+            <SetVariable name="Size">40f,34f</SetVariable>
+            <SetVariable name="ObjectName">SuperKnob</SetVariable>
+            <SetVariable name="KnobBg">regular</SetVariable>
+            <SetVariable name="KnobIndicator">regular</SetVariable>
+            <SetVariable name="ArcColor"><Variable name="ArcColorSuper"/></SetVariable>
+            <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
+            <SetVariable name="Group">[<Variable name="FxRack_FxUnit"/>]</SetVariable>
+            <SetVariable name="Control">super1</SetVariable>
+            <SetVariable name="Label">Super</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>FxUnit<Variable name="FxUnit"/>_DryWetKnob</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <SizePolicy>me,min</SizePolicy>
+        <Layout>vertical</Layout>
+        <Children>
+          <Template src="skin:/controls/knob_textless.xml">
+            <SetVariable name="Size">40f,34f</SetVariable>
+            <SetVariable name="ObjectName">DryWetKnob</SetVariable>
+            <SetVariable name="KnobBg">regular</SetVariable>
+            <SetVariable name="KnobIndicator">regular</SetVariable>
+            <SetVariable name="KnobColor">red</SetVariable>
+            <SetVariable name="ArcColor"><Variable name="ArcColorFxMix"/></SetVariable>
+            <SetVariable name="TooltipId">EffectUnit_mix</SetVariable>
+            <SetVariable name="Group">[<Variable name="FxRack_FxUnit"/>]</SetVariable>
+            <SetVariable name="Control">mix</SetVariable>
+            <SetVariable name="Label">Mix</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>FxUnit<Variable name="FxUnit"/>_FxSlotControls1</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <SizePolicy>min,min</SizePolicy>
+        <MaximumSize>220,</MaximumSize>
+        <Layout>vertical</Layout>
+        <Children>
+          <Template src="skin:/fx/slot_controls.xml">
+            <SetVariable name="FxNum">1</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>FxUnit<Variable name="FxUnit"/>_FxSlotControls2</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <SizePolicy>p,min</SizePolicy>
+        <MaximumSize>220,</MaximumSize>
+        <Layout>vertical</Layout>
+        <Children>
+          <Template src="skin:/fx/slot_controls.xml">
+            <SetVariable name="FxNum">2</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>FxUnit<Variable name="FxUnit"/>_FxSlotControls3</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <SizePolicy>p,min</SizePolicy>
+        <MaximumSize>220,</MaximumSize>
+        <Layout>vertical</Layout>
+        <Children>
+          <Template src="skin:/fx/slot_controls.xml">
+            <SetVariable name="FxNum">3</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+</Template>
diff --git a/res/skins/LateNight/fx/slot_controls.xml b/res/skins/LateNight/fx/slot_controls.xml
new file mode 100644
index 000000000000..869d75a1016f
--- /dev/null
+++ b/res/skins/LateNight/fx/slot_controls.xml
@@ -0,0 +1,65 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    An effect unit widget hosting all effect controls for both collapsed
+    and expanded state ([FxUnitN],show_parameters)
+  Variables:
+    group: The group for the controls.
+    FxRack
+    FxUnit
+    FxNum
+-->
+<Template>
+  <SetVariable name="FxRack_FxUnit_FxNum"><Variable name="FxRack_FxUnit"/>_Effect<Variable name="FxNum"/></SetVariable>
+  <SetVariable name="BtnType"><Variable name="TopRegion_BtnType"/></SetVariable>
+  <SetVariable name="ArcRadius"><Variable name="ArcRadiusSmall"/></SetVariable>
+
+<!-- Wrapper that allows to set an indirect top/bottom padding within the Fx unit
+    so the Fx unit controls layout is independent. -->
+  <WidgetGroup>
+    <ObjectName>FxSlotContainer</ObjectName>
+    <SizePolicy>min,min</SizePolicy>
+    <Layout>horizontal</Layout>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>FxSlotControls</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>p,min</SizePolicy>
+        <MaximumSize>173,</MaximumSize>
+        <Children>
+          <Template src="skin:/fx/focus_button.xml"/>
+
+          <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:/controls/button_2state.xml">
+            <SetVariable name="TooltipId">EffectSlot_enabled</SetVariable>
+            <SetVariable name="ObjectName">FxToggleButton</SetVariable>
+            <SetVariable name="BtnSize">square</SetVariable>
+            <SetVariable name="Size">26f,26f</SetVariable>
+            <SetVariable name="ConfigKey">[<Variable name="FxRack_FxUnit_FxNum"/>],enabled</SetVariable>
+          </Template>
+
+          <EffectSelector>
+            <MinimumSize>65,24</MinimumSize>
+            <MaximumSize>120,24</MaximumSize>
+            <SizePolicy>me,f</SizePolicy>
+            <EffectRack>1</EffectRack>
+            <EffectUnit><Variable name="FxUnit"/></EffectUnit>
+            <Effect><Variable name="FxNum"/></Effect>
+            <!-- Style the effect selector when the effect is enabled -->
+            <Connection>
+              <ConfigKey>[<Variable name="FxRack_FxUnit_FxNum"/>],enabled</ConfigKey>
+              <BindProperty>highlight</BindProperty>
+            </Connection>
+          </EffectSelector>
+        </Children>
+      </WidgetGroup><!-- FxSlotControls -->
+
+    </Children>
+  </WidgetGroup><!-- FxSlotContainer -->
+</Template>
diff --git a/res/skins/LateNight/fx/slot_parameters.xml b/res/skins/LateNight/fx/slot_parameters.xml
new file mode 100644
index 000000000000..a9c85bcdb73e
--- /dev/null
+++ b/res/skins/LateNight/fx/slot_parameters.xml
@@ -0,0 +1,127 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    An effect unit widget hosting all effect controls for both collapsed
+    and expanded state ([FxUnitN],show_parameters)
+  Variables:
+    group: The group for the controls.
+    FxRack
+    FxUnit
+    FxNum
+-->
+<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="BtnType"><Variable name="TopRegion_BtnType"/></SetVariable>
+  <SetVariable name="ArcRadius"><Variable name="ArcRadiusSmall"/></SetVariable>
+
+<!-- Wrapper that allows to set an indirect top/bottom padding within the Fx unit
+    so the Fx unit controls layout is independent. -->
+  <WidgetGroup>
+    <ObjectName>FxSlotContainer</ObjectName>
+    <SizePolicy>me,min</SizePolicy>
+    <Layout>stacked</Layout>
+    <Children>
+
+    <!-- transparent container. 3D border (or focus highlight border)
+      are set in FxSlotBorder* widgets underneath -->
+      <WidgetGroup>
+        <ObjectName>FxParametersContainer</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <WidgetGroup>
+            <ObjectName>FxSlotParameters</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <WidgetGroup><Size>0min,0min</Size></WidgetGroup>
+              <Template src="skin:/fx/parameter_button.xml">
+                <SetVariable name="FxParameter">1</SetVariable>
+              </Template>
+              <Template src="skin:/fx/parameter_button.xml">
+                <SetVariable name="FxParameter">2</SetVariable>
+              </Template>
+              <Template src="skin:/fx/parameter_button.xml">
+                <SetVariable name="FxParameter">3</SetVariable>
+              </Template>
+              <Template src="skin:/fx/parameter_button.xml">
+                <SetVariable name="FxParameter">4</SetVariable>
+              </Template>
+              <Template src="skin:/fx/parameter_button.xml">
+                <SetVariable name="FxParameter">5</SetVariable>
+              </Template>
+              <Template src="skin:/fx/parameter_button.xml">
+                <SetVariable name="FxParameter">6</SetVariable>
+              </Template>
+              <Template src="skin:/fx/parameter_button.xml">
+                <SetVariable name="FxParameter">7</SetVariable>
+              </Template>
+              <Template src="skin:/fx/parameter_button.xml">
+                <SetVariable name="FxParameter">8</SetVariable>
+              </Template>
+              <Template src="skin:/fx/parameter_knob.xml">
+                <SetVariable name="FxParameter">1</SetVariable>
+              </Template>
+              <Template src="skin:/fx/parameter_knob.xml">
+                <SetVariable name="FxParameter">2</SetVariable>
+              </Template>
+              <Template src="skin:/fx/parameter_knob.xml">
+                <SetVariable name="FxParameter">3</SetVariable>
+              </Template>
+              <Template src="skin:/fx/parameter_knob.xml">
+                <SetVariable name="FxParameter">4</SetVariable>
+              </Template>
+              <Template src="skin:/fx/parameter_knob.xml">
+                <SetVariable name="FxParameter">5</SetVariable>
+              </Template>
+              <Template src="skin:/fx/parameter_knob.xml">
+                <SetVariable name="FxParameter">6</SetVariable>
+              </Template>
+              <Template src="skin:/fx/parameter_knob.xml">
+                <SetVariable name="FxParameter">7</SetVariable>
+              </Template>
+              <Template src="skin:/fx/parameter_knob.xml">
+                <SetVariable name="FxParameter">8</SetVariable>
+              </Template>
+            </Children>
+            <Connection>
+              <ConfigKey persist="true">[<Variable name="FxRack_FxUnit"/>],show_parameters</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup><!-- FxSlotParameters -->
+
+        </Children>
+      </WidgetGroup><!-- FxParametersContainer -->
+
+      <!-- Layer to style the Fx slot border, depending on focus state -->
+      <WidgetGroup>
+        <SizePolicy>me,min</SizePolicy>
+        <Layout>stacked</Layout>
+        <Children>
+          <WidgetGroup>
+            <ObjectName>FxParametersFocusBg</ObjectName>
+            <SizePolicy>me,me</SizePolicy>
+            <Connection>
+              <ConfigKey persist="true">[<Variable name="FxRack_FxUnit"/>],focused_effect</ConfigKey>
+              <Transform><IsEqual><Variable name="FxNum"/></IsEqual></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+        </Children>
+        <Connection>
+          <ConfigKey>[<Variable name="FxRack_FxUnit"/>],show_focus</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+      <!-- Layer to style the Fx slot border, depending on focus state -->
+
+      <!-- Regular background, draws the background tile in Classic them -->
+      <WidgetGroup>
+        <ObjectName>FxParametersBg</ObjectName>
+        <SizePolicy>me,min</SizePolicy>
+      </WidgetGroup>
+
+    </Children>
+  </WidgetGroup><!-- FxSlotContainer -->
+</Template>
diff --git a/res/skins/LateNight/fx/unit.xml b/res/skins/LateNight/fx/unit.xml
new file mode 100644
index 000000000000..fe0bf11aceea
--- /dev/null
+++ b/res/skins/LateNight/fx/unit.xml
@@ -0,0 +1,47 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    An effect unit widget.
+  Variables:
+    group: The group for the controls.
+    FxRack
+    FxUnit
+-->
+<Template>
+  <SetVariable name="FxRack_FxUnit">[EffectRack1_EffectUnit<Variable name="FxUnit"/>]</SetVariable>
+  <SetVariable name="BtnType"><Variable name="TopRegion_BtnType"/></SetVariable>
+
+  <WidgetGroup>
+    <ObjectName>FxUnitContainer</ObjectName>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,max</SizePolicy>
+    <Children>
+
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <SizePolicy>me,max</SizePolicy>
+        <Children>
+          <Template src="skin:/fx/unit_parameters_hidden.xml"/>
+        </Children>
+        <Connection>
+          <ConfigKey persist="true">[EffectRack1_EffectUnit<Variable name="FxUnit"/>],show_parameters</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- FxSlotsCollapsed -->
+
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <SizePolicy>me,min</SizePolicy>
+        <Children>
+          <Template src="skin:/fx/unit_parameters_visible.xml"/>
+        </Children>
+        <Connection>
+          <ConfigKey persist="true">[EffectRack1_EffectUnit<Variable name="FxUnit"/>],show_parameters</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- FxUnitControlsCollapsed -->
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/fx/unit_parameters_hidden.xml b/res/skins/LateNight/fx/unit_parameters_hidden.xml
new file mode 100644
index 000000000000..4c3eeca863ae
--- /dev/null
+++ b/res/skins/LateNight/fx/unit_parameters_hidden.xml
@@ -0,0 +1,123 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    An effect unit widget.
+  Variables:
+    group: The group for the controls.
+    FxRack
+    FxUnit
+-->
+<Template>
+  <WidgetGroup>
+    <ObjectName>FxUnit<Variable name="FxUnit"/></ObjectName>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,min</SizePolicy>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>FxSlotsCollapsed</ObjectName>
+        <SizePolicy>me,min</SizePolicy>
+        <Layout>horizontal</Layout>
+        <Children>
+
+          <WidgetGroup><SizePolicy>min,min</SizePolicy></WidgetGroup>
+
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <SizePolicy>me,min</SizePolicy>
+            <MaximumSize>190,</MaximumSize>
+            <Children>
+              <SingletonContainer>
+                <ObjectName>FxUnit<Variable name="FxUnit"/>_FxSlotControls1</ObjectName>
+              </SingletonContainer>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>FxSlotSeparatorV</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,me</SizePolicy>
+            <Children/>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <SizePolicy>me,min</SizePolicy>
+            <MaximumSize>190,</MaximumSize>
+            <Children>
+              <SingletonContainer>
+                <ObjectName>FxUnit<Variable name="FxUnit"/>_FxSlotControls2</ObjectName>
+              </SingletonContainer>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>FxSlotSeparatorV</ObjectName>
+            <Layout>horizontal</Layout>
+            <Children/>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <SizePolicy>me,min</SizePolicy>
+            <MaximumSize>190,</MaximumSize>
+            <Children>
+              <SingletonContainer>
+                <ObjectName>FxUnit<Variable name="FxUnit"/>_FxSlotControls3</ObjectName>
+              </SingletonContainer>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>FxSlotSeparatorV</ObjectName>
+            <Layout>horizontal</Layout>
+            <Children/>
+          </WidgetGroup>
+        </Children>
+      </WidgetGroup><!-- FxSlotsCollapsed -->
+
+      <WidgetGroup>
+        <ObjectName>FxUnitControlsCollapsed</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>max,min</SizePolicy>
+        <Children>
+
+          <WidgetGroup><!-- Super knob, optional -->
+            <Layout>horizontal</Layout>
+            <SizePolicy>max,max</SizePolicy>
+            <Children>
+              <SingletonContainer>
+                <ObjectName>FxUnit<Variable name="FxUnit"/>_SuperKnob</ObjectName>
+              </SingletonContainer>
+            </Children>
+            <Connection>
+              <ConfigKey persist="true">[Skin],show_superknobs</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+
+          <SingletonContainer>
+            <ObjectName>FxUnit<Variable name="FxUnit"/>_DryWetKnob</ObjectName>
+          </SingletonContainer>
+
+          <SingletonContainer>
+            <ObjectName>FxUnit<Variable name="FxUnit"/>_MixmodePfl</ObjectName>
+          </SingletonContainer>
+        </Children>
+      </WidgetGroup><!-- FxUnitControlsCollapsed -->
+
+      <!-- Fx label + Expand_Collapsed -->
+      <WidgetGroup>
+        <ObjectName>FxUnitHeaderCollapsed</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>max,min</SizePolicy>
+        <Children>
+          <SingletonContainer>
+            <ObjectName>FxUnit<Variable name="FxUnit"/>_Header</ObjectName>
+          </SingletonContainer>
+        </Children>
+      </WidgetGroup>
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/fx/unit_parameters_visible.xml b/res/skins/LateNight/fx/unit_parameters_visible.xml
new file mode 100644
index 000000000000..6e6a624afebe
--- /dev/null
+++ b/res/skins/LateNight/fx/unit_parameters_visible.xml
@@ -0,0 +1,179 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    An effect unit widget.
+  Variables:
+    group: The group for the controls.
+    FxRack
+    FxUnit
+-->
+<Template>
+  <WidgetGroup>
+    <ObjectName>FxUnit<Variable name="FxUnit"/></ObjectName>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,min</SizePolicy>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>FxSlotsExpanded</ObjectName>
+        <SizePolicy>me,me</SizePolicy>
+        <Layout>vertical</Layout>
+        <Children>
+          <WidgetGroup>
+            <SizePolicy>me,me</SizePolicy>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Template src="skin:/fx/slot_parameters.xml">
+                <SetVariable name="FxNum">1</SetVariable>
+              </Template>
+              <WidgetGroup>
+                <SizePolicy>min,me</SizePolicy>
+                <MaximumSize>182,</MaximumSize>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <SingletonContainer>
+                    <ObjectName>FxUnit<Variable name="FxUnit"/>_FxSlotControls1</ObjectName>
+                  </SingletonContainer>
+                </Children>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName></ObjectName>
+            <Layout>horizontal</Layout>
+            <Children>
+              <WidgetGroup>
+                <ObjectName>FxSlotSeparatorH</ObjectName>
+                <Layout>horizontal</Layout>
+                <Children/>
+              </WidgetGroup>
+              <WidgetGroup>
+                <SizePolicy>me,f</SizePolicy>
+                <MaximumSize>185,0</MaximumSize>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <SizePolicy>me,me</SizePolicy>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Template src="skin:/fx/slot_parameters.xml">
+                <SetVariable name="FxNum">2</SetVariable>
+              </Template>
+              <WidgetGroup>
+                <SizePolicy>min,me</SizePolicy>
+                <MaximumSize>182,</MaximumSize>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <SingletonContainer>
+                    <ObjectName>FxUnit<Variable name="FxUnit"/>_FxSlotControls2</ObjectName>
+                  </SingletonContainer>
+                </Children>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName></ObjectName>
+            <Layout>horizontal</Layout>
+            <Children>
+              <WidgetGroup>
+                <ObjectName>FxSlotSeparatorH</ObjectName>
+                <Layout>horizontal</Layout>
+                <Children/>
+              </WidgetGroup>
+              <WidgetGroup>
+                <SizePolicy>me,f</SizePolicy>
+                <MaximumSize>185,0</MaximumSize>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <SizePolicy>me,me</SizePolicy>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Template src="skin:/fx/slot_parameters.xml">
+                <SetVariable name="FxNum">3</SetVariable>
+              </Template>
+              <WidgetGroup>
+                <SizePolicy>min,me</SizePolicy>
+                <MaximumSize>182,</MaximumSize>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <SingletonContainer>
+                    <ObjectName>FxUnit<Variable name="FxUnit"/>_FxSlotControls3</ObjectName>
+                  </SingletonContainer>
+                </Children>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup>
+
+        </Children>
+      </WidgetGroup><!-- FxSlotsExpanded -->
+
+      <WidgetGroup><!-- FxUnitHeader + FxUnitControlsExpanded -->
+        <ObjectName></ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>max,min</SizePolicy>
+        <Children>
+
+          <WidgetGroup>
+            <ObjectName>FxUnitHeaderExpanded</ObjectName>
+            <Layout>horizontal</Layout>
+            <Size>0min,35f</Size>
+            <Children>
+              <SingletonContainer>
+                <ObjectName>FxUnit<Variable name="FxUnit"/>_Header</ObjectName>
+              </SingletonContainer>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>FxUnitControlsExpanded</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>max,min</SizePolicy>
+            <Children>
+              <SingletonContainer>
+                <ObjectName>FxUnit<Variable name="FxUnit"/>_MixmodePfl</ObjectName>
+              </SingletonContainer>
+
+              <WidgetGroup><Size>,3f</Size></WidgetGroup>
+
+              <WidgetGroup>
+                <SizePolicy>min,me</SizePolicy>
+                <MinimumSize>,1</MinimumSize>
+                <MaximumSize>,15</MaximumSize>
+              </WidgetGroup>
+
+              <SingletonContainer>
+                <ObjectName>FxUnit<Variable name="FxUnit"/>_DryWetKnob</ObjectName>
+              </SingletonContainer>
+
+              <WidgetGroup><Size>,1me</Size></WidgetGroup>
+
+              <WidgetGroup>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                  <SingletonContainer>
+                    <ObjectName>FxUnit<Variable name="FxUnit"/>_SuperKnob</ObjectName>
+                  </SingletonContainer>
+                </Children>
+                <Connection>
+                  <ConfigKey persist="true">[Skin],show_superknobs</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+
+              <WidgetGroup><Size>,1me</Size></WidgetGroup>
+            </Children>
+          </WidgetGroup><!-- FxUnitControlsExpanded -->
+        </Children>
+      </WidgetGroup><!-- FxUnitHeader + FxUnitControlsExpanded -->
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/fx_assign_button.xml b/res/skins/LateNight/fx_assign_button.xml
deleted file mode 100644
index 3b73028e61b5..000000000000
--- a/res/skins/LateNight/fx_assign_button.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<!--
-Description:
-  A button that has click or display controls.
-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>
-  <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>
-    <!-- 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
deleted file mode 100644
index dacb32e8752d..000000000000
--- a/res/skins/LateNight/fx_assign_button_deck.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-Description:
-  A button that has click or display controls.
-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>EffectUnit_<Variable name="Type"/>_enabled</TooltipId>
-    <ObjectName>FxAssignButtonDeck</ObjectName>
-    <Size><Variable name="Width"/>f,20f</Size>
-    <NumberStates>2</NumberStates>
-    <RightClickIsPushButton>false</RightClickIsPushButton>
-    <State>
-      <Number>0</Number>
-      <Text><Variable name="Text"/><Variable name="FxUnit"/></Text>
-      <Alignment>center</Alignment>
-    </State>
-    <State>
-      <Number>1</Number>
-      <Text><Variable name="Text"/><Variable name="FxUnit"/></Text>
-      <Alignment>center</Alignment>
-    </State>
-    <Connection>
-      <ConfigKey>[EffectRack1_EffectUnit<Variable name="FxUnit"/>],group_<Variable name="group"/>_enable</ConfigKey>
-      <ButtonState>LeftButton</ButtonState>
-    </Connection>
-  </PushButton>
-</Template>
diff --git a/res/skins/LateNight/fx_focus_button.xml b/res/skins/LateNight/fx_focus_button.xml
deleted file mode 100644
index d4bbdb6b2388..000000000000
--- a/res/skins/LateNight/fx_focus_button.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<!--
-Description:
-  A button that displays focus state of an effect slot.
-  Left-click sets focus, right-click removes focus from all effects.
-  If focused, left-click also removes focus.
-Variables:
-  FxRack_FxUnit : [EffectRack1_EffectUnitN]
-  FxNum   : effect number
--->
-<Template>
-  <WidgetGroup>
-    <Layout>horizontal</Layout>
-    <SizePolicy>min,min</SizePolicy>
-    <Children>
-      <!-- wrapper to apply padding -->
-      <WidgetGroup>
-        <ObjectName>FxFocusButtonBox</ObjectName>
-        <Layout>horizontal</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <PushButton>
-            <TooltipId>EffectSlot_focus</TooltipId>
-            <ObjectName>FxFocusButton</ObjectName>
-            <Size>18f,26f</Size>
-            <NumberStates>2</NumberStates>
-            <RightClickIsPushButton>true</RightClickIsPushButton>
-            <State>
-              <Number>0</Number>
-              <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_<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>
-              <ButtonState>LeftButton</ButtonState>
-              <Transform><IsEqual><Variable name="FxNum"/></IsEqual></Transform>
-            </Connection>
-            <Connection>
-              <!-- right click > unfocus -->
-              <ConfigKey><Variable name="FxRack_FxUnit"/>,focused_effect</ConfigKey>
-              <ButtonState>RightButton</ButtonState>
-              <EmitOnDownPress>true</EmitOnDownPress>
-              <Transform><IsEqual><Variable name="FxNum"/></IsEqual><Not/></Transform>
-            </Connection>
-          </PushButton>
-        </Children>
-      </WidgetGroup>
-    </Children>
-    <Connection>
-      <ConfigKey><Variable name="FxRack_FxUnit"/>,show_focus</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/fx_meta_knob.xml b/res/skins/LateNight/fx_meta_knob.xml
deleted file mode 100644
index 42068a3bed01..000000000000
--- a/res/skins/LateNight/fx_meta_knob.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    A standard knob used for Meta parameter of effect units.
-  Variables:
-    FxRack_FxUnit_FxNum : [EffectRack1_EffectUnitX_EffectY]
--->
-<Template>
-  <WidgetGroup>
-    <Layout>horizontal</Layout>
-    <ObjectName>FxMetaKnob</ObjectName>
-    <SizePolicy>f,max</SizePolicy>
-    <Children>
-      <KnobComposed>
-        <TooltipId>EffectSlot_metaknob</TooltipId>
-        <Size>25f,25f</Size>
-        <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>
-          <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,meta</ConfigKey>
-        </Connection>
-      </KnobComposed>
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/fx_parameter_button.xml b/res/skins/LateNight/fx_parameter_button.xml
deleted file mode 100644
index e76731c3eea8..000000000000
--- a/res/skins/LateNight/fx_parameter_button.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    An effect parameter knob.
-  Variables:
-    EffectRack: the rack
-    EffectUnit: the unit
-    Effect: the effect
-    EffectParameter: the parameter
--->
-<Template>
-  <SetVariable name="FxRack_FxUnit_FxNum">[EffectRack1_EffectUnit<Variable name="FxUnit"/>_Effect<Variable name="FxNum"/>]</SetVariable>
-
-  <WidgetGroup>
-    <Layout>vertical</Layout>
-    <MinimumSize>55,35</MinimumSize>
-    <MaximumSize>60,</MaximumSize>
-    <SizePolicy>me,min</SizePolicy>
-    <Children>
-
-      <WidgetGroup>
-        <ObjectName>FxButtonBox</ObjectName>
-        <Layout>horizontal</Layout>
-        <Size>40me,20f</Size>
-        <Children>
-          <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,10</MinimumSize>
-        <MaximumSize>58,10</MaximumSize>
-        <Children>
-          <WidgetGroup><Size>1me,0min</Size></WidgetGroup>
-          <EffectButtonParameterName>
-            <ObjectName>FxButtonLabel</ObjectName>
-            <EffectRack><Variable name="FxRack"/></EffectRack>
-            <EffectUnit><Variable name="FxUnit"/></EffectUnit>
-            <Effect><Variable name="FxNum"/></Effect>
-            <EffectButtonParameter><Variable name="FxParameter"/></EffectButtonParameter>
-            <Alignment>center</Alignment>
-          </EffectButtonParameterName>
-          <WidgetGroup><Size>1me,0min</Size></WidgetGroup>
-        </Children>
-      </WidgetGroup>
-
-
-    </Children>
-    <Connection>
-      <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,button_parameter<Variable name="FxParameter"/>_loaded</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/fx_parameter_knob.xml b/res/skins/LateNight/fx_parameter_knob.xml
deleted file mode 100644
index b4627ca9a44c..000000000000
--- a/res/skins/LateNight/fx_parameter_knob.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    An effect parameter knob.
-  Variables:
-    EffectRack: the rack
-    EffectUnit: the unit
-    Effect: the effect
-    EffectParameter: the parameter
--->
-<Template>
-  <SetVariable name="FxRack_FxUnit_FxNum">[EffectRack1_EffectUnit<Variable name="FxUnit"/>_Effect<Variable name="FxNum"/>]</SetVariable>
-
-  <WidgetGroup>
-    <ObjectName>FxKnobContainer</ObjectName>
-    <Layout>vertical</Layout>
-    <MinimumSize>40,35</MinimumSize>
-    <MaximumSize>60,</MaximumSize>
-    <SizePolicy>me,min</SizePolicy>
-    <Children>
-      <WidgetGroup>
-        <ObjectName>FxKnob</ObjectName>
-        <Layout>horizontal</Layout>
-        <Size>25me,25f</Size>
-        <Children>
-          <EffectParameterKnobComposed>
-            <Size>25f,25f</Size>
-            <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>
-              <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/></ConfigKey>
-            </Connection>
-          </EffectParameterKnobComposed>
-        </Children>
-      </WidgetGroup>
-
-      <WidgetGroup>
-        <ObjectName>AlignBottom</ObjectName>
-        <Layout>horizontal</Layout>
-        <SizePolicy>me,f</SizePolicy>
-        <MinimumSize>40,10</MinimumSize>
-        <MaximumSize>58,10</MaximumSize>
-        <Children>
-          <WidgetGroup><Size>1me,0min</Size></WidgetGroup>
-          <EffectParameterName>
-            <ObjectName>FxKnobLabel</ObjectName>
-            <EffectRack><Variable name="FxRack"/></EffectRack>
-            <EffectUnit><Variable name="FxUnit"/></EffectUnit>
-            <Effect><Variable name="FxNum"/></Effect>
-            <EffectParameter><Variable name="FxParameter"/></EffectParameter>
-            <Alignment>center</Alignment>
-          </EffectParameterName>
-          <WidgetGroup><Size>1me,0min</Size></WidgetGroup>
-        </Children>
-      </WidgetGroup>
-
-      <WidgetGroup>
-        <ObjectName>AlignHCenter</ObjectName>
-        <Layout>horizontal</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <WidgetGroup><Size>0min,0min</Size></WidgetGroup>
-          <!-- Meta knob link invert button -->
-          <Template src="skin:button_2state.xml">
-            <SetVariable name="TooltipId">EffectSlot_parameter_inversion</SetVariable>
-            <SetVariable name="ObjectName">FxSuperLinkInvertButton</SetVariable>
-            <SetVariable name="Size">9f,7f</SetVariable>
-            <SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_link_inverse</SetVariable>
-          </Template>
-
-          <!-- Meta knob link button -->
-          <Template src="skin:button_5state.xml">
-            <SetVariable name="TooltipId">EffectSlot_parameter_link_type</SetVariable>
-            <SetVariable name="ObjectName">FxSuperLinkButton</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>
-        </Children>
-      </WidgetGroup>
-
-      <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
-
-    </Children>
-    <Connection>
-      <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_loaded</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/fx_rack.xml b/res/skins/LateNight/fx_rack.xml
index 07341851fc2a..487bcaca94fa 100644
--- a/res/skins/LateNight/fx_rack.xml
+++ b/res/skins/LateNight/fx_rack.xml
@@ -1,28 +1,159 @@
 <Template>
-  <SetVariable name="FxRack">1</SetVariable>
+  <SetVariable name="ArcRadius"><Variable name="ArcRadiusBig"/></SetVariable>
+  <SetVariable name="ArcThickness"><Variable name="ArcThicknessBig"/></SetVariable>
+  <SetVariable name="ArcUnipolar">true</SetVariable>
+
+  <!-- Let's reate Singletons for widgtes we use multiple times
+      at different places in each effect unit:
+      * Meta knob
+      * Effect selector
+      * Effect toggle
+      * Fx unit label
+      * expand/collapse button
+      -->
+  <Template src="skin:/fx/singletons.xml">
+    <SetVariable name="FxUnit">1</SetVariable>
+    <SetVariable name="ArcColorSuper"><Variable name="ArcColorFx12Quick"/></SetVariable>
+    <SetVariable name="KnobColor"><Variable name="KnobColorFx12"/></SetVariable>
+  </Template>
+  <Template src="skin:/fx/singletons.xml">
+    <SetVariable name="FxUnit">2</SetVariable>
+    <SetVariable name="ArcColorSuper"><Variable name="ArcColorFx12Quick"/></SetVariable>
+    <SetVariable name="KnobColor"><Variable name="KnobColorFx12"/></SetVariable>
+  </Template>
+  <Template src="skin:/fx/singletons.xml">
+    <SetVariable name="FxUnit">3</SetVariable>
+    <SetVariable name="ArcColorSuper"><Variable name="ArcColorFx34"/></SetVariable>
+    <SetVariable name="KnobColor"><Variable name="KnobColorFx34"/></SetVariable>
+  </Template>
+  <Template src="skin:/fx/singletons.xml">
+    <SetVariable name="FxUnit">4</SetVariable>
+    <SetVariable name="ArcColorSuper"><Variable name="ArcColorFx34"/></SetVariable>
+    <SetVariable name="KnobColor"><Variable name="KnobColorFx34"/></SetVariable>
+  </Template>
 
   <WidgetGroup>
+    <ObjectName>AlignTop</ObjectName>
     <Layout>horizontal</Layout>
-    <Connection>
-      <ConfigKey>[EffectRack<Variable name="FxRack"/>],show</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
+    <SizePolicy>me,max</SizePolicy>
     <Children>
+      <!-- These two  racks host 4 effect units total which can be displayed
+          in various combinations:
+          * 1 effect unit
+          * 2 effect units
+          * with controller mappings:
+            only those effect units the controller is currently mapped to
+            (matching the default midi-components.js mapping:
+             left side: units 1 and 3, right side: units 2 and 4)
+          -->
+
+      <!-- EffectUnit 1 + 3 -->
       <WidgetGroup>
         <Layout>vertical</Layout>
+        <SizePolicy>me,min</SizePolicy>
         <Children>
-          <Template src="skin:fx_units_12.xml"/>
-          <Template src="skin:fx_units_34.xml"/>
+
+          <!-- EffectUnit 1 -->
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <SizePolicy>i,min</SizePolicy>
+            <Children>
+              <Template src="skin:/fx/unit.xml">
+                <SetVariable name="FxUnit">1</SetVariable>
+              </Template>
+
+              <WidgetGroup>
+                <ObjectName>FxRackFillerL</ObjectName>
+                <SizePolicy>min,me</SizePolicy>
+                <Connection>
+                  <ConfigKey>[EffectRack1_EffectUnit2],show_parameters</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup>
+
+          <!-- EffectUnit 3 -->
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <SizePolicy>i,min</SizePolicy>
+            <Children>
+              <Template src="skin:/fx/unit.xml">
+                <SetVariable name="FxUnit">3</SetVariable>
+              </Template>
+
+              <WidgetGroup>
+                <ObjectName>FxRackFillerL</ObjectName>
+                <SizePolicy>min,me</SizePolicy>
+                <Connection>
+                  <ConfigKey>[EffectRack1_EffectUnit4],show_parameters</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+            </Children>
+            <Connection>
+              <ConfigKey>[Skin],show_4effectunits</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
         </Children>
-      </WidgetGroup>
+      </WidgetGroup><!-- EffectUnit 1 + 3 -->
 
+      <!-- EffectUnit 2 + 4 -->
       <WidgetGroup>
-        <Size>2f,1min</Size>
-        <Connection>
-          <ConfigKey>[Master],skin_settings</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup>
+        <Layout>vertical</Layout>
+        <SizePolicy>me,min</SizePolicy>
+        <Children>
+          <!-- EffectUnit 2 -->
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <SizePolicy>i,min</SizePolicy>
+            <Children>
+              <Template src="skin:/fx/unit.xml">
+                <SetVariable name="FxUnit">2</SetVariable>
+              </Template>
+
+              <WidgetGroup>
+                <ObjectName>FxRackFillerR</ObjectName>
+                <SizePolicy>min,me</SizePolicy>
+                <Connection>
+                  <ConfigKey>[EffectRack1_EffectUnit1],show_parameters</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup>
+
+          <!-- EffectUnit 4 -->
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <SizePolicy>i,min</SizePolicy>
+            <Children>
+              <Template src="skin:/fx/unit.xml">
+                <SetVariable name="FxUnit">4</SetVariable>
+              </Template>
+
+              <WidgetGroup>
+                <ObjectName>FxRackFillerR</ObjectName>
+                <SizePolicy>min,me</SizePolicy>
+                <Connection>
+                  <ConfigKey>[EffectRack1_EffectUnit3],show_parameters</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+            </Children>
+            <Connection>
+              <ConfigKey>[Skin],show_4effectunits</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+        </Children>
+      </WidgetGroup><!-- EffectUnit 2 + 4 -->
+
     </Children>
+    <Connection>
+      <ConfigKey>[EffectRack1],show</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/fx_slot.xml b/res/skins/LateNight/fx_slot.xml
deleted file mode 100644
index 4129732750d8..000000000000
--- a/res/skins/LateNight/fx_slot.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    An effect unit widget hosting all effect controls for both collapsed
-    and expanded state ([FxUnitN],show_parameters)
-  Variables:
-    group: The group for the controls.
-    FxRack
-    FxUnit
-    FxNum
--->
-<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>
-    <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,min</SizePolicy>
-        <Children>
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,min</SizePolicy>
-            <Children>
-              <WidgetGroup><Size>0min,0min</Size></WidgetGroup>
-              <Template src="skin:fx_parameter_button.xml">
-                <SetVariable name="FxParameter">1</SetVariable>
-              </Template>
-              <Template src="skin:fx_parameter_button.xml">
-                <SetVariable name="FxParameter">2</SetVariable>
-              </Template>
-              <Template src="skin:fx_parameter_button.xml">
-                <SetVariable name="FxParameter">3</SetVariable>
-              </Template>
-              <Template src="skin:fx_parameter_button.xml">
-                <SetVariable name="FxParameter">4</SetVariable>
-              </Template>
-              <Template src="skin:fx_parameter_button.xml">
-                <SetVariable name="FxParameter">5</SetVariable>
-              </Template>
-              <Template src="skin:fx_parameter_button.xml">
-                <SetVariable name="FxParameter">6</SetVariable>
-              </Template>
-              <Template src="skin:fx_parameter_button.xml">
-                <SetVariable name="FxParameter">7</SetVariable>
-              </Template>
-              <Template src="skin:fx_parameter_button.xml">
-                <SetVariable name="FxParameter">8</SetVariable>
-              </Template>
-              <Template src="skin:fx_parameter_knob.xml">
-                <SetVariable name="FxParameter">1</SetVariable>
-              </Template>
-              <Template src="skin:fx_parameter_knob.xml">
-                <SetVariable name="FxParameter">2</SetVariable>
-              </Template>
-              <Template src="skin:fx_parameter_knob.xml">
-                <SetVariable name="FxParameter">3</SetVariable>
-              </Template>
-              <Template src="skin:fx_parameter_knob.xml">
-                <SetVariable name="FxParameter">4</SetVariable>
-              </Template>
-              <Template src="skin:fx_parameter_knob.xml">
-                <SetVariable name="FxParameter">5</SetVariable>
-              </Template>
-              <Template src="skin:fx_parameter_knob.xml">
-                <SetVariable name="FxParameter">6</SetVariable>
-              </Template>
-              <Template src="skin:fx_parameter_knob.xml">
-                <SetVariable name="FxParameter">7</SetVariable>
-              </Template>
-              <Template src="skin:fx_parameter_knob.xml">
-                <SetVariable name="FxParameter">8</SetVariable>
-              </Template>
-            </Children>
-            <Connection>
-              <ConfigKey persist="true"><Variable name="FxRack_FxUnit"/>,show_parameters</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup>
-
-          <EffectSelector>
-            <MinimumSize>65,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>
-
-          <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>
-
-          <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><Variable name="FxRack_FxUnit"/>,show_focus</ConfigKey>
-          <BindProperty>highlight</BindProperty>
-        </Connection>
-      </WidgetGroup>
-
-      <WidgetGroup>
-        <SizePolicy>me,min</SizePolicy>
-        <Layout>stacked</Layout>
-        <Children>
-          <!-- Fx focus highligh border -->
-          <WidgetGroup>
-            <ObjectName>FxSlotBorder<Variable name="FxNum"/></ObjectName>
-            <SizePolicy>me,me</SizePolicy>
-            <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>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup>
-        </Children>
-        <Connection>
-          <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><!-- FxSlotContainer -->
-</Template>
diff --git a/res/skins/LateNight/fx_unit_parameters_hidden.xml b/res/skins/LateNight/fx_unit_parameters_hidden.xml
deleted file mode 100644
index 7e97ecb43582..000000000000
--- a/res/skins/LateNight/fx_unit_parameters_hidden.xml
+++ /dev/null
@@ -1,206 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    An effect unit widget.
-  Variables:
-    group: The group for the controls.
-    FxRack
-    FxUnit
--->
-<Template>
-  <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>horizontal</Layout>
-    <SizePolicy>me,max</SizePolicy>
-    <Children>
-
-      <WidgetGroup>
-        <ObjectName>FxSlotsCollapsed</ObjectName>
-        <SizePolicy>me,min</SizePolicy>
-        <Layout>horizontal</Layout>
-        <Children>
-
-          <WidgetGroup><!-- Dummy to fill empty space -->
-            <ObjectName>FxRackFiller</ObjectName>
-            <SizePolicy>min,min</SizePolicy>
-          </WidgetGroup>
-
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <SizePolicy>me,min</SizePolicy>
-            <MaximumSize>220,</MaximumSize>
-            <Children>
-              <Template src="skin:fx_slot.xml">
-                <SetVariable name="FxNum">1</SetVariable>
-              </Template>
-            </Children>
-          </WidgetGroup>
-
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <SizePolicy>me,min</SizePolicy>
-            <MaximumSize>220,</MaximumSize>
-            <Children>
-              <Template src="skin:fx_slot.xml">
-                <SetVariable name="FxNum">2</SetVariable>
-              </Template>
-            </Children>
-          </WidgetGroup>
-
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <SizePolicy>me,min</SizePolicy>
-            <MaximumSize>220,</MaximumSize>
-            <Children>
-              <Template src="skin:fx_slot.xml">
-                <SetVariable name="FxNum">3</SetVariable>
-              </Template>
-            </Children>
-          </WidgetGroup>
-        </Children>
-      </WidgetGroup><!-- FxSlotsCollapsed -->
-
-      <WidgetGroup>
-        <ObjectName>FxUnitControlsCollapsed</ObjectName>
-        <Layout>horizontal</Layout>
-        <SizePolicy>max,min</SizePolicy>
-        <Children>
-
-          <WidgetGroup><Size>2f,</Size></WidgetGroup>
-
-          <WidgetGroup><!-- Super knob, optional -->
-            <Layout>horizontal</Layout>
-            <SizePolicy>max,max</SizePolicy>
-            <Children>
-              <SingletonContainer>
-                <ObjectName>FxUnit<Variable name="FxUnit"/>_SuperKnob</ObjectName>
-              </SingletonContainer>
-
-              <WidgetGroup><Size>5f,</Size></WidgetGroup>
-            </Children>
-            <Connection>
-              <ConfigKey persist="true">[Skin],show_superknobs</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup>
-
-          <SingletonContainer>
-            <ObjectName>FxUnit<Variable name="FxUnit"/>_DryWetKnob</ObjectName>
-          </SingletonContainer>
-
-          <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>
-                    <ObjectName>FxUnitLabel</ObjectName>
-                    <Size>39f,16min</Size>
-                    <Text>FX&#8202;<Variable name="FxUnit"/></Text>
-                    <Alignment>center</Alignment>
-                  </Label>
-                  <SingletonContainer>
-                    <ObjectName>FxUnit<Variable name="FxUnit"/>_ExpandCollapseButton</ObjectName>
-                  </SingletonContainer>
-                </Children>
-              </WidgetGroup>
-              <!-- MixMode_Collapsed + Pfl -->
-              <WidgetGroup>
-                <ObjectName></ObjectName>
-                <SizePolicy>max,min</SizePolicy>
-                <Layout>horizontal</Layout>
-                <Children>
-                  <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><!-- FxUnitControlsCollapsed -->
-
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/fx_unit_parameters_visible.xml b/res/skins/LateNight/fx_unit_parameters_visible.xml
deleted file mode 100644
index 862334e7ffaa..000000000000
--- a/res/skins/LateNight/fx_unit_parameters_visible.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    An effect unit widget.
-  Variables:
-    group: The group for the controls.
-    FxRack
-    FxUnit
--->
-<Template>
-  <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>horizontal</Layout>
-    <Size>635me,0min</Size>
-    <Children>
-
-      <WidgetGroup>
-        <ObjectName>FxSlotsExpanded</ObjectName>
-        <SizePolicy>me,me</SizePolicy>
-        <Layout>vertical</Layout>
-        <Children>
-          <Template src="skin:fx_slot.xml">
-            <SetVariable name="FxNum">1</SetVariable>
-          </Template>
-
-          <Template src="skin:fx_slot.xml">
-            <SetVariable name="FxNum">2</SetVariable>
-          </Template>
-
-          <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>
-
-          <!-- Fx label + expand | mix mode + Pfl -->
-          <WidgetGroup>
-            <Layout>vertical</Layout>
-            <SizePolicy>max,min</SizePolicy>
-            <Children>
-
-              <!-- Fx Pfl + Expand_Collapsed -->
-              <WidgetGroup>
-                <ObjectName></ObjectName>
-                <SizePolicy>min,min</SizePolicy>
-                <Layout>horizontal</Layout>
-                <Children>
-                  <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>
-
-              <Label>
-                <ObjectName>FxUnitLabel</ObjectName>
-                <Size>52f,20f</Size>
-                <Text>FX&#8202;<Variable name="FxUnit"/></Text>
-                <Alignment>center</Alignment>
-              </Label>
-
-              <WidgetGroup>
-                <ObjectName></ObjectName>
-                <SizePolicy>min,min</SizePolicy>
-                <Layout>horizontal</Layout>
-                <Children>
-                  <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>
-              </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>,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>
-            <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
deleted file mode 100644
index 749cc5643d89..000000000000
--- a/res/skins/LateNight/fx_units_12.xml
+++ /dev/null
@@ -1,222 +0,0 @@
-<Template>
-  <SetVariable name="FxRack">1</SetVariable>
-
-  <SingletonDefinition>
-    <ObjectName>FxUnit1_SuperKnob</ObjectName>
-    <Children>
-      <WidgetGroup>
-        <SizePolicy>me,min</SizePolicy>
-        <Layout>vertical</Layout>
-        <Children>
-          <Template src="skin:knob_textless.xml">
-            <SetVariable name="Size">40f,34f</SetVariable>
-            <SetVariable name="ObjectName">SuperMixKnob</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>
-            <SetVariable name="label">Super</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </SingletonDefinition>
-
-  <SingletonDefinition>
-    <ObjectName>FxUnit2_SuperKnob</ObjectName>
-    <Children>
-      <WidgetGroup>
-        <SizePolicy>me,min</SizePolicy>
-        <Layout>vertical</Layout>
-        <Children>
-          <Template src="skin:knob_textless.xml">
-            <SetVariable name="Size">40f,34f</SetVariable>
-            <SetVariable name="ObjectName">SuperMixKnob</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>
-            <SetVariable name="label">Super</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </SingletonDefinition>
-      
-  <SingletonDefinition>
-    <ObjectName>FxUnit1_DryWetKnob</ObjectName>
-    <Children>
-      <WidgetGroup>
-        <SizePolicy>me,min</SizePolicy>
-        <Layout>vertical</Layout>
-        <Children>
-          <Template src="skin:knob_textless.xml">
-            <SetVariable name="Size">40f,34f</SetVariable>
-            <SetVariable name="ObjectName">SuperMixKnob</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>
-            <SetVariable name="label">Mix</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </SingletonDefinition>
-      
-  <SingletonDefinition>
-    <ObjectName>FxUnit2_DryWetKnob</ObjectName>
-    <Children>
-      <WidgetGroup>
-        <SizePolicy>me,min</SizePolicy>
-        <Layout>vertical</Layout>
-        <Children>
-          <Template src="skin:knob_textless.xml">
-            <SetVariable name="Size">40f,34f</SetVariable>
-            <SetVariable name="ObjectName">SuperMixKnob</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>
-            <SetVariable name="label">Mix</SetVariable>
-          </Template>
-        </Children>
-      </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>
-    <Layout>horizontal</Layout>
-    <SizePolicy>me,max</SizePolicy>
-    <Children>
-      <WidgetStack currentpage="[EffectRack1_EffectUnit1],show_parameters" persist="true"><!-- EffectUnit 1 -->
-        <SizePolicy>i,min</SizePolicy>
-        <Children>
-
-          <WidgetGroup><!-- EffectUnit 1 mini -->
-            <Layout>vertical</Layout>
-            <SizePolicy>me,min</SizePolicy>
-            <Children>
-              <Template src="skin:fx_unit_parameters_hidden.xml">
-                <SetVariable name="FxUnit">1</SetVariable>
-              </Template>
-              <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
-            </Children>
-          </WidgetGroup>
-
-          <!-- EffectUnit 1 maxi -->
-          <WidgetGroup trigger="[EffectRack1_EffectUnit1],show_parameters" on_hide_select="0" persist="true">
-            <Layout>vertical</Layout>
-            <SizePolicy>me,max</SizePolicy>
-            <Children>
-              <Template src="skin:fx_unit_parameters_visible.xml">
-                <SetVariable name="FxUnit">1</SetVariable>
-              </Template>
-            </Children>
-          </WidgetGroup>
-
-        </Children>
-      </WidgetStack><!-- /EffectUnit 1 -->
-
-      <!-- EffectUnit 2 -->
-      <WidgetStack currentpage="[EffectRack1_EffectUnit2],show_parameters" persist="true">
-        <SizePolicy>i,min</SizePolicy>
-        <Children>
-
-          <WidgetGroup><!-- EffectUnit 2 mini -->
-            <Layout>vertical</Layout>
-            <SizePolicy>me,min</SizePolicy>
-            <Children>
-              <Template src="skin:fx_unit_parameters_hidden.xml">
-                <SetVariable name="FxUnit">2</SetVariable>
-              </Template>
-              <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
-            </Children>
-          </WidgetGroup>
-
-          <!-- EffectUnit 2 maxi -->
-          <WidgetGroup trigger="[EffectRack1_EffectUnit2],show_parameters" on_hide_select="0" persist="true">
-            <Layout>vertical</Layout>
-            <SizePolicy>me,min</SizePolicy>
-            <Children>
-              <Template src="skin:fx_unit_parameters_visible.xml">
-                <SetVariable name="FxUnit">2</SetVariable>
-              </Template>
-            </Children>
-          </WidgetGroup>
-
-        </Children>
-      </WidgetStack><!-- /EffectUnit 2 -->
-
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/fx_units_34.xml b/res/skins/LateNight/fx_units_34.xml
deleted file mode 100644
index 23d131b45854..000000000000
--- a/res/skins/LateNight/fx_units_34.xml
+++ /dev/null
@@ -1,227 +0,0 @@
-<Template>
-  <SetVariable name="FxRack">1</SetVariable>
-
-  <SingletonDefinition>
-    <ObjectName>FxUnit3_SuperKnob</ObjectName>
-    <Children>
-      <WidgetGroup>
-        <SizePolicy>me,min</SizePolicy>
-        <Layout>vertical</Layout>
-        <Children>
-          <Template src="skin:knob_textless.xml">
-            <SetVariable name="Size">40f,34f</SetVariable>
-            <SetVariable name="ObjectName">SuperMixKnob</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>
-            <SetVariable name="label">Super</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </SingletonDefinition>
-
-  <SingletonDefinition>
-    <ObjectName>FxUnit4_SuperKnob</ObjectName>
-    <Children>
-      <WidgetGroup>
-        <SizePolicy>me,min</SizePolicy>
-        <Layout>vertical</Layout>
-        <Children>
-          <Template src="skin:knob_textless.xml">
-            <SetVariable name="Size">40f,34f</SetVariable>
-            <SetVariable name="ObjectName">SuperMixKnob</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>
-            <SetVariable name="label">Super</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </SingletonDefinition>
-      
-  <SingletonDefinition>
-    <ObjectName>FxUnit3_DryWetKnob</ObjectName>
-    <Children>
-      <WidgetGroup>
-        <SizePolicy>me,min</SizePolicy>
-        <Layout>vertical</Layout>
-        <Children>
-          <Template src="skin:knob_textless.xml">
-            <SetVariable name="Size">40f,34f</SetVariable>
-            <SetVariable name="ObjectName">SuperMixKnob</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>
-            <SetVariable name="label">Mix</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </SingletonDefinition>
-      
-  <SingletonDefinition>
-    <ObjectName>FxUnit4_DryWetKnob</ObjectName>
-    <Children>
-      <WidgetGroup>
-        <SizePolicy>me,min</SizePolicy>
-        <Layout>vertical</Layout>
-        <Children>
-          <Template src="skin:knob_textless.xml">
-            <SetVariable name="Size">40f,34f</SetVariable>
-            <SetVariable name="ObjectName">SuperMixKnob</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>
-            <SetVariable name="label">Mix</SetVariable>
-          </Template>
-        </Children>
-      </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>
-    <Layout>horizontal</Layout>
-    <SizePolicy>me,max</SizePolicy>
-    <Children>
-      <WidgetStack currentpage="[EffectRack1_EffectUnit3],show_parameters" persist="true"><!-- EffectUnit 3 -->
-        <SizePolicy>i,min</SizePolicy>
-        <Children>
-
-          <WidgetGroup><!-- EffectUnit 3 mini -->
-            <Layout>vertical</Layout>
-            <SizePolicy>me,min</SizePolicy>
-            <Children>
-              <Template src="skin:fx_unit_parameters_hidden.xml">
-                <SetVariable name="FxUnit">3</SetVariable>
-              </Template>
-              <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
-            </Children>
-          </WidgetGroup>
-
-          <!-- EffectUnit 1 maxi -->
-          <WidgetGroup trigger="[EffectRack1_EffectUnit3],show_parameters" on_hide_select="0" persist="true">
-            <ObjectName>EffUnit1_maxi</ObjectName>
-            <Layout>vertical</Layout>
-            <SizePolicy>me,max</SizePolicy>
-            <Children>
-              <Template src="skin:fx_unit_parameters_visible.xml">
-                <SetVariable name="FxUnit">3</SetVariable>
-              </Template>
-            </Children>
-          </WidgetGroup>
-
-        </Children>
-      </WidgetStack><!-- /EffectUnit 3 -->
-
-      <!-- EffectUnit 4 -->
-      <WidgetStack currentpage="[EffectRack1_EffectUnit4],show_parameters" persist="true">
-        <SizePolicy>i,min</SizePolicy>
-        <Children>
-
-          <WidgetGroup><!-- EffectUnit 4 mini -->
-            <Layout>vertical</Layout>
-            <SizePolicy>me,min</SizePolicy>
-            <Children>
-              <Template src="skin:fx_unit_parameters_hidden.xml">
-                <SetVariable name="FxUnit">4</SetVariable>
-              </Template>
-              <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
-            </Children>
-          </WidgetGroup>
-
-          <!-- EffectUnit 4 maxi -->
-          <WidgetGroup trigger="[EffectRack1_EffectUnit4],show_parameters" on_hide_select="0" persist="true">
-            <Layout>vertical</Layout>
-            <SizePolicy>me,min</SizePolicy>
-            <Children>
-              <Template src="skin:fx_unit_parameters_visible.xml">
-                <SetVariable name="FxUnit">4</SetVariable>
-              </Template>
-            </Children>
-          </WidgetGroup>
-
-        </Children>
-      </WidgetStack><!-- /EffectUnit 4 -->
-
-    </Children>
-    <Connection>
-      <ConfigKey persist="true">[Skin],show_4effectunits</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/helpers/skin_helper_deck_size.xml b/res/skins/LateNight/helpers/skin_helper_deck_size.xml
new file mode 100644
index 000000000000..dc48154fbb7d
--- /dev/null
+++ b/res/skins/LateNight/helpers/skin_helper_deck_size.xml
@@ -0,0 +1,250 @@
+<!--
+Description:
+
+    A four-state GUI switch, outsourcing the complex deck size selection
+    from the deck.xml template.
+
+    It picks the appropriate deck variant
+      FULL
+      Compact
+      minimal
+      none
+    depending on how the following skin controls are combined
+      [Master],maximize_library
+      [LateNight],max_lib_show_decks
+      [Master],show_mixer
+      [LateNight],deck_size_without_mixer
+
+    This is a SizeAwareStack and WidgetStack hack that basically executes
+    an analogue version of a simple script similiar to this:
+
+    if (![Master],maxmimize_library
+          && [Skin],select_minimal_deck) {
+        hide(fullDeck);
+        hide(compactDeck);
+        show(minimaldeck);
+    } else {
+      if ([Master],show_mixer) {
+        hide(minimaldeck);
+        hide(compactDeck);
+        show(fullDeck);
+      } else {
+        case ..
+        ...
+      }
+    }
+
+    This is a fixed-width container. The occupied space is defined
+    by widget connected to the above skin controls. The SizeAwareStack
+    then picks one child widget fitting into the remaining space.
+      Note: To make the whole thing work we need to be sure there's
+      only ONE fitting widget for every possible size the
+      SizeAwareStack could be shrunk to.
+
+    Each widget inside the SizeAwareStack is a WidgetStack.
+    By default, WidgetStacks pick their first child for display*,
+    then toggle the child's 'trigger' control to 1 (if present).
+    Example:
+    <WidgetStack>
+      <Children>
+        <WidgetGroup trigger="[Any],config_key">  => set to '1'
+        <WidgetGroup trigger="[Another],config_key">  => set to '0'
+      </Children>
+    </WidgetStack>
+
+    So, let's put several copies of a WidgetStack into the
+    SizeAwareStack, each with the identical set of children and
+    controls. If we then change the order of the WidgetStacks'
+    children, each WidgetStack can toggle a specific control to '1'
+    while setting the others to '0'.
+    If we've set the parent SizeAwareStack up carefully, and if we
+    omitted storing the index with
+    <WidgetStack currentPage="[Save],config_key"> anywhere inside
+    the SizeAwareStack, we can now toggle several N-state switches
+    at once.
+    This gives us a pretty reliable tool to pick the appropriate
+    deck variant, for example, depending on a may-be complex
+    skin configuration.
+-->
+
+<Template>
+  <!-- Extra wrapper so we can put multiple, independent size
+        detectors in here. -->
+  <!-- The height is zero, so this doesnt't even consume GUI space.
+        Set height to 10f in order to enable visual debugging -->
+  <WidgetGroup>
+    <Size>0me,0f</Size>
+    <Layout>vertical</Layout>
+    <ObjectName>AlignRight</ObjectName>
+    <Children>
+
+      <!-- Deck selector.
+            Picks the approriate deck size for display. -->
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Size>300f,10f</Size>
+        <ObjectName>Spacer1e</ObjectName>
+        <Children>
+
+          <!-- Widgets that define the remaining space,
+                visibility connected to skin controls -->
+
+          <WidgetGroup>
+            <Connection>
+              <ConfigKey>[Master],maximize_library</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+            <ObjectName>TEST1</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,f</SizePolicy>
+            <MinimumSize>200,10</MinimumSize>
+            <MaximumSize>300,10</MaximumSize>
+            <Children>
+              <WidgetGroup><!-- minimal deck selected -->
+                <Size>300f,10f</Size>
+                <ObjectName>TEST2</ObjectName>
+                <Connection>
+                  <ConfigKey persist="true">[LateNight],max_lib_show_decks</ConfigKey>
+                  <Transform><Not/></Transform>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup><!-- maximize_library -->
+
+          <WidgetGroup>
+            <Connection>
+              <ConfigKey>[Master],maximize_library</ConfigKey>
+              <Transform><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,f</SizePolicy>
+            <MinimumSize>0,10</MinimumSize>
+            <MaximumSize>200,10</MaximumSize>
+            <Children>
+
+              <!-- !show_mixer -->
+              <WidgetGroup>
+                <Connection>
+                  <ConfigKey>[Master],show_mixer</ConfigKey>
+                  <Transform><Not/></Transform>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+                <Layout>horizontal</Layout>
+                <ObjectName>TEST33</ObjectName>
+                <SizePolicy>min,f</SizePolicy>
+                <MinimumSize>0,10</MinimumSize>
+                <MaximumSize>200,10</MaximumSize>
+                <Children>
+
+                  <WidgetGroup><!-- Compact deck selected -->
+                    <Size>100f,10f</Size>
+                    <ObjectName>SET_COMPACT</ObjectName>
+                    <Connection>
+                      <ConfigKey persist="true">[LateNight],deck_size_without_mixer</ConfigKey>
+                      <Transform><IsEqual>1</IsEqual></Transform>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup>
+
+                  <WidgetGroup><!-- minimal deck selected -->
+                    <Size>200f,10f</Size>
+                    <ObjectName>SET_MINI</ObjectName>
+                    <Connection>
+                      <ConfigKey persist="true">[LateNight],deck_size_without_mixer</ConfigKey>
+                      <Transform><IsEqual>0</IsEqual></Transform>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup>
+                </Children>
+              </WidgetGroup><!-- !show_mixer -->
+
+            </Children>
+          </WidgetGroup><!-- !maximize_library -->
+
+          <!-- /Widgets that define the remaining space,
+                visibility connected to skin controls -->
+
+
+
+              <!-- Deck size detector -->
+          <SizeAwareStack>
+            <Children>
+              <!-- no decks -->
+              <!-- maximize_library && minimal deck selected -->
+              <WidgetStack>
+                <SizePolicy>me,f</SizePolicy>
+                <MinimumSize>0,10</MinimumSize>
+                <MaximumSize>0,10</MaximumSize>
+                <Children>
+                  <WidgetGroup trigger="[LateNight],show_no_deck">
+                    <ObjectName>TEST4</ObjectName>
+                    <Size>0f,10f</Size>
+                  </WidgetGroup>
+                  <WidgetGroup trigger="[LateNight],show_mini_deck"><SizePolicy>me,me</SizePolicy></WidgetGroup>
+                  <WidgetGroup trigger="[LateNight],show_compact_deck"><SizePolicy>me,me</SizePolicy></WidgetGroup>
+                  <WidgetGroup trigger="[LateNight],show_full_deck"><SizePolicy>me,me</SizePolicy></WidgetGroup>
+                </Children>
+              </WidgetStack>
+
+              <!-- Minimal deck -->
+              <!-- maximize_library || (!show_mixer && minimal deck selected) -->
+              <WidgetStack>
+                <SizePolicy>me,f</SizePolicy>
+                <MinimumSize>100,10</MinimumSize>
+                <MaximumSize>100,10</MaximumSize>
+                <Children>
+                  <WidgetGroup trigger="[LateNight],show_mini_deck">
+                    <ObjectName>IS_MINI</ObjectName>
+                    <Size>100f,10f</Size>
+                  </WidgetGroup>
+                  <WidgetGroup trigger="[LateNight],show_compact_deck"><SizePolicy>me,me</SizePolicy></WidgetGroup>
+                  <WidgetGroup trigger="[LateNight],show_full_deck"><SizePolicy>me,me</SizePolicy></WidgetGroup>
+                  <WidgetGroup trigger="[LateNight],show_no_deck"><SizePolicy>me,me</SizePolicy></WidgetGroup>
+                </Children>
+              </WidgetStack>
+
+              <!-- Compact deck -->
+              <!-- compact deck selected -->
+              <WidgetStack>
+                <SizePolicy>me,f</SizePolicy>
+                <MinimumSize>200,10</MinimumSize>
+                <MaximumSize>200,10</MaximumSize>
+                <Children>
+                  <WidgetGroup trigger="[LateNight],show_compact_deck">
+                    <ObjectName>IS_COMPACT</ObjectName>
+                    <Size>200f,10f</Size>
+                  </WidgetGroup>
+                  <WidgetGroup trigger="[LateNight],show_full_deck"><SizePolicy>me,me</SizePolicy></WidgetGroup>
+                  <WidgetGroup trigger="[LateNight],show_mini_deck"><SizePolicy>me,me</SizePolicy></WidgetGroup>
+                  <WidgetGroup trigger="[LateNight],show_no_deck"><SizePolicy>me,me</SizePolicy></WidgetGroup>
+                </Children>
+              </WidgetStack>
+
+              <!-- Full deck -->
+              <!-- show_mixer || full deck selected -->
+              <WidgetStack>
+                <SizePolicy>me,f</SizePolicy>
+                <MinimumSize>300,10</MinimumSize>
+                <MaximumSize>300,10</MaximumSize>
+                <Children>
+                  <WidgetGroup trigger="[LateNight],show_full_deck">
+                    <ObjectName>IS_FULL</ObjectName>
+                    <Size>300f,10f</Size>
+                  </WidgetGroup>
+                  <WidgetGroup trigger="[LateNight],show_compact_deck"><SizePolicy>me,me</SizePolicy></WidgetGroup>
+                  <WidgetGroup trigger="[LateNight],show_mini_deck"><SizePolicy>me,me</SizePolicy></WidgetGroup>
+                  <WidgetGroup trigger="[LateNight],show_no_deck"><SizePolicy>me,me</SizePolicy></WidgetGroup>
+                </Children>
+              </WidgetStack>
+            </Children>
+          </SizeAwareStack><!-- /Size detector -->
+          <!-- /Size detector -->
+
+        </Children>
+      </WidgetGroup>
+      <!-- checks which deck size should be displayed -->
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/helpers/skin_helper_mic_ducking.xml b/res/skins/LateNight/helpers/skin_helper_mic_ducking.xml
new file mode 100644
index 000000000000..1590c567f6bc
--- /dev/null
+++ b/res/skins/LateNight/helpers/skin_helper_mic_ducking.xml
@@ -0,0 +1,79 @@
+<!--
+Description:
+  Size-aware container that checks if the any microphone is configured.
+  If so, the Ducking controls container is shown.
+
+Controls:
+  [LateNight],show_ducking_controls
+
+-->
+<Template>
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <Size>5f,0f</Size>
+    <Children>
+
+      <WidgetGroup>
+        <Size>1f,0f</Size>
+        <Connection>
+          <ConfigKey>[Microphone],enabled</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <Size>1f,0f</Size>
+        <Connection>
+          <ConfigKey>[Microphone2],enabled</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <Size>1f,0f</Size>
+        <Connection>
+          <ConfigKey>[Microphone3],enabled</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <Size>1f,0f</Size>
+        <Connection>
+          <ConfigKey>[Microphone4],enabled</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+      <SizeAwareStack><!-- Size detector -->
+        <Children>
+          <WidgetStack><!-- Not enough space for stars -->
+            <SizePolicy>me,f</SizePolicy>
+            <MinimumSize>0,0</MinimumSize>
+            <MaximumSize>1,0</MaximumSize>
+            <Children>
+              <WidgetGroup><Size>1f,0f</Size></WidgetGroup>
+              <WidgetGroup trigger="[LateNight],show_ducking_controls"><Size>1f,0f</Size></WidgetGroup>
+            </Children>
+          </WidgetStack>
+
+          <WidgetStack><!-- when there is enough space for stars (min 83px) show them. -->
+            <SizePolicy>me,f</SizePolicy>
+            <MinimumSize>2,0</MinimumSize>
+            <MaximumSize>-1,0</MaximumSize>
+            <Children>
+              <WidgetGroup trigger="[LateNight],show_ducking_controls"><Size>1f,0f</Size></WidgetGroup>
+              <WidgetGroup><Size>1f,0f</Size></WidgetGroup>
+            </Children>
+          </WidgetStack>
+
+        </Children>
+      </SizeAwareStack><!-- /Size detector -->
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/helpers/skin_helper_spinny-cover.xml b/res/skins/LateNight/helpers/skin_helper_spinny-cover.xml
new file mode 100644
index 000000000000..dcff597345b7
--- /dev/null
+++ b/res/skins/LateNight/helpers/skin_helper_spinny-cover.xml
@@ -0,0 +1,141 @@
+<!--
+Description:
+  SizeAwareStack / WidgetStack trigger hack that sets controls
+  to hide or show the small or big Spinny/CoverArt containers
+  depending on
+  1)  if Spinny and/or Cover Art are selected at all
+  2)  if so ^ also checks if big spinny/cover is selected
+
+  If none is visible the spinny/cover container is hidden.
+
+Controls:
+  [LateNight],show_small_spinny_cover
+  [LateNight],show_big_spinny_cover
+
+-->
+<Template>
+  <WidgetGroup>
+    <Layout>vertical</Layout>
+    <Size>,0f</Size>
+    <Children>
+
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Size>2f,0f</Size>
+        <Children>
+
+          <WidgetGroup>
+            <Size>1f,0f</Size>
+            <Connection>
+              <ConfigKey persist="true">[Skin],show_spinnies</ConfigKey>
+              <Transform><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <Size>1f,0f</Size>
+            <Connection>
+              <ConfigKey persist="true">[Skin],show_coverart</ConfigKey>
+              <Transform><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+
+          <SizeAwareStack>
+            <Children>
+              <WidgetStack>
+                <SizePolicy>me,f</SizePolicy>
+                <MaximumSize>0,0</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>me,f</SizePolicy>
+                <MinimumSize>1,0</MinimumSize>
+                <MaximumSize>-1,0</MaximumSize>
+                <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>
+
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Size>3f,0f</Size>
+        <Children>
+
+          <WidgetGroup>
+            <Size>2f,0f</Size>
+            <Connection>
+              <ConfigKey>[LateNight],show_spinny_cover</ConfigKey>
+              <Transform><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <Size>1f,0f</Size>
+            <Connection>
+              <ConfigKey persist="true">[Skin],select_big_spinny_coverart</ConfigKey>
+              <Transform><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+
+          <SizeAwareStack>
+            <Children>
+              <!-- Hide small and big spinny/cover container -->
+              <WidgetStack>
+                <SizePolicy>me,f</SizePolicy>
+                <MinimumSize>0,0</MinimumSize>
+                <MaximumSize>1,0</MaximumSize>
+                <Children>
+                  <WidgetGroup><Size>1f,0f</Size></WidgetGroup>
+                  <WidgetGroup trigger="[LateNight],show_small_spinny_cover"><Size>0f,0f</Size></WidgetGroup>
+                  <WidgetGroup trigger="[LateNight],show_big_spinny_cover"><Size>0f,0f</Size></WidgetGroup>
+                </Children>
+              </WidgetStack>
+
+              <!-- Show small spinny/cover container,
+                    hide big spinny/cover container -->
+              <WidgetStack>
+                <SizePolicy>me,f</SizePolicy>
+                <MinimumSize>2,0</MinimumSize>
+                <MaximumSize>2,0</MaximumSize>
+                <Children>
+                  <WidgetGroup trigger="[LateNight],show_small_spinny_cover"><Size>0f,0f</Size></WidgetGroup>
+                  <WidgetGroup trigger="[LateNight],show_big_spinny_cover"><Size>0f,0f</Size></WidgetGroup>
+                </Children>
+              </WidgetStack>
+
+              <!-- Show big spinny/cover container,
+                    hide small spinny/cover container -->
+              <WidgetStack>
+                <SizePolicy>me,f</SizePolicy>
+                <MinimumSize>3,0</MinimumSize>
+                <MaximumSize>3,0</MaximumSize>
+                <Children>
+                  <WidgetGroup trigger="[LateNight],show_big_spinny_cover"><Size>0f,0f</Size></WidgetGroup>
+                  <WidgetGroup trigger="[LateNight],show_small_spinny_cover"><Size>10,0f</Size></WidgetGroup>
+                </Children>
+              </WidgetStack>
+
+            </Children>
+          </SizeAwareStack>
+
+        </Children>
+      </WidgetGroup>
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/skin_settings_button_2state.xml b/res/skins/LateNight/helpers/skin_settings_button_2state.xml
similarity index 79%
rename from res/skins/LateNight/skin_settings_button_2state.xml
rename to res/skins/LateNight/helpers/skin_settings_button_2state.xml
index c0fd4a0977b0..98247698e443 100644
--- a/res/skins/LateNight/skin_settings_button_2state.xml
+++ b/res/skins/LateNight/helpers/skin_settings_button_2state.xml
@@ -11,16 +11,16 @@ Variables:
   <PushButton>
     <TooltipId><Variable name="TooltipId"/></TooltipId>
     <ObjectName>SkinSettingsButton</ObjectName>
-    <Size>180min,17f</Size>
+    <Size>180me,17f</Size>
     <NumberStates>2</NumberStates>
     <State>
       <Number>0</Number>
-      <Text>&#8202;&#8202;&#8202;&#9744;  <Variable name="text"/></Text>
+      <Text>&#8202;&#8202;&#9744;  <Variable name="Text"/></Text>
       <Alignment>left</Alignment>
     </State>
     <State>
       <Number>1</Number>
-      <Text>&#8202;&#8202;&#8202;&#8202;&#10004;&#8202;&#8202; <Variable name="text"/></Text>
+      <Text>&#8202;&#8202;&#8202;&#10004;&#8202;&#8202; <Variable name="Text"/></Text>
       <Alignment>left</Alignment>
     </State>
     <Connection>
diff --git a/res/skins/LateNight/helpers/skin_settings_button_deckSize.xml b/res/skins/LateNight/helpers/skin_settings_button_deckSize.xml
new file mode 100644
index 000000000000..9b8f51e6e645
--- /dev/null
+++ b/res/skins/LateNight/helpers/skin_settings_button_deckSize.xml
@@ -0,0 +1,33 @@
+<!--
+Description:
+  2-state button for skin settings menu.
+  Can be squeezed so that all skin settings categories fit on small screens.
+Variables:
+  width         :
+  state_X_text  : label text for state X
+  Setting       : persistent left-click control
+-->
+<Template>
+  <PushButton>
+    <TooltipId><Variable name="TooltipId"/></TooltipId>
+    <ObjectName>DeckSizeButton</ObjectName>
+    <Size><Variable name="Width"/>f,17f</Size>
+    <NumberStates>2</NumberStates>
+    <State>
+      <Number>0</Number>
+      <Text><Variable name="Text"/></Text>
+      <Alignment>center</Alignment>
+    </State>
+    <State>
+      <Number>1</Number>
+      <Text><Variable name="Text"/></Text>
+      <Alignment>center</Alignment>
+    </State>
+    <Connection><!--
+      <ConfigKey persist="true">[LateNight],<Variable name="DeckSize"/>_deck_without_mixer</ConfigKey> -->
+      <ConfigKey persist="true">[LateNight],deck_size_without_mixer</ConfigKey>
+      <Transform><IsEqual><Variable name="DeckSize"/></IsEqual></Transform>
+      <ButtonState>LeftButton</ButtonState>
+    </Connection>
+  </PushButton>
+</Template>
diff --git a/res/skins/LateNight/skin_settings_labelbutton_2state.xml b/res/skins/LateNight/helpers/skin_settings_labelbutton_2state.xml
similarity index 91%
rename from res/skins/LateNight/skin_settings_labelbutton_2state.xml
rename to res/skins/LateNight/helpers/skin_settings_labelbutton_2state.xml
index ada3c43a78ca..d02c38aec160 100644
--- a/res/skins/LateNight/skin_settings_labelbutton_2state.xml
+++ b/res/skins/LateNight/helpers/skin_settings_labelbutton_2state.xml
@@ -11,17 +11,17 @@ Variables:
   <PushButton>
     <TooltipId><Variable name="TooltipId"/></TooltipId>
     <ObjectName>SkinSettingsLabelButton</ObjectName>
-    <Size>190min,21f</Size>
+    <Size>190me,21f</Size>
     <NumberStates>2</NumberStates>
     <RightClickIsPushButton>false</RightClickIsPushButton>
     <State>
       <Number>0</Number>
-      <Text> &#9744; <Variable name="text"/></Text>
+      <Text> &#9744; <Variable name="Text"/></Text>
       <Alignment>left</Alignment>
     </State>
     <State>
       <Number>1</Number>
-      <Text> &#9745; <Variable name="text"/></Text>
+      <Text> &#9745; <Variable name="Text"/></Text>
       <Alignment>left</Alignment>
     </State>
     <Connection>
diff --git a/res/skins/LateNight/knob.xml b/res/skins/LateNight/knob.xml
deleted file mode 100644
index f1a2c6fd1954..000000000000
--- a/res/skins/LateNight/knob.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    A standard knob.
-  Variables:
-    group
-    control: The control to connect to
-    label
-    Size
-    TooltipId
-    PotiMinAngle
-    PotiMaxAngle
--->
-<Template>
-  <WidgetGroup>
-    <Layout>vertical</Layout>
-    <SizePolicy>min,min</SizePolicy>
-    <Children>
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <ObjectName>KnobCentered</ObjectName>
-        <Children>
-
-          <KnobComposed>
-            <TooltipId><Variable name="TooltipId"/></TooltipId>
-            <Size><Variable name="Size"/></Size>
-            <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>
-            <Connection>
-              <ConfigKey><Variable name="group"/>,<Variable name="control"/></ConfigKey>
-            </Connection>
-          </KnobComposed>
-        </Children>
-      </WidgetGroup>
-
-      <Label>
-        <ObjectName>KnobLabel</ObjectName>
-        <Text><Variable name="label"/></Text>
-      </Label>
-
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/knob_textless.xml b/res/skins/LateNight/knob_textless.xml
deleted file mode 100644
index adabf7cfa7bb..000000000000
--- a/res/skins/LateNight/knob_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><Variable name="ObjectName"/></ObjectName>
-    <Children>
-      <KnobComposed>
-        <TooltipId><Variable name="TooltipId"/></TooltipId>
-        <Size><Variable name="Size"/></Size>
-        <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>
-        <Connection>
-          <ConfigKey><Variable name="group"/>,<Variable name="control"/></ConfigKey>
-        </Connection>
-      </KnobComposed>
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/library.xml b/res/skins/LateNight/library.xml
index 5aa0788c4fad..b88e01e11709 100644
--- a/res/skins/LateNight/library.xml
+++ b/res/skins/LateNight/library.xml
@@ -22,21 +22,54 @@
             <Collapsible>1,0</Collapsible>
             <Children>
               <WidgetGroup>
+                <ObjectName>SidebarSearchPreviewContainer</ObjectName>
                 <Layout>vertical</Layout>
                 <SizePolicy>min,me</SizePolicy>
                 <MinimumSize>100,</MinimumSize>
                 <Children>
 
-                  <Template src="skin:preview_deck.xml"/>
-
-                  <!--Search Input Field-->
+                  <!--Search Input Field + Library Expand toggle -->
                   <WidgetGroup>
-                    <ObjectName>SearchLineBox</ObjectName>
-                    <Layout>vertical</Layout>
+                    <ObjectName></ObjectName>
+                    <Layout>horizontal</Layout>
+                    <SizePolicy>min,max</SizePolicy>
                     <Children>
-                      <SearchBox></SearchBox>
+
+                      <WidgetGroup>
+                        <ObjectName>SearchLineBox</ObjectName>
+                        <Layout>horizontal</Layout>
+                        <SizePolicy>min,max</SizePolicy>
+                        <Children>
+                          <SearchBox></SearchBox>
+                        </Children>
+                      </WidgetGroup>
+
+                      <WidgetGroup>
+                        <ObjectName>LibExpandBox</ObjectName>
+                        <Layout>vertical</Layout>
+                        <Children>
+                          <PushButton>
+                            <TooltipId>maximize_library</TooltipId>
+                            <ObjectName>LibExpand</ObjectName>
+                            <Size>16f,18me</Size>
+                            <NumberStates>2</NumberStates>
+                            <State>
+                              <Number>0</Number>
+                            </State>
+                            <State>
+                              <Number>1</Number>
+                            </State>
+                            <Connection>
+                              <ConfigKey>[Master],maximize_library</ConfigKey>
+                              <ButtonState>LeftButton</ButtonState>
+                            </Connection>
+                          </PushButton>
+                        </Children>
+                      </WidgetGroup><!-- LibExpandBox -->
                     </Children>
-                  </WidgetGroup>
+                  </WidgetGroup><!-- SearchLineBox -->
+
+                  <Template src="skin:/decks/preview_deck.xml"/>
 
                   <Splitter>
                     <ObjectName>HorizontalSplitter</ObjectName>
@@ -55,19 +88,25 @@
                         </Children>
                       </WidgetGroup>
                       <!--Cover Art-->
-                      <CoverArt>
-                        <SizePolicy>me,me</SizePolicy>
-                        <MinimumSize>40,40</MinimumSize>
+                      <WidgetGroup>
+                        <ObjectName>AlignCenter</ObjectName>
+                        <Layout>vertical</Layout>
+                        <Children>
+                          <CoverArt>
+                            <SizePolicy>me,me</SizePolicy>
+                            <MinimumSize>40,40</MinimumSize>
+                          </CoverArt>
+                        </Children>
                         <Connection>
                           <ConfigKey persist="true">[Library],show_coverart</ConfigKey>
                           <BindProperty>visible</BindProperty>
                         </Connection>
-                      </CoverArt>
+                      </WidgetGroup><!--Cover Art-->
                     </Children>
-                  </Splitter>
+                  </Splitter><!-- HorizontalSplitter -->
 
                 </Children>
-              </WidgetGroup>
+              </WidgetGroup><!-- SidebarSearchPreviewContainer -->
 
               <!-- Library Table-->
               <Library>
@@ -78,15 +117,7 @@
               </Library>
 
             </Children>
-          </Splitter>
-
-          <WidgetGroup>
-            <Size>5f,1min</Size>
-            <Connection>
-              <ConfigKey>[Master],skin_settings</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup>
+          </Splitter><!-- VerticalSplitter -->
 
         </Children>
       </WidgetGroup><!-- LibraryContainer -->
diff --git a/res/skins/LateNight/mic_aux/aux_unit.xml b/res/skins/LateNight/mic_aux/aux_unit.xml
new file mode 100644
index 000000000000..b54a110ffd20
--- /dev/null
+++ b/res/skins/LateNight/mic_aux/aux_unit.xml
@@ -0,0 +1,121 @@
+<Template>
+  <SetVariable name="Group">[Auxiliary<Variable name="AuxNum"/>]</SetVariable>
+  <SetVariable name="Type">auxiliary</SetVariable>
+
+  <!-- input device is configured -->
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <SizePolicy>min,min</SizePolicy>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>MicAuxUnit</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+
+          <WidgetGroup>
+            <ObjectName>MicAuxMainControls</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,me</SizePolicy>
+            <Children>
+
+              <Label>
+                <ObjectName>MicAuxLabel</ObjectName>
+                <Size>,20f</Size>
+                <Text>Aux <Variable name="AuxNum"/></Text>
+                <Alignment>center</Alignment>
+              </Label>
+
+              <WidgetGroup>
+                <ObjectName>AuxPlayBox</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,me</SizePolicy>
+                <Children>
+                  <Template src="skin:/controls/button_2state.xml">
+                    <SetVariable name="TooltipId">master_enable</SetVariable>
+                    <SetVariable name="ObjectName">AuxPlay</SetVariable>
+                    <SetVariable name="Size">42f,26f</SetVariable>
+                    <SetVariable name="BtnSize">medium</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="Group"/>,master</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+
+              <Template src="skin:/controls/button_xfader_aux.xml"/>
+
+            </Children>
+          </WidgetGroup><!-- MicAuxMainControls -->
+
+          <WidgetGroup>
+            <ObjectName>MicAuxVUMeter</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,me</SizePolicy>
+            <Children>
+              <Template src="skin:/mixer/vumeter_single.xml">
+                <SetVariable name="ChannelType">auxiliary</SetVariable>
+                <SetVariable name="VuSize">micaux</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup><!-- Gain, Pfl, FX buttons-->
+            <ObjectName>MicAuxSubControls</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,me</SizePolicy>
+            <Children>
+              <WidgetGroup>
+                <ObjectName>MicAuxGainPFlContainer</ObjectName>
+                <Layout>horizontal</Layout>
+                <SizePolicy>min,me</SizePolicy>
+                <Children>
+                  <Template src="skin:/controls/knob_textless.xml">
+                    <SetVariable name="TooltipId">auxiliary_pregain</SetVariable>
+                    <SetVariable name="Size">35f,30f</SetVariable>
+                    <SetVariable name="KnobColor">orange</SetVariable>
+                    <SetVariable name="ArcColor"><Variable name="ArcColorGain"/></SetVariable>
+                    <SetVariable name="Control">pregain</SetVariable>
+                  </Template>
+                  <WidgetGroup><Size>4f,0min</Size></WidgetGroup>
+                  <WidgetGroup>
+                    <ObjectName>AlignHCenter</ObjectName>
+                    <Layout>vertical</Layout>
+                    <SizePolicy>min,min</SizePolicy>
+                    <Children>
+                      <Template src="skin:/controls/button_2state.xml">
+                        <SetVariable name="TooltipId">pfl</SetVariable>
+                        <SetVariable name="ObjectName">PflButton</SetVariable>
+                        <SetVariable name="BtnSize">square</SetVariable>
+                        <SetVariable name="Size">26f,26f</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="Group"/>,pfl</SetVariable>
+                      </Template>
+                    </Children>
+                  </WidgetGroup>
+                  <WidgetGroup><Size>0min,0min</Size></WidgetGroup>
+                </Children>
+              </WidgetGroup><!-- MicAuxGainPFlContainer -->
+
+              <WidgetGroup><Size>0min,0min</Size></WidgetGroup>
+
+              <WidgetGroup>
+                <ObjectName>AlignHCenter</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                  <Template src="skin:/fx/assign_buttons.xml"/>
+                </Children>
+              </WidgetGroup>
+
+            </Children>
+          </WidgetGroup><!-- MicAuxSubControls / Gain, Pfl, FX buttons-->
+
+        </Children>
+      </WidgetGroup><!-- MicAuxUnit -->
+
+    </Children>
+    <Connection>
+      <ConfigKey><Variable name="Group"/>,enabled</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/mic_aux/aux_unit_unconfigured.xml b/res/skins/LateNight/mic_aux/aux_unit_unconfigured.xml
new file mode 100644
index 000000000000..4d9ed33fbf84
--- /dev/null
+++ b/res/skins/LateNight/mic_aux/aux_unit_unconfigured.xml
@@ -0,0 +1,55 @@
+<Template>
+  <SetVariable name="Group">[Auxiliary<Variable name="AuxNum"/>]</SetVariable>
+
+  <!-- input device is NOT configured -->
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <SizePolicy>max,min</SizePolicy>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>MicAuxAddFrame</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+
+          <Label>
+            <ObjectName>MicAuxLabelUnconfigured</ObjectName>
+            <Size>,21f</Size>
+            <Text>Aux <Variable name="AuxNum"/></Text>
+            <Alignment>center</Alignment>
+          </Label>
+
+          <WidgetGroup>
+            <ObjectName>MicAuxAddBox</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,me</SizePolicy>
+            <Children>
+              <PushButton>
+                <TooltipId>configure_input</TooltipId>
+                <ObjectName>MicAuxAdd</ObjectName>
+                <Size>26f,26f</Size>
+                <NumberStates>1</NumberStates>
+                <State>
+                  <Number>0</Number>
+                  <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_flat_square.svg</Unpressed>
+                  <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_flat_square.svg</Pressed>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="Group"/>,master</ConfigKey>
+                </Connection>
+              </PushButton>
+            </Children>
+          </WidgetGroup><!-- MicAuxAddBox -->
+
+        </Children>
+      </WidgetGroup><!-- MicAuxAddFrame -->
+
+    </Children>
+    <Connection>
+      <ConfigKey><Variable name="Group"/>,enabled</ConfigKey>
+      <Transform><Not/></Transform>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup><!-- /MicAuxUnit -->
+</Template>
diff --git a/res/skins/LateNight/mic_aux/ducking_controls.xml b/res/skins/LateNight/mic_aux/ducking_controls.xml
new file mode 100644
index 000000000000..b2e16edf8da3
--- /dev/null
+++ b/res/skins/LateNight/mic_aux/ducking_controls.xml
@@ -0,0 +1,44 @@
+<Template>
+  <WidgetGroup>
+    <ObjectName>MicDuckingContainer</ObjectName>
+    <Layout>vertical</Layout>
+    <SizePolicy>f,min</SizePolicy>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>MicDuckingModeBox</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>me,min</SizePolicy>
+        <Children>
+          <Template src="skin:/controls/button_3state.xml">
+            <SetVariable name="TooltipId">talkover_duck_mode</SetVariable>
+            <SetVariable name="ObjectName">MicDucking</SetVariable>
+            <SetVariable name="Size">42f,24f</SetVariable>
+            <SetVariable name="BtnType">embedded</SetVariable>
+            <SetVariable name="BtnSize">medium</SetVariable>
+            <SetVariable name="ConfigKey">[Master],talkoverDucking</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+      <WidgetGroup>
+        <ObjectName>MicDuckingStrengthBox</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>me,min</SizePolicy>
+        <Children>
+          <Template src="skin:/controls/knob_textless.xml">
+            <SetVariable name="TooltipId">talkover_duck_strength</SetVariable>
+            <SetVariable name="Size">35f,30f</SetVariable>
+            <SetVariable name="KnobColor">red</SetVariable>
+            <SetVariable name="ArcColor"><Variable name="ArcColorFxMix"/></SetVariable>
+            <SetVariable name="ArcReversed">true</SetVariable>
+            <SetVariable name="Group">[Master]</SetVariable>
+            <SetVariable name="Control">duckStrength</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup><!-- MicDuckingStrengthKnob -->
+    </Children>
+    <Connection>
+      <ConfigKey>[LateNight],show_ducking_controls</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup><!-- MicDuckingContainer -->
+</Template>
diff --git a/res/skins/LateNight/mic_aux/mic_unit.xml b/res/skins/LateNight/mic_aux/mic_unit.xml
new file mode 100644
index 000000000000..9ca521854fb2
--- /dev/null
+++ b/res/skins/LateNight/mic_aux/mic_unit.xml
@@ -0,0 +1,121 @@
+<Template>
+  <SetVariable name="Group">[Microphone<Variable name="MicNum"/>]</SetVariable>
+  <SetVariable name="Type">microphone</SetVariable>
+
+  <!-- input device is configured -->
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <SizePolicy>min,min</SizePolicy>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>MicAuxUnit</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+
+          <WidgetGroup>
+            <ObjectName>MicAuxMainControls</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,me</SizePolicy>
+            <Children>
+
+              <Label>
+                <ObjectName>MicAuxLabel</ObjectName>
+                <Size>0min,20f</Size>
+                <Text>mic <Variable name="Mic1Hack"/><Variable name="MicNum"/></Text>
+                <Alignment>center</Alignment>
+              </Label>
+
+              <WidgetGroup><Size>0min,0me</Size></WidgetGroup>
+
+              <WidgetGroup>
+                <ObjectName>MicTalkBox</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                  <Template src="skin:/controls/button_2state.xml">
+                    <SetVariable name="TooltipId">microphone_talkover</SetVariable>
+                    <SetVariable name="ObjectName">MicTalk</SetVariable>
+                    <SetVariable name="Size">42f,26f</SetVariable>
+                    <SetVariable name="BtnSize">medium</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="Group"/>,talkover</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+
+            </Children>
+          </WidgetGroup><!-- MicAuxMainControls -->
+
+          <WidgetGroup>
+            <ObjectName>MicAuxVUMeter</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,me</SizePolicy>
+            <Children>
+              <Template src="skin:/mixer/vumeter_single.xml">
+                <SetVariable name="ChannelType">microphone</SetVariable>
+                <SetVariable name="VuSize">micaux</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup><!-- Gain, Pfl, FX buttons-->
+            <ObjectName>MicAuxSubControls</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,me</SizePolicy>
+            <Children>
+              <WidgetGroup>
+                <ObjectName>MicAuxGainPFlContainer</ObjectName>
+                <Layout>horizontal</Layout>
+                <SizePolicy>min,me</SizePolicy>
+                <Children>
+                  <Template src="skin:/controls/knob_textless.xml">
+                    <SetVariable name="TooltipId">microphone_pregain</SetVariable>
+                    <SetVariable name="Size">35f,30f</SetVariable>
+                    <SetVariable name="KnobColor">orange</SetVariable>
+                    <SetVariable name="ArcColor"><Variable name="ArcColorGain"/></SetVariable>
+                    <SetVariable name="Control">pregain</SetVariable>
+                  </Template>
+                  <WidgetGroup><Size>4f,0min</Size></WidgetGroup>
+                  <WidgetGroup>
+                    <ObjectName>AlignHCenter</ObjectName>
+                    <Layout>vertical</Layout>
+                    <SizePolicy>min,min</SizePolicy>
+                    <Children>
+                      <Template src="skin:/controls/button_2state.xml">
+                        <SetVariable name="TooltipId">pfl</SetVariable>
+                        <SetVariable name="ObjectName">PflButton</SetVariable>
+                        <SetVariable name="BtnSize">square</SetVariable>
+                        <SetVariable name="Size">26f,26f</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="Group"/>,pfl</SetVariable>
+                      </Template>
+                    </Children>
+                  </WidgetGroup>
+                  <WidgetGroup><Size>0min,0min</Size></WidgetGroup>
+                </Children>
+              </WidgetGroup><!-- MicAuxGainPFlContainer -->
+
+              <WidgetGroup><Size>0min,0min</Size></WidgetGroup>
+
+              <WidgetGroup>
+                <ObjectName>AlignHCenter</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                  <Template src="skin:/fx/assign_buttons.xml"/>
+                </Children>
+              </WidgetGroup>
+
+            </Children>
+          </WidgetGroup><!-- MicAuxSubControls / Gain, Pfl, FX buttons-->
+
+        </Children>
+      </WidgetGroup><!-- MicAuxUnit -->
+
+    </Children>
+    <Connection>
+      <ConfigKey><Variable name="Group"/>,enabled</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/mic_aux/mic_unit_unconfigured.xml b/res/skins/LateNight/mic_aux/mic_unit_unconfigured.xml
new file mode 100644
index 000000000000..09b1052bef08
--- /dev/null
+++ b/res/skins/LateNight/mic_aux/mic_unit_unconfigured.xml
@@ -0,0 +1,55 @@
+<Template>
+  <SetVariable name="Group">[Microphone<Variable name="MicNum"/>]</SetVariable>
+
+  <!-- input device is NOT configured -->
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <SizePolicy>max,min</SizePolicy>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>MicAuxAddFrame</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>me,min</SizePolicy>
+        <Children>
+
+          <Label>
+            <ObjectName>MicAuxLabelUnconfigured</ObjectName>
+            <Size>0min,21min</Size>
+            <Text>mic <Variable name="Mic1Hack"/><Variable name="MicNum"/></Text>
+            <Alignment>center</Alignment>
+          </Label>
+
+          <WidgetGroup>
+            <ObjectName>MicAuxAddBox</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,me</SizePolicy>
+            <Children>
+              <PushButton>
+                <TooltipId>configure_input</TooltipId>
+                <ObjectName>MicAuxAdd</ObjectName>
+                <Size>26f,26f</Size>
+                <NumberStates>1</NumberStates>
+                <State>
+                  <Number>0</Number>
+                  <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_flat_square.svg</Unpressed>
+                  <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_flat_square.svg</Pressed>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="Group"/>,talkover</ConfigKey>
+                </Connection>
+              </PushButton>
+            </Children>
+          </WidgetGroup><!-- MicAuxAddBox -->
+
+        </Children>
+      </WidgetGroup><!-- MicAuxAddFrame -->
+
+    </Children>
+    <Connection>
+      <ConfigKey><Variable name="Group"/>,enabled</ConfigKey>
+      <Transform><Not/></Transform>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup><!-- /MicAuxUnit -->
+</Template>
diff --git a/res/skins/LateNight/mic_aux_rack.xml b/res/skins/LateNight/mic_aux_rack.xml
index d182292956db..15d2b40c7e3b 100644
--- a/res/skins/LateNight/mic_aux_rack.xml
+++ b/res/skins/LateNight/mic_aux_rack.xml
@@ -1,167 +1,155 @@
 <Template>
+  <SetVariable name="BtnType"><Variable name="TopRegion_BtnType"/></SetVariable>
+  <SetVariable name="KnobBg">small</SetVariable>
+  <SetVariable name="KnobIndicator">small</SetVariable>
+  <SetVariable name="ArcRadius"><Variable name="ArcRadiusCompact"/></SetVariable>
+  <SetVariable name="ArcThickness"><Variable name="ArcThicknessBig"/></SetVariable>
+  <SetVariable name="ArcUnipolar">true</SetVariable>
+
   <WidgetGroup>
-    <ObjectName>MicAuxRack</ObjectName>
     <Layout>horizontal</Layout>
-    <SizePolicy>me,min</SizePolicy>
+    <SizePolicy>me,max</SizePolicy>
     <Children>
 
       <WidgetGroup>
-        <ObjectName>MicRack</ObjectName>
+        <ObjectName>MicAuxRack</ObjectName>
         <Layout>horizontal</Layout>
         <SizePolicy>me,min</SizePolicy>
         <Children>
-          <!-- Dummy to fill empty space -->
+
           <WidgetGroup>
             <ObjectName>MicAuxRackFiller</ObjectName>
-            <SizePolicy>i,min</SizePolicy>
+            <SizePolicy>me,min</SizePolicy>
           </WidgetGroup>
-            <WidgetGroup>
-              <SizePolicy>i,min</SizePolicy>
-              <MaximumSize>5,</MaximumSize>
-            </WidgetGroup>
-          <Template src="skin:mic_unit.xml">
-            <SetVariable name="micnum">4</SetVariable>
-          </Template>
-          <Template src="skin:mic_unit_unconfigured.xml">
-            <SetVariable name="micnum">4</SetVariable>
-          </Template>
-            <WidgetGroup>
-              <SizePolicy>min,min</SizePolicy>
-              <MinimumSize>3,0</MinimumSize>
-              <MaximumSize>5,</MaximumSize>
-            </WidgetGroup>
-          <Template src="skin:mic_unit.xml">
-            <SetVariable name="micnum">3</SetVariable>
-          </Template>
-          <Template src="skin:mic_unit_unconfigured.xml">
-            <SetVariable name="micnum">3</SetVariable>
-          </Template>
-            <WidgetGroup>
-              <SizePolicy>min,min</SizePolicy>
-              <MinimumSize>3,0</MinimumSize>
-              <MaximumSize>5,</MaximumSize>
-            </WidgetGroup>
-          <Template src="skin:mic_unit.xml">
-            <SetVariable name="micnum">2</SetVariable>
-          </Template>
-          <Template src="skin:mic_unit_unconfigured.xml">
-            <SetVariable name="micnum">2</SetVariable>
-          </Template>
-            <WidgetGroup>
-              <SizePolicy>min,min</SizePolicy>
-              <MinimumSize>3,0</MinimumSize>
-              <MaximumSize>5,</MaximumSize>
-            </WidgetGroup>
-          <Template src="skin:mic_unit.xml">
-            <SetVariable name="mic1hack">1</SetVariable>
-          </Template>
-          <Template src="skin:mic_unit_unconfigured.xml">
-            <SetVariable name="mic1hack">1</SetVariable>
-          </Template>
 
           <WidgetGroup>
-            <ObjectName>MicDuckingContainer</ObjectName>
-            <Layout>vertical</Layout>
-            <SizePolicy>max,min</SizePolicy>
+            <ObjectName>MicRack</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,min</SizePolicy>
             <Children>
-              <Template src="skin:button_3state.xml">
-                <SetVariable name="TooltipId">talkover_duck_mode</SetVariable>
-                <SetVariable name="ObjectName">MicDuckingButton</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 src="skin:/mic_aux/ducking_controls.xml">
+                <SetVariable name="KnobColor">red</SetVariable>
               </Template>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:/mic_aux/mic_unit.xml">
+                    <SetVariable name="Mic1Hack">1</SetVariable>
+                  </Template>
+                  <Template src="skin:/mic_aux/mic_unit_unconfigured.xml">
+                    <SetVariable name="Mic1Hack">1</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+
               <WidgetGroup>
-                <ObjectName>MicDuckingStrengthKnob</ObjectName>
                 <Layout>horizontal</Layout>
-                <SizePolicy>me,min</SizePolicy>
                 <Children>
-                  <Template src="skin:knob_textless.xml">
-                    <SetVariable name="TooltipId">talkover_duck_strength</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>
+                  <Template src="skin:/mic_aux/mic_unit.xml">
+                    <SetVariable name="MicNum">2</SetVariable>
+                  </Template>
+                  <Template src="skin:/mic_aux/mic_unit_unconfigured.xml">
+                    <SetVariable name="MicNum">2</SetVariable>
                   </Template>
                 </Children>
-              </WidgetGroup><!-- MicDuckingStrengthKnob -->
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:/mic_aux/mic_unit.xml">
+                    <SetVariable name="MicNum">3</SetVariable>
+                  </Template>
+                  <Template src="skin:/mic_aux/mic_unit_unconfigured.xml">
+                    <SetVariable name="MicNum">3</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:/mic_aux/mic_unit.xml">
+                    <SetVariable name="MicNum">4</SetVariable>
+                  </Template>
+                  <Template src="skin:/mic_aux/mic_unit_unconfigured.xml">
+                    <SetVariable name="MicNum">4</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
             </Children>
-          </WidgetGroup><!-- MicDuckingContainer -->
-        </Children>
-      </WidgetGroup><!-- MicRack -->
+          </WidgetGroup><!-- MicRack -->
 
-      <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>
+            <SizePolicy>me,min</SizePolicy>
           </WidgetGroup>
-            <WidgetGroup>
-              <SizePolicy>i,min</SizePolicy>
-              <MaximumSize>5,</MaximumSize>
-            </WidgetGroup>
-          <Template src="skin:aux_unit.xml">
-            <SetVariable name="auxnum">4</SetVariable>
-          </Template>
-          <Template src="skin:aux_unit_unconfigured.xml">
-            <SetVariable name="auxnum">4</SetVariable>
-          </Template>
-            <WidgetGroup>
-              <SizePolicy>min,min</SizePolicy>
-              <MinimumSize>3,0</MinimumSize>
-              <MaximumSize>5,</MaximumSize>
-            </WidgetGroup>
-          <Template src="skin:aux_unit.xml">
-            <SetVariable name="auxnum">3</SetVariable>
-          </Template>
-          <Template src="skin:aux_unit_unconfigured.xml">
-            <SetVariable name="auxnum">3</SetVariable>
-          </Template>
-            <WidgetGroup>
-              <SizePolicy>min,min</SizePolicy>
-              <MinimumSize>3,0</MinimumSize>
-              <MaximumSize>5,</MaximumSize>
-            </WidgetGroup>
-          <Template src="skin:aux_unit.xml">
-            <SetVariable name="auxnum">2</SetVariable>
-          </Template>
-          <Template src="skin:aux_unit_unconfigured.xml">
-            <SetVariable name="auxnum">2</SetVariable>
-          </Template>
-            <WidgetGroup>
-              <SizePolicy>min,min</SizePolicy>
-              <MinimumSize>3,0</MinimumSize>
-              <MaximumSize>5,</MaximumSize>
-            </WidgetGroup>
-          <Template src="skin:aux_unit.xml">
-            <SetVariable name="auxnum">1</SetVariable>
-          </Template>
-          <Template src="skin:aux_unit_unconfigured.xml">
-            <SetVariable name="auxnum">1</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup><!-- AuxRack -->
 
-      <WidgetGroup>
-        <SizePolicy>min,min</SizePolicy>
-        <MaximumSize>78,i</MaximumSize>
-      </WidgetGroup>
+          <WidgetGroup>
+            <ObjectName>AuxRack</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
 
-      <WidgetGroup><SizePolicy>min,min</SizePolicy></WidgetGroup>
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:/mic_aux/aux_unit.xml">
+                    <SetVariable name="AuxNum">1</SetVariable>
+                  </Template>
+                  <Template src="skin:/mic_aux/aux_unit_unconfigured.xml">
+                    <SetVariable name="AuxNum">1</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
 
-      <WidgetGroup>
-        <Size>2f,1min</Size>
-        <Connection>
-          <ConfigKey>[Master],skin_settings</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup>
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:/mic_aux/aux_unit.xml">
+                    <SetVariable name="AuxNum">2</SetVariable>
+                  </Template>
+                  <Template src="skin:/mic_aux/aux_unit_unconfigured.xml">
+                    <SetVariable name="AuxNum">2</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:/mic_aux/aux_unit.xml">
+                    <SetVariable name="AuxNum">3</SetVariable>
+                  </Template>
+                  <Template src="skin:/mic_aux/aux_unit_unconfigured.xml">
+                    <SetVariable name="AuxNum">3</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:/mic_aux/aux_unit.xml">
+                    <SetVariable name="AuxNum">4</SetVariable>
+                  </Template>
+                  <Template src="skin:/mic_aux/aux_unit_unconfigured.xml">
+                    <SetVariable name="AuxNum">4</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup><!-- AuxRack -->
+
+          <WidgetGroup>
+            <ObjectName>MicAuxRackFiller</ObjectName>
+            <SizePolicy>me,min</SizePolicy>
+          </WidgetGroup>
+
+        </Children>
+      </WidgetGroup><!-- MicAuxRack -->
 
     </Children>
     <Connection>
diff --git a/res/skins/LateNight/mic_unit.xml b/res/skins/LateNight/mic_unit.xml
deleted file mode 100644
index 7895e2224e21..000000000000
--- a/res/skins/LateNight/mic_unit.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<Template>
-  <SetVariable name="btn_type"><Variable name="TopRegion_btn_type"/></SetVariable>
-  <SetVariable name="group">[Microphone<Variable name="micnum"/>]</SetVariable>
-  <SetVariable name="Type">microphone</SetVariable>
-
-  <!-- input device is configured -->
-  <WidgetGroup>
-    <ObjectName>MicAuxUnit</ObjectName>
-    <Layout>horizontal</Layout>
-    <SizePolicy>min,max</SizePolicy>
-    <MaximumSize>170,</MaximumSize>
-    <Children>
-
-      <WidgetGroup>
-        <ObjectName>MicAuxSubControlsFrame</ObjectName>
-        <Layout>stacked</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-
-          <WidgetGroup><!-- Gain, Pfl, FX buttons, VU -->
-            <ObjectName>MicAuxSubControls</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,me</SizePolicy>
-            <Children>
-
-              <WidgetGroup><!-- Gain, Pfl, FX buttons -->
-                <Layout>vertical</Layout>
-                <SizePolicy>min,me</SizePolicy>
-                <Children>
-                  <WidgetGroup>
-                    <ObjectName>MicAuxGainPFlContainer</ObjectName>
-                    <Layout>horizontal</Layout>
-                    <SizePolicy>min,me</SizePolicy>
-                    <Children>
-                      <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">microphone_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,min</SizePolicy>
-                        <Children>
-                          <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>
-                        </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">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>
-                        <Connection>
-                          <ConfigKey persist="true">[Skin],show_4effectunits</ConfigKey>
-                          <BindProperty>visible</BindProperty>
-                        </Connection>
-                      </WidgetGroup><!-- /FX buttons 1-4 -->
-                    </Children>
-                  </WidgetGroup><!-- MicAuxFxButtons * 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>
-                </Children>
-              </WidgetGroup>
-            </Children>
-          </WidgetGroup><!-- MicAuxSubControls -->
-
-          <!-- Background tile underneath controls container -->
-          <WidgetGroup>
-            <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>,21f</Size>
-                <Text>mic <Variable name="mic1hack"/><Variable name="micnum"/></Text>
-                <Alignment>center</Alignment>
-              </Label>
-
-              <WidgetGroup>
-                <ObjectName>MicAuxPlayBox</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,me</SizePolicy>
-                <Children>
-                  <Template src="skin:button_2state.xml">
-                    <SetVariable name="TooltipId">microphone_talkover</SetVariable>
-                    <SetVariable name="ObjectName">MicTalk</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><!-- MicAuxMainControls -->
-        </Children>
-      </WidgetGroup><!-- MicAuxMainControlsFrame  -->
-
-    </Children>
-    <Connection>
-      <ConfigKey><Variable name="group"/>,enabled</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
-  </WidgetGroup><!-- /MicAuxUnit -->
-</Template>
diff --git a/res/skins/LateNight/mic_unit_unconfigured.xml b/res/skins/LateNight/mic_unit_unconfigured.xml
deleted file mode 100644
index 5e1d0f04871f..000000000000
--- a/res/skins/LateNight/mic_unit_unconfigured.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<Template>
-  <SetVariable name="btn_type"><Variable name="TopRegion_btn_type"/></SetVariable>
-  <SetVariable name="group">[Microphone<Variable name="micnum"/>]</SetVariable>
-  <SetVariable name="Type">microphone</SetVariable>
-
-  <!-- input device is NOT configured -->
-  <WidgetGroup>
-    <ObjectName>MicAuxUnit</ObjectName>
-    <Layout>horizontal</Layout>
-    <SizePolicy>min,max</SizePolicy>
-    <MaximumSize>50,</MaximumSize>
-    <Children>
-
-      <WidgetGroup>
-        <ObjectName>MicAuxMainControlsFrame</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>me,me</SizePolicy>
-        <Children>
-          <WidgetGroup>
-            <ObjectName>MicAuxMainControls</ObjectName>
-            <Layout>vertical</Layout>
-            <SizePolicy>me,me</SizePolicy>
-            <Children>
-
-              <Label>
-                <ObjectName>MicAuxSubTitle</ObjectName>
-                <Size>,21f</Size>
-                <Text>mic <Variable name="mic1hack"/><Variable name="micnum"/></Text>
-                <Alignment>center</Alignment>
-              </Label>
-
-              <WidgetGroup>
-                <ObjectName>MicAuxAddBox</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,me</SizePolicy>
-                <Children>
-                  <Template src="skin:button_1state.xml">
-                    <SetVariable name="TooltipId">configure_input</SetVariable>
-                    <SetVariable name="ObjectName">MicAuxAddButton</SetVariable>
-                    <SetVariable name="Size">26f,26f</SetVariable>
-                    <SetVariable name="btn_type">embedded</SetVariable>
-                    <SetVariable name="btn_format">square</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="group"/>,talkover</SetVariable>
-                  </Template>
-                </Children>
-              </WidgetGroup>
-
-            </Children>
-          </WidgetGroup><!-- MicAuxMainControls -->
-        </Children>
-      </WidgetGroup><!-- MicAuxMainControlsFrame -->
-
-    </Children>
-    <Connection>
-      <ConfigKey><Variable name="group"/>,enabled</ConfigKey>
-      <Transform><Not/></Transform>
-      <BindProperty>visible</BindProperty>
-    </Connection>
-  </WidgetGroup><!-- /MicAuxUnit -->
-</Template>
diff --git a/res/skins/LateNight/style_classic/background_tile.svg b/res/skins/LateNight/misc_res/background_tile.svg
similarity index 100%
rename from res/skins/LateNight/style_classic/background_tile.svg
rename to res/skins/LateNight/misc_res/background_tile.svg
diff --git a/res/skins/LateNight/misc_res/btn__keylock.svg b/res/skins/LateNight/misc_res/btn__keylock.svg
new file mode 100644
index 000000000000..589f29feaef6
--- /dev/null
+++ b/res/skins/LateNight/misc_res/btn__keylock.svg
@@ -0,0 +1,51 @@
+<?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="21"
+   height="18"
+   version="1.1"
+   viewBox="0 0 21 18">
+  <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
+     id="rect4195"
+     d="m 4,8 v 7 H 17 V 8 Z m 6,2 h 1 v 3 h -1 z"
+     color="#000001"
+     fill="#766d65"
+     style="fill:#444443;fill-opacity:1" />
+  <path
+     style="fill:#c7c2bd;fill-opacity:1"
+     fill="#766d65"
+     color="#000001"
+     d="M -8.5,7 V 5.5 C -8.5,3.567 -10.067,2 -12,2 c -1.933,0 -3.5,1.567 -3.5,3.5 V 7 h 2 V 5.5 c 0,-0.82843 0.67157,-1.5 1.5,-1.5 0.82843,0 1.5,0.67157 1.5,1.5 V 7 Z"
+     id="rect4195-6" />
+  <path
+     d="M 10.5 2.5 C 9.1432002 2.5 7.9402841 3.1128036 7.1152344 4.0625 L 8.6191406 5.3691406 C 9.0775198 4.8408028 9.7456226 4.5 10.5 4.5 C 11.880712 4.5 13 5.6192881 13 7 L 13 8 L 15 8 L 15 7 C 15 4.5147186 12.985281 2.5 10.5 2.5 z "
+     style="fill:#444443;fill-opacity:1;stroke:none;stroke-width:1.70255;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path1060" />
+  <path
+     style="fill:#3a3631;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M -9.5,7 -13,2 -17.422409,7.5832601 -16.478484,12 Z"
+     id="path1205-5" />
+  <path
+     id="path1060-3"
+     style="fill:#444443;fill-opacity:1;stroke:none;stroke-width:1.70255;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M -9.5,2.5 C -11.985281,2.5 -14,4.5147186 -14,7 v 1 h 2 V 7 c 0,-1.3807119 1.119288,-2.5 2.5,-2.5 1.380712,0 2.5,1.1192881 2.5,2.5 v 1 h 2 V 7 C -5,4.5147186 -7.014719,2.5 -9.5,2.5 Z" />
+</svg>
diff --git a/res/skins/LateNight/misc_res/btn__lib_bpm_locked_black.svg b/res/skins/LateNight/misc_res/btn__lib_bpm_locked_black.svg
new file mode 100644
index 000000000000..533877a8e06a
--- /dev/null
+++ b/res/skins/LateNight/misc_res/btn__lib_bpm_locked_black.svg
@@ -0,0 +1,3 @@
+<svg width="10" height="12" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m4.9765625 0c-1.4489106.00994182-2.441829.65947319-2.9335937 1.4238281-.491765.764355-.5464175 1.549471-.5429688 1.9726563.0047842.5863697.0007237 2.2786766 0 2.6035156h-.66601562c-.41667001 0-.83398438.4149781-.83398438.8300781v4.3398439c0 .4151.41732437.830078.83398438.830078h8.33203122c.41667 0 .8339844-.414978.8339844-.830078v-4.3398439c0-.4151-.4173244-.8300781-.8339844-.8300781h-.6660156c.000169-.2983616.0009685-1.5773226 0-2.171875-.0010016-.6121197-.0602547-1.5109887-.5585938-2.3417969-.4983389-.83080816-1.5189215-1.49626715-2.9648437-1.4863281zm.0097656 1.5c1.0446779-.007181 1.4069609.3194157 1.6699219.7578125s.3429516 1.0862385.34375 1.5742187c.0009639.5890622.0001684 1.8689344 0 2.1679688h-4c.0007682-.324936.0050349-1.9972105 0-2.6152344-.0019313-.2369985.0561849-.7641406.3046875-1.1503906s.6238412-.7271168 1.6816406-.734375zm-2.9863281 6.5h6c.277 0 .5.223.5.5s-.223.5-.5.5h-6c-.277 0-.5-.223-.5-.5s.223-.5.5-.5zm0 2h6c.277 0 .5.223.5.5s-.223.5-.5.5h-6c-.277 0-.5-.223-.5-.5s.223-.5.5-.5z" color="#000001" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000001" 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:#000001;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/misc_res/btn__lib_bpm_unlocked_black.svg b/res/skins/LateNight/misc_res/btn__lib_bpm_unlocked_black.svg
new file mode 100644
index 000000000000..68c242967754
--- /dev/null
+++ b/res/skins/LateNight/misc_res/btn__lib_bpm_unlocked_black.svg
@@ -0,0 +1,5 @@
+<svg width="10" height="12" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(0,-20)">
+		<path transform="translate(0,20)" d="m4.9766 0c-1.4489.01-2.4418.65947-2.9336 1.4238l1.26172.81059c.2485-.38625.62385-.7271 1.6816-.73438 1.0447-.00718 1.407.31941 1.6699.75781.26297.4384.34296 1.0862.34375 1.5742.0009639.58906.0001684 1.8689 0 2.168h-6.166c-.41667 0-.83398.41498-.83398.83008v4.3398c0 .4151.41732.83008.83398.83008h8.332c.41667 0 .83398-.41498.83398-.83008v-4.3398c0-.4151-.41732-.83008-.83398-.83008h-.66602c.000169-.29836.0009685-1.5773 0-2.1719-.0009966-.61214-.060246-1.5129-.55859-2.3438-.49835-.83081-1.5189-1.4943-2.9648-1.4844zm-2.9766 8h6c.277 0 .5.223.5.5s-.223.5-.5.5h-6c-.277 0-.5-.223-.5-.5s.223-.5.5-.5zm0 2h6c.277 0 .5.223.5.5s-.223.5-.5.5h-6c-.277 0-.5-.223-.5-.5s.223-.5.5-.5z" color="#000001" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000001" 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:#000001;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/misc_res/btn__lib_checkmark_black.svg b/res/skins/LateNight/misc_res/btn__lib_checkmark_black.svg
new file mode 100644
index 000000000000..65435479a6c1
--- /dev/null
+++ b/res/skins/LateNight/misc_res/btn__lib_checkmark_black.svg
@@ -0,0 +1,7 @@
+<svg width="10" height="10" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(0,-22)" fill="none" stroke="#000001">
+		<g transform="matrix(.4151 0 0 .4151 -1.6604 19.547)" fill="none" stroke="#000001">
+			<path d="m8.8184 20.364 4.8181 4.8181 9.6363-14.454" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="4.81809998"/>
+		</g>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__lib_preview_play_black.svg b/res/skins/LateNight/misc_res/btn__lib_preview_play_black.svg
similarity index 92%
rename from res/skins/LateNight/buttons_classic/btn__lib_preview_play_black.svg
rename to res/skins/LateNight/misc_res/btn__lib_preview_play_black.svg
index 3bb22e8fac03..6bb6b166542a 100644
--- a/res/skins/LateNight/buttons_classic/btn__lib_preview_play_black.svg
+++ b/res/skins/LateNight/misc_res/btn__lib_preview_play_black.svg
@@ -2,7 +2,7 @@
 	<g transform="translate(0,-14)">
 		<g transform="matrix(.4151 0 0 .4151 -1.6604 19.547)">
 			<path transform="matrix(0 1.0073 -.99696 0 665.47 -566.48)" d="m582.29 615.16h-23.318l11.659-20.194z"/>
-			<path d="m28.091-5.2913c-7.6146 0-14.009 6.184-14.009 13.799 0 .081419-.0018.15673 0 .25552v.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-.49392 0-.77584.032462-1.2416.12776.44085-5.5257 5.2378-9.838 10.879-9.838 5.6277 0 10.418 4.3312 10.878 9.8387-.46575-.0953-.74765-.12776-1.2416-.12776v14.309c3.9514 0 6.927-3.2033 6.927-7.1547 0-2.2227-1.029-4.1814-2.619-5.4938.01253-.21585.06386-.41511.06386-.63881 2.1e-5-7.6146-6.3933-13.799-14.008-13.799z" color="#000000" stroke-width="2.40910006" style="text-indent:0;text-transform:none"/>
+			<path d="m28.091-5.2913c-7.6146 0-14.009 6.184-14.009 13.799 0 .081419-.0018.15673 0 .25552v.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-.49392 0-.77584.032462-1.2416.12776.44085-5.5257 5.2378-9.838 10.879-9.838 5.6277 0 10.418 4.3312 10.878 9.8387-.46575-.0953-.74765-.12776-1.2416-.12776v14.309c3.9514 0 6.927-3.2033 6.927-7.1547 0-2.2227-1.029-4.1814-2.619-5.4938.01253-.21585.06386-.41511.06386-.63881 2.1e-5-7.6146-6.3933-13.799-14.008-13.799z" color="#000001" stroke-width="2.40910006" style="text-indent:0;text-transform:none"/>
 		</g>
 	</g>
 </svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__lib_radio_button_on_gold.svg b/res/skins/LateNight/misc_res/btn__lib_radio_button_on_gold.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__lib_radio_button_on_gold.svg
rename to res/skins/LateNight/misc_res/btn__lib_radio_button_on_gold.svg
diff --git a/res/skins/LateNight/misc_res/btn__lib_spinbox_down_black.svg b/res/skins/LateNight/misc_res/btn__lib_spinbox_down_black.svg
new file mode 100644
index 000000000000..87d13435e75c
--- /dev/null
+++ b/res/skins/LateNight/misc_res/btn__lib_spinbox_down_black.svg
@@ -0,0 +1,3 @@
+<svg width="13" height="10" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m2.6574 2.8965256 3.8426 3.7618 3.8426-3.7618" fill="none" stroke="#000001" stroke-width="1.29999995"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__lib_spinbox_down_white.svg b/res/skins/LateNight/misc_res/btn__lib_spinbox_down_white.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__lib_spinbox_down_white.svg
rename to res/skins/LateNight/misc_res/btn__lib_spinbox_down_white.svg
diff --git a/res/skins/LateNight/misc_res/btn__lib_spinbox_up_black.svg b/res/skins/LateNight/misc_res/btn__lib_spinbox_up_black.svg
new file mode 100644
index 000000000000..95a920c3af82
--- /dev/null
+++ b/res/skins/LateNight/misc_res/btn__lib_spinbox_up_black.svg
@@ -0,0 +1,3 @@
+<svg width="13" height="10" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m2.6574 7.1034743 3.8426-3.7618 3.8426 3.7618" fill="none" stroke="#000001" stroke-width="1.29999995"/>
+</svg>
diff --git a/res/skins/LateNight/buttons_classic/btn__lib_spinbox_up_white.svg b/res/skins/LateNight/misc_res/btn__lib_spinbox_up_white.svg
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__lib_spinbox_up_white.svg
rename to res/skins/LateNight/misc_res/btn__lib_spinbox_up_white.svg
diff --git a/res/skins/LateNight/buttons_classic/btn__mastersync_master_off.png b/res/skins/LateNight/misc_res/btn__mastersync_master_off.png
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__mastersync_master_off.png
rename to res/skins/LateNight/misc_res/btn__mastersync_master_off.png
diff --git a/res/skins/LateNight/buttons_classic/btn__mastersync_master_on.png b/res/skins/LateNight/misc_res/btn__mastersync_master_on.png
similarity index 100%
rename from res/skins/LateNight/buttons_classic/btn__mastersync_master_on.png
rename to res/skins/LateNight/misc_res/btn__mastersync_master_on.png
diff --git a/res/skins/LateNight/misc_res/btn__rate_center_cyan.svg b/res/skins/LateNight/misc_res/btn__rate_center_cyan.svg
new file mode 100644
index 000000000000..bb314837dba1
--- /dev/null
+++ b/res/skins/LateNight/misc_res/btn__rate_center_cyan.svg
@@ -0,0 +1,3 @@
+<svg width="10" height="10" version="1.1" viewBox="0 0 10 10" xmlns="http://www.w3.org/2000/svg">
+		<path d="M 5,8.5 C 3.06625,8.5 1.5,6.93375 1.5,4.9999999 1.5,3.06625 3.06625,1.5 5,1.5 6.93375,1.5 8.5,3.06625 8.5,4.9999999 8.5,6.93375 6.93375,8.5 5,8.5 Z" fill="#00a4d4" stroke="#a4a4a2"/>
+</svg>
diff --git a/res/skins/LateNight/misc_res/btn__rate_center_off.svg b/res/skins/LateNight/misc_res/btn__rate_center_off.svg
new file mode 100644
index 000000000000..92f45d11edc4
--- /dev/null
+++ b/res/skins/LateNight/misc_res/btn__rate_center_off.svg
@@ -0,0 +1,3 @@
+<svg width="10" height="10" version="1.1" viewBox="0 0 10 10" xmlns="http://www.w3.org/2000/svg">
+		<path d="M 5,8.5 C 3.06625,8.5 1.5,6.93375 1.5,4.9999999 1.5,3.06625 3.06625,1.5 5,1.5 6.93375,1.5 8.5,3.06625 8.5,4.9999999 8.5,6.93375 6.93375,8.5 5,8.5 Z" fill="#000e12" stroke="#a4a4a2"/>
+</svg>
diff --git a/res/skins/LateNight/misc_res/latency_bg.svg b/res/skins/LateNight/misc_res/latency_bg.svg
new file mode 100644
index 000000000000..4c8eeca04c4a
--- /dev/null
+++ b/res/skins/LateNight/misc_res/latency_bg.svg
@@ -0,0 +1,291 @@
+<?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="5"
+   width="59"
+   id="svg3248">
+  <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" />
+  <g
+     transform="translate(-1,-1)"
+     id="g1237">
+    <rect
+       y="5"
+       x="1"
+       height="1"
+       width="1"
+       id="use850"
+       style="opacity:1;fill:#333333;fill-opacity:1;stroke:none;stroke-width:0.71554178;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       y="1"
+       x="1"
+       height="1"
+       width="1"
+       id="use850-5"
+       style="opacity:1;fill:#555555;fill-opacity:1;stroke:none;stroke-width:0.71554178;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       y="2"
+       x="1"
+       height="3"
+       width="1"
+       id="use850-2"
+       style="opacity:1;fill:#3f3f3f;fill-opacity:1;stroke:none;stroke-width:1.23935473;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+  <use
+     height="100%"
+     width="100%"
+     id="use1239"
+     xlink:href="#g1237"
+     y="0"
+     x="0" />
+  <use
+     height="100%"
+     width="100%"
+     id="use1241"
+     transform="translate(2)"
+     xlink:href="#g1237"
+     y="0"
+     x="0" />
+  <use
+     height="100%"
+     width="100%"
+     id="use1243"
+     transform="translate(4)"
+     xlink:href="#g1237"
+     y="0"
+     x="0" />
+  <use
+     height="100%"
+     width="100%"
+     id="use1245"
+     transform="translate(6)"
+     xlink:href="#g1237"
+     y="0"
+     x="0" />
+  <use
+     height="100%"
+     width="100%"
+     id="use1247"
+     transform="translate(8)"
+     xlink:href="#g1237"
+     y="0"
+     x="0" />
+  <use
+     height="100%"
+     width="100%"
+     id="use1249"
+     transform="translate(10)"
+     xlink:href="#g1237"
+     y="0"
+     x="0" />
+  <use
+     height="100%"
+     width="100%"
+     id="use1251"
+     transform="translate(12)"
+     xlink:href="#g1237"
+     y="0"
+     x="0" />
+  <use
+     height="100%"
+     width="100%"
+     id="use1253"
+     transform="translate(14)"
+     xlink:href="#g1237"
+     y="0"
+     x="0" />
+  <use
+     height="100%"
+     width="100%"
+     id="use1255"
+     transform="translate(16)"
+     xlink:href="#g1237"
+     y="0"
+     x="0" />
+  <use
+     height="100%"
+     width="100%"
+     id="use1257"
+     transform="translate(18)"
+     xlink:href="#g1237"
+     y="0"
+     x="0" />
+  <use
+     height="100%"
+     width="100%"
+     id="use1259"
+     transform="translate(20)"
+     xlink:href="#g1237"
+     y="0"
+     x="0" />
+  <use
+     height="100%"
+     width="100%"
+     id="use1261"
+     transform="translate(22)"
+     xlink:href="#g1237"
+     y="0"
+     x="0" />
+  <use
+     height="100%"
+     width="100%"
+     id="use1263"
+     transform="translate(24)"
+     xlink:href="#g1237"
+     y="0"
+     x="0" />
+  <use
+     height="100%"
+     width="100%"
+     id="use1265"
+     transform="translate(26)"
+     xlink:href="#g1237"
+     y="0"
+     x="0" />
+  <use
+     height="100%"
+     width="100%"
+     id="use1267"
+     transform="translate(28)"
+     xlink:href="#g1237"
+     y="0"
+     x="0" />
+  <use
+     height="100%"
+     width="100%"
+     id="use1269"
+     transform="translate(30)"
+     xlink:href="#g1237"
+     y="0"
+     x="0" />
+  <use
+     height="100%"
+     width="100%"
+     id="use1271"
+     transform="translate(32)"
+     xlink:href="#g1237"
+     y="0"
+     x="0" />
+  <use
+     height="100%"
+     width="100%"
+     id="use1273"
+     transform="translate(34)"
+     xlink:href="#g1237"
+     y="0"
+     x="0" />
+  <use
+     height="100%"
+     width="100%"
+     id="use1275"
+     transform="translate(36)"
+     xlink:href="#g1237"
+     y="0"
+     x="0" />
+  <use
+     height="100%"
+     width="100%"
+     id="use1277"
+     transform="translate(38)"
+     xlink:href="#g1237"
+     y="0"
+     x="0" />
+  <use
+     height="100%"
+     width="100%"
+     id="use1279"
+     transform="translate(40)"
+     xlink:href="#g1237"
+     y="0"
+     x="0" />
+  <use
+     height="100%"
+     width="100%"
+     id="use1281"
+     transform="translate(42)"
+     xlink:href="#g1237"
+     y="0"
+     x="0" />
+  <use
+     height="100%"
+     width="100%"
+     id="use1283"
+     transform="translate(44)"
+     xlink:href="#g1237"
+     y="0"
+     x="0" />
+  <use
+     height="100%"
+     width="100%"
+     id="use1285"
+     transform="translate(46)"
+     xlink:href="#g1237"
+     y="0"
+     x="0" />
+  <use
+     height="100%"
+     width="100%"
+     id="use1287"
+     transform="translate(48)"
+     xlink:href="#g1237"
+     y="0"
+     x="0" />
+  <use
+     height="100%"
+     width="100%"
+     id="use1289"
+     transform="translate(50)"
+     xlink:href="#g1237"
+     y="0"
+     x="0" />
+  <use
+     height="100%"
+     width="100%"
+     id="use1291"
+     transform="translate(52)"
+     xlink:href="#g1237"
+     y="0"
+     x="0" />
+  <use
+     height="100%"
+     width="100%"
+     id="use1293"
+     transform="translate(54)"
+     xlink:href="#g1237"
+     y="0"
+     x="0" />
+  <use
+     height="100%"
+     width="100%"
+     id="use1295"
+     transform="translate(56)"
+     xlink:href="#g1237"
+     y="0"
+     x="0" />
+  <use
+     height="100%"
+     width="100%"
+     id="use1297"
+     transform="translate(58)"
+     xlink:href="#g1237"
+     y="0"
+     x="0" />
+</svg>
diff --git a/res/skins/LateNight/misc_res/latency_over.svg b/res/skins/LateNight/misc_res/latency_over.svg
new file mode 100644
index 000000000000..a2f1ebd7dbbb
--- /dev/null
+++ b/res/skins/LateNight/misc_res/latency_over.svg
@@ -0,0 +1,1039 @@
+<?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="5"
+   width="59"
+   id="svg3248">
+  <metadata
+     id="metadata48">
+    <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="defs3250">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1048.9"
+       y1="1048.9"
+       x2="61"
+       x1="46"
+       id="linearGradient5486-6">
+      <stop
+         offset="0"
+         stop-color="#e72904"
+         id="stop5482-5" />
+      <stop
+         offset="1"
+         stop-color="#9f250d"
+         id="stop5484-3" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1048.9"
+       y1="1048.9"
+       x2="45"
+       x1="26"
+       id="linearGradient5478-5">
+      <stop
+         offset="0"
+         stop-color="#b2cb08"
+         id="stop5474-2" />
+      <stop
+         offset="1"
+         stop-color="#d0f103"
+         id="stop5476-9" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1048.9"
+       y1="1048.9"
+       x2="25"
+       x1="2"
+       id="linearGradient6106">
+      <stop
+         offset="0"
+         stop-color="#127a12"
+         id="stop5444-7" />
+      <stop
+         offset="1"
+         stop-color="#08c408"
+         id="stop5446-0" />
+    </linearGradient>
+    <linearGradient
+       y2="1048.9"
+       x2="61"
+       y1="1048.9"
+       x1="46"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient860"
+       xlink:href="#linearGradient5486-6" />
+    <linearGradient
+       y2="1048.9"
+       x2="61"
+       y1="1048.9"
+       x1="46"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient862"
+       xlink:href="#linearGradient5486-6" />
+    <linearGradient
+       y2="1048.9"
+       x2="61"
+       y1="1048.9"
+       x1="46"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient864"
+       xlink:href="#linearGradient5486-6" />
+    <linearGradient
+       y2="1048.9"
+       x2="61"
+       y1="1048.9"
+       x1="46"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient866"
+       xlink:href="#linearGradient5486-6" />
+    <linearGradient
+       y2="1048.9"
+       x2="61"
+       y1="1048.9"
+       x1="46"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient868"
+       xlink:href="#linearGradient5486-6" />
+    <linearGradient
+       y2="1048.9"
+       x2="61"
+       y1="1048.9"
+       x1="46"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient870"
+       xlink:href="#linearGradient5486-6" />
+    <linearGradient
+       y2="1048.9"
+       x2="61"
+       y1="1048.9"
+       x1="46"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient872"
+       xlink:href="#linearGradient5486-6" />
+    <linearGradient
+       y2="1048.9"
+       x2="61"
+       y1="1048.9"
+       x1="46"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient874"
+       xlink:href="#linearGradient5486-6" />
+    <linearGradient
+       y2="1048.9"
+       x2="61"
+       y1="1048.9"
+       x1="46"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient876"
+       xlink:href="#linearGradient5486-6" />
+    <linearGradient
+       y2="1048.9"
+       x2="45"
+       y1="1048.9"
+       x1="26"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient878"
+       xlink:href="#linearGradient5478-5" />
+    <linearGradient
+       y2="1048.9"
+       x2="45"
+       y1="1048.9"
+       x1="26"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient880"
+       xlink:href="#linearGradient5478-5" />
+    <linearGradient
+       y2="1048.9"
+       x2="45"
+       y1="1048.9"
+       x1="26"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient882"
+       xlink:href="#linearGradient5478-5" />
+    <linearGradient
+       y2="1048.9"
+       x2="45"
+       y1="1048.9"
+       x1="26"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient884"
+       xlink:href="#linearGradient5478-5" />
+    <linearGradient
+       y2="1048.9"
+       x2="45"
+       y1="1048.9"
+       x1="26"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient886"
+       xlink:href="#linearGradient5478-5" />
+    <linearGradient
+       y2="1048.9"
+       x2="45"
+       y1="1048.9"
+       x1="26"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient888"
+       xlink:href="#linearGradient5478-5" />
+    <linearGradient
+       y2="1048.9"
+       x2="45"
+       y1="1048.9"
+       x1="26"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient890"
+       xlink:href="#linearGradient5478-5" />
+    <linearGradient
+       y2="1048.9"
+       x2="45"
+       y1="1048.9"
+       x1="26"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient892"
+       xlink:href="#linearGradient5478-5" />
+    <linearGradient
+       y2="1048.9"
+       x2="45"
+       y1="1048.9"
+       x1="26"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient894"
+       xlink:href="#linearGradient5478-5" />
+    <linearGradient
+       y2="1048.9"
+       x2="45"
+       y1="1048.9"
+       x1="26"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient896"
+       xlink:href="#linearGradient5478-5" />
+    <linearGradient
+       y2="1048.9"
+       x2="45"
+       y1="1048.9"
+       x1="26"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient898"
+       xlink:href="#linearGradient5478-5" />
+    <linearGradient
+       y2="1048.9"
+       x2="25"
+       y1="1048.9"
+       x1="2"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient900"
+       xlink:href="#linearGradient6106" />
+    <linearGradient
+       y2="1048.9"
+       x2="25"
+       y1="1048.9"
+       x1="2"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient902"
+       xlink:href="#linearGradient6106" />
+    <linearGradient
+       y2="1048.9"
+       x2="25"
+       y1="1048.9"
+       x1="2"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient904"
+       xlink:href="#linearGradient6106" />
+    <linearGradient
+       y2="1048.9"
+       x2="25"
+       y1="1048.9"
+       x1="2"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient906"
+       xlink:href="#linearGradient6106" />
+    <linearGradient
+       y2="1048.9"
+       x2="25"
+       y1="1048.9"
+       x1="2"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient908"
+       xlink:href="#linearGradient6106" />
+    <linearGradient
+       y2="1048.9"
+       x2="25"
+       y1="1048.9"
+       x1="2"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient910"
+       xlink:href="#linearGradient6106" />
+    <linearGradient
+       y2="1048.9"
+       x2="25"
+       y1="1048.9"
+       x1="2"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient912"
+       xlink:href="#linearGradient6106" />
+    <linearGradient
+       y2="1048.9"
+       x2="25"
+       y1="1048.9"
+       x1="2"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient914"
+       xlink:href="#linearGradient6106" />
+    <linearGradient
+       y2="1048.9"
+       x2="25"
+       y1="1048.9"
+       x1="2"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient916"
+       xlink:href="#linearGradient6106" />
+    <linearGradient
+       y2="1048.9"
+       x2="25"
+       y1="1048.9"
+       x1="2"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient918"
+       xlink:href="#linearGradient6106" />
+    <linearGradient
+       y2="1048.9"
+       x2="25"
+       y1="1048.9"
+       x1="2"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient920"
+       xlink:href="#linearGradient6106" />
+    <linearGradient
+       y2="1048.9"
+       x2="25"
+       y1="1048.9"
+       x1="2"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient922"
+       xlink:href="#linearGradient6106" />
+    <linearGradient
+       y2="1048.9"
+       x2="25"
+       y1="1048.9"
+       x1="2"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient924"
+       xlink:href="#linearGradient6106" />
+    <linearGradient
+       y2="1048.9"
+       x2="61"
+       y1="1048.9"
+       x1="46"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient876-3"
+       xlink:href="#linearGradient5486-6" />
+    <linearGradient
+       y2="1048.9"
+       x2="45"
+       y1="1048.9"
+       x1="26"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient898-7"
+       xlink:href="#linearGradient5478-5" />
+    <linearGradient
+       y2="1048.9"
+       x2="25"
+       y1="1048.9"
+       x1="2"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient924-2"
+       xlink:href="#linearGradient6106" />
+    <linearGradient
+       y2="1048.9"
+       x2="25"
+       y1="1048.9"
+       x1="2"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1394"
+       xlink:href="#linearGradient6106" />
+    <linearGradient
+       y2="1048.9"
+       x2="25"
+       y1="1048.9"
+       x1="2"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1396"
+       xlink:href="#linearGradient6106" />
+    <linearGradient
+       y2="1048.9"
+       x2="25"
+       y1="1048.9"
+       x1="2"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1398"
+       xlink:href="#linearGradient6106" />
+    <linearGradient
+       y2="1048.9"
+       x2="25"
+       y1="1048.9"
+       x1="2"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1400"
+       xlink:href="#linearGradient6106" />
+    <linearGradient
+       y2="1048.9"
+       x2="25"
+       y1="1048.9"
+       x1="2"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1402"
+       xlink:href="#linearGradient6106" />
+    <linearGradient
+       y2="1048.9"
+       x2="25"
+       y1="1048.9"
+       x1="2"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1404"
+       xlink:href="#linearGradient6106" />
+    <linearGradient
+       y2="1048.9"
+       x2="25"
+       y1="1048.9"
+       x1="2"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1406"
+       xlink:href="#linearGradient6106" />
+    <linearGradient
+       y2="1048.9"
+       x2="25"
+       y1="1048.9"
+       x1="2"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1408"
+       xlink:href="#linearGradient6106" />
+    <linearGradient
+       y2="1048.9"
+       x2="25"
+       y1="1048.9"
+       x1="2"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1410"
+       xlink:href="#linearGradient6106" />
+    <linearGradient
+       y2="1048.9"
+       x2="25"
+       y1="1048.9"
+       x1="2"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1412"
+       xlink:href="#linearGradient6106" />
+    <linearGradient
+       y2="1048.9"
+       x2="25"
+       y1="1048.9"
+       x1="2"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1414"
+       xlink:href="#linearGradient6106" />
+    <linearGradient
+       y2="1048.9"
+       x2="25"
+       y1="1048.9"
+       x1="2"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1416"
+       xlink:href="#linearGradient6106" />
+    <linearGradient
+       y2="1048.9"
+       x2="45"
+       y1="1048.9"
+       x1="26"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1418"
+       xlink:href="#linearGradient5478-5" />
+    <linearGradient
+       y2="1048.9"
+       x2="45"
+       y1="1048.9"
+       x1="26"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1420"
+       xlink:href="#linearGradient5478-5" />
+    <linearGradient
+       y2="1048.9"
+       x2="45"
+       y1="1048.9"
+       x1="26"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1422"
+       xlink:href="#linearGradient5478-5" />
+    <linearGradient
+       y2="1048.9"
+       x2="45"
+       y1="1048.9"
+       x1="26"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1424"
+       xlink:href="#linearGradient5478-5" />
+    <linearGradient
+       y2="1048.9"
+       x2="45"
+       y1="1048.9"
+       x1="26"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1426"
+       xlink:href="#linearGradient5478-5" />
+    <linearGradient
+       y2="1048.9"
+       x2="45"
+       y1="1048.9"
+       x1="26"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1428"
+       xlink:href="#linearGradient5478-5" />
+    <linearGradient
+       y2="1048.9"
+       x2="45"
+       y1="1048.9"
+       x1="26"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1430"
+       xlink:href="#linearGradient5478-5" />
+    <linearGradient
+       y2="1048.9"
+       x2="45"
+       y1="1048.9"
+       x1="26"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1432"
+       xlink:href="#linearGradient5478-5" />
+    <linearGradient
+       y2="1048.9"
+       x2="45"
+       y1="1048.9"
+       x1="26"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1434"
+       xlink:href="#linearGradient5478-5" />
+    <linearGradient
+       y2="1048.9"
+       x2="45"
+       y1="1048.9"
+       x1="26"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1436"
+       xlink:href="#linearGradient5478-5" />
+    <linearGradient
+       y2="1048.9"
+       x2="61"
+       y1="1048.9"
+       x1="46"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1438"
+       xlink:href="#linearGradient5486-6" />
+    <linearGradient
+       y2="1048.9"
+       x2="61"
+       y1="1048.9"
+       x1="46"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1440"
+       xlink:href="#linearGradient5486-6" />
+    <linearGradient
+       y2="1048.9"
+       x2="61"
+       y1="1048.9"
+       x1="46"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1442"
+       xlink:href="#linearGradient5486-6" />
+    <linearGradient
+       y2="1048.9"
+       x2="61"
+       y1="1048.9"
+       x1="46"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1444"
+       xlink:href="#linearGradient5486-6" />
+    <linearGradient
+       y2="1048.9"
+       x2="61"
+       y1="1048.9"
+       x1="46"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1446"
+       xlink:href="#linearGradient5486-6" />
+    <linearGradient
+       y2="1048.9"
+       x2="61"
+       y1="1048.9"
+       x1="46"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1448"
+       xlink:href="#linearGradient5486-6" />
+    <linearGradient
+       y2="1048.9"
+       x2="61"
+       y1="1048.9"
+       x1="46"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1450"
+       xlink:href="#linearGradient5486-6" />
+  </defs>
+  <g
+     style="fill:url(#linearGradient924)"
+     transform="matrix(1,0,0,1.6666742,-2,-1745.6746)"
+     id="g5428">
+    <rect
+       style="color:#000000;fill:url(#linearGradient900)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="2"
+       id="use5308" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient902)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="4"
+       id="use5310" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient904)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="6"
+       id="use5312" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient906)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="8"
+       id="use5314" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient908)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="10"
+       id="use5316" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient910)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="12"
+       id="use5318" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient912)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="14"
+       id="use5320" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient914)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="16"
+       id="use5322" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient916)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="18"
+       id="use5324" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient918)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="20"
+       id="use5326" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient920)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="22"
+       id="use5328" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient922)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="24"
+       id="use5330" />
+  </g>
+  <g
+     style="fill:url(#linearGradient898)"
+     transform="matrix(1,0,0,1.6666742,-2,-1745.6746)"
+     id="g5450">
+    <rect
+       style="color:#000000;fill:url(#linearGradient878)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="26"
+       id="use5332" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient880)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="28"
+       id="use5334" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient882)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="30"
+       id="use5336" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient884)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="32"
+       id="use5338" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient886)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="34"
+       id="use5340" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient888)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="36"
+       id="use5342" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient890)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="38"
+       id="use5344" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient892)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="40"
+       id="use5346" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient894)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="42"
+       id="use5348" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient896)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="44"
+       id="use5350" />
+  </g>
+  <g
+     style="fill:url(#linearGradient876)"
+     transform="matrix(1,0,0,1.6666742,-2,-1745.6746)"
+     id="g5462">
+    <rect
+       style="color:#000000;fill:url(#linearGradient860)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="46"
+       id="use5352" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient862)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="48"
+       id="use5354" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient864)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="50"
+       id="use5356" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient866)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="52"
+       id="use5358" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient868)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="54"
+       id="use5360" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient870)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="56"
+       id="use5362" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient872)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="58"
+       id="use5364" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient874)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="60"
+       id="use5366" />
+  </g>
+  <g
+     style="opacity:0.7;fill:url(#linearGradient924-2)"
+     transform="matrix(1,0,0,1.6666742,-1,-1745.6746)"
+     id="g5428-2">
+    <rect
+       style="color:#000000;fill:url(#linearGradient1394)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="2"
+       id="use5308-9" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient1396)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="4"
+       id="use5310-3" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient1398)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="6"
+       id="use5312-1" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient1400)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="8"
+       id="use5314-9" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient1402)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="10"
+       id="use5316-4" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient1404)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="12"
+       id="use5318-7" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient1406)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="14"
+       id="use5320-8" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient1408)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="16"
+       id="use5322-4" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient1410)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="18"
+       id="use5324-5" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient1412)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="20"
+       id="use5326-0" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient1414)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="22"
+       id="use5328-3" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient1416)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="24"
+       id="use5330-6" />
+  </g>
+  <g
+     style="opacity:0.7;fill:url(#linearGradient898-7)"
+     transform="matrix(1,0,0,1.6666742,-1,-1745.6746)"
+     id="g5450-1">
+    <rect
+       style="color:#000000;fill:url(#linearGradient1418)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="26"
+       id="use5332-0" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient1420)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="28"
+       id="use5334-6" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient1422)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="30"
+       id="use5336-3" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient1424)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="32"
+       id="use5338-2" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient1426)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="34"
+       id="use5340-0" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient1428)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="36"
+       id="use5342-6" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient1430)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="38"
+       id="use5344-1" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient1432)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="40"
+       id="use5346-5" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient1434)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="42"
+       id="use5348-5" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient1436)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="44"
+       id="use5350-4" />
+  </g>
+  <g
+     style="opacity:0.7;fill:url(#linearGradient876-3)"
+     transform="matrix(1,0,0,1.6666742,-1,-1745.6746)"
+     id="g5462-7">
+    <rect
+       style="color:#000000;fill:url(#linearGradient1438)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="46"
+       id="use5352-6" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient1440)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="48"
+       id="use5354-5" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient1442)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="50"
+       id="use5356-6" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient1444)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="52"
+       id="use5358-9" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient1446)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="54"
+       id="use5360-3" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient1448)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="56"
+       id="use5362-7" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient1450)"
+       height="3"
+       width="1"
+       y="1047.4"
+       x="58"
+       id="use5364-4" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/style_classic/library_branch_closed_selected_black.png b/res/skins/LateNight/misc_res/library_branch_closed_selected_black.png
similarity index 100%
rename from res/skins/LateNight/style_classic/library_branch_closed_selected_black.png
rename to res/skins/LateNight/misc_res/library_branch_closed_selected_black.png
diff --git a/res/skins/LateNight/style_classic/library_branch_open_selected_black.png b/res/skins/LateNight/misc_res/library_branch_open_selected_black.png
similarity index 100%
rename from res/skins/LateNight/style_classic/library_branch_open_selected_black.png
rename to res/skins/LateNight/misc_res/library_branch_open_selected_black.png
diff --git a/res/skins/LateNight/style_classic/menu_arrow_black.svg b/res/skins/LateNight/misc_res/menu_arrow_black.svg
similarity index 100%
rename from res/skins/LateNight/style_classic/menu_arrow_black.svg
rename to res/skins/LateNight/misc_res/menu_arrow_black.svg
diff --git a/res/skins/LateNight/mixer.xml b/res/skins/LateNight/mixer.xml
index 3d4d3370937d..5371b860d329 100644
--- a/res/skins/LateNight/mixer.xml
+++ b/res/skins/LateNight/mixer.xml
@@ -1,353 +1,72 @@
 <Template>
-  <SetVariable name="btn_type"><Variable name="TopRegion_btn_type"/></SetVariable>
+  <SetVariable name="BtnType"><Variable name="TopRegion_BtnType"/></SetVariable>
 
-  <SingletonDefinition>
-    <ObjectName>CrossfaderSingleton</ObjectName>
+  <WidgetGroup>
+    <SizePolicy>max,me</SizePolicy>
+    <Layout>horizontal</Layout>
+    <Connection>
+      <ConfigKey persist="true">[Master],show_mixer</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
     <Children>
-      <SliderComposed>
-        <TooltipId>crossfader</TooltipId>
-        <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>
-        </Connection>
-      </SliderComposed>
-    </Children>
-  </SingletonDefinition>
 
-  <SingletonDefinition>
-    <ObjectName>VuMeterChannel1</ObjectName>
-    <Children>
       <WidgetGroup>
+        <ObjectName>MixerContainer</ObjectName>
+        <SizePolicy>min,me</SizePolicy>
         <Layout>horizontal</Layout>
         <Children>
-          <Template src="skin:vumeter_channel.xml">
-            <SetVariable name="group">[Channel1]</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </SingletonDefinition>
 
-  <SingletonDefinition>
-    <ObjectName>VuMeterChannel2</ObjectName>
-    <Children>
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <Children>
-          <Template src="skin:vumeter_channel.xml">
-            <SetVariable name="group">[Channel2]</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </SingletonDefinition>
+          <Template src="skin:/mixer/mixer_decks.xml"/>
 
-  <SingletonDefinition>
-    <ObjectName>VuMeterChannel3</ObjectName>
-    <Children>
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <Children>
-          <Template src="skin:vumeter_channel.xml">
-            <SetVariable name="group">[Channel3]</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </SingletonDefinition>
+          <Template src="skin:/mixer/mixer_master_headphone.xml"/>
 
-  <SingletonDefinition>
-    <ObjectName>VuMeterChannel4</ObjectName>
-    <Children>
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <Children>
-          <Template src="skin:vumeter_channel.xml">
-            <SetVariable name="group">[Channel4]</SetVariable>
-          </Template>
         </Children>
-      </WidgetGroup>
-    </Children>
-  </SingletonDefinition>
+      </WidgetGroup><!-- MixerContainer -->
 
-  <SingletonDefinition>
-    <ObjectName>VuMeterMaster</ObjectName>
-    <Children>
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <Children>
-          <Template src="skin:vumeter_master.xml"/>
-        </Children>
-      </WidgetGroup>
     </Children>
-  </SingletonDefinition>
+  </WidgetGroup><!-- show_mixer -->
 
   <WidgetGroup>
     <SizePolicy>max,me</SizePolicy>
     <Layout>horizontal</Layout>
+    <Connection>
+      <ConfigKey persist="true">[Master],show_mixer</ConfigKey>
+      <Transform><Not/></Transform>
+      <BindProperty>visible</BindProperty>
+    </Connection>
     <Children>
 
       <WidgetGroup>
-        <ObjectName>MixerContainer</ObjectName>
+        <ObjectName></ObjectName>
         <SizePolicy>min,me</SizePolicy>
-        <Layout>horizontal</Layout>
+        <Layout>vertical</Layout>
+        <Connection>
+          <ConfigKey>[LateNight],show_compact_deck</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
         <Children>
 
           <WidgetGroup>
-            <ObjectName>MixerDecks</ObjectName>
+            <!--  width set in qss  -->
+            <ObjectName>CompactDecksCenterSpacer</ObjectName>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName></ObjectName>
+            <SizePolicy>min,me</SizePolicy>
             <Layout>vertical</Layout>
-            <SizePolicy>max,min</SizePolicy>
+            <Connection>
+              <ConfigKey persist="true">[LateNight],show_vumeters_compact</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
             <Children>
-
-              <!-- spacer to center channel controls without crossfader without
-                  stretching them -->
-              <WidgetGroup><SizePolicy>min,e</SizePolicy></WidgetGroup>
-
-              <WidgetGroup><!-- Channel controls -->
-                <ObjectName>AlignHCenter</ObjectName>
-                <SizePolicy>min,min</SizePolicy>
-                <Layout>horizontal</Layout>
-                <Children>
-
-                  <!-- Channel 3 -->
-                  <WidgetGroup>
-                    <SizePolicy>max,min</SizePolicy>
-                    <Layout>horizontal</Layout>
-                    <Children>
-                      <Template src="skin:mixer_channel_4decks.xml">
-                        <SetVariable name="channum">3</SetVariable>
-                        <SetVariable name="xfaderLeft">default</SetVariable>
-                        <SetVariable name="xfaderRight">warning</SetVariable>
-                      </Template>
-                    </Children>
-                    <Connection>
-                      <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup>
-
-                  <Template src="skin:mixer_channel_left.xml">
-                    <SetVariable name="channum">1</SetVariable>
-                    <SetVariable name="xfaderLeft">default</SetVariable>
-                    <SetVariable name="xfaderRight">warning</SetVariable>
-                  </Template>
-
-                  <WidgetGroup>
-                    <ObjectName>MasterVuMeter_2Decks</ObjectName>
-                    <Layout>vertical</Layout>
-                    <SizePolicy>max,me</SizePolicy>
-                    <Children>
-                      <WidgetGroup><Size>1min,44f</Size></WidgetGroup>
-                      <WidgetGroup>
-                        <ObjectName>VuMeterMaster2Decks</ObjectName>
-                        <Layout>horizontal</Layout>
-                        <SizePolicy>min,min</SizePolicy>
-                        <Children>
-                          <SingletonContainer>
-                            <ObjectName>VuMeterMaster</ObjectName>
-                          </SingletonContainer>
-                        </Children>
-                      </WidgetGroup>
-                      <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
-                    </Children>
-                    <Connection>
-                      <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                      <Transform><Invert/><Not/></Transform>
-                    </Connection>
-                  </WidgetGroup>
-
-                  <Template src="skin:mixer_channel_right.xml">
-                    <SetVariable name="channum">2</SetVariable>
-                    <SetVariable name="xfaderLeft">warning</SetVariable>
-                    <SetVariable name="xfaderRight">default</SetVariable>
-                  </Template>
-
-                  <!-- Channel 4 -->
-                  <WidgetGroup>
-                    <SizePolicy>max,min</SizePolicy>
-                    <Layout>horizontal</Layout>
-                    <Children>
-                      <Template src="skin:mixer_channel_4decks.xml">
-                        <SetVariable name="channum">4</SetVariable>
-                        <SetVariable name="xfaderLeft">warning</SetVariable>
-                        <SetVariable name="xfaderRight">default</SetVariable>
-                      </Template>
-                      <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-                    </Children>
-                    <Connection>
-                      <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup>
-
-                </Children>
-              </WidgetGroup><!-- /Channel controls -->
-
-              <WidgetGroup><SizePolicy>min,e</SizePolicy></WidgetGroup>
-
-              <WidgetGroup><!-- Crossfader + Channel1/2 assign switches -->
-                <ObjectName>CrossfaderAndSwitches2Decks</ObjectName>
-                <Layout>horizontal</Layout>
-                <Children>
-                  <WidgetGroup><Size>me,min</Size></WidgetGroup>
-
-                  <!-- Channel1 xfader switch -->
-                  <WidgetGroup>
-                    <Layout>vertical</Layout>
-                    <SizePolicy>min,min</SizePolicy>
-                    <Children>
-                      <WidgetGroup><Size>min,2f</Size></WidgetGroup>
-                      <Template src="skin:button_xfader_deck.xml">
-                        <SetVariable name="group">[Channel1]</SetVariable>
-                        <SetVariable name="xfaderLeft">default</SetVariable>
-                        <SetVariable name="xfaderRight">warning</SetVariable>
-                      </Template>
-                      <WidgetGroup><Size>min,me</Size></WidgetGroup>
-                    </Children>
-                    <Connection>
-                      <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
-                      <Transform><Not/></Transform>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup><!-- /Channel1 xfader switch -->
-
-                  <!-- 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>
-
-                  <!--  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>
-                      <!-- 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>
-                      </WidgetGroup>
-
-                      <!-- 2 decks -->
-                      <WidgetGroup>
-                        <Layout>horizontal</Layout>
-                        <Children>
-                          <!-- 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>
-                          </WidgetGroup>
-
-                          <!-- without EQ knobs -->
-                          <SliderComposed>
-                            <TooltipId>crossfader</TooltipId>
-                            <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>
-                            </Connection>
-                            <Connection>
-                              <ConfigKey persist="true">[Skin],show_eq_knobs</ConfigKey>
-                              <Transform><Not/></Transform>
-                              <BindProperty>visible</BindProperty>
-                            </Connection>
-                          </SliderComposed>
-                        </Children>
-                        <Connection>
-                          <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
-                          <Transform><Not/></Transform>
-                          <BindProperty>visible</BindProperty>
-                        </Connection>
-                      </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 -->
-                  <WidgetGroup>
-                    <ObjectName>AlignLeft</ObjectName>
-                    <Layout>vertical</Layout>
-                    <SizePolicy>min,min</SizePolicy>
-                    <Children>
-                      <WidgetGroup><Size>min,2f</Size></WidgetGroup>
-                      <Template src="skin:button_xfader_deck.xml">
-                        <SetVariable name="group">[Channel2]</SetVariable>
-                        <SetVariable name="xfaderLeft">warning</SetVariable>
-                        <SetVariable name="xfaderRight">default</SetVariable>
-                      </Template>
-                      <WidgetGroup><Size>min,me</Size></WidgetGroup>
-                    </Children>
-                    <Connection>
-                      <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
-                      <Transform><Not/></Transform>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup><!-- /Channel2 xfader switch -->
-
-                  <WidgetGroup><Size>me,min</Size></WidgetGroup>
-
-                </Children>
-                <Connection>
-                  <ConfigKey persist="true">[Skin],show_xfader</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup><!-- /Crossfader + Channel1/2 assign switches -->
-
-              <!-- spacer to center channel controls without crossfader without
-                  stretching them -->
-              <WidgetGroup><SizePolicy>min,e</SizePolicy></WidgetGroup>
-
+              <Template src="skin:/mixer/vumeters_compact.xml"/>
             </Children>
-          </WidgetGroup><!-- MixerDecks -->
-
-          <!-- Mixer Master & Headphone -->
-          <Template src="skin:mixer_master_headphone.xml"/>
+          </WidgetGroup>
 
         </Children>
-      </WidgetGroup><!-- MixerContainer -->
+      </WidgetGroup><!-- !show_mixer -->
 
     </Children>
-    <Connection>
-      <ConfigKey persist="true">[Master],show_mixer</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/mixer/channel_4decks.xml b/res/skins/LateNight/mixer/channel_4decks.xml
new file mode 100644
index 000000000000..7eb1191b38d2
--- /dev/null
+++ b/res/skins/LateNight/mixer/channel_4decks.xml
@@ -0,0 +1,125 @@
+<Template>
+  <SetVariable name="Group">[Channel<Variable name="ChanNum"/>]</SetVariable>
+  <SetVariable name="EqEffect">[EqualizerRack1_<Variable name="Group"/>_Effect1]</SetVariable>
+
+  <SetVariable name="KnobBg">regular</SetVariable>
+  <SetVariable name="KnobIndicator">regular</SetVariable>
+  <SetVariable name="ArcRadius"><Variable name="ArcRadiusBig"/></SetVariable>
+  <SetVariable name="ArcThickness"><Variable name="ArcThicknessBig"/></SetVariable>
+
+  <WidgetGroup>
+    <ObjectName>MixerChannel_4Decks</ObjectName>
+    <Layout>vertical</Layout>
+    <SizePolicy>min,min</SizePolicy>
+    <Children>
+
+      <WidgetGroup>
+        <Size>0min,0me</Size>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>AlignRight</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,max</SizePolicy>
+        <Children>
+          <Template src="skin:/controls/knob_textless.xml">
+            <SetVariable name="Size">40f,34f</SetVariable>
+            <SetVariable name="KnobColor">orange</SetVariable>
+            <SetVariable name="ArcColor"><Variable name="ArcColorGain"/></SetVariable>
+            <SetVariable name="Control">pregain</SetVariable>
+            <SetVariable name="TooltipId">pregain</SetVariable>
+          </Template>
+          <WidgetGroup><Size>2f,0min</Size></WidgetGroup>
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup><Size>1min,3f</Size></WidgetGroup>
+
+      <Template src="skin:/mixer/eq_knob_4decks.xml">
+        <SetVariable name="EqParameter">3</SetVariable>
+        <SetVariable name="EqRange">High</SetVariable>
+      </Template>
+
+      <WidgetGroup><Size>1min,3f</Size></WidgetGroup>
+
+      <Template src="skin:/mixer/eq_knob_4decks.xml">
+        <SetVariable name="EqParameter">2</SetVariable>
+        <SetVariable name="EqRange">Mid</SetVariable>
+      </Template>
+
+      <WidgetGroup><Size>1min,3f</Size></WidgetGroup>
+
+      <Template src="skin:/mixer/eq_knob_4decks.xml">
+        <SetVariable name="EqParameter">1</SetVariable>
+        <SetVariable name="EqRange">Low</SetVariable>
+      </Template>
+
+      <WidgetGroup><Size>1min,3f</Size></WidgetGroup>
+
+      <Template src="skin:/mixer/quick_effect_knob_4decks.xml"/>
+
+      <WidgetGroup>
+        <ObjectName>PflBox_4Decks</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:/controls/button_2state.xml">
+            <SetVariable name="TooltipId">pfl</SetVariable>
+            <SetVariable name="ObjectName">PflButton</SetVariable>
+            <SetVariable name="Size">26,26</SetVariable>
+            <SetVariable name="BtnSize">square</SetVariable>
+            <SetVariable name="ConfigKey"><Variable name="Group"/>,pfl</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>VuAndSlider_4Decks</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+
+          <WidgetGroup>
+            <ObjectName>VuMeterChannel_4Decks</ObjectName>
+            <Size>20f,0min</Size>
+            <Layout>horizontal</Layout>
+            <Children>
+              <SingletonContainer>
+                <ObjectName>VuMeterChannel<Variable name="ChanNum"/></ObjectName>
+              </SingletonContainer>
+            </Children>
+          </WidgetGroup>
+
+          <SliderComposed><!-- Volume -->
+            <TooltipId>channel_volume</TooltipId>
+            <Size>42f,107f</Size>
+            <Handle scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/knob_volume_deck.svg</Handle>
+            <Slider scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/slider_volume_deck.svg</Slider>
+            <Horizontal>false</Horizontal>
+            <BarColor><Variable name="BarColorVolume"/></BarColor>
+            <BarWidth><Variable name="BarWidth"/></BarWidth>
+            <BarMargins><Variable name="BarMarginVolume"/></BarMargins>
+            <BarRoundCaps>true</BarRoundCaps>
+            <BarAxisPos>21.0</BarAxisPos>
+            <Connection>
+              <ConfigKey><Variable name="Group"/>,volume</ConfigKey>
+            </Connection>
+          </SliderComposed>
+
+        </Children>
+      </WidgetGroup><!-- VuAndSlider_4Decks -->
+
+      <WidgetGroup>
+        <ObjectName>CrossfaderSwitch_4Decks</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:/controls/button_xfader_deck.xml"/>
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup><Size>0min,0me</Size></WidgetGroup>
+
+    </Children>
+  </WidgetGroup><!-- MixerChannel_4Decks -->
+</Template>
diff --git a/res/skins/LateNight/mixer/channel_left.xml b/res/skins/LateNight/mixer/channel_left.xml
new file mode 100644
index 000000000000..e21fef338ada
--- /dev/null
+++ b/res/skins/LateNight/mixer/channel_left.xml
@@ -0,0 +1,129 @@
+<!--  This layout is only used for channel 1.  It can switch between a standard
+vertical layout and a side-by-side layout for two-deck mode -->
+
+<Template>
+  <SetVariable name="Group">[Channel<Variable name="ChanNum"/>]</SetVariable>
+  <SetVariable name="EqEffect">[EqualizerRack1_<Variable name="Group"/>_Effect1]</SetVariable>
+
+  <SetVariable name="KnobBg">regular</SetVariable>
+  <SetVariable name="KnobIndicator">regular</SetVariable>
+  <SetVariable name="ArcRadius"><Variable name="ArcRadiusBig"/></SetVariable>
+  <SetVariable name="ArcThickness"><Variable name="ArcThicknessBig"/></SetVariable>
+
+  <WidgetGroup>
+    <SizePolicy>min,min</SizePolicy>
+    <Layout>horizontal</Layout>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>MixerChannel_2Decks</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+
+          <WidgetGroup><!-- EQs -->
+            <Layout>vertical</Layout>
+            <ObjectName>MixerChannel_2Decks_Left</ObjectName>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+
+              <!-- Spacer when there's no QuickEffect loaded -->
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Size>0min,34f</Size>
+                <Connection>
+                  <ConfigKey>[QuickEffectRack1_<Variable name="Group"/>_Effect1],loaded</ConfigKey>
+                  <Transform><Not/></Transform>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+
+              <Template src="skin:/mixer/eq_knob_left.xml">
+                <SetVariable name="EqParameter">3</SetVariable>
+                <SetVariable name="EqRange">High</SetVariable>
+              </Template>
+
+              <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
+
+              <Template src="skin:/mixer/eq_knob_left.xml">
+                <SetVariable name="EqParameter">2</SetVariable>
+                <SetVariable name="EqRange">Mid</SetVariable>
+              </Template>
+
+              <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
+
+              <Template src="skin:/mixer/eq_knob_left.xml">
+                <SetVariable name="EqParameter">1</SetVariable>
+                <SetVariable name="EqRange">Low</SetVariable>
+              </Template>
+
+              <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
+
+              <Template src="skin:/mixer/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>
+            <ObjectName>VolumeGain2Decks</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>me,min</SizePolicy>
+            <Children>
+              <Template src="skin:/controls/knob_textless.xml">
+                <SetVariable name="Size">40f,34f</SetVariable>
+                <SetVariable name="KnobColor">orange</SetVariable>
+                <SetVariable name="ArcColor"><Variable name="ArcColorGain"/></SetVariable>
+                <SetVariable name="Control">pregain</SetVariable>
+                <SetVariable name="TooltipId">pregain</SetVariable>
+              </Template>
+
+              <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
+
+              <SliderComposed><!-- Volume -->
+                <TooltipId>channel_volume</TooltipId>
+                <Size>42f,107f</Size>
+                <Handle scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/knob_volume_deck.svg</Handle>
+                <Slider scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/slider_volume_deck.svg</Slider>
+                <Horizontal>false</Horizontal>
+                <BarColor><Variable name="BarColorVolume"/></BarColor>
+                <BarWidth><Variable name="BarWidth"/></BarWidth>
+                <BarMargins><Variable name="BarMarginVolume"/></BarMargins>
+                <BarRoundCaps>true</BarRoundCaps>
+                <BarAxisPos>21.0</BarAxisPos>
+                <Connection>
+                  <ConfigKey><Variable name="Group"/>,volume</ConfigKey>
+                </Connection>
+              </SliderComposed>
+
+              <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
+            </Children>
+          </WidgetGroup><!-- VolumeGain2Decks -->
+        </Children>
+        <Connection>
+          <ConfigKey>[Skin],show_4decks</ConfigKey>
+          <BindProperty>visible</BindProperty>
+          <Transform><Not/></Transform>
+        </Connection>
+      </WidgetGroup><!-- MixerChannel_2Decks -->
+
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:/mixer/channel_4decks.xml"/>
+        </Children>
+        <Connection>
+          <ConfigKey>[Skin],show_4decks</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/mixer/channel_right.xml b/res/skins/LateNight/mixer/channel_right.xml
new file mode 100644
index 000000000000..7436039e2af4
--- /dev/null
+++ b/res/skins/LateNight/mixer/channel_right.xml
@@ -0,0 +1,131 @@
+<!--  This layout is only used for channel 2.  It can switch between a standard
+vertical layout and a reversed side-by-side layout for two-deck mode -->
+
+<Template>
+  <SetVariable name="Group">[Channel<Variable name="ChanNum"/>]</SetVariable>
+  <SetVariable name="EqEffect">[EqualizerRack1_<Variable name="Group"/>_Effect1]</SetVariable>
+
+  <SetVariable name="KnobBg">regular</SetVariable>
+  <SetVariable name="KnobIndicator">regular</SetVariable>
+  <SetVariable name="ArcRadius"><Variable name="ArcRadiusBig"/></SetVariable>
+  <SetVariable name="ArcThickness"><Variable name="ArcThicknessBig"/></SetVariable>
+
+  <WidgetGroup>
+    <SizePolicy>min,min</SizePolicy>
+    <Layout>horizontal</Layout>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>MixerChannel_2Decks</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+
+          <WidgetGroup>
+            <ObjectName>VolumeGain2Decks</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>me,min</SizePolicy>
+            <Children>
+              <Template src="skin:/controls/knob_textless.xml">
+                <SetVariable name="Size">40f,34f</SetVariable>
+                <SetVariable name="KnobColor">orange</SetVariable>
+                <SetVariable name="ArcColor"><Variable name="ArcColorGain"/></SetVariable>
+                <SetVariable name="Control">pregain</SetVariable>
+                <SetVariable name="TooltipId">pregain</SetVariable>
+              </Template>
+
+              <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
+
+              <SliderComposed><!-- Volume -->
+                <TooltipId>channel_volume</TooltipId>
+                <Size>42f,107f</Size>
+                <Handle scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/knob_volume_deck.svg</Handle>
+                <Slider scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/slider_volume_deck.svg</Slider>
+                <Horizontal>false</Horizontal>
+                <BarColor><Variable name="BarColorVolume"/></BarColor>
+                <BarWidth><Variable name="BarWidth"/></BarWidth>
+                <BarMargins><Variable name="BarMarginVolume"/></BarMargins>
+                <BarRoundCaps>true</BarRoundCaps>
+                <BarAxisPos>21.0</BarAxisPos>
+                <Connection>
+                  <ConfigKey><Variable name="Group"/>,volume</ConfigKey>
+                </Connection>
+              </SliderComposed>
+
+              <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
+            </Children>
+          </WidgetGroup><!-- VolumeGain2Decks -->
+
+          <WidgetGroup>
+            <ObjectName>MixerChannel_2Decks_Right</ObjectName>
+            <SizePolicy>min,min</SizePolicy>
+            <Layout>vertical</Layout>
+            <Children>
+
+              <!-- Spacer when there's no QuickEffect loaded -->
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Size>0min,34f</Size>
+                <Children>
+                </Children>
+                <Connection>
+                  <ConfigKey>[QuickEffectRack1_<Variable name="Group"/>_Effect1],loaded</ConfigKey>
+                  <Transform><Not/></Transform>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+
+              <Template src="skin:/mixer/eq_knob_right.xml">
+                <SetVariable name="EqParameter">3</SetVariable>
+                <SetVariable name="EqRange">High</SetVariable>
+              </Template>
+
+              <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
+
+              <Template src="skin:/mixer/eq_knob_right.xml">
+                <SetVariable name="EqParameter">2</SetVariable>
+                <SetVariable name="EqRange">Mid</SetVariable>
+              </Template>
+
+              <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
+
+              <Template src="skin:/mixer/eq_knob_right.xml">
+                <SetVariable name="EqParameter">1</SetVariable>
+                <SetVariable name="EqRange">Low</SetVariable>
+              </Template>
+
+              <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
+
+              <Template src="skin:/mixer/quick_effect_knob_right.xml"/>
+
+              <WidgetGroup><Size>0min,0me</Size></WidgetGroup>
+            </Children>
+            <Connection>
+              <ConfigKey>[Skin],show_eq_knobs</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup><!-- MixerChannel_2Decks_Right -->
+
+        </Children>
+        <Connection>
+          <ConfigKey>[Skin],show_4decks</ConfigKey>
+          <BindProperty>visible</BindProperty>
+          <Transform><Not/></Transform>
+        </Connection>
+      </WidgetGroup><!-- MixerChannel_2Decks -->
+
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:/mixer/channel_4decks.xml"/>
+        </Children>
+        <Connection>
+          <ConfigKey>[Skin],show_4decks</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/mixer/eq_knob_4decks.xml b/res/skins/LateNight/mixer/eq_knob_4decks.xml
new file mode 100644
index 000000000000..0fa4b152a5af
--- /dev/null
+++ b/res/skins/LateNight/mixer/eq_knob_4decks.xml
@@ -0,0 +1,127 @@
+<!DOCTYPE template>
+<Template>
+
+  <WidgetGroup>
+    <ObjectName>AlignRight</ObjectName>
+    <Layout>horizontal</Layout>
+    <SizePolicy>min,min</SizePolicy>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>ChannelMixer_KnobContainer</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <WidgetGroup><Size>4f,0min</Size></WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>AlignRight</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+
+              <WidgetGroup><!-- Kill button / placeholder -->
+                <ObjectName>EQKillButtonBox</ObjectName>
+                <Layout>vertical</Layout>
+                <Size>0min,34f</Size>
+                <Children>
+
+                  <WidgetGroup><Size>0min,5f</Size></WidgetGroup>
+
+                  <EffectPushButton>
+                    <TooltipId>filter<Variable name="EqRange"/>Kill</TooltipId>
+                    <ObjectName>EQKillButton_<Variable name="EqRange"/></ObjectName>
+                    <Size>18f,18f</Size>
+                    <NumberStates>2</NumberStates>
+                    <State>
+                      <Number>0</Number>
+                      <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_eqkill.svg</Unpressed>
+                      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_eqkill_active.svg</Pressed>
+                    </State>
+                    <State>
+                      <Number>1</Number>
+                      <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_eqkill_active.svg</Unpressed>
+                      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_eqkill_active.svg</Pressed>
+                    </State>
+                    <Connection>
+                      <ConfigKey><Variable name="EqEffect"/>,button_parameter<Variable name="EqParameter"/></ConfigKey>
+                      <ButtonState>LeftButton</ButtonState>
+                    </Connection>
+                  </EffectPushButton>
+
+                  <!-- Placeholder when Kill buttons are hidden -->
+                  <WidgetGroup>
+                    <Size>18f,0f</Size>
+                    <Connection>
+                      <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
+                      <Transform><Not/></Transform>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup>
+
+                </Children>
+              </WidgetGroup><!-- Kill button / placeholder -->
+
+              <WidgetGroup><!-- EQ knob + Kill status dot -->
+                <Size>40f,34f</Size>
+                <Children>
+                  <EffectParameterKnobComposed>
+                    <Pos>0,0</Pos>
+                    <Size>40f,34f</Size>
+                    <TooltipId>filter<Variable name="EqRange"/></TooltipId>
+                    <Knob>skin:/<Variable name="KnobScheme"/>/knobs/knob_indicator_regular_<Variable name="KnobColorEq"/>.svg</Knob>
+                    <BackPath>skin:/<Variable name="KnobScheme"/>/knobs/knob_bg_regular.svg</BackPath>
+                    <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
+                    <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
+                    <ArcRadius><Variable name="ArcRadius"/></ArcRadius>
+                    <ArcThickness><Variable name="ArcThickness"/></ArcThickness>
+                    <ArcColor><Variable name="ArcColorEq"/></ArcColor>
+                    <ArcRoundCaps><Variable name="ArcRoundCaps"/></ArcRoundCaps>
+                    <KnobCenterYOffset>1.598</KnobCenterYOffset>
+                    <Connection>
+                      <ConfigKey><Variable name="EqEffect"/>,parameter<Variable name="EqParameter"/></ConfigKey>
+                    </Connection>
+                  </EffectParameterKnobComposed>
+                  <PushButton>
+                    <TooltipId>filter<Variable name="EqRange"/>Kill</TooltipId>
+                    <ObjectName>EQKillDot</ObjectName>
+                    <Pos>0,28</Pos>
+                    <Size><Variable name="EqKillDotSize"/></Size>
+                    <NumberStates>2</NumberStates>
+                    <RightClickIsPushButton>false</RightClickIsPushButton>
+                    <State>
+                      <Number>0</Number>
+                    </State>
+                    <State>
+                      <Number>1</Number>
+                    </State>
+                    <Connection>
+                      <ConfigKey><Variable name="EqEffect"/>,button_parameter<Variable name="EqParameter"/></ConfigKey>
+                      <ButtonState>LeftButton</ButtonState>
+                    </Connection>
+                    <Connection>
+                      <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
+                      <Transform><Not/></Transform>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </PushButton>
+                </Children>
+              </WidgetGroup><!-- EQ knob + Kill status dot -->
+
+              <WidgetGroup><Size>2f,0min</Size></WidgetGroup>
+
+            </Children>
+            <Connection>
+              <ConfigKey><Variable name="EqEffect"/>,parameter<Variable name="EqParameter"/>_loaded</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+
+        </Children>
+      </WidgetGroup><!-- ChannelMixer_KnobContainer -->
+    </Children>
+    <Connection>
+      <ConfigKey>[Skin],show_eq_knobs</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/mixer/eq_knob_left.xml b/res/skins/LateNight/mixer/eq_knob_left.xml
new file mode 100644
index 000000000000..2aab3e366e3e
--- /dev/null
+++ b/res/skins/LateNight/mixer/eq_knob_left.xml
@@ -0,0 +1,103 @@
+<!DOCTYPE template>
+<Template>
+
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <SizePolicy>min,min</SizePolicy>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>ChannelMixer_KnobContainer</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+
+          <WidgetGroup>
+            <ObjectName>EQKillButtonBox</ObjectName>
+            <Layout>vertical</Layout>
+            <Size>18f,34f</Size>
+            <Children>
+              <WidgetGroup><Size>0min,5f</Size></WidgetGroup>
+              <EffectPushButton>
+                <TooltipId>filter<Variable name="EqRange"/>Kill</TooltipId>
+                <ObjectName>EQKillButton_<Variable name="EqRange"/></ObjectName>
+                <Size>18f,18f</Size>
+                <NumberStates>2</NumberStates>
+                <State>
+                  <Number>0</Number>
+                  <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_eqkill.svg</Unpressed>
+                  <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_eqkill_active.svg</Pressed>
+                </State>
+                <State>
+                  <Number>1</Number>
+                  <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_eqkill_active.svg</Unpressed>
+                  <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_eqkill_active.svg</Pressed>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="EqEffect"/>,button_parameter<Variable name="EqParameter"/></ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+              </EffectPushButton>
+            </Children>
+            <Connection>
+              <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup><!-- EQKillButtonBox -->
+
+          <WidgetGroup><!-- EQ knob + Kill status dot -->
+            <Size>40f,34f</Size>
+            <Children>
+              <EffectParameterKnobComposed>
+                <Pos>0,0</Pos>
+                <Size>40f,34f</Size>
+                <TooltipId>filter<Variable name="EqRange"/></TooltipId>
+                <Knob>skin:/<Variable name="KnobScheme"/>/knobs/knob_indicator_regular_<Variable name="KnobColorEq"/>.svg</Knob>
+                <BackPath>skin:/<Variable name="KnobScheme"/>/knobs/knob_bg_regular.svg</BackPath>
+                <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
+                <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
+                <ArcRadius><Variable name="ArcRadius"/></ArcRadius>
+                <ArcThickness><Variable name="ArcThickness"/></ArcThickness>
+                <ArcColor><Variable name="ArcColorEq"/></ArcColor>
+                <ArcRoundCaps><Variable name="ArcRoundCaps"/></ArcRoundCaps>
+                <KnobCenterYOffset>1.598</KnobCenterYOffset>
+                <Connection>
+                  <ConfigKey><Variable name="EqEffect"/>,parameter<Variable name="EqParameter"/></ConfigKey>
+                </Connection>
+              </EffectParameterKnobComposed>
+              <PushButton>
+                <TooltipId>filter<Variable name="EqRange"/>Kill</TooltipId>
+                <ObjectName>EQKillDot</ObjectName>
+                <Pos>0,28</Pos>
+                <Size><Variable name="EqKillDotSize"/></Size>
+                <NumberStates>2</NumberStates>
+                <RightClickIsPushButton>false</RightClickIsPushButton>
+                <State>
+                  <Number>0</Number>
+                </State>
+                <State>
+                  <Number>1</Number>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="EqEffect"/>,button_parameter<Variable name="EqParameter"/></ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+                <Connection>
+                  <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
+                  <Transform><Not/></Transform>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </PushButton>
+            </Children>
+          </WidgetGroup><!-- EQ knob + Kill status dot -->
+
+        </Children>
+      </WidgetGroup><!-- ChannelMixer_KnobContainer -->
+
+    </Children>
+    <Connection>
+      <ConfigKey><Variable name="EqEffect"/>,parameter<Variable name="EqParameter"/>_loaded</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/mixer/eq_knob_right.xml b/res/skins/LateNight/mixer/eq_knob_right.xml
new file mode 100644
index 000000000000..c662158d647b
--- /dev/null
+++ b/res/skins/LateNight/mixer/eq_knob_right.xml
@@ -0,0 +1,105 @@
+<!DOCTYPE template>
+<Template>
+
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <Size>0min,34f</Size>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>ChannelMixer_KnobContainer</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+
+          <WidgetGroup><!-- EQ knob + Kill status dot -->
+            <Size>40f,34f</Size>
+            <Children>
+              <EffectParameterKnobComposed>
+                <TooltipId>filter<Variable name="EqRange"/></TooltipId>
+                <Pos>0,0</Pos>
+                <Size>40f,34f</Size>
+                <Knob>skin:/<Variable name="KnobScheme"/>/knobs/knob_indicator_regular_<Variable name="KnobColorEq"/>.svg</Knob>
+                <BackPath>skin:/<Variable name="KnobScheme"/>/knobs/knob_bg_regular.svg</BackPath>
+                <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
+                <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
+                <ArcRadius><Variable name="ArcRadius"/></ArcRadius>
+                <ArcThickness><Variable name="ArcThickness"/></ArcThickness>
+                <ArcColor><Variable name="ArcColorEq"/></ArcColor>
+                <ArcRoundCaps><Variable name="ArcRoundCaps"/></ArcRoundCaps>
+                <KnobCenterYOffset>1.598</KnobCenterYOffset>
+                <Connection>
+                  <ConfigKey><Variable name="EqEffect"/>,parameter<Variable name="EqParameter"/></ConfigKey>
+                </Connection>
+              </EffectParameterKnobComposed>
+              <PushButton>
+                <TooltipId>filter<Variable name="EqRange"/>Kill</TooltipId>
+                <ObjectName>EQKillDot</ObjectName>
+                <Pos>34,28</Pos>
+                <Size><Variable name="EqKillDotSize"/></Size>
+                <NumberStates>2</NumberStates>
+                <RightClickIsPushButton>false</RightClickIsPushButton>
+                <State>
+                  <Number>0</Number>
+                </State>
+                <State>
+                  <Number>1</Number>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="EqEffect"/>,button_parameter<Variable name="EqParameter"/></ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+                <Connection>
+                  <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
+                  <Transform><Not/></Transform>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </PushButton>
+            </Children>
+          </WidgetGroup><!-- EQ knob + Kill status dot -->
+
+          <WidgetGroup>
+            <ObjectName>EQKillButtonBox</ObjectName>
+            <Layout>vertical</Layout>
+            <Size>18f,34f</Size>
+            <Children>
+
+              <WidgetGroup><Size>0min,5f</Size></WidgetGroup>
+
+              <EffectPushButton>
+                <TooltipId>filter<Variable name="EqRange"/>Kill</TooltipId>
+                <ObjectName>EQKillButton_<Variable name="EqRange"/></ObjectName>
+                <Size>18f,18f</Size>
+                <NumberStates>2</NumberStates>
+                <State>
+                  <Number>0</Number>
+                  <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_eqkill.svg</Unpressed>
+                  <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_eqkill_active.svg</Pressed>
+                </State>
+                <State>
+                  <Number>1</Number>
+                  <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_eqkill_active.svg</Unpressed>
+                  <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_eqkill_active.svg</Pressed>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="EqEffect"/>,button_parameter<Variable name="EqParameter"/></ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+              </EffectPushButton>
+
+            </Children>
+            <Connection>
+              <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup><!-- EQKillButtonBox -->
+
+        </Children>
+      </WidgetGroup><!-- ChannelMixer_KnobContainer -->
+
+    </Children>
+    <Connection>
+      <ConfigKey><Variable name="EqEffect"/>,parameter<Variable name="EqParameter"/>_loaded</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/mixer/mixer_decks.xml b/res/skins/LateNight/mixer/mixer_decks.xml
new file mode 100644
index 000000000000..c4047a8748f5
--- /dev/null
+++ b/res/skins/LateNight/mixer/mixer_decks.xml
@@ -0,0 +1,314 @@
+<Template>
+  <SetVariable name="BtnType"><Variable name="TopRegion_BtnType"/></SetVariable>
+
+  <WidgetGroup>
+    <ObjectName>MixerDecks</ObjectName>
+    <Layout>vertical</Layout>
+    <SizePolicy>max,min</SizePolicy>
+    <Children>
+
+      <!-- spacer to center channel controls without crossfader without
+          stretching them -->
+      <WidgetGroup><SizePolicy>min,e</SizePolicy></WidgetGroup>
+
+      <WidgetGroup><!-- Channel controls -->
+        <ObjectName>AlignHCenter</ObjectName>
+        <SizePolicy>min,min</SizePolicy>
+        <Layout>horizontal</Layout>
+        <Children>
+
+          <!-- Channel 3 -->
+          <WidgetGroup>
+            <SizePolicy>max,min</SizePolicy>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Template src="skin:/mixer/channel_4decks.xml">
+                <SetVariable name="ChanNum">3</SetVariable>
+                <SetVariable name="xfaderLeft">default</SetVariable>
+                <SetVariable name="xfaderRight">warning</SetVariable>
+              </Template>
+            </Children>
+            <Connection>
+              <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+
+          <Template src="skin:/mixer/channel_left.xml">
+            <SetVariable name="ChanNum">1</SetVariable>
+            <SetVariable name="xfaderLeft">default</SetVariable>
+            <SetVariable name="xfaderRight">warning</SetVariable>
+          </Template>
+
+          <WidgetGroup>
+            <ObjectName></ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>max,max</SizePolicy>
+            <Children>
+
+              <WidgetGroup>
+                <ObjectName></ObjectName>
+                <Layout>horizontal</Layout>
+                <Size>0min,26f</Size>
+                <Children>
+                  <Template src="skin:/controls/button_2state.xml">
+                    <SetVariable name="TooltipId">pfl</SetVariable>
+                    <SetVariable name="ObjectName">PflButton</SetVariable>
+                    <SetVariable name="Size">26f,26f</SetVariable>
+                    <SetVariable name="BtnSize">square</SetVariable>
+                    <SetVariable name="ConfigKey">[Channel1],pfl</SetVariable>
+                  </Template>
+                  <WidgetGroup><Size>3f,0min</Size></WidgetGroup>
+                  <Template src="skin:/controls/button_2state.xml">
+                    <SetVariable name="TooltipId">pfl</SetVariable>
+                    <SetVariable name="ObjectName">PflButton</SetVariable>
+                    <SetVariable name="Size">26f,26f</SetVariable>
+                    <SetVariable name="BtnSize">square</SetVariable>
+                    <SetVariable name="ConfigKey">[Channel2],pfl</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup><Size>1min,13f</Size></WidgetGroup>
+
+              <WidgetGroup>
+                <ObjectName></ObjectName>
+                <Layout>horizontal</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                  <SingletonContainer>
+                    <ObjectName>VuMeterChannel1</ObjectName>
+                  </SingletonContainer>
+                  <WidgetGroup><Size>7f,0min</Size></WidgetGroup>
+                  <SingletonContainer>
+                    <ObjectName>VuMeterMaster_Dark</ObjectName>
+                  </SingletonContainer>
+                  <WidgetGroup><Size>7f,0min</Size></WidgetGroup>
+                  <SingletonContainer>
+                    <ObjectName>VuMeterChannel2</ObjectName>
+                  </SingletonContainer>
+                </Children>
+              </WidgetGroup>
+            </Children>
+            <Connection>
+              <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
+              <BindProperty>visible</BindProperty>
+              <Transform><Invert/><Not/></Transform>
+            </Connection>
+          </WidgetGroup>
+
+          <Template src="skin:/mixer/channel_right.xml">
+            <SetVariable name="ChanNum">2</SetVariable>
+            <SetVariable name="xfaderLeft">warning</SetVariable>
+            <SetVariable name="xfaderRight">default</SetVariable>
+          </Template>
+
+          <!-- Channel 4 -->
+          <WidgetGroup>
+            <SizePolicy>max,min</SizePolicy>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Template src="skin:/mixer/channel_4decks.xml">
+                <SetVariable name="ChanNum">4</SetVariable>
+                <SetVariable name="xfaderLeft">warning</SetVariable>
+                <SetVariable name="xfaderRight">default</SetVariable>
+              </Template>
+              <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+            </Children>
+            <Connection>
+              <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+
+        </Children>
+      </WidgetGroup><!-- /Channel controls -->
+
+      <WidgetGroup><SizePolicy>min,e</SizePolicy></WidgetGroup>
+
+      <WidgetGroup><!-- Crossfader + Channel1/2 assign switches -->
+        <ObjectName>CrossfaderAndSwitches2Decks</ObjectName>
+        <Layout>horizontal</Layout>
+        <Children>
+
+          <!-- center xfader buttons below EQ knobs -->
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <WidgetGroup><Size>2f,0min</Size></WidgetGroup>
+              <WidgetGroup>
+                <Size>18f,0min</Size>
+                <Connection>
+                  <ConfigKey persist="true">[Skin],show_eq_kill_buttons</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+            </Children>
+            <Connection>
+              <ConfigKey persist="true">[Skin],show_eq_knobs</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+
+          <!-- Channel1 xfader switch -->
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <WidgetGroup><Size>min,2f</Size></WidgetGroup>
+              <Template src="skin:/controls/button_xfader_deck.xml">
+                <SetVariable name="Group">[Channel1]</SetVariable>
+                <SetVariable name="xfaderLeft">default</SetVariable>
+                <SetVariable name="xfaderRight">warning</SetVariable>
+              </Template>
+              <WidgetGroup><Size>min,me</Size></WidgetGroup>
+            </Children>
+            <Connection>
+              <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
+              <Transform><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup><!-- /Channel1 xfader switch -->
+
+          <WidgetGroup><Size>0me,0min</Size></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>
+              <!-- 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>
+              </WidgetGroup>
+
+              <!-- 2 decks -->
+              <WidgetGroup>
+                <ObjectName>AlignCenter</ObjectName>
+                <Layout>horizontal</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+
+                  <WidgetGroup><!-- with EQ knobs -->
+                    <Layout>horizontal</Layout>
+                    <SizePolicy>max,min</SizePolicy>
+                    <Children>
+                      <SingletonContainer>
+                        <ObjectName>CrossfaderSingleton</ObjectName>
+                      </SingletonContainer>
+                    </Children>
+                    <Connection>
+                      <ConfigKey persist="true">[Skin],show_eq_knobs</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup>
+
+
+                  <SliderComposed><!-- without EQ knobs -->
+                    <TooltipId>crossfader</TooltipId>
+                    <Size>85f,40f</Size>
+                    <Handle scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/knob_crossfader.svg</Handle>
+                    <Slider scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/slider_crossfader_small.svg</Slider>
+                    <Horizontal>true</Horizontal>
+                    <BarColor><Variable name="BarColorCrossfader"/></BarColor>
+                    <BarWidth><Variable name="BarWidth"/></BarWidth>
+                    <BarMargins><Variable name="BarMarginCrossfader"/></BarMargins>
+                    <BarMargins><Variable name="BarMarginVolume"/></BarMargins>
+                    <BarRoundCaps>true</BarRoundCaps>
+                    <BarAxisPos>19.0</BarAxisPos>
+                    <BarUnipolar>false</BarUnipolar>
+                    <Connection>
+                      <ConfigKey>[Master],crossfader</ConfigKey>
+                    </Connection>
+                    <Connection>
+                      <ConfigKey persist="true">[Skin],show_eq_knobs</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                      <Transform><Not/></Transform>
+                    </Connection>
+                  </SliderComposed>
+                </Children>
+                <Connection>
+                  <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
+                  <Transform><Not/></Transform>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup><!-- 2 decks -->
+            </Children>
+          </WidgetGroup><!-- CrossfaderContainer -->
+
+          <WidgetGroup><Size>0me,0min</Size></WidgetGroup>
+
+
+          <WidgetGroup><!-- Channel2 xfader switch -->
+            <ObjectName>AlignLeft</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <WidgetGroup><Size>min,2f</Size></WidgetGroup>
+              <Template src="skin:/controls/button_xfader_deck.xml">
+                <SetVariable name="Group">[Channel2]</SetVariable>
+                <SetVariable name="xfaderLeft">warning</SetVariable>
+                <SetVariable name="xfaderRight">default</SetVariable>
+              </Template>
+              <WidgetGroup><Size>min,me</Size></WidgetGroup>
+            </Children>
+            <Connection>
+              <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
+              <Transform><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup><!-- /Channel2 xfader switch -->
+
+          <!-- center xfader buttons below EQ knobs -->
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <WidgetGroup><Size>2f,0min</Size></WidgetGroup>
+              <WidgetGroup>
+                <Size>18f,0min</Size>
+                <Connection>
+                  <ConfigKey persist="true">[Skin],show_eq_kill_buttons</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+            </Children>
+            <Connection>
+              <ConfigKey persist="true">[Skin],show_eq_knobs</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+
+        </Children>
+        <Connection>
+          <ConfigKey persist="true">[Skin],show_xfader</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- /Crossfader + Channel1/2 assign switches -->
+
+      <!-- spacer to center channel controls without crossfader without
+          stretching them -->
+      <WidgetGroup><SizePolicy>min,e</SizePolicy></WidgetGroup>
+
+    </Children>
+    <Connection>
+      <ConfigKey persist="true">[Skin],show_master_head_mixer</ConfigKey>
+      <BindProperty>highlight</BindProperty>
+    </Connection>
+  </WidgetGroup><!-- MixerDecks -->
+</Template>
diff --git a/res/skins/LateNight/mixer/mixer_master_headphone.xml b/res/skins/LateNight/mixer/mixer_master_headphone.xml
new file mode 100644
index 000000000000..b61fc793af24
--- /dev/null
+++ b/res/skins/LateNight/mixer/mixer_master_headphone.xml
@@ -0,0 +1,261 @@
+<Template>
+  <SetVariable name="BtnType"><Variable name="SubRegion_BtnType"/></SetVariable>
+  <SetVariable name="Group">[Master]</SetVariable>
+  <SetVariable name="Type">master</SetVariable>
+  <SetVariable name="KnobBg">master</SetVariable>
+  <SetVariable name="KnobIndicator">master</SetVariable>
+  <SetVariable name="ArcRadius"><Variable name="ArcRadiusCompact"/></SetVariable>
+  <SetVariable name="ArcThickness"><Variable name="ArcThicknessBig"/></SetVariable>
+
+  <WidgetGroup>
+    <SizePolicy>max,min</SizePolicy>
+    <Layout>horizontal</Layout>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>MasterMixerSeparator</ObjectName>
+        <Layout>horizontal</Layout>
+        <Children/>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>MixerMasterHeadphone</ObjectName>
+        <SizePolicy>min,min</SizePolicy>
+        <Layout>vertical</Layout>
+        <Children>
+
+          <WidgetGroup>
+            <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>min,min</SizePolicy>
+                <Children>
+                  <WidgetGroup>
+                    <Layout>horizontal</Layout>
+                    <SizePolicy>me,min</SizePolicy>
+                    <Children>
+                      <Template src="skin:/controls/knob_textless.xml">
+                        <SetVariable name="TooltipId">master_gain</SetVariable>
+                        <SetVariable name="Size">35f,30f</SetVariable>
+                        <SetVariable name="KnobColor">orange</SetVariable>
+                        <SetVariable name="ArcColor"><Variable name="ArcColorGainLow"/></SetVariable>
+                        <SetVariable name="ArcUnipolar">true</SetVariable>
+                        <SetVariable name="Control">gain</SetVariable>
+                      </Template>
+                    </Children>
+                  </WidgetGroup>
+
+                  <WidgetGroup>
+                    <Layout>horizontal</Layout>
+                    <SizePolicy>me,min</SizePolicy>
+                    <Children>
+                      <Template src="skin:/controls/knob_textless.xml">
+                        <SetVariable name="TooltipId">balance</SetVariable>
+                        <SetVariable name="Size">35f,30f</SetVariable>
+                        <SetVariable name="KnobColor">red</SetVariable>
+                        <SetVariable name="ArcColor"><Variable name="ArcColorMstBal"/></SetVariable>
+                        <SetVariable name="Control">balance</SetVariable>
+                      </Template>
+                    </Children>
+                  </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&#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:/controls/knob_textless.xml">
+                    <SetVariable name="TooltipId">booth_gain</SetVariable>
+                    <SetVariable name="Size">35f,30f</SetVariable>
+                    <SetVariable name="KnobColor">orange</SetVariable>
+                    <SetVariable name="ArcColor"><Variable name="ArcColorGainLow"/></SetVariable>
+                    <SetVariable name="ArcUnipolar">true</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>
+
+              <WidgetGroup><Size>0min,0min</Size></WidgetGroup>
+
+              <WidgetGroup>
+                <ObjectName>AlignCenter</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                  <Template src="skin:/fx/assign_buttons.xml"/>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,me</SizePolicy>
+                <Children>
+                  <WidgetGroup>
+                    <ObjectName>VuMeterMaster_4Decks</ObjectName>
+                    <Layout>horizontal</Layout>
+                    <SizePolicy>max,max</SizePolicy>
+                    <Children>
+                      <SingletonContainer>
+                        <ObjectName>VuMeterMaster_Light</ObjectName>
+                      </SingletonContainer>
+                    </Children>
+                  </WidgetGroup>
+                </Children>
+                <Connection>
+                  <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup><!-- /MasterVuMeter4ch -->
+
+            </Children>
+          </WidgetGroup><!-- MasterControls -->
+
+          <WidgetGroup>
+            <ObjectName>MasterHeadphoneSeparator</ObjectName>
+            <Layout>horizontal</Layout>
+            <Children/>
+          </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>
+                    <Layout>horizontal</Layout>
+                    <SizePolicy>me,min</SizePolicy>
+                    <Children>
+                      <Template src="skin:/controls/knob_textless.xml">
+                        <SetVariable name="TooltipId">headphone_gain</SetVariable>
+                        <SetVariable name="Size">35f,30f</SetVariable>
+                        <SetVariable name="KnobColor">orange</SetVariable>
+                        <SetVariable name="ArcColor"><Variable name="ArcColorGainLow"/></SetVariable>
+                        <SetVariable name="ArcUnipolar">true</SetVariable>
+                        <SetVariable name="Control">headGain</SetVariable>
+                      </Template>
+                    </Children>
+                  </WidgetGroup>
+
+                  <WidgetGroup>
+                    <Layout>horizontal</Layout>
+                    <SizePolicy>me,min</SizePolicy>
+                    <Children>
+                      <Template src="skin:/controls/knob_textless.xml">
+                        <SetVariable name="TooltipId">headMix</SetVariable>
+                        <SetVariable name="Size">35f,30f</SetVariable>
+                        <SetVariable name="KnobColor">red</SetVariable>
+                        <SetVariable name="ArcColor"><Variable name="ArcColorMstBal"/></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>
+                    <SizePolicy>me,min</SizePolicy>
+                    <Alignment>right</Alignment>
+                    <Text>CUE/MST</Text>
+                  </Label>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <MinimumSize>0,0</MinimumSize>
+                <MaximumSize>,5</MaximumSize>
+                <SizePolicy>me,min</SizePolicy>
+              </WidgetGroup>
+
+              <WidgetGroup><!-- HeadSplit button -->
+                <Layout>horizontal</Layout>
+                <SizePolicy>me,min</SizePolicy>
+                <Children>
+                  <PushButton>
+                    <TooltipId>headSplit</TooltipId>
+                    <ObjectName>SplitCue</ObjectName>
+                    <Size>48f,22f</Size>
+                    <NumberStates>2</NumberStates>
+                    <RightClickIsPushButton>false</RightClickIsPushButton>
+                    <State>
+                      <Number>0</Number>
+                      <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_sync.svg</Unpressed>
+                      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_sync.svg</Pressed>
+                    </State>
+                    <State>
+                      <Number>1</Number>
+                      <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_sync_active.svg</Unpressed>
+                      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_sync_active.svg</Pressed>
+                    </State>
+                    <Connection>
+                      <ConfigKey>[Master],headSplit</ConfigKey>
+                      <ButtonState>LeftButton</ButtonState>
+                    </Connection>
+                  </PushButton>
+                </Children>
+              </WidgetGroup><!-- /HeadSplit button -->
+
+            </Children>
+          </WidgetGroup><!-- /HeadphoneControls -->
+
+        </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/mixer/quick_effect_knob_4decks.xml b/res/skins/LateNight/mixer/quick_effect_knob_4decks.xml
new file mode 100644
index 000000000000..19f8ca98ea37
--- /dev/null
+++ b/res/skins/LateNight/mixer/quick_effect_knob_4decks.xml
@@ -0,0 +1,127 @@
+<!DOCTYPE template>
+<Template>
+  <SetVariable name="QuickEffectGroup">[QuickEffectRack1_<Variable name="Group"/>]</SetVariable>
+  <SetVariable name="QuickEffect">[QuickEffectRack1_<Variable name="Group"/>_Effect1]</SetVariable>
+
+  <WidgetGroup>
+    <ObjectName>AlignRight</ObjectName>
+    <Layout>vertical</Layout>
+    <SizePolicy>min,min</SizePolicy>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>ChannelMixer_KnobContainer</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+
+          <WidgetGroup><!-- Enable button  + knob -->
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <WidgetGroup><Size>4f,0min</Size></WidgetGroup>
+
+              <WidgetGroup><!-- Enable button / placeholder -->
+                <ObjectName>EQKillButtonBox</ObjectName>
+                <Layout>vertical</Layout>
+                <Size>0min,34f</Size>
+                <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:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_eqkill.svg</Unpressed>
+                      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_eqkill_active.svg</Pressed>
+                    </State>
+                    <State>
+                      <Number>1</Number>
+                      <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_eqkill_active.svg</Unpressed>
+                      <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_eqkill_active.svg</Pressed>
+                    </State>
+                    <Connection>
+                      <ConfigKey><Variable name="QuickEffect"/>,enabled</ConfigKey>
+                      <ButtonState>LeftButton</ButtonState>
+                    </Connection>
+                    <Connection>
+                      <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </PushButton>
+
+                  <WidgetGroup><Size>18f,0f</Size></WidgetGroup>
+
+                </Children>
+              </WidgetGroup><!-- Enable button / placeholder -->
+
+              <WidgetGroup><!-- QuickEffect Meta knob + status dot -->
+                <Size>40f,34f</Size>
+                <Children>
+                  <KnobComposed>
+                    <TooltipId>QuickEffectRack_super1</TooltipId>
+                    <Pos>0,0</Pos>
+                    <Size>40f,34f</Size>
+                    <Knob>skin:/<Variable name="KnobScheme"/>/knobs/knob_indicator_<Variable name="KnobIndicator"/>_<Variable name="KnobColorQuickEffect"/>.svg</Knob>
+                    <BackPath>skin:/<Variable name="KnobScheme"/>/knobs/knob_bg_<Variable name="KnobBg"/>.svg</BackPath>
+                    <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
+                    <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
+                    <ArcRadius><Variable name="ArcRadius"/></ArcRadius>
+                    <ArcUnipolar><Variable name="ArcUnipolar"/></ArcUnipolar>
+                    <ArcReversed><Variable name="ArcReversed"/></ArcReversed>
+                    <ArcColor><Variable name="ArcColorFx12Quick"/></ArcColor>
+                    <ArcThickness><Variable name="ArcThickness"/></ArcThickness>
+                    <ArcRoundCaps><Variable name="ArcRoundCaps"/></ArcRoundCaps>
+                    <KnobCenterYOffset>1.598</KnobCenterYOffset>
+                    <Connection>
+                      <ConfigKey><Variable name="QuickEffectGroup"/>,super1</ConfigKey>
+                    </Connection>
+                  </KnobComposed>
+
+                  <PushButton>
+                    <TooltipId>QuickEffectRack_enabled</TooltipId>
+                    <ObjectName>QuickEffectDot</ObjectName>
+                    <Pos>0,28</Pos>
+                    <Size><Variable name="EqKillDotSize"/></Size>
+                    <NumberStates>2</NumberStates>
+                    <RightClickIsPushButton>false</RightClickIsPushButton>
+                    <State>
+                      <Number>0</Number>
+                    </State>
+                    <State>
+                      <Number>1</Number>
+                    </State>
+                    <Connection>
+                      <ConfigKey><Variable name="QuickEffect"/>,enabled</ConfigKey>
+                      <ButtonState>LeftButton</ButtonState>
+                    </Connection>
+                    <Connection>
+                      <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
+                      <Transform><Not/></Transform>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </PushButton>
+                </Children>
+              </WidgetGroup><!-- QuickEffect Meta knob + status dot -->
+
+              <WidgetGroup><Size>2f,0min</Size></WidgetGroup>
+
+            </Children>
+            <Connection>
+              <ConfigKey><Variable name="QuickEffect"/>,loaded</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup><!-- /Kill button + knob -->
+
+        </Children>
+      </WidgetGroup><!-- ChannelMixer_KnobContainer -->
+    </Children>
+    <Connection>
+      <ConfigKey>[Skin],show_eq_knobs</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/mixer/quick_effect_knob_left.xml b/res/skins/LateNight/mixer/quick_effect_knob_left.xml
new file mode 100644
index 000000000000..37182be91568
--- /dev/null
+++ b/res/skins/LateNight/mixer/quick_effect_knob_left.xml
@@ -0,0 +1,105 @@
+<!DOCTYPE template>
+<Template>
+  <SetVariable name="QuickEffectGroup">[QuickEffectRack1_<Variable name="Group"/>]</SetVariable>
+  <SetVariable name="QuickEffect">[QuickEffectRack1_<Variable name="Group"/>_Effect1]</SetVariable>
+
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <SizePolicy>min,min</SizePolicy>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>ChannelMixer_KnobContainer</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <Size>18f,34f</Size>
+            <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:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_eqkill.svg</Unpressed>
+                  <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_eqkill_active.svg</Pressed>
+                </State>
+                <State>
+                  <Number>1</Number>
+                  <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_eqkill_active.svg</Unpressed>
+                  <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_eqkill_active.svg</Pressed>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="QuickEffect"/>,enabled</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+              </PushButton>
+            </Children>
+            <Connection>
+              <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+
+          <WidgetGroup><!-- QuickEffect Meta knob + status dot -->
+            <Size>40f,34f</Size>
+            <Children>
+              <KnobComposed>
+                <TooltipId>QuickEffectRack_super1</TooltipId>
+                <Pos>0,0</Pos>
+                <Size>40f,34f</Size>
+                <Knob>skin:/<Variable name="KnobScheme"/>/knobs/knob_indicator_<Variable name="KnobIndicator"/>_<Variable name="KnobColorQuickEffect"/>.svg</Knob>
+                <BackPath>skin:/<Variable name="KnobScheme"/>/knobs/knob_bg_<Variable name="KnobBg"/>.svg</BackPath>
+                <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
+                <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
+                <ArcRadius><Variable name="ArcRadius"/></ArcRadius>
+                <ArcUnipolar><Variable name="ArcUnipolar"/></ArcUnipolar>
+                <ArcReversed><Variable name="ArcReversed"/></ArcReversed>
+                <ArcColor><Variable name="ArcColorFx12Quick"/></ArcColor>
+                <ArcThickness><Variable name="ArcThickness"/></ArcThickness>
+                <ArcRoundCaps><Variable name="ArcRoundCaps"/></ArcRoundCaps>
+                <KnobCenterYOffset>1.598</KnobCenterYOffset>
+                <Connection>
+                  <ConfigKey><Variable name="QuickEffectGroup"/>,super1</ConfigKey>
+                </Connection>
+              </KnobComposed>
+
+              <PushButton>
+                <TooltipId>QuickEffectRack_enabled</TooltipId>
+                <ObjectName>QuickEffectDot</ObjectName>
+                <Pos>0,28</Pos>
+                <Size><Variable name="EqKillDotSize"/></Size>
+                <NumberStates>2</NumberStates>
+                <RightClickIsPushButton>false</RightClickIsPushButton>
+                <State>
+                  <Number>0</Number>
+                </State>
+                <State>
+                  <Number>1</Number>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="QuickEffect"/>,enabled</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+                <Connection>
+                  <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
+                  <Transform><Not/></Transform>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </PushButton>
+            </Children>
+          </WidgetGroup><!-- QuickEffect Meta knob + status dot -->
+
+        </Children>
+      </WidgetGroup>
+    </Children>
+    <Connection>
+      <ConfigKey><Variable name="QuickEffect"/>,loaded</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/mixer/quick_effect_knob_right.xml b/res/skins/LateNight/mixer/quick_effect_knob_right.xml
new file mode 100644
index 000000000000..aea48423c0a1
--- /dev/null
+++ b/res/skins/LateNight/mixer/quick_effect_knob_right.xml
@@ -0,0 +1,105 @@
+<!DOCTYPE template>
+<Template>
+  <SetVariable name="QuickEffectGroup">[QuickEffectRack1_<Variable name="Group"/>]</SetVariable>
+  <SetVariable name="QuickEffect">[QuickEffectRack1_<Variable name="Group"/>_Effect1]</SetVariable>
+
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <SizePolicy>min,min</SizePolicy>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>ChannelMixer_KnobContainer</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+
+          <WidgetGroup><!-- QuickEffect Meta knob + status dot -->
+            <Size>40f,34f</Size>
+            <Children>
+              <KnobComposed>
+                <TooltipId>QuickEffectRack_super1</TooltipId>
+                <Pos>0,0</Pos>
+                <Size>40f,34f</Size>
+                <Knob>skin:/<Variable name="KnobScheme"/>/knobs/knob_indicator_<Variable name="KnobIndicator"/>_<Variable name="KnobColorQuickEffect"/>.svg</Knob>
+                <BackPath>skin:/<Variable name="KnobScheme"/>/knobs/knob_bg_<Variable name="KnobBg"/>.svg</BackPath>
+                <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
+                <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
+                <ArcRadius><Variable name="ArcRadius"/></ArcRadius>
+                <ArcUnipolar><Variable name="ArcUnipolar"/></ArcUnipolar>
+                <ArcReversed><Variable name="ArcReversed"/></ArcReversed>
+                <ArcColor><Variable name="ArcColorFx12Quick"/></ArcColor>
+                <ArcThickness><Variable name="ArcThickness"/></ArcThickness>
+                <ArcRoundCaps><Variable name="ArcRoundCaps"/></ArcRoundCaps>
+                <KnobCenterYOffset>1.598</KnobCenterYOffset>
+                <Connection>
+                  <ConfigKey><Variable name="QuickEffectGroup"/>,super1</ConfigKey>
+                </Connection>
+              </KnobComposed>
+
+              <PushButton>
+                <TooltipId>QuickEffectRack_enabled</TooltipId>
+                <ObjectName>QuickEffectDot</ObjectName>
+                <Pos>34,28</Pos>
+                <Size><Variable name="EqKillDotSize"/></Size>
+                <NumberStates>2</NumberStates>
+                <RightClickIsPushButton>false</RightClickIsPushButton>
+                <State>
+                  <Number>0</Number>
+                </State>
+                <State>
+                  <Number>1</Number>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="QuickEffect"/>,enabled</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+                <Connection>
+                  <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
+                  <Transform><Not/></Transform>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </PushButton>
+            </Children>
+          </WidgetGroup><!-- QuickEffect Meta knob + status dot -->
+
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <Size>18f,34f</Size>
+            <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:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_eqkill.svg</Unpressed>
+                  <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_eqkill_active.svg</Pressed>
+                </State>
+                <State>
+                  <Number>1</Number>
+                  <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_eqkill_active.svg</Unpressed>
+                  <Pressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_eqkill_active.svg</Pressed>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="QuickEffect"/>,enabled</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+              </PushButton>
+            </Children>
+            <Connection>
+              <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+
+        </Children>
+      </WidgetGroup>
+    </Children>
+    <Connection>
+      <ConfigKey><Variable name="QuickEffect"/>,loaded</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/mixer/singletons.xml b/res/skins/LateNight/mixer/singletons.xml
new file mode 100644
index 000000000000..3816fbf70d9f
--- /dev/null
+++ b/res/skins/LateNight/mixer/singletons.xml
@@ -0,0 +1,113 @@
+<!DOCTYPE template>
+<Template>
+  <SetVariable name="ChannelType">channel</SetVariable>
+  <SetVariable name="VuSize">deck</SetVariable>
+  <SetVariable name="VuColor">dark</SetVariable>
+
+  <SingletonDefinition>
+    <ObjectName>CrossfaderSingleton</ObjectName>
+    <Children>
+      <SliderComposed>
+        <TooltipId>crossfader</TooltipId>
+        <Size>115f,40f</Size>
+        <Handle scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/knob_crossfader.svg</Handle>
+        <Slider scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/slider_crossfader.svg</Slider>
+        <Horizontal>true</Horizontal>
+        <BarColor><Variable name="BarColorCrossfader"/></BarColor>
+        <BarWidth><Variable name="BarWidth"/></BarWidth>
+        <BarMargins><Variable name="BarMarginCrossfader"/></BarMargins>
+        <BarMargins><Variable name="BarMarginVolume"/></BarMargins>
+        <BarRoundCaps>true</BarRoundCaps>
+        <BarAxisPos>19.0</BarAxisPos>
+        <BarUnipolar>false</BarUnipolar>
+        <Connection>
+          <ConfigKey>[Master],crossfader</ConfigKey>
+        </Connection>
+      </SliderComposed>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>VuMeterChannel1</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Children>
+          <Template src="skin:/mixer/vumeter_single.xml">
+            <SetVariable name="Group">[Channel1]</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>VuMeterChannel2</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Children>
+          <Template src="skin:/mixer/vumeter_single.xml">
+            <SetVariable name="Group">[Channel2]</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>VuMeterChannel3</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Children>
+          <Template src="skin:/mixer/vumeter_single.xml">
+            <SetVariable name="Group">[Channel3]</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>VuMeterChannel4</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Children>
+          <Template src="skin:/mixer/vumeter_single.xml">
+            <SetVariable name="Group">[Channel4]</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>VuMeterMaster_Dark</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Children>
+          <Template src="skin:/mixer/vumeter_master.xml">
+            <SetVariable name="VuColor">dark</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>VuMeterMaster_Light</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Children>
+          <Template src="skin:/mixer/vumeter_master.xml">
+            <SetVariable name="VuColor">light</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+</Template>
diff --git a/res/skins/LateNight/vumeter_latency.xml b/res/skins/LateNight/mixer/vumeter_latency.xml
similarity index 76%
rename from res/skins/LateNight/vumeter_latency.xml
rename to res/skins/LateNight/mixer/vumeter_latency.xml
index e6d28f2eff78..5073a32282f9 100644
--- a/res/skins/LateNight/vumeter_latency.xml
+++ b/res/skins/LateNight/mixer/vumeter_latency.xml
@@ -17,15 +17,15 @@
         <TooltipId><Variable name="TooltipId"/></TooltipId>
         <MinimumSize>64,4</MinimumSize>
         <MaximumSize>64,4</MaximumSize>
-        <PathVu>skin:/style_<Variable name="style_scheme"/>/vumeter_latency_over.png</PathVu>
-        <PathBack>skin:/style_<Variable name="style_scheme"/>/vumeter_latency_bg.png</PathBack>
+        <PathVu>skin:/<Variable name="StyleScheme"/>/style/vumeter_latency_over.png</PathVu>
+        <PathBack>skin:/<Variable name="StyleScheme"/>/style/vumeter_latency_bg.png</PathBack>
         <Horizontal>true</Horizontal>
         <PeakHoldSize>5</PeakHoldSize>
         <PeakHoldTime>1000</PeakHoldTime>
         <PeakFallTime>100</PeakFallTime>
         <PeakFallStep>1</PeakFallStep>
         <Connection>
-          <ConfigKey><Variable name="group"/>,<Variable name="control"/></ConfigKey>
+          <ConfigKey><Variable name="Group"/>,<Variable name="Control"/></ConfigKey>
         </Connection>
       </VuMeter>
     </Children>
diff --git a/res/skins/LateNight/mixer/vumeter_master.xml b/res/skins/LateNight/mixer/vumeter_master.xml
new file mode 100644
index 000000000000..daf07dc21e67
--- /dev/null
+++ b/res/skins/LateNight/mixer/vumeter_master.xml
@@ -0,0 +1,81 @@
+<!--
+  Description:
+    A stereo meter for the Master VU level
+
+  Variables:
+    Group
+    ChannelType   channel | sampler | microphone | ...
+    StyleScheme
+    VuSize        deck | sampler | small
+    VuColor       dark | light
+            (in PaleMoon theme the Vu meters are different
+             in mixer or 'standalone' in between compact decks)
+-->
+<Template>
+  <WidgetGroup>
+    <ObjectName>VuMeterBoxMaster</ObjectName>
+    <Layout>horizontal</Layout>
+    <SizePolicy>min,min</SizePolicy>
+    <Children>
+      <!-- Left -->
+      <WidgetGroup>
+        <ObjectName>VuMeterBoxMasterSingle</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <StatusLight>
+            <TooltipId>master_PeakIndicatorL</TooltipId>
+            <PathBack>skin:/<Variable name="StyleScheme"/>/style/vu_deck_clipping_bg_<Variable name="VuColor"/>.png</PathBack>
+            <PathStatusLight>skin:/<Variable name="StyleScheme"/>/style/vu_deck_clipping_active.png</PathStatusLight>
+            <Connection>
+              <ConfigKey>[Master],PeakIndicatorL</ConfigKey>
+            </Connection>
+          </StatusLight>
+          <VuMeter>
+            <TooltipId>master_VuMeterL</TooltipId>
+            <PathBack>skin:/<Variable name="StyleScheme"/>/style/vu_deck_level_bg_<Variable name="VuColor"/>.png</PathBack>
+            <PathVu>skin:/<Variable name="StyleScheme"/>/style/vu_deck_level_active.png</PathVu>
+            <Horizontal>false</Horizontal>
+            <PeakHoldSize>5</PeakHoldSize>
+            <PeakHoldTime>500</PeakHoldTime>
+            <PeakFallTime>50</PeakFallTime>
+            <PeakFallStep>2</PeakFallStep>
+            <Connection>
+              <ConfigKey>[Master],VuMeterL</ConfigKey>
+            </Connection>
+          </VuMeter>
+        </Children>
+      </WidgetGroup><!-- VuMeterBoxMasterSingle -->
+      <!-- Left -->
+      <WidgetGroup><!-- Right -->
+        <ObjectName>VuMeterBoxMasterSingle</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <StatusLight>
+            <TooltipId>master_PeakIndicatorR</TooltipId>
+            <PathBack>skin:/<Variable name="StyleScheme"/>/style/vu_deck_clipping_bg_<Variable name="VuColor"/>.png</PathBack>
+            <PathStatusLight>skin:/<Variable name="StyleScheme"/>/style/vu_deck_clipping_active.png</PathStatusLight>
+            <Connection>
+              <ConfigKey>[Master],PeakIndicatorR</ConfigKey>
+            </Connection>
+          </StatusLight>
+          <VuMeter>
+            <TooltipId>master_VuMeterR</TooltipId>
+            <PathBack>skin:/<Variable name="StyleScheme"/>/style/vu_deck_level_bg_<Variable name="VuColor"/>.png</PathBack>
+            <PathVu>skin:/<Variable name="StyleScheme"/>/style/vu_deck_level_active.png</PathVu>
+            <Horizontal>false</Horizontal>
+            <PeakHoldSize>5</PeakHoldSize>
+            <PeakHoldTime>500</PeakHoldTime>
+            <PeakFallTime>50</PeakFallTime>
+            <PeakFallStep>2</PeakFallStep>
+            <Connection>
+              <ConfigKey>[Master],VuMeterR</ConfigKey>
+            </Connection>
+          </VuMeter>
+        </Children>
+      </WidgetGroup><!-- VuMeterBoxMasterSingle -->
+      <!-- Right -->
+    </Children>
+  </WidgetGroup><!-- VuMeterBoxMaster -->
+</Template>
diff --git a/res/skins/LateNight/mixer/vumeter_single.xml b/res/skins/LateNight/mixer/vumeter_single.xml
new file mode 100644
index 000000000000..cc08809e0cab
--- /dev/null
+++ b/res/skins/LateNight/mixer/vumeter_single.xml
@@ -0,0 +1,44 @@
+<!--
+  Description:
+    A mono meter for all channel VU levels
+
+  Variables:
+    Group
+    ChannelType   channel | sampler | microphone | ...
+    StyleScheme
+    VuSize        deck | sampler | small
+    VuColor       dark | light
+            In PaleMoon theme there are different Vu meters:
+            * in mixer: dark BackPath
+            * in between compact decks: light BackPath
+-->
+<Template>
+  <WidgetGroup>
+    <ObjectName>VuMeterBox</ObjectName>
+    <Layout>vertical</Layout>
+    <SizePolicy>min,min</SizePolicy>
+    <Children>
+      <StatusLight>
+        <TooltipId><Variable name="ChannelType"/>_PeakIndicator</TooltipId>
+        <PathBack>skin:/<Variable name="StyleScheme"/>/style/vu_<Variable name="VuSize"/>_clipping_bg_<Variable name="VuColor"/>.png</PathBack>
+        <PathStatusLight>skin:/<Variable name="StyleScheme"/>/style/vu_<Variable name="VuSize"/>_clipping_active.png</PathStatusLight>
+        <Connection>
+          <ConfigKey><Variable name="Group"/>,PeakIndicator</ConfigKey>
+        </Connection>
+      </StatusLight>
+      <VuMeter>
+        <TooltipId><Variable name="ChannelType"/>_VuMeter</TooltipId>
+        <PathBack>skin:/<Variable name="StyleScheme"/>/style/vu_<Variable name="VuSize"/>_level_bg_<Variable name="VuColor"/>.png</PathBack>
+        <PathVu>skin:/<Variable name="StyleScheme"/>/style/vu_<Variable name="VuSize"/>_level_active.png</PathVu>
+        <Horizontal>false</Horizontal>
+        <PeakHoldSize>5</PeakHoldSize>
+        <PeakHoldTime>500</PeakHoldTime>
+        <PeakFallTime>50</PeakFallTime>
+        <PeakFallStep>2</PeakFallStep>
+        <Connection>
+          <ConfigKey><Variable name="Group"/>,VuMeter</ConfigKey>
+        </Connection>
+      </VuMeter>
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/mixer/vumeters_compact.xml b/res/skins/LateNight/mixer/vumeters_compact.xml
new file mode 100644
index 000000000000..916d8e463a7c
--- /dev/null
+++ b/res/skins/LateNight/mixer/vumeters_compact.xml
@@ -0,0 +1,104 @@
+<Template>
+  <SetVariable name="ChannelType">channel</SetVariable>
+  <SetVariable name="VuSize">deck</SetVariable>
+  <SetVariable name="VuColor">light</SetVariable>
+
+  <WidgetGroup>
+    <SizePolicy>min,me</SizePolicy>
+    <Layout>vertical</Layout>
+    <Children>
+
+      <WidgetGroup><!-- 1 / Master / 2 -->
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,me</SizePolicy>
+        <Children>
+          <WidgetGroup>
+            <ObjectName>VuMeterDeck1_Compact</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,me</SizePolicy>
+            <Children>
+              <Template src="skin:/mixer/vumeter_single.xml">
+                <SetVariable name="Group">[Channel1]</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>VuMeterMaster_Compact</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,me</SizePolicy>
+            <Children>
+              <SingletonContainer>
+                <ObjectName>VuMeterMaster_Light</ObjectName>
+              </SingletonContainer>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>VuMeterDeck2_Compact</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,me</SizePolicy>
+            <Children>
+              <Template src="skin:/mixer/vumeter_single.xml">
+                <SetVariable name="Group">[Channel2]</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+        </Children>
+      </WidgetGroup><!-- 1 / Master / 2 -->
+
+      <WidgetGroup><!-- 3 / (Master) / 4 -->
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,me</SizePolicy>
+        <Children>
+          <WidgetGroup>
+            <ObjectName>VuMeterDeck3_Compact</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,me</SizePolicy>
+            <Children>
+              <Template src="skin:/mixer/vumeter_single.xml">
+                <SetVariable name="Group">[Channel3]</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>VuMeterMaster_Compact</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,me</SizePolicy>
+            <Children>
+              <WidgetGroup>
+                <Layout>stacked</Layout>
+                <Size>15f,96f</Size>
+                <Children>
+                  <WidgetGroup>
+                    <ObjectName>VuMasterCover</ObjectName>
+                  </WidgetGroup>
+                  <!-- Unfortnately we can load a Singleton only once,
+                      so we need a separate vu meter instance -->
+                  <Template src="skin:/mixer/vumeter_master.xml"/>
+                </Children>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>VuMeterDeck4_Compact</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,me</SizePolicy>
+            <Children>
+              <Template src="skin:/mixer/vumeter_single.xml">
+                <SetVariable name="Group">[Channel4]</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+        </Children>
+        <Connection>
+          <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- 3 / dimmed Master / 4 -->
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/mixer_channel_4decks.xml b/res/skins/LateNight/mixer_channel_4decks.xml
deleted file mode 100644
index b670f8e39c61..000000000000
--- a/res/skins/LateNight/mixer_channel_4decks.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<Template>
-  <SetVariable name="group">[Channel<Variable name="channum"/>]</SetVariable>
-  <WidgetGroup>
-    <ObjectName>MixerChannel_4Decks</ObjectName>
-    <Layout>vertical</Layout>
-    <SizePolicy>min,min</SizePolicy>
-    <Children>
-
-      <WidgetGroup>
-        <Size>0min,0me</Size>
-      </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>
-          <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>
-          <WidgetGroup><Size>3f,0min</Size></WidgetGroup>
-        </Children>
-      </WidgetGroup>
-
-      <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>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <Template src="skin:button_xfader_deck.xml"/>
-        </Children>
-      </WidgetGroup>
-
-      <!-- Spacer when there's no 4th EQ AND no QuickEffect loaded -->
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <Size>0min,4f</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>
-          <Transform><Not/></Transform>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup>
-
-      <WidgetGroup>
-        <ObjectName>VuAndSlider4decks</ObjectName>
-        <Layout>horizontal</Layout>
-        <Children>
-
-          <WidgetGroup>
-            <ObjectName>VuMeterChannel4Decks</ObjectName>
-            <Size>22f,0min</Size>
-            <Layout>horizontal</Layout>
-            <Children>
-              <SingletonContainer>
-                <ObjectName>VuMeterChannel<Variable name="channum"/></ObjectName>
-              </SingletonContainer>
-            </Children>
-          </WidgetGroup>
-
-          <SliderComposed>
-            <TooltipId>channel_volume</TooltipId>
-            <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>
-        </Children>
-      </WidgetGroup>
-
-      <WidgetGroup><Size>0min,0me</Size></WidgetGroup>
-
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/mixer_channel_left.xml b/res/skins/LateNight/mixer_channel_left.xml
deleted file mode 100644
index c5e5f2cdd3b8..000000000000
--- a/res/skins/LateNight/mixer_channel_left.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<!--  This layout is only used for channel 1.  It can switch between a standard
-vertical layout and a side-by-side layout for two-deck mode -->
-
-<Template>
-  <SetVariable name="group">[Channel<Variable name="channum"/>]</SetVariable>
-  <WidgetGroup>
-    <SizePolicy>min,min</SizePolicy>
-    <Layout>horizontal</Layout>
-    <Children>
-
-      <WidgetGroup><!--  Channel1 controls side-by-side-->
-        <ObjectName>MixerChannel_2Decks</ObjectName>
-        <Layout>horizontal</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-
-          <WidgetGroup><!-- EQs -->
-            <Layout>vertical</Layout>
-            <ObjectName>MixerChannel_2Decks_Left</ObjectName>
-            <SizePolicy>min,min</SizePolicy>
-            <Children>
-
-              <!-- Spacer when there's no QuickEffect loaded -->
-              <WidgetGroup>
-                <Layout>horizontal</Layout>
-                <Size>0min,34f</Size>
-                <Children>
-                </Children>
-                <Connection>
-                  <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">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>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>
-
-              <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
-
-              <SliderComposed><!-- Volume -->
-                <TooltipId>channel_volume</TooltipId>
-                <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 -->
-
-          <WidgetGroup><!-- Pfl button + VU Meter -->
-            <ObjectName>PFLVUMeterBox</ObjectName>
-            <Layout>vertical</Layout>
-            <SizePolicy>min,me</SizePolicy>
-            <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>1min,14f</Size></WidgetGroup>
-
-              <WidgetGroup>
-                <ObjectName>VuMeterChannel2Decks</ObjectName>
-                <Layout>horizontal</Layout>
-                <Children>
-                  <SingletonContainer>
-                    <ObjectName>VuMeterChannel<Variable name="channum"/></ObjectName>
-                  </SingletonContainer>
-                </Children>
-              </WidgetGroup>
-
-              <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
-
-            </Children>
-          </WidgetGroup><!-- /Pfl button + VU Meter -->
-        </Children>
-        <Connection>
-          <ConfigKey>[Skin],show_4decks</ConfigKey>
-          <BindProperty>visible</BindProperty>
-          <Transform><Not/></Transform>
-        </Connection>
-      </WidgetGroup><!-- /Channel1 mixer side-by-side -->
-
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <Template src="skin:mixer_channel_4decks.xml"/>
-        </Children>
-        <Connection>
-          <ConfigKey>[Skin],show_4decks</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup>
-
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/mixer_channel_right.xml b/res/skins/LateNight/mixer_channel_right.xml
deleted file mode 100644
index bf7d47c52305..000000000000
--- a/res/skins/LateNight/mixer_channel_right.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-<!--  This layout is only used for channel 2.  It can switch between a standard
-vertical layout and a reversed side-by-side layout for two-deck mode -->
-
-<Template>
-  <SetVariable name="group">[Channel<Variable name="channum"/>]</SetVariable>
-  <WidgetGroup>
-    <SizePolicy>min,min</SizePolicy>
-    <Layout>horizontal</Layout>
-    <Children>
-
-      <WidgetGroup><!--  Channel2 controls side-by-side-->
-        <ObjectName>MixerChannel_2Decks</ObjectName>
-        <Layout>horizontal</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-
-          <WidgetGroup><!-- Pfl button + VU Meter -->
-            <ObjectName>PFLVUMeterBox</ObjectName>
-            <Layout>vertical</Layout>
-            <SizePolicy>min,me</SizePolicy>
-            <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>1min,14f</Size></WidgetGroup>
-
-              <WidgetGroup>
-                <ObjectName>VuMeterChannel2Decks</ObjectName>
-                <Layout>horizontal</Layout>
-                <Children>
-                  <SingletonContainer>
-                    <ObjectName>VuMeterChannel<Variable name="channum"/></ObjectName>
-                  </SingletonContainer>
-                </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>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>
-
-              <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
-
-              <SliderComposed><!-- Volume -->
-                <TooltipId>channel_volume</TooltipId>
-                <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 -->
-
-          <WidgetGroup><!-- EQs -->
-            <Layout>vertical</Layout>
-            <ObjectName>MixerChannel_2Decks_Right</ObjectName>
-            <SizePolicy>min,min</SizePolicy>
-            <Children>
-
-              <!-- Spacer when there's no QuickEffect loaded -->
-              <WidgetGroup>
-                <Layout>horizontal</Layout>
-                <Size>0min,34f</Size>
-                <Children>
-                </Children>
-                <Connection>
-                  <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">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>
-                <Layout>horizontal</Layout>
-                <SizePolicy>min,me</SizePolicy>
-                <Children/>
-              </WidgetGroup>
-            </Children>
-            <Connection>
-              <ConfigKey>[Skin],show_eq_knobs</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup><!-- /EQs -->
-
-        </Children>
-        <Connection>
-          <ConfigKey>[Skin],show_4decks</ConfigKey>
-          <BindProperty>visible</BindProperty>
-          <Transform><Not/></Transform>
-        </Connection>
-      </WidgetGroup><!-- /Channel2 mixer side-by-side -->
-
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <Template src="skin:mixer_channel_4decks.xml"/>
-        </Children>
-        <Connection>
-          <ConfigKey>[Skin],show_4decks</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup>
-
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/mixer_master_headphone.xml b/res/skins/LateNight/mixer_master_headphone.xml
deleted file mode 100644
index 621a97656a8b..000000000000
--- a/res/skins/LateNight/mixer_master_headphone.xml
+++ /dev/null
@@ -1,439 +0,0 @@
-<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>
-    <SizePolicy>max,min</SizePolicy>
-    <Layout>vertical</Layout>
-    <Children>
-
-      <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><Variable name="BgTile"/></BackPath>
-            <SizePolicy>min,min</SizePolicy>
-            <Layout>vertical</Layout>
-            <Children>
-
-              <WidgetGroup>
-                <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>min,min</SizePolicy>
-                    <Children>
-                      <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>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">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>
-
-                  <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>
-
-                      <!-- 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 -->
-
-                  <!-- 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>
-                    <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 -->
-
-                </Children>
-              </WidgetGroup><!-- MasterControls -->
-
-              <WidgetGroup>
-                <ObjectName>MasterHeadphoneSeparator</ObjectName>
-                <Size>0me,0min</Size>
-                <!-- Layout + Children let's us apply qss padding -->
-                <Layout>horizontal</Layout>
-                <Children/>
-              </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>
-                        <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>
-
-                  <WidgetGroup><Size>0min,1f</Size></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>
-                        <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>
-
-                  <WidgetGroup><!-- HeadSplit button -->
-                    <Layout>horizontal</Layout>
-                    <SizePolicy>me,min</SizePolicy>
-                    <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 -->
-
-                </Children>
-              </WidgetGroup><!-- /HeadphoneControls -->
-
-            </Children>
-          </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/palemoon/buttons/btn_.svg b/res/skins/LateNight/palemoon/buttons/btn_.svg
new file mode 100644
index 000000000000..fb66ea1ba227
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_.svg
@@ -0,0 +1 @@
+<svg width="1" height="1" version="1.1" xmlns="http://www.w3.org/2000/svg"></svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__.svg b/res/skins/LateNight/palemoon/buttons/btn__.svg
new file mode 100644
index 000000000000..fb66ea1ba227
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__.svg
@@ -0,0 +1 @@
+<svg width="1" height="1" version="1.1" xmlns="http://www.w3.org/2000/svg"></svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__1.svg b/res/skins/LateNight/palemoon/buttons/btn__1.svg
new file mode 100644
index 000000000000..94cb732d5132
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__1.svg
@@ -0,0 +1,46 @@
+<?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="24"
+   version="1.1"
+   id="svg6">
+  <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" />
+  <text
+     id="text836"
+     y="17.235025"
+     x="5.8255696"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#918273;fill-opacity:1;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#918273;fill-opacity:1;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       y="17.235025"
+       x="5.8255696"
+       id="tspan834">1</tspan></text>
+  <text
+     id="text836-5"
+     y="17.235025"
+     x="5.8255696"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#918273;fill-opacity:1;stroke:none"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#918273;fill-opacity:1"
+       y="17.235025"
+       x="5.8255696"
+       id="tspan834-8">1</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__1_active.svg b/res/skins/LateNight/palemoon/buttons/btn__1_active.svg
new file mode 100644
index 000000000000..a27ee393bb4f
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__1_active.svg
@@ -0,0 +1,36 @@
+<?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="svg6"
+   version="1.1"
+   height="24"
+   width="20">
+  <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" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;"
+     x="5.8255696"
+     y="17.235025"
+     id="text836-5"><tspan
+       id="tspan834-8"
+       x="5.8255696"
+       y="17.235025"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#000000;fill-opacity:1;">1</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__1_active_dark.svg b/res/skins/LateNight/palemoon/buttons/btn__1_active_dark.svg
new file mode 100644
index 000000000000..b10dea4900b4
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__1_active_dark.svg
@@ -0,0 +1,58 @@
+<?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="svg6"
+   version="1.1"
+   height="24"
+   width="20">
+  <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">
+    <filter
+       height="1.8975376"
+       y="-0.44876881"
+       width="2.809931"
+       x="-0.90496552"
+       id="filter827"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur829"
+         stdDeviation="1.9577637" />
+    </filter>
+  </defs>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#818181;fill-opacity:1;stroke:#818181;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter827)"
+     x="5.8255696"
+     y="17.235025"
+     id="text836"><tspan
+       id="tspan834"
+       x="5.8255696"
+       y="17.235025"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#818181;fill-opacity:1;stroke:#818181;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">1</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;"
+     x="5.8255696"
+     y="17.235025"
+     id="text836-5"><tspan
+       id="tspan834-8"
+       x="5.8255696"
+       y="17.235025"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#000000;fill-opacity:1;">1</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__2.svg b/res/skins/LateNight/palemoon/buttons/btn__2.svg
new file mode 100644
index 000000000000..801512cc0083
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__2.svg
@@ -0,0 +1,46 @@
+<?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="24"
+   version="1.1"
+   id="svg6">
+  <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" />
+  <text
+     id="text836"
+     y="17.235025"
+     x="5.8255696"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#918273;fill-opacity:1;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#918273;fill-opacity:1;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       y="17.235025"
+       x="5.8255696"
+       id="tspan834">2</tspan></text>
+  <text
+     id="text836-5"
+     y="17.235025"
+     x="5.8255696"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#918273;fill-opacity:1;stroke:none"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#918273;fill-opacity:1"
+       y="17.235025"
+       x="5.8255696"
+       id="tspan834-8">2</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__2_active.svg b/res/skins/LateNight/palemoon/buttons/btn__2_active.svg
new file mode 100644
index 000000000000..df8e3441901b
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__2_active.svg
@@ -0,0 +1,36 @@
+<?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="svg6"
+   version="1.1"
+   height="24"
+   width="20">
+  <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" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;"
+     x="5.8255696"
+     y="17.235025"
+     id="text836-5"><tspan
+       id="tspan834-8"
+       x="5.8255696"
+       y="17.235025"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#000000;fill-opacity:1;">2</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__2_active_dark.svg b/res/skins/LateNight/palemoon/buttons/btn__2_active_dark.svg
new file mode 100644
index 000000000000..2b3b52476774
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__2_active_dark.svg
@@ -0,0 +1,58 @@
+<?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="svg6"
+   version="1.1"
+   height="24"
+   width="20">
+  <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">
+    <filter
+       height="2.0151045"
+       y="-0.50755226"
+       width="2.4672515"
+       x="-0.73362573"
+       id="filter819"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur821"
+         stdDeviation="2.2460124" />
+    </filter>
+  </defs>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#818181;fill-opacity:1;stroke:#818181;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter819)"
+     x="5.8255696"
+     y="17.235025"
+     id="text836"><tspan
+       id="tspan834"
+       x="5.8255696"
+       y="17.235025"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#818181;fill-opacity:1;stroke:#818181;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">2</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;"
+     x="5.8255696"
+     y="17.235025"
+     id="text836-5"><tspan
+       id="tspan834-8"
+       x="5.8255696"
+       y="17.235025"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#000000;fill-opacity:1;">2</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__3.svg b/res/skins/LateNight/palemoon/buttons/btn__3.svg
new file mode 100644
index 000000000000..68a9ac61daa1
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__3.svg
@@ -0,0 +1,46 @@
+<?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="24"
+   version="1.1"
+   id="svg6">
+  <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" />
+  <text
+     id="text836"
+     y="17.235025"
+     x="5.8255696"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#918273;fill-opacity:1;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#918273;fill-opacity:1;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       y="17.235025"
+       x="5.8255696"
+       id="tspan834">3</tspan></text>
+  <text
+     id="text836-5"
+     y="17.235025"
+     x="5.8255696"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#918273;fill-opacity:1;stroke:none"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#918273;fill-opacity:1"
+       y="17.235025"
+       x="5.8255696"
+       id="tspan834-8">3</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__3_active.svg b/res/skins/LateNight/palemoon/buttons/btn__3_active.svg
new file mode 100644
index 000000000000..df5be14c27cc
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__3_active.svg
@@ -0,0 +1,36 @@
+<?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="svg6"
+   version="1.1"
+   height="24"
+   width="20">
+  <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" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;"
+     x="5.8255696"
+     y="17.235025"
+     id="text836-5"><tspan
+       id="tspan834-8"
+       x="5.8255696"
+       y="17.235025"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#000000;fill-opacity:1;">3</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__3_active_dark.svg b/res/skins/LateNight/palemoon/buttons/btn__3_active_dark.svg
new file mode 100644
index 000000000000..507cef7533af
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__3_active_dark.svg
@@ -0,0 +1,58 @@
+<?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="svg6"
+   version="1.1"
+   height="24"
+   width="20">
+  <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">
+    <filter
+       height="2.003992"
+       y="-0.50199601"
+       width="2.4911067"
+       x="-0.74555336"
+       id="filter819"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur821"
+         stdDeviation="2.2513835" />
+    </filter>
+  </defs>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#818181;fill-opacity:1;stroke:#818181;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter819)"
+     x="5.8255696"
+     y="17.235025"
+     id="text836"><tspan
+       id="tspan834"
+       x="5.8255696"
+       y="17.235025"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#818181;fill-opacity:1;stroke:#818181;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">3</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;"
+     x="5.8255696"
+     y="17.235025"
+     id="text836-5"><tspan
+       id="tspan834-8"
+       x="5.8255696"
+       y="17.235025"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#000000;fill-opacity:1;">3</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__4.svg b/res/skins/LateNight/palemoon/buttons/btn__4.svg
new file mode 100644
index 000000000000..7c049618be2e
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__4.svg
@@ -0,0 +1,46 @@
+<?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="24"
+   version="1.1"
+   id="svg6">
+  <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" />
+  <text
+     id="text836"
+     y="17.235025"
+     x="5.8255696"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#918273;fill-opacity:1;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#918273;fill-opacity:1;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       y="17.235025"
+       x="5.8255696"
+       id="tspan834">4</tspan></text>
+  <text
+     id="text836-5"
+     y="17.235025"
+     x="5.8255696"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#918273;fill-opacity:1;stroke:none"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#918273;fill-opacity:1"
+       y="17.235025"
+       x="5.8255696"
+       id="tspan834-8">4</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__4_active.svg b/res/skins/LateNight/palemoon/buttons/btn__4_active.svg
new file mode 100644
index 000000000000..dd3f5842866d
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__4_active.svg
@@ -0,0 +1,36 @@
+<?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="svg6"
+   version="1.1"
+   height="24"
+   width="20">
+  <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" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;"
+     x="5.8255696"
+     y="17.235025"
+     id="text836-5"><tspan
+       id="tspan834-8"
+       x="5.8255696"
+       y="17.235025"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#000000;fill-opacity:1;">4</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__4_active_dark.svg b/res/skins/LateNight/palemoon/buttons/btn__4_active_dark.svg
new file mode 100644
index 000000000000..3aadb8dd1569
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__4_active_dark.svg
@@ -0,0 +1,58 @@
+<?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="svg6"
+   version="1.1"
+   height="24"
+   width="20">
+  <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">
+    <filter
+       height="2.0522572"
+       y="-0.52612859"
+       width="2.3960073"
+       x="-0.69800363"
+       id="filter823"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur825"
+         stdDeviation="2.2952474" />
+    </filter>
+  </defs>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#818181;fill-opacity:1;stroke:#818181;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter823)"
+     x="5.8255696"
+     y="17.235025"
+     id="text836"><tspan
+       id="tspan834"
+       x="5.8255696"
+       y="17.235025"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#818181;fill-opacity:1;stroke:#818181;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">4</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;"
+     x="5.8255696"
+     y="17.235025"
+     id="text836-5"><tspan
+       id="tspan834-8"
+       x="5.8255696"
+       y="17.235025"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#000000;fill-opacity:1;">4</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__5.svg b/res/skins/LateNight/palemoon/buttons/btn__5.svg
new file mode 100644
index 000000000000..04bf56d14a38
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__5.svg
@@ -0,0 +1,46 @@
+<?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="24"
+   version="1.1"
+   id="svg6">
+  <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" />
+  <text
+     id="text836"
+     y="17.235025"
+     x="5.8255696"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#918273;fill-opacity:1;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#918273;fill-opacity:1;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       y="17.235025"
+       x="5.8255696"
+       id="tspan834">5</tspan></text>
+  <text
+     id="text836-5"
+     y="17.235025"
+     x="5.8255696"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#918273;fill-opacity:1;stroke:none"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#918273;fill-opacity:1"
+       y="17.235025"
+       x="5.8255696"
+       id="tspan834-8">5</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__5_active.svg b/res/skins/LateNight/palemoon/buttons/btn__5_active.svg
new file mode 100644
index 000000000000..0333ef8e2e16
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__5_active.svg
@@ -0,0 +1,36 @@
+<?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="svg6"
+   version="1.1"
+   height="24"
+   width="20">
+  <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" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;"
+     x="5.8255696"
+     y="17.235025"
+     id="text836-5"><tspan
+       id="tspan834-8"
+       x="5.8255696"
+       y="17.235025"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#000000;fill-opacity:1;">5</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__5_active_dark.svg b/res/skins/LateNight/palemoon/buttons/btn__5_active_dark.svg
new file mode 100644
index 000000000000..2e3f47187a84
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__5_active_dark.svg
@@ -0,0 +1,58 @@
+<?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="svg6"
+   version="1.1"
+   height="24"
+   width="20">
+  <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">
+    <filter
+       height="1.9955466"
+       y="-0.49777328"
+       width="2.5101331"
+       x="-0.75506653"
+       id="filter819"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur821"
+         stdDeviation="2.2012533" />
+    </filter>
+  </defs>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#818181;fill-opacity:1;stroke:#818181;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter819)"
+     x="5.8255696"
+     y="17.235025"
+     id="text836"><tspan
+       id="tspan834"
+       x="5.8255696"
+       y="17.235025"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#818181;fill-opacity:1;stroke:#818181;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">5</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;"
+     x="5.8255696"
+     y="17.235025"
+     id="text836-5"><tspan
+       id="tspan834-8"
+       x="5.8255696"
+       y="17.235025"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#000000;fill-opacity:1;">5</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__6.svg b/res/skins/LateNight/palemoon/buttons/btn__6.svg
new file mode 100644
index 000000000000..909d2277280d
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__6.svg
@@ -0,0 +1,46 @@
+<?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="24"
+   version="1.1"
+   id="svg6">
+  <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" />
+  <text
+     id="text836"
+     y="17.235025"
+     x="5.8255696"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#918273;fill-opacity:1;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#918273;fill-opacity:1;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       y="17.235025"
+       x="5.8255696"
+       id="tspan834">6</tspan></text>
+  <text
+     id="text836-5"
+     y="17.235025"
+     x="5.8255696"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#918273;fill-opacity:1;stroke:none"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#918273;fill-opacity:1"
+       y="17.235025"
+       x="5.8255696"
+       id="tspan834-8">6</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__6_active.svg b/res/skins/LateNight/palemoon/buttons/btn__6_active.svg
new file mode 100644
index 000000000000..d77e7886598e
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__6_active.svg
@@ -0,0 +1,36 @@
+<?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="svg6"
+   version="1.1"
+   height="24"
+   width="20">
+  <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" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;"
+     x="5.8255696"
+     y="17.235025"
+     id="text836-5"><tspan
+       id="tspan834-8"
+       x="5.8255696"
+       y="17.235025"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#000000;fill-opacity:1;">6</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__6_active_dark.svg b/res/skins/LateNight/palemoon/buttons/btn__6_active_dark.svg
new file mode 100644
index 000000000000..3e7d0a0ee08d
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__6_active_dark.svg
@@ -0,0 +1,58 @@
+<?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="svg6"
+   version="1.1"
+   height="24"
+   width="20">
+  <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">
+    <filter
+       height="2.0130754"
+       y="-0.50653769"
+       width="2.4715116"
+       x="-0.73575581"
+       id="filter823"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur825"
+         stdDeviation="2.2657064" />
+    </filter>
+  </defs>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#818181;fill-opacity:1;stroke:#818181;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter823)"
+     x="5.8255696"
+     y="17.235025"
+     id="text836"><tspan
+       id="tspan834"
+       x="5.8255696"
+       y="17.235025"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#818181;fill-opacity:1;stroke:#818181;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">6</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;"
+     x="5.8255696"
+     y="17.235025"
+     id="text836-5"><tspan
+       id="tspan834-8"
+       x="5.8255696"
+       y="17.235025"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#000000;fill-opacity:1;">6</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__7.svg b/res/skins/LateNight/palemoon/buttons/btn__7.svg
new file mode 100644
index 000000000000..10610085db2a
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__7.svg
@@ -0,0 +1,46 @@
+<?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="24"
+   version="1.1"
+   id="svg6">
+  <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" />
+  <text
+     id="text836"
+     y="17.235025"
+     x="5.8255696"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#918273;fill-opacity:1;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#918273;fill-opacity:1;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       y="17.235025"
+       x="5.8255696"
+       id="tspan834">7</tspan></text>
+  <text
+     id="text836-5"
+     y="17.235025"
+     x="5.8255696"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#918273;fill-opacity:1;stroke:none"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#918273;fill-opacity:1"
+       y="17.235025"
+       x="5.8255696"
+       id="tspan834-8">7</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__7_active.svg b/res/skins/LateNight/palemoon/buttons/btn__7_active.svg
new file mode 100644
index 000000000000..5406e077437a
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__7_active.svg
@@ -0,0 +1,36 @@
+<?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="svg6"
+   version="1.1"
+   height="24"
+   width="20">
+  <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" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;"
+     x="5.8255696"
+     y="17.235025"
+     id="text836-5"><tspan
+       id="tspan834-8"
+       x="5.8255696"
+       y="17.235025"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#000000;fill-opacity:1;">7</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__7_active_dark.svg b/res/skins/LateNight/palemoon/buttons/btn__7_active_dark.svg
new file mode 100644
index 000000000000..dda63a34434a
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__7_active_dark.svg
@@ -0,0 +1,58 @@
+<?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="svg6"
+   version="1.1"
+   height="24"
+   width="20">
+  <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">
+    <filter
+       height="2.0310959"
+       y="-0.51554795"
+       width="2.435081"
+       x="-0.71754051"
+       id="filter855"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur857"
+         stdDeviation="2.2460124" />
+    </filter>
+  </defs>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#818181;fill-opacity:1;stroke:#818181;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter855)"
+     x="5.8255696"
+     y="17.235025"
+     id="text836"><tspan
+       id="tspan834"
+       x="5.8255696"
+       y="17.235025"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#818181;fill-opacity:1;stroke:#818181;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">7</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;"
+     x="5.8255696"
+     y="17.235025"
+     id="text836-5"><tspan
+       id="tspan834-8"
+       x="5.8255696"
+       y="17.235025"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#000000;fill-opacity:1;">7</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__8.svg b/res/skins/LateNight/palemoon/buttons/btn__8.svg
new file mode 100644
index 000000000000..471125e7e13b
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__8.svg
@@ -0,0 +1,46 @@
+<?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="24"
+   version="1.1"
+   id="svg6">
+  <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" />
+  <text
+     id="text836"
+     y="17.235025"
+     x="5.8255696"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#918273;fill-opacity:1;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#918273;fill-opacity:1;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       y="17.235025"
+       x="5.8255696"
+       id="tspan834">8</tspan></text>
+  <text
+     id="text836-5"
+     y="17.235025"
+     x="5.8255696"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#918273;fill-opacity:1;stroke:none"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#918273;fill-opacity:1"
+       y="17.235025"
+       x="5.8255696"
+       id="tspan834-8">8</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__8_active.svg b/res/skins/LateNight/palemoon/buttons/btn__8_active.svg
new file mode 100644
index 000000000000..b2fc2e05d88b
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__8_active.svg
@@ -0,0 +1,36 @@
+<?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="24"
+   version="1.1"
+   id="svg6">
+  <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" />
+  <text
+     id="text836-5"
+     y="17.235025"
+     x="5.8255696"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#000000;fill-opacity:1;"
+       y="17.235025"
+       x="5.8255696"
+       id="tspan834-8">8</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__8_active_dark.svg b/res/skins/LateNight/palemoon/buttons/btn__8_active_dark.svg
new file mode 100644
index 000000000000..8b8872a710cc
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__8_active_dark.svg
@@ -0,0 +1,58 @@
+<?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="24"
+   version="1.1"
+   id="svg6">
+  <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">
+    <filter
+       height="2.0101266"
+       y="-0.50506329"
+       width="2.4777778"
+       x="-0.73888889"
+       id="filter1125"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur1127"
+         stdDeviation="2.2621257" />
+    </filter>
+  </defs>
+  <text
+     id="text836"
+     y="17.235025"
+     x="5.8255696"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#c2b5a8;fill-opacity:1;stroke:#c2b5a8;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter1125);"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#c2b5a8;fill-opacity:1;stroke:#c2b5a8;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;"
+       y="17.235025"
+       x="5.8255696"
+       id="tspan834">8</tspan></text>
+  <text
+     id="text836-5"
+     y="17.235025"
+     x="5.8255696"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#000000;fill-opacity:1;"
+       y="17.235025"
+       x="5.8255696"
+       id="tspan834-8">8</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn___pressed.svg b/res/skins/LateNight/palemoon/buttons/btn___pressed.svg
new file mode 100644
index 000000000000..fb66ea1ba227
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn___pressed.svg
@@ -0,0 +1 @@
+<svg width="1" height="1" version="1.1" xmlns="http://www.w3.org/2000/svg"></svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__active.svg b/res/skins/LateNight/palemoon/buttons/btn__active.svg
new file mode 100644
index 000000000000..fb66ea1ba227
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__active.svg
@@ -0,0 +1 @@
+<svg width="1" height="1" version="1.1" xmlns="http://www.w3.org/2000/svg"></svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__arrow_left_down.svg b/res/skins/LateNight/palemoon/buttons/btn__arrow_left_down.svg
new file mode 100644
index 000000000000..9582f0e51203
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__arrow_left_down.svg
@@ -0,0 +1,34 @@
+<?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="24"
+   height="24"
+   version="1.1"
+   id="svg6">
+  <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" />
+  <path
+     d="M 11.5,11.5 8,8 v 9 h 9 L 13.5,13.5 17,10 15,8 Z"
+     id="path2"
+     style="fill:none;stroke:#000001;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" />
+  <path
+     d="M 11.5,11.5 8,8 v 9 h 9 L 13.5,13.5 17,10 15,8 Z"
+     id="path4"
+     style="fill:#8e8276" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__arrow_left_down_active.svg b/res/skins/LateNight/palemoon/buttons/btn__arrow_left_down_active.svg
new file mode 100644
index 000000000000..f3cc4c3a9ec2
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__arrow_left_down_active.svg
@@ -0,0 +1,30 @@
+<?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="svg6"
+   version="1.1"
+   height="24"
+   width="24">
+  <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" />
+  <path
+     style="fill:#000001"
+     id="path4"
+     d="M 11.5,11.5 8,8 v 9 h 9 L 13.5,13.5 17,10 15,8 Z" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__arrow_left_up.svg b/res/skins/LateNight/palemoon/buttons/btn__arrow_left_up.svg
new file mode 100644
index 000000000000..1ad1f4f8e25d
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__arrow_left_up.svg
@@ -0,0 +1,34 @@
+<?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="24"
+   height="24"
+   version="1.1"
+   id="svg6">
+  <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" />
+  <path
+     d="M 11.5,12.5 8,16 V 7 h 9 l -3.5,3.5 3.5,3.5 -2,2 z"
+     id="path2"
+     style="fill:none;stroke:#000001;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" />
+  <path
+     d="M 11.5,12.5 8,16 V 7 h 9 l -3.5,3.5 3.5,3.5 -2,2 z"
+     id="path4"
+     style="fill:#8e8276" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__arrow_left_up_active.svg b/res/skins/LateNight/palemoon/buttons/btn__arrow_left_up_active.svg
new file mode 100644
index 000000000000..fb942ba99f7d
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__arrow_left_up_active.svg
@@ -0,0 +1,30 @@
+<?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="svg6"
+   version="1.1"
+   height="24"
+   width="24">
+  <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" />
+  <path
+     style="fill:#000001"
+     id="path4"
+     d="M 11.5,12.5 8,16 V 7 h 9 l -3.5,3.5 3.5,3.5 -2,2 z" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__arrow_right_down.svg b/res/skins/LateNight/palemoon/buttons/btn__arrow_right_down.svg
new file mode 100644
index 000000000000..f199b29798e8
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__arrow_right_down.svg
@@ -0,0 +1,34 @@
+<?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="24"
+   height="24"
+   version="1.1"
+   id="svg6">
+  <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" />
+  <path
+     d="M 12.5,11.5 16,7.9999999 V 17 H 6.9999999 L 10.5,13.5 6.9999999,10 9,7.9999999 Z"
+     id="path2"
+     style="fill:none;stroke:#000001;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" />
+  <path
+     d="M 12.5,11.5 16,7.9999999 V 17 H 6.9999999 L 10.5,13.5 6.9999999,10 9,7.9999999 Z"
+     id="path4"
+     style="fill:#8e8276" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__arrow_right_down_active.svg b/res/skins/LateNight/palemoon/buttons/btn__arrow_right_down_active.svg
new file mode 100644
index 000000000000..aa3fd04abfaa
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__arrow_right_down_active.svg
@@ -0,0 +1,30 @@
+<?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="svg6"
+   version="1.1"
+   height="24"
+   width="24">
+  <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" />
+  <path
+     style="fill:#000001"
+     id="path4"
+     d="M 12.5,11.5 16,7.9999999 V 17 H 6.9999999 L 10.5,13.5 6.9999999,10 9,7.9999999 Z" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__arrow_right_up.svg b/res/skins/LateNight/palemoon/buttons/btn__arrow_right_up.svg
new file mode 100644
index 000000000000..30b5deb07b8f
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__arrow_right_up.svg
@@ -0,0 +1,34 @@
+<?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="24"
+   height="24"
+   version="1.1"
+   id="svg6">
+  <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" />
+  <path
+     d="M 12.5,12.5 16,16 V 7 H 6.9999999 L 10.5,10.5 6.9999999,14 9,16 Z"
+     id="path2"
+     style="fill:none;stroke:#000001;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" />
+  <path
+     d="M 12.5,12.5 16,16 V 7 H 6.9999999 L 10.5,10.5 6.9999999,14 9,16 Z"
+     id="path4"
+     style="fill:#8e8276" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__arrow_right_up_active.svg b/res/skins/LateNight/palemoon/buttons/btn__arrow_right_up_active.svg
new file mode 100644
index 000000000000..497746ce25e3
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__arrow_right_up_active.svg
@@ -0,0 +1,30 @@
+<?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="svg6"
+   version="1.1"
+   height="24"
+   width="24">
+  <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" />
+  <path
+     style="fill:#000001"
+     id="path4"
+     d="M 12.5,12.5 16,16 V 7 H 6.9999999 L 10.5,10.5 6.9999999,14 9,16 Z" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__autodj_addrandom.svg b/res/skins/LateNight/palemoon/buttons/btn__autodj_addrandom.svg
new file mode 100644
index 000000000000..8c4fedf1a198
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__autodj_addrandom.svg
@@ -0,0 +1,241 @@
+<?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="svg1272"
+   version="1.1"
+   viewBox="0 0 8.4666656 5.2916665"
+   height="20"
+   width="32">
+  <defs
+     id="defs1266">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047621"
+       x2="9.3150187"
+       x1="9.3150187"
+       id="linearGradient1980"
+       spreadMethod="pad">
+      <stop
+         style="stop-color:#80766b;stop-opacity:1"
+         id="stop1976"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop1978"
+         offset="1"
+         stop-color="#bfbfbe"
+         style="stop-color:#a89a8c;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047621"
+       x2="9.3150187"
+       x1="9.3150187"
+       id="linearGradient1974"
+       spreadMethod="pad">
+      <stop
+         style="stop-color:#80766b;stop-opacity:1"
+         id="stop1970"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop1972"
+         offset="1"
+         stop-color="#bfbfbe"
+         style="stop-color:#a89a8c;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       spreadMethod="pad"
+       id="linearGradient841"
+       x1="9.3150187"
+       x2="9.3150187"
+       y1="19.047621"
+       y2="1.025641"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         style="stop-color:#80766b;stop-opacity:1"
+         stop-color="#888"
+         offset="0"
+         id="stop837" />
+      <stop
+         style="stop-color:#a89a8c;stop-opacity:1"
+         stop-color="#bfbfbe"
+         offset="1"
+         id="stop839" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047621"
+       x2="4.7667475"
+       x1="4.7667475"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop4"
+         offset="1"
+         stop-color="#bfbfbe" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047621"
+       x2="4.7117639"
+       x1="4.7117639"
+       id="a-9">
+      <stop
+         id="stop2-1"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop4-2"
+         offset="1"
+         stop-color="#bfbfbe" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient1980"
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047621"
+       x2="7.6989398"
+       x1="7.6989398"
+       id="c"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,1.3333333e-8,291.70833)" />
+    <linearGradient
+       id="a-0">
+      <stop
+         id="stop2-6"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop4-26"
+         offset="1"
+         stop-color="#bfbfbe" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient1980"
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047621"
+       x2="24.42697"
+       x1="24.42697"
+       id="b"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,1.3333333e-8,291.70833)" />
+    <linearGradient
+       xlink:href="#a-9"
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047619"
+       x2="-11.208792"
+       x1="-11.208792"
+       id="b-9"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-2.7083332e-8,291.70831)">
+      <stop
+         id="stop7"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop9"
+         offset="1"
+         stop-color="#bfbfbe" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047619"
+       x2="2.8712108"
+       x1="2.8712108"
+       id="c-2">
+      <stop
+         id="stop2-0"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop4-23"
+         offset="1"
+         stop-color="#bfbfbe" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#a-0"
+       gradientUnits="userSpaceOnUse"
+       y2="1"
+       y1="19"
+       x2="1.5855784"
+       x1="1.5855784"
+       id="e" />
+    <linearGradient
+       xlink:href="#a-0"
+       gradientUnits="userSpaceOnUse"
+       y2="5.2124801"
+       y1="24.412479"
+       x2="8.1985474"
+       x1="8.1985474"
+       id="f" />
+    <linearGradient
+       gradientTransform="matrix(0.18110994,0,0,0.18062575,3.2891087,291.69973)"
+       y2="1"
+       x2="1.5855784"
+       y1="19"
+       x1="1.5855784"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2510"
+       xlink:href="#linearGradient1980" />
+    <linearGradient
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,1.1958333e-8,291.70833)"
+       y2="1"
+       x2="1.5855784"
+       y1="19"
+       x1="1.5855784"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2514"
+       xlink:href="#linearGradient1980" />
+    <linearGradient
+       gradientTransform="rotate(-90,1.5875,294.35417)"
+       gradientUnits="userSpaceOnUse"
+       y2="294.35416"
+       x2="3.9687567"
+       y1="294.35416"
+       x1="-0.26457667"
+       id="linearGradient2541"
+       xlink:href="#linearGradient1980" />
+  </defs>
+  <metadata
+     id="metadata1269">
+    <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(0,-291.70833)"
+     id="layer1">
+    <path
+       id="path11"
+       d="m 6.3942386,293.93624 q 0,0.10701 -0.037968,0.1959 -0.036316,0.0889 -0.1072986,0.16793 -0.069331,0.0774 -0.3202385,0.25848 -0.2195415,0.15804 -0.2278001,0.33255 H 5.2601843 q 0.0099,-0.16958 0.097394,-0.30293 0.087489,-0.135 0.2476135,-0.24531 0.1865251,-0.12677 0.2542059,-0.20743 0.067681,-0.0823 0.067681,-0.17945 0,-0.12677 -0.1006953,-0.2025 -0.1006953,-0.0774 -0.2641126,-0.0774 -0.1667244,0 -0.2806299,0.0971 -0.1122501,0.0971 -0.1320599,0.25683 l -0.4704693,-0.0198 q 0.044569,-0.33421 0.2756674,-0.52024 0.2310963,-0.18602 0.6008685,-0.18602 0.3829751,0 0.6107751,0.17122 0.2278001,0.17122 0.2278001,0.46097 z m -1.147259,1.62328 v -0.4445 h 0.4770617 v 0.4445 z"
+       style="fill:url(#linearGradient2510);fill-opacity:1.0;stroke-width:0.26459134" />
+    <path
+       d="m 4.4307857,292.50208 c -0.00311,6e-5 -0.00621,2.3e-4 -0.0093,5.2e-4 -0.00138,1.5e-4 -0.00276,3.2e-4 -0.00414,5.1e-4 -0.00122,1.6e-4 -0.00241,3.3e-4 -0.00362,5.2e-4 -0.00172,3.1e-4 -0.00345,6.5e-4 -0.00517,0.001 -0.00138,3.3e-4 -0.00276,6.7e-4 -0.00414,10e-4 -0.00419,10e-4 -0.00833,0.002 -0.012401,0.004 -0.00368,10e-4 -0.0073,0.003 -0.010853,0.004 -0.0019,8.2e-4 -0.00381,0.002 -0.00568,0.003 -0.00193,9.9e-4 -0.00382,0.002 -0.00568,0.003 -6.879e-4,3.4e-4 -0.00138,6.9e-4 -0.00206,10e-4 -0.00265,0.002 -0.00523,0.003 -0.00775,0.005 -0.00159,0.001 -0.00313,0.002 -0.00465,0.004 -0.00302,0.002 -0.00595,0.004 -0.00878,0.007 -0.00177,0.002 -0.00349,0.003 -0.00517,0.005 l -1.1276012,1.12448 c -0.00309,0.003 -0.00602,0.006 -0.00878,0.01 -0.00553,0.007 -0.010374,0.014 -0.01447,0.0217 -0.00209,0.004 -0.00399,0.008 -0.00569,0.0119 -0.00159,0.004 -0.00298,0.009 -0.00414,0.0129 -0.00124,0.004 -0.00228,0.008 -0.0031,0.0124 v 5.1e-4 c -0.00161,0.008 -0.00249,0.0161 -0.00259,0.0243 -2.9e-6,5.2e-4 -2.9e-6,0.001 0,0.002 L 3.175,296.07395 c 7.4e-6,0.073 0.059232,0.13228 0.1322916,0.13229 h 4.4979166 c 0.073059,-10e-6 0.1322838,-0.0592 0.1322917,-0.13229 l -1.77e-5,-3.43959 c -7.4e-6,-0.0731 -0.059232,-0.13228 -0.1322917,-0.13229 H 4.4343989 c -0.00122,-2e-5 -0.00241,-2e-5 -0.00362,0 z m 0.1359086,0.26458 h 3.1062083 l 1.77e-5,3.175 H 3.439587 l 1.77e-5,-2.05052 h 0.9948069 c 0.073059,0 0.1322837,-0.0592 0.1322917,-0.13229 z m -0.2645834,0.18656 3.55e-5,0.67333 H 3.6272208 Z"
+       dominant-baseline="auto"
+       style="color:#000001;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:#000001;text-transform:none;text-orientation:mixed;dominant-baseline:auto;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000001;fill:url(#linearGradient2514);stroke-width:0.26458332;color-rendering:auto;image-rendering:auto;shape-rendering:auto;fill-opacity:1.0"
+       id="path15" />
+    <path
+       id="path2533"
+       d="m 0.52916498,294.61875 v -0.52917 H 1.322915 v -0.79375 h 0.52917 v 0.79375 h 0.79375 v 0.52917 h -0.79375 v 0.79375 h -0.52917 v -0.79375 z"
+       style="fill:url(#linearGradient2541);fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__autodj_addrandom_pressed.svg b/res/skins/LateNight/palemoon/buttons/btn__autodj_addrandom_pressed.svg
new file mode 100644
index 000000000000..dffb206bd822
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__autodj_addrandom_pressed.svg
@@ -0,0 +1,94 @@
+<?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="svg23"
+   version="1.1"
+   height="20"
+   width="32">
+  <metadata
+     id="metadata27">
+    <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
+       id="d">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop4"
+         offset="1"
+         stop-color="#bfbfbe" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#d"
+       gradientUnits="userSpaceOnUse"
+       y2="1"
+       y1="19"
+       x2="1.5855784"
+       x1="1.5855784"
+       id="e" />
+    <linearGradient
+       xlink:href="#d"
+       gradientUnits="userSpaceOnUse"
+       y2="5.2124801"
+       y1="24.412479"
+       x2="8.1985474"
+       x1="8.1985474"
+       id="f" />
+  </defs>
+  <g
+     style="fill:#000001;fill-opacity:1"
+     id="g21"
+     fill="url(#e)">
+    <g
+       style="fill:#000001;fill-opacity:1"
+       id="g13"
+       aria-label="?"
+       transform="matrix(.68451 0 0 .68268 12.431277 -.032504)">
+      <path
+         style="fill:#000001;fill-opacity:1"
+         id="path11"
+         stroke-width="1.46290004"
+         fill="url(#e)"
+         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" />
+    </g>
+    <path
+       id="path15"
+       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:#000001;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal;fill:#000001;fill-opacity:1"
+       solid-color="#000001"
+       shape-rendering="auto"
+       image-rendering="auto"
+       dominant-baseline="auto"
+       color-rendering="auto"
+       color="#000001"
+       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" />
+    <g
+       style="fill:#000001;fill-opacity:1"
+       id="g19"
+       aria-label="+"
+       transform="matrix(.94002 0 0 .9375 -5.8999281 -3.8867)">
+      <path
+         style="fill:#000001;fill-opacity:1"
+         id="path17"
+         stroke-width="1.06519997"
+         fill="url(#f)"
+         d="m13.723 15.879v3.2h-2.1276v-3.2h-3.1914v-2.1333h3.1914v-3.2h2.1276v3.2h3.1914v2.1333z" />
+    </g>
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__autodj_enable_off.svg b/res/skins/LateNight/palemoon/buttons/btn__autodj_enable_off.svg
new file mode 100644
index 000000000000..f7eb37fdc263
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__autodj_enable_off.svg
@@ -0,0 +1,319 @@
+<?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="svg1272"
+   version="1.1"
+   viewBox="0 0 10.583332 5.2916665"
+   height="20"
+   width="40">
+  <defs
+     id="defs1266">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047621"
+       x2="9.3150187"
+       x1="9.3150187"
+       id="linearGradient1980"
+       spreadMethod="pad">
+      <stop
+         style="stop-color:#80766b;stop-opacity:1"
+         id="stop1976"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop1978"
+         offset="1"
+         stop-color="#bfbfbe"
+         style="stop-color:#a89a8c;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047621"
+       x2="9.3150187"
+       x1="9.3150187"
+       id="linearGradient1974"
+       spreadMethod="pad">
+      <stop
+         style="stop-color:#80766b;stop-opacity:1"
+         id="stop1970"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop1972"
+         offset="1"
+         stop-color="#bfbfbe"
+         style="stop-color:#a89a8c;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       spreadMethod="pad"
+       id="linearGradient841"
+       x1="9.3150187"
+       x2="9.3150187"
+       y1="19.047621"
+       y2="1.025641"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         style="stop-color:#80766b;stop-opacity:1"
+         stop-color="#888"
+         offset="0"
+         id="stop837" />
+      <stop
+         style="stop-color:#a89a8c;stop-opacity:1"
+         stop-color="#bfbfbe"
+         offset="1"
+         id="stop839" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047621"
+       x2="4.7667475"
+       x1="4.7667475"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop4"
+         offset="1"
+         stop-color="#bfbfbe" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047621"
+       x2="4.7117639"
+       x1="4.7117639"
+       id="a-9">
+      <stop
+         id="stop2-1"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop4-2"
+         offset="1"
+         stop-color="#bfbfbe" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient1980"
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047621"
+       x2="7.6989398"
+       x1="7.6989398"
+       id="c"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,1.3333333e-8,291.70833)" />
+    <linearGradient
+       id="a-0">
+      <stop
+         id="stop2-6"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop4-26"
+         offset="1"
+         stop-color="#bfbfbe" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient1980"
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047621"
+       x2="24.42697"
+       x1="24.42697"
+       id="b"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,1.3333333e-8,291.70833)" />
+    <linearGradient
+       xlink:href="#a-9"
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047619"
+       x2="-11.208792"
+       x1="-11.208792"
+       id="b-9"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-2.7083332e-8,291.70831)">
+      <stop
+         id="stop7"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop9"
+         offset="1"
+         stop-color="#bfbfbe" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047619"
+       x2="2.8712108"
+       x1="2.8712108"
+       id="c-2">
+      <stop
+         id="stop2-0"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop4-23"
+         offset="1"
+         stop-color="#bfbfbe" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-2.7083332e-8,291.70831)"
+       y2="1.025641"
+       x2="2.8712108"
+       y1="19.047619"
+       x1="2.8712108"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2360"
+       xlink:href="#linearGradient1980" />
+    <linearGradient
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-2.7083332e-8,291.70831)"
+       y2="1.025641"
+       x2="2.8712108"
+       y1="19.047619"
+       x1="2.8712108"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2362"
+       xlink:href="#linearGradient1980" />
+    <linearGradient
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-2.7083332e-8,291.70831)"
+       y2="1.025641"
+       x2="2.8712108"
+       y1="19.047619"
+       x1="2.8712108"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2364"
+       xlink:href="#linearGradient1980" />
+    <linearGradient
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-2.7083332e-8,291.70831)"
+       y2="1.025641"
+       x2="2.8712108"
+       y1="19.047619"
+       x1="2.8712108"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2366"
+       xlink:href="#linearGradient1980" />
+    <linearGradient
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-2.7083332e-8,291.70831)"
+       y2="1.025641"
+       x2="2.8712108"
+       y1="19.047619"
+       x1="2.8712108"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2368"
+       xlink:href="#linearGradient1980" />
+    <linearGradient
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-2.7083332e-8,291.70831)"
+       y2="1.025641"
+       x2="2.8712108"
+       y1="19.047619"
+       x1="2.8712108"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2370"
+       xlink:href="#linearGradient1980" />
+    <linearGradient
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-2.7083332e-8,291.70831)"
+       y2="1.025641"
+       x2="2.8712108"
+       y1="19.047619"
+       x1="2.8712108"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2372"
+       xlink:href="#linearGradient1980" />
+    <linearGradient
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,-2.7083332e-8,291.70831)"
+       y2="1.025641"
+       x2="2.8712108"
+       y1="19.047619"
+       x1="2.8712108"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2374"
+       xlink:href="#linearGradient1980" />
+  </defs>
+  <metadata
+     id="metadata1269">
+    <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(0,-291.70833)"
+     id="layer1">
+    <path
+       style="color:#000001;fill:url(#linearGradient2360);stroke-width:0.26458332;fill-opacity:1.0"
+       d="m 6.8791666,292.50206 c -0.1465792,0 -0.2645834,0.118 -0.2645834,0.26458 v 0.79375 h 2.1166667 v -0.79375 c 0,-0.14658 -0.1180042,-0.26458 -0.2645834,-0.26458 z m 0.3307291,0.39687 c 0.1095931,0 0.1984375,0.0888 0.1984375,0.19844 0,0.1096 -0.088844,0.19844 -0.1984375,0.19844 -0.109593,0 -0.1984375,-0.0888 -0.1984375,-0.19844 0,-0.10959 0.088845,-0.19844 0.1984375,-0.19844 z m 0.9260417,0 c 0.109593,0 0.1984375,0.0888 0.1984375,0.19844 0,0.1096 -0.088845,0.19844 -0.1984375,0.19844 -0.1095931,0 -0.1984375,-0.0888 -0.1984375,-0.19844 0,-0.10959 0.088844,-0.19844 0.1984375,-0.19844 z"
+       id="path14" />
+    <rect
+       style="fill:url(#linearGradient2362);stroke-width:0.26458332;fill-opacity:1.0"
+       x="6.8791666"
+       y="295.41248"
+       width="0.52916664"
+       height="0.79374999"
+       rx="0.26458332"
+       ry="0.26458332"
+       id="rect16" />
+    <rect
+       style="fill:url(#linearGradient2364);stroke-width:0.26458332;fill-opacity:1.0"
+       x="7.9375"
+       y="295.41248"
+       width="0.52916664"
+       height="0.79374999"
+       rx="0.26458332"
+       ry="0.26458332"
+       id="rect18" />
+    <rect
+       style="color:#000001;fill:url(#linearGradient2366);stroke-width:0.26458332;fill-opacity:1.0"
+       x="5.8208332"
+       y="293.82498"
+       width="0.52916664"
+       height="1.3229166"
+       rx="0.26458332"
+       ry="0.26458332"
+       id="rect20" />
+    <path
+       style="color:#000001;fill:url(#linearGradient2368);stroke-width:0.26458332;fill-opacity:1.0"
+       d="m 6.6145832,293.82498 v 1.69912 c 0,0.0855 0.059002,0.15297 0.1322917,0.15297 h 1.8520833 c 0.07329,0 0.1322917,-0.0675 0.1322917,-0.15297 v -1.69912 h -1.984375 z"
+       id="path22" />
+    <rect
+       style="color:#000001;fill:url(#linearGradient2370);stroke-width:0.26458332;fill-opacity:1.0"
+       x="8.9958334"
+       y="293.82498"
+       width="0.52916664"
+       height="1.3229166"
+       rx="0.26458332"
+       ry="0.26458332"
+       id="rect24" />
+    <path
+       d="m 1.704287,293.17127 a 0.19845866,0.19845866 0 0 0 -0.1214384,0.0481 c -0.5320771,0.44646 -0.7284773,1.17978 -0.4909344,1.83245 0.2375614,0.65267 0.8593402,1.08831 1.5538979,1.08831 0.6945842,10e-6 1.316355,-0.43564 1.5538979,-1.08831 0.2375561,-0.65267 0.041153,-1.38599 -0.4909344,-1.83245 a 0.19845866,0.19845866 0 1 0 -0.2547646,0.30385 c 0.4053152,0.34009 0.5540639,0.89601 0.3731154,1.39319 -0.1809618,0.49718 -0.6522244,0.82682 -1.1813116,0.82682 -0.5290873,0 -0.999834,-0.32964 -1.180809,-0.82682 -0.1809565,-0.49718 -0.032208,-1.05312 0.3731154,-1.39319 a 0.19845866,0.19845866 0 0 0 -0.1338421,-0.35193 z"
+       dominant-baseline="auto"
+       style="color:#000001;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:#000001;text-transform:none;text-orientation:mixed;dominant-baseline:auto;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000001;fill:url(#linearGradient2372);stroke-width:0.26458332;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;fill-opacity:1.0"
+       id="path26" />
+    <path
+       d="m 2.6427376,292.43282 a 0.19845866,0.19845866 0 0 0 -0.1953365,0.20154 v 1.32291 a 0.19845866,0.19845866 0 1 0 0.396875,0 v -1.32291 a 0.19845866,0.19845866 0 0 0 -0.2015385,-0.20154 z"
+       dominant-baseline="auto"
+       style="color:#000001;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:#000001;text-transform:none;text-orientation:mixed;dominant-baseline:auto;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000001;fill:url(#linearGradient2374);stroke-width:0.26458332;color-rendering:auto;image-rendering:auto;shape-rendering:auto;fill-opacity:1.0"
+       id="path28" />
+    <rect
+       rx="0.5"
+       y="291.9729"
+       x="-4.4979167"
+       height="4.7624998"
+       width="3.7041667"
+       id="rect2386"
+       style="opacity:1;fill:#80766b;fill-opacity:1;stroke:none;stroke-width:0.42333335;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__autodj_enable_on.svg b/res/skins/LateNight/palemoon/buttons/btn__autodj_enable_on.svg
new file mode 100644
index 000000000000..d5ad1aa5988b
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/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="#000001"/>
+	<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="#000001"/>
+	<path d="m25 8v6.4219c0 .32317.223.57812.5.57812h7c.277 0 .5-.25496.5-.57812v-6.4219h-7.5z" color="#000001"/>
+	<rect x="34" y="8" width="2" height="5" rx="1" ry="1" color="#000001"/>
+	<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="#000001" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000001" 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:#000001;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="#000001" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000001" 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:#000001;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/palemoon/buttons/btn__autodj_fade.svg b/res/skins/LateNight/palemoon/buttons/btn__autodj_fade.svg
new file mode 100644
index 000000000000..e88d45dc8420
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__autodj_fade.svg
@@ -0,0 +1,161 @@
+<?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="svg1272"
+   version="1.1"
+   viewBox="0 0 8.4666659 5.2916665"
+   height="20"
+   width="32">
+  <defs
+     id="defs1266">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047621"
+       x2="9.3150187"
+       x1="9.3150187"
+       id="linearGradient1980"
+       spreadMethod="pad">
+      <stop
+         style="stop-color:#80766b;stop-opacity:1"
+         id="stop1976"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop1978"
+         offset="1"
+         stop-color="#bfbfbe"
+         style="stop-color:#a89a8c;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047621"
+       x2="9.3150187"
+       x1="9.3150187"
+       id="linearGradient1974"
+       spreadMethod="pad">
+      <stop
+         style="stop-color:#80766b;stop-opacity:1"
+         id="stop1970"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop1972"
+         offset="1"
+         stop-color="#bfbfbe"
+         style="stop-color:#a89a8c;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       spreadMethod="pad"
+       id="linearGradient841"
+       x1="9.3150187"
+       x2="9.3150187"
+       y1="19.047621"
+       y2="1.025641"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         style="stop-color:#80766b;stop-opacity:1"
+         stop-color="#888"
+         offset="0"
+         id="stop837" />
+      <stop
+         style="stop-color:#a89a8c;stop-opacity:1"
+         stop-color="#bfbfbe"
+         offset="1"
+         id="stop839" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047621"
+       x2="4.7667475"
+       x1="4.7667475"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop4"
+         offset="1"
+         stop-color="#bfbfbe" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047621"
+       x2="4.7117639"
+       x1="4.7117639"
+       id="a-9">
+      <stop
+         id="stop2-1"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop4-2"
+         offset="1"
+         stop-color="#bfbfbe" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient1980"
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047621"
+       x2="7.6989398"
+       x1="7.6989398"
+       id="c"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,1.3333333e-8,291.70833)" />
+    <linearGradient
+       id="a-0">
+      <stop
+         id="stop2-6"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop4-26"
+         offset="1"
+         stop-color="#bfbfbe" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient1980"
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047621"
+       x2="24.42697"
+       x1="24.42697"
+       id="b"
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,1.3333333e-8,291.70833)" />
+  </defs>
+  <metadata
+     id="metadata1269">
+    <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(0,-291.70833)"
+     id="layer1">
+    <path
+       id="path11-8"
+       style="color:#000001;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:#000001;text-transform:none;text-orientation:mixed;dominant-baseline:auto;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000001;fill:url(#c);stroke-width:0.26458332;color-rendering:auto;image-rendering:auto;shape-rendering:auto;fill-opacity:1.0"
+       dominant-baseline="auto"
+       d="m 5.91185,293.30668 c -2.2704954,0.32673 -3.6546896,1.15488 -4.99718542,2.56727 l 0.28731102,0.27337 c 1.303364,-1.37125 2.5648709,-2.13114 4.7662042,-2.44792 z m -0.1525984,-0.80439 0.256667,1.90243 1.7740841,-1.20787 z" />
+    <path
+       id="path13-7"
+       style="color:#000001;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:#000001;text-transform:none;text-orientation:mixed;dominant-baseline:auto;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000001;fill:url(#b);stroke-width:0.26458332;color-rendering:auto;image-rendering:auto;shape-rendering:auto;fill-opacity:1.0"
+       dominant-baseline="auto"
+       d="m 0.99993979,292.98576 -0.0573617,0.39275 c 0.83835881,0.12216 1.44428111,0.26583 2.08242961,0.51268 0.1572631,-0.0788 0.3050911,-0.16655 0.471805,-0.23564 -0.7548562,-0.33443 -1.4847887,-0.52231 -2.49687291,-0.66979 z m 3.67188751,1.28559 c -0.1692487,0.0508 -0.3287712,0.10309 -0.4857485,0.16278 0.799121,0.44672 1.3762037,0.96623 2.0744656,1.7101 l 0.2894012,-0.2718 c -0.631137,-0.67233 -1.1601979,-1.15747 -1.8780918,-1.60105 z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__autodj_fade_disabled.svg b/res/skins/LateNight/palemoon/buttons/btn__autodj_fade_disabled.svg
new file mode 100644
index 000000000000..fece3fc9492a
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__autodj_fade_disabled.svg
@@ -0,0 +1,48 @@
+<?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="svg6"
+   version="1.1"
+   height="20"
+   width="32">
+  <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" />
+  <path
+     id="path2"
+     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:#000001;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal;fill:#444443;fill-opacity:1"
+     solid-color="#000001"
+     shape-rendering="auto"
+     image-rendering="auto"
+     fill="#666"
+     dominant-baseline="auto"
+     color-rendering="auto"
+     color="#000001"
+     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" />
+  <path
+     id="path4"
+     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:#000001;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal;fill:#444443;fill-opacity:1"
+     solid-color="#000001"
+     shape-rendering="auto"
+     image-rendering="auto"
+     fill="#666"
+     dominant-baseline="auto"
+     color-rendering="auto"
+     color="#000001"
+     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" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__autodj_fade_pressed.svg b/res/skins/LateNight/palemoon/buttons/btn__autodj_fade_pressed.svg
new file mode 100644
index 000000000000..b44688d391d8
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__autodj_fade_pressed.svg
@@ -0,0 +1,77 @@
+<?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="svg15"
+   version="1.1"
+   height="20"
+   width="32">
+  <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="defs9">
+    <linearGradient
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop4"
+         offset="1"
+         stop-color="#bfbfbe" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047621"
+       x2="7.6989398"
+       x1="7.6989398"
+       id="c" />
+    <linearGradient
+       xlink:href="#a"
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047621"
+       x2="24.42697"
+       x1="24.42697"
+       id="b" />
+  </defs>
+  <path
+     id="path11"
+     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:#000001;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal;fill:#000001;fill-opacity:1"
+     solid-color="#000001"
+     shape-rendering="auto"
+     image-rendering="auto"
+     fill="url(#c)"
+     dominant-baseline="auto"
+     color-rendering="auto"
+     color="#000001"
+     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" />
+  <path
+     id="path13"
+     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:#000001;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal;fill:#000001;fill-opacity:1"
+     solid-color="#000001"
+     shape-rendering="auto"
+     image-rendering="auto"
+     fill="url(#b)"
+     dominant-baseline="auto"
+     color-rendering="auto"
+     color="#000001"
+     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" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__autodj_repeat_playlist_off.svg b/res/skins/LateNight/palemoon/buttons/btn__autodj_repeat_playlist_off.svg
new file mode 100644
index 000000000000..13cb296e09c4
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__autodj_repeat_playlist_off.svg
@@ -0,0 +1,148 @@
+<?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="svg1272"
+   version="1.1"
+   viewBox="0 0 5.2916662 5.2916665"
+   height="20"
+   width="20">
+  <defs
+     id="defs1266">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047621"
+       x2="9.3150187"
+       x1="9.3150187"
+       id="linearGradient1980"
+       spreadMethod="pad">
+      <stop
+         style="stop-color:#80766b;stop-opacity:1"
+         id="stop1976"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop1978"
+         offset="1"
+         stop-color="#bfbfbe"
+         style="stop-color:#a89a8c;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047621"
+       x2="9.3150187"
+       x1="9.3150187"
+       id="linearGradient1974"
+       spreadMethod="pad">
+      <stop
+         style="stop-color:#80766b;stop-opacity:1"
+         id="stop1970"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop1972"
+         offset="1"
+         stop-color="#bfbfbe"
+         style="stop-color:#a89a8c;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       spreadMethod="pad"
+       id="linearGradient841"
+       x1="9.3150187"
+       x2="9.3150187"
+       y1="19.047621"
+       y2="1.025641"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         style="stop-color:#80766b;stop-opacity:1"
+         stop-color="#888"
+         offset="0"
+         id="stop837" />
+      <stop
+         style="stop-color:#a89a8c;stop-opacity:1"
+         stop-color="#bfbfbe"
+         offset="1"
+         id="stop839" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047621"
+       x2="4.7667475"
+       x1="4.7667475"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop4"
+         offset="1"
+         stop-color="#bfbfbe" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047621"
+       x2="4.7117639"
+       x1="4.7117639"
+       id="a-9">
+      <stop
+         id="stop2-1"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop4-2"
+         offset="1"
+         stop-color="#bfbfbe" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,0,291.70833)"
+       y2="1.025641"
+       x2="4.7117639"
+       y1="19.047621"
+       x1="4.7117639"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2187"
+       xlink:href="#linearGradient1980" />
+    <linearGradient
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,0,291.70833)"
+       y2="1.025641"
+       x2="4.7117639"
+       y1="19.047621"
+       x1="4.7117639"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2189"
+       xlink:href="#linearGradient1980" />
+  </defs>
+  <metadata
+     id="metadata1269">
+    <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(0,-291.70833)"
+     id="layer1">
+    <path
+       style="color:#000001;fill:url(#linearGradient2187);fill-opacity:1.0;stroke-width:0.26458332"
+       d="m 2.1290756,292.17135 -1.58749998,0.79375 1.58749998,0.79375 v -0.59531 H 3.96875 c 0.1897962,0 0.3968749,0.21995 0.3968749,0.39687 v 1.23196 l 0.396875,0.30591 v -1.53789 c 0,-0.43516 -0.3585897,-0.79375 -0.7937499,-0.79375 H 2.1290756 v -0.59532 z"
+       id="path9-3" />
+    <path
+       style="color:#000001;fill:url(#linearGradient2189);fill-opacity:1.0;stroke-width:0.26458332"
+       d="m 3.1625645,296.53698 1.5875,-0.79375 -1.5875,-0.79375 v 0.59531 H 1.3228902 c -0.1897962,0 -0.396875,-0.21996 -0.396875,-0.39688 v -1.23198 l -0.396875,-0.30591 v 1.53789 c 0,0.43516 0.35858979,0.79375 0.79375,0.79375 h 1.8396743 z"
+       id="path11-6" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__autodj_repeat_playlist_on.svg b/res/skins/LateNight/palemoon/buttons/btn__autodj_repeat_playlist_on.svg
new file mode 100644
index 000000000000..fb992a016f7c
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/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="#000001"/>
+	<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="#000001"/>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__autodj_shuffle.svg b/res/skins/LateNight/palemoon/buttons/btn__autodj_shuffle.svg
new file mode 100644
index 000000000000..48914b0d73e8
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__autodj_shuffle.svg
@@ -0,0 +1,160 @@
+<?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="svg1272"
+   version="1.1"
+   viewBox="0 0 9.5249991 5.2916665"
+   height="20"
+   width="36">
+  <defs
+     id="defs1266">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047621"
+       x2="9.3150187"
+       x1="9.3150187"
+       id="linearGradient1980"
+       spreadMethod="pad">
+      <stop
+         style="stop-color:#80766b;stop-opacity:1"
+         id="stop1976"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop1978"
+         offset="1"
+         stop-color="#bfbfbe"
+         style="stop-color:#a89a8c;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047621"
+       x2="9.3150187"
+       x1="9.3150187"
+       id="linearGradient1974"
+       spreadMethod="pad">
+      <stop
+         style="stop-color:#80766b;stop-opacity:1"
+         id="stop1970"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop1972"
+         offset="1"
+         stop-color="#bfbfbe"
+         style="stop-color:#a89a8c;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       spreadMethod="pad"
+       id="linearGradient841"
+       x1="9.3150187"
+       x2="9.3150187"
+       y1="19.047621"
+       y2="1.025641"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         style="stop-color:#80766b;stop-opacity:1"
+         stop-color="#888"
+         offset="0"
+         id="stop837" />
+      <stop
+         style="stop-color:#a89a8c;stop-opacity:1"
+         stop-color="#bfbfbe"
+         offset="1"
+         id="stop839" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047621"
+       x2="4.7667475"
+       x1="4.7667475"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop4"
+         offset="1"
+         stop-color="#bfbfbe" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,1.4130916e-8,291.70833)"
+       y2="1.025641"
+       x2="4.7667475"
+       y1="19.047621"
+       x1="4.7667475"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2045"
+       xlink:href="#linearGradient1980" />
+    <linearGradient
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,1.4130916e-8,291.70833)"
+       y2="1.025641"
+       x2="4.7667475"
+       y1="19.047621"
+       x1="4.7667475"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2047"
+       xlink:href="#linearGradient1980" />
+    <linearGradient
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,1.4130916e-8,291.70833)"
+       y2="1.025641"
+       x2="4.7667475"
+       y1="19.047621"
+       x1="4.7667475"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2049"
+       xlink:href="#linearGradient1980" />
+    <linearGradient
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,1.4130916e-8,291.70833)"
+       y2="1.025641"
+       x2="4.7667475"
+       y1="19.047621"
+       x1="4.7667475"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2051"
+       xlink:href="#linearGradient1980" />
+  </defs>
+  <metadata
+     id="metadata1269">
+    <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(0,-291.70833)"
+     id="layer1">
+    <path
+       style="fill:url(#linearGradient2045);fill-opacity:1.0;stroke-width:0.26458332"
+       d="m 6.8791666,292.30504 1.88e-5,1.58753 1.5875,-0.79378 z"
+       id="path9" />
+    <path
+       style="fill:url(#linearGradient2047);fill-opacity:1.0;stroke-width:0.26458332"
+       d="m 6.8791666,296.415 1.88e-5,-1.5875 1.5874735,0.79378 z"
+       id="path11" />
+    <path
+       id="path13"
+       style="color:#000001;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:#000001;text-transform:none;text-orientation:mixed;dominant-baseline:auto;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000001;fill:url(#linearGradient2049);fill-opacity:1.0;stroke-width:0.26458332;color-rendering:auto;image-rendering:auto;shape-rendering:auto"
+       dominant-baseline="auto"
+       d="m 6.8791666,292.88215 c -1.2530931,0 -1.9181762,0.8912 -2.6055373,1.45659 -0.6873345,0.56539 -1.4100704,1.09744 -2.9506333,1.09744 -0.2683404,-0.004 -0.2683404,0.40711 0,0.40327 1.6343577,0 2.4991219,-0.61055 3.2009292,-1.18774 0.7017279,-0.57718 1.2272697,-1.36628 2.3554001,-1.36628 0.2683405,0.004 0.2683405,-0.40711 0,-0.40328 z" />
+    <path
+       id="path15"
+       style="color:#000001;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:#000001;text-transform:none;text-orientation:mixed;dominant-baseline:auto;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;solid-color:#000001;fill:url(#linearGradient2051);fill-opacity:1.0;stroke-width:0.26458332;color-rendering:auto;image-rendering:auto;shape-rendering:auto"
+       dominant-baseline="auto"
+       d="m 5.1257729,294.69336 c -0.098825,0.0818 -0.1940005,0.15985 -0.3028157,0.24904 -0.00324,0.003 -0.00708,0.005 -0.010335,0.008 0.564859,0.4567 1.057619,0.90747 2.0665546,0.90747 0.2683404,0.004 0.2683404,-0.40566 0,-0.40182 -0.8662194,0 -1.244891,-0.35423 -1.7533938,-0.76256 z m -3.8028562,-1.81417 c -0.2683669,-0.004 -0.2683669,0.40566 0,0.40182 1.2961937,0 2.0423187,0.47496 2.646627,0.93615 0.056057,-0.0448 0.1121542,-0.0894 0.1684655,-0.13551 0.048662,-0.0399 0.1028118,-0.082 0.152445,-0.12295 -0.6590506,-0.51083 -1.5319904,-1.0795 -2.9675666,-1.0795 z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__autodj_shuffle_pressed.svg b/res/skins/LateNight/palemoon/buttons/btn__autodj_shuffle_pressed.svg
new file mode 100644
index 000000000000..21fe0268d592
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__autodj_shuffle_pressed.svg
@@ -0,0 +1,79 @@
+<?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="svg21"
+   version="1.1"
+   height="20"
+   width="36">
+  <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="defs7">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047621"
+       x2="4.7667475"
+       x1="4.7667475"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop4"
+         offset="1"
+         stop-color="#bfbfbe" />
+    </linearGradient>
+  </defs>
+  <g
+     style="fill:#000001;fill-opacity:1"
+     id="g19"
+     fill="url(#a)">
+    <path
+       style="fill:#000001;fill-opacity:1"
+       id="path9"
+       d="m26 2.2553 7.1e-5 6.0001 6-3.0001z" />
+    <path
+       style="fill:#000001;fill-opacity:1"
+       id="path11"
+       d="m26 17.789 7.1e-5-6 5.9999 3.0001z" />
+    <g
+       style="fill:#000001;fill-opacity:1"
+       id="g17"
+       shape-rendering="auto">
+      <path
+         id="path13"
+         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:#000001;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal;fill:#000001;fill-opacity:1"
+         solid-color="#000001"
+         image-rendering="auto"
+         dominant-baseline="auto"
+         color-rendering="auto"
+         color="#000001"
+         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" />
+      <path
+         id="path15"
+         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:#000001;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal;fill:#000001;fill-opacity:1"
+         solid-color="#000001"
+         image-rendering="auto"
+         dominant-baseline="auto"
+         color-rendering="auto"
+         color="#000001"
+         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" />
+    </g>
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__autodj_skip.svg b/res/skins/LateNight/palemoon/buttons/btn__autodj_skip.svg
new file mode 100644
index 000000000000..5a86df63987d
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__autodj_skip.svg
@@ -0,0 +1,137 @@
+<?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="svg1272"
+   version="1.1"
+   viewBox="0 0 8.4666659 5.2916665"
+   height="20"
+   width="32">
+  <defs
+     id="defs1266">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047621"
+       x2="9.3150187"
+       x1="9.3150187"
+       id="linearGradient1980"
+       spreadMethod="pad">
+      <stop
+         style="stop-color:#80766b;stop-opacity:1"
+         id="stop1976"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop1978"
+         offset="1"
+         stop-color="#bfbfbe"
+         style="stop-color:#a89a8c;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="1.025641"
+       y1="19.047621"
+       x2="9.3150187"
+       x1="9.3150187"
+       id="linearGradient1974"
+       spreadMethod="pad">
+      <stop
+         style="stop-color:#80766b;stop-opacity:1"
+         id="stop1970"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop1972"
+         offset="1"
+         stop-color="#bfbfbe"
+         style="stop-color:#a89a8c;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       spreadMethod="pad"
+       id="linearGradient841"
+       x1="9.3150187"
+       x2="9.3150187"
+       y1="19.047621"
+       y2="1.025641"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         style="stop-color:#80766b;stop-opacity:1"
+         stop-color="#888"
+         offset="0"
+         id="stop837" />
+      <stop
+         style="stop-color:#a89a8c;stop-opacity:1"
+         stop-color="#bfbfbe"
+         offset="1"
+         id="stop839" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,0,291.70833)"
+       spreadMethod="pad"
+       y2="1.025641"
+       x2="9.3150187"
+       y1="14.725587"
+       x1="9.3150187"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1896"
+       xlink:href="#linearGradient1974" />
+    <linearGradient
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,0,291.70833)"
+       spreadMethod="pad"
+       y2="1.025641"
+       x2="9.3150187"
+       y1="14.725587"
+       x1="9.3150187"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1898"
+       xlink:href="#linearGradient1980" />
+    <linearGradient
+       gradientTransform="matrix(0.26458333,0,0,0.26458333,0,291.70833)"
+       spreadMethod="pad"
+       y2="1.025641"
+       x2="9.3150187"
+       y1="14.725587"
+       x1="9.3150187"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1900"
+       xlink:href="#linearGradient841" />
+  </defs>
+  <metadata
+     id="metadata1269">
+    <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(0,-291.70833)"
+     id="layer1">
+    <rect
+       x="0.26458332"
+       y="293.56042"
+       width="2.1166666"
+       height="1.5875"
+       rx="0.26458332"
+       ry="0.26458332"
+       style="fill:url(#linearGradient1896);fill-opacity:1;stroke-width:0.26458332;paint-order:fill markers stroke"
+       id="rect9" />
+    <path
+       d="M 3.4395833,293.56041 C 3.2930041,293.56041 3.175,293.67842 3.175,293.825 h 0.2645833 z m 0.2645833,0 V 293.825 H 3.96875 v -0.26459 z m 0.5291667,0 v 0.26459 h 0.2645833 v -0.26459 z m 0.5291666,0 v 0.26459 h 0.5291667 c 0,-0.14658 -0.1180042,-0.26459 -0.2645833,-0.26459 z M 3.175,294.08958 v 0.26458 h 0.2645833 v -0.26458 z m 1.8520833,0 v 0.26458 h 0.2645833 v -0.26458 z M 3.175,294.61875 v 0.26458 c 0,0.14658 0.1180041,0.26458 0.2645833,0.26458 v -0.52916 z m 1.8520833,0 c 0,0.14658 -0.1180042,0.26458 -0.2645834,0.26458 v 0.26458 h 0.2645834 c 0.1465791,0 0.2645833,-0.118 0.2645833,-0.26458 v -0.26458 z m -1.3229167,0.26458 v 0.26458 H 3.96875 v -0.26458 z m 0.5291667,0 v 0.26458 h 0.2645833 v -0.26458 z"
+       style="fill:url(#linearGradient1898);fill-opacity:1;stroke-width:0.26458332;paint-order:fill markers stroke"
+       id="path11" />
+    <path
+       d="m 6.3499999,293.56041 c -0.1465791,0 -0.2645833,0.11801 -0.2645833,0.26459 v 1.05833 c 0,0.14658 0.1180042,0.26458 0.2645833,0.26458 h 1.5875 c 0.1465792,0 0.2645833,-0.118 0.2645833,-0.26458 V 293.825 c 0,-0.14658 -0.1180041,-0.26459 -0.2645833,-0.26459 z m 0.2645833,0.26459 h 1.0583334 c 0.1465791,0 0.2645833,0.118 0.2645833,0.26458 v 0.52917 c 0,0.14658 -0.1180042,0.26458 -0.2645833,0.26458 H 6.6145832 c -0.1465791,0 -0.2645833,-0.118 -0.2645833,-0.26458 v -0.52917 c 0,-0.14658 0.1180042,-0.26458 0.2645833,-0.26458 z"
+       style="fill:url(#linearGradient1900);fill-opacity:1;stroke-width:0.26458332;paint-order:fill markers stroke"
+       id="path13" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__autodj_skip_disabled.svg b/res/skins/LateNight/palemoon/buttons/btn__autodj_skip_disabled.svg
new file mode 100644
index 000000000000..529822ab347b
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__autodj_skip_disabled.svg
@@ -0,0 +1,48 @@
+<?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="svg10"
+   version="1.1"
+   height="20"
+   width="32">
+  <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="defs14" />
+  <g
+     style="fill:#444443;fill-opacity:1"
+     id="g8"
+     fill="#666">
+    <rect
+       id="rect2"
+       style="paint-order:fill markers stroke;fill:#444443;fill-opacity:1"
+       ry="1"
+       rx="1"
+       height="6"
+       width="8"
+       y="7"
+       x="1" />
+    <path
+       id="path4"
+       style="paint-order:fill markers stroke;fill:#444443;fill-opacity:1"
+       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" />
+    <path
+       id="path6"
+       style="paint-order:fill markers stroke;fill:#444443;fill-opacity:1"
+       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" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__autodj_skip_pressed.svg b/res/skins/LateNight/palemoon/buttons/btn__autodj_skip_pressed.svg
new file mode 100644
index 000000000000..f3781ff1499f
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__autodj_skip_pressed.svg
@@ -0,0 +1,65 @@
+<?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="svg17"
+   version="1.1"
+   height="20"
+   width="32">
+  <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"
+       y2="1.025641"
+       y1="19.047621"
+       x2="9.3150187"
+       x1="9.3150187"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-color="#888" />
+      <stop
+         id="stop4"
+         offset="1"
+         stop-color="#bfbfbe" />
+    </linearGradient>
+  </defs>
+  <g
+     style="fill:#000001;fill-opacity:1"
+     id="g15"
+     fill="url(#a)">
+    <rect
+       id="rect9"
+       style="paint-order:fill markers stroke;fill:#000001;fill-opacity:1"
+       ry="1"
+       rx="1"
+       height="6"
+       width="8"
+       y="7"
+       x="1" />
+    <path
+       id="path11"
+       style="paint-order:fill markers stroke;fill:#000001;fill-opacity:1"
+       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" />
+    <path
+       id="path13"
+       style="paint-order:fill markers stroke;fill:#000001;fill-opacity:1"
+       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" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__aux_play.svg b/res/skins/LateNight/palemoon/buttons/btn__aux_play.svg
new file mode 100644
index 000000000000..7260a04de8e8
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__aux_play.svg
@@ -0,0 +1,46 @@
+<?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="40"
+   height="22"
+   version="1.1"
+   id="svg22">
+  <metadata
+     id="metadata28">
+    <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="defs26" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:12px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:#000001;stroke-width:1.6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     x="4.4199219"
+     y="15.507538"
+     id="text847"><tspan
+       id="tspan845"
+       x="4.4199219"
+       y="15.507538"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';stroke:#000001;stroke-width:1.6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">PLAY</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:12px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#918273;fill-opacity:1;stroke:none;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     x="4.4199219"
+     y="15.507538"
+     id="text847-3"><tspan
+       x="4.4199219"
+       y="15.507538"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#918273;fill-opacity:1;stroke:none;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="tspan859">PLAY</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__aux_play_active.svg b/res/skins/LateNight/palemoon/buttons/btn__aux_play_active.svg
new file mode 100644
index 000000000000..c071b44d15f1
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__aux_play_active.svg
@@ -0,0 +1,36 @@
+<?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="40"
+   height="22"
+   version="1.1"
+   id="svg22">
+  <metadata
+     id="metadata28">
+    <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="defs26" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:12px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;"
+     x="4.4199219"
+     y="15.507538"
+     id="text847-3"><tspan
+       x="4.4199219"
+       y="15.507538"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;"
+       id="tspan859">PLAY</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__beat_curpos.svg b/res/skins/LateNight/palemoon/buttons/btn__beat_curpos.svg
similarity index 93%
rename from res/skins/LateNight/buttons_flip/btn__beat_curpos.svg
rename to res/skins/LateNight/palemoon/buttons/btn__beat_curpos.svg
index b850982aed1c..deaaf8ad541b 100644
--- a/res/skins/LateNight/buttons_flip/btn__beat_curpos.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__beat_curpos.svg
@@ -1,5 +1,5 @@
 <svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
-	<g fill="#585858">
+	<g fill="#3d3d3c">
 		<path d="m2 4v6h2v-6z" stroke-width=".92581999"/>
 		<path d="m7 4v10h2v-10z"/>
 		<path d="m12 4v10h2v-10z"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beat_curpos_active_12.svg b/res/skins/LateNight/palemoon/buttons/btn__beat_curpos_active_12.svg
new file mode 100644
index 000000000000..05f798a07308
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__beat_curpos_active_12.svg
@@ -0,0 +1,51 @@
+<?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="svg16"
+   viewBox="0 0 21 18"
+   version="1.1"
+   height="18"
+   width="21">
+  <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="defs20" />
+  <g
+     style="fill:#988f86;fill-opacity:1"
+     id="g842">
+    <path
+       style="fill:#988f86;stroke-width:0.70710999;fill-opacity:1"
+       id="path2"
+       d="m 2,4 v 6 H 4 V 4 Z" />
+    <path
+       style="fill:#988f86;stroke-width:0.91286999;fill-opacity:1"
+       d="M 7,4 V 14 H 9 V 4 Z"
+       id="path4" />
+    <path
+       style="fill:#988f86;stroke-width:0.91286999;fill-opacity:1"
+       d="m 12,4 v 10 h 2 V 4 Z"
+       id="path6" />
+    <path
+       style="fill:#988f86;stroke-width:0.91286999;fill-opacity:1"
+       d="m 17,4 v 10 h 2 V 4 Z"
+       id="path8" />
+  </g>
+  <path
+     d="m 2,12 v 2 h 2 v -2 z"
+     id="path12"
+     style="fill:#e6e6e6;stroke-width:0.40825;fill-opacity:1" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beat_curpos_active_34.svg b/res/skins/LateNight/palemoon/buttons/btn__beat_curpos_active_34.svg
new file mode 100644
index 000000000000..0fa6b38e82ea
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__beat_curpos_active_34.svg
@@ -0,0 +1,51 @@
+<?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="svg16"
+   viewBox="0 0 21 18"
+   version="1.1"
+   height="18"
+   width="21">
+  <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="defs20" />
+  <g
+     style="fill:#559b99;fill-opacity:1"
+     id="g842">
+    <path
+       style="fill:#559b99;stroke-width:0.70710999;fill-opacity:1"
+       id="path2"
+       d="m 2,4 v 6 H 4 V 4 Z" />
+    <path
+       style="fill:#559b99;stroke-width:0.91286999;fill-opacity:1"
+       d="M 7,4 V 14 H 9 V 4 Z"
+       id="path4" />
+    <path
+       style="fill:#559b99;stroke-width:0.91286999;fill-opacity:1"
+       d="m 12,4 v 10 h 2 V 4 Z"
+       id="path6" />
+    <path
+       style="fill:#559b99;stroke-width:0.91286999;fill-opacity:1"
+       d="m 17,4 v 10 h 2 V 4 Z"
+       id="path8" />
+  </g>
+  <path
+     d="m 2,12 v 2 h 2 v -2 z"
+     id="path12"
+     style="fill:#e6e6e6;stroke-width:0.40825;fill-opacity:1" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beat_curpos_large.svg b/res/skins/LateNight/palemoon/buttons/btn__beat_curpos_large.svg
new file mode 100644
index 000000000000..36b639415a28
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__beat_curpos_large.svg
@@ -0,0 +1,85 @@
+<?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="24"
+   height="24"
+   version="1.1"
+   id="svg16">
+  <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="defs20" />
+  <g
+     style="fill:none;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round;stroke-linecap:round"
+     id="g862">
+    <g
+       transform="translate(1,-10)"
+       id="g8-3"
+       style="fill:none;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round;stroke-linecap:round">
+      <path
+         style="fill:none;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round;stroke-linecap:round"
+         d="m 8,31 h 2 V 13 H 8 Z"
+         id="path2-6" />
+      <path
+         style="fill:none;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round;stroke-linecap:round"
+         d="m 13,31 h 2 V 13 h -2 z"
+         id="path4-7" />
+      <path
+         style="fill:none;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round;stroke-linecap:round"
+         d="m 18,31 h 2 V 13 h -2 z"
+         id="path6-5" />
+    </g>
+    <g
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round;stroke-linecap:round"
+       id="g843-3">
+      <path
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round;stroke-linecap:round"
+         id="path10-5"
+         d="M 4,17 H 6 V 3 H 4 Z" />
+      <path
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round;stroke-linecap:round"
+         id="path12-6"
+         d="M 4,21 H 6 V 19 H 4 Z" />
+    </g>
+  </g>
+  <g
+     style="fill:#3f3d3d"
+     id="g8"
+     transform="translate(1,-10)">
+    <path
+       id="path2"
+       d="m 8,31 h 2 V 13 H 8 Z" />
+    <path
+       id="path4"
+       d="m 13,31 h 2 V 13 h -2 z" />
+    <path
+       id="path6"
+       d="m 18,31 h 2 V 13 h -2 z" />
+  </g>
+  <g
+     id="g843"
+     style="fill:#928476;fill-opacity:1">
+    <path
+       d="M 4,17 H 6 V 3 H 4 Z"
+       id="path10"
+       style="fill:#928476;fill-opacity:1" />
+    <path
+       d="M 4,21 H 6 V 19 H 4 Z"
+       id="path12"
+       style="fill:#928476;fill-opacity:1" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beat_curpos_large_active.svg b/res/skins/LateNight/palemoon/buttons/btn__beat_curpos_large_active.svg
new file mode 100644
index 000000000000..4bbfe99dbc86
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__beat_curpos_large_active.svg
@@ -0,0 +1,55 @@
+<?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="svg16"
+   version="1.1"
+   height="24"
+   width="24">
+  <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="defs20" />
+  <g
+     transform="translate(1,-10)"
+     id="g8"
+     style="fill:#000000;fill-opacity:1">
+    <path
+       style="fill:#000000;fill-opacity:1"
+       d="m 8,31 h 2 V 13 H 8 Z"
+       id="path2" />
+    <path
+       style="fill:#000000;fill-opacity:1"
+       d="m 13,31 h 2 V 13 h -2 z"
+       id="path4" />
+    <path
+       style="fill:#000000;fill-opacity:1"
+       d="m 18,31 h 2 V 13 h -2 z"
+       id="path6" />
+  </g>
+  <g
+     style="fill:#000000;fill-opacity:1"
+     id="g843">
+    <path
+       style="fill:#000000;fill-opacity:1"
+       id="path10"
+       d="M 4,17 H 6 V 3 H 4 Z" />
+    <path
+       style="fill:#000000;fill-opacity:1"
+       id="path12"
+       d="M 4,21 H 6 V 19 H 4 Z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beatgrid_controls_collapse.svg b/res/skins/LateNight/palemoon/buttons/btn__beatgrid_controls_collapse.svg
new file mode 100644
index 000000000000..2274e08f46e0
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__beatgrid_controls_collapse.svg
@@ -0,0 +1,95 @@
+<?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="26"
+   height="52"
+   version="1.1"
+   id="svg16">
+  <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="defs20" />
+  <g
+     style="fill:none;stroke:#000001;stroke-opacity:1"
+     id="g1614">
+    <path
+       d="m 20.25735,45.224312 c -0.957305,0.834439 -2.423288,0.733907 -3.257741,-0.223406 L 9.331122,36.203358 C 7.5760221,36.617568 5.6542544,36.096071 4.3925974,34.648655 3.1300955,33.20027 2.8751128,31.224074 3.5266679,29.541431 l 2.0772585,2.383101 c 0.8344525,0.957312 2.3004357,1.057845 3.2577403,0.223405 0.9573046,-0.834439 1.0563284,-2.299117 0.2218758,-3.25643 L 7.0062841,26.508406 c 1.7558316,-0.41578 3.6787399,0.106574 4.9412419,1.554959 1.262697,1.448609 1.51741,3.424646 0.865929,5.107225 l 7.667187,8.796057 c 0.834453,0.957312 0.733938,2.423291 -0.223367,3.25773 z"
+       id="path2"
+       style="color:#000001;fill:none;stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="m 8.9996834,37.363444 v 7.6375 h 1.9999996 v -5.3425 z"
+       id="path6"
+       style="fill:none;stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="m 13.999684,27.000445 v 5.9864 l 2,2.294899 v -8.281299 z"
+       id="path8"
+       style="fill:none;stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="m 18.999684,27.000445 v 11.724999 l 2,2.293 V 27.000445 Z"
+       id="path10"
+       style="fill:none;stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="m 3.9996834,35.713444 v 9.2874 h 2 v -7.9846 c -0.73826,-0.26909 -1.4212,-0.69782 -2,-1.3027 z"
+       id="path12"
+       style="fill:none;stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 5.3640836,18.097737 9.7893426,13.672573 5.3640836,9.2474084 6.4704696,8.1411173 12.002019,13.672573 6.4704696,19.204029 Z"
+       id="path2-9"
+       style="fill:none;stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round;stroke-opacity:1" />
+    <path
+       d="m 20.635882,18.097737 -4.425258,-4.425258 4.425258,-4.4252586 -1.106385,-1.1063851 -5.531549,5.5315497 5.531549,5.53155 1.106385,-1.106385 z"
+       id="path4"
+       style="fill:none;stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round;stroke-opacity:1" />
+  </g>
+  <g
+     transform="matrix(-0.5112,0.44559,-0.50559,-0.58003,28.908684,44.828444)"
+     id="g4-1"
+     style="fill:#928476;stroke-width:1.0108;fill-opacity:1">
+    <path
+       transform="matrix(-1.4588,0,0,1.2857,27.506,3.1429)"
+       d="M 12,3 C 10.7163,3 9.666,4.0503 9.666,5.334 v 11.797 c -1.6125,0.8501 -2.7305,2.5239 -2.7305,4.4648 0,1.9422 1.1183,3.6174 2.7324,4.4668 V 22.867 c 0,-1.2837 1.0503,-2.334 2.334,-2.334 1.2837,0 2.332,1.0503 2.332,2.334 v 3.1956 c 1.6141,-0.84939 2.7324,-2.5246 2.7324,-4.4668 0,-1.9425 -1.1184,-3.6174 -2.7324,-4.4668 V 5.334 C 14.3339,4.0503 13.2836,3 11.9999,3 Z"
+       id="path2-2"
+       style="color:#000001;fill:#928476;fill-opacity:1" />
+  </g>
+  <g
+     id="g912">
+    <path
+       d="m 8.9996834,37.363444 v 7.6375 h 1.9999996 v -5.3425 z"
+       id="path6-5"
+       style="fill:#666668;fill-opacity:1" />
+    <path
+       d="m 13.999684,27.000445 v 5.9864 l 2,2.294899 v -8.281299 z"
+       id="path8-6"
+       style="fill:#666668;fill-opacity:1" />
+    <path
+       d="m 18.999684,27.000445 v 11.724999 l 2,2.293 V 27.000445 Z"
+       id="path10-2"
+       style="fill:#666668;fill-opacity:1" />
+    <path
+       d="m 3.9996834,35.713444 v 9.2874 h 2 v -7.9846 c -0.73826,-0.26909 -1.4212,-0.69782 -2,-1.3027 z"
+       id="path12-9"
+       style="fill:#666668;fill-opacity:1" />
+    <path
+       d="M 5.3640826,18.09772 9.7893416,13.672556 5.3640826,9.2473914 6.4704686,8.1411003 12.002018,13.672556 6.4704686,19.204012 Z"
+       id="path6-1"
+       style="fill:#666668;fill-opacity:1;stroke-width:0.93992448" />
+    <path
+       d="m 20.635881,18.09772 -4.425258,-4.425258 4.425258,-4.4252586 -1.106385,-1.1063851 -5.531549,5.5315497 5.531549,5.53155 1.106385,-1.106385 z"
+       id="path8-2"
+       style="fill:#666668;fill-opacity:1;stroke-width:0.93992448" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beatgrid_controls_expand.svg b/res/skins/LateNight/palemoon/buttons/btn__beatgrid_controls_expand.svg
new file mode 100644
index 000000000000..8d8b141b47ec
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__beatgrid_controls_expand.svg
@@ -0,0 +1,101 @@
+<?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="svg16"
+   version="1.1"
+   height="52"
+   width="26">
+  <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="defs20" />
+  <g
+     style="fill:#a89a8c;stroke:#000001;stroke-width:2.21497655;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="g4"
+     transform="matrix(-0.5112,0.44559,-0.50559,-0.58003,28.908684,44.828444)">
+    <path
+       style="color:#000001;fill:#a89a8c;stroke:#000001;stroke-width:1.61734033;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2"
+       d="M 12,3 C 10.7163,3 9.666,4.0503 9.666,5.334 v 11.797 c -1.6125,0.8501 -2.7305,2.5239 -2.7305,4.4648 0,1.9422 1.1183,3.6174 2.7324,4.4668 V 22.867 c 0,-1.2837 1.0503,-2.334 2.334,-2.334 1.2837,0 2.332,1.0503 2.332,2.334 v 3.1956 c 1.6141,-0.84939 2.7324,-2.5246 2.7324,-4.4668 0,-1.9425 -1.1184,-3.6174 -2.7324,-4.4668 V 5.334 C 14.3339,4.0503 13.2836,3 11.9999,3 Z"
+       transform="matrix(-1.4588,0,0,1.2857,27.506,3.1429)" />
+  </g>
+  <g
+     style="fill:#928476;stroke-width:1.0108;fill-opacity:1"
+     id="g4-1"
+     transform="matrix(-0.5112,0.44559,-0.50559,-0.58003,28.908684,44.828444)">
+    <path
+       style="color:#000001;fill:#928476;fill-opacity:1"
+       id="path2-2"
+       d="M 12,3 C 10.7163,3 9.666,4.0503 9.666,5.334 v 11.797 c -1.6125,0.8501 -2.7305,2.5239 -2.7305,4.4648 0,1.9422 1.1183,3.6174 2.7324,4.4668 V 22.867 c 0,-1.2837 1.0503,-2.334 2.334,-2.334 1.2837,0 2.332,1.0503 2.332,2.334 v 3.1956 c 1.6141,-0.84939 2.7324,-2.5246 2.7324,-4.4668 0,-1.9425 -1.1184,-3.6174 -2.7324,-4.4668 V 5.334 C 14.3339,4.0503 13.2836,3 11.9999,3 Z"
+       transform="matrix(-1.4588,0,0,1.2857,27.506,3.1429)" />
+  </g>
+  <g
+     style="fill:none;stroke:#000001;stroke-opacity:1"
+     id="g986">
+    <path
+       style="fill:none;stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path6"
+       d="m 8.9996834,37.363444 v 7.6375 h 1.9999996 v -5.3425 z" />
+    <path
+       style="fill:none;stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path8"
+       d="m 13.999684,27.000445 v 5.9864 l 2,2.294899 v -8.281299 z" />
+    <path
+       style="fill:none;stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path10"
+       d="m 18.999684,27.000445 v 11.724999 l 2,2.293 V 27.000445 Z" />
+    <path
+       style="fill:none;stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path12"
+       d="m 3.9996834,35.713444 v 9.2874 h 2 v -7.9846 c -0.73826,-0.26909 -1.4212,-0.69782 -2,-1.3027 z" />
+    <path
+       style="fill:none;stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round;stroke-opacity:1"
+       d="M 11.648483,18.12022 7.2232242,13.695056 11.648483,9.2698911 10.542098,8.1636 5.0105479,13.695056 10.542098,19.226511 Z"
+       id="path2-7" />
+    <path
+       style="fill:none;stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round;stroke-opacity:1"
+       d="m 14.351518,18.12022 4.425258,-4.425258 -4.425258,-4.4252589 1.106385,-1.1063851 5.531549,5.53155 -5.531549,5.531549 -1.106385,-1.106385 z"
+       id="path4-5" />
+  </g>
+  <g
+     id="g969">
+    <path
+       style="fill:#666668;fill-opacity:1"
+       id="path6-5"
+       d="m 8.9996834,37.363444 v 7.6375 h 1.9999996 v -5.3425 z" />
+    <path
+       style="fill:#666668;fill-opacity:1"
+       id="path8-6"
+       d="m 13.999684,27.000445 v 5.9864 l 2,2.294899 v -8.281299 z" />
+    <path
+       style="fill:#666668;fill-opacity:1"
+       id="path10-2"
+       d="m 18.999684,27.000445 v 11.724999 l 2,2.293 V 27.000445 Z" />
+    <path
+       style="fill:#666668;fill-opacity:1"
+       id="path12-9"
+       d="m 3.9996834,35.713444 v 9.2874 h 2 v -7.9846 c -0.73826,-0.26909 -1.4212,-0.69782 -2,-1.3027 z" />
+    <path
+       id="path10-6"
+       d="M 11.648484,18.120221 7.2232252,13.695056 11.648484,9.2698917 10.542099,8.1636006 5.0105489,13.695056 10.542099,19.226512 Z"
+       style="fill:#666668;fill-opacity:1;stroke-width:0.93992448" />
+    <path
+       id="path12-2"
+       d="m 14.351519,18.120221 4.425258,-4.425259 -4.425258,-4.4252583 1.106385,-1.1063851 5.531549,5.5315494 -5.531549,5.53155 -1.106385,-1.106385 z"
+       style="fill:#666668;fill-opacity:1;stroke-width:0.93992448" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beats_earlier.svg b/res/skins/LateNight/palemoon/buttons/btn__beats_earlier.svg
new file mode 100644
index 000000000000..e668c27c98fd
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__beats_earlier.svg
@@ -0,0 +1,78 @@
+<?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="svg16"
+   version="1.1"
+   height="24"
+   width="24">
+  <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="defs20" />
+  <g
+     style="fill:none;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round;stroke-linecap:round"
+     id="g854">
+    <path
+       style="fill:none;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round;stroke-linecap:round"
+       d="m 9,3 v 3 l 11,1e-6 v 2 L 9,8 v 3 L 2,7 Z"
+       id="path4-3" />
+    <path
+       d="M 15,21 H 13 V 9 h 2 z"
+       id="path2-6"
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round;stroke-linecap:round" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round;stroke-linecap:round"
+       id="path6-7"
+       d="M 7,21 H 9 V 12 H 7 Z" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round;stroke-linecap:round"
+       id="path8-5"
+       d="M 15,5 H 13 V 3 h 2 z" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round;stroke-linecap:round"
+       id="path10-3"
+       d="M 21,21 H 19 V 9 h 2 z" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round;stroke-linecap:round"
+       id="path12-5"
+       d="M 21,5 H 19 V 3 h 2 z" />
+  </g>
+  <path
+     id="path4"
+     fill="#928476"
+     d="m9 3v3l11 1e-6v2l-11-1e-6v3l-7-4z" />
+  <path
+     style="fill:#3f3d3d;fill-opacity:1"
+     id="path2"
+     d="M 15,21 H 13 V 9 h 2 z" />
+  <path
+     d="M 7,21 H 9 V 12 H 7 Z"
+     id="path6"
+     style="fill:#3f3d3d;fill-opacity:1" />
+  <path
+     d="M 15,5 H 13 V 3 h 2 z"
+     id="path8"
+     style="fill:#3f3d3d;fill-opacity:1" />
+  <path
+     d="M 21,21 H 19 V 9 h 2 z"
+     id="path10"
+     style="fill:#3f3d3d;fill-opacity:1" />
+  <path
+     d="M 21,5 H 19 V 3 h 2 z"
+     id="path12"
+     style="fill:#3f3d3d;fill-opacity:1" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beats_earlier_active.svg b/res/skins/LateNight/palemoon/buttons/btn__beats_earlier_active.svg
new file mode 100644
index 000000000000..478868999b4e
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__beats_earlier_active.svg
@@ -0,0 +1,56 @@
+<?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="svg16"
+   version="1.1"
+   height="24"
+   width="24">
+  <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="defs20" />
+  <path
+     style="fill-opacity:1;fill:#000001"
+     id="path4"
+     fill="#a89a8c"
+     d="m9 3v3l11 1e-6v2l-11-1e-6v3l-7-4z" />
+  <g
+     style="fill-opacity:1;fill:#000001"
+     id="g838">
+    <path
+       style="fill-opacity:1;fill:#000001"
+       d="m15 21h-2v-12h2z"
+       fill="#888"
+       id="path2" />
+    <path
+       style="fill:#000001;fill-opacity:1"
+       id="path6"
+       d="M 7,21 H 9 V 12 H 7 Z" />
+    <path
+       style="fill:#000001;fill-opacity:1"
+       id="path8"
+       d="M 15,5 H 13 V 3 h 2 z" />
+    <path
+       style="fill:#000001;fill-opacity:1"
+       id="path10"
+       d="M 21,21 H 19 V 9 h 2 z" />
+    <path
+       style="fill:#000001;fill-opacity:1"
+       id="path12"
+       d="M 21,5 H 19 V 3 h 2 z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beats_faster.svg b/res/skins/LateNight/palemoon/buttons/btn__beats_faster.svg
new file mode 100644
index 000000000000..c3255566c154
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__beats_faster.svg
@@ -0,0 +1,69 @@
+<?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="24"
+   height="24"
+   version="1.1"
+   id="svg12">
+  <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="defs16" />
+  <g
+     style="fill:none;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+     id="g849">
+    <path
+       style="fill:none;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+       id="path2-3"
+       d="m 20,10 h -2 v 3 L 11,9 18,5 v 3 h 2 z" />
+    <g
+       style="fill:none;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+       id="g834-6">
+      <path
+         style="fill:none;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+         id="path4-7"
+         d="M 5,21 H 3 V 3 h 2 z" />
+      <path
+         style="fill:none;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+         id="path6-5"
+         d="m 19,21 h 2 V 11 h -2 z" />
+      <path
+         style="fill:none;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+         id="path8-3"
+         d="m 19,7 h 2 V 3 h -2 z" />
+    </g>
+  </g>
+  <path
+     d="m20 10h-2v3l-7-4 7-4v3h2z"
+     fill="#928476"
+     id="path2" />
+  <g
+     id="g834">
+    <path
+       d="M 5,21 H 3 V 3 h 2 z"
+       id="path4"
+       style="fill:#3f3d3d" />
+    <path
+       d="m 19,21 h 2 V 11 h -2 z"
+       id="path6"
+       style="fill:#3f3d3d" />
+    <path
+       d="m 19,7 h 2 V 3 h -2 z"
+       id="path8"
+       style="fill:#3f3d3d" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beats_faster_active.svg b/res/skins/LateNight/palemoon/buttons/btn__beats_faster_active.svg
new file mode 100644
index 000000000000..7e0f5c0c616b
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__beats_faster_active.svg
@@ -0,0 +1,47 @@
+<?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="svg12"
+   version="1.1"
+   height="24"
+   width="24">
+  <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="defs16" />
+  <path
+     style="fill:#000001;fill-opacity:1"
+     id="path2"
+     fill="#a89a8c"
+     d="m20 10h-2v3l-7-4 7-4v3h2z" />
+  <g
+     style="fill:#000001;fill-opacity:1"
+     id="g834">
+    <path
+       style="fill:#000001;fill-opacity:1"
+       id="path4"
+       d="M 5,21 H 3 V 3 h 2 z" />
+    <path
+       style="fill:#000001;fill-opacity:1"
+       id="path6"
+       d="m 19,21 h 2 V 11 h -2 z" />
+    <path
+       style="fill:#000001;fill-opacity:1"
+       id="path8"
+       d="m 19,7 h 2 V 3 h -2 z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beats_hotcues_earlier.svg b/res/skins/LateNight/palemoon/buttons/btn__beats_hotcues_earlier.svg
new file mode 100644
index 000000000000..b6c48f9e4cc8
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__beats_hotcues_earlier.svg
@@ -0,0 +1,46 @@
+<?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="svg14"
+   version="1.1"
+   height="24"
+   width="24">
+  <metadata
+     id="metadata20">
+    <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="defs18" />
+  <g
+     style="fill:none;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+     id="g835">
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+       id="path6-3"
+       d="m 12,16 h -2 v 3 l -7,-4 7,-4 v 3 h 2 z" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.6;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 20,3 h -8 v 7 h 6 v 11 h 2 z"
+       id="path833-6" />
+  </g>
+  <path
+     d="m 12,16 h -2 v 3 l -7,-4 7,-4 v 3 h 2 z"
+     id="path6"
+     style="fill:#928476;fill-opacity:1" />
+  <path
+     id="path833"
+     d="m 20,3 h -8 v 7 h 6 v 11 h 2 z"
+     style="fill:#3f3d3d;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beats_hotcues_earlier_active.svg b/res/skins/LateNight/palemoon/buttons/btn__beats_hotcues_earlier_active.svg
new file mode 100644
index 000000000000..a6126ee3138e
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__beats_hotcues_earlier_active.svg
@@ -0,0 +1,38 @@
+<?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="svg14"
+   version="1.1"
+   height="24"
+   width="24">
+  <metadata
+     id="metadata20">
+    <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="defs18" />
+  <path
+     d="m 12,16 h -2 v 3 l -7,-4 7,-4 v 3 h 2 z"
+     id="path6"
+     style="fill:#000001;fill-opacity:1" />
+  <path
+     id="path833"
+     d="m 20,3 h -8 v 7 h 6 v 11 h 2 z M 19,9 H 13 V 4 h 6 z"
+     style="fill:#000001;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     style="opacity:1;fill:#000001;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 13,4 h 6 v 5 h -6 z"
+     id="rect835" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beats_hotcues_later.svg b/res/skins/LateNight/palemoon/buttons/btn__beats_hotcues_later.svg
new file mode 100644
index 000000000000..20fc208fdbbd
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__beats_hotcues_later.svg
@@ -0,0 +1,46 @@
+<?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="svg14"
+   version="1.1"
+   height="24"
+   width="24">
+  <metadata
+     id="metadata20">
+    <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="defs18" />
+  <g
+     style="fill:none;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+     id="g835">
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.6;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="M 12,3 H 4 v 7 h 6 v 11 h 2 z"
+       id="path833-3-3" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+       id="path6-7-6"
+       d="m 13,16 h 2 v 3 l 7,-4 -7,-4 v 3 h -2 z" />
+  </g>
+  <path
+     id="path833-3"
+     d="M 12,3 H 4 v 7 h 6 v 11 h 2 z"
+     style="fill:#3f3d3d;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     d="m 13,16 h 2 v 3 l 7,-4 -7,-4 v 3 h -2 z"
+     id="path6-7"
+     style="fill:#928476;fill-opacity:1" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beats_hotcues_later_active.svg b/res/skins/LateNight/palemoon/buttons/btn__beats_hotcues_later_active.svg
new file mode 100644
index 000000000000..7de776a40911
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__beats_hotcues_later_active.svg
@@ -0,0 +1,38 @@
+<?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="svg14"
+   version="1.1"
+   height="24"
+   width="24">
+  <metadata
+     id="metadata20">
+    <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="defs18" />
+  <path
+     id="path833-3"
+     d="M 12,3 H 4 v 7 h 6 v 11 h 2 z M 11,9 H 5 V 4 h 6 z"
+     style="fill:#000001;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     style="opacity:1;fill:#000001;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 5,4 h 6 V 9 H 5 Z"
+     id="rect835-6" />
+  <path
+     d="m 13,16 h 2 v 3 l 7,-4 -7,-4 v 3 h -2 z"
+     id="path6-7"
+     style="fill:#000001;fill-opacity:1" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beats_later.svg b/res/skins/LateNight/palemoon/buttons/btn__beats_later.svg
new file mode 100644
index 000000000000..1d1e4cf6fd66
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__beats_later.svg
@@ -0,0 +1,85 @@
+<?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="24"
+   height="24"
+   version="1.1"
+   id="svg18">
+  <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="defs22" />
+  <g
+     style="fill:none;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+     id="g862">
+    <path
+       d="m 15,3 v 3 l -11,1e-6 v 2 L 15,8 v 3 l 7,-4 z"
+       id="path6-3"
+       style="fill:none;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" />
+    <g
+       style="fill:none;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+       id="g849-6">
+      <path
+         style="fill:none;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+         id="path2-7"
+         d="m 17,21 h -2 v -9 h 2 z" />
+      <path
+         style="fill:none;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+         id="path4-5"
+         d="m 9,21 h 2 V 9 H 9 Z" />
+      <path
+         style="fill:none;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+         d="m 9,5 h 2 V 3 H 9 Z"
+         id="path8-3" />
+      <path
+         style="fill:none;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+         d="M 3,21 H 5 V 9 H 3 Z"
+         id="path10-5" />
+      <path
+         style="fill:none;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+         d="M 3,5 H 5 V 3 H 3 Z"
+         id="path12-6" />
+    </g>
+  </g>
+  <path
+     style="fill:#928476"
+     id="path6"
+     d="m 15,3 v 3 l -11,1e-6 v 2 L 15,8 v 3 l 7,-4 z" />
+  <g
+     id="g849">
+    <path
+       d="m 17,21 h -2 v -9 h 2 z"
+       id="path2"
+       style="fill:#3f3d3d" />
+    <path
+       d="m 9,21 h 2 V 9 H 9 Z"
+       id="path4"
+       style="fill:#3f3d3d" />
+    <path
+       id="path8"
+       d="m 9,5 h 2 V 3 H 9 Z"
+       style="fill:#3f3d3d" />
+    <path
+       id="path10"
+       d="M 3,21 H 5 V 9 H 3 Z"
+       style="fill:#3f3d3d" />
+    <path
+       id="path12"
+       d="M 3,5 H 5 V 3 H 3 Z"
+       style="fill:#3f3d3d" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beats_later_active.svg b/res/skins/LateNight/palemoon/buttons/btn__beats_later_active.svg
new file mode 100644
index 000000000000..2a2d0d56d5be
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__beats_later_active.svg
@@ -0,0 +1,54 @@
+<?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="svg18"
+   version="1.1"
+   height="24"
+   width="24">
+  <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="defs22" />
+  <path
+     d="m 15,3 v 3 l -11,1e-6 v 2 L 15,8 v 3 l 7,-4 z"
+     id="path6"
+     style="fill:#000001;fill-opacity:1" />
+  <g
+     style="fill:#000001;fill-opacity:1"
+     id="g849">
+    <path
+       style="fill:#000001;fill-opacity:1"
+       id="path2"
+       d="m 17,21 h -2 v -9 h 2 z" />
+    <path
+       style="fill:#000001;fill-opacity:1"
+       id="path4"
+       d="m 9,21 h 2 V 9 H 9 Z" />
+    <path
+       style="fill:#000001;fill-opacity:1"
+       d="m 9,5 h 2 V 3 H 9 Z"
+       id="path8" />
+    <path
+       style="fill:#000001;fill-opacity:1"
+       d="M 3,21 H 5 V 9 H 3 Z"
+       id="path10" />
+    <path
+       style="fill:#000001;fill-opacity:1"
+       d="M 3,5 H 5 V 3 H 3 Z"
+       id="path12" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beats_slower.svg b/res/skins/LateNight/palemoon/buttons/btn__beats_slower.svg
new file mode 100644
index 000000000000..1dad40052677
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__beats_slower.svg
@@ -0,0 +1,69 @@
+<?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="24"
+   height="24"
+   version="1.1"
+   id="svg14">
+  <metadata
+     id="metadata20">
+    <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="defs18" />
+  <g
+     id="g996">
+    <path
+       d="m 14,10 h 2 v 3 L 23,9 16,5 v 3 h -2 z"
+       id="path6"
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round;stroke-linecap:round" />
+    <g
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round;stroke-linecap:round"
+       id="g834">
+      <path
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round;stroke-linecap:round"
+         id="path4"
+         d="M 5,21 H 3 V 3 h 2 z" />
+      <path
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round;stroke-linecap:round"
+         id="path8"
+         d="M 15,21 H 13 V 11 h 2 z" />
+      <path
+         style="fill:none;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round;stroke-linecap:round"
+         id="path10"
+         d="M 15,7 H 13 V 3 h 2 z" />
+    </g>
+  </g>
+  <path
+     style="fill:#928476;fill-opacity:1"
+     id="path6-3"
+     d="m 14,10 h 2 v 3 L 23,9 16,5 v 3 h -2 z" />
+  <g
+     id="g834-6"
+     style="fill:#3f3d3d;fill-opacity:1">
+    <path
+       d="M 5,21 H 3 V 3 h 2 z"
+       id="path4-7"
+       style="fill:#3f3d3d;fill-opacity:1" />
+    <path
+       d="M 15,21 H 13 V 11 h 2 z"
+       id="path8-5"
+       style="fill:#3f3d3d;fill-opacity:1" />
+    <path
+       d="M 15,7 H 13 V 3 h 2 z"
+       id="path10-3"
+       style="fill:#3f3d3d;fill-opacity:1" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__beats_slower_active.svg b/res/skins/LateNight/palemoon/buttons/btn__beats_slower_active.svg
new file mode 100644
index 000000000000..298e682670df
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__beats_slower_active.svg
@@ -0,0 +1,46 @@
+<?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="svg14"
+   version="1.1"
+   height="24"
+   width="24">
+  <metadata
+     id="metadata20">
+    <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="defs18" />
+  <path
+     d="m 14,10 h 2 v 3 L 23,9 16,5 v 3 h -2 z"
+     id="path6"
+     style="fill:#000001;fill-opacity:1" />
+  <g
+     style="fill:#000001;fill-opacity:1"
+     id="g834">
+    <path
+       style="fill:#000001;fill-opacity:1"
+       id="path4"
+       d="M 5,21 H 3 V 3 h 2 z" />
+    <path
+       style="fill:#000001;fill-opacity:1"
+       id="path8"
+       d="M 15,21 H 13 V 11 h 2 z" />
+    <path
+       style="fill:#000001;fill-opacity:1"
+       id="path10"
+       d="M 15,7 H 13 V 3 h 2 z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__collapse_dim.svg b/res/skins/LateNight/palemoon/buttons/btn__collapse_dim.svg
new file mode 100644
index 000000000000..1d1422d7410d
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__collapse_dim.svg
@@ -0,0 +1,51 @@
+<?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="svg10"
+   version="1.1"
+   height="18"
+   width="16">
+  <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="defs14" />
+  <g
+     id="g825"
+     transform="translate(0.99970498,-0.00201898)">
+    <path
+       d="M 11.425164,16.637935 7,12.212676 2.574835,16.637935 1.4685439,15.531549 7,10 l 5.531456,5.531549 z"
+       id="path2"
+       style="fill:none;stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round" />
+    <path
+       d="M 11.425164,1.3661361 6.999906,5.7913942 2.574647,1.3661361 1.4682619,2.4725212 6.999812,8.004071 12.531362,2.4725212 11.424977,1.3661361 Z"
+       id="path4"
+       style="fill:none;stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round" />
+  </g>
+  <g
+     id="g821"
+     style="fill:#666668;fill-opacity:1"
+     transform="translate(0.99970498,-0.00203568)">
+    <path
+       d="M 11.425164,16.637935 7,12.212676 2.574835,16.637935 1.4685439,15.531549 7,10 l 5.531456,5.531549 z"
+       id="path6"
+       style="fill:#666668;fill-opacity:1;stroke-width:0.93992448" />
+    <path
+       d="M 11.425164,1.3661365 6.999906,5.7913946 2.574647,1.3661365 1.4682619,2.4725216 6.999812,8.004071 12.531362,2.4725216 11.424977,1.3661365 Z"
+       id="path8"
+       style="fill:#666668;fill-opacity:1;stroke-width:0.93992448" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__cue_deck.svg b/res/skins/LateNight/palemoon/buttons/btn__cue_deck.svg
new file mode 100644
index 000000000000..865dea5c8003
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__cue_deck.svg
@@ -0,0 +1,46 @@
+<?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="svg18"
+   version="1.1"
+   height="24"
+   width="38">
+  <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="defs22" />
+  <text
+     id="text836"
+     y="16.762369"
+     x="5.9856772"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#918273;fill-opacity:1;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.33333302px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#918273;fill-opacity:1;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       y="16.762369"
+       x="5.9856772"
+       id="tspan834">CUE</tspan></text>
+  <text
+     id="text836-5"
+     y="16.762369"
+     x="5.9856772"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#918273;fill-opacity:1;stroke:none"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.33333302px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#918273;fill-opacity:1"
+       y="16.762369"
+       x="5.9856772"
+       id="tspan834-8">CUE</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__cue_deck_active.svg b/res/skins/LateNight/palemoon/buttons/btn__cue_deck_active.svg
new file mode 100644
index 000000000000..193f652c7d15
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__cue_deck_active.svg
@@ -0,0 +1,36 @@
+<?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="svg18"
+   version="1.1"
+   height="24"
+   width="38">
+  <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="defs22" />
+  <text
+     id="text836-5"
+     y="16.762369"
+     x="5.9856772"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:13.33333302px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#000000;fill-opacity:1;"
+       y="16.762369"
+       x="5.9856772"
+       id="tspan834-8">CUE</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__delete.svg b/res/skins/LateNight/palemoon/buttons/btn__delete.svg
new file mode 100644
index 000000000000..33c44479466e
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__delete.svg
@@ -0,0 +1,6 @@
+<svg width="512" height="512" version="1.1" viewBox="0 0 511.99998 512.00002" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(-23.64344,7e-5)" fill="#a89a8c">
+		<path d="m279.64681 171.88159c-26.06575 0-52.13052.0299-71.90526.0877l-71.90864.20917 11.39635 144.28116c7.26636 91.9973 11.88509 146.21609 12.74582 149.6234 2.4022 9.50895 6.88437 16.93731 14.65702 24.28386 7.88017 7.44816 14.40588 11.12108 24.00553 13.51503 5.96413 1.48733 10.30426 1.57485 80.65663 1.61768 71.30357.0434 74.62708-.0215 81.02436-1.57888 9.85632-2.39955 16.34743-6.02487 24.29398-13.57238 7.85903-7.46439 12.32536-14.96921 14.6857-24.67522.90639-3.72716 5.40827-56.44582 12.77787-149.62509l11.37779-143.86956-71.90188-.20917c-19.77331-.0578-45.83951-.0877-71.90527-.0877zm79.20088 23.47248c1.92031.0545 3.91687.65563 5.89385 1.87747 4.29268 2.65302 5.9201 6.92117 5.75552 15.10065-.0764 3.80014-2.86136 62.8749-6.18904 131.27725-6.57263 135.10449-5.97739 128.11675-11.2479 131.76981-4.70407 3.26046-10.50992 2.49862-14.17796-1.86059-1.87869-2.2327-2.2317-3.50477-2.2317-8.05808 0-5.74085 8.32212-242.81518 8.888-253.19417.56337-10.33268 6.45099-17.10691 13.30923-16.91234zm-79.51126.22773c4.38547-.10444 8.72138 2.47334 10.99151 7.105 1.52928 3.12018 1.6007 6.17808 1.40345 60.44482-.11427 31.43731-.45063 90.79419-.74728 131.90475-.50093 69.42126-.6481 74.91225-2.06301 77.07039-.83789 1.27804-2.39249 2.86626-3.45466 3.52889-6.30109 3.93089-14.30324.80068-16.12627-6.30712-.65167-2.54075-2.5629-242.03828-2.06302-258.52124.18575-6.12512 2.35757-10.77695 6.23797-13.36153 1.82416-1.215 3.82792-1.8165 5.82131-1.86396zm-78.86857.007c5.49185.14786 11.05876 4.33427 12.51979 12.08289.48348 2.56393 2.8998 62.42091 5.37092 133.01639 4.87989 139.42323 4.88156 131.2626-.0304 134.68467-2.86392 1.99523-5.87605 2.50847-9.21188 1.56878-2.9698-.83662-6.927-4.95017-7.64816-7.95012-1.01291-4.21309-13.19116-261.60393-12.4928-264.03892 1.8586-6.48061 6.64675-9.49416 11.49249-9.36369z"/>
+		<path d="m197.35198 25.916155c5.91021-9.37875 14.10043-14.356319 23.66471-14.382207l5.25609-.01419 37.62836 20.407046 37.62843 20.407088 3.50577-4.104816c7.29902-8.546334 17.96939-13.649361 27.61485-13.206643l4.78273.219524 31.39991 17.283079c30.62399 16.855999 31.46538 17.371964 34.04955 20.880829 5.51991 7.495076 7.17444 22.573787 3.50975 31.986485l-1.49873 3.84943 37.42427 20.896 37.42427 20.89599 2.7998 4.44829c5.09476 8.0945 5.27082 17.67701.50871 27.6877l-2.88036 6.05495-143.19644-78.81791-143.19644-78.817918z"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__eject.svg b/res/skins/LateNight/palemoon/buttons/btn__eject.svg
new file mode 100644
index 000000000000..5aafa7d87bbd
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__eject.svg
@@ -0,0 +1,45 @@
+<?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"
+   viewBox="0 0 21 18"
+   version="1.1"
+   height="18"
+   width="21"
+   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
+     style="fill:#3d3d3c;fill-opacity:1"
+     id="g981">
+    <path
+       id="path3936-0-8-9-7-1"
+       d="M 4.4321514,11 11,3.7280156 17.567745,11 H 4.4324631"
+       fill="#3d3d3c"
+       style="stroke-width:1.03885;fill:#3d3d3c;fill-opacity:1" />
+    <rect
+       id="rect4195"
+       x="5"
+       y="13"
+       width="12"
+       height="1.9999993"
+       color="#000001"
+       fill="#3d3d3c"
+       style="stroke-width:0.784465;fill:#3d3d3c;fill-opacity:1" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__eject_active_12.svg b/res/skins/LateNight/palemoon/buttons/btn__eject_active_12.svg
new file mode 100644
index 000000000000..6beed1fefdd1
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__eject_active_12.svg
@@ -0,0 +1,45 @@
+<?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"
+   viewBox="0 0 21 18"
+   version="1.1"
+   height="18"
+   width="21"
+   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
+     style="fill:#988f86;fill-opacity:1"
+     id="g981">
+    <path
+       id="path3936-0-8-9-7-1"
+       d="M 4.4321514,11 11,3.7280156 17.567745,11 H 4.4324631"
+       fill="#3d3d3c"
+       style="stroke-width:1.03885;fill:#988f86;fill-opacity:1" />
+    <rect
+       id="rect4195"
+       x="5"
+       y="13"
+       width="12"
+       height="1.9999993"
+       color="#000001"
+       fill="#3d3d3c"
+       style="stroke-width:0.784465;fill:#988f86;fill-opacity:1" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__eject_active_34.svg b/res/skins/LateNight/palemoon/buttons/btn__eject_active_34.svg
new file mode 100644
index 000000000000..eb64a267dc8e
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__eject_active_34.svg
@@ -0,0 +1,45 @@
+<?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"
+   viewBox="0 0 21 18"
+   version="1.1"
+   height="18"
+   width="21"
+   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
+     style="fill:#559b99;fill-opacity:1"
+     id="g981">
+    <path
+       id="path3936-0-8-9-7-1"
+       d="M 4.4321514,11 11,3.7280156 17.567745,11 H 4.4324631"
+       fill="#3d3d3c"
+       style="stroke-width:1.03885;fill:#559b99;fill-opacity:1" />
+    <rect
+       id="rect4195"
+       x="5"
+       y="13"
+       width="12"
+       height="1.9999993"
+       color="#000001"
+       fill="#3d3d3c"
+       style="stroke-width:0.784465;fill:#559b99;fill-opacity:1" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__eq_kill_dot_active_green.svg b/res/skins/LateNight/palemoon/buttons/btn__eq_kill_dot_active_green.svg
new file mode 100644
index 000000000000..08bd77d3b24e
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__eq_kill_dot_active_green.svg
@@ -0,0 +1,10 @@
+<svg width="6" height="6" version="1.1" viewBox="0 0 6 6" xmlns="http://www.w3.org/2000/svg">
+		<defs>
+				<linearGradient id="a" x1=".077504925" x2="4.9224949" y1="2.5" y2="2.5" gradientTransform="rotate(-90,0,6)" gradientUnits="userSpaceOnUse">
+						<stop offset="0"/>
+						<stop stop-color="#727272" offset="1"/>
+				</linearGradient>
+		</defs>
+		<path d="m-5.6224949 3.5c0 1.1716273.9508677 2.1224951 2.1224949 2.1224951 1.1716273 0 2.1224949-.9508678 2.1224949-2.1224951 0-1.1716272-.9508676-2.1224951-2.1224948-2.1224951-1.1716273 0-2.122495.9508679-2.122495 2.1224951z" fill="#e49100" stroke="url(#a)" stroke-width=".60000002"/>
+		<path d="m0 3.0000006c0 1.6560141 1.343986 3.0000001 3.0000001 3.0000001 1.6560143 0 3.0000001-1.343986 3.0000001-3.0000001s-1.3439858-3.000000164-3-3.000000164-3.0000002 1.343986064-3.0000002 3.000000164z" fill="#7db200"/>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__eq_kill_dot_active_red.svg b/res/skins/LateNight/palemoon/buttons/btn__eq_kill_dot_active_red.svg
new file mode 100644
index 000000000000..25206e16b436
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__eq_kill_dot_active_red.svg
@@ -0,0 +1,10 @@
+<svg width="6" height="6" version="1.1" viewBox="0 0 6 6" xmlns="http://www.w3.org/2000/svg">
+		<defs>
+				<linearGradient id="a" x1=".077504925" x2="4.9224949" y1="2.5" y2="2.5" gradientTransform="rotate(-90,0,6)" gradientUnits="userSpaceOnUse">
+						<stop offset="0"/>
+						<stop stop-color="#727272" offset="1"/>
+				</linearGradient>
+		</defs>
+		<path d="m-5.6224949 3.5c0 1.1716273.9508677 2.1224951 2.1224949 2.1224951 1.1716273 0 2.1224949-.9508678 2.1224949-2.1224951 0-1.1716272-.9508676-2.1224951-2.1224948-2.1224951-1.1716273 0-2.122495.9508679-2.122495 2.1224951z" fill="#e49100" stroke="url(#a)" stroke-width=".60000002"/>
+		<path d="m0 2.9999998c0 1.656014 1.3439858 2.9999998 2.9999999 2.9999998 1.6560143 0 3-1.3439858 3-2.9999998 0-1.6560141-1.3439857-3-2.9999998-3-1.6560143 0-3.0000001 1.3439859-3.0000001 3z" fill="#f42300" stroke-width=".99999988"/>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__eq_kill_dot_off.svg b/res/skins/LateNight/palemoon/buttons/btn__eq_kill_dot_off.svg
new file mode 100644
index 000000000000..f59071930cca
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__eq_kill_dot_off.svg
@@ -0,0 +1,10 @@
+<svg width="6" height="6" version="1.1" viewBox="0 0 6 6" xmlns="http://www.w3.org/2000/svg">
+		<defs>
+				<linearGradient id="a" x1=".077504925" x2="4.9224949" y1="2.5" y2="2.5" gradientTransform="rotate(-90,0,6)" gradientUnits="userSpaceOnUse">
+						<stop offset="0"/>
+						<stop stop-color="#727272" offset="1"/>
+				</linearGradient>
+		</defs>
+		<path d="m-5.6224949 3.5c0 1.1716273.9508677 2.1224951 2.1224949 2.1224951 1.1716273 0 2.1224949-.9508678 2.1224949-2.1224951 0-1.1716272-.9508676-2.1224951-2.1224948-2.1224951-1.1716273 0-2.122495.9508679-2.122495 2.1224951z" fill="#e49100" stroke="url(#a)" stroke-width=".60000002"/>
+		<path d="m 0,2.9999998 c 0,1.6560141 1.3439858,3 2.9999999,3 1.6560143,0 3,-1.3439859 3,-3 C 5.9999999,1.3439859 4.6560142,-1.24e-7 3.0000001,-1.24e-7 1.3439858,-1.24e-7 0,1.3439859 0,2.9999998 Z" fill="#535353"/>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__eq_kill_high.svg b/res/skins/LateNight/palemoon/buttons/btn__eq_kill_high.svg
new file mode 100644
index 000000000000..5acb92b29f71
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__eq_kill_high.svg
@@ -0,0 +1,68 @@
+<?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="18"
+   height="18"
+   version="1.1"
+   id="svg17">
+  <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="defs9">
+    <linearGradient
+       id="a"
+       x1="2"
+       x2="24"
+       y1="12"
+       y2="12"
+       gradientTransform="matrix(.69565216 0 0 .69565216 -.04349915 -16.652173)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-opacity=".0047619"
+         offset="0"
+         id="stop2" />
+      <stop
+         stop-opacity="0"
+         offset=".5"
+         id="stop4" />
+      <stop
+         stop-opacity=".47451"
+         offset="1"
+         id="stop6" />
+    </linearGradient>
+  </defs>
+  <text
+     id="text838"
+     y="14.63623"
+     x="3.9139636"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:13.33333302px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       y="14.63623"
+       x="3.9139636"
+       id="tspan836">H</tspan></text>
+  <text
+     id="text838-3"
+     y="14.63623"
+     x="3.9139636"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#a89a8c;fill-opacity:1;stroke:none"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:13.33333302px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:#a89a8c;fill-opacity:1"
+       y="14.63623"
+       x="3.9139636"
+       id="tspan836-6">H</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__eq_kill_low.svg b/res/skins/LateNight/palemoon/buttons/btn__eq_kill_low.svg
new file mode 100644
index 000000000000..b8a4517a9f00
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__eq_kill_low.svg
@@ -0,0 +1,68 @@
+<?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="18"
+   height="18"
+   version="1.1"
+   id="svg17">
+  <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="defs9">
+    <linearGradient
+       id="a"
+       x1="2"
+       x2="24"
+       y1="12"
+       y2="12"
+       gradientTransform="matrix(.69565216 0 0 .69565216 -.04349915 -16.652173)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-opacity=".0047619"
+         offset="0"
+         id="stop2" />
+      <stop
+         stop-opacity="0"
+         offset=".5"
+         id="stop4" />
+      <stop
+         stop-opacity=".47451"
+         offset="1"
+         id="stop6" />
+    </linearGradient>
+  </defs>
+  <text
+     id="text838"
+     y="14.63623"
+     x="5.1662478"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:13.33333302px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       y="14.63623"
+       x="5.1662478"
+       id="tspan836">L</tspan></text>
+  <text
+     id="text838-3"
+     y="14.63623"
+     x="5.1662478"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#a89a8c;fill-opacity:1;stroke:none"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:13.33333302px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:#a89a8c;fill-opacity:1"
+       y="14.63623"
+       x="5.1662478"
+       id="tspan836-6">L</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__eq_kill_mid.svg b/res/skins/LateNight/palemoon/buttons/btn__eq_kill_mid.svg
new file mode 100644
index 000000000000..ab2d76247691
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__eq_kill_mid.svg
@@ -0,0 +1,68 @@
+<?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="18"
+   height="18"
+   version="1.1"
+   id="svg17">
+  <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="defs9">
+    <linearGradient
+       id="a"
+       x1="2"
+       x2="24"
+       y1="12"
+       y2="12"
+       gradientTransform="matrix(.69565216 0 0 .69565216 -.04349915 -16.652173)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-opacity=".0047619"
+         offset="0"
+         id="stop2" />
+      <stop
+         stop-opacity="0"
+         offset=".5"
+         id="stop4" />
+      <stop
+         stop-opacity=".47451"
+         offset="1"
+         id="stop6" />
+    </linearGradient>
+  </defs>
+  <text
+     id="text838"
+     y="14.63623"
+     x="2.7904694"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:13.33333302px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       y="14.63623"
+       x="2.7904694"
+       id="tspan836">M</tspan></text>
+  <text
+     id="text838-3"
+     y="14.63623"
+     x="2.7904694"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#a89a8c;fill-opacity:1;stroke:none"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:13.33333302px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:#a89a8c;fill-opacity:1"
+       y="14.63623"
+       x="2.7904694"
+       id="tspan836-6">M</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__expand_dim.svg b/res/skins/LateNight/palemoon/buttons/btn__expand_dim.svg
new file mode 100644
index 000000000000..7bc0dab78c1e
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__expand_dim.svg
@@ -0,0 +1,55 @@
+<?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="16"
+   height="18"
+   version="1.1"
+   id="svg16">
+  <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="defs20" />
+  <g
+     transform="translate(-3.0000331,-1.999548)"
+     id="g8"
+     style="fill:none;stroke:#000001;stroke-width:1.60000002;stroke-linejoin:round">
+    <g
+       transform="matrix(0.93992449,0,0,0.93992449,1.6003517,1.6003969)"
+       id="g6"
+       style="fill:none;stroke:#000001;stroke-width:1.70226443;stroke-linejoin:round">
+      <path
+         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"
+         id="path2" />
+      <path
+         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"
+         id="path4" />
+    </g>
+  </g>
+  <g
+     transform="matrix(0.93992449,0,0,0.93992449,-1.3996814,-0.3991511)"
+     id="g14"
+     style="fill:#666668;fill-opacity:1">
+    <path
+       style="fill:#666668;fill-opacity:1"
+       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"
+       id="path10" />
+    <path
+       style="fill:#666668;fill-opacity:1"
+       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"
+       id="path12" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__fx_focus.svg b/res/skins/LateNight/palemoon/buttons/btn__fx_focus.svg
new file mode 100644
index 000000000000..de337872a2c3
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__fx_focus.svg
@@ -0,0 +1,53 @@
+<?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="18"
+   height="18"
+   version="1.1"
+   id="svg22">
+  <metadata
+     id="metadata28">
+    <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="defs26">
+    <linearGradient
+       id="linearGradient903">
+      <stop
+         id="stop899"
+         offset="0"
+         style="stop-color:#333333;stop-opacity:1;" />
+      <stop
+         id="stop901"
+         offset="1"
+         style="stop-color:#010101;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="2.1355932"
+       x2="6.4322033"
+       y1="15.864407"
+       x1="11.491526"
+       id="linearGradient905"
+       xlink:href="#linearGradient903" />
+  </defs>
+  <circle
+     style="opacity:1;fill:#101010;fill-opacity:1;stroke:url(#linearGradient905);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path1001"
+     cx="9"
+     cy="9"
+     r="7" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__fx_focus_active.svg b/res/skins/LateNight/palemoon/buttons/btn__fx_focus_active.svg
new file mode 100644
index 000000000000..7f4132538802
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__fx_focus_active.svg
@@ -0,0 +1,79 @@
+<?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="18"
+   height="18"
+   version="1.1"
+   id="svg32">
+  <metadata
+     id="metadata38">
+    <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="defs36">
+    <linearGradient
+       id="linearGradient1005">
+      <stop
+         style="stop-color:#b24c12;stop-opacity:1"
+         offset="0"
+         id="stop1001" />
+      <stop
+         style="stop-color:#59250b;stop-opacity:1"
+         offset="1"
+         id="stop1003" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient1005"
+       id="linearGradient1007-3"
+       x1="7.0999489"
+       y1="2.9420629"
+       x2="10.925795"
+       y2="13.343758"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92167042,0,0,0.92167042,0.70496669,0.70496669)" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="2.1355932"
+       x2="6.4322033"
+       y1="15.864407"
+       x1="11.491526"
+       id="linearGradient905"
+       xlink:href="#linearGradient903" />
+    <linearGradient
+       id="linearGradient903">
+      <stop
+         id="stop899"
+         offset="0"
+         style="stop-color:#333333;stop-opacity:1;" />
+      <stop
+         id="stop901"
+         offset="1"
+         style="stop-color:#010101;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <circle
+     style="opacity:1;fill:#101010;fill-opacity:1;stroke:url(#linearGradient905);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path1001"
+     cx="9"
+     cy="9"
+     r="7" />
+  <circle
+     style="opacity:1;fill:url(#linearGradient1007-3);fill-opacity:1;stroke:none;stroke-width:0.92167038;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path1001-5"
+     cx="9"
+     cy="9"
+     r="6.4516926" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__fx_mixmode_d+w.svg b/res/skins/LateNight/palemoon/buttons/btn__fx_mixmode_d+w.svg
new file mode 100644
index 000000000000..4a8484be2332
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__fx_mixmode_d+w.svg
@@ -0,0 +1,56 @@
+<?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="28"
+   height="24"
+   version="1.1"
+   id="svg12">
+  <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="defs16" />
+  <g
+     id="g851">
+    <path
+       style="fill:none;stroke-linecap:round"
+       d="M 3.461888,8.0017027 H 24.433404"
+       stroke="#0d0505"
+       stroke-opacity="0.99608"
+       stroke-width="3.2"
+       id="path2" />
+    <path
+       style="fill:none;stroke-linecap:round"
+       d="M 24.433204,8.0017027 C 9.7535425,11.747304 3.461688,17.989903 3.461688,17.989903"
+       stroke="#0d0505"
+       stroke-opacity="0.99608"
+       stroke-width="3.2"
+       id="path6" />
+  </g>
+  <path
+     stroke="#b5b5b5"
+     stroke-width="2"
+     stroke-opacity=".99216003"
+     style="fill:none;fill-opacity:1;stroke:#918273;stroke-linecap:round;stroke-opacity:1"
+     id="path4"
+     d="M 3.461888,8.0017026 H 24.433404" />
+  <path
+     stroke="#da0606"
+     stroke-width="2"
+     id="path8"
+     d="M 24.433204,8.0017026 C 9.7535425,11.747303 3.461688,17.989903 3.461688,17.989903"
+     style="fill:none;stroke-linecap:round" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__fx_mixmode_d-w.svg b/res/skins/LateNight/palemoon/buttons/btn__fx_mixmode_d-w.svg
new file mode 100644
index 000000000000..2d214c283321
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__fx_mixmode_d-w.svg
@@ -0,0 +1,57 @@
+<?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="svg12"
+   version="1.1"
+   height="24"
+   width="28">
+  <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="defs16" />
+  <g
+     style="stroke:#060202;stroke-opacity:0.99607998;stroke-linejoin:round;fill:none"
+     id="g899">
+    <path
+       style="fill:none;stroke-linecap:round;stroke:#060202;stroke-opacity:0.99607998;stroke-linejoin:round"
+       id="path2"
+       stroke-width="3.2"
+       stroke-opacity="0.99608"
+       stroke="#060202"
+       d="m 3.5140858,7.001704 c 14.6820002,3.7456 20.9750002,9.9882 20.9750002,9.9882" />
+    <path
+       style="fill:none;stroke-linecap:round;stroke:#060202;stroke-opacity:0.99607998;stroke-linejoin:round"
+       id="path6"
+       stroke-width="3.2"
+       stroke-opacity="0.99608"
+       stroke="#060202"
+       d="m 24.486286,7.001704 c -14.6819998,3.7456 -20.9750002,9.9882 -20.9750002,9.9882" />
+  </g>
+  <path
+     d="m 3.5140858,7.001704 c 14.6820002,3.7456 20.9750002,9.9882 20.9750002,9.9882"
+     stroke="#b5b5b5"
+     stroke-opacity=".99216003"
+     stroke-width="2"
+     id="path4"
+     style="fill:none;fill-opacity:1;stroke:#918273;stroke-linecap:round;stroke-opacity:1" />
+  <path
+     d="m 24.486286,7.001704 c -14.6819998,3.7456 -20.9750002,9.9882 -20.9750002,9.9882"
+     stroke="#da0606"
+     stroke-width="2"
+     id="path8"
+     style="fill:none;stroke-linecap:round" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__fx_selector_down.svg b/res/skins/LateNight/palemoon/buttons/btn__fx_selector_down.svg
new file mode 100644
index 000000000000..ff686f7daae3
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__fx_selector_down.svg
@@ -0,0 +1,38 @@
+<?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="svg6"
+   version="1.1"
+   height="24"
+   width="16">
+  <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" />
+  <path
+     id="path2"
+     stroke-width="1.6"
+     stroke="#000001"
+     fill="none"
+     d="m8 15.918 4.5715-7.9181h-9.143z"
+     style="stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" />
+  <path
+     style="fill:#918273;fill-opacity:1"
+     id="path4"
+     fill="#888"
+     d="m8 15.918 4.5715-7.9181h-9.143z" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__fx_toggle.svg b/res/skins/LateNight/palemoon/buttons/btn__fx_toggle.svg
new file mode 100644
index 000000000000..9b15c050da00
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__fx_toggle.svg
@@ -0,0 +1,56 @@
+<?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="svg12"
+   version="1.1"
+   height="22"
+   width="22">
+  <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="defs16" />
+  <g
+     style="stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+     fill="none"
+     stroke="#000001"
+     stroke-width="1.6"
+     id="g6">
+    <path
+       style="stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+       id="path2"
+       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
+       style="stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+       id="path4"
+       d="m11.999999 3h-1.9999998v6.0000003h1.9999998z" />
+  </g>
+  <g
+     style="fill:#918273;fill-opacity:1"
+     id="g830">
+    <path
+       style="fill:#918273;fill-opacity:1"
+       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="#918273"
+       id="path8" />
+    <path
+       style="fill:#918273;fill-opacity:1"
+       d="m11.999999 3.0000001h-1.9999998v6.0000003h1.9999998z"
+       fill="#918273"
+       stroke-width=".99999994"
+       id="path10" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__fx_toggle_active.svg b/res/skins/LateNight/palemoon/buttons/btn__fx_toggle_active.svg
similarity index 100%
rename from res/skins/LateNight/buttons_flip/btn__fx_toggle_active.svg
rename to res/skins/LateNight/palemoon/buttons/btn__fx_toggle_active.svg
diff --git a/res/skins/LateNight/palemoon/buttons/btn__intro_end.svg b/res/skins/LateNight/palemoon/buttons/btn__intro_end.svg
new file mode 100644
index 000000000000..0d90052d3931
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__intro_end.svg
@@ -0,0 +1,63 @@
+<?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="svg14"
+   version="1.1"
+   height="24"
+   width="18">
+  <metadata
+     id="metadata20">
+    <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="defs18" />
+  <g
+     style="stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+     id="g6"
+     stroke-width="1.6"
+     stroke-linecap="square"
+     stroke="#000001"
+     fill="none"
+     transform="translate(-2.99971)">
+    <rect
+       id="rect2"
+       style="paint-order:markers fill stroke;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+       height="10"
+       width="2"
+       y="7"
+       x="-18"
+       transform="scale(-1,1)" />
+    <path
+       style="stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+       id="path4"
+       d="m5 17 9-10v10z" />
+  </g>
+  <g
+     id="g12"
+     fill="#918273"
+     transform="translate(-2.99971)">
+    <rect
+       id="rect8"
+       style="paint-order:markers fill stroke"
+       height="10"
+       width="2"
+       y="7"
+       x="-18"
+       transform="scale(-1,1)" />
+    <path
+       id="path10"
+       d="m5 17 9-10v10z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__intro_end_active.svg b/res/skins/LateNight/palemoon/buttons/btn__intro_end_active.svg
new file mode 100644
index 000000000000..7bb3c8e157e7
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__intro_end_active.svg
@@ -0,0 +1,44 @@
+<?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="svg14"
+   version="1.1"
+   height="24"
+   width="18">
+  <metadata
+     id="metadata20">
+    <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="defs18" />
+  <g
+     style="fill:#000001;fill-opacity:1"
+     id="g12"
+     fill="#a89a8c"
+     transform="translate(-2.99971)">
+    <rect
+       id="rect8"
+       style="paint-order:markers fill stroke;fill:#000001;fill-opacity:1"
+       height="10"
+       width="2"
+       y="7"
+       x="-18"
+       transform="scale(-1,1)" />
+    <path
+       style="fill:#000001;fill-opacity:1"
+       id="path10"
+       d="m5 17 9-10v10z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__intro_start.svg b/res/skins/LateNight/palemoon/buttons/btn__intro_start.svg
new file mode 100644
index 000000000000..4b5cb31406fe
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__intro_start.svg
@@ -0,0 +1,61 @@
+<?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="svg14"
+   version="1.1"
+   height="24"
+   width="18">
+  <metadata
+     id="metadata20">
+    <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="defs18" />
+  <g
+     style="stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+     id="g6"
+     stroke-width="1.6"
+     stroke-linecap="square"
+     stroke="#000001"
+     fill="none"
+     transform="translate(-3)">
+    <rect
+       id="rect2"
+       style="paint-order:markers fill stroke;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+       height="10"
+       width="2"
+       y="7"
+       x="6" />
+    <path
+       style="stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+       id="path4"
+       d="m9 17 9-10v10z" />
+  </g>
+  <g
+     id="g12"
+     fill="#918273"
+     transform="translate(-3)">
+    <rect
+       id="rect8"
+       style="paint-order:markers fill stroke"
+       height="10"
+       width="2"
+       y="7"
+       x="6" />
+    <path
+       id="path10"
+       d="m9 17 9-10v10z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__intro_start_active.svg b/res/skins/LateNight/palemoon/buttons/btn__intro_start_active.svg
new file mode 100644
index 000000000000..b959d6b8391a
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__intro_start_active.svg
@@ -0,0 +1,43 @@
+<?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="svg14"
+   version="1.1"
+   height="24"
+   width="18">
+  <metadata
+     id="metadata20">
+    <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="defs18" />
+  <g
+     style="fill:#000001;fill-opacity:1"
+     id="g12"
+     fill="#a89a8c"
+     transform="translate(-3)">
+    <rect
+       id="rect8"
+       style="paint-order:markers fill stroke;fill:#000001;fill-opacity:1"
+       height="10"
+       width="2"
+       y="7"
+       x="6" />
+    <path
+       style="fill:#000001;fill-opacity:1"
+       id="path10"
+       d="m9 17 9-10v10z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__jump_left.svg b/res/skins/LateNight/palemoon/buttons/btn__jump_left.svg
new file mode 100644
index 000000000000..54aad2180c15
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__jump_left.svg
@@ -0,0 +1,58 @@
+<?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="svg14"
+   version="1.1"
+   height="24"
+   width="24">
+  <metadata
+     id="metadata20">
+    <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="defs18" />
+  <g
+     style="stroke-linejoin:round"
+     id="g6"
+     stroke="#000001"
+     fill="none"
+     transform="matrix(-1,0,0,1,24.001,0)">
+    <path
+       style="stroke-linejoin:round"
+       id="path2"
+       stroke-width="1.6"
+       stroke-linecap="square"
+       d="m17 7v10h1v-10z" />
+    <path
+       style="stroke-linejoin:round"
+       id="path4"
+       stroke-width="1.5999999"
+       stroke-linejoin="round"
+       stroke-linecap="round"
+       d="M 6.0104936,6.6784736 14.001,12.005731 6.0104936,17.33299 V 6.6784736" />
+  </g>
+  <g
+     id="g12"
+     fill="#918273"
+     transform="matrix(-1,0,0,1,24.001,0)">
+    <path
+       id="path8"
+       d="m17 7v10h1v-10" />
+    <path
+       id="path10"
+       stroke-width=".99999994"
+       d="M 6.0104936,6.6733845 14.001,12.000642 6.0104936,17.327901 V 6.6733845" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__jump_left_active.svg b/res/skins/LateNight/palemoon/buttons/btn__jump_left_active.svg
new file mode 100644
index 000000000000..637f60a0ffa2
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__jump_left_active.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+		<g transform="matrix(-1,0,0,1,24.010494,0)" fill="#000001">
+				<path d="m17 7v10h1v-10"/>
+				<path d="M 6.0104936,6.6733845 14.001,12.000642 6.0104936,17.327901 V 6.6733845" stroke-width=".99999994"/>
+		</g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__jump_right.svg b/res/skins/LateNight/palemoon/buttons/btn__jump_right.svg
new file mode 100644
index 000000000000..32e34b10cea3
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__jump_right.svg
@@ -0,0 +1,56 @@
+<?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="svg14"
+   version="1.1"
+   height="24"
+   width="24">
+  <metadata
+     id="metadata20">
+    <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="defs18" />
+  <g
+     style="stroke-linejoin:round"
+     id="g6"
+     stroke="#000001"
+     fill="none">
+    <path
+       style="stroke-linejoin:round"
+       id="path2"
+       stroke-width="1.6"
+       stroke-linecap="square"
+       d="m17 7v10h1v-10z" />
+    <path
+       style="stroke-linejoin:round"
+       id="path4"
+       stroke-width="1.5999999"
+       stroke-linejoin="round"
+       stroke-linecap="round"
+       d="M 6.0104936,6.6784736 14.001,12.005731 6.0104936,17.33299 V 6.6784736" />
+  </g>
+  <g
+     id="g12"
+     fill="#918273">
+    <path
+       id="path8"
+       d="m17 7v10h1v-10" />
+    <path
+       id="path10"
+       stroke-width=".99999994"
+       d="M 6.0104936,6.6733845 14.001,12.000642 6.0104936,17.327901 V 6.6733845" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__jump_right_active.svg b/res/skins/LateNight/palemoon/buttons/btn__jump_right_active.svg
new file mode 100644
index 000000000000..9db0a673605e
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__jump_right_active.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+		<g fill="#000001">
+				<path d="m17 7v10h1v-10"/>
+				<path d="M 6.0104936,6.6733845 14.001,12.000642 6.0104936,17.327901 V 6.6733845" stroke-width=".99999994"/>
+		</g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__key_down.svg b/res/skins/LateNight/palemoon/buttons/btn__key_down.svg
new file mode 100644
index 000000000000..cbf40b07faa3
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__key_down.svg
@@ -0,0 +1,39 @@
+<?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="svg6"
+   version="1.1"
+   height="9"
+   width="10">
+  <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" />
+  <path
+     id="path2"
+     stroke-width="1.60000002"
+     stroke-linejoin="round"
+     stroke="#000001"
+     fill="none"
+     d="m5.0000515 8.00008-3.4641429-6h6.9281999z" />
+  <path
+     style="fill:#a89a8c;fill-opacity:1"
+     id="path4"
+     stroke-width=".85714287"
+     fill="#bfbfbe"
+     d="m5.0000515 8.00008-3.4641429-6h6.9281999z" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__key_down_active.svg b/res/skins/LateNight/palemoon/buttons/btn__key_down_active.svg
new file mode 100644
index 000000000000..3f367e4ed342
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__key_down_active.svg
@@ -0,0 +1,3 @@
+<svg width="10" height="9" version="1.1" xmlns="http://www.w3.org/2000/svg">
+		<path d="m5.0000515 8.00008-3.4641429-6h6.9281999z" fill="#000001"/>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__key_match.svg b/res/skins/LateNight/palemoon/buttons/btn__key_match.svg
new file mode 100644
index 000000000000..1d0fec0d35cd
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__key_match.svg
@@ -0,0 +1,57 @@
+<?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="svg10"
+   version="1.1"
+   height="16"
+   width="16">
+  <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="defs14" />
+  <g
+     id="g4"
+     aria-label="♪"
+     stroke-width="2.06548419"
+     stroke-linejoin="round"
+     stroke-linecap="round"
+     stroke="#000001"
+     fill="none"
+     transform="matrix(.77463677 0 0 .77463677 19.507552 .20097752)">
+    <path
+       id="path2"
+       stroke-width="2.06548419"
+       stroke-linejoin="round"
+       stroke-linecap="round"
+       stroke="#000001"
+       fill="none"
+       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" />
+  </g>
+  <g
+     style="fill:#a89a8c;fill-opacity:1"
+     id="g8"
+     aria-label="♪"
+     fill="#bfbfbe"
+     transform="matrix(.77463677 0 0 .77463677 19.507552 .20097721)">
+    <path
+       style="fill:#a89a8c;fill-opacity:1"
+       id="path6"
+       stroke-width="1.29092765"
+       fill="#bfbfbe"
+       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" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__key_match_active.svg b/res/skins/LateNight/palemoon/buttons/btn__key_match_active.svg
new file mode 100644
index 000000000000..5843d7564fda
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__key_match_active.svg
@@ -0,0 +1,5 @@
+<svg width="16" height="16" version="1.1" xmlns="http://www.w3.org/2000/svg">
+		<g transform="matrix(.77463677 0 0 .77463677 19.507552 .20097721)" fill="#000001" 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="#000001" stroke-width="1.29092765"/>
+		</g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__key_up.svg b/res/skins/LateNight/palemoon/buttons/btn__key_up.svg
new file mode 100644
index 000000000000..b4130953cbc6
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__key_up.svg
@@ -0,0 +1,39 @@
+<?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="svg6"
+   version="1.1"
+   height="9"
+   width="10">
+  <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" />
+  <path
+     id="path2"
+     stroke-width="1.60000002"
+     stroke-linejoin="round"
+     stroke="#000001"
+     fill="none"
+     d="M 5.0000515,0.99999999 1.5359086,7 h 6.9281999 z" />
+  <path
+     style="fill:#a89a8c;fill-opacity:1"
+     id="path4"
+     stroke-width=".85714287"
+     fill="#bfbfbe"
+     d="M 5.0000515,0.99999999 1.5359086,7 h 6.9281999 z" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__key_up_active.svg b/res/skins/LateNight/palemoon/buttons/btn__key_up_active.svg
new file mode 100644
index 000000000000..3db6c08ae7dd
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__key_up_active.svg
@@ -0,0 +1,3 @@
+<svg width="10" height="9" version="1.1" xmlns="http://www.w3.org/2000/svg">
+		<path d="m5.0000515 1-3.4641429 6h6.9281999z" fill="#000001"/>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__keylock.svg b/res/skins/LateNight/palemoon/buttons/btn__keylock.svg
new file mode 100644
index 000000000000..5bea4d8efa3b
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__keylock.svg
@@ -0,0 +1,37 @@
+<?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"
+   viewBox="0 0 21 18"
+   version="1.1"
+   height="18"
+   width="21"
+   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="fill:#444443;fill-opacity:1"
+     fill="#766d65"
+     color="#000001"
+     d="m 4,8 v 7 H 17 V 8 Z m 6,2 h 1 v 3 h -1 z"
+     id="rect4195" />
+  <path
+     id="path1060"
+     style="fill:#444443;fill-opacity:1;stroke:none;stroke-width:1.70255;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 10.5 2.5 C 9.1432002 2.5 7.9402841 3.1128036 7.1152344 4.0625 L 8.6191406 5.3691406 C 9.0775198 4.8408028 9.7456226 4.5 10.5 4.5 C 11.880712 4.5 13 5.6192881 13 7 L 13 8 L 15 8 L 15 7 C 15 4.5147186 12.985281 2.5 10.5 2.5 z " />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__keylock_active_12.svg b/res/skins/LateNight/palemoon/buttons/btn__keylock_active_12.svg
new file mode 100644
index 000000000000..029e0be4453b
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__keylock_active_12.svg
@@ -0,0 +1,37 @@
+<?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="21"
+   height="18"
+   version="1.1"
+   viewBox="0 0 21 18">
+  <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
+     id="rect4195"
+     d="m 4,8 v 7 H 17 V 8 Z m 6,2 h 1 v 3 h -1 z"
+     color="#000001"
+     fill="#766d65"
+     style="fill:#988f86;fill-opacity:1" />
+  <path
+     d="M 10.5,2.5 C 8.0147186,2.5 6,4.5147186 6,7 V 8 H 8 V 7 C 8,5.6192881 9.1192881,4.5 10.5,4.5 11.880712,4.5 13,5.6192881 13,7 v 1 h 2 V 7 C 15,4.5147186 12.985281,2.5 10.5,2.5 Z"
+     style="fill:#b9b3ac;fill-opacity:1;stroke:none;stroke-width:1.70255;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path1060" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__keylock_active_34.svg b/res/skins/LateNight/palemoon/buttons/btn__keylock_active_34.svg
new file mode 100644
index 000000000000..4b650c5a0ea3
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__keylock_active_34.svg
@@ -0,0 +1,37 @@
+<?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="21"
+   height="18"
+   version="1.1"
+   viewBox="0 0 21 18">
+  <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
+     id="rect4195"
+     d="m 4,8 v 7 H 17 V 8 Z m 6,2 h 1 v 3 h -1 z"
+     color="#000001"
+     fill="#766d65"
+     style="fill:#559b99;fill-opacity:1" />
+  <path
+     d="M 10.5,2.5 C 8.0147186,2.5 6,4.5147186 6,7 V 8 H 8 V 7 C 8,5.6192881 9.1192881,4.5 10.5,4.5 11.880712,4.5 13,5.6192881 13,7 v 1 h 2 V 7 C 15,4.5147186 12.985281,2.5 10.5,2.5 Z"
+     style="fill:#84aeaa;fill-opacity:1;stroke:none;stroke-width:1.70255;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path1060" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_bpm_locked_black.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_bpm_locked_black.svg
new file mode 100644
index 000000000000..533877a8e06a
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_bpm_locked_black.svg
@@ -0,0 +1,3 @@
+<svg width="10" height="12" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<path d="m4.9765625 0c-1.4489106.00994182-2.441829.65947319-2.9335937 1.4238281-.491765.764355-.5464175 1.549471-.5429688 1.9726563.0047842.5863697.0007237 2.2786766 0 2.6035156h-.66601562c-.41667001 0-.83398438.4149781-.83398438.8300781v4.3398439c0 .4151.41732437.830078.83398438.830078h8.33203122c.41667 0 .8339844-.414978.8339844-.830078v-4.3398439c0-.4151-.4173244-.8300781-.8339844-.8300781h-.6660156c.000169-.2983616.0009685-1.5773226 0-2.171875-.0010016-.6121197-.0602547-1.5109887-.5585938-2.3417969-.4983389-.83080816-1.5189215-1.49626715-2.9648437-1.4863281zm.0097656 1.5c1.0446779-.007181 1.4069609.3194157 1.6699219.7578125s.3429516 1.0862385.34375 1.5742187c.0009639.5890622.0001684 1.8689344 0 2.1679688h-4c.0007682-.324936.0050349-1.9972105 0-2.6152344-.0019313-.2369985.0561849-.7641406.3046875-1.1503906s.6238412-.7271168 1.6816406-.734375zm-2.9863281 6.5h6c.277 0 .5.223.5.5s-.223.5-.5.5h-6c-.277 0-.5-.223-.5-.5s.223-.5.5-.5zm0 2h6c.277 0 .5.223.5.5s-.223.5-.5.5h-6c-.277 0-.5-.223-.5-.5s.223-.5.5-.5z" color="#000001" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000001" 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:#000001;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/palemoon/buttons/btn__lib_bpm_locked_orange.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_bpm_locked_orange.svg
new file mode 100644
index 000000000000..2f902297b1f1
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_bpm_locked_orange.svg
@@ -0,0 +1,34 @@
+<?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="12"
+   width="10"
+   id="svg2">
+  <metadata
+     id="metadata11">
+    <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" />
+  <path
+     style="fill:none;stroke:#4097ba;stroke-width:1.5;stroke-opacity:1"
+     d="m 2.25,6.25 c 0,0 0.00538,-2.2 0,-2.8599 C 2.24462,2.72992 2.47449,0.7674 4.9812,0.7502 7.4718,0.73308 7.7482,2.73 7.75,3.8301 c 0.00108,0.65999 0,2.42 0,2.42"
+     id="path8889-9" />
+  <path
+     style="color:#000001;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#4097ba;fill-opacity:1"
+     d="M 0.83398,6 C 0.41731,6 0,6.41498 0,6.83008 v 4.3398 c 0,0.4151 0.41732,0.83008 0.83398,0.83008 h 8.332 c 0.41667,0 0.83398,-0.41498 0.83398,-0.83008 V 6.83008 C 9.99996,6.41498 9.58264,6 9.16598,6 Z m 1.166,2 h 6 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 h -6 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z m 0,2 h 6 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 h -6 c -0.277,0 -0.5,-0.223 -0.5,-0.5 0,-0.277 0.223,-0.5 0.5,-0.5 z"
+     id="rect8885-1" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_bpm_unlocked_black.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_bpm_unlocked_black.svg
new file mode 100644
index 000000000000..68c242967754
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_bpm_unlocked_black.svg
@@ -0,0 +1,5 @@
+<svg width="10" height="12" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(0,-20)">
+		<path transform="translate(0,20)" d="m4.9766 0c-1.4489.01-2.4418.65947-2.9336 1.4238l1.26172.81059c.2485-.38625.62385-.7271 1.6816-.73438 1.0447-.00718 1.407.31941 1.6699.75781.26297.4384.34296 1.0862.34375 1.5742.0009639.58906.0001684 1.8689 0 2.168h-6.166c-.41667 0-.83398.41498-.83398.83008v4.3398c0 .4151.41732.83008.83398.83008h8.332c.41667 0 .83398-.41498.83398-.83008v-4.3398c0-.4151-.41732-.83008-.83398-.83008h-.66602c.000169-.29836.0009685-1.5773 0-2.1719-.0009966-.61214-.060246-1.5129-.55859-2.3438-.49835-.83081-1.5189-1.4943-2.9648-1.4844zm-2.9766 8h6c.277 0 .5.223.5.5s-.223.5-.5.5h-6c-.277 0-.5-.223-.5-.5s.223-.5.5-.5zm0 2h6c.277 0 .5.223.5.5s-.223.5-.5.5h-6c-.277 0-.5-.223-.5-.5s.223-.5.5-.5z" color="#000001" color-rendering="auto" dominant-baseline="auto" image-rendering="auto" shape-rendering="auto" solid-color="#000001" 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:#000001;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/palemoon/buttons/btn__lib_bpm_unlocked_grey.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_bpm_unlocked_grey.svg
new file mode 100644
index 000000000000..ba6ce4268945
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_bpm_unlocked_grey.svg
@@ -0,0 +1,5 @@
+<svg width="10" height="12" version="1.1" xmlns="http://www.w3.org/2000/svg">
+	<g transform="translate(0,-20)">
+		<path transform="translate(0,20)" d="m4.9766 0c-1.4489.01-2.4418.65947-2.9336 1.4238l1.26172.81059c.2485-.38625.62385-.7271 1.6816-.73438 1.0447-.00718 1.407.31941 1.6699.75781.26297.4384.34296 1.0862.34375 1.5742.0009639.58906.0001684 1.8689 0 2.168h-6.166c-.41667 0-.83398.41498-.83398.83008v4.3398c0 .4151.41732.83008.83398.83008h8.332c.41667 0 .83398-.41498.83398-.83008v-4.3398c0-.4151-.41732-.83008-.83398-.83008h-.66602c.000169-.29836.0009685-1.5773 0-2.1719-.0009966-.61214-.060246-1.5129-.55859-2.3438-.49835-.83081-1.5189-1.4943-2.9648-1.4844zm-2.9766 8h6c.277 0 .5.223.5.5s-.223.5-.5.5h-6c-.277 0-.5-.223-.5-.5s.223-.5.5-.5zm0 2h6c.277 0 .5.223.5.5s-.223.5-.5.5h-6c-.277 0-.5-.223-.5-.5s.223-.5.5-.5z" color="#000001" color-rendering="auto" dominant-baseline="auto" fill="#979797" fill-opacity=".50196007" image-rendering="auto" shape-rendering="auto" solid-color="#000001" 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:#000001;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/palemoon/buttons/btn__lib_checkmark_blue.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_checkmark_blue.svg
new file mode 100644
index 000000000000..08420a7621ac
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_checkmark_blue.svg
@@ -0,0 +1,48 @@
+<?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="svg15"
+   version="1.1"
+   height="10"
+   width="10">
+  <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="defs7">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.4091 0 0 2.4091 -17.681 3.5004)"
+       y2="34"
+       y1="24"
+       x2="28"
+       x1="28"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-color="#f60" />
+      <stop
+         id="stop4"
+         offset="1"
+         stop-color="#de5800" />
+    </linearGradient>
+  </defs>
+  <path
+     style="fill:none;stroke:#4097ba;stroke-width:1.99999332;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     id="path9"
+     d="M 2.0001178,6.0000964 4.0001112,8.0000897 8.0001393,2.0002343" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_checkmark_ivory.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_checkmark_ivory.svg
new file mode 100644
index 000000000000..64aa0f7b654d
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_checkmark_ivory.svg
@@ -0,0 +1,48 @@
+<?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="svg15"
+   version="1.1"
+   height="10"
+   width="10">
+  <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="defs7">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.4091 0 0 2.4091 -17.681 3.5004)"
+       y2="34"
+       y1="24"
+       x2="28"
+       x1="28"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-color="#f60" />
+      <stop
+         id="stop4"
+         offset="1"
+         stop-color="#de5800" />
+    </linearGradient>
+  </defs>
+  <path
+     style="fill:none;stroke:#a7a099;stroke-width:1.99999332;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     id="path9"
+     d="M 2.0001178,6.0000964 4.0001112,8.0000897 8.0001393,2.0002343" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_clear_search.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_clear_search.svg
new file mode 100644
index 000000000000..1e3129c556b6
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_clear_search.svg
@@ -0,0 +1,45 @@
+<?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="svg10"
+   version="1.1"
+   height="19"
+   width="19">
+  <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>Mixxx 1.12+ iconset</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs14" />
+  <title
+     id="title2">Mixxx 1.12+ iconset</title>
+  <g
+     style="fill:#938271;fill-opacity:1"
+     id="g8"
+     transform="translate(0,-13)">
+    <g
+       style="fill:#938271;fill-opacity:1"
+       id="g6"
+       transform="matrix(.4151 0 0 .4151 -1.6604 19.547)">
+      <path
+         style="fill:#938271;fill-opacity:1"
+         id="path4"
+         stroke-width="0"
+         fill="#b3b3b3"
+         color="#000001"
+         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" />
+    </g>
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_clear_search2.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_clear_search2.svg
new file mode 100644
index 000000000000..c7bffed9e4ad
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_clear_search2.svg
@@ -0,0 +1,54 @@
+<?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="svg10"
+   version="1.1"
+   height="19"
+   width="19">
+  <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>Mixxx 1.12+ iconset</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs14" />
+  <title
+     id="title2">Mixxx 1.12+ iconset</title>
+  <path
+     id="path846"
+     d="M 17,4 V 15 H 6 L 1,9.5 6,4 Z"
+     style="fill:#676767;fill-opacity:1;stroke:none;stroke-width:0.84615386px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <g
+     style="opacity:1;stroke:#010101;stroke-opacity:1"
+     id="g8"
+     transform="matrix(0.70833144,0,0,0.70833144,4.6517175,-6.4374573)">
+    <g
+       style="stroke:#010101;stroke-opacity:1"
+       id="g6"
+       transform="matrix(0.4151,0,0,0.4151,-1.6604,19.547)">
+      <g
+         id="g862"
+         style="opacity:1;stroke:#010101;stroke-width:3.8544929;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+        <path
+           style="fill:none;stroke:#010101;stroke-width:3.8544929;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 36.027491,-1.3177544 19.164084,15.545652"
+           id="path856" />
+        <path
+           style="fill:none;stroke:#010101;stroke-width:3.8544929;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 19.164084,-1.3177544 36.027491,15.545652"
+           id="path858" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_clear_search2_focus.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_clear_search2_focus.svg
new file mode 100644
index 000000000000..64d2a7e1449c
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_clear_search2_focus.svg
@@ -0,0 +1,76 @@
+<?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="19"
+   height="19"
+   version="1.1"
+   id="svg10">
+  <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>Mixxx 1.12+ iconset</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs14" />
+  <title
+     id="title2">Mixxx 1.12+ iconset</title>
+  <path
+     id="path846-3"
+     d="M 17,4 V 15 H 6 L 1,9.5 6,4 Z"
+     style="fill:#4097ba;fill-opacity:1;stroke:none;stroke-width:0.84615386px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <g
+     style="opacity:1;stroke:#ffffff;stroke-opacity:1"
+     id="g8-6"
+     transform="matrix(0.70833144,0,0,0.70833144,4.6513352,-6.437457)">
+    <g
+       style="stroke:#ffffff;stroke-opacity:1"
+       id="g6-7"
+       transform="matrix(0.4151,0,0,0.4151,-1.6604,19.547)">
+      <g
+         id="g862-5"
+         style="opacity:1;stroke:#ffffff;stroke-width:3.8544929;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+        <path
+           style="fill:none;stroke:#ffffff;stroke-width:3.8544929;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 36.027491,-1.3177544 19.164084,15.545652"
+           id="path856-3" />
+        <path
+           style="fill:none;stroke:#ffffff;stroke-width:3.8544929;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 19.164084,-1.3177544 36.027491,15.545652"
+           id="path858-5" />
+      </g>
+    </g>
+  </g>
+  <g
+     style="opacity:1;stroke:#010101;stroke-opacity:1"
+     id="g8"
+     transform="matrix(0.70833144,0,0,0.70833144,4.6517175,-6.4374569)">
+    <g
+       style="stroke:#010101;stroke-opacity:1"
+       id="g6"
+       transform="matrix(0.4151,0,0,0.4151,-1.6604,19.547)">
+      <g
+         id="g862"
+         style="opacity:1;stroke:#010101;stroke-width:3.8544929;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+        <path
+           style="fill:none;stroke:#010101;stroke-width:3.8544929;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 36.027491,-1.3177544 19.164084,15.545652"
+           id="path856" />
+        <path
+           style="fill:none;stroke:#010101;stroke-width:3.8544929;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 19.164084,-1.3177544 36.027491,15.545652"
+           id="path858" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_clear_search_focus.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_clear_search_focus.svg
new file mode 100644
index 000000000000..b10713d388fd
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_clear_search_focus.svg
@@ -0,0 +1,45 @@
+<?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="svg10"
+   version="1.1"
+   height="19"
+   width="19">
+  <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>Mixxx 1.12+ iconset</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs14" />
+  <title
+     id="title2">Mixxx 1.12+ iconset</title>
+  <g
+     style="fill:#4097ba;fill-opacity:1"
+     id="g8"
+     transform="translate(0,-13)">
+    <g
+       style="fill:#4097ba;fill-opacity:1"
+       id="g6"
+       transform="matrix(.4151 0 0 .4151 -1.6604 19.547)">
+      <path
+         style="fill:#4097ba;fill-opacity:1"
+         id="path4"
+         stroke-width="0"
+         fill="#b3b3b3"
+         color="#000001"
+         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" />
+    </g>
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_preview_pause.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_preview_pause.svg
new file mode 100644
index 000000000000..99412128d21c
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_preview_pause.svg
@@ -0,0 +1,59 @@
+<?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="30"
+   id="svg2">
+  <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" />
+  <g
+     style="fill:#000001;fill-opacity:1"
+     transform="translate(0,-14)"
+     id="ic_library_crates">
+    <g
+       style="fill:#000001;fill-opacity:1"
+       fill="#f60"
+       transform="matrix(.4151 0 0 .4151 -1.6604 19.547)"
+       id="ic_library_unchecked">
+      <rect
+         style="fill:#000001;fill-opacity:1"
+         color="#000001"
+         height="19.273"
+         width="4.818"
+         y="-1.3179"
+         x="54.591"
+         id="rect3370" />
+      <rect
+         style="fill:#000001;fill-opacity:1"
+         color="#000001"
+         height="19.273"
+         width="4.818"
+         y="-1.3179"
+         x="64.227"
+         id="rect3372" />
+      <path
+         style="text-indent:0;text-transform:none;fill:#000001;fill-opacity:1"
+         stroke-width="2.4091"
+         color="#000001"
+         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"
+         id="path9863-1-2-3" />
+    </g>
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_preview_play.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_preview_play.svg
new file mode 100644
index 000000000000..b0d02ebebb00
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_preview_play.svg
@@ -0,0 +1,39 @@
+<?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="svg10"
+   version="1.1"
+   height="18"
+   width="30">
+  <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="defs14" />
+  <g
+     transform="matrix(0.4151,0,0,0.4151,-1.6604,5.547)"
+     id="g6"
+     style="fill:#7f7571;fill-opacity:1">
+    <path
+       style="fill:#7f7571;fill-opacity:1;stroke-width:0.88215041"
+       d="M 54.590219,18.654796 V -2.021583 L 72.312697,8.3166063 Z"
+       id="path2" />
+    <path
+       d="m 28.091,-5.2913 c -7.6146,0 -14.009,6.184 -14.009,13.799 0,0.081419 -0.0018,0.15673 0,0.25552 v 0.44717 c -1.5498,1.3124 -2.5552,3.24 -2.5552,5.4298 0,3.9514 2.9756,7.1547 6.927,7.1547 v -14.309 c -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.12776 v 14.309 c 3.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.799 z"
+       style="color:#000001;text-indent:0;text-transform:none;stroke-width:2.40910006;fill:#7f7571;fill-opacity:1"
+       id="path4" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_radio_button_off.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_radio_button_off.svg
new file mode 100644
index 000000000000..05d01166bf94
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_radio_button_off.svg
@@ -0,0 +1,30 @@
+<?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"
+   viewBox="0 0 18 18"
+   version="1.1"
+   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="fill:#777777;fill-opacity:1"
+     fill="#a89a8c"
+     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"
+     id="path4" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_radio_button_on_blue.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_radio_button_on_blue.svg
new file mode 100644
index 000000000000..38141b7f7d98
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_radio_button_on_blue.svg
@@ -0,0 +1,35 @@
+<?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="svg6"
+   viewBox="0 0 18 18"
+   version="1.1">
+  <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" />
+  <path
+     style="fill:#4097ba;fill-opacity:1"
+     id="path2"
+     fill="#e49100"
+     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" />
+  <path
+     style="fill:#777777;fill-opacity:1"
+     id="path4"
+     fill="#a89a8c"
+     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" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_sort_down.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_sort_down.svg
new file mode 100644
index 000000000000..51cabe0cac44
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_sort_down.svg
@@ -0,0 +1,38 @@
+<?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="svg6"
+   version="1.1"
+   height="12"
+   width="12">
+  <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" />
+  <path
+     id="path2"
+     stroke-width="1.6"
+     stroke="#000001"
+     fill="none"
+     d="M 6,9.9181 10.5715,2 h -9.143 z"
+     style="stroke-width:1.6;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+  <path
+     style="fill:#337995;fill-opacity:1"
+     id="path4"
+     fill="#fa0"
+     d="M 6,9.9181 10.5715,2 h -9.143 z" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_sort_up.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_sort_up.svg
new file mode 100644
index 000000000000..e6199349765f
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_sort_up.svg
@@ -0,0 +1,34 @@
+<?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="svg6"
+   version="1.1"
+   height="12"
+   width="12">
+  <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" />
+  <path
+     style="fill:none;stroke:#000001;stroke-width:1.6;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+     id="path2"
+     d="M 6,2.0819002 10.5715,10 h -9.143 z" />
+  <path
+     style="fill:#337995;fill-opacity:1"
+     id="path4"
+     d="M 6,2.0819002 10.5715,10 h -9.143 z" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_spinbox_down.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_spinbox_down.svg
new file mode 100644
index 000000000000..562f7abf4324
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_spinbox_down.svg
@@ -0,0 +1,30 @@
+<?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="10"
+   width="12">
+  <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:#918273;fill-opacity:1;stroke-width:0.99999994"
+     id="path35"
+     d="M 6.0000585,8 1.9585587,1 h 8.0828993 z" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__lib_spinbox_up.svg b/res/skins/LateNight/palemoon/buttons/btn__lib_spinbox_up.svg
new file mode 100644
index 000000000000..bfb34aad5a5d
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__lib_spinbox_up.svg
@@ -0,0 +1,30 @@
+<?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="12"
+   height="10"
+   version="1.1"
+   id="svg4">
+  <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
+     d="M 6.0000585,2 1.9585587,9 h 8.0828993 z"
+     id="path35"
+     style="fill:#918273;fill-opacity:1;stroke-width:0.99999994" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__loop.svg b/res/skins/LateNight/palemoon/buttons/btn__loop.svg
new file mode 100644
index 000000000000..2a562a4bc82a
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__loop.svg
@@ -0,0 +1,55 @@
+<?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="svg14"
+   version="1.1"
+   height="24"
+   width="24">
+  <metadata
+     id="metadata20">
+    <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="defs18" />
+  <g
+     style="stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+     id="g6"
+     stroke-width="1.6"
+     stroke="#000001"
+     fill="none">
+    <path
+       style="stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+       id="path2"
+       color="#000001"
+       d="m20 18v-12h-5v-3l-7 3.75 7 3.75-1e-4-2.9999 3.5001-1e-4v9l-1.5-1e-4v1.5001z" />
+    <path
+       style="stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+       id="path4"
+       color="#000001"
+       d="m4 6v12h5v3l7-3.75-7-3.75 1e-4 2.9999-3.5001 1e-4v-9l1.5 1e-4v-1.5001z" />
+  </g>
+  <g
+     id="g12"
+     fill="#918273">
+    <path
+       id="path8"
+       color="#000001"
+       d="m20 18v-12h-5v-3l-7 3.75 7 3.75-1e-4-2.9999 3.5001-1e-4v9l-1.5-1e-4v1.5001z" />
+    <path
+       id="path10"
+       color="#000001"
+       d="m4 6v12h5v3l7-3.75-7-3.75 1e-4 2.9999-3.5001 1e-4v-9l1.5 1e-4v-1.5001z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__loop_active.svg b/res/skins/LateNight/palemoon/buttons/btn__loop_active.svg
new file mode 100644
index 000000000000..49fbd3dacd9c
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__loop_active.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+		<g fill="#000001">
+				<path d="m20 18v-12h-5v-3l-7 3.75 7 3.75-1e-4-2.9999 3.5001-1e-4v9l-1.5-1e-4v1.5001z" color="#000001"/>
+				<path d="m4 6v12h5v3l7-3.75-7-3.75 1e-4 2.9999-3.5001 1e-4v-9l1.5 1e-4v-1.5001z" color="#000001"/>
+		</g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__loop_in.svg b/res/skins/LateNight/palemoon/buttons/btn__loop_in.svg
new file mode 100644
index 000000000000..c04e4f76a139
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__loop_in.svg
@@ -0,0 +1,46 @@
+<?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="24"
+   height="24"
+   version="1.1"
+   id="svg6">
+  <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" />
+  <path
+     style="fill:none;stroke:#000000;stroke-width:1.6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 13,10 8,6 v 8 z"
+     id="path839" />
+  <path
+     d="m 14,6 h 1 v 13 h -1 z"
+     fill="none"
+     stroke="#000001"
+     stroke-linecap="square"
+     stroke-width="1.6"
+     id="path2"
+     style="stroke-width:1.6;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" />
+  <path
+     d="m 14,6 h 1 v 13 h -1"
+     fill="#918273"
+     id="path4" />
+  <path
+     id="path839-3"
+     d="M 13,10 8,6.0000004 V 14 Z"
+     style="fill:#918273;fill-opacity:1;stroke:none;stroke-width:1.6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__loop_in_active.svg b/res/skins/LateNight/palemoon/buttons/btn__loop_in_active.svg
new file mode 100644
index 000000000000..539eaa4c0fd3
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__loop_in_active.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+		<path d="m9 6h5v13h-1v-7h-4v-6" fill="#000001"/>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__loop_out.svg b/res/skins/LateNight/palemoon/buttons/btn__loop_out.svg
new file mode 100644
index 000000000000..1d20e175e98a
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__loop_out.svg
@@ -0,0 +1,46 @@
+<?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="svg6"
+   version="1.1"
+   height="24"
+   width="24">
+  <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" />
+  <path
+     id="path839"
+     d="m 11,9.9999996 5,-4 V 14 Z"
+     style="fill:none;stroke:#000000;stroke-width:1.6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     style="stroke-width:1.6;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+     id="path2"
+     stroke-width="1.6"
+     stroke-linecap="square"
+     stroke="#000001"
+     fill="none"
+     d="M 10,6 H 9 v 13 h 1 z" />
+  <path
+     id="path4"
+     fill="#918273"
+     d="M 10,6 H 9 v 13 h 1" />
+  <path
+     style="fill:#918273;fill-opacity:1;stroke:none;stroke-width:1.6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 11,9.9999996 16,6 v 8 z"
+     id="path839-3" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__loop_out_active.svg b/res/skins/LateNight/palemoon/buttons/btn__loop_out_active.svg
new file mode 100644
index 000000000000..2bfe781e5e7e
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__loop_out_active.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+		<path d="m14 6h-5v13h1v-7h4v-6" fill="#000001"/>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__mic_duck_auto.svg b/res/skins/LateNight/palemoon/buttons/btn__mic_duck_auto.svg
new file mode 100644
index 000000000000..2d34a8925dbb
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__mic_duck_auto.svg
@@ -0,0 +1,36 @@
+<?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="40"
+   height="22"
+   version="1.1"
+   id="svg22">
+  <metadata
+     id="metadata28">
+    <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="defs26" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     x="20.494831"
+     y="15.584389"
+     id="text847-3"><tspan
+       x="20.494831"
+       y="15.584389"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="tspan847">AUTO</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__mic_duck_manual.svg b/res/skins/LateNight/palemoon/buttons/btn__mic_duck_manual.svg
new file mode 100644
index 000000000000..e26abe8c81c6
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__mic_duck_manual.svg
@@ -0,0 +1,36 @@
+<?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="40"
+   height="22"
+   version="1.1"
+   id="svg22">
+  <metadata
+     id="metadata28">
+    <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="defs26" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     x="19.941521"
+     y="15.593179"
+     id="text847-3"><tspan
+       x="19.941521"
+       y="15.593179"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="tspan847">MAN</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__mic_duck_off.svg b/res/skins/LateNight/palemoon/buttons/btn__mic_duck_off.svg
new file mode 100644
index 000000000000..68e8a14bbeb9
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__mic_duck_off.svg
@@ -0,0 +1,46 @@
+<?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="40"
+   height="22"
+   version="1.1"
+   id="svg22">
+  <metadata
+     id="metadata28">
+    <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="defs26" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:12px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:#000001;stroke-width:1.6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     x="2.5979552"
+     y="15.578529"
+     id="text847"><tspan
+       x="2.5979552"
+       y="15.578529"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';stroke:#000001;stroke-width:1.6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="tspan851">DUCK</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:12px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#918273;fill-opacity:1;stroke:none;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     x="2.5979552"
+     y="15.578529"
+     id="text847-3"><tspan
+       x="2.5979552"
+       y="15.578529"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#918273;fill-opacity:1;stroke:none;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="tspan847">DUCK</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__mic_talk.svg b/res/skins/LateNight/palemoon/buttons/btn__mic_talk.svg
new file mode 100644
index 000000000000..e9f8227faf50
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__mic_talk.svg
@@ -0,0 +1,52 @@
+<?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="40"
+   height="22"
+   version="1.1"
+   id="svg22">
+  <metadata
+     id="metadata28">
+    <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="defs26" />
+  <path
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:12px;line-height:1.25;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:0px;word-spacing:0px;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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.6;stroke-linecap:round;stroke-linejoin:round;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 14.775561,6.0446365 a 0.80008001,0.80008001 0 0 0 -0.753906,0.5351563 l -3.023437,8.6015632 a 0.80008001,0.80008001 0 0 0 0.753906,1.066406 h 1.957031 A 0.80008001,0.80008001 0 0 0 14.47478,15.679403 L 14.923999,14.2087 h 1.9375 l 0.449219,1.470703 a 0.80008001,0.80008001 0 0 0 0.765624,0.568359 h 1.957032 a 0.80008001,0.80008001 0 0 0 0.537109,-0.210937 0.80008001,0.80008001 0 0 0 0.541016,0.210937 h 5.289062 a 0.80008001,0.80008001 0 0 0 0.744141,-0.507812 0.80008001,0.80008001 0 0 0 0.74414,0.507812 h 1.816407 a 0.80008001,0.80008001 0 0 0 0.800781,-0.800781 v -2.044922 l 1.533203,2.466797 a 0.80008001,0.80008001 0 0 0 0.677735,0.378906 h 2.0625 A 0.80008001,0.80008001 0 0 0 35.457202,15.0212 L 32.746264,10.722372 35.384936,7.3766678 A 0.80008001,0.80008001 0 0 0 34.75603,6.0797928 h -2.015625 a 0.80008001,0.80008001 0 0 0 -0.625,0.3027343 L 30.50603,8.4020584 V 6.880574 A 0.80008001,0.80008001 0 0 0 29.705249,6.0797928 H 27.888842 A 0.80008001,0.80008001 0 0 0 27.090014,6.880574 v 6.660157 A 0.80008001,0.80008001 0 0 0 26.400561,13.1462 H 23.726733 V 6.880574 A 0.80008001,0.80008001 0 0 0 22.927905,6.0797928 H 21.111499 A 0.80008001,0.80008001 0 0 0 20.310718,6.880574 v 6.951173 L 17.752124,6.5797928 A 0.80008001,0.80008001 0 0 0 16.998218,6.0446365 Z M 5.0450931,6.0797928 A 0.80008001,0.80008001 0 0 0 4.2443118,6.880574 V 8.3922928 A 0.80008001,0.80008001 0 0 0 5.0450931,9.193074 h 1.5253906 v 6.253907 a 0.80008001,0.80008001 0 0 0 0.7988281,0.800781 H 9.1857181 A 0.80008001,0.80008001 0 0 0 9.9864992,15.446981 V 9.193074 H 11.513842 A 0.80008001,0.80008001 0 0 0 12.312671,8.3922928 V 6.880574 A 0.80008001,0.80008001 0 0 0 11.513842,6.0797928 Z M 7.7364994,7.6813552 H 8.8224368 A 0.80008001,0.80008001 0 0 0 8.38689,8.3922928 V 14.6462 H 8.1700931 V 8.3922928 A 0.80008001,0.80008001 0 0 0 7.7364994,7.6813552 Z m 14.1738276,0 h 0.216797 v 6.2656258 a 0.80008001,0.80008001 0 0 0 0.412109,0.699219 h -0.628906 z m 6.779297,0 h 0.216797 v 3.1191418 a 0.80008001,0.80008001 0 0 0 0.572265,0.767578 l -0.238281,0.169922 a 0.80008001,0.80008001 0 0 0 -0.333984,0.650391 V 14.6462 h -0.216797 z m 2.644531,2.2480469 -0.193359,0.2460949 a 0.80008001,0.80008001 0 0 0 -0.04883,0.921875 L 33.330249,14.6462 H 33.16228 l -2.009766,-3.230469 a 0.80008001,0.80008001 0 0 0 -0.634765,-0.376953 l 0.542969,-0.765625 z m -16.818359,0.072266 c -0.17609,0.587056 -0.219359,0.763289 -0.492188,1.646485 a 0.80008001,0.80008001 0 0 0 0.423828,0.958985 h -0.117187 a 0.80008001,0.80008001 0 0 0 -0.763672,0.568359 L 13.117358,14.6462 h -0.234375 z m 2.84375,0.277344 1.541015,4.367188 h -0.234375 l -0.447265,-1.470703 a 0.80008001,0.80008001 0 0 0 -0.763672,-0.568359 h -0.0957 A 0.80008001,0.80008001 0 0 0 17.785327,11.6462 c -0.250787,-0.806953 -0.27025,-0.866083 -0.425781,-1.367188 z m -1.462891,0.6875 c 0.01458,0.04695 0.02183,0.068 0.03711,0.117188 h -0.07227 c 0.01492,-0.04895 0.02071,-0.06966 0.03516,-0.117188 z"
+     id="text847" />
+  <g
+     transform="translate(-0.08771931,0.14619885)"
+     aria-label="TALK"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#918273;fill-opacity:1;stroke:none;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="text847-3">
+    <path
+       d="M 9.2744141,15.300781 H 7.4580078 V 8.2460938 H 5.1318359 V 6.734375 H 11.600586 V 8.2460938 H 9.2744141 Z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#918273;fill-opacity:1;stroke:none;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path962" />
+    <path
+       d="m 18.163086,15.300781 -0.621094,-2.039062 h -3.123047 l -0.621093,2.039062 H 11.84082 l 3.023438,-8.6015623 h 2.220703 l 3.035156,8.6015623 z m -1.054688,-3.5625 Q 16.24707,8.9667969 16.135742,8.6035156 16.030273,8.2402344 15.983398,8.0292969 q -0.193359,0.75 -1.107421,3.7089841 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#918273;fill-opacity:1;stroke:none;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path964" />
+    <path
+       d="M 21.198242,15.300781 V 6.734375 h 1.816406 v 7.066406 h 3.47461 v 1.5 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#918273;fill-opacity:1;stroke:none;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path966" />
+    <path
+       d="m 34.868164,15.300781 h -2.0625 l -2.244141,-3.609375 -0.767578,0.550782 v 3.058593 H 27.977539 V 6.734375 h 1.816406 v 3.919922 L 30.508789,9.6464844 32.829102,6.734375 h 2.015625 l -2.988282,3.791016 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#918273;fill-opacity:1;stroke:none;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path968" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__mic_talk_active.svg b/res/skins/LateNight/palemoon/buttons/btn__mic_talk_active.svg
new file mode 100644
index 000000000000..bcf53088d041
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__mic_talk_active.svg
@@ -0,0 +1,48 @@
+<?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="40"
+   height="22"
+   version="1.1"
+   id="svg22">
+  <metadata
+     id="metadata28">
+    <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="defs26" />
+  <g
+     transform="translate(-0.08771931,0.14619885)"
+     aria-label="TALK"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#0f0e0c;fill-opacity:1;stroke:none;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="text847-3">
+    <path
+       d="M 9.2744141,15.300781 H 7.4580078 V 8.2460938 H 5.1318359 V 6.734375 H 11.600586 V 8.2460938 H 9.2744141 Z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#0f0e0c;fill-opacity:1;stroke:none;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path962" />
+    <path
+       d="m 18.163086,15.300781 -0.621094,-2.039062 h -3.123047 l -0.621093,2.039062 H 11.84082 l 3.023438,-8.6015623 h 2.220703 l 3.035156,8.6015623 z m -1.054688,-3.5625 Q 16.24707,8.9667969 16.135742,8.6035156 16.030273,8.2402344 15.983398,8.0292969 q -0.193359,0.75 -1.107421,3.7089841 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#0f0e0c;fill-opacity:1;stroke:none;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path964" />
+    <path
+       d="M 21.198242,15.300781 V 6.734375 h 1.816406 v 7.066406 h 3.47461 v 1.5 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#0f0e0c;fill-opacity:1;stroke:none;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path966" />
+    <path
+       d="m 34.868164,15.300781 h -2.0625 l -2.244141,-3.609375 -0.767578,0.550782 v 3.058593 H 27.977539 V 6.734375 h 1.816406 v 3.919922 L 30.508789,9.6464844 32.829102,6.734375 h 2.015625 l -2.988282,3.791016 z"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#0f0e0c;fill-opacity:1;stroke:none;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path968" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__minus.svg b/res/skins/LateNight/palemoon/buttons/btn__minus.svg
new file mode 100644
index 000000000000..182681e36a29
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__minus.svg
@@ -0,0 +1,38 @@
+<?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="svg6"
+   version="1.1"
+   height="24"
+   width="24">
+  <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" />
+  <path
+     style="stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+     id="path2"
+     stroke-width="1.6"
+     stroke-linecap="square"
+     stroke="#000001"
+     fill="none"
+     d="m 8,10 h 9 v 3 H 8 Z" />
+  <path
+     id="path4"
+     fill="#8e8276"
+     d="m 8,10 h 9 v 3 H 8 Z" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__minus_active.svg b/res/skins/LateNight/palemoon/buttons/btn__minus_active.svg
new file mode 100644
index 000000000000..b7655ea54fb3
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__minus_active.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+		<path d="m8 10h9v3h-9v-3" fill="#000001"/>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__outro_end.svg b/res/skins/LateNight/palemoon/buttons/btn__outro_end.svg
new file mode 100644
index 000000000000..5e82aafc67ca
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__outro_end.svg
@@ -0,0 +1,63 @@
+<?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="svg14"
+   version="1.1"
+   height="24"
+   width="18">
+  <metadata
+     id="metadata20">
+    <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="defs18" />
+  <g
+     style="stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+     id="g6"
+     stroke-width="1.6"
+     stroke-linecap="square"
+     stroke="#000001"
+     fill="none"
+     transform="translate(-3)">
+    <rect
+       id="rect2"
+       style="paint-order:markers fill stroke;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+       height="10"
+       width="2"
+       y="7"
+       x="-18"
+       transform="scale(-1,1)" />
+    <path
+       style="stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+       id="path4"
+       d="m15 17-9-10v10z" />
+  </g>
+  <g
+     id="g12"
+     fill="#918273"
+     transform="translate(-3)">
+    <rect
+       id="rect8"
+       style="paint-order:markers fill stroke"
+       height="10"
+       width="2"
+       y="7"
+       x="-18"
+       transform="scale(-1,1)" />
+    <path
+       id="path10"
+       d="m15 17-9-10v10z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__outro_end_active.svg b/res/skins/LateNight/palemoon/buttons/btn__outro_end_active.svg
new file mode 100644
index 000000000000..a525e91dbb17
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__outro_end_active.svg
@@ -0,0 +1,44 @@
+<?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="svg14"
+   version="1.1"
+   height="24"
+   width="18">
+  <metadata
+     id="metadata20">
+    <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="defs18" />
+  <g
+     style="fill:#000001;fill-opacity:1"
+     id="g12"
+     fill="#a89a8c"
+     transform="translate(-3)">
+    <rect
+       id="rect8"
+       style="paint-order:markers fill stroke;fill:#000001;fill-opacity:1"
+       height="10"
+       width="2"
+       y="7"
+       x="-18"
+       transform="scale(-1,1)" />
+    <path
+       style="fill:#000001;fill-opacity:1"
+       id="path10"
+       d="m15 17-9-10v10z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__outro_start.svg b/res/skins/LateNight/palemoon/buttons/btn__outro_start.svg
new file mode 100644
index 000000000000..d5a7b1bb61fa
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__outro_start.svg
@@ -0,0 +1,61 @@
+<?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="svg14"
+   version="1.1"
+   height="24"
+   width="18">
+  <metadata
+     id="metadata20">
+    <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="defs18" />
+  <g
+     style="stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+     id="g6"
+     stroke-width="1.6"
+     stroke-linecap="square"
+     stroke="#000001"
+     fill="none"
+     transform="translate(-3)">
+    <rect
+       id="rect2"
+       style="paint-order:markers fill stroke;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+       height="10"
+       width="2"
+       y="7"
+       x="6" />
+    <path
+       style="stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+       id="path4"
+       d="m19 17-9-10v10z" />
+  </g>
+  <g
+     id="g12"
+     fill="#918273"
+     transform="translate(-3)">
+    <rect
+       id="rect8"
+       style="paint-order:markers fill stroke"
+       height="10"
+       width="2"
+       y="7"
+       x="6" />
+    <path
+       id="path10"
+       d="m19 17-9-10v10z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__outro_start_active.svg b/res/skins/LateNight/palemoon/buttons/btn__outro_start_active.svg
new file mode 100644
index 000000000000..cf3904e9bcfd
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__outro_start_active.svg
@@ -0,0 +1,43 @@
+<?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="svg74"
+   version="1.1"
+   height="24"
+   width="18">
+  <metadata
+     id="metadata80">
+    <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="defs78" />
+  <g
+     style="fill:#000001;fill-opacity:1"
+     id="g72"
+     fill="#a89a8c"
+     transform="translate(-3)">
+    <rect
+       id="rect68"
+       style="paint-order:markers fill stroke;fill:#000001;fill-opacity:1"
+       height="10"
+       width="2"
+       y="7"
+       x="6" />
+    <path
+       style="fill:#000001;fill-opacity:1"
+       id="path70"
+       d="m19 17-9-10v10z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__pause_deck_mini.svg b/res/skins/LateNight/palemoon/buttons/btn__pause_deck_mini.svg
new file mode 100644
index 000000000000..5b89030c7bc3
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__pause_deck_mini.svg
@@ -0,0 +1,6 @@
+<svg width="40" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+		<g transform="translate(0,2)" fill="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">
+				<path d="m14.000494 4h4v12h-4v-12"/>
+				<path d="m22.000394 4v12h4v-12h-4"/>
+		</g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__pause_sampler.svg b/res/skins/LateNight/palemoon/buttons/btn__pause_sampler.svg
new file mode 100644
index 000000000000..59d9a2e7fa18
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__pause_sampler.svg
@@ -0,0 +1,6 @@
+<svg width="32" height="32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+		<g transform="translate(1,1)" fill="#000001" stroke-linecap="square" stroke-width="1.6">
+				<path d="m8 7h5v15h-5v-15"/>
+				<path d="m17 7v15h5v-15h-5"/>
+		</g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__pfl.svg b/res/skins/LateNight/palemoon/buttons/btn__pfl.svg
new file mode 100644
index 000000000000..c35f3876e954
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__pfl.svg
@@ -0,0 +1,42 @@
+<?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="svg6"
+   version="1.1"
+   height="24"
+   width="24">
+  <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" />
+  <path
+     id="path2"
+     style="text-indent:0;text-transform:none"
+     stroke-width="1.6"
+     stroke-linejoin="round"
+     stroke-linecap="round"
+     stroke="#000001"
+     fill="none"
+     color="#000001"
+     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" />
+  <path
+     id="path4"
+     style="text-indent:0;text-transform:none;fill:#918273;fill-opacity:1"
+     fill="#a89a8c"
+     color="#000001"
+     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" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__pfl_active.svg b/res/skins/LateNight/palemoon/buttons/btn__pfl_active.svg
new file mode 100644
index 000000000000..6d149759c636
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__pfl_active.svg
@@ -0,0 +1,3 @@
+<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.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="#000001" style="text-indent:0;text-transform:none"/>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__play_deck.svg b/res/skins/LateNight/palemoon/buttons/btn__play_deck.svg
new file mode 100644
index 000000000000..4a4d091deb20
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/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="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">
+				<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="#918273">
+				<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/palemoon/buttons/btn__play_deck_active.svg b/res/skins/LateNight/palemoon/buttons/btn__play_deck_active.svg
new file mode 100644
index 000000000000..53eabe92c003
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__play_deck_active.svg
@@ -0,0 +1,7 @@
+<svg width="50" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+		<g transform="translate(1.0004937 .99999999)" fill="#000001">
+				<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/palemoon/buttons/btn__play_deck_mini.svg b/res/skins/LateNight/palemoon/buttons/btn__play_deck_mini.svg
new file mode 100644
index 000000000000..dfe7201ef0a0
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__play_deck_mini.svg
@@ -0,0 +1,8 @@
+<svg width="40" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+		<g transform="translate(0,2)" fill="none" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6">
+				<path d="m16.000494 4 8.9995 6-8.9995 6v-12"/>
+		</g>
+		<g transform="translate(5.0004937 .99999999)" fill="#918273">
+				<path d="m11 5 8.9995 6-8.9995 6v-12"/>
+		</g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__play_sampler.svg b/res/skins/LateNight/palemoon/buttons/btn__play_sampler.svg
new file mode 100644
index 000000000000..6de1463a87cd
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/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="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.6"/>
+		<path d="m11 7.3661 12.95 8.634-12.95 8.6339z" fill="#918273"/>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__plus.svg b/res/skins/LateNight/palemoon/buttons/btn__plus.svg
new file mode 100644
index 000000000000..d09681e62051
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__plus.svg
@@ -0,0 +1,38 @@
+<?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="svg6"
+   version="1.1"
+   height="24"
+   width="24">
+  <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" />
+  <path
+     style="stroke-width:1.6;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+     id="path2"
+     stroke-width="1.6"
+     stroke-linecap="square"
+     stroke="#000001"
+     fill="none"
+     d="m 8,10 h 3 V 7 h 3 v 3 h 3 v 3 h -3 v 3 H 11 V 13 H 8 Z" />
+  <path
+     id="path4"
+     fill="#8e8276"
+     d="m 8,10 h 3 V 7 h 3 v 3 h 3 v 3 h -3 v 3 H 11 V 13 H 8 Z" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__plus_active.svg b/res/skins/LateNight/palemoon/buttons/btn__plus_active.svg
new file mode 100644
index 000000000000..9ba0e6a3e0f9
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__plus_active.svg
@@ -0,0 +1,3 @@
+<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="#000001"/>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__plus_flat.svg b/res/skins/LateNight/palemoon/buttons/btn__plus_flat.svg
new file mode 100644
index 000000000000..1fbe34120e55
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__plus_flat.svg
@@ -0,0 +1,3 @@
+<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="#a89a8c" opacity=".59898478"/>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__prev.svg b/res/skins/LateNight/palemoon/buttons/btn__prev.svg
new file mode 100644
index 000000000000..0004b577a3c6
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/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="#918273"/></svg>
diff --git a/res/skins/LateNight/buttons_flip/btn__quantize.svg b/res/skins/LateNight/palemoon/buttons/btn__quantize.svg
similarity index 93%
rename from res/skins/LateNight/buttons_flip/btn__quantize.svg
rename to res/skins/LateNight/palemoon/buttons/btn__quantize.svg
index a9d18e0cfaef..04866056855c 100644
--- a/res/skins/LateNight/buttons_flip/btn__quantize.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__quantize.svg
@@ -1,5 +1,5 @@
 <svg width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg">
-	<g fill="#585858">
+	<g fill="#3d3d3c">
 		<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"/>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__quantize_active_12.svg b/res/skins/LateNight/palemoon/buttons/btn__quantize_active_12.svg
new file mode 100644
index 000000000000..f8b023c673bd
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__quantize_active_12.svg
@@ -0,0 +1,46 @@
+<?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="svg8"
+   viewBox="0 0 21 18"
+   version="1.1"
+   height="18"
+   width="21">
+  <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="defs12" />
+  <path
+     style="fill:#988f86;fill-opacity:1"
+     id="path2"
+     fill="#766d65"
+     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" />
+  <g
+     style="fill:#e6e6e6;fill-opacity:1"
+     id="g823">
+    <path
+       style="fill:#e6e6e6;fill-opacity:1"
+       d="m17 11h-3v3h3z"
+       fill="#fff"
+       id="path4" />
+    <path
+       style="fill:#e6e6e6;fill-opacity:1"
+       d="m17 4h-2.9896v3h2.9896z"
+       fill="#fff"
+       id="path6" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__quantize_active_34.svg b/res/skins/LateNight/palemoon/buttons/btn__quantize_active_34.svg
new file mode 100644
index 000000000000..60d71cdbfe77
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__quantize_active_34.svg
@@ -0,0 +1,70 @@
+<?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="21"
+   height="18"
+   version="1.1"
+   viewBox="0 0 21 18"
+   id="svg8"
+   sodipodi:docname="btn__quantize_active_34.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <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="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1056"
+     id="namedview10"
+     showgrid="false"
+     inkscape:zoom="13.111111"
+     inkscape:cx="10.5"
+     inkscape:cy="9"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8" />
+  <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"
+     fill="#85bdbb"
+     id="path2"
+     style="fill:#559b99;fill-opacity:1" />
+  <g
+     id="g842"
+     style="fill:#e6e6e6;fill-opacity:1">
+    <path
+       style="fill:#e6e6e6;fill-opacity:1"
+       id="path4"
+       fill="#fff"
+       d="m17 11h-3v3h3z" />
+    <path
+       style="fill:#e6e6e6;fill-opacity:1"
+       id="path6"
+       fill="#fff"
+       d="m17 4h-2.9896v3h2.9896z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__rate_center_cyan.svg b/res/skins/LateNight/palemoon/buttons/btn__rate_center_cyan.svg
new file mode 100644
index 000000000000..bb314837dba1
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__rate_center_cyan.svg
@@ -0,0 +1,3 @@
+<svg width="10" height="10" version="1.1" viewBox="0 0 10 10" xmlns="http://www.w3.org/2000/svg">
+		<path d="M 5,8.5 C 3.06625,8.5 1.5,6.93375 1.5,4.9999999 1.5,3.06625 3.06625,1.5 5,1.5 6.93375,1.5 8.5,3.06625 8.5,4.9999999 8.5,6.93375 6.93375,8.5 5,8.5 Z" fill="#00a4d4" stroke="#a4a4a2"/>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__rate_center_off.svg b/res/skins/LateNight/palemoon/buttons/btn__rate_center_off.svg
new file mode 100644
index 000000000000..dd58a88e1e7f
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__rate_center_off.svg
@@ -0,0 +1,31 @@
+<?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"
+   viewBox="0 0 6 6"
+   version="1.1"
+   height="6"
+   width="6">
+  <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:#090909;stroke:#8d8d8b;stroke-width:0.75;fill-opacity:1;stroke-opacity:1"
+     id="path2"
+     d="M 3,5.625 C 1.5496875,5.625 0.375,4.4503125 0.375,2.9999999 0.375,1.5496875 1.5496875,0.375 3,0.375 4.4503125,0.375 5.625,1.5496875 5.625,2.9999999 5.625,4.4503125 4.4503125,5.625 3,5.625 Z" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__rec_dot.svg b/res/skins/LateNight/palemoon/buttons/btn__rec_dot.svg
new file mode 100644
index 000000000000..fb9c92831ae9
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/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="#000001" fill="#a89a8c"/>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__rec_dot_active.svg b/res/skins/LateNight/palemoon/buttons/btn__rec_dot_active.svg
new file mode 100644
index 000000000000..a226d0000d61
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__rec_dot_active.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="#000001" fill="#000001"/>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__reloop.svg b/res/skins/LateNight/palemoon/buttons/btn__reloop.svg
new file mode 100644
index 000000000000..cc7f3e9f8707
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__reloop.svg
@@ -0,0 +1,64 @@
+<?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="svg18"
+   version="1.1"
+   height="24"
+   width="24">
+  <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="defs22" />
+  <g
+     style="stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+     id="g8"
+     stroke-width="1.6"
+     stroke="#000001"
+     fill="none">
+    <path
+       style="stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+       id="path2"
+       color="#000001"
+       d="m11 3h2v6h-2z" />
+    <path
+       style="stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+       id="path4"
+       color="#000001"
+       d="m20 5v13h-3l5e-4-1.5001 1.4995 1e-4v-10l-3.4999.000149.000125-1.5001z" />
+    <path
+       style="stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+       id="path6"
+       color="#000001"
+       d="m4 5v13h5v3l7-3.75-7-3.75 1e-4 2.9999-3.5001 1e-4v-10l3.5 1e-4v-1.5001z" />
+  </g>
+  <g
+     id="g16"
+     fill="#918273">
+    <path
+       id="path10"
+       color="#000001"
+       d="m11 3h2v6h-2z" />
+    <path
+       id="path12"
+       color="#000001"
+       d="m20 5v13h-3l5e-4-1.5001 1.4995 1e-4v-10l-3.4999.000149.000125-1.5001z" />
+    <path
+       id="path14"
+       color="#000001"
+       d="m4 5v13h5v3l7-3.75-7-3.75 1e-4 2.9999-3.5001 1e-4v-10l3.5 1e-4v-1.5001z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__reloop_active.svg b/res/skins/LateNight/palemoon/buttons/btn__reloop_active.svg
new file mode 100644
index 000000000000..71a6e40be4f7
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__reloop_active.svg
@@ -0,0 +1,7 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+		<g fill="#000001">
+				<path d="m11 3h2v6h-2z" color="#000001"/>
+				<path d="m20 5v13h-3l5e-4-1.5001 1.4995 1e-4v-10l-3.4999.000149.000125-1.5001z" color="#000001"/>
+				<path d="m4 5v13h5v3l7-3.75-7-3.75 1e-4 2.9999-3.5001 1e-4v-10l3.5 1e-4v-1.5001z" color="#000001"/>
+		</g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__repeat.svg b/res/skins/LateNight/palemoon/buttons/btn__repeat.svg
new file mode 100644
index 000000000000..91c2e1965e81
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__repeat.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="M 13,1.4492188 V 4 H 6.9003906 C 4.1893262,4 2,6.2607148 2,9 2,9.3724736 2.0482349,9.7336886 2.125,10.083984 L 4,9 C 4,7.3072852 5.2902549,6 6.9003906,6 H 13 v 3 l 6.541016,-3.7753906 z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#3d3d3c" 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 18.876953,7.9179688 17,9 c 0,1.692715 -1.290255,3 -2.900391,3 H 8 V 9 L 1.4589844,12.775391 8,16.552734 V 14 h 6.099609 C 16.810674,14 19,11.739285 19,9 19,8.6283798 18.953376,8.2675235 18.876953,7.9179688 Z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#3d3d3c" 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"/>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__repeat_active_12.svg b/res/skins/LateNight/palemoon/buttons/btn__repeat_active_12.svg
new file mode 100644
index 000000000000..02327dbd26e1
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__repeat_active_12.svg
@@ -0,0 +1,51 @@
+<?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="svg8"
+   viewBox="0 0 21 18"
+   version="1.1"
+   height="18"
+   width="21">
+  <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="defs12" />
+  <g
+     style="fill:#988f86;fill-opacity:1"
+     id="g6"
+     shape-rendering="auto"
+     fill="#766d65">
+    <path
+       id="path2"
+       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;fill:#988f86;fill-opacity:1"
+       solid-color="#000000"
+       image-rendering="auto"
+       dominant-baseline="auto"
+       color-rendering="auto"
+       color="#000000"
+       d="M 13,1.4492188 V 4 H 6.9003906 C 4.1893262,4 2,6.2607148 2,9 2,9.3724736 2.0482349,9.7336886 2.125,10.083984 L 4,9 C 4,7.3072852 5.2902549,6 6.9003906,6 H 13 v 3 l 6.541016,-3.7753906 z" />
+    <path
+       id="path4"
+       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;fill:#988f86;fill-opacity:1"
+       solid-color="#000000"
+       image-rendering="auto"
+       dominant-baseline="auto"
+       color-rendering="auto"
+       color="#000000"
+       d="M 18.876953,7.9179688 17,9 c 0,1.692715 -1.290255,3 -2.900391,3 H 8 V 9 L 1.4589844,12.775391 8,16.552734 V 14 h 6.099609 C 16.810674,14 19,11.739285 19,9 19,8.6283798 18.953376,8.2675235 18.876953,7.9179688 Z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__repeat_active_34.svg b/res/skins/LateNight/palemoon/buttons/btn__repeat_active_34.svg
new file mode 100644
index 000000000000..87baf3fb7415
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__repeat_active_34.svg
@@ -0,0 +1,51 @@
+<?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="svg8"
+   viewBox="0 0 21 18"
+   version="1.1"
+   height="18"
+   width="21">
+  <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="defs12" />
+  <g
+     style="fill:#559b99;fill-opacity:1"
+     id="g6"
+     shape-rendering="auto"
+     fill="#85bdbb">
+    <path
+       id="path2"
+       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;fill:#559b99;fill-opacity:1"
+       solid-color="#000000"
+       image-rendering="auto"
+       dominant-baseline="auto"
+       color-rendering="auto"
+       color="#000000"
+       d="M 13,1.4492188 V 4 H 6.9003906 C 4.1893262,4 2,6.2607148 2,9 2,9.3724736 2.0482349,9.7336886 2.125,10.083984 L 4,9 C 4,7.3072852 5.2902549,6 6.9003906,6 H 13 v 3 l 6.541016,-3.7753906 z" />
+    <path
+       id="path4"
+       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;fill:#559b99;fill-opacity:1"
+       solid-color="#000000"
+       image-rendering="auto"
+       dominant-baseline="auto"
+       color-rendering="auto"
+       color="#000000"
+       d="M 18.876953,7.9179688 17,9 c 0,1.692715 -1.290255,3 -2.900391,3 H 8 V 9 L 1.4589844,12.775391 8,16.552734 V 14 h 6.099609 C 16.810674,14 19,11.739285 19,9 19,8.6283798 18.953376,8.2675235 18.876953,7.9179688 Z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__reverse.svg b/res/skins/LateNight/palemoon/buttons/btn__reverse.svg
new file mode 100644
index 000000000000..5d8223cba233
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/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="#000001" 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="#918273" stroke-width=".99999994"/>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__reverse_active.svg b/res/skins/LateNight/palemoon/buttons/btn__reverse_active.svg
new file mode 100644
index 000000000000..d5e0998b0ed6
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__reverse_active.svg
@@ -0,0 +1,3 @@
+<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="#000001" stroke="#000001" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5999999"/>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__settings_off.svg b/res/skins/LateNight/palemoon/buttons/btn__settings_off.svg
new file mode 100644
index 000000000000..7201247ab45c
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/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="#a89a8c" 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="#000001" fill="#a89a8c"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__settings_on.svg b/res/skins/LateNight/palemoon/buttons/btn__settings_on.svg
new file mode 100644
index 000000000000..2ed1e10a1be4
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/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="#000001" stroke-width="1.12734854"/>
+	</g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__slip.svg b/res/skins/LateNight/palemoon/buttons/btn__slip.svg
new file mode 100644
index 000000000000..74db9235d104
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/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="#000001" fill="#3d3d3c" 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="#000001" fill="#3d3d3c"/>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__slip_active_12.svg b/res/skins/LateNight/palemoon/buttons/btn__slip_active_12.svg
new file mode 100644
index 000000000000..7a818384aaf9
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__slip_active_12.svg
@@ -0,0 +1,37 @@
+<?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="svg6"
+   viewBox="0 0 21 18"
+   version="1.1"
+   height="18"
+   width="21">
+  <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" />
+  <path
+     style="color:#000001;fill:#3d3d3c;stroke-width:0.91413999"
+     d="M 7.33344,14.96998 1.0000953,4.0003003 13.666419,4.0003 Z"
+     id="path2-3" />
+  <path
+     style="fill:#a8a098;fill-opacity:1"
+     id="path2"
+     fill="#fff"
+     color="#000001"
+     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" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__slip_active_34.svg b/res/skins/LateNight/palemoon/buttons/btn__slip_active_34.svg
new file mode 100644
index 000000000000..0c1fe00f2d0b
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__slip_active_34.svg
@@ -0,0 +1,37 @@
+<?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="svg6"
+   viewBox="0 0 21 18"
+   version="1.1"
+   height="18"
+   width="21">
+  <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" />
+  <path
+     style="color:#000001;fill:#3d3d3c;stroke-width:0.91413999"
+     d="M 7.33344,14.96998 1.0000953,4.0003003 13.666419,4.0003 Z"
+     id="path2-3" />
+  <path
+     style="fill:#71b1af;fill-opacity:1"
+     id="path2"
+     fill="#fff"
+     color="#000001"
+     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" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__spinbox_down.svg b/res/skins/LateNight/palemoon/buttons/btn__spinbox_down.svg
new file mode 100644
index 000000000000..4952f877f010
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__spinbox_down.svg
@@ -0,0 +1,87 @@
+<?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="18"
+   height="11"
+   version="1.1"
+   id="svg21">
+  <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="defs9">
+    <linearGradient
+       id="a"
+       x1="2"
+       x2="24"
+       y1="12"
+       y2="12"
+       gradientTransform="matrix(1,0,0,1.6956521,-13.50003,-38.152173)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-opacity=".0047619"
+         offset="0"
+         id="stop2" />
+      <stop
+         stop-opacity="0"
+         offset=".5"
+         id="stop4" />
+      <stop
+         stop-opacity=".47451"
+         offset="1"
+         id="stop6" />
+    </linearGradient>
+  </defs>
+  <rect
+     rx="2"
+     y="-57.983498"
+     x="-18.352602"
+     height="38.627037"
+     width="49.521614"
+     id="rect840"
+     style="fill:#1a1a1a;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round" />
+  <rect
+     y="8.8817842e-16"
+     x="40"
+     height="11"
+     width="18"
+     id="rect1027"
+     style="opacity:1;fill:#ac0606;fill-opacity:0.73544976;stroke:none;stroke-width:3.30481243;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     style="fill:none;stroke:#000001;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+     d="m 9.0000514,7.9999994 -3.4641426,-6 h 6.9281992 z"
+     id="path15" />
+  <path
+     style="fill:#918273;fill-opacity:1;stroke-width:0.85714287"
+     d="m 9.0000514,7.9999994 -3.4641426,-6 h 6.9281992 z"
+     id="path17" />
+  <path
+     id="rect15-9"
+     d="M -0.19921876,-12 C -0.63377006,-12 -1,-11.63377 -1,-11.199219 V 11.199219 C -1,11.63377 -0.63376996,12 -0.19921876,12 H 18.203219 C 18.63777,12 19.004,11.63377 19.004,11.199219 V -11.199219 C 19.004,-11.63377 18.63777,-12 18.203219,-12 Z M 1,-11 h 16.004 c 0.562649,0 1,0.437351 1,1.0000004 V 10 c 0,0.562649 -0.437351,1 -1,1 H 1 C 0.4373514,11 0,10.562649 0,10 V -9.9999996 C 0,-10.562649 0.4373514,-11 1,-11 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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     id="rect15-3-7-1"
+     d="m 0.99989845,-11 c -0.5626486,0 -1,0.437352 -1,1.0000002 v 0.5 H 1.1073204 c 0.1500777,-0.293496 0.4469066,-0.5 0.8007811,-0.5 l 14.1876015,2e-7 c 0.353874,0 0.650703,0.206504 0.800781,0.5 h 1.107422 v -0.5 c 0,-0.5626484 -0.437351,-1.0000004 -1,-1.0000004 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:#dcdcdc;fill-opacity:0.07058824;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     id="rect15-3-7-9"
+     d="M 0.99989845,11 V 9.091797 C 0.99989845,9.595433 1.4044651,10 1.9081015,10 H 16.095703 c 0.503636,0 0.908203,-0.404567 0.908203,-0.908203 V 3.5605474 -9.4999996 h 1 V 10 c 0,0.562648 -0.437351,1 -1,1 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:#d1d1d1;fill-opacity:0.0196078;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <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:#d1d1d1;fill-opacity:0.06;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="m 0.99989845,11 c -0.5626486,0 -1,-0.437352 -1,-1 V -9.5 h 1 v 13.060547 5.53125 z"
+     id="rect15-3-7-9-3" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__spinbox_up.svg b/res/skins/LateNight/palemoon/buttons/btn__spinbox_up.svg
new file mode 100644
index 000000000000..c2a8c5e06555
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__spinbox_up.svg
@@ -0,0 +1,109 @@
+<?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="svg39"
+   version="1.1"
+   height="11"
+   width="18">
+  <metadata
+     id="metadata43">
+    <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="defs21">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96801856,0,0,1.0311015,-18.062401,-11.387575)"
+       y2="11.044087"
+       y1="32.380493"
+       x2="12.460919"
+       x1="12.460919"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-color="#141414" />
+      <stop
+         id="stop4"
+         offset="1"
+         stop-color="#1c1c1c" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-24.5,-1.5)"
+       y2="24.007122"
+       x2="1"
+       x1="1"
+       id="b">
+      <stop
+         id="stop7"
+         offset="0"
+         stop-color="#393939" />
+      <stop
+         id="stop9"
+         offset=".30102351"
+         stop-color="#393939" />
+      <stop
+         id="stop11"
+         offset="1"
+         stop-color="#141414" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6956521,-1.50003,-38.152173)"
+       y2="12"
+       y1="12"
+       x2="24"
+       x1="2"
+       id="c">
+      <stop
+         id="stop14"
+         offset="0"
+         stop-opacity=".0047619" />
+      <stop
+         id="stop16"
+         offset=".5"
+         stop-opacity="0" />
+      <stop
+         id="stop18"
+         offset="1"
+         stop-opacity=".47451" />
+    </linearGradient>
+  </defs>
+  <path
+     style="fill:none;stroke:#000001;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+     id="path33"
+     d="M 9.0000514,2.9999997 5.5359085,9 h 6.9282005 z" />
+  <path
+     style="fill:#918273;fill-opacity:1;stroke-width:0.85714287"
+     id="path35"
+     d="M 9.0000514,2.9999997 5.5359085,9 h 6.9282005 z" />
+  <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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M -0.19921876,-1 C -0.63377006,-1 -1,-0.63377 -1,-0.199219 V 22.199219 C -1,22.63377 -0.63376996,23 -0.19921876,23 H 18.203219 C 18.63777,23 19.004,22.63377 19.004,22.199219 V -0.199219 C 19.004,-0.63377 18.63777,-1 18.203219,-1 Z M 1,0 h 16.004 c 0.562649,0 1,0.437351 1,1.0000004 V 21 c 0,0.562649 -0.437351,1 -1,1 H 1 C 0.4373514,22 0,21.562649 0,21 V 1.0000004 C 0,0.437351 0.4373514,0 1,0 Z"
+     id="rect15-9" />
+  <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:#dcdcdc;fill-opacity:0.0705882;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 0.9998984,0 C 0.4372498,0 -1.0155e-4,0.437352 -1.0155e-4,1.0000002 v 0.5 H 1.1073204 c 0.1500777,-0.293496 0.4469066,-0.5 0.8007811,-0.5 l 14.1876015,2e-7 c 0.353874,0 0.650703,0.206504 0.800781,0.5 h 1.107422 v -0.5 C 18.003906,0.437352 17.566555,0 17.003906,0 Z"
+     id="rect15-3-7-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:#d1d1d1;fill-opacity:0.0196078;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 0.9998984,22 V 20.091797 C 0.9998984,20.595433 1.4044651,21 1.9081015,21 H 16.095703 c 0.503636,0 0.908203,-0.404567 0.908203,-0.908203 V 14.560547 1.5000004 h 1 V 21 c 0,0.562648 -0.437351,1 -1,1 z"
+     id="rect15-3-7-9" />
+  <path
+     id="rect15-3-7-9-3"
+     d="M 0.9998984,22 C 0.4372498,22 -1.0155e-4,21.562648 -1.0155e-4,21 V 1.5 H 0.9998984 v 13.060547 5.53125 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:#d1d1d1;fill-opacity:0.06;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__split.svg b/res/skins/LateNight/palemoon/buttons/btn__split.svg
new file mode 100644
index 000000000000..c118e9535a7f
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__split.svg
@@ -0,0 +1,46 @@
+<?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="46"
+   height="20"
+   version="1.1"
+   id="svg26">
+  <metadata
+     id="metadata32">
+    <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="defs30" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:#000001;stroke-width:1.6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     x="6.6918755"
+     y="14.569261"
+     id="text847"><tspan
+       id="tspan845"
+       x="6.6918755"
+       y="14.569261"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';stroke:#000001;stroke-width:1.6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">SPLIT</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#828282;fill-opacity:1;stroke:none;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;"
+     x="6.6918755"
+     y="14.569261"
+     id="text847-3"><tspan
+       id="tspan845-0"
+       x="6.6918755"
+       y="14.569261"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#828282;fill-opacity:1;stroke:none;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;">SPLIT</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__split_active.svg b/res/skins/LateNight/palemoon/buttons/btn__split_active.svg
new file mode 100644
index 000000000000..d791cc405076
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__split_active.svg
@@ -0,0 +1,36 @@
+<?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="svg26"
+   version="1.1"
+   height="20"
+   width="46">
+  <metadata
+     id="metadata32">
+    <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="defs30" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     x="6.6918755"
+     y="14.569261"
+     id="text847-3"><tspan
+       id="tspan845-0"
+       x="6.6918755"
+       y="14.569261"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.6;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">SPLIT</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__star.svg b/res/skins/LateNight/palemoon/buttons/btn__star.svg
new file mode 100644
index 000000000000..554ca2bdafed
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__star.svg
@@ -0,0 +1,34 @@
+<?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="16"
+   height="16"
+   version="1.1"
+   id="svg4">
+  <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
+     id="path2-3"
+     d="m 8,1.742188 -1.4296875,4.2675781 -4.5,0.041016 L 5.6875,8.7285161 4.3339844,13.021484 8,10.408203 11.666016,13.021484 10.3125,8.7285161 13.929688,6.0507817 9.4296875,6.0097661 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:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <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:#a89a8c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.65781951;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="m 8,1.7421875 -1.4296875,4.2675781 -4.5,0.041016 L 5.6875,8.7285156 4.3339844,13.021484 8,10.408203 11.666016,13.021484 10.3125,8.7285156 13.929688,6.0507812 9.4296875,6.0097656 Z"
+     id="path2" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__sync_deck.svg b/res/skins/LateNight/palemoon/buttons/btn__sync_deck.svg
new file mode 100644
index 000000000000..dce573c463e1
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__sync_deck.svg
@@ -0,0 +1,46 @@
+<?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="svg32"
+   version="1.1"
+   height="20"
+   width="46">
+  <metadata
+     id="metadata38">
+    <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="defs36" />
+  <text
+     id="text847"
+     y="15.192383"
+     x="7.1855469"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:#000001;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';stroke:#000001;stroke-width:1.60000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       y="15.192383"
+       x="7.1855469"
+       id="tspan845">SYNC</tspan></text>
+  <text
+     id="text847-3"
+     y="15.192383"
+     x="7.1855469"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#a89a8c;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#a89a8c;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       y="15.192383"
+       x="7.1855469"
+       id="tspan845-0">SYNC</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__sync_deck_active.svg b/res/skins/LateNight/palemoon/buttons/btn__sync_deck_active.svg
new file mode 100644
index 000000000000..9aa5c30c245e
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__sync_deck_active.svg
@@ -0,0 +1,60 @@
+<?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="46"
+   height="20"
+   version="1.1"
+   id="svg32"
+   sodipodi:docname="btn__sync_deck_active.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1056"
+     id="namedview9"
+     showgrid="false"
+     inkscape:zoom="8"
+     inkscape:cx="3.375"
+     inkscape:cy="12"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg32" />
+  <metadata
+     id="metadata38">
+    <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="defs36" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;"
+     x="7.1855469"
+     y="15.192383"
+     id="text847-3"><tspan
+       id="tspan845-0"
+       x="7.1855469"
+       y="15.192383"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:12px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;">SYNC</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__sync_sampler.svg b/res/skins/LateNight/palemoon/buttons/btn__sync_sampler.svg
new file mode 100644
index 000000000000..ae7a093f3bc1
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__sync_sampler.svg
@@ -0,0 +1,64 @@
+<?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="svg20"
+   version="1.1"
+   height="24"
+   width="24">
+  <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="defs24" />
+  <g
+     id="g6"
+     stroke-width="1.6"
+     stroke-linejoin="round"
+     stroke-linecap="round"
+     stroke="#000001"
+     fill="none">
+    <path
+       id="path2"
+       d="m5 7.3636 6.955 4.6367-6.955 4.6367z" />
+    <path
+       id="path4"
+       d="M 19,7.3633 12.045,12 19,16.6367 Z" />
+  </g>
+  <g
+     id="g12"
+     fill="none"
+     transform="translate(1 -.9997)">
+    <path
+       id="path8"
+       d="M 4,8.3633 10.955,13 4,17.6367 V 8.3633" />
+    <path
+       id="path10"
+       d="M 18,8.3633 11.045,13 18,17.6367 V 8.3633" />
+  </g>
+  <g
+     style="fill:#918273;fill-opacity:1"
+     id="g18"
+     fill="#a89a8c">
+    <path
+       style="fill:#918273;fill-opacity:1"
+       id="path14"
+       d="m5 7.3636 6.955 4.6367-6.955 4.6367z" />
+    <path
+       style="fill:#918273;fill-opacity:1"
+       id="path16"
+       d="M 19,7.3633 12.045,12 19,16.6367 Z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__sync_sampler_active.svg b/res/skins/LateNight/palemoon/buttons/btn__sync_sampler_active.svg
new file mode 100644
index 000000000000..9a8dd71cab1c
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__sync_sampler_active.svg
@@ -0,0 +1,10 @@
+<svg width="24" height="24" version="1.1" xmlns="http://www.w3.org/2000/svg">
+		<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="#000001">
+				<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/palemoon/buttons/btn__xfader_aux_left.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_left.svg
new file mode 100644
index 000000000000..39c3d8de85f9
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_left.svg
@@ -0,0 +1,36 @@
+<?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="11"
+   height="13"
+   version="1.1"
+   id="svg4">
+  <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" />
+  <g
+     aria-label="L"
+     id="text838-3"
+     style="font-style:normal;font-weight:normal;font-size:40.0002px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#b2b2b2;fill-opacity:1;stroke:none;stroke-width:1.00001"
+     transform="translate(0,-1)">
+    <path
+       d="M 2.9999872,12.018282 3,3 h 1.5559974 l -1.28e-5,7.68364 h 4.029968 v 1.334642 z"
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:13.3334px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:#b2b2b2;fill-opacity:1;stroke-width:1.00001"
+       id="path877" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_left_off.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_left_off.svg
new file mode 100644
index 000000000000..17c88b4258a0
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_left_off.svg
@@ -0,0 +1,36 @@
+<?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="11"
+   height="13"
+   version="1.1"
+   id="svg4">
+  <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" />
+  <g
+     transform="translate(0,-1)"
+     aria-label="L"
+     id="text838-3"
+     style="font-style:normal;font-weight:normal;font-size:40.0002px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#555555;fill-opacity:1;stroke:none;stroke-width:1.00001">
+    <path
+       d="M 2.9999872,12.018282 3,3 h 1.5559974 l -1.28e-5,7.68364 h 4.029968 v 1.334642 z"
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:13.3334px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:#555555;fill-opacity:1;stroke-width:1.00001"
+       id="path877" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_mid.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_mid.svg
new file mode 100644
index 000000000000..270b3bc611f2
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_mid.svg
@@ -0,0 +1,41 @@
+<?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="11"
+   height="13"
+   version="1.1"
+   id="svg4">
+  <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" />
+  <g
+     transform="translate(0,-1)"
+     aria-label="M"
+     id="text838-3"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#9a9a9a;fill-opacity:1;stroke:none" />
+  <g
+     transform="translate(0,-1)"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#9a9a9a;fill-opacity:1;stroke:none"
+     id="text838-3-7"
+     aria-label="M">
+    <path
+       id="path885-5"
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:13.3333px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:#9a9a9a;fill-opacity:1"
+       d="M 4.7154968,9.5081967 2.3541632,4.5690065 H 2.30208 C 2.375865,5.7495591 2.4127568,7.3381224 2.4127568,8.3711059 V 12 H 1 V 3 h 2.1940048 l 2.2441464,5.053391 h 0.039062 L 7.7994849,3 H 10 v 9 H 8.5026081 V 8.2929811 c 0,-0.4730891 0.010851,-1.089407 0.032552,-1.8489537 0.026041,-0.7595467 0.047743,-1.7014102 0.065104,-1.8620001 H 8.5481809 L 6.0891912,9.5081967 Z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_mid_off.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_mid_off.svg
new file mode 100644
index 000000000000..b56e55d75bac
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_mid_off.svg
@@ -0,0 +1,41 @@
+<?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="11"
+   height="13"
+   version="1.1"
+   id="svg4">
+  <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" />
+  <g
+     transform="translate(0,-1)"
+     aria-label="M"
+     id="text838-3"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#a89a8c;fill-opacity:1;stroke:none" />
+  <g
+     transform="translate(0,-1)"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#555555;fill-opacity:1;stroke:none"
+     id="text838-3-7"
+     aria-label="M">
+    <path
+       id="path885-5"
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:13.3333px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:#555555;fill-opacity:1"
+       d="M 4.7154968,9.5081967 2.3541632,4.5690065 H 2.30208 C 2.375865,5.7495591 2.4127568,7.3381224 2.4127568,8.3711059 V 12 H 1 V 3 h 2.1940048 l 2.2441464,5.053391 h 0.039062 L 7.7994849,3 H 10 v 9 H 8.5026081 V 8.2929811 c 0,-0.4730891 0.010851,-1.089407 0.032552,-1.8489537 0.026041,-0.7595467 0.047743,-1.7014102 0.065104,-1.8620001 H 8.5481809 L 6.0891912,9.5081967 Z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_right.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_right.svg
new file mode 100644
index 000000000000..cf421c0694aa
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_right.svg
@@ -0,0 +1,36 @@
+<?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" />
+  <g
+     transform="translate(0.5,-1)"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#9a9a9a;fill-opacity:1;stroke:none"
+     id="text838-3"
+     aria-label="R">
+    <path
+       id="path845"
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:13.3333px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:#b2b2b2;fill-opacity:1"
+       d="m 3.5559856,7.4270722 h 1.0807265 c 0.7248245,0 1.2499968,-0.1345483 1.5755168,-0.4036448 0.32552,-0.2690966 0.48828,-0.6684012 0.48828,-1.1979137 0,-0.5381931 -0.1757808,-0.9244768 -0.5273424,-1.1588512 C 5.8216049,4.4322881 5.2920924,4.3151009 4.5846289,4.3151009 H 3.5559856 Z m 0,1.2890592 V 12 H 2 V 3 h 2.6887953 c 1.2282955,0 2.1375814,0.2300341 2.7278577,0.6901024 0.5902763,0.4600683 0.8854144,1.154511 0.8854144,2.0833281 0,1.1848929 -0.6163179,2.0290748 -1.8489537,2.5325457 L 9.141909,12 H 7.3710802 L 5.0924401,8.7161314 Z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_right_off.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_right_off.svg
new file mode 100644
index 000000000000..6ae3065548a1
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_aux_right_off.svg
@@ -0,0 +1,36 @@
+<?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" />
+  <g
+     transform="translate(0.5,-1)"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#555555;fill-opacity:1;stroke:none"
+     id="text838-3"
+     aria-label="R">
+    <path
+       id="path845"
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:13.3333px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:#555555;fill-opacity:1"
+       d="m 3.5559856,7.4270722 h 1.0807265 c 0.7248245,0 1.2499968,-0.1345483 1.5755168,-0.4036448 0.32552,-0.2690966 0.48828,-0.6684012 0.48828,-1.1979137 0,-0.5381931 -0.1757808,-0.9244768 -0.5273424,-1.1588512 C 5.8216049,4.4322881 5.2920924,4.3151009 4.5846289,4.3151009 H 3.5559856 Z m 0,1.2890592 V 12 H 2 V 3 h 2.6887953 c 1.2282955,0 2.1375814,0.2300341 2.7278577,0.6901024 0.5902763,0.4600683 0.8854144,1.154511 0.8854144,2.0833281 0,1.1848929 -0.6163179,2.0290748 -1.8489537,2.5325457 L 9.141909,12 H 7.3710802 L 5.0924401,8.7161314 Z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_left_default.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_left_default.svg
new file mode 100644
index 000000000000..52283dd83b36
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_left_default.svg
@@ -0,0 +1,35 @@
+<?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="11"
+   height="15"
+   version="1.1"
+   id="svg4">
+  <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" />
+  <g
+     aria-label="L"
+     id="text838-3"
+     style="font-style:normal;font-weight:normal;font-size:40.0002px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#9a9a9a;fill-opacity:1;stroke:none;stroke-width:1.00001">
+    <path
+       d="M 2.9999872,12.018282 3,3 h 1.5559974 l -1.28e-5,7.68364 h 4.029968 v 1.334642 z"
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:13.3334px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:#9a9a9a;fill-opacity:1;stroke-width:1.00001"
+       id="path877" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_left_off.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_left_off.svg
new file mode 100644
index 000000000000..c76a0c4db024
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_left_off.svg
@@ -0,0 +1,35 @@
+<?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="15"
+   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" />
+  <g
+     style="font-style:normal;font-weight:normal;font-size:40.0002px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#555555;fill-opacity:1;stroke:none;stroke-width:1.00001"
+     id="text838-3"
+     aria-label="L">
+    <path
+       id="path877"
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:13.3334px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:#555555;fill-opacity:1;stroke-width:1.00001"
+       d="M 2.9999872,12.018282 3,3 h 1.5559974 l -1.28e-5,7.68364 h 4.029968 v 1.334642 z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_left_warning.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_left_warning.svg
new file mode 100644
index 000000000000..b86a4f74f58a
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_left_warning.svg
@@ -0,0 +1,35 @@
+<?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="11"
+   height="15"
+   version="1.1"
+   id="svg4">
+  <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" />
+  <g
+     aria-label="L"
+     id="text838-3"
+     style="font-style:normal;font-weight:normal;font-size:40.0002px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#f856e7;fill-opacity:1;stroke:none;stroke-width:1.00001">
+    <path
+       d="M 2.9999872,12.018282 3,3 h 1.5559974 l -1.28e-5,7.68364 h 4.029968 v 1.334642 z"
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:13.3334px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:#f856e7;fill-opacity:1;stroke-width:1.00001"
+       id="path877" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_mid_off.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_mid_off.svg
new file mode 100644
index 000000000000..125ade25aa82
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_mid_off.svg
@@ -0,0 +1,39 @@
+<?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="15"
+   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" />
+  <g
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#a89a8c;fill-opacity:1;stroke:none"
+     id="text838-3"
+     aria-label="M" />
+  <g
+     aria-label="M"
+     id="text838-3-7"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#555555;fill-opacity:1;stroke:none">
+    <path
+       d="M 4.7154968,9.5081967 2.3541632,4.5690065 H 2.30208 C 2.375865,5.7495591 2.4127568,7.3381224 2.4127568,8.3711059 V 12 H 1 V 3 h 2.1940048 l 2.2441464,5.053391 h 0.039062 L 7.7994849,3 H 10 v 9 H 8.5026081 V 8.2929811 c 0,-0.4730891 0.010851,-1.089407 0.032552,-1.8489537 0.026041,-0.7595467 0.047743,-1.7014102 0.065104,-1.8620001 H 8.5481809 L 6.0891912,9.5081967 Z"
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:13.3333px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:#555555;fill-opacity:1"
+       id="path885-5" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_mid_warning.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_mid_warning.svg
new file mode 100644
index 000000000000..a144c7e13b7a
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_mid_warning.svg
@@ -0,0 +1,38 @@
+<?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="11"
+   height="15"
+   version="1.1"
+   id="svg4">
+  <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" />
+  <g
+     aria-label="M"
+     id="text838-3"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#a89a8c;fill-opacity:1;stroke:none" />
+  <path
+     d="M 4.7154968,9.5081967 2.3541632,4.5690065 H 2.30208 C 2.375865,5.7495591 2.4127568,7.3381224 2.4127568,8.3711059 V 12 H 1 V 3 h 2.1940048 l 2.2441464,5.053391 h 0.039062 L 7.7994849,3 H 10 v 9 H 8.5026081 V 8.2929811 c 0,-0.4730891 0.010851,-1.089407 0.032552,-1.8489537 0.026041,-0.7595467 0.047743,-1.7014102 0.065104,-1.8620001 H 8.5481809 L 6.0891912,9.5081967 Z"
+     style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:13.3333px;line-height:1.25;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';letter-spacing:0px;word-spacing:0px;fill:#f0bb2b;fill-opacity:1;stroke:none;stroke-width:1.6;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path885-5" />
+  <path
+     id="path885-5-3"
+     style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:13.3333px;line-height:1.25;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';letter-spacing:0px;word-spacing:0px;fill:none;fill-opacity:1;stroke:none"
+     d="M 4.7154968,9.5081967 2.3541632,4.5690065 H 2.30208 C 2.375865,5.7495591 2.4127568,7.3381224 2.4127568,8.3711059 V 12 H 1 V 3 h 2.1940048 l 2.2441464,5.053391 h 0.039062 L 7.7994849,3 H 10 v 9 H 8.5026081 V 8.2929811 c 0,-0.4730891 0.010851,-1.089407 0.032552,-1.8489537 0.026041,-0.7595467 0.047743,-1.7014102 0.065104,-1.8620001 H 8.5481809 L 6.0891912,9.5081967 Z" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_right_default.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_right_default.svg
new file mode 100644
index 000000000000..b176d2ad8f56
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_right_default.svg
@@ -0,0 +1,36 @@
+<?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="11"
+   height="13"
+   version="1.1"
+   id="svg4">
+  <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" />
+  <g
+     aria-label="R"
+     id="text838-3"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#9a9a9a;fill-opacity:1;stroke:none"
+     transform="translate(0.5)">
+    <path
+       d="m 3.5559856,7.4270722 h 1.0807265 c 0.7248245,0 1.2499968,-0.1345483 1.5755168,-0.4036448 0.32552,-0.2690966 0.48828,-0.6684012 0.48828,-1.1979137 0,-0.5381931 -0.1757808,-0.9244768 -0.5273424,-1.1588512 C 5.8216049,4.4322881 5.2917376,4.2926985 4.5846289,4.3151009 H 3.5559856 Z m 0,1.2890592 V 12 H 2 V 3 h 2.6887953 c 1.2282955,0 2.1375814,0.2300341 2.7278577,0.6901024 0.5902763,0.4600683 0.8854144,1.154511 0.8854144,2.0833281 0,1.1848929 -0.6163179,2.0290748 -1.8489537,2.5325457 L 9.141909,12 H 7.3710802 L 5.0924401,8.7161314 Z"
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:13.3333px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:#9a9a9a;fill-opacity:1"
+       id="path845" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_right_off.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_right_off.svg
new file mode 100644
index 000000000000..a0a903a8ed86
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_right_off.svg
@@ -0,0 +1,36 @@
+<?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="11"
+   height="15"
+   version="1.1"
+   id="svg4">
+  <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" />
+  <g
+     aria-label="R"
+     id="text838-3"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#555555;fill-opacity:1;stroke:none"
+     transform="translate(0.5)">
+    <path
+       d="m 3.5559856,7.4270722 h 1.0807265 c 0.7248245,0 1.2499968,-0.1345483 1.5755168,-0.4036448 0.32552,-0.2690966 0.48828,-0.6684012 0.48828,-1.1979137 0,-0.5381931 -0.1757808,-0.9244768 -0.5273424,-1.1588512 C 5.8216049,4.4322881 5.2920924,4.3151009 4.5846289,4.3151009 H 3.5559856 Z m 0,1.2890592 V 12 H 2 V 3 h 2.6887953 c 1.2282955,0 2.1375814,0.2300341 2.7278577,0.6901024 0.5902763,0.4600683 0.8854144,1.154511 0.8854144,2.0833281 0,1.1848929 -0.6163179,2.0290748 -1.8489537,2.5325457 L 9.141909,12 H 7.3710802 L 5.0924401,8.7161314 Z"
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:13.3333px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:#555555;fill-opacity:1"
+       id="path845" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_right_warning.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_right_warning.svg
new file mode 100644
index 000000000000..92f47715e73b
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_deck_right_warning.svg
@@ -0,0 +1,36 @@
+<?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="15"
+   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" />
+  <g
+     transform="translate(0.5)"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#f856e7;fill-opacity:1;stroke:none"
+     id="text838-3"
+     aria-label="R">
+    <path
+       id="path845"
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:13.3333px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:#f856e7;fill-opacity:1"
+       d="m 3.5559856,7.4270722 h 1.0807265 c 0.7248245,0 1.2499968,-0.1345483 1.5755168,-0.4036448 0.32552,-0.2690966 0.48828,-0.6684012 0.48828,-1.1979137 0,-0.5381931 -0.1757808,-0.9244768 -0.5273424,-1.1588512 C 5.8216049,4.4322881 5.2919449,4.3006529 4.5846289,4.3151009 H 3.5559856 Z m 0,1.2890592 V 12 H 2 V 3 h 2.6887953 c 1.2282955,0 2.1375814,0.2300341 2.7278577,0.6901024 0.5902763,0.4600683 0.8854144,1.154511 0.8854144,2.0833281 0,1.1848929 -0.6163179,2.0290748 -1.8489537,2.5325457 L 9.141909,12 H 7.3710802 L 5.0924401,8.7161314 Z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_sampler_left.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_sampler_left.svg
new file mode 100644
index 000000000000..4f7f7015eb76
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_sampler_left.svg
@@ -0,0 +1,36 @@
+<?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="svg6"
+   version="1.1"
+   height="18"
+   width="21">
+  <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" />
+  <g
+     transform="translate(5.0000128,1.981718)"
+     aria-label="L"
+     id="text838-3"
+     style="font-style:normal;font-weight:normal;font-size:40.0002px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#f856e7;fill-opacity:1;stroke:none;stroke-width:1.00001">
+    <path
+       d="M 2.9999872,12.018282 3,3 h 1.5559974 l -1.28e-5,7.68364 h 4.029968 v 1.334642 z"
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:13.3334px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:#f856e7;fill-opacity:1;stroke-width:1.00001"
+       id="path877" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_sampler_master.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_sampler_master.svg
new file mode 100644
index 000000000000..80599451b7aa
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_sampler_master.svg
@@ -0,0 +1,41 @@
+<?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="18"
+   width="21">
+  <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" />
+  <g
+     transform="matrix(1.1111111,0,0,1.1111111,4.8888889,1.6666667)"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#a89a8c;fill-opacity:1;stroke:none"
+     id="text838-3"
+     aria-label="M" />
+  <g
+     transform="matrix(1.1111111,0,0,1.1111111,4.8888889,1.6666667)"
+     aria-label="M"
+     id="text838-3-7"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#444443;fill-opacity:1;stroke:none">
+    <path
+       d="M 4.7154968,9.5081967 2.3541632,4.5690065 H 2.30208 C 2.375865,5.7495591 2.4127568,7.3381224 2.4127568,8.3711059 V 12 H 1 V 3 h 2.1940048 l 2.2441464,5.053391 h 0.039062 L 7.7994849,3 H 10 v 9 H 8.5026081 V 8.2929811 c 0,-0.4730891 0.010851,-1.089407 0.032552,-1.8489537 0.026041,-0.7595467 0.047743,-1.7014102 0.065104,-1.8620001 H 8.5481809 L 6.0891912,9.5081967 Z"
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:13.3333px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:#444443;fill-opacity:1"
+       id="path885-5" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__xfader_sampler_right.svg b/res/skins/LateNight/palemoon/buttons/btn__xfader_sampler_right.svg
new file mode 100644
index 000000000000..ea8c2350d326
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn__xfader_sampler_right.svg
@@ -0,0 +1,36 @@
+<?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="21"
+   height="18"
+   version="1.1"
+   id="svg4">
+  <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" />
+  <g
+     aria-label="R"
+     id="text838-3"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#f854e7;fill-opacity:1;stroke:none"
+     transform="translate(5.5,2)">
+    <path
+       d="m 3.5559856,7.4270722 h 1.0807265 c 0.7248245,0 1.2499968,-0.1345483 1.5755168,-0.4036448 0.32552,-0.2690966 0.48828,-0.6684012 0.48828,-1.1979137 0,-0.5381931 -0.1757808,-0.9244768 -0.5273424,-1.1588512 C 5.8216049,4.4322881 5.2919449,4.3006529 4.5846289,4.3151009 H 3.5559856 Z m 0,1.2890592 V 12 H 2 V 3 h 2.6887953 c 1.2282955,0 2.1375814,0.2300341 2.7278577,0.6901024 0.5902763,0.4600683 0.8854144,1.154511 0.8854144,2.0833281 0,1.1848929 -0.6163179,2.0290748 -1.8489537,2.5325457 L 9.141909,12 H 7.3710802 L 5.0924401,8.7161314 Z"
+       style="font-style:normal;font-variant:normal;font-weight:600;font-stretch:normal;font-size:13.3333px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Semi-Bold';fill:#f854e7;fill-opacity:1"
+       id="path845" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_.svg
new file mode 100644
index 000000000000..fb66ea1ba227
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_.svg
@@ -0,0 +1 @@
+<svg width="1" height="1" version="1.1" xmlns="http://www.w3.org/2000/svg"></svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded__active.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded__active.svg
new file mode 100644
index 000000000000..fb66ea1ba227
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded__active.svg
@@ -0,0 +1 @@
+<svg width="1" height="1" version="1.1" xmlns="http://www.w3.org/2000/svg"></svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded__pressed.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded__pressed.svg
new file mode 100644
index 000000000000..fb66ea1ba227
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded__pressed.svg
@@ -0,0 +1 @@
+<svg width="1" height="1" version="1.1" xmlns="http://www.w3.org/2000/svg"></svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_eqkill.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_eqkill.svg
new file mode 100644
index 000000000000..f1ac9a3b0f91
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_eqkill.svg
@@ -0,0 +1,60 @@
+<?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="svg17"
+   version="1.1"
+   height="18"
+   width="18">
+  <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="defs9">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(.69565216 0 0 .69565216 -.04349915 -16.652173)"
+       y2="12"
+       y1="12"
+       x2="24"
+       x1="2"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-opacity=".0047619" />
+      <stop
+         id="stop4"
+         offset=".5"
+         stop-opacity="0" />
+      <stop
+         id="stop6"
+         offset="1"
+         stop-opacity=".47451" />
+    </linearGradient>
+  </defs>
+  <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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 0.8007812,0 C 0.3662299,0 0,0.36623 0,0.8007812 V 17.199219 C 0,17.63377 0.36623,18 0.8007812,18 H 17.19932 c 0.434551,0 0.800781,-0.36623 0.800781,-0.800781 V 0.8007812 C 18.000101,0.3662299 17.633871,0 17.19932,0 Z M 2,1 h 14.000101 c 0.56265,0 1,0.4373514 1,1 v 14 c 0,0.562649 -0.437351,1 -1,1 H 2 C 1.4373514,17 1,16.562649 1,16 V 2 C 1,1.4373514 1.4373514,1 2,1 Z"
+     id="rect15-9" />
+  <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:#dcdcdc;fill-opacity:0.07058824;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 2,1 C 1.4373514,1 1,1.437352 1,2 V 2.5 H 2.1074219 C 2.2574996,2.2065045 2.5543285,2 2.9082031,2 H 15.091898 c 0.353875,0 0.650703,0.2065045 0.800782,0.5 h 1.107421 V 2 c 0,-0.562648 -0.43735,-1 -1,-1 z"
+     id="rect15-3-7-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:#d1d1d1;fill-opacity:0.01960784;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 2,17 C 1.4373514,17 1,16.562648 1,16 V 2.5 h 1 v 7.060547 5.53125 C 2,15.595433 2.4045667,16 2.9082031,16 H 15.091898 c 0.503636,0 0.908203,-0.404567 0.908203,-0.908203 V 9.560547 2.5 h 1 V 16 c 0,0.562648 -0.437351,1 -1,1 z"
+     id="rect15-3-7-9" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_eqkill_active.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_eqkill_active.svg
new file mode 100644
index 000000000000..106f4fe5b869
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_eqkill_active.svg
@@ -0,0 +1,60 @@
+<?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="svg17"
+   version="1.1"
+   height="18"
+   width="18">
+  <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="defs9">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-.5652174 0 0 .26530613 -1.6521574 -8.4693876)"
+       y2="12"
+       y1="12"
+       x2="24.405561"
+       x1=".5"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-opacity=".47451" />
+      <stop
+         id="stop4"
+         offset=".50727087"
+         stop-opacity="0" />
+      <stop
+         id="stop6"
+         offset="1"
+         stop-opacity=".0047619" />
+    </linearGradient>
+  </defs>
+  <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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 1.8007812,1 C 1.3662299,1 1,1.36623 1,1.8007812 V 16.199219 C 1,16.63377 1.36623,17 1.8007812,17 H 16.19932 c 0.434551,0 0.800781,-0.36623 0.800781,-0.800781 V 1.8007812 C 17.000101,1.3662299 16.633871,1 16.19932,1 Z M 3,2 h 12.000102 c 0.562649,0 0.999999,0.4373514 0.999999,1 v 12 c 0,0.562649 -0.43735,1 -0.999999,1 H 3 C 2.4373514,16 2,15.562649 2,15 V 3 C 2,2.4373514 2.4373514,2 3,2 Z"
+     id="rect15-9" />
+  <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:0.21176471;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,2 C 2.4373514,2 2,3.562648 2,3 V 3.5 H 3.1074219 C 3.2574996,3.2065045 3.5543285,3 3.9082031,3 H 14.091898 c 0.353875,0 0.650703,0.2065045 0.800782,0.5 h 1.107421 V 3 c 0,-0.562648 -0.43735,-1 -0.999999,-1 z"
+     id="rect15-3-7-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:0.31764706;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,16 C 2.4373514,16 2,15.562648 2,15 V 3.5 h 1 v 5.060547 5.53125 C 3,14.595433 3.4045667,15 3.9082031,15 H 14.091898 c 0.503636,0 0.908204,-0.404567 0.908204,-0.908203 V 8.560547 3.5 h 0.999999 V 15 c 0,0.562648 -0.43735,1 -0.999999,1 z"
+     id="rect15-3-7-9" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_fx_parameter.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_fx_parameter.svg
new file mode 100644
index 000000000000..971a05505399
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_fx_parameter.svg
@@ -0,0 +1,60 @@
+<?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="svg17"
+   version="1.1"
+   height="20"
+   width="35">
+  <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="defs9">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(.71567746 0 0 1.3913044 .96591082 -32.804349)"
+       y2="12"
+       y1="12"
+       x2="24"
+       x1="2"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-opacity=".0047619" />
+      <stop
+         id="stop4"
+         offset=".5"
+         stop-opacity="0" />
+      <stop
+         id="stop6"
+         offset="1"
+         stop-opacity=".47451" />
+    </linearGradient>
+  </defs>
+  <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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 1.8007812,1 C 1.3662299,1 1,1.36623 1,1.8007812 V 18.199219 C 1,18.63377 1.36623,19 1.8007812,19 H 33.19932 c 0.434551,0 0.800781,-0.36623 0.800781,-0.800781 V 1.8007812 C 34.000101,1.3662299 33.633871,1 33.19932,1 Z M 3,2 h 29.000101 c 0.562649,0 1,0.4373514 1,1 v 14 c 0,0.562649 -0.437351,1 -1,1 H 3 C 2.4373514,18 2,17.562649 2,17 V 3 C 2,2.4373514 2.4373514,2 3,2 Z"
+     id="rect15-9" />
+  <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:#dcdcdc;fill-opacity:0.07058824;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,2 C 2.4373514,2 2,2.437352 2,3 V 3.5 H 3.1074219 C 3.2574996,3.2065045 3.5543285,3 3.9082031,3 H 31.091898 c 0.353874,0 0.650703,0.2065045 0.800781,0.5 h 1.107422 V 3 c 0,-0.562648 -0.437351,-1 -1,-1 z"
+     id="rect15-3-7-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:#d1d1d1;fill-opacity:0.01960784;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,18 C 2.4373514,18 2,17.562648 2,17 V 3.5 h 1 v 7.060547 5.53125 C 3,16.595433 3.4045667,17 3.9082031,17 H 31.091898 c 0.503636,0 0.997804,-0.412601 0.908203,-0.908203 V 10.560547 3.5 h 1 V 17 c 0,0.562648 -0.437351,1 -1,1 z"
+     id="rect15-3-7-9" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_fx_parameter_active.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_fx_parameter_active.svg
new file mode 100644
index 000000000000..eb3d74e903e9
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_fx_parameter_active.svg
@@ -0,0 +1,60 @@
+<?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="svg17"
+   version="1.1"
+   height="20"
+   width="35">
+  <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="defs9">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-.65217394 0 0 .6122449 -1.5217207 -16.275509)"
+       y2="12"
+       y1="12"
+       x2="24.405561"
+       x1=".5"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-opacity=".39215687" />
+      <stop
+         id="stop4"
+         offset=".50727087"
+         stop-opacity="0" />
+      <stop
+         id="stop6"
+         offset="1"
+         stop-opacity=".0047619" />
+    </linearGradient>
+  </defs>
+  <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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 1.8007812,1 C 1.3662299,1 1,1.36623 1,1.8007812 V 18.199219 C 1,18.63377 1.36623,19 1.8007812,19 H 33.19932 c 0.434551,0 0.800781,-0.36623 0.800781,-0.800781 V 1.8007812 C 34.000101,1.3662299 33.633871,1 33.19932,1 Z M 3,2 h 29.000101 c 0.562649,0 1,0.4373514 1,1 v 14 c 0,0.562649 -0.437351,1 -1,1 H 3 C 2.4373514,18 2,17.562649 2,17 V 3 C 2,2.4373514 2.4373514,2 3,2 Z"
+     id="rect15-9" />
+  <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:0.21176471;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,2 C 2.4373514,2 2,3.562648 2,3 V 3.5 H 3.1074219 C 3.2574996,3.2065045 3.5543285,3 3.9082031,3 H 31.091898 c 0.353874,0 0.650703,0.2065045 0.800781,0.5 h 1.107422 V 3 c 0,-0.562648 -0.437351,-1 -1,-1 z"
+     id="rect15-3-7-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:0.31764706;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,18 C 2.4373514,18 2,17.562648 2,17 V 3.5 h 1 v 7.060547 5.53125 C 3,16.595433 3.4045667,17 3.9082031,17 H 31.091898 c 0.503636,0 0.997804,-0.412601 0.908203,-0.908203 V 10.560547 3.5 h 1 V 17 c 0,0.562648 -0.437351,1 -1,1 z"
+     id="rect15-3-7-9" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_library.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_library.svg
new file mode 100644
index 000000000000..9745cb851bbf
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_library.svg
@@ -0,0 +1,60 @@
+<?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="svg17"
+   version="1.1"
+   height="24"
+   width="24">
+  <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="defs9">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(.95652174 0 0 .95652174 -.4348113 -22.521739)"
+       y2="12"
+       y1="12"
+       x2="24"
+       x1="2"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-opacity=".0047619" />
+      <stop
+         id="stop4"
+         offset=".5"
+         stop-opacity="0" />
+      <stop
+         id="stop6"
+         offset="1"
+         stop-opacity=".47451" />
+    </linearGradient>
+  </defs>
+  <path
+     id="rect15-9"
+     d="M 0.8007812,0 C 0.3662299,0 0,0.36623 0,0.800781 V 23.199219 C 0,23.63377 0.36623,24 0.8007812,24 H 23.199219 C 23.63377,24 24,23.63377 24,23.199219 V 0.800781 C 24,0.36623 23.63377,0 23.199219,0 Z M 2,1 h 20 c 0.562649,0 1,0.437351 1,1 v 20 c 0,0.562649 -0.437351,1 -1,1 H 2 C 1.4373514,23 1,22.562649 1,22 V 2 C 1,1.437351 1.4373514,1 2,1 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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     id="rect15-3-7-1"
+     d="M 2,1 C 1.4373514,1 1,1.437352 1,2 V 2.5 H 2.1074219 C 2.2574996,2.206504 2.5543285,2 2.9082031,2 H 21.091797 c 0.353874,0 0.650703,0.206504 0.800781,0.5 H 23 V 2 C 23,1.437352 22.562649,1 22,1 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:#dcdcdc;fill-opacity:0.07058824;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     id="rect15-3-7-9"
+     d="M 2,23 C 1.4373514,23 1,22.562648 1,22 V 2.5 h 1 v 13.060547 5.53125 C 2,21.595433 2.4045667,22 2.9082031,22 H 21.091797 C 21.595433,22 22,21.595433 22,21.091797 V 15.560547 2.5 h 1 V 22 c 0,0.562648 -0.437351,1 -1,1 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:#d1d1d1;fill-opacity:0.01960784;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_library_active.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_library_active.svg
new file mode 100644
index 000000000000..5c548e8b28a0
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_library_active.svg
@@ -0,0 +1,60 @@
+<?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="svg17"
+   version="1.1"
+   height="24"
+   width="24">
+  <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="defs9">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-.91304352 0 0 .42857142 -.13037539 -11.142857)"
+       y2="12"
+       y1="12"
+       x2="24.405561"
+       x1=".5"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-opacity=".47451" />
+      <stop
+         id="stop4"
+         offset=".50727087"
+         stop-opacity="0" />
+      <stop
+         id="stop6"
+         offset="1"
+         stop-opacity=".0047619" />
+    </linearGradient>
+  </defs>
+  <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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 0.8007812,0 C 0.3662299,0 0,0.36623 0,0.8007812 V 23.199219 C 0,23.63377 0.36623,24 0.8007812,24 H 23.199219 C 23.63377,24 24,23.63377 24,23.199219 V 0.8007812 C 24,0.3662299 23.63377,0 23.199219,0 Z M 2,1 h 20 c 0.562649,0 1,0.4373514 1,1 v 20 c 0,0.562649 -0.437351,1 -1,1 H 2 C 1.4373514,23 1,22.562649 1,22 V 2 C 1,1.4373514 1.4373514,1 2,1 Z"
+     id="rect15-9" />
+  <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:0.21176471;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 2,1 C 1.4373514,1 1,1.437352 1,2 V 2.5 H 2.1074219 C 2.2574996,2.2065045 2.5543285,2 2.9082031,2 H 21.091797 c 0.353874,0 0.650703,0.2065045 0.800781,0.5 H 23 V 2 C 23,1.437352 22.562649,1 22,1 Z"
+     id="rect15-3-7-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:0.31764706;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 2,23 C 1.4373514,23 1,22.562648 1,22 V 2.5 h 1 v 13.060547 5.53125 C 2,21.595433 2.4045667,22 2.9082031,22 H 21.091797 C 21.595433,22 22,21.595433 22,21.091797 V 15.560547 2.5 h 1 V 22 c 0,0.562648 -0.437351,1 -1,1 z"
+     id="rect15-3-7-9" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_library_disabled.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_library_disabled.svg
new file mode 100644
index 000000000000..a1c1af551689
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_library_disabled.svg
@@ -0,0 +1,52 @@
+<?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="24"
+   height="24"
+   version="1.1"
+   id="svg17">
+  <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="defs9">
+    <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="stop2" />
+      <stop
+         stop-opacity="0"
+         offset=".5"
+         id="stop4" />
+      <stop
+         stop-opacity=".47451"
+         offset="1"
+         id="stop6" />
+    </linearGradient>
+  </defs>
+  <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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 0.8007812,0 C 0.3662299,0 0,0.36623 0,0.800781 V 23.199219 C 0,23.63377 0.36623,24 0.8007812,24 H 23.199219 C 23.63377,24 24,23.63377 24,23.199219 V 0.800781 C 24,0.36623 23.63377,0 23.199219,0 Z M 2,1 h 20 c 0.562649,0 1,0.437351 1,1 v 20 c 0,0.562649 -0.437351,1 -1,1 H 2 C 1.4373514,23 1,22.562649 1,22 V 2 C 1,1.437351 1.4373514,1 2,1 Z"
+     id="rect15-9" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_library_focus_blue.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_library_focus_blue.svg
new file mode 100644
index 000000000000..8f53767c38b0
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_library_focus_blue.svg
@@ -0,0 +1,60 @@
+<?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="24"
+   height="24"
+   version="1.1"
+   id="svg17">
+  <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="defs9">
+    <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="stop2" />
+      <stop
+         stop-opacity="0"
+         offset=".5"
+         id="stop4" />
+      <stop
+         stop-opacity=".47451"
+         offset="1"
+         id="stop6" />
+    </linearGradient>
+  </defs>
+  <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:#257b82;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 0.8007812,0 C 0.3662299,0 0,0.36623 0,0.800781 V 23.199219 C 0,23.63377 0.36623,24 0.8007812,24 H 23.199219 C 23.63377,24 24,23.63377 24,23.199219 V 0.800781 C 24,0.36623 23.63377,0 23.199219,0 Z M 2,1 h 20 c 0.562649,0 1,0.437351 1,1 v 20 c 0,0.562649 -0.437351,1 -1,1 H 2 C 1.4373514,23 1,22.562649 1,22 V 2 C 1,1.437351 1.4373514,1 2,1 Z"
+     id="rect15-9" />
+  <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:#dcdcdc;fill-opacity:0.07058824;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 2,1 C 1.4373514,1 1,1.437352 1,2 V 2.5 H 2.1074219 C 2.2574996,2.206504 2.5543285,2 2.9082031,2 H 21.091797 c 0.353874,0 0.650703,0.206504 0.800781,0.5 H 23 V 2 C 23,1.437352 22.562649,1 22,1 Z"
+     id="rect15-3-7-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:#d1d1d1;fill-opacity:0.01960784;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 2,23 C 1.4373514,23 1,22.562648 1,22 V 2.5 h 1 v 13.060547 5.53125 C 2,21.595433 2.4045667,22 2.9082031,22 H 21.091797 C 21.595433,22 22,21.595433 22,21.091797 V 15.560547 2.5 h 1 V 22 c 0,0.562648 -0.437351,1 -1,1 z"
+     id="rect15-3-7-9" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_library_focus_green.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_library_focus_green.svg
new file mode 100644
index 000000000000..824c000a4e96
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_library_focus_green.svg
@@ -0,0 +1,60 @@
+<?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="24"
+   height="24"
+   version="1.1"
+   id="svg17">
+  <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="defs9">
+    <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="stop2" />
+      <stop
+         stop-opacity="0"
+         offset=".5"
+         id="stop4" />
+      <stop
+         stop-opacity=".47451"
+         offset="1"
+         id="stop6" />
+    </linearGradient>
+  </defs>
+  <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:#438225;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 0.8007812,0 C 0.3662299,0 0,0.36623 0,0.800781 V 23.199219 C 0,23.63377 0.36623,24 0.8007812,24 H 23.199219 C 23.63377,24 24,23.63377 24,23.199219 V 0.800781 C 24,0.36623 23.63377,0 23.199219,0 Z M 2,1 h 20 c 0.562649,0 1,0.437351 1,1 v 20 c 0,0.562649 -0.437351,1 -1,1 H 2 C 1.4373514,23 1,22.562649 1,22 V 2 C 1,1.437351 1.4373514,1 2,1 Z"
+     id="rect15-9" />
+  <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:#dcdcdc;fill-opacity:0.07058824;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 2,1 C 1.4373514,1 1,1.437352 1,2 V 2.5 H 2.1074219 C 2.2574996,2.206504 2.5543285,2 2.9082031,2 H 21.091797 c 0.353874,0 0.650703,0.206504 0.800781,0.5 H 23 V 2 C 23,1.437352 22.562649,1 22,1 Z"
+     id="rect15-3-7-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:#d1d1d1;fill-opacity:0.01960784;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 2,23 C 1.4373514,23 1,22.562648 1,22 V 2.5 h 1 v 13.060547 5.53125 C 2,21.595433 2.4045667,22 2.9082031,22 H 21.091797 C 21.595433,22 22,21.595433 22,21.091797 V 15.560547 2.5 h 1 V 22 c 0,0.562648 -0.437351,1 -1,1 z"
+     id="rect15-3-7-9" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_library_header.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_library_header.svg
new file mode 100644
index 000000000000..11e0069d5fe7
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_library_header.svg
@@ -0,0 +1,60 @@
+<?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="23"
+   height="22"
+   version="1.1"
+   id="svg17">
+  <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="defs9">
+    <linearGradient
+       id="a"
+       x1="2"
+       x2="24"
+       y1="12"
+       y2="12"
+       gradientTransform="matrix(0.95652174,0,0,0.95652174,-0.4348113,-22.521739)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-opacity=".0047619"
+         offset="0"
+         id="stop2" />
+      <stop
+         stop-opacity="0"
+         offset=".5"
+         id="stop4" />
+      <stop
+         stop-opacity=".47451"
+         offset="1"
+         id="stop6" />
+    </linearGradient>
+  </defs>
+  <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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M -0.1992188,-1 C -0.6337701,-1 -1,-0.63377 -1,-0.199219 V 22.199219 C -1,22.63377 -0.63377,23 -0.1992188,23 H 22.199219 C 22.63377,23 23,22.63377 23,22.199219 V -0.199219 C 23,-0.63377 22.63377,-1 22.199219,-1 Z M 1,0 h 20 c 0.562649,0 1,0.437351 1,1 v 20 c 0,0.562649 -0.437351,1 -1,1 H 1 C 0.4373514,22 0,21.562649 0,21 V 1 C 0,0.437351 0.4373514,0 1,0 Z"
+     id="rect15-9" />
+  <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:#dcdcdc;fill-opacity:0.0705882;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 1,0 C 0.4373514,0 0,0.437352 0,1 V 1.5 H 1.1074219 C 1.2574996,1.206504 1.5543285,1 1.9082031,1 H 20.091797 c 0.353874,0 0.650703,0.206504 0.800781,0.5 H 22 V 1 C 22,0.437352 21.562649,0 21,0 Z"
+     id="rect15-3-7-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:#d1d1d1;fill-opacity:0.0196078;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 1,22 C 0.4373514,22 0,21.562648 0,21 V 1.5 h 1 v 13.060547 5.53125 C 1,20.595433 1.4045667,21 1.9082031,21 H 20.091797 C 20.595433,21 21,20.595433 21,20.091797 V 14.560547 1.5 h 1 V 21 c 0,0.562648 -0.437351,1 -1,1 z"
+     id="rect15-3-7-9" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_library_header_sort.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_library_header_sort.svg
new file mode 100644
index 000000000000..fc332df8083a
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_library_header_sort.svg
@@ -0,0 +1,81 @@
+<?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="22"
+   width="23">
+  <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="defs9">
+    <linearGradient
+       id="linearGradient867">
+      <stop
+         id="stop863"
+         offset="0"
+         style="stop-color:#171719;stop-opacity:0" />
+      <stop
+         style="stop-color:#171719;stop-opacity:1"
+         offset="0.34999999"
+         id="stop871" />
+      <stop
+         id="stop865"
+         offset="1"
+         style="stop-color:#171719;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.95652174,0,0,0.95652174,-0.4348113,-22.521739)"
+       y2="12"
+       y1="12"
+       x2="24"
+       x1="2"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-opacity=".0047619" />
+      <stop
+         id="stop4"
+         offset=".5"
+         stop-opacity="0" />
+      <stop
+         id="stop6"
+         offset="1"
+         stop-opacity=".47451" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="11"
+       x2="21"
+       y1="11"
+       x1="1"
+       id="linearGradient869"
+       xlink:href="#linearGradient867" />
+  </defs>
+  <rect
+     ry="0.89999998"
+     style="fill:url(#linearGradient869);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round"
+     id="rect837"
+     width="20"
+     height="20"
+     x="1"
+     y="1"
+     rx="0.89999998" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_library_tall.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_library_tall.svg
new file mode 100644
index 000000000000..77bc9bbdf042
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_library_tall.svg
@@ -0,0 +1,60 @@
+<?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="26"
+   height="52"
+   version="1.1"
+   id="svg17">
+  <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="defs9">
+    <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"
+         id="stop2" />
+      <stop
+         stop-opacity="0"
+         offset=".5"
+         id="stop4" />
+      <stop
+         stop-opacity=".47451"
+         offset="1"
+         id="stop6" />
+    </linearGradient>
+  </defs>
+  <path
+     id="rect15-9"
+     d="M 0.8007812,0 C 0.3662299,0 0,0.36623 0,0.800781 V 51.199219 C 0,51.63377 0.36623,52 0.8007812,52 H 25.19932 c 0.434551,0 0.800781,-0.36623 0.800781,-0.800781 V 0.800781 C 26.000101,0.36623 25.633871,0 25.19932,0 Z M 2,1 h 22.000101 c 0.562649,0 1,0.437351 1,1 v 48 c 0,0.562649 -0.437351,1 -1,1 H 2 C 1.4373514,51 1,50.562649 1,50 V 2 C 1,1.437351 1.4373514,1 2,1 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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     id="rect15-3-7-1"
+     d="M 2,1 C 1.4373514,1 1,1.437352 1,2 V 2.5 H 2.1074219 C 2.2574996,2.206504 2.5543285,2 2.9082031,2 H 23.091898 c 0.353875,0 0.650703,0.206504 0.800781,0.5 h 1.107422 V 2 c 0,-0.562648 -0.437351,-1 -1,-1 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:#dcdcdc;fill-opacity:0.07058824;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     id="rect15-3-7-9"
+     d="M 2,51 C 1.4373514,51 1,50.562648 1,50 V 2.5 h 1 v 41.060547 5.53125 C 2,49.595433 2.4045667,50 2.9082031,50 H 23.091898 c 0.503636,0 1.079466,-0.43458 0.908203,-0.908203 V 43.560547 2.5 h 1 V 50 c 0,0.562648 -0.437351,1 -1,1 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:#d1d1d1;fill-opacity:0.01960784;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_library_tall_active.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_library_tall_active.svg
new file mode 100644
index 000000000000..5751b22cdd22
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_library_tall_active.svg
@@ -0,0 +1,60 @@
+<?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="26"
+   height="52"
+   version="1.1"
+   id="svg19">
+  <metadata
+     id="metadata23">
+    <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
+       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"
+         id="stop2" />
+      <stop
+         stop-opacity="0"
+         offset=".50727087"
+         id="stop4" />
+      <stop
+         stop-opacity=".0047619"
+         offset="1"
+         id="stop6" />
+    </linearGradient>
+  </defs>
+  <path
+     id="rect15-9"
+     d="M 0.8007812,0 C 0.3662299,0 0,0.36623 0,0.800781 V 51.199219 C 0,51.63377 0.36623,52 0.8007812,52 H 25.19932 c 0.434551,0 0.800781,-0.36623 0.800781,-0.800781 V 0.800781 C 26.000101,0.36623 25.633871,0 25.19932,0 Z M 2,1 h 22.000101 c 0.562649,0 1,0.437351 1,1 v 48 c 0,0.562649 -0.437351,1 -1,1 H 2 C 1.4373514,51 1,50.562649 1,50 V 2 C 1,1.437351 1.4373514,1 2,1 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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     id="rect15-3-7-1"
+     d="M 2,1 C 1.4373514,1 1,1.437352 1,2 V 2.5 H 2.1074219 C 2.2574996,2.206504 2.5543285,2 2.9082031,2 H 23.091898 c 0.353875,0 0.650703,0.206504 0.800781,0.5 h 1.107422 V 2 c 0,-0.562648 -0.437351,-1 -1,-1 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:0.21176471;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     id="rect15-3-7-9"
+     d="M 2,51 C 1.4373514,51 1,50.562648 1,50 V 2.5 h 1 v 41.060547 5.53125 C 2,49.595433 2.4045667,50 2.9082031,50 H 23.091898 c 0.503636,0 1.079466,-0.43458 0.908203,-0.908203 V 43.560547 2.5 h 1 V 50 c 0,0.562648 -0.437351,1 -1,1 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:0.31764706;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_library_wide.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_library_wide.svg
new file mode 100644
index 000000000000..08b16767acd4
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_library_wide.svg
@@ -0,0 +1,60 @@
+<?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="52"
+   height="26"
+   version="1.1"
+   id="svg17">
+  <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="defs9">
+    <linearGradient
+       id="a"
+       x1="2"
+       x2="24"
+       y1="12"
+       y2="12"
+       gradientTransform="matrix(1,0,0,2.1304348,-40,-49.434783)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-opacity=".0047619"
+         offset="0"
+         id="stop2" />
+      <stop
+         stop-opacity="0"
+         offset=".5"
+         id="stop4" />
+      <stop
+         stop-opacity=".47451"
+         offset="1"
+         id="stop6" />
+    </linearGradient>
+  </defs>
+  <path
+     id="rect15-9"
+     d="M 0.8007307,0 C 0.3661794,0 -5.1399436e-5,0.36623 -5.05e-5,0.8007812 L 0,25.199219 C 8.9943568e-7,25.63377 0.36623,26 0.8007812,26 H 51.199346 c 0.434551,0 0.800782,-0.36623 0.800781,-0.800781 L 52.000076,0.8007812 C 52.000075,0.3662299 51.633846,0 51.199295,0 Z M 1.9999495,1 H 50.000076 c 0.562649,0 0.999999,0.4373514 1,1 l 5.1e-5,22 c 10e-7,0.562649 -0.437351,1 -1,1 H 2 C 1.4373514,25 1.0000013,24.562649 1,24 L 0.9999495,2 c -1.29e-6,-0.5626486 0.4373514,-1 1,-1 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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     id="rect15-3-7-1"
+     d="m 1.9999495,1 c -0.5626486,0 -1.00005683,0.437352 -1,1 V 2.5 H 2.1073714 C 2.2574491,2.2065045 2.554278,2 2.9081526,2 H 49.091873 c 0.353875,0 0.650703,0.2065045 0.800781,0.5 h 1.107422 V 2 c 0,-0.562648 -0.437351,-1 -1,-1 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:#dcdcdc;fill-opacity:0.07058824;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     id="rect15-3-7-9"
+     d="M 2,25 C 1.4373514,25 1,24.562648 1,24 L 0.9999495,2.5 h 1 L 2,17.560547 v 5.53125 C 2,23.595433 2.4045667,24 2.9082031,24 H 49.091924 c 0.503636,0 1.400816,-0.803405 0.908203,-0.908203 v -5.53125 L 50.000076,2.5 h 1 l 5.1e-5,21.5 c 10e-7,0.562648 -0.437351,1 -1,1 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:#d1d1d1;fill-opacity:0.01960784;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_library_wide_active.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_library_wide_active.svg
new file mode 100644
index 000000000000..59fb7139e5bc
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_library_wide_active.svg
@@ -0,0 +1,60 @@
+<?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="52"
+   height="26"
+   version="1.1"
+   id="svg17">
+  <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="defs9">
+    <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"
+         id="stop2" />
+      <stop
+         stop-opacity="0"
+         offset=".50727087"
+         id="stop4" />
+      <stop
+         stop-opacity=".0047619"
+         offset="1"
+         id="stop6" />
+    </linearGradient>
+  </defs>
+  <path
+     id="rect15-9"
+     d="M 0.8007307,0 C 0.3661794,0 -5.1399436e-5,0.36623 -5.05e-5,0.8007812 L 0,25.199219 C 8.9943568e-7,25.63377 0.36623,26 0.8007812,26 H 51.199346 c 0.434551,0 0.800782,-0.36623 0.800781,-0.800781 L 52.000076,0.8007812 C 52.000075,0.3662299 51.633846,0 51.199295,0 Z M 1.9999495,1 H 50.000076 c 0.562649,0 0.999999,0.4373514 1,1 l 5.1e-5,22 c 10e-7,0.562649 -0.437351,1 -1,1 H 2 C 1.4373514,25 1.0000013,24.562649 1,24 L 0.9999495,2 c -1.29e-6,-0.5626486 0.4373514,-1 1,-1 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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     id="rect15-3-7-1"
+     d="m 1.9999495,1 c -0.5626486,0 -1,0.437352 -1,1 V 2.5 H 2.1073714 C 2.2574491,2.2065045 2.554278,2 2.9081526,2 H 49.091873 c 0.353875,0 0.650703,0.2065045 0.800781,0.5 h 1.107422 V 2 c 0,-0.562648 -0.437351,-1 -1,-1 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:0.21176471;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     id="rect15-3-7-9"
+     d="M 2,25 C 1.4373514,25 1,24.562648 1,24 L 0.9999495,2.5 h 1 L 2,17.560547 v 5.53125 C 2,23.595433 2.4045667,24 2.9082031,24 H 49.091924 c 0.503636,0 1.400816,-0.803405 0.908203,-0.908203 v -5.53125 L 50.000076,2.5 h 1 l 5.1e-5,21.5 c 10e-7,0.562648 -0.437351,1 -1,1 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:0.31764706;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_medium.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_medium.svg
new file mode 100644
index 000000000000..dc327a770a3e
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_medium.svg
@@ -0,0 +1,60 @@
+<?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="svg17"
+   version="1.1"
+   height="26"
+   width="42">
+  <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="defs9">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6956522,-3.279503e-7,-39.652175)"
+       y2="12"
+       y1="12"
+       x2="24"
+       x1="2"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-opacity=".0047619" />
+      <stop
+         id="stop4"
+         offset=".5"
+         stop-opacity="0" />
+      <stop
+         id="stop6"
+         offset="1"
+         stop-opacity=".47451" />
+    </linearGradient>
+  </defs>
+  <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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 1.8007812,1 C 1.3662299,1 1,1.36623 1,1.8007812 V 24.199219 C 1,24.63377 1.36623,25 1.8007812,25 H 40.19932 c 0.434551,0 0.800781,-0.36623 0.800781,-0.800781 V 1.8007812 C 41.000101,1.3662299 40.633871,1 40.19932,1 Z M 3,2 h 36.000101 c 0.562649,0 1,0.4373514 1,1 v 20 c 0,0.562649 -0.437351,1 -1,1 H 3 C 2.4373514,24 2,23.562649 2,23 V 3 C 2,2.4373514 2.4373514,2 3,2 Z"
+     id="rect15-9" />
+  <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:#dcdcdc;fill-opacity:0.07058824;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,2 C 2.4373514,2 2,2.437352 2,3 V 3.5 H 3.1074219 C 3.2574996,3.2065045 3.5543285,3 3.9082031,3 H 38.091898 c 0.353875,0 0.650703,0.2065045 0.800781,0.5 h 1.107422 V 3 c 0,-0.562648 -0.437351,-1 -1,-1 z"
+     id="rect15-3-7-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:#d1d1d1;fill-opacity:0.01960784;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,24 C 2.4373514,24 2,23.562648 2,23 V 3.5 h 1 v 13.060547 5.53125 C 3,22.595433 3.4045667,23 3.9082031,23 H 38.091898 c 0.503636,0 1.384199,-0.743651 0.908203,-0.908203 V 16.560547 3.5 h 1 V 23 c 0,0.562648 -0.437351,1 -1,1 z"
+     id="rect15-3-7-9" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_medium_active.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_medium_active.svg
new file mode 100644
index 000000000000..b9e9e3dc5285
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_medium_active.svg
@@ -0,0 +1,60 @@
+<?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="svg19"
+   version="1.1"
+   height="26"
+   width="42">
+  <metadata
+     id="metadata23">
+    <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(-.91304356 0 0 .75510204 -1.1304082 -19.489795)"
+       y2="12"
+       y1="12"
+       x2="24.405561"
+       x1=".5"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-opacity=".39215687" />
+      <stop
+         id="stop4"
+         offset=".50727087"
+         stop-opacity="0" />
+      <stop
+         id="stop6"
+         offset="1"
+         stop-opacity=".0047619" />
+    </linearGradient>
+  </defs>
+  <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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 1.8007812,1 C 1.3662299,1 1,1.36623 1,1.8007812 V 24.199219 C 1,24.63377 1.36623,25 1.8007812,25 H 40.19932 c 0.434551,0 0.800781,-0.36623 0.800781,-0.800781 V 1.8007812 C 41.000101,1.3662299 40.633871,1 40.19932,1 Z M 3,2 h 36.000101 c 0.562649,0 1,0.4373514 1,1 v 20 c 0,0.562649 -0.437351,1 -1,1 H 3 C 2.4373514,24 2,23.562649 2,23 V 3 C 2,2.4373514 2.4373514,2 3,2 Z"
+     id="rect15-9" />
+  <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:0.21176471;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,2 C 2.4373514,2 2,2.437352 2,3 V 3.5 H 3.1074219 C 3.2574996,3.2065045 3.5543285,3 3.9082031,3 H 38.091898 c 0.353875,0 0.650703,0.2065045 0.800781,0.5 h 1.107422 V 3 c 0,-0.562648 -0.437351,-1 -1,-1 z"
+     id="rect15-3-7-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:0.31764706;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,24 C 2.4373514,24 2,23.562648 2,23 V 3.5 h 1 v 13.060547 5.53125 C 3,22.595433 3.4045667,23 3.9082031,23 H 38.091898 c 0.503636,0 0.908203,-0.404567 0.908203,-0.908203 V 16.560547 3.5 h 1 V 23 c 0,0.562648 -0.437351,1 -1,1 z"
+     id="rect15-3-7-9" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_medium_set.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_medium_set.svg
new file mode 100644
index 000000000000..39d60063c3e0
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_medium_set.svg
@@ -0,0 +1,64 @@
+<?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="svg17"
+   version="1.1"
+   height="26"
+   width="42">
+  <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="defs9">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6956521,0,-39.652173)"
+       y2="12"
+       y1="12"
+       x2="24"
+       x1="2"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-opacity=".0047619" />
+      <stop
+         id="stop4"
+         offset=".5"
+         stop-opacity="0" />
+      <stop
+         id="stop6"
+         offset="1"
+         stop-opacity=".47451" />
+    </linearGradient>
+  </defs>
+  <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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 1.8007812,1 C 1.3662299,1 1,1.36623 1,1.8007812 V 24.199219 C 1,24.63377 1.36623,25 1.8007812,25 H 40.19932 c 0.434551,0 0.800781,-0.36623 0.800781,-0.800781 V 1.8007812 C 41.000101,1.3662299 40.633871,1 40.19932,1 Z M 3,2 h 36.000101 c 0.562649,0 1,0.4373514 1,1 v 20 c 0,0.562649 -0.437351,1 -1,1 H 3 C 2.4373514,24 2,23.562649 2,23 V 3 C 2,2.4373514 2.4373514,2 3,2 Z"
+     id="rect15-9" />
+  <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:#dcdcdc;fill-opacity:0.19607843;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,2 C 2.4373514,2 2,2.437352 2,3 V 3.5 H 3.1074219 C 3.2574996,3.2065045 3.5543285,3 3.9082031,3 H 38.091898 c 0.353875,0 0.650703,0.2065045 0.800781,0.5 h 1.107422 V 3 c 0,-0.562648 -0.437351,-1 -1,-1 z"
+     id="rect15-3-7-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:#d1d1d1;fill-opacity:0.09803922;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,24 C 2.4373514,24 2,23.562648 2,23 V 3.5 h 1 v 13.060547 5.53125 C 3,22.595433 3.4045667,23 3.9082031,23 H 38.091898 c 0.503636,0 0.908203,-0.404567 0.908203,-0.908203 V 16.560547 3.5 h 1 V 23 c 0,0.562648 -0.437351,1 -1,1 z"
+     id="rect15-3-7-9" />
+  <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:0.05882353;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3.9082031,3 H 38.091898 c 0.353875,0 0.650703,0.2065045 0.800781,0.5 h 0.107422 v 13.060547 5.53125 C 39.000101,22.595433 38.595534,23 38.091898,23 H 3.9082031 C 3.4045667,23 3,22.595433 3,22.091797 V 16.560547 3.5 H 3.1074219 C 3.2574996,3.2065045 3.5543285,3 3.9082031,3 Z"
+     id="rect15-3-7" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_mixmode.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_mixmode.svg
new file mode 100644
index 000000000000..818e923d9f9c
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_mixmode.svg
@@ -0,0 +1,60 @@
+<?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="svg17"
+   version="1.1"
+   height="26"
+   width="32">
+  <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="defs9">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.2608696,-3.279503e-7,-29.869566)"
+       y2="12"
+       y1="12"
+       x2="24"
+       x1="2"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-opacity=".0047619" />
+      <stop
+         id="stop4"
+         offset=".5"
+         stop-opacity="0" />
+      <stop
+         id="stop6"
+         offset="1"
+         stop-opacity=".47451" />
+    </linearGradient>
+  </defs>
+  <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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 1.8007812,1 C 1.3662299,1 1,1.36623 1,1.8007812 V 24.199219 C 1,24.63377 1.36623,25 1.8007812,25 H 30.19932 c 0.434551,0 0.800781,-0.36623 0.800781,-0.800781 V 1.8007812 C 31.000101,1.3662299 30.633871,1 30.19932,1 Z M 3,2 h 26.000101 c 0.562649,0 1,0.4373514 1,1 v 20 c 0,0.562649 -0.437351,1 -1,1 H 3 C 2.4373514,24 2,23.562649 2,23 V 3 C 2,2.4373514 2.4373514,2 3,2 Z"
+     id="rect15-9" />
+  <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:#dcdcdc;fill-opacity:0.07058824;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,2 C 2.4373514,2 2,2.437352 2,3 V 3.5 H 3.1074219 C 3.2574996,3.2065045 3.5543285,3 3.9082031,3 H 28.091898 c 0.353874,0 0.650703,0.2065045 0.800781,0.5 h 1.107422 V 3 c 0,-0.562648 -0.437351,-1 -1,-1 z"
+     id="rect15-3-7-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:#d1d1d1;fill-opacity:0.01960784;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,24 C 2.4373514,24 2,23.562648 2,23 V 3.5 h 1 v 13.060547 5.53125 C 3,22.595433 3.4045667,23 3.9082031,23 H 28.091898 c 0.503636,0 1.278502,-0.56684 0.908203,-0.908203 V 16.560547 3.5 h 1 V 23 c 0,0.562648 -0.437351,1 -1,1 z"
+     id="rect15-3-7-9" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_mixmode_active.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_mixmode_active.svg
new file mode 100644
index 000000000000..676371b1eaaf
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_mixmode_active.svg
@@ -0,0 +1,60 @@
+<?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="svg17"
+   version="1.1"
+   height="26"
+   width="32">
+  <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="defs9">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-.91304356 0 0 .55102041 -1.1304082 -14.897959)"
+       y2="12"
+       y1="12"
+       x2="24.405561"
+       x1=".5"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-opacity=".39215687" />
+      <stop
+         id="stop4"
+         offset=".50727087"
+         stop-opacity="0" />
+      <stop
+         id="stop6"
+         offset="1"
+         stop-opacity=".0047619" />
+    </linearGradient>
+  </defs>
+  <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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 1.8007812,1 C 1.3662299,1 1,1.36623 1,1.8007812 V 24.199219 C 1,24.63377 1.36623,25 1.8007812,25 H 30.19932 c 0.434551,0 0.800781,-0.36623 0.800781,-0.800781 V 1.8007812 C 31.000101,1.3662299 30.633871,1 30.19932,1 Z M 3,2 h 26.000101 c 0.562649,0 1,0.4373514 1,1 v 20 c 0,0.562649 -0.437351,1 -1,1 H 3 C 2.4373514,24 2,23.562649 2,23 V 3 C 2,2.4373514 2.4373514,2 3,2 Z"
+     id="rect15-9" />
+  <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:0.21176471;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,2 C 2.4373514,2 2,2.437352 2,3 V 3.5 H 3.1074219 C 3.2574996,3.2065045 3.5543285,3 3.9082031,3 H 28.091898 c 0.353874,0 0.650703,0.2065045 0.800781,0.5 h 1.107422 V 3 c 0,-0.562648 -0.437351,-1 -1,-1 z"
+     id="rect15-3-7-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:0.31764706;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,24 C 2.4373514,24 2,23.562648 2,23 V 3.5 h 1 v 13.060547 5.53125 C 3,22.595433 3.4045667,23 3.9082031,23 H 28.091898 c 0.503636,0 1.278502,-0.56684 0.908203,-0.908203 V 16.560547 3.5 h 1 V 23 c 0,0.562648 -0.437351,1 -1,1 z"
+     id="rect15-3-7-9" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_play.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_play.svg
new file mode 100644
index 000000000000..f4f454d0eb6b
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_play.svg
@@ -0,0 +1,60 @@
+<?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="svg19"
+   version="1.1"
+   height="26"
+   width="68">
+  <metadata
+     id="metadata23">
+    <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(.95652174 0 0 2.7826087 .5651887 -64.608695)"
+       y2="12"
+       y1="12"
+       x2="24"
+       x1="2"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-opacity=".0047619" />
+      <stop
+         id="stop4"
+         offset=".5"
+         stop-opacity="0" />
+      <stop
+         id="stop6"
+         offset="1"
+         stop-opacity=".47451" />
+    </linearGradient>
+  </defs>
+  <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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 1.8007812,1 C 1.3662299,1 1,1.36623 1,1.8007812 V 24.199219 C 1,24.63377 1.36623,25 1.8007812,25 H 66.19932 c 0.434551,0 0.800781,-0.36623 0.800781,-0.800781 V 1.8007812 C 67.000101,1.3662299 66.633871,1 66.19932,1 Z M 3,2 h 62.000101 c 0.56265,0 1,0.4373514 1,1 v 20 c 0,0.562649 -0.43735,1 -1,1 H 3 C 2.4373514,24 2,23.562649 2,23 V 3 C 2,2.4373514 2.4373514,2 3,2 Z"
+     id="rect15-9" />
+  <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:#dcdcdc;fill-opacity:0.07058824;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,2 C 2.4373514,2 2,2.437352 2,3 V 3.5 H 3.1074219 C 3.2574996,3.2065045 3.5543285,3 3.9082031,3 H 64.091899 c 0.353874,0 0.650703,0.2065045 0.800781,0.5 h 1.107421 V 3 c 0,-0.562648 -0.43735,-1 -1,-1 z"
+     id="rect15-3-7-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:#d1d1d1;fill-opacity:0.01960784;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,24 C 2.4373514,24 2,23.562648 2,23 V 3.5 h 1 v 13.060547 5.53125 C 3,22.595433 3.4045667,23 3.9082031,23 H 64.091899 c 0.503636,0 1.407527,-0.842444 0.908202,-0.908203 V 16.560547 3.5 h 1 V 23 c 0,0.562648 -0.43735,1 -1,1 z"
+     id="rect15-3-7-9" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_play_active.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_play_active.svg
new file mode 100644
index 000000000000..4cdbc56bae4e
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_play_active.svg
@@ -0,0 +1,60 @@
+<?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="68"
+   height="26"
+   version="1.1"
+   id="svg19">
+  <metadata
+     id="metadata23">
+    <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
+       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"
+         id="stop2" />
+      <stop
+         stop-opacity="0"
+         offset=".50727087"
+         id="stop4" />
+      <stop
+         stop-opacity=".0047619"
+         offset="1"
+         id="stop6" />
+    </linearGradient>
+  </defs>
+  <path
+     id="rect15-9"
+     d="M 1.8007812,1 C 1.3662299,1 1,1.36623 1,1.8007812 V 24.199219 C 1,24.63377 1.36623,25 1.8007812,25 H 66.19932 c 0.434551,0 0.800781,-0.36623 0.800781,-0.800781 V 1.8007812 C 67.000101,1.3662299 66.633871,1 66.19932,1 Z M 3,2 h 62.000101 c 0.56265,0 1,0.4373514 1,1 v 20 c 0,0.562649 -0.43735,1 -1,1 H 3 C 2.4373514,24 2,23.562649 2,23 V 3 C 2,2.4373514 2.4373514,2 3,2 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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     id="rect15-3-7-1"
+     d="M 3,2 C 2.4373514,2 2,2.437352 2,3 V 3.5 H 3.1074219 C 3.2574996,3.2065045 3.5543285,3 3.9082031,3 H 64.091899 c 0.353874,0 0.650703,0.2065045 0.800781,0.5 h 1.107421 V 3 c 0,-0.562648 -0.43735,-1 -1,-1 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:0.39215687;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     id="rect15-3-7-9"
+     d="M 3,24 C 2.4373514,24 2,23.562648 2,23 V 3.5 h 1 v 13.060547 5.53125 C 3,22.595433 3.4045667,23 3.9082031,23 H 64.091899 c 0.503636,0 0.908202,-0.404567 0.908202,-0.908203 V 16.560547 3.5 h 1 V 23 c 0,0.562648 -0.43735,1 -1,1 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:0.31764706;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_spinbox.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_spinbox.svg
new file mode 100644
index 000000000000..8988619fc2c4
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_spinbox.svg
@@ -0,0 +1,134 @@
+<?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="svg26"
+   version="1.1"
+   height="26"
+   width="26">
+  <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="defs18">
+    <linearGradient
+       id="linearGradient874"
+       x1="-1"
+       x2="-1"
+       y1="2"
+       y2="25"
+       gradientTransform="translate(2.50005 -.507121)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#393939"
+         offset="0"
+         id="stop868"
+         style="stop-color:#1c1c1c;stop-opacity:1" />
+      <stop
+         stop-color="#393939"
+         offset="0.30102351"
+         id="stop870"
+         style="stop-color:#1e1e1e;stop-opacity:1" />
+      <stop
+         stop-color="#141414"
+         offset="1"
+         id="stop872"
+         style="stop-color:#0f0f0f;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0476191 0 0 1.0476191 .92857134 .92856947)"
+       y2="11.056819"
+       y1="2"
+       x2="11.056818"
+       x1="2"
+       id="c">
+      <stop
+         id="stop2"
+         offset="0" />
+      <stop
+         id="stop4"
+         offset="1" />
+      <stop
+         id="stop6"
+         offset="1"
+         stop-opacity=".97474748"
+         stop-color="#333" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(2.50005 -.507121)"
+       y2="25"
+       y1="2"
+       x2="-1"
+       x1="-1"
+       id="b">
+      <stop
+         style="stop-color:#1c1c1c;stop-opacity:1"
+         id="stop11"
+         offset="0"
+         stop-color="#393939" />
+      <stop
+         style="stop-color:#1e1e1e;stop-opacity:1"
+         id="stop13"
+         offset=".30102351"
+         stop-color="#393939" />
+      <stop
+         style="stop-color:#0f0f0f;stop-opacity:1"
+         id="stop15"
+         offset="1"
+         stop-color="#141414" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="24"
+       x2="22"
+       y1="3"
+       x1="22"
+       id="linearGradient866"
+       xlink:href="#linearGradient874" />
+  </defs>
+  <path
+     id="path1053"
+     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-variant-east-asian:normal;font-feature-settings:normal;font-variation-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;shape-margin:0;inline-size: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:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+     d="M 1.0507812,0 C 0.48205432,0 0,0.482054 0,1.050781 V 24.949219 C 0,25.517946 0.48205432,26 1.0507812,26 H 24.949219 C 25.517946,26 26,25.517946 26,24.949219 V 1.050781 C 26,0.482054 25.517946,0 24.949219,0 Z M 3,3 H 24.5 V 24.5 H 3 Z" />
+  <path
+     id="path22"
+     style="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:#000001;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;fill:#1b1b1d;fill-opacity:1"
+     solid-color="#000001"
+     shape-rendering="auto"
+     image-rendering="auto"
+     fill="url(#b)"
+     dominant-baseline="auto"
+     color-rendering="auto"
+     color="#000001"
+     d="M 1,2.5 1,24.992188 H 2 V 2.5" />
+  <path
+     id="path858"
+     d="M 2,25 V 24 H 24 V 3 l 1,-1 v 23 z"
+     style="fill:#202022;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  <path
+     d="M 25,1.0000005 1.5,0.992188 c -0.2761309,2.761e-5 -0.4999724,0.2238691 -0.5,0.5 V 2.5 H 2 V 2 h 23"
+     color="#000001"
+     color-rendering="auto"
+     dominant-baseline="auto"
+     fill="url(#b)"
+     image-rendering="auto"
+     shape-rendering="auto"
+     solid-color="#000001"
+     style="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:#000001;text-transform:none;text-orientation:mixed;white-space:normal;shape-padding:0;isolation:auto;mix-blend-mode:normal;fill:#242426;fill-opacity:1"
+     id="path22-6" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_spinbox_autodj.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_spinbox_autodj.svg
new file mode 100644
index 000000000000..997a92a2b494
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_spinbox_autodj.svg
@@ -0,0 +1,155 @@
+<?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="26"
+   height="26"
+   version="1.1"
+   id="svg26">
+  <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="defs18">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(2.50005 -.507121)"
+       y2="25"
+       y1="2"
+       x2="-1"
+       x1="-1"
+       id="linearGradient874">
+      <stop
+         style="stop-color:#1c1c1c;stop-opacity:1"
+         id="stop868"
+         offset="0"
+         stop-color="#393939" />
+      <stop
+         style="stop-color:#1e1e1e;stop-opacity:1"
+         id="stop870"
+         offset="0.30102351"
+         stop-color="#393939" />
+      <stop
+         style="stop-color:#0f0f0f;stop-opacity:1"
+         id="stop872"
+         offset="1"
+         stop-color="#141414" />
+    </linearGradient>
+    <linearGradient
+       id="c"
+       x1="2"
+       x2="22"
+       y1="2"
+       y2="22"
+       gradientTransform="matrix(1.0476191 0 0 1.0476191 .92857134 .92856947)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         id="stop2" />
+      <stop
+         offset=".5"
+         id="stop4" />
+      <stop
+         stop-color="#333"
+         stop-opacity=".97474748"
+         offset=".5"
+         id="stop6" />
+      <stop
+         stop-color="#333"
+         offset="1"
+         id="stop8" />
+    </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"
+         id="stop11"
+         style="stop-color:#1c1c1c;stop-opacity:1" />
+      <stop
+         stop-color="#393939"
+         offset=".30102351"
+         id="stop13"
+         style="stop-color:#1e1e1e;stop-opacity:1" />
+      <stop
+         stop-color="#141414"
+         offset="1"
+         id="stop15"
+         style="stop-color:#0f0f0f;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient874"
+       id="linearGradient866"
+       x1="22"
+       y1="3"
+       x2="22"
+       y2="24"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <rect
+     x="2.5"
+     y="2.4999981"
+     width="22"
+     height="22.000002"
+     style="paint-order:fill markers stroke"
+     id="rect24"
+     stroke-linecap="square"
+     stroke="url(#c)"
+     fill="none" />
+  <rect
+     x=".75"
+     y=".75"
+     width="24.5"
+     height="24.5"
+     rx=".30000007"
+     ry=".30000007"
+     fill="none"
+     stroke="#000001"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     stroke-width="1.5"
+     style="paint-order:fill markers stroke"
+     id="rect20" />
+  <path
+     d="m24 1-22.5-.0078125c-.2761309 2.761e-5-.4999724.2238691-.5.5v23.5000005h1v-23.0000005h22"
+     color="#000001"
+     color-rendering="auto"
+     dominant-baseline="auto"
+     fill="url(#b)"
+     image-rendering="auto"
+     shape-rendering="auto"
+     solid-color="#000001"
+     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:#000001;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal;fill:#222222;fill-opacity:1"
+     id="path22" />
+  <path
+     style="fill:#222222;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+     d="M 2,25 3,24 H 24 V 3 l 1,-1 v 23 z"
+     id="path858" />
+  <path
+     id="rect15-3-7-1-3"
+     d="M 2,1 C 1.437351,1 1,1.437352 1,2 V 2.5 H 2.107422 C 2.2575,2.2065045 2.554328,2 2.908203,2 h 19.183594 c 0.353874,0 0.650703,0.2065045 0.800781,0.5 H 24 V 2 C 24,1.437352 23.562649,1 23,1 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:#dcdcdc;fill-opacity:0.07058824;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     id="rect15-3-7-9-6"
+     d="m 2,24.992188 c -0.562649,0 -1,-0.437352 -1,-1 V 2.5 h 1 v 15.052735 5.53125 c 0,0.503636 0.404567,0.908203 0.908203,0.908203 H 22.091797 C 22.595433,23.992188 23,23.587621 23,23.083985 V 17.552735 2.5 h 1 v 21.492188 c 0,0.562648 -0.437351,1 -1,1 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:#d1d1d1;fill-opacity:0.01960784;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_spinbox_focus_blue.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_spinbox_focus_blue.svg
new file mode 100644
index 000000000000..49039438520a
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_spinbox_focus_blue.svg
@@ -0,0 +1,117 @@
+<?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="svg35"
+   version="1.1"
+   height="26"
+   width="26">
+  <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="defs23">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0476191,0,0,1.0476191,0.92857129,0.92856947)"
+       y2="22"
+       y1="2"
+       x2="22"
+       x1="2"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0" />
+      <stop
+         id="stop4"
+         offset=".5" />
+      <stop
+         id="stop6"
+         offset=".5"
+         stop-opacity=".97474748"
+         stop-color="#333" />
+      <stop
+         id="stop8"
+         offset="1"
+         stop-color="#333" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(2.50005,-0.507121)"
+       y2="25"
+       y1="2"
+       x2="-1"
+       x1="-1"
+       id="b">
+      <stop
+         id="stop11"
+         offset="0"
+         stop-color="#393939" />
+      <stop
+         id="stop13"
+         offset=".30102351"
+         stop-color="#393939" />
+      <stop
+         id="stop15"
+         offset="1"
+         stop-color="#141414" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-7.7034199,41.525424)"
+       y2="17.737288"
+       y1="-42.966103"
+       x2="12.889831"
+       x1="12.889831"
+       id="c">
+      <stop
+         id="stop18"
+         offset="0"
+         stop-color="#d09300" />
+      <stop
+         id="stop20"
+         offset="1"
+         stop-color="#bf4c00" />
+    </linearGradient>
+  </defs>
+  <rect
+     x="0.75"
+     y="0.75"
+     width="24.5"
+     height="24.5"
+     rx="0.30000007"
+     ry="0.30000007"
+     style="fill:none;stroke:#257b82;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;paint-order:fill markers stroke;stroke-opacity:1"
+     id="rect25" />
+  <rect
+     x="2.5"
+     y="2.4999981"
+     width="22"
+     height="22.000002"
+     style="fill:none;stroke:url(#a);stroke-linecap:square;paint-order:fill markers stroke"
+     id="rect27" />
+  <path
+     d="m 1.50005,24.492879 v -23 H 24.5 v 23"
+     id="path29"
+     style="fill:none;stroke:url(#b);stroke-width:1px;stroke-linecap:round;stroke-linejoin:round" />
+  <rect
+     id="rect33"
+     style="paint-order:fill markers stroke"
+     fill="#141414"
+     height="1"
+     width="18"
+     y="24"
+     x="7" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_square.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_square.svg
new file mode 100644
index 000000000000..6ba4487118c0
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_square.svg
@@ -0,0 +1,66 @@
+<?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="26"
+   height="26"
+   version="1.1"
+   id="svg19">
+  <metadata
+     id="metadata23">
+    <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
+       id="a"
+       x1="1.4817026"
+       x2="24.460131"
+       y1="12"
+       y2="12"
+       gradientTransform="matrix(0.95652169,0,0,0.95652169,4.3109514,-40.598009)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-opacity=".0047619"
+         offset="0"
+         id="stop2" />
+      <stop
+         id="stop830"
+         offset="0.06141451"
+         stop-opacity=".0047619"
+         style="stop-color:#000000;stop-opacity:0;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         stop-opacity=".0047619"
+         offset="0.94799"
+         id="stop832" />
+      <stop
+         stop-opacity="0"
+         offset="1"
+         id="stop4" />
+    </linearGradient>
+  </defs>
+  <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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 1.8007812,1 C 1.3662299,1 1,1.36623 1,1.8007812 V 24.199219 C 1,24.63377 1.36623,25 1.8007812,25 H 24.199219 C 24.63377,25 25,24.63377 25,24.199219 V 1.8007812 C 25,1.3662299 24.63377,1 24.199219,1 Z M 3,2 h 20 c 0.562649,0 1,0.4373514 1,1 v 20 c 0,0.562649 -0.437351,1 -1,1 H 3 C 2.4373514,24 2,23.562649 2,23 V 3 C 2,2.4373514 2.4373514,2 3,2 Z"
+     id="rect15-9" />
+  <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:#dcdcdc;fill-opacity:0.07058824;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,2 C 2.4373514,2 2,2.437352 2,3 V 3.5 H 3.1074219 C 3.2574996,3.2065045 3.5543285,3 3.9082031,3 H 22.091797 c 0.353874,0 0.650703,0.2065045 0.800781,0.5 H 24 V 3 C 24,2.437352 23.562649,2 23,2 Z"
+     id="rect15-3-7-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:#d1d1d1;fill-opacity:0.01960784;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,24 C 2.4373514,24 2,23.562648 2,23 V 3.5 h 1 v 13.060547 5.53125 C 3,22.595433 3.4045667,23 3.9082031,23 H 22.091797 C 22.595433,23 23,22.595433 23,22.091797 V 16.560547 3.5 h 1 V 23 c 0,0.562648 -0.437351,1 -1,1 z"
+     id="rect15-3-7-9" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_square_active.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_square_active.svg
new file mode 100644
index 000000000000..92d496ef9220
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_square_active.svg
@@ -0,0 +1,66 @@
+<?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="26"
+   height="26"
+   version="1.1"
+   id="svg19">
+  <metadata
+     id="metadata23">
+    <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
+       id="a"
+       x1="1.4817026"
+       x2="24.460131"
+       y1="12"
+       y2="12"
+       gradientTransform="matrix(0.95652169,0,0,0.95652169,4.3109514,-40.598009)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-opacity=".0047619"
+         offset="0"
+         id="stop2" />
+      <stop
+         id="stop830"
+         offset="0.06141451"
+         stop-opacity=".0047619"
+         style="stop-color:#000000;stop-opacity:0;" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         stop-opacity=".0047619"
+         offset="0.94799"
+         id="stop832" />
+      <stop
+         stop-opacity="0"
+         offset="1"
+         id="stop4" />
+    </linearGradient>
+  </defs>
+  <path
+     id="rect15-9"
+     d="M 1.8007812,1 C 1.3662299,1 1,1.36623 1,1.8007812 V 24.199219 C 1,24.63377 1.36623,25 1.8007812,25 H 24.199219 C 24.63377,25 25,24.63377 25,24.199219 V 1.8007812 C 25,1.3662299 24.63377,1 24.199219,1 Z M 3,2 h 20 c 0.562649,0 1,0.4373514 1,1 v 20 c 0,0.562649 -0.437351,1 -1,1 H 3 C 2.4373514,24 2,23.562649 2,23 V 3 C 2,2.4373514 2.4373514,2 3,2 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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     id="rect15-3-7-1"
+     d="M 3,2 C 2.4373514,2 2,2.437352 2,3 V 3.5 H 3.1074219 C 3.2574996,3.2065045 3.5543285,3 3.9082031,3 H 22.091797 c 0.353874,0 0.650703,0.2065045 0.800781,0.5 H 24 V 3 C 24,2.437352 23.562649,2 23,2 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:0.21176471;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     id="rect15-3-7-9"
+     d="M 3,24 C 2.4373514,24 2,23.562648 2,23 V 3.5 h 1 v 13.060547 5.53125 C 3,22.595433 3.4045667,23 3.9082031,23 H 22.091797 C 22.595433,23 23,22.595433 23,22.091797 V 16.560547 3.5 h 1 V 23 c 0,0.562648 -0.437351,1 -1,1 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:0.31764707;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_square_big.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_square_big.svg
new file mode 100644
index 000000000000..1e1b5227ac66
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_square_big.svg
@@ -0,0 +1,81 @@
+<?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="34"
+   height="34"
+   version="1.1"
+   id="svg26">
+  <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="defs16">
+    <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"
+         id="stop2" />
+      <stop
+         stop-opacity="0"
+         offset=".5"
+         id="stop4" />
+      <stop
+         stop-opacity=".47451"
+         offset="1"
+         id="stop6" />
+    </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"
+         id="stop9" />
+      <stop
+         stop-color="#393939"
+         offset=".49880221"
+         id="stop11" />
+      <stop
+         stop-color="#121212"
+         offset="1"
+         id="stop13" />
+    </linearGradient>
+  </defs>
+  <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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 1.8007812,1 C 1.3662299,1 1,1.36623 1,1.8007812 V 32.199219 C 1,32.63377 1.36623,33 1.8007812,33 H 32.19932 c 0.434551,0 0.800781,-0.36623 0.800781,-0.800781 V 1.8007812 C 33.000101,1.3662299 32.633871,1 32.19932,1 Z M 3,2 h 28.000101 c 0.562649,0 1,0.437351 1,1 v 28 c 0,0.562649 -0.437351,1 -1,1 H 3 C 2.4373514,32 2,31.562649 2,31 V 3 C 2,2.437351 2.4373514,2 3,2 Z"
+     id="rect15-9" />
+  <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:#dcdcdc;fill-opacity:0.07058824;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,2 C 2.4373514,2 2,2.437352 2,3 V 3.5 H 3.1074219 C 3.2574996,3.206504 3.5543285,3 3.9082031,3 H 30.091898 c 0.353874,0 0.650703,0.206504 0.800781,0.5 h 1.107422 V 3 c 0,-0.562648 -0.437351,-1 -1,-1 z"
+     id="rect15-3-7-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:#d1d1d1;fill-opacity:0.01960784;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,32 C 2.4373514,32 2,31.562648 2,31 V 3.5 h 1 v 21.060547 5.53125 C 3,30.595433 3.4045667,31 3.9082031,31 H 30.091898 c 0.503636,0 0.908203,-0.404567 0.908203,-0.908203 V 24.560547 3.5 h 1 V 31 c 0,0.562648 -0.437351,1 -1,1 z"
+     id="rect15-3-7-9" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_square_big_active.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_square_big_active.svg
new file mode 100644
index 000000000000..bc2dce7eac96
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_square_big_active.svg
@@ -0,0 +1,60 @@
+<?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="svg17"
+   version="1.1"
+   height="34"
+   width="34">
+  <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="defs9">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.2608696 0 0 .59183674 -.60865815 -15.816326)"
+       y2="12"
+       y1="12"
+       x2="24.405561"
+       x1=".5"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-opacity=".47451" />
+      <stop
+         id="stop4"
+         offset=".50727087"
+         stop-opacity="0" />
+      <stop
+         id="stop6"
+         offset="1"
+         stop-opacity=".0047619" />
+    </linearGradient>
+  </defs>
+  <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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 1.8007812,1 C 1.3662299,1 1,1.36623 1,1.8007812 V 32.199219 C 1,32.63377 1.36623,33 1.8007812,33 H 32.19932 c 0.434551,0 0.800781,-0.36623 0.800781,-0.800781 V 1.8007812 C 33.000101,1.3662299 32.633871,1 32.19932,1 Z M 3,2 h 28.000101 c 0.562649,0 1,0.437351 1,1 v 28 c 0,0.562649 -0.437351,1 -1,1 H 3 C 2.4373514,32 2,31.562649 2,31 V 3 C 2,2.437351 2.4373514,2 3,2 Z"
+     id="rect15-9" />
+  <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:0.21176471;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,2 C 2.4373514,2 2,2.437352 2,3 V 3.5 H 3.1074219 C 3.2574996,3.206504 3.5543285,3 3.9082031,3 H 30.091898 c 0.353874,0 0.650703,0.206504 0.800781,0.5 h 1.107422 V 3 c 0,-0.562648 -0.43735,-1 -1,-1 z"
+     id="rect15-3-7-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:0.31764706;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,32 C 2.4373514,32 2,31.562648 2,31 V 3.5 h 1 v 21.060547 5.53125 C 3,30.595433 3.4045667,31 3.9082031,31 H 30.091898 c 0.503636,0 0.908203,-0.404567 0.908203,-0.908203 V 24.560547 3.5 h 1 V 31 c 0,0.562648 -0.437351,1 -1,1 z"
+     id="rect15-3-7-9" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_square_set.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_square_set.svg
new file mode 100644
index 000000000000..345a04a5732a
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_square_set.svg
@@ -0,0 +1,70 @@
+<?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="svg19"
+   version="1.1"
+   height="26"
+   width="26">
+  <metadata
+     id="metadata23">
+    <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(0.95652169,0,0,0.95652169,4.3109514,-40.598009)"
+       y2="12"
+       y1="12"
+       x2="24.460131"
+       x1="1.4817026"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-opacity=".0047619" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         stop-opacity=".0047619"
+         offset="0.06141451"
+         id="stop830" />
+      <stop
+         id="stop832"
+         offset="0.94799"
+         stop-opacity=".0047619"
+         style="stop-color:#000000;stop-opacity:0;" />
+      <stop
+         id="stop4"
+         offset="1"
+         stop-opacity="0" />
+    </linearGradient>
+  </defs>
+  <path
+     id="rect15-9"
+     d="M 1.8007812,1 C 1.3662299,1 1,1.36623 1,1.8007812 V 24.199219 C 1,24.63377 1.36623,25 1.8007812,25 H 24.199219 C 24.63377,25 25,24.63377 25,24.199219 V 1.8007812 C 25,1.3662299 24.63377,1 24.199219,1 Z M 3,2 h 20 c 0.562649,0 1,0.4373514 1,1 v 20 c 0,0.562649 -0.437351,1 -1,1 H 3 C 2.4373514,24 2,23.562649 2,23 V 3 C 2,2.4373514 2.4373514,2 3,2 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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     id="rect15-3-7-1"
+     d="M 3,2 C 2.4373514,2 2,2.437352 2,3 V 3.5 H 3.1074219 C 3.2574996,3.2065045 3.5543285,3 3.9082031,3 H 22.091797 c 0.353874,0 0.650703,0.2065045 0.800781,0.5 H 24 V 3 C 24,2.437352 23.562649,2 23,2 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:#dcdcdc;fill-opacity:0.19607843;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     id="rect15-3-7-9"
+     d="M 3,24 C 2.4373514,24 2,23.562648 2,23 V 3.5 h 1 v 13.060547 5.53125 C 3,22.595433 3.4045667,23 3.9082031,23 H 22.091797 C 22.595433,23 23,22.595433 23,22.091797 V 16.560547 3.5 h 1 V 23 c 0,0.562648 -0.437351,1 -1,1 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:#d1d1d1;fill-opacity:0.09803922;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     id="rect15-3-7"
+     d="M 3.9082031,3 H 22.091797 c 0.353874,0 0.650703,0.2065045 0.800781,0.5 H 23 v 13.060547 5.53125 C 23,22.595433 22.595433,23 22.091797,23 H 3.9082031 C 3.4045667,23 3,22.595433 3,22.091797 V 16.560547 3.5 H 3.1074219 C 3.2574996,3.2065045 3.5543285,3 3.9082031,3 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:0.05882353;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_sync.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_sync.svg
new file mode 100644
index 000000000000..a549d2687492
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_sync.svg
@@ -0,0 +1,60 @@
+<?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="svg17"
+   version="1.1"
+   height="22"
+   width="48">
+  <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="defs9">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(.7826087 0 0 1.9130435 .82606344 -45.043478)"
+       y2="12"
+       y1="12"
+       x2="24"
+       x1="2"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-opacity=".0047619" />
+      <stop
+         id="stop4"
+         offset=".5"
+         stop-opacity="0" />
+      <stop
+         id="stop6"
+         offset="1"
+         stop-opacity=".47451" />
+    </linearGradient>
+  </defs>
+  <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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 1.8007812,1 C 1.3662299,1 1,1.36623 1,1.8007812 V 20.199219 C 1,20.63377 1.36623,21 1.8007812,21 H 46.19932 c 0.434551,0 0.800781,-0.36623 0.800781,-0.800781 V 1.8007812 C 47.000101,1.3662299 46.633871,1 46.19932,1 Z M 3,2 h 42.000101 c 0.562649,0 1,0.4373514 1,1 v 16 c 0,0.562649 -0.437351,1 -1,1 H 3 C 2.4373514,20 2,19.562649 2,19 V 3 C 2,2.4373514 2.4373514,2 3,2 Z"
+     id="rect15-9" />
+  <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:#dcdcdc;fill-opacity:0.07058824;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,2 C 2.4373514,2 2,3.562648 2,3 V 3.5 H 3.1074219 C 3.2574996,3.2065045 3.5543285,3 3.9082031,3 H 44.091898 c 0.353875,0 0.650703,0.2065045 0.800781,0.5 h 1.107422 V 3 c 0,-0.562648 -0.437351,-1 -1,-1 z"
+     id="rect15-3-7-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:#d1d1d1;fill-opacity:0.01960784;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,20 C 2.4373514,20 2,19.562648 2,19 V 3.5 h 1 v 9.060547 5.53125 C 3,18.595433 3.4045667,19 3.9082031,19 H 44.091898 c 0.503636,0 1.396639,-0.785401 0.908203,-0.908203 V 12.560547 3.5 h 1 V 19 c 0,0.562648 -0.437351,1 -1,1 z"
+     id="rect15-3-7-9" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_sync_active.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_sync_active.svg
new file mode 100644
index 000000000000..8671b2f92625
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_sync_active.svg
@@ -0,0 +1,60 @@
+<?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="svg17"
+   version="1.1"
+   height="22"
+   width="48">
+  <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="defs9">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-.73913044 0 0 .87755103 -1.3912827 -22.244898)"
+       y2="12"
+       y1="12"
+       x2="24.405561"
+       x1=".5"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-opacity=".47451" />
+      <stop
+         id="stop4"
+         offset=".50727087"
+         stop-opacity="0" />
+      <stop
+         id="stop6"
+         offset="1"
+         stop-opacity=".0047619" />
+    </linearGradient>
+  </defs>
+  <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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 1.8007812,1 C 1.3662299,1 1,1.36623 1,1.8007812 V 20.199219 C 1,20.63377 1.36623,21 1.8007812,21 H 46.19932 c 0.434551,0 0.800781,-0.36623 0.800781,-0.800781 V 1.8007812 C 47.000101,1.3662299 46.633871,1 46.19932,1 Z M 3,2 h 42.000101 c 0.562649,0 1,0.4373514 1,1 v 16 c 0,0.562649 -0.437351,1 -1,1 H 3 C 2.4373514,20 2,19.562649 2,19 V 3 C 2,2.4373514 2.4373514,2 3,2 Z"
+     id="rect15-9" />
+  <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:0.21176471;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,2 C 2.4373514,2 2,3.562648 2,3 V 3.5 H 3.1074219 C 3.2574996,3.2065045 3.5543285,3 3.9082031,3 H 44.091898 c 0.353875,0 0.650703,0.2065045 0.800781,0.5 h 1.107422 V 3 c 0,-0.562648 -0.437351,-1 -1,-1 z"
+     id="rect15-3-7-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:0.31764706;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,20 C 2.4373514,20 2,19.562648 2,19 V 3.5 h 1 v 9.060547 5.53125 C 3,18.595433 3.4045667,19 3.9082031,19 H 44.091898 c 0.503636,0 1.396639,-0.785401 0.908203,-0.908203 V 12.560547 3.5 h 1 V 19 c 0,0.562648 -0.437351,1 -1,1 z"
+     id="rect15-3-7-9" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_tall.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_tall.svg
new file mode 100644
index 000000000000..2d33538c033d
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_tall.svg
@@ -0,0 +1,60 @@
+<?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="svg17"
+   version="1.1"
+   height="52"
+   width="26">
+  <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="defs9">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.0869564 0 0 .95652174 -1.1304966 -23.521739)"
+       y2="12"
+       y1="12"
+       x2="24"
+       x1="2"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-opacity=".0047619" />
+      <stop
+         id="stop4"
+         offset=".5"
+         stop-opacity="0" />
+      <stop
+         id="stop6"
+         offset="1"
+         stop-opacity=".47451" />
+    </linearGradient>
+  </defs>
+  <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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 1.8007812,1 C 1.3662299,1 1,1.36623 1,1.800781 V 50.199219 C 1,50.63377 1.36623,51 1.8007812,51 H 24.199219 C 24.63377,51 25,50.63377 25,50.199219 V 1.800781 C 25,1.36623 24.63377,1 24.199219,1 Z M 3,2 h 20 c 0.562649,0 1,0.437351 1,1 v 46 c 0,0.562649 -0.437351,1 -1,1 H 3 C 2.4373514,50 2,49.562649 2,49 V 3 C 2,2.437351 2.4373514,2 3,2 Z"
+     id="rect15-9" />
+  <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:#dcdcdc;fill-opacity:0.07058824;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,2 C 2.4373514,2 2,2.437352 2,3 V 3.5 H 3.1074219 C 3.2574996,3.206504 3.5543285,3 3.9082031,3 H 22.091797 c 0.353874,0 0.650703,0.206504 0.800781,0.5 H 24 V 3 C 24,2.437352 23.562649,2 23,2 Z"
+     id="rect15-3-7-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:#d1d1d1;fill-opacity:0.01960784;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,50 C 2.4373514,50 2,49.562648 2,49 V 3.5 h 1 v 39.060547 5.53125 C 3,48.595433 3.4045667,49 3.9082031,49 H 22.091797 C 22.595433,49 23,48.595433 23,48.091797 V 42.560547 3.5 h 1 V 49 c 0,0.562648 -0.437351,1 -1,1 z"
+     id="rect15-3-7-9" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_tall_active.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_tall_active.svg
new file mode 100644
index 000000000000..7c7e003440a7
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_tall_active.svg
@@ -0,0 +1,60 @@
+<?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="svg19"
+   version="1.1"
+   height="52"
+   width="26">
+  <metadata
+     id="metadata23">
+    <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.1304348 0 0 .46938776 1.6956841 -12.061224)"
+       y2="12"
+       y1="12"
+       x2="24.405561"
+       x1=".5"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-opacity=".47451" />
+      <stop
+         id="stop4"
+         offset=".50727087"
+         stop-opacity="0" />
+      <stop
+         id="stop6"
+         offset="1"
+         stop-opacity=".0047619" />
+    </linearGradient>
+  </defs>
+  <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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 1.8007812,1 C 1.3662299,1 1,1.36623 1,1.800781 V 50.199219 C 1,50.63377 1.36623,51 1.8007812,51 H 24.199219 C 24.63377,51 25,50.63377 25,50.199219 V 1.800781 C 25,1.36623 24.63377,1 24.199219,1 Z M 3,2 h 20 c 0.562649,0 1,0.437351 1,1 v 46 c 0,0.562649 -0.437351,1 -1,1 H 3 C 2.4373514,50 2,49.562649 2,49 V 3 C 2,2.437351 2.4373514,2 3,2 Z"
+     id="rect15-9" />
+  <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:0.21176471;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,2 C 2.4373514,2 2,2.437352 2,3 V 3.5 H 3.1074219 C 3.2574996,3.206504 3.5543285,3 3.9082031,3 H 22.091797 c 0.353874,0 0.650703,0.206504 0.800781,0.5 H 24 V 3 C 24,2.437352 23.562649,2 23,2 Z"
+     id="rect15-3-7-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:0.31764706;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,50 C 2.4373514,50 2,49.562648 2,49 V 3.5 h 1 v 39.060547 5.53125 C 3,48.595433 3.4045667,49 3.9082031,49 H 22.091797 C 22.595433,49 23,48.595433 23,48.091797 V 42.560547 3.5 h 1 V 49 c 0,0.562648 -0.437351,1 -1,1 z"
+     id="rect15-3-7-9" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_wide.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_wide.svg
new file mode 100644
index 000000000000..9ef88b41d9c8
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_wide.svg
@@ -0,0 +1,60 @@
+<?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="svg17"
+   version="1.1"
+   height="26"
+   width="52">
+  <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="defs9">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,2.1304348,-40,-49.434783)"
+       y2="12"
+       y1="12"
+       x2="24"
+       x1="2"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-opacity=".0047619" />
+      <stop
+         id="stop4"
+         offset=".5"
+         stop-opacity="0" />
+      <stop
+         id="stop6"
+         offset="1"
+         stop-opacity=".47451" />
+    </linearGradient>
+  </defs>
+  <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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 1.8007812,1 C 1.3662299,1 1,1.36623 1,1.8007812 V 24.199219 C 1,24.63377 1.36623,25 1.8007812,25 H 50.19932 c 0.434551,0 0.800781,-0.36623 0.800781,-0.800781 V 1.8007812 C 51.000101,1.3662299 50.633871,1 50.19932,1 Z M 3,2 h 46.000101 c 0.562649,0 1,0.4373514 1,1 v 20 c 0,0.562649 -0.437351,1 -1,1 H 3 C 2.4373514,24 2,23.562649 2,23 V 3 C 2,2.4373514 2.4373514,2 3,2 Z"
+     id="rect15-9" />
+  <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:#dcdcdc;fill-opacity:0.07058824;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,2 C 2.4373514,2 2,2.437352 2,3 V 3.5 H 3.1074219 C 3.2574996,3.2065045 3.5543285,3 3.9082031,3 H 48.091898 c 0.353875,0 0.650703,0.2065045 0.800781,0.5 h 1.107422 V 3 c 0,-0.562648 -0.437351,-1 -1,-1 z"
+     id="rect15-3-7-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:#d1d1d1;fill-opacity:0.01960784;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,24 C 2.4373514,24 2,23.562648 2,23 V 3.5 h 1 v 13.060547 5.53125 C 3,22.595433 3.4045667,23 3.9082031,23 H 48.091898 c 0.503636,0 1.400816,-0.803405 0.908203,-0.908203 V 16.560547 3.5 h 1 V 23 c 0,0.562648 -0.437351,1 -1,1 z"
+     id="rect15-3-7-9" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_embedded_wide_active.svg b/res/skins/LateNight/palemoon/buttons/btn_embedded_wide_active.svg
new file mode 100644
index 000000000000..41853c28694e
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_embedded_wide_active.svg
@@ -0,0 +1,60 @@
+<?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="svg17"
+   version="1.1"
+   height="26"
+   width="52">
+  <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="defs9">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-.91304348 0 0 .95918367 -1.1304075 -24.081632)"
+       y2="12"
+       y1="12"
+       x2="24.405561"
+       x1=".5"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-opacity=".47451" />
+      <stop
+         id="stop4"
+         offset=".50727087"
+         stop-opacity="0" />
+      <stop
+         id="stop6"
+         offset="1"
+         stop-opacity=".0047619" />
+    </linearGradient>
+  </defs>
+  <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:#000001;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 1.8007812,1 C 1.3662299,1 1,1.36623 1,1.8007812 V 24.199219 C 1,24.63377 1.36623,25 1.8007812,25 H 50.19932 c 0.434551,0 0.800781,-0.36623 0.800781,-0.800781 V 1.8007812 C 51.000101,1.3662299 50.633871,1 50.19932,1 Z M 3,2 h 46.000101 c 0.562649,0 1,0.4373514 1,1 v 20 c 0,0.562649 -0.437351,1 -1,1 H 3 C 2.4373514,24 2,23.562649 2,23 V 3 C 2,2.4373514 2.4373514,2 3,2 Z"
+     id="rect15-9" />
+  <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:0.21176471;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,2 C 2.4373514,2 2,2.437352 2,3 V 3.5 H 3.1074219 C 3.2574996,3.2065045 3.5543285,3 3.9082031,3 H 48.091898 c 0.353875,0 0.650703,0.2065045 0.800781,0.5 h 1.107422 V 3 c 0,-0.562648 -0.437351,-1 -1,-1 z"
+     id="rect15-3-7-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:0.31764706;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:fill markers stroke;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 3,24 C 2.4373514,24 2,23.562648 2,23 V 3.5 h 1 v 13.060547 5.53125 C 3,22.595433 3.4045667,23 3.9082031,23 H 48.091898 c 0.503636,0 1.400816,-0.803405 0.908203,-0.908203 V 16.560547 3.5 h 1 V 23 c 0,0.562648 -0.437351,1 -1,1 z"
+     id="rect15-3-7-9" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn_flat_square.svg b/res/skins/LateNight/palemoon/buttons/btn_flat_square.svg
new file mode 100644
index 000000000000..2d4b23d53878
--- /dev/null
+++ b/res/skins/LateNight/palemoon/buttons/btn_flat_square.svg
@@ -0,0 +1,3 @@
+<svg width="26" height="26" version="1.1" xmlns="http://www.w3.org/2000/svg">
+		<rect x="1.5" y="1.50003" width="23" height="23" rx=".30000001" ry=".30000001" fill="none" opacity=".7461929" stroke="#020201" stroke-linecap="round" stroke-linejoin="round" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/res/skins/LateNight/palemoon/colorscheme.svg b/res/skins/LateNight/palemoon/colorscheme.svg
new file mode 100644
index 000000000000..4334d16a8670
--- /dev/null
+++ b/res/skins/LateNight/palemoon/colorscheme.svg
@@ -0,0 +1,592 @@
+<?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="svg8"
+   version="1.1"
+   viewBox="0 0 297 210"
+   height="210mm"
+   width="297mm"
+   sodipodi:docname="colorscheme.svg"
+   inkscape:version="1.0 (6e3e5246a0, 2020-05-07)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1056"
+     id="namedview17"
+     showgrid="false"
+     inkscape:snap-page="true"
+     inkscape:zoom="1.6819304"
+     inkscape:cx="407.98883"
+     inkscape:cy="302.79155"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8"
+     inkscape:document-rotation="0" />
+  <defs
+     id="defs2" />
+  <metadata
+     id="metadata5">
+    <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>
+  <rect
+     style="opacity:1;fill:#151515;fill-opacity:1;stroke:none;stroke-width:0.02923006;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect835-3-5"
+     width="297"
+     height="209.99998"
+     x="1.2584691"
+     y="-98.790245" />
+  <rect
+     style="opacity:1;fill:#151517;fill-opacity:1;stroke:none;stroke-width:0.02923006;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect835-6-7-9"
+     width="297"
+     height="209.99998"
+     x="292.30032"
+     y="-98.790245" />
+  <g
+     id="layer1"
+     transform="matrix(0.95947709,0,0,1.3622445,309.93042,1349.2252)"
+     style="stroke:none">
+    <rect
+       y="-990.44275"
+       x="-323.02014"
+       height="154.15733"
+       width="309.54361"
+       id="rect835"
+       style="opacity:1;fill:#1e1e1e;fill-opacity:1;stroke:none;stroke-width:0.0255673;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       y="-929.28387"
+       x="-243.74011"
+       height="3.3740489"
+       width="64.651772"
+       id="rect833"
+       style="opacity:1;fill:#c2b3a5;fill-opacity:1;stroke:none;stroke-width:0.0221751;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       style="opacity:1;fill:#ad9985;fill-opacity:1;stroke:none;stroke-width:0.0221751;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect833-6"
+       width="64.651772"
+       height="3.3740489"
+       x="-243.74011"
+       y="-922.34668" />
+    <rect
+       y="-914.93835"
+       x="-243.74011"
+       height="3.3740489"
+       width="64.651772"
+       id="rect833-6-7"
+       style="opacity:1;fill:#db0000;fill-opacity:1;stroke:none;stroke-width:0.0221751;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       style="opacity:1;fill:#85bdbb;fill-opacity:1;stroke:none;stroke-width:0.0221751;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect833-5"
+       width="64.651772"
+       height="3.3740489"
+       x="-179.71082"
+       y="-929.28387" />
+    <rect
+       y="-922.34668"
+       x="-179.18166"
+       height="3.3740489"
+       width="64.651772"
+       id="rect833-6-3"
+       style="opacity:1;fill:#63aba8;fill-opacity:1;stroke:none;stroke-width:0.0221751;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       style="opacity:1;fill:#a80000;fill-opacity:1;stroke:none;stroke-width:0.0221751;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect833-6-7-5"
+       width="64.651772"
+       height="3.3740489"
+       x="-179.18166"
+       y="-914.93835" />
+    <rect
+       y="-908.05896"
+       x="-243.74011"
+       height="3.3740489"
+       width="64.651772"
+       id="rect833-6-6"
+       style="opacity:1;fill:#d9b28c;fill-opacity:1;stroke:none;stroke-width:0.0221751;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       style="opacity:1;fill:#7bc6c3;fill-opacity:1;stroke:none;stroke-width:0.0221751;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect833-6-3-2"
+       width="64.651772"
+       height="3.3740489"
+       x="-179.18166"
+       y="-908.05896" />
+    <rect
+       style="opacity:1;fill:#19424d;fill-opacity:1;stroke:none;stroke-width:0.0221751;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect833-6-6-9"
+       width="64.651772"
+       height="3.3740489"
+       x="-243.74011"
+       y="-900.65051" />
+    <rect
+       y="-900.65051"
+       x="-179.18166"
+       height="3.3740489"
+       width="64.651772"
+       id="rect833-6-3-2-1"
+       style="opacity:1;fill:#58b7b3;fill-opacity:1;stroke:none;stroke-width:0.0221751;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+  <rect
+     style="opacity:1;fill:#1c1c26;fill-opacity:1;stroke:none;stroke-width:0.02923006;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect835-6"
+     width="297"
+     height="209.99998"
+     x="291.04184"
+     y="1.2577942e-05" />
+  <rect
+     style="opacity:1;fill:#1e1e1e;fill-opacity:1;stroke:none;stroke-width:0.02923006;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect835-3"
+     width="297"
+     height="209.99998"
+     x="-5.475255e-06"
+     y="1.2577942e-05" />
+  <rect
+     style="opacity:1;fill:#777777;fill-opacity:1;stroke:none;stroke-width:0.0253519;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect833-60-36"
+     width="62.031895"
+     height="4.5962796"
+     x="17.859034"
+     y="83.313354" />
+  <rect
+     style="opacity:1;fill:#c2b3a5;fill-opacity:1;stroke:none;stroke-width:0.0253519;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect833-60"
+     width="62.031895"
+     height="4.5962796"
+     x="76.067368"
+     y="83.313354" />
+  <rect
+     y="92.763512"
+     x="76.067368"
+     height="4.5962796"
+     width="31.015947"
+     id="rect833-6-62"
+     style="opacity:1;fill:#ad9985;fill-opacity:1;stroke:none;stroke-width:0.0179265;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     style="opacity:1;fill:#db0000;fill-opacity:1;stroke:none;stroke-width:0.0253519;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect833-6-7-6"
+     width="62.031895"
+     height="4.5962796"
+     x="76.067368"
+     y="102.85546" />
+  <rect
+     y="83.313354"
+     x="137.50201"
+     height="4.5962796"
+     width="62.031895"
+     id="rect833-5-1"
+     style="opacity:1;fill:#85bdbb;fill-opacity:1;stroke:none;stroke-width:0.0253519;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     style="opacity:1;fill:#63aba8;fill-opacity:1;stroke:none;stroke-width:0.0253519;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect833-6-3-8"
+     width="62.031895"
+     height="4.5962796"
+     x="138.00972"
+     y="92.763512" />
+  <rect
+     y="102.85546"
+     x="138.00972"
+     height="4.5962796"
+     width="62.031895"
+     id="rect833-6-7-5-7"
+     style="opacity:1;fill:#a80000;fill-opacity:1;stroke:none;stroke-width:0.0253519;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     style="opacity:1;fill:#d9b28c;fill-opacity:1;stroke:none;stroke-width:0.0253519;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect833-6-6-92"
+     width="62.031895"
+     height="4.5962796"
+     x="76.067368"
+     y="112.22688" />
+  <rect
+     y="112.22688"
+     x="138.00972"
+     height="4.5962796"
+     width="62.031895"
+     id="rect833-6-3-2-0"
+     style="opacity:1;fill:#7bc6c3;fill-opacity:1;stroke:none;stroke-width:0.0253519;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     y="122.31899"
+     x="76.067368"
+     height="4.5962796"
+     width="62.031895"
+     id="rect833-6-6-9-2"
+     style="opacity:1;fill:#19424d;fill-opacity:1;stroke:none;stroke-width:0.0253519;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     style="opacity:1;fill:#58b7b3;fill-opacity:1;stroke:none;stroke-width:0.0253519;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect833-6-3-2-1-3"
+     width="62.031895"
+     height="4.5962796"
+     x="138.00972"
+     y="122.31899" />
+  <rect
+     style="opacity:1;fill:#1e1e22;fill-opacity:1;stroke:none;stroke-width:0.02923006;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect835-6-7"
+     width="297"
+     height="209.99998"
+     x="291.04184"
+     y="58.208351" />
+  <rect
+     style="opacity:1;fill:#332acc;fill-opacity:1;stroke:none;stroke-width:0.42333335;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect849-3"
+     width="55.372883"
+     height="10.382415"
+     x="235.49205"
+     y="78.489403" />
+  <rect
+     style="opacity:1;fill:#33f600;fill-opacity:1;stroke:none;stroke-width:0.42333335;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect849-3-6"
+     width="55.372883"
+     height="10.382415"
+     x="235.49205"
+     y="88.871819" />
+  <rect
+     style="opacity:1;fill:#ff2a00;fill-opacity:1;stroke:none;stroke-width:0.42333335;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect849-3-7"
+     width="55.372883"
+     height="10.382415"
+     x="235.49205"
+     y="99.254234" />
+  <rect
+     style="opacity:1;fill:#2922a6;fill-opacity:1;stroke:none;stroke-width:0.42333335;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect849-3-2"
+     width="55.372883"
+     height="10.382415"
+     x="290.86493"
+     y="78.489403" />
+  <rect
+     style="opacity:1;fill:#29c800;fill-opacity:1;stroke:none;stroke-width:0.42333335;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect849-3-6-7"
+     width="55.372883"
+     height="10.382415"
+     x="290.86493"
+     y="88.871819" />
+  <rect
+     style="opacity:1;fill:#c82100;fill-opacity:1;stroke:none;stroke-width:0.42333335;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect849-3-7-0"
+     width="55.372883"
+     height="10.382415"
+     x="290.86493"
+     y="99.254234" />
+  <rect
+     style="opacity:1;fill:#191464;fill-opacity:1;stroke:none;stroke-width:0.42333335;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect849-3-2-9"
+     width="55.372883"
+     height="10.382415"
+     x="346.23782"
+     y="78.489403" />
+  <rect
+     style="opacity:1;fill:#156400;fill-opacity:1;stroke:none;stroke-width:0.42333335;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect849-3-6-7-3"
+     width="55.372883"
+     height="10.382415"
+     x="346.23782"
+     y="88.871819" />
+  <rect
+     style="opacity:1;fill:#781300;fill-opacity:1;stroke:none;stroke-width:0.42333335;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect849-3-7-0-6"
+     width="55.372883"
+     height="10.382415"
+     x="346.23782"
+     y="99.254234" />
+  <rect
+     style="opacity:1;fill:#0c0a32;fill-opacity:1;stroke:none;stroke-width:0.42333335;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect849-3-2-9-3"
+     width="55.372883"
+     height="10.382415"
+     x="401.61072"
+     y="78.489403" />
+  <rect
+     style="opacity:1;fill:#092800;fill-opacity:1;stroke:none;stroke-width:0.42333335;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect849-3-6-7-3-6"
+     width="55.372883"
+     height="10.382415"
+     x="401.61072"
+     y="88.871819" />
+  <rect
+     style="opacity:1;fill:#3c0a00;fill-opacity:1;stroke:none;stroke-width:0.42333335;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect849-3-7-0-6-7"
+     width="55.372883"
+     height="10.382415"
+     x="401.61072"
+     y="99.254234" />
+  <rect
+     style="opacity:1;fill:#ff9417;fill-opacity:1;stroke:none;stroke-width:0.0253519;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect833-6-3-2-1-3-3"
+     width="62.031895"
+     height="4.5962796"
+     x="138.00972"
+     y="132.90233" />
+  <rect
+     style="opacity:1;fill:#999998;fill-opacity:1;stroke:none;stroke-width:0.0253519;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect833-60-3"
+     width="62.031895"
+     height="4.5962796"
+     x="136.92148"
+     y="72.730026" />
+  <rect
+     style="opacity:1;fill:#a89a8c;fill-opacity:1;stroke:none;stroke-width:0.0253519;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect833-60-6"
+     width="62.031895"
+     height="4.5962796"
+     x="76.067368"
+     y="72.730026" />
+  <rect
+     style="opacity:1;fill:#258fab;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect883"
+     width="21.579491"
+     height="8.2313519"
+     x="116.18442"
+     y="59.166035" />
+  <rect
+     style="opacity:1;fill:#216e75;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect883-7"
+     width="21.579491"
+     height="8.2313519"
+     x="137.76392"
+     y="59.166035" />
+  <rect
+     style="opacity:1;fill:#438225;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect883-3"
+     width="21.579491"
+     height="8.2313519"
+     x="116.18442"
+     y="22.124363" />
+  <rect
+     style="opacity:1;fill:#236b00;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect883-7-6"
+     width="21.579491"
+     height="8.2313519"
+     x="137.76392"
+     y="22.124363" />
+  <rect
+     style="opacity:1;fill:#257b82;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect883-3-7"
+     width="21.579491"
+     height="8.2313519"
+     x="116.18442"
+     y="30.355711" />
+  <rect
+     style="opacity:1;fill:#146674;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect883-7-6-5"
+     width="21.579491"
+     height="8.2313519"
+     x="137.76392"
+     y="30.355711" />
+  <rect
+     style="opacity:1;fill:#c2b3a5;fill-opacity:1;stroke:none;stroke-width:0.0253519;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect833-7"
+     width="62.031895"
+     height="4.5962796"
+     x="76.067642"
+     y="-59.561649" />
+  <rect
+     y="-50.111485"
+     x="76.067642"
+     height="4.5962796"
+     width="62.031895"
+     id="rect833-6-5"
+     style="opacity:1;fill:#ad9985;fill-opacity:1;stroke:none;stroke-width:0.0253519;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     style="opacity:1;fill:#db0000;fill-opacity:1;stroke:none;stroke-width:0.0253519;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect833-6-7-3"
+     width="62.031895"
+     height="4.5962796"
+     x="76.067642"
+     y="-40.019527" />
+  <rect
+     y="-59.561649"
+     x="137.5024"
+     height="4.5962796"
+     width="62.031895"
+     id="rect833-5-5"
+     style="opacity:1;fill:#85bdbb;fill-opacity:1;stroke:none;stroke-width:0.0253519;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     style="opacity:1;fill:#63aba8;fill-opacity:1;stroke:none;stroke-width:0.0253519;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect833-6-3-6"
+     width="62.031895"
+     height="4.5962796"
+     x="138.01012"
+     y="-50.111485" />
+  <rect
+     y="-40.019527"
+     x="138.01012"
+     height="4.5962796"
+     width="62.031895"
+     id="rect833-6-7-5-2"
+     style="opacity:1;fill:#a80000;fill-opacity:1;stroke:none;stroke-width:0.0253519;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     style="opacity:1;fill:#d9b28c;fill-opacity:1;stroke:none;stroke-width:0.0253519;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect833-6-6-91"
+     width="62.031895"
+     height="4.5962796"
+     x="76.067642"
+     y="-30.648108" />
+  <rect
+     y="-30.648108"
+     x="138.01012"
+     height="4.5962796"
+     width="62.031895"
+     id="rect833-6-3-2-2"
+     style="opacity:1;fill:#7bc6c3;fill-opacity:1;stroke:none;stroke-width:0.0253519;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     y="-20.555994"
+     x="76.067642"
+     height="4.5962796"
+     width="62.031895"
+     id="rect833-6-6-9-7"
+     style="opacity:1;fill:#19424d;fill-opacity:1;stroke:none;stroke-width:0.0253519;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     style="opacity:1;fill:#58b7b3;fill-opacity:1;stroke:none;stroke-width:0.0253519;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect833-6-3-2-1-0"
+     width="62.031895"
+     height="4.5962796"
+     x="138.01012"
+     y="-20.555994" />
+  <rect
+     style="opacity:1;fill:#948a80;fill-opacity:1;stroke:none;stroke-width:0.0253519;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect833-60-36-7"
+     width="62.031895"
+     height="4.5962796"
+     x="17.859034"
+     y="87.909637" />
+  <rect
+     style="opacity:1;fill:#5ba000;fill-opacity:1;stroke:none;stroke-width:0.10404524;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect883-3-3"
+     width="3.3370345"
+     height="8.2313519"
+     x="111.60775"
+     y="22.124363" />
+  <rect
+     style="opacity:1;fill:#009ba7;fill-opacity:1;stroke:none;stroke-width:0.10404524;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect883-3-7-6"
+     width="3.3370345"
+     height="8.2313519"
+     x="111.60775"
+     y="30.355711" />
+  <rect
+     style="opacity:1;fill:#236b00;fill-opacity:1;stroke:none;stroke-width:0.10404524;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect883-7-6-7"
+     width="3.3370349"
+     height="8.2313519"
+     x="-163.73883"
+     y="22.124363"
+     transform="scale(-1,1)" />
+  <rect
+     style="opacity:1;fill:#146674;fill-opacity:1;stroke:none;stroke-width:0.10404524;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect883-7-6-5-5"
+     width="3.3370349"
+     height="8.2313519"
+     x="-163.73883"
+     y="30.355711"
+     transform="scale(-1,1)" />
+  <rect
+     y="92.763512"
+     x="107.08331"
+     height="4.5962796"
+     width="31.015944"
+     id="rect833-6-62-3"
+     style="opacity:1;fill:#918273;fill-opacity:1;stroke:none;stroke-width:0.0179265;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     style="opacity:1;fill:#438225;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect883-3-36"
+     width="21.579491"
+     height="8.2313519"
+     x="116.18442"
+     y="37.999363" />
+  <rect
+     style="opacity:1;fill:#236b00;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect883-7-6-75"
+     width="21.579491"
+     height="8.2313519"
+     x="137.76392"
+     y="37.999363" />
+  <rect
+     style="opacity:1;fill:#257b82;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect883-3-7-3"
+     width="21.579491"
+     height="8.2313519"
+     x="116.18442"
+     y="46.230713" />
+  <rect
+     style="opacity:1;fill:#146674;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect883-7-6-5-56"
+     width="21.579491"
+     height="8.2313519"
+     x="137.76392"
+     y="46.230713" />
+  <rect
+     style="opacity:1;fill:#395579;stroke:#000000;stroke-width:0.423333;stroke-linecap:round;stroke-linejoin:round;fill-opacity:1"
+     id="rect898"
+     width="7.9375"
+     height="7.9375"
+     x="93.583565"
+     y="154.8726" />
+  <rect
+     y="154.8726"
+     x="103.10857"
+     height="7.9375"
+     width="7.9375"
+     id="rect898-3"
+     style="opacity:1;fill:#395579;stroke:#000000;stroke-width:0.423333;stroke-linecap:round;stroke-linejoin:round;fill-opacity:1" />
+  <rect
+     y="163.86847"
+     x="93.583565"
+     height="7.9375"
+     width="7.9375"
+     id="rect898-6"
+     style="opacity:1;fill:#395579;stroke:#000000;stroke-width:0.423333;stroke-linecap:round;stroke-linejoin:round;fill-opacity:1" />
+  <rect
+     style="opacity:1;fill:#395579;stroke:#000000;stroke-width:0.423333;stroke-linecap:round;stroke-linejoin:round;fill-opacity:1"
+     id="rect898-3-7"
+     width="7.9375"
+     height="7.9375"
+     x="103.10857"
+     y="163.86847" />
+  <g
+     transform="translate(34.194173,-12.672099)"
+     id="g918">
+    <circle
+       style="fill:#243e42;fill-opacity:1;stroke:none;stroke-width:0.291457;stroke-linecap:round;stroke-linejoin:round"
+       id="path1221-3"
+       cx="174.14142"
+       cy="89.037079"
+       r="3.96875" />
+    <path
+       id="path16"
+       d="m 174.84757,89.035135 a 0.70606507,0.70606507 0 0 1 -1.41211,0 0.70606507,0.70606507 0 1 1 1.41211,0 z"
+       style="stroke-width:0.264583" />
+  </g>
+  <g
+     transform="translate(-61.121009,-11.17215)"
+     id="g930">
+    <circle
+       r="3.96875"
+       cy="84.475105"
+       cx="129.15096"
+       id="path1221-3-3"
+       style="fill:#3e3a32;fill-opacity:1;stroke:none;stroke-width:0.291457;stroke-linecap:round;stroke-linejoin:round" />
+    <path
+       id="path16-6"
+       d="m 129.85701,84.478586 a 0.70606507,0.70606507 0 0 1 -1.41211,0 0.70606507,0.70606507 0 1 1 1.41211,0 z"
+       style="stroke-width:0.264583" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/knobs/knob_bg_fx.svg b/res/skins/LateNight/palemoon/knobs/knob_bg_fx.svg
new file mode 100644
index 000000000000..f5815c74a659
--- /dev/null
+++ b/res/skins/LateNight/palemoon/knobs/knob_bg_fx.svg
@@ -0,0 +1,138 @@
+<?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="svg32"
+   version="1.1"
+   height="26"
+   width="26">
+  <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="defs12">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="rotate(-105.96536,-4.469143,20.360757)"
+       y2="18.998119"
+       y1="18.998119"
+       x2="31.999203"
+       x1="8.000597"
+       id="a">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-color="#0e0e0e" />
+      <stop
+         id="stop4"
+         offset="1"
+         stop-color="#5d5d5d" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.0309358,-0.09353841,0.09280739,-0.03117947,-44.769021,43.124832)"
+       y2="483.05225"
+       y1="472.03"
+       x2="446.62161"
+       x1="256.73999"
+       id="b">
+      <stop
+         id="stop7"
+         offset="0"
+         stop-color="#1e1e1e" />
+      <stop
+         id="stop9"
+         offset="1"
+         stop-color="#3d3d3d" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(-0.16649667,-1.0580923,1.0580923,-0.16649667,3.227828,43.322923)"
+       gradientUnits="userSpaceOnUse"
+       y2="18.998186"
+       x2="30.822329"
+       y1="18.998186"
+       x1="9.1772108"
+       id="linearGradient875"
+       xlink:href="#b-3" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="rotate(-105.96536,19.999759,18.998456)"
+       y2="18.998119"
+       y1="18.998119"
+       x2="31.999203"
+       x1="8.000597"
+       id="b-3">
+      <stop
+         id="stop7-6"
+         offset="0"
+         stop-color="#0e0e0e" />
+      <stop
+         id="stop9-7"
+         offset="1"
+         stop-color="#5d5d5d" />
+    </linearGradient>
+    <filter
+       height="1.0960201"
+       y="-0.048010066"
+       width="1.0959876"
+       x="-0.047993742"
+       id="filter885"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur887"
+         stdDeviation="0.46348536" />
+    </filter>
+  </defs>
+  <path
+     id="path14"
+     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:#000000;fill-opacity:1;stroke-width:0.86127436;color-rendering:auto;image-rendering:auto;shape-rendering:auto"
+     dominant-baseline="auto"
+     d="M 13.883194,1.8401072 C 12.439843,1.7385452 10.953638,1.9240453 9.5004706,2.4318747 3.6392268,4.3241414 0.43787427,10.685805 2.3828728,16.566925 4.3279947,22.448416 10.682158,25.601104 16.497896,23.56981 22.359139,21.677544 25.562312,15.317701 23.617314,9.4365809 22.158025,5.0241123 18.216779,2.1450417 13.883194,1.8401072 Z" />
+  <g
+     style="opacity:0.49300005"
+     transform="matrix(0.09194813,0.02571728,-0.02571728,0.09194813,-8.3075399,-40.611359)"
+     id="g26-7">
+    <path
+       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"
+       dominant-baseline="auto"
+       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;opacity:1;isolation:auto;mix-blend-mode:normal;solid-color:#000000;color-rendering:auto;image-rendering:auto;shape-rendering:auto"
+       id="path24-5" />
+  </g>
+  <g
+     style="opacity:0.93999999;fill:#050505"
+     transform="matrix(0.09255934,0.02588823,-0.02588823,0.09255934,-8.6438862,-42.31336)"
+     id="g30-3">
+    <path
+       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"
+       dominant-baseline="auto"
+       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;opacity:1;isolation:auto;mix-blend-mode:normal;solid-color:#000000;fill:#050505;color-rendering:auto;image-rendering:auto;shape-rendering:auto"
+       id="path28-5" />
+  </g>
+  <path
+     id="path34"
+     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;opacity:0.74599998;isolation:auto;mix-blend-mode:normal;solid-color:#000000;fill:#555555;fill-opacity:1;stroke-width:0.875;color-rendering:auto;image-rendering:auto;shape-rendering:auto"
+     dominant-baseline="auto"
+     d="m 2.701244,15.084341 c 0.2809698,1.328662 0.8320426,2.62189 1.6654463,3.802088 3.2206833,4.800531 9.7877577,6.047015 14.5926127,2.773617 C 23.76446,18.38644 24.968967,11.8387 21.634578,7.1151251 18.413895,2.3145939 11.847995,1.0659966 7.0431386,4.3393944 3.4381673,6.7953501 1.857644,11.095099 2.701244,15.084341 Z" />
+  <path
+     d="M 11.19417,3.3559671 A 10.04317,10.12228 8.0144789 1 1 14.80583,23.258166 10.04317,10.12228 8.0144789 1 1 11.19417,3.3559671 Z"
+     id="path36-1"
+     style="opacity:1;fill:#282828;fill-opacity:1;stroke-width:0.949743" />
+  <path
+     transform="matrix(0.875,0,0,0.8781038,-4.4997993,-3.6823803)"
+     d="M 9.1115125,22.795856 A 11.451207,11.541409 89.071998 1 1 30.888027,15.200519 11.451207,11.541409 89.071998 1 1 9.1115125,22.795856 Z"
+     id="path36-3"
+     style="opacity:0.1;fill:url(#linearGradient875);fill-opacity:1;stroke-width:1.08289;filter:url(#filter885)" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/knobs/knob_bg_master.svg b/res/skins/LateNight/palemoon/knobs/knob_bg_master.svg
new file mode 100644
index 000000000000..18799c5024e7
--- /dev/null
+++ b/res/skins/LateNight/palemoon/knobs/knob_bg_master.svg
@@ -0,0 +1,150 @@
+<?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="svg42"
+   version="1.1"
+   height="30"
+   width="35">
+  <metadata
+     id="metadata46">
+    <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="defs12">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.02706882,-0.08184611,0.08120647,-0.02728204,-10.727536,16.877832)"
+       y2="483.05225"
+       y1="472.03"
+       x2="446.62161"
+       x1="256.73999"
+       id="c">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-color="#1e1e1e" />
+      <stop
+         id="stop4"
+         offset="1"
+         stop-color="#3d3d3d" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.24067413,-0.84124964,0.84124964,-0.24067413,6.3307695,-1.900091)"
+       y2="18.998119"
+       y1="18.998119"
+       x2="31.999203"
+       x1="8.000597"
+       id="b">
+      <stop
+         id="stop7"
+         offset="0"
+         stop-color="#0e0e0e" />
+      <stop
+         id="stop9"
+         offset="1"
+         stop-color="#5d5d5d" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(-0.16649667,-1.0580923,1.0580923,-0.16649667,3.227828,43.322923)"
+       gradientUnits="userSpaceOnUse"
+       y2="18.998186"
+       x2="30.822329"
+       y1="18.998186"
+       x1="9.1772108"
+       id="linearGradient875"
+       xlink:href="#b-3" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="rotate(-105.96536,19.999759,18.998456)"
+       y2="18.998119"
+       y1="18.998119"
+       x2="31.999203"
+       x1="8.000597"
+       id="b-3">
+      <stop
+         id="stop7-6"
+         offset="0"
+         stop-color="#0e0e0e" />
+      <stop
+         id="stop9-7"
+         offset="1"
+         stop-color="#5d5d5d" />
+    </linearGradient>
+    <filter
+       height="1.0960201"
+       y="-0.048010066"
+       width="1.0959876"
+       x="-0.047993742"
+       id="filter885"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur887"
+         stdDeviation="0.46348536" />
+    </filter>
+  </defs>
+  <path
+     d="M 7.4568573,26.920396 C 2.1859729,21.248529 2.0292894,12.179906 7.5574427,6.7602582 13.085596,1.3406105 21.914401,1.3406106 27.442554,6.7602585 32.970707,12.179906 32.830738,21.315382 27.559853,26.98725 L 25.187334,24.759118 9.8238044,24.658534 Z"
+     style="fill:none;fill-opacity:1;stroke:#050505;stroke-width:1.13749993;stroke-linecap:round;stroke-opacity:1;paint-order:fill markers stroke"
+     id="path30-3-3-3" />
+  <path
+     d="M 7.4568573,26.920396 C 2.1859729,21.248529 2.0292894,12.179906 7.5574427,6.7602581 13.085596,1.3406104 21.914401,1.3406105 27.442554,6.7602584 32.970707,12.179906 32.830738,21.315382 27.559853,26.98725 L 25.187334,24.759118 9.8238044,24.658534 Z"
+     style="fill:#0f0f0f;fill-opacity:1;stroke:none;stroke-width:1.13749993;stroke-linecap:round;paint-order:fill markers stroke"
+     id="path30-3-6" />
+  <path
+     d="M 18.383105,5.7225801 C 16.939754,5.6210181 15.453549,5.8065182 14.000384,6.3143476 8.1391404,8.2066143 4.9377877,14.568278 6.8827864,20.449398 8.8279083,26.330889 15.182069,29.483577 20.997807,27.452283 26.85905,25.560017 30.062223,19.200174 28.117225,13.319054 26.657936,8.9065852 22.71669,6.0275146 18.383105,5.7225801 Z"
+     dominant-baseline="auto"
+     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:#000000;fill-opacity:1;stroke-width:0.86127436;color-rendering:auto;image-rendering:auto;shape-rendering:auto"
+     id="path14-7" />
+  <g
+     transform="matrix(0.86126008,0.24088869,-0.24088869,0.86126008,5.091785,-4.5900697)"
+     id="g32-6-5">
+    <g
+       style="opacity:0.49300005"
+       transform="matrix(0.10676,0,0,0.10676,-19.071124,-31.786292)"
+       id="g26-7-3">
+      <path
+         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"
+         dominant-baseline="auto"
+         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;opacity:1;isolation:auto;mix-blend-mode:normal;solid-color:#000000;color-rendering:auto;image-rendering:auto;shape-rendering:auto"
+         id="path24-5-5" />
+    </g>
+    <g
+       style="opacity:0.93999999;fill:#050505"
+       transform="matrix(0.10746967,0,0,0.10746967,-20.137858,-33.659792)"
+       id="g30-3-6">
+      <path
+         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"
+         dominant-baseline="auto"
+         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;opacity:1;isolation:auto;mix-blend-mode:normal;solid-color:#000000;fill:#050505;color-rendering:auto;image-rendering:auto;shape-rendering:auto"
+         id="path28-5-2" />
+    </g>
+  </g>
+  <path
+     d="m 7.2010538,18.966814 c 0.2809698,1.328662 0.8320426,2.62189 1.6654463,3.802088 3.2206829,4.800531 9.7877549,6.047015 14.5926099,2.773617 4.805157,-3.273606 6.009664,-9.821346 2.675275,-14.544921 C 22.913702,6.1970668 16.347802,4.9484695 11.542948,8.2218673 7.9379771,10.677823 6.3574538,14.977572 7.2010538,18.966814 Z"
+     dominant-baseline="auto"
+     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;opacity:0.74599998;isolation:auto;mix-blend-mode:normal;solid-color:#000000;fill:#3f3f3f;fill-opacity:1;stroke-width:0.875;color-rendering:auto;image-rendering:auto;shape-rendering:auto"
+     id="path34-9" />
+  <path
+     d="M 15.7541,8.0249776 A 9.7088013,9.7852779 8.0144789 1 1 19.245518,27.26457 9.7088013,9.7852779 8.0144789 1 1 15.7541,8.0249776 Z"
+     id="path36-1"
+     style="opacity:1;fill:#222224;fill-opacity:1;stroke-width:0.91812313" />
+  <path
+     transform="matrix(0.875,0,0,0.8781038,2.0072387e-4,-0.30072661)"
+     d="M 9.1115125,22.795856 A 11.451207,11.541409 89.071998 1 1 30.888027,15.200519 11.451207,11.541409 89.071998 1 1 9.1115125,22.795856 Z"
+     id="path36-3"
+     style="opacity:0.1;fill:url(#linearGradient875);fill-opacity:1;stroke-width:1.08289;filter:url(#filter885)" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/knobs/knob_bg_regular.svg b/res/skins/LateNight/palemoon/knobs/knob_bg_regular.svg
new file mode 100644
index 000000000000..78bc896e86da
--- /dev/null
+++ b/res/skins/LateNight/palemoon/knobs/knob_bg_regular.svg
@@ -0,0 +1,178 @@
+<?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="svg42"
+   version="1.1"
+   height="34"
+   width="40">
+  <metadata
+     id="metadata46">
+    <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="defs12">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.0309358,-0.09353841,0.09280739,-0.03117947,-12.260041,64.912913)"
+       y2="483.05225"
+       y1="472.03"
+       x2="446.62161"
+       x1="256.73999"
+       id="c">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-color="#1e1e1e"
+         style="stop-color:#050505;stop-opacity:1" />
+      <stop
+         id="stop4"
+         offset="1"
+         stop-color="#3d3d3d"
+         style="stop-color:#2f2f2f;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="rotate(254.03464 19.999759 18.998456)"
+       y2="18.998119"
+       y1="18.998119"
+       x2="31.999203"
+       x1="8.000597"
+       id="b">
+      <stop
+         id="stop7"
+         offset="0"
+         stop-color="#0e0e0e" />
+      <stop
+         id="stop9"
+         offset="1"
+         stop-color="#5d5d5d" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(-0.16649667,-1.0580923,1.0580923,-0.16649667,3.227828,43.322923)"
+       gradientUnits="userSpaceOnUse"
+       y2="18.998186"
+       x2="30.822329"
+       y1="18.998186"
+       x1="9.1772108"
+       id="linearGradient875"
+       xlink:href="#b" />
+    <filter
+       height="1.0960201"
+       y="-0.048010068"
+       width="1.0959875"
+       x="-0.047993742"
+       id="filter885"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur887"
+         stdDeviation="0.46348536" />
+    </filter>
+  </defs>
+  <rect
+     style="opacity:1;fill:#f40fff;fill-opacity:0.50264551;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect831"
+     width="40"
+     height="34"
+     x="0"
+     y="-40" />
+  <path
+     id="path30-3-3"
+     style="fill:none;fill-opacity:1;stroke:#050505;stroke-width:1.29999995;stroke-linecap:round;stroke-opacity:1;paint-order:fill markers stroke"
+     d="M 8.5221226,30.470032 C 2.4982547,23.987898 2.3191879,13.623758 8.6370774,7.4298743 14.954967,1.2359912 25.04503,1.2359913 31.362919,7.4298746 37.680808,13.623758 37.520843,24.064302 31.496975,30.546436 L 28.785525,28 11.227205,27.885047 Z" />
+  <path
+     id="path30-3"
+     style="fill:#171717;fill-opacity:1;stroke:none;stroke-width:1.29999995;stroke-linecap:round;paint-order:fill markers stroke"
+     d="M 8.5221226,30.470032 C 2.4982547,23.987898 2.3191879,13.623758 8.6370774,7.4298742 14.954967,1.2359911 25.04503,1.2359912 31.362919,7.4298745 37.680808,13.623758 37.520843,24.064302 31.496975,30.546436 L 28.785525,28 11.227205,27.885047 Z" />
+  <path
+     id="path14"
+     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:#000000;stroke-width:0.98431355;color-rendering:auto;image-rendering:auto;shape-rendering:auto;fill-opacity:1"
+     dominant-baseline="auto"
+     d="M 21.009263,6.2439565 C 19.359719,6.1278856 17.661199,6.3398857 16.000439,6.9202622 9.3018747,9.0828527 5.6431859,16.353325 7.8660416,23.074605 10.089038,29.79631 17.350936,33.399382 23.997494,31.077903 30.696057,28.915313 34.356826,21.646921 32.133971,14.925641 30.466213,9.8828195 25.961931,6.592453 21.009263,6.2439565 Z" />
+  <g
+     id="g32-6"
+     transform="matrix(0.98429723,0.27530136,-0.27530136,0.98429723,5.8191829,-5.541929)">
+    <g
+       id="g26-7"
+       transform="matrix(0.10676,0,0,0.10676,-19.071124,-31.786292)"
+       style="opacity:0.49300005">
+      <path
+         id="path24-5"
+         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;opacity:1;isolation:auto;mix-blend-mode:normal;solid-color:#000000;color-rendering:auto;image-rendering:auto;shape-rendering:auto"
+         dominant-baseline="auto"
+         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" />
+    </g>
+    <g
+       id="g30-3"
+       transform="matrix(0.10746967,0,0,0.10746967,-20.137858,-33.659792)"
+       style="opacity:0.93999999;fill:#050505">
+      <path
+         id="path28-5"
+         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;opacity:1;isolation:auto;mix-blend-mode:normal;solid-color:#000000;fill:#050505;color-rendering:auto;image-rendering:auto;shape-rendering:auto"
+         dominant-baseline="auto"
+         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" />
+    </g>
+  </g>
+  <path
+     id="path34"
+     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;opacity:0.746;fill:#636363;fill-opacity:1"
+     dominant-baseline="auto"
+     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"
+     shape-rendering="auto"
+     image-rendering="auto"
+     color-rendering="auto"
+     fill="url(#b)"
+     solid-color="#000000"
+     color="#000000" />
+  <path
+     style="opacity:1;fill:#282828;fill-opacity:1;stroke-width:1.01100147"
+     id="path36"
+     d="M 18.077475,8.4052397 A 10.690954,10.775167 8.0144789 1 1 21.922088,29.591131 10.690954,10.775167 8.0144789 1 1 18.077475,8.4052397 Z" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:0px;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+     x="44.084747"
+     y="-35.947918"
+     id="text935"><tspan
+       x="44.084747"
+       y="-35.947918"
+       style="font-size:3.33333325px;line-height:0px"
+       id="tspan937">Align this rectangle with page borders to copy all paths to btn_embedded</tspan><tspan
+       x="44.084747"
+       y="-26.423178"
+       style="font-size:3.33333325px;line-height:0px"
+       id="tspan947" /><tspan
+       x="44.084747"
+       y="-26.423178"
+       style="font-size:3.33333325px;line-height:0px"
+       id="tspan949" /><tspan
+       x="44.084747"
+       y="-26.423178"
+       style="font-size:3.33333325px;line-height:0px"
+       id="tspan951" /><tspan
+       x="44.084747"
+       y="-26.423178"
+       style="font-size:3.33333325px;line-height:0px"
+       id="tspan945">(shift + Up/Down),</tspan><tspan
+       x="44.084747"
+       y="-16.898439"
+       style="font-size:3.33333325px;line-height:0px"
+       id="tspan941" /></text>
+  <path
+     transform="matrix(1,0,0,1.0035472,0.09951893,-0.38973691)"
+     d="M 9.1115125,22.795856 A 11.451207,11.541409 89.071998 1 1 30.888027,15.200519 11.451207,11.541409 89.071998 1 1 9.1115125,22.795856 Z"
+     id="path36-3"
+     style="opacity:0.1;fill:url(#linearGradient875);fill-opacity:1;stroke-width:1.08289;filter:url(#filter885)" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/knobs/knob_bg_small.svg b/res/skins/LateNight/palemoon/knobs/knob_bg_small.svg
new file mode 100644
index 000000000000..f47927233333
--- /dev/null
+++ b/res/skins/LateNight/palemoon/knobs/knob_bg_small.svg
@@ -0,0 +1,150 @@
+<?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="svg42"
+   version="1.1"
+   height="30"
+   width="35">
+  <metadata
+     id="metadata46">
+    <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="defs12">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.02706882,-0.08184611,0.08120647,-0.02728204,-10.727536,56.877832)"
+       y2="483.05225"
+       y1="472.03"
+       x2="446.62161"
+       x1="256.73999"
+       id="c">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-color="#1e1e1e" />
+      <stop
+         id="stop4"
+         offset="1"
+         stop-color="#3d3d3d" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.24067413,-0.84124964,0.84124964,-0.24067413,6.3307695,38.099909)"
+       y2="18.998119"
+       y1="18.998119"
+       x2="31.999203"
+       x1="8.000597"
+       id="b">
+      <stop
+         id="stop7"
+         offset="0"
+         stop-color="#0e0e0e" />
+      <stop
+         id="stop9"
+         offset="1"
+         stop-color="#5d5d5d" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#b-3"
+       id="linearGradient875"
+       x1="9.1772108"
+       y1="18.998186"
+       x2="30.822329"
+       y2="18.998186"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.16649667,-1.0580923,1.0580923,-0.16649667,3.227828,43.322923)" />
+    <linearGradient
+       id="b-3"
+       x1="8.000597"
+       x2="31.999203"
+       y1="18.998119"
+       y2="18.998119"
+       gradientTransform="rotate(-105.96536,19.999759,18.998456)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#0e0e0e"
+         offset="0"
+         id="stop7-6" />
+      <stop
+         stop-color="#5d5d5d"
+         offset="1"
+         id="stop9-7" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="filter885"
+       x="-0.047993742"
+       width="1.0959876"
+       y="-0.048010066"
+       height="1.0960201">
+      <feGaussianBlur
+         stdDeviation="0.46348536"
+         id="feGaussianBlur887" />
+    </filter>
+  </defs>
+  <path
+     d="M 7.4568573,26.920396 C 2.1859729,21.248529 2.0292894,12.179906 7.5574427,6.7602582 13.085596,1.3406105 21.914401,1.3406106 27.442554,6.7602585 32.970707,12.179906 32.830738,21.315382 27.559853,26.98725 L 25.187334,24.759118 9.8238044,24.658534 Z"
+     style="fill:none;fill-opacity:1;stroke:#050505;stroke-width:1.13749993;stroke-linecap:round;stroke-opacity:1;paint-order:fill markers stroke"
+     id="path30-3-3" />
+  <path
+     d="M 7.4568573,26.920396 C 2.1859729,21.248529 2.0292894,12.179906 7.5574427,6.7602581 13.085596,1.3406104 21.914401,1.3406105 27.442554,6.7602584 32.970707,12.179906 32.830738,21.315382 27.559853,26.98725 L 25.187334,24.759118 9.8238044,24.658534 Z"
+     style="fill:#171717;fill-opacity:1;stroke:none;stroke-width:1.13749993;stroke-linecap:round;paint-order:fill markers stroke"
+     id="path30-3" />
+  <path
+     d="M 18.383193,5.7225801 C 16.939842,5.6210181 15.453637,5.8065182 14.000472,6.3143476 8.1392282,8.2066143 4.9378755,14.568278 6.8828742,20.449398 c 1.9451219,5.881491 8.2992828,9.034179 14.1150208,7.002885 5.861243,-1.892266 9.064416,-8.252109 7.119418,-14.133229 -1.459289,-4.4124688 -5.400535,-7.2915394 -9.73412,-7.5964739 z"
+     dominant-baseline="auto"
+     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:#000000;fill-opacity:1;stroke-width:0.86127436;color-rendering:auto;image-rendering:auto;shape-rendering:auto"
+     id="path14" />
+  <g
+     transform="matrix(0.86126008,0.24088869,-0.24088869,0.86126008,5.091785,-4.5900697)"
+     id="g32-6">
+    <g
+       style="opacity:0.49300005"
+       transform="matrix(0.10676,0,0,0.10676,-19.071124,-31.786292)"
+       id="g26-7">
+      <path
+         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"
+         dominant-baseline="auto"
+         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;opacity:1;isolation:auto;mix-blend-mode:normal;solid-color:#000000;color-rendering:auto;image-rendering:auto;shape-rendering:auto"
+         id="path24-5" />
+    </g>
+    <g
+       style="opacity:0.93999999;fill:#050505"
+       transform="matrix(0.10746967,0,0,0.10746967,-20.137858,-33.659792)"
+       id="g30-3">
+      <path
+         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"
+         dominant-baseline="auto"
+         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;opacity:1;isolation:auto;mix-blend-mode:normal;solid-color:#000000;fill:#050505;color-rendering:auto;image-rendering:auto;shape-rendering:auto"
+         id="path28-5" />
+    </g>
+  </g>
+  <path
+     d="m 7.2012454,18.966814 c 0.2809698,1.328662 0.8320426,2.62189 1.6654463,3.802088 3.2206833,4.800531 9.7877553,6.047015 14.5926103,2.773617 4.805157,-3.273606 6.009664,-9.821346 2.675275,-14.544921 C 22.913894,6.1970668 16.347994,4.9484695 11.54314,8.2218673 7.9381687,10.677823 6.3576454,14.977572 7.2012454,18.966814 Z"
+     dominant-baseline="auto"
+     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;opacity:0.74599998;isolation:auto;mix-blend-mode:normal;solid-color:#000000;fill:#474747;fill-opacity:1;stroke-width:0.875;color-rendering:auto;image-rendering:auto;shape-rendering:auto"
+     id="path34" />
+  <path
+     d="M 15.721532,7.6625733 A 9.8899288,9.9678322 8.0144789 1 1 19.278086,27.2611 9.8899288,9.9678322 8.0144789 1 1 15.721532,7.6625733 Z"
+     id="path36-1"
+     style="opacity:1;fill:#282828;fill-opacity:1;stroke-width:0.935252" />
+  <path
+     style="opacity:0.1;fill:url(#linearGradient875);fill-opacity:1;stroke-width:1.08289;filter:url(#filter885)"
+     id="path36-3"
+     d="M 9.1115125,22.795856 A 11.451207,11.541409 89.071998 1 1 30.888027,15.200519 11.451207,11.541409 89.071998 1 1 9.1115125,22.795856 Z"
+     transform="matrix(0.875,0,0,0.8781038,2.0071326e-4,-0.30072665)" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/knobs/knob_indicator_fx_grey.svg b/res/skins/LateNight/palemoon/knobs/knob_indicator_fx_grey.svg
new file mode 100644
index 000000000000..751f8a629993
--- /dev/null
+++ b/res/skins/LateNight/palemoon/knobs/knob_indicator_fx_grey.svg
@@ -0,0 +1,264 @@
+<?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="26"
+   height="26"
+   version="1.1"
+   id="svg29">
+  <metadata
+     id="metadata33">
+    <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="defs17">
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="c">
+      <feGaussianBlur
+         stdDeviation="0.42678198"
+         id="feGaussianBlur2" />
+    </filter>
+    <radialGradient
+       id="b"
+       cx="366.94"
+       cy="355.35999"
+       r="21.466"
+       gradientTransform="matrix(1,0,0,0.98824,-5.7382e-7,4.1807)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#d">
+      <stop
+         stop-color="#c4f161"
+         stop-opacity=".94901961"
+         offset="0"
+         id="stop5" />
+      <stop
+         stop-color="#c0ff5d"
+         stop-opacity=".81961"
+         offset=".54692036"
+         id="stop7"
+         style="stop-color:#73c500;stop-opacity:1" />
+      <stop
+         stop-color="#7bd002"
+         stop-opacity="0"
+         offset="1"
+         id="stop9"
+         style="stop-color:#457600;stop-opacity:0.44973546" />
+    </radialGradient>
+    <linearGradient
+       id="d"
+       x1="12.517102"
+       x2="12.517102"
+       y1="3.9656665"
+       y2="11.698717"
+       gradientTransform="translate(0,0.0529661)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#77c305"
+         offset="0"
+         id="stop12" />
+      <stop
+         stop-color="#457600"
+         offset="1"
+         id="stop14" />
+    </linearGradient>
+    <radialGradient
+       spreadMethod="pad"
+       fr="0"
+       r="21.466"
+       fy="355.35999"
+       fx="366.94"
+       cy="355.35999"
+       cx="366.94"
+       gradientTransform="matrix(0.07432224,0,0,0.03608647,-14.271395,-10.811015)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient1274"
+       xlink:href="#b-3-3" />
+    <radialGradient
+       spreadMethod="pad"
+       fr="0"
+       fy="355.35999"
+       fx="366.94"
+       id="b-3-3"
+       cx="366.94"
+       cy="355.35999"
+       r="21.466"
+       gradientTransform="matrix(1,0,0,0.98824,-5.7382e-7,4.1807)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#c4f161"
+         stop-opacity=".94901961"
+         offset="0"
+         id="stop5-6"
+         style="stop-color:#ffffff;stop-opacity:0.94901961" />
+      <stop
+         stop-color="#c0ff5d"
+         stop-opacity=".81961"
+         offset="0.6310814"
+         id="stop7-7"
+         style="stop-color:#dfdfdf;stop-opacity:1" />
+      <stop
+         stop-color="#7bd002"
+         stop-opacity="0"
+         offset="1"
+         id="stop9-5"
+         style="stop-color:#999999;stop-opacity:0" />
+    </radialGradient>
+    <filter
+       id="c-5-6"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         stdDeviation="0.42678198"
+         id="feGaussianBlur2-2" />
+    </filter>
+    <linearGradient
+       id="a"
+       x1="8.000597"
+       x2="31.999203"
+       y1="18.998119"
+       y2="18.998119"
+       gradientTransform="rotate(-105.96536,-4.469143,20.360757)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#0e0e0e"
+         offset="0"
+         id="stop2" />
+      <stop
+         stop-color="#5d5d5d"
+         offset="1"
+         id="stop4" />
+    </linearGradient>
+    <linearGradient
+       id="b-6"
+       x1="256.73999"
+       x2="446.62161"
+       y1="472.03"
+       y2="483.05225"
+       gradientTransform="matrix(-0.0309358,-0.09353841,0.09280739,-0.03117947,-44.769021,43.124832)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#1e1e1e"
+         offset="0"
+         id="stop7-75" />
+      <stop
+         stop-color="#3d3d3d"
+         offset="1"
+         id="stop9-3" />
+    </linearGradient>
+    <radialGradient
+       id="d-5"
+       cx="367.10001"
+       cy="353.17999"
+       r="28.985001"
+       gradientTransform="matrix(1,0,0,0.67653,0,114.24)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#dfdfdd"
+         stop-opacity=".94901961"
+         offset="0"
+         id="stop2-6" />
+      <stop
+         stop-color="#c5c5c1"
+         stop-opacity=".81960785"
+         offset=".61062"
+         id="stop4-2" />
+      <stop
+         stop-color="#787878"
+         stop-opacity="0"
+         offset="1"
+         id="stop6" />
+    </radialGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="c-9">
+      <feGaussianBlur
+         stdDeviation="0.42678198"
+         id="feGaussianBlur9" />
+    </filter>
+    <linearGradient
+       gradientTransform="translate(8.583863,0.54169302)"
+       id="b-1"
+       x1="12.569915"
+       x2="12.569915"
+       y1="6.4768233"
+       y2="12.000253"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#9b9d99"
+         offset="0"
+         id="stop12-2"
+         style="stop-color:#737373;stop-opacity:1" />
+      <stop
+         stop-color="#737373"
+         offset="1"
+         id="stop14-7"
+         style="stop-color:#7d7d7d;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#b-3-3-2"
+       id="radialGradient1274-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.07515518,0,0,0.03626066,-14.57792,-10.870545)"
+       cx="366.94"
+       cy="355.35999"
+       fx="366.94"
+       fy="355.35999"
+       r="21.466"
+       fr="0"
+       spreadMethod="pad" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98824,-5.7382e-7,4.1807)"
+       r="21.466"
+       cy="355.35999"
+       cx="366.94"
+       id="b-3-3-2"
+       fx="366.94"
+       fy="355.35999"
+       fr="0"
+       spreadMethod="pad">
+      <stop
+         style="stop-color:#5bdaec;stop-opacity:1"
+         id="stop5-6-9"
+         offset="0"
+         stop-opacity=".94901961"
+         stop-color="#c4f161" />
+      <stop
+         style="stop-color:#00acc5;stop-opacity:1"
+         id="stop7-7-1"
+         offset=".54692036"
+         stop-opacity=".81961"
+         stop-color="#c0ff5d" />
+      <stop
+         style="stop-color:#008ba0;stop-opacity:0.4509804"
+         id="stop9-5-2"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#7bd002" />
+    </radialGradient>
+  </defs>
+  <path
+     id="path19"
+     d="m 10.6451,2.2038578 0.01709,6.0344235 c 6.8e-4,0.603026 0.242246,1.032396 0.663824,1.374023 0.422001,0.341972 0.986838,0.4735897 1.633789,0.4735897 0.615239,0 1.179802,-0.08046 1.625244,-0.4001027 0.445441,-0.319645 0.705599,-0.778129 0.764654,-1.36377 l 0.0034,-0.0376 v -0.03588 L 15.3549,2.2534238 C 13.147643,1.6779394 12.865824,1.654957 10.6451,2.2038578 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:1.39999998;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:#858585;fill-opacity:1;stroke:none;stroke-width:1.39999998;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 12.999109,1.2313373 c 0.9695,0 1.613281,-0.025448 1.613281,0.944052 v 5.721417 c 0,0.9695 -0.643781,1.488977 -1.613281,1.488977 -0.9695,0 -1.613281,-0.519477 -1.613281,-1.488977 v -5.721417 c 0,-0.9695 0.643781,-0.944052 1.613281,-0.944052 z"
+     id="rect825-3" />
+  <path
+     d="m 14.595364,2.0126131 a 1.595401,0.77461187 0 1 1 -3.190728,0 1.595401,0.77461187 0 1 1 3.190728,0 z"
+     id="path27-5-9"
+     style="opacity:0.278;fill:url(#radialGradient1274);fill-opacity:1;stroke-width:0.06587751" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/knobs/knob_indicator_master_orange.svg b/res/skins/LateNight/palemoon/knobs/knob_indicator_master_orange.svg
new file mode 100644
index 000000000000..72a891aa472a
--- /dev/null
+++ b/res/skins/LateNight/palemoon/knobs/knob_indicator_master_orange.svg
@@ -0,0 +1,201 @@
+<?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="35"
+   height="30"
+   version="1.1"
+   id="svg29">
+  <metadata
+     id="metadata33">
+    <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="defs17">
+    <linearGradient
+       id="e"
+       x1="202.39"
+       x2="202.49001"
+       y1="623.47998"
+       y2="634.37"
+       gradientTransform="matrix(1.2573,0,0,0.86853,-274.59,-533.44)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#f18900"
+         offset="0"
+         id="stop2" />
+      <stop
+         stop-color="#b67300"
+         offset="1"
+         id="stop4" />
+    </linearGradient>
+    <filter
+       id="d"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         stdDeviation="0.42678198"
+         id="feGaussianBlur7" />
+    </filter>
+    <radialGradient
+       id="f"
+       cx="366.94"
+       cy="355.35999"
+       r="21.466"
+       gradientTransform="matrix(0.077812,0,0,0.07615674,-11.052125,-22.036072)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#fffefa"
+         stop-opacity=".94902"
+         offset="0"
+         id="stop10"
+         style="stop-color:#ffaa26;stop-opacity:1" />
+      <stop
+         stop-color="#ff994e"
+         stop-opacity=".81961"
+         offset=".61062"
+         id="stop12"
+         style="stop-color:#dd8c00;stop-opacity:1" />
+      <stop
+         stop-color="#ff902d"
+         stop-opacity="0"
+         offset="1"
+         id="stop14"
+         style="stop-color:#b67300;stop-opacity:0.45502645" />
+    </radialGradient>
+    <radialGradient
+       fy="355.35999"
+       fx="366.93451"
+       id="f-3"
+       cx="366.93451"
+       cy="355.35999"
+       r="25.759201"
+       gradientTransform="matrix(0.69980946,-0.00367881,0.00393052,0.76229507,108.75351,85.820703)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#fefefe"
+         stop-opacity=".94901961"
+         offset="0"
+         id="stop10-6" />
+      <stop
+         style="stop-color:#909090;stop-opacity:1"
+         stop-color="#a3a4a2"
+         stop-opacity=".02352941"
+         offset="1"
+         id="stop14-7" />
+    </radialGradient>
+    <filter
+       id="d-5"
+       x="-0.0059850197"
+       y="-0.0060153441"
+       width="1.01197"
+       height="1.0120307"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         stdDeviation="0.10706202"
+         id="feGaussianBlur2" />
+    </filter>
+    <radialGradient
+       id="f-7"
+       cx="366.94"
+       cy="355.35999"
+       r="21.466"
+       gradientTransform="matrix(0.07335364,0,0,0.07179322,-29.4162,-20.774819)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#f">
+      <stop
+         stop-color="#fffefa"
+         stop-opacity=".94902"
+         offset="0"
+         id="stop10-5"
+         style="stop-color:#ffaa26;stop-opacity:1" />
+      <stop
+         stop-color="#ff994e"
+         stop-opacity=".81961"
+         offset=".61062"
+         id="stop12-5"
+         style="stop-color:#dd8c00;stop-opacity:1" />
+      <stop
+         stop-color="#ff902d"
+         stop-opacity="0"
+         offset="1"
+         id="stop14-3"
+         style="stop-color:#b67300;stop-opacity:0.45502645" />
+    </radialGradient>
+    <radialGradient
+       id="f-6"
+       cx="366.94"
+       cy="355.35999"
+       r="21.466"
+       gradientTransform="matrix(0.07408271,0,0,0.07250678,-9.683718,-21.030291)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#fffefa"
+         stop-opacity=".94902"
+         offset="0"
+         id="stop10-2"
+         style="stop-color:#ffaa26;stop-opacity:0.55555558" />
+      <stop
+         stop-color="#ff994e"
+         stop-opacity=".81961"
+         offset="0.40000001"
+         id="stop12-9"
+         style="stop-color:#dd8c00;stop-opacity:0.55555558" />
+      <stop
+         stop-color="#ff902d"
+         stop-opacity="0"
+         offset="1"
+         id="stop14-1"
+         style="stop-color:#8c5800;stop-opacity:0.49206349" />
+    </radialGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.07335364,0,0,0.03606549,-9.4161996,-6.7969665)"
+       r="21.466"
+       cy="355.35999"
+       cx="366.94"
+       id="f-7-2">
+      <stop
+         style="stop-color:#ffaa26;stop-opacity:1"
+         id="stop10-5-7"
+         offset="0"
+         stop-opacity=".94902"
+         stop-color="#fffefa" />
+      <stop
+         style="stop-color:#b34e13;stop-opacity:1"
+         id="stop12-0"
+         offset=".61062"
+         stop-opacity=".81961"
+         stop-color="#ff994e" />
+      <stop
+         style="stop-color:#b34e13;stop-opacity:0.00301151"
+         id="stop14-3-9"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#ff902d" />
+    </radialGradient>
+  </defs>
+  <path
+     id="path19"
+     d="m 15.145991,6.2038575 0.01709,6.0344235 c 6.8e-4,0.603026 0.242246,1.032396 0.663824,1.374023 0.422001,0.341972 0.986838,0.47359 1.633789,0.47359 0.615239,0 1.179802,-0.08046 1.625244,-0.400103 0.445441,-0.319645 0.705599,-0.778129 0.764654,-1.36377 l 0.0034,-0.0376 v -0.03588 l 0.0018,-5.9951175 C 17.648534,5.6779391 17.366715,5.6549567 15.145991,6.2038575 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:1.39999998;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:#8d3b11;fill-opacity:1;stroke:none;stroke-width:1.39999998;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 17.452728,5.2313365 c 0.9695,0 1.660553,-0.025448 1.660553,0.9440524 v 5.8464171 c 0,0.9695 -0.643781,1.488977 -1.613281,1.488977 -0.9695,0 -1.613281,-0.519477 -1.613281,-1.488977 V 6.1753889 c 0,-0.9695 0.596509,-0.9440524 1.566009,-0.9440524 z"
+     id="rect825" />
+  <path
+     style="opacity:0.25767157;fill:url(#f-7-2);stroke-width:0.05173989"
+     id="path27"
+     d="m 19.074355,6.0192072 a 1.5746092,0.77416129 0 1 1 -3.149146,0 1.5746092,0.77416129 0 1 1 3.149146,0 z" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/knobs/knob_indicator_master_red.svg b/res/skins/LateNight/palemoon/knobs/knob_indicator_master_red.svg
new file mode 100644
index 000000000000..372a555e4c84
--- /dev/null
+++ b/res/skins/LateNight/palemoon/knobs/knob_indicator_master_red.svg
@@ -0,0 +1,241 @@
+<?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="svg29"
+   version="1.1"
+   height="30"
+   width="35">
+  <metadata
+     id="metadata33">
+    <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="defs17">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2573,0,0,0.86853,-274.59,-533.44)"
+       y2="634.37"
+       y1="623.47998"
+       x2="202.49001"
+       x1="202.39"
+       id="e">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-color="#f18900" />
+      <stop
+         id="stop4"
+         offset="1"
+         stop-color="#b67300" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="d">
+      <feGaussianBlur
+         id="feGaussianBlur7"
+         stdDeviation="0.42678198" />
+    </filter>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.077812,0,0,0.07615674,-11.052125,-22.036072)"
+       r="21.466"
+       cy="355.35999"
+       cx="366.94"
+       id="f">
+      <stop
+         style="stop-color:#ffaa26;stop-opacity:1"
+         id="stop10"
+         offset="0"
+         stop-opacity=".94902"
+         stop-color="#fffefa" />
+      <stop
+         style="stop-color:#dd8c00;stop-opacity:1"
+         id="stop12"
+         offset=".61062"
+         stop-opacity=".81961"
+         stop-color="#ff994e" />
+      <stop
+         style="stop-color:#b67300;stop-opacity:0.45502645"
+         id="stop14"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#ff902d" />
+    </radialGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.69980946,-0.00367881,0.00393052,0.76229507,108.75351,85.820703)"
+       r="25.759201"
+       cy="355.35999"
+       cx="366.93451"
+       id="f-3"
+       fx="366.93451"
+       fy="355.35999">
+      <stop
+         id="stop10-6"
+         offset="0"
+         stop-opacity=".94901961"
+         stop-color="#fefefe" />
+      <stop
+         id="stop14-7"
+         offset="1"
+         stop-opacity=".02352941"
+         stop-color="#a3a4a2"
+         style="stop-color:#909090;stop-opacity:1" />
+    </radialGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       height="1.0120307"
+       width="1.01197"
+       y="-0.0060153441"
+       x="-0.0059850197"
+       id="d-5">
+      <feGaussianBlur
+         id="feGaussianBlur2"
+         stdDeviation="0.10706202" />
+    </filter>
+    <radialGradient
+       xlink:href="#f"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.07335364,0,0,0.07179322,-29.4162,-20.774819)"
+       r="21.466"
+       cy="355.35999"
+       cx="366.94"
+       id="f-7">
+      <stop
+         style="stop-color:#ffaa26;stop-opacity:1"
+         id="stop10-5"
+         offset="0"
+         stop-opacity=".94902"
+         stop-color="#fffefa" />
+      <stop
+         style="stop-color:#dd8c00;stop-opacity:1"
+         id="stop12-5"
+         offset=".61062"
+         stop-opacity=".81961"
+         stop-color="#ff994e" />
+      <stop
+         style="stop-color:#b67300;stop-opacity:0.45502645"
+         id="stop14-3"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#ff902d" />
+    </radialGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.07408271,0,0,0.07250678,-9.683718,-21.030291)"
+       r="21.466"
+       cy="355.35999"
+       cx="366.94"
+       id="f-6">
+      <stop
+         style="stop-color:#ffaa26;stop-opacity:0.55555558"
+         id="stop10-2"
+         offset="0"
+         stop-opacity=".94902"
+         stop-color="#fffefa" />
+      <stop
+         style="stop-color:#dd8c00;stop-opacity:0.55555558"
+         id="stop12-9"
+         offset="0.40000001"
+         stop-opacity=".81961"
+         stop-color="#ff994e" />
+      <stop
+         style="stop-color:#8c5800;stop-opacity:0.49206349"
+         id="stop14-1"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#ff902d" />
+    </radialGradient>
+    <radialGradient
+       id="f-7-2"
+       cx="366.94"
+       cy="355.35999"
+       r="21.466"
+       gradientTransform="matrix(0.07335364,0,0,0.03606549,-9.4161996,-6.7969665)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#fffefa"
+         stop-opacity=".94902"
+         offset="0"
+         id="stop10-5-7"
+         style="stop-color:#ffaa26;stop-opacity:1" />
+      <stop
+         stop-color="#ff994e"
+         stop-opacity=".81961"
+         offset=".61062"
+         id="stop12-0"
+         style="stop-color:#b34e13;stop-opacity:1" />
+      <stop
+         stop-color="#ff902d"
+         stop-opacity="0"
+         offset="1"
+         id="stop14-3-9"
+         style="stop-color:#b34e13;stop-opacity:0.45490196" />
+    </radialGradient>
+    <radialGradient
+       fy="355.35999"
+       fx="366.94"
+       xlink:href="#b"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.07440094,-2.9112641e-8,5.6927711e-8,0.03660921,-9.789372,-6.9944069)"
+       r="21.466"
+       cy="355.35999"
+       cx="366.94"
+       id="a-5">
+      <stop
+         style="stop-color:#ee6833;stop-opacity:1"
+         id="stop2-6"
+         offset="0"
+         stop-opacity=".95055"
+         stop-color="#eece33" />
+      <stop
+         style="stop-color:#960000;stop-opacity:1"
+         id="stop6-2"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#ff2d2d" />
+    </radialGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2573,0,0,0.86853,-234.59,-533.44)"
+       y2="634.37"
+       y1="623.47998"
+       x2="202.49001"
+       x1="202.39"
+       id="b">
+      <stop
+         id="stop2-7"
+         offset="0"
+         stop-color="#e90808" />
+      <stop
+         id="stop4-0"
+         offset="1"
+         stop-color="#b60000" />
+    </linearGradient>
+  </defs>
+  <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:1.39999998;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 15.145991,6.2038575 0.01709,6.0344235 c 6.8e-4,0.603026 0.242246,1.032396 0.663824,1.374023 0.422001,0.341972 0.986838,0.47359 1.633789,0.47359 0.615239,0 1.179802,-0.08046 1.625244,-0.400103 0.445441,-0.319645 0.705599,-0.778129 0.764654,-1.36377 l 0.0034,-0.0376 v -0.03588 l 0.0018,-5.9951175 C 17.648534,5.6779391 17.366715,5.6549567 15.145991,6.2038575 Z"
+     id="path19" />
+  <path
+     style="fill:#960000;fill-opacity:1;stroke:none;stroke-width:1.39999998;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 17.560069,5.231337 c 0.9695,0 1.553212,-0.025448 1.553212,0.944052 v 5.721417 c 0,0.9695 -0.643781,1.488977 -1.613281,1.488977 -0.9695,0 -1.613281,-0.519477 -1.613281,-1.488977 V 6.175389 c 0,-0.9695 0.70385,-0.944052 1.67335,-0.944052 z"
+     id="rect825-3" />
+  <path
+     style="opacity:0.49800002;fill:url(#a-5);fill-opacity:1;stroke-width:0.05205585"
+     id="path27-2-9"
+     d="m 19.096247,6.0149775 a 1.5853624,0.77833012 0 1 1 -3.170651,0 1.5853624,0.77833012 0 1 1 3.170651,0 z" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/knobs/knob_indicator_regular_blue.svg b/res/skins/LateNight/palemoon/knobs/knob_indicator_regular_blue.svg
new file mode 100644
index 000000000000..6dcf427efe00
--- /dev/null
+++ b/res/skins/LateNight/palemoon/knobs/knob_indicator_regular_blue.svg
@@ -0,0 +1,379 @@
+<?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="40"
+   height="34"
+   version="1.1"
+   id="svg29">
+  <metadata
+     id="metadata33">
+    <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="defs17">
+    <radialGradient
+       xlink:href="#b-3-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.69980946,-0.00367881,0.00393052,0.76229507,108.75351,85.820703)"
+       r="25.759201"
+       cy="355.35999"
+       cx="366.93451"
+       id="f"
+       fx="366.93451"
+       fy="355.35999">
+      <stop
+         id="stop10"
+         offset="0"
+         stop-opacity=".94901961"
+         stop-color="#fefefe" />
+      <stop
+         id="stop14"
+         offset="1"
+         stop-opacity=".02352941"
+         stop-color="#a3a4a2"
+         style="stop-color:#909090;stop-opacity:0.16931216" />
+    </radialGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       height="1.0120307"
+       width="1.01197"
+       y="-0.0060153441"
+       x="-0.0059850197"
+       id="d">
+      <feGaussianBlur
+         id="feGaussianBlur2"
+         stdDeviation="0.10706202" />
+    </filter>
+    <linearGradient
+       id="c"
+       x1="256.73999"
+       x2="446.62161"
+       y1="472.03"
+       y2="483.05225"
+       gradientTransform="matrix(-0.0309358,-0.09353841,0.09280739,-0.03117947,-12.260041,64.912913)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#1e1e1e"
+         offset="0"
+         id="stop2" />
+      <stop
+         stop-color="#3d3d3d"
+         offset="1"
+         id="stop4" />
+    </linearGradient>
+    <linearGradient
+       id="b"
+       x1="8.000597"
+       x2="31.999203"
+       y1="18.998119"
+       y2="18.998119"
+       gradientTransform="rotate(-105.96536,19.999759,18.998455)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#0e0e0e"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#5d5d5d"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+    <radialGradient
+       spreadMethod="pad"
+       fr="0"
+       fy="355.35999"
+       fx="366.94"
+       id="b-3-3"
+       cx="366.94"
+       cy="355.35999"
+       r="21.466"
+       gradientTransform="matrix(1,0,0,0.98824,-5.7382e-7,4.1807)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#c4f161"
+         stop-opacity=".94901961"
+         offset="0"
+         id="stop5-6" />
+      <stop
+         stop-color="#c0ff5d"
+         stop-opacity=".81961"
+         offset=".54692036"
+         id="stop7-7"
+         style="stop-color:#73c500;stop-opacity:1" />
+      <stop
+         stop-color="#7bd002"
+         stop-opacity="0"
+         offset="1"
+         id="stop9-5"
+         style="stop-color:#5ba000;stop-opacity:0.4509804" />
+    </radialGradient>
+    <linearGradient
+       id="d-3"
+       x1="12.517102"
+       x2="12.517102"
+       y1="3.9656665"
+       y2="11.698717"
+       gradientTransform="translate(0,0.0529661)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#77c305"
+         offset="0"
+         id="stop12-6" />
+      <stop
+         stop-color="#457600"
+         offset="1"
+         id="stop14-7" />
+    </linearGradient>
+    <filter
+       id="c-5-6"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         stdDeviation="0.42678198"
+         id="feGaussianBlur2-2" />
+    </filter>
+    <radialGradient
+       id="f-7"
+       cx="366.94"
+       cy="355.35999"
+       r="21.466"
+       gradientTransform="matrix(0.08383273,0,0,0.0412177,-18.761371,-8.0536762)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#fffefa"
+         stop-opacity=".94902"
+         offset="0"
+         id="stop10-5"
+         style="stop-color:#ffaa26;stop-opacity:1" />
+      <stop
+         stop-color="#ff994e"
+         stop-opacity=".81961"
+         offset=".61062"
+         id="stop12"
+         style="stop-color:#dd8c00;stop-opacity:1" />
+      <stop
+         stop-color="#ff902d"
+         stop-opacity="0"
+         offset="1"
+         id="stop14-3"
+         style="stop-color:#b67300;stop-opacity:0.45502645" />
+    </radialGradient>
+    <radialGradient
+       fy="355.35999"
+       fx="366.93451"
+       id="f-6"
+       cx="366.93451"
+       cy="355.35999"
+       r="25.759201"
+       gradientTransform="matrix(0.69980946,-0.00367881,0.00393052,0.76229507,108.75351,85.820703)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#fefefe"
+         stop-opacity=".94901961"
+         offset="0"
+         id="stop10-7" />
+      <stop
+         style="stop-color:#909090;stop-opacity:0.16931216"
+         stop-color="#a3a4a2"
+         stop-opacity=".02352941"
+         offset="1"
+         id="stop14-5" />
+    </radialGradient>
+    <filter
+       id="d-35"
+       x="-0.0059850197"
+       y="-0.0060153441"
+       width="1.01197"
+       height="1.0120307"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         stdDeviation="0.10706202"
+         id="feGaussianBlur2-6" />
+    </filter>
+    <radialGradient
+       fy="355.35999"
+       fx="366.94"
+       xlink:href="#b-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.07221587,-3.329178e-8,5.525581e-8,0.04186449,-6.4985153,-8.2885201)"
+       r="21.466"
+       cy="355.35999"
+       cx="366.94"
+       id="a-5">
+      <stop
+         style="stop-color:#ee6833;stop-opacity:1"
+         id="stop2-6"
+         offset="0"
+         stop-opacity=".95055"
+         stop-color="#eece33" />
+      <stop
+         style="stop-color:#aa0000;stop-opacity:1"
+         id="stop6-2"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#ff2d2d" />
+    </radialGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2573,0,0,0.86853,-234.59,-533.44)"
+       y2="634.37"
+       y1="623.47998"
+       x2="202.49001"
+       x1="202.39"
+       id="b-6">
+      <stop
+         id="stop12-2"
+         offset="0"
+         stop-color="#e90808" />
+      <stop
+         id="stop14-9"
+         offset="1"
+         stop-color="#b60000" />
+    </linearGradient>
+    <radialGradient
+       spreadMethod="pad"
+       fr="0"
+       r="21.466"
+       fy="355.35999"
+       fx="366.94"
+       cy="355.35999"
+       cx="366.94"
+       gradientTransform="matrix(1,0,0,0.98824,-5.7382e-7,4.1807)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient1274"
+       xlink:href="#b-3-3-1" />
+    <radialGradient
+       spreadMethod="pad"
+       fr="0"
+       fy="355.35999"
+       fx="366.94"
+       id="b-3-3-1"
+       cx="366.94"
+       cy="355.35999"
+       r="21.466"
+       gradientTransform="matrix(1,0,0,0.98824,-5.7382e-7,4.1807)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#c4f161"
+         stop-opacity=".94901961"
+         offset="0"
+         id="stop5-6-2" />
+      <stop
+         stop-color="#c0ff5d"
+         stop-opacity=".81961"
+         offset=".54692036"
+         id="stop7-7-7"
+         style="stop-color:#73c500;stop-opacity:1" />
+      <stop
+         stop-color="#7bd002"
+         stop-opacity="0"
+         offset="1"
+         id="stop9-5-0"
+         style="stop-color:#5ba000;stop-opacity:0.4509804" />
+    </radialGradient>
+    <filter
+       id="c-5-6-9"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         stdDeviation="0.42678198"
+         id="feGaussianBlur2-2-3" />
+    </filter>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.06894746,0,0,0.04773054,-5.2994503,-10.227876)"
+       r="21.466"
+       cy="355.35999"
+       cx="366.94"
+       id="f-2">
+      <stop
+         id="stop10-7-6"
+         offset="0"
+         stop-opacity=".94901961"
+         stop-color="#a7ebf7" />
+      <stop
+         style="stop-color:#54c3d4;stop-opacity:0.4745098;"
+         stop-color="#a7ebf7"
+         stop-opacity=".94901961"
+         offset="0.75433189"
+         id="stop912" />
+      <stop
+         style="stop-color:#029bb1;stop-opacity:0"
+         id="stop14-93"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#02b0d0" />
+    </radialGradient>
+    <radialGradient
+       xlink:href="#b-3-3-1-6"
+       id="radialGradient1274-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98824,-5.7382e-7,4.1807)"
+       cx="366.94"
+       cy="355.35999"
+       fx="366.94"
+       fy="355.35999"
+       r="21.466"
+       fr="0"
+       spreadMethod="pad" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98824,-5.7382e-7,4.1807)"
+       r="21.466"
+       cy="355.35999"
+       cx="366.94"
+       id="b-3-3-1-6"
+       fx="366.94"
+       fy="355.35999"
+       fr="0"
+       spreadMethod="pad">
+      <stop
+         id="stop5-6-2-7"
+         offset="0"
+         stop-opacity=".94901961"
+         stop-color="#c4f161" />
+      <stop
+         style="stop-color:#73c500;stop-opacity:1"
+         id="stop7-7-7-5"
+         offset=".54692036"
+         stop-opacity=".81961"
+         stop-color="#c0ff5d" />
+      <stop
+         style="stop-color:#5ba000;stop-opacity:0"
+         id="stop9-5-0-3"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#7bd002" />
+    </radialGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="c-5-6-9-5">
+      <feGaussianBlur
+         id="feGaussianBlur2-2-3-6"
+         stdDeviation="0.42678198" />
+    </filter>
+  </defs>
+  <path
+     id="path19"
+     d="m 17.309704,6.9472657 0.01953,6.8964843 c 7.77e-4,0.689172 0.276853,1.179881 0.758656,1.570312 0.482287,0.390825 1.127815,0.541246 1.867187,0.541246 0.703131,0 1.348346,-0.09195 1.857422,-0.457261 0.509076,-0.365309 0.806399,-0.88929 0.87389,-1.558594 l 0.0039,-0.04297 v -0.04101 l 0.002,-6.8515627 C 20.169753,6.3462161 19.847674,6.3199505 17.309704,6.9472657 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:1.60000002;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="rect825"
+     d="m 20,5.692956 c 1.108,0 1.84375,0.609531 1.84375,1.717531 l 0,6.043005 c 0,1.108 -0.73575,1.701689 -1.84375,1.701689 -1.108,0 -1.84375,-0.593689 -1.84375,-1.701689 l 0,-6.043005 c 0,-1.108 0.73575,-1.717531 1.84375,-1.717531 z"
+     style="fill:#028392;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="path27"
+     d="m 21.479743,6.7335764 a 1.4800261,1.0245566 0 1 1 -2.959984,0 1.4800261,1.0245566 0 1 1 2.959984,0 z"
+     style="fill:url(#f-2);stroke-width:0.0577067;opacity:0.3" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/knobs/knob_indicator_regular_green.svg b/res/skins/LateNight/palemoon/knobs/knob_indicator_regular_green.svg
new file mode 100644
index 000000000000..92fea5173cbf
--- /dev/null
+++ b/res/skins/LateNight/palemoon/knobs/knob_indicator_regular_green.svg
@@ -0,0 +1,26 @@
+<svg 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">
+  <metadata>
+    <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>
+  <defs>
+    <radialGradient id="a" cx="366.94" cy="355.36" r="21.466" fr="0" gradientTransform="matrix(1 0 0 .98824 -5.7382e-7 4.1807)" gradientUnits="userSpaceOnUse">
+      <stop stop-color="#c4f161" stop-opacity=".94902" offset="0"/>
+      <stop stop-color="#73c500" offset=".54692"/>
+      <stop stop-color="#5ba000" stop-opacity="0" offset="1"/>
+    </radialGradient>
+    <filter id="b" color-interpolation-filters="sRGB">
+      <feGaussianBlur stdDeviation="0.42678198"/>
+    </filter>
+  </defs>
+  <g>
+    <path d="m17.31 6.9473 0.01953 6.8965c7.77e-4 0.68917 0.27685 1.1799 0.75866 1.5703 0.48229 0.39082 1.1278 0.54125 1.8672 0.54125 0.70313 0 1.3483-0.09195 1.8574-0.45726 0.50908-0.36531 0.8064-0.88929 0.87389-1.5586l0.0039-0.04297v-0.04101l2e-3 -6.8516c-2.5225-0.65769-2.8446-0.68396-5.3826-0.056645z" 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"/>
+    <path d="m20 5.693c1.108 0 1.8438 0.60953 1.8438 1.7175v6.043c0 1.108-0.73575 1.7017-1.8438 1.7017s-1.8438-0.59369-1.8438-1.7017v-6.043c0-1.108 0.73575-1.7175 1.8438-1.7175z" fill="#518f00"/>
+    <path transform="matrix(.073219 0 0 .044122 -6.8667 -8.904)" 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(#b)" opacity=".52959" stroke-width="1.2646"/>
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/knobs/knob_indicator_regular_grey.svg b/res/skins/LateNight/palemoon/knobs/knob_indicator_regular_grey.svg
new file mode 100644
index 000000000000..9ca6744f728a
--- /dev/null
+++ b/res/skins/LateNight/palemoon/knobs/knob_indicator_regular_grey.svg
@@ -0,0 +1,157 @@
+<?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="svg29"
+   version="1.1"
+   height="34"
+   width="40">
+  <metadata
+     id="metadata33">
+    <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="defs17">
+    <radialGradient
+       fy="355.35999"
+       fx="366.93451"
+       id="f"
+       cx="366.93451"
+       cy="355.35999"
+       r="25.759201"
+       gradientTransform="matrix(0.69980946,-0.00367881,0.00393052,0.76229507,108.75351,85.820703)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#fefefe"
+         stop-opacity=".94901961"
+         offset="0"
+         id="stop10" />
+      <stop
+         style="stop-color:#909090;stop-opacity:0.16931216"
+         stop-color="#a3a4a2"
+         stop-opacity=".02352941"
+         offset="1"
+         id="stop14" />
+    </radialGradient>
+    <filter
+       id="d"
+       x="-0.0059850197"
+       y="-0.0060153441"
+       width="1.01197"
+       height="1.0120307"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         stdDeviation="0.10706202"
+         id="feGaussianBlur2" />
+    </filter>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.0309358,-0.09353841,0.09280739,-0.03117947,-12.260041,64.912913)"
+       y2="483.05225"
+       y1="472.03"
+       x2="446.62161"
+       x1="256.73999"
+       id="c">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-color="#1e1e1e" />
+      <stop
+         id="stop4"
+         offset="1"
+         stop-color="#3d3d3d" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="rotate(-105.96536,19.999759,18.998455)"
+       y2="18.998119"
+       y1="18.998119"
+       x2="31.999203"
+       x1="8.000597"
+       id="b">
+      <stop
+         id="stop7"
+         offset="0"
+         stop-color="#0e0e0e" />
+      <stop
+         id="stop9"
+         offset="1"
+         stop-color="#5d5d5d" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#d-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98824,-5.7382e-7,4.1807)"
+       r="21.466"
+       cy="355.35999"
+       cx="366.94"
+       id="b-3-3">
+      <stop
+         id="stop5-6"
+         offset="0"
+         stop-opacity=".94901961"
+         stop-color="#c4f161" />
+      <stop
+         style="stop-color:#73c500;stop-opacity:1"
+         id="stop7-7"
+         offset=".54692036"
+         stop-opacity=".81961"
+         stop-color="#c0ff5d" />
+      <stop
+         style="stop-color:#5ba000;stop-opacity:0.4509804"
+         id="stop9-5"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#7bd002" />
+    </radialGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,0.0529661)"
+       y2="11.698717"
+       y1="3.9656665"
+       x2="12.517102"
+       x1="12.517102"
+       id="d-3">
+      <stop
+         id="stop12-6"
+         offset="0"
+         stop-color="#77c305" />
+      <stop
+         id="stop14-7"
+         offset="1"
+         stop-color="#457600" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="c-5-6">
+      <feGaussianBlur
+         id="feGaussianBlur2-2"
+         stdDeviation="0.42678198" />
+    </filter>
+  </defs>
+  <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:1.60000002;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 17.309704,6.9472657 0.01953,6.8964843 c 7.77e-4,0.689172 0.276853,1.179881 0.758656,1.570312 0.482287,0.390825 1.127815,0.541246 1.867187,0.541246 0.703131,0 1.348346,-0.09195 1.857422,-0.457261 0.509076,-0.365309 0.806399,-0.88929 0.87389,-1.558594 l 0.0039,-0.04297 v -0.04101 l 0.002,-6.8515627 C 20.169753,6.3462161 19.847674,6.3199505 17.309704,6.9472657 Z"
+     id="path19" />
+  <path
+     style="fill:#828282;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 19.981484,5.6929565 c 1.108,0 1.862266,-0.029083 1.862266,1.0789168 v 6.6816187 c 0,1.108 -0.73575,1.701689 -1.84375,1.701689 -1.108,0 -1.84375,-0.593689 -1.84375,-1.701689 V 6.7718733 c 0,-1.108 0.717234,-1.0789168 1.825234,-1.0789168 z"
+     id="rect825" />
+  <path
+     transform="matrix(0.08190769,0,0,0.04167502,-10.055006,-8.2250257)"
+     d="m 388.4,355.36 a 21.466,21.213 0 1 1 -42.931,0 21.466,21.213 0 1 1 42.931,0 z"
+     style="opacity:0.52899996;fill:url(#f);filter:url(#d)"
+     id="path27" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/knobs/knob_indicator_regular_orange.svg b/res/skins/LateNight/palemoon/knobs/knob_indicator_regular_orange.svg
new file mode 100644
index 000000000000..3b1abbe9ea89
--- /dev/null
+++ b/res/skins/LateNight/palemoon/knobs/knob_indicator_regular_orange.svg
@@ -0,0 +1,218 @@
+<?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="40"
+   height="34"
+   version="1.1"
+   id="svg29">
+  <metadata
+     id="metadata33">
+    <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="defs17">
+    <radialGradient
+       xlink:href="#b-3-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.69980946,-0.00367881,0.00393052,0.76229507,108.75351,85.820703)"
+       r="25.759201"
+       cy="355.35999"
+       cx="366.93451"
+       id="f"
+       fx="366.93451"
+       fy="355.35999">
+      <stop
+         id="stop10"
+         offset="0"
+         stop-opacity=".94901961"
+         stop-color="#fefefe" />
+      <stop
+         id="stop14"
+         offset="1"
+         stop-opacity=".02352941"
+         stop-color="#a3a4a2"
+         style="stop-color:#909090;stop-opacity:0.16931216" />
+    </radialGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       height="1.0120307"
+       width="1.01197"
+       y="-0.0060153441"
+       x="-0.0059850197"
+       id="d">
+      <feGaussianBlur
+         id="feGaussianBlur2"
+         stdDeviation="0.10706202" />
+    </filter>
+    <linearGradient
+       id="c"
+       x1="256.73999"
+       x2="446.62161"
+       y1="472.03"
+       y2="483.05225"
+       gradientTransform="matrix(-0.0309358,-0.09353841,0.09280739,-0.03117947,-12.260041,64.912913)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#1e1e1e"
+         offset="0"
+         id="stop2" />
+      <stop
+         stop-color="#3d3d3d"
+         offset="1"
+         id="stop4" />
+    </linearGradient>
+    <linearGradient
+       id="b"
+       x1="8.000597"
+       x2="31.999203"
+       y1="18.998119"
+       y2="18.998119"
+       gradientTransform="rotate(-105.96536,19.999759,18.998455)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#0e0e0e"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#5d5d5d"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+    <radialGradient
+       spreadMethod="pad"
+       fr="0"
+       fy="355.35999"
+       fx="366.94"
+       id="b-3-3"
+       cx="366.94"
+       cy="355.35999"
+       r="21.466"
+       gradientTransform="matrix(1,0,0,0.98824,-5.7382e-7,4.1807)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#c4f161"
+         stop-opacity=".94901961"
+         offset="0"
+         id="stop5-6" />
+      <stop
+         stop-color="#c0ff5d"
+         stop-opacity=".81961"
+         offset=".54692036"
+         id="stop7-7"
+         style="stop-color:#73c500;stop-opacity:1" />
+      <stop
+         stop-color="#7bd002"
+         stop-opacity="0"
+         offset="1"
+         id="stop9-5"
+         style="stop-color:#5ba000;stop-opacity:0.4509804" />
+    </radialGradient>
+    <linearGradient
+       id="d-3"
+       x1="12.517102"
+       x2="12.517102"
+       y1="3.9656665"
+       y2="11.698717"
+       gradientTransform="translate(0,0.0529661)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#77c305"
+         offset="0"
+         id="stop12-6" />
+      <stop
+         stop-color="#457600"
+         offset="1"
+         id="stop14-7" />
+    </linearGradient>
+    <filter
+       id="c-5-6"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         stdDeviation="0.42678198"
+         id="feGaussianBlur2-2" />
+    </filter>
+    <radialGradient
+       id="f-7"
+       cx="366.94"
+       cy="355.35999"
+       r="21.466"
+       gradientTransform="matrix(0.08383273,0,0,0.0412177,-10.761371,-8.0536762)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#fffefa"
+         stop-opacity=".94902"
+         offset="0"
+         id="stop10-5"
+         style="stop-color:#ffaa26;stop-opacity:1" />
+      <stop
+         stop-color="#ff994e"
+         stop-opacity=".81961"
+         offset=".61062"
+         id="stop12"
+         style="stop-color:#b34e13;stop-opacity:1" />
+      <stop
+         stop-color="#ff902d"
+         stop-opacity="0"
+         offset="1"
+         id="stop14-3"
+         style="stop-color:#b34e13;stop-opacity:0.45490196" />
+    </radialGradient>
+    <radialGradient
+       fy="355.35999"
+       fx="366.93451"
+       id="f-6"
+       cx="366.93451"
+       cy="355.35999"
+       r="25.759201"
+       gradientTransform="matrix(0.69980946,-0.00367881,0.00393052,0.76229507,108.75351,85.820703)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#fefefe"
+         stop-opacity=".94901961"
+         offset="0"
+         id="stop10-7" />
+      <stop
+         style="stop-color:#909090;stop-opacity:0.16931216"
+         stop-color="#a3a4a2"
+         stop-opacity=".02352941"
+         offset="1"
+         id="stop14-5" />
+    </radialGradient>
+    <filter
+       id="d-35"
+       x="-0.0059850197"
+       y="-0.0060153441"
+       width="1.01197"
+       height="1.0120307"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         stdDeviation="0.10706202"
+         id="feGaussianBlur2-6" />
+    </filter>
+  </defs>
+  <path
+     id="path19"
+     d="m 17.309704,6.9472657 0.01953,6.8964843 c 7.77e-4,0.689172 0.276853,1.179881 0.758656,1.570312 0.482287,0.390825 1.127815,0.541246 1.867187,0.541246 0.703131,0 1.348346,-0.09195 1.857422,-0.457261 0.509076,-0.365309 0.806399,-0.88929 0.87389,-1.558594 l 0.0039,-0.04297 v -0.04101 l 0.002,-6.8515627 C 20.169753,6.3462161 19.847674,6.3199505 17.309704,6.9472657 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:1.60000002;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="rect825"
+     d="m 19.945975,5.692956 c 1.108,0 1.897775,-0.029083 1.897775,1.078917 v 6.681619 c 0,1.108 -0.73575,1.701689 -1.84375,1.701689 -1.108,0 -1.84375,-0.593689 -1.84375,-1.701689 V 6.771873 c 0,-1.108 0.681725,-1.078917 1.789725,-1.078917 z"
+     style="fill:#b34e13;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="m 21.799263,6.5933797 a 1.7995534,0.88475576 0 1 1 -3.599024,0 1.7995534,0.88475576 0 1 1 3.599024,0 z"
+     id="path27"
+     style="opacity:0.73600003;fill:url(#f-7);stroke-width:0.0591313" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/knobs/knob_indicator_regular_red.svg b/res/skins/LateNight/palemoon/knobs/knob_indicator_regular_red.svg
new file mode 100644
index 000000000000..7731ce5c359e
--- /dev/null
+++ b/res/skins/LateNight/palemoon/knobs/knob_indicator_regular_red.svg
@@ -0,0 +1,258 @@
+<?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="svg29"
+   version="1.1"
+   height="34"
+   width="40">
+  <metadata
+     id="metadata33">
+    <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="defs17">
+    <radialGradient
+       fy="355.35999"
+       fx="366.93451"
+       id="f"
+       cx="366.93451"
+       cy="355.35999"
+       r="25.759201"
+       gradientTransform="matrix(0.69980946,-0.00367881,0.00393052,0.76229507,108.75351,85.820703)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#b-3-3">
+      <stop
+         stop-color="#fefefe"
+         stop-opacity=".94901961"
+         offset="0"
+         id="stop10" />
+      <stop
+         style="stop-color:#909090;stop-opacity:0.16931216"
+         stop-color="#a3a4a2"
+         stop-opacity=".02352941"
+         offset="1"
+         id="stop14" />
+    </radialGradient>
+    <filter
+       id="d"
+       x="-0.0059850197"
+       y="-0.0060153441"
+       width="1.01197"
+       height="1.0120307"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         stdDeviation="0.10706202"
+         id="feGaussianBlur2" />
+    </filter>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.0309358,-0.09353841,0.09280739,-0.03117947,-12.260041,64.912913)"
+       y2="483.05225"
+       y1="472.03"
+       x2="446.62161"
+       x1="256.73999"
+       id="c">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-color="#1e1e1e" />
+      <stop
+         id="stop4"
+         offset="1"
+         stop-color="#3d3d3d" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="rotate(-105.96536,19.999759,18.998455)"
+       y2="18.998119"
+       y1="18.998119"
+       x2="31.999203"
+       x1="8.000597"
+       id="b">
+      <stop
+         id="stop7"
+         offset="0"
+         stop-color="#0e0e0e" />
+      <stop
+         id="stop9"
+         offset="1"
+         stop-color="#5d5d5d" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98824,-5.7382e-7,4.1807)"
+       r="21.466"
+       cy="355.35999"
+       cx="366.94"
+       id="b-3-3"
+       fx="366.94"
+       fy="355.35999"
+       fr="0"
+       spreadMethod="pad">
+      <stop
+         id="stop5-6"
+         offset="0"
+         stop-opacity=".94901961"
+         stop-color="#c4f161" />
+      <stop
+         style="stop-color:#73c500;stop-opacity:1"
+         id="stop7-7"
+         offset=".54692036"
+         stop-opacity=".81961"
+         stop-color="#c0ff5d" />
+      <stop
+         style="stop-color:#5ba000;stop-opacity:0.4509804"
+         id="stop9-5"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#7bd002" />
+    </radialGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,0.0529661)"
+       y2="11.698717"
+       y1="3.9656665"
+       x2="12.517102"
+       x1="12.517102"
+       id="d-3">
+      <stop
+         id="stop12-6"
+         offset="0"
+         stop-color="#77c305" />
+      <stop
+         id="stop14-7"
+         offset="1"
+         stop-color="#457600" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="c-5-6">
+      <feGaussianBlur
+         id="feGaussianBlur2-2"
+         stdDeviation="0.42678198" />
+    </filter>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.08383273,0,0,0.0412177,-18.761371,-8.0536762)"
+       r="21.466"
+       cy="355.35999"
+       cx="366.94"
+       id="f-7">
+      <stop
+         style="stop-color:#ffaa26;stop-opacity:1"
+         id="stop10-5"
+         offset="0"
+         stop-opacity=".94902"
+         stop-color="#fffefa" />
+      <stop
+         style="stop-color:#dd8c00;stop-opacity:1"
+         id="stop12"
+         offset=".61062"
+         stop-opacity=".81961"
+         stop-color="#ff994e" />
+      <stop
+         style="stop-color:#b67300;stop-opacity:0.45502645"
+         id="stop14-3"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#ff902d" />
+    </radialGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.69980946,-0.00367881,0.00393052,0.76229507,108.75351,85.820703)"
+       r="25.759201"
+       cy="355.35999"
+       cx="366.93451"
+       id="f-6"
+       fx="366.93451"
+       fy="355.35999">
+      <stop
+         id="stop10-7"
+         offset="0"
+         stop-opacity=".94901961"
+         stop-color="#fefefe" />
+      <stop
+         id="stop14-5"
+         offset="1"
+         stop-opacity=".02352941"
+         stop-color="#a3a4a2"
+         style="stop-color:#909090;stop-opacity:0.16931216" />
+    </radialGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       height="1.0120307"
+       width="1.01197"
+       y="-0.0060153441"
+       x="-0.0059850197"
+       id="d-35">
+      <feGaussianBlur
+         id="feGaussianBlur2-6"
+         stdDeviation="0.10706202" />
+    </filter>
+    <radialGradient
+       id="a-5"
+       cx="366.94"
+       cy="355.35999"
+       r="21.466"
+       gradientTransform="matrix(0.07221587,-3.329178e-8,5.525581e-8,0.04186449,-6.4985153,-8.2885201)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#b-6"
+       fx="366.94"
+       fy="355.35999">
+      <stop
+         stop-color="#eece33"
+         stop-opacity=".95055"
+         offset="0"
+         id="stop2-6"
+         style="stop-color:#ee6833;stop-opacity:1" />
+      <stop
+         stop-color="#ff2d2d"
+         stop-opacity="0"
+         offset="1"
+         id="stop6-2"
+         style="stop-color:#aa0000;stop-opacity:1" />
+    </radialGradient>
+    <linearGradient
+       id="b-6"
+       x1="202.39"
+       x2="202.49001"
+       y1="623.47998"
+       y2="634.37"
+       gradientTransform="matrix(1.2573,0,0,0.86853,-234.59,-533.44)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#e90808"
+         offset="0"
+         id="stop12-2" />
+      <stop
+         stop-color="#b60000"
+         offset="1"
+         id="stop14-9" />
+    </linearGradient>
+  </defs>
+  <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:1.60000002;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 17.309704,6.9472657 0.01953,6.8964843 c 7.77e-4,0.689172 0.276853,1.179881 0.758656,1.570312 0.482287,0.390825 1.127815,0.541246 1.867187,0.541246 0.703131,0 1.348346,-0.09195 1.857422,-0.457261 0.509076,-0.365309 0.806399,-0.88929 0.87389,-1.558594 l 0.0039,-0.04297 v -0.04101 l 0.002,-6.8515627 C 20.169753,6.3462161 19.847674,6.3199505 17.309704,6.9472657 Z"
+     id="path19" />
+  <path
+     style="fill:#aa0000;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 20,5.692956 c 1.108,0 1.84375,0.609531 1.84375,1.717531 l 0,6.043005 c 0,1.108 -0.73575,1.701689 -1.84375,1.701689 -1.108,0 -1.84375,-0.593689 -1.84375,-1.701689 l 0,-6.043005 c 0,-1.108 0.73575,-1.717531 1.84375,-1.717531 z"
+     id="rect825-9" />
+  <path
+     d="m 21.538767,6.5883618 a 1.5388022,0.89005988 0 1 1 -3.077534,0 1.5388022,0.89005988 0 1 1 3.077534,0 z"
+     id="path27-2"
+     style="fill:url(#a-5);fill-opacity:1;stroke-width:0.05484339" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/knobs/knob_indicator_small_blue.svg b/res/skins/LateNight/palemoon/knobs/knob_indicator_small_blue.svg
new file mode 100644
index 000000000000..b2b7f5c51c8b
--- /dev/null
+++ b/res/skins/LateNight/palemoon/knobs/knob_indicator_small_blue.svg
@@ -0,0 +1,324 @@
+<?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="35"
+   height="30"
+   version="1.1"
+   id="svg29">
+  <metadata
+     id="metadata33">
+    <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="defs17">
+    <linearGradient
+       id="e"
+       x1="202.39"
+       x2="202.49001"
+       y1="623.47998"
+       y2="634.37"
+       gradientTransform="matrix(1.2573,0,0,0.86853,-274.59,-533.44)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#f18900"
+         offset="0"
+         id="stop2" />
+      <stop
+         stop-color="#b67300"
+         offset="1"
+         id="stop4" />
+    </linearGradient>
+    <filter
+       id="d"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         stdDeviation="0.42678198"
+         id="feGaussianBlur7" />
+    </filter>
+    <radialGradient
+       id="f"
+       cx="366.94"
+       cy="355.35999"
+       r="21.466"
+       gradientTransform="matrix(0.077812,0,0,0.07615674,-11.052125,-22.036072)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#fffefa"
+         stop-opacity=".94902"
+         offset="0"
+         id="stop10"
+         style="stop-color:#ffaa26;stop-opacity:1" />
+      <stop
+         stop-color="#ff994e"
+         stop-opacity=".81961"
+         offset=".61062"
+         id="stop12"
+         style="stop-color:#dd8c00;stop-opacity:1" />
+      <stop
+         stop-color="#ff902d"
+         stop-opacity="0"
+         offset="1"
+         id="stop14"
+         style="stop-color:#b67300;stop-opacity:0.45502645" />
+    </radialGradient>
+    <radialGradient
+       fy="355.35999"
+       fx="366.93451"
+       id="f-3"
+       cx="366.93451"
+       cy="355.35999"
+       r="25.759201"
+       gradientTransform="matrix(0.69980946,-0.00367881,0.00393052,0.76229507,108.75351,85.820703)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#fefefe"
+         stop-opacity=".94901961"
+         offset="0"
+         id="stop10-6" />
+      <stop
+         style="stop-color:#909090;stop-opacity:1"
+         stop-color="#a3a4a2"
+         stop-opacity=".02352941"
+         offset="1"
+         id="stop14-7" />
+    </radialGradient>
+    <filter
+       id="d-5"
+       x="-0.0059850197"
+       y="-0.0060153441"
+       width="1.01197"
+       height="1.0120307"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         stdDeviation="0.10706202"
+         id="feGaussianBlur2" />
+    </filter>
+    <radialGradient
+       id="f-7"
+       cx="366.94"
+       cy="355.35999"
+       r="21.466"
+       gradientTransform="matrix(0.07335364,0,0,0.07179322,-29.4162,-20.774819)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#f">
+      <stop
+         stop-color="#fffefa"
+         stop-opacity=".94902"
+         offset="0"
+         id="stop10-5"
+         style="stop-color:#ffaa26;stop-opacity:1" />
+      <stop
+         stop-color="#ff994e"
+         stop-opacity=".81961"
+         offset=".61062"
+         id="stop12-5"
+         style="stop-color:#dd8c00;stop-opacity:1" />
+      <stop
+         stop-color="#ff902d"
+         stop-opacity="0"
+         offset="1"
+         id="stop14-3"
+         style="stop-color:#b67300;stop-opacity:0.45502645" />
+    </radialGradient>
+    <radialGradient
+       id="f-6"
+       cx="366.94"
+       cy="355.35999"
+       r="21.466"
+       gradientTransform="matrix(0.07408271,0,0,0.07250678,-9.683718,-21.030291)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#fffefa"
+         stop-opacity=".94902"
+         offset="0"
+         id="stop10-2"
+         style="stop-color:#ffaa26;stop-opacity:0.55555558" />
+      <stop
+         stop-color="#ff994e"
+         stop-opacity=".81961"
+         offset="0.40000001"
+         id="stop12-9"
+         style="stop-color:#dd8c00;stop-opacity:0.55555558" />
+      <stop
+         stop-color="#ff902d"
+         stop-opacity="0"
+         offset="1"
+         id="stop14-1"
+         style="stop-color:#8c5800;stop-opacity:0.49206349" />
+    </radialGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.07335364,0,0,0.03606549,-9.4161996,-6.7969665)"
+       r="21.466"
+       cy="355.35999"
+       cx="366.94"
+       id="f-7-2">
+      <stop
+         style="stop-color:#ffaa26;stop-opacity:1"
+         id="stop10-5-7"
+         offset="0"
+         stop-opacity=".94902"
+         stop-color="#fffefa" />
+      <stop
+         style="stop-color:#b34e13;stop-opacity:1"
+         id="stop12-0"
+         offset=".61062"
+         stop-opacity=".81961"
+         stop-color="#ff994e" />
+      <stop
+         style="stop-color:#b34e13;stop-opacity:0.45490196"
+         id="stop14-3-9"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#ff902d" />
+    </radialGradient>
+    <radialGradient
+       id="a-5"
+       cx="366.94"
+       cy="355.35999"
+       r="21.466"
+       gradientTransform="matrix(0.07440094,-2.9112641e-8,5.6927711e-8,0.03660921,-9.789372,-6.9944069)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#b"
+       fx="366.94"
+       fy="355.35999">
+      <stop
+         stop-color="#eece33"
+         stop-opacity=".95055"
+         offset="0"
+         id="stop2-6"
+         style="stop-color:#ee6833;stop-opacity:1" />
+      <stop
+         stop-color="#ff2d2d"
+         stop-opacity="0"
+         offset="1"
+         id="stop6-2"
+         style="stop-color:#960000;stop-opacity:1" />
+    </radialGradient>
+    <linearGradient
+       id="b"
+       x1="202.39"
+       x2="202.49001"
+       y1="623.47998"
+       y2="634.37"
+       gradientTransform="matrix(1.2573,0,0,0.86853,-234.59,-533.44)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#e90808"
+         offset="0"
+         id="stop2-7" />
+      <stop
+         stop-color="#b60000"
+         offset="1"
+         id="stop4-0" />
+    </linearGradient>
+    <radialGradient
+       spreadMethod="pad"
+       fr="0"
+       r="21.466"
+       fy="355.35999"
+       fx="366.94"
+       cy="355.35999"
+       cx="366.94"
+       gradientTransform="matrix(0.07515518,0,0,0.03626065,-10.077028,-6.870545)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient1274-3"
+       xlink:href="#b-3-3-6" />
+    <radialGradient
+       spreadMethod="pad"
+       fr="0"
+       fy="355.35999"
+       fx="366.94"
+       id="b-3-3-6"
+       cx="366.94"
+       cy="355.35999"
+       r="21.466"
+       gradientTransform="matrix(1,0,0,0.98824,-5.7382e-7,4.1807)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#c4f161"
+         stop-opacity=".94901961"
+         offset="0"
+         id="stop5-6-7" />
+      <stop
+         stop-color="#c0ff5d"
+         stop-opacity=".81961"
+         offset=".54692036"
+         id="stop7-7-5"
+         style="stop-color:#73c500;stop-opacity:1" />
+      <stop
+         stop-color="#7bd002"
+         stop-opacity="0"
+         offset="1"
+         id="stop9-5-3"
+         style="stop-color:#5ba000;stop-opacity:0.4509804" />
+    </radialGradient>
+    <radialGradient
+       xlink:href="#b-3-3"
+       id="radialGradient1274"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.07515518,0,0,0.03626066,-10.077029,-6.8705452)"
+       cx="366.94"
+       cy="355.35999"
+       fx="366.94"
+       fy="355.35999"
+       r="21.466"
+       fr="0"
+       spreadMethod="pad" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98824,-5.7382e-7,4.1807)"
+       r="21.466"
+       cy="355.35999"
+       cx="366.94"
+       id="b-3-3"
+       fx="366.94"
+       fy="355.35999"
+       fr="0"
+       spreadMethod="pad">
+      <stop
+         style="stop-color:#5bdaec;stop-opacity:1"
+         id="stop5-6"
+         offset="0"
+         stop-opacity=".94901961"
+         stop-color="#c4f161" />
+      <stop
+         style="stop-color:#00acc5;stop-opacity:1"
+         id="stop7-7"
+         offset=".54692036"
+         stop-opacity=".81961"
+         stop-color="#c0ff5d" />
+      <stop
+         style="stop-color:#008ba0;stop-opacity:0.4509804"
+         id="stop9-5"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#7bd002" />
+    </radialGradient>
+  </defs>
+  <path
+     id="path19"
+     d="m 15.145991,6.2038575 0.01709,6.0344235 c 6.8e-4,0.603026 0.242246,1.032396 0.663824,1.374023 0.422001,0.341972 0.986838,0.47359 1.633789,0.47359 0.615239,0 1.179802,-0.08046 1.625244,-0.400103 0.445441,-0.319645 0.705599,-0.778129 0.764654,-1.36377 l 0.0034,-0.0376 v -0.03588 l 0.0018,-5.9951175 C 17.648534,5.6779391 17.366715,5.6549567 15.145991,6.2038575 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:1.39999998;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:#0091a2;fill-opacity:1;stroke:none;stroke-width:1.39999998;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 17.5,5.231337 c 0.9695,0 1.613281,-0.025448 1.613281,0.944052 v 5.721417 c 0,0.9695 -0.643781,1.488977 -1.613281,1.488977 -0.9695,0 -1.613281,-0.519477 -1.613281,-1.488977 V 6.175389 c 0,-0.9695 0.643781,-0.944052 1.613281,-0.944052 z"
+     id="rect825-3" />
+  <path
+     style="opacity:0.369;fill:url(#radialGradient1274);fill-opacity:1;stroke-width:0.0664053"
+     id="path27-5-9"
+     d="m 19.113243,6.0149775 a 1.6132811,0.77835065 0 1 1 -3.226487,0 1.6132811,0.77835065 0 1 1 3.226487,0 z" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/knobs/knob_indicator_small_green.svg b/res/skins/LateNight/palemoon/knobs/knob_indicator_small_green.svg
new file mode 100644
index 000000000000..6f7f8f907cf2
--- /dev/null
+++ b/res/skins/LateNight/palemoon/knobs/knob_indicator_small_green.svg
@@ -0,0 +1,330 @@
+<?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="svg29"
+   version="1.1"
+   height="30"
+   width="35">
+  <metadata
+     id="metadata33">
+    <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="defs17">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2573,0,0,0.86853,-274.59,-533.44)"
+       y2="634.37"
+       y1="623.47998"
+       x2="202.49001"
+       x1="202.39"
+       id="e">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-color="#f18900" />
+      <stop
+         id="stop4"
+         offset="1"
+         stop-color="#b67300" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="d">
+      <feGaussianBlur
+         id="feGaussianBlur7"
+         stdDeviation="0.42678198" />
+    </filter>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.077812,0,0,0.07615674,-11.052125,-22.036072)"
+       r="21.466"
+       cy="355.35999"
+       cx="366.94"
+       id="f">
+      <stop
+         style="stop-color:#ffaa26;stop-opacity:1"
+         id="stop10"
+         offset="0"
+         stop-opacity=".94902"
+         stop-color="#fffefa" />
+      <stop
+         style="stop-color:#dd8c00;stop-opacity:1"
+         id="stop12"
+         offset=".61062"
+         stop-opacity=".81961"
+         stop-color="#ff994e" />
+      <stop
+         style="stop-color:#b67300;stop-opacity:0.45502645"
+         id="stop14"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#ff902d" />
+    </radialGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.69980946,-0.00367881,0.00393052,0.76229507,108.75351,85.820703)"
+       r="25.759201"
+       cy="355.35999"
+       cx="366.93451"
+       id="f-3"
+       fx="366.93451"
+       fy="355.35999">
+      <stop
+         id="stop10-6"
+         offset="0"
+         stop-opacity=".94901961"
+         stop-color="#fefefe" />
+      <stop
+         id="stop14-7"
+         offset="1"
+         stop-opacity=".02352941"
+         stop-color="#a3a4a2"
+         style="stop-color:#909090;stop-opacity:1" />
+    </radialGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       height="1.0120307"
+       width="1.01197"
+       y="-0.0060153441"
+       x="-0.0059850197"
+       id="d-5">
+      <feGaussianBlur
+         id="feGaussianBlur2"
+         stdDeviation="0.10706202" />
+    </filter>
+    <radialGradient
+       xlink:href="#f"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.07335364,0,0,0.07179322,-29.4162,-20.774819)"
+       r="21.466"
+       cy="355.35999"
+       cx="366.94"
+       id="f-7">
+      <stop
+         style="stop-color:#ffaa26;stop-opacity:1"
+         id="stop10-5"
+         offset="0"
+         stop-opacity=".94902"
+         stop-color="#fffefa" />
+      <stop
+         style="stop-color:#dd8c00;stop-opacity:1"
+         id="stop12-5"
+         offset=".61062"
+         stop-opacity=".81961"
+         stop-color="#ff994e" />
+      <stop
+         style="stop-color:#b67300;stop-opacity:0.45502645"
+         id="stop14-3"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#ff902d" />
+    </radialGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.07408271,0,0,0.07250678,-9.683718,-21.030291)"
+       r="21.466"
+       cy="355.35999"
+       cx="366.94"
+       id="f-6">
+      <stop
+         style="stop-color:#ffaa26;stop-opacity:0.55555558"
+         id="stop10-2"
+         offset="0"
+         stop-opacity=".94902"
+         stop-color="#fffefa" />
+      <stop
+         style="stop-color:#dd8c00;stop-opacity:0.55555558"
+         id="stop12-9"
+         offset="0.40000001"
+         stop-opacity=".81961"
+         stop-color="#ff994e" />
+      <stop
+         style="stop-color:#8c5800;stop-opacity:0.49206349"
+         id="stop14-1"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#ff902d" />
+    </radialGradient>
+    <radialGradient
+       id="f-7-2"
+       cx="366.94"
+       cy="355.35999"
+       r="21.466"
+       gradientTransform="matrix(0.07335364,0,0,0.03606549,-9.4161996,-6.7969665)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#fffefa"
+         stop-opacity=".94902"
+         offset="0"
+         id="stop10-5-7"
+         style="stop-color:#ffaa26;stop-opacity:1" />
+      <stop
+         stop-color="#ff994e"
+         stop-opacity=".81961"
+         offset=".61062"
+         id="stop12-0"
+         style="stop-color:#b34e13;stop-opacity:1" />
+      <stop
+         stop-color="#ff902d"
+         stop-opacity="0"
+         offset="1"
+         id="stop14-3-9"
+         style="stop-color:#b34e13;stop-opacity:0.45490196" />
+    </radialGradient>
+    <radialGradient
+       fy="355.35999"
+       fx="366.94"
+       xlink:href="#b"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.07440094,-2.9112641e-8,5.6927711e-8,0.03660921,-9.789372,-6.9944069)"
+       r="21.466"
+       cy="355.35999"
+       cx="366.94"
+       id="a-5">
+      <stop
+         style="stop-color:#ee6833;stop-opacity:1"
+         id="stop2-6"
+         offset="0"
+         stop-opacity=".95055"
+         stop-color="#eece33" />
+      <stop
+         style="stop-color:#960000;stop-opacity:1"
+         id="stop6-2"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#ff2d2d" />
+    </radialGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2573,0,0,0.86853,-234.59,-533.44)"
+       y2="634.37"
+       y1="623.47998"
+       x2="202.49001"
+       x1="202.39"
+       id="b">
+      <stop
+         id="stop2-7"
+         offset="0"
+         stop-color="#e90808" />
+      <stop
+         id="stop4-0"
+         offset="1"
+         stop-color="#b60000" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#b-3-3-6"
+       id="radialGradient1274-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.07515518,0,0,0.03626065,-10.077028,-6.870545)"
+       cx="366.94"
+       cy="355.35999"
+       fx="366.94"
+       fy="355.35999"
+       r="21.466"
+       fr="0"
+       spreadMethod="pad" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98824,-5.7382e-7,4.1807)"
+       r="21.466"
+       cy="355.35999"
+       cx="366.94"
+       id="b-3-3-6"
+       fx="366.94"
+       fy="355.35999"
+       fr="0"
+       spreadMethod="pad">
+      <stop
+         id="stop5-6-7"
+         offset="0"
+         stop-opacity=".94901961"
+         stop-color="#c4f161" />
+      <stop
+         style="stop-color:#73c500;stop-opacity:1"
+         id="stop7-7-5"
+         offset=".54692036"
+         stop-opacity=".81961"
+         stop-color="#c0ff5d" />
+      <stop
+         style="stop-color:#5ba000;stop-opacity:0.4509804"
+         id="stop9-5-3"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#7bd002" />
+    </radialGradient>
+    <radialGradient
+       spreadMethod="pad"
+       fr="0"
+       r="21.466"
+       fy="355.35999"
+       fx="366.94"
+       cy="355.35999"
+       cx="366.94"
+       gradientTransform="matrix(1,0,0,0.98824,-5.7382e-7,4.1807)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient1274"
+       xlink:href="#b-3-3-1" />
+    <radialGradient
+       spreadMethod="pad"
+       fr="0"
+       fy="355.35999"
+       fx="366.94"
+       id="b-3-3-1"
+       cx="366.94"
+       cy="355.35999"
+       r="21.466"
+       gradientTransform="matrix(1,0,0,0.98824,-5.7382e-7,4.1807)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#c4f161"
+         stop-opacity=".94901961"
+         offset="0"
+         id="stop5-6-2" />
+      <stop
+         stop-color="#c0ff5d"
+         stop-opacity=".81961"
+         offset=".54692036"
+         id="stop7-7-7"
+         style="stop-color:#73c500;stop-opacity:1" />
+      <stop
+         stop-color="#7bd002"
+         stop-opacity="0"
+         offset="1"
+         id="stop9-5-0"
+         style="stop-color:#5ba000;stop-opacity:0" />
+    </radialGradient>
+    <filter
+       id="c-5-6-9"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         stdDeviation="0.42678198"
+         id="feGaussianBlur2-2-3" />
+    </filter>
+  </defs>
+  <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:1.39999998;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 15.145991,6.2038575 0.01709,6.0344235 c 6.8e-4,0.603026 0.242246,1.032396 0.663824,1.374023 0.422001,0.341972 0.986838,0.47359 1.633789,0.47359 0.615239,0 1.179802,-0.08046 1.625244,-0.400103 0.445441,-0.319645 0.705599,-0.778129 0.764654,-1.36377 l 0.0034,-0.0376 v -0.03588 l 0.0018,-5.9951175 C 17.648534,5.6779391 17.366715,5.6549567 15.145991,6.2038575 Z"
+     id="path19" />
+  <path
+     id="rect825-3"
+     d="m 17.5,5.231337 c 0.9695,0 1.613281,-0.025448 1.613281,0.944052 v 5.721417 c 0,0.9695 -0.643781,1.488977 -1.613281,1.488977 -0.9695,0 -1.613281,-0.519477 -1.613281,-1.488977 V 6.175389 c 0,-0.9695 0.643781,-0.944052 1.613281,-0.944052 z"
+     style="fill:#518f00;fill-opacity:1;stroke:none;stroke-width:1.39999998;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     style="opacity:0.278;fill:url(#radialGradient1274-3);fill-opacity:1;stroke-width:0.06640531"
+     id="path27-5-9-5"
+     d="m 19.113244,6.0149775 a 1.6132812,0.77835065 0 1 1 -3.226488,0 1.6132812,0.77835065 0 1 1 3.226488,0 z" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/knobs/knob_indicator_small_orange.svg b/res/skins/LateNight/palemoon/knobs/knob_indicator_small_orange.svg
new file mode 100644
index 000000000000..d7822ba5be9a
--- /dev/null
+++ b/res/skins/LateNight/palemoon/knobs/knob_indicator_small_orange.svg
@@ -0,0 +1,212 @@
+<?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="svg29"
+   version="1.1"
+   height="30"
+   width="35">
+  <metadata
+     id="metadata33">
+    <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="defs17">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2573,0,0,0.86853,-274.59,-533.44)"
+       y2="634.37"
+       y1="623.47998"
+       x2="202.49001"
+       x1="202.39"
+       id="e">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-color="#f18900" />
+      <stop
+         id="stop4"
+         offset="1"
+         stop-color="#b67300" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       id="d">
+      <feGaussianBlur
+         id="feGaussianBlur7"
+         stdDeviation="0.42678198" />
+    </filter>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.077812,0,0,0.07615674,-11.052125,-22.036072)"
+       r="21.466"
+       cy="355.35999"
+       cx="366.94"
+       id="f">
+      <stop
+         style="stop-color:#ffaa26;stop-opacity:1"
+         id="stop10"
+         offset="0"
+         stop-opacity=".94902"
+         stop-color="#fffefa" />
+      <stop
+         style="stop-color:#dd8c00;stop-opacity:1"
+         id="stop12"
+         offset=".61062"
+         stop-opacity=".81961"
+         stop-color="#ff994e" />
+      <stop
+         style="stop-color:#b67300;stop-opacity:0.45502645"
+         id="stop14"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#ff902d" />
+    </radialGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.69980946,-0.00367881,0.00393052,0.76229507,108.75351,85.820703)"
+       r="25.759201"
+       cy="355.35999"
+       cx="366.93451"
+       id="f-3"
+       fx="366.93451"
+       fy="355.35999">
+      <stop
+         id="stop10-6"
+         offset="0"
+         stop-opacity=".94901961"
+         stop-color="#fefefe" />
+      <stop
+         id="stop14-7"
+         offset="1"
+         stop-opacity=".02352941"
+         stop-color="#a3a4a2"
+         style="stop-color:#909090;stop-opacity:1" />
+    </radialGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       height="1.0120307"
+       width="1.01197"
+       y="-0.0060153441"
+       x="-0.0059850197"
+       id="d-5">
+      <feGaussianBlur
+         id="feGaussianBlur2"
+         stdDeviation="0.10706202" />
+    </filter>
+    <radialGradient
+       xlink:href="#f"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.07335364,0,0,0.07179322,-29.4162,-20.774819)"
+       r="21.466"
+       cy="355.35999"
+       cx="366.94"
+       id="f-7">
+      <stop
+         style="stop-color:#ffaa26;stop-opacity:1"
+         id="stop10-5"
+         offset="0"
+         stop-opacity=".94902"
+         stop-color="#fffefa" />
+      <stop
+         style="stop-color:#dd8c00;stop-opacity:1"
+         id="stop12-5"
+         offset=".61062"
+         stop-opacity=".81961"
+         stop-color="#ff994e" />
+      <stop
+         style="stop-color:#b67300;stop-opacity:0.45502645"
+         id="stop14-3"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#ff902d" />
+    </radialGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.07408271,0,0,0.07250678,-9.683718,-21.030291)"
+       r="21.466"
+       cy="355.35999"
+       cx="366.94"
+       id="f-6">
+      <stop
+         style="stop-color:#ffaa26;stop-opacity:0.55555558"
+         id="stop10-2"
+         offset="0"
+         stop-opacity=".94902"
+         stop-color="#fffefa" />
+      <stop
+         style="stop-color:#dd8c00;stop-opacity:0.55555558"
+         id="stop12-9"
+         offset="0.40000001"
+         stop-opacity=".81961"
+         stop-color="#ff994e" />
+      <stop
+         style="stop-color:#8c5800;stop-opacity:0.49206349"
+         id="stop14-1"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#ff902d" />
+    </radialGradient>
+    <radialGradient
+       id="f-7-2"
+       cx="366.94"
+       cy="355.35999"
+       r="21.466"
+       gradientTransform="matrix(0.07335364,0,0,0.03606549,-9.4161996,-6.7969665)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#fffefa"
+         stop-opacity=".94902"
+         offset="0"
+         id="stop10-5-7"
+         style="stop-color:#ffaa26;stop-opacity:1" />
+      <stop
+         stop-color="#ff994e"
+         stop-opacity=".81961"
+         offset=".61062"
+         id="stop12-0"
+         style="stop-color:#b34e13;stop-opacity:1" />
+      <stop
+         stop-color="#ff902d"
+         stop-opacity="0"
+         offset="1"
+         id="stop14-3-9"
+         style="stop-color:#b34e13;stop-opacity:0.00301151" />
+    </radialGradient>
+    <filter
+       height="1.0507882"
+       y="-0.025394103"
+       width="1.0251395"
+       x="-0.012569745"
+       id="filter859"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         id="feGaussianBlur861"
+         stdDeviation="0.016493697" />
+    </filter>
+  </defs>
+  <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:1.39999998;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 15.145991,6.2038575 0.01709,6.0344235 c 6.8e-4,0.603026 0.242246,1.032396 0.663824,1.374023 0.422001,0.341972 0.986838,0.47359 1.633789,0.47359 0.615239,0 1.179802,-0.08046 1.625244,-0.400103 0.445441,-0.319645 0.705599,-0.778129 0.764654,-1.36377 l 0.0034,-0.0376 v -0.03588 l 0.0018,-5.9951175 C 17.648534,5.6779391 17.366715,5.6549567 15.145991,6.2038575 Z"
+     id="path19" />
+  <path
+     id="rect825"
+     d="m 17.452728,5.2313365 c 0.9695,0 1.660553,-0.025448 1.660553,0.9440524 v 5.8464171 c 0,0.9695 -0.643781,1.488977 -1.613281,1.488977 -0.9695,0 -1.613281,-0.519477 -1.613281,-1.488977 V 6.1753889 c 0,-0.9695 0.596509,-0.9440524 1.566009,-0.9440524 z"
+     style="fill:#b34e13;fill-opacity:1;stroke:none;stroke-width:1.39999998;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="m 19.074355,6.0192072 a 1.5746092,0.77416129 0 1 1 -3.149146,0 1.5746092,0.77416129 0 1 1 3.149146,0 z"
+     id="path27"
+     style="opacity:0.54792351;fill:url(#f-7-2);stroke-width:0.05173989;filter:url(#filter859)" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/knobs/knob_indicator_small_red.svg b/res/skins/LateNight/palemoon/knobs/knob_indicator_small_red.svg
new file mode 100644
index 000000000000..678d63b68853
--- /dev/null
+++ b/res/skins/LateNight/palemoon/knobs/knob_indicator_small_red.svg
@@ -0,0 +1,247 @@
+<?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="35"
+   height="30"
+   version="1.1"
+   id="svg29">
+  <metadata
+     id="metadata33">
+    <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="defs17">
+    <linearGradient
+       id="e"
+       x1="202.39"
+       x2="202.49001"
+       y1="623.47998"
+       y2="634.37"
+       gradientTransform="matrix(1.2573,0,0,0.86853,-274.59,-533.44)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#f18900"
+         offset="0"
+         id="stop2" />
+      <stop
+         stop-color="#b67300"
+         offset="1"
+         id="stop4" />
+    </linearGradient>
+    <filter
+       id="d"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         stdDeviation="0.42678198"
+         id="feGaussianBlur7" />
+    </filter>
+    <radialGradient
+       id="f"
+       cx="366.94"
+       cy="355.35999"
+       r="21.466"
+       gradientTransform="matrix(0.077812,0,0,0.07615674,-11.052125,-22.036072)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#fffefa"
+         stop-opacity=".94902"
+         offset="0"
+         id="stop10"
+         style="stop-color:#ffaa26;stop-opacity:1" />
+      <stop
+         stop-color="#ff994e"
+         stop-opacity=".81961"
+         offset=".61062"
+         id="stop12"
+         style="stop-color:#dd8c00;stop-opacity:1" />
+      <stop
+         stop-color="#ff902d"
+         stop-opacity="0"
+         offset="1"
+         id="stop14"
+         style="stop-color:#b67300;stop-opacity:0.45502645" />
+    </radialGradient>
+    <radialGradient
+       fy="355.35999"
+       fx="366.93451"
+       id="f-3"
+       cx="366.93451"
+       cy="355.35999"
+       r="25.759201"
+       gradientTransform="matrix(0.69980946,-0.00367881,0.00393052,0.76229507,108.75351,85.820703)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#fefefe"
+         stop-opacity=".94901961"
+         offset="0"
+         id="stop10-6" />
+      <stop
+         style="stop-color:#909090;stop-opacity:1"
+         stop-color="#a3a4a2"
+         stop-opacity=".02352941"
+         offset="1"
+         id="stop14-7" />
+    </radialGradient>
+    <filter
+       id="d-5"
+       x="-0.0059850197"
+       y="-0.0060153441"
+       width="1.01197"
+       height="1.0120307"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         stdDeviation="0.10706202"
+         id="feGaussianBlur2" />
+    </filter>
+    <radialGradient
+       id="f-7"
+       cx="366.94"
+       cy="355.35999"
+       r="21.466"
+       gradientTransform="matrix(0.07335364,0,0,0.07179322,-29.4162,-20.774819)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#f">
+      <stop
+         stop-color="#fffefa"
+         stop-opacity=".94902"
+         offset="0"
+         id="stop10-5"
+         style="stop-color:#ffaa26;stop-opacity:1" />
+      <stop
+         stop-color="#ff994e"
+         stop-opacity=".81961"
+         offset=".61062"
+         id="stop12-5"
+         style="stop-color:#dd8c00;stop-opacity:1" />
+      <stop
+         stop-color="#ff902d"
+         stop-opacity="0"
+         offset="1"
+         id="stop14-3"
+         style="stop-color:#b67300;stop-opacity:0.45502645" />
+    </radialGradient>
+    <radialGradient
+       id="f-6"
+       cx="366.94"
+       cy="355.35999"
+       r="21.466"
+       gradientTransform="matrix(0.07408271,0,0,0.07250678,-9.683718,-21.030291)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#fffefa"
+         stop-opacity=".94902"
+         offset="0"
+         id="stop10-2"
+         style="stop-color:#ffaa26;stop-opacity:0.55555558" />
+      <stop
+         stop-color="#ff994e"
+         stop-opacity=".81961"
+         offset="0.40000001"
+         id="stop12-9"
+         style="stop-color:#dd8c00;stop-opacity:0.55555558" />
+      <stop
+         stop-color="#ff902d"
+         stop-opacity="0"
+         offset="1"
+         id="stop14-1"
+         style="stop-color:#8c5800;stop-opacity:0.49206349" />
+    </radialGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.07335364,0,0,0.03606549,-9.4161996,-6.7969665)"
+       r="21.466"
+       cy="355.35999"
+       cx="366.94"
+       id="f-7-2">
+      <stop
+         style="stop-color:#ffaa26;stop-opacity:1"
+         id="stop10-5-7"
+         offset="0"
+         stop-opacity=".94902"
+         stop-color="#fffefa" />
+      <stop
+         style="stop-color:#b34e13;stop-opacity:1"
+         id="stop12-0"
+         offset=".61062"
+         stop-opacity=".81961"
+         stop-color="#ff994e" />
+      <stop
+         style="stop-color:#b34e13;stop-opacity:0.45490196"
+         id="stop14-3-9"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#ff902d" />
+    </radialGradient>
+    <radialGradient
+       id="a-5"
+       cx="366.94"
+       cy="355.35999"
+       r="21.466"
+       gradientTransform="matrix(0.07440094,-2.9112641e-8,5.6927711e-8,0.03660921,-9.789372,-6.9944069)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#b"
+       fx="366.94"
+       fy="355.35999">
+      <stop
+         stop-color="#eece33"
+         stop-opacity=".95055"
+         offset="0"
+         id="stop2-6"
+         style="stop-color:#ee6833;stop-opacity:1" />
+      <stop
+         style="stop-color:#aa0000;stop-opacity:1"
+         id="stop865"
+         offset="0.85094851"
+         stop-opacity=".95055"
+         stop-color="#eece33" />
+      <stop
+         stop-color="#ff2d2d"
+         stop-opacity="0"
+         offset="1"
+         id="stop6-2"
+         style="stop-color:#960000;stop-opacity:0" />
+    </radialGradient>
+    <linearGradient
+       id="b"
+       x1="202.39"
+       x2="202.49001"
+       y1="623.47998"
+       y2="634.37"
+       gradientTransform="matrix(1.2573,0,0,0.86853,-234.59,-533.44)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#e90808"
+         offset="0"
+         id="stop2-7" />
+      <stop
+         stop-color="#b60000"
+         offset="1"
+         id="stop4-0" />
+    </linearGradient>
+  </defs>
+  <path
+     id="path19"
+     d="m 15.145991,6.2038575 0.01709,6.0344235 c 6.8e-4,0.603026 0.242246,1.032396 0.663824,1.374023 0.422001,0.341972 0.986838,0.47359 1.633789,0.47359 0.615239,0 1.179802,-0.08046 1.625244,-0.400103 0.445441,-0.319645 0.705599,-0.778129 0.764654,-1.36377 l 0.0034,-0.0376 v -0.03588 l 0.0018,-5.9951175 C 17.648534,5.6779391 17.366715,5.6549567 15.145991,6.2038575 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:1.39999998;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="rect825-3"
+     d="m 17.560069,5.231337 c 0.9695,0 1.553212,-0.025448 1.553212,0.944052 v 5.721417 c 0,0.9695 -0.643781,1.488977 -1.613281,1.488977 -0.9695,0 -1.613281,-0.519477 -1.613281,-1.488977 V 6.175389 c 0,-0.9695 0.70385,-0.944052 1.67335,-0.944052 z"
+     style="fill:#aa0000;fill-opacity:1;stroke:none;stroke-width:1.39999998;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="m 19.096247,6.0149775 a 1.5853624,0.77833012 0 1 1 -3.170651,0 1.5853624,0.77833012 0 1 1 3.170651,0 z"
+     id="path27-2-9"
+     style="opacity:0.49800002;fill:url(#a-5);fill-opacity:1;stroke-width:0.05205585" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/sliders/knob_crossfader.svg b/res/skins/LateNight/palemoon/sliders/knob_crossfader.svg
new file mode 100644
index 000000000000..9cebb802dbb5
--- /dev/null
+++ b/res/skins/LateNight/palemoon/sliders/knob_crossfader.svg
@@ -0,0 +1,86 @@
+<?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="19"
+   height="40"
+   version="1.1"
+   id="svg22">
+  <metadata
+     id="metadata28">
+    <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="defs26" />
+  <path
+     id="path6-7-5"
+     d="m 4.000125,31.998023 v 2.001954 c 0,1.662 1.338,2.999997 3,3 l 5.01367,0.002 c 1.662,3e-6 3,-1.338 3,-3 l -0.01367,-2.002001 z"
+     style="color:#000000;opacity:0.9" />
+  <path
+     d="m 5.4378513,37.278061 c 0.4313821,0.371 1.1214487,0.721737 2.0741205,0.721766 l 4.9880452,1.5e-4 c 1.415307,3.49e-4 2.499382,-0.999651 2.83042,-2 0,1.662 -0.668522,3.000049 -2.330444,3 L 8.00023,38.999827 C 6.9120815,38.999794 5.7956591,38.683311 5.4378513,37.278061 Z"
+     id="path2"
+     style="color:#000000;opacity:0.15;stroke-width:0.99997634" />
+  <path
+     d="m 4.937875,36.183306 c 0.5667967,0.518445 1.2599736,0.816497 2.0447938,0.816521 l 4.9151252,1.5e-4 c 2.101652,6.4e-5 3.101611,-1.652534 3.101605,-2.999651 L 14.999274,7.00035 C 14.999271,6.42654 14.800787,5.708214 14.418978,5.222656 15.281497,5.748436 15.499745,6.9118 15.49975,8 l 1.25e-4,26.999977 c 8e-6,1.661999 -1.337937,3.000049 -2.999858,3 l -4.9997633,-1.5e-4 C 6.4121052,37.999794 5.0001221,37.467958 4.937875,36.183306 Z"
+     id="path4"
+     style="color:#000000;opacity:0.6;stroke-width:0.99997634" />
+  <path
+     style="fill:#171717;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 4.000125,33.999977 4,5 C 3.9999952,3.892 4.892,3 6,3 h 3 c 1.108,0 1.999995,0.892 2,2 l 1.25e-4,28.999977 c 5e-6,1.107999 -0.892,2 -2,2 h -3 c -1.108,0 -1.9999952,-0.892001 -2,-2 z"
+     id="rect1700-1" />
+  <path
+     style="fill:#0f0f0f;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 8.000125,33.999977 8,5 c -4.8e-6,-1.108 0.892,-2 2,-2 h 3 c 1.108,0 1.999995,0.892 2,2 l 1.25e-4,28.999977 c 5e-6,1.107999 -0.892,2 -2,2 h -3 c -1.108,0 -1.9999952,-0.892001 -2,-2 z"
+     id="rect1700" />
+  <path
+     style="fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 9.000125,34.999977 9,4 c -2.2e-6,-0.554 0.892,-1 2,-1 h 1 c 1.108,0 1.999998,0.446 2,1 l 1.25e-4,30.999977 c 2e-6,0.553999 -0.892,1 -2,1 h -1 c -1.108,0 -1.9999978,-0.446001 -2,-1 z"
+     id="rect1698" />
+  <path
+     style="opacity:1;fill:#6e2612;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 8,4 1.25e-4,30.999977 h 1 L 9,4 Z"
+     id="rect1022-35" />
+  <path
+     style="opacity:1;fill:#853c14;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 10,4 1.25e-4,30.999977 h 1 L 11,4 Z"
+     id="rect1022-6-6" />
+  <path
+     style="opacity:1;fill:#7f3710;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 9,4 1.25e-4,30.999977 h 1 L 10,4 Z"
+     id="rect1022-7-2" />
+  <path
+     style="opacity:1;fill:#682b10;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 8.000125,35.999977 v -1 h 1 v 1 z"
+     id="rect1022-3-5-9-2" />
+  <path
+     style="opacity:1;fill:#6a2e0e;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 10.000125,35.999977 v -1 h 1 v 1 z"
+     id="rect1022-6-6-3-7-9" />
+  <path
+     style="opacity:1;fill:#712f11;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 9.000125,35.999977 v -1 h 1 v 1 z"
+     id="rect1022-7-7-5-3-3" />
+  <path
+     style="opacity:1;fill:#af4f13;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 9.999678,4 V 3 h 1 v 1 z"
+     id="rect1022-6-6-2-6-9" />
+  <path
+     style="opacity:1;fill:#a64912;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 8.999678,4 V 3 h 1 v 1 z"
+     id="rect1022-7-7-8-1-1" />
+  <path
+     style="opacity:1;fill:#963517;fill-opacity:1;stroke:none;stroke-width:0.27434278;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 8,3.0004005 V 4 H 9 V 3.0004005 Z"
+     id="rect1022-3-27" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/sliders/knob_pitch_deck.svg b/res/skins/LateNight/palemoon/sliders/knob_pitch_deck.svg
new file mode 100644
index 000000000000..18c170917cd3
--- /dev/null
+++ b/res/skins/LateNight/palemoon/sliders/knob_pitch_deck.svg
@@ -0,0 +1,90 @@
+<?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="40"
+   height="17"
+   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
+     style="color:#000000;opacity:0.15"
+     id="path2-3"
+     d="m 6.7938003,15.148301 c 0.60561,0.57244 1.4882,0.85239 2.062,0.85238 L 34.51286,16 c 1.4154,3.51e-4 2.7757,-1.024799 2.9852,-2.699099 C 37.50911,15.438 37.07257,17.000001 35.16746,17 l -25.8110596,-1.9e-5 c -1.0882,-10e-7 -2.3492,-0.629739 -2.5625,-1.851699 z" />
+  <path
+     style="color:#000000;opacity:0.5"
+     id="path4-6"
+     d="m 6.2938003,14.183301 c 0.69268,0.64195 1.4882,0.81723 2.062,0.817221 L 33.91086,14.999841 c 2.1018,-5.6e-5 3.1018,-1.6525 3.1018,-2.9996 L 36.999599,10 h -1 V 7 l 1.013061,2.4e-4 c 0,-0.57381 -0.1985,-1.2921 -0.58032,-1.7777 0.86256,0.52578 1.0808,1.6891 1.0808,2.7773 v 5.000001 c 0,1.662 -1.338,3 -3,2.999999 l -25.6570596,-1.9e-5 c -1.0882,-1e-6 -2.5339,-0.85452 -2.5625,-1.8165 z" />
+  <path
+     id="path6-7"
+     d="m 8.3550684,4.0019715 c -1.6613385,-1.8e-6 -2.9989357,1.336966 -3,2.998047 H 5.9995996 V 10.000018 H 5.3550684 v 2.001954 c 0,1.661999 1.338,2.999998 3,3 l 25.6582026,-1.9e-5 c 1.662,3e-6 3,-1.338 3,-3 L 36.999599,10 h -1 V 7 l 1.013672,0.002 c 0.0076,-1.661983 -1.338,-2.9999982 -3,-3 z"
+     style="color:#000000;opacity:0.8" />
+  <path
+     id="rect1700-1"
+     d="M 6.9995996,3.0000185 34.999599,3 c 1.108,-7e-7 2,0.892 2,2 v 3 c 0,1.108 -0.892,1.9999993 -2,2 l -27.9999994,1.8e-5 c -1.108,10e-7 -2,-0.8919995 -2,-1.9999995 v -3 c 0,-1.108 0.892,-1.9999993 2,-2 z"
+     style="fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="rect1698-3"
+     d="M 5.9995995,4 H 36 c 0.554,0 1,0.8645735 1,1.9385056 V 7.061172 c 0,1.0739321 -0.446,1.9385057 -1,1.9385057 H 5.9995995 c -0.554,0 -1,-0.8645736 -1,-1.9385057 V 5.9385056 c 0,-1.0739321 0.446,-1.9385056 1,-1.9385056 z"
+     style="fill:#141414;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     style="fill:#050505;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 6.9995996,7.0000185 34.999599,7 c 1.108,-7e-7 2,0.892 2,2 v 3 c 0,1.108 -0.892,1.999999 -2,2 l -27.9999994,1.8e-5 c -1.108,10e-7 -2,-0.891999 -2,-2 V 9.0000185 c 0,-1.108 0.892,-1.9999993 2,-2 z"
+     id="rect1700" />
+  <path
+     id="rect1698"
+     d="m 6,8 h 30 c 0.554,0 1,0.8645735 1,1.938506 v 1.122988 C 37,12.135426 36.554,13 36,13 H 6 C 5.446,13 5,12.135426 5,11.061494 V 9.938506 C 5,8.8645735 5.446,8 6,8 Z"
+     style="fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     style="opacity:1;fill:#561e0e;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 5.9995996,7.0000188 35.999599,7.0000003 V 8 l -29.9999994,1.85e-5 z"
+     id="rect1022-35" />
+  <path
+     style="opacity:1;fill:#a74a17;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 5.9995996,9.0000185 35.999599,9 v 1 l -29.9999994,1.8e-5 z"
+     id="rect1022-6-6" />
+  <path
+     style="opacity:1;fill:#8d3b13;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 5.9995996,8.0000185 35.999599,8 v 1 l -29.9999994,1.85e-5 z"
+     id="rect1022-7-2" />
+  <path
+     style="opacity:1;fill:#37110b;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 36.999599,7 h -1 v 1 h 1 z"
+     id="rect1022-3-5-9-2" />
+  <path
+     style="opacity:1;fill:#7a3612;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 36.999599,9 h -1 v 1 h 1 z"
+     id="rect1022-6-6-3-7-9" />
+  <path
+     style="opacity:1;fill:#57240d;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 36.999599,8 h -1 v 1 h 1 z"
+     id="rect1022-7-7-5-3-3" />
+  <path
+     style="opacity:1;fill:#b35115;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 5.9995996,8.9996962 h -1 v 1.0000003 h 1 z"
+     id="rect1022-6-6-2-6-9" />
+  <path
+     style="opacity:1;fill:#994311;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 5.9995996,7.9996962 h -1 v 1 h 1 z"
+     id="rect1022-7-7-8-1-1" />
+  <path
+     style="opacity:1;fill:#61230d;fill-opacity:1;stroke:none;stroke-width:0.27434278;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 5.0000001,7.0000185 h 0.9995995 v 1 H 5.0000001 Z"
+     id="rect1022-3-27" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/sliders/knob_pitch_sampler.svg b/res/skins/LateNight/palemoon/sliders/knob_pitch_sampler.svg
new file mode 100644
index 000000000000..4754d039ebba
--- /dev/null
+++ b/res/skins/LateNight/palemoon/sliders/knob_pitch_sampler.svg
@@ -0,0 +1,91 @@
+<?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="30"
+   height="13"
+   version="1.1"
+   id="svg22">
+  <metadata
+     id="metadata28">
+    <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="defs26" />
+  <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"
+     id="path2" />
+  <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"
+     id="path4" />
+  <path
+     style="fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 4,2 h 22 c 1.108,0 2,0.892 2,2 v 2 c 0,1.108 -0.892,2 -2,2 H 4 C 2.892,8 2,7.108 2,6 V 4 C 2,2.892 2.892,2 4,2 Z"
+     id="rect1700-1" />
+  <path
+     style="fill:#050505;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 4,5 h 22 c 1.108,0 2,0.892 2,2 v 2 c 0,1.108 -0.892,2 -2,2 H 4 C 2.892,11 2,10.108 2,9 V 7 C 2,5.892 2.892,5 4,5 Z"
+     id="rect1700" />
+  <path
+     style="fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 28,8 c 0,1.108 -0.446,2 -1,2 H 3 C 2.446,10 2,9.108 2,8 Z"
+     id="rect1698" />
+  <path
+     id="rect1022-35-3"
+     d="m 3,5.0003223 24,0 V 6.000322 l -24,0 z"
+     style="opacity:1;fill:#561e0e;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="rect1022-6-6-6"
+     d="m 3,7.000322 24,0 v 1 l -24,0 z"
+     style="opacity:1;fill:#a74a17;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="rect1022-7-2-7"
+     d="m 3,6.000322 24,0 v 1 l -24,0 z"
+     style="opacity:1;fill:#8d3b13;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="rect1022-3-5-9-2-5"
+     d="m 28,5.000322 h -1 v 1 h 1 z"
+     style="opacity:1;fill:#37110b;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="rect1022-6-6-3-7-9-3"
+     d="m 28,7.000322 h -1 v 1 h 1 z"
+     style="opacity:1;fill:#7a3612;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="rect1022-7-7-5-3-3-5"
+     d="m 28,6.000322 h -1 v 1 h 1 z"
+     style="opacity:1;fill:#57240d;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="rect1022-6-6-2-6-9-6"
+     d="M 3,6.9999997 H 2 V 8 h 1 z"
+     style="opacity:1;fill:#b35115;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="rect1022-7-7-8-1-1-2"
+     d="M 3,5.9999997 H 2 v 1 h 1 z"
+     style="opacity:1;fill:#994311;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     style="opacity:1;fill:#61230d;fill-opacity:1;stroke:none;stroke-width:0.27434278;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1022-3-27-9"
+     width="0.99959946"
+     height="1"
+     x="2.0004005"
+     y="5.0003219" />
+  <path
+     style="fill:#141414;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 3,3 h 24 c 0.554,0 1,0.892 1,2 H 2 C 2,3.892 2.446,3 3,3 Z"
+     id="rect1698-7" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/sliders/knob_volume_deck.svg b/res/skins/LateNight/palemoon/sliders/knob_volume_deck.svg
new file mode 100644
index 000000000000..dc488d98dab9
--- /dev/null
+++ b/res/skins/LateNight/palemoon/sliders/knob_volume_deck.svg
@@ -0,0 +1,103 @@
+<?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="svg22"
+   version="1.1"
+   height="19"
+   width="42">
+  <metadata
+     id="metadata28">
+    <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="defs26" />
+  <path
+     style="color:#000000;opacity:0.15"
+     id="path2-3-6"
+     d="m 4.7942007,16.148283 c 0.60561,0.57244 1.4882,0.85239 2.062,0.85238 L 36.513261,17 c 1.4154,3.51e-4 2.7757,-1.024799 2.9852,-2.699099 0.01105,2.137099 -0.42549,3.699102 -2.3306,3.699099 l -29.8110603,-3.7e-5 c -1.0882,-1e-6 -2.3492,-0.62974 -2.5625,-1.8517 z" />
+  <path
+     style="color:#000000;opacity:0.5"
+     id="path4-6-7"
+     d="m 4.2942007,15.183283 c 0.69268,0.64195 1.4882,0.81723 2.062,0.81722 l 29.5550603,-6.62e-4 c 2.1018,-4.8e-5 3.1018,-1.6525 3.1018,-2.9996 L 39,11 H 38 V 8 l 1.013061,2.4e-4 c 0,-0.57381 -0.1985,-1.2921 -0.58032,-1.7777 0.86256,0.52578 1.0808,1.6891 1.0808,2.7773 v 5.000001 c 0,1.662 -1.338,3.000002 -3,2.999999 l -29.6570603,-3.7e-5 c -1.0882,-1e-6 -2.5339,-0.85452 -2.5625,-1.8165 z" />
+  <path
+     id="path6-7-5"
+     d="M 6.3554688,5.0019531 C 4.6941302,5.001951 3.3565331,6.3389194 3.3554688,8 H 4 v 3 H 3.3554688 v 2.001953 c 0,1.662 1.338,2.999998 3,3 H 36.013672 c 1.662,3e-6 3,-1.338 3,-3 L 39,11 H 38 V 8 l 1.013672,0.00195 c 0.0076,-1.6619827 -1.338,-2.9999979 -3,-3 z"
+     style="color:#000000;opacity:0.8" />
+  <rect
+     ry="2"
+     rx="2"
+     y="4"
+     x="3"
+     height="7"
+     width="36"
+     id="rect1700-1"
+     style="fill:#2a2a2a;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     ry="2"
+     rx="2"
+     y="8"
+     x="3"
+     height="7"
+     width="36"
+     id="rect1700"
+     style="fill:#050505;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="rect1698"
+     d="M 4.0004005,9 H 38 c 0.554,0 1,0.8645735 1,1.938506 v 1.122988 C 39,13.135426 38.554,14 38,14 H 4.0004005 c -0.554,0 -1,-0.864574 -1,-1.938506 v -1.122988 c 0,-1.0739325 0.446,-1.938506 1,-1.938506 z"
+     style="fill:#1a1a1a;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="rect1698-3"
+     d="m 4,5 h 34 c 0.554,0 1,0.8645735 1,1.9385056 V 8.061172 c 0,1.0739321 -0.446,1.9385057 -1,1.9385057 H 4 c -0.554,0 -1,-0.8645736 -1,-1.9385057 V 6.9385056 C 3,5.8645735 3.446,5 4,5 Z"
+     style="fill:#141414;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="rect1022-35"
+     d="M 4,8.0000003 H 38 V 9 H 4 Z"
+     style="opacity:1;fill:#561e0e;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="rect1022-6-6"
+     d="m 4,10 h 34 v 1 H 4 Z"
+     style="opacity:1;fill:#a74a17;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="rect1022-7-2"
+     d="m 4,9 h 34 v 1 H 4 Z"
+     style="opacity:1;fill:#8d3b13;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="rect1022-3-5-9-2"
+     d="m 39,8 h -1 v 1 h 1 z"
+     style="opacity:1;fill:#37110b;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="rect1022-6-6-3-7-9"
+     d="m 39,10 h -1 v 1 h 1 z"
+     style="opacity:1;fill:#7a3612;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="rect1022-7-7-5-3-3"
+     d="m 39,9 h -1 v 1 h 1 z"
+     style="opacity:1;fill:#57240d;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="rect1022-6-6-2-6-9"
+     d="M 4,9.9996777 H 3 v 1.0000003 h 1 z"
+     style="opacity:1;fill:#b35115;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="rect1022-7-7-8-1-1"
+     d="M 4,8.9996777 H 3 v 1 h 1 z"
+     style="opacity:1;fill:#994311;fill-opacity:1;stroke:none;stroke-width:1.60000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     style="opacity:1;fill:#61230d;fill-opacity:1;stroke:none;stroke-width:0.27434278;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect1022-3-27"
+     width="0.99959946"
+     height="1"
+     x="3.0004005"
+     y="8" />
+</svg>
diff --git a/res/skins/LateNight/sliders_flip/knob_volume_previewdeck.svg b/res/skins/LateNight/palemoon/sliders/knob_volume_previewdeck.svg
similarity index 100%
rename from res/skins/LateNight/sliders_flip/knob_volume_previewdeck.svg
rename to res/skins/LateNight/palemoon/sliders/knob_volume_previewdeck.svg
diff --git a/res/skins/LateNight/palemoon/sliders/slider_crossfader.svg b/res/skins/LateNight/palemoon/sliders/slider_crossfader.svg
new file mode 100644
index 000000000000..ecd065069b28
--- /dev/null
+++ b/res/skins/LateNight/palemoon/sliders/slider_crossfader.svg
@@ -0,0 +1,110 @@
+<?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="svg46"
+   version="1.1"
+   height="40"
+   width="115">
+  <metadata
+     id="metadata52">
+    <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="defs50" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path2"
+     d="m 57.999797,23 -2e-4,9 h -0.999596 l 2e-4,-9 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path4"
+     d="m 57.999797,5 -2e-4,9 h -0.999596 l 2e-4,-9 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path6"
+     d="m 7.999796,23 -2e-4,9 H 7 l 2e-4,-9 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path8"
+     d="m 7.999796,5 -2e-4,9 H 7 l 2e-4,-9 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path10"
+     d="m 107.9998,23 -2e-4,9 H 107 l 2e-4,-9 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path12"
+     d="m 107.9998,5 -2e-4,9 H 107 l 2e-4,-9 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path14"
+     d="m 44.999797,23 2e-6,7 h -0.999596 l -2e-6,-7 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path16"
+     d="m 44.999999,7 -4.02e-4,7 h -0.999596 l 4.02e-4,-7 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path18"
+     d="m 70.999797,23 2e-6,7 h -0.999596 l -2e-6,-7 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path20"
+     d="m 70.999999,7 -4.02e-4,7 h -0.999596 l 4.02e-4,-7 z" />
+  <path
+     style="color:#000000;fill:#636363;stroke-width:0.99979782"
+     id="path22"
+     d="m 57.999898,6 -2e-4,9 h -0.999596 l 2e-4,-9 z" />
+  <path
+     style="color:#000000;fill:#636363;stroke-width:0.99979782"
+     id="path24"
+     d="m 57.999597,33 2e-4,-9 h -0.999596 l -2e-4,9 z" />
+  <path
+     style="color:#000000;fill:#4b4b4b;stroke-width:0.99979782"
+     id="path26"
+     d="m 7.999796,6 -2e-4,9 H 7 l 2e-4,-9 z" />
+  <path
+     style="color:#000000;fill:#4b4b4b;stroke-width:0.99979782"
+     id="path28"
+     d="m 7.999596,33 2e-4,-9 H 7.0002 L 7,33 Z" />
+  <path
+     style="color:#000000;fill:#4b4b4b;stroke-width:0.99979782"
+     id="path30"
+     d="m 107.9998,6 -2e-4,9 H 107 l 2e-4,-9 z" />
+  <path
+     style="color:#000000;fill:#4b4b4b;stroke-width:0.99979782"
+     id="path32"
+     d="m 107.9996,33 2e-4,-9 h -0.9996 L 107,33 Z" />
+  <path
+     style="color:#000000;fill:#4b4b4b;stroke-width:0.99979782"
+     id="path34"
+     d="m 44.999999,8 -4.02e-4,7 h -0.999596 l 4.02e-4,-7 z" />
+  <path
+     style="color:#000000;fill:#4b4b4b;stroke-width:0.99979782"
+     id="path36"
+     d="m 44.999799,31 -2e-6,-7 h -0.999596 l 2e-6,7 z" />
+  <path
+     style="color:#000000;fill:#4b4b4b;stroke-width:0.99979782"
+     id="path38"
+     d="m 70.999999,8 -4.02e-4,7 h -0.999596 l 4.02e-4,-7 z" />
+  <path
+     style="color:#000000;fill:#4b4b4b;stroke-width:0.99979782"
+     id="path40"
+     d="m 70.999799,31 -2e-6,-7 h -0.999596 l 2e-6,7 z" />
+  <path
+     style="color:#000000;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.65253747;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path42"
+     d="m 108.67374,18.326268 v 1.347463 H 6.3262687 v -1.347463 z" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/sliders/slider_crossfader_small.svg b/res/skins/LateNight/palemoon/sliders/slider_crossfader_small.svg
new file mode 100644
index 000000000000..f34a4c419aa8
--- /dev/null
+++ b/res/skins/LateNight/palemoon/sliders/slider_crossfader_small.svg
@@ -0,0 +1,110 @@
+<?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="svg46"
+   version="1.1"
+   height="40"
+   width="85">
+  <metadata
+     id="metadata52">
+    <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="defs50" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path2"
+     d="m 42.999797,24 -2e-4,9 h -0.999596 l 2e-4,-9 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path4"
+     d="m 42.999797,6 -2e-4,9 h -0.999596 l 2e-4,-9 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path6"
+     d="m 7.999796,24 -2e-4,9 H 7 l 2e-4,-9 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path8"
+     d="m 7.999796,6 -2e-4,9 H 7 l 2e-4,-9 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path10"
+     d="m 77.9998,24 -2e-4,9 H 77 l 2e-4,-9 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path12"
+     d="m 77.9998,6 -2e-4,9 H 77 l 2e-4,-9 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path14"
+     d="m 31.999797,24 2e-6,7 h -0.999596 l -2e-6,-7 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path16"
+     d="m 31.999999,8 -4.02e-4,7 h -0.999596 l 4.02e-4,-7 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path18"
+     d="m 53.999797,24 2e-6,7 h -0.999596 l -2e-6,-7 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path20"
+     d="m 53.999999,8 -4.02e-4,7 h -0.999596 l 4.02e-4,-7 z" />
+  <path
+     style="color:#000000;fill:#636363;stroke-width:0.99979782"
+     id="path22"
+     d="m 42.999898,7 -2e-4,9 h -0.999596 l 2e-4,-9 z" />
+  <path
+     style="color:#000000;fill:#636363;stroke-width:0.99979782"
+     id="path24"
+     d="m 42.999597,34 2e-4,-9 h -0.999596 l -2e-4,9 z" />
+  <path
+     style="color:#000000;fill:#4b4b4b;stroke-width:0.99979782"
+     id="path26"
+     d="m 7.999796,7 -2e-4,9 H 7 l 2e-4,-9 z" />
+  <path
+     style="color:#000000;fill:#4b4b4b;stroke-width:0.99979782"
+     id="path28"
+     d="m 7.999596,34 2e-4,-9 H 7.0002 L 7,34 Z" />
+  <path
+     style="color:#000000;fill:#4b4b4b;stroke-width:0.99979782"
+     id="path30"
+     d="m 77.9998,7 -2e-4,9 H 77 l 2e-4,-9 z" />
+  <path
+     style="color:#000000;fill:#4b4b4b;stroke-width:0.99979782"
+     id="path32"
+     d="m 77.9996,34 2e-4,-9 H 77.0002 L 77,34 Z" />
+  <path
+     style="color:#000000;fill:#4b4b4b;stroke-width:0.99979782"
+     id="path34"
+     d="m 31.999999,9 -4.02e-4,7 h -0.999596 l 4.02e-4,-7 z" />
+  <path
+     style="color:#000000;fill:#4b4b4b;stroke-width:0.99979782"
+     id="path36"
+     d="m 31.999799,32 -2e-6,-7 h -0.999596 l 2e-6,7 z" />
+  <path
+     style="color:#000000;fill:#4b4b4b;stroke-width:0.99979782"
+     id="path38"
+     d="m 53.999999,9 -4.02e-4,7 h -0.999596 l 4.02e-4,-7 z" />
+  <path
+     style="color:#000000;fill:#4b4b4b;stroke-width:0.99979782"
+     id="path40"
+     d="m 53.999799,32 -2e-6,-7 h -0.999596 l 2e-6,7 z" />
+  <path
+     style="color:#000000;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.65535903;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path42"
+     d="M 78.67232,19.327679 V 20.67232 H 6.3276795 v -1.344641 z" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/sliders/slider_pitch_deck.svg b/res/skins/LateNight/palemoon/sliders/slider_pitch_deck.svg
new file mode 100644
index 000000000000..fe1a8fead879
--- /dev/null
+++ b/res/skins/LateNight/palemoon/sliders/slider_pitch_deck.svg
@@ -0,0 +1,196 @@
+<?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="40"
+   height="113"
+   version="1.1"
+   id="svg84">
+  <metadata
+     id="metadata90">
+    <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="defs88" />
+  <rect
+     y="-55.063557"
+     x="-202.53813"
+     height="219.77542"
+     width="166.62712"
+     id="rect852"
+     style="opacity:1;fill:#146674;fill-opacity:0.55555558;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <g
+     style="fill:#050505;stroke-width:0.99979782"
+     transform="translate(1)"
+     id="g38">
+    <path
+       style="color:#000000"
+       d="m 8,20.500564 h 8 V 21.50016 H 8 Z"
+       id="path2" />
+    <path
+       style="color:#000000"
+       d="m 8,32.500511 h 8 v 0.999596 H 8 Z"
+       id="path4" />
+    <path
+       style="color:#000000"
+       d="m 8,44.500457 h 8 v 0.999596 H 8 Z"
+       id="path6" />
+    <path
+       style="color:#000000"
+       d="m 5,56.500202 11,2.02e-4 V 57.5 L 5,57.499798 Z"
+       id="path8" />
+    <path
+       style="color:#000000"
+       d="m 8,68.500361 h 8 v 0.999596 H 8 Z"
+       id="path10" />
+    <path
+       style="color:#000000"
+       d="m 8,80.500308 h 8 v 0.999596 H 8 Z"
+       id="path12" />
+    <path
+       style="color:#000000"
+       d="m 8,92.500254 h 8 V 93.49985 H 8 Z"
+       id="path14" />
+    <path
+       style="color:#000000"
+       d="m 32,20.500564 h -8 v 0.999596 h 8 z"
+       id="path16" />
+    <path
+       style="color:#000000"
+       d="m 32,32.500511 h -8 v 0.999596 h 8 z"
+       id="path18" />
+    <path
+       style="color:#000000"
+       d="m 32,44.500457 h -8 v 0.999596 h 8 z"
+       id="path20" />
+    <path
+       style="color:#000000"
+       d="M 34,56.500404 H 24 V 57.5 h 10 z"
+       id="path22" />
+    <path
+       style="color:#000000"
+       d="m 32,68.500361 h -8 v 0.999596 h 8 z"
+       id="path24" />
+    <path
+       style="color:#000000"
+       d="m 32,80.500308 h -8 v 0.999596 h 8 z"
+       id="path26" />
+    <path
+       style="color:#000000"
+       d="m 32,92.500254 h -8 v 0.999596 h 8 z"
+       id="path28" />
+    <path
+       style="color:#000000"
+       d="m 8,6.500564 h 8 V 7.50016 H 8 Z"
+       id="path30" />
+    <path
+       style="color:#000000"
+       d="M 32,6.500564 H 24 V 7.50016 h 8 z"
+       id="path32" />
+    <path
+       style="color:#000000"
+       d="m 8,104.50025 h 8 v 0.9996 H 8 Z"
+       id="path34" />
+    <path
+       style="color:#000000"
+       d="m 32,104.50025 h -8 v 0.9996 h 8 z"
+       id="path36" />
+  </g>
+  <g
+     style="fill:#636363;stroke-width:0.99979782"
+     transform="translate(1)"
+     id="g44">
+    <path
+       style="color:#000000"
+       d="M 5,57.000404 H 16 V 58 H 5 Z"
+       id="path40" />
+    <path
+       style="color:#000000"
+       d="M 34,57.000404 H 24 V 58 h 10 z"
+       id="path42" />
+  </g>
+  <g
+     style="fill:#404040;stroke-width:0.99979782"
+     transform="translate(1)"
+     id="g78">
+    <path
+       style="color:#000000"
+       d="m 8,21.000564 h 8 V 22.00016 H 8 Z"
+       id="path46" />
+    <path
+       style="color:#000000"
+       d="m 8,33.000511 h 8 v 0.999596 H 8 Z"
+       id="path48" />
+    <path
+       style="color:#000000"
+       d="m 8,45.000457 h 8 v 0.999596 H 8 Z"
+       id="path50" />
+    <path
+       style="color:#000000"
+       d="m 8,69.000361 h 8 v 0.999596 H 8 Z"
+       id="path52" />
+    <path
+       style="color:#000000"
+       d="m 8,81.000308 h 8 v 0.999596 H 8 Z"
+       id="path54" />
+    <path
+       style="color:#000000"
+       d="m 8,93.000254 h 8 V 93.99985 H 8 Z"
+       id="path56" />
+    <path
+       style="color:#000000"
+       d="m 32,21.000564 h -8 v 0.999596 h 8 z"
+       id="path58" />
+    <path
+       style="color:#000000"
+       d="m 32,33.000511 h -8 v 0.999596 h 8 z"
+       id="path60" />
+    <path
+       style="color:#000000"
+       d="m 32,45.000457 h -8 v 0.999596 h 8 z"
+       id="path62" />
+    <path
+       style="color:#000000"
+       d="m 32,69.000361 h -8 v 0.999596 h 8 z"
+       id="path64" />
+    <path
+       style="color:#000000"
+       d="m 32,81.000308 h -8 v 0.999596 h 8 z"
+       id="path66" />
+    <path
+       style="color:#000000"
+       d="m 32,93.000254 h -8 v 0.999596 h 8 z"
+       id="path68" />
+    <path
+       style="color:#000000"
+       d="m 8,7.000564 h 8 V 8.00016 H 8 Z"
+       id="path70" />
+    <path
+       style="color:#000000"
+       d="M 32,7.000564 H 24 V 8.00016 h 8 z"
+       id="path72" />
+    <path
+       style="color:#000000"
+       d="m 8,105.00025 h 8 v 0.9996 H 8 Z"
+       id="path74" />
+    <path
+       style="color:#000000"
+       d="m 32,105.00025 h -8 v 0.9996 h 8 z"
+       id="path76" />
+  </g>
+  <path
+     d="m 20.326337,6.3263365 h 1.347327 V 106.67366 h -1.347327 z"
+     id="path80"
+     style="color:#000000;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.65267289;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/sliders/slider_pitch_deck_compact.svg b/res/skins/LateNight/palemoon/sliders/slider_pitch_deck_compact.svg
new file mode 100644
index 000000000000..815844ff1660
--- /dev/null
+++ b/res/skins/LateNight/palemoon/sliders/slider_pitch_deck_compact.svg
@@ -0,0 +1,179 @@
+<?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="40"
+   height="95"
+   version="1.1"
+   id="svg84">
+  <metadata
+     id="metadata90">
+    <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="defs88" />
+  <path
+     id="path4"
+     d="m 9,6.49985 h 8 V 7.6090008 H 9 Z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path8"
+     d="m 6,46.445425 11,-1.27e-4 v 1.109151 l -11,1.26e-4 z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path10"
+     d="m 9,56.43169 h 8 v 1.109151 H 9 Z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path12"
+     d="m 9,66.418082 h 8 v 1.109151 H 9 Z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path14"
+     d="m 9,76.404474 h 8 v 1.109151 H 9 Z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path22"
+     d="M 35,46.500404 H 25 V 47.5 h 10 z"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     id="path34"
+     d="m 9,86.390695 h 8 V 87.49985 H 9 Z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <g
+     transform="translate(1,-10)"
+     style="fill:#636363;stroke-width:0.99979782"
+     id="g44">
+    <path
+       style="color:#000000"
+       d="m 5,57.000202 11,2.02e-4 V 58 L 5,57.999798 Z"
+       id="path40" />
+    <path
+       style="color:#000000"
+       d="M 34,57.000404 H 24 V 58 h 10 z"
+       id="path42" />
+  </g>
+  <path
+     id="path48"
+     d="m 9,6.99985 h 8 V 8.1090008 H 9 Z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     id="path52"
+     d="m 9,56.93169 h 8 v 1.109151 H 9 Z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     id="path54"
+     d="m 9,66.917998 h 8 v 1.109151 H 9 Z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     id="path56"
+     d="m 9,76.904474 h 8 v 1.109151 H 9 Z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     id="path74"
+     d="m 9,86.890695 h 8 V 87.99985 H 9 Z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     d="m 20.276325,6.2763199 h 1.447351 V 88.723672 h -1.447351 z"
+     id="path80"
+     style="color:#000000;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.55264783;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     id="path10-3"
+     d="m 9,16.486123 h 8 v 1.109151 H 9 Z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path12-6"
+     d="m 9,26.472515 h 8 v 1.109151 H 9 Z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path14-7"
+     d="m 9,36.458907 h 8 v 1.10915 H 9 Z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path52-6"
+     d="m 9,16.986123 h 8 v 1.109151 H 9 Z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     id="path54-2"
+     d="m 9,26.972431 h 8 v 1.10915 H 9 Z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     id="path56-9"
+     d="m 9,36.958907 h 8 v 1.10915 H 9 Z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     id="path4-1"
+     d="m 25,6.49985 h 8 v 1.1091508 h -8 z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path10-8"
+     d="m 25,56.43169 h 8 v 1.109151 h -8 z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path12-7"
+     d="m 25,66.418082 h 8 v 1.109151 h -8 z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path14-9"
+     d="m 25,76.404474 h 8 v 1.109151 h -8 z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path34-2"
+     d="m 25,86.390695 h 8 v 1.109155 h -8 z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path48-0"
+     d="m 25,6.99985 h 8 v 1.1091508 h -8 z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     id="path52-2"
+     d="m 25,56.93169 h 8 v 1.109151 h -8 z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     id="path54-3"
+     d="m 25,66.917998 h 8 v 1.109151 h -8 z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     id="path56-7"
+     d="m 25,76.904474 h 8 v 1.109151 h -8 z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     id="path74-5"
+     d="m 25,86.890695 h 8 v 1.109155 h -8 z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     id="path10-3-9"
+     d="m 25,16.486123 h 8 v 1.109151 h -8 z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path12-6-2"
+     d="m 25,26.472515 h 8 v 1.109151 h -8 z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path14-7-2"
+     d="m 25,36.458907 h 8 v 1.10915 h -8 z"
+     style="color:#000000;fill:#050505;stroke-width:1.0531621" />
+  <path
+     id="path52-6-8"
+     d="m 25,16.986123 h 8 v 1.109151 h -8 z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     id="path54-2-9"
+     d="m 25,26.972431 h 8 v 1.10915 h -8 z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+  <path
+     id="path56-9-7"
+     d="m 25,36.958907 h 8 v 1.10915 h -8 z"
+     style="color:#000000;fill:#404040;stroke-width:1.0531621" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/sliders/slider_pitch_deck_compact_sync.svg b/res/skins/LateNight/palemoon/sliders/slider_pitch_deck_compact_sync.svg
new file mode 100644
index 000000000000..df7debdaeff6
--- /dev/null
+++ b/res/skins/LateNight/palemoon/sliders/slider_pitch_deck_compact_sync.svg
@@ -0,0 +1,179 @@
+<?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="svg84"
+   version="1.1"
+   height="79"
+   width="40">
+  <metadata
+     id="metadata90">
+    <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="defs88" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="m 9,6.5004044 h 8 v 0.999596 H 9 Z"
+     id="path4" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="m 6,38.500202 11,2.02e-4 V 39.5 L 6,39.499798 Z"
+     id="path8" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="m 9,46.500404 h 8 V 47.5 H 9 Z"
+     id="path10" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="m 9,54.500404 h 8 V 55.5 H 9 Z"
+     id="path12" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="m 9,62.500404 h 8 V 63.5 H 9 Z"
+     id="path14" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="M 35,38.500404 H 25 V 39.5 h 10 z"
+     id="path22" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="M 33,46.500404 H 25 V 47.5 h 8 z"
+     id="path24" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="M 33,54.500404 H 25 V 55.5 h 8 z"
+     id="path26" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="M 33,62.500404 H 25 V 63.5 h 8 z"
+     id="path28" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="m 9,70.500254 h 8 v 0.9996 H 9 Z"
+     id="path34" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="m 33,70.500254 h -8 v 0.9996 h 8 z"
+     id="path36" />
+  <g
+     id="g44"
+     style="fill:#636363;stroke-width:0.99979782"
+     transform="translate(1,-18.000072)">
+    <path
+       id="path40"
+       d="m 5,57.000274 11,1.3e-4 V 58 L 5,57.99987 Z"
+       style="color:#000000" />
+    <path
+       id="path42"
+       d="M 34,57.000404 H 24 V 58 h 10 z"
+       style="color:#000000" />
+  </g>
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="m 9,7.0004044 h 8 v 0.999596 H 9 Z"
+     id="path48" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="m 9,47.000312 h 8 v 0.999596 H 9 Z"
+     id="path52" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="m 9,55.000294 h 8 V 55.99989 H 9 Z"
+     id="path54" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="m 9,63.000276 h 8 v 0.999596 H 9 Z"
+     id="path56" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="M 33,47.000404 H 25 V 48 h 8 z"
+     id="path64" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="M 33,55.000404 H 25 V 56 h 8 z"
+     id="path66" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="M 33,63.000404 H 25 V 64 h 8 z"
+     id="path68" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="m 9,71.000254 h 8 v 0.9996 H 9 Z"
+     id="path74" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="m 33,71.000254 h -8 v 0.9996 h 8 z"
+     id="path76" />
+  <path
+     style="color:#000000;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.44564319;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path80"
+     d="m 20.222823,6.222822 h 1.554355 v 66.554356 h -1.554355 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="m 9,14.500404 h 8 V 15.5 H 9 Z"
+     id="path10-3" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="m 9,22.50048 h 8 v 0.999596 H 9 Z"
+     id="path12-6" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="m 9,30.500404 h 8 V 31.5 H 9 Z"
+     id="path14-7" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="m 9,15.000385 h 8 v 0.999596 H 9 Z"
+     id="path52-6" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="m 9,23.000366 h 8 v 0.999596 H 9 Z"
+     id="path54-2" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="m 9,31.000351 h 8 v 0.999596 H 9 Z"
+     id="path56-9" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="m 25,6.5004044 h 8 v 0.999596 h -8 z"
+     id="path4-0" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="m 25,7.0004044 h 8 v 0.999596 h -8 z"
+     id="path48-9" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="m 25,14.500404 h 8 V 15.5 h -8 z"
+     id="path10-3-3" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="m 25,22.50048 h 8 v 0.999596 h -8 z"
+     id="path12-6-6" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     d="m 25,30.500404 h 8 V 31.5 h -8 z"
+     id="path14-7-0" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="m 25,15.000385 h 8 v 0.999596 h -8 z"
+     id="path52-6-6" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="m 25,23.000366 h 8 v 0.999596 h -8 z"
+     id="path54-2-2" />
+  <path
+     style="color:#000000;fill:#404040;stroke-width:0.99979782"
+     d="m 25,31.000351 h 8 v 0.999596 h -8 z"
+     id="path56-9-6" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/sliders/slider_pitch_sampler.svg b/res/skins/LateNight/palemoon/sliders/slider_pitch_sampler.svg
new file mode 100644
index 000000000000..95600a97417f
--- /dev/null
+++ b/res/skins/LateNight/palemoon/sliders/slider_pitch_sampler.svg
@@ -0,0 +1,154 @@
+<?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="30"
+   height="65"
+   version="1.1"
+   id="svg70">
+  <metadata
+     id="metadata76">
+    <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="defs74" />
+  <path
+     d="m 6,4.500412 h 6 V 5.500008 H 6 Z"
+     id="path4"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 6,13.500404 h 6 V 14.5 H 6 Z"
+     id="path6"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 4,31.500404 h 8 V 32.5 H 4 Z"
+     id="path8"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 6,22.500404 h 6 V 23.5 H 6 Z"
+     id="path10"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 6,40.500352 h 6 v 0.999596 H 6 Z"
+     id="path12"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 6,58.500254 h 6 V 59.49985 H 6 Z"
+     id="path14"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 6,49.500303 h 6 v 0.999596 H 6 Z"
+     id="path16"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 24,4.500412 h -6 v 0.999596 h 6 z"
+     id="path18"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="M 24,13.500404 H 18 V 14.5 h 6 z"
+     id="path20"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="M 26,31.500404 H 18 V 32.5 h 8 z"
+     id="path22"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="M 24,22.500404 H 18 V 23.5 h 6 z"
+     id="path24"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 24,40.500352 h -6 v 0.999596 h 6 z"
+     id="path26"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 24,58.500254 h -6 v 0.999596 h 6 z"
+     id="path28"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <path
+     d="m 24,49.500303 h -6 v 0.999596 h 6 z"
+     id="path30"
+     style="color:#000000;fill:#050505;stroke-width:0.99979782" />
+  <g
+     transform="translate(2)"
+     fill="#636363"
+     stroke-width=".99979782"
+     id="g42">
+    <path
+       d="m2 32.000404h8v.999596h-8z"
+       color="#000000"
+       id="path38" />
+    <path
+       d="m24 32.000404h-8v.999596h8z"
+       color="#000000"
+       id="path40" />
+  </g>
+  <g
+     transform="translate(2)"
+     fill="#404040"
+     stroke-width=".99979782"
+     id="g68">
+    <path
+       d="m4 5.000412h6v.999596h-6z"
+       color="#000000"
+       id="path44" />
+    <path
+       d="m4 14.000404h6v.999596h-6z"
+       color="#000000"
+       id="path46" />
+    <path
+       d="m4 23.000404h6v.999596h-6z"
+       color="#000000"
+       id="path48" />
+    <path
+       d="m4 41.000352h6v.999596h-6z"
+       color="#000000"
+       id="path50" />
+    <path
+       d="m4 59.000254h6v.999596h-6z"
+       color="#000000"
+       id="path52" />
+    <path
+       d="m4 50.000303h6v.999596h-6z"
+       color="#000000"
+       id="path54" />
+    <path
+       d="m22 5.000412h-6v.999596h6z"
+       color="#000000"
+       id="path56" />
+    <path
+       d="m22 14.000404h-6v.999596h6z"
+       color="#000000"
+       id="path58" />
+    <path
+       d="m22 23.000404h-6v.999596h6z"
+       color="#000000"
+       id="path60" />
+    <path
+       d="m22 41.000352h-6v.999596h6z"
+       color="#000000"
+       id="path62" />
+    <path
+       d="m22 59.000254h-6v.999596h6z"
+       color="#000000"
+       id="path64" />
+    <path
+       d="m22 50.000303h-6v.999596h6z"
+       color="#000000"
+       id="path66" />
+  </g>
+  <path
+     d="m 14.183453,4.183452 h 1.633095 v 56.633095 h -1.633095 z"
+     id="path80"
+     style="color:#000000;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.36690497;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/sliders/slider_volume_deck.svg b/res/skins/LateNight/palemoon/sliders/slider_volume_deck.svg
new file mode 100644
index 000000000000..394cdce7567e
--- /dev/null
+++ b/res/skins/LateNight/palemoon/sliders/slider_volume_deck.svg
@@ -0,0 +1,190 @@
+<?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="42"
+   height="107"
+   version="1.1"
+   id="svg94">
+  <metadata
+     id="metadata100">
+    <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="defs98" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path4"
+     d="m 9,57.500804 h 8 V 58.5004 H 9 Z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path6"
+     d="m 9,67.500956 h 8 v 0.999596 H 9 Z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path8"
+     d="m 9,77.500705 h 8 v 0.999596 H 9 Z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path10"
+     d="m 9,87.500454 h 8 V 88.50005 H 9 Z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path12"
+     d="m 9,17.499953 h 8 v 0.999596 H 9 Z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path14"
+     d="m 9,27.501559 h 8 v 0.999596 H 9 Z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path16"
+     d="m 9,37.501307 h 8 v 0.999596 H 9 Z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path18"
+     d="m 9,47.501055 h 8 v 0.999596 H 9 Z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path20"
+     d="m 8,7.500404 9,-2.025e-4 v 0.999596 L 8,8.5 Z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path22"
+     d="m 8,97.500405 9,-2.03e-4 v 0.999595 L 8,98.5 Z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path24"
+     d="m 25,57.500804 8,2.53e-4 v 0.999596 L 25,58.5004 Z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path26"
+     d="m 25,67.500956 8,2.53e-4 v 0.999596 l -8,-2.53e-4 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path28"
+     d="m 25,77.500705 8,2.53e-4 v 0.999596 l -8,-2.53e-4 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path30"
+     d="m 25,87.500454 8,2.52e-4 v 0.999596 l -8,-2.52e-4 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path32"
+     d="m 25,17.499953 8,2.52e-4 v 0.999596 l -8,-2.52e-4 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path34"
+     d="m 25,27.501559 8,2.53e-4 v 0.999596 l -8,-2.53e-4 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path36"
+     d="m 25,37.501307 8,2.53e-4 v 0.999596 l -8,-2.53e-4 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path38"
+     d="m 25,47.501055 8,2.53e-4 v 0.999596 l -8,-2.53e-4 z" />
+  <path
+     d="m 9,58.000552 h 8 v 0.999596 H 9 Z"
+     id="path42"
+     style="color:#000000;fill:#404040;stroke-width:0.99979782" />
+  <path
+     d="m 9,68.000704 h 8 V 69.0003 H 9 Z"
+     id="path44"
+     style="color:#000000;fill:#404040;stroke-width:0.99979782" />
+  <path
+     d="m 9,78.000453 h 8 v 0.999596 H 9 Z"
+     id="path46"
+     style="color:#000000;fill:#404040;stroke-width:0.99979782" />
+  <path
+     d="m 9,88.000202 h 8 v 0.999596 H 9 Z"
+     id="path48"
+     style="color:#000000;fill:#404040;stroke-width:0.99979782" />
+  <path
+     d="m 9,17.999701 h 8 v 0.999596 H 9 Z"
+     id="path50"
+     style="color:#000000;fill:#404040;stroke-width:0.99979782" />
+  <path
+     d="m 9,28.001307 h 8 v 0.999596 H 9 Z"
+     id="path52"
+     style="color:#000000;fill:#404040;stroke-width:0.99979782" />
+  <path
+     d="m 9,38.001055 h 8 v 0.999596 H 9 Z"
+     id="path54"
+     style="color:#000000;fill:#404040;stroke-width:0.99979782" />
+  <path
+     d="m 9,48.000803 h 8 v 0.999596 H 9 Z"
+     id="path56"
+     style="color:#000000;fill:#404040;stroke-width:0.99979782" />
+  <path
+     d="m 25,58.000552 8,2.53e-4 v 0.999596 l -8,-2.53e-4 z"
+     id="path58"
+     style="color:#000000;fill:#404040;stroke-width:0.99979782" />
+  <path
+     d="m 25,68.000704 8,2.03e-4 v 0.999596 L 25,69.0003 Z"
+     id="path60"
+     style="color:#000000;fill:#404040;stroke-width:0.99979782" />
+  <path
+     d="m 25,78.000453 8,2.03e-4 v 0.999596 l -8,-2.03e-4 z"
+     id="path62"
+     style="color:#000000;fill:#404040;stroke-width:0.99979782" />
+  <path
+     d="m 25,88.000202 8,2.02e-4 V 89 l -8,-2.02e-4 z"
+     id="path64"
+     style="color:#000000;fill:#404040;stroke-width:0.99979782" />
+  <path
+     d="m 25,17.999701 8,2.02e-4 v 0.999596 l -8,-2.02e-4 z"
+     id="path66"
+     style="color:#000000;fill:#404040;stroke-width:0.99979782" />
+  <path
+     d="m 25,28.001307 8,2.03e-4 v 0.999596 l -8,-2.03e-4 z"
+     id="path68"
+     style="color:#000000;fill:#404040;stroke-width:0.99979782" />
+  <path
+     d="m 25,38.001055 8,2.03e-4 v 0.999596 l -8,-2.03e-4 z"
+     id="path70"
+     style="color:#000000;fill:#404040;stroke-width:0.99979782" />
+  <path
+     d="m 25,48.000803 8,2.03e-4 v 0.999596 l -8,-2.03e-4 z"
+     id="path72"
+     style="color:#000000;fill:#404040;stroke-width:0.99979782" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path76"
+     d="m 25,7.4999495 9,2.525e-4 v 0.999596 l -9,-2.525e-4 z" />
+  <path
+     style="color:#000000;fill:#050505;stroke-width:0.99979782"
+     id="path78"
+     d="m 25,97.49995 9,2.52e-4 v 0.999596 l -9,-2.53e-4 z" />
+  <path
+     style="color:#000000;fill:#505050;stroke-width:0.99979782"
+     id="path84"
+     d="m 8,8.000404 9,-2.025e-4 v 0.999596 L 8,9 Z" />
+  <path
+     style="color:#000000;fill:#505050;stroke-width:0.99979782"
+     id="path86"
+     d="m 8,98.000405 9,-2.03e-4 v 0.999595 L 8,99 Z" />
+  <path
+     style="color:#000000;fill:#505050;stroke-width:0.99979788"
+     id="path88"
+     d="m 25,8.0002015 9,2.025e-4 V 9 l -9,-2.025e-4 z" />
+  <path
+     style="color:#000000;fill:#505050;stroke-width:0.99979788"
+     id="path90"
+     d="m 25,98.000202 9,2.02e-4 V 99 l -9,-2.03e-4 z" />
+  <path
+     style="color:#000000;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.61044729;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path80"
+     d="m 20.305224,7.3052273 h 1.389553 V 99.69478 h -1.389553 z" />
+</svg>
diff --git a/res/skins/LateNight/sliders_flip/slider_volume_previewdeck.svg b/res/skins/LateNight/palemoon/sliders/slider_volume_previewdeck.svg
similarity index 100%
rename from res/skins/LateNight/sliders_flip/slider_volume_previewdeck.svg
rename to res/skins/LateNight/palemoon/sliders/slider_volume_previewdeck.svg
diff --git a/res/skins/LateNight/palemoon/style/batt/ic_battery_charged.svg b/res/skins/LateNight/palemoon/style/batt/ic_battery_charged.svg
new file mode 100644
index 000000000000..189a39493f2c
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/batt/ic_battery_charged.svg
@@ -0,0 +1,59 @@
+<?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"
+   version="1.1"
+   viewBox="0 0 48 48"
+   id="svg4"
+   sodipodi:docname="ic_battery_charged.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <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" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1056"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="4.9166667"
+     inkscape:cx="24"
+     inkscape:cy="24"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4" />
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 4.0001,27.9999 h 4 L 8,31.841 C 7.9999615,33.3201 8.6792,34 10.159,34 h 31.68 C 43.309,34 44,33.3203 44,31.841 V 16.169 C 44,14.6997 43.31,14.000052 41.83,14 L 10.159526,13.9999 C 8.6797254,14.0099 8.0003,14.6899 8,16.169 v 3.8309 H 4 Z"
+     id="path2-3"
+     sodipodi:nodetypes="ccssssscccccc" />
+  <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"
+     id="path2"
+     fill="#a89a8c" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/style/batt/ic_battery_charging_0.svg b/res/skins/LateNight/palemoon/style/batt/ic_battery_charging_0.svg
new file mode 100644
index 000000000000..74af63daab24
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/batt/ic_battery_charging_0.svg
@@ -0,0 +1,41 @@
+<?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="svg8"
+   viewBox="0 0 48 48"
+   version="1.1">
+  <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="defs12" />
+  <path
+     id="path2-3"
+     d="m 4.0001,27.9999 h 4 L 8,31.841 C 7.9999615,33.3201 8.6792,34 10.159,34 h 31.68 C 43.309,34 44,33.3203 44,31.841 V 16.169 C 44,14.6997 43.31,14.000052 41.83,14 L 10.159526,13.9999 C 8.6797254,14.0099 8.0003,14.6899 8,16.169 v 3.8309 H 4 Z"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <g
+     id="g6"
+     transform="rotate(-90,24,24)">
+    <path
+       id="path2"
+       fill="#f00"
+       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" />
+    <path
+       id="path4"
+       fill="#444443"
+       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" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/style/batt/ic_battery_charging_1.svg b/res/skins/LateNight/palemoon/style/batt/ic_battery_charging_1.svg
new file mode 100644
index 000000000000..8af59619dbb4
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/batt/ic_battery_charging_1.svg
@@ -0,0 +1,41 @@
+<?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="svg8"
+   viewBox="0 0 48 48"
+   version="1.1">
+  <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="defs12" />
+  <path
+     id="path2-3"
+     d="m 4.0001,27.9999 h 4 L 8,31.841 C 7.9999615,33.3201 8.6792,34 10.159,34 h 31.68 C 43.309,34 44,33.3203 44,31.841 V 16.169 C 44,14.6997 43.31,14.000052 41.83,14 L 10.159526,13.9999 C 8.6797254,14.0099 8.0003,14.6899 8,16.169 v 3.8309 H 4 Z"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <g
+     id="g6"
+     transform="rotate(-90,24,24)">
+    <path
+       id="path2"
+       fill="#ff5c00"
+       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" />
+    <path
+       id="path4"
+       fill="#444443"
+       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" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/style/batt/ic_battery_charging_2.svg b/res/skins/LateNight/palemoon/style/batt/ic_battery_charging_2.svg
new file mode 100644
index 000000000000..14fc74d6dfd9
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/batt/ic_battery_charging_2.svg
@@ -0,0 +1,41 @@
+<?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="svg8"
+   viewBox="0 0 48 48"
+   version="1.1">
+  <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="defs12" />
+  <path
+     id="path2-3"
+     d="m 4.0001,27.9999 h 4 L 8,31.841 C 7.9999615,33.3201 8.6792,34 10.159,34 h 31.68 C 43.309,34 44,33.3203 44,31.841 V 16.169 C 44,14.6997 43.31,14.000052 41.83,14 L 10.159526,13.9999 C 8.6797254,14.0099 8.0003,14.6899 8,16.169 v 3.8309 H 4 Z"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <g
+     id="g6"
+     transform="rotate(-90,24.00005,24)">
+    <path
+       id="path2"
+       fill="#ffb108"
+       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" />
+    <path
+       id="path4"
+       fill="#444443"
+       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" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/style/batt/ic_battery_charging_3.svg b/res/skins/LateNight/palemoon/style/batt/ic_battery_charging_3.svg
new file mode 100644
index 000000000000..c9d3e8342d15
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/batt/ic_battery_charging_3.svg
@@ -0,0 +1,41 @@
+<?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="svg8"
+   viewBox="0 0 48 48"
+   version="1.1">
+  <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="defs12" />
+  <path
+     id="path2-3"
+     d="m 4.0001,27.9999 h 4 L 8,31.841 C 7.9999615,33.3201 8.6792,34 10.159,34 h 31.68 C 43.309,34 44,33.3203 44,31.841 V 16.169 C 44,14.6997 43.31,14.000052 41.83,14 L 10.159526,13.9999 C 8.6797254,14.0099 8.0003,14.6899 8,16.169 v 3.8309 H 4 Z"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <g
+     id="g6"
+     transform="rotate(-90,24,24)">
+    <path
+       id="path2"
+       fill="#a89a8c"
+       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" />
+    <path
+       id="path4"
+       fill="#444443"
+       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" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/style/batt/ic_battery_charging_4.svg b/res/skins/LateNight/palemoon/style/batt/ic_battery_charging_4.svg
new file mode 100644
index 000000000000..81b9738e6bd5
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/batt/ic_battery_charging_4.svg
@@ -0,0 +1,41 @@
+<?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="svg8"
+   viewBox="0 0 48 48"
+   version="1.1">
+  <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="defs12" />
+  <path
+     id="path2-3"
+     d="m 4.0001,27.9999 h 4 L 8,31.841 C 7.9999615,33.3201 8.6792,34 10.159,34 h 31.68 C 43.309,34 44,33.3203 44,31.841 V 16.169 C 44,14.6997 43.31,14.000052 41.83,14 L 10.159526,13.9999 C 8.6797254,14.0099 8.0003,14.6899 8,16.169 v 3.8309 H 4 Z"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <g
+     id="g6"
+     transform="rotate(-90,24.0002,24)">
+    <path
+       id="path2"
+       fill="#a89a8c"
+       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" />
+    <path
+       id="path4"
+       fill="#444443"
+       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" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/style/batt/ic_battery_charging_5.svg b/res/skins/LateNight/palemoon/style/batt/ic_battery_charging_5.svg
new file mode 100644
index 000000000000..4607889ddfce
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/batt/ic_battery_charging_5.svg
@@ -0,0 +1,41 @@
+<?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="svg8"
+   viewBox="0 0 48 48"
+   version="1.1">
+  <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="defs12" />
+  <path
+     id="path2-3"
+     d="m 4.0001,27.9999 h 4 L 8,31.841 C 7.9999615,33.3201 8.6792,34 10.159,34 h 31.68 C 43.309,34 44,33.3203 44,31.841 V 16.169 C 44,14.6997 43.31,14.000052 41.83,14 L 10.159526,13.9999 C 8.6797254,14.0099 8.0003,14.6899 8,16.169 v 3.8309 H 4 Z"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <g
+     id="g6"
+     transform="rotate(-90,24.00015,24)">
+    <path
+       id="path2"
+       fill="#a89a8c"
+       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" />
+    <path
+       id="path4"
+       fill="#444443"
+       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" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/style/batt/ic_battery_charging_6.svg b/res/skins/LateNight/palemoon/style/batt/ic_battery_charging_6.svg
new file mode 100644
index 000000000000..b0cde2f1fd2c
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/batt/ic_battery_charging_6.svg
@@ -0,0 +1,41 @@
+<?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="svg8"
+   viewBox="0 0 48 48"
+   version="1.1">
+  <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="defs12" />
+  <path
+     id="path2-3"
+     d="m 4.0001,27.9999 h 4 L 8,31.841 C 7.9999615,33.3201 8.6792,34 10.159,34 h 31.68 C 43.309,34 44,33.3203 44,31.841 V 16.169 C 44,14.6997 43.31,14.000052 41.83,14 L 10.159526,13.9999 C 8.6797254,14.0099 8.0003,14.6899 8,16.169 v 3.8309 H 4 Z"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <g
+     id="g6"
+     transform="rotate(-90,24,24)">
+    <path
+       id="path2"
+       fill="#a89a8c"
+       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" />
+    <path
+       id="path4"
+       fill="#444443"
+       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" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/style/batt/ic_battery_charging_7.svg b/res/skins/LateNight/palemoon/style/batt/ic_battery_charging_7.svg
new file mode 100644
index 000000000000..e74dc9dcd864
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/batt/ic_battery_charging_7.svg
@@ -0,0 +1,41 @@
+<?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="svg8"
+   viewBox="0 0 48 48"
+   version="1.1">
+  <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="defs12" />
+  <path
+     id="path2-3"
+     d="m 4.0001,27.9999 h 4 L 8,31.841 C 7.9999615,33.3201 8.6792,34 10.159,34 h 31.68 C 43.309,34 44,33.3203 44,31.841 V 16.169 C 44,14.6997 43.31,14.000052 41.83,14 L 10.159526,13.9999 C 8.6797254,14.0099 8.0003,14.6899 8,16.169 v 3.8309 H 4 Z"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <g
+     id="g6"
+     transform="rotate(-90,24,24)">
+    <path
+       id="path2"
+       fill="#a89a8c"
+       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" />
+    <path
+       id="path4"
+       fill="#444443"
+       d="m20 4v4h8v-4z" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/style/batt/ic_battery_discharging_0.svg b/res/skins/LateNight/palemoon/style/batt/ic_battery_discharging_0.svg
new file mode 100644
index 000000000000..3c318f683e74
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/batt/ic_battery_discharging_0.svg
@@ -0,0 +1,41 @@
+<?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="svg8"
+   viewBox="0 0 48 48"
+   version="1.1">
+  <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="defs12" />
+  <path
+     id="path2-3"
+     d="m 4.0001,27.9999 h 4 L 8,31.841 C 7.9999615,33.3201 8.6792,34 10.159,34 h 31.68 C 43.309,34 44,33.3203 44,31.841 V 16.169 C 44,14.6997 43.31,14.000052 41.83,14 L 10.159526,13.9999 C 8.6797254,14.0099 8.0003,14.6899 8,16.169 v 3.8309 H 4 Z"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <g
+     id="g6"
+     transform="rotate(-90,24,24)">
+    <path
+       id="path2"
+       fill="#f00"
+       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" />
+    <path
+       id="path4"
+       fill="#444443"
+       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" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/style/batt/ic_battery_discharging_1.svg b/res/skins/LateNight/palemoon/style/batt/ic_battery_discharging_1.svg
new file mode 100644
index 000000000000..9f39d303a2eb
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/batt/ic_battery_discharging_1.svg
@@ -0,0 +1,41 @@
+<?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="svg8"
+   viewBox="0 0 48 48"
+   version="1.1">
+  <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="defs12" />
+  <path
+     id="path2-3"
+     d="m 4.0001,27.9999 h 4 L 8,31.841 C 7.9999615,33.3201 8.6792,34 10.159,34 h 31.68 C 43.309,34 44,33.3203 44,31.841 V 16.169 C 44,14.6997 43.31,14.000052 41.83,14 L 10.159526,13.9999 C 8.6797254,14.0099 8.0003,14.6899 8,16.169 v 3.8309 H 4 Z"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <g
+     id="g6"
+     transform="rotate(-90,24,24)">
+    <path
+       id="path2"
+       fill="#ff5c00"
+       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" />
+    <path
+       id="path4"
+       fill="#444443"
+       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" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/style/batt/ic_battery_discharging_2.svg b/res/skins/LateNight/palemoon/style/batt/ic_battery_discharging_2.svg
new file mode 100644
index 000000000000..49b42db285f1
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/batt/ic_battery_discharging_2.svg
@@ -0,0 +1,41 @@
+<?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="svg8"
+   viewBox="0 0 48 48"
+   version="1.1">
+  <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="defs12" />
+  <path
+     id="path2-3"
+     d="m 4.0001,27.9999 h 4 L 8,31.841 C 7.9999615,33.3201 8.6792,34 10.159,34 h 31.68 C 43.309,34 44,33.3203 44,31.841 V 16.169 C 44,14.6997 43.31,14.000052 41.83,14 L 10.159526,13.9999 C 8.6797254,14.0099 8.0003,14.6899 8,16.169 v 3.8309 H 4 Z"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <g
+     id="g6"
+     transform="rotate(-90,24,23.99995)">
+    <path
+       id="path2"
+       fill="#ffb108"
+       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" />
+    <path
+       id="path4"
+       fill="#444443"
+       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" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/style/batt/ic_battery_discharging_3.svg b/res/skins/LateNight/palemoon/style/batt/ic_battery_discharging_3.svg
new file mode 100644
index 000000000000..28cfa6241b41
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/batt/ic_battery_discharging_3.svg
@@ -0,0 +1,41 @@
+<?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="svg8"
+   viewBox="0 0 48 48"
+   version="1.1">
+  <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="defs12" />
+  <path
+     id="path2-3"
+     d="m 4.0001,27.9999 h 4 L 8,31.841 C 7.9999615,33.3201 8.6792,34 10.159,34 h 31.68 C 43.309,34 44,33.3203 44,31.841 V 16.169 C 44,14.6997 43.31,14.000052 41.83,14 L 10.159526,13.9999 C 8.6797254,14.0099 8.0003,14.6899 8,16.169 v 3.8309 H 4 Z"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <g
+     id="g6"
+     transform="rotate(-90,24,23.99995)">
+    <path
+       id="path2"
+       fill="#a89a8c"
+       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" />
+    <path
+       id="path4"
+       fill="#444443"
+       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" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/style/batt/ic_battery_discharging_4.svg b/res/skins/LateNight/palemoon/style/batt/ic_battery_discharging_4.svg
new file mode 100644
index 000000000000..f103cc147870
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/batt/ic_battery_discharging_4.svg
@@ -0,0 +1,41 @@
+<?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="svg8"
+   viewBox="0 0 48 48"
+   version="1.1">
+  <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="defs12" />
+  <path
+     id="path2-3"
+     d="m 4.0001,27.9999 h 4 L 8,31.841 C 7.9999615,33.3201 8.6792,34 10.159,34 h 31.68 C 43.309,34 44,33.3203 44,31.841 V 16.169 C 44,14.6997 43.31,14.000052 41.83,14 L 10.159526,13.9999 C 8.6797254,14.0099 8.0003,14.6899 8,16.169 v 3.8309 H 4 Z"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <g
+     id="g6"
+     transform="rotate(-90,24,23.99995)">
+    <path
+       id="path2"
+       fill="#a89a8c"
+       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" />
+    <path
+       id="path4"
+       fill="#444443"
+       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" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/style/batt/ic_battery_discharging_5.svg b/res/skins/LateNight/palemoon/style/batt/ic_battery_discharging_5.svg
new file mode 100644
index 000000000000..e511a1660520
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/batt/ic_battery_discharging_5.svg
@@ -0,0 +1,41 @@
+<?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="svg8"
+   viewBox="0 0 48 48"
+   version="1.1">
+  <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="defs12" />
+  <path
+     id="path2-3"
+     d="m 4.0001,27.9999 h 4 L 8,31.841 C 7.9999615,33.3201 8.6792,34 10.159,34 h 31.68 C 43.309,34 44,33.3203 44,31.841 V 16.169 C 44,14.6997 43.31,14.000052 41.83,14 L 10.159526,13.9999 C 8.6797254,14.0099 8.0003,14.6899 8,16.169 v 3.8309 H 4 Z"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <g
+     id="g6"
+     transform="rotate(-90,24,23.99995)">
+    <path
+       id="path2"
+       fill="#a89a8c"
+       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" />
+    <path
+       id="path4"
+       fill="#444443"
+       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" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/style/batt/ic_battery_discharging_6.svg b/res/skins/LateNight/palemoon/style/batt/ic_battery_discharging_6.svg
new file mode 100644
index 000000000000..9b88c103870c
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/batt/ic_battery_discharging_6.svg
@@ -0,0 +1,41 @@
+<?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="svg8"
+   viewBox="0 0 48 48"
+   version="1.1">
+  <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="defs12" />
+  <path
+     id="path2-3"
+     d="m 4.0001,27.9999 h 4 L 8,31.841 C 7.9999615,33.3201 8.6792,34 10.159,34 h 31.68 C 43.309,34 44,33.3203 44,31.841 V 16.169 C 44,14.6997 43.31,14.000052 41.83,14 L 10.159526,13.9999 C 8.6797254,14.0099 8.0003,14.6899 8,16.169 v 3.8309 H 4 Z"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <g
+     id="g6"
+     transform="rotate(-90,24,23.99995)">
+    <path
+       id="path2"
+       fill="#a89a8c"
+       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" />
+    <path
+       id="path4"
+       fill="#444443"
+       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" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/palemoon/style/batt/ic_battery_discharging_7.svg b/res/skins/LateNight/palemoon/style/batt/ic_battery_discharging_7.svg
new file mode 100644
index 000000000000..16ac7a383c34
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/batt/ic_battery_discharging_7.svg
@@ -0,0 +1,37 @@
+<?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="svg8"
+   viewBox="0 0 48 48"
+   version="1.1">
+  <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="defs12" />
+  <path
+     id="path2-3"
+     d="m 4.0001,27.9999 h 4 L 8,31.841 C 7.9999615,33.3201 8.6792,34 10.159,34 h 31.68 C 43.309,34 44,33.3203 44,31.841 V 16.169 C 44,14.6997 43.31,14.000052 41.83,14 L 10.159526,13.9999 C 8.6797254,14.0099 8.0003,14.6899 8,16.169 v 3.8309 H 4 Z"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     d="m 8.00005,27.99995 v 3.332 c 0,1.4791 1.1882,2.668 2.668,2.668 h 30.662 c 1.47,0 2.6699,-1.1887 2.6699,-2.668 v -14.664 c 0,-1.4693 -1.1899,-2.668 -2.6699,-2.668 h -29.33 v 0.002 l -1.332,-0.002 c -1.4798,0.01 -2.6677,1.1986 -2.668,2.6777 v 3.3223 z"
+     id="path2"
+     style="fill:#a89a8c" />
+  <path
+     d="m 4.00005,27.99995 h 4 v -8 h -4 z"
+     id="path4"
+     style="fill:#444443" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/style/cover_default.svg b/res/skins/LateNight/palemoon/style/cover_default.svg
new file mode 100644
index 000000000000..8787eeef1552
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/cover_default.svg
@@ -0,0 +1,41 @@
+<?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="444"
+   height="444"
+   version="1.1"
+   id="svg8">
+  <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="defs12" />
+  <rect
+     width="444"
+     height="444"
+     fill="#696969"
+     fill-opacity=".52156866"
+     opacity=".5"
+     stroke="#000"
+     stroke-linecap="round"
+     stroke-width="1.10000002"
+     style="paint-order:fill markers stroke;fill:#282829;fill-opacity:1;stroke:none;opacity:1"
+     id="rect2" />
+  <path
+     d="M 222 124.2793 C 168.033 124.2793 124.2832 168.02909 124.2832 221.99609 C 124.2832 275.96309 168.033 319.71289 222 319.71289 C 275.967 319.71289 319.7168 275.96309 319.7168 221.99609 C 319.7168 168.02909 275.967 124.2793 222 124.2793 z M 222.00195 216.44141 C 225.07195 216.44141 227.56055 218.93 227.56055 222 C 227.56055 225.07 225.07205 227.55859 222.00195 227.55859 C 218.93195 227.55859 216.44336 225.0699 216.44336 222 C 216.44336 218.93 218.93185 216.44141 222.00195 216.44141 z "
+     id="path4"
+     style="fill:#363636;fill-opacity:1" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/style/latency_bg.png b/res/skins/LateNight/palemoon/style/latency_bg.png
new file mode 100644
index 000000000000..ed8a3cc9930f
Binary files /dev/null and b/res/skins/LateNight/palemoon/style/latency_bg.png differ
diff --git a/res/skins/LateNight/palemoon/style/latency_over.png b/res/skins/LateNight/palemoon/style/latency_over.png
new file mode 100644
index 000000000000..890f20444f7e
Binary files /dev/null and b/res/skins/LateNight/palemoon/style/latency_over.png differ
diff --git a/res/skins/LateNight/palemoon/style/library_branch_closed_grey.png b/res/skins/LateNight/palemoon/style/library_branch_closed_grey.png
new file mode 100644
index 000000000000..8db3c12ddba3
Binary files /dev/null and b/res/skins/LateNight/palemoon/style/library_branch_closed_grey.png differ
diff --git a/res/skins/LateNight/style_flip/library_branch_closed_selected.png b/res/skins/LateNight/palemoon/style/library_branch_closed_selected_white.png
similarity index 100%
rename from res/skins/LateNight/style_flip/library_branch_closed_selected.png
rename to res/skins/LateNight/palemoon/style/library_branch_closed_selected_white.png
diff --git a/res/skins/LateNight/palemoon/style/library_branch_open_grey.png b/res/skins/LateNight/palemoon/style/library_branch_open_grey.png
new file mode 100644
index 000000000000..5f90ac334789
Binary files /dev/null and b/res/skins/LateNight/palemoon/style/library_branch_open_grey.png differ
diff --git a/res/skins/LateNight/style_flip/library_branch_open_selected.png b/res/skins/LateNight/palemoon/style/library_branch_open_selected_white.png
similarity index 100%
rename from res/skins/LateNight/style_flip/library_branch_open_selected.png
rename to res/skins/LateNight/palemoon/style/library_branch_open_selected_white.png
diff --git a/res/skins/LateNight/palemoon/style/library_splitter_handle_unchecked.svg b/res/skins/LateNight/palemoon/style/library_splitter_handle_unchecked.svg
new file mode 100644
index 000000000000..9029ae064142
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/library_splitter_handle_unchecked.svg
@@ -0,0 +1,6 @@
+<svg width="6" height="60" version="1.1" viewBox="0 0 1.5875002 15.875002" xmlns="http://www.w3.org/2000/svg">
+		<path d="m1e-8.26458335h1.58750019l-1e-7 6.87916785-.2645833-.2645834-1.05833343 2e-7-.26458337.2645833z" fill="#1e1e1e" style="paint-order:fill markers stroke"/>
+		<path d="m0 0h1.5875002v.26458335h-1.5875002z" fill="#333" style="paint-order:fill markers stroke"/>
+		<path d="m.79375007 6.8791678c.39575673.0002726.79252633.3865376.79270843.7937501l.0006509.9260411h.265625l-.0006509-.9260411c-.0004143-.5894163-.487626-1.0624923-1.05833343-1.057422z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#0a0a0a" 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.7937501 6.8782565c-.3957567.0002725-.79242218.3865377-.7927084.7937501l-.0006509.9260411h-.26562503l.0006509-.9260411c.00041429-.5894163.48762603-1.0624923 1.05833343-1.057422z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#0a0a0a" 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"/>
+</svg>
diff --git a/res/skins/LateNight/palemoon/style/menu_arrow_ivory.svg b/res/skins/LateNight/palemoon/style/menu_arrow_ivory.svg
new file mode 100644
index 000000000000..dd0c262a1e75
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/menu_arrow_ivory.svg
@@ -0,0 +1,2 @@
+<svg width="10" height="10" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<path d="m1.1132 1.1697 3.7618 3.8426-3.7618 3.8426" fill="none" stroke="#c2b3a5" stroke-width="1.3"/></svg>
diff --git a/res/skins/LateNight/palemoon/style/menu_arrow_white.svg b/res/skins/LateNight/palemoon/style/menu_arrow_white.svg
new file mode 100644
index 000000000000..3bacc6f4bdaa
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/menu_arrow_white.svg
@@ -0,0 +1 @@
+<svg width="10" height="10" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="m1.1132 1.1697 3.7618 3.8426-3.7618 3.8426" fill="none" stroke="#f9f9f9" stroke-width="1.3"/></svg>
diff --git a/res/skins/LateNight/palemoon/style/mixxx_logo_small.svg b/res/skins/LateNight/palemoon/style/mixxx_logo_small.svg
new file mode 100644
index 000000000000..5ea82575a860
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/mixxx_logo_small.svg
@@ -0,0 +1,458 @@
+<?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="74"
+   height="24"
+   version="1.1"
+   id="svg85">
+  <metadata
+     id="metadata89">
+    <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="defs57">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="89.146004"
+       y1="0.028000001"
+       x2="0"
+       id="linearGradient902">
+      <stop
+         style="stop-color:#ae8e1a;stop-opacity:1"
+         id="stop898"
+         offset="0"
+         stop-color="#ffd235" />
+      <stop
+         style="stop-color:#af8119;stop-opacity:1"
+         id="stop900"
+         offset="1"
+         stop-color="#feb30a" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="89.146004"
+       y1="0.028000001"
+       x2="0"
+       id="a-6">
+      <stop
+         id="stop893"
+         offset="0"
+         stop-color="#ffd235" />
+      <stop
+         id="stop895"
+         offset="1"
+         stop-color="#feb30a" />
+    </linearGradient>
+    <linearGradient
+       id="g"
+       x1="74.992996"
+       x2="13.486"
+       y1="-0.1462"
+       y2="88.766998"
+       gradientTransform="matrix(0.19912877,0,0,0.20002033,56.013392,3.0873529)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#39b549"
+         offset=".478"
+         id="stop2" />
+      <stop
+         stop-color="#1a76bc"
+         offset="1"
+         id="stop4" />
+    </linearGradient>
+    <linearGradient
+       id="f"
+       x1="74.998001"
+       x2="13.488"
+       y1="-0.15009999"
+       y2="88.766998"
+       gradientTransform="matrix(0.19912877,0,0,0.20002033,31.636499,3.0873529)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#381f1f"
+         offset="0"
+         id="stop7" />
+      <stop
+         stop-color="#3a1f20"
+         offset=".0017"
+         id="stop9" />
+      <stop
+         stop-color="#5b2825"
+         offset=".0376"
+         id="stop11" />
+      <stop
+         stop-color="#7c2f28"
+         offset=".0757"
+         id="stop13" />
+      <stop
+         stop-color="#9b2e28"
+         offset=".1173"
+         id="stop15" />
+      <stop
+         stop-color="#b62c28"
+         offset=".1626"
+         id="stop17" />
+      <stop
+         stop-color="#cc2626"
+         offset=".2129"
+         id="stop19" />
+      <stop
+         stop-color="#dc2225"
+         offset=".271"
+         id="stop21" />
+      <stop
+         stop-color="#e81f25"
+         offset=".3438"
+         id="stop23" />
+      <stop
+         stop-color="#ed1b26"
+         offset=".478"
+         id="stop25" />
+      <stop
+         stop-color="#f7921e"
+         offset="1"
+         id="stop27" />
+    </linearGradient>
+    <linearGradient
+       id="e"
+       x1="74.991997"
+       x2="13.485"
+       y1="-0.1471"
+       y2="88.765999"
+       gradientTransform="matrix(0.19912877,0,0,0.20002033,43.826283,3.0873529)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#120e1e"
+         offset="0"
+         id="stop30" />
+      <stop
+         stop-color="#1b1426"
+         offset=".0231"
+         id="stop32" />
+      <stop
+         stop-color="#442349"
+         offset=".1446"
+         id="stop34" />
+      <stop
+         stop-color="#652866"
+         offset=".2552"
+         id="stop36" />
+      <stop
+         stop-color="#7c287b"
+         offset=".3511"
+         id="stop38" />
+      <stop
+         stop-color="#8b2589"
+         offset=".4286"
+         id="stop40" />
+      <stop
+         stop-color="#91268f"
+         offset=".478"
+         id="stop42" />
+      <stop
+         stop-color="#ed1b26"
+         offset="1"
+         id="stop44" />
+    </linearGradient>
+    <linearGradient
+       id="h"
+       x2="0"
+       y1="0.028000001"
+       y2="89.146004"
+       gradientTransform="matrix(0.4467,0,0,0.4487,0,0.01288623)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#a" />
+    <linearGradient
+       id="d-3"
+       x2="0"
+       y1="0.028000001"
+       y2="89.146004"
+       gradientTransform="matrix(0.19912877,0,0,0.20002033,30.399372,3.087294)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient902" />
+    <linearGradient
+       id="a-6-3"
+       x2="0"
+       y1="0.028000001"
+       y2="89.146004"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#ffd235"
+         offset="0"
+         id="stop47-7" />
+      <stop
+         stop-color="#feb30a"
+         offset="1"
+         id="stop49-5" />
+    </linearGradient>
+    <linearGradient
+       id="c-3"
+       x2="0"
+       y1="0.028000001"
+       y2="89.146004"
+       gradientTransform="matrix(0.19912877,0,0,0.20002033,42.586053,3.087294)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#a-6-3" />
+    <linearGradient
+       id="b-5"
+       x2="0"
+       y1="0.028000001"
+       y2="89.146004"
+       gradientTransform="matrix(0.19912877,0,0,0.20002033,54.774728,3.087294)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#a-6-3" />
+    <linearGradient
+       id="i-6"
+       x2="0"
+       y1="0.028000001"
+       y2="89.146004"
+       gradientTransform="matrix(0.19912877,0,0,0.20002033,23.961539,3.087294)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#a-6-3" />
+    <linearGradient
+       id="h-2"
+       x2="0"
+       y1="0.028000001"
+       y2="89.146004"
+       gradientTransform="matrix(0.19912877,0,0,0.20002033,1,3.087294)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#a-6-3" />
+    <linearGradient
+       id="g-3"
+       x1="74.992996"
+       x2="13.486"
+       y1="-0.1462"
+       y2="88.766998"
+       gradientTransform="matrix(0.19912877,0,0,0.20002033,56.013392,3.0873525)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#39b549"
+         offset=".478"
+         id="stop2-6" />
+      <stop
+         stop-color="#1a76bc"
+         offset="1"
+         id="stop4-0" />
+    </linearGradient>
+    <linearGradient
+       id="f-6"
+       x1="74.998001"
+       x2="13.488"
+       y1="-0.15009999"
+       y2="88.766998"
+       gradientTransform="matrix(0.19912877,0,0,0.20002033,31.636499,3.0873525)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#381f1f"
+         offset="0"
+         id="stop7-2" />
+      <stop
+         stop-color="#3a1f20"
+         offset=".0017"
+         id="stop9-6" />
+      <stop
+         stop-color="#5b2825"
+         offset=".0376"
+         id="stop11-1" />
+      <stop
+         stop-color="#7c2f28"
+         offset=".0757"
+         id="stop13-8" />
+      <stop
+         stop-color="#9b2e28"
+         offset=".1173"
+         id="stop15-7" />
+      <stop
+         stop-color="#b62c28"
+         offset=".1626"
+         id="stop17-9" />
+      <stop
+         stop-color="#cc2626"
+         offset=".2129"
+         id="stop19-2" />
+      <stop
+         stop-color="#dc2225"
+         offset=".271"
+         id="stop21-0" />
+      <stop
+         stop-color="#e81f25"
+         offset=".3438"
+         id="stop23-2" />
+      <stop
+         stop-color="#ed1b26"
+         offset=".478"
+         id="stop25-3" />
+      <stop
+         stop-color="#f7921e"
+         offset="1"
+         id="stop27-7" />
+    </linearGradient>
+    <linearGradient
+       id="e-5"
+       x1="74.991997"
+       x2="13.485"
+       y1="-0.1471"
+       y2="88.765999"
+       gradientTransform="matrix(0.19912877,0,0,0.20002033,43.826283,3.0873525)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#120e1e"
+         offset="0"
+         id="stop30-9" />
+      <stop
+         stop-color="#1b1426"
+         offset=".0231"
+         id="stop32-2" />
+      <stop
+         stop-color="#442349"
+         offset=".1446"
+         id="stop34-2" />
+      <stop
+         stop-color="#652866"
+         offset=".2552"
+         id="stop36-8" />
+      <stop
+         stop-color="#7c287b"
+         offset=".3511"
+         id="stop38-9" />
+      <stop
+         stop-color="#8b2589"
+         offset=".4286"
+         id="stop40-7" />
+      <stop
+         stop-color="#91268f"
+         offset=".478"
+         id="stop42-3" />
+      <stop
+         stop-color="#ed1b26"
+         offset="1"
+         id="stop44-6" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="12"
+       x2="72.324745"
+       y1="12"
+       x1="54.774727"
+       id="linearGradient914"
+       xlink:href="#linearGradient902" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="12"
+       x2="60.135872"
+       y1="12"
+       x1="42.586052"
+       id="linearGradient916"
+       xlink:href="#linearGradient902" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="12"
+       x2="47.947197"
+       y1="12"
+       x1="30.399372"
+       id="linearGradient918"
+       xlink:href="#linearGradient902" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="12"
+       x2="28.564402"
+       y1="12"
+       x1="23.961538"
+       id="linearGradient920"
+       xlink:href="#linearGradient902" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="12"
+       x2="21.925844"
+       y1="12"
+       x1="1"
+       id="linearGradient922"
+       xlink:href="#linearGradient902" />
+  </defs>
+  <g
+     id="g1121"
+     style="fill:none;stroke:#0f0f0f;stroke-opacity:1;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round">
+    <path
+       style="fill:none;stroke-width:1.5;stroke:#0f0f0f;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+       id="path59-1"
+       d="M 54.77413,20.912646 66.942962,3.087344 h 5.378751 L 60.15511,20.912646 Z" />
+    <path
+       style="fill:none;stroke-width:1.5;stroke:#0f0f0f;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+       id="path61-2"
+       d="M 30.397238,20.912646 42.565178,3.087344 h 5.381871 L 35.780446,20.912646 Z" />
+    <path
+       style="fill:none;stroke-width:1.5;stroke:#0f0f0f;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+       id="path63-9"
+       d="M 42.587021,20.912646 54.755853,3.087344 H 60.13505 L 47.968001,20.912646 Z" />
+  </g>
+  <path
+     d="M 54.77413,20.912646 66.942962,3.0873444 h 5.378751 L 60.15511,20.912646 Z"
+     id="path59"
+     style="fill:url(#g);stroke-width:0.44577742" />
+  <path
+     d="M 30.397238,20.912646 42.565178,3.0873444 h 5.381871 L 35.780446,20.912646 Z"
+     id="path61"
+     style="fill:url(#f);stroke-width:0.44577742" />
+  <path
+     d="M 42.587021,20.912646 54.755853,3.0873444 H 60.13505 L 47.968001,20.912646 Z"
+     id="path63"
+     style="fill:url(#e);stroke-width:0.44577742" />
+  <g
+     transform="matrix(0.44577742,0,0,0.44577742,1,3.0815493)"
+     id="g83"
+     style="fill:none;stroke:#0f0f0f;stroke-width:3.36490798;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;stroke-linejoin:round">
+    <path
+       d="M 105.31533,40.000133 78.021962,0.01288623 H 65.950788 L 93.242371,40.000133 Z"
+       id="path73"
+       style="fill:none;stroke:#0f0f0f;stroke-width:3.36490798;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;stroke-linejoin:round" />
+    <path
+       d="M 132.65784,40.000133 105.35956,0.01288623 H 93.288828 L 120.58666,40.000133 Z"
+       id="path75"
+       style="fill:none;stroke:#0f0f0f;stroke-width:3.36490798;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;stroke-linejoin:round" />
+    <path
+       d="M 160.0008,40.000133 132.70251,0.01288623 H 120.63134 L 147.92962,40.000133 Z"
+       id="path77"
+       style="fill:none;stroke:#0f0f0f;stroke-width:3.36490798;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;stroke-linejoin:round" />
+    <path
+       d="M 51.508977,0.01288623 H 61.834448 V 40.000133 H 51.508977 Z"
+       id="path79"
+       style="fill:none;fill-rule:evenodd;stroke:#0f0f0f;stroke-width:3.36490798;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;stroke-linejoin:round" />
+    <path
+       d="M 10.124456,40.000133 V 16.583377 l 13.077589,19.939331 h 0.26668 L 36.682111,16.380565 V 40.000133 H 46.942363 V 0.01288623 H 35.812386 L 23.468725,19.951768 11.131317,0.01288623 H 0 V 40.000133 Z"
+       id="path81"
+       style="fill:none;stroke:#0f0f0f;stroke-width:3.36490798;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;stroke-linejoin:round" />
+  </g>
+  <path
+     id="path73-1"
+     d="M 47.947196,20.912706 35.780429,3.087294 h -5.381057 l 12.165972,17.825412 z"
+     style="fill:url(#linearGradient918);stroke-width:0.19957405;fill-opacity:1.0" />
+  <path
+     id="path75-2"
+     d="M 60.13587,20.912706 47.966913,3.087294 h -5.38086 L 54.75481,20.912706 Z"
+     style="fill:url(#linearGradient916);stroke-width:0.19957405;fill-opacity:1.0" />
+  <path
+     id="path77-7"
+     d="M 72.324744,20.912706 60.155783,3.087294 h -5.381055 l 12.168956,17.825412 z"
+     style="fill:url(#linearGradient914);stroke-width:0.19957405;fill-opacity:1.0" />
+  <path
+     id="path79-0"
+     d="m 23.961539,3.087294 h 4.602862 v 17.825412 h -4.602862 z"
+     style="fill:url(#linearGradient920);fill-rule:evenodd;stroke-width:0.19957405;fill-opacity:1.0" />
+  <path
+     id="path81-9"
+     d="M 5.5132539,20.912706 V 10.474045 l 5.8296941,8.888503 h 0.11888 l 5.890229,-8.978912 v 10.52907 h 4.573788 V 3.087294 H 16.964353 L 11.461828,11.975597 5.9620898,3.087294 H 1 v 17.825412 z"
+     style="fill:url(#linearGradient922);stroke-width:0.19957405;fill-opacity:1.0" />
+</svg>
diff --git a/res/skins/LateNight/style_flip/spinny_bg.svg b/res/skins/LateNight/palemoon/style/spinny_bg.svg
similarity index 100%
rename from res/skins/LateNight/style_flip/spinny_bg.svg
rename to res/skins/LateNight/palemoon/style/spinny_bg.svg
diff --git a/res/skins/LateNight/palemoon/style/spinny_indicator.svg b/res/skins/LateNight/palemoon/style/spinny_indicator.svg
new file mode 100644
index 000000000000..09c932959e47
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/spinny_indicator.svg
@@ -0,0 +1,50 @@
+<?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="svg12"
+   version="1.1"
+   height="110"
+   width="110">
+  <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="defs16" />
+  <rect
+     style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5"
+     id="rect929-7-3"
+     width="4.1195445"
+     height="30.468542"
+     x="52.940231"
+     y="5.5573483"
+     rx="2" />
+  <rect
+     rx="2"
+     y="5.5573483"
+     x="52.940231"
+     height="30.468542"
+     width="4.1195445"
+     id="rect929-7"
+     style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.596692"
+     id="rect929"
+     width="4.1195445"
+     height="30.468542"
+     x="52.940231"
+     y="5.5573483"
+     rx="2" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/style/spinny_indicator_ghost.svg b/res/skins/LateNight/palemoon/style/spinny_indicator_ghost.svg
new file mode 100644
index 000000000000..766d1df5f90a
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/spinny_indicator_ghost.svg
@@ -0,0 +1,50 @@
+<?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="110"
+   height="110"
+   version="1.1"
+   id="svg12">
+  <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="defs16" />
+  <rect
+     rx="2"
+     y="5.5573483"
+     x="52.940231"
+     height="30.468542"
+     width="4.1195445"
+     id="rect929-7-3"
+     style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.5" />
+  <rect
+     style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect929-7"
+     width="4.1195445"
+     height="30.468542"
+     x="52.940231"
+     y="5.5573483"
+     rx="2" />
+  <rect
+     rx="2"
+     y="5.5573483"
+     x="52.940231"
+     height="30.468542"
+     width="4.1195445"
+     id="rect929"
+     style="fill:#f08c00;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.596692" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/style/spinny_mask_12.svg b/res/skins/LateNight/palemoon/style/spinny_mask_12.svg
new file mode 100644
index 000000000000..dad5fc4f5272
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/spinny_mask_12.svg
@@ -0,0 +1,90 @@
+<?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="svg22"
+   version="1.1"
+   enable-background="new"
+   height="100"
+   width="100">
+  <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="defs12">
+    <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="c">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-color="#eece33" />
+      <stop
+         id="stop4"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#eece33" />
+    </radialGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.26579674,-0.96388794,0.96650068,-0.26507821,114.97193,111.56218)"
+       y2="50"
+       y1="50"
+       x2="97.375"
+       x1="2.625"
+       id="b">
+      <stop
+         id="stop7"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1" />
+      <stop
+         id="stop9"
+         offset="1"
+         stop-opacity=".5714286"
+         stop-color="#dedede"
+         style="stop-color:#a1a1a1;stop-opacity:0.56862748" />
+    </linearGradient>
+  </defs>
+  <rect
+     style="fill:#000000;fill-opacity:0.30000001;stroke-width:1.04167"
+     x="0"
+     y="0"
+     width="100"
+     height="100"
+     color="#000000"
+     enable-background="accumulate"
+     fill="#020202"
+     id="rect2" />
+  <path
+     id="path18"
+     fill="#1e1e1e"
+     enable-background="accumulate"
+     color="#000000"
+     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"
+     style="fill:#1e1e20;fill-opacity:1" />
+  <circle
+     style="fill:#887f6d;fill-opacity:0.4;stroke:none;stroke-width:1.10157;stroke-linecap:round;stroke-linejoin:round"
+     id="path1221-3-6"
+     cx="50"
+     cy="50"
+     r="15" />
+  <path
+     id="path16"
+     d="m 52.66856,50.01315 a 2.6685924,2.6685924 0 0 1 -5.33712,0 2.6685924,2.6685924 0 1 1 5.33712,0 z" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/style/spinny_mask_12_BAK.svg b/res/skins/LateNight/palemoon/style/spinny_mask_12_BAK.svg
new file mode 100644
index 000000000000..e34943408fdb
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/spinny_mask_12_BAK.svg
@@ -0,0 +1,90 @@
+<?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="100"
+   height="100"
+   enable-background="new"
+   version="1.1"
+   id="svg22">
+  <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="defs12">
+    <radialGradient
+       id="c"
+       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"
+         id="stop2" />
+      <stop
+         stop-color="#eece33"
+         stop-opacity="0"
+         offset="1"
+         id="stop4" />
+    </radialGradient>
+    <linearGradient
+       id="b"
+       x1="2.625"
+       x2="97.375"
+       y1="50"
+       y2="50"
+       gradientTransform="matrix(-0.26579674,-0.96388794,0.96650068,-0.26507821,114.97193,111.56218)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0"
+         id="stop7" />
+      <stop
+         style="stop-color:#a1a1a1;stop-opacity:0.56862748"
+         stop-color="#dedede"
+         stop-opacity=".5714286"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+  </defs>
+  <rect
+     id="rect2"
+     fill="#020202"
+     enable-background="accumulate"
+     color="#000000"
+     height="100"
+     width="100"
+     y="0"
+     x="0"
+     style="fill:#000000;fill-opacity:0.30000001;stroke-width:1.04167" />
+  <path
+     style="fill:#1e1e20;fill-opacity:1"
+     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"
+     id="path18" />
+  <circle
+     style="fill:#3e3a32;fill-opacity:1;stroke:none;stroke-width:1.10157;stroke-linecap:round;stroke-linejoin:round"
+     id="path1221-3"
+     cx="50"
+     cy="50"
+     r="15" />
+  <path
+     d="m 52.66856,50.01315 a 2.6685924,2.6685924 0 0 1 -5.33712,0 2.6685924,2.6685924 0 1 1 5.33712,0 z"
+     id="path16" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/style/spinny_mask_34.svg b/res/skins/LateNight/palemoon/style/spinny_mask_34.svg
new file mode 100644
index 000000000000..54547e5d6fa4
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/spinny_mask_34.svg
@@ -0,0 +1,107 @@
+<?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="100"
+   height="100"
+   enable-background="new"
+   version="1.1"
+   id="svg22">
+  <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="defs12">
+    <radialGradient
+       id="c"
+       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"
+         id="stop2" />
+      <stop
+         stop-color="#eece33"
+         stop-opacity="0"
+         offset="1"
+         id="stop4" />
+    </radialGradient>
+    <linearGradient
+       id="b"
+       x1="2.625"
+       x2="97.375"
+       y1="50"
+       y2="50"
+       gradientTransform="matrix(-0.26579674,-0.96388794,0.96650068,-0.26507821,114.97193,111.56218)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0"
+         id="stop7" />
+      <stop
+         style="stop-color:#a1a1a1;stop-opacity:0.56862748"
+         stop-color="#dedede"
+         stop-opacity=".5714286"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0417,0,0,1.0417,-82.086,2.6121)"
+       r="20.077"
+       cy="45.492001"
+       cx="50.002998"
+       id="b-3">
+      <stop
+         id="stop7-6"
+         offset="0"
+         stop-color="#09b2ae" />
+      <stop
+         id="stop9-7"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#09b2ae" />
+    </radialGradient>
+  </defs>
+  <rect
+     style="stroke-width:1.04167;fill:#000000;fill-opacity:0.30000001"
+     x="0"
+     y="0"
+     width="100"
+     height="100"
+     color="#000000"
+     enable-background="accumulate"
+     fill="#020202"
+     id="rect2" />
+  <path
+     style="fill:#1e1e20;fill-opacity:1"
+     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"
+     id="path18" />
+  <circle
+     r="15"
+     cy="50"
+     cx="50"
+     id="path1221-3"
+     style="fill:#56959f;fill-opacity:0.40000001;stroke:none;stroke-width:1.10157;stroke-linecap:round;stroke-linejoin:round" />
+  <path
+     d="m52.66891 49.99266a2.6685924 2.6685924 0 0 1-5.337121 0 2.6685924 2.6685924 0 1 1 5.337121 0z"
+     id="path16" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/style/spinny_mask_cover_12.svg b/res/skins/LateNight/palemoon/style/spinny_mask_cover_12.svg
new file mode 100644
index 000000000000..c029c294211d
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/spinny_mask_cover_12.svg
@@ -0,0 +1,90 @@
+<?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="svg22"
+   version="1.1"
+   enable-background="new"
+   height="100"
+   width="100">
+  <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="defs12">
+    <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="c">
+      <stop
+         id="stop2"
+         offset="0"
+         stop-color="#eece33" />
+      <stop
+         id="stop4"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#eece33" />
+    </radialGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.26579674,-0.96388794,0.96650068,-0.26507821,114.97193,111.56218)"
+       y2="50"
+       y1="50"
+       x2="97.375"
+       x1="2.625"
+       id="b">
+      <stop
+         id="stop7"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1" />
+      <stop
+         id="stop9"
+         offset="1"
+         stop-opacity=".5714286"
+         stop-color="#dedede"
+         style="stop-color:#a1a1a1;stop-opacity:0.56862748" />
+    </linearGradient>
+  </defs>
+  <rect
+     style="fill:#000000;fill-opacity:0.30000001;stroke-width:1.04167"
+     x="0"
+     y="0"
+     width="100"
+     height="100"
+     color="#000000"
+     enable-background="accumulate"
+     fill="#020202"
+     id="rect2" />
+  <path
+     id="path18"
+     fill="#1e1e1e"
+     enable-background="accumulate"
+     color="#000000"
+     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"
+     style="fill:#1e1e20;fill-opacity:1" />
+  <path
+     id="path16"
+     d="m 52.66856,50.01315 a 2.6685924,2.6685924 0 0 1 -5.33712,0 2.6685924,2.6685924 0 1 1 5.33712,0 z" />
+  <circle
+     style="fill:#887f6d;fill-opacity:0.4;stroke:none;stroke-width:1.10157;stroke-linecap:round;stroke-linejoin:round"
+     id="path1221-3-6"
+     cx="50"
+     cy="50"
+     r="15" />
+</svg>
diff --git a/res/skins/LateNight/palemoon/style/spinny_mask_cover_34.svg b/res/skins/LateNight/palemoon/style/spinny_mask_cover_34.svg
new file mode 100644
index 000000000000..8fa8e95a5f58
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/spinny_mask_cover_34.svg
@@ -0,0 +1,107 @@
+<?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="100"
+   height="100"
+   enable-background="new"
+   version="1.1"
+   id="svg22">
+  <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="defs12">
+    <radialGradient
+       id="c"
+       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"
+         id="stop2" />
+      <stop
+         stop-color="#eece33"
+         stop-opacity="0"
+         offset="1"
+         id="stop4" />
+    </radialGradient>
+    <linearGradient
+       id="b"
+       x1="2.625"
+       x2="97.375"
+       y1="50"
+       y2="50"
+       gradientTransform="matrix(-0.26579674,-0.96388794,0.96650068,-0.26507821,114.97193,111.56218)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0"
+         id="stop7" />
+      <stop
+         style="stop-color:#a1a1a1;stop-opacity:0.56862748"
+         stop-color="#dedede"
+         stop-opacity=".5714286"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0417,0,0,1.0417,-82.086,2.6121)"
+       r="20.077"
+       cy="45.492001"
+       cx="50.002998"
+       id="b-3">
+      <stop
+         id="stop7-6"
+         offset="0"
+         stop-color="#09b2ae" />
+      <stop
+         id="stop9-7"
+         offset="1"
+         stop-opacity="0"
+         stop-color="#09b2ae" />
+    </radialGradient>
+  </defs>
+  <rect
+     style="stroke-width:1.04167;fill:#000000;fill-opacity:0.30000001"
+     x="0"
+     y="0"
+     width="100"
+     height="100"
+     color="#000000"
+     enable-background="accumulate"
+     fill="#020202"
+     id="rect2" />
+  <path
+     style="fill:#1e1e20;fill-opacity:1"
+     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"
+     id="path18" />
+  <circle
+     r="15"
+     cy="50"
+     cx="50"
+     id="path1221-3"
+     style="fill:#243e42;fill-opacity:1;stroke:none;stroke-width:1.10157;stroke-linecap:round;stroke-linejoin:round" />
+  <path
+     d="m52.66891 49.99266a2.6685924 2.6685924 0 0 1-5.337121 0 2.6685924 2.6685924 0 1 1 5.337121 0z"
+     id="path16" />
+</svg>
diff --git a/res/skins/LateNight/style_flip/splitter_handle_horizontal_checked.png b/res/skins/LateNight/palemoon/style/splitter_handle_horizontal_checked.png
similarity index 100%
rename from res/skins/LateNight/style_flip/splitter_handle_horizontal_checked.png
rename to res/skins/LateNight/palemoon/style/splitter_handle_horizontal_checked.png
diff --git a/res/skins/LateNight/style_flip/splitter_handle_horizontal_unchecked.png b/res/skins/LateNight/palemoon/style/splitter_handle_horizontal_unchecked.png
similarity index 100%
rename from res/skins/LateNight/style_flip/splitter_handle_horizontal_unchecked.png
rename to res/skins/LateNight/palemoon/style/splitter_handle_horizontal_unchecked.png
diff --git a/res/skins/LateNight/palemoon/style/splitter_handle_vertical_checked.png b/res/skins/LateNight/palemoon/style/splitter_handle_vertical_checked.png
new file mode 100644
index 000000000000..0c0af2be814b
Binary files /dev/null and b/res/skins/LateNight/palemoon/style/splitter_handle_vertical_checked.png differ
diff --git a/res/skins/LateNight/palemoon/style/splitter_handle_vertical_unchecked.png b/res/skins/LateNight/palemoon/style/splitter_handle_vertical_unchecked.png
new file mode 100644
index 000000000000..0741fc82196b
Binary files /dev/null and b/res/skins/LateNight/palemoon/style/splitter_handle_vertical_unchecked.png differ
diff --git a/res/skins/LateNight/style_flip/toolbar_separator.png b/res/skins/LateNight/palemoon/style/toolbar_separator.png
similarity index 100%
rename from res/skins/LateNight/style_flip/toolbar_separator.png
rename to res/skins/LateNight/palemoon/style/toolbar_separator.png
diff --git a/res/skins/LateNight/palemoon/style/vinyl_control_0.svg b/res/skins/LateNight/palemoon/style/vinyl_control_0.svg
new file mode 100644
index 000000000000..1ef47cc0ee41
--- /dev/null
+++ b/res/skins/LateNight/palemoon/style/vinyl_control_0.svg
@@ -0,0 +1,38 @@
+<?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="svg4272">
+  <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="fill:#555554;fill-opacity:1"
+     fill="#555554"
+     color="#000000"
+     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"
+     id="path834" />
+  <path
+     style="fill:#676765;fill-opacity:1"
+     fill="#555554"
+     color="#000000"
+     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"
+     id="path834-6" />
+</svg>
diff --git a/res/skins/LateNight/style_flip/vinyl_control_1.svg b/res/skins/LateNight/palemoon/style/vinyl_control_1.svg
similarity index 100%
rename from res/skins/LateNight/style_flip/vinyl_control_1.svg
rename to res/skins/LateNight/palemoon/style/vinyl_control_1.svg
diff --git a/res/skins/LateNight/style_flip/vinyl_control_2.svg b/res/skins/LateNight/palemoon/style/vinyl_control_2.svg
similarity index 100%
rename from res/skins/LateNight/style_flip/vinyl_control_2.svg
rename to res/skins/LateNight/palemoon/style/vinyl_control_2.svg
diff --git a/res/skins/LateNight/style_flip/vinyl_control_3.svg b/res/skins/LateNight/palemoon/style/vinyl_control_3.svg
similarity index 100%
rename from res/skins/LateNight/style_flip/vinyl_control_3.svg
rename to res/skins/LateNight/palemoon/style/vinyl_control_3.svg
diff --git a/res/skins/LateNight/style_flip/vu_clipping_deck_over.png b/res/skins/LateNight/palemoon/style/vu_deck_clipping_active.png
similarity index 100%
rename from res/skins/LateNight/style_flip/vu_clipping_deck_over.png
rename to res/skins/LateNight/palemoon/style/vu_deck_clipping_active.png
diff --git a/res/skins/LateNight/palemoon/style/vu_deck_clipping_bg_dark.png b/res/skins/LateNight/palemoon/style/vu_deck_clipping_bg_dark.png
new file mode 100644
index 000000000000..e888bc8b8397
Binary files /dev/null and b/res/skins/LateNight/palemoon/style/vu_deck_clipping_bg_dark.png differ
diff --git a/res/skins/LateNight/palemoon/style/vu_deck_clipping_bg_light.png b/res/skins/LateNight/palemoon/style/vu_deck_clipping_bg_light.png
new file mode 100644
index 000000000000..a27b774dabfb
Binary files /dev/null and b/res/skins/LateNight/palemoon/style/vu_deck_clipping_bg_light.png differ
diff --git a/res/skins/LateNight/palemoon/style/vu_deck_level_active.png b/res/skins/LateNight/palemoon/style/vu_deck_level_active.png
new file mode 100644
index 000000000000..75f25c0ade40
Binary files /dev/null and b/res/skins/LateNight/palemoon/style/vu_deck_level_active.png differ
diff --git a/res/skins/LateNight/palemoon/style/vu_deck_level_bg_dark.png b/res/skins/LateNight/palemoon/style/vu_deck_level_bg_dark.png
new file mode 100644
index 000000000000..575029010a9b
Binary files /dev/null and b/res/skins/LateNight/palemoon/style/vu_deck_level_bg_dark.png differ
diff --git a/res/skins/LateNight/palemoon/style/vu_deck_level_bg_light.png b/res/skins/LateNight/palemoon/style/vu_deck_level_bg_light.png
new file mode 100644
index 000000000000..4df3dcfbaa41
Binary files /dev/null and b/res/skins/LateNight/palemoon/style/vu_deck_level_bg_light.png differ
diff --git a/res/skins/LateNight/palemoon/style/vu_micaux_clipping_active.png b/res/skins/LateNight/palemoon/style/vu_micaux_clipping_active.png
new file mode 100644
index 000000000000..94442d3066a5
Binary files /dev/null and b/res/skins/LateNight/palemoon/style/vu_micaux_clipping_active.png differ
diff --git a/res/skins/LateNight/palemoon/style/vu_micaux_clipping_bg_.png b/res/skins/LateNight/palemoon/style/vu_micaux_clipping_bg_.png
new file mode 100644
index 000000000000..f011b5acaea3
Binary files /dev/null and b/res/skins/LateNight/palemoon/style/vu_micaux_clipping_bg_.png differ
diff --git a/res/skins/LateNight/palemoon/style/vu_micaux_level_active.png b/res/skins/LateNight/palemoon/style/vu_micaux_level_active.png
new file mode 100644
index 000000000000..41ee6873ccc4
Binary files /dev/null and b/res/skins/LateNight/palemoon/style/vu_micaux_level_active.png differ
diff --git a/res/skins/LateNight/palemoon/style/vu_micaux_level_bg_.png b/res/skins/LateNight/palemoon/style/vu_micaux_level_bg_.png
new file mode 100644
index 000000000000..25494682a537
Binary files /dev/null and b/res/skins/LateNight/palemoon/style/vu_micaux_level_bg_.png differ
diff --git a/res/skins/LateNight/palemoon/style/vu_preview_clipping_active.png b/res/skins/LateNight/palemoon/style/vu_preview_clipping_active.png
new file mode 100644
index 000000000000..94442d3066a5
Binary files /dev/null and b/res/skins/LateNight/palemoon/style/vu_preview_clipping_active.png differ
diff --git a/res/skins/LateNight/palemoon/style/vu_preview_clipping_bg_.png b/res/skins/LateNight/palemoon/style/vu_preview_clipping_bg_.png
new file mode 100644
index 000000000000..8bac3b19b71c
Binary files /dev/null and b/res/skins/LateNight/palemoon/style/vu_preview_clipping_bg_.png differ
diff --git a/res/skins/LateNight/palemoon/style/vu_preview_level_active.png b/res/skins/LateNight/palemoon/style/vu_preview_level_active.png
new file mode 100644
index 000000000000..41ee6873ccc4
Binary files /dev/null and b/res/skins/LateNight/palemoon/style/vu_preview_level_active.png differ
diff --git a/res/skins/LateNight/palemoon/style/vu_preview_level_bg_.png b/res/skins/LateNight/palemoon/style/vu_preview_level_bg_.png
new file mode 100644
index 000000000000..b97b98dea879
Binary files /dev/null and b/res/skins/LateNight/palemoon/style/vu_preview_level_bg_.png differ
diff --git a/res/skins/LateNight/palemoon/style/vu_sampler_clipping_active.png b/res/skins/LateNight/palemoon/style/vu_sampler_clipping_active.png
new file mode 100644
index 000000000000..94442d3066a5
Binary files /dev/null and b/res/skins/LateNight/palemoon/style/vu_sampler_clipping_active.png differ
diff --git a/res/skins/LateNight/palemoon/style/vu_sampler_clipping_bg_.png b/res/skins/LateNight/palemoon/style/vu_sampler_clipping_bg_.png
new file mode 100644
index 000000000000..96ff63a574fe
Binary files /dev/null and b/res/skins/LateNight/palemoon/style/vu_sampler_clipping_bg_.png differ
diff --git a/res/skins/LateNight/palemoon/style/vu_sampler_level_active.png b/res/skins/LateNight/palemoon/style/vu_sampler_level_active.png
new file mode 100644
index 000000000000..edb6518c73b2
Binary files /dev/null and b/res/skins/LateNight/palemoon/style/vu_sampler_level_active.png differ
diff --git a/res/skins/LateNight/palemoon/style/vu_sampler_level_bg_.png b/res/skins/LateNight/palemoon/style/vu_sampler_level_bg_.png
new file mode 100644
index 000000000000..67828a370f23
Binary files /dev/null and b/res/skins/LateNight/palemoon/style/vu_sampler_level_bg_.png differ
diff --git a/res/skins/LateNight/preview_deck.xml b/res/skins/LateNight/preview_deck.xml
deleted file mode 100644
index f7830be99d80..000000000000
--- a/res/skins/LateNight/preview_deck.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<Template>
-  <SetVariable name="group">[PreviewDeck1]</SetVariable>
-  <!-- This outer widget group makes the PreviewDeck borders work correctly -->
-  <WidgetGroup>
-    <Layout>vertical</Layout>
-    <SizePolicy>me,max</SizePolicy>
-    <Children>
-
-      <WidgetGroup>
-        <ObjectName>PreviewDeck</ObjectName>
-        <Layout>horizontal</Layout>
-        <Size>100min,66f</Size>
-        <Children>
-
-          <!-- PreviewDeck left: Play, text, overview -->
-          <WidgetGroup>
-            <ObjectName>PreviewDeckLeftPart</ObjectName>
-            <Layout>vertical</Layout>
-            <SizePolicy>min,min</SizePolicy>
-            <MinimumSize>,40</MinimumSize>
-            <Children>
-              <!-- Row 1 PreviewTitleEjectRow -->
-              <WidgetGroup>
-                <ObjectName>PreviewTitleEjectRow</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                  <Label>
-                    <ObjectName>PreviewLabel</ObjectName>
-                    <TooltipId>text</TooltipId>
-                    <SizePolicy>min,min</SizePolicy>
-                    <Text>Preview</Text>
-                    <Connection>
-                      <ConfigKey><Variable name="group"/>,track_loaded</ConfigKey>
-                      <Transform><Not/></Transform>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </Label>
-
-                  <WidgetGroup>
-                    <ObjectName>PreviewDeckText</ObjectName>
-                    <Layout>horizontal</Layout>
-                    <SizePolicy>i,min</SizePolicy>
-                    <Children>
-                      <Text>
-                        <ObjectName>PreviewTitle</ObjectName>
-                        <TooltipId>text</TooltipId>
-                        <SizePolicy>me,min</SizePolicy>
-                        <Group><Variable name="group"/></Group>
-                        <Elide>right</Elide>
-                      </Text>
-                      <Number>
-                        <ObjectName>PreviewBPM</ObjectName>
-                        <TooltipId>visual_bpm</TooltipId>
-                        <Size>45f,21f</Size>
-                        <Group><Variable name="group"/></Group>
-                        <!--CSS alignments not respected, bug lp:605530 -->
-                        <Alignment>right</Alignment>
-                        <Connection>
-                          <ConfigKey><Variable name="group"/>,visual_bpm</ConfigKey>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey><Variable name="group"/>,track_loaded</ConfigKey>
-                          <BindProperty>visible</BindProperty>
-                        </Connection>
-                      </Number>
-                    </Children>
-                  </WidgetGroup>
-
-                  <WidgetGroup>
-                    <ObjectName>PreviewEjectButton</ObjectName>
-                    <Layout>horizontal</Layout>
-                    <SizePolicy>min,min</SizePolicy>
-                    <Children>
-                      <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>
-              </WidgetGroup><!-- Row 1 PreviewTitleEjectRow -->
-
-              <!-- Row 2 PreviewPlayOverview -->
-              <WidgetGroup>
-                <ObjectName>PreviewPlayOverview</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>me,me</SizePolicy>
-                <Children>
-                  <WidgetGroup>
-                    <ObjectName>PreviewPlayBox</ObjectName>
-                    <Layout>horizontal</Layout>
-                    <SizePolicy>min,min</SizePolicy>
-                    <Children>
-                      <Template src="skin:button_2state_right_display.xml">
-                        <SetVariable name="TooltipId">cue_gotoandplay_cue_default</SetVariable>
-                        <SetVariable name="ObjectName">PlayPreview</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,32f</Size>
-                    <Children>
-                      <Overview>
-                        <TooltipId>waveform_overview</TooltipId>
-                        <SizePolicy>me,me</SizePolicy>
-                        <Group><Variable name="group"/></Group>
-                        <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>
-                          <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>
-                </Children>
-              </WidgetGroup><!-- Row 2 PreviewPlayOverview -->
-            </Children>
-          </WidgetGroup><!-- PreviewDeck left: Play, text, overview -->
-
-          <!-- PreviewDeck right: VU, pregain -->
-          <WidgetGroup>
-            <ObjectName>PreviewDeckRightPart</ObjectName>
-            <Layout>horizontal</Layout>
-            <Children>
-              <WidgetGroup>
-                <ObjectName>PreviewVuMeter</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                  <Template src="skin:vumeter_small.xml">
-                    <SetVariable name="GroupType">preview</SetVariable>
-                  </Template>
-                </Children>
-              </WidgetGroup>
-
-              <SliderComposed>
-                <TooltipId>pregain</TooltipId>
-                <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>
-                </Connection>
-              </SliderComposed>
-            </Children>
-          </WidgetGroup><!-- PreviewDeck right: VU, pregain -->
-
-        </Children>
-      </WidgetGroup><!-- PreviewDeck -->
-
-    </Children>
-    <Connection>
-      <ConfigKey>[PreviewDeck],show_previewdeck</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/quick_effect_knob_4decks.xml b/res/skins/LateNight/quick_effect_knob_4decks.xml
deleted file mode 100644
index a39a361f4aff..000000000000
--- a/res/skins/LateNight/quick_effect_knob_4decks.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<!DOCTYPE template>
-<Template>
-  <SetVariable name="QuickEffectGroup">[QuickEffectRack1_<Variable name="group"/>]</SetVariable>
-  <SetVariable name="QuickEffect">[QuickEffectRack1_<Variable name="group"/>_Effect1]</SetVariable>
-  <WidgetGroup>
-    <Layout>vertical</Layout>
-    <SizePolicy>min,min</SizePolicy>
-    <Children>
-
-      <WidgetGroup><!-- Kill button + knob -->
-        <Layout>horizontal</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <WidgetGroup><Size>4f,0min</Size></WidgetGroup>
-
-          <WidgetGroup>
-            <ObjectName>EQKillButtonBox4Decks</ObjectName>
-            <Layout>vertical</Layout>
-            <Size>20f,34f</Size>
-            <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><Variable name="QuickEffect"/>,enabled</ConfigKey>
-                  <ButtonState>LeftButton</ButtonState>
-                </Connection>
-              </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>
-            <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>
-
-          <WidgetGroup><Size>2f,0min</Size></WidgetGroup>
-        </Children>
-        <Connection>
-          <ConfigKey><Variable name="QuickEffect"/>,loaded</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup><!-- /Kill button + knob -->
-
-    </Children>
-    <Connection>
-      <ConfigKey>[Skin],show_eq_knobs</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/quick_effect_knob_left.xml b/res/skins/LateNight/quick_effect_knob_left.xml
deleted file mode 100644
index 836165ea9174..000000000000
--- a/res/skins/LateNight/quick_effect_knob_left.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE template>
-<Template>
-  <SetVariable name="QuickEffectGroup">[QuickEffectRack1_<Variable name="group"/>]</SetVariable>
-  <SetVariable name="QuickEffect">[QuickEffectRack1_<Variable name="group"/>_Effect1]</SetVariable>
-
-  <WidgetGroup>
-    <Layout>horizontal</Layout>
-    <SizePolicy>min,min</SizePolicy>
-    <Children>
-
-      <WidgetGroup>
-        <Layout>vertical</Layout>
-        <Size>18f,34f</Size>
-        <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><Variable name="QuickEffect"/>,enabled</ConfigKey>
-              <ButtonState>LeftButton</ButtonState>
-            </Connection>
-          </PushButton>
-        </Children>
-        <Connection>
-          <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>
-
-      <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><Variable name="QuickEffect"/>,loaded</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/quick_effect_knob_right.xml b/res/skins/LateNight/quick_effect_knob_right.xml
deleted file mode 100644
index 3a2e48e46b97..000000000000
--- a/res/skins/LateNight/quick_effect_knob_right.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE template>
-<Template>
-  <SetVariable name="QuickEffectGroup">[QuickEffectRack1_<Variable name="group"/>]</SetVariable>
-  <SetVariable name="QuickEffect">[QuickEffectRack1_<Variable name="group"/>_Effect1]</SetVariable>
-
-  <WidgetGroup>
-    <Layout>horizontal</Layout>
-    <SizePolicy>min,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="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>[Skin],show_eq_kill_buttons</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup>
-
-      <WidgetGroup>
-        <Layout>vertical</Layout>
-        <Size>18f,34f</Size>
-        <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><Variable name="QuickEffect"/>,enabled</ConfigKey>
-              <ButtonState>LeftButton</ButtonState>
-            </Connection>
-          </PushButton>
-        </Children>
-        <Connection>
-          <ConfigKey>[Skin],show_eq_kill_buttons</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup>
-
-    </Children>
-    <Connection>
-      <ConfigKey><Variable name="QuickEffect"/>,loaded</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/sampler.xml b/res/skins/LateNight/sampler.xml
deleted file mode 100644
index 4fa253635d93..000000000000
--- a/res/skins/LateNight/sampler.xml
+++ /dev/null
@@ -1,358 +0,0 @@
-<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>
-    <SizePolicy>me,min</SizePolicy>
-    <Children>
-      <!-- SamplerMainControls -->
-      <WidgetGroup>
-        <ObjectName>SamplerMainControls</ObjectName>
-        <BackPath><Variable name="BgTile"/></BackPath>
-        <Layout>vertical</Layout>
-        <SizePolicy>me,me</SizePolicy>
-        <Children>
-          <WidgetGroup>
-            <ObjectName>SamplerText</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>i,me</SizePolicy>
-            <Children>
-              <TrackProperty>
-                <TooltipId>track_title</TooltipId>
-                <ObjectName>SamplerTitle</ObjectName>
-                <SizePolicy>me,me</SizePolicy>
-                <Property>titleInfo</Property>
-                <Group><Variable name="group"/></Group>
-                <Elide>right</Elide>
-              </TrackProperty>
-
-              <Number>
-                <TooltipId>visual_bpm</TooltipId>
-                <ObjectName>SamplerBpm</ObjectName>
-                <Group>[Sampler<Variable name="samplernum"/>]</Group>
-                <!--CSS alignments not respected see bug lp:605530 , lets call <Alignment>-->
-                <Alignment>left</Alignment>
-                <Connection>
-                  <ConfigKey>[Sampler<Variable name="samplernum"/>],visual_bpm</ConfigKey>
-                </Connection>
-                <Connection>
-                  <ConfigKey>[Sampler<Variable name="samplernum"/>],track_loaded</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </Number>
-
-            </Children>
-          </WidgetGroup>
-
-          <!-- SamplerRowTwo: Play, Overview, Controls, Gain -->
-          <WidgetGroup>
-            <ObjectName>SamplerRowTwo</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>me,me</SizePolicy>
-            <Children>
-              <WidgetGroup>
-                <ObjectName>SamplerPlay</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                  <Template src="skin:button_2state_right_display.xml">
-                    <SetVariable name="TooltipId">cue_gotoandplay_cue_default</SetVariable>
-                    <SetVariable name="ObjectName">PlaySampler</SetVariable>
-                    <SetVariable name="Size">34f,34f</SetVariable>
-                    <SetVariable name="btn_type"><Variable name="TopRegion_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</SetVariable>
-                  </Template>
-                </Children>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <ObjectName>OverviewBox</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>me,min</SizePolicy>
-                <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>
-                <ObjectName>SamplerButtonGrid</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>max,min</SizePolicy>
-                <Children>
-                  <WidgetGroup>
-                    <Layout>horizontal</Layout>
-                    <SizePolicy>min,min</SizePolicy>
-                    <Children>
-                      <Template src="skin:button_2state.xml">
-                        <SetVariable name="TooltipId">repeat</SetVariable>
-                        <SetVariable name="ObjectName">RepeatButton12</SetVariable>
-                        <SetVariable name="btn_type"></SetVariable>
-                        <SetVariable name="ConfigKey"><Variable name="group"/>,repeat</SetVariable>
-                        <SetVariable name="Size">21f,18f</SetVariable>
-                      </Template>
-                      <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>
-
-                  <WidgetGroup>
-                    <Layout>horizontal</Layout>
-                    <SizePolicy>min,min</SizePolicy>
-                    <Children>
-                      <PushButton>
-                        <TooltipId>orientation</TooltipId>
-                        <Size>21f,18f</Size>
-                        <NumberStates>3</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <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">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">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.xml">
-                        <SetVariable name="TooltipId">keylock</SetVariable>
-                        <SetVariable name="ObjectName">KeylockButton12</SetVariable>
-                        <SetVariable name="btn_type"></SetVariable>
-                        <SetVariable name="ConfigKey"><Variable name="group"/>,keylock</SetVariable>
-                        <SetVariable name="Size">21f,18f</SetVariable>
-                      </Template>
-                    </Children>
-                  </WidgetGroup>
-                </Children>
-              </WidgetGroup><!-- /Sampler controls -->
-
-              <WidgetGroup>
-                <ObjectName>SamplerGain</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                  <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>
-
-            </Children>
-          </WidgetGroup><!-- SamplerRowTwo: Play, Overview, Controls, Gain -->
-
-          <!-- Third Row -->
-          <WidgetGroup>
-            <ObjectName>SamplerButtons</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>me,min</SizePolicy>
-            <Children>
-
-              <WidgetGroup>
-                <ObjectName>SamplerHotcues</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <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><!-- /Hotcues 5-8 -->
-                    <Layout>horizontal</Layout>
-                    <SizePolicy>min,min</SizePolicy>
-                    <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 persist="true">[Skin],show_8_hotcues</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup><!-- /Hotcues 5-8 -->
-
-                  <WidgetGroup>
-                    <SizePolicy>me,min</SizePolicy>
-                  </WidgetGroup>
-                </Children>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <ObjectName>SamplerPfl</ObjectName>
-                <Layout>horizontal</Layout>
-                <Size>0min,0min</Size>
-                <Children>
-                  <Template src="skin:button_2state.xml">
-                    <SetVariable name="TooltipId">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>
-                  </Template>
-                </Children>
-              </WidgetGroup><!-- /SamplerPfl -->
-
-            </Children>
-          </WidgetGroup><!-- /SamplerButtons -->
-        </Children>
-      </WidgetGroup><!-- /SamplerMainControls -->
-
-      <WidgetGroup>
-        <ObjectName>SamplerVU</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>f,min</SizePolicy>
-        <Children>
-          <WidgetGroup>
-            <ObjectName>VuMeterBox</ObjectName>
-            <Layout>vertical</Layout>
-            <SizePolicy>f,min</SizePolicy>
-            <Children>
-              <StatusLight>
-                <TooltipId>sampler_PeakIndicator</TooltipId>
-                <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>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>
-                <PeakFallTime>50</PeakFallTime>
-                <PeakFallStep>2</PeakFallStep>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,VuMeter</ConfigKey>
-                </Connection>
-              </VuMeter>
-            </Children>
-          </WidgetGroup>
-        </Children>
-      </WidgetGroup><!-- SamplerVU -->
-
-      <WidgetGroup>
-        <ObjectName>SamplerRateControls</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <WidgetGroup>
-            <ObjectName>SamplerPitchSlider</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,min</SizePolicy>
-            <Children>
-              <SliderComposed>
-                <TooltipId>rate</TooltipId>
-                <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>
-                </Connection>
-              </SliderComposed>
-            </Children>
-          </WidgetGroup>
-
-          <WidgetGroup>
-            <ObjectName>AlignHCenter</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,min</SizePolicy>
-            <Children>
-              <Template src="skin:button_2state_right.xml">
-                <SetVariable name="TooltipId">beatsync_beatsync_tempo</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><!-- SamplerRateControls -->
-
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/sampler_mini.xml b/res/skins/LateNight/sampler_mini.xml
deleted file mode 100644
index 120a70c976e5..000000000000
--- a/res/skins/LateNight/sampler_mini.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<Template>
-  <SetVariable name="group">[Sampler<Variable name="samplernum"/>]</SetVariable>
-
-  <WidgetGroup>
-    <ObjectName>SamplerDeckMini</ObjectName>
-    <Layout>horizontal</Layout>
-    <SizePolicy>me,min</SizePolicy>
-    <Children>
-
-      <WidgetGroup>
-        <ObjectName>SamplerPlaySmall</ObjectName>
-        <Layout>horizontal</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <Template src="skin:button_2state_right_display.xml">
-            <SetVariable name="TooltipId">cue_gotoandplay_cue_default</SetVariable>
-            <SetVariable name="ObjectName">PlaySampler</SetVariable>
-            <SetVariable name="Size">34f,34f</SetVariable>
-            <SetVariable name="btn_type"><Variable name="TopRegion_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</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-
-      <WidgetGroup>
-        <ObjectName>SamplerMiniControls</ObjectName>
-        <Layout>vertical</Layout>
-        <Size>0me,36f</Size>
-        <Children>
-
-          <!-- Top row -->
-          <WidgetGroup>
-            <ObjectName>SamplerTextSmall</ObjectName>
-            <Layout>horizontal</Layout>
-            <Size>0min,18f</Size>
-            <Children>
-              <TrackProperty>
-                <TooltipId>track_title</TooltipId>
-                <ObjectName>SamplerTitleSmall</ObjectName>
-                <SizePolicy>me,min</SizePolicy>
-                <Property>titleInfo</Property>
-                <Group><Variable name="group"/></Group>
-                <Elide>right</Elide>
-              </TrackProperty>
-            </Children>
-          </WidgetGroup>
-
-          <!-- Bottom row -->
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <Size>0min,18f</Size>
-            <Children>
-              <Number>
-                <TooltipId>visual_bpm</TooltipId>
-                <ObjectName>SamplerBpm</ObjectName>
-                <Group>[Sampler<Variable name="samplernum"/>]</Group>
-                <!--CSS alignments not respected see bug lp:605530 , lets call <Alignment>-->
-                <Alignment>left</Alignment>
-                <Connection>
-                  <ConfigKey>[Sampler<Variable name="samplernum"/>],visual_bpm</ConfigKey>
-                </Connection>
-                <Connection>
-                  <ConfigKey>[Sampler<Variable name="samplernum"/>],track_loaded</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </Number>
-
-              <WidgetGroup><SizePolicy>me,min</SizePolicy></WidgetGroup>
-
-              <PushButton>
-                <TooltipId>orientation</TooltipId>
-                <Size>21f,18f</Size>
-                <NumberStates>3</NumberStates>
-                <State>
-                  <Number>0</Number>
-                  <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">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">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.xml">
-                <SetVariable name="TooltipId">keylock</SetVariable>
-                <SetVariable name="ObjectName">KeylockButton12</SetVariable>
-                <SetVariable name="btn_type"></SetVariable>
-                <SetVariable name="ConfigKey"><Variable name="group"/>,keylock</SetVariable>
-                <SetVariable name="Size">21f,18f</SetVariable>
-              </Template>
-
-              <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><!-- Bottom row -->
-
-        </Children>
-      </WidgetGroup><!-- SamplerMiniControls -->
-
-    </Children>
-  </WidgetGroup><!-- SamplerDeckMini -->
-</Template>
diff --git a/res/skins/LateNight/samplers/sampler.xml b/res/skins/LateNight/samplers/sampler.xml
new file mode 100644
index 000000000000..47eda94e6673
--- /dev/null
+++ b/res/skins/LateNight/samplers/sampler.xml
@@ -0,0 +1,340 @@
+<Template>
+  <SetVariable name="Group">[Sampler<Variable name="SamplerNum"/>]</SetVariable>
+
+  <WidgetGroup>
+    <ObjectName>Sampler</ObjectName>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,min</SizePolicy>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>SamplerMainControls</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>me,me</SizePolicy>
+        <Children>
+
+          <WidgetGroup>
+            <ObjectName>SamplerTitleRow</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>i,me</SizePolicy>
+            <Children>
+              <TrackProperty>
+                <TooltipId>track_title</TooltipId>
+                <ObjectName>SamplerTitle</ObjectName>
+                <SizePolicy>me,me</SizePolicy>
+                <Property>title</Property>
+                <Group><Variable name="Group"/></Group>
+                <Elide>right</Elide>
+              </TrackProperty>
+
+              <Number>
+                <TooltipId>visual_bpm</TooltipId>
+                <ObjectName>SamplerBpm</ObjectName>
+                <Group><Variable name="Group"/></Group>
+                <!--CSS alignments not respected see bug lp:605530 , lets call <Alignment>-->
+                <Alignment>left</Alignment>
+                <Connection>
+                  <ConfigKey><Variable name="Group"/>,visual_bpm</ConfigKey>
+                </Connection>
+                <Connection>
+                  <ConfigKey><Variable name="Group"/>,track_loaded</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </Number>
+            </Children>
+          </WidgetGroup>
+
+          <!--  * Play, Overview, Controls, Gain  | VU
+                * hotcues + Pfl                   |  meter -->
+          <WidgetGroup>
+            <ObjectName>SamplerRowTwo</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>me,me</SizePolicy>
+            <Children>
+              <!--  * Play, Overview, Controls, Gain
+                    * hotcues + Pfl  -->
+              <WidgetGroup>
+                <ObjectName></ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>me,me</SizePolicy>
+                <Children>
+
+                  <WidgetGroup>
+                    <ObjectName></ObjectName>
+                    <Layout>horizontal</Layout>
+                    <SizePolicy>me,me</SizePolicy>
+                    <Children>
+                      <WidgetGroup>
+                        <ObjectName>SamplerPlayBox</ObjectName>
+                        <Layout>horizontal</Layout>
+                        <SizePolicy>min,min</SizePolicy>
+                        <Children>
+                          <Template src="skin:/controls/button_2state_right_display.xml">
+                            <SetVariable name="TooltipId">cue_gotoandplay_cue_default</SetVariable>
+                            <SetVariable name="ObjectName">PlaySampler</SetVariable>
+                            <SetVariable name="Size">34f,34f</SetVariable>
+                            <SetVariable name="BtnType"><Variable name="TopRegion_BtnType"/></SetVariable>
+                            <SetVariable name="BtnSize">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</SetVariable>
+                          </Template>
+                        </Children>
+                      </WidgetGroup><!-- SamplerPlay -->
+
+                      <WidgetGroup>
+                        <ObjectName>OverviewBox</ObjectName>
+                        <Layout>horizontal</Layout>
+                        <SizePolicy>me,min</SizePolicy>
+                        <Children>
+                          <Template src="skin:/decks/overview.xml">
+                            <SetVariable name="SignalColor"><Variable name="SignalColor_12"/></SetVariable>
+                            <SetVariable name="BgColor"><Variable name="BgColorOverview_12"/></SetVariable>
+                            <SetVariable name="OverviewFontSize"><Variable name="OverviewFontSizeSampler"/></SetVariable>
+                          </Template>
+                        </Children>
+                        <Connection>
+                          <ConfigKey><Variable name="Group"/>,track_loaded</ConfigKey>
+                          <BindProperty>highlight</BindProperty>
+                        </Connection>
+                      </WidgetGroup><!-- OverviewBox -->
+
+                      <WidgetGroup>
+                        <ObjectName>SamplerSettings</ObjectName>
+                        <Layout>vertical</Layout>
+                        <SizePolicy>max,min</SizePolicy>
+                        <Children>
+                          <WidgetGroup>
+                            <Layout>horizontal</Layout>
+                            <SizePolicy>min,min</SizePolicy>
+                            <Children>
+                              <Template src="skin:/controls/button_2state.xml">
+                                <SetVariable name="TooltipId">repeat</SetVariable>
+                                <SetVariable name="ObjectName">RepeatButton12</SetVariable>
+                                <SetVariable name="BtnType"></SetVariable>
+                                <SetVariable name="ConfigKey"><Variable name="Group"/>,repeat</SetVariable>
+                                <SetVariable name="Size">21f,18f</SetVariable>
+                              </Template>
+                              <Template src="skin:/controls/button_1state.xml">
+                                <SetVariable name="TooltipId">eject</SetVariable>
+                                <SetVariable name="ObjectName">EjectButton12</SetVariable>
+                                <SetVariable name="BtnType"></SetVariable>
+                                <SetVariable name="ConfigKey"><Variable name="Group"/>,eject</SetVariable>
+                                <SetVariable name="Size">21f,18f</SetVariable>
+                              </Template>
+                            </Children>
+                          </WidgetGroup>
+
+                          <WidgetGroup>
+                            <Layout>horizontal</Layout>
+                            <SizePolicy>min,min</SizePolicy>
+                            <Children>
+                              <PushButton>
+                                <TooltipId>orientation</TooltipId>
+                                <Size>21f,18f</Size>
+                                <NumberStates>3</NumberStates>
+                                <State>
+                                  <Number>0</Number>
+                                  <Pressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_sampler_left.svg</Pressed>
+                                  <Unpressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_sampler_left.svg</Unpressed>
+                                </State>
+                                <State>
+                                  <Number>1</Number>
+                                  <Pressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_sampler_master.svg</Pressed>
+                                  <Unpressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_sampler_master.svg</Unpressed>
+                                </State>
+                                <State>
+                                  <Number>2</Number>
+                                  <Pressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_sampler_right.svg</Pressed>
+                                  <Unpressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_sampler_right.svg</Unpressed>
+                                </State>
+                                <Connection>
+                                  <ConfigKey><Variable name="Group"/>,orientation</ConfigKey>
+                                  <ButtonState>LeftButton</ButtonState>
+                                </Connection>
+                              </PushButton>
+                              <Template src="skin:/controls/button_2state.xml">
+                                <SetVariable name="TooltipId">keylock</SetVariable>
+                                <SetVariable name="ObjectName">KeylockButton12</SetVariable>
+                                <SetVariable name="BtnType"></SetVariable>
+                                <SetVariable name="ConfigKey"><Variable name="Group"/>,keylock</SetVariable>
+                                <SetVariable name="Size">21f,18f</SetVariable>
+                              </Template>
+                            </Children>
+                          </WidgetGroup>
+                        </Children>
+                      </WidgetGroup><!-- SamplerSettings -->
+
+                      <WidgetGroup>
+                        <ObjectName>SamplerGain</ObjectName>
+                        <Layout>horizontal</Layout>
+                        <SizePolicy>min,min</SizePolicy>
+                        <Children>
+                          <Template src="skin:/controls/knob_textless.xml">
+                            <SetVariable name="TooltipId">pregain</SetVariable>
+                            <SetVariable name="Size">35f,30f</SetVariable>
+                            <SetVariable name="KnobBg">small</SetVariable>
+                            <SetVariable name="KnobIndicator">small</SetVariable>
+                            <SetVariable name="KnobColor">orange</SetVariable>
+                            <SetVariable name="ArcColor"><Variable name="ArcColorGain"/></SetVariable>
+                            <SetVariable name="ArcThickness"><Variable name="ArcThicknessBig"/></SetVariable>
+                            <SetVariable name="ArcRadius"><Variable name="ArcRadiusCompact"/></SetVariable>
+                            <SetVariable name="unipolar">true</SetVariable>
+                            <SetVariable name="Group"><Variable name="Group"/></SetVariable>
+                            <SetVariable name="Control">pregain</SetVariable>
+                          </Template>
+                        </Children>
+                      </WidgetGroup><!-- SamplerGain -->
+                    </Children>
+                  </WidgetGroup><!-- Play + overview + settings + gain -->
+
+                  <WidgetGroup><!-- hotcues + pfl -->
+                    <ObjectName>SamplerButtons</ObjectName>
+                    <Layout>horizontal</Layout>
+                    <SizePolicy>me,min</SizePolicy>
+                    <Children>
+
+                      <WidgetGroup>
+                        <ObjectName>SamplerHotcues</ObjectName>
+                        <Layout>horizontal</Layout>
+                        <SizePolicy>min,min</SizePolicy>
+                        <Children>
+                          <Template src="skin:/controls/button_hotcue.xml">
+                            <SetVariable name="number">1</SetVariable>
+                          </Template>
+
+                          <Template src="skin:/controls/button_hotcue.xml">
+                            <SetVariable name="number">2</SetVariable>
+                          </Template>
+
+                          <Template src="skin:/controls/button_hotcue.xml">
+                            <SetVariable name="number">3</SetVariable>
+                          </Template>
+
+                          <Template src="skin:/controls/button_hotcue.xml">
+                            <SetVariable name="number">4</SetVariable>
+                          </Template>
+
+                          <WidgetGroup><!-- /Hotcues 5-8 -->
+                            <Layout>horizontal</Layout>
+                            <SizePolicy>f,min</SizePolicy>
+                            <Children>
+                              <Template src="skin:/controls/button_hotcue.xml">
+                                <SetVariable name="number">5</SetVariable>
+                              </Template>
+
+                              <Template src="skin:/controls/button_hotcue.xml">
+                                <SetVariable name="number">6</SetVariable>
+                              </Template>
+
+                              <Template src="skin:/controls/button_hotcue.xml">
+                                <SetVariable name="number">7</SetVariable>
+                              </Template>
+
+                              <Template src="skin:/controls/button_hotcue.xml">
+                                <SetVariable name="number">8</SetVariable>
+                              </Template>
+                            </Children>
+                            <Connection>
+                              <ConfigKey persist="true">[Skin],show_8_hotcues</ConfigKey>
+                              <BindProperty>visible</BindProperty>
+                            </Connection>
+                          </WidgetGroup><!-- /Hotcues 5-8 -->
+
+                          <WidgetGroup>
+                            <SizePolicy>me,min</SizePolicy>
+                          </WidgetGroup>
+                        </Children>
+                      </WidgetGroup><!-- SamplerHotcues -->
+
+                      <WidgetGroup>
+                        <ObjectName>SamplerPfl</ObjectName>
+                        <Layout>horizontal</Layout>
+                        <Size>0min,0min</Size>
+                        <Children>
+                          <Template src="skin:/controls/button_2state.xml">
+                            <SetVariable name="TooltipId">pfl</SetVariable>
+                            <SetVariable name="ObjectName">PflButton</SetVariable>
+                            <SetVariable name="BtnType"><Variable name="TopRegion_BtnType"/></SetVariable>
+                            <SetVariable name="BtnSize">square</SetVariable>
+                            <SetVariable name="Size">26f,26f</SetVariable>
+                            <SetVariable name="ConfigKey"><Variable name="Group"/>,pfl</SetVariable>
+                          </Template>
+                        </Children>
+                      </WidgetGroup><!-- SamplerPfl -->
+
+                    </Children>
+                  </WidgetGroup><!-- hotcues + pfl -->
+
+                </Children>
+              </WidgetGroup><!--  * Play, Overview, Controls, Gain
+                                  * hotcues + Pfl  -->
+
+              <WidgetGroup>
+                <ObjectName>SamplerVU</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>f,min</SizePolicy>
+                <Children>
+                  <Template src="skin:/mixer/vumeter_single.xml">
+                    <SetVariable name="ChannelType">sampler</SetVariable>
+                    <SetVariable name="VuSize">sampler</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup><!-- SamplerVU -->
+            </Children>
+          </WidgetGroup><!--  * Play, Overview, Controls, Gain  | VU
+                              * hotcues + Pfl                   |  meter -->
+
+        </Children>
+      </WidgetGroup><!-- /SamplerMainControls -->
+
+      <WidgetGroup>
+        <ObjectName>SamplerRateControls</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <WidgetGroup>
+            <ObjectName>AlignHCenter</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <Template src="skin:/controls/button_2state_right.xml">
+                <SetVariable name="TooltipId">beatsync_beatsync_tempo</SetVariable>
+                <SetVariable name="ObjectName">SyncSampler</SetVariable>
+                <SetVariable name="Size">26f,26f</SetVariable>
+                <SetVariable name="BtnType"><Variable name="TopRegion_BtnType"/></SetVariable>
+                <SetVariable name="BtnSize">square</SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="Group"/>,beatsync</SetVariable>
+                <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,beatsync_tempo</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>SamplerPitchSlider</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <SliderComposed>
+                <TooltipId>rate</TooltipId>
+                <Size>30f,65f</Size>
+                <Handle scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/knob_pitch_sampler.svg</Handle>
+                <Slider scalemode="STRETCH_ASPECT">skin:/<Variable name="SliderScheme"/>/sliders/slider_pitch_sampler.svg</Slider>
+                <Horizontal>false</Horizontal>
+                <BarWidth><Variable name="BarWidth"/></BarWidth>
+                <BarMargins><Variable name="BarMarginPitchSampler"/></BarMargins>
+                <BarAxisPos>15.0</BarAxisPos>
+                <BarColor><Variable name="BarColorPitch"/></BarColor>
+                <BarUnipolar>false</BarUnipolar>
+                <Connection>
+                  <ConfigKey><Variable name="Group"/>,rate</ConfigKey>
+                </Connection>
+              </SliderComposed>
+            </Children>
+          </WidgetGroup><!-- SamplerPitchSlider -->
+        </Children>
+      </WidgetGroup><!-- SamplerRateControls -->
+
+    </Children>
+  </WidgetGroup><!-- Sampler -->
+</Template>
diff --git a/res/skins/LateNight/samplers/sampler_mini.xml b/res/skins/LateNight/samplers/sampler_mini.xml
new file mode 100644
index 000000000000..0c6014112510
--- /dev/null
+++ b/res/skins/LateNight/samplers/sampler_mini.xml
@@ -0,0 +1,125 @@
+<Template>
+  <SetVariable name="Group">[Sampler<Variable name="SamplerNum"/>]</SetVariable>
+
+  <WidgetGroup>
+    <ObjectName>SamplerMini</ObjectName>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,min</SizePolicy>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>SamplerPlayBoxMini</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:/controls/button_2state_right_display.xml">
+            <SetVariable name="TooltipId">cue_gotoandplay_cue_default</SetVariable>
+            <SetVariable name="ObjectName">PlaySampler</SetVariable>
+            <SetVariable name="Size">34f,34f</SetVariable>
+            <SetVariable name="BtnType"><Variable name="TopRegion_BtnType"/></SetVariable>
+            <SetVariable name="BtnSize">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</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName></ObjectName>
+        <Layout>vertical</Layout>
+        <Size>0me,36f</Size>
+        <Children>
+
+          <WidgetGroup>
+            <ObjectName>SamplerTitleBoxMini</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>i,f</SizePolicy>
+            <MinimumSize>,18</MinimumSize>
+            <Children>
+              <TrackProperty>
+                <TooltipId>track_title</TooltipId>
+                <ObjectName>SamplerTitleMini</ObjectName>
+                <SizePolicy>me,me</SizePolicy>
+                <Property>title</Property>
+                <Group><Variable name="Group"/></Group>
+                <Elide>right</Elide>
+              </TrackProperty>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>SamplerBPMSettingsMini</ObjectName>
+            <Layout>horizontal</Layout>
+            <Size>,18f</Size>
+            <Children>
+              <Number>
+                <TooltipId>visual_bpm</TooltipId>
+                <ObjectName>SamplerBpm</ObjectName>
+                <Size>45f,18f</Size>
+                <Group><Variable name="Group"/></Group>
+                <!--CSS alignments not respected see bug lp:605530 , lets call <Alignment>-->
+                <Alignment>left</Alignment>
+                <Connection>
+                  <ConfigKey><Variable name="Group"/>,visual_bpm</ConfigKey>
+                </Connection>
+                <Connection>
+                  <ConfigKey><Variable name="Group"/>,track_loaded</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </Number>
+
+              <WidgetGroup><Size>0me,0min</Size></WidgetGroup>
+
+              <WidgetGroup>
+                <ObjectName>SamplerSettingsMini</ObjectName>
+                <Layout>horizontal</Layout>
+                <Size>43f,18f</Size>
+                <Children>
+                  <PushButton>
+                    <TooltipId>orientation</TooltipId>
+                    <Size>21f,18f</Size>
+                    <NumberStates>3</NumberStates>
+                    <State>
+                      <Number>0</Number>
+                      <Pressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_sampler_left.svg</Pressed>
+                      <Unpressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_sampler_left.svg</Unpressed>
+                    </State>
+                    <State>
+                      <Number>1</Number>
+                      <Pressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_sampler_master.svg</Pressed>
+                      <Unpressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_sampler_master.svg</Unpressed>
+                    </State>
+                    <State>
+                      <Number>2</Number>
+                      <Pressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_sampler_right.svg</Pressed>
+                      <Unpressed scalemode="STRETCH_ASPECT">skin:/<Variable name="BtnScheme"/>/buttons/btn__xfader_sampler_right.svg</Unpressed>
+                    </State>
+                    <Connection>
+                      <ConfigKey><Variable name="Group"/>,orientation</ConfigKey>
+                      <ButtonState>LeftButton</ButtonState>
+                    </Connection>
+                  </PushButton>
+                  <Template src="skin:/controls/button_1state.xml">
+                    <SetVariable name="TooltipId">eject</SetVariable>
+                    <SetVariable name="ObjectName">EjectButton12</SetVariable>
+                    <SetVariable name="BtnType"></SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="Group"/>,eject</SetVariable>
+                    <SetVariable name="Size">21f,18f</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup><!-- SamplerControlsMini -->
+
+            </Children>
+            <Connection>
+              <ConfigKey><Variable name="Group"/>,track_loaded</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup><!-- SamplerBPMSettingsMini -->
+
+        </Children>
+      </WidgetGroup><!-- SamplerMiniControls -->
+
+    </Children>
+  </WidgetGroup><!-- SamplerMini -->
+</Template>
diff --git a/res/skins/LateNight/samplers_4decks.xml b/res/skins/LateNight/samplers/samplers_4decks.xml
similarity index 90%
rename from res/skins/LateNight/samplers_4decks.xml
rename to res/skins/LateNight/samplers/samplers_4decks.xml
index 7e8d7dd8f920..7fbc975c2049 100644
--- a/res/skins/LateNight/samplers_4decks.xml
+++ b/res/skins/LateNight/samplers/samplers_4decks.xml
@@ -1,5 +1,6 @@
 <Template>
   <WidgetGroup>
+    <ObjectName>SamplerContainer</ObjectName>
     <Layout>horizontal</Layout>
     <SizePolicy>me,max</SizePolicy>
     <Children>
@@ -12,6 +13,7 @@
           <WidgetGroup>
             <ObjectName>SamplerRow</ObjectName>
 		        <Layout>horizontal</Layout>
+		        <SizePolicy>min,min</SizePolicy>
 		        <Children>
 
               <SingletonContainer>
@@ -23,7 +25,7 @@
               </SingletonContainer>
 
               <SingletonContainer>
-                <ObjectName>SamplerExpandbutton_Singleton</ObjectName>
+                <ObjectName>SamplerExpand_Singleton</ObjectName>
               </SingletonContainer>
 
               <SingletonContainer>
@@ -54,7 +56,7 @@
               </SingletonContainer>
 
               <SingletonContainer>
-                <ObjectName>SamplerExpandbutton_Singleton</ObjectName>
+                <ObjectName>SamplerExpand_Singleton</ObjectName>
               </SingletonContainer>
 
               <SingletonContainer>
diff --git a/res/skins/LateNight/samplers_8decks.xml b/res/skins/LateNight/samplers/samplers_8decks.xml
similarity index 79%
rename from res/skins/LateNight/samplers_8decks.xml
rename to res/skins/LateNight/samplers/samplers_8decks.xml
index d60fd138ebe0..d77891c57edf 100644
--- a/res/skins/LateNight/samplers_8decks.xml
+++ b/res/skins/LateNight/samplers/samplers_8decks.xml
@@ -1,5 +1,6 @@
 <Template>
   <WidgetGroup>
+    <ObjectName>SamplerContainer</ObjectName>
     <Layout>horizontal</Layout>
     <SizePolicy>me,max</SizePolicy>
     <Children>
@@ -11,8 +12,9 @@
           <!--8 small Samplers -->
           <WidgetGroup>
             <ObjectName>SamplerRow</ObjectName>
-		        <Layout>horizontal</Layout>
-		        <Children>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
 
               <SingletonContainer>
                 <ObjectName>SamplerMini1_Singleton</ObjectName>
@@ -31,7 +33,7 @@
               </SingletonContainer>
 
               <SingletonContainer>
-                <ObjectName>SamplerExpandbutton_Singleton</ObjectName>
+                <ObjectName>SamplerExpand_Singleton</ObjectName>
               </SingletonContainer>
 
               <SingletonContainer>
@@ -75,24 +77,23 @@
                   </SingletonContainer>
 
                   <SingletonContainer>
-                    <ObjectName>SamplerExpandbutton_Singleton</ObjectName>
+                    <ObjectName>SamplerExpand_Singleton</ObjectName>
                   </SingletonContainer>
 
                   <Template src="skin:sampler.xml">
-                    <SetVariable name="samplernum">5</SetVariable>
+                    <SetVariable name="SamplerNum">5</SetVariable>
                   </Template>
 
                   <Template src="skin:sampler.xml">
-                    <SetVariable name="samplernum">6</SetVariable>
+                    <SetVariable name="SamplerNum">6</SetVariable>
                   </Template>
 
                 </Children>
-              </WidgetGroup>
-              <!-- /First row -->
+              </WidgetGroup><!-- /First row -->
 
-              <!-- Second row -->
-              <WidgetGroup>
+              <WidgetGroup><!-- Second row -->
                 <ObjectName>SamplerRow</ObjectName>
+                <SizePolicy>min,min</SizePolicy>
                 <Layout>horizontal</Layout>
                 <Children>
 
@@ -104,14 +105,17 @@
                     <ObjectName>Sampler4_Singleton</ObjectName>
                   </SingletonContainer>
 
-                  <WidgetGroup><Size>6f,1min</Size></WidgetGroup>
+                  <WidgetGroup>
+                    <ObjectName>MicAuxRackFiller</ObjectName>
+                    <Size>20f,1me</Size>
+                  </WidgetGroup>
 
                   <Template src="skin:sampler.xml">
-                    <SetVariable name="samplernum">7</SetVariable>
+                    <SetVariable name="SamplerNum">7</SetVariable>
                   </Template>
 
                   <Template src="skin:sampler.xml">
-                    <SetVariable name="samplernum">8</SetVariable>
+                    <SetVariable name="SamplerNum">8</SetVariable>
                   </Template>
 
                 </Children>
diff --git a/res/skins/LateNight/samplers/singletons.xml b/res/skins/LateNight/samplers/singletons.xml
new file mode 100644
index 000000000000..b31fb9d36e27
--- /dev/null
+++ b/res/skins/LateNight/samplers/singletons.xml
@@ -0,0 +1,230 @@
+<Template>
+
+  <SingletonDefinition>
+    <ObjectName>SamplerExpand_Singleton</ObjectName>
+    <Children>
+      <!-- needs an extra wrapper otherwise border wouldn't get applied -->
+      <WidgetGroup>
+        <SizePolicy>min,me</SizePolicy>
+        <Layout>vertical</Layout>
+        <Children>
+          <WidgetGroup>
+            <ObjectName>SamplerExpandBox</ObjectName>
+            <SizePolicy>min,me</SizePolicy>
+            <Layout>vertical</Layout>
+            <Children>
+              <PushButton>
+                <TooltipId>show_samplers</TooltipId>
+                <ObjectName>SamplerExpand</ObjectName>
+                <Size>16f,36f</Size>
+                <NumberStates>2</NumberStates>
+                <State>
+                  <Number>0</Number>
+                </State>
+                <State>
+                  <Number>1</Number>
+                </State>
+                <Connection>
+                  <ConfigKey>[Skin],expand_samplers</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+              </PushButton>
+            </Children>
+          </WidgetGroup><!-- SamplerExpandBox -->
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition><!-- SamplerExpand_Singleton -->
+
+  <SingletonDefinition>
+    <ObjectName>SamplerMini1_Singleton</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>AlignCenterTop</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:/samplers/sampler_mini.xml">
+            <SetVariable name="SamplerNum">1</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>SamplerMini2_Singleton</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>AlignCenterTop</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:/samplers/sampler_mini.xml">
+            <SetVariable name="SamplerNum">2</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>SamplerMini3_Singleton</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>AlignCenterTop</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:/samplers/sampler_mini.xml">
+            <SetVariable name="SamplerNum">3</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>SamplerMini4_Singleton</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>AlignCenterTop</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:/samplers/sampler_mini.xml">
+            <SetVariable name="SamplerNum">4</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>SamplerMini5_Singleton</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>AlignCenterTop</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:/samplers/sampler_mini.xml">
+            <SetVariable name="SamplerNum">5</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>SamplerMini6_Singleton</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>AlignCenterTop</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:/samplers/sampler_mini.xml">
+            <SetVariable name="SamplerNum">6</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>SamplerMini7_Singleton</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>AlignCenterTop</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:/samplers/sampler_mini.xml">
+            <SetVariable name="SamplerNum">7</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>SamplerMini8_Singleton</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>AlignCenterTop</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:/samplers/sampler_mini.xml">
+            <SetVariable name="SamplerNum">8</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>Sampler1_Singleton</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>AlignCenterTop</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:/samplers/sampler.xml">
+            <SetVariable name="SamplerNum">1</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>Sampler2_Singleton</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>AlignCenterTop</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:/samplers/sampler.xml">
+            <SetVariable name="SamplerNum">2</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>Sampler3_Singleton</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>AlignCenterTop</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:/samplers/sampler.xml">
+            <SetVariable name="SamplerNum">3</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>Sampler4_Singleton</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>AlignCenterTop</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:/samplers/sampler.xml">
+            <SetVariable name="SamplerNum">4</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+</Template>
diff --git a/res/skins/LateNight/samplers_rack.xml b/res/skins/LateNight/samplers_rack.xml
index dc2be7a6845c..3b214f38c359 100644
--- a/res/skins/LateNight/samplers_rack.xml
+++ b/res/skins/LateNight/samplers_rack.xml
@@ -1,245 +1,11 @@
 <Template>
-  <SetVariable name="btn_type">embedded</SetVariable>
+  <SetVariable name="BtnType"><Variable name="SubRegion_BtnType"/></SetVariable>
 
-  <SingletonDefinition>
-    <ObjectName>SamplerExpandbutton_Singleton</ObjectName>
-    <Children>
-      <WidgetGroup>
-        <ObjectName>AlignCenterTop</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <WidgetGroup>
-            <ObjectName>SamplerExpandButtonBox</ObjectName>
-            <SizePolicy>min,me</SizePolicy>
-            <Layout>vertical</Layout>
-            <Children>
-              <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>
-      </WidgetGroup>
-    </Children>
-  </SingletonDefinition>
-
-  <SingletonDefinition>
-    <ObjectName>SamplerMini1_Singleton</ObjectName>
-    <Children>
-      <WidgetGroup>
-        <ObjectName>AlignCenterTop</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <Template src="skin:sampler_mini.xml">
-            <SetVariable name="samplernum">1</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </SingletonDefinition>
-
-  <SingletonDefinition>
-    <ObjectName>SamplerMini2_Singleton</ObjectName>
-    <Children>
-      <WidgetGroup>
-        <ObjectName>AlignCenterTop</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <Template src="skin:sampler_mini.xml">
-            <SetVariable name="samplernum">2</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </SingletonDefinition>
-
-  <SingletonDefinition>
-    <ObjectName>SamplerMini3_Singleton</ObjectName>
-    <Children>
-      <WidgetGroup>
-        <ObjectName>AlignCenterTop</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <Template src="skin:sampler_mini.xml">
-            <SetVariable name="samplernum">3</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </SingletonDefinition>
-
-  <SingletonDefinition>
-    <ObjectName>SamplerMini4_Singleton</ObjectName>
-    <Children>
-      <WidgetGroup>
-        <ObjectName>AlignCenterTop</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <Template src="skin:sampler_mini.xml">
-            <SetVariable name="samplernum">4</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </SingletonDefinition>
-
-  <SingletonDefinition>
-    <ObjectName>SamplerMini5_Singleton</ObjectName>
-    <Children>
-      <WidgetGroup>
-        <ObjectName>AlignCenterTop</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <Template src="skin:sampler_mini.xml">
-            <SetVariable name="samplernum">5</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </SingletonDefinition>
-
-  <SingletonDefinition>
-    <ObjectName>SamplerMini6_Singleton</ObjectName>
-    <Children>
-      <WidgetGroup>
-        <ObjectName>AlignCenterTop</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <Template src="skin:sampler_mini.xml">
-            <SetVariable name="samplernum">6</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </SingletonDefinition>
-
-  <SingletonDefinition>
-    <ObjectName>SamplerMini7_Singleton</ObjectName>
-    <Children>
-      <WidgetGroup>
-        <ObjectName>AlignCenterTop</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <Template src="skin:sampler_mini.xml">
-            <SetVariable name="samplernum">7</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </SingletonDefinition>
-
-  <SingletonDefinition>
-    <ObjectName>SamplerMini8_Singleton</ObjectName>
-    <Children>
-      <WidgetGroup>
-        <ObjectName>AlignCenterTop</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <Template src="skin:sampler_mini.xml">
-            <SetVariable name="samplernum">8</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </SingletonDefinition>
-
-  <SingletonDefinition>
-    <ObjectName>Sampler1_Singleton</ObjectName>
-    <Children>
-      <WidgetGroup>
-        <ObjectName>AlignCenterTop</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <Template src="skin:sampler.xml">
-            <SetVariable name="samplernum">1</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </SingletonDefinition>
-
-  <SingletonDefinition>
-    <ObjectName>Sampler2_Singleton</ObjectName>
-    <Children>
-      <WidgetGroup>
-        <ObjectName>AlignCenterTop</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <Template src="skin:sampler.xml">
-            <SetVariable name="samplernum">2</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </SingletonDefinition>
-
-  <SingletonDefinition>
-    <ObjectName>Sampler3_Singleton</ObjectName>
-    <Children>
-      <WidgetGroup>
-        <ObjectName>AlignCenterTop</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <Template src="skin:sampler.xml">
-            <SetVariable name="samplernum">3</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </SingletonDefinition>
-
-  <SingletonDefinition>
-    <ObjectName>Sampler4_Singleton</ObjectName>
-    <Children>
-      <WidgetGroup>
-        <ObjectName>AlignCenterTop</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <Template src="skin:sampler.xml">
-            <SetVariable name="samplernum">4</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </SingletonDefinition>
+  <Template src="skin:/samplers/singletons.xml"/>
 
   <WidgetGroup>
     <Layout>horizontal</Layout>
     <SizePolicy>me,max</SizePolicy>
-    <Connection>
-      <ConfigKey>[Samplers],show_samplers</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
     <Children>
 
       <WidgetGroup><Size>0min,0min</Size></WidgetGroup>
@@ -251,10 +17,10 @@
             <Children>
 
               <!--only 4 Sampler but big -->
-              <Template src="skin:samplers_4decks.xml"/>
+              <Template src="skin:/samplers/samplers_4decks.xml"/>
 
               <!--8 Sampler -->
-              <Template trigger="[Skin],8_samplers" on_hide_select="0" src="skin:samplers_8decks.xml"/>
+              <Template trigger="[Skin],8_samplers" on_hide_select="0" src="skin:/samplers/samplers_8decks.xml"/>
 
             </Children>
           </WidgetStack>
@@ -263,14 +29,10 @@
 
       <WidgetGroup><Size>0min,0min</Size></WidgetGroup>
 
-      <WidgetGroup>
-        <Size>2f,1min</Size>
-        <Connection>
-          <ConfigKey>[Master],skin_settings</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup>
-
     </Children>
+    <Connection>
+      <ConfigKey>[Samplers],show_samplers</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/screen_h-size_detection.xml b/res/skins/LateNight/screen_h-size_detection.xml
deleted file mode 100644
index 72e3c5682d81..000000000000
--- a/res/skins/LateNight/screen_h-size_detection.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<!--
-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
deleted file mode 100644
index 8b78b9fd6539..000000000000
--- a/res/skins/LateNight/separator_artist_title.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<!-- 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
deleted file mode 100644
index a052a0d2bc2e..000000000000
--- a/res/skins/LateNight/separator_spinny_cover.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- 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 844543e5d894..849dbc4da584 100644
--- a/res/skins/LateNight/skin.xml
+++ b/res/skins/LateNight/skin.xml
@@ -1,7 +1,8 @@
   <!--
-  LateNight, Resizable skin for Mixxx 2.1.x
+  LateNight, Resizable skin for Mixxx 2.3.x
   www.mixxx.org
-  Copyright (C) 2010-2013 jus <s.brandt@mixxx.org>, 2014 Owen Williams <owilliams@mixxx.org>
+  Copyright (C) 2010-2013 jus <s.brandt@mixxx.org>, 2014 Owen Williams <owilliams@mixxx.org>,
+  2019-2020 ronso0 <ronso0@mixxx.org>
   "LateNight" is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported license.
   http://creativecommons.org/licenses/by-sa/3.0/
 
@@ -35,12 +36,15 @@
     <language>en</language>
     <license>Creative Commons Attribution, Share-Alike 3.0 Unported</license>
     <attributes>
-      <!-- Set skin defaults. -->
+      <!-- Set skin defaults -->
+      <!-- Decks -->
       <attribute config_key="[Master],num_decks">4</attribute>
       <attribute config_key="[Master],num_samplers">8</attribute>
-      <!-- Decks -->
+
+      <attribute persist="true" config_key="[Skin],show_waveforms">1</attribute>
       <attribute persist="true" config_key="[Skin],show_4decks">0</attribute>
       <attribute persist="true" config_key="[Skin],show_8_hotcues">1</attribute>
+      <attribute persist="true" config_key="[LateNight],deck_size_without_mixer">1</attribute>
       <attribute persist="true" config_key="[Skin],show_intro_outro_cues">1</attribute>
       <attribute persist="true" config_key="[Skin],show_spinnies">1</attribute>
       <attribute persist="true" config_key="[Skin],show_coverart">1</attribute>
@@ -48,6 +52,8 @@
       <attribute persist="true" config_key="[Vinylcontrol],show_vinylcontrol">0</attribute>
       <attribute persist="true" config_key="[Skin],show_rate_controls">1</attribute>
       <attribute persist="true" config_key="[Skin],show_rate_control_buttons">1</attribute>
+      <attribute persist="true" config_key="[Skin],show_rate_key_controls_compact">1</attribute>
+      <attribute persist="true" config_key="[Skin],show_beatgrid_controls">1</attribute>
       <attribute persist="true" config_key="[Skin],timing_shift_buttons">0</attribute>
       <!-- Mixer -->
       <attribute persist="true" config_key="[Master],show_mixer">1</attribute>
@@ -55,6 +61,7 @@
       <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>
+      <attribute persist="true" config_key="[LateNight],show_vumeters_compact">1</attribute>
       <!-- Effects -->
       <attribute persist="true" config_key="[EffectRack1],show">1</attribute>
       <attribute persist="true" config_key="[Skin],show_4effectunits">0</attribute>
@@ -65,12 +72,13 @@
       <attribute persist="true" config_key="[Skin],expand_samplers">0</attribute>
       <!-- Library -->
       <attribute config_key="[Master],maximize_library">0</attribute>
+      <attribute persist="true" config_key="[LateNight],max_lib_show_decks">1</attribute>
       <attribute persist="true" config_key="[PreviewDeck],show_previewdeck">0</attribute>
       <attribute persist="true" config_key="[Library],show_coverart">1</attribute>
 
       <attribute persist="true" config_key="[Microphone],show_microphone">0</attribute>
       <attribute config_key="[Master],skin_settings">0</attribute>
-      <!--Disable hidden effect routing Buttons-->
+      <!-- Disable hidden effect routing Buttons -->
       <attribute persist="false" config_key="[EffectRack1_EffectUnit1],group_[MasterOutput]_enable">0</attribute>
       <attribute persist="false" config_key="[EffectRack1_EffectUnit1],group_[BusLeft]_enable">0</attribute>
       <attribute persist="false" config_key="[EffectRack1_EffectUnit1],group_[BusCenter]_enable">0</attribute>
@@ -93,125 +101,171 @@
       <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 create 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>
+      <Name>PaleMoon</Name>
+      <!-- Mix any of the existing button, knob, slider or style theme subsets.
+        The button templates for example link to skin:/BtnTheme/buttons/btn_...
+
+        BtnScheme     borders / background images for pushbuttons, spinboxes,
+                      effect selector, AutoDJ fade mode selector.
+                      If 'BtnSize' variable is undefined it links to transparent
+                      dummy icons like btn_embedded__active.svg
+              Note:   Icons for buttons that have images set in xml already are set
+                      in the respective style-[theme].qss
+        KnobScheme    guess what
+        SliderScheme  ...exactly!
+        StyleScheme   icons & backgrounds for library, splitters, spinnies,
+                      VU meter, default cover art etc. -->
+      <Style src="skin:style_palemoon.qss"/>
+      <SetVariable name="BtnScheme">palemoon</SetVariable>
+      <SetVariable name="KnobScheme">palemoon</SetVariable>
+      <SetVariable name="SliderScheme">palemoon</SetVariable>
+      <SetVariable name="StyleScheme">palemoon</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>
+      <!-- This is a hack to have a grey background in empty decks.
+          When a track is laoded the bg gets darker for better contrast -->
+      <SetVariable name="BgColorOverview_12">#19191a</SetVariable>
+      <SetVariable name="BgColorOverview_34">#001b23</SetVariable>
+      <SetVariable name="BgColorOverview_SamPre">rgba(15, 15, 15, 20)</SetVariable>
+      <SetVariable name="BgColorWaveform_12">#0f0f0e</SetVariable>
+      <SetVariable name="BgColorWaveform_34">#001b23</SetVariable>
+      <SetVariable name="SignalColor_12">#d9b28c</SetVariable>
+      <SetVariable name="SignalColor_34">#7bc6c3</SetVariable>
+    <!--
+      <SetVariable name="SignalRGBHighColor">slateblue</SetVariable>
+      <SetVariable name="SignalRGBMidColor">limegreen</SetVariable>
+      <SetVariable name="SignalRGBLowColor">firebrick</SetVariable>
+      <SetVariable name="SignalRGBHighColor">#100032</SetVariable>
+      <SetVariable name="SignalRGBMidColor">#102800</SetVariable>
+      <SetVariable name="SignalRGBLowColor">#3c0000</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>
+      <SetVariable name="SignalRGBMidColor">#33f600</SetVariable>
+      <SetVariable name="SignalRGBLowColor">#ff2a00</SetVariable>
+      <SetVariable name="AxesColor">#999</SetVariable>
+      <SetVariable name="BeatColor">#999</SetVariable>
+      <!--SetVariable name="PlayPosColor">#00c8ff</SetVariable-->
+      <!-- <SetVariable name="PlayPosColor">#ff9417</SetVariable> -->
+      <SetVariable name="PlayPosColor">#00c6ff</SetVariable>
+      <SetVariable name="CueColor">#ff7a01</SetVariable>
+      <SetVariable name="LoopColor">#00b400</SetVariable>
+      <SetVariable name="IntroOutroColor">#2c5c9a</SetVariable>
+      <SetVariable name="PlayedOverlayColor">#dd151515</SetVariable>
+      <SetVariable name="EndOfTrackColor">#f856e7</SetVariable>
+      <SetVariable name="OverviewFontSizeDeck">13</SetVariable>
+      <SetVariable name="OverviewFontSizeDeckMini">11</SetVariable>
+      <SetVariable name="OverviewFontSizeSampler">10</SetVariable>
+      <SetVariable name="OverviewFontSizePreview">9</SetVariable>
+
+      <!-- Set the button type
+        * elevated: buttons stand out, have a 3D border and a drop shadow
+        * embedded: buttons are domed and seem leveled with surface, and they have surrounding groove
+        In PaleMoon there's only the _embedded_ style set -->
+      <!-- Buttons in top-level containers like mixer, rate controls, collapsed FxUnits etc. -->
+      <SetVariable name="TopRegion_BtnType">embedded</SetVariable>
+      <!-- Buttons in subregions like transport row, mic/aux units etc. -->
+      <SetVariable name="SubRegion_BtnType">embedded</SetVariable>
+
+      <!-- Knob settings -->
+      <SetVariable name="PotiMinAngle">-130</SetVariable>
+      <SetVariable name="PotiMaxAngle">130</SetVariable>
+      <!-- Arc Settings -->
+      <SetVariable name="ArcRadiusBig">14.5</SetVariable>
+      <SetVariable name="ArcRadiusCompact">13.0</SetVariable>
+      <SetVariable name="ArcRadiusSmall">12.0</SetVariable>
+      <SetVariable name="ArcThicknessBig">2</SetVariable>
+      <SetVariable name="ArcRoundCaps">true</SetVariable>
+      <!-- Arc Colors -->
+      <SetVariable name="ArcColorEq">#858585</SetVariable>
+      <SetVariable name="ArcColorGain">#b96300</SetVariable>
+      <SetVariable name="ArcColorFx12Quick">#518f00</SetVariable>
+      <SetVariable name="ArcColorFx34">#028392</SetVariable>
+      <SetVariable name="ArcColorFxParameter">#6d6d6d</SetVariable>
+      <SetVariable name="ArcColorGainLow">#8d3b11</SetVariable>
+      <SetVariable name="ArcColorMstBal">#a00000</SetVariable>
+      <SetVariable name="ArcColorFxMix">#aa0000</SetVariable>
+      <!-- Knob pointers
+           = suffix for indicator image url -->
+      <SetVariable name="KnobColorEq">grey</SetVariable>
+      <SetVariable name="KnobColorQuickEffect">green</SetVariable>
+      <SetVariable name="KnobColorFx12">green</SetVariable>
+      <SetVariable name="KnobColorFx34">blue</SetVariable>
+      <SetVariable name="KnobColorFxParameter">grey</SetVariable>
+      <!-- Size of the small EQ kill indicators
+            svg is 6x6 px, set size to '0f,0f' to hide them -->
+      <SetVariable name="EqKillDotSize">6f,6f</SetVariable>
+
+      <!-- Slider bar settings -->
+      <SetVariable name="BarBgColor">#020202</SetVariable>
+      <SetVariable name="BarColorVolume">#257b82</SetVariable>
+      <SetVariable name="BarColorCrossfader">#257b82</SetVariable>
+      <SetVariable name="BarColorPitch">#888</SetVariable>
+      <SetVariable name="BarWidth">2</SetVariable>
+      <SetVariable name="BarMarginVolume">8,8</SetVariable>
+      <SetVariable name="BarMarginPitch">7,8</SetVariable>
+      <SetVariable name="BarMarginPitchSampler">5,5</SetVariable>
+      <SetVariable name="BarMarginCrossfader">7,7</SetVariable>
+    </Scheme><!-- PaleMoon -->
 
     <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>
+      <Name>Classic</Name>
+      <Style src="skin:style_classic.qss"/>
+      <SetVariable name="BtnScheme">classic</SetVariable>
+      <SetVariable name="KnobScheme">classic</SetVariable>
+      <SetVariable name="SliderScheme">classic</SetVariable>
+      <SetVariable name="StyleScheme">classic</SetVariable>
+
+      <SetVariable name="TopRegion_BtnType">embedded</SetVariable>
+      <SetVariable name="SubRegion_BtnType">elevated</SetVariable>
+
+      <!-- Knob settings -->
+      <SetVariable name="PotiMinAngle">-135</SetVariable>
+      <SetVariable name="PotiMaxAngle">135</SetVariable>
+      <SetVariable name="KnobColorEq">red</SetVariable>
+      <SetVariable name="KnobColorQuickEffect">green</SetVariable>
+      <SetVariable name="KnobColorFx12">green</SetVariable>
+      <SetVariable name="KnobColorFx34">blue</SetVariable>
+      <SetVariable name="KnobColorFxParameter">white</SetVariable>
+      <!-- EQ kill dots conflict with arcs in Classic knob backgrounds.
+        Leaving it blank could cause users to accidentially click it
+        without having a 'kill' indicator, so we 'remove' it. -->
+      <SetVariable name="EqKillDotSize">0f,0f</SetVariable>
+
+      <!-- Waveform & Overview colors -->
+      <SetVariable name="BgColorOverview_12">rgba(15, 15, 15, 20)</SetVariable>
+      <SetVariable name="BgColorOverview_34">rgba(0, 27, 35, 120)</SetVariable>
+      <SetVariable name="BgColorOverview_SamPre">#0f0f0f</SetVariable>
+      <SetVariable name="BgColorWaveform_12">#0f0f0e</SetVariable>
+      <SetVariable name="BgColorWaveform_34">#001b23</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="SignalColor_34">#09b2ae</SetVariable>
       <SetVariable name="SignalRGBHighColor">#332acc</SetVariable>
-      <SetVariable name="BeatColor">#ffffff</SetVariable>
+      <SetVariable name="SignalRGBMidColor">#33f600</SetVariable>
+      <SetVariable name="SignalRGBLowColor">#ff2a00</SetVariable>
       <SetVariable name="AxesColor">#ffffff</SetVariable>
-      <SetVariable name="PlayPosColor">#00ff00</SetVariable>
+      <SetVariable name="BeatColor">#ffffff</SetVariable>
+      <SetVariable name="PlayPosColor">#00c8ff</SetVariable>
+      <SetVariable name="CueColor">#ff001c</SetVariable>
+      <SetVariable name="LoopColor">#00ff00</SetVariable>
+      <SetVariable name="IntroOutroColor">#0000ff</SetVariable>
       <SetVariable name="PlayedOverlayColor">#bb000000</SetVariable>
-      <SetVariable name="EndOfTrackColor">#ff00ff</SetVariable>
-
-    </Scheme>
+      <SetVariable name="EndOfTrackColor">#f856e7</SetVariable>
+      <SetVariable name="OverviewFontSizeDeck">13</SetVariable>
+      <SetVariable name="OverviewFontSizeDeckMini">11</SetVariable>
+      <SetVariable name="OverviewFontSizeSampler">10</SetVariable>
+      <SetVariable name="OverviewFontSizePreview">9</SetVariable>
+    </Scheme><!-- Classic -->
   </Schemes>
 
   <ObjectName>Mixxx</ObjectName>
-  <Style src="skin:style.qss" src-mac="skin:style-mac.qss"/>
+  <Style src="skin:style.qss"/>
   <!-- MinimumSize should not be an exact monitor resolution. There needs
   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>
+  <MinimumSize>1280,668</MinimumSize>
   <SizePolicy>me,me</SizePolicy>
   <Layout>vertical</Layout>
   <LaunchImageStyle>
@@ -219,9 +273,10 @@
       background-color: #0f0f0f;
     }
     QLabel {
-      <!-- ToDo ronso0 :: Unfortunately, variables are not considered here. Yet ;)
+      <!-- ToDo ronso0 :: Unfortunately, variables are not considered here, yet ;)
+          because the launch screen appears while the skin is parsed.
       image: url(skin:/style_<Variable name="scheme"/>/mixxx_logo.svg); -->
-      image: url(skin:/style_classic/mixxx_logo.svg);
+      image: url(skin:/classic/style/mixxx_logo.svg);
       padding: 0;
       margin: 0px 2px 0px 2px;
       border: none;
@@ -231,7 +286,7 @@
       max-height: 40px;
     }
     QProgressBar {
-      background: url(skin:/style_classic/progressbar_bg.svg);
+      background: url(skin:/classic/style/progressbar_bg.svg);
       border: none;
       min-width: 164px;
       min-height: 5px;
@@ -239,107 +294,80 @@
       max-height: 5px;
     }
     QProgressBar::chunk {
-      background: url(skin:/style_classic/progressbar.svg);
+      background: url(skin:/classic/style/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>
-    <!-- Define singletons as early in the skin as possible.  Note that the
-    library doesn't actually appear here, it's just instantiated and configured.
-    -->
-
+    <!-- Define singletons as early in the skin as possible.
+    Note that Singletons don't actually appear here, they are just instantiated
+    and configured. -->
     <SingletonDefinition>
-      <ObjectName>WaveformsSingleton</ObjectName>
+      <ObjectName>Deck1_Src</ObjectName>
       <Children>
-        <Template src="skin:waveforms_container.xml"/>
-      </Children>
-    </SingletonDefinition>
-
-    <SingletonDefinition>
-      <ObjectName>SpinnyCoverart1</ObjectName>
-      <Children>
-        <Template src="skin:spinny_coverart.xml">
-          <SetVariable name="channum">1</SetVariable>
-        </Template>
-      </Children>
-    </SingletonDefinition>
-
-    <SingletonDefinition>
-      <ObjectName>SpinnyCoverart2</ObjectName>
-      <Children>
-        <Template src="skin:spinny_coverart.xml">
-          <SetVariable name="channum">2</SetVariable>
-        </Template>
+      <Template src="skin:/decks/deck.xml">
+        <SetVariable name="ChanNum">1</SetVariable>
+        <SetVariable name="DeckGroup">12</SetVariable>
+        <SetVariable name="SignalColor"><Variable name="SignalColor_12"/></SetVariable>
+        <SetVariable name="BgColor"><Variable name="BgColorOverview_12"/></SetVariable>
+      </Template>
       </Children>
     </SingletonDefinition>
 
     <SingletonDefinition>
-      <ObjectName>SpinnyCoverart3</ObjectName>
+      <ObjectName>Deck2_Src</ObjectName>
       <Children>
-        <Template src="skin:spinny_coverart.xml">
-          <SetVariable name="channum">3</SetVariable>
+        <Template src="skin:/decks/deck.xml">
+          <SetVariable name="ChanNum">2</SetVariable>
+          <SetVariable name="DeckGroup">12</SetVariable>
+          <SetVariable name="SignalColor"><Variable name="SignalColor_12"/></SetVariable>
+          <SetVariable name="BgColor"><Variable name="BgColorOverview_12"/></SetVariable>
         </Template>
       </Children>
     </SingletonDefinition>
 
     <SingletonDefinition>
-      <ObjectName>SpinnyCoverart4</ObjectName>
+      <ObjectName>Deck3_Src</ObjectName>
       <Children>
-        <Template src="skin:spinny_coverart.xml">
-          <SetVariable name="channum">4</SetVariable>
-        </Template>
+      <Template src="skin:/decks/deck.xml">
+        <SetVariable name="ChanNum">3</SetVariable>
+        <SetVariable name="DeckGroup">34</SetVariable>
+        <SetVariable name="SignalColor"><Variable name="SignalColor_34"/></SetVariable>
+        <SetVariable name="BgColor"><Variable name="BgColorOverview_34"/></SetVariable>
+      </Template>
       </Children>
     </SingletonDefinition>
 
     <SingletonDefinition>
-      <ObjectName>DeckOverview1</ObjectName>
+      <ObjectName>Deck4_Src</ObjectName>
       <Children>
-        <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>
+      <Template src="skin:/decks/deck.xml">
+        <SetVariable name="ChanNum">4</SetVariable>
+        <SetVariable name="DeckGroup">34</SetVariable>
+        <SetVariable name="SignalColor"><Variable name="SignalColor_34"/></SetVariable>
+        <SetVariable name="BgColor"><Variable name="BgColorOverview_34"/></SetVariable>
+      </Template>
       </Children>
     </SingletonDefinition>
 
     <SingletonDefinition>
-      <ObjectName>DeckOverview2</ObjectName>
+      <ObjectName>DecksLeft_Struct</ObjectName>
       <Children>
-        <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>
+        <Template src="skin:/decks/decks_left.xml"/>
       </Children>
     </SingletonDefinition>
 
     <SingletonDefinition>
-      <ObjectName>DeckOverview3</ObjectName>
+      <ObjectName>DecksRight_Struct</ObjectName>
       <Children>
-        <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>
+        <Template src="skin:/decks/decks_right.xml"/>
       </Children>
     </SingletonDefinition>
 
-    <SingletonDefinition>
-      <ObjectName>DeckOverview4</ObjectName>
-      <Children>
-        <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>
+    <Template src="skin:/mixer/singletons.xml"/>
 
     <SingletonDefinition>
       <ObjectName>LibrarySingleton</ObjectName>
@@ -353,7 +381,18 @@
       <Layout>vertical</Layout>
       <SizePolicy>me,me</SizePolicy>
       <Children>
-        <!-- regular/maximized library + skin settings menu -->
+
+      <!-- Some helpers to show widgets and switch layouts
+          depending on the skin configuration.
+          Appearantly putting those here keeps i.e. the deck
+          size when [Master],maximize_library is toggled. -->
+        <Template src="skin:/helpers/skin_helper_deck_size.xml"/>
+        <Template src="skin:/helpers/skin_helper_mic_ducking.xml"/>
+        <Template src="skin:/helpers/skin_helper_spinny-cover.xml"/>
+
+        <Template src="skin:toolbar.xml"/>
+
+        <!-- regular/maximized library  |  skin settings menu -->
         <WidgetGroup>
           <Layout>horizontal</Layout>
           <SizePolicy>me,me</SizePolicy>
@@ -363,40 +402,61 @@
             <WidgetStack currentpage="[Master],maximize_library">
               <Children>
 
-                <!-- Waveforms, Decks, Effects... /  Library -->
+                <!-- Waveforms, Decks, Effects... /  Library
+                This view needs to be set up first because it instantiates
+                the mini deck Singletons we need in maximized library view. -->
                 <Splitter>
                   <ObjectName>HorizontalSplitter</ObjectName>
                   <Orientation>vertical</Orientation>
                   <SizePolicy>me,min</SizePolicy>
                   <SplitSizesConfigKey>[Skin],stackedWaveforms_splitSize</SplitSizesConfigKey>
-                  <Collapsible>1,0</Collapsible>
-                  <Connection>
-                    <ConfigKey>[Master],maximize_library</ConfigKey>
-                    <Transform><Not/></Transform>
-                    <BindProperty>visible</BindProperty>
-                  </Connection>
+                  <Collapsible>0,0</Collapsible>
                   <Children>
 
-                    <SingletonContainer>
-                      <ObjectName>WaveformsSingleton</ObjectName>
-                    </SingletonContainer>
+                    <WidgetGroup>
+                      <Layout>vertical</Layout>
+                      <SizePolicy>me,max</SizePolicy>
+                      <Children>
+                        <Template src="skin:waveforms_container.xml"/>
+                      </Children>
+                      <Connection>
+                        <ConfigKey persist="true">[Skin],show_waveforms</ConfigKey>
+                        <BindProperty>visible</BindProperty>
+                      </Connection>
+                    </WidgetGroup>
 
                     <WidgetGroup>
+                      <ObjectName>DecksMixerContainer</ObjectName>
                       <Layout>vertical</Layout>
                       <SizePolicy>me,me</SizePolicy>
                       <Children>
+                        <WidgetGroup><!-- Top spacer when waveforms are hidden -->
+                          <ObjectName>ToolbarDeckSpacer</ObjectName>
+                          <Connection>
+                            <ConfigKey persist="true">[Skin],show_waveforms</ConfigKey>
+                            <Transform><Not/></Transform>
+                            <BindProperty>visible</BindProperty>
+                          </Connection>
+                        </WidgetGroup><!-- ToolbarDeckSpacer -->
+
                         <WidgetGroup>
                           <Layout>horizontal</Layout>
                           <SizePolicy>me,max</SizePolicy>
                           <Children>
-                            <Template src="skin:decks_left.xml"/>
+                            <SingletonContainer>
+                              <ObjectName>DecksLeft_Struct</ObjectName>
+                            </SingletonContainer>
                             <Template src="skin:mixer.xml"/>
-                            <Template src="skin:decks_right.xml"/>
+                            <SingletonContainer>
+                              <ObjectName>DecksRight_Struct</ObjectName>
+                            </SingletonContainer>
                           </Children>
                         </WidgetGroup>
+
                         <Template src="skin:fx_rack.xml"/>
                         <Template src="skin:samplers_rack.xml"/>
                         <Template src="skin:mic_aux_rack.xml"/>
+
                         <SingletonContainer>
                           <ObjectName>LibrarySingleton</ObjectName>
                         </SingletonContainer>
@@ -404,33 +464,41 @@
                     </WidgetGroup>
 
                   </Children>
-                </Splitter><!-- Decks, Effects ... Library -->
+                </Splitter>
+                <!-- Decks, Effects, Samplers, Mic/Aux, Library -->
 
-                <!-- Maximized Library -->
-                <WidgetGroup>
+                <!-- Maximized Library & mini decks only -->
+                <WidgetGroup trigger="[Master],maximize_library" on_hide_select="0">
                   <Layout>vertical</Layout>
                   <SizePolicy>me,me</SizePolicy>
-                  <Connection>
-                    <ConfigKey>[Master],maximize_library</ConfigKey>
-                    <BindProperty>visible</BindProperty>
-                  </Connection>
                   <Children>
-                    <Template src="skin:decks_mini.xml"/>
+
+                    <WidgetGroup>
+                      <Layout>horizontal</Layout>
+                      <SizePolicy>me,max</SizePolicy>
+                      <Children>
+                        <SingletonContainer>
+                          <ObjectName>DecksLeft_Struct</ObjectName>
+                        </SingletonContainer>
+                        <SingletonContainer>
+                          <ObjectName>DecksRight_Struct</ObjectName>
+                        </SingletonContainer>
+                      </Children>
+                    </WidgetGroup>
+
                     <SingletonContainer>
                       <ObjectName>LibrarySingleton</ObjectName>
                     </SingletonContainer>
                   </Children>
-                </WidgetGroup><!-- Maximized Library -->
+                </WidgetGroup><!-- Maximized Library & mini decks only -->
 
               </Children>
             </WidgetStack>
-            <Template src="skin:skin_settings.xml"/>
+            <Template src="skin:/skin_settings.xml"/>
 
           </Children>
         </WidgetGroup><!-- regular/maximized library + skin settings menu -->
 
-        <Template src="skin:toolbar.xml"/>
-        <Template src="skin:screen_h-size_detection.xml"/>
       </Children>
     </WidgetGroup>
   </Children>
diff --git a/res/skins/LateNight/skin_preview_Flip.png b/res/skins/LateNight/skin_preview_Flip.png
deleted file mode 100644
index f17ec0d2446a..000000000000
Binary files a/res/skins/LateNight/skin_preview_Flip.png and /dev/null differ
diff --git a/res/skins/LateNight/skin_preview_PaleMoon.png b/res/skins/LateNight/skin_preview_PaleMoon.png
new file mode 100644
index 000000000000..8c5a3423f379
Binary files /dev/null and b/res/skins/LateNight/skin_preview_PaleMoon.png differ
diff --git a/res/skins/LateNight/skin_settings.xml b/res/skins/LateNight/skin_settings.xml
index 5c6b6ef28258..90f33766aaf0 100644
--- a/res/skins/LateNight/skin_settings.xml
+++ b/res/skins/LateNight/skin_settings.xml
@@ -20,378 +20,719 @@ Description:
       <WidgetGroup>
         <ObjectName>SkinSettings</ObjectName>
         <Layout>vertical</Layout>
-        <Size>190f,1me</Size>
+        <Size>240f,1me</Size>
         <Children>
+
+          <Label>
+            <ObjectName>CategoryLabel</ObjectName>
+            <Text>Decks</Text>
+            <Size>180me,21f</Size>
+          </Label>
+
+<!-- Deck size selectors -->
           <WidgetGroup>
-            <ObjectName>SkinSettingsHeader</ObjectName>
+            <ObjectName>DeckSizeSettings</ObjectName>
+            <Size>225me,20f</Size>
             <Layout>horizontal</Layout>
-            <SizePolicy>me,f</SizePolicy>
             <Children>
+              <WidgetGroup><Size>13f,0min</Size></WidgetGroup>
+
               <Label>
-                <ObjectName>CategoryLabel</ObjectName>
-                <Text>Decks / General</Text>
-                <Size>180min,21f</Size>
+                <ObjectName>SkinSettingsText</ObjectName>
+                <Size>64f,18f</Size>
+                <Text>Deck Size: </Text>
+                <Alignment>left</Alignment>
               </Label>
 
-              <!-- push Close button to far right -->
-              <WidgetGroup><Size>1me,1min</Size></WidgetGroup>
-
-              <Template src="skin:button_2state.xml">
-                <SetVariable name="TooltipId">skin_settings</SetVariable>
-                <SetVariable name="ObjectName">SkinSettingsClose</SetVariable>
-                <SetVariable name="Size">20f,21f</SetVariable>
-                <SetVariable name="ConfigKey">[Master],skin_settings</SetVariable>
-              </Template>
-            </Children>
-          </WidgetGroup>
-
-          <!-- Decks / General -->
-          <WidgetGroup><!-- 4 buttons -->
-            <ObjectName>SkinSettingsCategory</ObjectName>
-            <SizePolicy>me,min</SizePolicy>
-            <Layout>vertical</Layout>
-            <Children>
-
-              <!-- 2/4 Decks toggle -->
-              <Template src="skin:skin_settings_button_2state.xml">
-                <SetVariable name="TooltipId">toggle_4decks</SetVariable>
-                <SetVariable name="text">4 Decks</SetVariable>
-                <SetVariable name="Setting">[Skin],show_4decks</SetVariable>
-              </Template>
-
-              <!-- 4/8 Hotcues toggle -->
-              <Template src="skin:skin_settings_button_2state.xml">
-                <SetVariable name="TooltipId">hotcue_toggle</SetVariable>
-                <SetVariable name="text">8 Hotcues</SetVariable>
-                <SetVariable name="Setting">[Skin],show_8_hotcues</SetVariable>
-              </Template>
-
-              <!-- Intro & Outro cues toggle -->
-              <Template src="skin:skin_settings_button_2state.xml">
-                <SetVariable name="TooltipId">show_intro_outro_cues</SetVariable>
-                <SetVariable name="text">Intro &amp; Outro Cues</SetVariable>
-                <SetVariable name="Setting">[Skin],show_intro_outro_cues</SetVariable>
-              </Template>
-
-              <!-- Cue shift buttons in beatgrid editing section -->
-              <Template src="skin:skin_settings_button_2state.xml">
-                <SetVariable name="TooltipId">show_intro_outro_cues</SetVariable>
-                <SetVariable name="Text">Hotcue Shift Buttons</SetVariable>
-                <SetVariable name="Setting">[Skin],timing_shift_buttons</SetVariable>
-              </Template>
-
-              <!-- Rate Control toggle -->
-              <Template src="skin:skin_settings_button_2state.xml">
-                <SetVariable name="TooltipId">rate_toggle</SetVariable>
-                <SetVariable name="text">Rate Slider &amp; Sync</SetVariable>
-                <SetVariable name="Setting">[Skin],show_rate_controls</SetVariable>
-              </Template>
-
-              <!-- Rate Control buttons toggle -->
+              <!-- Deck size toggles + stacked show_mixer hint/toggle -->
               <WidgetGroup>
+                <Size>225f,18f</Size>
                 <Layout>stacked</Layout>
-                <Size>180min,17f</Size>
                 <Children>
-                  <WidgetGroup>
-                    <ObjectName>SubmenuCover</ObjectName>
-                    <Layout>stacked</Layout>
-                    <Size>180min,17f</Size>
+
+                  <!-- un-hide mixer, hint + toggle -->
+                  <PushButton>
+                    <TooltipId>show_mixer</TooltipId>
+                    <ObjectName>SkinSettingsMixerToggle</ObjectName>
+                    <Size>180me,17f</Size>
+                    <NumberStates>2</NumberStates>
+                    <State>
+                      <Number>0</Number>
+                      <Text>  hide mixer to select  </Text>
+                      <Alignment>left</Alignment>
+                    </State>
+                    <State>
+                      <Number>1</Number>
+                      <Text></Text>
+                      <Alignment>left</Alignment>
+                    </State>
                     <Connection>
-                      <ConfigKey persist="true">[Skin],show_rate_controls</ConfigKey>
+                      <ConfigKey persist="true">[Master],show_mixer</ConfigKey>
                       <Transform><Not/></Transform>
-                      <BindProperty>visible</BindProperty>
+                      <ButtonState>LeftButton</ButtonState>
                     </Connection>
-                  </WidgetGroup>
-                  <Template src="skin:skin_settings_button_2state.xml">
-                    <SetVariable name="TooltipId">rate_toggle</SetVariable>
-                    <SetVariable name="text">Rate Control Buttons</SetVariable>
-                    <SetVariable name="Setting">[Skin],show_rate_control_buttons</SetVariable>
-                  </Template>
-                </Children>
-              </WidgetGroup>
-
-              <!-- Vinyl Control toggle -->
-              <Template src="skin:skin_settings_button_2state.xml">
-                <SetVariable name="TooltipId">show_vinylcontrol</SetVariable>
-                <SetVariable name="text">Vinyl Control</SetVariable>
-                <SetVariable name="Setting">[VinylControl],show_vinylcontrol</SetVariable>
-              </Template>
-
-              <!-- Spinny -->
-              <Template src="skin:skin_settings_button_2state.xml">
-                <SetVariable name="TooltipId">show_spinny</SetVariable>
-                <SetVariable name="text">Spinny</SetVariable>
-                <SetVariable name="Setting">[Skin],show_spinnies</SetVariable>
-              </Template>
-
-              <!-- Cover Art -->
-              <Template src="skin:skin_settings_button_2state.xml">
-                <SetVariable name="TooltipId">show_coverart</SetVariable>
-                <SetVariable name="text">Cover Art</SetVariable>
-                <SetVariable name="Setting">[Skin],show_coverart</SetVariable>
-              </Template>
-
-              <!-- Big Spinny -->
-              <WidgetGroup>
-                <Layout>stacked</Layout>
-                <Size>190f,17f</Size>
-                <Children>
-                  <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>
+                      <ConfigKey persist="true">[Master],show_mixer</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 -->
+                  </PushButton>
 
+                  <!-- FULL / Compact / mini Deck -->
+                  <WidgetGroup>
+                    <ObjectName>DeckSizeToggles</ObjectName>
+                    <Size>0me,18f</Size>
+                    <Layout>horizontal</Layout>
+                    <Children>
+                      <Template src="skin:/helpers/skin_settings_button_deckSize.xml">
+                        <SetVariable name="TooltipId"></SetVariable>
+                        <SetVariable name="Text">FULL</SetVariable>
+                        <SetVariable name="Width">40</SetVariable>
+                        <SetVariable name="DeckSize">2</SetVariable>
+                      </Template>
+                      <Template src="skin:/helpers/skin_settings_button_deckSize.xml">
+                        <SetVariable name="TooltipId"></SetVariable>
+                        <SetVariable name="Text">Compact</SetVariable>
+                        <SetVariable name="Width">66</SetVariable>
+                        <SetVariable name="DeckSize">1</SetVariable>
+                      </Template>
+                      <Template src="skin:/helpers/skin_settings_button_deckSize.xml">
+                        <SetVariable name="TooltipId"></SetVariable>
+                        <SetVariable name="Text">mini</SetVariable>
+                        <SetVariable name="Width">40</SetVariable>
+                        <SetVariable name="DeckSize">0</SetVariable>
+                      </Template>
+                      <WidgetGroup><Size>0me,0min</Size></WidgetGroup>
+                    </Children>
+                  </WidgetGroup><!-- DeckSizeToggles -->
+                </Children>
+              </WidgetGroup><!-- Deck size toggles + stacked show_mixer hint/toggle -->
             </Children>
-          </WidgetGroup><!-- /Deck / General -->
-
-          <WidgetGroup>
-            <ObjectName>SkinSettingsSeparator</ObjectName>
-            <Size>1min,6f</Size>
-          </WidgetGroup>
+          </WidgetGroup><!-- DeckSizeSettings -->
+<!-- Deck size selectors -->
 
-          <!--  Mixer -->
-          <Template src="skin:skin_settings_labelbutton_2state.xml">
-            <SetVariable name="text">Mixer</SetVariable>
-            <SetVariable name="Setting">[Master],show_mixer</SetVariable>
-            <SetVariable name="TooltipId">show_mixer</SetVariable>
-          </Template>
 
+<!-- Deck Options FULL / Compact / mini -->
           <WidgetGroup>
-            <ObjectName>SkinSettingsCategory</ObjectName>
+            <ObjectName></ObjectName>
             <SizePolicy>me,min</SizePolicy>
-            <Layout>vertical</Layout>
+            <!-- Horizontal layout to reduce graphic glitches when switching deck size -->
+            <Layout>horizontal</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>180min,17f</Size>
+              <WidgetGroup><!-- Full Deck Options -->
+                <ObjectName></ObjectName>
+                <SizePolicy>me,min</SizePolicy>
+                <Layout>vertical</Layout>
                 <Children>
-                  <WidgetGroup><!-- translucent cover when Channel Mixer is hidden -->
-                    <ObjectName>SubmenuCover</ObjectName>
+                  <WidgetGroup>
+                    <ObjectName>SkinSettingsCategory</ObjectName>
+                    <SizePolicy>me,min</SizePolicy>
                     <Layout>vertical</Layout>
-                    <Size>180min,17f</Size>
-                    <Connection>
-                      <ConfigKey persist="true">[Master],show_mixer</ConfigKey>
-                      <Transform><Not/></Transform>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
+                    <Children>
+
+                      <!-- 2/4 Decks -->
+                      <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                        <SetVariable name="TooltipId">toggle_4decks</SetVariable>
+                        <SetVariable name="Text">4 Decks</SetVariable>
+                        <SetVariable name="Setting">[Skin],show_4decks</SetVariable>
+                      </Template>
+
+                      <!-- 4/8 Hotcues -->
+                      <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                        <SetVariable name="TooltipId">hotcue_toggle</SetVariable>
+                        <SetVariable name="Text">8 Hotcues</SetVariable>
+                        <SetVariable name="Setting">[Skin],show_8_hotcues</SetVariable>
+                      </Template>
+
+                      <!-- Intro & Outro cues -->
+                      <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                        <SetVariable name="TooltipId">show_intro_outro_cues</SetVariable>
+                        <SetVariable name="Text">Intro &amp; Outro Cues</SetVariable>
+                        <SetVariable name="Setting">[Skin],show_intro_outro_cues</SetVariable>
+                      </Template>
+
+                      <!-- Cue shift buttons in beatgrid editing section -->
+                      <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                        <SetVariable name="TooltipId">show_intro_outro_cues</SetVariable>
+                        <SetVariable name="Text">Hotcue Shift Buttons</SetVariable>
+                        <SetVariable name="Setting">[Skin],timing_shift_buttons</SetVariable>
+                      </Template>
+
+                      <!-- Rate Controls -->
+                      <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                        <SetVariable name="TooltipId">rate_toggle</SetVariable>
+                        <SetVariable name="Text">Rate Controls</SetVariable>
+                        <SetVariable name="Setting">[Skin],show_rate_controls</SetVariable>
+                      </Template>
+
+                      <!-- Rate Adjust Buttons -->
+                      <WidgetGroup>
+                        <ObjectName>SkinSettingsSubMenu</ObjectName>
+                        <Layout>stacked</Layout>
+                        <Size>180min,17f</Size>
+                        <Children>
+                          <WidgetGroup>
+                            <ObjectName>SubmenuCover</ObjectName>
+                            <Layout>stacked</Layout>
+                            <Size>180min,17f</Size>
+                            <Connection>
+                              <ConfigKey persist="true">[Skin],show_rate_controls</ConfigKey>
+                              <Transform><Not/></Transform>
+                              <BindProperty>visible</BindProperty>
+                            </Connection>
+                          </WidgetGroup>
+                          <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                            <SetVariable name="TooltipId">rate_toggle</SetVariable>
+                            <SetVariable name="Text">Rate Adjust Buttons</SetVariable>
+                            <SetVariable name="Setting">[Skin],show_rate_control_buttons</SetVariable>
+                          </Template>
+                        </Children>
+                      </WidgetGroup>
+
+                      <!-- Key Control -->
+                      <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                        <SetVariable name="TooltipId">rate_toggle</SetVariable>
+                        <SetVariable name="Text">Key Controls</SetVariable>
+                        <SetVariable name="Setting">[Skin],show_key_controls</SetVariable>
+                      </Template>
+
+                      <!-- Vinyl Control -->
+                      <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                        <SetVariable name="TooltipId">show_vinylcontrol</SetVariable>
+                        <SetVariable name="Text">Vinyl Control</SetVariable>
+                        <SetVariable name="Setting">[VinylControl],show_vinylcontrol</SetVariable>
+                      </Template>
+
+                      <!-- Spinny -->
+                      <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                        <SetVariable name="TooltipId">show_spinny</SetVariable>
+                        <SetVariable name="Text">Spinny</SetVariable>
+                        <SetVariable name="Setting">[Skin],show_spinnies</SetVariable>
+                      </Template>
+
+                      <!-- Cover Art -->
+                      <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                        <SetVariable name="TooltipId">show_coverart</SetVariable>
+                        <SetVariable name="Text">Cover Art</SetVariable>
+                        <SetVariable name="Setting">[Skin],show_coverart</SetVariable>
+                      </Template>
+
+                      <!-- Big Spinny / Cover Art -->
+                      <WidgetGroup>
+                        <ObjectName>SkinSettingsSubMenu</ObjectName>
+                        <Layout>stacked</Layout>
+                        <Size>180min,17f</Size>
+                        <Children>
+                          <WidgetGroup>
+                            <ObjectName>SubmenuCover</ObjectName>
+                            <Layout>stacked</Layout>
+                            <Size>180min,17f</Size>
+                            <Connection>
+                              <ConfigKey>[LateNight],show_spinny_cover</ConfigKey>
+                              <Transform><Not/></Transform>
+                              <BindProperty>visible</BindProperty>
+                            </Connection>
+                          </WidgetGroup>
+                          <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                            <SetVariable name="TooltipId">show_coverart</SetVariable>
+                            <SetVariable name="Text">Big Spinny/Cover Art</SetVariable>
+                            <SetVariable name="Setting">[Skin],select_big_spinny_coverart</SetVariable>
+                          </Template>
+                        </Children>
+                      </WidgetGroup>
+
+                    </Children>
                   </WidgetGroup>
-
-                  <Template src="skin:skin_settings_button_2state.xml">
-                    <SetVariable name="text">EQ Knobs</SetVariable>
-                    <SetVariable name="Setting">[Skin],show_eq_knobs</SetVariable>
-                  </Template>
-
                 </Children>
-              </WidgetGroup><!-- /EQ knobs -->
-
-              <WidgetGroup><!-- EQ Kill -->
-                <Layout>stacked</Layout>
-                <Size>180min,17f</Size>
+                <Connection>
+                  <ConfigKey>[LateNight],show_full_deck</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup><!-- Full Deck Options -->
+
+              <WidgetGroup><!-- Compact Deck Options -->
+                <ObjectName></ObjectName>
+                <SizePolicy>me,min</SizePolicy>
+                <Layout>vertical</Layout>
                 <Children>
-                  <WidgetGroup><!-- translucent cover when Channel Mixer is hidden -->
-                    <ObjectName>SubmenuCover</ObjectName>
+                  <WidgetGroup>
+                    <ObjectName>SkinSettingsCategory</ObjectName>
+                    <SizePolicy>me,min</SizePolicy>
                     <Layout>vertical</Layout>
-                    <Size>180min,17f</Size>
-                    <Connection>
-                      <ConfigKey persist="true">[Master],show_mixer</ConfigKey>
-                      <Transform><Not/></Transform>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
+                    <Children>
+
+                      <!-- 2/4 Decks -->
+                      <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                        <SetVariable name="TooltipId">toggle_4decks</SetVariable>
+                        <SetVariable name="Text">4 Decks</SetVariable>
+                        <SetVariable name="Setting">[Skin],show_4decks</SetVariable>
+                      </Template>
+
+                      <!-- Cue shift buttons in beatgrid editing section -->
+                      <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                        <SetVariable name="TooltipId">show_intro_outro_cues</SetVariable>
+                        <SetVariable name="Text">Hotcue Shift Buttons</SetVariable>
+                        <SetVariable name="Setting">[Skin],timing_shift_buttons</SetVariable>
+                      </Template>
+
+                      <!-- Loop/Jump Controls in compact decks-->
+                      <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                        <SetVariable name="TooltipId"></SetVariable>
+                        <SetVariable name="Text">Loop / Jump Controls</SetVariable>
+                        <SetVariable name="Setting">[LateNight],show_loopjump_controls_compact</SetVariable>
+                      </Template>
+
+                      <!-- Rate Control -->
+                      <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                        <SetVariable name="TooltipId">rate_toggle</SetVariable>
+                        <SetVariable name="Text">Rate Controls</SetVariable>
+                        <SetVariable name="Setting">[Skin],show_rate_controls_compact</SetVariable>
+                      </Template>
+
+                      <!-- Sync button in compact decks -->
+                      <WidgetGroup>
+                        <ObjectName>SkinSettingsSubMenu</ObjectName>
+                        <Layout>stacked</Layout>
+                        <Size>180min,17f</Size>
+                        <Children>
+                          <!-- index 0 due to bug -->
+                          <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
+                          <WidgetGroup>
+                            <ObjectName>SubmenuCover</ObjectName>
+                            <Layout>stacked</Layout>
+                            <Size>180min,17f</Size>
+                            <Connection>
+                              <ConfigKey persist="true">[Skin],show_rate_controls_compact</ConfigKey>
+                              <Transform><Not/></Transform>
+                              <BindProperty>visible</BindProperty>
+                            </Connection>
+                          </WidgetGroup>
+                          <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                            <SetVariable name="TooltipId">rate_toggle</SetVariable>
+                            <SetVariable name="Text">Sync Button</SetVariable>
+                            <SetVariable name="Setting">[LateNight],show_sync_button_compact</SetVariable>
+                          </Template>
+                        </Children>
+                      </WidgetGroup>
+
+                      <!-- Key Control -->
+                      <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                        <SetVariable name="TooltipId">rate_toggle</SetVariable>
+                        <SetVariable name="Text">Key Controls</SetVariable>
+                        <SetVariable name="Setting">[Skin],show_key_controls_compact</SetVariable>
+                      </Template>
+
+                      <!-- Vinyl Control -->
+                      <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                        <SetVariable name="TooltipId">show_vinylcontrol</SetVariable>
+                        <SetVariable name="Text">Vinyl Control</SetVariable>
+                        <SetVariable name="Setting">[VinylControl],show_vinylcontrol</SetVariable>
+                      </Template>
+
+                      <!-- Level meters -->
+                      <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                        <SetVariable name="TooltipId">show_vinylcontrol</SetVariable>
+                        <SetVariable name="Text">VU meters</SetVariable>
+                        <SetVariable name="Setting">[LateNight],show_vumeters_compact</SetVariable>
+                      </Template>
+
+                      <!-- Spinny -->
+                      <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                        <SetVariable name="TooltipId">show_spinny</SetVariable>
+                        <SetVariable name="Text">Spinny</SetVariable>
+                        <SetVariable name="Setting">[Skin],show_spinnies</SetVariable>
+                      </Template>
+
+                      <!-- Cover Art -->
+                      <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                        <SetVariable name="TooltipId">show_coverart</SetVariable>
+                        <SetVariable name="Text">Cover Art</SetVariable>
+                        <SetVariable name="Setting">[Skin],show_coverart</SetVariable>
+                      </Template>
+
+                      <!-- Big Spinny / Cover Art -->
+                      <WidgetGroup>
+                        <ObjectName>SkinSettingsSubMenu</ObjectName>
+                        <Layout>stacked</Layout>
+                        <Size>180min,17f</Size>
+                        <Children>
+                          <WidgetGroup>
+                            <ObjectName>SubmenuCover</ObjectName>
+                            <Layout>stacked</Layout>
+                            <Size>180min,17f</Size>
+                            <Connection>
+                              <ConfigKey>[LateNight],show_spinny_cover</ConfigKey>
+                              <Transform><Not/></Transform>
+                              <BindProperty>visible</BindProperty>
+                            </Connection>
+                          </WidgetGroup>
+                          <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                            <SetVariable name="TooltipId">show_coverart</SetVariable>
+                            <SetVariable name="Text">Big Spinny/Cover Art</SetVariable>
+                            <SetVariable name="Setting">[Skin],select_big_spinny_coverart</SetVariable>
+                          </Template>
+                        </Children>
+                      </WidgetGroup>
+
+                    </Children>
                   </WidgetGroup>
-
-                  <Template src="skin:skin_settings_button_2state.xml">
-                    <SetVariable name="text">EQ Kill</SetVariable>
-                    <SetVariable name="Setting">[Skin],show_eq_kill_buttons</SetVariable>
-                  </Template>
-
                 </Children>
-              </WidgetGroup><!-- /EQ Kill -->
-
-              <WidgetGroup><!-- crossfader -->
+                <Connection>
+                  <ConfigKey>[LateNight],show_compact_deck</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup><!-- Compact Deck Options -->
+
+              <WidgetGroup><!-- Mini Deck Options -->
+                <ObjectName></ObjectName>
+                <SizePolicy>me,f</SizePolicy>
                 <Layout>stacked</Layout>
-                <Size>180min,17f</Size>
                 <Children>
-                  <WidgetGroup><!-- translucent cover when Channel Mixer is hidden -->
+                  <WidgetGroup>
                     <ObjectName>SubmenuCover</ObjectName>
-                    <Layout>vertical</Layout>
-                    <Size>180min,17f</Size>
+                    <SizePolicy>me,min</SizePolicy>
                     <Connection>
-                      <ConfigKey persist="true">[Master],show_mixer</ConfigKey>
-                      <Transform><Not/></Transform>
+                      <ConfigKey>[LateNight],no_decks_visible</ConfigKey>
                       <BindProperty>visible</BindProperty>
                     </Connection>
                   </WidgetGroup>
 
-                  <Template src="skin:skin_settings_button_2state.xml">
-                    <SetVariable name="text">Crossfader</SetVariable>
-                    <SetVariable name="Setting">[Skin],show_xfader</SetVariable>
-                  </Template>
-
+                  <WidgetGroup>
+                    <ObjectName>SkinSettingsCategory</ObjectName>
+                    <SizePolicy>me,min</SizePolicy>
+                    <Layout>vertical</Layout>
+                    <Children>
+
+                      <!-- 2/4 Decks -->
+                      <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                        <SetVariable name="TooltipId">toggle_4decks</SetVariable>
+                        <SetVariable name="Text">4 Decks</SetVariable>
+                        <SetVariable name="Setting">[Skin],show_4decks</SetVariable>
+                      </Template>
+
+                      <!-- Cue shift buttons in beatgrid editing section -->
+                      <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                        <SetVariable name="TooltipId">show_intro_outro_cues</SetVariable>
+                        <SetVariable name="Text">Hotcue Shift Buttons</SetVariable>
+                        <SetVariable name="Setting">[Skin],timing_shift_buttons</SetVariable>
+                      </Template>
+
+                      <WidgetGroup><Size>0me,102f</Size></WidgetGroup>
+
+                      <!-- Spinny -->
+                      <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                        <SetVariable name="TooltipId">show_spinny</SetVariable>
+                        <SetVariable name="Text">Spinny</SetVariable>
+                        <SetVariable name="Setting">[Skin],show_spinnies</SetVariable>
+                      </Template>
+
+                      <!-- Cover Art -->
+                      <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                        <SetVariable name="TooltipId">show_coverart</SetVariable>
+                        <SetVariable name="Text">Cover Art</SetVariable>
+                        <SetVariable name="Setting">[Skin],show_coverart</SetVariable>
+                      </Template>
+
+                      <WidgetGroup><Size>0me,17f</Size></WidgetGroup>
+
+                    </Children>
+                  </WidgetGroup>
                 </Children>
-              </WidgetGroup><!-- /crossfader -->
-
+                <Connection>
+                  <ConfigKey>[LateNight],show_mini_deck</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup><!-- Mini Deck Options -->
             </Children>
-          </WidgetGroup><!-- /Mixer -->
+          </WidgetGroup>
+<!-- Deck Options FULL / Compact / mini -->
+
 
+
+<!-- Other skin options -->
           <WidgetGroup>
             <ObjectName>SkinSettingsSeparator</ObjectName>
             <Size>1min,6f</Size>
           </WidgetGroup>
 
-          <!-- Effects -->
-          <Template src="skin:skin_settings_labelbutton_2state.xml">
-            <SetVariable name="text">Effects </SetVariable>
-            <SetVariable name="Setting">[EffectRack1],show</SetVariable>
-            <SetVariable name="TooltipId">show_effects</SetVariable>
-          </Template>
-
-          <WidgetGroup><!-- 4 buttons -->
-            <ObjectName>SkinSettingsCategory</ObjectName>
-            <SizePolicy>me,min</SizePolicy>
-            <Layout>vertical</Layout>
+          <WidgetGroup><!--  Mixer -->
+            <ObjectName></ObjectName>
+            <SizePolicy>me,f</SizePolicy>
+            <Layout>stacked</Layout>
             <Children>
-              <WidgetGroup><!-- 4 Effect Units -->
-                <Layout>stacked</Layout>
-                <Size>180min,17f</Size>
-                <Children>
-                  <WidgetGroup>
-                    <ObjectName>SubmenuCover</ObjectName>
-                    <Layout>stacked</Layout>
-                    <Size>180min,17f</Size>
-                    <Connection>
-                      <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
-                      <Transform><Not/></Transform>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup>
+              <WidgetGroup>
+                <ObjectName>SubmenuCover</ObjectName>
+                <SizePolicy>me,min</SizePolicy>
+                <Connection>
+                  <ConfigKey>[Master],maximize_library</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
 
-                  <Template src="skin:skin_settings_button_2state.xml">
-                    <SetVariable name="text">4 EFFECT UNITS</SetVariable>
-                    <SetVariable name="Setting">[Skin],show_4effectunits</SetVariable>
+              <WidgetGroup>
+                <SizePolicy>me,min</SizePolicy>
+                <Layout>vertical</Layout>
+                <Children>
+                  <Template src="skin:/helpers/skin_settings_labelbutton_2state.xml">
+                    <SetVariable name="Text">Mixer</SetVariable>
+                    <SetVariable name="Setting">[Master],show_mixer</SetVariable>
+                    <SetVariable name="TooltipId">show_mixer</SetVariable>
                   </Template>
-                </Children>
-              </WidgetGroup><!-- /4 Effect Units -->
 
-              <WidgetGroup><!-- Super knobs -->
-                <Layout>stacked</Layout>
-                <Size>180min,17f</Size>
-                <Children>
                   <WidgetGroup>
-                    <ObjectName>SubmenuCover</ObjectName>
+                    <ObjectName>SkinSettingsCategory</ObjectName>
+                    <SizePolicy>me,f</SizePolicy>
                     <Layout>stacked</Layout>
-                    <Size>180min,17f</Size>
-                    <Connection>
-                      <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
-                      <Transform><Not/></Transform>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
+                    <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>
+                        <SizePolicy>me,min</SizePolicy>
+                        <Connection>
+                          <ConfigKey persist="true">[Master],show_mixer</ConfigKey>
+                          <Transform><Not/></Transform>
+                          <BindProperty>visible</BindProperty>
+                        </Connection>
+                      </WidgetGroup>
+
+                      <WidgetGroup>
+                        <SizePolicy>me,min</SizePolicy>
+                        <Layout>vertical</Layout>
+                        <Children>
+
+                          <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                            <SetVariable name="Text">Master / Headphone Mixer</SetVariable>
+                            <SetVariable name="Setting">[Skin],show_master_head_mixer</SetVariable>
+                          </Template>
+
+                          <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                            <SetVariable name="Text">EQ Knobs</SetVariable>
+                            <SetVariable name="Setting">[Skin],show_eq_knobs</SetVariable>
+                          </Template>
+
+                          <WidgetGroup><!-- EQ Kill -->
+                            <ObjectName>SkinSettingsSubMenu</ObjectName>
+                            <Layout>stacked</Layout>
+                            <Size>180min,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>180min,17f</Size>
+                                <Connection>
+                                  <ConfigKey persist="true">[Skin],show_eq_knobs</ConfigKey>
+                                  <Transform><Not/></Transform>
+                                  <BindProperty>visible</BindProperty>
+                                </Connection>
+                              </WidgetGroup>
+                              <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                                <SetVariable name="Text">EQ Kill Buttons</SetVariable>
+                                <SetVariable name="Setting">[Skin],show_eq_kill_buttons</SetVariable>
+                              </Template>
+                            </Children>
+                          </WidgetGroup><!-- /EQ Kill -->
+
+                          <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                            <SetVariable name="Text">Crossfader</SetVariable>
+                            <SetVariable name="Setting">[Skin],show_xfader</SetVariable>
+                          </Template>
+
+                        </Children>
+                      </WidgetGroup>
+                    </Children>
                   </WidgetGroup>
-
-                  <Template src="skin:skin_settings_button_2state.xml">
-                    <SetVariable name="text">Super Knobs</SetVariable>
-                    <SetVariable name="Setting">[Skin],show_superknobs</SetVariable>
-                  </Template>
                 </Children>
-              </WidgetGroup><!-- /Super knobs -->
-
+              </WidgetGroup>
             </Children>
-          </WidgetGroup><!-- /Effects -->
+          </WidgetGroup><!-- /Mixer -->
 
           <WidgetGroup>
             <ObjectName>SkinSettingsSeparator</ObjectName>
             <Size>1min,6f</Size>
           </WidgetGroup>
 
-          <!-- Samplers -->
-          <Template src="skin:skin_settings_labelbutton_2state.xml">
-            <SetVariable name="TooltipId">show_samplers</SetVariable>
-            <SetVariable name="text">Samplers </SetVariable>
-            <SetVariable name="Setting">[Samplers],show_samplers</SetVariable>
-          </Template>
-
-          <WidgetGroup><!-- 4 buttons -->
-            <ObjectName>SkinSettingsCategory</ObjectName>
-            <SizePolicy>me,min</SizePolicy>
-            <Layout>vertical</Layout>
+          <WidgetGroup><!-- Effects -->
+            <ObjectName></ObjectName>
+            <SizePolicy>me,f</SizePolicy>
+            <Layout>stacked</Layout>
             <Children>
-
-              <WidgetGroup><!-- 8 Samplers -->
-                <Layout>stacked</Layout>
-                <Size>180min,17f</Size>
+              <WidgetGroup>
+                <ObjectName>SubmenuCover</ObjectName>
+                <SizePolicy>me,min</SizePolicy>
+                <Connection>
+                  <ConfigKey>[Master],maximize_library</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+              <WidgetGroup>
+                <SizePolicy>me,min</SizePolicy>
+                <Layout>vertical</Layout>
                 <Children>
+                  <Template src="skin:/helpers/skin_settings_labelbutton_2state.xml">
+                    <SetVariable name="Text">Effects </SetVariable>
+                    <SetVariable name="Setting">[EffectRack1],show</SetVariable>
+                    <SetVariable name="TooltipId">show_effects</SetVariable>
+                  </Template>
+
                   <WidgetGroup>
-                    <ObjectName>SubmenuCover</ObjectName>
+                    <ObjectName>SkinSettingsCategory</ObjectName>
+                    <SizePolicy>me,f</SizePolicy>
                     <Layout>stacked</Layout>
-                    <Size>180min,17f</Size>
-                    <Connection>
-                      <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
-                      <Transform><Not/></Transform>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
+                    <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>
+                        <SizePolicy>me,min</SizePolicy>
+                        <Connection>
+                          <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
+                          <Transform><Not/></Transform>
+                          <BindProperty>visible</BindProperty>
+                        </Connection>
+                      </WidgetGroup>
+
+                      <WidgetGroup>
+                        <SizePolicy>me,min</SizePolicy>
+                        <Layout>vertical</Layout>
+                        <Children>
+                          <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                            <SetVariable name="Text">4 Effect Units</SetVariable>
+                            <SetVariable name="Setting">[Skin],show_4effectunits</SetVariable>
+                          </Template>
+                          <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                            <SetVariable name="Text">Super Knobs</SetVariable>
+                            <SetVariable name="Setting">[Skin],show_superknobs</SetVariable>
+                          </Template>
+                        </Children>
+                      </WidgetGroup>
+                    </Children>
                   </WidgetGroup>
-                  <Template src="skin:skin_settings_button_2state.xml">
-                    <SetVariable name="text">8 Samplers</SetVariable>
-                    <SetVariable name="Setting">[Skin],8_samplers</SetVariable>
-                  </Template>
                 </Children>
-              </WidgetGroup><!-- / 8 Samplers -->
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup><!-- /Effects -->
 
+          <WidgetGroup>
+            <ObjectName>SkinSettingsSeparator</ObjectName>
+            <Size>1min,6f</Size>
+          </WidgetGroup>
+
+          <WidgetGroup><!-- Samplers -->
+            <ObjectName></ObjectName>
+            <SizePolicy>me,f</SizePolicy>
+            <Layout>stacked</Layout>
+            <Children>
+              <WidgetGroup>
+                <ObjectName>SubmenuCover</ObjectName>
+                <SizePolicy>me,min</SizePolicy>
+                <Connection>
+                  <ConfigKey>[Master],maximize_library</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
               <WidgetGroup>
-                <ObjectName>SamplerLoadSaveBox</ObjectName>
+                <SizePolicy>me,min</SizePolicy>
                 <Layout>vertical</Layout>
-                <Size>180min,1min</Size>
                 <Children>
-                  <PushButton>
-                    <TooltipId>LoadSamplerBank</TooltipId>
-                    <ObjectName>SkinSettingsButton</ObjectName>
-                    <Size>160min,18f</Size>
-                    <NumberStates>1</NumberStates>
-                    <State>
-                      <Number>0</Number>
-                      <Text> Load Sampler Bank</Text>
-                      <Alignment>left</Alignment>
-                    </State>
-                    <Connection>
-                      <ConfigKey>[Sampler],LoadSamplerBank</ConfigKey>
-                      <ButtonState>LeftButton</ButtonState>
-                    </Connection>
-                  </PushButton>
+                  <Template src="skin:/helpers/skin_settings_labelbutton_2state.xml">
+                    <SetVariable name="TooltipId">show_samplers</SetVariable>
+                    <SetVariable name="Text">Samplers </SetVariable>
+                    <SetVariable name="Setting">[Samplers],show_samplers</SetVariable>
+                  </Template>
 
-                  <PushButton>
-                    <TooltipId>SaveSamplerBank</TooltipId>
-                    <ObjectName>SkinSettingsButton</ObjectName>
-                    <Size>160min,18f</Size>
-                    <NumberStates>1</NumberStates>
-                    <State>
-                      <Number>0</Number>
-                      <Text> Save Sampler Bank</Text>
-                      <Alignment>left</Alignment>
-                    </State>
-                    <Connection>
-                      <ConfigKey>[Sampler],SaveSamplerBank</ConfigKey>
-                      <ButtonState>LeftButton</ButtonState>
-                    </Connection>
-                  </PushButton>
+                  <WidgetGroup>
+                    <ObjectName>SkinSettingsCategory</ObjectName>
+                    <SizePolicy>me,f</SizePolicy>
+                    <Layout>stacked</Layout>
+                    <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>
+                        <SizePolicy>me,min</SizePolicy>
+                        <Connection>
+                          <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
+                          <Transform><Not/></Transform>
+                          <BindProperty>visible</BindProperty>
+                        </Connection>
+                      </WidgetGroup>
+
+                      <WidgetGroup>
+                        <SizePolicy>me,min</SizePolicy>
+                        <Layout>vertical</Layout>
+                        <Children>
+
+                          <Template src="skin:/helpers/skin_settings_button_2state.xml">
+                            <SetVariable name="Text">8 Samplers</SetVariable>
+                            <SetVariable name="Setting">[Skin],8_samplers</SetVariable>
+                          </Template>
+
+                          <WidgetGroup>
+                            <ObjectName>SamplerLoadSaveBox</ObjectName>
+                            <Layout>horizontal</Layout>
+                            <Size>180min,1min</Size>
+                            <Children>
+                              <PushButton>
+                                <TooltipId>LoadSamplerBank</TooltipId>
+                                <ObjectName>SkinSettingsButton</ObjectName>
+                                <Size>35f,18f</Size>
+                                <NumberStates>1</NumberStates>
+                                <State>
+                                  <Number>0</Number>
+                                  <Text> Load </Text>
+                                  <Alignment>left</Alignment>
+                                </State>
+                                <Connection>
+                                  <ConfigKey>[Sampler],LoadSamplerBank</ConfigKey>
+                                  <ButtonState>LeftButton</ButtonState>
+                                </Connection>
+                              </PushButton>
+                              <Label>
+                                <TooltipId>SaveSamplerBank</TooltipId>
+                                <ObjectName>SkinSettingsText</ObjectName>
+                                <Size>6min,18f</Size>
+                                <Text>/</Text>
+                                <Alignment>center</Alignment>
+                              </Label>
+                              <PushButton>
+                                <TooltipId>SaveSamplerBank</TooltipId>
+                                <ObjectName>SkinSettingsButton</ObjectName>
+                                <Size>35f,18f</Size>
+                                <NumberStates>1</NumberStates>
+                                <State>
+                                  <Number>0</Number>
+                                  <Text> Save </Text>
+                                  <Alignment>left</Alignment>
+                                </State>
+                                <Connection>
+                                  <ConfigKey>[Sampler],SaveSamplerBank</ConfigKey>
+                                  <ButtonState>LeftButton</ButtonState>
+                                </Connection>
+                              </PushButton>
+                              <Label>
+                                <TooltipId>SaveSamplerBank</TooltipId>
+                                <ObjectName>SkinSettingsText</ObjectName>
+                                <Size>140min,18f</Size>
+                                <Text>Sampler Bank</Text>
+                                <Alignment>left</Alignment>
+                              </Label>
+                            </Children>
+                          </WidgetGroup>
+                        </Children>
+                      </WidgetGroup>
+
+                    </Children>
+                  </WidgetGroup>
                 </Children>
               </WidgetGroup>
-
             </Children>
           </WidgetGroup><!-- /Samplers -->
 
@@ -413,21 +754,19 @@ Description:
             <Children>
 
               <!-- Preview Deck -->
-              <Template src="skin:skin_settings_button_2state.xml">
+              <Template src="skin:/helpers/skin_settings_button_2state.xml">
                 <SetVariable name="TooltipId">show_previewdeck</SetVariable>
-                <SetVariable name="text">Preview Deck</SetVariable>
+                <SetVariable name="Text">Preview Deck</SetVariable>
                 <SetVariable name="Setting">[PreviewDeck],show_previewdeck</SetVariable>
               </Template>
 
               <!-- Cover Art -->
-              <Template src="skin:skin_settings_button_2state.xml">
+              <Template src="skin:/helpers/skin_settings_button_2state.xml">
                 <SetVariable name="TooltipId">show_coverart</SetVariable>
-                <SetVariable name="text">Cover Art</SetVariable>
+                <SetVariable name="Text">Cover Art</SetVariable>
                 <SetVariable name="Setting">[Library],show_coverart</SetVariable>
               </Template>
 
-
-
             </Children>
           </WidgetGroup><!-- /Library -->
         </Children>
diff --git a/res/skins/LateNight/sliders_classic/knob_crossfader.svg b/res/skins/LateNight/sliders_classic/knob_crossfader.svg
deleted file mode 100644
index 63372cd9a688..000000000000
--- a/res/skins/LateNight/sliders_classic/knob_crossfader.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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/sliders_classic/knob_pitch_deck.svg b/res/skins/LateNight/sliders_classic/knob_pitch_deck.svg
deleted file mode 100644
index db639a6dccaf..000000000000
--- a/res/skins/LateNight/sliders_classic/knob_pitch_deck.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index 4ea321cb8a66..000000000000
--- a/res/skins/LateNight/sliders_classic/knob_pitch_sampler.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<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
deleted file mode 100644
index c659eaff3bed..000000000000
--- a/res/skins/LateNight/sliders_classic/knob_volume_deck.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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/sliders_classic/slider_crossfader.svg b/res/skins/LateNight/sliders_classic/slider_crossfader.svg
deleted file mode 100644
index cae6bb353d7f..000000000000
--- a/res/skins/LateNight/sliders_classic/slider_crossfader.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<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
deleted file mode 100644
index 53e312239994..000000000000
--- a/res/skins/LateNight/sliders_classic/slider_crossfader_small.svg
+++ /dev/null
@@ -1,34 +0,0 @@
-<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
deleted file mode 100644
index 622fd753d9e2..000000000000
--- a/res/skins/LateNight/sliders_classic/slider_pitch_deck.svg
+++ /dev/null
@@ -1,46 +0,0 @@
-<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
deleted file mode 100644
index 7eab8ab4c57d..000000000000
--- a/res/skins/LateNight/sliders_classic/slider_pitch_sampler.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<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
deleted file mode 100644
index ad23ef6c25ba..000000000000
--- a/res/skins/LateNight/sliders_classic/slider_volume_deck.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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/knob_crossfader.svg b/res/skins/LateNight/sliders_flip/knob_crossfader.svg
deleted file mode 100644
index e3feb46ed8c3..000000000000
--- a/res/skins/LateNight/sliders_flip/knob_crossfader.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index ac116f795aa7..000000000000
--- a/res/skins/LateNight/sliders_flip/knob_pitch_deck.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index ba3cee8fdf1e..000000000000
--- a/res/skins/LateNight/sliders_flip/knob_pitch_sampler.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<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
deleted file mode 100644
index 349bc072e5be..000000000000
--- a/res/skins/LateNight/sliders_flip/knob_volume_deck.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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/slider_crossfader.svg b/res/skins/LateNight/sliders_flip/slider_crossfader.svg
deleted file mode 100644
index 05305fef0cf6..000000000000
--- a/res/skins/LateNight/sliders_flip/slider_crossfader.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<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="#000" 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="#505050" style="paint-order:fill markers stroke"/>
-	<g fill="#858585" 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="#505050" 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
deleted file mode 100644
index aa0a5dd42c6a..000000000000
--- a/res/skins/LateNight/sliders_flip/slider_crossfader_small.svg
+++ /dev/null
@@ -1,34 +0,0 @@
-<svg width="102" height="46" version="1.1" xmlns="http://www.w3.org/2000/svg">
-	<g fill="#000">
-		<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="#505050">
-		<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="#858585" 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
deleted file mode 100644
index 5fd1cdb7d4e3..000000000000
--- a/res/skins/LateNight/sliders_flip/slider_pitch_deck.svg
+++ /dev/null
@@ -1,47 +0,0 @@
-<svg width="40" height="113" version="1.1" xmlns="http://www.w3.org/2000/svg">
-	<rect x="-1114.678" y="-798.66101" width="2271.4915" height="1907.5933" display="none" fill="#0f0f0e" style="paint-order:fill markers stroke"/>
-	<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="#858585" stroke-width=".99979782">
-		<path d="m6 57.000404h10v.999596h-10z" color="#000000"/>
-		<path d="m34 57.000404h-10v.999596h10z" color="#000000"/>
-	</g>
-	<g fill="#505050" 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
deleted file mode 100644
index d288565ef9ac..000000000000
--- a/res/skins/LateNight/sliders_flip/slider_pitch_sampler.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<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="#636363" 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="#505050" 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
deleted file mode 100644
index 7008c53414e7..000000000000
--- a/res/skins/LateNight/sliders_flip/slider_volume_deck.svg
+++ /dev/null
@@ -1,48 +0,0 @@
-<svg width="46" height="107" version="1.1" xmlns="http://www.w3.org/2000/svg">
-	<path d="m21 8h4v91h-4z" color="#000000" stroke-width=".99999994"/>
-	<g stroke-width=".99979782">
-		<path d="m12 57.500602 7 .000202v.999596l-7-.000202z" color="#000000"/>
-		<path d="m12 67.500754 7 .000202v.999596l-7-.000202z" color="#000000"/>
-		<path d="m12 77.500503 7 .000202v.999596l-7-.000202z" color="#000000"/>
-		<path d="m12 87.500252 7 .000202v.999596l-7-.000202z" color="#000000"/>
-		<path d="m12 17.499751 7 .000202v.999596l-7-.000202z" color="#000000"/>
-		<path d="m12 27.501357 7 .000202v.999596l-7-.000202z" color="#000000"/>
-		<path d="m12 37.501105 7 .000202v.999596l-7-.000202z" color="#000000"/>
-		<path d="m12 47.500853 7 .000202v.999596l-7-.000202z" color="#000000"/>
-		<path d="m11 7.500202 8-5e-7v.999596l-8 5e-7z" color="#000000"/>
-		<path d="m11 97.500203 8-1e-6v.999595l-8 1e-6z" 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"/>
-		<path d="m27 7.5002015 8 .0002025v.999596l-8-.0002025z" color="#000000"/>
-		<path d="m27 97.500202 8 .000202v.999596l-8-.000203z" color="#000000"/>
-	</g>
-	<path d="m20 100h6v-93h-6zm1-.999999v-90.9999996h4v90.9999996z" fill="#505050" style="paint-order:fill markers stroke"/>
-	<g fill="#505050" stroke-width=".99979782">
-		<path d="m12 58.000602 7 .000202v.999596l-7-.000202z" color="#000000"/>
-		<path d="m12 68.000754 7 .000202v.999596l-7-.000202z" color="#000000"/>
-		<path d="m12 78.000503 7 .000202v.999596l-7-.000202z" color="#000000"/>
-		<path d="m12 88.000252 7 .000202v.999596l-7-.000202z" color="#000000"/>
-		<path d="m12 17.999751 7 .000202v.999596l-7-.000202z" color="#000000"/>
-		<path d="m12 28.001357 7 .000202v.999596l-7-.000202z" color="#000000"/>
-		<path d="m12 38.001105 7 .000202v.999596l-7-.000202z" color="#000000"/>
-		<path d="m12 48.000853 7 .000202v.999596l-7-.000202z" 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"/>
-		<path d="m11 8.000202 8-5e-7v.999596l-8 5e-7z" color="#000000"/>
-		<path d="m11 98.000203 8-1e-6v.999595l-8 1e-6z" 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>
-</svg>
diff --git a/res/skins/LateNight/spinny_coverart.xml b/res/skins/LateNight/spinny_coverart.xml
deleted file mode 100644
index 7327fae90b0c..000000000000
--- a/res/skins/LateNight/spinny_coverart.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<Template>
-  <SetVariable name="group">[Channel<Variable name="channum"/>]</SetVariable>
-
-  <WidgetGroup>
-    <Layout>horizontal</Layout>
-    <Children>
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <SizePolicy>me,me</SizePolicy>
-        <Children>
-
-          <WidgetGroup>
-            <ObjectName>SpinnyContainer</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,me</SizePolicy>
-            <Children>
-
-              <Spinny>
-                <TooltipId>spinny</TooltipId>
-                <SizePolicy>me,me</SizePolicy>
-                <MinimumSize>40,40</MinimumSize>
-                <Group><Variable name="group"/></Group>
-                <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>
-                  <Transform><Not/></Transform>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </Spinny>
-
-              <Spinny>
-                <TooltipId>spinny</TooltipId>
-                <SizePolicy>me,me</SizePolicy>
-                <MinimumSize>40,40</MinimumSize>
-                <Group><Variable name="group"/></Group>
-                <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>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </Spinny>
-
-            </Children>
-          </WidgetGroup>
-        </Children>
-        <Connection>
-          <ConfigKey persist="true">[Skin],show_spinnies</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup>
-
-      <WidgetGroup>
-        <Layout>vertical</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,min</SizePolicy>
-            <Children>
-              <WidgetGroup>
-                <ObjectName>CoverArtContainer</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                  <CoverArt>
-                    <TooltipId>coverart</TooltipId>
-                    <SizePolicy>me,me</SizePolicy>
-                    <MinimumSize>40,40</MinimumSize>
-                    <Group><Variable name="group"/></Group>
-                    <DefaultCover>skin:/style_<Variable name="style_scheme"/>/cover_default.svg</DefaultCover>
-                  </CoverArt>
-                </Children>
-              </WidgetGroup>
-            </Children>
-            <Connection>
-              <ConfigKey persist="true">[Skin],show_coverart</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup>
-
-        </Children>
-        <Connection>
-          <ConfigKey persist="true">[Skin],show_spinnies</ConfigKey>
-          <Transform><Not/></Transform>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup>
-
-    </Children>
-  </WidgetGroup>
-
-</Template>
diff --git a/res/skins/LateNight/style-mac.qss b/res/skins/LateNight/style-mac.qss
deleted file mode 100644
index 49b40e907d50..000000000000
--- a/res/skins/LateNight/style-mac.qss
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Previously necessary hack to hide the checkmark, otherwise text gets cut off
-on the right on Retina screens. This can only be done for macOS
-because it cuts off text on the left on KDE
-WEffectSelector QAbstractItemView {
-  margin: 0 0 0 -26px;
-} */
-
-/* hide the checkmark just in case the above shows a
-partial checkmark on some untested screen
-WEffectSelector::indicator {
-    border: 0;
-} */
-
-
-#LibraryBPMSpinBox {
-  padding: 0px;
-  margin: 0px;
-}
-
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index 54de327e9ea3..5dab257cf191 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -1,8 +1,9 @@
-/* LateNight 2.3 */
+/* LateNight 2.3 // common layout settings */
 
 /************** font settings *************************************************/
 #Mixxx, WWidget,
-WEffect, WEffectSelector,
+WEffect,
+WEffectSelector,
 WKey,
 WLabel, WLibrary QLabel,
 WNumber,
@@ -17,20 +18,79 @@ QSpinBox,
 QComboBox,
 WLibrary QHeaderView,
 QToolTip,
+WOverview #PassthroughLabel,
 #LibraryContainer QMenu,
 WCueMenuPopup,
 WCueMenuPopup QMenu,
 WCoverArtMenu,
 WTrackMenu,
 WTrackMenu QMenu,
-WOverview /* Hotcue labels in the overview */ {
+WOverview /* Hotcue labels in the overview */,
+WEffectSelector,
+WEffectSelector QAbstractScrollArea,
+#fadeModeCombobox,
+#fadeModeCombobox QAbstractScrollArea,
+WLibrary QRadioButton {
   font-family: "Open Sans";
-  text-transform: uppercase;
-  font-weight: bold;
+  font-weight: 500; /* semi-bold */
   font-style: normal;
+  text-transform: none;
+}
+
+/* Bold */
+#KnobLabel,
+/* Passthrough label on overview waveform */
+WOverview #PassthroughLabel,
+#EQKillButton,
+#FxUnitLabel,
+#MicAuxLabel, #MicAuxLabelUnconfigured,
+#LatencyLabel,
+#VinylControls WPushButton,
+#FxAssignButtons WPushButton,
+#SamplerTitleMini,
+/* ToolBar */
+#GuiToggleButton,
+#RecFeedback, #RecDuration,
+#BroadcastButton,
+/* SKin settings & Library */
+#SkinSettingsToggle,
+#DeckSizeButton[value="1"],
+#DlgMissing > QPushButton,
+#DlgHidden > QPushButton,
+#DlgAutoDJ > QPushButton,
+#DlgRecording > QPushButton,
+#DlgAnalysis > QPushButton,
+#labelRecFilename,
+WEffectSelector,
+#fadeModeCombobox,
+WOverview #PassthroughLabel {
+  font-weight: bold;
+}
+WLibrary QHeaderView {
+  /* not applied: */;
+  font-weight: 500;
 }
 
+/* All capitals */
+#KnobLabel,
+#FxUnitLabel,
+#MicAuxLabel, #MicAuxLabelUnconfigured,
+#LatencyLabel,
+#VinylControls WPushButton,
+#FxAssignButtons WPushButton,
+/* ToolBar */
+#GuiToggleButton,
+#RecFeedback, #RecDuration,
+#BroadcastButton,
+#SkinSettingsToggle,
+WLibrary QPushButton {
+  text-transform: uppercase;
+}
 /* regular font weight */
+#SkinSettingsButton,
+#DeckSizeButton,
+#SkinSettingsMixerToggle,
+#SkinSettingsText,
 QToolTip,
 #LibraryContainer QMenu,
 WCueMenuPopup,
@@ -38,38 +98,15 @@ WCueMenuPopup QMenu,
 WCoverArtMenu,
 WTrackMenu,
 WTrackMenu QMenu,
-WBeatSpinBox QMenu {
+WBeatSpinBox QMenu,
+#labelRecPrefix,
+#labelRecStatistics {
   font-weight: normal;
 }
 
-/* regular case / no text transformation */
-WKey,
-WOverview,
-WTrackProperty, WTrackText,
-QToolTip,
-#LibraryContainer QMenu,
-#LibraryContainer QMenu QCheckBox,
-WCueMenuPopup,
-WCueMenuPopup QMenu,
-WCoverArtMenu,
-WBeatSpinBox QMenu,
-WTrackMenu,
-WTrackMenu QCheckBox,
-WTrackMenu QMenu,
-WTrackMenu QMenu QCheckBox,
-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,
@@ -78,78 +115,111 @@ WPushButton, WLibrary QPushButton,
   font-size: 10px;
   text-align: center;
 }
-#EQKillButton {
-  font-size: 12px;
+
+WPushButton, WLibrary QPushButton,
+#RecDuration[highlight="0"],
+#RecDuration[highlight="1"] {
+  font-size: 11px;
 }
 
-#ArtistText,
-#TitleText,
-#BpmText {
-  font-size: 18px;
-  }
-  #ArtistText,
-  #TitleText {
-    text-align: left;
-  }
-  #BpmText {
-    text-align: center;
-  }
+#RecDuration[highlight="2"],
+#SamplerTitleMini,
+#EQKillButton,
+#RateText,
+#SamplerBPM,
+#PreviewBPM,
+WLibrary QRadioButton {
+	font-size: 12px;
+}
 
-#SkinSettingsLabelButton,
-#CategoryLabel  {
-  font-size: 17px;
+WKey,
+#DurationText,
+WEffectSelector,
+WEffectSelector QAbstractScrollArea,
+#fadeModeCombobox,
+#fadeModeCombobox QAbstractScrollArea,
+#labelRecPrefix,
+#labelRecFilename,
+#labelRecStatistics,
+#SkinSettingsButton,
+#DeckSizeButton,
+#SkinSettingsMixerToggle,
+#SkinSettingsText  {
+  font-size: 13px;
+}
+
+#PlayPositionTextSmall,
+#SamplerTitleMini,
+#MicAuxLabel, #MicAuxLabelUnconfigured,
+#PreviewTitle,
+#PreviewLabel,
+WBeatSpinBox,
+#spinBoxTransition,
+WTime {
+  font-size: 14px;
   text-align: left;
 }
 
 #TitleTextSmall,
 #ArtistTextSmall,
 #PlayPositionText,
-#PlayPositionTextSmall,
-#BpmTextSmall,
+#BpmText, #BpmTextSmall,
 #FxUnitLabel,
 #SamplerTitle {
-	font-size: 16px;
+  font-size: 16px;
 }
 
-#SamplerTitleSmall,
-#MicAuxSubTitle,
-#PreviewTitle,
-#PreviewLabel,
-WTime {
-  font-size: 14px;
+#SkinSettingsLabelButton,
+#CategoryLabel  {
+  font-size: 17px;
   text-align: left;
 }
 
-WKey,
-#DurationText,
-WBeatSpinBox,
-#spinBoxTransition,
-WLibrary QHeaderView {
-  font-size: 13px;
+#ArtistText,
+#TitleText {
+  font-size: 18px;
 }
 
 #RateText,
+#MicAuxLabel,
 #PreviewBPM,
-WEffectSelector,
-WEffectSelector QAbstractScrollArea,
-#fadeModeCombobox,
-#fadeModeCombobox QAbstractScrollArea {
-  font-size: 12px;
-  }
-  #RateText,
-  #MicAuxSubTitle,
-  #PreviewBPM {
-    text-align: center;
-  }
+WBeatSpinBox, #spinBoxTransition {
+  text-align: center;
+}
+WBeatSpinBox, #spinBoxTransition {
+  qproperty-alignment: 'AlignHCenter';
+}
 
-#SamplerTitle {
+#SamplerTitle,
+#SamplerTitleMini {
   text-align: left;
 }
-#SamplerTitleSmall {
-  text-align: left;
+
+#KnobLabel,
+#FxKnobLabel,
+#FxButtonLabel {
+  qproperty-alignment: 'AlignLeft | AlignVCenter';
 }
 
 
+#LibraryContainer QHeaderView {
+  /* use relative font size, adjusts with OS font size */
+  font-size: 1em;
+  line-height: 1.2em;
+  border-bottom: 1px solid #000;
+  }
+  #LibraryContainer QHeaderView::section {
+    height: 1.2em;
+    border: 0px;
+    padding: 0px 2px;
+  }
+  #LibraryContainer QHeaderView::up-arrow,
+  #LibraryContainer QHeaderView::down-arrow {
+    width: 0.8em;
+    padding: 0px 3px;
+    }
+
+
 /* This does NOT style the cue labels in the overview
 WOverview {
   font-size: 20px;
@@ -164,1650 +234,190 @@ WOverview {
 WOverview QLabel {
   font-weight: bold;
   font-size: 12px;
-  color: green;
   background-color: blue;
 } */
 /************** font sizes / alignment ****************************************/
+/************** font settings *************************************************/
 
 
 
-/************** font colors **************************************************/
-#VinylButton[displayValue="0"],
-#VinylTristateButton,
-#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"],
-#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;
-}
-
-/* yellow */
-#Deck1 WLabel, #Deck2 WLabel,
-#DeckMini1 WLabel, #DeckMini2 WLabel,
-#Deck1 WBeatSpinBox, #Deck2 WBeatSpinBox, #spinBoxTransition,
-#Deck1 WStarRating, #Deck2 WStarRating,
-#SamplerTitle, #SamplerTitleSmall, #SamplerBpm,
-#FxUnitLabel, #MicAuxSubTitle,
-WEffectSelector, WEffectSelector QAbstractScrollArea,
-#PreviewLabel, #PreviewDeckText, #PreviewTitle, #PreviewBPM,
-#fadeModeCombobox, #fadeModeCombobox QAbstractScrollArea,
-#CategoryLabel, #SkinSettingsLabelButton,
-WSearchLineEdit,
-#LibraryBPMSpinBox,
-#LibraryBPMButton::item,
-#LibraryContainer QTableView,
-#LibraryContainer QTextBrowser,
-#LibraryContainer QTreeView,
-WLibrary QLabel, WLibrary QRadioButton,
-WLibrary QTableView::indicator,
-QToolTip,
-WBeatSpinBox QMenu,
-#LibraryContainer QMenu,
-#LibraryContainer QMenu QCheckBox,
-WCueMenuPopup,
-WCueMenuPopup QMenu,
-WCueMenuPopup QLabel,
-#CueLabelEdit,
-WCoverArtMenu,
-WTrackMenu,
-WTrackMenu QCheckBox,
-WTrackMenu QMenu,
-WTrackMenu QMenu QCheckBox,
-#LatencyLabel, WTime {
-  color: #f0bb2b;
-  }
-  WSearchLineEdit,
-  #LibraryBPMSpinBox,
-  #LibraryBPMButton::item,
-  #LibraryContainer QTableView,
-  #LibraryContainer QTextBrowser,
-  #LibraryContainer QTreeView {
-    selection-color: #f0bb2b;
-  }
 
-/* light blue */
-#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;
-}
+/*********** layout margins & paddings of individual sections ******************
+*******************************************************************************/
 
-#MasterHeadphoneMixer WLabel,
-#FxKnobLabel,
-#FxButtonLabel {
-  padding: 0px;
-  background-color: #101010;
+/************** ToolBar *******************************************************/
+#ToolBar {
+  }
+  #ToolBar, #ToolBarSection {
+    qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
   }
-  #FxKnobLabel,
-  #FxButtonLabel {
-    qproperty-alignment: 'AlignLeft | AlignVCenter';
+  #RecBox {
+    qproperty-layoutAlignment: 'AlignCenter';
+    }
+  #ClockWidget {
+    qproperty-layoutAlignment: 'AlignVCenter | AlignHCenter';
     }
+  #LatencyLabel {
+  }
+/************** ToolBar *******************************************************/
 
-/* Passthrough label on overview waveform */
-WOverview #PassthroughLabel {
-  font-weight: bold;
-  color: #d09300;
-}
 
-/************** font colors **************************************************/
-/************** font settings *************************************************/
 
+/************** Decks *********************************************************/
 
+#DeckRows12345 {
+  }
 
-/************** Backgrounds, 3D borders & margins *****************************
-************** of major GUI containers **************************************/
+#DeckRow_1_KeyVinylFx {
+  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
+  }
+  #VinylControls {
+    qproperty-layoutAlignment: 'AlignLeft | AlignTop';
+  }
+  #VinylStatus {
+    border-radius: 5px;
+  }
+  #KeyText, #KeyTextSmall {
+    qproperty-alignment: 'AlignCenter';
+  }
 
-#debugbg {
-    background-color: #fff;
-}
+#DeckRow_2_3_ArtistTitleTime {
+  }
+  #TitleRow {
+    qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
+  }
+  #PlayPositionGutter, #DurationGutter {
+    qproperty-layoutAlignment: 'AlignRight | AlignBottom';
+  }
 
-#SkinContainer {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
-}
+#DeckSettings {
+  qproperty-layoutAlignment: 'AlignCenter';
+  }
+  #Stars {
+    qproperty-layoutAlignment: 'AlignCenter';
+  }
 
-#Deck1, #DeckMini1, #Deck2, #DeckMini2,
-  #Deck3, #DeckMini3, #Deck4, #DeckMini4,
-  #DeckRow_1_KeyVinylFx,
-  #DeckRow_2_3_ArtistTitleTime,
-  #DeckRow_4_OverviewSpinny,
-#FxUnit1, #FxUnit2, #FxUnit3, #FxUnit4,
-  #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,
-#PreviewDeck,
-#SearchLineBox,
-QAbstractScrollArea::corner {
-  background-color: #1e1e1e;
-}
+#DeckRow_5_LoopCuesTransport {
+  qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
+  }
+  #DeckRow_5_LoopCuesTransportCompact {
+    qproperty-layoutAlignment: 'AlignLeft';
+  }
 
-/* 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,
-#FxSlotBorder1[highlight="0"],
-#FxSlotBorder2[highlight="0"],
-#FxSlotBorder3[highlight="0"],
-#SamplerHotcues,
-#MicAuxMainControlsFrame, #MicAuxSubControlsFrame,
-WSearchLineEdit,
-#OverviewBox,
-#KeyText {
-  border-top: 1px solid #0a0a0a;
-  border-left: 1px solid #0a0a0a;
-  border-bottom: 1px solid #333;
-  border-right: 1px solid #333;
-  border-bottom-left-radius: 1px;
-  border-top-right-radius: 1px; /*
-  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;
-} */
+  #LoopControls,
+  #JumpControls {
+    qproperty-layoutAlignment: 'AlignCenter';
+  }
 
-/************ 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 visibility conditions */
-#SeparatorLine {
-  background-color: #0c0c0c;
-}
-
-/*********** layout margins & paddings ****************************************/
-#Deck1, #Deck2,
-#Deck3, #Deck4,
-#DeckMini1, #DeckMini2,
-#DeckMini3, #DeckMini4,
-#FxUnit1, #FxUnit3,
-#FxUnit2, #FxUnit4,
-#MicRack, #AuxRack {
-  margin-bottom: 5px;
-}
-#MixerContainer {
-  margin-bottom: 3px;
+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
+  background: none;*/
 }
 
-#Deck1, #Deck2,
-#Deck3, #Deck4 {
-  padding: 2px 3px 3px 2px;
-}
-#DeckMini1, #DeckMini2,
-#DeckMini3, #DeckMini4 {
-  padding: 1px;
-}
-#DeckMini1, #DeckMini2 {
-  margin-top: 5px;
+#BpmText,
+#RateText {
+  qproperty-alignment: 'AlignCenter';
 }
 
-#Deck1, #DeckMini1,
-#Deck2, #DeckMini2,
-#Deck3, #DeckMini3,
-#Deck4, #DeckMini4,
-#FxUnit1, #FxUnit3,
-#FxUnit2, #FxUnit4 {
-  margin-right: 3px;
-  margin-left: 3px;
+#RateContainer,
+#RateContainerCompact,
+#BpmContainer,
+#RateButtons
+#SyncBox {
+  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
 }
 
-#MicRack, #AuxRack {
-  margin-left: 3px;
-  margin-right: 3px;
+#RateControls {
+  qproperty-layoutAlignment: 'AlignHCenter | AlignBottom';
 }
-/************** Backgrounds, 3D borders & margins *****************************
-************** of major GUI containers **************************************/
+/************** Decks  ********************************************************/
 
 
 
-/************** 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);
+/************** Mixer  ********************************************************/
+#MixerContainer {
+  qproperty-layoutAlignment: 'AlignTop';
 }
 
-#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;
+#MixerDecks {
+  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
   }
-  #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;
+  #MixerChannel_2Decks {
+    qproperty-layoutAlignment: 'AlignHCenter | AlignBottom';
   }
-  #KeyUpButton[displayValue="1"] {
-    border-width: 2px 0px 2px 2px;
-    border-image: url(skin:buttons_classic/btn_embedded_library_active.svg) 2 1 2 2;
+
+  #MixerChannel_4Decks {
+    qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
   }
 
-#FxSuperLinkButton,
-#FxSuperLinkInvertButton {
-  border: 1px solid #0a0a0a;
-  border-radius: 2px;
-}
+  #MixerChannel_2Decks_Left {
+    qproperty-layoutAlignment: 'AlignRight | AlignBottom';
+  }
 
-#BeatgridButtonsToggle {
-  border-width: 2px;
-  border-image: url(skin:buttons_classic/btn_embedded_library.svg) 2 2 2 2;
-  margin: 1px;
-}
+  #MixerChannel_2Decks_Right {
+    qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
+  }
 
-/* Library controls in AutoDJ etc. */
-#DlgMissing > QPushButton,
-#DlgHidden > QPushButton,
-#DlgAutoDJ > QPushButton,
-#DlgRecording > QPushButton,
-#DlgAnalysis > QPushButton {
-  color: #bbb;
+  #VolumeGain2Decks {
+    qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
   }
-  #DlgMissing > QPushButton:focus,
-  #DlgHidden > QPushButton:focus,
-  #DlgAutoDJ > QPushButton:focus,
-  #DlgRecording > QPushButton:focus,
-  #DlgAnalysis > QPushButton:focus {
-    outline: none;
+  #VuAndSlider_4Decks {
+    qproperty-layoutAlignment: 'AlignRight | AlignTop';
   }
-  #DlgMissing > QPushButton:pressed,
-  #DlgHidden > QPushButton:pressed,
-  #DlgAutoDJ > QPushButton:pressed,
-  #DlgRecording > QPushButton:pressed,
-  #DlgAnalysis > QPushButton:pressed {
-    border-image: url(skin:buttons_classic/btn_embedded_library_active.svg) 2 2 2 2;
-    color: #d2d2d2;
+
+  #KnobCentered {
+    qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
   }
-  #DlgMissing > QPushButton:!enabled,
-  #DlgHidden > QPushButton:!enabled,
-  #DlgAutoDJ > QPushButton:!enabled,
-  #DlgRecording > QPushButton:!enabled,
-  #DlgAnalysis > QPushButton:!enabled {
-    color: #666;
-  }
-  QPushButton#pushButtonAutoDJ:checked,
-  QPushButton#pushButtonRepeatPlaylist:checked,
-  #DlgAnalysis > QPushButton:checked,
-  QPushButton#pushButtonRecording:checked {
-    color: #000;
-  }
-
-WEffectSelector,
-WEffectSelector:open {
-  border-width: 1px 2px 2px 1px;
-  }
-  WEffectSelector {
-    border-image: url(skin:buttons_classic/btn_elevated_fx_selector.svg) 1 2 2 1;
-  }
-  WEffectSelector:open {
-    border-image: url(skin:buttons_classic/btn_elevated_fx_selector_open.svg) 1 2 2 1;
-  }
-
-#fadeModeCombobox,
-#fadeModeCombobox:open {
-  border-width: 2px 2px 2px 2px;
-  }
-  #fadeModeCombobox {
-    border-image: url(skin:buttons_classic/btn_embedded_library.svg) 2 2 2 2;
-  }
-  #fadeModeCombobox:open {
-    border-image: url(skin:buttons_classic/btn_embedded_library_active.svg) 2 2 2 2;
-  }
-
-#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.
-
-  font-family: "Acknowledge TT (BRK)";
-  font-family: "Bulky Pixels";
-  font-family: "Irresistor";
-  font-family: "Visitor TT1 BRK";
-  font-family: "Boxy Bold";
-  font-family: "Pixel Intv";
-  font-size: 13px;
-  color: #eee;
-  */
-}
-
-#RateControls WPushButton, #SyncButton,
-#DeckRow_5_LoopCuesTransport WPushButton, #PlayBg,
-#PlayContainerSmall WPushButton,
-#PflButton, #EQKillButton, #QuickEffectButton,
-#PlaySampler, #PlayDeckMini,
-#SamplerButtons WPushButton,
-#SamplerSyncButton,
-#FxUnitControlsExpanded WPushButton, #FxUnitControlsCollapsed  WPushButton,
-#FxExpandCollapseButton,
-#FxAssignButton, #FxToggleButton, #FxParameterButton, #FxFocusButton,
-#SplitCueButton,
-#PlayPreview,
-#BeatgridButtons WPushButton,
-#MicTalk, #PlayAux, #MicAuxAddButton, #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;
-}
-
-/************** 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,
-#PlaySampler[displayValue="0"], #PlayDeckMini[displayValue="0"],
-#SamplerSyncButton[displayValue="0"],
-#MicTalk[value="0"], #PlayAux[value="0"], #MicAuxAddButton,
-#MicDuckingButton[value="0"],
-#PlayPreview[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"],
-#CueDeleteButton {
-  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"], #PlayBg,
-#HotcueButton,
-#FxAssignButton[displayValue="0"], #FxFocusButton[displayValue="0"],
-#FxToggleButton[displayValue="0"], #FxParameterButton[displayValue="0"],
-#SplitCueButton[value="0"],
-#MicAuxGainPFlContainer WPushButton[displayValue="0"] {
-  background-color: #2c2c2c;
-}
-/* Exception: #PlayDeck is transparent. #PlayIndicator & #PlayBg shine through */
-WPushButton#PlayDeck[value="0"],
-WPushButton#PlayDeck[value="1"],
-WPushButton#PlayDeckMini[value="0"],
-WPushButton#PlayDeckMini[value="1"],
-WPushButton#PlayIndicator[value="0"] {
-  background-color: none;
-}
-
-/* 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"], #PlayIndicator[displayValue="1"],
-#PlayDeckMini[displayValue="1"],
-#PlaySampler[displayValue="1"],
-#PflButton[value="1"],
-#SamplerSyncButton[displayValue="1"],
-#EQKillButton[displayValue="1"],
-#MicTalk[value="1"], #PlayAux[value="1"],
-#MicDuckingButton[value="1"],
-#PlayPreview[displayValue="1"],
-QPushButton#pushButtonRecording:checked,
-#RecFeedback[displayValue="2"],
-#BeatgridButtons WPushButton[value="1"],
-#KeyMatchButton[displayValue="1"],
-#KeyUpButton[displayValue="1"],
-#KeyDownButton[displayValue="1"] {
-  background-color: #db0000;
-}
-
-#BroadcastButton[displayValue="3"] {
-  /* pink */
-  background-color: #f856e7;
-}
-
-/* Orange/yellow */
-#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;
-}
-
-#SpecialCueButton[value="1"] {
-  background-color: #0044ff;
-}
-
-
-/************** 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;
-  }
-
-#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;
-}
-
-#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;
-}
-
-#QuickEffectButton[displayValue="0"] {
-  image: url(skin:/buttons_classic/btn__star.svg) no-repeat center center;
-}
-
-#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;
-    }
-
-#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;
-  }
-
-#PlaySampler[value="0"],
-#PlayDeckMini[value="0"],
-#PlayPreview[displayValue="0"] {
-  image: url(skin:/buttons_classic/btn__play_sampler.svg) no-repeat center center;
-  }
-  #PlaySampler[value="1"],
-  #PlayDeckMini[value="1"],
-  #PlayPreview[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;
-    }
-    #HotcuesEarlier {
-      image: url(skin:/buttons_classic/btn__hotcues_earlier.svg) no-repeat center center;
-    }
-    #HotcuesLater {
-      image: url(skin:/buttons_classic/btn__hotcues_later.svg) no-repeat center center;
-    }
-
-#MicTalk {
-  image: url(skin:/buttons_classic/btn__mic_talk.svg) no-repeat center center;
-}
-#PlayAux {
-  image: url(skin:/buttons_classic/btn__aux_play.svg) no-repeat center center;
-}
-#MicAuxAddButton {
-  image: url(skin:/buttons_classic/btn__plus.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;
-  }
-
-#RecDot {
-  background: transparent;
-  image: url(skin:/buttons_classic/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_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;
-  }
-
-#ToolbarLogo {
-  image: url(skin:/style_classic/mixxx_logo_small.svg) no-repeat center center;
-}
-
-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);
-  }
-
-/* AutoDJ button icons */
-QPushButton#pushButtonAutoDJ:!checked {
-  image: url(skin:/buttons_classic/btn__autodj_enable_off.svg) no-repeat center center;
-  }
-  QPushButton#pushButtonAutoDJ:checked {
-    image: url(skin:/buttons_classic/btn__autodj_enable_on.svg) no-repeat center center;
-  }
-
-QPushButton#pushButtonFadeNow:!enabled {
-  image: url(skin:/buttons_classic/btn__autodj_fade_disabled.svg) no-repeat center center;
-  }
-  QPushButton#pushButtonFadeNow:enabled {
-    image: url(skin:/buttons_classic/btn__autodj_fade.svg) no-repeat center center;
-  }
-
-QPushButton#pushButtonSkipNext:!enabled {
-  image: url(skin:/buttons_classic/btn__autodj_skip_disabled.svg) no-repeat center center;
-  }
-  QPushButton#pushButtonSkipNext:enabled {
-    image: url(skin:/buttons_classic/btn__autodj_skip.svg) no-repeat center center;
-  }
-
-QPushButton#pushButtonShuffle:enabled {
-  image: url(skin:/buttons_classic/btn__autodj_shuffle.svg) no-repeat center center;
-}
-
-QPushButton#pushButtonAddRandom:enabled {
-  image: url(skin:/buttons_classic/btn__autodj_addrandom.svg) no-repeat center center;
-}
-
-QPushButton#pushButtonRepeatPlaylist:!checked {
-  image: url(skin:/buttons_classic/btn__autodj_repeat_playlist_off.svg) no-repeat center center;
-  }
-  QPushButton#pushButtonRepeatPlaylist:checked {
-    image: url(skin:/buttons_classic/btn__autodj_repeat_playlist_on.svg) no-repeat center center;
-  }
-/* AutoDJ button icons */
-
-/* widgets in cue popup menu */
-#CueDeleteButton {  /*
-  padding: 3px 6px; */
-  qproperty-icon: url(skin:/buttons_classic/btn__delete.svg);
-  /* color buttons are 42x24 px.
-  To get the final size for the Delete button consider border width.
-  wide button:
-  width: 38px;
-  height: 20px;
-  tall button, about the same height as cue number + label edit box */
-  width: 24px;
-  height: 42px;
-  border-width: 2px;
-  border-image: url(skin:/buttons_classic/btn_embedded_library.svg) 2 2 2 2;
-  /* make the icon slightly larger than default 16px */
-  qproperty-iconSize: 20px;
-  /* has no effect
-  padding: 0px; */
-}
-/*    */
-#CueLabelEdit {
-  border: 1px solid #f0bb2b;
-  border-radius: 0px;
-  background-color: #000;
-  selection-color: #000;
-  selection-background-color: #ccc;
-  padding: 2px;
-}
-/************** Button icons **************************************************/
-/************** Button styles *************************************************/
-
-
-
-/************** ToolBar *******************************************************/
-#ToolBar {
-  padding: 1px 0px 2px 2px;
-  }
-  #ToolBar, #ToolBarSection {
-    qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
-    qproperty-layoutSpacing: 2;
-  }
-  #ToolBarSeparator {
-    background: transparent;
-    image: url(skin:/style_classic/toolbar_separator.png) no-repeat center center;
-    margin: 0px 3px;
-  }
-
-  #RecBox {
-    qproperty-layoutAlignment: 'AlignCenter';
-    }
-
-  #ClockWidget {
-    qproperty-layoutAlignment: 'AlignVCenter | AlignHCenter';
-    margin-bottom: 2px;
-    }
-
-  #LatencyLabel {
-    padding-bottom: 2px;
-  }
-/************** ToolBar *******************************************************/
-
-
-
-/************** Decks *********************************************************/
-#DeckRow_1_KeyVinylFx {
-  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
-  /* 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 {
-  padding-left: 1px;
-  margin: 2px 0px 2px 0xp;
-  }
-  #TitleRow {
-    qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
-    padding: 0px;
-  }
-  #ArtistRow {
-    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 {
-  padding: 0px 0px 1px 0px;
-}
-
-  #SmallSpinnyCoverContainer {
-    border-width: 1px 0px 0px 0px;
-  }
-  #Stars {
-    qproperty-layoutAlignment: 'AlignCenter';
-    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: 'AlignRight | AlignBottom';
-  padding: 1px 2px 2px 1px;
-  }
-  #PlayCueRevHotCues {
-    qproperty-layoutAlignment: 'AlignRight | AlignBottom';
-  }
-  #PlayContainerSmall {
-    margin: 1px 0px;
-    padding: 5px 1px 0px 2px;
-    border-width: 0px 0px 0px 1px;
-  }
-  #MiniDeckSpinnyCoverContainer {
-    margin: 1px 2px 1px 1px;
-  }
-
-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
-  background: none;*/
-}
-
-
-
-  #TitleTextSmall {
-    padding: 1px 3px 1px 1px;
-  }
-  #ArtistTextSmall {
-    margin: 0px 2px 0px 1px;
-    padding: 0px 1px 0px 0px;
-    border-width: 1px 0px 0px 0px;
-  }
-  #PlayPositionTextSmall {
-    padding: 0px 3px 2px 2px; /*
-    border-width: 0px 1px 0px 0px;  */
-  }
-
-#RateContainer {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
-  /* for some reason padding-right & margin-right are not applied.
-    #RateControls add the right margin. */
-  padding: 4px 0px 3px 0px;
-}
-
-#BpmContainer {
-  qproperty-layoutAlignment: 'AlignCenter';
-  }
-  #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;
-  }
-  #RateSlider {
-  }
-  #RateButtons {
-    qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
-  }
-
-#SyncBox {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
-  margin: 2px 1px 1px 0px;
-}
-
-
-/***************** Loop Controls *****************/
-WBeatSpinBox,
-#spinBoxTransition,
-#LibraryBPMSpinBox  {
-  selection-color: #000;
-  selection-background-color: #d2d2d2;
-  }
-  WBeatSpinBox:hover,
-  #spinBoxTransition:hover {
-    background-color: #0a0a0a;
-  }
-  WBeatSpinBox:focus,
-  #spinBoxTransition:focus {
-    background-color: #000;
-  }
-  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;
-    }
-    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;
-    }
-  #spinBoxTransition {
-    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;
-    }
-    #spinBoxTransition:hover {
-      border-image: url(skin:buttons_classic/spinbox_embedded_border_hover.svg) 3 19 2 3;
-    }
-    #spinBoxTransition:focus {
-      border-image: url(skin:buttons_classic/spinbox_embedded_border_focus_orange.svg) 3 19 2 3;
-    }
-
-  WBeatSpinBox::up-button,
-  WBeatSpinBox::down-button,
-  #spinBoxTransition::up-button,
-  #spinBoxTransition::down-button {
-    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: 17px;
-    padding: 0px;
-    }
-    WBeatSpinBox::up-button,
-    #spinBoxTransition::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;
-        }
-      #spinBoxTransition::up-button {
-        margin: -1px -2px 0px 0px;
-        }
-    WBeatSpinBox::down-button,
-    #spinBoxTransition::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;
-        }
-      #spinBoxTransition::down-button {
-        margin: 0px -2px -1px 0px;
-        }
-
-/********************** Loop Controls **********************/
-/************** Decks  ********************************************************/
-
-
-
-/************** Mixer  ********************************************************/
-#MixerContainer {
-  qproperty-layoutAlignment: 'AlignTop';
-}
-
-#Mixer {
-  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
-  padding-top: 3px;
-}
-
-#MasterHeadphoneMixerContainer {
-  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;
-  }
-
-#MixerDecks {
-  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
-  padding: 0px 5px 2px 5px;
-  }
-  #MixerChannel_2Decks {
-    qproperty-layoutAlignment: 'AlignHCenter | AlignBottom';
-  }
-
-  #MixerChannel_4Decks {
-    qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
-  }
-
-  #MixerChannel_2Decks_Left {
-    qproperty-layoutAlignment: 'AlignRight | AlignBottom';
-    margin: 0px 2px;
-  }
-
-  #MixerChannel_2Decks_Right {
-    qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
-    margin: 0px 2px;
-  }
-
-  #VuAndSlider4decks {
-    qproperty-layoutAlignment: 'AlignRight | AlignTop';
-  }
-
-
-#PFLVUMeterBox {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
-  padding: 4px 0px 5px 0px;
-}
 
 #VuMeterBox,
 #VuMeterBoxMasterSingle {
-  background-color: #040404;
-  qproperty-layoutSpacing: 1;
+  /* gap in between clipping and Vu level */
+  qproperty-layoutSpacing: 2;
 }
-#VuMeterBox {
+#VuMeterBox,
+#VuMeterBoxMaster,
+#LatencyMeterBox {
+  /* (black) groove around Vu widgets */
   padding: 1px;
+}
+#VuMeterBoxMaster {
+  /* gap in between Master lft/right Vu */
+  qproperty-layoutSpacing: 1;
   }
-  #VuMeterChannel2Decks,
-  #VuMeterChannel4Decks,
-  #VuMeterMaster2Decks,
-  #VuMeterMaster4Decks {
+  #VuMeterChannel_2Decks,
+  #VuMeterChannel_4Decks,
+  #VuMeterMaster_2Decks,
+  #VuMeterMaster_4Decks {
     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';
-  padding: 0px 0px 0px 0px;
-}
-
-#KnobCentered {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
-}
-
-#EQKillButtonBoxLeft {
-  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
-}
-#EQKillButtonBoxRight {
-  qproperty-layoutAlignment: 'AlignRight | AlignTop';
-}
 
 #CrossfaderAndSwitches2Decks {
   qproperty-layoutAlignment: 'AlignHCenter';
-  padding: 0px;
 }
-#CrossfaderSwitch4Decks {
+#CrossfaderSwitch_4Decks {
   qproperty-layoutAlignment: 'AlignRight';
-  margin: 5px 5px 3px 0px;
-}
-#Crossfader {
-  qproperty-layoutAlignment: 'AlignCenter';
-  padding: 0px 0px 0px 1px;
-}
-
-#CrossfaderButtonContainerDeck {
-  padding: 1px;
-  border-bottom: 1px solid #333;
-  border-right: 1px solid #333;
-  border-bottom-right-radius: 1px;
-  }
-#CrossfaderButtonContainerAux {
-  padding: 1px 1px 0px 1px;
-  margin-left: 5px;
-  border-right: 1px solid #333;
-  }
-  #CrossfaderButton[value="0"] {
-  }
-  #CrossfaderButton[value="1"] {
-    background-color: #262626;
-  }
-/************** Mixer  ********************************************************/
-
-
-
-/************** PreviewDeck ***************************************************/
-#PreviewDeck {
-  qproperty-layoutAlignment: 'AlignTop';
-  padding: 1px 1px 0x 1px;
-  margin: 0px 0px 4px 3px;
-}
-
-#PreviewDeckLeftPart,
-#PreviewDeckRightPart {
-  margin-bottom: 1px;
-}
-
-#PreviewTitleEjectRow {
-  }
-  #PreviewLabel {
-    qproperty-alignment: 'AlignVCenter | AlignHCenter';
-    border-width: 0px 1px 0px 0px;
-    padding: 1px 3px 1px 2px;
-    margin-bottom: 1px;
-  }
-  #PreviewDeckText {
-    qproperty-layoutAlignment: 'AlignLeft | AlignTop';
-    padding: 0px;
   }
-    #PreviewTitle {
-      margin: 2px 2px 2px 0px;
+  #CrossfaderContainer {
+    qproperty-layoutAlignment: 'AlignHCenter | AlignBottom';
     }
-    #PreviewBPM {
-      padding: 4px 0px 2px 2px;
+    #Crossfader {
+      qproperty-layoutAlignment: 'AlignCenter';
     }
-  #PreviewEjectButton {
-  }
-
-#PreviewPlayBox {
-  padding: 0px;
-  margin: 0px 1px 0px 0px;
-  border-width: 0px;
-}
-
-#PreviewVuMeter {
-  margin: 0px 0px 0px 2px;
-}
-/************** PreviewDeck ***************************************************/
-
-
-
-/************** SkinSettings **************************************************/
-#SkinSettingsContainer {
-}
-
-#SkinSettings {
-  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
-  padding: 2px 0px 2px 0px;
-  border: 1px solid #585858;
-  border-width: 0px 0px 1px 1px;
-
-}
-#SkinSettingsHeader {
-  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
-  padding-right: 2px;
-  }
-  #SkinSettingsClose {
-    margin-bottom: 1px;
-    background-color: transparent;
-    image: url(skin:/buttons_classic/btn__settings_close.svg) no-repeat center top;
-  }
 
-#SkinSettingsCategory {
-  padding: 3px 10px 10px 4px;
-  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
-  border: 1px solid #1e1e1e;
-  border-width: 0px;
-  }
-  #CategoryLabel {
-    padding: 3px 0px 2px 3px;
-  }
-  #SkinSettingsLabelButton {
-    padding: 0px 0px 0px 3px;
-  }
-  #SkinSettingsButton {
-    padding-top: 1px;
-    color: #d2d2d2;
+#MixerMasterHeadphone {
   }
-
-
-#SubmenuCover {
-  background-color: rgba(15, 15, 15, 180);
-}
-/************** SkinSettings **************************************************/
-
-
-
-/************** Mic Aux *******************************************************/
-#MicAuxRack {
-}
-
-#MicRack, #AuxRack {
-  qproperty-layoutAlignment: 'AlignRight | AlignTop';
-  padding: 2px 3px 1px 4px;
-  qproperty-layoutSpacing: 2;
-  }
-
-#MicAuxUnit {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
-  }
-  #MicAuxMainControlsFrame {
-    border-radius: 1px;
-    }
-    #MicAuxMainControls {
-      border-radius: 2px;
-      padding: 0px 1px 0px 1px;
-      border-bottom-left-radius: 1px;
-      border-top-right-radius: 1px;
-      }
-      #MicAuxSubTitle {
-        qproperty-alignment: 'AlignCenter | AlignTop';
-        padding: 0px 0px 3px 1px;
-      }
-      #MicAuxPlayBox {
-        qproperty-alignment: 'AlignCenter | AlignBottom';
-        padding: 0px 0px 2px 1px;
-      }
-      #MicAuxAddBox {
-        qproperty-alignment: 'AlignCenter | AlignBottom';
-        padding: 0px 0px 8px 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: 1px 1px 3px 2px;
-  }
-  #MicDuckingStrengthKnob {
-  qproperty-layoutAlignment: 'AlignHCenter';
-    margin: 2px 0px 3px 1px;
-  }
-
-/************** Mic Aux *******************************************************/
-
-
-
-/************** Samplers ******************************************************/
-#SamplerRow {
-  qproperty-layoutAlignment: 'AlignTop';
-  margin: 0px 3px 5px 3px;
-  qproperty-layoutSpacing: 3;
-}
-
-#SamplerDeck {
-  padding: 1px 0px 2px 2px;
-}
-
-#SamplerDeckMini {
-  padding: 1px;
-}
-
-#SamplerExpandButtonBox {
-  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
-  padding: 1px 2px 1px 1px;
-}
-
-#SamplerText {
-  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
-  padding: 1px 3px 1px 4px;
-  border-width: 0px 1px 0px 0px;
-}
-
-#SamplerTextSmall {
-  qproperty-layoutAlignment: 'AlignLeft';
-  padding: 0px 0px 0px 3px;
-}
-
-#SamplerPlay {
-  padding: 1px 2px 1px 0px;
-  border-width: 1px 0px 0px 0px;
-  border-right: 0px;
-  border-bottom: 0px;
-  border-left: 0px;
-}
-
-#SamplerPlaySmall {
-  padding: 1px;
-}
-
-#SamplerMiniControls {
-  padding: 0px 0px 0px 2px;
-}
-
-#SamplerButtons {
-  qproperty-layoutAlignment: 'AlignVCenter';
-}
-
-#SamplerDeck #OverviewBox {
-  margin-bottom: 1px;
-}
-
-#SamplerHotcues {
-  padding: 1px 1px 2px 1px;
-}
-
-#SamplerButtonGrid {
-  border-width: 1px 1px 0px 0px;
-  padding: 1px 0px 1px 0px;
-}
-
-#SamplerHotcues,
-#SamplerPfl {
-  qproperty-layoutAlignment: 'AlignRight | AlignVCenter';
-}
-
-#SamplerGain {
-  padding: 0px 0px 0px 2px;
-  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-width: 0px 1px 0px 0px;
-}
-
-#SamplerRateControls {
-  padding: 0px 1px 1px 0px;
+  #MasterControls,
+  #HeadphoneControls {
+    qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
   }
-  #SamplerPitchSlider {
-    padding: 0px 0px 1px 0px;
-    qproperty-layoutAlignment: 'AlignRight | AlignBottom';
+  #MasterHeadphoneSeparator {
   }
-/************** Samplers *****************************************************/
+
+/************** Mixer  ********************************************************/
 
 
 
@@ -1818,86 +428,44 @@ WBeatSpinBox,
 
 #FxUnit1, #FxUnit2, #FxUnit3, #FxUnit4 {
   qproperty-layoutAlignment: 'AlignRight | AlignTop';
-  padding: 2px;
 }
 
-#FxSlotsCollapsed,
-#FxSlotsExpanded {
+#FxUnitHeaderCollapsed,
+#FxUnitHeaderExpanded,
+#FxUnitHeader {
   qproperty-layoutAlignment: 'AlignRight | AlignTop';
 }
-
 #FxUnitControlsExpanded, #FxUnitControlsCollapsed {
   qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
-  padding: 0px 0px 0px 3px;
-}
-
-#SuperMixKnob {
-  margin-bottom: 1px;
-}
-
-#FxUnit1_ExpandCollapseButton,
-#FxUnit2_ExpandCollapseButton,
-#FxUnit3_ExpandCollapseButton,
-#FxUnit4_ExpandCollapseButton {
-  }
-  #ExpandCollapseButton {
-    border: 1px solid #000;
-  }
-
-#FxUnitControlsCollapsed #FxUnitLabel {
-  margin: 0px 3px 0px 5px;
-}
-#FxUnitControlsExpanded #FxUnitLabel {
-  margin: 2px 0px;
-}
-
-#FxSlotsCollapsed #FxSlotContainer {
-  margin: 2px 1px 1px 1px;
-}
-#FxSlotsExpanded #FxSlotContainer {
-  margin: 1px;
 }
 
 #FxSlot1,
 #FxSlot2,
 #FxSlot3 {
   qproperty-layoutAlignment: 'AlignRight | AlignVCenter';
-  padding: 2px 4px 1px 4px;
-}
-#FxSlotBorder1[highlight="1"],
-#FxSlotBorder2[highlight="1"],
-#FxSlotBorder3[highlight="1"] {
-  border: 1px solid #d08e00;
-  background-color: rgba(0,0,0,125);
-}
+  }
 
 #FxFocusButtonBox {
   qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
-  padding: 0px 0px 0px 4px;
 }
 
 #FxMetaKnob {
   qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
-  padding: 1px 4px 2px 4px;
 }
 
-#FxKnobContainer {
+#FxParameterKnobBox {
   qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
 }
 
-#FxKnob {
+#FxParameterKnob {
   qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
   margin-left: 1px;
 }
 
-#FxButtonBox {
+#FxParameterButtonBox {
   qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
 }
 
-#FxUnitKnob {
-  qproperty-layoutAlignment: 'AlignRight';
-  padding: 3px;
-}
 WEffectSelector {
   /* Fixes the white bars on the top/bottom of the popup on Mac OS X */
   min-height: 13px;
@@ -1918,9 +486,9 @@ WEffectSelector {
   #fadeModeCombobox QAbstractScrollArea {
     width: 142px;
     /* padding-left: 6px; */
-    /* On Linux, this is not applied but font color from WEffectSelector
-    is inherited.
-    On Windows, it must be defined here */
+    /* 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;
@@ -1939,7 +507,8 @@ WEffectSelector {
   WEffectSelector::item:selected,
   #fadeModeCombobox::item:selected {
     background-color: #333;
-  /* Already of those two destroys font config and puts tick mark behind text:
+  /* Already one of those properties destroys font config and
+     puts tick mark behind text:
     margin: 0px;
     padding: 0px; */
   /* This moves the tick mark behind item text,
@@ -1951,398 +520,157 @@ WEffectSelector {
   /* This is sufficient to completely hide the tick mark, but
     this alone would show an empty, shadowed box instead of tick mark
     background-color: transparent;*/
-  /* This should decrease the tick mark's left & right margin but is not respected */
+  /* This should decrease the tick mark's left & right margin but is not respected
     margin: 0px;
-    padding: 0px;
+    padding: 0px;*/
   }
+/************** Effects *******************************************************/
+
 
-#FxSuperLinkButton,
-#FxSuperLinkInvertButton {
-  }
-  #FxSuperLinkButton {
-    margin: 0px 1px 0px 0px;
-    }
-  #FxSuperLinkInvertButton {
-    margin: 0px;
-  }
 
-#FxSuperLinkButton[value="0"],
-#FxSuperLinkInvertButton[displayValue="0"] {
-  background-color: #4b4b4b;
+/************** Samplers ******************************************************/
+#SamplerRow {
+  qproperty-layoutAlignment: 'AlignTop';
 }
-#FxSuperLinkInvertButton[displayValue="1"] {
-  background-color: #9C0900;
+#SamplerExpandBox {
+  qproperty-layoutAlignment: 'AlignTop | AlignHCenter';
   }
-  #FxSuperLinkInvertButton[displayValue="1"]:hover {
-    background-color: #B50A00;
+  #SamplerExpand {
   }
+    #SamplerTitleBox {
+      qproperty-layoutAlignment: 'AlignLeft | AlignTop';
+      }
 
-#FxSuperLinkButton[value="1"] {
-  background-color: #5b9601;
-  }
-#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 #333,
-    stop: 1 #333);
-  }
-#FxSuperLinkButton[value="3"] {
-  background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
-    stop: 0 #333,
-    stop: 0.66 #333,
-    stop: 0.67 #5b9601,
-    stop: 1 #5b9601);
-  }
-#FxSuperLinkButton[value="4"] {
-  background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
-    stop: 0 #5b9601,
-    stop: 0.330000 #5b9601,
-    stop: 0.340000 #333,
-    stop: 0.660000 #333,
-    stop: 0.670000 #5b9601,
-    stop: 1 #5b9601);
-  }
-/************** Effects *******************************************************/
+    #SamplerSettings {
+      qproperty-layoutAlignment: 'AlignVCenter';
+    }
+    #SamplerBPMSettingsMini,
+    #SamplerSettingsMini {
+      qproperty-layoutAlignment: 'AlignRight';
+    }
 
+    #SamplerHotcues,
+    #SamplerPfl {
+      qproperty-layoutAlignment: 'AlignRight | AlignVCenter';
+    }
 
+    #SamplerPfl {
+      qproperty-layoutAlignment: 'AlignRight | AlignBottom';
+    }
 
-/************** Library *******************************************************/
-#LibrarySingleton {
-  /* This doesn't work as expected:
-  it appears LibrarySingleton is displayed twice (nested in itself),
-  so padding/margin would double.
-  Placed a plain spacer in library.xml which works reliably
-  padding-top: 5px;*/
-}
+    #SamplerVU {
+      qproperty-layoutAlignment: 'AlignCenter';
+    }
 
-#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 #0f0f0f,
-    stop:1 #1e1e1e);
-}
+    #SamplerPitchSlider {
+      qproperty-layoutAlignment: 'AlignRight | AlignBottom';
+    }
 
-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 #333,
-    stop:1 #1e1e1e);
-  border-right: 1px solid qlineargradient(x1:0, y1:0, x2:0, y2:1,
-    stop:0 #0a0a0a,
-    stop:1 #1e1e1e);
-  border-bottom-right-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
+/************** Samplers *****************************************************/
 
-#LibraryContainer QTableView,
-#LibraryContainer QTextBrowser,
-#LibraryContainer QTreeView {
-  border-top: 1px solid #0a0a0a;
-  border-right: 1px solid qlineargradient(x1:0, y1:0, x2:0, y2:1,
-    stop:0 #333,
-    stop:1 #444);
-  border-bottom: 1px solid #444;
-  border-left: 1px solid #0a0a0a;
-  alternate-background-color: #0a0a0a;
-  selection-background-color: #5e4507;
-}
 
-#LibraryContainer QTableView:focus,
-#LibraryContainer QTreeView:focus,
-#LibraryContainer QTextBrowser:focus {
-  border: 1px solid #ff6600;
-}
 
-#LibraryContainer QTreeView {
-  show-decoration-selected: 0;
-}
+/************** Mic Aux *******************************************************/
 
-/* selected items in Tree and Tracks table */
-#LibraryContainer QTreeView::item:selected,
-#LibraryContainer QTableView::item:selected,
-#LibraryBPMButton::item:selected {
-/* this doesn't style BPM value in selected row
-#LibraryContainer QTableView::item:selected #LibraryBPMSpinBox::item:selected,
-#LibraryContainer QTableView::item:selected > #LibraryBPMSpinBox::item:selected */
-  color: #fff;
-  background-color: #5e4507;
-}
-
-/* checkbox in library "Played" column */
-#LibraryContainer QTableView::indicator {/*
-  This results in 10x10px + 1px border = 12x12px
-  Omitting this definitions makes the checkbox grow to
-  12x12px + 1px border = 14x14px
-  which also miraculously makes the BPM icon grow to 14x14px
-  Neither checkbox nor BPM icon size have an effect on the size... */
-  width: 10px;
-  height: 10px;
-  /* border is added to size defined above */
-  border: 1px solid transparent;
-  margin: 0px;
-  padding: 0px;
+#MicDuckingContainer {
+  qproperty-layoutAlignment: 'AlignCenter | AlignTop';
   }
-  #LibraryContainer QTableView::indicator:hover {
-    border: 1px solid #888;
+  #MicDuckingStrengthBox {
+    qproperty-layoutAlignment: 'AlignHCenter';
   }
-  #LibraryContainer QTableView::indicator:checked,
-  #LibraryContainer QTableView::indicator:checked:selected {
-    image: url(skin:/buttons_classic/btn__lib_checkmark_orange.svg);
-    border: 1px solid #ff6600;
-    }
-    #LibraryContainer QTableView::indicator:checked:hover,
-    #LibraryContainer QTableView::indicator:selected:hover {
-      border: 1px solid #aaa;
-    }
-  #LibraryContainer QTableView::indicator:unchecked {
-    image: none;
-    border: 1px solid rgba(151,151,151,128);
-    }
-    #LibraryContainer QTableView::indicator:unchecked:hover,
-    #LibraryContainer QTableView::indicator:selected {
-      border: 1px solid #888;
-    }
 
-/* Table cell in edit mode */
-WLibrary QLineEdit,
-#LibraryBPMSpinBox {
-  color: #ddd;
-  background-color: #0f0f0f;
-  selection-color: #000;
-  selection-background-color: #ccc;
-  border: 1px solid #5E4507;
-}
-
-/* Entire BPM cell */
-/* Lock icon at the left */
-#LibraryBPMButton::indicator:checked {
-  image: url(skin:/buttons_classic/btn__lib_bpm_locked_orange.svg);
-  }
-#LibraryBPMButton::indicator:unchecked {
-  image: url(skin:/buttons_classic/btn__lib_bpm_unlocked_grey.svg);
-  }
-/* BPM value */
-#LibraryBPMButton::item {
-  }
-#LibraryBPMSpinBox {
-  border-left: 0px;
-}
-/* When activated, the left border of the spinbox shows an
-  artefact of the inactive BPM value. */
-#LibraryBPMSpinBox::up-button,
-#LibraryBPMSpinBox::down-button {
-  background-color: #5E4507;
+#MicAuxUnit {
+  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
   }
-  #LibraryBPMSpinBox::up-button {
-    image: url(skin:/buttons_classic/btn__lib_spinbox_up_white.svg) no-repeat;
+    #MicAuxLabel {
+      qproperty-alignment: 'AlignCenter | AlignTop';
     }
-  #LibraryBPMSpinBox::down-button {
-    image: url(skin:/buttons_classic/btn__lib_spinbox_down_white.svg) no-repeat;
+    #AuxPlayBox {
+      qproperty-layoutAlignment: 'AlignCenter | AlignBottom';
     }
-/* remove OS focus indicator from BPM cell */
-WLibrary QCheckBox,
-#LibraryBPMButton::item:selected,
-WCueMenuPopup QPushButton:focus {
-  outline: none;
-}
-
-/* Button in library "Preview" column */
-#LibraryPreviewButton {/*
-  width: 23px;
-  height: 12px;*/
-  background: transparent;
-  margin: 0px;
-  padding: 0px;
-  border-radius: 2px;
-  border: 1px solid transparent;
-  }
-  #LibraryPreviewButton:!checked {
-    image: url(skin:/buttons_classic/btn__lib_preview_play_grey.svg);
-    }
-    #LibraryPreviewButton:!checked:hover {
-      border: 1px solid #5e4507;
-      background: #0f0f0f;
+    #MicTalkBox {
+      qproperty-layoutAlignment: 'AlignCenter | AlignBottom';
     }
-  #LibraryPreviewButton:checked {
-    image: url(skin:/buttons_classic/btn__lib_preview_pause.svg);
-    background-color: #000;
-    border: 1px solid #5e4507;
+    #MicAuxVUMeter {
+      qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
     }
-    #LibraryPreviewButton:checked:hover {
-      border: 1px solid #888;
+    #MicAuxAddBox {
+      qproperty-layoutAlignment: 'AlignCenter | AlignBottom';
     }
 
-#LibraryContainer QHeaderView {
-  font-size: 13px/15px;
-  color: #bbb;
-  border-bottom: 1px solid #000;
-  }
-  #LibraryContainer QHeaderView::section {
-    height: 18px;
-    border: 0px;
-    border-right: 1px solid #000;
-    border-bottom: 1px solid #000;
-    padding: 0px 2px;
-  }
-
-  #LibraryContainer QHeaderView::up-arrow,
-  #LibraryContainer QHeaderView::down-arrow {
-    width: 12px;
-    padding-left: 3px;
-    padding-right: 3px;
-    border-right: 1px solid #000;
-    /* gradient colors should match those of QHeaderView gradient,
-      with a little transparency added to not cut off the header label */
-    background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
-      stop:0 rgba(34,34,34,190),
-      stop:1 rgba(17,17,17,190));
+  #MicAuxSubControls {
+    qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
     }
-    #LibraryContainer QHeaderView::up-arrow {
-      image: url(skin:/buttons_classic/btn__lib_sort_up.png);
+    #MicAuxGainPFlContainer {
+      }
+      #MicAuxGainKnob {
+        qproperty-layoutAlignment: 'AlignCenter';
       }
-    #LibraryContainer QHeaderView::down-arrow {
-      image: url(skin:/style_classic/btn_lib_sort_down.png);
+    #MicAuxFxButtons {
+      qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
     }
 
-/*********** scrollbars *********************************/
-#LibraryContainer QScrollBar,
-WEffectSelector QAbstractScrollArea QScrollBar {
-  border: 0px solid #585858;
-  background: #000;
-  border-radius: 2px;
-  padding: 1px;
-  color: #999999;
+/************** Mic Aux *******************************************************/
+
+
+
+/************** Skin setttings ************************************************/
+
+#SkinSettings {
+  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
   }
-  #LibraryContainer QScrollBar:horizontal,
-  WEffectSelector QAbstractScrollArea QScrollBar:horizontal {
-    min-width: 12px;
-    height: 15px;
-    border-top-left-radius: 0px;
-    border-top-right-radius: 0px;
-    background-color: #000;
+  #SkinSettingsCategory {
+    qproperty-layoutAlignment: 'AlignLeft | AlignTop';
   }
-  #LibraryContainer QScrollBar:vertical,
-  WEffectSelector QAbstractScrollArea QScrollBar:vertical {
-    min-height: 12px;
-    width: 15px;
-    border-top-left-radius: 0px;
-    border-bottom-left-radius: 0px;
-    color: #b3b3b3;
-    background-color: #000;
+  #DeckSizeToggleContainer {
+    qproperty-layoutAlignment: 'AlignLeft | AlignTop';
   }
-  /* catch scroll bar of focused treeview like this:
-  #LibraryContainer QTreeView:focus QScrollBar:vertical {
-  }*/
-#LibraryContainer QScrollBar::handle:horizontal,
-WEffectSelector QAbstractScrollArea QScrollBar::handle:horizontal {
-  min-width: 25px;
-  border-radius: 2px;
-  background: qlineargradient(x1:0, y1:0, x2:0, y2:1,
-    stop:0 #725309,
-    stop:1 #412f05);
-}
-#LibraryContainer QScrollBar::handle:vertical,
-WEffectSelector QAbstractScrollArea QScrollBar::handle:vertical {
-  min-height: 25px;
-  border-radius: 2px;
-  background: qlineargradient(x1:0, y1:0, x2:0, y2:1,
-    stop:0 #725309,
-    stop:1 #412f05);
-}
-
-/* "add-page" and "sub-page" are the gutter of the scrollbar */
-#LibraryContainer QScrollBar::add-page,
-#LibraryContainer QScrollBar::sub-page,
-WEffectSelector QAbstractScrollArea QScrollBar::add-page,
-WEffectSelector QAbstractScrollArea QScrollBar::sub-page {
-  min-width: 15px;
-  min-height: 15px;
-  background-color: #000;
-  border-radius: 2px;
-}
-/* Turn off buttons */
-#LibraryContainer QScrollBar::add-line,
-#LibraryContainer QScrollBar::sub-line,
-WEffectSelector QAbstractScrollArea QScrollBar::add-line,
-WEffectSelector QAbstractScrollArea QScrollBar::sub-line{
-  width: 0px;
-  height: 0px;
-  border: 0px;
-}
 
-/* Corner in between two scrollbars */
-#LibraryContainer QAbstractScrollArea::corner,
-WEffectSelector QAbstractScrollArea QScrollBar::corner {
-  background-color: #1e1e1e;
-}
-/*********** scrollbars *********************************/
 
 
-/*********** library search bar *********************************/
-#SearchLineBox {
-  padding: 2px;
-  margin-bottom: 3px;
-  margin-left: 2px;
-}
 
-WSearchLineEdit {
-  padding: 2px;
-  background-color: #0f0f0f;
-  selection-color: #000;
-  selection-background-color: #ccc;
-  }
-  WSearchLineEdit:focus {
-    padding: 1px;
-    border: 2px solid #d08e00;
-  }
-  /* Clear button: see /skins/default.qss */
-
-/************ splitters ***********************/
-/* HorizontalSplitter
-  (the splitter itself is horizontal)
-  Used to split
-  - Waveforms & Decks/FX/etc
-  - Library feature & Coverart */
-#HorizontalSplitter {
-  padding: 0px;
-  margin: 0px;
+
+/************** PreviewDeck ***************************************************/
+#PreviewDeck {
+  qproperty-layoutAlignment: 'AlignTop';
 }
 
-#HorizontalSplitter::handle {
-    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_classic/splitter_handle_horizontal_checked.png);
+#PreviewTitleEjectRow {
   }
-#HorizontalSplitter::handle:vertical {
-  height: 9px;
-}
+  #PreviewDeckTextBox {
+    qproperty-layoutAlignment: 'AlignLeft | AlignTop';
+    }
+    #PreviewLabel { /* Placeholder */
+      qproperty-alignment: 'AlignVCenter | AlignLeft';
+    }
+/************** PreviewDeck ***************************************************/
+/*********** layout margins & paddings of individual sections ******************
+*******************************************************************************/
 
-/* VerticalSplitter
-  (the splitter itself is vertical)
-  Used to split Library sidebar & Tracks table */
-#VerticalSplitter::handle {
-  image: url(skin:/style_classic/splitter_handle_unchecked.png);
-}
-#VerticalSplitter::handle:pressed,
-#VerticalSplitter::handle:hover {
-  image: url(skin:/style_classic/splitter_handle_checked.png);
-}
-#VerticalSplitter::handle:vertical {
-  /* 'height' works although it's actually the width of the handle */
-  height: 10px;
+
+
+/************** Library *******************************************************/
+
+#LibrarySingleton {
+  /* This doesn't work as expected:
+  it appears LibrarySingleton is displayed twice (nested in itself),
+  so padding/margin would double.
+  Placed a plain spacer in library.xml which works reliably
+  padding-top: 5px;*/
 }
-/************ splitters ***********************/
 
 
+#SearchLineBox {
+  padding: 2px 0px 2px 2px;
+  border-right: 0px;
+  border-top-right-radius: 0px;
+  border-top-left-radius: 0px;
+  }
+  #LibExpandBox {
+    qproperty-layoutAlignment: 'AlignTop | AlignHCenter';
+  }
+
+/************ Library feature controls / tree view / table view *************/
 /* Extra declaration for QRadioButton otherwise it shows up with wrong colors in Linux with Gnome */
 WLibrary QLabel, WLibrary QRadioButton {
   background: transparent;
@@ -2360,14 +688,6 @@ WLibrary QRadioButton {
   margin: 2px 5px 5px 1px;
 }
 
-WLibrary QRadioButton::indicator:checked {
-  background: url(skin:/buttons_classic/btn__lib_radio_button_on_yellow.svg) center center;
-}
-
-WLibrary QRadioButton::indicator:unchecked {
-  background: url(skin:/buttons_classic/btn__lib_radio_button_off.svg) center center;
-}
-
 /* Library feature pushbuttons
   Don't use 'WLibrary QPushButton' here, as this would apply padding
   to the Preview & BPM lock buttons as well.
@@ -2377,9 +697,12 @@ WLibrary QRadioButton::indicator:unchecked {
 #DlgAutoDJ > QPushButton,
 #DlgRecording > QPushButton,
 #DlgAnalysis > QPushButton {
-  margin: 0px 6px 3px 0px;
+  margin: 0px 2px 3px 0px;
   padding: 0px;
+  /* Note: border-width is added, so the effective minimal size
+    is 24 x 36 px */
   height: 20px;
+  min-width: 32px;
   }
 #DlgMissing > QPushButton,
 #DlgHidden > QPushButton,
@@ -2407,360 +730,16 @@ WLibrary QRadioButton::indicator:unchecked {
 #labelRecFilename,
 #labelRecStatistics {
   text-transform: none;
-  font-size: 13px;
   padding: 0px 0px 3px 0px;
   }
-  #labelRecFilename {
-    font-weight: bold;
-  }
-  #labelRecPrefix,
-  #labelRecStatistics {
-    font-weight: normal;
-  }
 
 #LibraryContainer QTreeView {
   show-decoration-selected: 0;
 }
-/* triangle for closed/opened branches in treeview */
-/* closed */
-#LibraryContainer QTreeView::branch:closed:has-children:!has-siblings:!selected,
-#LibraryContainer QTreeView::branch:closed:has-children:has-siblings:!selected {
-/*  Suppresses that selected sidebar items branch indicator shows wrong color when out of focus ; lp:880588 */
-  border-image: none;
-    image: url(skin:/style_classic/library_branch_closed_grey.png);
-  }
-  /* closed, selected */
-  #LibraryContainer QTreeView::branch:closed:has-children:!has-siblings:selected,
-  #LibraryContainer QTreeView::branch:closed:has-children:has-siblings:selected {
-    border-image: none;
-    image: url(skin:/style_classic/library_branch_closed_selected_white.png);
-    background-color: #5e4507;
-  }
-/* open */
-#LibraryContainer QTreeView::branch:open:has-children:!has-siblings,
-#LibraryContainer QTreeView::branch:open:has-children:has-siblings {
-  border-image: none;
-  image: url(skin:/style_classic/library_branch_open_grey.png);
-  }
-  /* open, selected */
-  #LibraryContainer QTreeView::branch:open:has-children:!has-siblings:selected,
-  #LibraryContainer QTreeView::branch:open:has-children:has-siblings:selected {
-    border-image: none;
-    image: url(skin:/style_classic/library_branch_open_selected_white.png);
-    background-color: #5e4507;
-    }
-  /* space left of selected child item */
-  #LibraryContainer QTreeView::branch:closed:!has-children:!has-siblings:selected,
-  #LibraryContainer QTreeView::branch:closed:!has-children:has-siblings:selected,
-  #LibraryContainer QTreeView::branch:open:!has-children:!has-siblings:selected,
-  #LibraryContainer QTreeView::branch:open:!has-children:has-siblings:selected {
-    border-image: none;
-    background-color: #0f0f0f;
-  }
 /************** Library *******************************************************/
 
 
 
-/************** common styles for WEffectSelector ******************************
-*************** QSpinBox, QMenu, QToolTip *************************************/
-WEffectSelector QAbstractScrollArea,
-#fadeModeCombobox QAbstractScrollArea,
-QToolTip,
-WBeatSpinBox QMenu,
-#LibraryContainer QMenu,
-WCueMenuPopup,
-WCueMenuPopup QMenu,
-WCoverArtMenu,
-WTrackMenu,
-WTrackMenu QMenu,
-#SkinSettings {
-  padding: 3px;
-  border: 1px solid #888;
-  border-radius: 2px;
-}
-
-#SkinContainer,
-#CrossfaderButtonContainerDeck,
-#CrossfaderButtonContainerAux,
-#CrossfaderButton[value="0"],
-#LibraryContainer QTableView,
-#LibraryContainer QTextBrowser,
-#LibraryContainer QTreeView,
-QToolTip,
-WBeatSpinBox QMenu,
-  WCueMenuPopup,
-  #LibraryContainer QMenu,
-  WCueMenuPopup QMenu,
-  WCoverArtMenu,
-  WTrackMenu,
-  WTrackMenu QMenu,
-WBeatSpinBox QMenu::item,
-  #LibraryContainer QMenu::item,
-  WCueMenuPopup QMenu::item,
-  WCueMenuPopup QLabel,
-  WCoverArtMenu::item,
-  WTrackMenu::item,
-  WTrackMenu QMenu::item,
-#LibraryContainer QMenu QCheckBox,
-WTrackMenu QCheckBox,
-WTrackMenu QMenu QCheckBox,
-WBeatSpinBox,
-#spinBoxTransition,
-#SkinSettings,
-WSearchLineEdit,
-WEffectSelector QAbstractScrollArea,
-#fadeModeCombobox QAbstractScrollArea,
-WEffectSelector, WEffectSelector::item,
-#fadeModeCombobox, #fadeModeCombobox::item {
-  background-color: #0f0f0f;
-}
-WBeatSpinBox,
-#spinBoxTransition,
-#SkinSettings,
-WEffectSelector, WEffectSelector QAbstractScrollArea,
-#fadeModeCombobox, #fadeModeCombobox QAbstractScrollArea {
-  font-size: 13px/13px;
-}
-  /* hovered items */
-  WEffectSelector::item:selected,
-  #fadeModeCombobox::item:selected,
-  WBeatSpinBox QMenu::item:selected,
-  #LibraryContainer QMenu::item:selected,
-  WCueMenuPopup QMenu::item:selected,
-  WCoverArtMenu::item:selected,
-  WTrackMenu::item:selected,
-  WTrackMenu QMenu::item:selected,
-  #LibraryContainer QMenu QCheckBox:selected,
-  #LibraryContainer QMenu QCheckBox:focus,  /* selected by keyboard */
-  #LibraryContainer QMenu QCheckBox:hover, /* mouse hover */
-  WTrackMenu QCheckBox:selected,
-  WTrackMenu QCheckBox:focus,
-  WTrackMenu QCheckBox:hover,
-  WTrackMenu QMenu QCheckBox:selected,
-  WTrackMenu QMenu QCheckBox:focus,
-  WTrackMenu QMenu QCheckBox:hover,
-  #SkinSettingsButton:hover,
-  #SkinSettingsLabelButton:hover {
-    background-color: #5E4507;
-    color: white;
-    /* remove OS focus indicator */
-    outline: none;
-  }
-  /* hover over checked effect */
-  WEffectSelector::item:checked:selected,
-  #fadeModeCombobox::item:checked:selected {
-    background-color: #2a1e03;
-    color: #fff;
-    }
-
-
-WEffectSelector,
-#fadeModeCombobox {
-  font-weight: bold;
-  text-transform: uppercase;
-  /* The 3D frame on the combo box becomes flat when you give it a border
-  border-radius: 3px; */
-  }
-  WEffectSelector {
-    /* 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: 0px 0px 2px 5px;
-    margin: 0px;
-  }
-  #fadeModeCombobox {
-    height: 19px;
-    padding: 0px 0px 1px 5px;
-    margin: 0px 1px 2px 1px;
-  }
-  WEffectSelector::down-arrow,
-  #fadeModeCombobox::down-arrow {
-    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_classic/btn__fx_selector_down_pressed.svg);
-    }
-
-  WEffectSelector QAbstractScrollArea {
-    min-width: 160px;
-  }
-  #fadeModeCombobox QAbstractScrollArea {
-    min-width: 185px;
-  }
-  WEffectSelector::indicator:checked,
-  #fadeModeCombobox::indicator:checked {
-    /* checkbox container is 28 x 22px;
-      use margin + border to create a square checkbox sized like kill buttons */
-    margin: 2px;
-    image: url(skin:/buttons_classic/btn__lib_checkmark_orange.svg);
-  }
-  WEffectSelector::checked, /* selected item */
-  WEffectSelector::indicator, /* checkbox, tick mark */
-  WEffectSelector::drop-down,
-  WEffectSelector::indicator:!checked,
-  #fadeModeCombobox::checked, /* selected mode */
-  #fadeModeCombobox::indicator, /* checkbox, tick mark */
-  #fadeModeCombobox::drop-down,
-  #fadeModeCombobox::indicator:!checked,
-  WBeatSpinBox QMenu::item,
-  #LibraryContainer QMenu::item,
-  WCueMenuPopup QMenu::item,
-  WCoverArtMenu::item,
-  WTrackMenu::item,
-  WTrackMenu QMenu::item,
-  #LibraryContainer QMenu QCheckBox,
-  WTrackMenu QCheckBox,
-  WTrackMenu QMenu QCheckBox {
-      padding: 0px;
-      margin: 0px;
-      image: none;
-      outline: none;
-      border: 0px solid transparent;
-    }
-  WBeatSpinBox QMenu::separator,
-  #LibraryContainer QMenu::separator,
-  WCueMenuPopup QMenu::separator,
-  WTrackMenu::separator,
-  WTrackMenu QMenu::separator,
-  #SkinSettingsSeparator {
-    border-top: 1px solid #000;
-    border-bottom: 1px solid #222;
-    }
-    WBeatSpinBox QMenu::separator,
-    #LibraryContainer QMenu::separator,
-    WCueMenuPopup QMenu::separator,
-    WTrackMenu::separator,
-    WTrackMenu QMenu::separator {
-        height: 0px;
-        margin: 4px;
-      }
-    #SkinSettingsSeparator {
-      margin: 0px 4px 4px 4px;
-    }
-  WBeatSpinBox QMenu::item,
-  #LibraryContainer QMenu::item,
-  WCueMenuPopup QMenu::item,
-  WCoverArtMenu::item,
-  WTrackMenu::item,
-  WTrackMenu QMenu::item {
-  /* Right padding creates a margin to the menu expand arrow.
-    Left padding should be bigger than menu icon width + menu icon
-    left/right margin */
-    padding: 5px 12px 5px 26px;
-  }
-  /* Icons in QLineEdit menus:
-   beatsize spinbox, searchbox, editable track properties */
-  WBeatSpinBox QMenu::icon,
-  #LibraryContainer QMenu::icon,
-  WCueMenuPopup QMenu::icon,
-  WTrackMenu::icon,
-  WTrackMenu QMenu::icon,
-  /* checkbox in Crate name context menu:
-    "[ ] Auto DJ Track Source"  */
-  #LibraryContainer QMenu::indicator,
-  WTrackMenu::indicator,
-  WTrackMenu QMenu::indicator {
-    margin: 0px 4px 0px 5px;
-    }
-  /* items in Crate sub menu */
-  #LibraryContainer QMenu QCheckBox,
-  WTrackMenu QCheckBox,
-  WTrackMenu QMenu QCheckBox {
-    padding: 3px 10px 3px 5px;
-    }
-  #LibraryContainer QMenu QCheckBox::indicator,
-  #LibraryContainer QMenu::indicator,
-  WCueMenuPopup QMenu::indicator,
-  WTrackMenu QCheckBox::indicator,
-  WTrackMenu::indicator,
-  WTrackMenu QMenu QCheckBox::indicator,
-  WTrackMenu QMenu::indicator {
-    width: 13px;
-    height: 13px;
-    border: 1px solid #333;
-    border-radius: 1px;
-    background-color: #000;
-    /* remove OS focus indicator */
-    outline: none;
-    }
-  #LibraryContainer QMenu QCheckBox::indicator:checked,
-  #LibraryContainer QMenu::indicator:checked,
-  WTrackMenu QCheckBox::indicator:checked,
-  WTrackMenu::indicator:checked,
-  WTrackMenu QMenu QCheckBox::indicator:checked,
-  WTrackMenu QMenu::indicator:checked,
-  WCueMenuPopup QMenu::indicator:checked {
-    image: url(skin:/buttons_classic/btn__lib_checkmark_orange.svg);
-    }
-  /* disabled menu item and checkbox */
-  #LibraryContainer QMenu QCheckBox:!enabled,
-  #LibraryContainer QMenu::item:!enabled,
-  WTrackMenu QCheckBox:!enabled,
-  WTrackMenu::item:!enabled,
-  WTrackMenu QMenu QCheckBox:!enabled,
-  WTrackMenu QMenu::item:!enabled,
-  WCueMenuPopup QMenu::item:!enabled,
-  WCoverArtMenu::item:!enabled,
-  #LibraryContainer QMenu QCheckBox::indicator:!enabled,
-  WTrackMenu QCheckBox::indicator:!enabled,
-  WTrackMenu QMenu QCheckBox::indicator:!enabled {
-    color: #494949;
-    }
-  #LibraryContainer QMenu QCheckBox::indicator:!enabled:!checked,
-  #LibraryContainer QMenu::indicator:!enabled:!checked,
-  WTrackMenu QCheckBox::indicator:!enabled:!checked,
-  WTrackMenu::indicator:!enabled:!checked,
-  WTrackMenu QMenu QCheckBox::indicator:!enabled:!checked,
-  WTrackMenu QMenu::indicator:!enabled:!checked,
-  WCueMenuPopup QMenu::indicator:!enabled:!checked {
-    border: 1px solid #222;
-    background-color: #222;
-    }
-  #LibraryContainer QMenu QCheckBox::indicator:!enabled:checked,
-  WTrackMenu QCheckBox::indicator:!enabled:checked,
-  WTrackMenu QMenu QCheckBox::indicator:!enabled:checked {
-    image: url(skin:/buttons_classic/btn__lib_checkmark_grey.svg);
-    border: 1px solid #222;
-    background-color: #222;
-    }
-  #LibraryContainer QMenu QCheckBox::indicator:indeterminate,
-  #LibraryContainer QCheckBox::indicator:indeterminate:!enabled,
-  WTrackMenu QCheckBox::indicator:indeterminate,
-  WTrackMenu QMenu QCheckBox::indicator:indeterminate {
-    image: url(skin:/buttons_classic/btn__lib_checkmark_grey.svg);
-  }
-
-  #LibraryContainer QMenu::right-arrow,
-  WTrackMenu::right-arrow,
-  WTrackMenu QMenu::right-arrow {
-    width: 10px;
-    height: 10px;
-    image: url(skin:/style_classic/menu_arrow_yellow.svg);
-    }
-  #LibraryContainer QMenu::right-arrow:selected,
-  WTrackMenu::right-arrow:selected,
-  WTrackMenu QMenu::right-arrow:selected {
-    image: url(skin:/style_classic/menu_arrow_white.svg);
-  }
-
-  #LibraryContainer QHeaderView QMenu::indicator {
-    width: 10px;
-    height: 10px;
-    margin-left: 2px;
-    border: none;
-    background: none;
-    }
-    #LibraryContainer QHeaderView QMenu::indicator:checked {
-      image: url(skin:/buttons_classic/btn__lib_checkmark_orange.svg);
-    }
-/************** common styles for WEffectSelector ******************************
-*************** QSpinBox, QMenu, QToolTip *************************************/
-
-
-
 /************** little helpers ************************************************/
 #AlignLeft {
   qproperty-layoutAlignment: 'AlignLeft';
@@ -2798,6 +777,10 @@ WEffectSelector,
   qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
 }
 
+#AlignTop {
+  qproperty-layoutAlignment: 'AlignTop';
+}
+
 #AlignBottom {
   qproperty-layoutAlignment: 'AlignHCenter | AlignBottom';
 }
@@ -2806,6 +789,59 @@ WEffectSelector,
   background-color: #456113;
 }
 
+#TEST1 {
+  background-color: #456113;
+}
+
+#TEST2 {
+  background-color: #561134;
+}
+
+#TEST3 {
+  background-color: #451361;
+}
+
+#TEST4 {
+  background-color: #134561;
+}
+
+#TEST33 {
+  background-color: #333;
+}
+
+#TEST66 {
+  background-color: #666;
+}
+
+#TEST99 {
+  background-color: #999;
+}
+
+#SET_FULL_MIXER {
+  background-color: #ff0000;
+  }
+
+#SET_FULL {
+  background-color: #cc0000;
+  }
+  #IS_FULL {
+    background-color: #990000;
+  }
+
+#SET_COMPACT {
+  background-color: #00cc00;
+  }
+  #IS_COMPACT {
+    background-color: #009900;
+  }
+
+#SET_MINI {
+  background-color: #0000cc;
+  }
+  #IS_MINI {
+    background-color: #000099;
+  }
+
 #Spacer00 {
   background-color: #000;
 }
diff --git a/res/skins/LateNight/style_classic.qss b/res/skins/LateNight/style_classic.qss
new file mode 100644
index 000000000000..bc31198ca4b7
--- /dev/null
+++ b/res/skins/LateNight/style_classic.qss
@@ -0,0 +1,2526 @@
+/* LateNight 2.3 // Classic theme
+
+* containers
+  * colors, borders, background tiles
+  * layout spacing
+
+* colors & icons
+  * font colors
+  * button styles
+  * button icons
+
+* library
+* menu & special widget styles
+
+
+/**********************************************************************
+************** Colors & borders of GUI containers ********************/
+
+#ToolBar,
+#WaveformsContainer,
+#Deck1, #DeckCompact1, #DeckMini1,
+#Deck2, #DeckCompact2, #DeckMini2,
+#Deck3, #DeckCompact3, #DeckMini3,
+#Deck4, #DeckCompact4, #DeckMini4,
+#VuMeterDeck1_Compact,
+  #VuMeterDeck2_Compact,
+  #VuMeterDeck3_Compact,
+  #VuMeterDeck4_Compact,
+  #VuMeterMaster_Compact,
+#FxUnit1, #FxUnit2, #FxUnit3, #FxUnit4,
+  #FxUnitControlsExpanded, #FxUnitControlsCollapsed,
+  #FxSlotsExpanded, #FxSlotsCollapsed,
+#MixerContainer,
+#MicDuckingContainer, #MicAuxUnit, #MicAuxAddFrame,
+#Sampler, #SamplerMini,
+WEffectSelector::checked, #fadeModeCombobox::checked,
+WLibrary,
+#SidebarBox,
+#PreviewDeck,
+#LibExpandBox,
+#SearchLineBox,
+QAbstractScrollArea::corner {
+  background-color: #1e1e1e;
+}
+
+/* borders of elevated containers */
+#WaveformsContainer,
+#Deck1, #DeckCompact1, #DeckMini1,
+#Deck2, #DeckCompact2, #DeckMini2,
+#Deck3, #DeckCompact3, #DeckMini3,
+#Deck4, #DeckCompact4, #DeckMini4,
+#MixerContainer,
+  #VuMeterDeck1_Compact,
+  #VuMeterDeck2_Compact,
+  #VuMeterDeck3_Compact,
+  #VuMeterDeck4_Compact,
+  #VuMeterMaster_Compact,
+#FxUnit1, #FxUnit2, #FxUnit3, #FxUnit4,
+#MicDuckingContainer, #MicAuxUnit, #MicAuxAddFrame,
+#Sampler, #SamplerMini,
+WLibrary,
+#SidebarBox,
+#PreviewDeck,
+#LibExpandBox,
+#SearchLineBox {
+  border-top: 1px solid #333;
+  border-left: 1px solid #333;
+  border-bottom: 1px solid #0a0a0a;
+  border-right: 1px solid #0a0a0a;
+  border-radius: 2px;
+  }
+  #WaveformsContainer {
+    border-width: 1px 0px;
+    border-radius: 0px;
+  }
+
+/* borders of embedded regions like deck buttons & Master mixer */
+#WaveformBox1,
+#WaveformBox2,
+#WaveformBox3,
+#WaveformBox4,
+#DeckRow_5_LoopCuesTransport,
+#DeckRow_5_LoopCuesTransportCompact,
+#MasterControls, #HeadphoneControls,
+#FxParametersBg,
+#SamplerHotcues,
+WSearchLineEdit,
+#OverviewBox, #OverviewBoxMini {
+  border-top: 1px solid #0a0a0a;
+  border-left: 1px solid #0a0a0a;
+  border-bottom: 1px solid #333;
+  border-right: 1px solid #333;
+  border-bottom-left-radius: 1px;
+  border-top-right-radius: 1px;
+  background-color: #151515;
+  }
+  #KeyText {
+    border-top: 1px solid #0c0c0c;
+    border-bottom: 1px solid #0c0c0c;
+  }
+  #WaveformBox1,
+  #WaveformBox2,
+  #WaveformBox3,
+  #WaveformBox4 {
+    border-radius: 0px;
+  }
+  /* some get a background image */
+  #DeckRow_5_LoopCuesTransport,
+  #DeckRow_5_LoopCuesTransportCompact,
+  #MasterControls, #HeadphoneControls,
+  #FxParametersBg,
+  #SamplerHotcues {
+    background-image: url(skin:/classic/style/background_tile.png);
+  }
+
+#FxParametersFocusBg {
+  border: 1px solid #d08e00;
+  background-color: rgba(0,0,0,50);
+}
+
+#OverviewBox[highlight="1"],
+#OverviewBoxMini[highlight="1"] {
+  background-color: #080808;
+}
+
+/* background of fillers */
+#FxRackFillerL,
+#FxRackFillerR,
+#SamplerExpandBox,
+#MicAuxRackFiller {
+  border-top: 1px solid #222;
+  border-left: 1px solid #222;
+  border-bottom: 1px solid #111;
+  border-right: 1px solid #111;
+  border-radius: 2px;
+  background-color: #171717;
+  }
+
+#VuMeterBox,
+#VuMeterBoxMaster,
+#VuMeterBoxMasterSingle,
+#LatencyMeterBox {
+  background-color: #040404;
+}
+
+#VuMasterCover {
+  background-color: rgba(21, 21, 21, 150);
+}
+
+#SkinSettings {
+  padding: 3px;
+  border-top: 1px solid #585858;
+  border-bottom: 1px solid #585858;
+  border-left: 1px solid #585858;
+  border-top-left-radius: 2px;
+  border-bottom-left-radius: 2px;
+}
+
+#SubmenuCover {
+  background-color: rgba(15, 15, 15, 180);
+}
+#SkinSettingsMixerToggle {
+  background-color: rgba(15, 15, 15, 255);
+}
+
+/**** ToolBar *******************************/
+#ToolBar, #ToolBarSection {
+  qproperty-layoutSpacing: 2;
+}
+#ToolBar {
+  padding: 1px 2px 0px 2px;
+  }
+  #ToolBarSeparator {}
+  #BatteryBox {
+    margin-bottom: 1px;
+  }
+  #ClockWidget {
+    margin-bottom: 2px;
+  }
+  #LatencyLabel {
+    padding-bottom: 2px;
+  }
+
+#DeckRateSeparator,
+#MasterMixerSeparator {
+  min-width: 0px;
+  max-width: 0px;
+}
+
+#FxSlotSeparatorV {
+  min-width: 2px;
+  max-width: 2px;
+  image: url(skin:/classic/style/fx_separator.png) repeat center center;
+  margin: 2px 0px;
+}
+#FxSlotSeparatorH {
+  min-height: 2px;
+  max-height: 2px;
+}
+
+WBeatSpinBox,
+#spinBoxTransition,
+#LibraryBPMSpinBox  {
+  selection-color: #000;
+  selection-background-color: #d2d2d2;
+  }
+  WBeatSpinBox:focus,
+  #spinBoxTransition:focus {
+    background-color: #000;
+  }
+
+
+WLibrary {
+  border-top-left-radius: 0px;
+}
+WLibrary,
+#SearchLineBox {
+  border-top: 0px;
+  }
+  #SearchLineBox {
+  padding-right: 2px;
+  border-right: 0px;
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+  }
+
+#LibExpandBox {
+  qproperty-layoutAlignment: 'AlignVCenter | AlignHCenter';
+  border-width: 0px 0px 1px 0px;
+  border-radius: 0px;
+  margin-bottom: 3px;
+  padding: 0px 0px 2px 2px;
+}
+
+#SidebarBox {
+  border-right: 0px;
+  border-top-right-radius: 0px;
+}
+
+
+/************ separator lines & borders within containers ***********/
+#DeckRows2345,
+#DeckRows234, #TitleRow,
+#DeckRow_2_3_ArtistTitleTime,
+#DeckRow_5_Compact,
+#DeckSettingsContainer, #DeckSettingsContainerCompact,
+#DeckRateSeparator,
+#ExpandingBottomBorder,
+#PreviewPlayBox,
+#SamplerTitle, #SamplerPlay, #SamplerSettings,
+#SamplerGain, #SamplerVU, #SamplerPfl {
+  border-style: solid;
+  border-color: #0c0c0c;
+}
+
+/**********************************************************************
+************** Colors & borders of GUI containers ********************/
+
+
+
+
+/******************* Container layouts, margins etc. ******************
+**********************************************************************/
+
+#ToolbarDeckSpacer {
+  min-height: 4px;
+  max-height: 4px;
+}
+
+#MiniDecksTopSpacer {
+  min-height: 4px;
+  max-height: 4px;
+}
+
+#CompactDecksCenterSpacer {
+  min-width: 4px;
+  max-width: 4px;
+}
+
+#Deck1, #DeckCompact1, #DeckMini1,
+#Deck2, #DeckCompact2, #DeckMini2,
+#Deck3, #DeckCompact3, #DeckMini3,
+#Deck4, #DeckCompact4, #DeckMini4,
+#MixerContainer,
+#VuMeterDeck1_Compact,
+#VuMeterDeck2_Compact,
+#VuMeterDeck3_Compact,
+#VuMeterDeck4_Compact,
+#VuMeterMaster_Compact,
+#FxUnit1, #FxUnit3,
+#FxUnit2, #FxUnit4,
+#FxRackFillerR,
+#FxRackFillerL,
+#MicAuxRack,
+#SamplerRow,
+#LibExpandBox,
+#SearchLineBox,
+#PreviewDeck {
+  margin-bottom: 4px;
+}
+
+#Deck1, #DeckMini1,
+#Deck3, #DeckMini3,
+#MixerContainer,
+#FxUnit1,
+#FxUnit3,
+#FxRackFillerL,
+#FxRackFillerR,
+#MicRack, #AuxRack {
+  margin-right: 2px;
+}
+
+#Deck2, #DeckMini2,
+#Deck4, #DeckMini4,
+#MixerContainer,
+#FxUnit2,
+#FxUnit4,
+#FxRackFillerL,
+#FxRackFillerR,
+#MicRack, #AuxRack {
+  margin-left: 2px;
+}
+/* gap in between compact decks is managed
+  by #CompactDecksCenterSpacer in order to have VU meters
+  directly attached to each deck.
+  A highlight connection to [LateNight],show_vumeters_compact
+  can be used for the borders but screws up the margin: contents
+  are rendered beyond the parent border */
+
+#SamplerRow {
+  qproperty-layoutSpacing: 4;
+}
+
+#MicRack, #AuxRack {
+  qproperty-layoutSpacing: 3;
+}
+
+#PreviewDeck {
+  margin-right: 3px;
+}
+
+#SkinSettingsContainer {
+  margin-left: 3px;
+}
+
+
+/************** Waveforms *****************************************************/
+
+#WaveformsContainer {
+  padding-bottom: 1px;
+}
+
+#WaveformBox1,
+#WaveformBox2,
+#WaveformBox3,
+#WaveformBox4 {
+  border-left: 0px;
+  }
+  #WaveformBox1,
+  #WaveformBox3 {
+    border-bottom: 0px;
+  }
+  #WaveformBox2,
+  #WaveformBox4 {
+    border-top: 0px;
+  }
+  /* Hide some borders when 4 decks are visible */
+  #WaveformBox1[highlight="1"] {
+    border-top: 0px;
+  }
+  #WaveformBox2[highlight="1"] {
+    border-bottom: 0px;
+  }
+
+
+/************** Decks *********************************************************/
+
+#DeckMini1,
+#DeckMini2,
+#DeckMini3,
+#DeckMini4 {
+  padding: 0px 4px 0px 1px;
+}
+
+/* All rows in FULL deck */
+#DeckRows12345,
+#DeckRows2345 {
+  margin: 2px 0px 3px 2px;
+  background-color: transparent;
+}
+  /* All rows in compact deck */
+#DeckRows2345 {
+}
+#DeckRows234 {
+}
+
+#DeckRow_1_KeyVinylFx {
+  margin-bottom: 1px;
+  }
+  #ExpandingBottomBorder {
+    border-width: 0px 0px 1px 0px;
+  }
+  #KeyTextSmall {
+    padding: 0px 1px 0px 0px;
+  }
+
+
+#SpinnyCoverContainer_Small {
+  min-width: 63px;
+  max-width: 63px;
+  min-height: 63px;
+  max-height: 63px;
+  margin: 0px 2px 1px 0px;
+  }
+  #SpinnyCoverContainer_SmallCompact {
+    min-width: 63px;
+    max-width: 63px;
+    min-height: 63px;
+    max-height: 63px;
+    margin: 0px 2px 1px 0px;
+  }
+#SpinnyCoverContainer_Big {
+  min-width: 115px;
+  max-width: 115px;
+  min-height: 115px;
+  max-height: 115px;
+  margin: 1px 2px 1px 0px;
+  }
+  #SpinnyCoverContainer_BigCompact {
+    min-width: 109px;
+    max-width: 109px;
+    min-height: 109px;
+    max-height: 109px;
+    margin: 0px 2px 1px 0px;
+  }
+#SpinnyCoverContainer_MiniDeck {
+  min-width: 53px;
+  max-width: 53px;
+  min-height: 53px;
+  max-height: 53px;
+  /* for some reason margin-right is only halve the value set here... */
+  margin: 0px 0px 1px 4px;
+}
+
+#DeckRow_2_3_ArtistTitleTime {
+  padding-left: 1px;
+  margin: 0px;
+  }
+  #DeckRow_2_3_ArtistTitleTime[highlight="0"] {
+    border-width: 0px 0px 0px 0px;
+    }
+    #DeckRow_2_3_ArtistTitleTime[highlight="1"] {
+      border-width: 0px 1px 0px 0px;
+    }
+  #ArtistRow, #TitleRow {
+    padding-right: 2px;
+    }
+    #ArtistText,
+    #TitleText {
+      /* for some reason the padding/margin is doubled in the skin... */
+      padding: 0px 2px 1px 0px;
+    }
+    #PlayPositionText,
+    #DurationText {
+      /* for some reason the padding/margin is doubled in the skin... */
+      padding: 0px 1px 1px 1px;
+    }
+
+    #TitleTextSmall {
+      padding: 1px 3px 1px 1px;
+    }
+    #ArtistTextSmall {
+      margin: 0px 0px 0px 1px;
+      padding: 0px 1px 0px 0px;
+    }
+    #PlayPositionTextSmall {
+      padding: 0px 0px 2px 2px;
+    }
+
+ #OverviewBoxMini {
+    margin: 1px 0px;
+  }
+
+#DeckSettingsContainer[highlight="0"] {
+  border-width: 1px 0px 0px 0px;
+  }
+  #DeckSettingsContainer[highlight="1"] {
+    border-width: 1px 1px 0px 0px;
+  }
+#DeckSettingsContainerCompact[highlight="0"] {
+  border-width: 1px 0px 1px 0px;
+  }
+  #DeckSettingsContainerCompact[highlight="1"] {
+    border-width: 1px 1px 1px 0px;
+  }
+
+#DeckRow_5_Compact {
+  padding-top: 2px;
+  }
+  #DeckRow_5_Compact[highlight="0"] {
+    border-width: 0px 0px 0px 0px;
+    }
+    #DeckRow_5_Compact[highlight="1"] {
+      border-width: 0px 1px 0px 0px;
+    }
+
+  #DeckRow_5_LoopCuesTransport,
+  #DeckRow_5_LoopCuesTransportCompact {
+    padding: 1px 1px 2px 1px;
+    }
+  #DeckRow_5_LoopCuesTransport {
+    margin: 2px 0px 0px 0px;
+    }
+    #PlayCueMini {
+      margin: 1px 1px 1px 0px;
+    }
+
+
+
+/************** RateControls ********************************************/
+
+#RateContainer {
+  padding: 4px 0px 0px 0px;
+  }
+  #RateContainerCompact {
+    padding: 0px 0px 0px 0px;
+  }
+
+  #RateText {
+    padding: 0px;
+    margin: 0px;
+  }
+
+  #SyncBox {
+    margin: 2px 1px 1px 0px;
+  }
+
+  #RateControls {
+    margin: 0px 2px;
+    }
+    #RateButtons {
+      margin-right: 3px;
+    }
+
+
+
+/********************** Loop Controls / AutoDJ spinbox ************************/
+
+  WBeatSpinBox {
+    border-width: 2px 19px 2px 2px;
+    border-image: url(skin:/classic/buttons/spinbox_elevated_border.svg) 2 19 2 2;
+    margin: 1px 0px 0px 1px;
+    padding: 0px -17px 2px 1px;
+    background-color: #0f0f0f;
+    }
+    WBeatSpinBox:focus {
+      border-image: url(skin:/classic/buttons/spinbox_elevated_border_focus.svg) 2 19 2 2;
+    }
+
+  #spinBoxTransition {
+    border-width: 3px 19px 2px 3px;
+    border-image: url(skin:/classic/buttons/spinbox_embedded_border.svg) 3 19 2 3;
+    width: 24px;
+    height: 19px;
+    padding: 0px -15px 0px 0px;
+    margin: 0px 2px 3px 5px;
+    }
+    #spinBoxTransition:focus {
+      border-image: url(skin:/classic/buttons/spinbox_embedded_border_focus_orange.svg) 3 19 2 3;
+    }
+
+  WBeatSpinBox::up-button,
+  WBeatSpinBox::down-button,
+  #spinBoxTransition::up-button,
+  #spinBoxTransition::down-button {
+    subcontrol-origin: content;
+    position: relative;
+    /* as with spinbox: border is added to size. */
+    width: 17px;
+    padding: 0px;
+    }
+    WBeatSpinBox::up-button,
+    #spinBoxTransition::up-button {
+      height: 11px;
+      subcontrol-position: top right;
+      image: url(skin:/classic/buttons/spinbox_up.svg) no-repeat;
+      }
+      WBeatSpinBox::up-button:pressed,
+      #spinBoxTransition::up-button:pressed {
+        image: url(skin:/classic/buttons/spinbox_up_pressed.svg) no-repeat;
+      }
+      WBeatSpinBox::up-button {
+        margin: -1px 0px 0px 0px;
+        }
+      #spinBoxTransition::up-button {
+        margin: -2px -3px 0px 0px;
+        }
+    WBeatSpinBox::down-button,
+    #spinBoxTransition::down-button {
+      height: 11px;
+      subcontrol-position: bottom right;
+      image: url(skin:/classic/buttons/spinbox_down.svg) no-repeat;
+      }
+      WBeatSpinBox::down-button:pressed,
+      #spinBoxTransition::down-button:pressed {
+        image: url(skin:/classic/buttons/spinbox_down_pressed.svg) no-repeat;
+      }
+      WBeatSpinBox::down-button {
+        margin: 0px 0px -2px 0px;
+        }
+      #spinBoxTransition::down-button {
+        margin: 0px -3px -1px 0px;
+        }
+
+
+
+/************** Mixer *********************************************************/
+
+#MixerDecks {
+  padding: 2px 6px 2px 6px;
+  }
+  #MixerChannel_2Decks_Left {
+    margin: 0px 2px;
+  }
+  #MixerChannel_2Decks_Right {
+    margin: 0px 2px;
+  }
+  #VolumeGain2Decks {
+    margin: 0px 2px;
+  }
+  #VuAndSlider_4Decks {
+    margin-right: 1px;
+  }
+
+  #PflBox_4Decks {
+    margin: 3px 0px 0px 20px;
+  }
+
+  #CrossfaderSwitch_4Decks {
+    margin: 0px 3px 3px 0px;
+  }
+  #Crossfader {
+    padding: 0px 0px 0px 1px;
+  }
+
+  #CrossfaderButtonContainer_Deck {
+    padding: 1px;
+    border-bottom: 1px solid #333;
+    border-right: 1px solid #333;
+    border-bottom-right-radius: 1px;
+    }
+  #CrossfaderButtonContainer_Aux {
+    padding: 1px 1px 0px 1px;
+    margin-left: 5px;
+    border-right: 1px solid #333;
+    }
+    #CrossfaderButton[value="1"] {
+      background-color: #262626;
+    }
+
+#MixerMasterHeadphone {
+  margin: 3px 3px 3px 0px;
+  }
+  #MasterControls {
+    padding: 3px;
+    margin-bottom: 2px;
+  }
+  #MasterHeadphoneSeparator {
+    min-height: 2px;
+    max-height: 2px;
+  }
+  #HeadphoneControls {
+    padding: 3px;
+  }
+
+/* All VU meter instances */
+#VuMeterChannel_2Decks {
+  margin: 0px 9px 2px 9px;
+}
+#VuMeterChannel_4Decks {
+  margin: 6px 0px 6px 11px;
+}
+#VuMeterMaster_2Decks {
+  margin: 0px 0px 2px 0px;
+}
+#VuMeterMaster_4Decks {
+  margin: 5px 0px;
+}
+
+#VuMeterMaster_Compact {
+  margin-right: 4px;
+  margin-left: 4px;
+  padding: 0px 5px;
+}
+#VuMeterDeck1_Compact,
+#VuMeterDeck3_Compact {
+  padding: 0px 4px 0px 5px;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 1px;
+}
+#VuMeterDeck2_Compact,
+#VuMeterDeck4_Compact {
+  padding: 0px 5px 0px 4px;
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 1px;
+}
+
+/************** Fx *********************************************************/
+
+#FxUnitHeaderCollapsed {
+  border-left: 0px;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+  }
+  #FxUnitHeaderExpanded {
+    border-bottom-left-radius: 0px;
+  }
+  #FxUnitHeader {
+    padding: 0px 2px 0px 2px;
+  }
+  #FxUnitLabel {
+    alignment: left;
+  }
+
+#FxUnitControlsExpanded,
+#FxUnitControlsCollapsed {
+  padding: 0px 0px 0px 3px;
+  }
+  #FxUnitControlsCollapsed {
+    margin: 2px 2px 2px 0px;
+  }
+  #FxUnitControlsExpanded {
+    margin-right: 2px;
+  }
+
+#DryWetKnob,
+#SuperKnob {
+  margin: 0px 1px;
+}
+
+#FxUnitControlsCollapsed #FxUnitLabel {
+  alignment: right;
+}
+#FxUnitControlsExpanded #FxUnitLabel {
+  alignment: left;
+}
+
+#FxSlotsCollapsed #FxSlotContainer {
+  margin: 2px 0px 1px 0px;
+  padding-right: 0px;
+  padding-left: 0px;
+}
+
+#FxMetaKnob {
+  padding: 1px 4px 2px 4px;
+}
+
+#FxSlotsExpanded {
+  margin: 2px 0px 2px 3px;
+}
+#FxSlotsCollapsed {
+  margin: 2px 0px 2px 0px;
+  }
+  #FxSlot1,
+  #FxSlot2,
+  #FxSlot3 {
+    padding: 2px 4px 1px 2px;
+  }
+  #FxSlotsExpanded #FxSlot1,
+  #FxSlotsExpanded #FxSlot2,
+  #FxSlotsExpanded #FxSlot3 {
+    padding-right: 7px;
+  }
+
+#FxParametersContainer {
+  padding: 2px 1px 1px 1px;
+  margin: 2px 1px;
+}
+
+WPushButton#FxSuperLinkButton,
+WPushButton#FxSuperLinkInvertButton {
+  border-radius: 3px;
+  margin: 1px 1px 0px 0px;
+}
+
+
+/************** Sampler ****************************************************/
+
+#SamplerExpandBox {
+  padding: 0px 1px 0px 1px;
+}
+
+#SamplerMini {
+  padding: 1px;
+  }
+  #SamplerTitleBoxMini {
+    padding: 0px 0px 0px 2px;
+  }
+  #SamplerPlayBoxMini {
+    padding: 1px;
+  }
+
+#Sampler {
+  padding: 1px 0px 2px 2px;
+  }
+  #SamplerTitleRow {
+    margin: 0px 1px 0px 0px;
+    }
+    #SamplerTitleBox {
+      border-width: 0px 1px 0px 0px;
+      }
+    #SamplerTitle {
+      padding: 1px 3px 1px 0px;
+    }
+    #SamplerBpm {
+      margin-right: 2px;
+    }
+
+  #SamplerPlayBox {
+    padding: 0px 2px 1px 0px;
+  }
+
+  #SamplerGain {
+    padding: 0px 0px 0px 2px;
+    border-width: 1px 0px 0px 0px;
+  }
+
+  #SamplerSettings {
+    border-width: 1px 1px 0px 0px;
+  }
+  #SamplerButtons {
+    margin-right: 2px;
+  }
+  #SamplerHotcues {
+    padding: 1px 1px 2px 1px;
+  }
+  #SamplerPfl {
+    padding: 0px 2px 2px 6px;
+    border-width: 0px 0px 0px 0px;
+  }
+  #SamplerVU {
+    padding: 2px 3px 0px 3px;
+    border-width: 1px 1px 0px 0px;
+  }
+
+  #SamplerRateControls {
+    padding: 0px 1px 1px 0px;
+    }
+    #SamplerPitchSlider {
+      padding: 0px 0px 1px 0px;
+    }
+
+/************** MicAux *****************************************************/
+
+#MicDuckingContainer {
+  }
+  #MicDuckingModeBox {
+    padding: 2px 2px 0px 2px;
+  }
+  #MicDuckingStrengthBox {
+    padding: 2px 0px;
+  }
+
+#MicAuxMainControls {
+  border-radius: 2px;
+  padding: 0px 1px 0px 2px;
+  border-bottom-left-radius: 1px;
+  border-top-right-radius: 1px;
+  }
+  #MicAuxLabel {
+    padding: 3px 0px 3px 1px;
+  }
+  #AuxPlayBox {
+    padding: 0px 0px 2px 1px;
+  }
+  #MicTalkBox {
+    padding: 0px 0px 7px 1px;
+  }
+  #MicAuxVUMeter {
+    padding: 2px 1px 3px 0px;
+    margin-left: 2px;
+  }
+  #MicAuxAddBox {
+    margin: 1px 0px 1px 1px;
+  }
+
+#MicAuxSubControls {
+  border-width: 0px;
+  padding: 0px 3px 3px 3px;
+  }
+  #MicAuxFxButtons {
+    padding: 2px 0px;
+  }
+
+#MicAuxAddFrame {
+  padding: 2px 4px 4px 4px;
+}
+
+
+/************** PreviewDeck ***************************************************/
+
+#PreviewDeck {
+  padding: 2px 1px;
+  }
+
+  #PreviewDeckTextBox {
+    }
+    #PreviewLabel { /* Placeholder */
+      padding-left: 2px;
+    }
+    #PreviewTitle {
+      margin: 0px 2px 0px 0px;
+    }
+    #PreviewBPM {
+      padding-left: 2px;
+    }
+    #PreviewEjectBox {
+      padding-bottom: 2px;
+    }
+
+  #PreviewDeck #OverviewBox {
+    margin: 1px 2px 0px 2px;
+  }
+
+
+
+/************** SkinSettings **************************************************/
+
+#DeckSizeSettings {
+  margin: 2px 0px 0px 0px;
+  }
+  #DeckSizeToggleContainer {
+    padding: 0px 0px 0px 0px;
+    }
+    #DeckSizeButton {
+      margin-left: 1px;
+    }
+
+#SkinSettingsCategory {
+  padding: 2px 5px 7px 3px;
+  }
+  #CategoryLabel {
+    padding: 3px 0px 2px 0px;
+  }
+  #SkinSettingsLabelButton {
+    padding: 0px 0px 0px 3px;
+  }
+
+  #SamplerLoadSaveBox {
+    padding-left: 18px;
+  }
+
+
+/******************************************************************************
+******************** Container layouts, margins etc. *************************/
+
+
+
+
+/************** font colors ***************************************************
+******************************************************************************/
+
+/* yellow */
+#Deck1 WLabel, #DeckCompact1 WLabel, #DeckMini1 WLabel,
+  #Deck1 WStarRating, #DeckCompact1 WStarRating,
+#Deck2 WLabel, #DeckCompact2 WLabel, #DeckMini2 WLabel,
+  #Deck2 WStarRating, #DeckCompact2 WStarRating,
+#MicAuxLabel,
+#SamplerTitle, #SamplerTitleMini, #SamplerBpm,
+#PreviewDeckTextBox, #PreviewTitle, #PreviewBPM,
+#CategoryLabel, #SkinSettingsLabelButton,
+WSearchLineEdit,
+#LibraryBPMSpinBox,
+#LibraryBPMButton::item,
+#LibraryContainer QTableView,
+#LibraryContainer QTextBrowser,
+#LibraryContainer QTreeView,
+WLibrary QLabel, WLibrary QRadioButton,
+WLibrary QTableView::indicator,
+QToolTip,
+WBeatSpinBox QMenu,
+#LibraryContainer QMenu,
+#LibraryContainer QMenu QCheckBox,
+WCueMenuPopup,
+WCueMenuPopup QMenu,
+WCueMenuPopup QLabel,
+#CueLabelEdit,
+WCoverArtMenu,
+WTrackMenu,
+WTrackMenu QCheckBox,
+WTrackMenu QMenu,
+WTrackMenu QMenu QCheckBox,
+#LatencyLabel, WTime {
+  color: #f0bb2b;
+  }
+  WSearchLineEdit,
+  #LibraryBPMSpinBox,
+  #LibraryBPMButton::item,
+  #LibraryContainer QTableView,
+  #LibraryContainer QTextBrowser,
+  #LibraryContainer QTreeView {
+    selection-color: #f0bb2b;
+  }
+
+/* light blue */
+#Deck3 WLabel, #DeckCompact3 WLabel, #DeckMini3 WLabel,
+  #Deck3 WStarRating, #DeckCompact3 WStarRating,
+#Deck4 WLabel, #DeckCompact4 WLabel, #DeckMini4 WLabel,
+  #Deck4 WStarRating, #DeckCompact4 WStarRating,
+#AuxSubTitle {
+  color: #0bd9d1;
+}
+
+/* green for Fx 1/2 */
+#FxUnit1 #FxUnitLabel,
+#FxUnit2 #FxUnitLabel {
+  color: #73b508;
+}
+
+/* blue for Fx 3/4 */
+#FxUnit3 #FxUnitLabel,
+#FxUnit4 #FxUnitLabel {
+  color: #0795b5;
+}
+
+/* Grey. default for all deck labels */
+#PlayPositionText, #PlayPositionTextSmall,
+#DurationText, #RateText,
+#KeyText, #KeyTextSmall,
+#PreviewLabel,
+WEffectSelector, WEffectSelector QAbstractScrollArea,
+#fadeModeCombobox, #fadeModeCombobox QAbstractScrollArea,
+WBeatSpinBox, #spinBoxTransition,
+WLibrary QLabel, WLibrary QRadioButton {
+  color: #888;
+}
+
+/* Darker grey for knob labels & inactive decks/units */
+#KnobLabel,
+#FxKnobLabel,
+#FxButtonLabel,
+#MicAuxLabelUnconfigured,
+#DlgMissing > QPushButton:!enabled,
+#DlgHidden > QPushButton:!enabled,
+#DlgAutoDJ > QPushButton:!enabled,
+#DlgRecording > QPushButton:!enabled,
+#DlgAnalysis > QPushButton:!enabled {
+  color: #666;
+}
+
+#VinylButton[displayValue="0"],
+#VinylModeButton,
+#FxAssignButtons WPushButton[displayValue="0"],
+#GuiToggleButton[displayValue="0"],
+#BroadcastButton[displayValue="0"],
+#SkinSettingsToggle[displayValue="0"],
+#RecDuration[highlight="0"] {
+  color: #d2d2d1;
+  }
+
+#VinylButton[displayValue="1"],
+#VinylButton[displayValue="2"],
+#VinylCueButton[displayValue="1"],
+#VinylCueButton[displayValue="2"],
+#FxAssignButtons WPushButton[displayValue="1"],
+#GuiToggleButton[displayValue="1"],
+#GuiToggleButton[displayValue="2"],
+#BroadcastButton[displayValue="1"], /* connecting: yellow */
+#RecDuration[highlight="1"],
+#RecDuration[highlight="2"],
+#SkinSettingsToggle[displayValue="1"],
+QPushButton#pushButtonAutoDJ:checked,
+QPushButton#pushButtonRepeatPlaylist:checked,
+#DlgAnalysis > QPushButton:checked,
+QPushButton#pushButtonRecording:checked {
+  color: #000;
+}
+
+#DlgMissing > QPushButton:pressed,
+#DlgHidden > QPushButton:pressed,
+#DlgAutoDJ > QPushButton:pressed,
+#DlgRecording > QPushButton:pressed,
+#DlgAnalysis > QPushButton:pressed {
+  color: #999;
+}
+
+#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.
+
+  font-family: "Acknowledge TT (BRK)";
+  font-family: "Bulky Pixels";
+  font-family: "Irresistor";
+  font-family: "Visitor TT1 BRK";
+  font-family: "Boxy Bold";
+  font-family: "Pixel Intv";
+  font-size: 13px;
+  color: #eee;
+  */
+}
+
+#MixerMasterHeadphone WLabel,
+#FxKnobLabel,
+#FxButtonLabel {
+  padding: 0px;
+  background-color: #151515;
+}
+
+/* Passthrough label on overview waveform */
+WOverview #PassthroughLabel {
+  color: #d09300;
+}
+  #SkinSettingsButton,
+  #DeckSizeButton,
+  #SkinSettingsText {
+    color: #d2d2d2;
+  }
+  #DeckSizeButton[value="1"] {
+    background-color: #555;
+    color: #fff;
+  }
+
+
+/* Library controls in AutoDJ etc. */
+#DlgMissing > QPushButton,
+#DlgHidden > QPushButton,
+#DlgAutoDJ > QPushButton,
+#DlgRecording > QPushButton,
+#DlgAnalysis > QPushButton {
+  color: #bbb;
+  }
+/*****************************************************************************/
+/************** font colors **************************************************/
+
+
+
+/************** Button styles *************************************************
+*************** Button borders ************************************************/
+#FxAssignButtons WPushButton[displayValue="0"],
+#VinylButton[displayValue="0"], #VinylModeButton, #VinylCueButton[displayValue="0"],
+#KeyMatchReset[displayValue="0"],
+#GuiToggleButton[displayValue="0"],
+#RecFeedback[displayValue="0"],
+#BroadcastButton[displayValue="0"],
+#SkinSettingsToggle[displayValue="0"],
+#DlgMissing > QPushButton,
+#DlgHidden > QPushButton,
+#DlgAutoDJ > QPushButton,
+#DlgRecording > QPushButton,
+#DlgAnalysis > QPushButton,
+WEffectSelector,
+WEffectSelector:on {
+  border-width: 2px;
+  border-image: url(skin:/classic/buttons/btn_embedded_library.svg) 2 2 2 2;
+  }
+  #FxAssignButtons WPushButton[displayValue="1"],
+  #VinylButton[displayValue="1"],
+  #VinylButton[displayValue="2"],
+  #VinylCueButton[displayValue="1"],
+  #VinylCueButton[displayValue="2"],
+  #KeyMatchReset[pressed="true"],
+  #GuiToggleButton[displayValue="1"],
+  #RecFeedback[displayValue="1"],
+  #RecFeedback[displayValue="2"],
+  #BroadcastButton[displayValue="1"],
+  #BroadcastButton[displayValue="2"],
+  #BroadcastButton[displayValue="3"],
+  #SkinSettingsToggle[displayValue="1"],
+  #DlgMissing > QPushButton:pressed,
+  #DlgHidden > QPushButton:pressed,
+  #DlgAutoDJ > QPushButton:pressed,
+  #DlgRecording > QPushButton:pressed,
+  #DlgAnalysis > QPushButton:pressed,
+  QPushButton#pushButtonAutoDJ:checked,
+  QPushButton#pushButtonRepeatPlaylist:checked,
+  #DlgAnalysis > QPushButton:checked,
+  QPushButton#pushButtonRecording:checked {
+    border-width: 2px;
+    border-image: url(skin:/classic/buttons/btn_embedded_library_active.svg) 2 2 2 2;
+  }
+  #KeyUp {
+    border-width: 1px 2px 0px 2px;
+    border-image: url(skin:/classic/buttons/btn_embedded_library.svg) 1 2 12 2;
+    }
+  #KeyDown {
+    border-width: 0px 2px 1px 2px;
+    border-image: url(skin:/classic/buttons/btn_embedded_library.svg) 12 2 1 2;
+    }
+
+/* Library controls in AutoDJ etc. */
+  #DlgMissing > QPushButton:focus,
+  #DlgHidden > QPushButton:focus,
+  #DlgAutoDJ > QPushButton:focus,
+  #DlgRecording > QPushButton:focus,
+  #DlgAnalysis > QPushButton:focus {
+    outline: none;
+  }
+
+  WEffectSelector:on {
+    /* not applied. Only visible on Windows (nad macOS?)
+    padding-left: 10px; */
+  }
+  /* Highlight WEffectSelector when effect is active */
+  WEffectSelector[highlight="1"] {  /*
+    background-color: #6AAF04;
+    color: #000;
+    border-image: url(skin:/classic/buttons/btn_embedded_effectselector_active.svg) 2 2 2 2;  */
+  }
+
+#fadeModeCombobox,
+#fadeModeCombobox:on {
+  border-width: 2px 2px 2px 2px;
+  }
+  #fadeModeCombobox {
+    border-image: url(skin:/classic/buttons/btn_embedded_library.svg) 2 2 2 2;
+  }
+  #fadeModeCombobox:on {
+    border-image: url(skin:/classic/buttons/btn_embedded_library_active.svg) 2 2 2 2;
+  }
+
+#BeatgridControls WPushButton, #BeatgridControlsToggle,
+#DeckRow_5_LoopCuesTransport WPushButton,
+#PlayDeck, #PlayIndicator, #PlayBg,
+#CueDeck, #PlayCueMini WPushButton,
+#LoopActivate,
+#RateControls WPushButton, #SyncDeck,
+#MixerContainer WPushButton,
+#FxUnitContainer WPushButton,
+#SamplerContainer WPushButton,
+#MicAuxRack WPushButton,
+#PlayPreview {
+  /* Limit background-color area to button area designed in SVG backpath. */
+  margin: 1px;
+  /* just to be sure the colored background doesn't overlap the rounded SVG border */
+  border-radius: 2px;
+}
+
+WPushButton#FxExpand,
+WPushButton#SamplerExpand,
+#FxAssignButtons WPushButton,
+#VinylControls WPushButton,
+#KeyControls WPushButton,
+#SamplerSettings WPushButton,
+#SamplerSettingsMini WPushButton,
+WPushButton#CrossfaderButton,
+WPushButton#FxExpandOverlay,
+#LibExpand,
+#ToolBar WPushButton {
+  margin: 0px;
+  border-radius: 0px;
+}
+
+
+
+/************** button background colors **************************************/
+#BeatgridControls WPushButton[displayValue="0"],
+#DeckRow_5_LoopCuesTransport WPushButton[displayValue="0"],
+#PlayBg, #PlayCueMini WPushButton[displayValue="0"],
+#CueDeck[displayValue="0"], #LoopActivate[displayValue="0"],
+#FxAssignButtons WPushButton[displayValue="0"],
+#VinylControls WPushButton[displayValue="0"],
+#KeyControls WPushButton[displayValue="0"],
+  WPushButton#VinylModeButton[displayValue="1"],
+  WPushButton#VinylModeButton[displayValue="2"],
+WPushButton#MixModeButton[displayValue="1"],
+#RateControls WPushButton[displayValue="0"], #SyncDeck[value="0"],
+#MixerContainer WPushButton[displayValue="0"],
+#FxUnitContainer WPushButton[displayValue="0"],
+#SamplerContainer WPushButton[displayValue="0"],
+#MicAuxRack WPushButton[displayValue="0"],
+/* library buttons */
+QPushButton#pushButtonAutoDJ:enabled:!checked,
+#DlgMissing > QPushButton:enabled,
+#DlgHidden > QPushButton:enabled,
+#DlgAutoDJ > QPushButton:enabled,
+#DlgRecording > QPushButton:enabled,
+#DlgAnalysis > QPushButton:enabled,
+#GuiToggleButton[displayValue="0"], #RecFeedback[displayValue="0"],
+#BroadcastButton[displayValue="0"], #SkinSettingsToggle[displayValue="0"] {
+  background-color: #262626;
+}
+
+/* Red */
+#BeatgridControls WPushButton[value="1"],
+#RateControls WPushButton[value="1"],
+#SyncDeck[value="1"], #SyncSampler[displayValue="1"],
+WPushButton#PlayDeck[displayValue="1"],
+WPushButton#PlayDeckMini[displayValue="1"],
+#PlaySampler[displayValue="1"], #PlayPreview[displayValue="1"],
+WPushButton#PlayIndicator[displayValue="1"],
+#LibraryPreviewButton:checked,
+#CueDeck[displayValue="1"],
+WPushButton#Reverse[pressed="true"],
+#LoopControls WPushButton[value="1"], #LoopActivate[displayValue="1"],
+#BeatjumpControls WPushButton[value="1"],
+#EQKillButtonBox WPushButton[displayValue="1"],
+#PflButton[value="1"],
+#MicTalk[value="1"], #AuxPlay[value="1"],
+#MicDucking[value="1"], #MicDucking[value="2"],
+#RecFeedback[displayValue="2"],
+QPushButton#pushButtonRecording:checked {
+  background-color: #db0000;
+}
+
+/* Green for Fx buttons: QuickEffect + Fx 1/2 */
+#FxUnit1 #FxToggleButton[displayValue="1"],
+#FxUnit2 #FxToggleButton[displayValue="1"],
+WPushButton#QuickEffectButton[displayValue="1"],
+#FxAssignButton1[displayValue="1"],
+#FxAssignButton2[displayValue="1"],
+#BroadcastButton[displayValue="2"] {
+  background-color: #659f08;
+}
+/* Blue for Fx buttons 3/4 */
+#FxUnit3 #FxToggleButton[displayValue="1"],
+#FxUnit4 #FxToggleButton[displayValue="1"],
+#FxAssignButton3[displayValue="1"],
+#FxAssignButton4[displayValue="1"] {
+  background-color: #0895bc;
+}
+
+/* Emphasize Fx parameter buttons on dark background
+    because they don't have bright icons */
+WPushButton#FxParameterButton[displayValue="0"] {
+  background-color: #333;
+}
+
+/* Grey for Pfl, Fx parameters & SplitCue */
+#VinylCueButton[displayValue="1"],
+#VinylCueButton[displayValue="2"],
+#FxParameterButton[displayValue="1"],
+#SplitCue[value="1"],
+QPushButton#pushButtonRepeatPlaylist:checked {
+  background-color: #888;
+}
+
+#BroadcastButton[displayValue="3"] {
+  /* pink */
+  background-color: #f856e7;
+}
+
+/* Golden */
+#VinylButton[displayValue="1"],
+#VinylButton[displayValue="2"],
+#GuiToggleButton[displayValue="1"],
+#GuiToggleButton[displayValue="2"],
+#BroadcastButton[displayValue="1"],   /* connecting: yellow */
+#RecFeedback[displayValue="1"],   /* initialize recording */
+#SkinSettingsToggle[displayValue="1"],
+QPushButton#pushButtonAutoDJ:checked,
+#DlgAnalysis > QPushButton:checked {
+  background-color: #d09300;
+}
+
+#SpecialCueButton[value="1"] {
+  background-color: #0044ff;
+}
+
+#FxSuperLinkButton[value="0"],
+#FxSuperLinkInvertButton[displayValue="0"] {
+  background-color: #4b4b4b;
+}
+#FxSuperLinkInvertButton[displayValue="1"] {
+  background-color: #9C0900;
+  }
+
+/* Green for Fx1 / Fx2 */
+#FxUnit1 #FxSuperLinkButton[value="1"],
+#FxUnit2 #FxSuperLinkButton[value="1"] {
+  background-color: #426b00;
+  }
+#FxUnit1 #FxSuperLinkButton[value="2"],
+#FxUnit2 #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 #426b00,
+    stop: 0.33 #426b00,
+    stop: 0.34 #333,
+    stop: 1 #333);
+  }
+#FxUnit1 #FxSuperLinkButton[value="3"],
+#FxUnit2 #FxSuperLinkButton[value="3"] {
+  background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
+    stop: 0 #333,
+    stop: 0.66 #333,
+    stop: 0.67 #426b00,
+    stop: 1 #426b00);
+  }
+#FxUnit1 #FxSuperLinkButton[value="4"],
+#FxUnit2 #FxSuperLinkButton[value="4"] {
+  background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
+    stop: 0 #426b00,
+    stop: 0.330000 #426b00,
+    stop: 0.340000 #333,
+    stop: 0.660000 #333,
+    stop: 0.670000 #426b00,
+    stop: 1 #426b00);
+  }
+
+/* Blue for Fx3 / Fx4 */
+#FxUnit3 #FxSuperLinkButton[value="1"],
+#FxUnit4 #FxSuperLinkButton[value="1"] {
+  background-color: #00696b;
+  }
+#FxUnit3 #FxSuperLinkButton[value="2"],
+#FxUnit4 #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 #00696b,
+    stop: 0.33 #00696b,
+    stop: 0.34 #333,
+    stop: 1 #333);
+  }
+#FxUnit3 #FxSuperLinkButton[value="3"],
+#FxUnit4 #FxSuperLinkButton[value="3"] {
+  background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
+    stop: 0 #333,
+    stop: 0.66 #333,
+    stop: 0.67 #00696b,
+    stop: 1 #00696b);
+  }
+#FxUnit3 #FxSuperLinkButton[value="4"],
+#FxUnit4 #FxSuperLinkButton[value="4"] {
+  background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
+    stop: 0 #00696b,
+    stop: 0.330000 #00696b,
+    stop: 0.340000 #333,
+    stop: 0.660000 #333,
+    stop: 0.670000 #00696b,
+    stop: 1 #00696b);
+  }
+
+/* Special flat buttons */
+WPushButton#PlayDeck[displayValue="0"],
+WPushButton#PlayDeckMini[displayValue="0"],
+WPushButton#PlayIndicator[value="0"],
+WPushButton#BpmTap[displayValue="0"],
+WPushButton#FxFocusButton[displayValue="0"],
+#SamplerSettings WPushButton[displayValue="0"],
+#SamplerSettingsMini WPushButton[displayValue="0"],
+WPushButton#FxExpand[displayValue="0"],
+WPushButton#FxExpandOverlay[displayValue="0"],
+WPushButton#SamplerExpand[displayValue="0"],
+#BeatgridControlsToggle,
+#SamplerControlsMini WPushButton,
+#RecDot {
+  background-color: transparent;
+}
+
+/************** Button icons **************************************************/
+
+#PlayDeck {
+  image: url(skin:/classic/buttons/btn__play_deck.svg) no-repeat center center;
+}
+
+#PlayDeckMini[value="0"] {
+  image: url(skin:/classic/buttons/btn__play_deck_mini.svg) no-repeat center center;
+  }
+  #PlayDeckMini[value="1"] {
+    image: url(skin:/classic/buttons/btn__pause_deck_mini.svg) no-repeat center center;
+  }
+#PlaySampler[value="0"],
+#PlayPreview[displayValue="0"] {
+  image: url(skin:/classic/buttons/btn__play_sampler.svg) no-repeat center center;
+  }
+  #PlaySampler[value="1"],
+  #PlayPreview[displayValue="1"] {
+    image: url(skin:/classic/buttons/btn__pause_sampler.svg) no-repeat center center;
+  }
+
+#CueDeck {
+  image: url(skin:/classic/buttons/btn__cue_deck.svg) no-repeat center center;
+}
+
+#Reverse {
+  image: url(skin:/classic/buttons/btn__reverse.svg) no-repeat center center;
+}
+
+#Hotcue1 WPushButton {
+  image: url(skin:/classic/buttons/btn__1.svg) no-repeat center center;
+  }
+  #Hotcue2 WPushButton {
+    image: url(skin:/classic/buttons/btn__2.svg) no-repeat center center;
+  }
+  #Hotcue3 WPushButton {
+    image: url(skin:/classic/buttons/btn__3.svg) no-repeat center center;
+  }
+  #Hotcue4 WPushButton {
+    image: url(skin:/classic/buttons/btn__4.svg) no-repeat center center;
+  }
+  #Hotcue5 WPushButton {
+    image: url(skin:/classic/buttons/btn__5.svg) no-repeat center center;
+  }
+  #Hotcue6 WPushButton {
+    image: url(skin:/classic/buttons/btn__6.svg) no-repeat center center;
+  }
+  #Hotcue7 WPushButton {
+    image: url(skin:/classic/buttons/btn__7.svg) no-repeat center center;
+  }
+  #Hotcue8 WPushButton {
+    image: url(skin:/classic/buttons/btn__8.svg) no-repeat center center;
+  }
+
+#SpecialCueButton_intro_start WPushButton {
+  image: url(skin:/classic/buttons/btn__intro_start.svg) no-repeat center center;
+  }
+  #SpecialCueButton_intro_end WPushButton {
+    image: url(skin:/classic/buttons/btn__intro_end.svg) no-repeat center center;
+  }
+  #SpecialCueButton_outro_start WPushButton {
+    image: url(skin:/classic/buttons/btn__outro_start.svg) no-repeat center center;
+  }
+  #SpecialCueButton_outro_end WPushButton {
+    image: url(skin:/classic/buttons/btn__outro_end.svg) no-repeat center center;
+  }
+
+#LoopActivate {
+  image: url(skin:/classic/buttons/btn__loop.svg) no-repeat center center;
+}
+#Reloop {
+  image: url(skin:/classic/buttons/btn__reloop.svg) no-repeat center center;
+}
+
+#LoopIn {
+  image: url(skin:/classic/buttons/btn__loop_in.svg) no-repeat center center;
+}
+#LoopOut {
+  image: url(skin:/classic/buttons/btn__loop_out.svg) no-repeat center center;
+}
+
+#JumpForward {
+  image: url(skin:/classic/buttons/btn__jump_right.svg) no-repeat center center;
+}
+#JumpBack {
+  image: url(skin:/classic/buttons/btn__jump_left.svg) no-repeat center center;
+}
+
+/* Key buttons */
+#KeyMatchReset {
+  image: url(skin:/classic/buttons/btn__key_match.svg) no-repeat center center;
+}
+
+#KeyUp {
+  image: url(skin:/classic/buttons/btn__key_up.svg) no-repeat center center;
+}
+
+#KeyDown {
+  image: url(skin:/classic/buttons/btn__key_down.svg) no-repeat center center;
+}
+
+/* Rate buttons */
+#SyncDeck {
+  image: url(skin:/classic/buttons/btn__sync_deck.svg) no-repeat center center;
+  }
+
+  #SyncSampler {
+    image: url(skin:/classic/buttons/btn__sync_sampler.svg) no-repeat center center;
+    }
+
+  #RatePermUp {
+    image: url(skin:/classic/buttons/btn__plus.svg) no-repeat center center;
+  }
+
+  #RatePermDown {
+    image: url(skin:/classic/buttons/btn__minus.svg) no-repeat center center;
+  }
+
+  #RateTempUp {
+    image: url(skin:/classic/buttons/btn__arrow_right_up.svg) no-repeat center center;
+  }
+  #RateTempDown {
+    image: url(skin:/classic/buttons/btn__arrow_left_down.svg) no-repeat center center;
+  }
+
+  #RateTempUpRev {
+    image: url(skin:/classic/buttons/btn__arrow_right_down.svg) no-repeat center center;
+  }
+
+  #RateTempDownRev {
+    image: url(skin:/classic/buttons/btn__arrow_left_up.svg) no-repeat center center;
+  }
+
+/* Mixer buttons */
+#PflButton {
+  image: url(skin:/classic/buttons/btn__pfl.svg) no-repeat center center;
+}
+
+#QuickEffectButton[displayValue="0"] {
+  image: url(skin:/classic/buttons/btn__star.svg) no-repeat center center;
+}
+
+/* EQ Kill button icons H / M / L */
+#EQKillButton_High[displayValue="0"] {
+  image: url(skin:/classic/buttons/btn__eq_kill_high.svg) no-repeat center center;
+}
+#EQKillButton_Mid[displayValue="0"] {
+  image: url(skin:/classic/buttons/btn__eq_kill_mid.svg) no-repeat center center;
+}
+#EQKillButton_Low[displayValue="0"] {
+  image: url(skin:/classic/buttons/btn__eq_kill_low.svg) no-repeat center center;
+}
+
+#SplitCue[displayValue="0"] {
+  image: url(skin:/classic/buttons/btn__split.svg) no-repeat center center;
+  }
+  #SplitCue[displayValue="1"] {
+    image: url(skin:/classic/buttons/btn__split_active.svg) no-repeat center center;
+  }
+
+#FxExpand[value="0"],
+#LibExpand[value="0"] {
+  image: url(skin:/classic/buttons/btn__expand.svg) no-repeat left center;
+  }
+  #FxExpand[value="1"],
+  #LibExpand[value="1"] {
+    image: url(skin:/classic/buttons/btn__collapse.svg) no-repeat left center;
+  }
+#SamplerExpand[value="0"] {
+  image: url(skin:/classic/buttons/btn__expand_dim.svg) no-repeat left center;
+  }
+  #SamplerExpand[value="1"] {
+    image: url(skin:/classic/buttons/btn__collapse_dim.svg) no-repeat left center;
+  }
+
+#MixModeButton[value="0"] {
+  image: url(skin:/classic/buttons/btn__fx_mixmode_d-w.svg) no-repeat center center;
+  }
+  #MixModeButton[value="1"] {
+    image: url(skin:/classic/buttons/btn__fx_mixmode_d+w.svg) no-repeat center center;
+  }
+
+#FxToggleButton[value="0"] {
+  image: url(skin:/classic/buttons/btn__fx_toggle.svg) no-repeat center center;
+  }
+  #FxToggleButton[value="1"] {
+    image: url(skin:/classic/buttons/btn__fx_toggle_active.svg) no-repeat center center;
+  }
+
+#FxFocusButton[value="0"] {
+  image: url(skin:/classic/buttons/btn__fx_focus.svg) no-repeat center center;
+  }
+  #FxFocusButton[value="1"] {
+    image: url(skin:/classic/buttons/btn__fx_focus_active.svg) no-repeat center center;
+  }
+
+/* deck controls for decks 1-4 and samplers */
+#CurposButton12[displayValue="0"], #CurposButton34[displayValue="0"] {
+  image: url(skin:/classic/buttons/btn__beat_curpos.svg) no-repeat center center;
+  }
+  #CurposButton12[value="1"] {
+    image: url(skin:/classic/buttons/btn__beat_curpos_active_12.svg) no-repeat center center;
+  }
+  #CurposButton34[value="1"] {
+    image: url(skin:/classic/buttons/btn__beat_curpos_active_34.svg) no-repeat center center;
+  }
+
+  #EjectButton12[displayValue="0"], #EjectButton34[displayValue="0"] {
+    image: url(skin:/classic/buttons/btn__eject.svg) no-repeat center center;
+    }
+    #EjectButton12[value="1"] {
+      image: url(skin:/classic/buttons/btn__eject_active_12.svg) no-repeat center center;
+    }
+    #EjectButton34[value="1"] {
+      image: url(skin:/classic/buttons/btn__eject_active_34.svg) no-repeat center center;
+    }
+
+  #RepeatButton12[displayValue="0"], #RepeatButton34[displayValue="0"] {
+    image: url(skin:/classic/buttons/btn__repeat.svg) no-repeat center center;
+    }
+    #RepeatButton12[displayValue="1"] {
+      image: url(skin:/classic/buttons/btn__repeat_active_12.svg) no-repeat center center;
+    }
+    #RepeatButton34[displayValue="1"] {
+      image: url(skin:/classic/buttons/btn__repeat_active_34.svg) no-repeat center center;
+    }
+
+  #QuantizeButton12[displayValue="0"], #QuantizeButton34[displayValue="0"] {
+    image: url(skin:/classic/buttons/btn__quantize.svg) no-repeat center center;
+    }
+    #QuantizeButton12[displayValue="1"] {
+      image: url(skin:/classic/buttons/btn__quantize_active_12.svg) no-repeat center center;
+    }
+    #QuantizeButton34[displayValue="1"] {
+      image: url(skin:/classic/buttons/btn__quantize_active_34.svg) no-repeat center center;
+    }
+
+  #SlipmodeButton12[displayValue="0"], #SlipmodeButton34[displayValue="0"] {
+    image: url(skin:/classic/buttons/btn__slip.svg) no-repeat center center;
+    }
+    #SlipmodeButton12[displayValue="1"] {
+      image: url(skin:/classic/buttons/btn__slip_active_12.svg) no-repeat center center;
+    }
+    #SlipmodeButton34[displayValue="1"] {
+      image: url(skin:/classic/buttons/btn__slip_active_34.svg) no-repeat center center;
+    }
+
+  #KeylockButton12[displayValue="0"], #KeylockButton34[displayValue="0"] {
+    image: url(skin:/classic/buttons/btn__keylock.svg) no-repeat center center;
+    }
+    #KeylockButton12[displayValue="1"] {
+      image: url(skin:/classic/buttons/btn__keylock_active_12.svg) no-repeat center center;
+    }
+    #KeylockButton34[displayValue="1"] {
+      image: url(skin:/classic/buttons/btn__keylock_active_34.svg) no-repeat center center;
+    }
+
+#BeatgridControlsToggle[displayValue="0"] {
+  image: url(skin:/classic/buttons/btn__beatgrid_controls_expand.svg) no-repeat center center;
+  }
+  #BeatgridControlsToggle[displayValue="1"] {
+    image: url(skin:/classic/buttons/btn__beatgrid_controls_collapse.svg) no-repeat center center;
+  }
+  #BeatCurposLarge {
+    image: url(skin:/classic/buttons/btn__beat_curpos_large.svg) no-repeat center center;
+    }
+    #BeatsEarlier {
+      image: url(skin:/classic/buttons/btn__beats_earlier.svg) no-repeat center center;
+    }
+    #BeatsLater {
+      image: url(skin:/classic/buttons/btn__beats_later.svg) no-repeat center center;
+    }
+    #BeatsSlower {
+      image: url(skin:/classic/buttons/btn__beats_slower.svg) no-repeat center center;
+    }
+    #BeatsFaster {
+      image: url(skin:/classic/buttons/btn__beats_faster.svg) no-repeat center center;
+    }
+    #HotcuesEarlier {
+      image: url(skin:/classic/buttons/btn__hotcues_earlier.svg) no-repeat center center;
+    }
+    #HotcuesLater {
+      image: url(skin:/classic/buttons/btn__hotcues_later.svg) no-repeat center center;
+    }
+
+#MicTalk {
+  image: url(skin:/classic/buttons/btn__mic_talk.svg) no-repeat center center;
+}
+
+#AuxPlay {
+  image: url(skin:/classic/buttons/btn__aux_play.svg) no-repeat center center;
+}
+
+#MicAuxAdd {
+  image: url(skin:/classic/buttons/btn__plus_flat.svg) no-repeat center center;
+}
+
+#MicDucking[value="0"] {
+  image: url(skin:/classic/buttons/btn__mic_duck_off.svg) no-repeat center center;
+  }
+  #MicDucking[value="1"] {
+    image: url(skin:/classic/buttons/btn__mic_duck_auto.svg) no-repeat center center;
+  }
+  #MicDucking[value="2"] {
+    image: url(skin:/classic/buttons/btn__mic_duck_manual.svg) no-repeat center center;
+  }
+
+#RecDot[highlight="0"] {
+  image: url(skin:/classic/buttons/btn__rec_dot.svg) no-repeat center center;
+  }
+  #RecDot[highlight="1"], #RecDot[highlight="2"] {
+    image: url(skin:/classic/buttons/btn__rec_dot_active.svg) no-repeat center center;
+  }
+
+#SkinSettingsToggle[displayValue="0"] {
+  /* for some reason the alignment isn't rescpected, so the icons
+    have to be sized like available area (76x16px) */
+  image: url(skin:/classic/buttons/btn__settings_off.svg) no-repeat left top;
+  }
+  #SkinSettingsToggle[displayValue="1"] {
+    image: url(skin:/classic/buttons/btn__settings_on.svg) no-repeat left top;
+  }
+
+#ToolbarLogo {
+  image: url(skin:/classic/style/mixxx_logo_small.svg) no-repeat center center;
+}
+#ToolbarSeparator {
+  image: url(skin:/classic/style/toolbar_separator.png) no-repeat center center;
+  margin: 0px 3px;
+}
+
+WSearchLineEdit QToolButton:!focus {
+  image: url(skin:/classic/buttons/btn__lib_clear_search.svg);
+  }
+  WSearchLineEdit QToolButton:focus {
+    image: url(skin:/classic/buttons/btn__lib_clear_search_focus.svg);
+  }
+
+/* AutoDJ button icons */
+QPushButton#pushButtonAutoDJ:!checked {
+  image: url(skin:/classic/buttons/btn__autodj_enable_off.svg) no-repeat center center;
+  }
+  QPushButton#pushButtonAutoDJ:checked {
+    image: url(skin:/classic/buttons/btn__autodj_enable_on.svg) no-repeat center center;
+  }
+
+QPushButton#pushButtonFadeNow:!enabled {
+  image: url(skin:/classic/buttons/btn__autodj_fade_disabled.svg) no-repeat center center;
+  }
+  QPushButton#pushButtonFadeNow:enabled {
+    image: url(skin:/classic/buttons/btn__autodj_fade.svg) no-repeat center center;
+  }
+
+QPushButton#pushButtonSkipNext:!enabled {
+  image: url(skin:/classic/buttons/btn__autodj_skip_disabled.svg) no-repeat center center;
+  }
+  QPushButton#pushButtonSkipNext:enabled {
+    image: url(skin:/classic/buttons/btn__autodj_skip.svg) no-repeat center center;
+  }
+
+QPushButton#pushButtonShuffle:enabled {
+  image: url(skin:/classic/buttons/btn__autodj_shuffle.svg) no-repeat center center;
+  }
+
+QPushButton#pushButtonAddRandom:enabled {
+  image: url(skin:/classic/buttons/btn__autodj_addrandom.svg) no-repeat center center;
+  }
+
+QPushButton#pushButtonRepeatPlaylist:!checked {
+  image: url(skin:/classic/buttons/btn__autodj_repeat_playlist_off.svg) no-repeat center center;
+  }
+  QPushButton#pushButtonRepeatPlaylist:checked {
+    image: url(skin:/classic/buttons/btn__autodj_repeat_playlist_on.svg) no-repeat center center;
+  }
+
+/* widgets in cue popup menu */
+#CueDeleteButton {  /*
+  padding: 3px 6px; */
+  qproperty-icon: url(skin:/classic/buttons/btn__delete.svg);
+  /* color buttons are 42x24 px.
+  To get the final size for the Delete button consider border width.
+  It's a tall button, about the same height as cue number + label edit box */
+  width: 24px;
+  height: 42px;
+  border-width: 2px;
+  border-image: url(skin:/classic/buttons/btn_embedded_library.svg) 2 2 2 2;
+  /* make the icon slightly larger than default 16px */
+  qproperty-iconSize: 20px;
+  /* has no effect
+  padding: 0px; */
+}
+
+#CueLabelEdit {
+  border: 1px solid #f0bb2b;
+  border-radius: 0px;
+  background-color: #000;
+  selection-color: #000;
+  selection-background-color: #ccc;
+  padding: 2px;
+}
+/************** Button icons **************************************************/
+/************** Button styles *************************************************/
+
+
+
+/************** Library *******************************************************/
+
+#LibraryContainer {
+  /* ToDo (ronso0)
+  Check, may be obsolete since tollbar is at the top now.
+
+  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 #080808,
+    stop:1 #1e1e1e); */
+}
+
+WLibrary,
+#SidebarBox {
+  padding: 2px 0px 0px 2px;
+  border-bottom: 0px;
+  border-left: 0px;
+  border-right: 0px;
+  border-bottom-right-radius: 0px;
+  border-bottom-left-radius: 0px;
+  border-top-left-radius: 0px;
+}
+
+#LibraryContainer QTableView,
+#LibraryContainer QTextBrowser,
+#LibraryContainer QTreeView {
+  border-top: 1px solid #0a0a0a;
+  border-right: 1px solid qlineargradient(x1:0, y1:0, x2:0, y2:1,
+    stop:0 #333,
+    stop:1 #444);
+  border-bottom: 1px solid #444;
+  border-left: 1px solid #0a0a0a;
+  alternate-background-color: #1a1a1a;
+  selection-background-color: #5e4507;
+}
+
+#LibraryContainer QTableView:focus,
+#LibraryContainer QTreeView:focus,
+#LibraryContainer QTextBrowser:focus {
+  border: 1px solid #d09300;
+}
+
+#LibraryContainer QTreeView {
+  show-decoration-selected: 0;
+}
+
+/* selected items in Tree and Tracks table */
+#LibraryContainer QTreeView::item:selected,
+#LibraryContainer QTableView::item:selected,
+#LibraryBPMButton::item:selected {
+/* this doesn't style BPM value in selected row
+#LibraryContainer QTableView::item:selected #LibraryBPMSpinBox::item:selected,
+#LibraryContainer QTableView::item:selected > #LibraryBPMSpinBox::item:selected */
+  color: #fff;
+  background-color: #5e4507;
+}
+
+/* checkbox in library "Played" column */
+#LibraryContainer QTableView::indicator {/*
+  This results in 10x10px + 1px border = 12x12px
+  Omitting this definitions makes the checkbox grow to
+  12x12px + 1px border = 14x14px
+  which also miraculously makes the BPM icon grow to 14x14px
+  Neither checkbox nor BPM icon size have an effect on the size... */
+  width: 10px;
+  height: 10px;
+  /* border is added to size defined above */
+  border: 1px solid transparent;
+  margin: 0px;
+  padding: 0px;
+  }
+  #LibraryContainer QTableView::indicator:checked,
+  #LibraryContainer QTableView::indicator:checked:selected {
+    image: url(skin:/classic/buttons/btn__lib_checkmark_orange.svg);
+    border: 1px solid #ff6600;
+    }
+  #LibraryContainer QTableView::indicator:unchecked {
+    image: none;
+    border: 1px solid rgba(151,151,151,128);
+    }
+    #LibraryContainer QTableView::indicator:selected {
+      border: 1px solid #888;
+    }
+
+/* Table cell in edit mode */
+WLibrary QLineEdit,
+#LibraryBPMSpinBox {
+  color: #ddd;
+  background-color: #0f0f0f;
+  selection-color: #000;
+  selection-background-color: #ccc;
+  border: 1px solid #5E4507;
+}
+
+/* Entire BPM cell */
+/* Lock icon at the left */
+#LibraryBPMButton::indicator:checked {
+  image: url(skin:/classic/buttons/btn__lib_bpm_locked_orange.svg);
+  }
+#LibraryBPMButton::indicator:unchecked {
+  image: url(skin:/classic/buttons/btn__lib_bpm_unlocked_grey.svg);
+  }
+/* BPM value */
+#LibraryBPMButton::item {
+  }
+#LibraryBPMSpinBox {
+  border-left: 0px;
+}
+/* When activated, the left border of the spinbox shows an
+  artefact of the inactive BPM value. */
+#LibraryBPMSpinBox::up-button,
+#LibraryBPMSpinBox::down-button {
+  margin-right: 3px;
+  background-color: #382904;
+  }
+  #LibraryBPMSpinBox::up-button {
+    image: url(skin:/classic/buttons/btn__lib_bpm_up.svg) no-repeat;
+    }
+  #LibraryBPMSpinBox::down-button {
+    image: url(skin:/classic/buttons/btn__lib_bpm_down.svg) no-repeat;
+    }
+/* remove OS focus indicator from BPM cell */
+WLibrary QCheckBox,
+#LibraryBPMButton::item:selected,
+WCueMenuPopup QPushButton:focus {
+  outline: none;
+}
+
+/* Button in library "Preview" column */
+#LibraryPreviewButton {
+  margin: 0px;
+  padding: 0px;
+  border-radius: 2px;
+  border: 1px solid transparent;
+  }
+  #LibraryPreviewButton:!checked {
+    image: url(skin:/classic/buttons/btn__lib_preview_play.svg);
+    }
+  #LibraryPreviewButton:checked {
+    image: url(skin:/classic/buttons/btn__lib_preview_pause.svg);
+    }
+
+
+/*********** table header styles *********************************/
+
+#LibraryContainer QHeaderView {
+  color: #bbb;
+  border-bottom: 1px solid #000;
+  }
+  #LibraryContainer QHeaderView,
+  #LibraryContainer QHeaderView::section,
+  #LibraryContainer QHeaderView::up-arrow,
+  #LibraryContainer QHeaderView::down-arrow {
+    background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
+      stop:0 #222,
+      stop:1 #111);
+  }
+  #LibraryContainer QHeaderView::section {
+    border-right: 1px solid #000;
+    border-bottom: 1px solid #000;
+  }
+  #LibraryContainer QHeaderView::up-arrow,
+  #LibraryContainer QHeaderView::down-arrow {
+    border-right: 1px solid #000;
+    /* gradient colors should match those of QHeaderView gradient,
+      with a little transparency added to not cut off the header label */
+    background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
+      stop:0 rgba(34,34,34,190),
+      stop:1 rgba(17,17,17,190));
+    }
+    #LibraryContainer QHeaderView::up-arrow {
+      image: url(skin:/classic/buttons/btn__lib_sort_up.svg);
+      }
+    #LibraryContainer QHeaderView::down-arrow {
+      image: url(skin:/classic/style/btn__lib_sort_down.svg);
+    }
+
+
+
+/*********** scrollbars *********************************/
+#LibraryContainer QScrollBar,
+WEffectSelector QAbstractScrollArea QScrollBar {
+  border: 0px solid #585858;
+  background: #000;
+  border-radius: 2px;
+  padding: 1px;
+  color: #999999;
+  }
+  #LibraryContainer QScrollBar:horizontal,
+  WEffectSelector QAbstractScrollArea QScrollBar:horizontal {
+    min-width: 12px;
+    height: 15px;
+    border-top-left-radius: 0px;
+    border-top-right-radius: 0px;
+    background-color: #000;
+  }
+  #LibraryContainer QScrollBar:vertical,
+  WEffectSelector QAbstractScrollArea QScrollBar:vertical {
+    min-height: 12px;
+    width: 15px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+    color: #b3b3b3;
+    background-color: #000;
+  }
+  /* catch scroll bar of focused treeview like this:
+  #LibraryContainer QTreeView:focus QScrollBar:vertical {
+  }*/
+#LibraryContainer QScrollBar::handle:horizontal,
+WEffectSelector QAbstractScrollArea QScrollBar::handle:horizontal {
+  min-width: 25px;
+  border-radius: 2px;
+  background: qlineargradient(x1:0, y1:0, x2:0, y2:1,
+    stop:0 #725309,
+    stop:1 #412f05);
+}
+#LibraryContainer QScrollBar::handle:vertical,
+WEffectSelector QAbstractScrollArea QScrollBar::handle:vertical {
+  min-height: 25px;
+  border-radius: 2px;
+  background: qlineargradient(x1:0, y1:0, x2:0, y2:1,
+    stop:0 #725309,
+    stop:1 #412f05);
+}
+
+/* "add-page" and "sub-page" are the gutter of the scrollbar */
+#LibraryContainer QScrollBar::add-page,
+#LibraryContainer QScrollBar::sub-page,
+WEffectSelector QAbstractScrollArea QScrollBar::add-page,
+WEffectSelector QAbstractScrollArea QScrollBar::sub-page {
+  min-width: 15px;
+  min-height: 15px;
+  background-color: #000;
+  border-radius: 2px;
+}
+/* Turn off buttons */
+#LibraryContainer QScrollBar::add-line,
+#LibraryContainer QScrollBar::sub-line,
+WEffectSelector QAbstractScrollArea QScrollBar::add-line,
+WEffectSelector QAbstractScrollArea QScrollBar::sub-line{
+  width: 0px;
+  height: 0px;
+  border: 0px;
+}
+
+/* Corner in between two scrollbars */
+#LibraryContainer QAbstractScrollArea::corner,
+WEffectSelector QAbstractScrollArea QScrollBar::corner {
+  background-color: #1e1e1e;
+}
+/*********** scrollbars *********************************/
+
+
+/*********** library search bar *********************************/
+WSearchLineEdit {
+  padding: 2px;
+  background-color: #0f0f0f;
+  selection-color: #000;
+  selection-background-color: #ccc;
+  }
+  WSearchLineEdit:focus {
+    padding: 1px;
+    border: 2px solid #d08e00;
+    border-radius: 0px;
+  }
+  WSearchLineEdit[active="false"],
+  WSearchLineEdit:disabled {
+    color: #999;
+  }
+  WSearchLineEdit:disabled {
+    background-color: #191919;
+  }
+  /* Clear button: see /skins/default.qss */
+
+/************ splitters ***********************/
+/* HorizontalSplitter
+  (the splitter itself is horizontal)
+  Used to split
+  - Waveforms & Decks/FX/etc
+  - Library feature & Coverart */
+#HorizontalSplitter {
+  padding: 0px;
+  margin: 0px;
+}
+
+#HorizontalSplitter::handle {
+    image: url(skin:/classic/style/splitter_handle_horizontal_unchecked.png); /*
+    border-top: 1px solid #000; */
+  }
+  #HorizontalSplitter::handle:pressed,
+  #HorizontalSplitter::handle:hover {
+    image: url(skin:/classic/style/splitter_handle_horizontal_checked.png);
+  }
+#HorizontalSplitter::handle:vertical {
+  height: 9px;
+}
+
+/* VerticalSplitter
+  (the splitter itself is vertical)
+  Used to split Library sidebar & Tracks table */
+#VerticalSplitter {
+  border-top: 1px solid #333333;
+}
+#VerticalSplitter::handle { /*
+  background-image: url(skin:/classic/style/library_splitter_handle_unchecked.svg);
+  background-position: center top;
+  background-repeat: no-repeat;  */
+  image: url(skin:/classic/style/splitter_handle_vertical_unchecked.png);
+  background-color: #1e1e1e;
+}
+#VerticalSplitter::handle:pressed,
+#VerticalSplitter::handle:hover {
+  image: url(skin:/classic/style/splitter_handle_vertical_checked.png);
+}
+#VerticalSplitter::handle:vertical {
+  /* 'height' works although it's actually the width of the handle */
+  height: 6px;
+}
+/************ splitters ***********************/
+
+
+/************ Library feature controls / tree view / table view *************/
+WLibrary QRadioButton::indicator:checked {
+  background: url(skin:/classic/buttons/btn__lib_radio_button_on_yellow.svg) center center;
+}
+
+WLibrary QRadioButton::indicator:unchecked {
+  background: url(skin:/classic/buttons/btn__lib_radio_button_off.svg) center center;
+}
+
+/* triangle for closed/opened branches in treeview */
+/* closed */
+#LibraryContainer QTreeView::branch:closed:has-children:!has-siblings:!selected,
+#LibraryContainer QTreeView::branch:closed:has-children:has-siblings:!selected {
+/*  Suppresses that selected sidebar items branch indicator shows wrong color when out of focus ; lp:880588 */
+  border-image: none;
+    image: url(skin:/classic/style/library_branch_closed_grey.png);
+  }
+  /* closed, selected */
+  #LibraryContainer QTreeView::branch:closed:has-children:!has-siblings:selected,
+  #LibraryContainer QTreeView::branch:closed:has-children:has-siblings:selected {
+    border-image: none;
+    image: url(skin:/classic/style/library_branch_closed_selected_white.png);
+    background-color: #5e4507;
+  }
+/* open */
+#LibraryContainer QTreeView::branch:open:has-children:!has-siblings,
+#LibraryContainer QTreeView::branch:open:has-children:has-siblings {
+  border-image: none;
+  image: url(skin:/classic/style/library_branch_open_grey.png);
+  }
+  /* open, selected */
+  #LibraryContainer QTreeView::branch:open:has-children:!has-siblings:selected,
+  #LibraryContainer QTreeView::branch:open:has-children:has-siblings:selected {
+    border-image: none;
+    image: url(skin:/classic/style/library_branch_open_selected_white.png);
+    background-color: #5e4507;
+    }
+  /* space left of selected child item */
+  #LibraryContainer QTreeView::branch:closed:!has-children:!has-siblings:selected,
+  #LibraryContainer QTreeView::branch:closed:!has-children:has-siblings:selected,
+  #LibraryContainer QTreeView::branch:open:!has-children:!has-siblings:selected,
+  #LibraryContainer QTreeView::branch:open:!has-children:has-siblings:selected {
+    border-image: none;
+    background-color: #0f0f0f;
+  }
+/************** Library *******************************************************/
+
+
+
+/************** common styles for WEffectSelector ******************************
+*************** QSpinBox, QMenu, QToolTip *************************************/
+WEffectSelector QAbstractScrollArea,
+#fadeModeCombobox QAbstractScrollArea,
+QToolTip,
+WBeatSpinBox QMenu,
+#LibraryContainer QMenu,
+WCueMenuPopup,
+WCueMenuPopup QMenu,
+WCoverArtMenu,
+WTrackMenu,
+WTrackMenu QMenu {
+  padding: 3px;
+  border: 1px solid #888;
+  border-radius: 2px;
+}
+
+#SkinContainer {
+  background-color: #0f0f0f;
+}
+#CrossfaderButtonContainer_Deck,
+#CrossfaderButtonContainer_Aux,
+WPushButton#CrossfaderButton[value="0"],
+#LibraryContainer QTableView,
+#LibraryContainer QTextBrowser,
+#LibraryContainer QTreeView,
+QToolTip,
+WBeatSpinBox QMenu,
+  WCueMenuPopup,
+  #LibraryContainer QMenu,
+  WCueMenuPopup QMenu,
+  WCoverArtMenu,
+  WTrackMenu,
+  WTrackMenu QMenu,
+WBeatSpinBox QMenu::item,
+  #LibraryContainer QMenu::item,
+  WCueMenuPopup QMenu::item,
+  WCueMenuPopup QLabel,
+  WCoverArtMenu::item,
+  WTrackMenu::item,
+  WTrackMenu QMenu::item,
+#LibraryContainer QMenu QCheckBox,
+WTrackMenu QCheckBox,
+WTrackMenu QMenu QCheckBox,
+WBeatSpinBox,
+#spinBoxTransition,
+#SkinSettings,
+WSearchLineEdit,
+WEffectSelector QAbstractScrollArea,
+#fadeModeCombobox QAbstractScrollArea,
+WEffectSelector::item,
+#fadeModeCombobox::item {
+  background-color: #0f0f0f;
+}
+WEffectSelector, #fadeModeCombobox {
+  background-color: #161616;
+}
+  /* hovered items */
+  WEffectSelector::item:selected,
+  #fadeModeCombobox::item:selected,
+  WBeatSpinBox QMenu::item:selected,
+  #LibraryContainer QMenu::item:selected,
+  WCueMenuPopup QMenu::item:selected,
+  WCoverArtMenu::item:selected,
+  WTrackMenu::item:selected,
+  WTrackMenu QMenu::item:selected,
+  #LibraryContainer QMenu QCheckBox:selected,
+  #LibraryContainer QMenu QCheckBox:focus,  /* selected by keyboard */
+  #LibraryContainer QMenu QCheckBox:hover, /* mouse hover */
+  WTrackMenu QCheckBox:selected,
+  WTrackMenu QCheckBox:focus,
+  WTrackMenu QCheckBox:hover,
+  WTrackMenu QMenu QCheckBox:selected,
+  WTrackMenu QMenu QCheckBox:focus,
+  WTrackMenu QMenu QCheckBox:hover,
+  #SkinSettingsButton:hover,
+  #DeckSizeButton:hover,
+  #SkinSettingsMixerToggle[hover="true"],
+  #SkinSettingsLabelButton:hover {
+    background-color: #5E4507;
+    color: white;
+    /* remove OS focus indicator */
+    outline: none;
+  }
+  /* hover over checked effect */
+  WEffectSelector::item:checked:selected,
+  #fadeModeCombobox::item:checked:selected {
+    background-color: #2a1e03;
+    color: #fff;
+    }
+
+
+WEffectSelector,
+#fadeModeCombobox {
+  /* The 3D frame on the combo box becomes flat when you give it a border
+  border-radius: 3px; */
+  }
+  WEffectSelector {
+    /* 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: 0px 0px 2px 5px;
+    margin: 0px;
+  }
+  #fadeModeCombobox {
+    height: 19px;
+    padding: 0px 0px 1px 5px;
+    margin: 0px 1px 2px 1px;
+  }
+  WEffectSelector::down-arrow,
+  #fadeModeCombobox::down-arrow {
+    image: url(skin:/classic/buttons/btn__fx_selector_down.svg);
+    border: 0;
+    padding: 0;
+    margin: 0;
+    }
+    WEffectSelector::down-arrow:hover,
+    #fadeModeCombobox::down-arrow:hover {
+      image: url(skin:/classic/buttons/btn__fx_selector_down_pressed.svg);
+    }
+
+  WEffectSelector QAbstractScrollArea {
+    min-width: 160px;
+  }
+  #fadeModeCombobox QAbstractScrollArea {
+    min-width: 185px;
+  }
+  WEffectSelector::indicator:checked,
+  #fadeModeCombobox::indicator:checked {
+    /* checkbox container is 28 x 22px;
+      use margin + border to create a square checkbox sized like kill buttons */
+    margin: 2px;
+    image: url(skin:/classic/buttons/btn__lib_checkmark_orange.svg);
+  }
+  WEffectSelector::checked, /* selected item */
+  WEffectSelector::indicator, /* checkbox, tick mark */
+  WEffectSelector::drop-down,
+  WEffectSelector::indicator:!checked,
+  #fadeModeCombobox::checked, /* selected mode */
+  #fadeModeCombobox::indicator, /* checkbox, tick mark */
+  #fadeModeCombobox::drop-down,
+  #fadeModeCombobox::indicator:!checked,
+  WBeatSpinBox QMenu::item,
+  #LibraryContainer QMenu::item,
+  WCueMenuPopup QMenu::item,
+  WCoverArtMenu::item,
+  WTrackMenu::item,
+  WTrackMenu QMenu::item,
+  #LibraryContainer QMenu QCheckBox,
+  WTrackMenu QCheckBox,
+  WTrackMenu QMenu QCheckBox {
+      padding: 0px;
+      margin: 0px;
+      image: none;
+      outline: none;
+      border: 0px solid transparent;
+    }
+  WBeatSpinBox QMenu::separator,
+  #LibraryContainer QMenu::separator,
+  WCueMenuPopup QMenu::separator,
+  WTrackMenu::separator,
+  WTrackMenu QMenu::separator,
+  #SkinSettingsSeparator {
+    border-top: 1px solid #000;
+    border-bottom: 1px solid #222;
+    }
+    WBeatSpinBox QMenu::separator,
+    #LibraryContainer QMenu::separator,
+    WCueMenuPopup QMenu::separator,
+    WTrackMenu::separator,
+    WTrackMenu QMenu::separator {
+        height: 0px;
+        margin: 4px;
+      }
+    #SkinSettingsSeparator {
+      margin: 0px 4px 4px 4px;
+    }
+  WBeatSpinBox QMenu::item,
+  #LibraryContainer QMenu::item,
+  WCueMenuPopup QMenu::item,
+  WCoverArtMenu::item,
+  WTrackMenu::item,
+  WTrackMenu QMenu::item {
+  /* Right padding creates a margin to the menu expand arrow.
+    Left padding should be bigger than menu icon width + menu icon
+    left/right margin */
+    padding: 5px 12px 5px 26px;
+  }
+  /* Icons in QLineEdit menus:
+   beatsize spinbox, searchbox, editable track properties */
+  WBeatSpinBox QMenu::icon,
+  #LibraryContainer QMenu::icon,
+  WCueMenuPopup QMenu::icon,
+  WTrackMenu::icon,
+  WTrackMenu QMenu::icon,
+  /* checkbox in Crate name context menu:
+    "[ ] Auto DJ Track Source"  */
+  #LibraryContainer QMenu::indicator,
+  WTrackMenu::indicator,
+  WTrackMenu QMenu::indicator {
+    margin: 0px 4px 0px 5px;
+    }
+  /* items in Crate sub menu */
+  #LibraryContainer QMenu QCheckBox,
+  WTrackMenu QCheckBox,
+  WTrackMenu QMenu QCheckBox {
+    padding: 3px 10px 3px 5px;
+    }
+  #LibraryContainer QMenu QCheckBox::indicator,
+  #LibraryContainer QMenu::indicator,
+  WCueMenuPopup QMenu::indicator,
+  WTrackMenu QCheckBox::indicator,
+  WTrackMenu::indicator,
+  WTrackMenu QMenu QCheckBox::indicator,
+  WTrackMenu QMenu::indicator {
+    width: 13px;
+    height: 13px;
+    border: 1px solid #333;
+    border-radius: 1px;
+    background-color: #000;
+    /* remove OS focus indicator */
+    outline: none;
+    }
+  #LibraryContainer QMenu QCheckBox::indicator:checked,
+  #LibraryContainer QMenu::indicator:checked,
+  WTrackMenu QCheckBox::indicator:checked,
+  WTrackMenu::indicator:checked,
+  WTrackMenu QMenu QCheckBox::indicator:checked,
+  WTrackMenu QMenu::indicator:checked,
+  WCueMenuPopup QMenu::indicator:checked {
+    image: url(skin:/classic/buttons/btn__lib_checkmark_orange.svg);
+    }
+  /* disabled menu item and checkbox */
+  #LibraryContainer QMenu QCheckBox:!enabled,
+  #LibraryContainer QMenu::item:!enabled,
+  WTrackMenu QCheckBox:!enabled,
+  WTrackMenu::item:!enabled,
+  WTrackMenu QMenu QCheckBox:!enabled,
+  WTrackMenu QMenu::item:!enabled,
+  WCueMenuPopup QMenu::item:!enabled,
+  WCoverArtMenu::item:!enabled,
+  #LibraryContainer QMenu QCheckBox::indicator:!enabled,
+  WTrackMenu QCheckBox::indicator:!enabled,
+  WTrackMenu QMenu QCheckBox::indicator:!enabled {
+    color: #494949;
+    }
+  #LibraryContainer QMenu QCheckBox::indicator:!enabled:!checked,
+  #LibraryContainer QMenu::indicator:!enabled:!checked,
+  WTrackMenu QCheckBox::indicator:!enabled:!checked,
+  WTrackMenu::indicator:!enabled:!checked,
+  WTrackMenu QMenu QCheckBox::indicator:!enabled:!checked,
+  WTrackMenu QMenu::indicator:!enabled:!checked,
+  WCueMenuPopup QMenu::indicator:!enabled:!checked {
+    border: 1px solid #222;
+    background-color: #222;
+    }
+  #LibraryContainer QMenu QCheckBox::indicator:!enabled:checked,
+  WTrackMenu QCheckBox::indicator:!enabled:checked,
+  WTrackMenu QMenu QCheckBox::indicator:!enabled:checked {
+    image: url(skin:/classic/buttons/btn__lib_checkmark_grey.svg);
+    border: 1px solid #222;
+    background-color: #222;
+    }
+  #LibraryContainer QMenu QCheckBox::indicator:indeterminate,
+  #LibraryContainer QCheckBox::indicator:indeterminate:!enabled,
+  WTrackMenu QCheckBox::indicator:indeterminate,
+  WTrackMenu QMenu QCheckBox::indicator:indeterminate {
+    image: url(skin:/classic/buttons/btn__lib_checkmark_grey.svg);
+  }
+
+  #LibraryContainer QMenu::right-arrow,
+  WTrackMenu::right-arrow,
+  WTrackMenu QMenu::right-arrow {
+    width: 10px;
+    height: 10px;
+    image: url(skin:/classic/style/menu_arrow_yellow.svg);
+    }
+  #LibraryContainer QMenu::right-arrow:selected,
+  WTrackMenu::right-arrow:selected,
+  WTrackMenu QMenu::right-arrow:selected {
+    image: url(skin:/classic/style/menu_arrow_white.svg);
+  }
+
+  #LibraryContainer QHeaderView QMenu::indicator {
+    width: 10px;
+    height: 10px;
+    margin-left: 2px;
+    border: none;
+    background: none;
+    }
+    #LibraryContainer QHeaderView QMenu::indicator:checked {
+      image: url(skin:/classic/buttons/btn__lib_checkmark_orange.svg);
+    }
+/************** common styles for WEffectSelector ******************************
+*************** QSpinBox, QMenu, QToolTip *************************************/
diff --git a/res/skins/LateNight/style_classic/background_tile.xcf b/res/skins/LateNight/style_classic/background_tile.xcf
deleted file mode 100644
index e21fa430b0da..000000000000
Binary files a/res/skins/LateNight/style_classic/background_tile.xcf and /dev/null differ
diff --git a/res/skins/LateNight/style_classic/background_tile_BAK.png b/res/skins/LateNight/style_classic/background_tile_BAK.png
deleted file mode 100644
index 13af17ef6c7b..000000000000
Binary files a/res/skins/LateNight/style_classic/background_tile_BAK.png and /dev/null differ
diff --git a/res/skins/LateNight/style_classic/background_tile_blurred.png b/res/skins/LateNight/style_classic/background_tile_blurred.png
deleted file mode 100644
index ea2cb89fd4d4..000000000000
Binary files a/res/skins/LateNight/style_classic/background_tile_blurred.png and /dev/null differ
diff --git a/res/skins/LateNight/style_classic/background_tile_bright.png b/res/skins/LateNight/style_classic/background_tile_bright.png
deleted file mode 100644
index 5c1c279e9f85..000000000000
Binary files a/res/skins/LateNight/style_classic/background_tile_bright.png and /dev/null differ
diff --git a/res/skins/LateNight/style_classic/background_tile_checkers.svg b/res/skins/LateNight/style_classic/background_tile_checkers.svg
deleted file mode 100644
index 2472572bc2a4..000000000000
--- a/res/skins/LateNight/style_classic/background_tile_checkers.svg
+++ /dev/null
@@ -1,151 +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"
-   width="4"
-   height="4"
-   version="1.1"
-   id="svg6"
-   sodipodi:docname="background_tile_checkers.svg"
-   inkscape:export-filename="/home/ronso/Downloads/mixxx_source/src/0__skin_src/res/skins/LateNight/style/background_tile.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   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="true"
-     inkscape:zoom="45.254834"
-     inkscape:cx="2.812611"
-     inkscape:cy="3.2497541"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer2"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:object-nodes="true"
-     inkscape:object-paths="false"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-paths="true"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:snap-intersection-paths="true">
-    <sodipodi:guide
-       position="3.999,0.3564688"
-       orientation="1,0"
-       id="guide838"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="3.999,0.3564688"
-       orientation="0,1"
-       id="guide840"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="3.822,8.1774688"
-       orientation="-4,4"
-       id="guide844"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="8.1777344,4.1777344"
-       orientation="0.70710678,0.70710678"
-       id="guide846"
-       inkscape:locked="false"
-       inkscape:label=""
-       inkscape:color="rgb(0,0,255)" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid866" />
-  </sodipodi:namedview>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="bg">
-    <rect
-       style="display:inline;opacity:1;fill:#0a0a0a;fill-opacity:1;stroke:none;stroke-width:2.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke"
-       id="rect864"
-       width="4"
-       height="4"
-       x="0"
-       y="0" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="[ ]"
-     style="display:none;opacity:1"
-     transform="translate(0,-4)">
-    <g
-       id="g887"
-       style="display:inline;fill:#191919;fill-opacity:1"
-       transform="matrix(2,0,0,2,0,-8)">
-      <rect
-         y="6"
-         x="0"
-         height="1"
-         width="1"
-         id="rect868"
-         style="opacity:1;fill:#191919;fill-opacity:1;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
-      <rect
-         y="7"
-         x="1"
-         height="1"
-         width="1"
-         id="rect868-3"
-         style="display:inline;opacity:1;fill:#191919;fill-opacity:1;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="o"
-     style="display:inline">
-    <g
-       transform="translate(0,-4)"
-       style="display:inline;fill:#212121;fill-opacity:1"
-       id="g825">
-      <circle
-         r="1"
-         cy="5"
-         cx="1"
-         id="path889"
-         style="opacity:1;fill:#212121;fill-opacity:1;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
-      <circle
-         r="1"
-         cy="7"
-         cx="3"
-         id="path889-6"
-         style="display:inline;opacity:1;fill:#212121;fill-opacity:1;stroke:none;stroke-width:1.10000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:fill markers stroke" />
-    </g>
-  </g>
-</svg>
diff --git a/res/skins/LateNight/style_classic/background_tile_cross_INV.png b/res/skins/LateNight/style_classic/background_tile_cross_INV.png
deleted file mode 100644
index 30480ffce237..000000000000
Binary files a/res/skins/LateNight/style_classic/background_tile_cross_INV.png and /dev/null differ
diff --git a/res/skins/LateNight/style_classic/background_tile_crossblur.png b/res/skins/LateNight/style_classic/background_tile_crossblur.png
deleted file mode 100644
index f75d729905eb..000000000000
Binary files a/res/skins/LateNight/style_classic/background_tile_crossblur.png and /dev/null differ
diff --git a/res/skins/LateNight/style_classic/background_tile_crossblur_brighter.png b/res/skins/LateNight/style_classic/background_tile_crossblur_brighter.png
deleted file mode 100644
index f75d729905eb..000000000000
Binary files a/res/skins/LateNight/style_classic/background_tile_crossblur_brighter.png and /dev/null differ
diff --git a/res/skins/LateNight/style_classic/background_tile_fx_focus.png b/res/skins/LateNight/style_classic/background_tile_fx_focus.png
deleted file mode 100644
index 868510cf81d3..000000000000
Binary files a/res/skins/LateNight/style_classic/background_tile_fx_focus.png and /dev/null differ
diff --git a/res/skins/LateNight/style_classic/background_tile_mokka.png b/res/skins/LateNight/style_classic/background_tile_mokka.png
deleted file mode 100644
index 5c1c279e9f85..000000000000
Binary files a/res/skins/LateNight/style_classic/background_tile_mokka.png and /dev/null differ
diff --git a/res/skins/LateNight/style_classic/background_tile_slashcross.png b/res/skins/LateNight/style_classic/background_tile_slashcross.png
deleted file mode 100644
index 9451ba6ebcba..000000000000
Binary files a/res/skins/LateNight/style_classic/background_tile_slashcross.png and /dev/null differ
diff --git a/res/skins/LateNight/style_classic/background_tile_slashes_NEW.png b/res/skins/LateNight/style_classic/background_tile_slashes_NEW.png
deleted file mode 100644
index 3e1c32718aac..000000000000
Binary files a/res/skins/LateNight/style_classic/background_tile_slashes_NEW.png and /dev/null differ
diff --git a/res/skins/LateNight/style_classic/background_tile_weave.svg b/res/skins/LateNight/style_classic/background_tile_weave.svg
deleted file mode 100644
index e0d2e640da6e..000000000000
--- a/res/skins/LateNight/style_classic/background_tile_weave.svg
+++ /dev/null
@@ -1,445 +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"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="12"
-   height="12"
-   version="1.1"
-   id="svg6"
-   sodipodi:docname="background_tile_weave.svg"
-   inkscape:export-filename="/home/ronso/Downloads/mixxx_source/src/0__skin_src/res/skins/LateNight/style/background_tile.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96"
-   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">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient937">
-      <stop
-         id="stop935"
-         offset="0"
-         style="stop-color:#2c2c2c;stop-opacity:1" />
-      <stop
-         id="stop933"
-         offset="1"
-         style="stop-color:#040404;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient854-0"
-       inkscape:collect="always">
-      <stop
-         id="stop850"
-         offset="0"
-         style="stop-color:#040404;stop-opacity:1" />
-      <stop
-         id="stop852"
-         offset="1"
-         style="stop-color:#2c2c2c;stop-opacity:1" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient854-0"
-       id="radialGradient1973"
-       cx="6"
-       cy="2"
-       fx="6"
-       fy="2"
-       r="2.1777344"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4994748,0,0,1.4994749,-2.9993479,-0.99645104)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient854-0"
-       id="radialGradient1981"
-       cx="2"
-       cy="6"
-       fx="2"
-       fy="6"
-       r="2.1777344"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4994748,0,0,1.4994749,0,-3.9957991)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient854-0"
-       id="radialGradient2017"
-       cx="3.9977343"
-       cy="4.0002656"
-       fx="3.9977343"
-       fy="4.0002656"
-       r="2.1777344"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4994748,0,0,1.4994749,-2.9989496,-6.9947489)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient854-0"
-       id="radialGradient2019"
-       cx="7.9977345"
-       cy="8.0002661"
-       fx="7.9977345"
-       fy="8.0002661"
-       r="2.1777346"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4994748,0,0,1.4994749,-2.9989496,-6.9947489)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient937"
-       id="radialGradient2027"
-       cx="5.9977345"
-       cy="6.0002656"
-       fx="5.9977345"
-       fy="6.0002656"
-       r="2.1777344"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4994748,0,0,1.4994749,0,-3.9957991)" />
-    <radialGradient
-       gradientTransform="matrix(1.4994748,0,0,1.4994749,5.9978992,-9.9936987)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient854-0"
-       id="radialGradient1981-2"
-       cx="2"
-       cy="6"
-       fx="2"
-       fy="6"
-       r="2.1777344"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient854-0"
-       id="radialGradient848"
-       cx="2"
-       cy="6"
-       fx="2"
-       fy="6"
-       r="2.1777344"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4994748,0,0,1.4994749,-2.9993479,-0.99645104)" />
-    <radialGradient
-       gradientTransform="matrix(1.4994748,0,0,1.4994749,2.9985513,-6.9943506)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient854-0"
-       id="radialGradient1973-3"
-       cx="6"
-       cy="2"
-       fx="6"
-       fy="2"
-       r="2.1777344"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient937"
-       id="radialGradient2027-9"
-       cx="5.9977345"
-       cy="6.0002656"
-       fx="5.9977345"
-       fy="6.0002656"
-       r="2.1777344"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4994748,0,0,1.4994749,-5.9963997,-9.9921992)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient854-0"
-       id="radialGradient1027"
-       gradientUnits="userSpaceOnUse"
-       cx="2"
-       cy="6"
-       fx="2"
-       fy="6"
-       r="2.1777344"
-       gradientTransform="matrix(1.4994748,0,0,1.4994749,0,-3.9957991)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient854-0"
-       id="radialGradient1029"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4994748,0,0,1.4994749,-2.9993479,-0.99645104)"
-       cx="2"
-       cy="6"
-       fx="2"
-       fy="6"
-       r="2.1777344" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient854-0"
-       id="radialGradient1031"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4994748,0,0,1.4994749,5.9978992,-9.9936987)"
-       cx="2"
-       cy="6"
-       fx="2"
-       fy="6"
-       r="2.1777344" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient854-0"
-       id="radialGradient1033"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4994748,0,0,1.4994749,-2.9993479,-0.99645104)"
-       cx="6"
-       cy="2"
-       fx="6"
-       fy="2"
-       r="2.1777344" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient854-0"
-       id="radialGradient1035"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4994748,0,0,1.4994749,-2.9989496,-6.9947489)"
-       cx="3.9977343"
-       cy="4.0002656"
-       fx="3.9977343"
-       fy="4.0002656"
-       r="2.1777344" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient854-0"
-       id="radialGradient1037"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4994748,0,0,1.4994749,-2.9989496,-6.9947489)"
-       cx="7.9977345"
-       cy="8.0002661"
-       fx="7.9977345"
-       fy="8.0002661"
-       r="2.1777346" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient937"
-       id="radialGradient1039"
-       gradientUnits="userSpaceOnUse"
-       cx="5.9977345"
-       cy="6.0002656"
-       fx="5.9977345"
-       fy="6.0002656"
-       r="2.1777344"
-       gradientTransform="matrix(1.4994748,0,0,1.4994749,0,-3.9957991)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient854-0"
-       id="radialGradient1041"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4994748,0,0,1.4994749,2.9985513,-6.9943506)"
-       cx="6"
-       cy="2"
-       fx="6"
-       fy="2"
-       r="2.1777344" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient937"
-       id="radialGradient1043"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4994748,0,0,1.4994749,-5.9963997,-9.9921992)"
-       cx="5.9977345"
-       cy="6.0002656"
-       fx="5.9977345"
-       fy="6.0002656"
-       r="2.1777344" />
-  </defs>
-  <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="true"
-     inkscape:zoom="16"
-     inkscape:cx="0.038765462"
-     inkscape:cy="8.9946397"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1"
-     inkscape:snap-page="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true"
-     inkscape:object-nodes="true"
-     inkscape:object-paths="false"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     inkscape:bbox-paths="true"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:snap-intersection-paths="true">
-    <sodipodi:guide
-       position="3.999,0.3564688"
-       orientation="1,0"
-       id="guide838"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="3.999,0.3564688"
-       orientation="0,1"
-       id="guide840"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="3.822,8.1774688"
-       orientation="-4,4"
-       id="guide844"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="8.1777344,4.1777344"
-       orientation="0.70710678,0.70710678"
-       id="guide846"
-       inkscape:locked="false"
-       inkscape:label=""
-       inkscape:color="rgb(0,0,255)" />
-  </sodipodi:namedview>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="/"
-     style="display:inline"
-     transform="translate(0,4)">
-    <rect
-       y="-3.9957991"
-       x="-8.8244562e-10"
-       style="fill:#0c0a0b;fill-opacity:1;stroke-width:1.49947488"
-       id="rect965"
-       height="11.995799"
-       width="11.995798" />
-    <rect
-       width="11.995798"
-       height="11.995799"
-       id="rect2"
-       style="fill:#101010;fill-opacity:1;stroke-width:1.49947488"
-       x="-8.8244562e-10"
-       y="-3.9957991" />
-    <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:url(#radialGradient1027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.74973744;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 -0.53301649,2.0021005 0,1.469084 6.5279168,8.0000001 5.9963997,8.5315172 Z"
-       id="path4-3-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <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:url(#radialGradient1029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.74973744;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 3.2650596,5.2679568 2.7320431,4.7349403 -3.2658561,10.73284 l 0.5330165,0.533016 z"
-       id="path4-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <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:url(#radialGradient1031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.74973744;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 5.4633832,-3.9942996 5.9963997,-4.5273162 12.527315,2.000601 11.994299,2.5336176 Z"
-       id="path4-3-5-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <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:url(#radialGradient1033);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.74973744;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 2.7320431,4.7349403 3.2650596,5.2679568 9.2629588,-0.72994277 8.7299423,-1.2629593 Z"
-       id="path4-3-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <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:url(#radialGradient1035);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.74973744;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 -0.26990546,-3.7288926 0.26311104,-4.2619091 6.2610102,1.7359905 5.7279937,2.269007 Z"
-       id="path4-3-5-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <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:url(#radialGradient1037);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.74973744;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 5.7279937,2.269007 6.2610102,1.7359905 12.25891,7.7338898 11.725893,8.2669066 Z"
-       id="path4-3-5-2-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <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:url(#radialGradient1039);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.74973744;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 5.9963997,7.4654841 6.5294162,7.9985006 11.994299,2.5336176 11.461282,2.000601 Z"
-       id="path4-3-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <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:url(#radialGradient1041);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.74973744;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 8.7299423,-1.2629593 9.2629588,-0.72994277 15.260858,-6.7278424 14.727842,-7.2608589 Z"
-       id="path4-3-3-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <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:url(#radialGradient1043);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.74973744;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 0,1.469084 0.53301651,2.0021005 5.9978992,-3.4627826 5.4648827,-3.9957991 Z"
-       id="path4-3-6-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
-       id="path967"
-       d="M -0.53301649,2.0021005 0,1.469084 6.5279168,8.0000001 5.9963997,8.5315172 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(#radialGradient1981);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.74973744;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
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
-       id="path969"
-       d="M 3.2650596,5.2679568 2.7320431,4.7349403 -3.2658561,10.73284 l 0.5330165,0.533016 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(#radialGradient848);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.74973744;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
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
-       id="path971"
-       d="M 5.4633832,-3.9942996 5.9963997,-4.5273162 12.527315,2.000601 11.994299,2.5336176 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(#radialGradient1981-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.74973744;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
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
-       id="path973"
-       d="M 2.7320431,4.7349403 3.2650596,5.2679568 9.2629588,-0.72994277 8.7299423,-1.2629593 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(#radialGradient1973);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.74973744;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
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
-       id="path975"
-       d="M -0.26990546,-3.7288926 0.26311104,-4.2619091 6.2610102,1.7359905 5.7279937,2.269007 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(#radialGradient2017);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.74973744;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
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
-       id="path977"
-       d="M 5.7279937,2.269007 6.2610102,1.7359905 12.25891,7.7338898 11.725893,8.2669066 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(#radialGradient2019);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.74973744;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
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
-       id="path979"
-       d="M 5.9963997,7.4654841 6.5294162,7.9985006 11.994299,2.5336176 11.461282,2.000601 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(#radialGradient2027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.74973744;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
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
-       id="path981"
-       d="M 8.7299423,-1.2629593 9.2629588,-0.72994277 15.260858,-6.7278424 14.727842,-7.2608589 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(#radialGradient1973-3);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.74973744;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
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
-       id="path983"
-       d="M 0,1.469084 0.53301651,2.0021005 5.9978992,-3.4627826 5.4648827,-3.9957991 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(#radialGradient2027-9);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.74973744;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
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="\"
-     transform="translate(0,4)" />
-</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
deleted file mode 100644
index 63a3e089bd98..000000000000
--- a/res/skins/LateNight/style_classic/btn__fx_focus_off.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-<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
deleted file mode 100644
index a409dff62d5f..000000000000
--- a/res/skins/LateNight/style_classic/btn__fx_focus_on.svg
+++ /dev/null
@@ -1,152 +0,0 @@
-<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_classic/latency_bg.png b/res/skins/LateNight/style_classic/latency_bg.png
deleted file mode 100644
index c3d120b33147..000000000000
Binary files a/res/skins/LateNight/style_classic/latency_bg.png and /dev/null differ
diff --git a/res/skins/LateNight/style_classic/latency_bg.svg b/res/skins/LateNight/style_classic/latency_bg.svg
deleted file mode 100644
index c1a4a3d49abb..000000000000
--- a/res/skins/LateNight/style_classic/latency_bg.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg3248" width="63" height="7" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="rect5103" d="m0 0v7h63v-7zm1 1h61v5h-61z" color="#000000" fill="#0f0f0f"/></svg>
diff --git a/res/skins/LateNight/style_classic/latency_over.png b/res/skins/LateNight/style_classic/latency_over.png
deleted file mode 100644
index 805a1ca23dff..000000000000
Binary files a/res/skins/LateNight/style_classic/latency_over.png and /dev/null differ
diff --git a/res/skins/LateNight/style_classic/latency_over.svg b/res/skins/LateNight/style_classic/latency_over.svg
deleted file mode 100644
index 5f7a98aeac42..000000000000
--- a/res/skins/LateNight/style_classic/latency_over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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_classic/mixxx_logo_small.svg b/res/skins/LateNight/style_classic/mixxx_logo_small.svg
deleted file mode 100644
index 4113679a2eea..000000000000
--- a/res/skins/LateNight/style_classic/mixxx_logo_small.svg
+++ /dev/null
@@ -1,55 +0,0 @@
-<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_classic/spinny1_mask.svg b/res/skins/LateNight/style_classic/spinny1_mask.svg
deleted file mode 100644
index b91ba7507453..000000000000
--- a/res/skins/LateNight/style_classic/spinny1_mask.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index b91ba7507453..000000000000
--- a/res/skins/LateNight/style_classic/spinny2_mask.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index 8670bf69176d..000000000000
--- a/res/skins/LateNight/style_classic/spinny3_mask.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index 8670bf69176d..000000000000
--- a/res/skins/LateNight/style_classic/spinny4_mask.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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/spinny_indicator.svg b/res/skins/LateNight/style_classic/spinny_indicator.svg
deleted file mode 100644
index a7a130439a55..000000000000
--- a/res/skins/LateNight/style_classic/spinny_indicator.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<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
deleted file mode 100644
index e825c25e47e5..000000000000
--- a/res/skins/LateNight/style_classic/spinny_indicator_ghost.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<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_classic/splitter_handle_checked.png b/res/skins/LateNight/style_classic/splitter_handle_checked.png
deleted file mode 100644
index 1635a9601973..000000000000
Binary files a/res/skins/LateNight/style_classic/splitter_handle_checked.png and /dev/null differ
diff --git a/res/skins/LateNight/style_classic/splitter_handle_horizontal_unchecked.svg b/res/skins/LateNight/style_classic/splitter_handle_horizontal_unchecked.svg
deleted file mode 100644
index 107935a6d03f..000000000000
--- a/res/skins/LateNight/style_classic/splitter_handle_horizontal_unchecked.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<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_classic/splitter_handle_unchecked.png b/res/skins/LateNight/style_classic/splitter_handle_unchecked.png
deleted file mode 100644
index 2d1f1de98979..000000000000
Binary files a/res/skins/LateNight/style_classic/splitter_handle_unchecked.png and /dev/null differ
diff --git a/res/skins/LateNight/style_classic/vu_level_sampler.png b/res/skins/LateNight/style_classic/vu_level_sampler.png
deleted file mode 100644
index 901712c3b138..000000000000
Binary files a/res/skins/LateNight/style_classic/vu_level_sampler.png and /dev/null 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
deleted file mode 100644
index 7d2ff651b617..000000000000
Binary files a/res/skins/LateNight/style_classic/vu_level_sampler_over.png and /dev/null differ
diff --git a/res/skins/LateNight/style_flip.qss b/res/skins/LateNight/style_flip.qss
deleted file mode 100644
index 14525757ccdb..000000000000
--- a/res/skins/LateNight/style_flip.qss
+++ /dev/null
@@ -1,1146 +0,0 @@
-/* LateNight 2.3 */
-
-/************** Backgrounds, 3D borders & margins *****************************
-************** of major GUI containers **************************************/
-
-
-#SkinContainer,
-#CrossfaderButtonContainerDeck, #CrossfaderButtonContainerAux,
-#CrossfaderButton[value="0"],
-#fadeModeCombobox,
-#LibraryContainer QTableView,
-#LibraryContainer QTextBrowser,
-#LibraryContainer QTreeView {
-  background-color: #1e1e1d;
-  selection-color: #000;
-}
-WEffectSelector QAbstractItemView,
-WEffectSelector::item,
-#fadeModeCombobox QAbstractItemView,
-#fadeModeCombobox::item,
-QToolTip {
-  background-color: #050504;
-}
-
-#CueLabelEdit {
-  border: 1px solid #ffaa00;
-}
-
-
-
-
-/************** Label styles **************************************************/
-
-/* 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,
-WBeatSpinBox QMenu,
-#LibraryContainer QMenu,
-#LibraryContainer QMenu QCheckBox,
-WTrackMenu,
-WTrackMenu QCheckBox,
-WTrackMenu QMenu,
-WTrackMenu QMenu QCheckBox,
-WCoverArtMenu,
-WCueMenuPopup,
-WCueMenuPopup QMenu,
-WCueMenuPopup QLabel,
-#CueLabelEdit,
-WLibrary QTableView::indicator,
-WSearchLineEdit,
-#LibraryBPMSpinBox,
-#LibraryBPMButton::item,
-#LibraryContainer QTableView,
-#LibraryContainer QTextBrowser,
-#LibraryContainer QTreeView,
-#LatencyLabel, WTime {
-  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';
-    }
-  /* hovered items */
-  WEffectSelector::item:selected,
-  #fadeModeCombobox::item:selected,
-  WBeatSpinBox QMenu::item:selected,
-  #LibraryContainer QMenu::item:selected,
-  WCoverArtMenu::item:selected,
-  WTrackMenu::item:selected,
-  WTrackMenu QMenu::item:selected,
-  WTrackMenu QCheckBox:selected,
-  WTrackMenu QCheckBox:focus,
-  WTrackMenu QCheckBox:hover,
-  WTrackMenu QMenu QCheckBox:selected,
-  WTrackMenu QMenu QCheckBox:focus,
-  WTrackMenu QMenu QCheckBox:hover,
-  #LibraryContainer QMenu QCheckBox:selected,
-  #LibraryContainer QMenu QCheckBox:focus,  /* selected by keyboard */
-  #LibraryContainer QMenu QCheckBox:hover /* mouse hover */ {
-    background-color: #c88500;
-    color: #000;
-    /* remove OS focus indicator */
-    outline: none;
-  }
-  #SkinSettingsButton:hover,
-  #SkinSettingsLabelButton:hover {
-    border: 1px solid #c88500;
-    background-color: #050504;
-  }
-  #LibraryContainer QMenu::right-arrow,
-  WTrackMenu::right-arrow,
-  WTrackMenu QMenu::right-arrow {
-    image: url(skin:/style_classic/menu_arrow_gold.svg);
-    }
-  #LibraryContainer QMenu::right-arrow:selected,
-  WTrackMenu::right-arrow:selected,
-  WTrackMenu QMenu::right-arrow:selected {
-    image: url(skin:/style_classic/menu_arrow_black.svg);
-  }
-/* BPM lock icon */
-#LibraryBPMButton::indicator:checked:selected {
-  image: url(skin:/buttons_classic/btn__lib_bpm_locked_black.svg);
-  }
-  #LibraryBPMButton::indicator:unchecked:selected {
-    image: url(skin:/buttons_classic/btn__lib_bpm_unlocked_black.svg);
-  }
-  /* checkbox in library "Played" column */
-  #LibraryContainer QTableView::indicator:unchecked:selected,
-  #LibraryContainer QTableView::indicator:checked:selected {
-    border: 1px solid #000;
-    }
-  #LibraryContainer QTableView::indicator:checked:selected {
-    image: url(skin:/buttons_classic/btn__lib_checkmark_black.svg);
-    }
-  #LibraryContainer QTableView::indicator:checked:!selected {
-    image: url(skin:/buttons_classic/btn__lib_checkmark_orange.svg);
-    }
-/************** Label styles **************************************************/
-
-/* 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 #444;
-  border-left: 1px solid #444;
-  border-bottom: 1px solid #000;
-  border-right: 1px solid #000;
-  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 #333;
-  border-right: 1px solid #333;
-/* 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,
-#PlaySampler[displayValue="0"], #PlayDeckMini[displayValue="0"],
-#SamplerSyncButton[displayValue="0"],
-#MicTalk[value="0"], #PlayAux[value="0"], #MicAuxAddButton,
-#MicDuckingButton[value="0"],
-#PlayPreview[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,
-#FxAssignButton[displayValue="0"], #FxFocusButton[displayValue="0"],
-#FxToggleButton[displayValue="0"], #FxParameterButton[displayValue="0"],
-#SplitCueButton[value="0"],
-#MicAuxGainPFlContainer WPushButton[displayValue="0"] {
-  background-color: #2c2c2c;
-}
-
-#SkinSettingsButton {
-  color: #bbb;
-}
-#SkinSettingsCategory {
-  border-width: 0px;
-  }
-
-WBeatSpinBox#Spinbox_embedded:focus,
-#DlgAutoDJ QSpinBox:focus {
-  border-image: url(skin:buttons_flip/spinbox_embedded_border_focus_blue.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;
-  }
-
-#PlaySampler[value="0"],
-#PlayDeckMini[value="0"],
-#PlayPreview[displayValue="0"] {
-  image: url(skin:/buttons_flip/btn__play_sampler.svg) no-repeat center center;
-  }
-  #PlaySampler[value="1"],
-  #PlayDeckMini[value="1"],
-  #PlayPreview[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;
-    }
-    #HotcuesEarlier {
-      image: url(skin:/buttons_classic/btn__hotcues_earlier.svg) no-repeat center center;
-    }
-    #HotcuesLater {
-      image: url(skin:/buttons_classic/btn__hotcues_later.svg) no-repeat center center;
-    }
-
-#MicTalk {
-  image: url(skin:/buttons_flip/btn__mic_talk.svg) no-repeat center center;
-}
-#PlayAux {
-  image: url(skin:/buttons_flip/btn__aux_play.svg) no-repeat center center;
-}
-#MicAuxAddButton {
-  image: url(skin:/buttons_flip/btn__plus.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_blue.svg);
-  }
-/************** Button icons **************************************************/
-
-
-
-/************** 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: 2px 2px 2px 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;
-}
-
-#MicAuxRackFiller {
-  margin: 2px 0px;
-}
-
-  #MicAuxPlayBox {
-    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: 5px;
-  }
-
-/************** 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 {
-/* only 1px padding to compensate the 2px border of inner widgets
-  (QTreeView, QTableView, QTextBrowser) */
-  padding: 1px 1px 0px 1px;
-  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;
-}
-#SearchLineBox {
-/* only 1px padding to compensate the 2px border of WSearchLineEdit */
-  padding: 1px;
-}
-
-/* 2px border gradient fakes 1px padding + 1px border to appear like
-  1px border but reserve space for 2px border when focused */
-#LibraryContainer QTreeView,
-#LibraryContainer QTextBrowser,
-#LibraryContainer QTableView,
-WSearchLineEdit {
-  border-top: 2px solid qlineargradient(
-    x1:0, y1:0, x2:0, y2:1,
-    stop:0 #0f0f0e,
-    stop:0.49 #0f0f0e,
-    stop:0.5 #000,
-    stop:1 #000);
-  border-right: 2px solid qlineargradient(
-    x1:0, y1:0, x2:1, y2:0,
-    stop:0 #222,
-    stop:0.49 #222,
-    stop:0.5 #0f0f0e,
-    stop:1 #0f0f0e);
-  border-bottom: 2px solid qlineargradient(
-    x1:0, y1:1, x2:0, y2:0,
-    stop:0 #0f0f0e,
-    stop:0.49 #0f0f0e,
-    stop:0.5 #000,
-    stop:1 #000);
-  border-left: 2px solid qlineargradient(
-    x1:0, y1:0, x2:1, y2:0,
-    stop:0 #0f0f0e,
-    stop:0.49 #0f0f0e,
-    stop:0.5 #000,
-    stop:1 #000);
-  background-color: #050504;
-  alternate-background-color: #0f0f0e;
-  selection-background-color: #5e4507;
-}
-
-/* Flat, dark table headers with dimmed text */
-#LibraryContainer QHeaderView,
-#LibraryContainer QHeaderView::section,
-#LibraryContainer QHeaderView::up-arrow,
-#LibraryContainer QHeaderView::down-arrow {
-  background-color: #0f0f0e;
-  color: #999;
-}
-
-#LibraryContainer QTableView:focus,
-#LibraryContainer QTreeView:focus,
-WSearchLineEdit:focus {
-  border: 2px solid #009fb4;
-}
-
-#LibraryContainer QHeaderView::up-arrow,
-#LibraryContainer QHeaderView::down-arrow {
-  width: 13px;
-}
-#LibraryContainer QHeaderView::up-arrow {
-  image: url(skin:/buttons_classic/btn__lib_sort_up.svg);
-  }
-#LibraryContainer 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;
-}
-
-/* adjust pposition of Library featurecontrols */
-#DlgMissing > QPushButton,
-#DlgHidden > QPushButton,
-#DlgAutoDJ > QPushButton,
-#DlgRecording > QPushButton,
-#DlgAnalysis > QPushButton,
-#fadeModeCombobox,
-#spinBoxTransition {
-  margin-top: 1px;
-  margin-bottom: 2px;
-  }
-  QPushButton#pushButtonAutoDJ {
-    margin-left: 2px;
-  }
-
-/* selected items in Tracks table */
-#LibraryContainer QTableView::item:selected,
-#LibraryBPMButton::item:selected {
-  color: #000;
-  selection-color: #000;
-  background-color: #aa7100;
-}
-/* Match border color of table cell in edit mode and Preview button */
-WLibrary QLineEdit,
-#LibraryBPMSpinBox,
-#LibraryPreviewButton:!checked:hover,
-#LibraryPreviewButton:checked:hover,
-#LibraryPreviewButton:checked {
-  border: 1px solid #aa7100;
-}
-
-#LibraryBPMSpinBox::up-button,
-#LibraryBPMSpinBox::down-button {
-  background-color: #aa7100;
-  }
-  #LibraryBPMSpinBox::up-button {
-    image: url(skin:/buttons_classic/btn__lib_spinbox_up_black.svg) no-repeat;
-    }
-  #LibraryBPMSpinBox::down-button {
-    image: url(skin:/buttons_classic/btn__lib_spinbox_down_black.svg) no-repeat;
-    }
-
-/* selected items in sidebar tree */
-#LibraryContainer QTreeView::item:selected {
-  color: #fff;
-  selection-color: #fff;
-  background-color: transparent;
-  border: 1px solid #ffaa00;
-}
-
-/* icons for closed/opened branches in treeview */
-/* closed, selected */
-#LibraryContainer QTreeView::branch:closed:has-children:!has-siblings:!selected,
-#LibraryContainer QTreeView::branch:closed:has-children:has-siblings:!selected {
-/*  Suppresses that selected sidebar items branch indicator shows wrong color when out of focus ; lp:880588 */
-  border-image: none;
-  image: url(skin:/style_classic/library_branch_closed_grey.png);
-  background-color: #050504;
-  }
-  /* closed, selected */
-  #LibraryContainer QTreeView::branch:closed:has-children:!has-siblings:selected,
-  #LibraryContainer QTreeView::branch:closed:has-children:has-siblings:selected {
-    border-image: none;
-    image: url(skin:/style_classic/library_branch_closed_selected_black.png);
-    background-color: #ffaa00;
-  }
-#LibraryContainer QTreeView::branch:open:has-children:!has-siblings,
-#LibraryContainer QTreeView::branch:open:has-children:has-siblings {
-  border-image: none;
-  image: url(skin:/style_classic/library_branch_open_grey.png);
-  }
-  /* open, selected */
-  #LibraryContainer QTreeView::branch:open:has-children:!has-siblings:selected,
-  #LibraryContainer QTreeView::branch:open:has-children:has-siblings:selected {
-    border-image: none;
-    image: url(skin:/style_classic/library_branch_open_selected_black.png);
-    background-color: #ffaa00;
-  }
-  /* space left of selected child item */
-  #LibraryContainer QTreeView::branch:closed:!has-children:!has-siblings:selected,
-  #LibraryContainer QTreeView::branch:closed:!has-children:has-siblings:selected,
-  #LibraryContainer QTreeView::branch:open:!has-children:!has-siblings:selected,
-  #LibraryContainer QTreeView::branch:open:!has-children:has-siblings:selected {
-    border-image: none;
-    background-color: #050504;
-  }
-
-/* Scrollbars */
-#LibraryContainer QScrollBar,
-WEffectSelector QAbstractScrollArea QScrollBar {
-  padding: 0px;
-  }
-  #LibraryContainer QScrollBar::handle:horizontal,
-  #LibraryContainer QScrollBar::handle:vertical,
-  WEffectSelector QAbstractScrollArea QScrollBar::handle:horizontal,
-  WEffectSelector QAbstractScrollArea QScrollBar::handle:vertical {
-    /*
-    background: qlineargradient(x1:0, y1:0, x2:0, y2:1,
-      stop:0 #725309,
-      stop:1 #412f05);*/
-    background-color: #555;
-    border-top: 1px solid #888;
-    border-left: 1px solid #888;
-    border-bottom: 1px solid #222;
-    border-right: 1px solid #222;
-    border-radius: 1px;
-  }
-
-/* "add-page" and "sub-page" are the gutter of the scrollbar */
-#LibraryContainer QScrollBar::add-page,
-#LibraryContainer QScrollBar::sub-page,
-WEffectSelector QAbstractScrollArea QScrollBar::add-page,
-WEffectSelector QAbstractScrollArea QScrollBar::sub-page {
-  background-color: #000;
-}
-
-/* Corner in between two scrollbars */
-#LibraryContainer QAbstractScrollArea::corner {
-  background-color: #0f0f0e;
-}
-
-/************** Library *******************************************************/
diff --git a/res/skins/LateNight/style_flip/background_border.svg b/res/skins/LateNight/style_flip/background_border.svg
deleted file mode 100644
index 919326852268..000000000000
--- a/res/skins/LateNight/style_flip/background_border.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index 1ae4d399600e..000000000000
--- a/res/skins/LateNight/style_flip/batt/ic_battery_charged.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<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
deleted file mode 100644
index a3614955513a..000000000000
--- a/res/skins/LateNight/style_flip/batt/ic_battery_charging_0.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<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
deleted file mode 100644
index 50830d115f36..000000000000
--- a/res/skins/LateNight/style_flip/batt/ic_battery_charging_1.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<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
deleted file mode 100644
index 18fee209f34d..000000000000
--- a/res/skins/LateNight/style_flip/batt/ic_battery_charging_2.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<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
deleted file mode 100644
index bb4d8fbb5e38..000000000000
--- a/res/skins/LateNight/style_flip/batt/ic_battery_charging_3.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<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
deleted file mode 100644
index e99b266351cb..000000000000
--- a/res/skins/LateNight/style_flip/batt/ic_battery_charging_4.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<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
deleted file mode 100644
index b92c064bfb1d..000000000000
--- a/res/skins/LateNight/style_flip/batt/ic_battery_charging_5.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<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
deleted file mode 100644
index 5bfd6f0080db..000000000000
--- a/res/skins/LateNight/style_flip/batt/ic_battery_charging_6.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<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
deleted file mode 100644
index 87c47e72bd69..000000000000
--- a/res/skins/LateNight/style_flip/batt/ic_battery_charging_7.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<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
deleted file mode 100644
index 28e29535c673..000000000000
--- a/res/skins/LateNight/style_flip/batt/ic_battery_discharging_0.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<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
deleted file mode 100644
index c5989b75a357..000000000000
--- a/res/skins/LateNight/style_flip/batt/ic_battery_discharging_1.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<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
deleted file mode 100644
index 22f78b69e965..000000000000
--- a/res/skins/LateNight/style_flip/batt/ic_battery_discharging_2.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<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
deleted file mode 100644
index 150c1fb9bb21..000000000000
--- a/res/skins/LateNight/style_flip/batt/ic_battery_discharging_3.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<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
deleted file mode 100644
index f4745d4bec19..000000000000
--- a/res/skins/LateNight/style_flip/batt/ic_battery_discharging_4.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<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
deleted file mode 100644
index b477bee1df85..000000000000
--- a/res/skins/LateNight/style_flip/batt/ic_battery_discharging_5.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<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
deleted file mode 100644
index 5ac8e715efbd..000000000000
--- a/res/skins/LateNight/style_flip/batt/ic_battery_discharging_6.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<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
deleted file mode 100644
index 2505b6edbe48..000000000000
--- a/res/skins/LateNight/style_flip/batt/ic_battery_discharging_7.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<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/btn__fx_focus_off.svg b/res/skins/LateNight/style_flip/btn__fx_focus_off.svg
deleted file mode 100644
index 63a3e089bd98..000000000000
--- a/res/skins/LateNight/style_flip/btn__fx_focus_off.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-<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
deleted file mode 100644
index a409dff62d5f..000000000000
--- a/res/skins/LateNight/style_flip/btn__fx_focus_on.svg
+++ /dev/null
@@ -1,152 +0,0 @@
-<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
deleted file mode 100644
index 85a8f9726a3e..000000000000
Binary files a/res/skins/LateNight/style_flip/btn_lib_sort_down.png and /dev/null 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
deleted file mode 100644
index ae53038219a0..000000000000
Binary files a/res/skins/LateNight/style_flip/btn_lib_sort_up.png and /dev/null differ
diff --git a/res/skins/LateNight/style_flip/cover_default.svg b/res/skins/LateNight/style_flip/cover_default.svg
deleted file mode 100644
index 020d7aab7a18..000000000000
--- a/res/skins/LateNight/style_flip/cover_default.svg
+++ /dev/null
@@ -1,62 +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: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
deleted file mode 100644
index c3d120b33147..000000000000
Binary files a/res/skins/LateNight/style_flip/latency_bg.png and /dev/null differ
diff --git a/res/skins/LateNight/style_flip/latency_bg.svg b/res/skins/LateNight/style_flip/latency_bg.svg
deleted file mode 100644
index f7327adf15cc..000000000000
--- a/res/skins/LateNight/style_flip/latency_bg.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<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
deleted file mode 100644
index 805a1ca23dff..000000000000
Binary files a/res/skins/LateNight/style_flip/latency_over.png and /dev/null differ
diff --git a/res/skins/LateNight/style_flip/latency_over.svg b/res/skins/LateNight/style_flip/latency_over.svg
deleted file mode 100644
index 5f7a98aeac42..000000000000
--- a/res/skins/LateNight/style_flip/latency_over.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index aac367c5b22a..000000000000
Binary files a/res/skins/LateNight/style_flip/library_branch_closed.png and /dev/null differ
diff --git a/res/skins/LateNight/style_flip/library_branch_open.png b/res/skins/LateNight/style_flip/library_branch_open.png
deleted file mode 100644
index 56ae3993ef5d..000000000000
Binary files a/res/skins/LateNight/style_flip/library_branch_open.png and /dev/null differ
diff --git a/res/skins/LateNight/style_flip/mixxx_logo.svg b/res/skins/LateNight/style_flip/mixxx_logo.svg
deleted file mode 100644
index 07d1092a934f..000000000000
--- a/res/skins/LateNight/style_flip/mixxx_logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="svg2" width="160" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><clipPath id="z"><path id="path52" transform="translate(0 .028)" d="M 0,0 H 358.182 V 89.118 H 0 V 0 z"/></clipPath><linearGradient id="w" x1="74.993" x2="13.486" y1="-.1462" y2="88.767" gradientTransform="matrix(.4467 0 0 .4487 123.41 .013019)" gradientUnits="userSpaceOnUse"><stop id="stop7" stop-color="#39b549" offset=".478"/><stop id="stop9" stop-color="#1a76bc" offset="1"/></linearGradient><linearGradient id="x" x1="74.998" x2="13.488" y1="-.1501" y2="88.767" gradientTransform="matrix(.4467 0 0 .4487 68.726 .013019)" gradientUnits="userSpaceOnUse"><stop id="stop12" stop-color="#381f1f" offset="0"/><stop id="stop14" stop-color="#3a1f20" offset=".0017"/><stop id="stop16" stop-color="#5b2825" offset=".0376"/><stop id="stop18" stop-color="#7c2f28" offset=".0757"/><stop id="stop20" stop-color="#9b2e28" offset=".1173"/><stop id="stop22" stop-color="#b62c28" offset=".1626"/><stop id="stop24" stop-color="#cc2626" offset=".2129"/><stop id="stop26" stop-color="#dc2225" offset=".271"/><stop id="stop28" stop-color="#e81f25" offset=".3438"/><stop id="stop30" stop-color="#ed1b26" offset=".478"/><stop id="stop32" stop-color="#f7921e" offset="1"/></linearGradient><linearGradient id="y" x1="74.992" x2="13.485" y1="-.1471" y2="88.766" gradientTransform="matrix(.4467 0 0 .4487 96.071 .013019)" gradientUnits="userSpaceOnUse"><stop id="stop35" stop-color="#120e1e" offset="0"/><stop id="stop37" stop-color="#1b1426" offset=".0231"/><stop id="stop39" stop-color="#442349" offset=".1446"/><stop id="stop41" stop-color="#652866" offset=".2552"/><stop id="stop43" stop-color="#7c287b" offset=".3511"/><stop id="stop45" stop-color="#8b2589" offset=".4286"/><stop id="stop47" stop-color="#91268f" offset=".478"/><stop id="stop49" stop-color="#ed1b26" offset="1"/></linearGradient><linearGradient id="linearGradient8101" x2="0" y1=".028" y2="89.146" gradientUnits="userSpaceOnUse"><stop id="stop8095" stop-color="#ffd235" offset="0"/><stop id="stop8097" stop-color="#feb30a" offset="1"/></linearGradient></defs><path id="path197" d="m120.63 40 27.298-39.987h12.066l-27.293 39.987h-12.071z" fill="url(#w)"/><path id="path199" d="m65.946 40 27.296-39.987h12.073l-27.293 39.987h-12.076z" fill="url(#x)"/><path id="path201" d="m93.291 40 27.298-39.987h12.067l-27.294 39.987h-12.071z" fill="url(#y)"/><g id="g203" transform="matrix(.4467 0 0 .4487 0 .00032263)" clip-path="url(#z)" fill="url(#linearGradient8101)"><path id="path205" transform="translate(147.64 .028)" d="M 88.123,89.118 27.023,0 H 0 l 61.096,89.118 h 27.027 z"/><path id="path207" transform="translate(208.84 .028)" d="M 88.133,89.118 27.022,0 H 0 l 61.11,89.118 h 27.023 z"/><path id="path209" transform="translate(270.05 .028)" d="M 88.134,89.118 27.023,0 H 0 l 61.111,89.118 h 27.023 z"/><path id="path211" transform="translate(115.31 .028)" d="M 0,0 H 23.115 V 89.118 H 0 V 0 z" fill-rule="evenodd"/><path id="path213" transform="translate(0 .028)" d="m22.665 89.118v-52.188l29.276 44.438h0.597l29.58-44.89v52.64h22.969v-89.118h-24.916l-27.633 44.437-27.619-44.437h-24.919v89.118h22.665z"/></g></svg>
diff --git a/res/skins/LateNight/style_flip/progressbar.svg b/res/skins/LateNight/style_flip/progressbar.svg
deleted file mode 100644
index b0b7340af80d..000000000000
--- a/res/skins/LateNight/style_flip/progressbar.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index c9f10c1a3688..000000000000
--- a/res/skins/LateNight/style_flip/progressbar_bg.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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
deleted file mode 100644
index a433d6fef144..000000000000
--- a/res/skins/LateNight/style_flip/spinny1_mask.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index a433d6fef144..000000000000
--- a/res/skins/LateNight/style_flip/spinny2_mask.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index 04fb55fe958b..000000000000
--- a/res/skins/LateNight/style_flip/spinny3_mask.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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
deleted file mode 100644
index 04fb55fe958b..000000000000
--- a/res/skins/LateNight/style_flip/spinny4_mask.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<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_indicator.svg b/res/skins/LateNight/style_flip/spinny_indicator.svg
deleted file mode 100644
index a7a130439a55..000000000000
--- a/res/skins/LateNight/style_flip/spinny_indicator.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<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
deleted file mode 100644
index e825c25e47e5..000000000000
--- a/res/skins/LateNight/style_flip/spinny_indicator_ghost.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<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
deleted file mode 100644
index 1635a9601973..000000000000
Binary files a/res/skins/LateNight/style_flip/splitter_handle_checked.png and /dev/null 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
deleted file mode 100644
index 107935a6d03f..000000000000
--- a/res/skins/LateNight/style_flip/splitter_handle_horizontal_unchecked.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<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
deleted file mode 100644
index 2d1f1de98979..000000000000
Binary files a/res/skins/LateNight/style_flip/splitter_handle_unchecked.png and /dev/null differ
diff --git a/res/skins/LateNight/style_flip/vinyl_control_0.svg b/res/skins/LateNight/style_flip/vinyl_control_0.svg
deleted file mode 100644
index f4a5a61bddf0..000000000000
--- a/res/skins/LateNight/style_flip/vinyl_control_0.svg
+++ /dev/null
@@ -1 +0,0 @@
-<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/vu_clipping_deck.png b/res/skins/LateNight/style_flip/vu_clipping_deck.png
deleted file mode 100644
index fe190c376af1..000000000000
Binary files a/res/skins/LateNight/style_flip/vu_clipping_deck.png and /dev/null differ
diff --git a/res/skins/LateNight/style_flip/vu_clipping_small.png b/res/skins/LateNight/style_flip/vu_clipping_small.png
deleted file mode 100644
index 1a9bf44ff13d..000000000000
Binary files a/res/skins/LateNight/style_flip/vu_clipping_small.png and /dev/null differ
diff --git a/res/skins/LateNight/style_flip/vu_level_deck.png b/res/skins/LateNight/style_flip/vu_level_deck.png
deleted file mode 100644
index d06e5baec76b..000000000000
Binary files a/res/skins/LateNight/style_flip/vu_level_deck.png and /dev/null 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
deleted file mode 100644
index 37822643e069..000000000000
Binary files a/res/skins/LateNight/style_flip/vu_level_deck_over.png and /dev/null differ
diff --git a/res/skins/LateNight/style_flip/vu_level_sampler.png b/res/skins/LateNight/style_flip/vu_level_sampler.png
deleted file mode 100644
index 3db3f3e619c1..000000000000
Binary files a/res/skins/LateNight/style_flip/vu_level_sampler.png and /dev/null 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
deleted file mode 100644
index 7d2ff651b617..000000000000
Binary files a/res/skins/LateNight/style_flip/vu_level_sampler_over.png and /dev/null differ
diff --git a/res/skins/LateNight/style_flip/vu_level_small.png b/res/skins/LateNight/style_flip/vu_level_small.png
deleted file mode 100644
index 8ed482774aa1..000000000000
Binary files a/res/skins/LateNight/style_flip/vu_level_small.png and /dev/null differ
diff --git a/res/skins/LateNight/style_palemoon.qss b/res/skins/LateNight/style_palemoon.qss
new file mode 100644
index 000000000000..a2921434e2fa
--- /dev/null
+++ b/res/skins/LateNight/style_palemoon.qss
@@ -0,0 +1,2961 @@
+/* LateNight 2.3 // PaleMoon theme
+
+* containers
+  * colors, borders, background tiles
+  * layout spacing
+
+* colors & icons
+  * font colors
+  * button styles
+  * button icons
+
+* library
+* menu & special widget styles
+
+
+/**********************************************************************
+************** container background colors & borders *****************/
+
+#Deck1, #DeckCompact1, #DeckMini1,
+#Deck2, #DeckCompact2, #DeckMini2,
+#Deck3, #DeckCompact3, #DeckMini3,
+#Deck4, #DeckCompact4, #DeckMini4,
+  #FxUnitControlsExpanded, #FxUnitControlsCollapsed,
+  #FxSlotsExpanded, #FxSlotsCollapsed, #FxSlotContainer,
+#MixerDecks,
+#MicDuckingContainer, #MicAuxUnit, #MicAuxAddFrame,
+#Sampler, #SamplerMini {
+  background-color: #1e1e20;
+}
+
+/* 1st-level containers */
+#Deck1, #DeckCompact1, #DeckMini1,
+#Deck2, #DeckCompact2, #DeckMini2,
+#Deck3, #DeckCompact3, #DeckMini3,
+#Deck4, #DeckCompact4, #DeckMini4,
+#MixerDecks,
+#FxUnitControlsCollapsed,
+#FxUnitControlsExpanded,
+#FxSlotsCollapsed,
+#FxSlotsExpanded,
+#MicDuckingContainer, #MicAuxUnit, #MicAuxAddFrame,
+#Sampler, #SamplerMini {
+  border-top: 1px solid #333;
+  border-left: 1px solid #282828;
+  border-bottom: 1px solid #0c0c0c;
+  border-right: 1px solid #181818;
+  border-radius: 1px;
+  border-bottom-left-radius: 2px;
+  }
+  #MixerDecks[highlight="1"] {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 1px;
+    border-right: 1px solid #0c0c0c;
+  }
+
+/* dim 1st-level containers */
+#ToolBar,
+#WaveformsContainer,
+#MasterControls, #HeadphoneControls,
+#VuMeterDeck1_Compact,
+#VuMeterDeck2_Compact,
+#VuMeterDeck3_Compact,
+#VuMeterDeck4_Compact,
+#VuMeterMaster_Compact,
+#FxUnitHeaderCollapsed, #FxUnitHeaderExpanded,
+#SamplerExpandBox,
+#VerticalSplitter::handle,
+#SearchLineBox,
+#LibExpandBox,
+#SidebarBox,
+#PreviewDeck,
+WLibrary, QAbstractScrollArea::corner {
+  border-top: 1px solid #212123;
+  border-right: 1px solid #111;
+  border-bottom: 1px solid #020202;
+  border-left: 1px solid #191919;
+  border-radius: 1px;
+  background-color: #151517;
+  }
+  #WaveformsContainer {
+    border-width: 1px 0px;
+    border-radius: 0px;
+  }
+
+  WLibrary,
+  #SidebarBox {
+    padding: 2px 0px 0px 2px;
+    }
+    #SidebarBox {
+      border-width: 1px 0px 0px 0px;
+      border-bottom-right-radius: 0px;
+      border-bottom-left-radius: 0px;
+      border-top-left-radius: 0px;
+    }
+  WLibrary,
+  #VerticalSplitter::handle {
+    border-radius: 0px;
+    }
+    #VerticalSplitter::handle {
+      border-width: 1px 0px 0px 0px;
+    }
+  WLibrary {
+    border-width: 1px 0px 0px 0px;
+  }
+
+/* recessed regions */
+#WaveformBox1,
+#WaveformBox2,
+#WaveformBox3,
+#WaveformBox4,
+#WaveformsFrame,
+#OverviewBox,
+#OverviewBoxMini,
+WSearchLineEdit {
+  border-top: 1px solid #0d0d0d;
+  border-left: 1px solid #121212;
+  border-bottom: 1px solid #2a2a2a;
+  border-right: 1px solid #252525;
+  background-color: #19191a;
+  }
+#LibraryContainer QTableView,
+#LibraryContainer QTextBrowser,
+#LibraryContainer QTreeView,
+WSearchLineEdit {
+  border-top: 1px solid #000;
+  border-left: 1px solid #000;
+  border-bottom: 1px solid #1e1e1e;
+  border-right: 1px solid #222;
+  }
+  #WaveformsFrame,
+  #OverviewBox,
+  #OverviewBoxMini,
+  WSearchLineEdit {
+    border-radius: 1px;
+  }
+  #OverviewBox[highlight="1"],
+  #OverviewBoxMini[highlight="1"] {
+    background-color: #151515;
+  }
+  WBeatSpinBox[highlight="0"] {
+    background-color: #171719;
+    }
+    WBeatSpinBox[highlight="1"] {
+      background-color: #121213;
+    }
+  #KeyText,
+  #DeckSettingsContainer,
+  #DeckSettingsContainerCompact,
+  #spinBoxTransition  {
+    background-color: #19191a;
+    }
+    #KeyText,
+    #DeckSettingsContainer,
+    #DeckSettingsContainerCompact {
+      border-top: 1px solid #0d0d0d;
+      border-bottom: 1px solid #2a2a2a;
+      }
+      #DeckSettings {
+        border-top: 1px solid #1c1c1c;
+        border-bottom: 1px solid #050505;
+      }
+
+/* fillers */
+#FxRackFillerL,
+#FxRackFillerR,
+#MicAuxRackFiller {
+  border-top: 1px solid #1c1c1c;
+  border-left: 1px solid #191919;
+  border-bottom: 1px solid #020202;
+  border-right: 1px solid #111;
+  border-radius: 1px;
+  background-color: #151517;
+  }
+
+/* meters */
+#VuMeterBox,
+#VuMeterBoxMaster,
+#VuMeterBoxMasterSingle,
+#LatencyMeterBox {
+  background-color: #040404;
+}
+
+#WaveformsContainer {
+  border-bottom: 1px solid #0c0c0c;
+}
+
+#FxParametersFocusBg {
+  border: 1px solid #1c1c1e;
+  background-color: rgba(0,0,1,50);
+}
+
+#VuMasterCover {
+  background-color: rgba(21, 21, 21, 150);
+}
+
+#SearchLineBox {
+  padding-right: 2px;
+  border-right: 0px;
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
+
+#LibExpandBox {
+  qproperty-layoutAlignment: 'AlignVCenter | AlignHCenter';
+  border-right: 0px;
+  border-left: 0px;
+  border-radius: 0px;
+  margin-bottom: 3px;
+  padding: 0px 2px 2px 2px;
+}
+
+
+
+#SidebarBox {
+  border-right: 0px;
+  border-top-right-radius: 0px;
+}
+
+
+/************ lines / grooves / splitters *********************/
+
+#DeckRateSeparator,
+#MasterMixerSeparator,
+#MasterHeadphoneSeparator,
+#FxSlotSeparatorV,
+#FxSlotSeparatorH,
+#SeparatorToolbar {
+  /* needs a background color to paint the borders */
+  background-color: transparent;
+  }
+  #DeckRateSeparator,
+  #FxSlotSeparatorV {
+    min-width: 0px;
+    max-width: 0px;
+    border-left: 1px solid #0c0c0c;
+    border-right: 1px solid #333;
+  }
+  #MasterMixerSeparator {
+    border-left: 1px solid #0c0c0c;
+    border-right: 1px solid #222;
+  }
+  #FxSlotSeparatorV {
+    margin: 0px 0px 0px 2px;
+  }
+
+#FxSlotSeparatorH {
+  min-height: 0px;
+  max-height: 0px;
+  border-top: 1px solid #0c0c0c;
+  border-bottom: 1px solid #333;
+}
+
+#ToolbarSeparator {
+  margin: 0px 5px;
+}
+
+/* dynamic bottom border in #DeckRow1_ */
+#ExpandingBottomBorder {
+  /* border shows up if we set a bg color... */
+  background-color: transparent;
+  border-bottom: 1px solid #0c0c0c;
+}
+
+#PreviewPlayBox,
+#SamplerTitle, #SamplerPlay, #SamplerSettings,
+#SamplerGain, #SamplerVU, #SamplerPfl {
+  border-style: solid;
+  border-color: #0c0c0c;
+}
+
+
+/**********************************************************************
+************** container background colors & borders *****************/
+
+
+
+
+/******************* Container layouts, margins etc. ******************
+**********************************************************************/
+
+#ToolbarDeckSpacer {
+  min-height: 3px;
+  max-height: 3px;
+}
+
+/* Since the toolbar is dim in PaleMoon, we don't need an extra margin
+    in between mini decks and the toolbar. */
+#MiniDecksTopSpacer {
+  min-height: 0px;
+  max-height: 0px;
+}
+
+#CompactDecksCenterSpacer {
+  min-width: 4px;
+  max-width: 4px;
+}
+
+#ToolBar {
+  padding: 1px 2px 0px 2px;
+  }
+  #LatencyLabel,
+  #BatteryBox,
+  #ClockWidget {
+    margin-bottom: 1px;
+  }
+
+#Deck1, #DeckCompact1, #DeckMini1,
+#Deck2, #DeckCompact2, #DeckMini2,
+#Deck3, #DeckCompact3, #DeckMini3,
+#Deck4, #DeckCompact4, #DeckMini4,
+#MixerContainer,
+#VuMeterDeck1_Compact,
+#VuMeterDeck2_Compact,
+#VuMeterDeck3_Compact,
+#VuMeterDeck4_Compact,
+#VuMeterMaster_Compact,
+#FxUnit1, #FxUnit3,
+#FxUnit2, #FxUnit4,
+#FxRackFillerR,
+#FxRackFillerL,
+#MicAuxRack,
+#SamplerRow,
+#LibExpandBox,
+#SearchLineBox,
+#PreviewDeck {
+  margin-bottom: 3px;
+}
+
+#Deck1, #DeckMini1,
+#Deck3, #DeckMini3,
+#MixerContainer,
+#FxUnit1,
+#FxUnit3,
+#FxRackFillerL,
+#FxRackFillerR,
+#MicRack, #AuxRack {
+  margin-right: 2px;
+}
+
+#Deck2, #DeckMini2,
+#Deck4, #DeckMini4,
+#MixerContainer,
+#FxUnit2,
+#FxUnit4,
+#FxRackFillerL,
+#FxRackFillerR,
+#MicRack, #AuxRack {
+  margin-left: 2px;
+}
+/* gap in between compact decks is managed
+  by #CompactDecksCenterSpacer in order to have VU meters
+  directly attached to each deck.
+  A highlight connection to [LateNight],show_vumeters_compact
+  can be used for the borders but screws up the margin: contents
+  are rendered beyond the parent border */
+
+#MixerContainer {
+  margin-right: 1px;
+  margin-left: 1px;
+}
+
+#SamplerRow {
+  qproperty-layoutSpacing: 4;
+}
+
+#MicRack, #AuxRack {
+  qproperty-layoutSpacing: 3;
+}
+
+#PreviewDeck {
+  margin-right: 3px;
+}
+
+#SkinSettingsContainer {
+  margin-left: 3px;
+}
+
+
+/************** Waveforms *****************************************************/
+
+#WaveformsContainer {
+  padding-bottom: 1px;
+}
+
+#WaveformBox1,
+#WaveformBox2,
+#WaveformBox3,
+#WaveformBox4 {
+  border-left: 0px;
+  }
+  #WaveformBox1,
+  #WaveformBox3 {
+    border-bottom: 0px;
+  }
+  #WaveformBox2,
+  #WaveformBox4 {
+    border-top: 0px;
+  }
+  /* Hide some borders when 4 decks are visible */
+  #WaveformBox1[highlight="1"] {
+    border-top: 0px;
+  }
+  #WaveformBox2[highlight="1"] {
+    border-bottom: 0px;
+  }
+
+
+/************** Decks *********************************************************/
+
+#DeckMini1,
+#DeckMini2,
+#DeckMini3,
+#DeckMini4 {
+  padding-right: 2px;
+}
+
+/* All rows in FULL deck */
+#DeckRows12345,
+#DeckRows234 {
+  padding: 2px 0px 2px 1px;
+  }
+  /* All rows in compact deck */
+  #DeckRows2345 {
+    padding: 0px 0px 2px 1px;
+  }
+
+#SpinnyCoverContainer_Small{
+  min-width: 63px;
+  max-width: 63px;
+  min-height: 63px;
+  max-height: 63px;
+  margin: 0px 1px 0px 0px;
+  }
+  #SpinnyCoverContainer_SmallCompact {
+    min-width: 63px;
+    max-width: 63px;
+    min-height: 63px;
+    max-height: 63px;
+    margin: 0px 1px 1px 0px;
+  }
+#SpinnyCoverContainer_Big{
+  min-width: 120px;
+  max-width: 120px;
+  min-height: 120px;
+  max-height: 120px;
+  margin: 1px 2px 0px 0px;
+  }
+  #SpinnyCoverContainer_BigCompact {
+    min-width: 114px;
+    max-width: 114px;
+    min-height: 114px;
+    max-height: 114px;
+    margin: 0px 2px 0px 0px;
+  }
+#SpinnyCoverContainer_MiniDeck {
+  min-width: 53px;
+  max-width: 53px;
+  min-height: 53px;
+  max-height: 53px;
+}
+
+  /* Replacement for #DeckMiniN padding */
+  #PlayCueMini {
+    margin: 0px 1px 1px 0px;
+  }
+  #OverviewBoxMini {
+    margin: 1px 0px;
+  }
+  #DeckMini_TitlePlayPosKeyBPM {
+    margin: 1px 1px 1px 0px;
+  }
+
+#DeckRow_1_KeyVinylFx {
+  padding-right: 2px;
+  padding-left: 1px;
+  }
+  #KeyText {
+    border-left: 0px;
+    border-right: : 0px;
+  }
+
+#DeckRow_2_3_ArtistTitleTime {
+  margin: 2px 0px 2px 0px;
+  }
+  #ArtistText,
+  #TitleText {
+    /* for some reason the padding/margin is doubled in the skin... */
+    padding: 0px 2px 1px 0px;
+  }
+  #PlayPositionText,
+  #DurationText {
+    /* for some reason the padding/margin is doubled in the skin... */
+    padding: 0px 1px 1px 1px;
+  }
+  #TitleTextSmall {
+    padding: 1px 3px 1px 1px;
+  }
+  #ArtistTextSmall {
+    margin: 0px 0px 0px 1px;
+    padding: 0px 1px 0px 0px;
+  }
+  #PlayPositionTextSmall {
+    padding: 0px 0px 2px 2px;
+  }
+
+#DeckSettingsContainer,
+#DeckSettingsContainerCompact {
+  border-width: 1px 0px 1px 0px;
+  }
+  /* without rate controls */
+  #DeckSettingsContainer[highlight="0"],
+  #DeckSettingsContainerCompact[highlight="0"] {
+    margin-right: 2px;
+  }
+  /* with rate controls */
+  #DeckSettingsContainer[highlight="1"],
+  #DeckSettingsContainerCompact[highlight="1"] {
+    margin-right: 0px;
+  }
+
+  #DeckSettings {
+    padding: 1px 2px 1px 1px;
+    border-width: 1px 0px 1px 0px;
+    }
+    #DeckSettingsGrid {
+      padding: 0px 2px;
+      qproperty-layoutSpacing: 4;
+    }
+
+#DeckRow_5_LoopCuesTransport {
+  margin-top: 1px;
+}
+#DeckRow_5_Compact {
+}
+
+
+/************** RateControls ********************************************/
+
+#RateContainer {
+  padding: 4px 0px 0px 0px;
+  }
+  #RateContainerCompact {
+    padding: 0px 0px 0px 0px;
+  }
+
+  #BpmTapContainer {
+    margin: 0px 2px;
+    }
+    #BpmRateContainer {
+      margin: 0px 0px 0px 3px;
+    }
+    #RateText {
+      padding: 0px;
+      margin: 0px 2px 0px 0px;
+    }
+
+  #SyncBox {
+    margin: 2px 1px 1px 0px;
+  }
+
+  #RateControls {
+    margin: 0px 2px;
+    }
+    #RateButtons {
+      margin-right: 2px;
+    }
+
+
+/********************** Loop Controls / AutoDJ spinbox ************************/
+WBeatSpinBox,
+#spinBoxTransition,
+#LibraryBPMSpinBox  {
+  selection-color: #000;
+  selection-background-color: #d2d2d2;
+}
+WBeatSpinBox {
+  border-width: 3px 19px 2px 3px;
+  border-image: url(skin:/palemoon/buttons/btn_embedded_spinbox.svg) 3 19 2 3;
+}
+#spinBoxTransition {
+  border-width: 3px 19px 2px 3px;
+  border-image: url(skin:/palemoon/buttons/btn_embedded_spinbox_autodj.svg) 3 19 2 3;
+}
+
+WBeatSpinBox {
+  margin: 1px 0px 1px 1px;
+  padding: 0px -17px 2px 1px;
+}
+
+#spinBoxTransition {
+  width: 24px;
+  height: 19px;
+  padding: 0px -15px 0px 0px;
+  margin: 0px 2px 3px 5px;
+  }
+  WBeatSpinBox:focus,
+  #spinBoxTransition:focus {
+    border-image: url(skin:/palemoon/buttons/btn_embedded_spinbox_focus_blue.svg) 3 19 2 3;
+  }
+
+WBeatSpinBox::up-button,
+WBeatSpinBox::down-button,
+#spinBoxTransition::up-button,
+#spinBoxTransition::down-button {
+  subcontrol-origin: content;
+  position: relative;
+  /* as with spinbox: border is added to size. */
+  width: 18px;
+  padding: 0px;
+  }
+  WBeatSpinBox::up-button,
+  #spinBoxTransition::up-button {
+    height: 11px;
+    subcontrol-position: top right;
+    image: url(skin:/palemoon/buttons/btn__spinbox_up.svg) no-repeat;
+    }
+    WBeatSpinBox::up-button {
+      margin: -2px -1px 0px 0px;
+      }
+    #spinBoxTransition::up-button {
+      margin: -2px -3px 0px 0px;
+      }
+  WBeatSpinBox::down-button,
+  #spinBoxTransition::down-button {
+    height: 11px;
+    subcontrol-position: bottom right;
+    image: url(skin:/palemoon/buttons/btn__spinbox_down.svg) no-repeat;
+    }
+    WBeatSpinBox::down-button {
+      margin: 0px -1px -3px 0px;
+      }
+    #spinBoxTransition::down-button {
+      margin: 0px -3px -1px 0px;
+      }
+
+
+/************** Mixer ***************************************************/
+
+#MixerDecks {
+  padding: 2px 5px 2px 5px;
+  }
+  #MixerChannel_2Decks_Left {
+    margin: 0px 2px;
+  }
+  #MixerChannel_2Decks_Right {
+    margin: 0px 2px;
+  }
+  #VuAndSlider_4Decks {
+    margin-right: 1px;
+  }
+  #PflBox_4Decks {
+    margin: 3px 0px 0px 20px;
+  }
+
+  #CrossfaderSwitch_4Decks {
+    margin: 0px 4px 3px 0px;
+  }
+  #Crossfader {
+    padding: 0px 0px 0px 1px;
+  }
+
+  #CrossfaderButtonContainer_Deck {
+    padding: 1px;
+    border-bottom: 1px solid #333;
+    border-right: 1px solid #333;
+    border-bottom-right-radius: 1px;
+    }
+  #CrossfaderButtonContainer_Aux {
+    padding: 1px 1px 0px 1px;
+    margin-left: 5px;
+    border-right: 1px solid #333;
+    }
+    #CrossfaderButton[value="1"] {
+      background-color: #262626;
+    }
+
+#MixerMasterHeadphone {
+  }
+  #MasterControls,
+  #HeadphoneControls {
+    padding: 4px;
+  }
+  #MasterControls {
+    border-radius: 0px 1px 0px 0px;
+  }
+  #HeadphoneControls {
+    border-radius: 0px 0px 1px 0px;
+  }
+
+/* All VU meter instances */
+#VuMeterChannel_2Decks {
+  margin: 0px 9px 2px 9px;
+}
+#VuMeterChannel_4Decks {
+  margin: 6px 0px 6px 11px;
+}
+#VuMeterMaster_2Decks {
+  margin: 0px 0px 2px 0px;
+}
+#VuMeterMaster_4Decks {
+  margin: 5px 0px;
+}
+
+#VuMeterDeck1_Compact,
+#VuMeterDeck3_Compact {
+  padding: 0px 4px 0px 5px;
+  border-left: 0px;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+#VuMeterDeck2_Compact,
+#VuMeterDeck4_Compact {
+  padding: 0px 5px 0px 4px;
+  border-right: 0px;
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
+#VuMeterMaster_Compact {
+  margin-right: 4px;
+  margin-left: 4px;
+  padding: 0px 5px;
+}
+
+
+/************** Effects *************************************************/
+
+#FxUnitHeaderCollapsed {
+  padding: 0px;
+  border-left: 0px;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+  }
+  #FxUnitHeaderExpanded {
+    padding: 0px;
+    border-bottom-left-radius: 0px;
+    border-left: 0px;
+    border-bottom: 0px;
+    border-top-left-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
+  #FxUnitHeader {
+    padding: 0px 0px 1px 4px;
+  }
+  #FxUnitLabel {
+    alignment: left;  /*
+    background-color: rgba(255,0,0,80); */
+  }
+
+#FxUnitControlsCollapsed {
+  padding: 1px 2px 3px 2px;
+  qproperty-layoutSpacing: 2;
+  border-left: 0px;
+  border-right: 0px;
+  border-radius: 0px;
+  }
+  #FxUnitControlsExpanded {
+    padding: 2px 1px 2px 0px;
+    border-top: 0px;
+    border-left: 0px;
+    border-top-left-radius: 0px;
+    border-top-right-radius: 0px;
+    border-top-left-radius: 0px;
+  }
+
+#FxSlotsCollapsed {
+  padding: 0px 0px 0px 0px;
+  border-right: 0px;
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+}
+#FxSlotsExpanded {
+  padding: 0px 0px 1px 1px;
+  border-right: 0px;
+  border-top-right-radius: 0px;
+  border-bottom-right-radius: 0px;
+  }
+  #FxSlot1,
+  #FxSlot2,
+  #FxSlot3 {
+    padding: 2px 4px 2px 2px;
+  }
+  #FxSlotsExpanded #FxSlot1,
+  #FxSlotsExpanded #FxSlot2,
+  #FxSlotsExpanded #FxSlot3 {
+    padding-right: 7px;
+  }
+
+#FxParametersContainer {
+  padding: 5px 0px 2px 0px;
+}
+
+#FxSlotsCollapsed #FxSlotContainer {
+  margin: 2px 0px 1px 1px;
+}
+
+WEffectSelector {
+  /* Fixes the white bars on the top/bottom of the popup on Mac OS X */
+  min-height: 13px;
+  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 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 QAbstractScrollArea,
+  #fadeModeCombobox QAbstractScrollArea {
+    width: 142px;
+    /* padding-left: 6px; */
+    /* 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;
+  }
+  /* selected item */
+  WEffectSelector::checked,
+  #fadeModeCombobox::checked {
+    /* not applied
+    padding-left: 5px;  */
+    padding: 0px;
+    margin: 0px;
+    color: #eee;
+  }
+  /* hovered items */
+  WEffectSelector::item:selected,
+  #fadeModeCombobox::item:selected {
+    background-color: #333;
+  /* Already of those two destroys font config and puts tick mark behind text:
+    margin: 0px;
+    padding: 0px; */
+  /* This moves the tick mark behind item text,
+    text sits at left border now
+    border: 0; */
+  }
+  WEffectSelector::indicator,
+  #fadeModeCombobox::indicator {
+  /* This is sufficient to completely hide the tick mark, but
+    this alone would show an empty, shadowed box instead of tick mark
+    background-color: transparent;*/
+  /* This should decrease the tick mark's left & right margin but is not respected */
+    margin: 0px;
+    padding: 0px;
+  }
+
+WPushButton#FxSuperLinkButton,
+WPushButton#FxSuperLinkInvertButton {
+  border-radius: 3px;
+  margin: 1px 1px 0px 0px;
+}
+
+
+/************** Sampler *************************************************/
+
+#SamplerExpandBox {
+  padding: 0px 1px 0px 1px;
+}
+
+#SamplerMini {
+  padding: 0px 1px 1px 0px;
+  }
+  #SamplerPlayBoxMini {
+    padding: 1px;
+  }
+  #SamplerTitleBoxMini {
+    padding: 0px 0px 0px 0px;
+  }
+  #SamplerTitleMini {
+    padding: 2px 0px 0px 0px;
+  }
+
+#Sampler {
+  padding: 1px 0px 2px 0px;
+  }
+  #SamplerTitleBox {
+    border-width: 0px 1px 0px 0px;
+    }
+    #SamplerTitle {
+      padding: 3px 3px 1px 4px;
+    }
+  #SamplerBpm {
+    margin-right: 2px;
+
+  }
+
+  #SamplerPlayBox {
+    padding: 1px 2px 1px 0px;
+  }
+
+  #SamplerSettings {
+    border-width: 1px 1px 1px 0px;
+    padding: 0px 0px 2px 0px;
+  }
+
+  #SamplerHotcues {
+    padding: 1px 0px 0px 0px;
+  }
+
+  #SamplerGain {
+    padding: 0px 0px 0px 2px;
+    border-width: 1px 0px 0px 0px;
+  }
+  #SamplerPfl {
+    border-width: 0px 0px 0px 1px;
+    padding: 0px 5px 1px 6px;
+  }
+
+  #SamplerVU {
+    padding: 2px 3px 0px 1px;
+    border-width: 1px 1px 0px 0px;
+  }
+
+  #SamplerRateControls {
+    padding: 0px 1px 1px 0px;
+    }
+    #SamplerPitchSlider {
+      padding: 0px 0px 1px 0px;
+    }
+
+
+/************** MicAux **************************************************/
+
+#MicDuckingContainer {
+  }
+  #MicDuckingModeBox {
+    padding: 2px 2px 0px 2px;
+  }
+  #MicDuckingStrengthBox {
+    padding-top: 3px;
+  }
+
+#MicAuxMainControls {
+  border-radius: 2px;
+  padding: 0px 1px 0px 2px;
+  border-bottom-left-radius: 1px;
+  border-top-right-radius: 1px;
+  }
+  #MicAuxLabel {
+    padding: 3px 0px 3px 1px;
+  }
+  #AuxPlayBox {
+    padding: 0px 0px 2px 1px;
+  }
+  #MicTalkBox {
+    padding: 0px 0px 5px 1px;
+  }
+  #MicAuxVUMeter {
+    padding: 4px 1px 1px 0px;
+    margin-left: 2px;
+  }
+  #MicAuxAddBox {
+    margin: 1px 0px 1px 1px;
+  }
+
+#MicAuxSubControls {
+  border-width: 0px;
+  padding: 0px 2px 3px 3px;
+  }
+  #MicAuxFxButtons {
+    padding: 2px 0px;
+  }
+
+#MicAuxAddFrame {
+  padding: 2px 4px 4px 4px;
+}
+
+
+/************** PreviewDeck ***************************************************/
+
+#PreviewDeck {
+  padding: 2px 1px;
+  }
+
+  #PreviewDeckTextBox {
+    }
+    #PreviewLabel { /* Placeholder */
+      padding-left: 2px;
+    }
+    #PreviewTitle {
+      margin: 0px 2px 0px 0px;
+    }
+    #PreviewBPM {
+      padding-left: 2px;
+    }
+    #PreviewEjectBox {
+      padding-bottom: 2px;
+    }
+
+  #PreviewDeck #OverviewBox {
+    margin: 1px 2px 0px 2px;
+  }
+
+
+/************** SkinSettings **************************************************/
+
+#SkinSettings {
+  padding: 3px;
+  border-top: 1px solid #585858;
+  border-bottom: 1px solid #585858;
+  border-left: 1px solid #585858;
+  border-top-left-radius: 2px;
+  border-bottom-left-radius: 2px;
+}
+
+#DeckSizeSettings {
+  margin: 2px 0px 0px 0px;
+  }
+  #DeckSizeToggles {
+    padding: 0px 0px 0px 0px;
+    }
+    #DeckSizeButton {
+      margin-left: 1px;
+    }
+
+#SkinSettingsCategory {
+  padding: 2px 5px 7px 3px;
+  }
+  #SkinSettingsSubMenu {
+    padding: 0px 0px 0px 13px;
+  }
+  #CategoryLabel {
+    padding: 3px 0px 2px 0px;
+  }
+  #SkinSettingsLabelButton {
+    padding: 0px 0px 0px 3px;
+  }
+
+  #SamplerLoadSaveBox {
+    padding-left: 18px;
+  }
+
+#SubmenuCover {
+  background-color: rgba(15, 15, 15, 180);
+}
+#SkinSettingsMixerToggle {
+  background-color: rgba(15, 15, 15, 255);
+}
+/*********************************************************************
+******************* Container layouts, margins etc. *****************/
+
+
+
+
+
+/************** font colors **************************************************/
+
+#FxUnit1 #FxUnitLabel,
+#FxUnit2 #FxUnitLabel,
+#FxUnit3 #FxUnitLabel,
+#FxUnit4 #FxUnitLabel,
+#MicAuxLabelUnconfigured,
+WEffectSelector,
+#fadeModeCombobox {
+  font-weight: 500;
+}
+
+/* Ivory */
+#Deck1 #TitleText, #Deck1 #ArtistText,
+  #DeckCompact1 #TitleText, #DeckCompact1 #ArtistText,
+  #DeckMini1 #TitleTextSmall, #DeckMini1 #ArtistTextSmall,
+  #Deck1 #BpmText, #DeckCompact1 #BpmText, #DeckMini1 #BpmTextSmall,
+#Deck2 #TitleText, #Deck2 #ArtistText,
+  #DeckCompact2 #TitleText, #DeckCompact2 #ArtistText,
+  #DeckMini2 #TitleTextSmall, #DeckMini2 #ArtistTextSmall,
+  #Deck2 #BpmText, #DeckCompact2 #BpmText, #DeckMini2 #BpmTextSmall,
+#MicAuxLabel,
+#SamplerTitle, #SamplerTitleMini,
+/* Library controls */
+  WSearchLineEdit, WTime,
+  #PreviewDeckTextBox, #PreviewTitle, #PreviewBPM,
+  #LibraryBPMSpinBox,
+  #LibraryBPMButton::item,
+  #LibraryContainer QTableView,
+  #LibraryContainer QTextBrowser,
+  #LibraryContainer QTreeView,
+  WLibrary QLabel, WLibrary QRadioButton,
+  WLibrary QTableView::indicator,
+  #LibraryContainer QHeaderView,
+  #DlgMissing > QPushButton,
+  #DlgHidden > QPushButton,
+  #DlgAutoDJ > QPushButton,
+  #DlgRecording > QPushButton,
+  #DlgAnalysis > QPushButton,
+/* Tooltip and menus */
+QToolTip,
+WBeatSpinBox QMenu,
+#spinBoxTransition QMenu,
+#LibraryContainer QMenu,
+#LibraryContainer QMenu QCheckBox,
+WCueMenuPopup,
+WCueMenuPopup QMenu,
+WCueMenuPopup QLabel,
+#CueLabelEdit,
+WCoverArtMenu,
+WTrackMenu,
+WTrackMenu QCheckBox,
+WTrackMenu QMenu,
+WTrackMenu QMenu QCheckBox {
+  color: #c2b3a5;
+  }
+  WSearchLineEdit,
+  #LibraryBPMSpinBox,
+  #LibraryBPMButton::item,
+  #LibraryContainer QTableView,
+  #LibraryContainer QTextBrowser,
+  #LibraryContainer QTreeView {
+    selection-color: #c2b3a5;
+  }
+  /* dim ivory / light brown */
+  #Deck1 WStarRating, #DeckCompact1 WStarRating,
+  #Deck2 WStarRating, #DeckCompact2 WStarRating,
+  #SkinSettingsLabelButton, #CategoryLabel,
+  #SkinSettingsButton,
+  #DeckSizeButton,
+  #SkinSettingsMixerToggle,
+  #SkinSettingsText {
+    color: #988f86;
+  }
+WEffectSelector,
+#fadeModeCombobox {
+  color: #918273;
+  font-size: 14px;
+}
+  /* dim² ivory */
+  #Deck1 #PlayPositionText, #DeckCompact1 #PlayPositionTextSmall, #DeckMini1 #PlayPositionTextSmall,
+  #Deck1 #KeyText,  #DeckCompact1 #KeyText, #DeckMini1 #KeyTextSmall,
+  #Deck2 #PlayPositionText, #DeckCompact2 #PlayPositionTextSmall, #DeckMini2 #PlayPositionTextSmall,
+  #Deck2 #KeyText,  #DeckCompact2 #KeyText, #DeckMini2 #KeyTextSmall,
+  #SamplerBpm {
+    color: #766b65;
+  }
+
+  WBeatSpinBox, #spinBoxTransition {
+    color: #a7998b;
+  }
+
+/* pale blue */
+#Deck3 #TitleText, #Deck3 #ArtistText,
+  #DeckCompact3 #TitleText, #DeckCompact3 #ArtistText,
+  #DeckMini3 #TitleTextSmall, #DeckMini3 #ArtistTextSmall,
+  #Deck3 #BpmText, #DeckCompact3 #BpmText, #DeckMini3 #BpmTextSmall,
+  #Deck3 #KeyText,  #DeckCompact3 #KeyText, #DeckMini3 #KeyTextSmall,
+#Deck4 #TitleText, #Deck4 #ArtistText,
+  #DeckCompact4 #TitleText, #DeckCompact4 #ArtistText,
+  #DeckMini4 #TitleTextSmall, #DeckMini4 #ArtistTextSmall,
+  #Deck4 #BpmText, #DeckCompact4 #BpmText, #DeckMini4 #BpmTextSmall,
+  #Deck4 #KeyText,  #DeckCompact4 #KeyText, #DeckMini4 #KeyTextSmall {
+  color: #85bdbb;
+  }
+  #Deck3 WStarRating, #DeckCompact3 WStarRating,
+  #Deck4 WStarRating, #DeckCompact4 WStarRating {
+    color: #559b99;
+  }
+
+/* green for Fx 1/2
+#FxUnit1 #FxUnitLabel,
+#FxUnit2 #FxUnitLabel {
+  color: #236B00;
+} */
+
+/* blue for Fx 3/4
+#FxUnit3 #FxUnitLabel,
+#FxUnit4 #FxUnitLabel {
+  color: #146674;
+} */
+
+/* green for Fx 1/2 */
+#FxUnit1 #FxUnitLabel,
+#FxUnit2 #FxUnitLabel,
+#FxUnit3 #FxUnitLabel,
+#FxUnit4 #FxUnitLabel,
+#MicAuxLabelUnconfigured {
+  color: #686666;
+}
+
+/* Grey. default for all deck labels */
+#PlayPositionText, #PlayPositionTextSmall,
+#DurationText, #RateText,
+#MasterControls #FxAssignButtons WPushButton[displayValue="0"],
+#PreviewLabel,
+WEffectSelector QAbstractScrollArea,
+#fadeModeCombobox QAbstractScrollArea,
+#GuiToggleButton[displayValue="0"],
+#RecDuration[highlight="0"],
+#BroadcastButton[displayValue="0"],
+#SkinSettingsToggle[displayValue="0"],
+WLibrary QLabel {
+  color: #777;
+}
+
+/* Darker grey for knob labels & inactive decks/units */
+#KnobLabel,
+#FxKnobLabel,
+#FxButtonLabel,
+#VinylButton[displayValue="0"],
+#VinylCueButton[displayValue="0"],
+#VinylModeButton,
+#FxAssignButtons WPushButton[displayValue="0"],
+#LatencyLabel {
+  color: #666;
+  }
+  /*
+  #MasterControls #FxAssignButtons WPushButton[displayValue="0"] {
+    color: #847C79;
+  } */
+
+/* Even darker grey for knob labels in master/headphone mixer */
+#MixerMasterHeadphone #KnobLabel {
+  color: #444;
+}
+
+#VinylButton[displayValue="1"],
+#VinylCueButton[displayValue="1"],
+#VinylCueButton[displayValue="2"],
+#FxAssignButtons WPushButton[displayValue="1"],
+#GuiToggleButton[displayValue="1"],
+#GuiToggleButton[displayValue="2"],
+#BroadcastButton[displayValue="1"], /* connecting */
+#BroadcastButton[displayValue="2"], /* broadcasting */
+#BroadcastButton[displayValue="3"], /* failure */
+#RecDuration[highlight="1"],  /* initializing */
+#RecDuration[highlight="2"],  /* recording */
+#SkinSettingsToggle[displayValue="1"],
+QPushButton#pushButtonAutoDJ:checked,
+QPushButton#pushButtonRepeatPlaylist:checked,
+#DlgAnalysis > QPushButton:checked,
+QPushButton#pushButtonRecording:checked {
+  color: #000;
+}
+
+#DlgMissing > QPushButton:!enabled,
+#DlgHidden > QPushButton:!enabled,
+#DlgAutoDJ > QPushButton:!enabled,
+#DlgRecording > QPushButton:!enabled,
+#DlgAnalysis > QPushButton:!enabled {
+  color: #444443;
+}
+
+/* Passthrough label on overview waveform */
+WOverview #PassthroughLabel {
+  color: #d09300;
+}
+
+#SkinSettingsButton,
+#DeckSizeButton,
+#SkinSettingsText,
+#SkinSettingsMixerToggle {
+  color: #d2d2d2;
+  }
+  #DeckSizeButton[value="1"] {
+    background-color: #334;
+  }
+
+/************** font colors **************************************************/
+/************** font settings *************************************************/
+
+
+
+
+/************** Button styles *************************************************
+*************** Button borders ************************************************/
+
+#GuiToggleButton[displayValue="0"],
+#RecFeedback[displayValue="0"],
+#BroadcastButton[displayValue="0"],
+#SkinSettingsToggle[displayValue="0"],
+#KeyMatchReset[displayValue="0"],
+#VinylButton[displayValue="0"],
+#VinylModeButton,
+#VinylCueButton[displayValue="0"],
+#FxAssignButtons WPushButton[displayValue="0"],
+WEffectSelector,
+#DlgMissing > QPushButton:enabled,
+#DlgHidden > QPushButton:enabled,
+#DlgAutoDJ > QPushButton:enabled,
+#DlgRecording > QPushButton:enabled,
+#DlgAnalysis > QPushButton:enabled,
+#fadeModeCombobox,
+#CueDeleteButton,
+#LibraryContainer WBeatSpinBox {
+  outline: none;
+  border-width: 2px;
+  border-image: url(skin:/palemoon/buttons/btn_embedded_library.svg) 2 2 2 2;
+  }
+  #LibraryContainer QHeaderView {
+    border-bottom-right-radius: 1px solid #000; /*
+    outline: none;
+    border-width: 1px 0px 1px 0px;
+    border-image: url(skin:/palemoon/buttons/btn_embedded_library_header.svg) 1 1 1 1;  */
+  }
+  #LibraryContainer QHeaderView::section {
+    outline: none;
+    border-width: 1px 2px 1px 1px;
+    border-image: url(skin:/palemoon/buttons/btn_embedded_library_header.svg) 1 2 1 1;
+  }
+  #LibraryContainer QHeaderView::up-arrow,
+  #LibraryContainer QHeaderView::down-arrow {
+    outline: none;
+    border-width: 1px 2px 1px 0px;
+    border-image: url(skin:/palemoon/buttons/btn_embedded_library_header_sort.svg) 1 2 1 1;
+  }
+  /*
+  WPushButton#BpmTap[displayValue="0"] {
+    outline: none;
+    border-width: 2px;
+    border-image: url(skin:/palemoon/buttons/btn_flat_square.svg) 2 2 2 2;
+  } */
+  #DlgMissing > QPushButton:!enabled,
+  #DlgHidden > QPushButton:!enabled,
+  #DlgAutoDJ > QPushButton:!enabled,
+  #DlgRecording > QPushButton:!enabled,
+  #DlgAnalysis > QPushButton:!enabled {
+    outline: none;
+    border-width: 2px;
+    border-image: url(skin:/palemoon/buttons/btn_embedded_library_disabled.svg) 2 2 2 2;
+  }
+  /*
+  WPushButton#BpmTap[displayValue="1"], */
+  #KeyMatchReset[pressed="true"],
+  #VinylButton[displayValue="1"],
+  #VinylButton[displayValue="2"],
+  #VinylCueButton[displayValue="1"],
+  #VinylCueButton[displayValue="2"],
+  #FxAssignButtons WPushButton[displayValue="1"],
+  #GuiToggleButton[displayValue="1"],
+  #RecFeedback[displayValue="1"],
+  #RecFeedback[displayValue="2"],
+  #RecFeedback[displayValue="3"],
+  #BroadcastButton[displayValue="1"],
+  #BroadcastButton[displayValue="2"],
+  #BroadcastButton[displayValue="3"],
+  #SkinSettingsToggle[displayValue="1"],
+  #DlgMissing > QPushButton:pressed,
+  #DlgHidden > QPushButton:pressed,
+  #DlgAutoDJ > QPushButton:pressed,
+  #DlgRecording > QPushButton:pressed,
+  #DlgAnalysis > QPushButton:pressed
+  QPushButton#pushButtonAutoDJ:checked,
+  QPushButton#pushButtonRepeatPlaylist:checked,
+  #DlgAnalysis > QPushButton:checked,
+  QPushButton#pushButtonRecording:checked,
+  #fadeModeCombobox:on,
+  WEffectSelector:on,
+  #CueDeleteButton[pressed="true"] {
+    border-width: 2px;
+    border-image: url(skin:/palemoon/buttons/btn_embedded_library_active.svg) 2 2 2 2;
+  }
+  WEffectSelector,
+  WEffectSelector:on {
+    margin-top: 1px;
+  }
+  WEffectSelector:on {
+    padding-left: 10px;
+  }
+  /* TEST
+      Highlight WEffectSelector when effect is active.
+      Also, the background is dark like dim top-level buttons
+  #FxUnit1 WEffectSelector[highlight="1"],
+  #FxUnit2 WEffectSelector[highlight="1"] {
+    border-image: url(skin:/palemoon/buttons/btn_embedded_fxselector_active_green.svg) 2 2 2 2;
+  }
+  #FxUnit3 WEffectSelector[highlight="1"],
+  #FxUnit4 WEffectSelector[highlight="1"] {
+    border-image: url(skin:/palemoon/buttons/btn_embedded_fxselector_active_blue.svg) 2 2 2 2;
+  }*/
+
+#KeyUp {
+  border-width: 1px 2px 0px 2px;
+  border-image: url(skin:/palemoon/buttons/btn_embedded_library.svg) 1 2 12 2;
+  }
+  #KeyUp[pressed="true"] {
+    border-width: 1px 2px 0px 2px;
+    border-image: url(skin:/palemoon/buttons/btn_embedded_library_active.svg) 1 2 12 2;
+  }
+#KeyDown {
+  border-width: 0px 2px 1px 2px;
+  border-image: url(skin:/palemoon/buttons/btn_embedded_library.svg) 12 2 1 2;
+  }
+  #KeyDown[pressed="true"] {
+    border-width: 0px 2px 1px 2px;
+    border-image: url(skin:/palemoon/buttons/btn_embedded_library_active.svg) 12 2 1 2;
+  }
+
+#BeatgridControls WPushButton, #BeatgridControlsToggle,
+#DeckRow_5_LoopCuesTransport WPushButton,
+#PlayDeck, #PlayIndicator, #PlayBg,
+#CueDeck, #PlayCueMini WPushButton,
+#LoopActivate,
+#RateControls WPushButton,
+#SyncDeck, #SyncSampler,
+#MixerContainer WPushButton,
+#FxUnitContainer WPushButton,
+#SamplerContainer WPushButton,
+#MicAuxRack WPushButton,
+#PlayPreview {
+  /* Limit background-color area to button area designed in SVG backpath. */
+  margin: 1px;
+  /* just to be sure the colored background doesn't overlap the rounded SVG border */
+  border-radius: 2px;
+}
+
+WPushButton#FxExpand,
+WPushButton#SamplerExpand,
+#FxAssignButtons WPushButton,
+#VinylControls WPushButton,
+#KeyControls WPushButton,
+#SamplerSettings WPushButton,
+#SamplerSettingsMini WPushButton,
+WPushButton#CrossfaderButton,
+#LibExpand,
+#ToolBar WPushButton {
+  margin: 0px;
+  border-radius: 0px;
+}
+
+/************** button background colors **************************************/
+
+/* top-level buttons in transport, fx, micaux and others */
+#DeckRow_5_LoopCuesTransport WPushButton[displayValue="0"],
+#PlayBg, #PlayCueMini WPushButton[displayValue="0"],
+#CueDeck[displayValue="0"], #LoopActivate[displayValue="0"],
+#KeyControls WPushButton[displayValue="0"],
+#EQKillButtonBox WPushButton[displayValue="0"],
+WPushButton#QuickEffectButton[displayValue="0"],
+#FxToggleButton[displayValue="0"],
+#SamplerContainer WPushButton[displayValue="0"],
+#MicAuxUnit WPushButton[displayValue="0"],
+#MicAuxUnit WPushButton#CrossfaderButton[value="1"],
+#MicDuckingContainer WPushButton[displayValue="0"],
+/* Beatsize up/down buttons */
+WBeatSpinBox::up-button,
+WBeatSpinBox::down-button {
+  background-color: #121213;
+  }
+  /* dim buttons in top-level containers */
+  #LoopControls WPushButton[displayValue="0"],
+  #BeatjumpControls WPushButton[displayValue="0"],
+  #SyncDeck[value="0"],
+  #MixerDecks WPushButton#CrossfaderButton[value="1"],
+  WBeatSpinBox::up-button,
+  WBeatSpinBox::down-button,
+  WPushButton#LoopActivate[displayValue="0"], /* in compact deck */
+  #FxParameterButton[displayValue="0"],
+  #LibraryContainer QHeaderView,
+  #LibraryContainer QHeaderView::section {
+    background-color: #171719;
+  }
+  /*  even buttons in 2nd level containers */
+  #FxAssignButtons WPushButton[displayValue="0"],
+  #VinylControls WPushButton[displayValue="0"],
+  #KeyControls WPushButton[displayValue="0"],
+  WPushButton#VinylModeButton[displayValue="1"],
+  WPushButton#VinylModeButton[displayValue="2"],
+  WPushButton#HotcueButton[displayValue="0"],
+  WPushButton#SpecialCueButton[displayValue="0"],
+  #RateControls WPushButton[displayValue="0"],
+  #PflButton[displayValue="0"],
+  #MixModeButton[displayValue="0"],
+  #MixModeButton[displayValue="1"],
+  WEffectSelector,
+  #fadeModeCombobox,
+  #SamplerContainer #SyncSampler[displayValue="0"],
+  #SamplerContainer #PflButton[displayValue="0"],
+  #MicAuxUnit #PflButton[displayValue="0"],
+  WPushButton#MicAuxAdd {
+    background-color: #1e1e20;
+  }
+  /* brigth buttons in dimmed containers
+  #BeatgridControls WPushButton[displayValue="0"], */
+  #CueDeleteButton,
+  #MasterControls #FxAssignButtons WPushButton[displayValue="0"],
+  #SplitCue[displayValue="0"],
+  #PlayPreview[displayValue="0"],
+  /* library controls */
+  #spinBoxTransition::up-button,
+  #spinBoxTransition::down-button,
+  QPushButton#pushButtonAutoDJ:enabled:!checked,
+  #DlgMissing > QPushButton:enabled,
+  #DlgHidden > QPushButton:enabled,
+  #DlgAutoDJ > QPushButton:enabled,
+  #DlgRecording > QPushButton:enabled,
+  #DlgAnalysis > QPushButton:enabled {
+    background-color: #222;
+  }
+  /* dark buttons in toolbar */
+  #ToolBar WPushButton[displayValue="0"] {
+    background-color: #151517;
+  }
+
+WPushButton#CrossfaderButton[value="0"] {
+  background-color: #222225;
+}
+
+/* Orange for 'active' status */
+WPushButton#PlayDeck[displayValue="1"],
+WPushButton#PlayDeckMini[displayValue="1"],
+#PlaySampler[displayValue="1"],
+#PlayPreview[displayValue="1"],
+WPushButton#PlayIndicator[displayValue="1"],
+#LibraryPreviewButton:checked,
+#CueDeck[displayValue="1"],
+WPushButton#Reverse[pressed="true"],
+#LoopActivate[value="1"], #Reloop[value="1"],
+#SyncSampler[displayValue="1"],
+#MicTalk[value="1"], #AuxPlay[value="1"],
+#MicDucking[value="1"],
+#MicDucking[value="2"],
+#VinylButton[displayValue="1"],
+QPushButton#pushButtonAutoDJ:checked,
+#DlgAnalysis > QPushButton:checked {
+  background-color: #b24c12;
+}
+/* dim orange for momentary controls */
+#SyncDeck[value="1"],
+WPushButton#LoopIn[pressed="true"],
+WPushButton#LoopOut[pressed="true"],
+#BeatjumpControls WPushButton[value="1"],
+#RateControls WPushButton[value="1"],
+#BeatgridControls WPushButton[pressed="true"],
+#CueDeleteButton[pressed="true"] {
+  background-color: #7d350d;
+}
+/*
+  #BpmTap {
+  background-color: rgba(125, 53, 13, 120);
+}
+*/
+
+/* Red */
+#EQKillButtonBox WPushButton[displayValue="1"],
+QPushButton#pushButtonRecording:checked,
+#RecFeedback[displayValue="2"] {
+  background-color: #a80000;
+}
+
+/* Green for Fx toggles, QuickEffect + Fx12 */
+#FxUnit1 #FxToggleButton[displayValue="1"],
+#FxUnit2 #FxToggleButton[displayValue="1"],
+#BroadcastButton[displayValue="2"] {
+  background-color: #438225;
+  }
+  /* Dim green for assign buttons Fx12 */
+  WPushButton#QuickEffectButton[displayValue="1"],
+  #FxAssignButton1[displayValue="1"],
+  #FxAssignButton2[displayValue="1"] {
+    background-color: #236b00;
+  }
+/* Blue for Fx buttons 3/4 */
+#FxUnit3 #FxToggleButton[displayValue="1"],
+#FxUnit4 #FxToggleButton[displayValue="1"] {
+  background-color: #257b82;
+  }
+  /* Dim blue for assign buttons Fx34 */
+  #FxAssignButton3[displayValue="1"],
+  #FxAssignButton4[displayValue="1"] {
+    background-color: #146674;
+  }
+
+WPushButton#FxSuperLinkButton[value="0"],
+WPushButton#FxSuperLinkInvertButton[displayValue="0"] {
+  background-color: #333;
+  }
+  #FxSuperLinkInvertButton[displayValue="1"] {
+    background-color: #9C0900;
+    }
+
+/* Green for Fx1 / Fx2 */
+#FxUnit1 #FxSuperLinkButton[value="1"],
+#FxUnit2 #FxSuperLinkButton[value="1"] {
+  background-color: #236b00;
+  }
+#FxUnit1 #FxSuperLinkButton[value="2"],
+#FxUnit2 #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 #236b00,
+    stop: 0.33 #236b00,
+    stop: 0.34 #333,
+    stop: 1 #333);
+  }
+#FxUnit1 #FxSuperLinkButton[value="3"],
+#FxUnit2 #FxSuperLinkButton[value="3"] {
+  background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
+    stop: 0 #333,
+    stop: 0.66 #333,
+    stop: 0.67 #236b00,
+    stop: 1 #236b00);
+  }
+#FxUnit1 #FxSuperLinkButton[value="4"],
+#FxUnit2 #FxSuperLinkButton[value="4"] {
+  background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
+    stop: 0 #236b00,
+    stop: 0.330000 #236b00,
+    stop: 0.340000 #333,
+    stop: 0.660000 #333,
+    stop: 0.670000 #236b00,
+    stop: 1 #236b00);
+  }
+
+/* Blue for Fx3 / Fx4 */
+#FxUnit3 #FxSuperLinkButton[value="1"],
+#FxUnit4 #FxSuperLinkButton[value="1"] {
+  background-color: #146674;
+  }
+#FxUnit3 #FxSuperLinkButton[value="2"],
+#FxUnit4 #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 #146674,
+    stop: 0.33 #146674,
+    stop: 0.34 #333,
+    stop: 1 #333);
+  }
+#FxUnit3 #FxSuperLinkButton[value="3"],
+#FxUnit4 #FxSuperLinkButton[value="3"] {
+  background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
+    stop: 0 #333,
+    stop: 0.66 #333,
+    stop: 0.67 #146674,
+    stop: 1 #146674);
+  }
+#FxUnit3 #FxSuperLinkButton[value="4"],
+#FxUnit4 #FxSuperLinkButton[value="4"] {
+  background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
+    stop: 0 #146674,
+    stop: 0.330000 #146674,
+    stop: 0.340000 #333,
+    stop: 0.660000 #333,
+    stop: 0.670000 #146674,
+    stop: 1 #146674);
+  }
+
+/* Yellow */
+#RecFeedback[displayValue="1"],   /* initialize recording */
+#BroadcastButton[displayValue="1"]   /* connecting */ {
+  background-color: #d09300;
+}
+
+#SpecialCueButton[value="1"] {  /*
+  background-color: #3166ab;
+  background-color: #2b5a97;  */
+  background-color: #395579;
+}
+
+/* pink */
+#BroadcastButton[displayValue="3"],
+#RecFeedback[displayValue="3"] { /* failure */
+  background-color: #f856e7;
+}
+
+/* Pale blue for GUI toggles */
+#GuiToggleButton[displayValue="1"],
+#SkinSettingsToggle[displayValue="1"] {
+  background-color: #216e75;
+  background-color: #555;
+}
+
+/* Grey */
+#VinylCueButton[displayValue="1"],
+#VinylCueButton[displayValue="2"],
+#PflButton[value="1"],
+#FxParameterButton[displayValue="1"],
+QPushButton#pushButtonRepeatPlaylist:checked {
+  background-color: #666;
+}
+
+/* Darker grey */
+#SplitCue[value="1"] {
+  background-color: #555;
+}
+
+/* Special flat buttons */
+#BeatgridControlsToggle,
+WPushButton#PlayDeck[displayValue="0"],
+WPushButton#PlayDeckMini[displayValue="0"],
+WPushButton#PlayIndicator[value="0"],
+/*
+WPushButton#BpmTap[displayValue="0"],
+*/
+WPushButton#FxFocusButton[displayValue="0"],
+#SamplerSettings WPushButton[displayValue="0"],
+#SamplerSettingsMini WPushButton[displayValue="0"],
+WPushButton#FxExpand[displayValue="0"],
+WPushButton#SamplerExpand[displayValue="0"],
+WPushButton#RecButton[displayValue="0"],
+WPushButton#RecButton[displayValue="1"],
+#RecDot {
+  background-color: transparent;
+}
+
+/************** Button icons **************************************************/
+#PlayDeck[displayValue="0"] {
+  image: url(skin:/palemoon/buttons/btn__play_deck.svg) no-repeat center center;
+  }
+  #PlayDeck[displayValue="1"] {
+    image: url(skin:/palemoon/buttons/btn__play_deck_active.svg) no-repeat center center;
+  }
+
+#PlayDeckMini[value="0"] {
+  image: url(skin:/palemoon/buttons/btn__play_deck_mini.svg) no-repeat center center;
+  }
+  #PlayDeckMini[value="1"] {
+    image: url(skin:/palemoon/buttons/btn__pause_deck_mini.svg) no-repeat center center;
+  }
+#PlaySampler[value="0"],
+#PlayPreview[displayValue="0"] {
+  image: url(skin:/palemoon/buttons/btn__play_sampler.svg) no-repeat center center;
+  }
+  #PlaySampler[value="1"],
+  #PlayPreview[displayValue="1"] {
+    image: url(skin:/palemoon/buttons/btn__pause_sampler.svg) no-repeat center center;
+  }
+
+#CueDeck[displayValue="0"] {
+  image: url(skin:/palemoon/buttons/btn__cue_deck.svg) no-repeat center center;
+  }
+  #CueDeck[displayValue="1"] {
+    image: url(skin:/palemoon/buttons/btn__cue_deck_active.svg) no-repeat center center;
+  }
+
+#Reverse {
+  image: url(skin:/palemoon/buttons/btn__reverse.svg) no-repeat center center;
+  }
+  #Reverse[pressed="true"] {
+    image: url(skin:/palemoon/buttons/btn__reverse_active.svg) no-repeat center center;
+  }
+
+#Hotcue1 WPushButton[displayValue="0"] {
+  image: url(skin:/palemoon/buttons/btn__1.svg) no-repeat center center;
+  }
+  #Hotcue1 WPushButton[displayValue="1"] {
+    image: url(skin:/palemoon/buttons/btn__1_active.svg) no-repeat center center;
+  }
+  #Hotcue1 WPushButton[displayValue="1"][dark="true"] {
+    image: url(skin:/palemoon/buttons/btn__1_active_dark.svg) no-repeat center center;
+  }
+
+#Hotcue2 WPushButton[displayValue="0"] {
+  image: url(skin:/palemoon/buttons/btn__2.svg) no-repeat center center;
+  }
+  #Hotcue2 WPushButton[displayValue="1"] {
+    image: url(skin:/palemoon/buttons/btn__2_active.svg) no-repeat center center;
+  }
+  #Hotcue2 WPushButton[displayValue="1"][dark="true"] {
+    image: url(skin:/palemoon/buttons/btn__2_active_dark.svg) no-repeat center center;
+  }
+
+#Hotcue3 WPushButton[displayValue="0"] {
+  image: url(skin:/palemoon/buttons/btn__3.svg) no-repeat center center;
+  }
+  #Hotcue3 WPushButton[displayValue="1"] {
+    image: url(skin:/palemoon/buttons/btn__3_active.svg) no-repeat center center;
+  }
+  #Hotcue3 WPushButton[displayValue="1"][dark="true"] {
+    image: url(skin:/palemoon/buttons/btn__3_active_dark.svg) no-repeat center center;
+  }
+
+#Hotcue4 WPushButton[displayValue="0"] {
+  image: url(skin:/palemoon/buttons/btn__4.svg) no-repeat center center;
+  }
+  #Hotcue4 WPushButton[displayValue="1"] {
+    image: url(skin:/palemoon/buttons/btn__4_active.svg) no-repeat center center;
+  }
+  #Hotcue4 WPushButton[displayValue="1"][dark="true"] {
+    image: url(skin:/palemoon/buttons/btn__4_active_dark.svg) no-repeat center center;
+  }
+
+#Hotcue5 WPushButton[displayValue="0"] {
+  image: url(skin:/palemoon/buttons/btn__5.svg) no-repeat center center;
+  }
+  #Hotcue5 WPushButton[displayValue="1"] {
+    image: url(skin:/palemoon/buttons/btn__5_active.svg) no-repeat center center;
+  }
+  #Hotcue5 WPushButton[displayValue="1"][dark="true"] {
+    image: url(skin:/palemoon/buttons/btn__5_active_dark.svg) no-repeat center center;
+  }
+
+#Hotcue6 WPushButton[displayValue="0"] {
+  image: url(skin:/palemoon/buttons/btn__6.svg) no-repeat center center;
+  }
+  #Hotcue6 WPushButton[displayValue="1"] {
+    image: url(skin:/palemoon/buttons/btn__6_active.svg) no-repeat center center;
+  }
+  #Hotcue6 WPushButton[displayValue="1"][dark="true"] {
+    image: url(skin:/palemoon/buttons/btn__6_active_dark.svg) no-repeat center center;
+  }
+
+#Hotcue7 WPushButton[displayValue="0"] {
+  image: url(skin:/palemoon/buttons/btn__7.svg) no-repeat center center;
+  }
+  #Hotcue7 WPushButton[displayValue="1"] {
+    image: url(skin:/palemoon/buttons/btn__7_active.svg) no-repeat center center;
+  }
+  #Hotcue7 WPushButton[displayValue="1"][dark="true"] {
+    image: url(skin:/palemoon/buttons/btn__7_active_dark.svg) no-repeat center center;
+  }
+
+#Hotcue8 WPushButton[displayValue="0"] {
+  image: url(skin:/palemoon/buttons/btn__8.svg) no-repeat center center;
+  }
+  #Hotcue8 WPushButton[displayValue="1"] {
+    image: url(skin:/palemoon/buttons/btn__8_active.svg) no-repeat center center;
+  }
+  #Hotcue8 WPushButton[displayValue="1"][dark="true"] {
+    image: url(skin:/palemoon/buttons/btn__8_active_dark.svg) no-repeat center center;
+  }
+
+#SpecialCueButton_intro_start WPushButton[displayValue="0"] {
+  image: url(skin:/palemoon/buttons/btn__intro_start.svg) no-repeat center center;
+  }
+  #SpecialCueButton_intro_start WPushButton[displayValue="1"] {
+    image: url(skin:/palemoon/buttons/btn__intro_start_active.svg) no-repeat center center;
+  }
+#SpecialCueButton_intro_end WPushButton[displayValue="0"] {
+  image: url(skin:/palemoon/buttons/btn__intro_end.svg) no-repeat center center;
+  }
+  #SpecialCueButton_intro_end WPushButton[displayValue="1"] {
+    image: url(skin:/palemoon/buttons/btn__intro_end_active.svg) no-repeat center center;
+  }
+#SpecialCueButton_outro_start WPushButton[displayValue="0"] {
+  image: url(skin:/palemoon/buttons/btn__outro_start.svg) no-repeat center center;
+  }
+  #SpecialCueButton_outro_start WPushButton[displayValue="1"] {
+    image: url(skin:/palemoon/buttons/btn__outro_start_active.svg) no-repeat center center;
+  }
+#SpecialCueButton_outro_end WPushButton[displayValue="0"] {
+  image: url(skin:/palemoon/buttons/btn__outro_end.svg) no-repeat center center;
+  }
+  #SpecialCueButton_outro_end WPushButton[displayValue="1"] {
+    image: url(skin:/palemoon/buttons/btn__outro_end_active.svg) no-repeat center center;
+  }
+
+#LoopActivate[displayValue="0"] {
+  image: url(skin:/palemoon/buttons/btn__loop.svg) no-repeat center center;
+  }
+  #LoopActivate[displayValue="1"], #LoopActivate[pressed="true"] {
+    image: url(skin:/palemoon/buttons/btn__loop_active.svg) no-repeat center center;
+  }
+#Reloop[displayValue="0"] {
+  image: url(skin:/palemoon/buttons/btn__reloop.svg) no-repeat center center;
+  }
+  #Reloop[displayValue="1"] {
+    image: url(skin:/palemoon/buttons/btn__reloop_active.svg) no-repeat center center;
+  }
+
+#LoopIn {
+  image: url(skin:/palemoon/buttons/btn__loop_in.svg) no-repeat center center;
+  }
+  #LoopIn[pressed="true"] {
+    image: url(skin:/palemoon/buttons/btn__loop_in_active.svg) no-repeat center center;
+  }
+#LoopOut {
+  image: url(skin:/palemoon/buttons/btn__loop_out.svg) no-repeat center center;
+  }
+  #LoopOut[pressed="true"] {
+    image: url(skin:/palemoon/buttons/btn__loop_out_active.svg) no-repeat center center;
+  }
+
+#JumpForward {
+  image: url(skin:/palemoon/buttons/btn__jump_right.svg) no-repeat center center;
+  }
+  #JumpForward[pressed="true"] {
+    image: url(skin:/palemoon/buttons/btn__jump_right_active.svg) no-repeat center center;
+  }
+#JumpBack {
+  image: url(skin:/palemoon/buttons/btn__jump_left.svg) no-repeat center center;
+  }
+  #JumpBack[pressed="true"] {
+    image: url(skin:/palemoon/buttons/btn__jump_left_active.svg) no-repeat center center;
+  }
+
+/* Key buttons */
+#KeyMatchReset {
+  image: url(skin:/palemoon/buttons/btn__key_match.svg) no-repeat center center;
+  }
+  #KeyMatchReset[pressed="true"] {
+    image: url(skin:/palemoon/buttons/btn__key_match_active.svg) no-repeat center center;
+  }
+
+#KeyUp {
+  image: url(skin:/palemoon/buttons/btn__key_up.svg) no-repeat center center;
+  }
+  #KeyUp[pressed="true"] {
+    image: url(skin:/palemoon/buttons/btn__key_up_active.svg) no-repeat center center;
+  }
+
+#KeyDown {
+  image: url(skin:/palemoon/buttons/btn__key_down.svg) no-repeat center center;
+  }
+  #KeyDown[pressed="true"] {
+    image: url(skin:/palemoon/buttons/btn__key_down_active.svg) no-repeat center center;
+  }
+
+/* Rate buttons */
+#SyncDeck[displayValue="0"] {
+  image: url(skin:/palemoon/buttons/btn__sync_deck.svg) no-repeat center center;
+  }
+  #SyncDeck[displayValue="1"] {
+    image: url(skin:/palemoon/buttons/btn__sync_deck_active.svg) no-repeat center center;
+  }
+
+  #SyncSampler {
+    image: url(skin:/palemoon/buttons/btn__sync_sampler.svg) no-repeat center center;
+    }
+    #SyncSampler[displayValue="1"] {
+      image: url(skin:/palemoon/buttons/btn__sync_sampler_active.svg) no-repeat center center;
+    }
+
+  #RatePermUp {
+    image: url(skin:/palemoon/buttons/btn__plus.svg) no-repeat center center;}
+  #RatePermUp[pressed="true"] {
+    image: url(skin:/palemoon/buttons/btn__plus_active.svg) no-repeat center center;
+    }
+
+  #RatePermDown {
+    image: url(skin:/palemoon/buttons/btn__minus.svg) no-repeat center center;}
+  #RatePermDown[pressed="true"] {
+    image: url(skin:/palemoon/buttons/btn__minus_active.svg) no-repeat center center;
+    }
+
+  #RateTempUp {
+    image: url(skin:/palemoon/buttons/btn__arrow_right_up.svg) no-repeat center center;}
+  #RateTempUp[pressed="true"] {
+    image: url(skin:/palemoon/buttons/btn__arrow_right_up_active.svg) no-repeat center center;
+    }
+  #RateTempDown {
+    image: url(skin:/palemoon/buttons/btn__arrow_left_down.svg) no-repeat center center;}
+  #RateTempDown[pressed="true"] {
+    image: url(skin:/palemoon/buttons/btn__arrow_left_down_active.svg) no-repeat center center;
+    }
+
+  #RateTempUpRev {
+    image: url(skin:/palemoon/buttons/btn__arrow_right_down.svg) no-repeat center center;}
+  #RateTempUpRev[pressed="true"] {
+    image: url(skin:/palemoon/buttons/btn__arrow_right_down_active.svg) no-repeat center center;
+    }
+
+  #RateTempDownRev {
+    image: url(skin:/palemoon/buttons/btn__arrow_left_up.svg) no-repeat center center;
+    }
+    #RateTempDownRev[pressed="true"] {
+      image: url(skin:/palemoon/buttons/btn__arrow_left_up_active.svg) no-repeat center center;
+    }
+
+/* Mixer buttons */
+#PflButton[value="0"] {
+  image: url(skin:/palemoon/buttons/btn__pfl.svg) no-repeat center center;
+  }
+  #PflButton[value="1"] {
+    image: url(skin:/palemoon/buttons/btn__pfl_active.svg) no-repeat center center;
+  }
+
+#QuickEffectButton[displayValue="0"] {
+  image: url(skin:/palemoon/buttons/btn__star.svg) no-repeat center center;
+}
+
+/* EQ Kill button icons H / M / L */
+#EQKillButton_High[displayValue="0"] {
+  image: url(skin:/palemoon/buttons/btn__eq_kill_high.svg) no-repeat center center;
+}
+#EQKillButton_Mid[displayValue="0"] {
+  image: url(skin:/palemoon/buttons/btn__eq_kill_mid.svg) no-repeat center center;
+}
+#EQKillButton_Low[displayValue="0"] {
+  image: url(skin:/palemoon/buttons/btn__eq_kill_low.svg) no-repeat center center;
+}
+
+/* EQ Kill / QuickEffect dots */
+#EQKillDot[displayValue="0"],
+#QuickEffectDot[displayValue="0"] {
+  image: url(skin:/palemoon/buttons/btn__eq_kill_dot_off.svg) no-repeat center center;
+  }
+  #EQKillDot[displayValue="1"] {
+    image: url(skin:/palemoon/buttons/btn__eq_kill_dot_active_red.svg) no-repeat center center;
+  }
+  #QuickEffectDot[displayValue="1"] {
+    image: url(skin:/palemoon/buttons/btn__eq_kill_dot_active_green.svg) no-repeat center center;
+  }
+
+#RateCenter[highlight="0"] {
+  image: url(skin:/palemoon/buttons/btn__rate_center_off.svg) no-repeat center center;
+  }
+  #RateCenter[highlight="1"] {
+    image: url(skin:/palemoon/buttons/btn__rate_center_cyan.svg) no-repeat center center;
+  }
+
+#SplitCue[value="0"] {
+  image: url(skin:/palemoon/buttons/btn__split.svg) no-repeat center center;
+  }
+  #SplitCue[value="1"] {
+    image: url(skin:/palemoon/buttons/btn__split_active.svg) no-repeat center center;
+  }
+
+#FxExpand[value="0"],
+#SamplerExpand[value="0"],
+#LibExpand[value="0"] {
+  image: url(skin:/palemoon/buttons/btn__expand_dim.svg) no-repeat center center;
+  }
+  #FxExpand[value="1"],
+  #SamplerExpand[value="1"],
+  #LibExpand[value="1"] {
+    image: url(skin:/palemoon/buttons/btn__collapse_dim.svg) no-repeat center center;
+  }
+
+#MixModeButton[value="0"] {
+  image: url(skin:/palemoon/buttons/btn__fx_mixmode_d-w.svg) no-repeat center center;
+  }
+  #MixModeButton[value="1"] {
+    image: url(skin:/palemoon/buttons/btn__fx_mixmode_d+w.svg) no-repeat center center;
+  }
+
+#FxToggleButton[value="0"] {
+  image: url(skin:/palemoon/buttons/btn__fx_toggle.svg) no-repeat center center;
+  }
+  #FxToggleButton[value="1"] {
+    image: url(skin:/palemoon/buttons/btn__fx_toggle_active.svg) no-repeat center center;
+  }
+
+#FxFocusButton[value="0"] {
+  image: url(skin:/palemoon/buttons/btn__fx_focus.svg) no-repeat center center;
+  }
+  #FxFocusButton[value="1"] {
+    image: url(skin:/palemoon/buttons/btn__fx_focus_active.svg) no-repeat center center;
+  }
+
+/* deck controls for decks 1-4 and samplers */
+#CurposButton12[displayValue="0"], #CurposButton34[displayValue="0"] {
+  image: url(skin:/palemoon/buttons/btn__beat_curpos.svg) no-repeat center center;
+  }
+  #CurposButton12[value="1"] {
+    image: url(skin:/palemoon/buttons/btn__beat_curpos_active_12.svg) no-repeat center center;
+  }
+  #CurposButton34[value="1"] {
+    image: url(skin:/palemoon/buttons/btn__beat_curpos_active_34.svg) no-repeat center center;
+  }
+
+  #EjectButton12[displayValue="0"], #EjectButton34[displayValue="0"] {
+    image: url(skin:/palemoon/buttons/btn__eject.svg) no-repeat center center;
+    }
+    #EjectButton12[value="1"] {
+      image: url(skin:/palemoon/buttons/btn__eject_active_12.svg) no-repeat center center;
+    }
+    #EjectButton34[value="1"] {
+      image: url(skin:/palemoon/buttons/btn__eject_active_34.svg) no-repeat center center;
+    }
+
+  #RepeatButton12[displayValue="0"], #RepeatButton34[displayValue="0"] {
+    image: url(skin:/palemoon/buttons/btn__repeat.svg) no-repeat center center;
+    }
+    #RepeatButton12[displayValue="1"] {
+      image: url(skin:/palemoon/buttons/btn__repeat_active_12.svg) no-repeat center center;
+    }
+    #RepeatButton34[displayValue="1"] {
+      image: url(skin:/palemoon/buttons/btn__repeat_active_34.svg) no-repeat center center;
+    }
+
+  #QuantizeButton12[displayValue="0"], #QuantizeButton34[displayValue="0"] {
+    image: url(skin:/palemoon/buttons/btn__quantize.svg) no-repeat center center;
+    }
+    #QuantizeButton12[displayValue="1"] {
+      image: url(skin:/palemoon/buttons/btn__quantize_active_12.svg) no-repeat center center;
+    }
+    #QuantizeButton34[displayValue="1"] {
+      image: url(skin:/palemoon/buttons/btn__quantize_active_34.svg) no-repeat center center;
+    }
+
+  #SlipmodeButton12[displayValue="0"], #SlipmodeButton34[displayValue="0"] {
+    image: url(skin:/palemoon/buttons/btn__slip.svg) no-repeat center center;
+    }
+    #SlipmodeButton12[displayValue="1"] {
+      image: url(skin:/palemoon/buttons/btn__slip_active_12.svg) no-repeat center center;
+    }
+    #SlipmodeButton34[displayValue="1"] {
+      image: url(skin:/palemoon/buttons/btn__slip_active_34.svg) no-repeat center center;
+    }
+
+  #KeylockButton12[displayValue="0"], #KeylockButton34[displayValue="0"] {
+    image: url(skin:/palemoon/buttons/btn__keylock.svg) no-repeat center center;
+    }
+    #KeylockButton12[displayValue="1"] {
+      image: url(skin:/palemoon/buttons/btn__keylock_active_12.svg) no-repeat center center;
+    }
+    #KeylockButton34[displayValue="1"] {
+      image: url(skin:/palemoon/buttons/btn__keylock_active_34.svg) no-repeat center center;
+    }
+
+#BeatgridControlsToggle[displayValue="0"] {
+  image: url(skin:/palemoon/buttons/btn__beatgrid_controls_expand.svg) no-repeat center center;
+  }
+  #BeatgridControlsToggle[displayValue="1"] {
+    image: url(skin:/palemoon/buttons/btn__beatgrid_controls_collapse.svg) no-repeat center center;
+  }
+
+  #BeatCurposLarge[displayValue="0"] {
+    image: url(skin:/palemoon/buttons/btn__beat_curpos_large.svg) no-repeat center center;
+    }
+    #BeatCurposLarge[pressed="true"] {
+      image: url(skin:/palemoon/buttons/btn__beat_curpos_large_active.svg) no-repeat center center;
+    }
+
+  #BeatsEarlier {
+    image: url(skin:/palemoon/buttons/btn__beats_earlier.svg) no-repeat center center;
+    }
+    #BeatsEarlier[pressed="true"] {
+      image: url(skin:/palemoon/buttons/btn__beats_earlier_active.svg) no-repeat center center;
+    }
+
+  #BeatsLater {
+    image: url(skin:/palemoon/buttons/btn__beats_later.svg) no-repeat center center;
+    }
+    #BeatsLater[pressed="true"] {
+      image: url(skin:/palemoon/buttons/btn__beats_later_active.svg) no-repeat center center;
+    }
+
+  #BeatsSlower {
+    image: url(skin:/palemoon/buttons/btn__beats_slower.svg) no-repeat center center;
+    }
+    #BeatsSlower[pressed="true"] {
+      image: url(skin:/palemoon/buttons/btn__beats_slower_active.svg) no-repeat center center;
+    }
+
+  #BeatsFaster {
+    image: url(skin:/palemoon/buttons/btn__beats_faster.svg) no-repeat center center;
+    }
+    #BeatsFaster[pressed="true"] {
+      image: url(skin:/palemoon/buttons/btn__beats_faster_active.svg) no-repeat center center;
+    }
+  #HotcuesEarlier {
+    image: url(skin:/palemoon/buttons/btn__beats_hotcues_earlier.svg) no-repeat center center;
+  }
+    #HotcuesEarlier[pressed="true"] {
+      image: url(skin:/palemoon/buttons/btn__beats_hotcues_earlier_active.svg) no-repeat center center;
+    }
+  #HotcuesLater {
+    image: url(skin:/palemoon/buttons/btn__beats_hotcues_later.svg) no-repeat center center;
+  }
+    #HotcuesLater[pressed="true"] {
+      image: url(skin:/palemoon/buttons/btn__beats_hotcues_later_active.svg) no-repeat center center;
+    }
+
+#MicTalk[displayValue="0"] {
+  image: url(skin:/palemoon/buttons/btn__mic_talk.svg) no-repeat center center;
+  }
+  #MicTalk[displayValue="1"] {
+    image: url(skin:/palemoon/buttons/btn__mic_talk_active.svg) no-repeat center center;
+  }
+
+#AuxPlay[displayValue="0"] {
+  image: url(skin:/palemoon/buttons/btn__aux_play.svg) no-repeat center center;
+  }
+  #AuxPlay[displayValue="1"] {
+    image: url(skin:/palemoon/buttons/btn__aux_play_active.svg) no-repeat center center;
+  }
+
+#MicAuxAdd {
+  image: url(skin:/palemoon/buttons/btn__plus_flat.svg) no-repeat center center;
+}
+
+#MicDucking[value="0"] {
+  image: url(skin:/palemoon/buttons/btn__mic_duck_off.svg) no-repeat center center;
+  }
+  #MicDucking[value="1"] {
+    image: url(skin:/palemoon/buttons/btn__mic_duck_auto.svg) no-repeat center center;
+  }
+  #MicDucking[value="2"] {
+    image: url(skin:/palemoon/buttons/btn__mic_duck_manual.svg) no-repeat center center;
+  }
+
+#RecDot[highlight="0"] {
+  image: url(skin:/palemoon/buttons/btn__rec_dot.svg) no-repeat center center;
+  }
+  #RecDot[highlight="1"], #RecDot[highlight="2"] {
+    image: url(skin:/palemoon/buttons/btn__rec_dot_active.svg) no-repeat center center;
+  }
+
+#SkinSettingsToggle[displayValue="0"] {
+  /* for some reason the alignment isn't rescpected, so the icons
+    have to be sized like available area (76x16px) */
+  image: url(skin:/palemoon/buttons/btn__settings_off.svg) no-repeat left top;
+  }
+  #SkinSettingsToggle[displayValue="1"] {
+    image: url(skin:/palemoon/buttons/btn__settings_on.svg) no-repeat left top;
+  }
+
+#ToolbarLogo {
+  image: url(skin:/palemoon/style/mixxx_logo_small.svg) no-repeat center center;
+}
+
+WSearchLineEdit QToolButton:!focus {
+  image: url(skin:/palemoon/buttons/btn__lib_clear_search.svg);
+  }
+  WSearchLineEdit QToolButton:focus {
+    image: url(skin:/palemoon/buttons/btn__lib_clear_search_focus.svg);
+  }
+
+/* AutoDJ button icons */
+QPushButton#pushButtonAutoDJ:!checked {
+  image: url(skin:/palemoon/buttons/btn__autodj_enable_off.svg) no-repeat center center;
+  }
+  QPushButton#pushButtonAutoDJ:checked {
+    image: url(skin:/palemoon/buttons/btn__autodj_enable_on.svg) no-repeat center center;
+  }
+
+QPushButton#pushButtonFadeNow:!enabled {
+  image: url(skin:/palemoon/buttons/btn__autodj_fade_disabled.svg) no-repeat center center;
+  }
+  QPushButton#pushButtonFadeNow:enabled {
+    image: url(skin:/palemoon/buttons/btn__autodj_fade.svg) no-repeat center center;
+  }
+
+QPushButton#pushButtonSkipNext:!enabled {
+  image: url(skin:/palemoon/buttons/btn__autodj_skip_disabled.svg) no-repeat center center;
+  }
+  QPushButton#pushButtonSkipNext:enabled {
+    image: url(skin:/palemoon/buttons/btn__autodj_skip.svg) no-repeat center center;
+  }
+
+QPushButton#pushButtonShuffle:enabled {
+  image: url(skin:/palemoon/buttons/btn__autodj_shuffle.svg) no-repeat center center;
+}
+
+QPushButton#pushButtonAddRandom:enabled {
+  image: url(skin:/palemoon/buttons/btn__autodj_addrandom.svg) no-repeat center center;
+}
+
+QPushButton#pushButtonRepeatPlaylist:!checked {
+  image: url(skin:/palemoon/buttons/btn__autodj_repeat_playlist_off.svg) no-repeat center center;
+  }
+  QPushButton#pushButtonRepeatPlaylist:checked {
+    image: url(skin:/palemoon/buttons/btn__autodj_repeat_playlist_on.svg) no-repeat center center;
+  }
+/* AutoDJ button icons */
+
+/* widgets in cue popup menu */
+#CueDeleteButton {
+  qproperty-icon: url(skin:/palemoon/buttons/btn__delete.svg);
+  width: 24px;
+  height: 42px;
+  /* make the icon slightly larger than default 16px */
+  qproperty-iconSize: 20px;
+}
+/*    */
+#CueLabelEdit {
+  border: 1px solid #c2b3a5;
+  border-radius: 0px;
+  background-color: #000;
+  selection-color: #000;
+  selection-background-color: #ccc;
+  padding: 2px;
+}
+/************** Button icons **************************************************/
+/************** Button styles *************************************************/
+
+
+
+/************** Library *********************************************/
+#LibrarySingleton {
+  /* This doesn't work as expected:
+  it appears LibrarySingleton is displayed twice (nested in itself),
+  so padding/margin would double.
+  Placed a plain spacer in library.xml which works reliably
+  padding-top: 5px;*/
+}
+
+#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 #080808,
+    stop:1 #1e1e1e); */
+}
+
+#LibraryContainer QTableView,
+#LibraryContainer QTextBrowser,
+#LibraryContainer QTreeView { /*
+  border-top: 1px solid #0a0a0a;
+  border-right: 1px solid qlineargradient(x1:0, y1:0, x2:0, y2:1,
+    stop:0 #333,
+    stop:1 #444);
+  border-bottom: 1px solid #444;
+  border-left: 1px solid #0a0a0a; */
+  alternate-background-color: #0a0a0a;
+  selection-background-color: #2c454f;
+}
+
+#LibraryContainer QTableView:focus,
+#LibraryContainer QTreeView:focus,
+#LibraryContainer QTextBrowser:focus {
+  border: 1px solid #257b82;
+}
+
+#LibraryContainer QTreeView {
+  show-decoration-selected: 0;
+}
+
+/* selected items in Tree and Tracks table */
+#LibraryContainer QTreeView::item:selected,
+#LibraryContainer QTableView::item:selected,
+#LibraryBPMButton::item:selected {
+/* this doesn't style BPM value in selected row
+#LibraryContainer QTableView::item:selected #LibraryBPMSpinBox::item:selected,
+#LibraryContainer QTableView::item:selected > #LibraryBPMSpinBox::item:selected */
+  color: #fff;
+  background-color: #2c454f;
+}
+
+/* checkbox in library "Played" column */
+#LibraryContainer QTableView::indicator {/*
+  This results in 10x10px + 1px border = 12x12px
+  Omitting this definitions makes the checkbox grow to
+  12x12px + 1px border = 14x14px
+  which also miraculously makes the BPM icon grow to 14x14px
+  Neither checkbox nor BPM icon size have an effect on the size... */
+  width: 10px;
+  height: 10px;
+  /* border is added to size defined above */
+  border: 1px solid transparent;
+  margin: 0px;
+  padding: 0px;
+  }
+  #LibraryContainer QTableView::indicator:checked,
+  #LibraryContainer QTableView::indicator:checked:selected {
+    image: url(skin:/palemoon/buttons/btn__lib_checkmark_blue.svg);
+    }
+  #LibraryContainer QTableView::indicator:unchecked {
+    image: none;
+    border: 1px solid rgba(151,151,151,128);
+    }
+
+/* Table cell in edit mode */
+WLibrary QLineEdit,
+#LibraryBPMSpinBox {
+  color: #ddd;
+  background-color: #0f0f0f;
+  selection-color: #000;
+  selection-background-color: #ccc;
+  border: 1px solid #2c454f;
+}
+
+/* Entire BPM cell */
+/* Lock icon at the left */
+#LibraryBPMButton::indicator:checked {
+  image: url(skin:/palemoon/buttons/btn__lib_bpm_locked_orange.svg);
+  }
+#LibraryBPMButton::indicator:unchecked {
+  image: url(skin:/palemoon/buttons/btn__lib_bpm_unlocked_grey.svg);
+  }
+/* BPM value */
+#LibraryBPMButton::item {
+  }
+#LibraryBPMSpinBox {
+  border-width: 1px 2px 1px 0px;
+}
+/* When activated, the left border of the spinbox shows an
+  artefact of the inactive BPM value. */
+#LibraryBPMSpinBox::up-button,
+#LibraryBPMSpinBox::down-button {
+  margin-right: 2px;  /*
+  background-color: #19272d;  */
+  }
+  #LibraryBPMSpinBox::up-button {
+    image: url(skin:/palemoon/buttons/btn__lib_spinbox_up.svg) no-repeat center center;
+    }
+  #LibraryBPMSpinBox::down-button {
+    image: url(skin:/palemoon/buttons/btn__lib_spinbox_down.svg) no-repeat center center;
+    }
+
+/* remove OS focus indicator from BPM cell */
+WLibrary QCheckBox,
+#LibraryBPMButton::item:selected,
+WCueMenuPopup QPushButton:focus {
+  outline: none;
+}
+
+/* Button in library "Preview" column */
+#LibraryPreviewButton {
+  margin: 0px;
+  padding: 0px;
+  border-radius: 2px;
+  border: 1px solid transparent;
+  }
+  #LibraryPreviewButton:!checked {
+    image: url(skin:/palemoon/buttons/btn__lib_preview_play.svg);
+    }
+  #LibraryPreviewButton:checked {
+    image: url(skin:/palemoon/buttons/btn__lib_preview_pause.svg);
+    }
+
+
+/*********** table header styles *********************************/
+
+#LibraryContainer QHeaderView { /*
+  border-bottom: 1px solid #000;
+  }
+  #LibraryContainer QHeaderView::up-arrow,
+  #LibraryContainer QHeaderView::down-arrow {
+    background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
+      stop:0 #222,
+      stop:1 #111);
+  }
+  #LibraryContainer QHeaderView::section {
+    padding-top: 2px 1px 0px 2px;
+    border-right: 1px solid #000;
+    border-bottom: 1px solid #000; */
+  }
+  #LibraryContainer QHeaderView::up-arrow,
+  #LibraryContainer QHeaderView::down-arrow {/*
+    border-right: 1px solid #000;*/
+    /* left > right gradient to fade out the header section label
+    background-color: qlineargradient(
+      x0: 0, y1: 0,
+      x2: 1, y2:0,
+      stop: 0     rgba(17,17,17,0),
+      stop: 0.2   rgba(17,17,17,0),
+      stop: 0.21  rgba(17,17,17,190),
+      stop: 1     rgba(17,17,17,255));
+    background-color: rgba(23, 23, 25, 190); */
+    }
+    #LibraryContainer QHeaderView::up-arrow {
+      image: url(skin:/palemoon/buttons/btn__lib_sort_up.svg);
+      }
+    #LibraryContainer QHeaderView::down-arrow {
+      image: url(skin:/palemoon/buttons/btn__lib_sort_down.svg);
+    }
+
+
+
+/*********** scrollbars *********************************/
+#LibraryContainer QScrollBar,
+WEffectSelector QAbstractScrollArea QScrollBar {
+  border: 0px solid #585858;
+  background: #000;
+  border-radius: 2px;
+  padding: 1px;
+  color: #999999;
+  }
+  #LibraryContainer QScrollBar:horizontal,
+  WEffectSelector QAbstractScrollArea QScrollBar:horizontal {
+    min-width: 12px;
+    height: 15px;
+    border-top-left-radius: 0px;
+    border-top-right-radius: 0px;
+    background-color: #000;
+  }
+  #LibraryContainer QScrollBar:vertical,
+  WEffectSelector QAbstractScrollArea QScrollBar:vertical {
+    min-height: 12px;
+    width: 15px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+    color: #b3b3b3;
+    background-color: #000;
+  }
+  /* catch scroll bar of focused treeview like this:
+  #LibraryContainer QTreeView:focus QScrollBar:vertical {
+  }*/
+#LibraryContainer QScrollBar::handle:horizontal,
+WEffectSelector QAbstractScrollArea QScrollBar::handle:horizontal,
+#LibraryContainer QScrollBar::handle:vertical,
+WEffectSelector QAbstractScrollArea QScrollBar::handle:vertical {
+  border-radius: 2px;
+  background: #2c454f; /*
+  background: qlineargradient(x1:0, y1:0, x2:0, y2:1,
+    stop:0 #725309,
+    stop:1 #412f05);  */
+  }
+  #LibraryContainer QScrollBar::handle:horizontal,
+  WEffectSelector QAbstractScrollArea QScrollBar::handle:horizontal {
+    min-width: 25px;
+  }
+  #LibraryContainer QScrollBar::handle:vertical,
+  WEffectSelector QAbstractScrollArea QScrollBar::handle:vertical {
+    min-height: 25px;
+  }
+
+/* "add-page" and "sub-page" are the gutter of the scrollbar */
+#LibraryContainer QScrollBar::add-page,
+#LibraryContainer QScrollBar::sub-page,
+WEffectSelector QAbstractScrollArea QScrollBar::add-page,
+WEffectSelector QAbstractScrollArea QScrollBar::sub-page {
+  min-width: 15px;
+  min-height: 15px;
+  background-color: #000;
+  border-radius: 2px;
+}
+/* Turn off buttons */
+#LibraryContainer QScrollBar::add-line,
+#LibraryContainer QScrollBar::sub-line,
+WEffectSelector QAbstractScrollArea QScrollBar::add-line,
+WEffectSelector QAbstractScrollArea QScrollBar::sub-line {
+  width: 0px;
+  height: 0px;
+  border: 0px;
+}
+
+/* Corner in between two scrollbars */
+#LibraryContainer QAbstractScrollArea::corner,
+WEffectSelector QAbstractScrollArea QScrollBar::corner {
+  background-color: #1e1e1e;
+}
+/*********** scrollbars *********************************/
+
+
+/*********** library search bar *********************************/
+WSearchLineEdit {
+  padding: 2px;
+  background-color: #0f0f0f;
+  selection-color: #000;
+  selection-background-color: #ccc;
+  }
+  WSearchLineEdit:focus {
+    padding: 1px;
+    border: 2px solid #257b82;
+    border-radius: 0px;
+  }
+  WSearchLineEdit[active="false"],
+  WSearchLineEdit:disabled {
+    color: #999;
+  }
+  WSearchLineEdit:disabled {
+    background-color: #191919;
+  }
+  /* Clear button: see /skins/default.qss */
+
+/************ splitters ***********************/
+/* HorizontalSplitter
+  (the splitter itself is horizontal)
+  Used to split
+  - Waveforms & Decks/FX/etc
+  - Library feature & Coverart */
+#HorizontalSplitter {
+  padding: 0px;
+  margin: 0px;
+  }
+  #HorizontalSplitter::handle {
+      image: url(skin:/palemoon/style/splitter_handle_horizontal_unchecked.png);
+    }
+    #HorizontalSplitter::handle:pressed,
+    #HorizontalSplitter::handle:hover {
+      image: url(skin:/palemoon/style/splitter_handle_horizontal_checked.png);
+    }
+  #HorizontalSplitter::handle:vertical {
+    height: 9px;
+  }
+
+/* VerticalSplitter
+  (the splitter itself is vertical)
+  Used to split Library sidebar & Tracks table */
+#VerticalSplitter {
+  }
+  #VerticalSplitter::handle {
+    image: url(skin:/palemoon/style/splitter_handle_vertical_unchecked.png);
+  }
+  #VerticalSplitter::handle:pressed,
+  #VerticalSplitter::handle:hover {
+    image: url(skin:/palemoon/style/splitter_handle_vertical_checked.png);
+  }
+  #VerticalSplitter::handle:vertical {
+    /* 'height' works although it's actually the width of the handle */
+    height: 6px;
+  }
+/************ splitters ***********************/
+
+
+/* Extra declaration for QRadioButton otherwise it shows up with wrong colors in Linux with Gnome */
+WLibrary QLabel, WLibrary QRadioButton {
+  background: transparent;
+}
+
+/* Additional space for QRadionButtons */
+WLibrary QRadioButton {
+  /* bottom margin! */
+  margin: 2px 3px 4px 3px;
+}
+
+/* Additional space for QLabels */
+#DlgAnalysis QLabel,
+#DlgAutoDJ QLabel {
+  margin: 2px 5px 5px 1px;
+}
+
+WLibrary QRadioButton::indicator:checked {
+  background: url(skin:/palemoon/buttons/btn__lib_radio_button_on_blue.svg) center center;
+}
+
+WLibrary QRadioButton::indicator:unchecked {
+  background: url(skin:/palemoon/buttons/btn__lib_radio_button_off.svg) center center;
+}
+
+/* Library feature pushbuttons
+  Don't use 'WLibrary QPushButton' here, as this would apply padding
+  to the Preview & BPM lock buttons as well.
+  Define the buttons fore every Library feature instead. */
+#DlgMissing > QPushButton,
+#DlgHidden > QPushButton,
+#DlgAutoDJ > QPushButton,
+#DlgRecording > QPushButton,
+#DlgAnalysis > QPushButton {
+  margin: 0px 6px 3px 0px;
+  padding: 0px;
+  height: 20px;
+  }
+#DlgMissing > QPushButton,
+#DlgHidden > QPushButton,
+#DlgRecording > QPushButton,
+#DlgAnalysis > QPushButton {
+  padding: 0px 5px;
+  }
+  QPushButton#pushButtonAutoDJ {
+    min-width: 40px;
+  }
+  /* Space in between 'Enable AutoDJ' and transition time spinbox */
+  #DlgAutoDJ > #horizontalSpacer {
+    width: 100px;
+  }
+  /* Push 'New' radio button away from corner */
+  #radioButtonRecentlyAdded {
+    margin-left: 10px;
+  }
+  /* Space in between 'All' radio button and 'Select All' button */
+  QPushButton#pushButtonSelectAll {
+    margin-left: 12px;
+  }
+
+#LibraryContainer QTreeView {
+  show-decoration-selected: 0;
+}
+/* triangle for closed/opened branches in treeview */
+/* closed */
+#LibraryContainer QTreeView::branch:closed:has-children:!has-siblings:!selected,
+#LibraryContainer QTreeView::branch:closed:has-children:has-siblings:!selected {
+/*  Suppresses that selected sidebar items branch indicator shows wrong color when out of focus ; lp:880588 */
+  border-image: none;
+    image: url(skin:/palemoon/style/library_branch_closed_grey.png);
+  }
+  /* closed, selected */
+  #LibraryContainer QTreeView::branch:closed:has-children:!has-siblings:selected,
+  #LibraryContainer QTreeView::branch:closed:has-children:has-siblings:selected {
+    border-image: none;
+    image: url(skin:/palemoon/style/library_branch_closed_selected_white.png);
+    background-color: #2c454f;
+  }
+/* open */
+#LibraryContainer QTreeView::branch:open:has-children:!has-siblings,
+#LibraryContainer QTreeView::branch:open:has-children:has-siblings {
+  border-image: none;
+  image: url(skin:/palemoon/style/library_branch_open_grey.png);
+  }
+  /* open, selected */
+  #LibraryContainer QTreeView::branch:open:has-children:!has-siblings:selected,
+  #LibraryContainer QTreeView::branch:open:has-children:has-siblings:selected {
+    border-image: none;
+    image: url(skin:/palemoon/style/library_branch_open_selected_white.png);
+    background-color: #2c454f;
+    }
+  /* space left of selected child item */
+  #LibraryContainer QTreeView::branch:closed:!has-children:!has-siblings:selected,
+  #LibraryContainer QTreeView::branch:closed:!has-children:has-siblings:selected,
+  #LibraryContainer QTreeView::branch:open:!has-children:!has-siblings:selected,
+  #LibraryContainer QTreeView::branch:open:!has-children:has-siblings:selected {
+    border-image: none;
+    background-color: #0f0f0f;
+  }
+/************** Library *******************************************************/
+
+
+
+/************** common styles for WEffectSelector ******************************
+*************** QSpinBox, QMenu, QToolTip *************************************/
+WEffectSelector QAbstractScrollArea,
+#fadeModeCombobox QAbstractScrollArea,
+QToolTip,
+WBeatSpinBox QMenu,
+#LibraryContainer QMenu,
+WCueMenuPopup,
+WCueMenuPopup QMenu,
+WCoverArtMenu,
+WTrackMenu,
+WTrackMenu QMenu {
+  padding: 3px;
+  border: 1px solid #888;
+  border-radius: 2px;
+}
+
+#SkinContainer {
+  background-color: #080808;
+}
+#CrossfaderButtonContainer_Deck,
+#CrossfaderButtonContainer_Aux,
+#LibraryContainer QTableView,
+#LibraryContainer QTextBrowser,
+#LibraryContainer QTreeView,
+QToolTip,
+WBeatSpinBox QMenu,
+  WCueMenuPopup,
+  #LibraryContainer QMenu,
+  WCueMenuPopup QMenu,
+  WCoverArtMenu,
+  WTrackMenu,
+  WTrackMenu QMenu,
+WBeatSpinBox QMenu::item,
+  #LibraryContainer QMenu::item,
+  WCueMenuPopup QMenu::item,
+  WCueMenuPopup QLabel,
+  WCoverArtMenu::item,
+  WTrackMenu::item,
+  WTrackMenu QMenu::item,
+#LibraryContainer QMenu QCheckBox,
+WTrackMenu QCheckBox,
+WTrackMenu QMenu QCheckBox,
+#SkinSettings,
+WSearchLineEdit,
+WEffectSelector QAbstractScrollArea,
+#fadeModeCombobox QAbstractScrollArea,
+WEffectSelector::item,
+#fadeModeCombobox::item {
+  background-color: #0f0f0f;
+}
+  /* hovered items */
+  WEffectSelector::item:selected,
+  #fadeModeCombobox::item:selected,
+  WBeatSpinBox QMenu::item:selected,
+  #LibraryContainer QMenu::item:selected,
+  WCueMenuPopup QMenu::item:selected,
+  WCoverArtMenu::item:selected,
+  WTrackMenu::item:selected,
+  WTrackMenu QMenu::item:selected,
+  #LibraryContainer QMenu QCheckBox:selected,
+  #LibraryContainer QMenu QCheckBox:focus,  /* selected by keyboard */
+  #LibraryContainer QMenu QCheckBox:hover, /* mouse hover */
+  WTrackMenu QCheckBox:selected,
+  WTrackMenu QCheckBox:focus,
+  WTrackMenu QCheckBox:hover,
+  WTrackMenu QMenu QCheckBox:selected,
+  WTrackMenu QMenu QCheckBox:focus,
+  WTrackMenu QMenu QCheckBox:hover,
+  #SkinSettingsButton[hover="true"],
+  #DeckSizeButton[hover="true"],
+  #SkinSettingsMixerToggle[hover="true"],
+  #SkinSettingsLabelButton[hover="true"] {
+    background-color: #2c454f;
+    color: #fff;
+    /* remove OS focus indicator */
+    outline: none;
+  }
+  /* hover over checked effect */
+  WEffectSelector::item:checked:selected,
+  #fadeModeCombobox::item:checked:selected {
+    background-color: #0a2329;
+    color: #fff;
+    }
+
+
+WEffectSelector,
+#fadeModeCombobox {
+  /* The 3D frame on the combo box becomes flat when you give it a border
+  border-radius: 3px; */
+  }
+  WEffectSelector {
+    /* 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: 3px 0px 2px 5px;
+    margin: 0px;
+  }
+  #fadeModeCombobox {
+    min-height: 17px;
+    max-height: 17px;
+    padding: 1px 0px 1px 5px;
+    margin: 0px 1px 4px 1px;
+  }
+  WEffectSelector::down-arrow,
+  #fadeModeCombobox::down-arrow {
+    image: url(skin:/palemoon/buttons/btn__fx_selector_down.svg);
+    border: 0;
+    padding: 0;
+    margin: 0;
+  }
+
+  WEffectSelector QAbstractScrollArea {
+    min-width: 160px;
+  }
+  #fadeModeCombobox QAbstractScrollArea {
+    min-width: 185px;
+  }
+  WEffectSelector::indicator:checked,
+  #fadeModeCombobox::indicator:checked {
+    /* checkbox container is 28 x 22px
+      use margin + border to create a square checkbox sized like kill buttons */
+    margin: 2px;
+    image: url(skin:/palemoon/buttons/btn__lib_checkmark_ivory.svg);
+  }
+  WEffectSelector::checked, /* selected item */
+  WEffectSelector::indicator, /* checkbox, tick mark */
+  WEffectSelector::drop-down,
+  WEffectSelector::indicator:!checked,
+  #fadeModeCombobox::checked, /* selected mode */
+  #fadeModeCombobox::indicator, /* checkbox, tick mark */
+  #fadeModeCombobox::drop-down,
+  #fadeModeCombobox::indicator:!checked,
+  WBeatSpinBox QMenu::item,
+  #LibraryContainer QMenu::item,
+  WCueMenuPopup QMenu::item,
+  WCoverArtMenu::item,
+  WTrackMenu::item,
+  WTrackMenu QMenu::item,
+  #LibraryContainer QMenu QCheckBox,
+  WTrackMenu QCheckBox,
+  WTrackMenu QMenu QCheckBox {
+      padding: 0px;
+      margin: 0px;
+      image: none;
+      outline: none;
+      border: 0px solid transparent;
+    }
+  WBeatSpinBox QMenu::separator,
+  #LibraryContainer QMenu::separator,
+  WCueMenuPopup QMenu::separator,
+  WTrackMenu::separator,
+  WTrackMenu QMenu::separator,
+  #SkinSettingsSeparator {
+    border-top: 1px solid #000;
+    border-bottom: 1px solid #222;
+    }
+    WBeatSpinBox QMenu::separator,
+    #LibraryContainer QMenu::separator,
+    WCueMenuPopup QMenu::separator,
+    WTrackMenu::separator,
+    WTrackMenu QMenu::separator {
+        height: 0px;
+        margin: 4px;
+      }
+    #SkinSettingsSeparator {
+      margin: 0px 4px 4px 4px;
+    }
+  WBeatSpinBox QMenu::item,
+  #LibraryContainer QMenu::item,
+  WCueMenuPopup QMenu::item,
+  WCoverArtMenu::item,
+  WTrackMenu::item,
+  WTrackMenu QMenu::item {
+  /* Right padding creates a margin to the menu expand arrow.
+    Left padding should be bigger than menu icon width + menu icon
+    left/right margin */
+    padding: 5px 12px 5px 26px;
+  }
+  /* Icons in QLineEdit menus:
+   beatsize spinbox, searchbox, editable track properties */
+  WBeatSpinBox QMenu::icon,
+  #LibraryContainer QMenu::icon,
+  WCueMenuPopup QMenu::icon,
+  WTrackMenu::icon,
+  WTrackMenu QMenu::icon,
+  /* checkbox in Crate name context menu:
+    "[ ] Auto DJ Track Source"  */
+  #LibraryContainer QMenu::indicator,
+  WTrackMenu::indicator,
+  WTrackMenu QMenu::indicator {
+    margin: 0px 4px 0px 5px;
+    }
+  /* items in Crate sub menu */
+  #LibraryContainer QMenu QCheckBox,
+  WTrackMenu QCheckBox,
+  WTrackMenu QMenu QCheckBox {
+    padding: 3px 10px 3px 5px;
+    }
+  #LibraryContainer QMenu QCheckBox::indicator,
+  #LibraryContainer QMenu::indicator,
+  WCueMenuPopup QMenu::indicator,
+  WTrackMenu QCheckBox::indicator,
+  WTrackMenu::indicator,
+  WTrackMenu QMenu QCheckBox::indicator,
+  WTrackMenu QMenu::indicator {
+    width: 13px;
+    height: 13px;
+    border: 1px solid #333;
+    border-radius: 1px;
+    background-color: #000;
+    /* remove OS focus indicator */
+    outline: none;
+    }
+  #LibraryContainer QMenu QCheckBox::indicator:checked,
+  #LibraryContainer QMenu::indicator:checked,
+  WTrackMenu QCheckBox::indicator:checked,
+  WTrackMenu::indicator:checked,
+  WTrackMenu QMenu QCheckBox::indicator:checked,
+  WTrackMenu QMenu::indicator:checked,
+  WCueMenuPopup QMenu::indicator:checked {
+    image: url(skin:/palemoon/buttons/btn__lib_checkmark_blue.svg);
+    }
+  /* disabled menu item and checkbox */
+  #LibraryContainer QMenu QCheckBox:!enabled,
+  #LibraryContainer QMenu::item:!enabled,
+  WTrackMenu QCheckBox:!enabled,
+  WTrackMenu::item:!enabled,
+  WTrackMenu QMenu QCheckBox:!enabled,
+  WTrackMenu QMenu::item:!enabled,
+  WCueMenuPopup QMenu::item:!enabled,
+  WCoverArtMenu::item:!enabled,
+  #LibraryContainer QMenu QCheckBox::indicator:!enabled,
+  WTrackMenu QCheckBox::indicator:!enabled,
+  WTrackMenu QMenu QCheckBox::indicator:!enabled {
+    color: #494949;
+    }
+  #LibraryContainer QMenu QCheckBox::indicator:!enabled:!checked,
+  #LibraryContainer QMenu::indicator:!enabled:!checked,
+  WTrackMenu QCheckBox::indicator:!enabled:!checked,
+  WTrackMenu::indicator:!enabled:!checked,
+  WTrackMenu QMenu QCheckBox::indicator:!enabled:!checked,
+  WTrackMenu QMenu::indicator:!enabled:!checked,
+  WCueMenuPopup QMenu::indicator:!enabled:!checked {
+    border: 1px solid #222;
+    background-color: #222;
+    }
+  #LibraryContainer QMenu QCheckBox::indicator:!enabled:checked,
+  WTrackMenu QCheckBox::indicator:!enabled:checked,
+  WTrackMenu QMenu QCheckBox::indicator:!enabled:checked {
+    image: url(skin:/palemoon/buttons/btn__lib_checkmark_grey.svg);
+    border: 1px solid #222;
+    background-color: #222;
+    }
+  #LibraryContainer QMenu QCheckBox::indicator:indeterminate,
+  #LibraryContainer QCheckBox::indicator:indeterminate:!enabled,
+  WTrackMenu QCheckBox::indicator:indeterminate,
+  WTrackMenu QMenu QCheckBox::indicator:indeterminate {
+    image: url(skin:/palemoon/buttons/btn__lib_checkmark_grey.svg);
+  }
+
+  #LibraryContainer QMenu::right-arrow,
+  WTrackMenu::right-arrow,
+  WTrackMenu QMenu::right-arrow {
+    width: 10px;
+    height: 10px;
+    image: url(skin:/palemoon/style/menu_arrow_ivory.svg);
+    }
+  #LibraryContainer QMenu::right-arrow:selected,
+  WTrackMenu::right-arrow:selected,
+  WTrackMenu QMenu::right-arrow:selected {
+    image: url(skin:/palemoon/style/menu_arrow_white.svg);
+  }
+
+  #LibraryContainer QHeaderView QMenu::indicator {
+    width: 10px;
+    height: 10px;
+    margin-left: 2px;
+    border: none;
+    background: none;
+    }
+    #LibraryContainer QHeaderView QMenu::indicator:checked {
+      image: url(skin:/palemoon/buttons/btn__lib_checkmark_blue.svg);
+    }
+/************** common styles for WEffectSelector ******************************
+*************** QSpinBox, QMenu, QToolTip *************************************/
diff --git a/res/skins/LateNight/toolbar.xml b/res/skins/LateNight/toolbar.xml
index 1280998a3ed0..f25b78979a1e 100644
--- a/res/skins/LateNight/toolbar.xml
+++ b/res/skins/LateNight/toolbar.xml
@@ -5,27 +5,45 @@
     <SizePolicy>e,min</SizePolicy>
     <Children>
 
-      <Template src="skin:button_2state.xml">
+      <Template src="skin:/controls/button_2state.xml">
         <SetVariable name="TooltipId">maximize_library</SetVariable>
         <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
-        <SetVariable name="Size">84f,20f</SetVariable>
+        <SetVariable name="Size">80f,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>ToolbarSeparator</ObjectName>
+        <Size>12f,9min</Size>
+      </WidgetGroup>
+
+      <WidgetGroup><!-- GUI toggles with regular library -->
         <ObjectName>ToolBarSection</ObjectName>
         <SizePolicy>min,min</SizePolicy>
         <Layout>horizontal</Layout>
         <Children>
 
-          <WidgetGroup>
-            <ObjectName>ToolBarSeparator</ObjectName>
-            <Size>13f,9min</Size>
-          </WidgetGroup>
+          <Template src="skin:/controls/button_2state.xml">
+            <SetVariable name="TooltipId">FIXME_waveforms</SetVariable>
+            <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
+            <SetVariable name="Size">80f,20f</SetVariable>
+            <SetVariable name="state_0_text">WAVEFORMS</SetVariable>
+            <SetVariable name="state_1_text">WAVEFORMS</SetVariable>
+            <SetVariable name="ConfigKey">[Skin],show_waveforms</SetVariable>
+          </Template>
+
+          <Template src="skin:/controls/button_2state_persist.xml">
+            <SetVariable name="TooltipId">show_4decks</SetVariable>
+            <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
+            <SetVariable name="Size">52f,20f</SetVariable>
+            <SetVariable name="state_0_text">4 DECKS</SetVariable>
+            <SetVariable name="state_1_text">4 DECKS</SetVariable>
+            <SetVariable name="ConfigKey">[Skin],show_4decks</SetVariable>
+          </Template>
 
-          <Template src="skin:button_2state_persist.xml">
+          <Template src="skin:/controls/button_2state_persist.xml">
             <SetVariable name="TooltipId">show_mixer</SetVariable>
             <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
             <SetVariable name="Size">48f,20f</SetVariable>
@@ -34,7 +52,7 @@
             <SetVariable name="ConfigKey">[Master],show_mixer</SetVariable>
           </Template>
 
-          <Template src="skin:button_2state_persist.xml">
+          <Template src="skin:/controls/button_2state_persist.xml">
             <SetVariable name="TooltipId">show_effects</SetVariable>
             <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
             <SetVariable name="Size">59f,20f</SetVariable>
@@ -43,7 +61,7 @@
             <SetVariable name="ConfigKey">[EffectRack1],show</SetVariable>
           </Template>
 
-          <Template src="skin:button_2state_persist.xml">
+          <Template src="skin:/controls/button_2state_persist.xml">
             <SetVariable name="TooltipId">show_samplers</SetVariable>
             <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
             <SetVariable name="Size">71f,20f</SetVariable>
@@ -52,7 +70,7 @@
             <SetVariable name="ConfigKey">[Samplers],show_samplers</SetVariable>
           </Template>
 
-          <Template src="skin:button_2state_persist.xml">
+          <Template src="skin:/controls/button_2state_persist.xml">
             <SetVariable name="TooltipId">show_microphone</SetVariable>
             <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
             <SetVariable name="Size">61f,20f</SetVariable>
@@ -67,15 +85,116 @@
           <Transform><Not/></Transform>
           <BindProperty>visible</BindProperty>
         </Connection>
-      </WidgetGroup>
+      </WidgetGroup><!-- GUI toggles with regular library -->
+
+      <WidgetGroup><!-- GUI toggles with maximized library -->
+        <ObjectName>ToolBarSection</ObjectName>
+        <SizePolicy>min,min</SizePolicy>
+        <Layout>horizontal</Layout>
+        <Children>
+
+          <Template src="skin:/controls/button_2state.xml">
+            <SetVariable name="TooltipId">FIXME_waveforms</SetVariable>
+            <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
+            <SetVariable name="Size">80f,20f</SetVariable>
+            <SetVariable name="state_0_text">DECKS</SetVariable>
+            <SetVariable name="state_1_text">DECKS</SetVariable>
+            <SetVariable name="ConfigKey">[LateNight],max_lib_show_decks</SetVariable>
+          </Template>
+
+          <Template src="skin:/controls/button_2state_persist.xml">
+            <SetVariable name="TooltipId">show_4decks</SetVariable>
+            <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
+            <SetVariable name="Size">52f,20f</SetVariable>
+            <SetVariable name="state_0_text">4 DECKS</SetVariable>
+            <SetVariable name="state_1_text">4 DECKS</SetVariable>
+            <SetVariable name="ConfigKey">[Skin],show_4decks</SetVariable>
+          </Template>
+
+        </Children>
+        <Connection>
+          <ConfigKey>[Master],maximize_library</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- GUI toggles with maximized library -->
+
+      <WidgetGroup><Size>me,min</Size></WidgetGroup>
+
+      <Label>
+        <ObjectName>ToolbarLogo</ObjectName>
+        <Size>74f,24f</Size>
+      </Label>
+
+      <WidgetGroup><Size>7f,1min</Size></WidgetGroup>
 
-      <!-- Spacer -->
       <WidgetGroup>
+        <ObjectName>LatencyBatteryContainer</ObjectName>
         <Layout>horizontal</Layout>
-        <Size>me,min</Size>
-        <Children/>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Label>
+            <ObjectName>LatencyLabel</ObjectName>
+            <Text>CPU</Text>
+          </Label>
+
+          <WidgetGroup>
+            <ObjectName>LatencyMeterBox</ObjectName>
+            <Layout>horizontal</Layout>
+            <Size>61f,7f</Size>
+            <Children>
+              <VuMeter>
+                <TooltipId>audio_latency_usage</TooltipId>
+                <Size>59f,5f</Size>
+                <PathBack>skin:/<Variable name="StyleScheme"/>/style/latency_bg.png</PathBack>
+                <PathVu>skin:/<Variable name="StyleScheme"/>/style/latency_over.png</PathVu>
+                <Horizontal>true</Horizontal>
+                <PeakHoldSize>5</PeakHoldSize>
+                <PeakHoldTime>1000</PeakHoldTime>
+                <PeakFallTime>100</PeakFallTime>
+                <PeakFallStep>1</PeakFallStep>
+                <Connection>
+                  <ConfigKey>[Master],audio_latency_usage</ConfigKey>
+                </Connection>
+              </VuMeter>
+            </Children>
+          </WidgetGroup><!-- LatencyMeterBox -->
+
+          <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>BatteryBox</ObjectName>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Battery>
+                <ObjectName>Battery</ObjectName>
+                <Size>24,24</Size>
+                <SizePolicy>f,f</SizePolicy>
+                <PixmapCharged scalemode="STRETCH_ASPECT">skin:/<Variable name="StyleScheme"/>/style/batt/ic_battery_charged.svg</PixmapCharged>
+                <NumberStates>8</NumberStates>
+                <PixmapsCharging scalemode="STRETCH_ASPECT">skin:/<Variable name="StyleScheme"/>/style/batt/ic_battery_charging_%1.svg</PixmapsCharging>
+                <PixmapsDischarging scalemode="STRETCH_ASPECT">skin:/<Variable name="StyleScheme"/>/style/batt/ic_battery_discharging_%1.svg</PixmapsDischarging>
+              </Battery>
+            </Children>
+          </WidgetGroup><!-- BatteryBox -->
+        </Children>
+      </WidgetGroup><!-- LatencyBatteryContainer -->
+
+      <WidgetGroup><Size>7f,min</Size></WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>ClockWidget</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Time>
+            <TooltipId>time</TooltipId>
+            <CustomFormat>hh:mm</CustomFormat>
+          </Time>
+        </Children>
       </WidgetGroup>
 
+      <WidgetGroup><Size>7f,min</Size></WidgetGroup>
+
       <WidgetGroup><!-- Recording button & recording duration label -->
         <ObjectName>RecBox</ObjectName>
         <Layout>stacked</Layout>
@@ -84,7 +203,7 @@
             = 70x18 available for text -->
         <Children>
           <!-- invisible Rec button -->
-          <Template src="skin:button_2state.xml">
+          <Template src="skin:/controls/button_2state.xml">
             <SetVariable name="ObjectName">RecButton</SetVariable>
             <SetVariable name="TooltipId">toggle_recording</SetVariable>
             <SetVariable name="Size">68f,20f</SetVariable>
@@ -98,6 +217,10 @@
               <Label>
                 <ObjectName>RecDot</ObjectName>
                 <Size>15f,20f</Size>
+                <Connection>
+                  <ConfigKey>[Recording],status</ConfigKey>
+                  <BindProperty>highlight</BindProperty>
+                </Connection>
               </Label>
 
               <RecordingDuration>
@@ -113,8 +236,8 @@
             </Children>
           </WidgetGroup><!-- /Rec dot + RecDuration -->
 
-          <!-- invisible Rec button -->
-          <Template src="skin:button_3state_display.xml">
+          <!-- Rec feedback color -->
+          <Template src="skin:/controls/button_3state_display.xml">
             <SetVariable name="ObjectName">RecFeedback</SetVariable>
             <SetVariable name="TooltipId">toggle_recording</SetVariable>
             <SetVariable name="Size">72f,20f</SetVariable>
@@ -129,7 +252,7 @@
         <TooltipId>skin_settings</TooltipId>
         <ObjectName>BroadcastButton</ObjectName>
         <NumberStates>4</NumberStates>
-        <State><!-- Off -->
+        <State>
           <Number>0</Number>
           <Text>Broadcast</Text>
         </State>
@@ -146,23 +269,23 @@
           <Text>Conn. Failed</Text>
         </State>
         <Connection>
-          <ConfigKey persist="true">[Shoutcast],enabled</ConfigKey>
+          <ConfigKey>[Shoutcast],enabled</ConfigKey>
           <ButtonState>LeftButton</ButtonState>
         </Connection>
         <Connection>
-          <ConfigKey persist="true">[Shoutcast],status</ConfigKey>
+          <ConfigKey>[Shoutcast],status</ConfigKey>
         </Connection>
       </PushButton>
 
       <WidgetGroup>
-        <ObjectName>ToolBarSeparator</ObjectName>
-        <Size>13f,9min</Size>
+        <ObjectName>ToolbarSeparator</ObjectName>
+        <Size>12f,9min</Size>
       </WidgetGroup>
 
       <PushButton>
         <Size>80f,20f</Size>
         <TooltipId>skin_settings</TooltipId>
-        <ObjectName>SettingsButton</ObjectName>
+        <ObjectName>SkinSettingsToggle</ObjectName>
         <NumberStates>2</NumberStates>
         <State>
           <Number>0</Number>
@@ -177,122 +300,10 @@
         </Connection>
       </PushButton>
 
-      <WidgetGroup> <!-- Spacer -->
-        <Layout>horizontal</Layout>
-        <Size>7f,min</Size>
-        <Children/>
-      </WidgetGroup>
-
-      <Label>
-        <ObjectName>ToolbarLogo</ObjectName>
-        <Size>72f,24f</Size>
-      </Label>
-
-      <WidgetGroup> <!-- Spacer -->
-        <Layout>horizontal</Layout>
-        <Size>7f,min</Size>
-        <Children/>
-      </WidgetGroup>
-
-      <WidgetGroup>
-        <ObjectName>ClockWidget</ObjectName>
-        <Layout>horizontal</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <Time>
-            <TooltipId>time</TooltipId>
-            <CustomFormat>hh:mm</CustomFormat>
-          </Time>
-        </Children>
-      </WidgetGroup>
-
-      <WidgetGroup><Size>9f,1min</Size></WidgetGroup>
-
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <Label>
-            <ObjectName>LatencyLabel</ObjectName>
-            <Text>CPU</Text>
-          </Label>
-
-          <VuMeter>
-            <TooltipId>audio_latency_usage</TooltipId>
-            <ObjectName>LatencyMeter</ObjectName>
-            <Size>63f,7f</Size>
-            <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>
-            <PeakFallTime>100</PeakFallTime>
-            <PeakFallStep>1</PeakFallStep>
-            <Connection>
-              <ConfigKey>[Master],audio_latency_usage</ConfigKey>
-            </Connection>
-          </VuMeter>
-
-          <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
-          <Battery>
-            <ObjectName>Battery</ObjectName>
-            <Size>24,24</Size>
-            <SizePolicy>f,f</SizePolicy>
-            <PixmapCharged scalemode="STRETCH_ASPECT">skin:/style_<Variable name="style_scheme"/>/batt/ic_battery_charged.svg</PixmapCharged>
-            <NumberStates>8</NumberStates>
-            <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>
+    <Connection>
+      <ConfigKey>[Skin],show_waveforms</ConfigKey>
+      <BindProperty>highlight</BindProperty>
+    </Connection>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/vumeter_channel.xml b/res/skins/LateNight/vumeter_channel.xml
deleted file mode 100644
index 05f41d9af46a..000000000000
--- a/res/skins/LateNight/vumeter_channel.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    A standard knob.
-  Variables:
-    group
-    control: The control to connect to
-    label
-    Size
-    TooltipId
-    PotiMinAngle
-    PotiMaxAngle
--->
-<Template>
-  <WidgetGroup>
-    <ObjectName>VuMeterBox</ObjectName>
-    <Layout>vertical</Layout>
-    <SizePolicy>min,min</SizePolicy>
-    <Children>
-      <StatusLight>
-        <TooltipId>channel_PeakIndicator</TooltipId>
-        <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>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>
-        <PeakFallTime>50</PeakFallTime>
-        <PeakFallStep>2</PeakFallStep>
-        <Connection>
-          <ConfigKey><Variable name="group"/>,VuMeter</ConfigKey>
-        </Connection>
-      </VuMeter>
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/vumeter_master.xml b/res/skins/LateNight/vumeter_master.xml
deleted file mode 100644
index 4cd2d854a739..000000000000
--- a/res/skins/LateNight/vumeter_master.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    A standard knob.
-  Variables:
-    group
-    control: The control to connect to
-    label
-    Size
-    TooltipId
-    PotiMinAngle
-    PotiMaxAngle
--->
-<Template>
-  <WidgetGroup>
-    <ObjectName>VuMeterBox</ObjectName>
-    <Layout>horizontal</Layout>
-    <SizePolicy>min,min</SizePolicy>
-    <Children>
-      <WidgetGroup>
-        <ObjectName>VuMeterBoxMasterSingle</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <StatusLight>
-            <TooltipId>master_PeakIndicatorL</TooltipId>
-            <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>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>
-            <PeakFallTime>50</PeakFallTime>
-            <PeakFallStep>2</PeakFallStep>
-            <Connection>
-              <ConfigKey>[Master],VuMeterL</ConfigKey>
-            </Connection>
-          </VuMeter>
-        </Children>
-      </WidgetGroup>
-      <WidgetGroup>
-        <ObjectName>VuMeterBoxMasterSingle</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <StatusLight>
-            <TooltipId>master_PeakIndicatorR</TooltipId>
-            <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>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>
-            <PeakFallTime>50</PeakFallTime>
-            <PeakFallStep>2</PeakFallStep>
-            <Connection>
-              <ConfigKey>[Master],VuMeterR</ConfigKey>
-            </Connection>
-          </VuMeter>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/vumeter_small.xml b/res/skins/LateNight/vumeter_small.xml
deleted file mode 100644
index ce413bb08dd2..000000000000
--- a/res/skins/LateNight/vumeter_small.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    A standard knob.
-  Variables:
-    group
-    control: The control to connect to
-    label
-    Size
-    TooltipId
-    PotiMinAngle
-    PotiMaxAngle
--->
-<Template>
-  <WidgetGroup>
-    <ObjectName>VuMeterBox</ObjectName>
-    <Layout>vertical</Layout>
-    <SizePolicy>min,min</SizePolicy>
-    <Children>
-      <StatusLight>
-        <TooltipId><Variable name="GroupType"/>_PeakIndicator</TooltipId>
-        <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>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>
-        <PeakFallTime>50</PeakFallTime>
-        <PeakFallStep>2</PeakFallStep>
-        <Connection>
-          <ConfigKey><Variable name="group"/>,VuMeter</ConfigKey>
-        </Connection>
-      </VuMeter>
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/waveform.xml b/res/skins/LateNight/waveform.xml
index 4c932efc73cc..5bbdce3ef51d 100644
--- a/res/skins/LateNight/waveform.xml
+++ b/res/skins/LateNight/waveform.xml
@@ -1,144 +1,154 @@
 <Template>
-  <SetVariable name="btn_type">embedded</SetVariable>
-  <SetVariable name="btn_format">square</SetVariable>
-  <SetVariable name="group">[Channel<Variable name="channum"/>]</SetVariable>
+  <SetVariable name="Group">[Channel<Variable name="ChanNum"/>]</SetVariable>
 
   <WidgetGroup>
     <ObjectName>Waveform</ObjectName>
     <Layout>horizontal</Layout>
     <SizePolicy>me,me</SizePolicy>
     <Children>
-      <Visual>
-        <TooltipId>waveform_display</TooltipId>
-        <Channel><Variable name="channum"/></Channel>
-        <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>
-        <BeatColor><Variable name="BeatColor"/></BeatColor>
-        <AxesColor><Variable name="AxesColor"/></AxesColor>
-        <BeatHighlightColor></BeatHighlightColor>
-        <PlayPosColor>#00FF00</PlayPosColor>
-        <EndOfTrackColor><Variable name="EndOfTrackColor"/></EndOfTrackColor>
-        <DefaultMark>
-          <Align>bottom|right</Align>
-          <Color>#FF0000</Color>
-          <TextColor>#FFFFFF</TextColor>
-          <Text> %1 </Text>
-        </DefaultMark>
-        <MarkRange>
-          <StartControl>loop_start_position</StartControl>
-          <EndControl>loop_end_position</EndControl>
-          <EnabledControl>loop_enabled</EnabledControl>
-          <Color>#00FF00</Color>
-          <DisabledColor>#FFFFFF</DisabledColor>
-        </MarkRange>
-        <Mark>
-          <Control>loop_start_position</Control>
-          <Text>IN</Text>
-          <Align>bottom|left</Align>
-          <Color>#00FF00</Color>
-          <TextColor>#FFFFFF</TextColor>
-        </Mark>
-        <Mark>
-          <Control>loop_end_position</Control>
-          <Text>OUT</Text>
-          <Align>bottom|right</Align>
-          <Color>#00FF00</Color>
-          <TextColor>#FFFFFF</TextColor>
-        </Mark>
-        <MarkRange>
-          <StartControl>intro_start_position</StartControl>
-          <EndControl>intro_end_position</EndControl>
-          <Color>#0000FF</Color>
-          <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
-        </MarkRange>
-        <MarkRange>
-          <StartControl>outro_start_position</StartControl>
-          <EndControl>outro_end_position</EndControl>
-          <Color>#0000FF</Color>
-          <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
-        </MarkRange>
-        <Mark>
-          <Control>intro_start_position</Control>
-          <Text>|&#9698;</Text>
-          <Align>bottom|left</Align>
-          <Color>#0000FF</Color>
-          <TextColor>#FFFFFF</TextColor>
-          <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
-        </Mark>
-        <Mark>
-          <Control>intro_end_position</Control>
-          <Text>&#9698;|</Text>
-          <Align>bottom|right</Align>
-          <Color>#0000FF</Color>
-          <TextColor>#FFFFFF</TextColor>
-          <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
-        </Mark>
-        <Mark>
-          <Control>outro_start_position</Control>
-          <Text>|&#9699;</Text>
-          <Align>bottom|left</Align>
-          <Color>#0000FF</Color>
-          <TextColor>#FFFFFF</TextColor>
-          <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
-        </Mark>
-        <Mark>
-          <Control>outro_end_position</Control>
-          <Text>&#9699;|</Text>
-          <Align>bottom|right</Align>
-          <Color>#0000FF</Color>
-          <TextColor>#FFFFFF</TextColor>
-          <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
-        </Mark>
-        <!--
-        The hotcues not represented by a button in the current skin show only in the waveform under two circumstances:
-          - if a MIDI device which supports more hotcues than buttons are in the current skin has them activated
-          - if you change from a skin which supports more hotcues than buttons are in the current skin (and has them activated)
-        -->
-        <Mark>
-          <Control>cue_point</Control>
-          <Text>CUE</Text>
-          <Align>top|right</Align>
-          <Color>#FF001C</Color>
-          <TextColor>#FFFFFF</TextColor>
-        </Mark>
-      </Visual>
-
-      <!-- 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>
+        <ObjectName>WaveformBox<Variable name="ChanNum"/></ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>me,me</SizePolicy>
+        <Children>
+          <Visual>
+            <TooltipId>waveform_display</TooltipId>
+            <Channel><Variable name="ChanNum"/></Channel>
+            <BgColor><Variable name="BgColorWaveform"/></BgColor>
+            <SignalColor><Variable name="SignalColor"/></SignalColor>
+            <SignalRGBLowColor><Variable name="SignalRGBLowColor"/></SignalRGBLowColor>
+            <SignalRGBMidColor><Variable name="SignalRGBMidColor"/></SignalRGBMidColor>
+            <SignalRGBHighColor><Variable name="SignalRGBHighColor"/></SignalRGBHighColor>
+            <BeatColor><Variable name="BeatColor"/></BeatColor>
+            <AxesColor><Variable name="AxesColor"/></AxesColor>
+            <BeatHighlightColor></BeatHighlightColor>
+            <PlayPosColor><Variable name="PlayPosColor"/></PlayPosColor>
+            <EndOfTrackColor><Variable name="EndOfTrackColor"/></EndOfTrackColor>
+            <!--
+            The hotcues not represented by a button in the current skin show only in the waveform under two circumstances:
+              - if a MIDI device which supports more hotcues than buttons are in the current skin has them activated
+              - if you change from a skin which supports more hotcues than buttons are in the current skin (and has them activated)
+            -->
+            <DefaultMark>
+              <Align>bottom|right</Align>
+              <Color>#FF0000</Color>
+              <TextColor>#FFFFFF</TextColor>
+              <Text> %1 </Text>
+            </DefaultMark>
+            <!-- Cue -->
+            <Mark>
+              <Control>cue_point</Control>
+              <Text>CUE</Text>
+              <Align>top|right</Align>
+              <Color><Variable name="CueColor"/></Color>
+              <TextColor>#FFFFFF</TextColor>
+            </Mark>
+            <!-- Loop -->
+            <MarkRange>
+              <StartControl>loop_start_position</StartControl>
+              <EndControl>loop_end_position</EndControl>
+              <EnabledControl>loop_enabled</EnabledControl>
+              <Color><Variable name="LoopColor"/></Color>
+              <DisabledColor>#FFFFFF</DisabledColor>
+            </MarkRange>
+            <Mark>
+              <Control>loop_start_position</Control>
+              <!--Text>IN</Text-->
+              <Align>bottom|right</Align>
+              <Color><Variable name="LoopColor"/></Color>
+              <TextColor>#FFFFFF</TextColor>
+            </Mark>
+            <Mark>
+              <Control>loop_end_position</Control>
+              <!--Text>OUT</Text-->
+              <Align>bottom|right</Align>
+              <Color><Variable name="LoopColor"/></Color>
+              <TextColor>#FFFFFF</TextColor>
+            </Mark>
+            <!-- Intro -->
+            <MarkRange>
+              <StartControl>intro_start_position</StartControl>
+              <EndControl>intro_end_position</EndControl>
+              <Color><Variable name="IntroOutroColor"/></Color>
+              <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
+              <DurationTextColor>#ffffff</DurationTextColor>
+              <DurationTextLocation>after</DurationTextLocation>
+            </MarkRange>
+            <Mark>
+              <Control>intro_start_position</Control>
+              <Text></Text>
+              <Align>top|right</Align>
+              <Color><Variable name="IntroOutroColor"/></Color>
+              <TextColor>#FFFFFF</TextColor>
+              <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
+            </Mark>
+            <Mark>
+              <Control>intro_end_position</Control>
+              <Text>&#9698;</Text>
+              <Align>top|left</Align>
+              <Color><Variable name="IntroOutroColor"/></Color>
+              <TextColor>#FFFFFF</TextColor>
+              <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
+            </Mark>
+            <!-- Outro -->
+            <MarkRange>
+              <StartControl>outro_start_position</StartControl>
+              <EndControl>outro_end_position</EndControl>
+              <Color><Variable name="IntroOutroColor"/></Color>
+              <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
+              <DurationTextColor>#ffffff</DurationTextColor>
+              <DurationTextLocation>before</DurationTextLocation>
+            </MarkRange>
+            <Mark>
+              <Control>outro_start_position</Control>
+              <Text>&#9699;</Text>
+              <Align>top|right</Align>
+              <Color><Variable name="IntroOutroColor"/></Color>
+              <TextColor>#FFFFFF</TextColor>
+              <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
+            </Mark>
+            <Mark>
+              <Control>outro_end_position</Control>
+              <Text></Text>
+              <Align>top|left</Align>
+              <Color><Variable name="IntroOutroColor"/></Color>
+              <TextColor>#FFFFFF</TextColor>
+              <VisibilityControl>[Skin],show_intro_outro_cues</VisibilityControl>
+            </Mark>
+          </Visual>
+        </Children>
+        <Connection>
+          <ConfigKey persist="true"><Variable name="Highlight"/></ConfigKey>
+          <BindProperty>highlight</BindProperty>
+        </Connection>
       </WidgetGroup>
 
       <WidgetGroup>
-        <ObjectName>BeatgridButtons</ObjectName>
+        <ObjectName>BeatgridControls</ObjectName>
         <Layout>vertical</Layout>
-        <!-- Horizontal size is 82px and we'll add the WaveformContainer's negative margin
-            (shifts waveform center mark) so that all buttons are visible -->
-        <SizePolicy>f,f</SizePolicy>
+        <SizePolicy>max,me</SizePolicy>
         <Children>
-          <WidgetGroup><Size>1me,0me</Size></WidgetGroup>
+          <WidgetGroup><Size>0me,1me</Size></WidgetGroup>
 
           <WidgetGroup><!-- beat grid buttons row -->
             <Layout>horizontal</Layout>
             <SizePolicy>f,f</SizePolicy>
             <Children>
 
+              <WidgetGroup><Size>1f,0min</Size></WidgetGroup>
+
               <WidgetGroup><!-- CurPos only -->
                 <Layout>vertical</Layout>
-                <SizePolicy>f,f</SizePolicy>
+                <Size>26f,52f</Size>
                 <Children>
-	              <Template src="skin:button_1state_right.xml">
-	                <SetVariable name="TooltipId">beats_translate_curpos</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>
+  	              <Template src="skin:/controls/button_1state_right.xml">
+  	                <SetVariable name="TooltipId">beats_translate_curpos</SetVariable>
+  	                <SetVariable name="ObjectName">BeatCurposLarge</SetVariable>
+  	                <SetVariable name="Size">26f,52f</SetVariable>
+  	                <SetVariable name="BtnSize">library_tall</SetVariable>
+  	                <SetVariable name="ConfigKey"><Variable name="Group"/>,beats_translate_curpos</SetVariable>
+  	                <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,beats_translate_match_alignment</SetVariable>
+  	              </Template>
                 </Children>
                 <Connection>
                   <ConfigKey persist="true">[Skin],timing_shift_buttons</ConfigKey>
@@ -149,88 +159,92 @@
 
               <WidgetGroup><!-- CurPos + hotcue shift -->
                 <Layout>vertical</Layout>
-                <SizePolicy>f,f</SizePolicy>
+                <Size>52f,52f</Size>
                 <Children>
-                  <Template src="skin:button_1state_right.xml">
+                  <Template src="skin:/controls/button_1state_right.xml">
                     <SetVariable name="TooltipId">beats_translate_curpos</SetVariable>
                     <SetVariable name="ObjectName">BeatCurposLarge</SetVariable>
                     <SetVariable name="Size">52f,26f</SetVariable>
-                    <SetVariable name="btn_format">wide</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="group"/>,beats_translate_curpos</SetVariable>
-                    <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beats_translate_match_alignment</SetVariable>
+                    <SetVariable name="BtnSize">library_wide</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="Group"/>,beats_translate_curpos</SetVariable>
+                    <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,beats_translate_match_alignment</SetVariable>
                   </Template>
 
                   <WidgetGroup><!-- hotcue shift -->
                     <Layout>horizontal</Layout>
-                    <SizePolicy>f,f</SizePolicy>
+                    <Size>52f,26f</Size>
                     <Children>
-                      <Template src="skin:button_1state_right.xml">
+                      <Template src="skin:/controls/button_1state_right.xml">
                         <SetVariable name="TooltipId">shift_cues_earlier</SetVariable>
                         <SetVariable name="ObjectName">HotcuesEarlier</SetVariable>
                         <SetVariable name="Size">26f,26f</SetVariable>
-                        <SetVariable name="ConfigKey"><Variable name="group"/>,shift_cues_earlier</SetVariable>
-                        <SetVariable name="ConfigKeyRight"><Variable name="group"/>,shift_cues_earlier_small</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="Group"/>,shift_cues_earlier</SetVariable>
+                        <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,shift_cues_earlier_small</SetVariable>
                       </Template>
 
-                      <Template src="skin:button_1state_right.xml">
+                      <Template src="skin:/controls/button_1state_right.xml">
                         <SetVariable name="TooltipId">shift_cues_later</SetVariable>
                         <SetVariable name="ObjectName">HotcuesLater</SetVariable>
                         <SetVariable name="Size">26f,26f</SetVariable>
-                        <SetVariable name="ConfigKey"><Variable name="group"/>,shift_cues_later</SetVariable>
-                        <SetVariable name="ConfigKeyRight"><Variable name="group"/>,shift_cues_later_small</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="Group"/>,shift_cues_later</SetVariable>
+                        <SetVariable name="ConfigKeyRight"><Variable name="Group"/>,shift_cues_later_small</SetVariable>
                       </Template>
                     </Children>
                   </WidgetGroup><!-- hotcue shift -->
                 </Children>
+                <Connection>
+                  <ConfigKey persist="true">[Skin],timing_shift_buttons</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
               </WidgetGroup><!-- CurPos + hotcue shift -->
 
               <WidgetGroup><!-- beats earlier & faster -->
                 <Layout>vertical</Layout>
-                <SizePolicy>f,f</SizePolicy>
+                <Size>26f,52f</Size>
                 <Children>
-                  <Template src="skin:button_1state.xml">
+                  <Template src="skin:/controls/button_1state.xml">
                     <SetVariable name="TooltipId">beats_translate_earlier</SetVariable>
                     <SetVariable name="ObjectName">BeatsEarlier</SetVariable>
                     <SetVariable name="Size">26f,26f</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="group"/>,beats_translate_earlier</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="Group"/>,beats_translate_earlier</SetVariable>
                   </Template>
 
-                  <Template src="skin:button_1state.xml">
+                  <Template src="skin:/controls/button_1state.xml">
                     <SetVariable name="TooltipId">beats_adjust_faster</SetVariable>
                     <SetVariable name="ObjectName">BeatsFaster</SetVariable>
                     <SetVariable name="Size">26f,26f</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="group"/>,beats_adjust_faster</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="Group"/>,beats_adjust_faster</SetVariable>
                   </Template>
                 </Children>
               </WidgetGroup><!-- /beats earlier & faster -->
 
               <WidgetGroup><!-- beats later & slower -->
                 <Layout>vertical</Layout>
-                <SizePolicy>f,f</SizePolicy>
+                <Size>26f,52f</Size>
                 <Children>
-                  <Template src="skin:button_1state.xml">
+                  <Template src="skin:/controls/button_1state.xml">
                     <SetVariable name="TooltipId">beats_translate_later</SetVariable>
                     <SetVariable name="ObjectName">BeatsLater</SetVariable>
                     <SetVariable name="Size">26f,26f</SetVariable>
-                    <SetVariable name="ConfigKey"><Variable name="group"/>,beats_translate_later</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="Group"/>,beats_translate_later</SetVariable>
                   </Template>
 
-                  <Template src="skin:button_1state.xml">
+                  <Template src="skin:/controls/button_1state.xml">
                     <SetVariable name="TooltipId">beats_adjust_slower</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>
+                    <SetVariable name="ConfigKey"><Variable name="Group"/>,beats_adjust_slower</SetVariable>
                   </Template>
                 </Children>
               </WidgetGroup><!-- /beats later & slower -->
             </Children>
           </WidgetGroup><!-- /beat grid buttons row -->
 
-          <WidgetGroup><Size>1me,0me</Size></WidgetGroup>
+          <WidgetGroup><Size>1me,1me</Size></WidgetGroup>
         </Children>
         <Connection>
-          <ConfigKey persist="true">[Skin],beatgrid_buttons</ConfigKey>
+          <ConfigKey persist="true">[Skin],show_beatgrid_controls</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
       </WidgetGroup><!-- /Transparent container for beatgrid buttons -->
diff --git a/res/skins/LateNight/waveforms_container.xml b/res/skins/LateNight/waveforms_container.xml
index e55afc609789..19f57892374e 100644
--- a/res/skins/LateNight/waveforms_container.xml
+++ b/res/skins/LateNight/waveforms_container.xml
@@ -1,4 +1,7 @@
 <Template>
+  <SetVariable name="BtnType">embedded</SetVariable>
+  <SetVariable name="BtnSize">library</SetVariable>
+
   <WidgetGroup>
     <Layout>horizontal</Layout>
     <SizePolicy>me,min</SizePolicy>
@@ -10,95 +13,81 @@
         <SizePolicy>me,min</SizePolicy>
         <Children>
 
-          <WidgetGroup><!-- Waveforms -->
+          <WidgetGroup>
             <Layout>vertical</Layout>
             <Size>100me,40me</Size>
             <Children>
 
-              <WidgetGroup><!-- Waveform 3 -->
+              <WidgetGroup>
                 <Layout>horizontal</Layout>
                 <SizePolicy>me,me</SizePolicy>
                 <Children>
                   <Template src="skin:waveform.xml">
-                    <SetVariable name="channum">3</SetVariable>
+                    <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>
+                    <SetVariable name="BgColorWaveform"><Variable name="BgColorWaveform_34"/></SetVariable>
+                    <SetVariable name="Highlight">[Skin],show_4decks</SetVariable>
                   </Template>
                 </Children>
                 <Connection>
                   <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
                   <BindProperty>visible</BindProperty>
                 </Connection>
-              </WidgetGroup><!-- Waveform 3 -->
+              </WidgetGroup>
 
-              <WidgetGroup><!-- Waveform 1 -->
+              <WidgetGroup>
                 <Layout>horizontal</Layout>
                 <SizePolicy>me,me</SizePolicy>
                 <Children>
                   <Template src="skin:waveform.xml">
-                    <SetVariable name="channum">1</SetVariable>
+                    <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>
+                    <SetVariable name="BgColorWaveform"><Variable name="BgColorWaveform_12"/></SetVariable>
+                    <SetVariable name="Highlight">[Skin],show_4decks</SetVariable>
                   </Template>
                 </Children>
               </WidgetGroup>
 
-              <WidgetGroup><!-- Waveform 2 -->
+              <WidgetGroup>
                 <Layout>horizontal</Layout>
                 <SizePolicy>me,me</SizePolicy>
                 <Children>
                   <Template src="skin:waveform.xml">
-                    <SetVariable name="channum">2</SetVariable>
+                    <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>
+                    <SetVariable name="BgColorWaveform"><Variable name="BgColorWaveform_12"/></SetVariable>
+                    <SetVariable name="Highlight">[Skin],show_4decks</SetVariable>
                   </Template>
                 </Children>
-              </WidgetGroup><!-- Waveform 2 -->
+              </WidgetGroup>
 
-              <WidgetGroup><!-- Waveform 4 -->
+              <WidgetGroup>
                 <Layout>horizontal</Layout>
                 <SizePolicy>me,me</SizePolicy>
                 <Children>
                   <Template src="skin:waveform.xml">
-                    <SetVariable name="channum">4</SetVariable>
+                    <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>
+                    <SetVariable name="BgColorWaveform"><Variable name="BgColorWaveform_34"/></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>
 
             </Children>
-          </WidgetGroup><!-- /Waveforms -->
+          </WidgetGroup>
 
-          <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>
+          <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+
+          <Template src="skin:/controls/button_2state_persist.xml">
+            <SetVariable name="TooltipId">FIXME_beatgrid_controls</SetVariable>
+            <SetVariable name="ObjectName">BeatgridControlsToggle</SetVariable>
+            <SetVariable name="Size">26f,52f</SetVariable>
+            <SetVariable name="BtnSize"></SetVariable>
+            <SetVariable name="ConfigKey">[Skin],show_beatgrid_controls</SetVariable>
           </Template>
 
           <WidgetGroup>
@@ -116,14 +105,6 @@
         </Connection>
       </WidgetGroup><!-- WaveformsContainer -->
 
-      <WidgetGroup>
-        <Size>5f,1min</Size>
-        <Connection>
-          <ConfigKey>[Master],skin_settings</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup>
-
     </Children>
   </WidgetGroup>
 </Template>