diff --git a/res/skins/LateNight/111___ToDo b/res/skins/LateNight/111___ToDo
new file mode 100644
index 000000000000..7dfc49f70e6e
--- /dev/null
+++ b/res/skins/LateNight/111___ToDo
@@ -0,0 +1,7 @@
+
+    tooltip > TooltipId
+    Fx variables
+    PotiMinAngle
+    PotiMaxAngle
+    KnobCenterYOffset
+    variables in descriptions
diff --git a/res/skins/LateNight/aux_passthrough.xml b/res/skins/LateNight/aux_unit.xml
similarity index 78%
rename from res/skins/LateNight/aux_passthrough.xml
rename to res/skins/LateNight/aux_unit.xml
index f7c1b585eaaa..baa160144b23 100644
--- a/res/skins/LateNight/aux_passthrough.xml
+++ b/res/skins/LateNight/aux_unit.xml
@@ -22,10 +22,11 @@
             <MaximumSize>-1, 26</MaximumSize>
             <Children>
               <Template src="skin:knob_sized_textless.xml">
-                 <SetVariable name="width">28</SetVariable>
-                 <SetVariable name="height">24</SetVariable>
-                 <SetVariable name="group">[Auxiliary<Variable name="auxnum"/>]</SetVariable>
-                 <SetVariable name="control">pregain</SetVariable>
+                <SetVariable name="TooltipId">pregain</SetVariable>
+                <SetVariable name="width">28</SetVariable>
+                <SetVariable name="height">24</SetVariable>
+                <SetVariable name="group">[Auxiliary<Variable name="auxnum"/>]</SetVariable>
+                <SetVariable name="control">pregain</SetVariable>
               </Template>
               <WidgetGroup>
                 <ObjectName>GuiToggleContainerPadLeft</ObjectName>
@@ -33,6 +34,7 @@
                 <SizePolicy>min,min</SizePolicy>
                 <Children>
                   <PushButton>
+                    <TooltipId>mute</TooltipId>
                     <Size>40f,24f</Size>
                     <ObjectName>GuiToggleButton</ObjectName>
                     <NumberStates>2</NumberStates>
@@ -61,13 +63,13 @@
                     <NumberStates>2</NumberStates>
                     <State>
                         <Number>0</Number>
-                        <Pressed>btn_pfl1_down.png</Pressed>
-                        <Unpressed>btn_pfl1.png</Unpressed>
+                        <Pressed>buttons/btn_pfl1_down.png</Pressed>
+                        <Unpressed>buttons/btn_pfl1.png</Unpressed>
                     </State>
                     <State>
                         <Number>1</Number>
-                        <Pressed>btn_pfl1_overdown.png</Pressed>
-                        <Unpressed>btn_pfl1_over.png</Unpressed>
+                        <Pressed>buttons/btn_pfl1_overdown.png</Pressed>
+                        <Unpressed>buttons/btn_pfl1_over.png</Unpressed>
                     </State>
                     <Connection>
                         <ConfigKey>[Auxiliary<Variable name="auxnum"/>],pfl</ConfigKey>
@@ -103,18 +105,18 @@
                 <NumberStates>3</NumberStates>
                 <State>
                   <Number>0</Number>
-                  <Pressed>btn_orientation_microphone_left_over.png</Pressed>
-                  <Unpressed>btn_orientation_microphone_left_over.png</Unpressed>
+                  <Pressed>buttons/btn_orientation_microphone_left_over.png</Pressed>
+                  <Unpressed>buttons/btn_orientation_microphone_left_over.png</Unpressed>
                 </State>
                 <State>
                   <Number>1</Number>
-                  <Pressed>btn_orientation_microphone_master.png</Pressed>
-                  <Unpressed>btn_orientation_microphone_master.png</Unpressed>
+                  <Pressed>buttons/btn_orientation_microphone_master.png</Pressed>
+                  <Unpressed>buttons/btn_orientation_microphone_master.png</Unpressed>
                 </State>
                 <State>
                   <Number>2</Number>
-                  <Pressed>btn_orientation_microphone_right_over.png</Pressed>
-                  <Unpressed>btn_orientation_microphone_right_over.png</Unpressed>
+                  <Pressed>buttons/btn_orientation_microphone_right_over.png</Pressed>
+                  <Unpressed>buttons/btn_orientation_microphone_right_over.png</Unpressed>
                 </State>
                 <Connection>
                   <ConfigKey>[Auxiliary<Variable name="auxnum"/>],orientation</ConfigKey>
diff --git a/res/skins/LateNight/btn_beatloop2_0125.png b/res/skins/LateNight/btn_beatloop2_0125.png
deleted file mode 100644
index 2de1bbdc108a..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_0125.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_0125_down.png b/res/skins/LateNight/btn_beatloop2_0125_down.png
deleted file mode 100644
index d35f2b1f0247..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_0125_down.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_0125_over.png b/res/skins/LateNight/btn_beatloop2_0125_over.png
deleted file mode 100644
index e37c349bf325..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_0125_over.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_0125_overdown.png b/res/skins/LateNight/btn_beatloop2_0125_overdown.png
deleted file mode 100644
index c5085d5c0642..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_0125_overdown.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_0250.png b/res/skins/LateNight/btn_beatloop2_0250.png
deleted file mode 100644
index 597ae7d41a8d..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_0250.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_0250_down.png b/res/skins/LateNight/btn_beatloop2_0250_down.png
deleted file mode 100644
index 2542ee85f1b1..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_0250_down.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_0250_over.png b/res/skins/LateNight/btn_beatloop2_0250_over.png
deleted file mode 100644
index 1efd46f6b216..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_0250_over.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_0250_overdown.png b/res/skins/LateNight/btn_beatloop2_0250_overdown.png
deleted file mode 100644
index 34189ac7b015..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_0250_overdown.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_0500.png b/res/skins/LateNight/btn_beatloop2_0500.png
deleted file mode 100644
index 22b5e3b7fd55..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_0500.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_0500_down.png b/res/skins/LateNight/btn_beatloop2_0500_down.png
deleted file mode 100644
index 6e72472af73c..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_0500_down.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_0500_over.png b/res/skins/LateNight/btn_beatloop2_0500_over.png
deleted file mode 100644
index 53356cb06c20..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_0500_over.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_0500_overdown.png b/res/skins/LateNight/btn_beatloop2_0500_overdown.png
deleted file mode 100644
index 082da015fd74..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_0500_overdown.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_1.png b/res/skins/LateNight/btn_beatloop2_1.png
deleted file mode 100644
index dc4e49617f7d..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_1.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_16.png b/res/skins/LateNight/btn_beatloop2_16.png
deleted file mode 100644
index 2ca6990425d2..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_16.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_16_down.png b/res/skins/LateNight/btn_beatloop2_16_down.png
deleted file mode 100644
index 0dee8d76c6d9..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_16_down.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_16_over.png b/res/skins/LateNight/btn_beatloop2_16_over.png
deleted file mode 100644
index e198cff40dc3..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_16_over.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_16_overdown.png b/res/skins/LateNight/btn_beatloop2_16_overdown.png
deleted file mode 100644
index 90ac6452960a..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_16_overdown.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_1_down.png b/res/skins/LateNight/btn_beatloop2_1_down.png
deleted file mode 100644
index e828dfa503d2..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_1_down.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_1_over.png b/res/skins/LateNight/btn_beatloop2_1_over.png
deleted file mode 100644
index 3c5bd032b187..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_1_over.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_1_overdown.png b/res/skins/LateNight/btn_beatloop2_1_overdown.png
deleted file mode 100644
index 85b610eebf9d..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_1_overdown.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_2.png b/res/skins/LateNight/btn_beatloop2_2.png
deleted file mode 100644
index 74269e24312a..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_2.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_2_down.png b/res/skins/LateNight/btn_beatloop2_2_down.png
deleted file mode 100644
index 1a13c01126ea..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_2_down.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_2_over.png b/res/skins/LateNight/btn_beatloop2_2_over.png
deleted file mode 100644
index 533dec1c2d44..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_2_over.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_2_overdown.png b/res/skins/LateNight/btn_beatloop2_2_overdown.png
deleted file mode 100644
index e2d922923a70..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_2_overdown.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_4.png b/res/skins/LateNight/btn_beatloop2_4.png
deleted file mode 100644
index 77cefd6c8b3f..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_4.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_4_down.png b/res/skins/LateNight/btn_beatloop2_4_down.png
deleted file mode 100644
index 2b499af8d479..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_4_down.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_4_over.png b/res/skins/LateNight/btn_beatloop2_4_over.png
deleted file mode 100644
index 628eaa2da61f..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_4_over.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_4_overdown.png b/res/skins/LateNight/btn_beatloop2_4_overdown.png
deleted file mode 100644
index 533c4efcc129..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_4_overdown.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_8.png b/res/skins/LateNight/btn_beatloop2_8.png
deleted file mode 100644
index 6a02bcceabbe..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_8.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_8_down.png b/res/skins/LateNight/btn_beatloop2_8_down.png
deleted file mode 100644
index ea98d4a77a20..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_8_down.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_8_over.png b/res/skins/LateNight/btn_beatloop2_8_over.png
deleted file mode 100644
index e1a71bc7c435..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_8_over.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_8_overdown.png b/res/skins/LateNight/btn_beatloop2_8_overdown.png
deleted file mode 100644
index 0e98a66fea9e..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_8_overdown.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_double.png b/res/skins/LateNight/btn_beatloop2_double.png
deleted file mode 100644
index 064c012eb974..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_double.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_double_overdown.png b/res/skins/LateNight/btn_beatloop2_double_overdown.png
deleted file mode 100644
index 247ff233d404..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_double_overdown.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_halve.png b/res/skins/LateNight/btn_beatloop2_halve.png
deleted file mode 100644
index e507a2325615..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_halve.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_beatloop2_halve_overdown.png b/res/skins/LateNight/btn_beatloop2_halve_overdown.png
deleted file mode 100644
index d2906843cd0e..000000000000
Binary files a/res/skins/LateNight/btn_beatloop2_halve_overdown.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_kill.png b/res/skins/LateNight/btn_kill.png
deleted file mode 100644
index 289ffe4e8731..000000000000
Binary files a/res/skins/LateNight/btn_kill.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_kill_down.png b/res/skins/LateNight/btn_kill_down.png
deleted file mode 100644
index 1a996fdbbf71..000000000000
Binary files a/res/skins/LateNight/btn_kill_down.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_kill_over.png b/res/skins/LateNight/btn_kill_over.png
deleted file mode 100644
index 2d8e17b90ea9..000000000000
Binary files a/res/skins/LateNight/btn_kill_over.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_kill_overdown.png b/res/skins/LateNight/btn_kill_overdown.png
deleted file mode 100644
index 5c8242db8719..000000000000
Binary files a/res/skins/LateNight/btn_kill_overdown.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_pfl1.png b/res/skins/LateNight/btn_pfl1.png
deleted file mode 100644
index 2d4a41796cc4..000000000000
Binary files a/res/skins/LateNight/btn_pfl1.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_pfl1_down.png b/res/skins/LateNight/btn_pfl1_down.png
deleted file mode 100644
index 453cb7d1c062..000000000000
Binary files a/res/skins/LateNight/btn_pfl1_down.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_pfl1_over.png b/res/skins/LateNight/btn_pfl1_over.png
deleted file mode 100644
index 2ff52f70347a..000000000000
Binary files a/res/skins/LateNight/btn_pfl1_over.png and /dev/null differ
diff --git a/res/skins/LateNight/btn_pfl1_overdown.png b/res/skins/LateNight/btn_pfl1_overdown.png
deleted file mode 100644
index 60ab10aa1bcf..000000000000
Binary files a/res/skins/LateNight/btn_pfl1_overdown.png and /dev/null differ
diff --git a/res/skins/LateNight/button_1state_right.xml b/res/skins/LateNight/button_1state_right.xml
new file mode 100644
index 000000000000..a30c4e50677e
--- /dev/null
+++ b/res/skins/LateNight/button_1state_right.xml
@@ -0,0 +1,39 @@
+<!--
+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>1</NumberStates>
+    <RightClickIsPushButton>true</RightClickIsPushButton>
+    <State>
+      <Number>0</Number>
+      <Text><Variable name="state_0_text"/></Text>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
+      <Alignment><Variable name="Align"/></Alignment>
+    </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.xml b/res/skins/LateNight/button_2state.xml
new file mode 100644
index 000000000000..a2fecb64fbe9
--- /dev/null
+++ b/res/skins/LateNight/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>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="icon"/>_down.png</Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="icon"/>.png</Unpressed>
+    </State>
+    <State>
+      <Number>1</Number>
+      <Text><Variable name="state_1_text"/></Text>
+      <Alignment><Variable name="Align"/></Alignment>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="icon"/>_overdown.png</Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="icon"/>_over.png</Unpressed>
+    </State>
+    <Connection>
+      <ConfigKey><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
new file mode 100644
index 000000000000..b8844238cde9
--- /dev/null
+++ b/res/skins/LateNight/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>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
+    </State>
+    <State>
+      <Number>1</Number>
+      <Text><Variable name="state_1_text"/></Text>
+      <Alignment><Variable name="Align"/></Alignment>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_pressed"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_unpressed"/></Unpressed>
+    </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
new file mode 100644
index 000000000000..a8a8edcb4057
--- /dev/null
+++ b/res/skins/LateNight/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>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
+    </State>
+    <State>
+      <Number>1</Number>
+      <Text><Variable name="state_1_text"/></Text>
+      <Alignment><Variable name="Align"/></Alignment>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_pressed"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_unpressed"/></Unpressed>
+    </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_display.xml b/res/skins/LateNight/button_3state_display.xml
new file mode 100644
index 000000000000..d8346645e2f7
--- /dev/null
+++ b/res/skins/LateNight/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>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
+      <Alignment><Variable name="Align"/></Alignment>
+    </State>
+    <State>
+      <Number>1</Number>
+      <Text><Variable name="state_1_text"/></Text>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_pressed"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_unpressed"/></Unpressed>
+      <Alignment><Variable name="Align"/></Alignment>
+    </State>
+    <State>
+      <Number>2</Number>
+      <Text><Variable name="state_2_text"/></Text>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_pressed"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_unpressed"/></Unpressed>
+      <Alignment><Variable name="Align"/></Alignment>
+    </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_5state.xml b/res/skins/LateNight/button_5state.xml
new file mode 100644
index 000000000000..25f8611f7e17
--- /dev/null
+++ b/res/skins/LateNight/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>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
+      <Alignment><Variable name="Align"/></Alignment>
+    </State>
+    <State>
+      <Number>1</Number>
+      <Text><Variable name="state_1_text"/></Text>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_pressed"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_1_unpressed"/></Unpressed>
+      <Alignment><Variable name="Align"/></Alignment>
+    </State>
+    <State>
+      <Number>2</Number>
+      <Text><Variable name="state_2_text"/></Text>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_pressed"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_2_unpressed"/></Unpressed>
+      <Alignment><Variable name="Align"/></Alignment>
+    </State>
+    <State>
+      <Number>3</Number>
+      <Text><Variable name="state_3_text"/></Text>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_3_pressed"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_3_unpressed"/></Unpressed>
+      <Alignment><Variable name="Align"/></Alignment>
+    </State>
+    <State>
+      <Number>4</Number>
+      <Text><Variable name="state_4_text"/></Text>
+      <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_4_pressed"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_<Variable name="state_4_unpressed"/></Unpressed>
+      <Alignment><Variable name="Align"/></Alignment>
+    </State>
+    <Connection>
+      <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
+      <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+      <ButtonState>LeftButton</ButtonState>
+    </Connection>
+  </PushButton>
+</Template>
diff --git a/res/skins/LateNight/buttons/btn_beat_curpos.png b/res/skins/LateNight/buttons/btn_beat_curpos.png
new file mode 100644
index 000000000000..e3276d7c8dbf
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_beat_curpos.png differ
diff --git a/res/skins/LateNight/buttons/btn_beat_curpos.svg b/res/skins/LateNight/buttons/btn_beat_curpos.svg
new file mode 100644
index 000000000000..efb1fe6f46aa
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_beat_curpos.svg
@@ -0,0 +1,61 @@
+<?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"
+   version="1.1"
+   width="25"
+   height="18"
+   viewBox="0 0 25 18"
+   id="svg2">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <path
+     d="M 4,4 4,14 6,14 6,4 z"
+     id="path3805"
+     style="fill:#585858;fill-opacity:1" />
+  <path
+     d="M 9,4.0000003 9,14 l 2,0 0,-9.9999997 z"
+     id="path3805-6"
+     style="fill:#585858;fill-opacity:1" />
+  <path
+     d="M 14,4.0000002 14,14 l 2,0 0,-9.9999998 z"
+     id="path3805-7"
+     style="fill:#585858;fill-opacity:1" />
+  <path
+     d="M 19,4.0000002 19,14 l 2,0 0,-9.9999998 z"
+     id="path3805-6-5"
+     style="fill:#585858;fill-opacity:1" />
+  <path
+     d="m 4,-13 0,12 2,0 0,-12 z"
+     id="path3805-3"
+     style="fill:#55f864;fill-opacity:1" />
+  <path
+     d="m 9,-13 0,12 2,0 0,-12 z"
+     id="path3805-6-56"
+     style="fill:#55f864;fill-opacity:1" />
+  <path
+     d="m 14,-13 0,12 2,0 0,-12 z"
+     id="path3805-7-2"
+     style="fill:#55f864;fill-opacity:1" />
+  <path
+     d="m 19,-13 0,12 2,0 0,-12 z"
+     id="path3805-6-5-9"
+     style="fill:#55f864;fill-opacity:1" />
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_beat_curpos_over.png b/res/skins/LateNight/buttons/btn_beat_curpos_over.png
new file mode 100644
index 000000000000..fdb7353b93c4
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_beat_curpos_over.png differ
diff --git a/res/skins/LateNight/buttons/btn_beatbox_double.png b/res/skins/LateNight/buttons/btn_beatbox_double.png
new file mode 100644
index 000000000000..06ea88b84301
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_beatbox_double.png differ
diff --git a/res/skins/LateNight/buttons/btn_beatbox_double.svg b/res/skins/LateNight/buttons/btn_beatbox_double.svg
new file mode 100644
index 000000000000..441910766f2d
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_beatbox_double.svg
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="16"
+   height="24"
+   id="svg3063">
+  <metadata
+     id="metadata3073">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+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="linearGradient5420">
+      <stop
+         id="stop5422"
+         style="stop-color:#101010;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5424"
+         style="stop-color:#242424;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient5426"
+       xlink:href="#linearGradient5420"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient5426-7"
+       xlink:href="#linearGradient5420-5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient5420-5">
+      <stop
+         id="stop5422-3"
+         style="stop-color:#101010;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5424-5"
+         style="stop-color:#242424;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient6970"
+       xlink:href="#linearGradient5420-5"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <path
+     d="m 0,18.284991 c 0,1.60264 1.1434775,2.875 2.583894,2.875 l 10.335576,0 c 1.440417,0 2.583894,-1.27236 2.583894,-2.875 l 0,-14.95 c 0,-1.60264 -1.143477,-2.875 -2.583894,-2.875 l -10.335576,0 C 1.1434775,0.459991 0,1.732351 0,3.334991 z"
+     id="path3067-6"
+     style="font-weight:400;text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;color:#000000;fill:url(#linearGradient6970);fill-opacity:1;marker:none;overflow:visible;font-family:Sans;-inkscape-font-specification:Sans" />
+  <path
+     d="M 6.9996967,7.0819 2.428178,15 h 9.143038 z"
+     id="path3065"
+     style="fill:#bfbfbf;fill-opacity:1" />
+  <path
+     d="M 12.5,0 C 14.430351,0 16,1.72656 16,3.85 v 14.3 C 16,20.27344 14.430351,22 12.5,22 H 2.5 C 1.519402,22 0.635958,21.58244 0,20.86568 V 18.15 c 0,1.53296 1.106351,2.75 2.5,2.75 h 10 c 1.393649,0 2.5,-1.21704 2.5,-2.75 V 3.85 C 15,2.31704 13.893649,1.1 12.5,1.1 H 2.5 C 1.106351,1.1 0,2.31704 0,3.85 V 1.16875 C 0.635958,0.45199 1.519402,0 2.5,0 h 10 z"
+     id="path3067"
+     style="font-weight:400;text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;color:#000000;fill:#666666;fill-opacity:1;marker:none;overflow:visible;font-family:Sans;-inkscape-font-specification:Sans" />
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_beatbox_double_pressed.svg b/res/skins/LateNight/buttons/btn_beatbox_double_pressed.svg
new file mode 100644
index 000000000000..b0cb02a94f99
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_beatbox_double_pressed.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="16"
+   height="24"
+   id="svg3063">
+  <metadata
+     id="metadata3073">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+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="linearGradient5420">
+      <stop
+         id="stop5422"
+         style="stop-color:#101010;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5424"
+         style="stop-color:#242424;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient5426"
+       xlink:href="#linearGradient5420"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <path
+     d="m 0,18.284991 c 0,1.60264 1.1434775,2.875 2.583894,2.875 l 10.335576,0 c 1.440417,0 2.583894,-1.27236 2.583894,-2.875 l 0,-14.9499999 c 0,-1.60264 -1.143477,-2.87499998 -2.583894,-2.87499998 l -10.335576,0 C 1.1434775,0.45999112 0,1.7323511 0,3.3349911 z"
+     id="path3067-6"
+     style="font-weight:400;text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;color:#000000;fill:url(#linearGradient5426);fill-opacity:1;marker:none;overflow:visible;font-family:Sans;-inkscape-font-specification:Sans" />
+  <path
+     d="M 6.9996967,7.0819 2.428178,15 h 9.143038 z"
+     id="path3065"
+     style="fill:#888888;fill-opacity:1" />
+  <path
+     d="M 12.5,0 C 14.430351,0 16,1.72656 16,3.85 v 14.3 C 16,20.27344 14.430351,22 12.5,22 H 2.5 C 1.519402,22 0.635958,21.58244 0,20.86568 V 18.15 c 0,1.53296 1.106351,2.75 2.5,2.75 h 10 c 1.393649,0 2.5,-1.21704 2.5,-2.75 V 3.85 C 15,2.31704 13.893649,1.1 12.5,1.1 H 2.5 C 1.106351,1.1 0,2.31704 0,3.85 V 1.16875 C 0.635958,0.45199 1.519402,0 2.5,0 h 10 z"
+     id="path3067"
+     style="font-weight:400;text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;color:#000000;fill:#666666;fill-opacity:1;marker:none;overflow:visible;font-family:Sans;-inkscape-font-specification:Sans" />
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_beatbox_down.svg b/res/skins/LateNight/buttons/btn_beatbox_down.svg
new file mode 100644
index 000000000000..0cea6c553845
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_beatbox_down.svg
@@ -0,0 +1,36 @@
+<?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"
+   version="1.1"
+   width="16"
+   height="20"
+   id="svg3037">
+  <metadata
+     id="metadata3047">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3045" />
+  <path
+     d="M 9.0003033,14.918 13.571822,6.9999 H 4.4287835 z"
+     id="path3039"
+     style="fill:#888888;fill-opacity:1" />
+  <path
+     d="M 3.5,0 C 1.5696486,0 0,1.5696 0,3.5 v 13 C 0,18.4304 1.5696486,20 3.5,20 h 10 c 0.980598,0 1.864042,-0.379628 2.5,-1.03125 V 16.5 C 16,17.8936 14.893649,19 13.5,19 H 3.5 C 2.1063514,19 1,17.8936 1,16.5 V 3.5 C 1,2.1064 2.1063514,1 3.5,1 h 10 C 14.893649,1 16,2.1064 16,3.5 V 1.0625 C 15.364042,0.41087819 14.480598,0 13.5,0 h -10 z"
+     id="path3041"
+     style="font-weight:400;text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;color:#000000;fill:#666666;fill-opacity:1;marker:none;overflow:visible;font-family:Sans;-inkscape-font-specification:Sans" />
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_beatbox_down_hover.svg b/res/skins/LateNight/buttons/btn_beatbox_down_hover.svg
new file mode 100644
index 000000000000..8b07291f6f35
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_beatbox_down_hover.svg
@@ -0,0 +1,36 @@
+<?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"
+   version="1.1"
+   width="16"
+   height="20"
+   id="svg3049">
+  <metadata
+     id="metadata3061">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3059" />
+  <path
+     d="M 3.5,0 C 1.5696486,0 0,1.5696 0,3.5 v 13 C 0,18.4304 1.5696486,20 3.5,20 h 10 c 0.980598,0 1.864042,-0.3796 2.5,-1.0312 V 16.5 C 16,17.8936 14.893649,19 13.5,19 H 3.5 C 2.1063514,19 1,17.8936 1,16.5 V 3.5 C 1,2.1064 2.1063514,1 3.5,1 h 10 C 14.893649,1 16,2.1064 16,3.5 V 1.0625 C 15.364042,0.4109 14.480598,0 13.5,0 h -10 z"
+     id="path3053"
+     style="font-weight:400;text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;color:#000000;fill:#d2d2d2;marker:none;overflow:visible;font-family:Sans;-inkscape-font-specification:Sans" />
+  <path
+     d="M 9.0003033,14.918 13.571822,6.9999 H 4.4287835 z"
+     id="path3055"
+     style="fill:#d2d2d2" />
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_beatbox_halve.png b/res/skins/LateNight/buttons/btn_beatbox_halve.png
new file mode 100644
index 000000000000..dcbc55528051
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_beatbox_halve.png differ
diff --git a/res/skins/LateNight/buttons/btn_beatbox_halve.svg b/res/skins/LateNight/buttons/btn_beatbox_halve.svg
new file mode 100644
index 000000000000..8a0983102d89
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_beatbox_halve.svg
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="16"
+   height="24"
+   id="svg3063">
+  <metadata
+     id="metadata3073">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+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="linearGradient5420">
+      <stop
+         id="stop5422"
+         style="stop-color:#101010;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5424"
+         style="stop-color:#242424;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient5426"
+       xlink:href="#linearGradient5420"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient6970"
+       xlink:href="#linearGradient5420-5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient5420-5">
+      <stop
+         id="stop5422-3"
+         style="stop-color:#101010;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5424-5"
+         style="stop-color:#242424;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient7042"
+       xlink:href="#linearGradient5420-5"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <path
+     d="m 0.71186441,18.386686 c 0,1.60264 1.14347749,2.875 2.58389399,2.875 l 10.3355756,0 c 1.440417,0 2.583894,-1.27236 2.583894,-2.875 l 0,-14.9500001 c 0,-1.60264 -1.143477,-2.87499998 -2.583894,-2.87499998 l -10.3355756,0 c -1.4404165,0 -2.58389399,1.27235998 -2.58389399,2.87499998 z"
+     id="path3067-6"
+     style="font-weight:400;text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;color:#000000;fill:url(#linearGradient7042);fill-opacity:1;marker:none;overflow:visible;font-family:Sans;-inkscape-font-specification:Sans" />
+  <path
+     d="M 9.0003033,15 13.571822,7.0819 H 4.428784 z"
+     id="path3065"
+     style="fill:#bfbfbf;fill-opacity:1" />
+  <path
+     d="M 3.5,0 C 1.569649,0 0,1.72656 0,3.85 v 14.3 C 0,20.27344 1.569649,22 3.5,22 h 10 c 0.980598,0 1.864042,-0.41756 2.5,-1.13432 V 18.15 c 0,1.53296 -1.106351,2.75 -2.5,2.75 H 3.5 C 2.106351,20.9 1,19.68296 1,18.15 V 3.85 C 1,2.31704 2.106351,1.1 3.5,1.1 h 10 c 1.393649,0 2.5,1.21704 2.5,2.75 V 1.16875 C 15.364042,0.45199 14.480598,0 13.5,0 h -10 z"
+     id="path3067"
+     style="font-weight:400;text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;color:#000000;fill:#666666;fill-opacity:1;marker:none;overflow:visible;font-family:Sans;-inkscape-font-specification:Sans" />
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_beatbox_halve_pressed.svg b/res/skins/LateNight/buttons/btn_beatbox_halve_pressed.svg
new file mode 100644
index 000000000000..8e69025b8761
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_beatbox_halve_pressed.svg
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="16"
+   height="24"
+   id="svg3063">
+  <metadata
+     id="metadata3073">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+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="linearGradient5420">
+      <stop
+         id="stop5422"
+         style="stop-color:#101010;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5424"
+         style="stop-color:#242424;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient5426"
+       xlink:href="#linearGradient5420"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient7042"
+       xlink:href="#linearGradient5420-5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient5420-5">
+      <stop
+         id="stop5422-3"
+         style="stop-color:#101010;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5424-5"
+         style="stop-color:#242424;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient7106"
+       xlink:href="#linearGradient5420-5"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <path
+     d="m 0.71186441,18.386686 c 0,1.60264 1.14347749,2.875 2.58389399,2.875 l 10.3355756,0 c 1.440417,0 2.583894,-1.27236 2.583894,-2.875 l 0,-14.95 c 0,-1.60264 -1.143477,-2.875 -2.583894,-2.875 l -10.3355756,0 c -1.4404165,0 -2.58389399,1.27236 -2.58389399,2.875 z"
+     id="path3067-6"
+     style="font-weight:400;text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;color:#000000;fill:url(#linearGradient7106);fill-opacity:1;marker:none;overflow:visible;font-family:Sans;-inkscape-font-specification:Sans" />
+  <path
+     d="M 9.0003033,15 13.571822,7.0819 H 4.428784 z"
+     id="path3065"
+     style="fill:#888888;fill-opacity:1" />
+  <path
+     d="M 3.5,0 C 1.569649,0 0,1.72656 0,3.85 v 14.3 C 0,20.27344 1.569649,22 3.5,22 h 10 c 0.980598,0 1.864042,-0.41756 2.5,-1.13432 V 18.15 c 0,1.53296 -1.106351,2.75 -2.5,2.75 H 3.5 C 2.106351,20.9 1,19.68296 1,18.15 V 3.85 C 1,2.31704 2.106351,1.1 3.5,1.1 h 10 c 1.393649,0 2.5,1.21704 2.5,2.75 V 1.16875 C 15.364042,0.45199 14.480598,0 13.5,0 h -10 z"
+     id="path3067"
+     style="font-weight:400;text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;color:#000000;fill:#666666;fill-opacity:1;marker:none;overflow:visible;font-family:Sans;-inkscape-font-specification:Sans" />
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_beatbox_up.svg b/res/skins/LateNight/buttons/btn_beatbox_up.svg
new file mode 100644
index 000000000000..f03cfcfdc3c8
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_beatbox_up.svg
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="16"
+   height="24"
+   id="svg3063">
+  <metadata
+     id="metadata3073">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+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" />
+  <image
+     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAYCAYAAADzoH0MAAAABHNCSVQICAgIfAhkiAAAAXFJREFU
+OI2dkzFuwzAMRR8DIWsPkGtkzdhmLJApY7dOPVMvkalXSM7E34EULRWFi1qAYVgUPx8/ZTscDm+n
+0+mTDet+v7/a9XrV4/HYks/xeGS3NbmvJmn1gAFrJ/4UWI9OAsp6/1s/CNbqLQXGUs2l+Oi5v0L0
+FE07AA0J1YYw2ZxUwpoql4CkianLCcMksDyqEIuXsExo7o6ZIbG0YqoqtY8isYSULSDkQeAdJNuK
+bJvsC9MXP1oMwYMt4eKIJoQSJ84rvWqSsu9hSL1X9VrKtxVVYEOTO5pGNxiYNAh8YKuegeblmRJT
+4YFZVY7vnEQZnAS442ZlS+FKmMAtsCvu2VZSNx+ucp9vd9oN8H4PBkZTKbQIdONiTEaiqo802sG6
+N0MLwpGTxuWQTFE5MS0vlzy8MWkZo1dPqmrxTxQ59cfK8g70COzO5xdcQu64UiQfd/Vxx11TkEU8
+6fb7/dflcnlmw7rdbu8GfABPWwQAvgEUPiKG/c+VPAAAAABJRU5ErkJggg==
+"
+     x="36.062447"
+     y="7.4246211"
+     width="16"
+     height="24"
+     id="image4872" />
+  <path
+     d="M 6.9996967,7.0819 2.428178,15 h 9.143038 z"
+     id="path3065"
+     style="fill:#888888;fill-opacity:1" />
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_beatbox_up_hover.svg b/res/skins/LateNight/buttons/btn_beatbox_up_hover.svg
new file mode 100644
index 000000000000..5e11deb90e47
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_beatbox_up_hover.svg
@@ -0,0 +1,36 @@
+<?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"
+   version="1.1"
+   width="16"
+   height="20"
+   id="svg3075">
+  <metadata
+     id="metadata3087">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3085" />
+  <path
+     d="M 6.9996967,5.0819 2.428178,13 h 9.143038 z"
+     id="path3079"
+     style="fill:#d2d2d2" />
+  <path
+     d="M 12.5,0 C 14.430351,0 16,1.5696 16,3.5 v 13 C 16,18.4304 14.430351,20 12.5,20 H 2.5 C 1.519402,20 0.635958,19.6204 0,18.9688 V 16.5 C 0,17.8936 1.106351,19 2.5,19 h 10 C 13.893649,19 15,17.8936 15,16.5 V 3.5 C 15,2.1064 13.893649,1 12.5,1 H 2.5 C 1.106351,1 0,2.1064 0,3.5 V 1.0625 C 0.635958,0.4109 1.519402,0 2.5,0 h 10 z"
+     id="path3081"
+     style="font-weight:400;text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;color:#000000;fill:#d2d2d2;marker:none;overflow:visible;font-family:Sans;-inkscape-font-specification:Sans" />
+</svg>
diff --git a/res/skins/LateNight/btn_beatgrid2.png b/res/skins/LateNight/buttons/btn_beatgrid2.png
similarity index 100%
rename from res/skins/LateNight/btn_beatgrid2.png
rename to res/skins/LateNight/buttons/btn_beatgrid2.png
diff --git a/res/skins/LateNight/btn_beatgrid2_over.png b/res/skins/LateNight/buttons/btn_beatgrid2_over.png
similarity index 100%
rename from res/skins/LateNight/btn_beatgrid2_over.png
rename to res/skins/LateNight/buttons/btn_beatgrid2_over.png
diff --git a/res/skins/LateNight/btn_clear.png b/res/skins/LateNight/buttons/btn_clear.png
similarity index 100%
rename from res/skins/LateNight/btn_clear.png
rename to res/skins/LateNight/buttons/btn_clear.png
diff --git a/res/skins/LateNight/btn_clear_down.png b/res/skins/LateNight/buttons/btn_clear_down.png
similarity index 100%
rename from res/skins/LateNight/btn_clear_down.png
rename to res/skins/LateNight/buttons/btn_clear_down.png
diff --git a/res/skins/LateNight/btn_clipping1.png b/res/skins/LateNight/buttons/btn_clipping1.png
similarity index 100%
rename from res/skins/LateNight/btn_clipping1.png
rename to res/skins/LateNight/buttons/btn_clipping1.png
diff --git a/res/skins/LateNight/btn_clipping1_over.png b/res/skins/LateNight/buttons/btn_clipping1_over.png
similarity index 100%
rename from res/skins/LateNight/btn_clipping1_over.png
rename to res/skins/LateNight/buttons/btn_clipping1_over.png
diff --git a/res/skins/LateNight/btn_clipping_previewdeck.png b/res/skins/LateNight/buttons/btn_clipping_previewdeck.png
similarity index 100%
rename from res/skins/LateNight/btn_clipping_previewdeck.png
rename to res/skins/LateNight/buttons/btn_clipping_previewdeck.png
diff --git a/res/skins/LateNight/btn_clipping_previewdeck_over.png b/res/skins/LateNight/buttons/btn_clipping_previewdeck_over.png
similarity index 100%
rename from res/skins/LateNight/btn_clipping_previewdeck_over.png
rename to res/skins/LateNight/buttons/btn_clipping_previewdeck_over.png
diff --git a/res/skins/LateNight/btn_clipping_sampler.png b/res/skins/LateNight/buttons/btn_clipping_sampler.png
similarity index 100%
rename from res/skins/LateNight/btn_clipping_sampler.png
rename to res/skins/LateNight/buttons/btn_clipping_sampler.png
diff --git a/res/skins/LateNight/btn_clipping_sampler_over.png b/res/skins/LateNight/buttons/btn_clipping_sampler_over.png
similarity index 100%
rename from res/skins/LateNight/btn_clipping_sampler_over.png
rename to res/skins/LateNight/buttons/btn_clipping_sampler_over.png
diff --git a/res/skins/LateNight/btn_eject1.png b/res/skins/LateNight/buttons/btn_eject1.png
similarity index 100%
rename from res/skins/LateNight/btn_eject1.png
rename to res/skins/LateNight/buttons/btn_eject1.png
diff --git a/res/skins/LateNight/btn_eject1_over.png b/res/skins/LateNight/buttons/btn_eject1_over.png
similarity index 100%
rename from res/skins/LateNight/btn_eject1_over.png
rename to res/skins/LateNight/buttons/btn_eject1_over.png
diff --git a/res/skins/LateNight/btn_eject2.png b/res/skins/LateNight/buttons/btn_eject2.png
similarity index 100%
rename from res/skins/LateNight/btn_eject2.png
rename to res/skins/LateNight/buttons/btn_eject2.png
diff --git a/res/skins/LateNight/btn_eject2_over.png b/res/skins/LateNight/buttons/btn_eject2_over.png
similarity index 100%
rename from res/skins/LateNight/btn_eject2_over.png
rename to res/skins/LateNight/buttons/btn_eject2_over.png
diff --git a/res/skins/LateNight/btn_eject_sampler.png b/res/skins/LateNight/buttons/btn_eject_sampler.png
similarity index 100%
rename from res/skins/LateNight/btn_eject_sampler.png
rename to res/skins/LateNight/buttons/btn_eject_sampler.png
diff --git a/res/skins/LateNight/btn_eject_sampler_over.png b/res/skins/LateNight/buttons/btn_eject_sampler_over.png
similarity index 100%
rename from res/skins/LateNight/btn_eject_sampler_over.png
rename to res/skins/LateNight/buttons/btn_eject_sampler_over.png
diff --git a/res/skins/LateNight/btn_forward2.png b/res/skins/LateNight/buttons/btn_forward2.png
similarity index 100%
rename from res/skins/LateNight/btn_forward2.png
rename to res/skins/LateNight/buttons/btn_forward2.png
diff --git a/res/skins/LateNight/btn_forward2_overdown.png b/res/skins/LateNight/buttons/btn_forward2_overdown.png
similarity index 100%
rename from res/skins/LateNight/btn_forward2_overdown.png
rename to res/skins/LateNight/buttons/btn_forward2_overdown.png
diff --git a/res/skins/LateNight/buttons/btn_fxButton.png b/res/skins/LateNight/buttons/btn_fxButton.png
new file mode 100644
index 000000000000..54bc99d21c8f
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_fxButton.png differ
diff --git a/res/skins/LateNight/buttons/btn_fxButton_down.png b/res/skins/LateNight/buttons/btn_fxButton_down.png
new file mode 100644
index 000000000000..010476fcaf28
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_fxButton_down.png differ
diff --git a/res/skins/LateNight/buttons/btn_fxButton_over.png b/res/skins/LateNight/buttons/btn_fxButton_over.png
new file mode 100644
index 000000000000..495b6b68ad16
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_fxButton_over.png differ
diff --git a/res/skins/LateNight/buttons/btn_fxButton_overdown.png b/res/skins/LateNight/buttons/btn_fxButton_overdown.png
new file mode 100644
index 000000000000..c155c89dba6d
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_fxButton_overdown.png differ
diff --git a/res/skins/LateNight/buttons/btn_fxCollapse.png b/res/skins/LateNight/buttons/btn_fxCollapse.png
new file mode 100644
index 000000000000..d3d55fdd2452
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_fxCollapse.png differ
diff --git a/res/skins/LateNight/buttons/btn_fxExpand.png b/res/skins/LateNight/buttons/btn_fxExpand.png
new file mode 100644
index 000000000000..256787b592a3
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_fxExpand.png differ
diff --git a/res/skins/LateNight/buttons/btn_fxSelector.png b/res/skins/LateNight/buttons/btn_fxSelector.png
new file mode 100644
index 000000000000..f04940164942
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_fxSelector.png differ
diff --git a/res/skins/LateNight/buttons/btn_fxSelector.svg b/res/skins/LateNight/buttons/btn_fxSelector.svg
new file mode 100644
index 000000000000..7fa61ec464d8
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_fxSelector.svg
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="16"
+   height="24"
+   id="svg3063">
+  <metadata
+     id="metadata3073">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+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="linearGradient5420">
+      <stop
+         id="stop5422"
+         style="stop-color:#101010;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5424"
+         style="stop-color:#242424;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient5426"
+       xlink:href="#linearGradient5420"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient6970"
+       xlink:href="#linearGradient5420-5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient5420-5">
+      <stop
+         id="stop5422-3"
+         style="stop-color:#101010;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5424-5"
+         style="stop-color:#242424;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient7042"
+       xlink:href="#linearGradient5420-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-29.389831,3.2542373)" />
+  </defs>
+  <path
+     d="M 8.0000003,15.9181 12.571519,8 H 3.428481 z"
+     id="path3065"
+     style="fill:#bfbfbf;fill-opacity:1" />
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_fxSelector_pressed.png b/res/skins/LateNight/buttons/btn_fxSelector_pressed.png
new file mode 100644
index 000000000000..aeffc75ffee5
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_fxSelector_pressed.png differ
diff --git a/res/skins/LateNight/buttons/btn_fxSelector_pressed.svg b/res/skins/LateNight/buttons/btn_fxSelector_pressed.svg
new file mode 100644
index 000000000000..7d765fb31b0b
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_fxSelector_pressed.svg
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="16"
+   height="24"
+   id="svg3063">
+  <metadata
+     id="metadata3073">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+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="linearGradient5420">
+      <stop
+         id="stop5422"
+         style="stop-color:#101010;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5424"
+         style="stop-color:#242424;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient5426"
+       xlink:href="#linearGradient5420"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient7042"
+       xlink:href="#linearGradient5420-5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient5420-5">
+      <stop
+         id="stop5422-3"
+         style="stop-color:#101010;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5424-5"
+         style="stop-color:#242424;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient7106"
+       xlink:href="#linearGradient5420-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.46354621,0)" />
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient7106-3"
+       xlink:href="#linearGradient5420-5-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.46354621,0)" />
+    <linearGradient
+       id="linearGradient5420-5-6">
+      <stop
+         id="stop5422-3-7"
+         style="stop-color:#101010;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5424-5-5"
+         style="stop-color:#242424;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient3765"
+       xlink:href="#linearGradient5420-5-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0320341,0,0,1.1594203,-0.734668,-1.6512301)" />
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient3765-5"
+       xlink:href="#linearGradient5420-5-6-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0320341,0,0,1.1594203,-0.734668,-1.6512301)" />
+    <linearGradient
+       id="linearGradient5420-5-6-6">
+      <stop
+         id="stop5422-3-7-2"
+         style="stop-color:#101010;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5424-5-5-9"
+         style="stop-color:#242424;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient3801"
+       xlink:href="#linearGradient5420-5-6-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.90302984,0,0,1.0540185,0.3571655,-0.41020918)" />
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient3765-2"
+       xlink:href="#linearGradient5420-5-6-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0320341,0,0,1.1594203,-0.734668,-1.6512301)" />
+    <linearGradient
+       id="linearGradient5420-5-6-7">
+      <stop
+         id="stop5422-3-7-0"
+         style="stop-color:#101010;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5424-5-5-93"
+         style="stop-color:#242424;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient3835"
+       xlink:href="#linearGradient5420-5-6-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0320341,0,0,1.1594203,-22.734668,-0.6512301)" />
+  </defs>
+  <path
+     d="M 8.0000003,15.9181 12.571519,8 H 3.428481 z"
+     id="path3065"
+     style="fill:#888888;fill-opacity:1" />
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_fxSelector_pressed_x2.svg b/res/skins/LateNight/buttons/btn_fxSelector_pressed_x2.svg
new file mode 100644
index 000000000000..c50844abe7aa
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_fxSelector_pressed_x2.svg
@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="32"
+   height="48"
+   id="svg3063">
+  <metadata
+     id="metadata3073">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+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="linearGradient5420">
+      <stop
+         id="stop5422"
+         style="stop-color:#101010;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5424"
+         style="stop-color:#242424;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient5426"
+       xlink:href="#linearGradient5420"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient7042"
+       xlink:href="#linearGradient5420-5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient5420-5">
+      <stop
+         id="stop5422-3"
+         style="stop-color:#101010;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5424-5"
+         style="stop-color:#242424;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient7106"
+       xlink:href="#linearGradient5420-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.46354621,0)" />
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient7106-3"
+       xlink:href="#linearGradient5420-5-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.46354621,0)" />
+    <linearGradient
+       id="linearGradient5420-5-6">
+      <stop
+         id="stop5422-3-7"
+         style="stop-color:#101010;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5424-5-5"
+         style="stop-color:#242424;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient3765"
+       xlink:href="#linearGradient5420-5-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0320341,0,0,1.1594203,-0.734668,-1.6512301)" />
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient3765-5"
+       xlink:href="#linearGradient5420-5-6-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0320341,0,0,1.1594203,-0.734668,-1.6512301)" />
+    <linearGradient
+       id="linearGradient5420-5-6-6">
+      <stop
+         id="stop5422-3-7-2"
+         style="stop-color:#101010;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5424-5-5-9"
+         style="stop-color:#242424;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient3801"
+       xlink:href="#linearGradient5420-5-6-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.90302984,0,0,1.0540185,0.3571655,-0.41020918)" />
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient3765-2"
+       xlink:href="#linearGradient5420-5-6-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0320341,0,0,1.1594203,-0.734668,-1.6512301)" />
+    <linearGradient
+       id="linearGradient5420-5-6-7">
+      <stop
+         id="stop5422-3-7-0"
+         style="stop-color:#101010;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5424-5-5-93"
+         style="stop-color:#242424;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient3835"
+       xlink:href="#linearGradient5420-5-6-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0320341,0,0,1.1594203,-22.734668,-0.6512301)" />
+  </defs>
+  <path
+     d="M 16,31.836199 25.143038,16 H 6.856962 z"
+     id="path3065"
+     style="fill:#888888;fill-opacity:1" />
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_fxSelector_x2.svg b/res/skins/LateNight/buttons/btn_fxSelector_x2.svg
new file mode 100644
index 000000000000..dec7e899740a
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_fxSelector_x2.svg
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="32"
+   height="48"
+   id="svg3063">
+  <metadata
+     id="metadata3073">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+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="linearGradient5420">
+      <stop
+         id="stop5422"
+         style="stop-color:#101010;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5424"
+         style="stop-color:#242424;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient5426"
+       xlink:href="#linearGradient5420"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient6970"
+       xlink:href="#linearGradient5420-5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient5420-5">
+      <stop
+         id="stop5422-3"
+         style="stop-color:#101010;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5424-5"
+         style="stop-color:#242424;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="12.551146"
+       y1="21.841436"
+       x2="12.525126"
+       y2="1.1143692"
+       id="linearGradient7042"
+       xlink:href="#linearGradient5420-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-29.389831,3.2542373)" />
+  </defs>
+  <path
+     d="M 16.000001,31.8362 25.143038,16 H 6.856962 z"
+     id="path3065"
+     style="fill:#bfbfbf;fill-opacity:1" />
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_fxToggle.png b/res/skins/LateNight/buttons/btn_fxToggle.png
new file mode 100644
index 000000000000..bf1d59f2c1aa
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_fxToggle.png differ
diff --git a/res/skins/LateNight/buttons/btn_fxToggle_down.png b/res/skins/LateNight/buttons/btn_fxToggle_down.png
new file mode 100644
index 000000000000..5d3588d1e01c
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_fxToggle_down.png differ
diff --git a/res/skins/LateNight/buttons/btn_fxToggle_over.png b/res/skins/LateNight/buttons/btn_fxToggle_over.png
new file mode 100644
index 000000000000..c9edf3772452
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_fxToggle_over.png differ
diff --git a/res/skins/LateNight/buttons/btn_fxToggle_overdown.png b/res/skins/LateNight/buttons/btn_fxToggle_overdown.png
new file mode 100644
index 000000000000..59d918170616
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_fxToggle_overdown.png differ
diff --git a/res/skins/LateNight/buttons/btn_fx_focus_off.svg b/res/skins/LateNight/buttons/btn_fx_focus_off.svg
new file mode 100644
index 000000000000..627729812e53
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_fx_focus_off.svg
@@ -0,0 +1,369 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="24"
+   height="24"
+   id="svg2">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient4937">
+      <stop
+         id="stop4939"
+         style="stop-color:#e90808;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4941"
+         style="stop-color:#b60000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3939">
+      <stop
+         id="stop3941"
+         style="stop-color:#eece33;stop-opacity:0.95054942"
+         offset="0" />
+      <stop
+         id="stop5813"
+         style="stop-color:#ff734e;stop-opacity:0.8186813"
+         offset="0.61061949" />
+      <stop
+         id="stop3943"
+         style="stop-color:#ff2d2d;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5461">
+      <stop
+         id="stop5463"
+         style="stop-color:#b9dcff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5465"
+         style="stop-color:#0d0d0d;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5441">
+      <stop
+         id="stop5443"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5445"
+         style="stop-color:#343434;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="345.55801"
+       y1="460.78387"
+       x2="477.52518"
+       y2="506.3692"
+       id="linearGradient5483-8"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient5441-4">
+      <stop
+         id="stop5443-2"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5445-4"
+         style="stop-color:#2a2a2a;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5441-7">
+      <stop
+         id="stop5443-4"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5445-7"
+         style="stop-color:#2a2a2a;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="345.55801"
+       y1="460.78387"
+       x2="477.52518"
+       y2="506.3692"
+       id="linearGradient5573-4"
+       xlink:href="#linearGradient5441-4-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.31622182,-0.94868528,0.94868528,-0.31622182,39.645033,974.00809)" />
+    <linearGradient
+       id="linearGradient5441-4-6">
+      <stop
+         id="stop5443-2-5"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5445-4-9"
+         style="stop-color:#2a2a2a;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient3945"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,223.83677,381.60387)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient5024"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(54.522364,18.173742)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient5032"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-57.471498)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient5265"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.822937,-35.303175)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient5267"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient5791"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381477e-7,4.1806787)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient5793"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.822937,-35.303175)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient5795"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient5803"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient5825"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381459e-7,4.1806787)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient5845"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient5847"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient3354"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient3356"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient3358"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381495e-7,4.1806787)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient3837"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)" />
+    <linearGradient
+       x1="358.44156"
+       y1="427.03851"
+       x2="505.35883"
+       y2="383.93106"
+       id="linearGradient3839"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.10675958,-1.80501e-6,-1.8067783e-6,0.10676051,-714.3216,-61.769285)" />
+    <linearGradient
+       x1="202.39464"
+       y1="623.47784"
+       x2="202.48778"
+       y2="634.36542"
+       id="linearGradient4945"
+       xlink:href="#linearGradient4937"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.257316,0,0,1,-52.110466,0)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient4947"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)" />
+    <linearGradient
+       x1="358.44156"
+       y1="427.03851"
+       x2="505.35883"
+       y2="383.93106"
+       id="linearGradient3839-3"
+       xlink:href="#linearGradient5441-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.10675958,-1.80501e-6,-1.8067783e-6,0.10676051,-714.3216,-61.769285)" />
+    <linearGradient
+       id="linearGradient5441-6">
+      <stop
+         id="stop5443-7"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5445-5"
+         style="stop-color:#343434;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="358.44156"
+       y1="427.03851"
+       x2="505.35883"
+       y2="383.93106"
+       id="linearGradient3847-3"
+       xlink:href="#linearGradient5441-6-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.10675958,-1.80501e-6,-1.8067783e-6,0.10676051,-714.3216,-61.769285)" />
+    <linearGradient
+       id="linearGradient5441-6-5">
+      <stop
+         id="stop5443-7-6"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5445-5-2"
+         style="stop-color:#343434;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="matrix(-0.90900139,0,0,-0.90900139,188.78559,594.56696)"
+     id="layer2"
+     style="fill:#333333;fill-opacity:1;display:inline">
+    <ellipse
+       cx="-669.49945"
+       cy="-18.149733"
+       rx="10.368815"
+       ry="10.368437"
+       transform="matrix(-0.31620878,-0.94868963,0.94868095,-0.31623482,0,0)"
+       id="path4669"
+       style="fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:#585858;stroke-width:1.38587463;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+  <path
+     d="m 18.59375,6.25 c 0.719146,0.8418315 1.315347,1.8209673 1.6875,2.9375 0.509395,1.528289 0.551336,3.093029 0.25,4.5625 -0.03993,0.194697 -0.07218,0.402827 -0.125,0.59375 -0.01757,0.07085 -0.0431,0.148452 -0.0625,0.21875 -0.05954,0.19487 -0.114758,0.37259 -0.1875,0.5625 -0.02234,0.06292 -0.03868,0.125157 -0.0625,0.1875 -0.787064,2.059906 -2.378753,3.777164 -4.53125,4.6875 -0.192751,0.08152 -0.392218,0.182072 -0.59375,0.25 -0.08377,0.02824 -0.165998,0.03707 -0.25,0.0625 -0.180566,0.05465 -0.349996,0.114394 -0.53125,0.15625 -0.0096,0.0025 -0.02168,-0.0025 -0.03125,0 -2.861725,0.751579 -5.7755834,-0.002 -7.90625,-1.8125 2.2549023,2.806355 6.701139,4.664713 10.306218,3.449524 4.618562,-1.556811 7.119162,-6.599734 5.5625,-11.21875 C 21.553632,9.2102678 19.889681,7.2756664 18.59375,6.25 z"
+     id="path4669-2"
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:13.13139534;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+  <g
+     transform="matrix(-0.90900139,0,0,-0.90900139,205.84809,594.06696)"
+     id="layer2-1"
+     style="fill:#878787;fill-opacity:1;display:inline" />
+  <g
+     transform="matrix(-0.90900139,0,0,-0.90900139,188.78559,594.56696)"
+     id="layer2-7"
+     style="fill:none;display:inline" />
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_fx_focus_on.svg b/res/skins/LateNight/buttons/btn_fx_focus_on.svg
new file mode 100644
index 000000000000..e407c6f14fb6
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_fx_focus_on.svg
@@ -0,0 +1,361 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="24"
+   height="24"
+   id="svg2">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient4937">
+      <stop
+         id="stop4939"
+         style="stop-color:#e90808;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4941"
+         style="stop-color:#b60000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3939">
+      <stop
+         id="stop3941"
+         style="stop-color:#eece33;stop-opacity:0.95054942"
+         offset="0" />
+      <stop
+         id="stop5813"
+         style="stop-color:#ff734e;stop-opacity:0.8186813"
+         offset="0.61061949" />
+      <stop
+         id="stop3943"
+         style="stop-color:#ff2d2d;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5461">
+      <stop
+         id="stop5463"
+         style="stop-color:#b9dcff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5465"
+         style="stop-color:#0d0d0d;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5441">
+      <stop
+         id="stop5443"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5445"
+         style="stop-color:#343434;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="345.55801"
+       y1="460.78387"
+       x2="477.52518"
+       y2="506.3692"
+       id="linearGradient5483-8"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient5441-4">
+      <stop
+         id="stop5443-2"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5445-4"
+         style="stop-color:#2a2a2a;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5441-7">
+      <stop
+         id="stop5443-4"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5445-7"
+         style="stop-color:#2a2a2a;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="345.55801"
+       y1="460.78387"
+       x2="477.52518"
+       y2="506.3692"
+       id="linearGradient5573-4"
+       xlink:href="#linearGradient5441-4-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.31622182,-0.94868528,0.94868528,-0.31622182,39.645033,974.00809)" />
+    <linearGradient
+       id="linearGradient5441-4-6">
+      <stop
+         id="stop5443-2-5"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5445-4-9"
+         style="stop-color:#2a2a2a;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient3945"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,223.83677,381.60387)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient5024"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(54.522364,18.173742)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient5032"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-57.471498)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient5265"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.822937,-35.303175)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient5267"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient5791"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381477e-7,4.1806787)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient5793"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.822937,-35.303175)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient5795"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient5803"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient5825"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381459e-7,4.1806787)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient5845"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient5847"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient3354"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient3356"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient3358"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381495e-7,4.1806787)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient3837"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)" />
+    <linearGradient
+       x1="358.44156"
+       y1="427.03851"
+       x2="505.35883"
+       y2="383.93106"
+       id="linearGradient3839"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.10675958,-1.80501e-6,-1.8067783e-6,0.10676051,-714.3216,-61.769285)" />
+    <linearGradient
+       x1="202.39464"
+       y1="623.47784"
+       x2="202.48778"
+       y2="634.36542"
+       id="linearGradient4945"
+       xlink:href="#linearGradient4937"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.257316,0,0,1,-52.110466,0)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient4947"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)" />
+    <linearGradient
+       x1="358.44156"
+       y1="427.03851"
+       x2="505.35883"
+       y2="383.93106"
+       id="linearGradient3839-3"
+       xlink:href="#linearGradient5441-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.10675958,-1.80501e-6,-1.8067783e-6,0.10676051,-714.3216,-61.769285)" />
+    <linearGradient
+       id="linearGradient5441-6">
+      <stop
+         id="stop5443-7"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5445-5"
+         style="stop-color:#343434;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="358.44156"
+       y1="427.03851"
+       x2="505.35883"
+       y2="383.93106"
+       id="linearGradient3847-3"
+       xlink:href="#linearGradient5441-6-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.10675958,-1.80501e-6,-1.8067783e-6,0.10676051,-714.3216,-61.769285)" />
+    <linearGradient
+       id="linearGradient5441-6-5">
+      <stop
+         id="stop5443-7-6"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5445-5-2"
+         style="stop-color:#343434;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="matrix(-0.90900139,0,0,-0.90900139,188.78559,594.56696)"
+     id="layer2"
+     style="fill:#878787;fill-opacity:1;display:inline">
+    <ellipse
+       cx="-669.49945"
+       cy="-18.149733"
+       rx="10.368815"
+       ry="10.368437"
+       transform="matrix(-0.31620878,-0.94868963,0.94868095,-0.31623482,0,0)"
+       id="path4669"
+       style="fill:#878787;fill-opacity:1;fill-rule:nonzero;stroke:#585858;stroke-width:1.38587463;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+  <path
+     d="M 9.6805691,20.53469 C 7.5185124,19.651574 6.3483312,18.491359 5.5438707,16.104443 4.0746028,11.744973 6.421301,7.0122689 10.780571,5.5429352 15.002128,4.1200182 18.92145,5.6569177 20.540003,9.7535519 20.490373,9.5667869 20.450123,9.3874718 20.38753,9.2017558 18.830868,4.5827419 13.815881,2.083984 9.1973207,3.6407949 4.5787591,5.1976056 2.079698,10.211992 3.63636,14.831005 c 0.9729133,2.886883 3.3090616,4.948472 6.0442091,5.703685 z"
+     id="path4669-2"
+     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.94000005;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:13.13139534;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+</svg>
diff --git a/res/skins/LateNight/btn_hotcue1_1.png b/res/skins/LateNight/buttons/btn_hotcue1_1.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue1_1.png
rename to res/skins/LateNight/buttons/btn_hotcue1_1.png
diff --git a/res/skins/LateNight/btn_hotcue1_1_down.png b/res/skins/LateNight/buttons/btn_hotcue1_1_down.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue1_1_down.png
rename to res/skins/LateNight/buttons/btn_hotcue1_1_down.png
diff --git a/res/skins/LateNight/btn_hotcue1_1_over.png b/res/skins/LateNight/buttons/btn_hotcue1_1_over.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue1_1_over.png
rename to res/skins/LateNight/buttons/btn_hotcue1_1_over.png
diff --git a/res/skins/LateNight/btn_hotcue1_1_overdown.png b/res/skins/LateNight/buttons/btn_hotcue1_1_overdown.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue1_1_overdown.png
rename to res/skins/LateNight/buttons/btn_hotcue1_1_overdown.png
diff --git a/res/skins/LateNight/btn_hotcue1_2.png b/res/skins/LateNight/buttons/btn_hotcue1_2.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue1_2.png
rename to res/skins/LateNight/buttons/btn_hotcue1_2.png
diff --git a/res/skins/LateNight/btn_hotcue1_2_down.png b/res/skins/LateNight/buttons/btn_hotcue1_2_down.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue1_2_down.png
rename to res/skins/LateNight/buttons/btn_hotcue1_2_down.png
diff --git a/res/skins/LateNight/btn_hotcue1_2_over.png b/res/skins/LateNight/buttons/btn_hotcue1_2_over.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue1_2_over.png
rename to res/skins/LateNight/buttons/btn_hotcue1_2_over.png
diff --git a/res/skins/LateNight/btn_hotcue1_2_overdown.png b/res/skins/LateNight/buttons/btn_hotcue1_2_overdown.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue1_2_overdown.png
rename to res/skins/LateNight/buttons/btn_hotcue1_2_overdown.png
diff --git a/res/skins/LateNight/btn_hotcue1_3.png b/res/skins/LateNight/buttons/btn_hotcue1_3.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue1_3.png
rename to res/skins/LateNight/buttons/btn_hotcue1_3.png
diff --git a/res/skins/LateNight/btn_hotcue1_3_down.png b/res/skins/LateNight/buttons/btn_hotcue1_3_down.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue1_3_down.png
rename to res/skins/LateNight/buttons/btn_hotcue1_3_down.png
diff --git a/res/skins/LateNight/btn_hotcue1_3_over.png b/res/skins/LateNight/buttons/btn_hotcue1_3_over.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue1_3_over.png
rename to res/skins/LateNight/buttons/btn_hotcue1_3_over.png
diff --git a/res/skins/LateNight/btn_hotcue1_3_overdown.png b/res/skins/LateNight/buttons/btn_hotcue1_3_overdown.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue1_3_overdown.png
rename to res/skins/LateNight/buttons/btn_hotcue1_3_overdown.png
diff --git a/res/skins/LateNight/btn_hotcue1_4.png b/res/skins/LateNight/buttons/btn_hotcue1_4.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue1_4.png
rename to res/skins/LateNight/buttons/btn_hotcue1_4.png
diff --git a/res/skins/LateNight/btn_hotcue1_4_down.png b/res/skins/LateNight/buttons/btn_hotcue1_4_down.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue1_4_down.png
rename to res/skins/LateNight/buttons/btn_hotcue1_4_down.png
diff --git a/res/skins/LateNight/btn_hotcue1_4_over.png b/res/skins/LateNight/buttons/btn_hotcue1_4_over.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue1_4_over.png
rename to res/skins/LateNight/buttons/btn_hotcue1_4_over.png
diff --git a/res/skins/LateNight/btn_hotcue1_4_overdown.png b/res/skins/LateNight/buttons/btn_hotcue1_4_overdown.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue1_4_overdown.png
rename to res/skins/LateNight/buttons/btn_hotcue1_4_overdown.png
diff --git a/res/skins/LateNight/btn_hotcue2_1.png b/res/skins/LateNight/buttons/btn_hotcue2_1.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue2_1.png
rename to res/skins/LateNight/buttons/btn_hotcue2_1.png
diff --git a/res/skins/LateNight/btn_hotcue2_1_down.png b/res/skins/LateNight/buttons/btn_hotcue2_1_down.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue2_1_down.png
rename to res/skins/LateNight/buttons/btn_hotcue2_1_down.png
diff --git a/res/skins/LateNight/btn_hotcue2_1_over.png b/res/skins/LateNight/buttons/btn_hotcue2_1_over.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue2_1_over.png
rename to res/skins/LateNight/buttons/btn_hotcue2_1_over.png
diff --git a/res/skins/LateNight/btn_hotcue2_1_overdown.png b/res/skins/LateNight/buttons/btn_hotcue2_1_overdown.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue2_1_overdown.png
rename to res/skins/LateNight/buttons/btn_hotcue2_1_overdown.png
diff --git a/res/skins/LateNight/btn_hotcue2_2.png b/res/skins/LateNight/buttons/btn_hotcue2_2.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue2_2.png
rename to res/skins/LateNight/buttons/btn_hotcue2_2.png
diff --git a/res/skins/LateNight/btn_hotcue2_2_down.png b/res/skins/LateNight/buttons/btn_hotcue2_2_down.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue2_2_down.png
rename to res/skins/LateNight/buttons/btn_hotcue2_2_down.png
diff --git a/res/skins/LateNight/btn_hotcue2_2_over.png b/res/skins/LateNight/buttons/btn_hotcue2_2_over.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue2_2_over.png
rename to res/skins/LateNight/buttons/btn_hotcue2_2_over.png
diff --git a/res/skins/LateNight/btn_hotcue2_2_overdown.png b/res/skins/LateNight/buttons/btn_hotcue2_2_overdown.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue2_2_overdown.png
rename to res/skins/LateNight/buttons/btn_hotcue2_2_overdown.png
diff --git a/res/skins/LateNight/btn_hotcue2_3.png b/res/skins/LateNight/buttons/btn_hotcue2_3.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue2_3.png
rename to res/skins/LateNight/buttons/btn_hotcue2_3.png
diff --git a/res/skins/LateNight/btn_hotcue2_3_down.png b/res/skins/LateNight/buttons/btn_hotcue2_3_down.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue2_3_down.png
rename to res/skins/LateNight/buttons/btn_hotcue2_3_down.png
diff --git a/res/skins/LateNight/btn_hotcue2_3_over.png b/res/skins/LateNight/buttons/btn_hotcue2_3_over.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue2_3_over.png
rename to res/skins/LateNight/buttons/btn_hotcue2_3_over.png
diff --git a/res/skins/LateNight/btn_hotcue2_3_overdown.png b/res/skins/LateNight/buttons/btn_hotcue2_3_overdown.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue2_3_overdown.png
rename to res/skins/LateNight/buttons/btn_hotcue2_3_overdown.png
diff --git a/res/skins/LateNight/btn_hotcue2_4.png b/res/skins/LateNight/buttons/btn_hotcue2_4.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue2_4.png
rename to res/skins/LateNight/buttons/btn_hotcue2_4.png
diff --git a/res/skins/LateNight/btn_hotcue2_4_down.png b/res/skins/LateNight/buttons/btn_hotcue2_4_down.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue2_4_down.png
rename to res/skins/LateNight/buttons/btn_hotcue2_4_down.png
diff --git a/res/skins/LateNight/btn_hotcue2_4_over.png b/res/skins/LateNight/buttons/btn_hotcue2_4_over.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue2_4_over.png
rename to res/skins/LateNight/buttons/btn_hotcue2_4_over.png
diff --git a/res/skins/LateNight/btn_hotcue2_4_overdown.png b/res/skins/LateNight/buttons/btn_hotcue2_4_overdown.png
similarity index 100%
rename from res/skins/LateNight/btn_hotcue2_4_overdown.png
rename to res/skins/LateNight/buttons/btn_hotcue2_4_overdown.png
diff --git a/res/skins/LateNight/btn_keylock2.png b/res/skins/LateNight/buttons/btn_keylock2.png
similarity index 100%
rename from res/skins/LateNight/btn_keylock2.png
rename to res/skins/LateNight/buttons/btn_keylock2.png
diff --git a/res/skins/LateNight/btn_keylock2_over.png b/res/skins/LateNight/buttons/btn_keylock2_over.png
similarity index 100%
rename from res/skins/LateNight/btn_keylock2_over.png
rename to res/skins/LateNight/buttons/btn_keylock2_over.png
diff --git a/res/skins/LateNight/btn_keylock_sampler.png b/res/skins/LateNight/buttons/btn_keylock_sampler.png
similarity index 100%
rename from res/skins/LateNight/btn_keylock_sampler.png
rename to res/skins/LateNight/buttons/btn_keylock_sampler.png
diff --git a/res/skins/LateNight/btn_keylock_sampler_over.png b/res/skins/LateNight/buttons/btn_keylock_sampler_over.png
similarity index 100%
rename from res/skins/LateNight/btn_keylock_sampler_over.png
rename to res/skins/LateNight/buttons/btn_keylock_sampler_over.png
diff --git a/res/skins/LateNight/buttons/btn_kill.png b/res/skins/LateNight/buttons/btn_kill.png
new file mode 100644
index 000000000000..8b219c482082
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_kill.png differ
diff --git a/res/skins/LateNight/buttons/btn_kill_down.png b/res/skins/LateNight/buttons/btn_kill_down.png
new file mode 100644
index 000000000000..377140e726ba
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_kill_down.png differ
diff --git a/res/skins/LateNight/buttons/btn_kill_over.png b/res/skins/LateNight/buttons/btn_kill_over.png
new file mode 100644
index 000000000000..c301816520ec
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_kill_over.png differ
diff --git a/res/skins/LateNight/buttons/btn_kill_overdown.png b/res/skins/LateNight/buttons/btn_kill_overdown.png
new file mode 100644
index 000000000000..59929d226523
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_kill_overdown.png differ
diff --git a/res/skins/LateNight/buttons/btn_loop.png b/res/skins/LateNight/buttons/btn_loop.png
new file mode 100644
index 000000000000..840692795e09
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_loop.png differ
diff --git a/res/skins/LateNight/buttons/btn_loop.svg b/res/skins/LateNight/buttons/btn_loop.svg
new file mode 100644
index 000000000000..1d2f96badf55
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_loop.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="26"
+   height="26"
+   id="svg14046">
+  <metadata
+     id="metadata14058">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs14056" />
+  <image
+     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABHNCSVQICAgIfAhkiAAAAk5JREFU SIm9lr1OVFEUhb+FJJpwHdBXoDcW0FtSEBsoJnQ2vpMvgISCaDSBxJKWBt+BVjIBCynOsji/l3sv oWDYmUzmztl7r7P2z5rR5ubmx+3t7e8swc7Pzz9dXV19A240n899cXGxDBy2trY4Ojr6AFyuLAWh b++AN6sAth8dJWDKe+JsHXi1ChBsRPSyQAZjJOIXOQsmoOKL4iWzX+i79iwyCoFyZuGUxTb5KQIa yim4gCk9OL2G3CKjBISahFIJFMIEUAaI31igFGolMMdEGgdyTBIyL2NUsEIKkkxILOSaSvE2uL0U GimdQ7y8c0uMECH555oHOQII5ADK5U2sEJIjoB4qXdNEp7Idfj1kyg4ODtqQGJXjR4fBITZUhVJi YubzOYvFohd0enoKwPX1NRvr64l/qWNiOVK6EOrENJTKTWezWc4x2BPbuEyiyk56bBgeWtjj4+PJ M9sE9wo36ftoZdjZ2ZkEu29jzIdA2atVBeDs7GyQcH9/v1Q7D7sLyEiPyu3ygpqkEIG9vT1ub/8m hYgDE2cmJurWurhfOfFEdaoESVl4CBZKSgCi69aaYlTFyBsdMiNnRYH7xYtAKSBODSD39Ktf8yii ZbHrkMaRtqssNrYS2UZlyBNkt31zlbDmmVCJlXfHuUvphoxK9kavWiWW0mep9xNS26HaQyh9HAIN drX1qrKC60m/567MmlIOSvcc9mxA6rru8+7u7pdlJD85Ofl1d3f3A/gpYAN4T/y3MntirAXwG7gU 8AJ4DbwFXj4x0D/gD3DzH9nraXNADqa9AAAAAElFTkSuQmCC "
+     x="-33.131729"
+     y="-4"
+     width="26"
+     height="26"
+     id="image3261" />
+  <path
+     d="m 4.00025,8.1879374 1.499875,1.1561248 -2.5e-4,6.6558758 C 5.4998535,16.571231 6.428698,17.500037 7,17.500031 l 7,-6.2e-5 0,-3 7,3.750031 -7,3.75 0,-3 -7,6.3e-5 c -1.644706,1.4e-5 -3,-1.355295 -3,-3 z"
+     id="path14050"
+     style="color:#000000;fill:#8d8f90;fill-opacity:1;marker:none;overflow:visible" />
+  <path
+     d="m 19.99975,15.812063 -1.499875,-1.156125 2.5e-4,-6.6558758 C 18.50015,7.3313923 17.717368,6.4999623 17,6.4999688 l -7,6.24e-5 0,3 L 3,5.75 10,2 l 0,3 7,-6.25e-5 c 1.644706,-1.47e-5 3,1.355295 3,3 z"
+     id="path14050-3"
+     style="color:#000000;fill:#8d8f90;fill-opacity:1;marker:none;overflow:visible" />
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_loop_0.svg b/res/skins/LateNight/buttons/btn_loop_0.svg
new file mode 100644
index 000000000000..e331c22a24a8
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_loop_0.svg
@@ -0,0 +1,52 @@
+<?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"
+   version="1.1"
+   width="26"
+   height="26"
+   id="svg14046">
+  <metadata
+     id="metadata14058">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs14056" />
+  <g
+     id="layer1"
+     style="display:inline">
+    <path
+       d="m 4.00025,8.187937 1.499875,1.156125 -2.5e-4,6.655876 C 5.499854,16.571231 6.428698,17.500037 7,17.500031 l 7,-6.2e-5 0,-3 7,3.750031 -7,3.75 0,-3 -7,6.3e-5 c -1.644706,1.4e-5 -3,-1.355295 -3,-3 z"
+       id="path14050"
+       style="color:#000000;fill:#8d8f90;fill-opacity:1;marker:none;overflow:visible" />
+    <path
+       d="m 19.99975,15.812063 -1.499875,-1.156125 2.5e-4,-6.655876 C 18.50015,7.331392 17.717368,6.499962 17,6.499969 l -7,6.2e-5 0,3 L 3,5.75 10,2 l 0,3 7,-6.25e-5 c 1.644706,-1.47e-5 3,1.3552955 3,3.0000005 z"
+       id="path14050-3"
+       style="color:#000000;fill:#8d8f90;fill-opacity:1;marker:none;overflow:visible" />
+  </g>
+  <g
+     id="layer2"
+     style="display:none">
+    <path
+       d="m 4.00025,8.187937 1.499875,1.156125 -2.5e-4,6.655876 C 5.499854,16.571231 6.428698,17.500037 7,17.500031 l 7,-6.2e-5 0,-3 7,3.750031 -7,3.75 0,-3 -7,6.3e-5 c -1.644706,1.4e-5 -3,-1.355295 -3,-3 z"
+       id="path14050-36"
+       style="color:#000000;fill:#bfbfbf;fill-opacity:1;marker:none;overflow:visible" />
+    <path
+       d="m 19.99975,15.812063 -1.499875,-1.156125 2.5e-4,-6.655876 C 18.50015,7.331392 17.717368,6.499962 17,6.499969 l -7,6.2e-5 0,3 L 3,5.75 10,2 l 0,3 7,-6.25e-5 c 1.644706,-1.47e-5 3,1.3552955 3,3.0000005 z"
+       id="path14050-3-7"
+       style="color:#000000;fill:#bfbfbf;fill-opacity:1;marker:none;overflow:visible" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_loop_down.png b/res/skins/LateNight/buttons/btn_loop_down.png
new file mode 100644
index 000000000000..688ebda61a32
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_loop_down.png differ
diff --git a/res/skins/LateNight/buttons/btn_loop_down.svg b/res/skins/LateNight/buttons/btn_loop_down.svg
new file mode 100644
index 000000000000..41f10ae68ccc
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_loop_down.svg
@@ -0,0 +1,92 @@
+<?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"
+   version="1.1"
+   width="26"
+   height="26"
+   id="svg14046"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="btn_loop_down.svg">
+  <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="746"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="8"
+     inkscape:cx="6.4723235"
+     inkscape:cy="18.650493"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata14058">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs14056" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="normal"
+     style="display:inline">
+    <path
+       d="m 4.00025,8.187937 1.499875,1.156125 -2.5e-4,6.655876 C 5.499854,16.571231 6.428698,17.500037 7,17.500031 l 7,-6.2e-5 0,-3 7,3.750031 -7,3.75 0,-3 -7,6.3e-5 c -1.644706,1.4e-5 -3,-1.355295 -3,-3 z"
+       id="path14050"
+       style="color:#000000;fill:#8d8f90;fill-opacity:1;marker:none;overflow:visible"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccsscccccscc" />
+    <path
+       d="m 19.99975,15.812063 -1.499875,-1.156125 2.5e-4,-6.655876 C 18.50015,7.331392 17.717368,6.499962 17,6.499969 l -7,6.2e-5 0,3 L 3,5.75 10,2 l 0,3 7,-6.25e-5 c 1.644706,-1.47e-5 3,1.3552955 3,3.0000005 z"
+       id="path14050-3"
+       style="color:#000000;fill:#8d8f90;fill-opacity:1;marker:none;overflow:visible"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccsscccccscc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="0"
+     style="display:none">
+    <path
+       d="m 4.00025,8.187937 1.499875,1.156125 -2.5e-4,6.655876 C 5.499854,16.571231 6.428698,17.500037 7,17.500031 l 7,-6.2e-5 0,-3 7,3.750031 -7,3.75 0,-3 -7,6.3e-5 c -1.644706,1.4e-5 -3,-1.355295 -3,-3 z"
+       id="path14050-36"
+       style="color:#000000;fill:#bfbfbf;fill-opacity:1;marker:none;overflow:visible"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccsscccccscc" />
+    <path
+       d="m 19.99975,15.812063 -1.499875,-1.156125 2.5e-4,-6.655876 C 18.50015,7.331392 17.717368,6.499962 17,6.499969 l -7,6.2e-5 0,3 L 3,5.75 10,2 l 0,3 7,-6.25e-5 c 1.644706,-1.47e-5 3,1.3552955 3,3.0000005 z"
+       id="path14050-3-7"
+       style="color:#000000;fill:#bfbfbf;fill-opacity:1;marker:none;overflow:visible"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccsscccccscc" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/btn_loop_in2.png b/res/skins/LateNight/buttons/btn_loop_in.png
similarity index 100%
rename from res/skins/LateNight/btn_loop_in2.png
rename to res/skins/LateNight/buttons/btn_loop_in.png
diff --git a/res/skins/LateNight/buttons/btn_loop_in.svg b/res/skins/LateNight/buttons/btn_loop_in.svg
new file mode 100644
index 000000000000..1dc4a0555cce
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_loop_in.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22"><path d="M15 3H8v16h7v-2h-5V5h5z" fill="#888"/></svg>
\ No newline at end of file
diff --git a/res/skins/LateNight/buttons/btn_loop_in_active.svg b/res/skins/LateNight/buttons/btn_loop_in_active.svg
new file mode 100644
index 000000000000..576eb38d0ba8
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_loop_in_active.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22"><path d="M15 3H8v16h7v-2h-5V5h5z" fill="#d2d2d2"/></svg>
\ No newline at end of file
diff --git a/res/skins/LateNight/btn_loop_in2_overdown.png b/res/skins/LateNight/buttons/btn_loop_in_overdown.png
similarity index 100%
rename from res/skins/LateNight/btn_loop_in2_overdown.png
rename to res/skins/LateNight/buttons/btn_loop_in_overdown.png
diff --git a/res/skins/LateNight/buttons/btn_loop_off.png b/res/skins/LateNight/buttons/btn_loop_off.png
new file mode 100644
index 000000000000..112a67e6d53b
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_loop_off.png differ
diff --git a/res/skins/LateNight/buttons/btn_loop_on.svg b/res/skins/LateNight/buttons/btn_loop_on.svg
new file mode 100644
index 000000000000..1ec10f979b90
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_loop_on.svg
@@ -0,0 +1,40 @@
+<?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"
+   version="1.1"
+   width="30"
+   height="22"
+   id="svg14060">
+  <metadata
+     id="metadata14072">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs14070" />
+  <g
+     id="g14062"
+     style="color:#000000;fill:#d2d2d2;fill-opacity:1">
+    <path
+       d="M 5.094,7.187875 6.50025,8.000375 7.094,8.344125 7.09375,15 c -2.15e-5,0.571293 0.428698,1 1,1 h 9.9375 V 13 L 21.5,15 24.96875,17 21.5,19 18.03125,21 v -3 h -9.9375 c -1.644706,0 -3,-1.355295 -3,-3 z"
+       id="path14064"
+       style="fill:#d2d2d2;fill-opacity:1;marker:none;overflow:visible" />
+    <path
+       d="m 11.96875,1 v 3 h 9.9375 c 1.644703,0 3,1.3552971 3,3 v 7.812125 L 23.5,13.999625 22.90625,13.655875 V 7 c 0,-0.5712971 -0.428703,-1 -1,-1 h -9.9375 V 9 L 8.5,7 5.03125,5 8.5,3 z"
+       id="path14066"
+       style="font-weight:400;text-indent:0;text-align:start;line-height:normal;text-transform:none;block-progression:tb;fill:#d2d2d2;fill-opacity:1;marker:none;overflow:visible;font-family:Sans;-inkscape-font-specification:Sans" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/btn_loop_out2.png b/res/skins/LateNight/buttons/btn_loop_out.png
similarity index 100%
rename from res/skins/LateNight/btn_loop_out2.png
rename to res/skins/LateNight/buttons/btn_loop_out.png
diff --git a/res/skins/LateNight/buttons/btn_loop_out.svg b/res/skins/LateNight/buttons/btn_loop_out.svg
new file mode 100644
index 000000000000..810a4ae05bbe
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_loop_out.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22"><path d="M7 3h7v16H7v-2h5V5H7z" fill="#888"/></svg>
\ No newline at end of file
diff --git a/res/skins/LateNight/buttons/btn_loop_out_active.svg b/res/skins/LateNight/buttons/btn_loop_out_active.svg
new file mode 100644
index 000000000000..f7c4878e3a55
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_loop_out_active.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22"><path d="M7 3h7v16H7v-2h5V5H7z" fill="#d2d2d2"/></svg>
\ No newline at end of file
diff --git a/res/skins/LateNight/btn_loop_out2_overdown.png b/res/skins/LateNight/buttons/btn_loop_out_overdown.png
similarity index 100%
rename from res/skins/LateNight/btn_loop_out2_overdown.png
rename to res/skins/LateNight/buttons/btn_loop_out_overdown.png
diff --git a/res/skins/LateNight/buttons/btn_loop_over.png b/res/skins/LateNight/buttons/btn_loop_over.png
new file mode 100644
index 000000000000..f1c6dd5d007e
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_loop_over.png differ
diff --git a/res/skins/LateNight/buttons/btn_loop_overdown.png b/res/skins/LateNight/buttons/btn_loop_overdown.png
new file mode 100644
index 000000000000..0707fd530373
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_loop_overdown.png differ
diff --git a/res/skins/LateNight/buttons/btn_loop_reloop_overdown.png b/res/skins/LateNight/buttons/btn_loop_reloop_overdown.png
new file mode 100644
index 000000000000..8f8757abe442
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_loop_reloop_overdown.png differ
diff --git a/res/skins/LateNight/btn_mastersync_master_off.png b/res/skins/LateNight/buttons/btn_mastersync_master_off.png
similarity index 100%
rename from res/skins/LateNight/btn_mastersync_master_off.png
rename to res/skins/LateNight/buttons/btn_mastersync_master_off.png
diff --git a/res/skins/LateNight/btn_mastersync_master_on.png b/res/skins/LateNight/buttons/btn_mastersync_master_on.png
similarity index 100%
rename from res/skins/LateNight/btn_mastersync_master_on.png
rename to res/skins/LateNight/buttons/btn_mastersync_master_on.png
diff --git a/res/skins/LateNight/btn_microphone_talkover.png b/res/skins/LateNight/buttons/btn_microphone_talkover.png
similarity index 100%
rename from res/skins/LateNight/btn_microphone_talkover.png
rename to res/skins/LateNight/buttons/btn_microphone_talkover.png
diff --git a/res/skins/LateNight/btn_microphone_talkover_down.png b/res/skins/LateNight/buttons/btn_microphone_talkover_down.png
similarity index 100%
rename from res/skins/LateNight/btn_microphone_talkover_down.png
rename to res/skins/LateNight/buttons/btn_microphone_talkover_down.png
diff --git a/res/skins/LateNight/btn_microphone_talkover_over.png b/res/skins/LateNight/buttons/btn_microphone_talkover_over.png
similarity index 100%
rename from res/skins/LateNight/btn_microphone_talkover_over.png
rename to res/skins/LateNight/buttons/btn_microphone_talkover_over.png
diff --git a/res/skins/LateNight/btn_microphone_talkover_overdown.png b/res/skins/LateNight/buttons/btn_microphone_talkover_overdown.png
similarity index 100%
rename from res/skins/LateNight/btn_microphone_talkover_overdown.png
rename to res/skins/LateNight/buttons/btn_microphone_talkover_overdown.png
diff --git a/res/skins/LateNight/btn_next.png b/res/skins/LateNight/buttons/btn_next.png
similarity index 100%
rename from res/skins/LateNight/btn_next.png
rename to res/skins/LateNight/buttons/btn_next.png
diff --git a/res/skins/LateNight/btn_next_chain.png b/res/skins/LateNight/buttons/btn_next_chain.png
similarity index 100%
rename from res/skins/LateNight/btn_next_chain.png
rename to res/skins/LateNight/buttons/btn_next_chain.png
diff --git a/res/skins/LateNight/btn_next_chain_down.png b/res/skins/LateNight/buttons/btn_next_chain_down.png
similarity index 100%
rename from res/skins/LateNight/btn_next_chain_down.png
rename to res/skins/LateNight/buttons/btn_next_chain_down.png
diff --git a/res/skins/LateNight/btn_next_down.png b/res/skins/LateNight/buttons/btn_next_down.png
similarity index 100%
rename from res/skins/LateNight/btn_next_down.png
rename to res/skins/LateNight/buttons/btn_next_down.png
diff --git a/res/skins/LateNight/btn_nudge_down1.png b/res/skins/LateNight/buttons/btn_nudge_down1.png
similarity index 100%
rename from res/skins/LateNight/btn_nudge_down1.png
rename to res/skins/LateNight/buttons/btn_nudge_down1.png
diff --git a/res/skins/LateNight/btn_nudge_down1_overdown.png b/res/skins/LateNight/buttons/btn_nudge_down1_overdown.png
similarity index 100%
rename from res/skins/LateNight/btn_nudge_down1_overdown.png
rename to res/skins/LateNight/buttons/btn_nudge_down1_overdown.png
diff --git a/res/skins/LateNight/btn_nudge_up1.png b/res/skins/LateNight/buttons/btn_nudge_up1.png
similarity index 100%
rename from res/skins/LateNight/btn_nudge_up1.png
rename to res/skins/LateNight/buttons/btn_nudge_up1.png
diff --git a/res/skins/LateNight/btn_nudge_up1_overdown.png b/res/skins/LateNight/buttons/btn_nudge_up1_overdown.png
similarity index 100%
rename from res/skins/LateNight/btn_nudge_up1_overdown.png
rename to res/skins/LateNight/buttons/btn_nudge_up1_overdown.png
diff --git a/res/skins/LateNight/btn_orientation_microphone_left_over.png b/res/skins/LateNight/buttons/btn_orientation_microphone_left_over.png
similarity index 100%
rename from res/skins/LateNight/btn_orientation_microphone_left_over.png
rename to res/skins/LateNight/buttons/btn_orientation_microphone_left_over.png
diff --git a/res/skins/LateNight/btn_orientation_microphone_master.png b/res/skins/LateNight/buttons/btn_orientation_microphone_master.png
similarity index 100%
rename from res/skins/LateNight/btn_orientation_microphone_master.png
rename to res/skins/LateNight/buttons/btn_orientation_microphone_master.png
diff --git a/res/skins/LateNight/btn_orientation_microphone_right_over.png b/res/skins/LateNight/buttons/btn_orientation_microphone_right_over.png
similarity index 100%
rename from res/skins/LateNight/btn_orientation_microphone_right_over.png
rename to res/skins/LateNight/buttons/btn_orientation_microphone_right_over.png
diff --git a/res/skins/LateNight/btn_orientation_sampler_left_over.png b/res/skins/LateNight/buttons/btn_orientation_sampler_left_over.png
similarity index 100%
rename from res/skins/LateNight/btn_orientation_sampler_left_over.png
rename to res/skins/LateNight/buttons/btn_orientation_sampler_left_over.png
diff --git a/res/skins/LateNight/btn_orientation_sampler_master.png b/res/skins/LateNight/buttons/btn_orientation_sampler_master.png
similarity index 100%
rename from res/skins/LateNight/btn_orientation_sampler_master.png
rename to res/skins/LateNight/buttons/btn_orientation_sampler_master.png
diff --git a/res/skins/LateNight/btn_orientation_sampler_right_over.png b/res/skins/LateNight/buttons/btn_orientation_sampler_right_over.png
similarity index 100%
rename from res/skins/LateNight/btn_orientation_sampler_right_over.png
rename to res/skins/LateNight/buttons/btn_orientation_sampler_right_over.png
diff --git a/res/skins/LateNight/buttons/btn_pfl1.png b/res/skins/LateNight/buttons/btn_pfl1.png
new file mode 100644
index 000000000000..cd634104c0fd
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_pfl1.png differ
diff --git a/res/skins/LateNight/buttons/btn_pfl1_down.png b/res/skins/LateNight/buttons/btn_pfl1_down.png
new file mode 100644
index 000000000000..5b7356c06ead
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_pfl1_down.png differ
diff --git a/res/skins/LateNight/buttons/btn_pfl1_over.png b/res/skins/LateNight/buttons/btn_pfl1_over.png
new file mode 100644
index 000000000000..4a071dddcd1a
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_pfl1_over.png differ
diff --git a/res/skins/LateNight/buttons/btn_pfl1_overdown.png b/res/skins/LateNight/buttons/btn_pfl1_overdown.png
new file mode 100644
index 000000000000..17b140521bde
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_pfl1_overdown.png differ
diff --git a/res/skins/LateNight/btn_pfl_sampler.png b/res/skins/LateNight/buttons/btn_pfl_sampler.png
similarity index 100%
rename from res/skins/LateNight/btn_pfl_sampler.png
rename to res/skins/LateNight/buttons/btn_pfl_sampler.png
diff --git a/res/skins/LateNight/btn_pfl_sampler_down.png b/res/skins/LateNight/buttons/btn_pfl_sampler_down.png
similarity index 100%
rename from res/skins/LateNight/btn_pfl_sampler_down.png
rename to res/skins/LateNight/buttons/btn_pfl_sampler_down.png
diff --git a/res/skins/LateNight/btn_pfl_sampler_over.png b/res/skins/LateNight/buttons/btn_pfl_sampler_over.png
similarity index 100%
rename from res/skins/LateNight/btn_pfl_sampler_over.png
rename to res/skins/LateNight/buttons/btn_pfl_sampler_over.png
diff --git a/res/skins/LateNight/btn_pfl_sampler_overdown.png b/res/skins/LateNight/buttons/btn_pfl_sampler_overdown.png
similarity index 100%
rename from res/skins/LateNight/btn_pfl_sampler_overdown.png
rename to res/skins/LateNight/buttons/btn_pfl_sampler_overdown.png
diff --git a/res/skins/LateNight/btn_pitch_down1.png b/res/skins/LateNight/buttons/btn_pitch_down1.png
similarity index 100%
rename from res/skins/LateNight/btn_pitch_down1.png
rename to res/skins/LateNight/buttons/btn_pitch_down1.png
diff --git a/res/skins/LateNight/btn_pitch_down1_overdown.png b/res/skins/LateNight/buttons/btn_pitch_down1_overdown.png
similarity index 100%
rename from res/skins/LateNight/btn_pitch_down1_overdown.png
rename to res/skins/LateNight/buttons/btn_pitch_down1_overdown.png
diff --git a/res/skins/LateNight/btn_pitch_up1.png b/res/skins/LateNight/buttons/btn_pitch_up1.png
similarity index 100%
rename from res/skins/LateNight/btn_pitch_up1.png
rename to res/skins/LateNight/buttons/btn_pitch_up1.png
diff --git a/res/skins/LateNight/btn_pitch_up1_overdown.png b/res/skins/LateNight/buttons/btn_pitch_up1_overdown.png
similarity index 100%
rename from res/skins/LateNight/btn_pitch_up1_overdown.png
rename to res/skins/LateNight/buttons/btn_pitch_up1_overdown.png
diff --git a/res/skins/LateNight/btn_play1.png b/res/skins/LateNight/buttons/btn_play1.png
similarity index 100%
rename from res/skins/LateNight/btn_play1.png
rename to res/skins/LateNight/buttons/btn_play1.png
diff --git a/res/skins/LateNight/btn_play1_down.png b/res/skins/LateNight/buttons/btn_play1_down.png
similarity index 100%
rename from res/skins/LateNight/btn_play1_down.png
rename to res/skins/LateNight/buttons/btn_play1_down.png
diff --git a/res/skins/LateNight/btn_play1_over.png b/res/skins/LateNight/buttons/btn_play1_over.png
similarity index 100%
rename from res/skins/LateNight/btn_play1_over.png
rename to res/skins/LateNight/buttons/btn_play1_over.png
diff --git a/res/skins/LateNight/btn_play1_overdown.png b/res/skins/LateNight/buttons/btn_play1_overdown.png
similarity index 100%
rename from res/skins/LateNight/btn_play1_overdown.png
rename to res/skins/LateNight/buttons/btn_play1_overdown.png
diff --git a/res/skins/LateNight/btn_play_sampler.png b/res/skins/LateNight/buttons/btn_play_sampler.png
similarity index 100%
rename from res/skins/LateNight/btn_play_sampler.png
rename to res/skins/LateNight/buttons/btn_play_sampler.png
diff --git a/res/skins/LateNight/btn_play_sampler_down.png b/res/skins/LateNight/buttons/btn_play_sampler_down.png
similarity index 100%
rename from res/skins/LateNight/btn_play_sampler_down.png
rename to res/skins/LateNight/buttons/btn_play_sampler_down.png
diff --git a/res/skins/LateNight/btn_play_sampler_over.png b/res/skins/LateNight/buttons/btn_play_sampler_over.png
similarity index 100%
rename from res/skins/LateNight/btn_play_sampler_over.png
rename to res/skins/LateNight/buttons/btn_play_sampler_over.png
diff --git a/res/skins/LateNight/btn_play_sampler_overdown.png b/res/skins/LateNight/buttons/btn_play_sampler_overdown.png
similarity index 100%
rename from res/skins/LateNight/btn_play_sampler_overdown.png
rename to res/skins/LateNight/buttons/btn_play_sampler_overdown.png
diff --git a/res/skins/LateNight/buttons/btn_power_off.svg b/res/skins/LateNight/buttons/btn_power_off.svg
new file mode 100644
index 000000000000..ac784eaef7bd
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_power_off.svg
@@ -0,0 +1,37 @@
+<?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"
+   version="1.1"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   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" />
+  <path
+     d="m 26,4.995532 -4,0 0,14.077982 4,0 z"
+     id="path2985"
+     style="fill:#8d8f90;fill-opacity:1" />
+  <path
+     d="m 33.13,11.87 -2.89,2.89 C 33.69,16.87 36,20.66 36,25 36,31.63 30.63,37 24,37 17.37,37 12,31.63 12,25 12,20.66 14.31,16.87 17.76,14.76 L 14.87,11.87 C 10.72,14.76 8,19.56 8,25 c 0,8.84 7.16,16 16,16 8.84,0 16,-7.16 16,-16 0,-5.44 -2.72,-10.24 -6.87,-13.13 z"
+     id="path6"
+     style="fill:#8d8f90;fill-opacity:1" />
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_power_on.svg b/res/skins/LateNight/buttons/btn_power_on.svg
new file mode 100644
index 000000000000..09c922280fa2
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_power_on.svg
@@ -0,0 +1,37 @@
+<?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"
+   version="1.1"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   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" />
+  <path
+     d="m 33.13,11.87 -2.89,2.89 C 33.69,16.87 36,20.66 36,25 36,31.63 30.63,37 24,37 17.37,37 12,31.63 12,25 12,20.66 14.31,16.87 17.76,14.76 L 14.87,11.87 C 10.72,14.76 8,19.56 8,25 c 0,8.84 7.16,16 16,16 8.84,0 16,-7.16 16,-16 0,-5.44 -2.72,-10.24 -6.87,-13.13 z"
+     id="path6"
+     style="fill:#bfbfbf;fill-opacity:1" />
+  <path
+     d="m 26,4.995532 -4,0 0,14.077982 4,0 z"
+     id="path2985-3"
+     style="fill:#bfbfbf;fill-opacity:1" />
+</svg>
diff --git a/res/skins/LateNight/btn_prev.png b/res/skins/LateNight/buttons/btn_prev.png
similarity index 100%
rename from res/skins/LateNight/btn_prev.png
rename to res/skins/LateNight/buttons/btn_prev.png
diff --git a/res/skins/LateNight/btn_prev_chain.png b/res/skins/LateNight/buttons/btn_prev_chain.png
similarity index 100%
rename from res/skins/LateNight/btn_prev_chain.png
rename to res/skins/LateNight/buttons/btn_prev_chain.png
diff --git a/res/skins/LateNight/btn_prev_chain_down.png b/res/skins/LateNight/buttons/btn_prev_chain_down.png
similarity index 100%
rename from res/skins/LateNight/btn_prev_chain_down.png
rename to res/skins/LateNight/buttons/btn_prev_chain_down.png
diff --git a/res/skins/LateNight/btn_prev_down.png b/res/skins/LateNight/buttons/btn_prev_down.png
similarity index 100%
rename from res/skins/LateNight/btn_prev_down.png
rename to res/skins/LateNight/buttons/btn_prev_down.png
diff --git a/res/skins/LateNight/btn_quantize2.png b/res/skins/LateNight/buttons/btn_quantize2.png
similarity index 100%
rename from res/skins/LateNight/btn_quantize2.png
rename to res/skins/LateNight/buttons/btn_quantize2.png
diff --git a/res/skins/LateNight/btn_quantize2_over.png b/res/skins/LateNight/buttons/btn_quantize2_over.png
similarity index 100%
rename from res/skins/LateNight/btn_quantize2_over.png
rename to res/skins/LateNight/buttons/btn_quantize2_over.png
diff --git a/res/skins/LateNight/buttons/btn_quickEffect_over.png b/res/skins/LateNight/buttons/btn_quickEffect_over.png
new file mode 100644
index 000000000000..a6899f0d76f1
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_quickEffect_over.png differ
diff --git a/res/skins/LateNight/buttons/btn_quickEffect_overdown.png b/res/skins/LateNight/buttons/btn_quickEffect_overdown.png
new file mode 100644
index 000000000000..601b1591d41f
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_quickEffect_overdown.png differ
diff --git a/res/skins/LateNight/buttons/btn_reloop.png b/res/skins/LateNight/buttons/btn_reloop.png
new file mode 100644
index 000000000000..4d2f88987b5e
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_reloop.png differ
diff --git a/res/skins/LateNight/buttons/btn_reloop_down.png b/res/skins/LateNight/buttons/btn_reloop_down.png
new file mode 100644
index 000000000000..d5e1f66d9ba3
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_reloop_down.png differ
diff --git a/res/skins/LateNight/buttons/btn_reloop_down.svg b/res/skins/LateNight/buttons/btn_reloop_down.svg
new file mode 100644
index 000000000000..4c24ec4c6f78
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_reloop_down.svg
@@ -0,0 +1,60 @@
+<?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"
+   version="1.1"
+   width="26"
+   height="26"
+   id="svg4272">
+  <metadata
+     id="metadata4284">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs4282" />
+  <g
+     id="layer3"
+     style="display:inline">
+    <path
+       d="m 6,6.000125 c -1.644703,-1.028e-4 -3,1.355297 -3,3 l 0,7.00025 c 0,1.644705 1.355294,3.000023 3,3 l 1.00025,-1.25e-4 0,3 6.99975,-3.75 -6.999875,-3.750062 0,3 -1.00025,1.24e-4 C 5.2530103,17.500405 4.4999724,16.733185 4.5,16.000375 l 0,-7.00025 C 4.5,8.288378 5.2670519,7.500188 6,7.500188 L 8,7.500312 8,6.00025 z"
+       id="path4276"
+       style="color:#000000;fill:#8d8f90;fill-opacity:1;marker:none;overflow:visible" />
+    <path
+       d="m 10,3 2,0 0,8 -2,0 z"
+       id="path3871"
+       style="color:#000000;fill:#8d8f90;fill-opacity:1;marker:none;overflow:visible" />
+    <path
+       d="m 16,6.000125 c 1.644703,-1.028e-4 3,1.355297 3,3 l 0,7.00025 c 0,1.644705 -1.355294,3.000023 -3,3 l -1.00025,-6.3e-5 5e-4,-1.500124 1.00025,6.2e-5 c 0.78903,4.9e-5 1.499527,-0.788131 1.4995,-1.499875 l 0,-7.00025 c 0,-0.725791 -0.753266,-1.499914 -1.500125,-1.499937 l -1.99975,1.25e-4 1.25e-4,-1.500063 z"
+       id="path4278"
+       style="color:#000000;fill:#8d8f90;fill-opacity:1;marker:none;overflow:visible" />
+  </g>
+  <g
+     id="layer4"
+     style="display:none">
+    <path
+       d="m 6,6.000125 c -1.644703,-1.028e-4 -3,1.355297 -3,3 l 0,7.00025 c 0,1.644705 1.355294,3.000023 3,3 l 1.00025,-1.25e-4 0,3 6.99975,-3.75 -6.999875,-3.750062 0,3 -1.00025,1.24e-4 C 5.2530103,17.500405 4.4999724,16.733185 4.5,16.000375 l 0,-7.00025 C 4.5,8.288378 5.2670519,7.500188 6,7.500188 L 8,7.500312 8,6.00025 z"
+       id="path4276-5"
+       style="color:#000000;fill:#bfbfbf;fill-opacity:1;marker:none;overflow:visible" />
+    <path
+       d="m 10,3 2,0 0,8 -2,0 z"
+       id="path3871-3"
+       style="color:#000000;fill:#bfbfbf;fill-opacity:1;marker:none;overflow:visible" />
+    <path
+       d="m 16,6.000125 c 1.644703,-1.028e-4 3,1.355297 3,3 l 0,7.00025 c 0,1.644705 -1.355294,3.000023 -3,3 l -1.00025,-6.3e-5 5e-4,-1.500124 1.00025,6.2e-5 c 0.78903,4.9e-5 1.499527,-0.788131 1.4995,-1.499875 l 0,-7.00025 c 0,-0.725791 -0.753266,-1.499914 -1.500125,-1.499937 l -1.99975,1.25e-4 1.25e-4,-1.500063 z"
+       id="path4278-5"
+       style="color:#000000;fill:#bfbfbf;fill-opacity:1;marker:none;overflow:visible" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_reloop_off.svg b/res/skins/LateNight/buttons/btn_reloop_off.svg
new file mode 100644
index 000000000000..c4b0a720a219
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_reloop_off.svg
@@ -0,0 +1,40 @@
+<?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"
+   version="1.1"
+   width="30"
+   height="22"
+   id="svg4272">
+  <metadata
+     id="metadata4284">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs4282" />
+  <g
+     id="g4274"
+     style="color:#000000;fill:#888888">
+    <path
+       d="m 10,4.999875 c -1.644703,-1.028e-4 -3,1.3552971 -3,3 v 7.00025 c 0,1.644705 1.355294,3.000023 3,3 L 11.00025,18 v 3 L 14.469,19 17.93775,17 14.469,15 11.00025,13 v 3 L 10,16.000125 c -0.571302,7.1e-5 -1.0000215,-0.428707 -1,-1 v -7.00025 c 0,-0.5712971 0.428703,-0.9999817 1,-1 L 12,7 V 5 z"
+       id="path4276"
+       style="marker:none;overflow:visible" />
+    <path
+       d="m 14,1.99975 h 2 v 8 h -2 z m 6,3.000125 c 1.644703,-1.028e-4 3,1.3552971 3,3 v 7.00025 c 0,1.644705 -1.355294,3.000023 -3,3 h -1.031 v -2 H 20 c 0.571302,0 1.000022,-0.428707 1,-1 v -7.00025 c 0,-0.5712971 -0.428703,-0.9999817 -1,-1 L 18.00025,7 V 5 z"
+       id="path4278"
+       style="marker:none;overflow:visible" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_reloop_on.svg b/res/skins/LateNight/buttons/btn_reloop_on.svg
new file mode 100644
index 000000000000..5bcc58d110a1
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_reloop_on.svg
@@ -0,0 +1,59 @@
+<?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"
+   version="1.1"
+   width="26"
+   height="26"
+   id="svg4272">
+  <metadata
+     id="metadata4284">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs4282" />
+  <g
+     id="layer3"
+     style="display:none">
+    <path
+       d="m 6,6.000125 c -1.644703,-1.028e-4 -3,1.355297 -3,3 l 0,7.00025 c 0,1.644705 1.355294,3.000023 3,3 l 1.00025,-1.25e-4 0,3 6.99975,-3.75 -6.999875,-3.750062 0,3 -1.00025,1.24e-4 C 5.2530103,17.500405 4.4999724,16.733185 4.5,16.000375 l 0,-7.00025 C 4.5,8.288378 5.2670519,7.500188 6,7.500188 L 8,7.500312 8,6.00025 z"
+       id="path4276"
+       style="color:#000000;fill:#8d8f90;fill-opacity:1;marker:none;overflow:visible" />
+    <path
+       d="m 10,3 2,0 0,8 -2,0 z"
+       id="path3871"
+       style="color:#000000;fill:#8d8f90;fill-opacity:1;marker:none;overflow:visible" />
+    <path
+       d="m 16,6.000125 c 1.644703,-1.028e-4 3,1.355297 3,3 l 0,7.00025 c 0,1.644705 -1.355294,3.000023 -3,3 l -1.00025,-6.3e-5 5e-4,-1.500124 1.00025,6.2e-5 c 0.78903,4.9e-5 1.499527,-0.788131 1.4995,-1.499875 l 0,-7.00025 c 0,-0.725791 -0.753266,-1.499914 -1.500125,-1.499937 l -1.99975,1.25e-4 1.25e-4,-1.500063 z"
+       id="path4278"
+       style="color:#000000;fill:#8d8f90;fill-opacity:1;marker:none;overflow:visible" />
+  </g>
+  <g
+     id="layer4">
+    <path
+       d="m 6,6.000125 c -1.644703,-1.028e-4 -3,1.355297 -3,3 l 0,7.00025 c 0,1.644705 1.355294,3.000023 3,3 l 1.00025,-1.25e-4 0,3 6.99975,-3.75 -6.999875,-3.750062 0,3 -1.00025,1.24e-4 C 5.2530103,17.500405 4.4999724,16.733185 4.5,16.000375 l 0,-7.00025 C 4.5,8.288378 5.2670519,7.500188 6,7.500188 L 8,7.500312 8,6.00025 z"
+       id="path4276-5"
+       style="color:#000000;fill:#bfbfbf;fill-opacity:1;marker:none;overflow:visible" />
+    <path
+       d="m 10,3 2,0 0,8 -2,0 z"
+       id="path3871-3"
+       style="color:#000000;fill:#bfbfbf;fill-opacity:1;marker:none;overflow:visible" />
+    <path
+       d="m 16,6.000125 c 1.644703,-1.028e-4 3,1.355297 3,3 l 0,7.00025 c 0,1.644705 -1.355294,3.000023 -3,3 l -1.00025,-6.3e-5 5e-4,-1.500124 1.00025,6.2e-5 c 0.78903,4.9e-5 1.499527,-0.788131 1.4995,-1.499875 l 0,-7.00025 c 0,-0.725791 -0.753266,-1.499914 -1.500125,-1.499937 l -1.99975,1.25e-4 1.25e-4,-1.500063 z"
+       id="path4278-5"
+       style="color:#000000;fill:#bfbfbf;fill-opacity:1;marker:none;overflow:visible" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_reloop_over.png b/res/skins/LateNight/buttons/btn_reloop_over.png
new file mode 100644
index 000000000000..66920034f6d6
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_reloop_over.png differ
diff --git a/res/skins/LateNight/buttons/btn_reloop_overdown.png b/res/skins/LateNight/buttons/btn_reloop_overdown.png
new file mode 100644
index 000000000000..26aebb185dae
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_reloop_overdown.png differ
diff --git a/res/skins/LateNight/btn_repeat2.png b/res/skins/LateNight/buttons/btn_repeat2.png
similarity index 100%
rename from res/skins/LateNight/btn_repeat2.png
rename to res/skins/LateNight/buttons/btn_repeat2.png
diff --git a/res/skins/LateNight/btn_repeat2_over.png b/res/skins/LateNight/buttons/btn_repeat2_over.png
similarity index 100%
rename from res/skins/LateNight/btn_repeat2_over.png
rename to res/skins/LateNight/buttons/btn_repeat2_over.png
diff --git a/res/skins/LateNight/btn_repeat_sampler.png b/res/skins/LateNight/buttons/btn_repeat_sampler.png
similarity index 100%
rename from res/skins/LateNight/btn_repeat_sampler.png
rename to res/skins/LateNight/buttons/btn_repeat_sampler.png
diff --git a/res/skins/LateNight/btn_repeat_sampler_over.png b/res/skins/LateNight/buttons/btn_repeat_sampler_over.png
similarity index 100%
rename from res/skins/LateNight/btn_repeat_sampler_over.png
rename to res/skins/LateNight/buttons/btn_repeat_sampler_over.png
diff --git a/res/skins/LateNight/btn_reverse2.png b/res/skins/LateNight/buttons/btn_reverse2.png
similarity index 100%
rename from res/skins/LateNight/btn_reverse2.png
rename to res/skins/LateNight/buttons/btn_reverse2.png
diff --git a/res/skins/LateNight/btn_reverse2_overdown.png b/res/skins/LateNight/buttons/btn_reverse2_overdown.png
similarity index 100%
rename from res/skins/LateNight/btn_reverse2_overdown.png
rename to res/skins/LateNight/buttons/btn_reverse2_overdown.png
diff --git a/res/skins/LateNight/btn_rewind2.png b/res/skins/LateNight/buttons/btn_rewind2.png
similarity index 100%
rename from res/skins/LateNight/btn_rewind2.png
rename to res/skins/LateNight/buttons/btn_rewind2.png
diff --git a/res/skins/LateNight/btn_rewind2_overdown.png b/res/skins/LateNight/buttons/btn_rewind2_overdown.png
similarity index 100%
rename from res/skins/LateNight/btn_rewind2_overdown.png
rename to res/skins/LateNight/buttons/btn_rewind2_overdown.png
diff --git a/res/skins/LateNight/buttons/btn_slip.png b/res/skins/LateNight/buttons/btn_slip.png
new file mode 100644
index 000000000000..f2e50f4946f3
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_slip.png differ
diff --git a/res/skins/LateNight/buttons/btn_slip.svg b/res/skins/LateNight/buttons/btn_slip.svg
new file mode 100644
index 000000000000..ee774e38db29
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_slip.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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="48"
+   width="48"
+   version="1.1"
+   viewBox="0 0 48 48.000001"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="ic_slip_48px.svg">
+  <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" />
+      </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="1366"
+     inkscape:window-height="702"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="4.9166667"
+     inkscape:cx="25.220339"
+     inkscape:cy="24"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     d="M 5,14 17,36 23.5,24.084 30,36 43,14 29,14 18,14 5,14 Z M 26.818,18 36,18 30,27.965 25.871,19.736 26.818,18 Z"
+     id="path4"
+     inkscape:connector-curvature="0"
+     style="fill:#d2d2d2;fill-opacity:1" />
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_slip_over.png b/res/skins/LateNight/buttons/btn_slip_over.png
new file mode 100644
index 000000000000..b695861864d1
Binary files /dev/null and b/res/skins/LateNight/buttons/btn_slip_over.png differ
diff --git a/res/skins/LateNight/btn_spinny1.png b/res/skins/LateNight/buttons/btn_spinny1.png
similarity index 100%
rename from res/skins/LateNight/btn_spinny1.png
rename to res/skins/LateNight/buttons/btn_spinny1.png
diff --git a/res/skins/LateNight/btn_spinny1_over.png b/res/skins/LateNight/buttons/btn_spinny1_over.png
similarity index 100%
rename from res/skins/LateNight/btn_spinny1_over.png
rename to res/skins/LateNight/buttons/btn_spinny1_over.png
diff --git a/res/skins/LateNight/btn_sync_sampler.png b/res/skins/LateNight/buttons/btn_sync_sampler.png
similarity index 100%
rename from res/skins/LateNight/btn_sync_sampler.png
rename to res/skins/LateNight/buttons/btn_sync_sampler.png
diff --git a/res/skins/LateNight/btn_sync_sampler_overdown.png b/res/skins/LateNight/buttons/btn_sync_sampler_overdown.png
similarity index 100%
rename from res/skins/LateNight/btn_sync_sampler_overdown.png
rename to res/skins/LateNight/buttons/btn_sync_sampler_overdown.png
diff --git a/res/skins/LateNight/btn_vinylcontrol_cueing_hot2.png b/res/skins/LateNight/buttons/btn_vinylcontrol_cueing_hot2.png
similarity index 100%
rename from res/skins/LateNight/btn_vinylcontrol_cueing_hot2.png
rename to res/skins/LateNight/buttons/btn_vinylcontrol_cueing_hot2.png
diff --git a/res/skins/LateNight/btn_vinylcontrol_cueing_off2.png b/res/skins/LateNight/buttons/btn_vinylcontrol_cueing_off2.png
similarity index 100%
rename from res/skins/LateNight/btn_vinylcontrol_cueing_off2.png
rename to res/skins/LateNight/buttons/btn_vinylcontrol_cueing_off2.png
diff --git a/res/skins/LateNight/btn_vinylcontrol_cueing_one2.png b/res/skins/LateNight/buttons/btn_vinylcontrol_cueing_one2.png
similarity index 100%
rename from res/skins/LateNight/btn_vinylcontrol_cueing_one2.png
rename to res/skins/LateNight/buttons/btn_vinylcontrol_cueing_one2.png
diff --git a/res/skins/LateNight/btn_vinylcontrol_indicator_horizontal1.png b/res/skins/LateNight/buttons/btn_vinylcontrol_indicator_horizontal1.png
similarity index 100%
rename from res/skins/LateNight/btn_vinylcontrol_indicator_horizontal1.png
rename to res/skins/LateNight/buttons/btn_vinylcontrol_indicator_horizontal1.png
diff --git a/res/skins/LateNight/btn_vinylcontrol_indicator_horizontal2.png b/res/skins/LateNight/buttons/btn_vinylcontrol_indicator_horizontal2.png
similarity index 100%
rename from res/skins/LateNight/btn_vinylcontrol_indicator_horizontal2.png
rename to res/skins/LateNight/buttons/btn_vinylcontrol_indicator_horizontal2.png
diff --git a/res/skins/LateNight/btn_vinylcontrol_indicator_horizontal3.png b/res/skins/LateNight/buttons/btn_vinylcontrol_indicator_horizontal3.png
similarity index 100%
rename from res/skins/LateNight/btn_vinylcontrol_indicator_horizontal3.png
rename to res/skins/LateNight/buttons/btn_vinylcontrol_indicator_horizontal3.png
diff --git a/res/skins/LateNight/btn_vinylcontrol_mode_abs2.png b/res/skins/LateNight/buttons/btn_vinylcontrol_mode_abs2.png
similarity index 100%
rename from res/skins/LateNight/btn_vinylcontrol_mode_abs2.png
rename to res/skins/LateNight/buttons/btn_vinylcontrol_mode_abs2.png
diff --git a/res/skins/LateNight/btn_vinylcontrol_mode_const2.png b/res/skins/LateNight/buttons/btn_vinylcontrol_mode_const2.png
similarity index 100%
rename from res/skins/LateNight/btn_vinylcontrol_mode_const2.png
rename to res/skins/LateNight/buttons/btn_vinylcontrol_mode_const2.png
diff --git a/res/skins/LateNight/btn_vinylcontrol_mode_rel2.png b/res/skins/LateNight/buttons/btn_vinylcontrol_mode_rel2.png
similarity index 100%
rename from res/skins/LateNight/btn_vinylcontrol_mode_rel2.png
rename to res/skins/LateNight/buttons/btn_vinylcontrol_mode_rel2.png
diff --git a/res/skins/LateNight/btn_volume_display1.png b/res/skins/LateNight/buttons/btn_volume_display1.png
similarity index 100%
rename from res/skins/LateNight/btn_volume_display1.png
rename to res/skins/LateNight/buttons/btn_volume_display1.png
diff --git a/res/skins/LateNight/btn_volume_display1_over.png b/res/skins/LateNight/buttons/btn_volume_display1_over.png
similarity index 100%
rename from res/skins/LateNight/btn_volume_display1_over.png
rename to res/skins/LateNight/buttons/btn_volume_display1_over.png
diff --git a/res/skins/LateNight/btn_volume_display_previewdeck.png b/res/skins/LateNight/buttons/btn_volume_display_previewdeck.png
similarity index 100%
rename from res/skins/LateNight/btn_volume_display_previewdeck.png
rename to res/skins/LateNight/buttons/btn_volume_display_previewdeck.png
diff --git a/res/skins/LateNight/btn_volume_display_previewdeck_over.png b/res/skins/LateNight/buttons/btn_volume_display_previewdeck_over.png
similarity index 100%
rename from res/skins/LateNight/btn_volume_display_previewdeck_over.png
rename to res/skins/LateNight/buttons/btn_volume_display_previewdeck_over.png
diff --git a/res/skins/LateNight/btn_volume_display_sampler.png b/res/skins/LateNight/buttons/btn_volume_display_sampler.png
similarity index 100%
rename from res/skins/LateNight/btn_volume_display_sampler.png
rename to res/skins/LateNight/buttons/btn_volume_display_sampler.png
diff --git a/res/skins/LateNight/btn_volume_display_sampler_over.png b/res/skins/LateNight/buttons/btn_volume_display_sampler_over.png
similarity index 100%
rename from res/skins/LateNight/btn_volume_display_sampler_over.png
rename to res/skins/LateNight/buttons/btn_volume_display_sampler_over.png
diff --git a/res/skins/LateNight/buttons/rec_dot.svg b/res/skins/LateNight/buttons/rec_dot.svg
new file mode 100644
index 000000000000..e3cd73f6ef67
--- /dev/null
+++ b/res/skins/LateNight/buttons/rec_dot.svg
@@ -0,0 +1,33 @@
+<?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"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 15 20"
+   id="svg2">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <path
+     d="m 13.477476,10 a 3.977476,3.977476 0 1 1 -7.9549519,0 3.977476,3.977476 0 1 1 7.9549519,0 z"
+     id="path2987"
+     style="color:#000000;fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.49700001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+</svg>
diff --git a/res/skins/LateNight/buttons/toolbar_divider.png b/res/skins/LateNight/buttons/toolbar_divider.png
new file mode 100644
index 000000000000..501d58a7587d
Binary files /dev/null and b/res/skins/LateNight/buttons/toolbar_divider.png differ
diff --git a/res/skins/LateNight/deck.xml b/res/skins/LateNight/deck.xml
index 828399fa8a80..cfc3b5ffbbfe 100644
--- a/res/skins/LateNight/deck.xml
+++ b/res/skins/LateNight/deck.xml
@@ -1,340 +1,324 @@
 <Template>
-    <WidgetGroup>
-        <ObjectName>Deck</ObjectName>
-        <Layout>horizontal</Layout>
-        <SizePolicy>me, min</SizePolicy>
-        <MinimumSize>-1, 220</MinimumSize>
+  <SetVariable name="group">[Channel<Variable name="channum"/>]</SetVariable>
+  <WidgetGroup>
+    <ObjectName>Deck<Variable name="channum" /></ObjectName>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,min</SizePolicy>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>RateContainer</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,me</SizePolicy>
         <Children>
-            <WidgetGroup>
-                <ObjectName>RateContainer<Variable name="channum" /></ObjectName>
+          <WidgetGroup>
+            <ObjectName>AlignCenter</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,me</SizePolicy>
+            <MaximumSize>-1,46</MaximumSize>
+            <Children>
+              <!-- In order to make the bpm display tappable, we use an old-style
+              widget group and put the bpm pushbutton on top of the display. -->
+              <WidgetGroup>
+                <ObjectName>BpmContainer</ObjectName>
+                <Layout>stacked</Layout>
+                <Size>60f,22f</Size>
+                <Children>
+                  <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>
+
+                  <PushButton>
+                    <TooltipId>bpm_tap_visual_bpm</TooltipId>
+                    <Size>60f,22f</Size>
+                    <NumberStates>1</NumberStates>
+                    <State>
+                      <Number>0</Number>
+                      <Text></Text>
+                    </State>
+                    <State>
+                      <Number>1</Number>
+                      <Text></Text>
+                    </State>
+                    <Connection>
+                      <ConfigKey><Variable name="group"/>,bpm_tap</ConfigKey>
+                      <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+                    </Connection>
+                  </PushButton>
+                </Children>
+              </WidgetGroup>
+
+              <NumberRate>
+                <TooltipId>rate_display</TooltipId>
+                <ObjectName>RateText</ObjectName>
+                <Channel><Variable name="channum" /></Channel>
+                <NumberOfDigits>2</NumberOfDigits>
+              </NumberRate>
+
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>RateControls</ObjectName>
+            <Size>-1min,110me</Size>
+            <Layout>horizontal</Layout>
+            <Children>
+              <SliderComposed>
+                <ObjectName>RateSlider</ObjectName>
+                <TooltipId>rate</TooltipId>
+                <Handle>knob_pitch1.png</Handle>
+                <Slider>slider_pitch1.png</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>
-                <MinimumSize>60,-1</MinimumSize>
                 <Children>
-                   <WidgetGroup>
-                       <ObjectName>RateAdjust</ObjectName>
-                       <Layout>vertical</Layout>
-                       <SizePolicy>min,min</SizePolicy>
-	                   <Children>
-                           <WidgetGroup>
-                               <Layout>horizontal</Layout>
-                               <SizePolicy>min,min</SizePolicy>
-                               <Children>
-                                   <PushButton>
-                                      <Size>16f,16f</Size>
-                                      <ObjectName>PitchTweakButton</ObjectName>
-                                      <NumberStates>1</NumberStates>
-                                      <State>
-                                        <Number>0</Number>
-                                        <Unpressed>btn_prev.png</Unpressed>
-                                        <Pressed>btn_prev_down.png</Pressed>
-                                      </State>
-                                      <Connection>
-                                        <ConfigKey persist="true">[Channel<Variable name="channum"/>],pitch_down</ConfigKey>
-                                        <ButtonState>LeftButton</ButtonState>
-                                      </Connection>
-                                      <Connection>
-                                        <ConfigKey persist="true">[Channel<Variable name="channum"/>],pitch_down_small</ConfigKey>
-                                        <ButtonState>RightButton</ButtonState>
-                                      </Connection>
-                                   </PushButton>
-                                   <PushButton>
-                                      <Size>28f,16f</Size>
-                                      <ObjectName>PitchTweakButton</ObjectName>
-                                      <NumberStates>2</NumberStates>
-                                      <State>
-                                        <Number>0</Number>
-                                        <Text>KEY</Text>
-                                      </State>
-                                      <State>
-                                        <Number>1</Number>
-                                        <Text>KEY</Text>
-                                      </State>
-                                      <Connection>
-                                        <ConfigKey persist="true">[Channel<Variable name="channum"/>],pitch_adjust_set_default</ConfigKey>
-                                        <ButtonState>LeftButton</ButtonState>
-                                      </Connection>
-                                      <Connection>
-                                        <ConfigKey persist="true">[Channel<Variable name="channum"/>],pitch_adjust_set_default</ConfigKey>
-                                      </Connection>
-                                      <Connection>
-                                        <ConfigKey persist="true">[Channel<Variable name="channum"/>],reset_key</ConfigKey>
-                                        <ButtonState>RightButton</ButtonState>
-                                      </Connection>
-                                   </PushButton>
-                                   <PushButton>
-                                      <Size>16f,16f</Size>
-                                      <ObjectName>PitchTweakButton</ObjectName>
-                                      <NumberStates>1</NumberStates>
-                                      <State>
-                                        <Number>0</Number>
-                                        <Unpressed>btn_next.png</Unpressed>
-                                        <Pressed>btn_next_down.png</Pressed>
-                                      </State>
-                                      <Connection>
-                                        <ConfigKey persist="true">[Channel<Variable name="channum"/>],pitch_up</ConfigKey>
-                                        <ButtonState>LeftButton</ButtonState>
-                                      </Connection>
-                                      <Connection>
-                                        <ConfigKey persist="true">[Channel<Variable name="channum"/>],pitch_up_small</ConfigKey>
-                                        <ButtonState>RightButton</ButtonState>
-                                      </Connection>
-                                  </PushButton>
-                               </Children>
-                               <!-- <Connection>
-                                   <ConfigKey>[Channel<Variable name="channum"/>],visual_key</ConfigKey>
-                                   <BindProperty>visible</BindProperty>
-                               </Connection> -->
-                           </WidgetGroup>
-                           <Key>
-                              <ObjectName>TextColor<Variable name="channum" /></ObjectName>
-                              <Style>QLabel { qproperty-alignment: 'AlignCenter';
-                                  font: bold 13px/16px Lucida Grande, Lucida Sans
-                                  Unicode, Segoe UI, Arial, Verdana, sans-serif;
-                                  background-color: transparent; padding: 0px; margin: 0px;}
-                              </Style>
-                              <Group>[Channel<Variable name="channum"/>]</Group>
-                              <SizePolicy>min,f</SizePolicy>
-                              <Size>-1,17</Size>
-                              <Connection>
-                                <ConfigKey>[Channel<Variable name="channum"/>],visual_key</ConfigKey>
-                              </Connection>
-                           </Key>
-                           <!-- 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. -->
-                           <WidgetGroup>
-                               <ObjectName>BpmContainer</ObjectName>
-                               <Size>60,22</Size>
-                               <Children>
-                                   <NumberBpm>
-                                      <ObjectName>BpmTextColor<Variable name="channum" /></ObjectName>
-                                      <TooltipId>visual_bpm</TooltipId>
-                                      <Pos>0,0</Pos>
-                                      <Size>60,22</Size>
-                                      <Channel>
-                                          <Variable name="channum" />
-                                      </Channel>
-                                      <NumberOfDigits>2</NumberOfDigits>
-                                      <Connection>
-                                          <ConfigKey>[Channel<Variable name="channum" />],visual_bpm</ConfigKey>
-                                      </Connection>
-                                  </NumberBpm>
-                                  <PushButton>
-                                      <TooltipId>bpm_tap_visual_bpm</TooltipId>
-                                      <NumberStates>1</NumberStates>
-                                      <State>
-                                        <Number>0</Number>
-                                        <Text></Text>
-                                      </State>
-                                      <State>
-                                        <Number>1</Number>
-                                        <Text></Text>
-                                      </State>
-                                      <Pos>0,0</Pos>
-                                      <Size>60,22</Size>
-                                      <Connection>
-                                          <ConfigKey>[Channel<Variable name="channum" />],bpm_tap</ConfigKey>
-                                          <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-                                      </Connection>
-                                  </PushButton>
-                              </Children>
-                          </WidgetGroup>
-                          <NumberRate>
-                              <TooltipId>rate_display</TooltipId>
-                              <ObjectName>RateTextColor<Variable name="channum" /></ObjectName>
-                              <Channel>
-                                  <Variable name="channum" />
-                              </Channel>
-                              <NumberOfDigits>2</NumberOfDigits>
-                          </NumberRate>
-			            </Children>
-		            </WidgetGroup>
-                    <WidgetGroup>
-                        <SizePolicy>min,min</SizePolicy>
-                        <Layout>horizontal</Layout>
-                        <ObjectName>RateSlider</ObjectName>
-                        <Children>
-        		            <SliderComposed>
-        		                <TooltipId>rate</TooltipId>
-        		                <Handle>knob_pitch1.png</Handle>
-        		                <Slider>slider_pitch1.png</Slider>
-        		                <Horizontal>false</Horizontal>
-        		                <Connection>
-        		                    <ConfigKey>[Channel<Variable name="channum" />],rate</ConfigKey>
-        		                </Connection>
-        		            </SliderComposed>
-                        </Children>
-                    </WidgetGroup>
-		            <WidgetGroup>
-		                <ObjectName>RateButtons</ObjectName>
-		                <Layout>vertical</Layout>
-		                <SizePolicy>min,min</SizePolicy>
-		                <Children>
-		                    <WidgetGroup>
-		                        <ObjectName>RatePermButtons</ObjectName>
-		                        <Layout>horizontal</Layout>
-		                        <Children>
-		                            <PushButton>
-		                                <TooltipId>rate_perm_down_rate_perm_down_small</TooltipId>
-		                                <NumberStates>1</NumberStates>
-		                                <State>
-		                                    <Number>0</Number>
-		                                    <Pressed>btn_pitch_down1_overdown.png</Pressed>
-		                                    <Unpressed>btn_pitch_down1.png</Unpressed>
-		                                </State>
-		                                <Connection>
-		                                    <ConfigKey>[Channel<Variable name="channum" />],rate_perm_down</ConfigKey>
-		                                    <ButtonState>LeftButton</ButtonState>
-		                                </Connection>
-		                                <Connection>
-		                                    <ConfigKey>[Channel<Variable name="channum" />],rate_perm_down_small</ConfigKey>
-		                                    <ButtonState>RightButton</ButtonState>
-		                                </Connection>
-		                            </PushButton>
-		                            <PushButton>
-		                                <TooltipId>rate_perm_up_rate_perm_up_small</TooltipId>
-		                                <NumberStates>1</NumberStates>
-		                                <State>
-		                                    <Number>0</Number>
-		                                    <Pressed>btn_pitch_up1_overdown.png</Pressed>
-		                                    <Unpressed>btn_pitch_up1.png</Unpressed>
-		                                </State>
-		                                <Connection>
-		                                    <ConfigKey>[Channel<Variable name="channum" />],rate_perm_up</ConfigKey>
-		                                    <ButtonState>LeftButton</ButtonState>
-		                                </Connection>
-		                                <Connection>
-		                                    <ConfigKey>[Channel<Variable name="channum" />],rate_perm_up_small</ConfigKey>
-		                                    <ButtonState>RightButton</ButtonState>
-		                                </Connection>
-		                            </PushButton>
-		                        </Children>
-		                    </WidgetGroup>
-		                    <WidgetGroup>
-		                        <ObjectName>RateTempButtons</ObjectName>
-		                        <Layout>horizontal</Layout>
-		                        <Children>
-		                            <PushButton>
-		                                <TooltipId>rate_temp_down_rate_temp_down_small</TooltipId>
-		                                <NumberStates>1</NumberStates>
-		                                <State>
-		                                    <Number>0</Number>
-		                                    <Pressed>btn_nudge_down1_overdown.png</Pressed>
-		                                    <Unpressed>btn_nudge_down1.png</Unpressed>
-		                                </State>
-		                                <Connection>
-		                                    <ConfigKey>[Channel<Variable name="channum" />],rate_temp_down</ConfigKey>
-		                                    <ButtonState>LeftButton</ButtonState>
-		                                </Connection>
-		                                <Connection>
-		                                    <ConfigKey>[Channel<Variable name="channum" />],rate_temp_down_small</ConfigKey>
-		                                    <ButtonState>RightButton</ButtonState>
-		                                </Connection>
-		                            </PushButton>
-		                            <PushButton>
-		                                <TooltipId>rate_temp_up_rate_temp_up_small</TooltipId>
-		                                <NumberStates>1</NumberStates>
-		                                <State>
-		                                    <Number>0</Number>
-		                                    <Pressed>btn_nudge_up1_overdown.png</Pressed>
-		                                    <Unpressed>btn_nudge_up1.png</Unpressed>
-		                                </State>
-		                                <Connection>
-		                                    <ConfigKey>[Channel<Variable name="channum" />],rate_temp_up</ConfigKey>
-		                                    <ButtonState>LeftButton</ButtonState>
-		                                </Connection>
-		                                <Connection>
-		                                    <ConfigKey>[Channel<Variable name="channum" />],rate_temp_up_small</ConfigKey>
-		                                    <ButtonState>RightButton</ButtonState>
-		                                </Connection>
-		                            </PushButton>
-		                        </Children>
-		                    </WidgetGroup>
-		                </Children>
-		            </WidgetGroup>
-                    <WidgetGroup>
-                        <ObjectName>SyncControls</ObjectName>
-                        <Layout>vertical</Layout>
-                        <SizePolicy>min,min</SizePolicy>
-                        <MinimumSize>52,</MinimumSize>
-                        <Children>
-                            <PushButton>
-                                <Size>52,17</Size>
-                                <ObjectName>SyncToggleButton</ObjectName>
-                                <TooltipId>sync_enabled</TooltipId>
-                                <NumberStates>2</NumberStates>
-                                <State>
-                                    <Number>0</Number>
-                                    <Text>SYNC</Text>
-                                </State>
-                                <State>
-                                    <Number>1</Number>
-                                    <Text>SYNC</Text>
-                                </State>
-                                <Connection>
-                                    <ConfigKey>[Channel<Variable name="channum" />],sync_enabled</ConfigKey>
-                                    <ButtonState>LeftButton</ButtonState>
-                                </Connection>
-                                <Connection>
-                                    <ConfigKey>[Channel<Variable name="channum" />],beatsync</ConfigKey>
-                                    <ButtonState>RightButton</ButtonState>
-                                </Connection>
-                            </PushButton>
-                            <!-- Disable explicit master for now. -->
-                            <!-- <PushButton>
-                                <TooltipId>sync_master</TooltipId>
-                                <Style></Style>
-                                <NumberStates>2</NumberStates>
-                                <State>
-                                    <Number>0</Number>
-                                    <Pressed>btn_mastersync_master_on.png</Pressed>
-                                    <Unpressed>btn_mastersync_master_off.png</Unpressed>
-                                </State>
-                                <State>
-                                    <Number>1</Number>
-                                    <Pressed>btn_mastersync_master_on.png</Pressed>
-                                    <Unpressed>btn_mastersync_master_on.png</Unpressed>
-                                </State>
-                                <Connection>
-                                    <ConfigKey>[Channel<Variable name="channum" />],sync_master</ConfigKey>
-                                    <ButtonState>LeftButton</ButtonState>
-                                </Connection>
-                            </PushButton> -->
-                        </Children>
-                    </WidgetGroup>
-	            </Children>
-            </WidgetGroup>
-			<WidgetGroup>  <!-- Deck Channel1 -->
-				<ObjectName>Deck<Variable name="channum" /></ObjectName>
-				<SizePolicy>me,min</SizePolicy>
-				<MinimumSize>340,-1</MinimumSize>
-				<Layout>vertical</Layout>
-				<Children>
-				    <WidgetGroup>
-		                <ObjectName>VinylStatusTop<Variable name="channum" /></ObjectName>
-		                <SizePolicy>me,min</SizePolicy>
-		                <MinimumSize>2,10</MinimumSize>
-		                <Layout>horizontal</Layout>
-		                <Children>
-		                    <StatusLight>
-		                        <Size>2me,10f</Size>
-		                        <TooltipId>vinylcontrol_status</TooltipId>
-		                        <NumberPos>3</NumberPos>
-		                        <PathStatusLight scalemode="STRETCH">btn_vinylcontrol_indicator_horizontal1.png</PathStatusLight>
-		                        <PathStatusLight2 scalemode="STRETCH">btn_vinylcontrol_indicator_horizontal2.png</PathStatusLight2>
-		                        <PathStatusLight3 scalemode="STRETCH">btn_vinylcontrol_indicator_horizontal3.png</PathStatusLight3>
-		                        <Connection>
-		                            <ConfigKey>[Channel<Variable name="channum"/>],vinylcontrol_status</ConfigKey>
-		                        </Connection>
-		                    </StatusLight>
-		                </Children>
-		            </WidgetGroup>
-					<Template src="skin:deck_row_1.xml" />
-					<Template src="skin:deck_row_2_3_4.xml" />
-					<Template src="skin:deck_row_5.xml" />
-					<Template src="skin:deck_buttons.xml" />
-				</Children>
-			</WidgetGroup> <!-- /Deck Channel1 -->
-		</Children>
-	</WidgetGroup>
+                  <WidgetGroup><!-- Rate buttons for up=faster -->
+                    <Layout>vertical</Layout>
+                    <SizePolicy>min,min</SizePolicy>
+                    <Children>
+                      <PushButton>
+                        <TooltipId>rate_perm_up_rate_perm_up_small</TooltipId>
+                        <NumberStates>1</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Pressed>buttons/btn_pitch_up1_overdown.png</Pressed>
+                          <Unpressed>buttons/btn_pitch_up1.png</Unpressed>
+                        </State>
+                        <Connection>
+                          <ConfigKey><Variable name="group"/>,rate_perm_up</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey><Variable name="group"/>,rate_perm_up_small</ConfigKey>
+                          <ButtonState>RightButton</ButtonState>
+                        </Connection>
+                      </PushButton>
+
+                      <PushButton>
+                        <TooltipId>rate_temp_down_rate_temp_down_small</TooltipId>
+                        <NumberStates>1</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Pressed>buttons/btn_nudge_down1_overdown.png</Pressed>
+                          <Unpressed>buttons/btn_nudge_down1.png</Unpressed>
+                        </State>
+                        <Connection>
+                          <ConfigKey><Variable name="group"/>,rate_temp_down</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey><Variable name="group"/>,rate_temp_down_small</ConfigKey>
+                          <ButtonState>RightButton</ButtonState>
+                        </Connection>
+                      </PushButton>
+
+                      <PushButton>
+                        <TooltipId>rate_temp_up_rate_temp_up_small</TooltipId>
+                        <NumberStates>1</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Pressed>buttons/btn_nudge_up1_overdown.png</Pressed>
+                          <Unpressed>buttons/btn_nudge_up1.png</Unpressed>
+                        </State>
+                        <Connection>
+                          <ConfigKey><Variable name="group"/>,rate_temp_up</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey><Variable name="group"/>,rate_temp_up_small</ConfigKey>
+                          <ButtonState>RightButton</ButtonState>
+                        </Connection>
+                      </PushButton>
+
+                      <PushButton>
+                        <TooltipId>rate_perm_down_rate_perm_down_small</TooltipId>
+                        <NumberStates>1</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Pressed>buttons/btn_pitch_down1_overdown.png</Pressed>
+                          <Unpressed>buttons/btn_pitch_down1.png</Unpressed>
+                        </State>
+                        <Connection>
+                          <ConfigKey><Variable name="group"/>,rate_perm_down</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey><Variable name="group"/>,rate_perm_down_small</ConfigKey>
+                          <ButtonState>RightButton</ButtonState>
+                        </Connection>
+                      </PushButton>
+                    </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>
+                      <PushButton>
+                        <TooltipId>rate_perm_down_rate_perm_down_small</TooltipId>
+                        <NumberStates>1</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Pressed>buttons/btn_pitch_down1_overdown.png</Pressed>
+                          <Unpressed>buttons/btn_pitch_down1.png</Unpressed>
+                        </State>
+                        <Connection>
+                          <ConfigKey><Variable name="group"/>,rate_perm_down</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey><Variable name="group"/>,rate_perm_down_small</ConfigKey>
+                          <ButtonState>RightButton</ButtonState>
+                        </Connection>
+                      </PushButton>
+
+                      <PushButton>
+                        <TooltipId>rate_temp_down_rate_temp_down_small</TooltipId>
+                        <NumberStates>1</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Pressed>buttons/btn_nudge_down1_overdown.png</Pressed>
+                          <Unpressed>buttons/btn_nudge_down1.png</Unpressed>
+                        </State>
+                        <Connection>
+                          <ConfigKey><Variable name="group"/>,rate_temp_down</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey><Variable name="group"/>,rate_temp_down_small</ConfigKey>
+                          <ButtonState>RightButton</ButtonState>
+                        </Connection>
+                      </PushButton>
+
+                      <PushButton>
+                        <TooltipId>rate_temp_up_rate_temp_up_small</TooltipId>
+                        <NumberStates>1</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Pressed>buttons/btn_nudge_up1_overdown.png</Pressed>
+                          <Unpressed>buttons/btn_nudge_up1.png</Unpressed>
+                        </State>
+                        <Connection>
+                          <ConfigKey><Variable name="group"/>,rate_temp_up</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey><Variable name="group"/>,rate_temp_up_small</ConfigKey>
+                          <ButtonState>RightButton</ButtonState>
+                        </Connection>
+                      </PushButton>
+
+                      <PushButton>
+                        <TooltipId>rate_perm_up_rate_perm_up_small</TooltipId>
+                        <NumberStates>1</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Pressed>buttons/btn_pitch_up1_overdown.png</Pressed>
+                          <Unpressed>buttons/btn_pitch_up1.png</Unpressed>
+                        </State>
+                        <Connection>
+                          <ConfigKey><Variable name="group"/>,rate_perm_up</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                        <Connection>
+                          <ConfigKey><Variable name="group"/>,rate_perm_up_small</ConfigKey>
+                          <ButtonState>RightButton</ButtonState>
+                        </Connection>
+                      </PushButton>
+                    </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>
+              </WidgetGroup><!-- RateButtons for different rate directions -->
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>SyncControls</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <PushButton>
+                <Size>52,22</Size>
+                <ObjectName>SyncToggleButton</ObjectName>
+                <TooltipId>sync_enabled</TooltipId>
+                <NumberStates>2</NumberStates>
+                <State>
+                  <Number>0</Number>
+                  <Text>SYNC</Text>
+                </State>
+                <State>
+                  <Number>1</Number>
+                  <Text>SYNC</Text>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,sync_enabled</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,beatsync</ConfigKey>
+                  <ButtonState>RightButton</ButtonState>
+                </Connection>
+              </PushButton>
+              <!-- Disable explicit master for now. -->
+              <!-- <PushButton>
+                <TooltipId>sync_master</TooltipId>
+                <Style></Style>
+                <NumberStates>2</NumberStates>
+                <State>
+                  <Number>0</Number>
+                  <Pressed>buttons/btn_mastersync_master_on.png</Pressed>
+                  <Unpressed>buttons/btn_mastersync_master_off.png</Unpressed>
+                </State>
+                <State>
+                  <Number>1</Number>
+                  <Pressed>buttons/btn_mastersync_master_on.png</Pressed>
+                  <Unpressed>buttons/btn_mastersync_master_on.png</Unpressed>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,sync_master</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+              </PushButton> -->
+            </Children>
+          </WidgetGroup>
+        </Children>
+      </WidgetGroup><!-- /RateContainer -->
+
+      <WidgetGroup>  <!-- Deck Channel
+        <ObjectName>Deck<Variable name="channum" /></ObjectName> -->
+        <SizePolicy>me,min</SizePolicy>
+        <Layout>vertical</Layout>
+        <Children>
+          <Template src="skin:deck_row_1.xml" />
+          <Template src="skin:deck_row_2_3_4.xml" />
+          <Template src="skin:deck_row_5.xml" />
+          <Template src="skin:deck_buttons.xml" />
+        </Children>
+      </WidgetGroup> <!-- /Deck Channel1 -->
+    </Children>
+  </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/deck_buttons.xml b/res/skins/LateNight/deck_buttons.xml
index a4600a5e67ab..18ec18df92c1 100644
--- a/res/skins/LateNight/deck_buttons.xml
+++ b/res/skins/LateNight/deck_buttons.xml
@@ -1,480 +1,363 @@
 <Template>
 	<WidgetGroup>
 		<ObjectName>DeckButtons</ObjectName>
-		<SizePolicy>me,me</SizePolicy>
+		<SizePolicy>min,min</SizePolicy>
 		<BackPath>background_tile.png</BackPath>
 		<Layout>horizontal</Layout>
-		<MinimumSize>200,-1</MinimumSize>
 		<Children>
-			<WidgetGroup>
-				<Layout>horizontal</Layout>
-				<ObjectName>LoopSizeButtons</ObjectName>
-				<SizePolicy>me,min</SizePolicy>
-				<Children>
-					<PushButton>
-						<TooltipId>loop_halve</TooltipId>
-						<NumberStates>1</NumberStates>
-						<State>
-							<Number>0</Number>
-							<Pressed>btn_beatloop2_halve_overdown.png</Pressed>
-							<Unpressed>btn_beatloop2_halve.png</Unpressed>
-						</State>
-						<Connection>
-							<ConfigKey>[Channel<Variable name="channum" />],loop_halve</ConfigKey>
-							<ButtonState>LeftButton</ButtonState>
-						</Connection>
-						<Connection>
-							<ConfigKey>[Channel<Variable name="channum" />],loop_move_1_backward</ConfigKey>
-							<ButtonState>RightButton</ButtonState>
-						</Connection>
-					</PushButton>
-					<WidgetGroup>
-						<Layout>vertical</Layout>
-						<ObjectName>BeatLoopRows</ObjectName>
-						<Children>
-							<WidgetGroup>
-								<Layout>horizontal</Layout>
-								<SizePolicy>me,min</SizePolicy>
-								<Children>
-									<PushButton>
-										<TooltipId>beatloop</TooltipId>
-										<NumberStates>2</NumberStates>
-										<LeftClickIsPushButton>true</LeftClickIsPushButton>
-										<RightClickIsPushButton>true</RightClickIsPushButton>
-										<State>
-											<Number>0</Number>
-											<Pressed>btn_beatloop2_0125_down.png</Pressed>
-											<Unpressed>btn_beatloop2_0125.png</Unpressed>
-										</State>
-										<State>
-											<Number>1</Number>
-											<Pressed>btn_beatloop2_0125_overdown.png</Pressed>
-											<Unpressed>btn_beatloop2_0125_over.png</Unpressed>
-										</State>
-										<Connection>
-											<ConfigKey>[Channel<Variable name="channum" />],beatloop_0.125_toggle</ConfigKey>
-											<ButtonState>LeftButton</ButtonState>
-										</Connection>
-										<Connection>
-											<ConfigKey>[Channel<Variable name="channum" />],beatlooproll_0.125_activate</ConfigKey>
-											<ButtonState>RightButton</ButtonState>
-										</Connection>
-										<Connection>
-											<ConfigKey>[Channel<Variable name="channum" />],beatloop_0.125_enabled</ConfigKey>
-										</Connection>
-									</PushButton>
-									<PushButton>
-										<TooltipId>beatloop</TooltipId>
-										<NumberStates>2</NumberStates>
-										<LeftClickIsPushButton>true</LeftClickIsPushButton>
-										<RightClickIsPushButton>true</RightClickIsPushButton>
-										<State>
-											<Number>0</Number>
-											<Pressed>btn_beatloop2_0250_down.png</Pressed>
-											<Unpressed>btn_beatloop2_0250.png</Unpressed>
-										</State>
-										<State>
-											<Number>1</Number>
-											<Pressed>btn_beatloop2_0250_overdown.png</Pressed>
-											<Unpressed>btn_beatloop2_0250_over.png</Unpressed>
-										</State>
-										<Connection>
-											<ConfigKey>[Channel<Variable name="channum" />],beatloop_0.25_toggle</ConfigKey>
-											<ButtonState>LeftButton</ButtonState>
-										</Connection>
-										<Connection>
-											<ConfigKey>[Channel<Variable name="channum" />],beatlooproll_0.25_activate</ConfigKey>
-											<ButtonState>RightButton</ButtonState>
-										</Connection>
-										<Connection>
-											<ConfigKey>[Channel<Variable name="channum" />],beatloop_0.25_enabled</ConfigKey>
-										</Connection>
-									</PushButton>
-									<PushButton>
-										<TooltipId>beatloop</TooltipId>
-										<NumberStates>2</NumberStates>
-										<LeftClickIsPushButton>true</LeftClickIsPushButton>
-										<RightClickIsPushButton>true</RightClickIsPushButton>
-										<State>
-											<Number>0</Number>
-											<Pressed>btn_beatloop2_0500_down.png</Pressed>
-											<Unpressed>btn_beatloop2_0500.png</Unpressed>
-										</State>
-										<State>
-											<Number>1</Number>
-											<Pressed>btn_beatloop2_0500_overdown.png</Pressed>
-											<Unpressed>btn_beatloop2_0500_over.png</Unpressed>
-										</State>
-										<Connection>
-											<ConfigKey>[Channel<Variable name="channum" />],beatloop_0.5_toggle</ConfigKey>
-											<ButtonState>LeftButton</ButtonState>
-										</Connection>
-										<Connection>
-											<ConfigKey>[Channel<Variable name="channum" />],beatlooproll_0.5_activate</ConfigKey>
-											<ButtonState>RightButton</ButtonState>
-										</Connection>
-										<Connection>
-											<ConfigKey>[Channel<Variable name="channum" />],beatloop_0.5_enabled</ConfigKey>
-										</Connection>
-									</PushButton>
-									<PushButton>
-										<TooltipId>beatloop</TooltipId>
-										<NumberStates>2</NumberStates>
-										<LeftClickIsPushButton>true</LeftClickIsPushButton>
-										<RightClickIsPushButton>true</RightClickIsPushButton>
-										<State>
-											<Number>0</Number>
-											<Pressed>btn_beatloop2_1_down.png</Pressed>
-											<Unpressed>btn_beatloop2_1.png</Unpressed>
-										</State>
-										<State>
-											<Number>1</Number>
-											<Pressed>btn_beatloop2_1_overdown.png</Pressed>
-											<Unpressed>btn_beatloop2_1_over.png</Unpressed>
-										</State>
-										<Connection>
-											<ConfigKey>[Channel<Variable name="channum" />],beatloop_1_toggle</ConfigKey>
-											<ButtonState>LeftButton</ButtonState>
-										</Connection>
-										<Connection>
-											<ConfigKey>[Channel<Variable name="channum" />],beatlooproll_1_activate</ConfigKey>
-											<ButtonState>RightButton</ButtonState>
-										</Connection>
-										<Connection>
-											<ConfigKey>[Channel<Variable name="channum" />],beatloop_1_enabled</ConfigKey>
-										</Connection>
-									</PushButton>
-								</Children>
-							</WidgetGroup>
-							<WidgetGroup>
-								<Layout>horizontal</Layout>
-								<SizePolicy>me,min</SizePolicy>
-								<Children>
-									<PushButton>
-										<TooltipId>beatloop</TooltipId>
-										<NumberStates>2</NumberStates>
-										<LeftClickIsPushButton>true</LeftClickIsPushButton>
-										<RightClickIsPushButton>true</RightClickIsPushButton>
-										<State>
-											<Number>0</Number>
-											<Pressed>btn_beatloop2_2_down.png</Pressed>
-											<Unpressed>btn_beatloop2_2.png</Unpressed>
-										</State>
-										<State>
-											<Number>1</Number>
-											<Pressed>btn_beatloop2_2_overdown.png</Pressed>
-											<Unpressed>btn_beatloop2_2_over.png</Unpressed>
-										</State>
-										<Connection>
-											<ConfigKey>[Channel<Variable name="channum" />],beatloop_2_toggle</ConfigKey>
-											<ButtonState>LeftButton</ButtonState>
-										</Connection>
-										<Connection>
-											<ConfigKey>[Channel<Variable name="channum" />],beatlooproll_2_activate</ConfigKey>
-											<ButtonState>RightButton</ButtonState>
-										</Connection>
-										<Connection>
-											<ConfigKey>[Channel<Variable name="channum" />],beatloop_2_enabled</ConfigKey>
-										</Connection>
-									</PushButton>
-									<PushButton>
-										<TooltipId>beatloop</TooltipId>
-										<NumberStates>2</NumberStates>
-										<LeftClickIsPushButton>true</LeftClickIsPushButton>
-										<RightClickIsPushButton>true</RightClickIsPushButton>
-										<State>
-											<Number>0</Number>
-											<Pressed>btn_beatloop2_4_down.png</Pressed>
-											<Unpressed>btn_beatloop2_4.png</Unpressed>
-										</State>
-										<State>
-											<Number>1</Number>
-											<Pressed>btn_beatloop2_4_overdown.png</Pressed>
-											<Unpressed>btn_beatloop2_4_over.png</Unpressed>
-										</State>
-										<Connection>
-											<ConfigKey>[Channel<Variable name="channum" />],beatloop_4_toggle</ConfigKey>
-											<ButtonState>LeftButton</ButtonState>
-										</Connection>
-										<Connection>
-											<ConfigKey>[Channel<Variable name="channum" />],beatlooproll_4_activate</ConfigKey>
-											<ButtonState>RightButton</ButtonState>
-										</Connection>
-										<Connection>
-											<ConfigKey>[Channel<Variable name="channum" />],beatloop_4_enabled</ConfigKey>
-										</Connection>
-									</PushButton>
-									<PushButton>
-										<TooltipId>beatloop</TooltipId>
-										<NumberStates>2</NumberStates>
-										<LeftClickIsPushButton>true</LeftClickIsPushButton>
-										<RightClickIsPushButton>true</RightClickIsPushButton>
-										<State>
-											<Number>0</Number>
-											<Pressed>btn_beatloop2_8_down.png</Pressed>
-											<Unpressed>btn_beatloop2_8.png</Unpressed>
-										</State>
-										<State>
-											<Number>1</Number>
-											<Pressed>btn_beatloop2_8_overdown.png</Pressed>
-											<Unpressed>btn_beatloop2_8_over.png</Unpressed>
-										</State>
-										<Connection>
-											<ConfigKey>[Channel<Variable name="channum" />],beatloop_8_toggle</ConfigKey>
-											<ButtonState>LeftButton</ButtonState>
-										</Connection>
-										<Connection>
-											<ConfigKey>[Channel<Variable name="channum" />],beatlooproll_8_activate</ConfigKey>
-											<ButtonState>RightButton</ButtonState>
-										</Connection>
-										<Connection>
-											<ConfigKey>[Channel<Variable name="channum" />],beatloop_8_enabled</ConfigKey>
-										</Connection>
-									</PushButton>
-									<PushButton>
-										<TooltipId>beatloop</TooltipId>
-										<NumberStates>2</NumberStates>
-										<LeftClickIsPushButton>true</LeftClickIsPushButton>
-										<RightClickIsPushButton>true</RightClickIsPushButton>
-										<State>
-											<Number>0</Number>
-											<Pressed>btn_beatloop2_16_down.png</Pressed>
-											<Unpressed>btn_beatloop2_16.png</Unpressed>
-										</State>
-										<State>
-											<Number>1</Number>
-											<Pressed>btn_beatloop2_16_overdown.png</Pressed>
-											<Unpressed>btn_beatloop2_16_over.png</Unpressed>
-										</State>
-										<Connection>
-											<ConfigKey>[Channel<Variable name="channum" />],beatloop_16_toggle</ConfigKey>
-											<ButtonState>LeftButton</ButtonState>
-										</Connection>
-										<Connection>
-											<ConfigKey>[Channel<Variable name="channum" />],beatlooproll_16_activate</ConfigKey>
-											<ButtonState>RightButton</ButtonState>
-										</Connection>
-										<Connection>
-											<ConfigKey>[Channel<Variable name="channum" />],beatloop_16_enabled</ConfigKey>
-										</Connection>
-									</PushButton>
-								</Children>
-							</WidgetGroup>
-						</Children>
-					</WidgetGroup>
 
-					<PushButton>
-						<TooltipId>loop_double</TooltipId>
-						<NumberStates>1</NumberStates>
-						<State>
-							<Number>0</Number>
-							<Pressed>btn_beatloop2_double_overdown.png</Pressed>
-							<Unpressed>btn_beatloop2_double.png</Unpressed>
-						</State>
-						<Connection>
-							<ConfigKey>[Channel<Variable name="channum" />],loop_double</ConfigKey>
-							<ButtonState>LeftButton</ButtonState>
-						</Connection>
-						<Connection>
-							<ConfigKey>[Channel<Variable name="channum" />],loop_move_1_forward</ConfigKey>
-							<ButtonState>RightButton</ButtonState>
-						</Connection>
-					</PushButton>
-				</Children>
-			</WidgetGroup>
-			<WidgetGroup>
-				<Layout>vertical</Layout>
-				<ObjectName>LoopInOut</ObjectName>
-				<Children>
-					<WidgetGroup>
-						<Layout>horizontal</Layout>
-						<ObjectName>LoopInOut</ObjectName>
-						<SizePolicy>me,min</SizePolicy>
-						<Children>
-							<PushButton>
-								<TooltipId>loop_in</TooltipId>
-								<NumberStates>1</NumberStates>
-								<State>
-									<Number>0</Number>
-									<Pressed>btn_loop_in2_overdown.png</Pressed>
-									<Unpressed>btn_loop_in2.png</Unpressed>
-								</State>
-								<Connection>
-									<ConfigKey>[Channel<Variable name="channum" />],loop_in</ConfigKey>
-									<ButtonState>LeftButton</ButtonState>
-								</Connection>
-							</PushButton>
-							<PushButton>
-								<TooltipId>loop_out</TooltipId>
-								<NumberStates>1</NumberStates>
-								<State>
-									<Number>0</Number>
-									<Pressed>btn_loop_out2_overdown.png</Pressed>
-									<Unpressed>btn_loop_out2.png</Unpressed>
-								</State>
-								<Connection>
-									<ConfigKey>[Channel<Variable name="channum" />],loop_out</ConfigKey>
-									<ButtonState>LeftButton</ButtonState>
-								</Connection>
-							</PushButton>
-						</Children>
-					</WidgetGroup>
-					<WidgetGroup>
-						<Layout>horizontal</Layout>
-						<ObjectName>LoopInOut</ObjectName>
-						<Children>
-							<PushButton>
-								<Size>52,24</Size>
-								<ObjectName>LoopToggleButton</ObjectName>
-								<TooltipId>reloop_exit</TooltipId>
-								<NumberStates>2</NumberStates>
-								<LeftClickIsPushButton>true</LeftClickIsPushButton>
-								<State>
-									<Number>0</Number>
-									<Text>LOOP</Text>
-								</State>
-								<State>
-									<Number>1</Number>
-									<Text>LOOP</Text>
-								</State>
-								<Connection>
-									<ConfigKey>[Channel<Variable name="channum" />],reloop_exit</ConfigKey>
-									<ButtonState>LeftButton</ButtonState>
-								</Connection>
-								<Connection>
-									<ConfigKey>[Channel<Variable name="channum" />],loop_enabled</ConfigKey>
-								</Connection>
-							</PushButton>
-						</Children>
-					</WidgetGroup>
-				</Children>
-			</WidgetGroup>
+      <WidgetGroup><Size>0me,1min</Size></WidgetGroup>
+
+      <WidgetGroup><!-- Loop buttons + beatloop size spinbox -->
+        <ObjectName>AlignLeftTop</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,max</SizePolicy>
+        <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="Size">26f,26f</SetVariable>
+                <SetVariable name="state_0_pressed">loop_down.png</SetVariable>
+                <SetVariable name="state_0_unpressed">loop.png</SetVariable>
+                <SetVariable name="state_1_pressed">loop_overdown.png</SetVariable>
+                <SetVariable name="state_1_unpressed">loop_over.png</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>
+                <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="Size">26f,26f</SetVariable>
+                <SetVariable name="state_0_pressed">reloop_down.png</SetVariable>
+                <SetVariable name="state_0_unpressed">reloop.png</SetVariable>
+                <SetVariable name="state_1_pressed">reloop_overdown.png</SetVariable>
+                <SetVariable name="state_1_unpressed">reloop_over.png</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="Size">26f,26f</SetVariable>
+                <SetVariable name="state_0_pressed">loop_in_overdown.png</SetVariable>
+                <SetVariable name="state_0_unpressed">loop_in.png</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="Size">26f,26f</SetVariable>
+                <SetVariable name="state_0_pressed">loop_out_overdown.png</SetVariable>
+                <SetVariable name="state_0_unpressed">loop_out.png</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>0me,1min</Size></WidgetGroup>
+
+      <WidgetGroup><Size>0me,1min</Size></WidgetGroup>
+
+      <WidgetGroup><!-- Jump buttons + beatjump size spinbox -->
+        <ObjectName>AlignLeftTop</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <WidgetGroup><!-- beatjump size -->
+            <ObjectName>AlignLeftTop</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>26f,min</SizePolicy>
+            <Children>
+              <!-- put this spacer here so BeatSpinBox expands whith HiDPI scaling -->
+              <WidgetGroup><Size>0f,26f</Size></WidgetGroup>
+              <BeatSpinBox>
+                <TooltipId>beatjump_size</TooltipId>
+                <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="Size">26f,26f</SetVariable>
+                <SetVariable name="state_0_pressed">nudge_down1_overdown.png</SetVariable>
+                <SetVariable name="state_0_unpressed">nudge_down1.png</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="Size">26f,26f</SetVariable>
+                <SetVariable name="state_0_pressed">nudge_up1_overdown.png</SetVariable>
+                <SetVariable name="state_0_unpressed">nudge_up1.png</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>0me,1min</Size></WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName></ObjectName>
+        <Layout>vertical</Layout>
+        <Children>
+			    <WidgetGroup><!-- HotCues, Cue -->
+				    <ObjectName>PlayCue</ObjectName>
+				    <Layout>horizontal</Layout>
+				    <Children>
+              <PushButton><!-- HotCue 1 -->
+                <TooltipId>hotcue</TooltipId>
+                <NumberStates>2</NumberStates>
+                <LeftClickIsPushButton>true</LeftClickIsPushButton>
+                <RightClickIsPushButton>true</RightClickIsPushButton>
+                <State>
+                  <Number>0</Number>
+                  <Pressed>buttons/btn_hotcue2_1_down.png</Pressed>
+                  <Unpressed>buttons/btn_hotcue2_1.png</Unpressed>
+                </State>
+                <State>
+                  <Number>1</Number>
+                  <Pressed>buttons/btn_hotcue2_1_overdown.png</Pressed>
+                  <Unpressed>buttons/btn_hotcue2_1_over.png</Unpressed>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,hotcue_1_activate</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,hotcue_1_clear</ConfigKey>
+                  <ButtonState>RightButton</ButtonState>
+                </Connection>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,hotcue_1_enabled</ConfigKey>
+                </Connection>
+              </PushButton>
+
+              <PushButton><!-- HotCue 2 -->
+                <TooltipId>hotcue</TooltipId>
+                <NumberStates>2</NumberStates>
+                <LeftClickIsPushButton>true</LeftClickIsPushButton>
+                <RightClickIsPushButton>true</RightClickIsPushButton>
+                <State>
+                  <Number>0</Number>
+                  <Pressed>buttons/btn_hotcue2_2_down.png</Pressed>
+                  <Unpressed>buttons/btn_hotcue2_2.png</Unpressed>
+                </State>
+                <State>
+                  <Number>1</Number>
+                  <Pressed>buttons/btn_hotcue2_2_overdown.png</Pressed>
+                  <Unpressed>buttons/btn_hotcue2_2_over.png</Unpressed>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,hotcue_2_activate</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,hotcue_2_clear</ConfigKey>
+                  <ButtonState>RightButton</ButtonState>
+                </Connection>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,hotcue_2_enabled</ConfigKey>
+                </Connection>
+              </PushButton>
+
+              <PushButton><!-- HotCue 3 -->
+                <TooltipId>hotcue</TooltipId>
+                <NumberStates>2</NumberStates>
+                <LeftClickIsPushButton>true</LeftClickIsPushButton>
+                <RightClickIsPushButton>true</RightClickIsPushButton>
+                <State>
+                  <Number>0</Number>
+                  <Pressed>buttons/btn_hotcue2_3_down.png</Pressed>
+                  <Unpressed>buttons/btn_hotcue2_3.png</Unpressed>
+                </State>
+                <State>
+                  <Number>1</Number>
+                  <Pressed>buttons/btn_hotcue2_3_overdown.png</Pressed>
+                  <Unpressed>buttons/btn_hotcue2_3_over.png</Unpressed>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,hotcue_3_activate</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,hotcue_3_clear</ConfigKey>
+                  <ButtonState>RightButton</ButtonState>
+                </Connection>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,hotcue_3_enabled</ConfigKey>
+                </Connection>
+              </PushButton>
+
+              <PushButton><!-- HotCue 4 -->
+                <TooltipId>hotcue</TooltipId>
+                <NumberStates>2</NumberStates>
+                <LeftClickIsPushButton>true</LeftClickIsPushButton>
+                <RightClickIsPushButton>true</RightClickIsPushButton>
+                <State>
+                  <Number>0</Number>
+                  <Pressed>buttons/btn_hotcue2_4_down.png</Pressed>
+                  <Unpressed>buttons/btn_hotcue2_4.png</Unpressed>
+                </State>
+                <State>
+                  <Number>1</Number>
+                  <Pressed>buttons/btn_hotcue2_4_overdown.png</Pressed>
+                  <Unpressed>buttons/btn_hotcue2_4_over.png</Unpressed>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,hotcue_4_activate</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,hotcue_4_clear</ConfigKey>
+                  <ButtonState>RightButton</ButtonState>
+                </Connection>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,hotcue_4_enabled</ConfigKey>
+                </Connection>
+              </PushButton>
+
+					    <PushButton><!-- Cue -->
+                <ObjectName>CueToggleButton</ObjectName>
+                <Size>52,26</Size>
+						    <TooltipId>cue_default_cue_gotoandstop</TooltipId>
+						    <NumberStates>2</NumberStates>
+						    <State>
+							    <Number>0</Number>
+							    <Text>CUE</Text>
+						    </State>
+						    <State>
+							    <Number>1</Number>
+							    <Text>CUE</Text>
+						    </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>
+						    </Connection>
+					    </PushButton>
+				    </Children>
+			    </WidgetGroup><!-- /HotCues, Cue -->
+
+			    <WidgetGroup><!-- /rew, fwd, rev, Play -->
+				    <ObjectName>PlayCue</ObjectName>
+				    <Layout>horizontal</Layout>
+				    <Children>
+
+              <PushButton><!-- Rewind -->
+                <TooltipId>back_start</TooltipId>
+                <NumberStates>1</NumberStates>
+                <State>
+                  <Number>0</Number>
+                  <Pressed>buttons/btn_rewind2_overdown.png</Pressed>
+                  <Unpressed>buttons/btn_rewind2.png</Unpressed>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,back</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,start</ConfigKey>
+                  <ButtonState>RightButton</ButtonState>
+                </Connection>
+              </PushButton>
+
+              <PushButton><!-- Forward -->
+                <TooltipId>fwd_end</TooltipId>
+                <NumberStates>1</NumberStates>
+                <State>
+                  <Number>0</Number>
+                  <Pressed>buttons/btn_forward2_overdown.png</Pressed>
+                  <Unpressed>buttons/btn_forward2.png</Unpressed>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,fwd</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,end</ConfigKey>
+                  <ButtonState>RightButton</ButtonState>
+                </Connection>
+              </PushButton>
 
-			<WidgetGroup>
-                <ObjectName>FFRew</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>me,min</SizePolicy>
-                <Children>
-                    <WidgetGroup>
-                        <ObjectName>FFRew</ObjectName>
-                        <Layout>horizontal</Layout>
-                        <SizePolicy>me,min</SizePolicy>
-                        <Children>
-                            <PushButton>
-                                <TooltipId>back_start</TooltipId>
-                                <NumberStates>1</NumberStates>
-                                <State>
-                                    <Number>0</Number>
-                                    <Pressed>btn_rewind2_overdown.png</Pressed>
-                                    <Unpressed>btn_rewind2.png</Unpressed>
-                                </State>
-                                <Connection>
-                                    <ConfigKey>[Channel<Variable name="channum" />],back</ConfigKey>
-                                    <ButtonState>LeftButton</ButtonState>
-                                </Connection>
-                                <Connection>
-                                    <ConfigKey>[Channel<Variable name="channum" />],start</ConfigKey>
-                                    <ButtonState>RightButton</ButtonState>
-                                </Connection>
-                            </PushButton>
-                            <PushButton>
-                                <TooltipId>fwd_end</TooltipId>
-                                <NumberStates>1</NumberStates>
-                                <State>
-                                    <Number>0</Number>
-                                    <Pressed>btn_forward2_overdown.png</Pressed>
-                                    <Unpressed>btn_forward2.png</Unpressed>
-                                </State>
-                                <Connection>
-                                    <ConfigKey>[Channel<Variable name="channum" />],fwd</ConfigKey>
-                                    <ButtonState>LeftButton</ButtonState>
-                                </Connection>
-                                <Connection>
-                                    <ConfigKey>[Channel<Variable name="channum" />],end</ConfigKey>
-                                    <ButtonState>RightButton</ButtonState>
-                                </Connection>
-                            </PushButton>
-                        </Children>
-                    </WidgetGroup>
-                    <WidgetGroup>
-                        <Layout>horizontal</Layout>
-                        <ObjectName>FFRew</ObjectName>
-                        <SizePolicy>me,min</SizePolicy>
-                        <Children>
-                            <PushButton>
-                                <TooltipId>reverse</TooltipId>
-                                <NumberStates>1</NumberStates>
-                                <RightClickIsPushButton>true</RightClickIsPushButton>
-                                <State>
-                                    <Number>0</Number>
-                                    <Pressed>btn_reverse2_overdown.png</Pressed>
-                                    <Unpressed>btn_reverse2.png</Unpressed>
-                                </State>
-                                <Connection>
-                                    <ConfigKey>[Channel<Variable name="channum" />],reverse</ConfigKey>
-                                    <ButtonState>LeftButton</ButtonState>
-                                </Connection>
-                                <Connection>
-                                    <ConfigKey>[Channel<Variable name="channum" />],reverseroll</ConfigKey>
-                                    <ButtonState>RightButton</ButtonState>
-                                </Connection>
-                            </PushButton>
-                        </Children>
-                    </WidgetGroup>
-                </Children>
-            </WidgetGroup>
+              <PushButton><!-- Reverse -->
+                <TooltipId>reverse</TooltipId>
+                <NumberStates>1</NumberStates>
+                <RightClickIsPushButton>true</RightClickIsPushButton>
+                <State>
+                  <Number>0</Number>
+                  <Pressed>buttons/btn_reverse2_overdown.png</Pressed>
+                  <Unpressed>buttons/btn_reverse2.png</Unpressed>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,reverse</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,reverseroll</ConfigKey>
+                  <ButtonState>RightButton</ButtonState>
+                </Connection>
+              </PushButton>
 
-			<WidgetGroup>
-				<ObjectName>PlayCue</ObjectName>
-				<Layout>vertical</Layout>
-				<Children>
-					<PushButton>
-								<ObjectName>CueToggleButton</ObjectName>
-								<Size>52,26</Size>
-						<TooltipId>cue_default_cue_gotoandstop</TooltipId>
-						<NumberStates>2</NumberStates>
-						<State>
-							<Number>0</Number>
-							<Text>CUE</Text>
-						</State>
-						<State>
-							<Number>1</Number>
-							<Text>CUE</Text>
-						</State>
-						<Connection>
-							<ConfigKey>[Channel<Variable name="channum" />],cue_default</ConfigKey>
-							<ButtonState>LeftButton</ButtonState>
-						</Connection>
-						<Connection>
-							<ConfigKey>[Channel<Variable name="channum" />],cue_gotoandstop</ConfigKey>
-							<ButtonState>RightButton</ButtonState>
-						</Connection>
-						<Connection>
-							<ConfigKey>[Channel<Variable name="channum" />],cue_indicator</ConfigKey>
-						</Connection>
-					</PushButton>
-					<PushButton>
-						<TooltipId>play_cue_set</TooltipId>
-						<NumberStates>2</NumberStates>
-						<RightClickIsPushButton>true</RightClickIsPushButton>
-						<State>
-							<Number>0</Number>
-							<Pressed>btn_play1_down.png</Pressed>
-							<Unpressed>btn_play1.png</Unpressed>
-						</State>
-						<State>
-							<Number>1</Number>
-							<Pressed>btn_play1_overdown.png</Pressed>
-							<Unpressed>btn_play1_over.png</Unpressed>
-						</State>
-						<Connection>
-							<ConfigKey>[Channel<Variable name="channum" />],play</ConfigKey>
-							<ButtonState>LeftButton</ButtonState>
-						</Connection>
-						<Connection>
-							<ConfigKey>[Channel<Variable name="channum" />],play_indicator</ConfigKey>
-						</Connection>
-					</PushButton>
+					    <PushButton><!-- Play -->
+						    <TooltipId>play_cue_set</TooltipId>
+						    <NumberStates>2</NumberStates>
+						    <RightClickIsPushButton>true</RightClickIsPushButton>
+						    <State>
+							    <Number>0</Number>
+							    <Pressed>buttons/btn_play1_down.png</Pressed>
+							    <Unpressed>buttons/btn_play1.png</Unpressed>
+						    </State>
+						    <State>
+							    <Number>1</Number>
+							    <Pressed>buttons/btn_play1_overdown.png</Pressed>
+							    <Unpressed>buttons/btn_play1_over.png</Unpressed>
+						    </State>
+						    <Connection>
+							    <ConfigKey><Variable name="group"/>,play</ConfigKey>
+							    <ButtonState>LeftButton</ButtonState>
+						    </Connection>
+						    <Connection>
+							    <ConfigKey><Variable name="group"/>,play_indicator</ConfigKey>
+						    </Connection>
+					    </PushButton>
+				    </Children>
+			    </WidgetGroup><!-- /rew, fwd, rev, Play -->
 				</Children>
 			</WidgetGroup>
 		</Children>
diff --git a/res/skins/LateNight/deck_row_1.xml b/res/skins/LateNight/deck_row_1.xml
index 6200c25c6db6..d2ce764e38f4 100644
--- a/res/skins/LateNight/deck_row_1.xml
+++ b/res/skins/LateNight/deck_row_1.xml
@@ -1,169 +1,150 @@
 <Template>
-	<WidgetGroup>
-		<ObjectName>DeckRowOne</ObjectName>
-		<Layout>horizontal</Layout>
-		<SizePolicy>me,min</SizePolicy>
-		<MinimumSize>180,-1</MinimumSize>
-		<Children>
-		        <Template src="skin:vinyl_controls.xml"/>
-            <WidgetGroup>  <!-- spacer -->
-                <Layout>horizontal</Layout>
-                <SizePolicy>me,min</SizePolicy>
-                <Children></Children>
-            </WidgetGroup>
-            <WidgetGroup>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <ObjectName>EffectKnob</ObjectName>
-                <Children>
-                     <WidgetGroup>
-                         <ObjectName>AlignCenterTop</ObjectName>
-                         <Layout>horizontal</Layout>
-                         <SizePolicy>min,min</SizePolicy>
-                         <Children>
-                             <Template src="skin:knob_textless.xml">
-                                <SetVariable name="group">[QuickEffectRack1_[Channel<Variable name="channum"/>]]</SetVariable>
-                                <SetVariable name="control">super1</SetVariable>
-                             </Template>
-                         </Children>
-                     </WidgetGroup>
-                     <EffectName>
-                         <ObjectName>KnobLabel</ObjectName>
-                         <EffectRackGroup>[QuickEffectRack1]</EffectRackGroup>
-                         <EffectUnitGroup>[QuickEffectRack1_[Channel<Variable name="channum"/>]]</EffectUnitGroup>
-                         <Effect>1</Effect>
-                     </EffectName>
-                 </Children>
-            </WidgetGroup>
-		      	<WidgetGroup>
-                <ObjectName>Hotcues</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <WidgetGroup>
-                        <ObjectName>Hotcues</ObjectName>
-                        <Layout>horizontal</Layout>
-                        <SizePolicy>min,min</SizePolicy>
-                        <Children>
-                            <PushButton>
-                                <TooltipId>hotcue</TooltipId>
-                                <NumberStates>2</NumberStates>
-                                <LeftClickIsPushButton>true</LeftClickIsPushButton>
-                                <RightClickIsPushButton>true</RightClickIsPushButton>
-                                <State>
-                                    <Number>0</Number>
-                                    <Pressed>btn_hotcue2_1_down.png</Pressed>
-                                    <Unpressed>btn_hotcue2_1.png</Unpressed>
-                                </State>
-                                <State>
-                                    <Number>1</Number>
-                                    <Pressed>btn_hotcue2_1_overdown.png</Pressed>
-                                    <Unpressed>btn_hotcue2_1_over.png</Unpressed>
-                                </State>
-                                <Connection>
-                                    <ConfigKey>[Channel<Variable name="channum" />],hotcue_1_activate</ConfigKey>
-                                    <ButtonState>LeftButton</ButtonState>
-                                </Connection>
-                                <Connection>
-                                    <ConfigKey>[Channel<Variable name="channum" />],hotcue_1_clear</ConfigKey>
-                                    <ButtonState>RightButton</ButtonState>
-                                </Connection>
-                                <Connection>
-                                    <ConfigKey>[Channel<Variable name="channum" />],hotcue_1_enabled</ConfigKey>
-                                </Connection>
-                            </PushButton>
-                            <PushButton>
-                                <TooltipId>hotcue</TooltipId>
-                                <NumberStates>2</NumberStates>
-                                <LeftClickIsPushButton>true</LeftClickIsPushButton>
-                                <RightClickIsPushButton>true</RightClickIsPushButton>
-                                <State>
-                                    <Number>0</Number>
-                                    <Pressed>btn_hotcue2_2_down.png</Pressed>
-                                    <Unpressed>btn_hotcue2_2.png</Unpressed>
-                                </State>
-                                <State>
-                                    <Number>1</Number>
-                                    <Pressed>btn_hotcue2_2_overdown.png</Pressed>
-                                    <Unpressed>btn_hotcue2_2_over.png</Unpressed>
-                                </State>
-                                <Connection>
-                                    <ConfigKey>[Channel<Variable name="channum" />],hotcue_2_activate</ConfigKey>
-                                    <ButtonState>LeftButton</ButtonState>
-                                </Connection>
-                                <Connection>
-                                    <ConfigKey>[Channel<Variable name="channum" />],hotcue_2_clear</ConfigKey>
-                                    <ButtonState>RightButton</ButtonState>
-                                </Connection>
-                                <Connection>
-                                    <ConfigKey>[Channel<Variable name="channum" />],hotcue_2_enabled</ConfigKey>
-                                </Connection>
-                            </PushButton>
-                        </Children>
-                    </WidgetGroup>
-                    <WidgetGroup>
-                        <ObjectName>Hotcues</ObjectName>
-                        <Layout>horizontal</Layout>
-                        <SizePolicy>min,min</SizePolicy>
-                        <Children>
-                            <PushButton>
-                                <TooltipId>hotcue</TooltipId>
-                                <NumberStates>2</NumberStates>
-                                <LeftClickIsPushButton>true</LeftClickIsPushButton>
-                                <RightClickIsPushButton>true</RightClickIsPushButton>
-                                <State>
-                                    <Number>0</Number>
-                                    <Pressed>btn_hotcue2_3_down.png</Pressed>
-                                    <Unpressed>btn_hotcue2_3.png</Unpressed>
-                                </State>
-                                <State>
-                                    <Number>1</Number>
-                                    <Pressed>btn_hotcue2_3_overdown.png</Pressed>
-                                    <Unpressed>btn_hotcue2_3_over.png</Unpressed>
-                                </State>
-                                <Connection>
-                                    <ConfigKey>[Channel<Variable name="channum" />],hotcue_3_activate</ConfigKey>
-                                    <ButtonState>LeftButton</ButtonState>
-                                </Connection>
-                                <Connection>
-                                    <ConfigKey>[Channel<Variable name="channum" />],hotcue_3_clear</ConfigKey>
-                                    <ButtonState>RightButton</ButtonState>
-                                </Connection>
-                                <Connection>
-                                    <ConfigKey>[Channel<Variable name="channum" />],hotcue_3_enabled</ConfigKey>
-                                </Connection>
-                            </PushButton>
-                            <PushButton>
-                                <TooltipId>hotcue</TooltipId>
-                                <NumberStates>2</NumberStates>
-                                <LeftClickIsPushButton>true</LeftClickIsPushButton>
-                                <RightClickIsPushButton>true</RightClickIsPushButton>
-                                <State>
-                                    <Number>0</Number>
-                                    <Pressed>btn_hotcue2_4_down.png</Pressed>
-                                    <Unpressed>btn_hotcue2_4.png</Unpressed>
-                                </State>
-                                <State>
-                                    <Number>1</Number>
-                                    <Pressed>btn_hotcue2_4_overdown.png</Pressed>
-                                    <Unpressed>btn_hotcue2_4_over.png</Unpressed>
-                                </State>
-                                <Connection>
-                                    <ConfigKey>[Channel<Variable name="channum" />],hotcue_4_activate</ConfigKey>
-                                    <ButtonState>LeftButton</ButtonState>
-                                </Connection>
-                                <Connection>
-                                    <ConfigKey>[Channel<Variable name="channum" />],hotcue_4_clear</ConfigKey>
-                                    <ButtonState>RightButton</ButtonState>
-                                </Connection>
-                                <Connection>
-                                    <ConfigKey>[Channel<Variable name="channum" />],hotcue_4_enabled</ConfigKey>
-                                </Connection>
-                            </PushButton>
-                        </Children>
-                    </WidgetGroup>
-                </Children>
-            </WidgetGroup>
-		</Children>
-	</WidgetGroup>
+  <WidgetGroup>
+    <ObjectName>DeckRowOne</ObjectName>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,min</SizePolicy>
+    <Children>
+      <WidgetGroup>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <WidgetGroup><!-- Key adjust -->
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <PushButton>
+                <Size>32f,22f</Size>
+                <TooltipId>sync_reset_key</TooltipId>
+                <ObjectName>PitchTweakButton</ObjectName>
+                <NumberStates>2</NumberStates>
+                <State>
+                  <Number>0</Number>
+                  <Text>KEY</Text>
+                </State>
+                <State>
+                  <Number>1</Number>
+                  <Text>KEY</Text>
+                </State>
+                <Connection>
+                  <ConfigKey persist="true"><Variable name="group"/>,pitch_adjust_set_default</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+                <Connection>
+                  <ConfigKey persist="true"><Variable name="group"/>,pitch_adjust_set_default</ConfigKey>
+                </Connection>
+                <Connection>
+                  <ConfigKey persist="true"><Variable name="group"/>,reset_key</ConfigKey>
+                  <ButtonState>RightButton</ButtonState>
+                </Connection>
+              </PushButton>
+
+              <PushButton>
+                <Size>16f,22f</Size>
+                <TooltipId>pitch_down</TooltipId>
+                <ObjectName>PitchTweakButton</ObjectName>
+                <NumberStates>1</NumberStates>
+                <State>
+                  <Number>0</Number>
+                  <Unpressed>buttons/btn_prev.png</Unpressed>
+                  <Pressed>buttons/btn_prev_down.png</Pressed>
+                </State>
+                <Connection>
+                  <ConfigKey persist="true"><Variable name="group"/>,pitch_down</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+                <Connection>
+                  <ConfigKey persist="true"><Variable name="group"/>,pitch_down_small</ConfigKey>
+                  <ButtonState>RightButton</ButtonState>
+                </Connection>
+              </PushButton>
+
+              <Key>
+                <ObjectName>KeyText</ObjectName>
+                <TooltipId>track_key</TooltipId>
+                <Group><Variable name="group"/></Group>
+                <Size>44f,20f</Size>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,visual_key</ConfigKey>
+                </Connection>
+              </Key>
+
+              <PushButton>
+                <Size>16f,22f</Size>
+                <TooltipId>pitch_up</TooltipId>
+                <ObjectName>PitchTweakButton</ObjectName>
+                <NumberStates>1</NumberStates>
+                <State>
+                  <Number>0</Number>
+                  <Unpressed>buttons/btn_next.png</Unpressed>
+                  <Pressed>buttons/btn_next_down.png</Pressed>
+                </State>
+                <Connection>
+                  <ConfigKey persist="true"><Variable name="group"/>,pitch_up</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+                <Connection>
+                  <ConfigKey persist="true"><Variable name="group"/>,pitch_up_small</ConfigKey>
+                  <ButtonState>RightButton</ButtonState>
+                </Connection>
+              </PushButton>
+            </Children>
+          </WidgetGroup><!-- /Key adjust -->
+
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup>  <!-- spacer -->
+        <Layout>horizontal</Layout>
+        <SizePolicy>me,min</SizePolicy>
+        <Children></Children>
+      </WidgetGroup>
+
+      <Template src="skin:vinyl_controls.xml"/>
+
+      <WidgetGroup>  <!-- spacer -->
+        <Layout>horizontal</Layout>
+        <SizePolicy>me,min</SizePolicy>
+        <Children></Children>
+      </WidgetGroup>
+
+      <PushButton>
+        <Size>35f,22f</Size>
+        <TooltipId>EffectUnit_deck_enabled</TooltipId>
+        <ObjectName>FxAssignButton</ObjectName>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Text>FX1</Text>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Text>FX1</Text>
+        </State>
+        <Connection>
+          <ConfigKey>[EffectRack1_EffectUnit1],group_<Variable name="group"/>_enable</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+      </PushButton>
+
+      <PushButton>
+        <Size>35f,22f</Size>
+        <TooltipId>EffectUnit_deck_enabled</TooltipId>
+        <ObjectName>FxAssignButton</ObjectName>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Text>FX2</Text>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Text>FX2</Text>
+        </State>
+        <Connection>
+          <ConfigKey>[EffectRack1_EffectUnit2],group_<Variable name="group"/>_enable</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+      </PushButton>
+
+    </Children>
+  </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/deck_row_2_3_4.xml b/res/skins/LateNight/deck_row_2_3_4.xml
index c93a40715a91..6acebd5704b7 100644
--- a/res/skins/LateNight/deck_row_2_3_4.xml
+++ b/res/skins/LateNight/deck_row_2_3_4.xml
@@ -1,107 +1,91 @@
 <Template>
-	<WidgetGroup>
-		<ObjectName>DeckRowTwoThreeFour</ObjectName>
-		<Layout>vertical</Layout>
-		<SizePolicy>i,min</SizePolicy>
-		<MinimumSize>-1,-1</MinimumSize>
-		<Children>
-		    <WidgetGroup>
-		        <ObjectName>TitleGutter</ObjectName>
-		        <Layout>horizontal</Layout>
-		        <SizePolicy>i,min</SizePolicy>
-		        <Children>
-                    <WidgetGroup>
-                        <ObjectName>AlignLeftTop</ObjectName>
-                        <Layout>horizontal</Layout>
-                        <SizePolicy>me,min</SizePolicy>
-                        <Children>
-        					        <TrackProperty>
-                            <ObjectName>TextColor<Variable name="channum" /></ObjectName>
-                            <Alignment>Left</Alignment>
-                						<TooltipId>track_title</TooltipId>
-                						<Style>QLabel { font: bold 18px/21px Lucida Grande, Lucida Sans
-                							Unicode, Arial, Verdana, sans-serif; text-align: left;}
-                						</Style>
-                						<Property>title</Property>
-                            <Elide>right</Elide>
-                            <SizePolicy>me,min</SizePolicy>
-                						<Channel>
-                							<Variable name="channum" />
-                						</Channel>
-                					</TrackProperty>
-                        </Children>
-                    </WidgetGroup>
-                    <WidgetGroup>
-                        <ObjectName>AlignRightTop</ObjectName>
-                        <Layout>horizontal</Layout>
-                        <SizePolicy>max,min</SizePolicy>
-                        <MinimumSize>100,</MinimumSize>
-                        <MaximumSize>220,</MaximumSize>
-                        <Children>
-                            <NumberPos>
-                                <ObjectName>TextColor<Variable name="channum" /></ObjectName>
-                                <TooltipId>track_time</TooltipId>
-                                <Alignment>right</Alignment>
-                                <Style>QLabel { font: bold 18px/21px Lucida Grande, Lucida Sans
-                                    Unicode, Arial, Verdana, sans-serif;}
-                                </Style>
-                                <Channel>
-                                    <Variable name="channum" />
-                                </Channel>
-                                <Connection>
-                                    <ConfigKey>[Channel<Variable name="channum" />],playposition</ConfigKey>
-                                </Connection>
-                            </NumberPos>
-                        </Children>
-                    </WidgetGroup>
-				</Children>
-			</WidgetGroup>
-			<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>TextColor<Variable name="channum" /></ObjectName>
-								<TooltipId>track_artist</TooltipId>
-								<Style>QLabel { font: bold 18px/21px Lucida Grande, Lucida Sans
-									Unicode, Arial, Verdana, sans-serif;}
-								</Style>
-								<Property>artist</Property>
+  <WidgetGroup>
+    <ObjectName>DeckRowTwoThreeFour</ObjectName>
+    <Layout>vertical</Layout>
+    <SizePolicy>i,min</SizePolicy>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>TitleGutter</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>i,min</SizePolicy>
+        <Children>
+          <WidgetGroup>
+            <ObjectName>AlignLeftTop</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>me,min</SizePolicy>
+            <Children>
+              <TrackProperty>
+                <ObjectName>TitleText</ObjectName>
+                <Alignment>Left</Alignment>
+                <TooltipId>track_title</TooltipId>
+                <Property>title</Property>
                 <Elide>right</Elide>
                 <SizePolicy>me,min</SizePolicy>
-								<Channel>
-									<Variable name="channum" />
-								</Channel>
-							</TrackProperty>
-						</Children>
-					</WidgetGroup>
-					<WidgetGroup>
-                        <ObjectName>DurationGutter</ObjectName>
-                        <Layout>horizontal</Layout>
-                        <SizePolicy>max,min</SizePolicy>
-                        <Children>
-                            <TrackProperty>
-                                <ObjectName>TextColor<Variable name="channum" /></ObjectName>
-                                <TooltipId>track_duration</TooltipId>
-                                <Style>QLabel { font: 13px/15px Lucida Grande, Lucida Sans
-                                    Unicode,
-                                    Arial, Verdana, sans-serif;}
-                                </Style>
-                                <Property>durationFormatted</Property>
-                                <Channel>
-                                    <Variable name="channum" />
-                                </Channel>
-                            </TrackProperty>
-                        </Children>
-                    </WidgetGroup>
-				</Children>
-			</WidgetGroup>
-		</Children>
-	</WidgetGroup>
+                <Channel><Variable name="channum"/></Channel>
+              </TrackProperty>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>AlignRightTop</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <MinimumSize>100,</MinimumSize>
+            <Children>
+              <NumberPos>
+                <ObjectName>PlayPositionText</ObjectName>
+                <TooltipId>track_time</TooltipId>
+                <Alignment>right</Alignment>
+                <Channel><Variable name="channum"/></Channel>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,playposition</ConfigKey>
+                </Connection>
+              </NumberPos>
+            </Children>
+          </WidgetGroup>
+        </Children>
+      </WidgetGroup>
+
+      <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>
+                <TooltipId>track_artist</TooltipId>
+                <Property>artist</Property>
+                <Elide>right</Elide>
+                <SizePolicy>me,min</SizePolicy>
+                <Channel>
+                  <Variable name="channum"/>
+                </Channel>
+              </TrackProperty>
+            </Children>
+          </WidgetGroup>
+          <WidgetGroup>
+            <ObjectName>DurationGutter</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>max,min</SizePolicy>
+            <Children>
+              <TrackProperty>
+                <ObjectName>DurationText</ObjectName>
+                <TooltipId>track_duration</TooltipId>
+                <Property>durationFormatted</Property>
+                <Channel>
+                  <Variable name="channum"/>
+                </Channel>
+              </TrackProperty>
+            </Children>
+          </WidgetGroup>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/deck_row_5.xml b/res/skins/LateNight/deck_row_5.xml
index 07d57ed4bf00..d9634b1bce6c 100644
--- a/res/skins/LateNight/deck_row_5.xml
+++ b/res/skins/LateNight/deck_row_5.xml
@@ -2,176 +2,178 @@
   <WidgetGroup>
     <ObjectName>DeckRowFive</ObjectName>
     <Layout>horizontal</Layout>
-    <SizePolicy>me,min</SizePolicy>
+    <SizePolicy>me,me</SizePolicy>
     <Children>
-			<Overview>
-				<TooltipId>waveform_overview</TooltipId>
-				<Style></Style>
-				<Channel><Variable name="channum"/></Channel>
-				<MinimumSize>-1,10</MinimumSize>
-				<!-- transparent background if no <BgColor> & <BgPixmap> is present
-				<BgColor>#1C1C1C</BgColor>
-				<BgPixmap></BgPixmap>
-				-->
-				<SizePolicy>me,min</SizePolicy>
-				<MinimumSize>-1,-1</MinimumSize>
-				<SignalColor><Variable name="signal_color" /></SignalColor>
-                <SignalRGBLowColor><Variable name="SignalRGBLowColor"/></SignalRGBLowColor>
-                <SignalRGBMidColor><Variable name="SignalRGBMidColor"/></SignalRGBMidColor>
-                <SignalRGBHighColor><Variable name="SignalRGBHighColor"/></SignalRGBHighColor>
-				<PlayPosColor>#00FF00</PlayPosColor>
-				<EndOfTrackColor>#EA0000</EndOfTrackColor>
-				<DefaultMark>
-					<Align>bottom|right</Align>
-					<Color>#00FF00</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>cue_point</Control>
-					<Text>C</Text>
-					<Align>top|right</Align>
-					<Color>#FF001C</Color>
-					<TextColor>#FFFFFF</TextColor>
-				</Mark>
-				<Connection>
-					<ConfigKey>[Channel<Variable name="channum"/>],playposition</ConfigKey>
-				</Connection>
-			</Overview>
+
+      <Template src="skin:spinny.xml"/>
+
+      <Overview>
+        <TooltipId>waveform_overview</TooltipId>
+        <Channel><Variable name="channum"/></Channel>
+        <Size>-1me,50me</Size>
+        <!-- transparent background if no <BgColor> & <BgPixmap> is present
+        <BgColor>#1C1C1C</BgColor>
+        <BgPixmap></BgPixmap>
+        -->
+        <SignalColor><Variable name="signal_color" /></SignalColor>
+        <SignalRGBLowColor><Variable name="SignalRGBLowColor"/></SignalRGBLowColor>
+        <SignalRGBMidColor><Variable name="SignalRGBMidColor"/></SignalRGBMidColor>
+        <SignalRGBHighColor><Variable name="SignalRGBHighColor"/></SignalRGBHighColor>
+        <PlayPosColor>#00FF00</PlayPosColor>
+        <EndOfTrackColor>#EA0000</EndOfTrackColor>
+        <DefaultMark>
+          <Align>bottom</Align>
+          <Color>#00FF00</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>cue_point</Control>
+          <Text>C</Text>
+          <Align>top</Align>
+          <Color>#FF001C</Color>
+          <TextColor>#FFFFFF</TextColor>
+        </Mark>
+        <Connection>
+          <ConfigKey><Variable name="group"/>,playposition</ConfigKey>
+        </Connection>
+      </Overview>
 
       <WidgetGroup>
         <ObjectName>ToolbarButtons</ObjectName>
-        <Layout>vertical</Layout>
+        <Layout>horizontal</Layout>
         <Children>
           <WidgetGroup>
             <ObjectName>ToggleRowOne</ObjectName>
-            <Layout>horizontal</Layout>
+            <Layout>vertical</Layout>
+            <Children>
+
+              <PushButton>
+                <TooltipId>slip_mode</TooltipId>
+                <NumberStates>2</NumberStates>
+                <State>
+                  <Number>0</Number>
+                  <Pressed>buttons/btn_slip.png</Pressed>
+                  <Unpressed>buttons/btn_slip.png</Unpressed>
+                </State>
+                <State>
+                  <Number>1</Number>
+                  <Pressed>buttons/btn_slip_over.png</Pressed>
+                  <Unpressed>buttons/btn_slip_over.png</Unpressed>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,slip_enabled</ConfigKey>
+                </Connection>
+              </PushButton>
+
+              <PushButton>
+                <TooltipId>repeat</TooltipId>
+                <NumberStates>2</NumberStates>
+                <State>
+                  <Number>0</Number>
+                  <Pressed>buttons/btn_repeat2.png</Pressed>
+                  <Unpressed>buttons/btn_repeat2.png</Unpressed>
+                </State>
+                <State>
+                  <Number>1</Number>
+                  <Pressed>buttons/btn_repeat2_over.png</Pressed>
+                  <Unpressed>buttons/btn_repeat2_over.png</Unpressed>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,repeat</ConfigKey>
+                </Connection>
+              </PushButton>
+
+              <PushButton>
+                <TooltipId>eject</TooltipId>
+                <Style></Style>
+                <NumberStates>1</NumberStates>
+                <State>
+                  <Number>0</Number>
+                  <Pressed>buttons/btn_eject2_over.png</Pressed>
+                  <Unpressed>buttons/btn_eject2.png</Unpressed>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,eject</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+              </PushButton>
+
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <Layout>vertical</Layout>
             <Children>
               <PushButton>
-	              <TooltipId>show_spinny</TooltipId>
-	              <Style></Style>
-	              <NumberStates>2</NumberStates>
-	              <State>
-		              <Number>0</Number>
-		              <Pressed>btn_spinny1.png</Pressed>
-		              <Unpressed>btn_spinny1.png</Unpressed>
-	              </State>
-	              <State>
-		              <Number>1</Number>
-		              <Pressed>btn_spinny1_over.png</Pressed>
-		              <Unpressed>btn_spinny1_over.png</Unpressed>
-	              </State>
-	              <Connection>
-		              <ConfigKey persist="true">[Spinny],show_spinnies</ConfigKey>
-		              <ButtonState>LeftButton</ButtonState>
-	              </Connection>
+                <TooltipId>beats_translate_curpos</TooltipId>
+                <NumberStates>1</NumberStates>
+                <RightClickIsPushButton>true</RightClickIsPushButton>
+                <State>
+                  <Number>0</Number>
+                  <Pressed>buttons/btn_beat_curpos_over.png</Pressed>
+                  <Unpressed>buttons/btn_beat_curpos.png</Unpressed>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,beats_translate_curpos</ConfigKey>
+                  <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,beats_translate_match_alignment</ConfigKey>
+                  <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+                  <ButtonState>RightButton</ButtonState>
+                </Connection>
               </PushButton>
+
               <PushButton>
-	              <TooltipId>repeat</TooltipId>
-	              <Style></Style>
-	              <NumberStates>2</NumberStates>
-	              <State>
-		              <Number>0</Number>
-		              <Pressed>btn_repeat2.png</Pressed>
-		              <Unpressed>btn_repeat2.png</Unpressed>
-	              </State>
-	              <State>
-		              <Number>1</Number>
-		              <Pressed>btn_repeat2_over.png</Pressed>
-		              <Unpressed>btn_repeat2_over.png</Unpressed>
-	              </State>
-	              <Connection>
-		              <ConfigKey>[Channel<Variable name="channum"/>],repeat</ConfigKey>
-	              </Connection>
+                <TooltipId>quantize</TooltipId>
+                <NumberStates>2</NumberStates>
+                <State>
+                  <Number>0</Number>
+                  <Pressed>buttons/btn_quantize2.png</Pressed>
+                  <Unpressed>buttons/btn_quantize2.png</Unpressed>
+                </State>
+                <State>
+                  <Number>1</Number>
+                  <Pressed>buttons/btn_quantize2_over.png</Pressed>
+                  <Unpressed>buttons/btn_quantize2_over.png</Unpressed>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,quantize</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
               </PushButton>
+
               <PushButton>
-	              <TooltipId>eject</TooltipId>
-	              <Style></Style>
-	              <NumberStates>1</NumberStates>
-	              <State>
-		              <Number>0</Number>
-		              <Pressed>btn_eject2_over.png</Pressed>
-		              <Unpressed>btn_eject2.png</Unpressed>
-	              </State>
-	              <Connection>
-		              <ConfigKey>[Channel<Variable name="channum"/>],eject</ConfigKey>
-		              <ButtonState>LeftButton</ButtonState>
-	              </Connection>
+                <TooltipId>keylock</TooltipId>
+                <NumberStates>2</NumberStates>
+                <State>
+                  <Number>0</Number>
+                  <Pressed>buttons/btn_keylock2.png</Pressed>
+                  <Unpressed>buttons/btn_keylock2.png</Unpressed>
+                </State>
+                <State>
+                  <Number>1</Number>
+                  <Pressed>buttons/btn_keylock2_over.png</Pressed>
+                  <Unpressed>buttons/btn_keylock2_over.png</Unpressed>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,keylock</ConfigKey>
+                </Connection>
               </PushButton>
-    	      </Children>
-    	    </WidgetGroup>
-    	    <WidgetGroup>
-    	      <Layout>horizontal</Layout>
-    	      <Children>
-		          <PushButton>
-			          <TooltipId>beats_translate_curpos</TooltipId>
-			          <Style></Style>
-			          <NumberStates>1</NumberStates>
-			          <State>
-				          <Number>0</Number>
-				          <Pressed>btn_beatgrid2_over.png</Pressed>
-				          <Unpressed>btn_beatgrid2.png</Unpressed>
-			          </State>
-			          <Pos>0,23</Pos>
-			          <Connection>
-				          <ConfigKey>[Channel<Variable name="channum"/>],beats_translate_curpos</ConfigKey>
-				          <ButtonState>LeftButton</ButtonState>
-			          </Connection>
-			          <Connection>
-				          <ConfigKey>[Channel<Variable name="channum"/>],beats_translate_match_alignment</ConfigKey>
-				          <ButtonState>RightButton</ButtonState>
-			          </Connection>
-		          </PushButton>
-		          <PushButton>
-			          <TooltipId>quantize</TooltipId>
-			          <Style></Style>
-			          <NumberStates>2</NumberStates>
-			          <State>
-				          <Number>0</Number>
-				          <Pressed>btn_quantize2.png</Pressed>
-				          <Unpressed>btn_quantize2.png</Unpressed>
-			          </State>
-			          <State>
-				          <Number>1</Number>
-				          <Pressed>btn_quantize2_over.png</Pressed>
-				          <Unpressed>btn_quantize2_over.png</Unpressed>
-			          </State>
-			          <Pos>26,23</Pos>
-			          <Connection>
-				          <ConfigKey>[Channel<Variable name="channum"/>],quantize</ConfigKey>
-				          <ButtonState>LeftButton</ButtonState>
-			          </Connection>
-		          </PushButton>
-		          <PushButton>
-			          <TooltipId>keylock</TooltipId>
-			          <Style></Style>
-			          <NumberStates>2</NumberStates>
-			          <State>
-				          <Number>0</Number>
-				          <Pressed>btn_keylock2.png</Pressed>
-				          <Unpressed>btn_keylock2.png</Unpressed>
-			          </State>
-			          <State>
-				          <Number>1</Number>
-				          <Pressed>btn_keylock2_over.png</Pressed>
-				          <Unpressed>btn_keylock2_over.png</Unpressed>
-			          </State>
-			          <Pos>52,23</Pos>
-			          <Connection>
-				          <ConfigKey>[Channel<Variable name="channum"/>],keylock</ConfigKey>
-			          </Connection>
-		          </PushButton>
-	          </Children>
+
+            </Children>
           </WidgetGroup> <!-- /Channel1 Toggle Buttons -->
         </Children>
       </WidgetGroup>
-		</Children>
-	</WidgetGroup>
+    </Children>
+  </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/decks_left.xml b/res/skins/LateNight/decks_left.xml
index d64f2acf0913..057410f8a220 100644
--- a/res/skins/LateNight/decks_left.xml
+++ b/res/skins/LateNight/decks_left.xml
@@ -1,51 +1,44 @@
 <Template>
-    <WidgetGroup>
-        <ObjectName>DecksSizer</ObjectName>
+  <WidgetGroup>
+    <ObjectName>DecksSizer</ObjectName>
+    <Layout>vertical</Layout>
+    <SizePolicy>me,min</SizePolicy>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>DecksLeftContainer</ObjectName>
         <Layout>vertical</Layout>
         <SizePolicy>me,min</SizePolicy>
         <Children>
-            <WidgetGroup>
-                <ObjectName>DecksLeftContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>me,min</SizePolicy>
-                <Children>
-                    <Template src="skin:deck.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>
-                    <WidgetGroup>
-                        <ObjectName>Deck</ObjectName>
-                        <Layout>horizontal</Layout>
-                        <SizePolicy>me,me</SizePolicy>
-                        <Children>
-                            <Template src="skin:deck.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>
-                        </Children>
-                        <Connection>
-                            <ConfigKey>[Master],show_4decks</ConfigKey>
-                            <BindProperty>visible</BindProperty>
-                        </Connection>
-                    </WidgetGroup>
-                    <Template src="skin:preview_deck.xml" />
-                    <WidgetGroup>
-                      <Layout>horizontal</Layout>
-                      <SizePolicy>me,me</SizePolicy>
-                      <MinimumSize>0,0</MinimumSize>
-                      <MaximumSize>,80</MaximumSize>
-                      <Children/>
-                    </WidgetGroup>
-                </Children>
-            </WidgetGroup>
+          <Template src="skin:deck.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>
+
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <SizePolicy>me,min</SizePolicy>
+            <Children>
+              <Template src="skin:deck.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>
+            </Children>
+            <Connection>
+              <ConfigKey>[Master],show_4decks</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+          <!--Template src="skin:preview_deck.xml" /-->
         </Children>
-    </WidgetGroup>
+      </WidgetGroup>
+    </Children>
+  </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/decks_right.xml b/res/skins/LateNight/decks_right.xml
index 085af01870dc..1f5c73f0f9ab 100644
--- a/res/skins/LateNight/decks_right.xml
+++ b/res/skins/LateNight/decks_right.xml
@@ -1,62 +1,65 @@
 <Template>
-    <WidgetGroup>
-        <ObjectName>DecksSizer</ObjectName>
+  <WidgetGroup>
+    <ObjectName>DecksSizer</ObjectName>
+    <Layout>vertical</Layout>
+    <SizePolicy>me,min</SizePolicy>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>DecksRightContainer</ObjectName>
         <Layout>vertical</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="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>
-                        <ObjectName>Deck</ObjectName>
-                        <Layout>horizontal</Layout>
-                        <SizePolicy>me,me</SizePolicy>
-                        <Children>
-                            <Template src="skin:deck.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>
-                        </Children>
-                        <Connection>
-                            <ConfigKey>[Master],show_4decks</ConfigKey>
-                            <BindProperty>visible</BindProperty>
-                        </Connection>
-                    </WidgetGroup>
-                    <WidgetGroup>
-                      <ObjectName>NoBorder</ObjectName>
-                      <Layout>horizontal</Layout>
-                      <SizePolicy>me,me</SizePolicy>
-                      <MinimumSize>0,0</MinimumSize>
-                      <MaximumSize>,70</MaximumSize>
-                      <Children/>
-                      <Connection>
-                          <ConfigKey>[PreviewDeck],show_previewdeck</ConfigKey>
-                          <BindProperty>visible</BindProperty>
-                      </Connection>
-                    </WidgetGroup>
-                    <WidgetGroup>
-                      <Layout>horizontal</Layout>
-                      <SizePolicy>me,me</SizePolicy>
-                      <MinimumSize>0,0</MinimumSize>
-                      <MaximumSize>,80</MaximumSize>
-                      <Children/>
-                    </WidgetGroup>
-                </Children>
-            </WidgetGroup>
+          <Template src="skin:deck.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>
+            <Layout>horizontal</Layout>
+            <SizePolicy>me,min</SizePolicy>
+            <Children>
+              <Template src="skin:deck.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>
+            </Children>
+            <Connection>
+              <ConfigKey>[Master],show_4decks</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+
+          <!--WidgetGroup>
+            <ObjectName>NoBorder</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>me,me</SizePolicy>
+            <MinimumSize>0,0</MinimumSize>
+            <MaximumSize>,70</MaximumSize>
+            <Children/>
+            <Connection>
+              <ConfigKey>[PreviewDeck],show_previewdeck</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <SizePolicy>me,min</SizePolicy>
+            <MinimumSize>0,0</MinimumSize>
+            <MaximumSize>,80</MaximumSize>
+            <Children/>
+          </WidgetGroup-->
+
         </Children>
-    </WidgetGroup>
+      </WidgetGroup>
+    </Children>
+  </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/effect_parameter_knob.xml b/res/skins/LateNight/effect_parameter_knob.xml
deleted file mode 100644
index 69d7bc0dd5a9..000000000000
--- a/res/skins/LateNight/effect_parameter_knob.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    An effect parameter knob.
-  Variables:
-    EffectRack: the rack
-    EffectUnit: the unit
-    Effect: the effect
-    EffectParameter: the parameter
--->
-<Template>
-  <WidgetGroup>
-    <Layout>vertical</Layout>
-    <Children>
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <ObjectName>EffectKnob</ObjectName>
-        <MinimumSize>0,50</MinimumSize>
-        <Children>
-          <EffectParameterKnobComposed>
-            <Size>40f,34f</Size>
-            <Knob>knob_indicator.svg</Knob>
-            <BackPath>knob_bg.svg</BackPath>
-            <MinAngle>-135</MinAngle>
-            <MaxAngle>135</MaxAngle>
-            <Connection>
-              <ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>_Effect<Variable name="Effect"/>],parameter<Variable name="EffectParameter"/></ConfigKey>
-            </Connection>
-          </EffectParameterKnobComposed>
-        </Children>
-      </WidgetGroup>
-      <EffectParameterName>
-        <Size>1me,18f</Size>
-        <ObjectName>KnobLabel</ObjectName>
-        <EffectRack><Variable name="EffectRack"/></EffectRack>
-        <EffectUnit><Variable name="EffectUnit"/></EffectUnit>
-        <Effect><Variable name="Effect"/></Effect>
-        <EffectParameter><Variable name="EffectParameter"/></EffectParameter>
-        <Alignment>center</Alignment>
-      </EffectParameterName>
-    </Children>
-    <Connection>
-      <ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>_Effect<Variable name="Effect"/>],parameter<Variable name="EffectParameter"/>_loaded</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/effect_rack.xml b/res/skins/LateNight/effect_rack.xml
deleted file mode 100644
index 4c901dc84ca0..000000000000
--- a/res/skins/LateNight/effect_rack.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    An effect rack widget.
-  Variables:
-    group: The group for the controls.
--->
-<Template>
-  <WidgetGroup>
-    <Layout>vertical</Layout>
-    <ObjectName>EffectRackContainer</ObjectName>
-    <Children>
-        <WidgetGroup trigger="[EffectRack1],show">
-          <ObjectName>EffectRackExpanded</ObjectName>
-          <SizePolicy>me,min</SizePolicy>
-          <Layout>vertical</Layout>
-          <Children>
-            <WidgetGroup>
-              <Layout>horizontal</Layout>
-              <SizePolicy>me,min</SizePolicy>
-              <Children>
-              <Template src="skin:effect_unit.xml">
-                <SetVariable name="EffectRack">1</SetVariable>
-                <SetVariable name="EffectUnit">1</SetVariable>
-              </Template>
-
-              <Template src="skin:effect_unit.xml">
-                <SetVariable name="EffectRack">1</SetVariable>
-                <SetVariable name="EffectUnit">2</SetVariable>
-              </Template>
-
-              <Template src="skin:effect_unit.xml">
-                <SetVariable name="EffectRack">1</SetVariable>
-                <SetVariable name="EffectUnit">3</SetVariable>
-              </Template>
-
-              <Template src="skin:effect_unit.xml">
-                <SetVariable name="EffectRack">1</SetVariable>
-                <SetVariable name="EffectUnit">4</SetVariable>
-              </Template>
-              </Children>
-            </WidgetGroup>
-          </Children>
-        </WidgetGroup>
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/effect_unit.xml b/res/skins/LateNight/effect_unit.xml
deleted file mode 100644
index 1d1ff1b8e1f7..000000000000
--- a/res/skins/LateNight/effect_unit.xml
+++ /dev/null
@@ -1,221 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    An effect unit widget.
-  Variables:
-    group: The group for the controls.
--->
-<Template>
-  <SetVariable name="group">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>]</SetVariable>
-  <WidgetGroup>
-    <ObjectName>EffectUnit<Variable name="EffectUnit"/></ObjectName>
-    <Layout>vertical</Layout>
-    <SizePolicy>me,f</SizePolicy>
-    <MinimumSize>300,85</MinimumSize>
-    <MaximumSize>350,85</MaximumSize>
-    <Children>
-      <WidgetGroup>
-        <ObjectName>EffectUnitNameRow</ObjectName>
-        <Layout>horizontal</Layout>
-        <SizePolicy>me,min</SizePolicy>
-        <Children>
-          <WidgetGroup>
-            <ObjectName>EffectUnitNameContainer</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>me,max</SizePolicy>
-            <Children>
-              <EffectChainName>
-                <EffectRack><Variable name="EffectRack"/></EffectRack>
-                <EffectUnit><Variable name="EffectUnit"/></EffectUnit>
-              </EffectChainName>
-            </Children>
-          </WidgetGroup>
-
-          <WidgetGroup>
-            <ObjectName>EffectUnitNextPrevContainer</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>me,max</SizePolicy>
-            <Children>
-              <PushButton>
-                <ObjectName>EffectUnitButton</ObjectName>
-                <Size>20f,20f</Size>
-                <NumberStates>1</NumberStates>
-                <State>
-                  <Number>0</Number>
-                  <Unpressed>btn_clear.png</Unpressed>
-                  <Pressed>btn_clear_down.png</Pressed>
-                </State>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,clear</ConfigKey>
-                </Connection>
-              </PushButton>
-
-              <PushButton>
-                <ObjectName>EffectUnitButton</ObjectName>
-                <Size>20f,20f</Size>
-                <NumberStates>1</NumberStates>
-                <State>
-                  <Number>0</Number>
-                  <Unpressed>btn_prev_chain.png</Unpressed>
-                  <Pressed>btn_prev_chain_down.png</Pressed>
-                </State>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,prev_chain</ConfigKey>
-                  <ButtonState>LeftButton</ButtonState>
-                </Connection>
-              </PushButton>
-
-              <PushButton>
-                <ObjectName>EffectUnitButton</ObjectName>
-                <Size>20f,20f</Size>
-                <NumberStates>1</NumberStates>
-                <State>
-                  <Number>0</Number>
-                  <Unpressed>btn_next_chain.png</Unpressed>
-                  <Pressed>btn_next_chain_down.png</Pressed>
-                </State>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,next_chain</ConfigKey>
-                  <ButtonState>LeftButton</ButtonState>
-                </Connection>
-              </PushButton>
-
-              <PushButton>
-                <Size>40f,20f</Size>
-                <ObjectName>EffectToggleButton</ObjectName>
-                <NumberStates>2</NumberStates>
-                <State>
-                  <Number>0</Number>
-                  <Text>OFF</Text>
-                </State>
-                <State>
-                  <Number>1</Number>
-                  <Text>ON</Text>
-                </State>
-                <Connection>
-                  <!-- FIXME: Quick hack until effect chains are implemented. -->
-                  <ConfigKey persist="true">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>_Effect1],enabled</ConfigKey>
-                </Connection>
-              </PushButton>
-            </Children>
-          </WidgetGroup>
-        </Children>
-      </WidgetGroup>
-
-
-      <WidgetGroup>
-        <ObjectName>EffectUnitControlRow</ObjectName>
-        <Layout>horizontal</Layout>
-        <SizePolicy>me,min</SizePolicy>
-        <BackPath>background_tile.png</BackPath>
-        <Children>
-          <WidgetGroup>
-            <ObjectName>EffectUnitParameters</ObjectName>
-            <SizePolicy>me,max</SizePolicy>
-            <Layout>horizontal</Layout>
-            <Children>
-              <WidgetGroup>
-                <SizePolicy>max,min</SizePolicy>
-                <Layout>horizontal</Layout>
-                <ObjectName>EffectKnobContainer</ObjectName>
-                <Children>
-                  <Template src="skin:effect_parameter_knob.xml">
-                    <SetVariable name="Effect">1</SetVariable>
-                    <SetVariable name="EffectParameter">1</SetVariable>
-                  </Template>
-                  <Template src="skin:effect_parameter_knob.xml">
-                    <SetVariable name="Effect">1</SetVariable>
-                    <SetVariable name="EffectParameter">2</SetVariable>
-                  </Template>
-                  <Template src="skin:effect_parameter_knob.xml">
-                    <SetVariable name="Effect">1</SetVariable>
-                    <SetVariable name="EffectParameter">3</SetVariable>
-                  </Template>
-                  <Template src="skin:effect_parameter_knob.xml">
-                    <SetVariable name="Effect">1</SetVariable>
-                    <SetVariable name="EffectParameter">4</SetVariable>
-                  </Template>
-                </Children>
-              </WidgetGroup>
-            </Children>
-          </WidgetGroup>
-
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,min</SizePolicy>
-            <ObjectName>EffectControlsRight</ObjectName>
-            <Children>
-              <WidgetGroup>
-                <ObjectName>EffectUnitControls</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>max,min</SizePolicy>
-                <Children>
-                  <!-- <Template src="skin:knob.xml">
-                    <SetVariable name="control">super1</SetVariable>
-                    <SetVariable name="label">SuperKnob</SetVariable>
-                  </Template>-->
-                  <Template src="skin:knob.xml">
-                    <SetVariable name="control">mix</SetVariable>
-                    <SetVariable name="label">Mix</SetVariable>
-                  </Template>
-                </Children>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <ObjectName>EffectUnitGroupControls</ObjectName>
-                <SizePolicy>min,min</SizePolicy>
-                <Layout>vertical</Layout>
-                <Children>
-                  <WidgetGroup>
-                    <Layout>horizontal</Layout>
-                    <SizePolicy>min,min</SizePolicy>
-                    <Children>
-                      <Template src="skin:effect_unit_group_control_button.xml">
-                        <SetVariable name="group_name">MASTER</SetVariable>
-                        <SetVariable name="group_group">[Master]</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_unit_group_control_button.xml">
-                        <SetVariable name="group_name">HEAD</SetVariable>
-                        <SetVariable name="group_group">[Headphone]</SetVariable>
-                      </Template>
-                    </Children>
-                  </WidgetGroup>
-                  <WidgetGroup>
-                    <Layout>horizontal</Layout>
-                    <SizePolicy>min,min</SizePolicy>
-                    <Children>
-                      <Template src="skin:effect_unit_group_control_button.xml">
-                        <SetVariable name="group_name">CH1</SetVariable>
-                        <SetVariable name="group_group">[Channel1]</SetVariable>
-                      </Template>
-
-                      <Template src="skin:effect_unit_group_control_button.xml">
-                        <SetVariable name="group_name">CH2</SetVariable>
-                        <SetVariable name="group_group">[Channel2]</SetVariable>
-                      </Template>
-                    </Children>
-                  </WidgetGroup>
-                  <WidgetGroup>
-                    <Layout>horizontal</Layout>
-                    <SizePolicy>min,min</SizePolicy>
-                    <Children>
-                      <Template src="skin:effect_unit_group_control_button.xml">
-                        <SetVariable name="group_name">CH3</SetVariable>
-                        <SetVariable name="group_group">[Channel3]</SetVariable>
-                      </Template>
-
-                      <Template src="skin:effect_unit_group_control_button.xml">
-                        <SetVariable name="group_name">CH4</SetVariable>
-                        <SetVariable name="group_group">[Channel4]</SetVariable>
-                      </Template>
-                    </Children>
-                  </WidgetGroup>
-                </Children>
-              </WidgetGroup>
-            </Children>
-          </WidgetGroup>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/effect_unit_group_control_button.xml b/res/skins/LateNight/effect_unit_group_control_button.xml
deleted file mode 100644
index 1eed70b979d3..000000000000
--- a/res/skins/LateNight/effect_unit_group_control_button.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    An effect group control button.
-  Variables:
-    group_name: The text to show on the button.
-    group_group: The group to enable the effect unit for.
--->
-<Template>
-  <Template src="skin:left_display_2state_button.xml">
-    <SetVariable name="ObjectName">EffectUnitGroupControlButton</SetVariable>
-    <!-- <SetVariable name="MinimumSize"><Variable name="SmallWideButtonMinimumSize"/></SetVariable>
-    <SetVariable name="MaximumSize"><Variable name="SmallWideButtonMaximumSize"/></SetVariable>
-    <SetVariable name="SizePolicy"><Variable name="SmallWideButtonSizePolicy"/></SetVariable> -->
-    <SetVariable name="state_0_pressed"></SetVariable>
-    <SetVariable name="state_0_unpressed"></SetVariable>
-    <SetVariable name="state_0_text"><Variable name="group_name"/></SetVariable>
-    <SetVariable name="state_1_pressed"></SetVariable>
-    <SetVariable name="state_1_unpressed"></SetVariable>
-    <SetVariable name="state_1_text"><Variable name="group_name"/></SetVariable>
-    <SetVariable name="left_connection_control"><Variable name="group"/>,group_<Variable name="group_group"/>_enable</SetVariable>
-    <SetVariable name="display_connection_control"><Variable name="group"/>,group_<Variable name="group_group"/>_enable</SetVariable>
-  </Template>
-</Template>
diff --git a/res/skins/LateNight/eq_knob.xml b/res/skins/LateNight/eq_knob.xml
deleted file mode 100644
index bf28abd5dea8..000000000000
--- a/res/skins/LateNight/eq_knob.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE template>
-<Template>
-  <SetVariable name="EqualizerNumber">1</SetVariable>
-  <SetVariable name="EffectNumber">1</SetVariable>
-  <SetVariable name="EqualizerRackGroup">[EqualizerRack<Variable name="EqualizerNumber"/>]</SetVariable>
-  <SetVariable name="EqualizerEffectUnitGroup">[EqualizerRack<Variable name="EqualizerNumber"/>_<Variable name="group"/>]</SetVariable>
-  <SetVariable name="EqualizerEffectGroup">[EqualizerRack<Variable name="EqualizerNumber"/>_<Variable name="group"/>_Effect<Variable name="EffectNumber"/>]</SetVariable>
-  <WidgetGroup>
-    <Layout>horizontal</Layout>
-    <SizePolicy>min,min</SizePolicy>
-    <Children>
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-            <WidgetGroup>
-                <ObjectName>KillButton<Variable name="reversed"/></ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <MinimumSize>26,30</MinimumSize>
-                <Children>
-                    <EffectPushButton>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                            <Number>0</Number>
-                            <Pressed>btn_kill_down.png</Pressed>
-                            <Unpressed>btn_kill.png</Unpressed>
-                        </State>
-                        <State>
-                            <Number>1</Number>
-                            <Pressed>btn_kill_overdown.png</Pressed>
-                            <Unpressed>btn_kill_over.png</Unpressed>
-                        </State>
-                        <Connection>
-                            <ConfigKey><Variable name="EqualizerEffectGroup"/>,button_parameter<Variable name="parameter"/></ConfigKey>
-                            <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                    </EffectPushButton>
-                </Children>
-            </WidgetGroup>
-            <WidgetGroup>
-                <Layout>horizontal</Layout>
-                <SizePolicy>me, min</SizePolicy>
-                <Children>
-                    <EffectParameterKnobComposed>
-                        <Size>40f,34f</Size>
-                        <Knob>knob_indicator.svg</Knob>
-                        <BackPath>knob_bg.svg</BackPath>
-                        <MinAngle>-135</MinAngle>
-                        <MaxAngle>135</MaxAngle>
-                        <Connection>
-                            <ConfigKey><Variable name="EqualizerEffectGroup"/>,parameter<Variable name="parameter"/></ConfigKey>
-                        </Connection>
-                    </EffectParameterKnobComposed>
-                </Children>
-            </WidgetGroup>
-        </Children>
-        <Connection>
-          <ConfigKey><Variable name="EqualizerEffectGroup"/>,parameter<Variable name="parameter"/>_loaded</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup>
-    </Children>
-    <Connection>
-      <ConfigKey>[Master],show_eqs</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
new file mode 100644
index 000000000000..2a67b9a386d2
--- /dev/null
+++ b/res/skins/LateNight/eq_knob_left.xml
@@ -0,0 +1,62 @@
+<!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>
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+
+          <!-- Kill button -->
+          <WidgetGroup>
+            <ObjectName>KillButtonLeft</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <MinimumSize>26,30</MinimumSize>
+            <Children>
+              <Template src="skin:fx_button.xml">
+                <SetVariable name="icon">kill</SetVariable>
+                <SetVariable name="Size">18f,18f</SetVariable>
+                <SetVariable name="FxParameter">button_parameter<Variable name="FxParameter"/></SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+          <!-- EQ knob -->
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <SizePolicy>me,min</SizePolicy>
+            <Children>
+              <EffectParameterKnobComposed>
+                <Size>40f,34f</Size>
+                <Knob>skin:knob_indicator.svg</Knob>
+                <BackPath>skin:knob_bg.svg</BackPath>
+                <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
+                <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
+                <KnobCenterYOffset>-1.602</KnobCenterYOffset>
+                <Connection>
+                  <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/></ConfigKey>
+                </Connection>
+              </EffectParameterKnobComposed>
+            </Children>
+          </WidgetGroup>
+
+        </Children>
+        <Connection>
+          <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_loaded</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+    </Children>
+    <Connection>
+      <ConfigKey>[Master],show_eqs</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
new file mode 100644
index 000000000000..89684b3513fd
--- /dev/null
+++ b/res/skins/LateNight/eq_knob_right.xml
@@ -0,0 +1,60 @@
+<!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>
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <!-- EQ knob -->
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <SizePolicy>me, min</SizePolicy>
+            <Children>
+              <EffectParameterKnobComposed>
+                <Size>40f,34f</Size>
+                <Knob>skin:knob_indicator.svg</Knob>
+                <BackPath>skin:knob_bg.svg</BackPath>
+                <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
+                <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
+                <KnobCenterYOffset>-1.602</KnobCenterYOffset>
+                <Connection>
+                  <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/></ConfigKey>
+                </Connection>
+              </EffectParameterKnobComposed>
+            </Children>
+          </WidgetGroup>
+
+          <!-- Kill button -->
+          <WidgetGroup>
+            <ObjectName>KillButtonRight</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <MinimumSize>26,30</MinimumSize>
+            <Children>
+              <Template src="skin:fx_button.xml">
+                <SetVariable name="icon">kill</SetVariable>
+                <SetVariable name="Size">18f,18f</SetVariable>
+                <SetVariable name="FxParameter">button_parameter<Variable name="FxParameter"/></SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+        </Children>
+        <Connection>
+          <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_loaded</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+    </Children>
+    <Connection>
+      <ConfigKey>[Master],show_eqs</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/fx_button.xml b/res/skins/LateNight/fx_button.xml
new file mode 100644
index 000000000000..22491f51c5f8
--- /dev/null
+++ b/res/skins/LateNight/fx_button.xml
@@ -0,0 +1,39 @@
+<!--
+Description:
+  An EffectPushButton template used for FX parameter buttons,
+  EQ kill buttons and QuickEffect buttons.
+Variables:
+  ObjectName:
+  Size      :
+  parameter : 1, 2, 3, ...
+  icon      : optional button graphic for ON/OFF state, is prefixed with
+              '_over', '_down' & '_over_down' is respective button template
+  labelOff  : optional button graphic for OFF state
+  FxRack_FxUnit_FxNum : various, might be
+      [EffectRack1_EffectUnitX_EffectY]
+      [EqualizerRack1_[ChannelA]_EffectY]
+      [QuickEffectRack1_[ChannelA]_EffectY]
+  FxParameter : 
+-->
+<Template>
+  <EffectPushButton>
+    <ObjectName><Variable name="ObjectName"/></ObjectName>
+    <Size><Variable name="Size"/></Size>
+    <NumberStates>2</NumberStates>
+    <RightClickIsPushButton>false</RightClickIsPushButton>
+    <State>
+      <Number>0</Number>
+      <Pressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="icon"/>_down.png</Pressed>
+      <Unpressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="icon"/>.png</Unpressed>
+    </State>
+    <State>
+      <Number>1</Number>
+      <Pressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="icon"/>_overdown.png</Pressed>
+      <Unpressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="icon"/>_over.png</Unpressed>
+    </State>
+    <Connection>
+      <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,<Variable name="FxParameter"/></ConfigKey>
+      <ButtonState>LeftButton</ButtonState>
+    </Connection>
+  </EffectPushButton>
+</Template>
diff --git a/res/skins/LateNight/fx_focus_button.xml b/res/skins/LateNight/fx_focus_button.xml
new file mode 100644
index 000000000000..2fc1f561134e
--- /dev/null
+++ b/res/skins/LateNight/fx_focus_button.xml
@@ -0,0 +1,107 @@
+<!--
+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>
+    <ObjectName>EffectFocusButton</ObjectName>
+    <Layout>horizontal</Layout>
+    <SizePolicy>min,me</SizePolicy>
+    <Children>
+      <WidgetGroup><Size>2f,-1min</Size></WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>EffectFocusButton</ObjectName>
+        <Layout>vertical</Layout>
+        <Size>-1min,20f</Size>
+        <Children>
+          <!-- visible if unfocused: left-click > focus, right click > unfocus -->
+          <PushButton>
+            <TooltipId>EffectSlot_focus</TooltipId>
+            <Size>20f,20f</Size>
+            <NumberStates>2</NumberStates>
+            <RightClickIsPushButton>true</RightClickIsPushButton>
+            <State>
+              <Number>0</Number>
+              <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_focus_off.svg</Pressed>
+              <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_focus_off.svg</Unpressed>
+            </State>
+            <State>
+              <Number>1</Number>
+              <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_focus_on.svg</Pressed>
+              <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_focus_on.svg</Unpressed>
+            </State>
+            <Connection>
+              <ConfigKey><Variable name="FxRack_FxUnit"/>,focused_effect</ConfigKey>
+              <ButtonState>LeftButton</ButtonState>
+              <EmitOnDownPress>true</EmitOnDownPress>
+              <Transform><IsEqual><Variable name="FxNum"/></IsEqual></Transform>
+            </Connection>
+            <Connection>
+              <ConfigKey><Variable name="FxRack_FxUnit"/>,focused_effect</ConfigKey>
+              <ButtonState>RightButton</ButtonState>
+              <EmitOnDownPress>true</EmitOnDownPress>
+              <Transform><IsEqual><Variable name="FxNum"/></IsEqual><Not/></Transform>
+            </Connection>
+            <Connection>
+              <ConfigKey><Variable name="FxRack_FxUnit"/>,focused_effect</ConfigKey>
+              <Transform><IsEqual><Variable name="FxNum"/></IsEqual><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </PushButton>
+
+          <!-- visible if focused: left-click > unfocus, right click > unfocus -->
+          <PushButton>
+            <TooltipId>EffectSlot_focus</TooltipId>
+            <Size>20f,20f</Size>
+            <NumberStates>2</NumberStates>
+            <RightClickIsPushButton>true</RightClickIsPushButton>
+            <State>
+              <Number>0</Number>
+              <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_focus_off.svg</Pressed>
+              <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_focus_off.svg</Unpressed>
+            </State>
+            <State>
+              <Number>1</Number>
+              <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_focus_on.svg</Pressed>
+              <Unpressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_fx_focus_on.svg</Unpressed>
+            </State>
+            <Connection>
+              <ConfigKey><Variable name="FxRack_FxUnit"/>,focused_effect</ConfigKey>
+              <ButtonState>LeftButton</ButtonState>
+              <EmitOnDownPress>true</EmitOnDownPress>
+              <Transform><IsEqual><Variable name="FxNum"/></IsEqual><Not/></Transform>
+            </Connection>
+            <Connection>
+              <ConfigKey><Variable name="FxRack_FxUnit"/>,focused_effect</ConfigKey>
+              <ButtonState>RightButton</ButtonState>
+              <EmitOnDownPress>true</EmitOnDownPress>
+              <Transform><IsEqual><Variable name="FxNum"/></IsEqual><Not/></Transform>
+            </Connection>
+            <Connection>
+              <ConfigKey><Variable name="FxRack_FxUnit"/>,focused_effect</ConfigKey>
+              <Transform><IsEqual><Variable name="FxNum"/></IsEqual></Transform>
+              <ConnectValueFromWidget>false</ConnectValueFromWidget>
+            </Connection>
+            <Connection>
+              <ConfigKey><Variable name="FxRack_FxUnit"/>,focused_effect</ConfigKey>
+              <Transform><IsEqual><Variable name="FxNum"/></IsEqual></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </PushButton>
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup><Size>2f,-1min</Size></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..15ede5ca9b83
--- /dev/null
+++ b/res/skins/LateNight/fx_meta_knob.xml
@@ -0,0 +1,27 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    A standard knob.
+  Variables:
+    FxRack_FxUnit_FxNum : [EffectRack1_EffectUnitX_EffectY]
+-->
+<Template>
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <ObjectName>MetaKnob</ObjectName>
+    <SizePolicy>min,max</SizePolicy>
+    <Children>
+      <KnobComposed>
+        <TooltipId>EffectSlot_metaknob</TooltipId>
+        <Size>25f,25f</Size>
+        <Knob>knob_sm_indicator.svg</Knob>
+        <BackPath>knob_sm_bg.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
new file mode 100644
index 000000000000..9768194c13c4
--- /dev/null
+++ b/res/skins/LateNight/fx_parameter_button.xml
@@ -0,0 +1,48 @@
+<!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>
+    <Size>60f,42f</Size>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>EffectButton</ObjectName>
+        <Layout>horizontal</Layout>
+        <Size>40me,25f</Size>
+        <Children>
+          <Template src="skin:fx_button.xml">
+            <SetVariable name="icon">fxButton</SetVariable>
+            <SetVariable name="Size">40f,20f</SetVariable>
+            <SetVariable name="FxParameter">button_parameter<Variable name="FxParameter"/></SetVariable>
+          </Template>
+	     </Children>
+      </WidgetGroup>
+
+      <EffectButtonParameterName>
+        <Size>1min,14f</Size>
+        <ObjectName>KnobLabel</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>
+
+    </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..01ea52fb04ce
--- /dev/null
+++ b/res/skins/LateNight/fx_parameter_knob.xml
@@ -0,0 +1,82 @@
+<!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>
+    <Size>60f,48f</Size>
+    <Children>
+
+      <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
+
+      <WidgetGroup>
+        <Layout>stacked</Layout>
+        <Size>26me,38f</Size>
+        <Children>
+          <WidgetGroup>
+            <ObjectName>EffectKnob</ObjectName>
+            <Layout>horizontal</Layout>
+            <Size>25me,25f</Size>
+            <Children>
+              <EffectParameterKnobComposed>
+                <Size>25f,25f</Size>
+                <Knob>skin:knob_sm_indicator.svg</Knob>
+                <BackPath>skin:knob_sm_bg.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>
+
+          <EffectParameterName>
+            <Size>1min,40f</Size>
+            <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>
+	     </Children>
+      </WidgetGroup>
+
+      <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
+
+      <!-- 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">60f,5f</SetVariable>
+        <SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_link_type</SetVariable>
+      </Template>
+
+      <WidgetGroup><Size>1min,1f</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">60f,5f</SetVariable>
+        <SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_link_inverse</SetVariable>
+      </Template>
+
+    </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_samplers_container_full.xml b/res/skins/LateNight/fx_samplers_container_full.xml
deleted file mode 100644
index b34d14753758..000000000000
--- a/res/skins/LateNight/fx_samplers_container_full.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<Template>
-    <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <SizePolicy>me,max</SizePolicy>
-        <MinimumSize>0,0</MinimumSize>
-        <Children>
-          <WidgetGroup>
-              <Layout>vertical</Layout>
-              <Children>
-                  <WidgetGroup>
-                      <Layout>vertical</Layout>
-                      <Children>
-                          <Template src="skin:microphone_rack.xml"/>
-                      </Children>
-                      <Connection>
-                          <ConfigKey persist="true">[Microphone],show_microphone</ConfigKey>
-                          <BindProperty>visible</BindProperty>
-                      </Connection>
-                  </WidgetGroup>
-                  <WidgetGroup>
-                      <Layout>vertical</Layout>
-                      <Children>
-                          <Template src="skin:sampler_decks.xml"/>
-                      </Children>
-                      <Connection>
-                          <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
-                          <BindProperty>visible</BindProperty>
-                      </Connection>
-                  </WidgetGroup>
-                  <WidgetGroup>
-                      <Layout>vertical</Layout>
-                      <Children>
-                          <Template src="skin:effect_rack.xml"/>
-                      </Children>
-                      <Connection>
-                          <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
-                          <BindProperty>visible</BindProperty>
-                      </Connection>
-                  </WidgetGroup>
-              </Children>
-              <Connection>
-                  <ConfigKey>[Master],maximize_library</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                  <Transform>
-                    <Not/>
-                  </Transform>
-              </Connection>
-          </WidgetGroup>
-        </Children>
-    </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/fx_samplers_container_med.xml b/res/skins/LateNight/fx_samplers_container_med.xml
deleted file mode 100644
index 3cad9bbdf3c8..000000000000
--- a/res/skins/LateNight/fx_samplers_container_med.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<Template>
-    <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <SizePolicy>me,max</SizePolicy>
-        <MinimumSize>0,0</MinimumSize>
-        <Children>
-            <WidgetStack currentpage="[Master],view_curpage" persist="true">
-                <SizePolicy>me,min</SizePolicy>
-                <Children>
-                    <!-- First page is blank for when the user just wants the library. -->
-                    <WidgetGroup on_hide_select="0">
-                        <Layout>vertical</Layout>
-                        <SizePolicy>me,min</SizePolicy>
-                        <Children/>
-                    </WidgetGroup>
-                    <!-- When any tab is hidden, go back to the first (empty) page. -->
-                    <WidgetGroup trigger="[Microphone],show_microphone" on_hide_select="0">
-                        <Layout>vertical</Layout>
-                        <SizePolicy>me,min</SizePolicy>
-                        <Children>
-                            <Template src="skin:microphone_rack.xml"/>
-                        </Children>
-                    </WidgetGroup>
-                    <WidgetGroup trigger="[EffectRack1],show" on_hide_select="0">
-                        <Layout>vertical</Layout>
-                        <SizePolicy>me,min</SizePolicy>
-                        <Children>
-                            <Template src="skin:effect_rack.xml"/>
-                        </Children>
-                    </WidgetGroup>
-                    <WidgetGroup trigger="[Samplers],show_samplers" on_hide_select="0">
-                        <Layout>vertical</Layout>
-                        <SizePolicy>me,min</SizePolicy>
-                        <Children>
-                            <Template src="skin:sampler_decks.xml"/>
-                        </Children>
-                    </WidgetGroup>
-                </Children>
-                <Connection>
-                  <ConfigKey>[Master],maximize_library</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                  <Transform>
-                    <Not/>
-                  </Transform>
-                </Connection>
-            </WidgetStack>
-        </Children>
-    </WidgetGroup>
-</Template>
\ No newline at end of file
diff --git a/res/skins/LateNight/fx_samplers_container_small.xml b/res/skins/LateNight/fx_samplers_container_small.xml
deleted file mode 100644
index a68acd504f9a..000000000000
--- a/res/skins/LateNight/fx_samplers_container_small.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<Template>
-    <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <SizePolicy>me,max</SizePolicy>
-        <MinimumSize>0,0</MinimumSize>
-        <Children>
-            <WidgetStack currentpage="[Master],view_curpage" persist="true">
-                <Children>
-                    <WidgetGroup trigger="[Library],show_library_tab_small" persist="true">
-                        <Layout>vertical</Layout>
-                        <Children>
-                            <SingletonContainer>
-                                <ObjectName>LibrarySingleton</ObjectName>
-                            </SingletonContainer>
-                        </Children>
-                    </WidgetGroup>
-                    <WidgetGroup trigger="[Microphone],show_microphone" persist="true">
-                        <Layout>vertical</Layout>
-                        <Children>
-                            <Template src="skin:microphone_rack.xml"/>
-                        </Children>
-                    </WidgetGroup>
-                    <WidgetGroup trigger="[EffectRack1],show" persist="true">
-                        <Layout>vertical</Layout>
-                        <Children>
-                            <Template src="skin:effect_rack.xml"/>
-                        </Children>
-                    </WidgetGroup>
-                    <WidgetGroup trigger="[Samplers],show_samplers" persist="true">
-                        <Layout>vertical</Layout>
-                        <Children>
-                            <Template src="skin:sampler_decks.xml"/>
-                        </Children>
-                    </WidgetGroup>
-                </Children>
-                <Connection>
-                  <ConfigKey>[Master],maximize_library</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                  <Transform>
-                    <Not/>
-                  </Transform>
-                </Connection>
-            </WidgetStack>
-        </Children>
-    </WidgetGroup>
-</Template>
\ No newline at end of file
diff --git a/res/skins/LateNight/fx_slot.xml b/res/skins/LateNight/fx_slot.xml
new file mode 100644
index 000000000000..014480ac6947
--- /dev/null
+++ b/res/skins/LateNight/fx_slot.xml
@@ -0,0 +1,142 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    An effect unit widget.
+  Variables:
+    group: The group for the controls.
+-->
+<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>
+
+  <WidgetGroup>
+    <SizePolicy>me,me</SizePolicy>
+    <Layout>stacked</Layout>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>EffectSlot<Variable name="FxNum"/></ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>max,me</SizePolicy>
+        <Children>
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <WidgetGroup><Size>0me,-1min</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>
+
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <MinimumSize>72,26</MinimumSize>
+            <MaximumSize>120,-1</MaximumSize>
+            <SizePolicy>min,me</SizePolicy>
+            <Children>
+              <EffectSelector>
+                <Size>72min,26p</Size>
+                <EffectRack><Variable name="FxRack"/></EffectRack>
+                <EffectUnit><Variable name="FxUnit"/></EffectUnit>
+                <Effect><Variable name="FxNum"/></Effect>
+              </EffectSelector>
+            </Children>
+          </WidgetGroup>
+
+          <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="icon">fxToggle</SetVariable>
+            <SetVariable name="Size">30f,30f</SetVariable>
+            <SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,enabled</SetVariable>
+          </Template>
+
+          <WidgetGroup><Size>2f,-1min</Size></WidgetGroup>
+
+          <Template src="skin:fx_focus_button.xml"/>
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <SizePolicy>me,me</SizePolicy>
+        <Children>
+          <WidgetGroup>
+            <ObjectName>EffectSlot_focused</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>me,me</SizePolicy>
+            <Children>
+            </Children>
+            <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 persist="true"><Variable name="FxRack_FxUnit"/>,show_focus</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+    </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..22a8f65b24ff
--- /dev/null
+++ b/res/skins/LateNight/fx_unit_parameters_hidden.xml
@@ -0,0 +1,116 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    An effect unit widget.
+  Variables:
+    group: The group for the controls.
+-->
+<Template>
+  <SetVariable name="FxRack_FxUnit">EffectRack<Variable name="FxRack"/>_EffectUnit<Variable name="FxUnit"/></SetVariable>
+      
+<!-- Singletons -->
+
+<!-- Structure -->
+  <WidgetGroup>
+    <ObjectName>EffectUnit<Variable name="FxUnit"/></ObjectName>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,max</SizePolicy>
+    <Children>
+
+      <WidgetGroup><!-- No parameters -->
+        <ObjectName>EffectRows</ObjectName>
+        <SizePolicy>me,min</SizePolicy>
+        <Layout>horizontal</Layout>
+        <BackPath>background_tile.png</BackPath>
+        <Children>
+
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <Template src="skin:fx_slot.xml">
+                <SetVariable name="FxNum">1</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+
+          <WidgetGroup><ObjectName>Spacer58</ObjectName><Size>1f,1me</Size></WidgetGroup>
+
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <MaximumSize>200,-1</MaximumSize>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <Template src="skin:fx_slot.xml">
+                <SetVariable name="FxNum">2</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup><ObjectName>Spacer58</ObjectName><Size>1f,1me</Size></WidgetGroup>
+
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <MaximumSize>200,-1</MaximumSize>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <Template src="skin:fx_slot.xml">
+                <SetVariable name="FxNum">3</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+        </Children>
+      </WidgetGroup><!-- /No parameters -->
+
+      <WidgetGroup><!-- Mix / Super -->
+        <ObjectName>EffectUnitControls</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>max,min</SizePolicy>
+        <Children>
+
+          <WidgetGroup><Size>5f,</Size></WidgetGroup>
+
+          <WidgetGroup><!-- Super knob, optional -->
+            <Layout>horizontal</Layout>
+            <SizePolicy>max,min</SizePolicy>
+            <Children>
+              <SingletonContainer>
+                <ObjectName>FxUnit<Variable name="FxUnit"/>_SuperKnob</ObjectName>
+              </SingletonContainer>
+
+              <WidgetGroup><Size>5f,</Size></WidgetGroup>
+            </Children>
+            <Connection>
+              <ConfigKey persist="true">[Master],show_superknobs</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+
+          <SingletonContainer>
+            <ObjectName>FxUnit<Variable name="FxUnit"/>_DryWetKnob</ObjectName>
+          </SingletonContainer>
+
+          <WidgetGroup><Size>3f,</Size></WidgetGroup>
+
+          <WidgetGroup><!-- No parameters -->
+            <SizePolicy>me,min</SizePolicy>
+            <Layout>vertical</Layout>
+            <Children>
+              <SingletonContainer>
+                <ObjectName>FxUnit<Variable name="FxUnit"/>_ExpandCollapseButton</ObjectName>
+              </SingletonContainer>
+
+              <WidgetGroup><Size>3f,</Size></WidgetGroup>
+
+              <SingletonContainer>
+                <ObjectName>FxUnit<Variable name="FxUnit"/>_PflButton</ObjectName>
+              </SingletonContainer>
+            </Children>
+          </WidgetGroup>
+        </Children>
+      </WidgetGroup><!-- /Mix / Super -->
+
+    </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..7bc193326025
--- /dev/null
+++ b/res/skins/LateNight/fx_unit_parameters_visible.xml
@@ -0,0 +1,91 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    An effect unit widget.
+  Variables:
+    group: The group for the controls.
+-->
+<Template>
+  <SetVariable name="FxRack_FxUnit">EffectRack<Variable name="FxRack"/>_EffectUnit<Variable name="FxUnit"/></SetVariable>
+
+  <WidgetGroup>
+    <ObjectName>EffectUnit<Variable name="FxUnit"/></ObjectName>
+    <Layout>vertical</Layout>
+    <SizePolicy>me,max</SizePolicy>
+    <Children>
+
+      <WidgetGroup><!-- Show parameters -->
+        <SizePolicy>me,me</SizePolicy>
+        <Layout>horizontal</Layout>
+        <Children>
+          <WidgetGroup>
+            <ObjectName>EffectRows</ObjectName>
+            <SizePolicy>me,me</SizePolicy>
+            <Layout>vertical</Layout>
+            <BackPath>background_tile.png</BackPath>
+            <Children>
+              <Template src="skin:fx_slot.xml">
+                <SetVariable name="FxNum">1</SetVariable>
+              </Template>
+
+              <WidgetGroup><ObjectName>Spacer58</ObjectName><Size>1me,1f</Size></WidgetGroup>
+
+              <Template src="skin:fx_slot.xml">
+                <SetVariable name="FxNum">2</SetVariable>
+              </Template>
+
+              <WidgetGroup><ObjectName>Spacer58</ObjectName><Size>1me,1f</Size></WidgetGroup>
+
+              <Template src="skin:fx_slot.xml">
+                <SetVariable name="FxNum">3</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup><!-- Enable + Mix/Super + Pfl -->
+            <ObjectName>EffectUnitControls</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>max,min</SizePolicy>
+            <Children>
+
+              <SingletonContainer>
+                <ObjectName>FxUnit<Variable name="FxUnit"/>_ExpandCollapseButton</ObjectName>
+              </SingletonContainer>
+
+              <WidgetGroup><Size>,3me</Size></WidgetGroup>
+
+              <SingletonContainer>
+                <ObjectName>FxUnit<Variable name="FxUnit"/>_DryWetKnob</ObjectName>
+              </SingletonContainer>
+
+              <WidgetGroup><!-- Super knob, optional -->
+                <Layout>vertical</Layout>
+                <SizePolicy>min,me</SizePolicy>
+                <Children>
+                  <WidgetGroup><Size>,3me</Size></WidgetGroup>
+
+                  <SingletonContainer>
+                    <ObjectName>FxUnit<Variable name="FxUnit"/>_SuperKnob</ObjectName>
+                  </SingletonContainer>
+                </Children>
+                <Connection>
+                  <ConfigKey persist="true">[Master],show_superknobs</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+
+              <WidgetGroup><Size>,3me</Size></WidgetGroup>
+
+              <SingletonContainer>
+                <ObjectName>FxUnit<Variable name="FxUnit"/>_PflButton</ObjectName>
+              </SingletonContainer>
+
+              <WidgetGroup><Size>,3f</Size></WidgetGroup>
+            </Children>
+          </WidgetGroup><!-- /Enable + Mix/Super + Pfl -->
+        </Children>
+      </WidgetGroup>
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/fx_units_12.xml b/res/skins/LateNight/fx_units_12.xml
new file mode 100644
index 000000000000..4d76603e64e9
--- /dev/null
+++ b/res/skins/LateNight/fx_units_12.xml
@@ -0,0 +1,287 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    An effect rack widget.
+  Variables:
+    group: The group for the controls.
+-->
+<Template>
+  <SetVariable name="FxRack">1</SetVariable>
+
+  <SingletonDefinition>
+    <ObjectName>FxUnit1_ExpandCollapseButton</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <SizePolicy>me,max</SizePolicy>
+        <Layout>vertical</Layout>
+        <Children>
+        <PushButton>
+          <TooltipId>EffectUnit_show_parameters</TooltipId>
+          <Size>40f,26f</Size>
+          <NumberStates>2</NumberStates>
+          <RightClickIsPushButton>true</RightClickIsPushButton>
+          <State>
+            <Number>0</Number>
+            <Pressed>skin:/buttons/btn_fxExpand.png</Pressed>
+            <Unpressed>skin:/buttons/btn_fxExpand.png</Unpressed>
+            <Text>FX1</Text>
+          </State>
+          <State>
+            <Number>1</Number>
+            <Pressed>skin:/buttons/btn_fxCollapse.png</Pressed>
+            <Unpressed>skin:/buttons/btn_fxCollapse.png</Unpressed>
+            <Text>FX1</Text>
+          </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>
+          <Size>40f,26f</Size>
+          <NumberStates>2</NumberStates>
+          <RightClickIsPushButton>true</RightClickIsPushButton>
+          <State>
+            <Number>0</Number>
+            <Pressed>skin:/buttons/btn_fxExpand.png</Pressed>
+            <Unpressed>skin:/buttons/btn_fxExpand.png</Unpressed>
+            <Text>FX2</Text>
+          </State>
+          <State>
+            <Number>1</Number>
+            <Pressed>skin:/buttons/btn_fxCollapse.png</Pressed>
+            <Unpressed>skin:/buttons/btn_fxCollapse.png</Unpressed>
+            <Text>FX2</Text>
+          </State>
+          <Connection>
+            <ConfigKey>[EffectRack1_EffectUnit2],show_parameters</ConfigKey>
+            <ButtonState>LeftButton</ButtonState>
+          </Connection>
+        </PushButton>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>FxUnit1_PflButton</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <SizePolicy>me,min</SizePolicy>
+        <Layout>vertical</Layout>
+        <Children>
+          <PushButton>
+            <Size>28f,28f</Size>
+            <TooltipId>EffectUnit_headphones_enabled</TooltipId>
+            <NumberStates>2</NumberStates>
+            <State>
+              <Number>0</Number>
+              <Pressed>buttons/btn_pfl1_down.png</Pressed>
+              <Unpressed>buttons/btn_pfl1.png</Unpressed>
+            </State>
+            <State>
+              <Number>1</Number>
+              <Pressed>buttons/btn_pfl1_overdown.png</Pressed>
+              <Unpressed>buttons/btn_pfl1_over.png</Unpressed>
+            </State>
+            <Connection>
+              <ConfigKey>[EffectRack1_EffectUnit1],group_[Headphone]_enable</ConfigKey>
+            </Connection>
+          </PushButton>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>FxUnit2_PflButton</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <SizePolicy>me,min</SizePolicy>
+        <Layout>vertical</Layout>
+        <Children>
+          <PushButton>
+            <Size>28f,28f</Size>
+            <TooltipId>EffectUnit_headphones_enabled</TooltipId>
+            <NumberStates>2</NumberStates>
+            <State>
+              <Number>0</Number>
+              <Pressed>buttons/btn_pfl1_down.png</Pressed>
+              <Unpressed>buttons/btn_pfl1.png</Unpressed>
+            </State>
+            <State>
+              <Number>1</Number>
+              <Pressed>buttons/btn_pfl1_overdown.png</Pressed>
+              <Unpressed>buttons/btn_pfl1_over.png</Unpressed>
+            </State>
+            <Connection>
+              <ConfigKey>[EffectRack1_EffectUnit2],group_[Headphone]_enable</ConfigKey>
+            </Connection>
+          </PushButton>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>FxUnit1_SuperKnob</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <SizePolicy>me,min</SizePolicy>
+        <Layout>vertical</Layout>
+        <Children>
+          <Template src="skin:knob.xml">
+            <SetVariable name="Size">36f,30f</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.xml">
+            <SetVariable name="Size">36f,30f</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.xml">
+            <SetVariable name="Size">36f,30f</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.xml">
+            <SetVariable name="Size">36f,30f</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>
+
+  <WidgetGroup>
+    <ObjectName>EffectRack</ObjectName>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,max</SizePolicy>
+    <Children>
+      <WidgetStack currentpage="[LateNight],SwitchStack_fx_unit1_expanded" persist="true"><!-- EffectUnit 1 -->
+        <SizePolicy>me,min</SizePolicy>
+        <Children>
+
+          <!-- EffectUnit 1 maxi -->
+          <WidgetGroup trigger="[EffectRack1_EffectUnit1],show_parameters" on_hide_select="1" 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">1</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup><!-- EffectUnit 1 mini -->
+            <ObjectName>EffUnit1_mini</ObjectName>
+            <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>
+
+        </Children>
+      </WidgetStack><!-- /EffectUnit 1 -->
+
+      <!-- EffectUnit 2 -->
+      <WidgetStack currentpage="[LateNight],SwitchStack_fx_unit2_expanded" persist="true">
+        <SizePolicy>me,min</SizePolicy>
+        <Children>
+
+          <!-- EffectUnit 2 maxi -->
+          <WidgetGroup trigger="[EffectRack1_EffectUnit2],show_parameters" on_hide_select="1" 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>
+
+          <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>
+
+        </Children>
+      </WidgetStack><!-- /EffectUnit 2 -->
+
+    </Children>
+    <Connection>
+      <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/knob.xml b/res/skins/LateNight/knob.xml
index df115711e8cb..cb8b855a7091 100644
--- a/res/skins/LateNight/knob.xml
+++ b/res/skins/LateNight/knob.xml
@@ -14,23 +14,27 @@
         <Layout>horizontal</Layout>
         <ObjectName>KnobCentered</ObjectName>
         <Children>
+
           <KnobComposed>
-            <TooltipId><Variable name="tooltip"/></TooltipId>
-            <Size>40f,34f</Size>
+            <TooltipId><Variable name="TooltipId"/></TooltipId>
+            <Size><Variable name="Size"/></Size>
             <Knob>knob_indicator.svg</Knob>
             <BackPath>knob_bg.svg</BackPath>
-            <MinAngle>-135</MinAngle>
-            <MaxAngle>135</MaxAngle>
+            <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>
\ No newline at end of file
+</Template>
diff --git a/res/skins/LateNight/knob_bg.svg_blank b/res/skins/LateNight/knob_bg.svg_blank
new file mode 100644
index 000000000000..44de52837243
--- /dev/null
+++ b/res/skins/LateNight/knob_bg.svg_blank
@@ -0,0 +1,357 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="40"
+   height="34"
+   id="svg2">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient4937">
+      <stop
+         id="stop4939"
+         style="stop-color:#e90808;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4941"
+         style="stop-color:#b60000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3939">
+      <stop
+         id="stop3941"
+         style="stop-color:#eece33;stop-opacity:0.95054942"
+         offset="0" />
+      <stop
+         id="stop5813"
+         style="stop-color:#ff734e;stop-opacity:0.8186813"
+         offset="0.61061949" />
+      <stop
+         id="stop3943"
+         style="stop-color:#ff2d2d;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5461">
+      <stop
+         id="stop5463"
+         style="stop-color:#b9dcff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5465"
+         style="stop-color:#0d0d0d;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5441">
+      <stop
+         id="stop5443"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5445"
+         style="stop-color:#343434;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="345.55801"
+       y1="460.78387"
+       x2="477.52518"
+       y2="506.3692"
+       id="linearGradient5483-8"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient5441-4">
+      <stop
+         id="stop5443-2"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5445-4"
+         style="stop-color:#2a2a2a;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5441-7">
+      <stop
+         id="stop5443-4"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5445-7"
+         style="stop-color:#2a2a2a;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="345.55801"
+       y1="460.78387"
+       x2="477.52518"
+       y2="506.3692"
+       id="linearGradient5573-4"
+       xlink:href="#linearGradient5441-4-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.31622183,-0.94868524,0.94868524,-0.31622183,39.645062,974.00808)" />
+    <linearGradient
+       id="linearGradient5441-4-6">
+      <stop
+         id="stop5443-2-5"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5445-4-9"
+         style="stop-color:#2a2a2a;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient3945"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,223.83677,381.60387)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient5024"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(54.522364,18.173742)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient5032"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-57.471498)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient5265"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.822937,-35.303175)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient5267"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient5791"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381477e-7,4.1806787)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient5793"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.822937,-35.303175)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient5795"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient5803"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient5825"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381459e-7,4.1806787)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient5845"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient5847"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient3354"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient3356"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient3358"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381495e-7,4.1806787)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient3837"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient3839"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)" />
+    <linearGradient
+       x1="202.39464"
+       y1="623.47784"
+       x2="202.48778"
+       y2="634.36542"
+       id="linearGradient4945"
+       xlink:href="#linearGradient4937"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.257316,0,0,1,-52.110466,0)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient4947"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)" />
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(-182.48349,-619.88674)"
+     id="layer4"
+     style="display:inline">
+    <g
+       transform="matrix(0.10676061,0,0,0.10675946,162.71346,586.67292)"
+       id="g3912"
+       style="opacity:0.94000005;display:inline">
+      <path
+         d="m 478.8123,472.02954 a 108.08632,108.08632 0 1 1 -216.17264,0 108.08632,108.08632 0 1 1 216.17264,0 z"
+         transform="matrix(-0.31622183,-0.94868528,0.94868528,-0.31622183,49.241524,1000.9691)"
+         id="path4669-2"
+         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:11.79993725;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    </g>
+  </g>
+  <g
+     transform="translate(-182.48349,-619.88674)"
+     id="layer2"
+     style="display:inline">
+    <path
+       d="m 478.8123,472.02954 a 108.08632,108.08632 0 1 1 -216.17264,0 108.08632,108.08632 0 1 1 216.17264,0 z"
+       transform="matrix(-0.03376004,-0.10128113,0.10128222,-0.03375967,167.18755,691.97202)"
+       id="path4669"
+       style="fill:url(#linearGradient3839);fill-opacity:1;fill-rule:nonzero;stroke:#585858;stroke-width:11.79993725;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <rect
+       width="5.0000539"
+       height="3"
+       x="184.98351"
+       y="650.38672"
+       id="rect5530-9"
+       style="fill:none;stroke:#252525;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:319.5;display:inline" />
+    <rect
+       width="5.0000539"
+       height="3"
+       x="183.98349"
+       y="649.38672"
+       id="rect5530"
+       style="fill:none;stroke:#767676;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:319.5" />
+    <rect
+       width="5.0000043"
+       height="3"
+       x="215.98349"
+       y="650.38672"
+       id="rect5530-9-3"
+       style="fill:#370000;fill-opacity:0;stroke:#252525;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:319.5;display:inline" />
+    <rect
+       width="5.0000043"
+       height="3"
+       x="214.98349"
+       y="649.38672"
+       id="rect5530-5"
+       style="fill:#767676;fill-opacity:1;stroke:#767676;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:319.5" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/knob_bg.svg_ring b/res/skins/LateNight/knob_bg.svg_ring
new file mode 100644
index 000000000000..62a953970175
--- /dev/null
+++ b/res/skins/LateNight/knob_bg.svg_ring
@@ -0,0 +1,447 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="40"
+   height="34"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="knob_bg.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient4937">
+      <stop
+         style="stop-color:#e90808;stop-opacity:1;"
+         offset="0"
+         id="stop4939" />
+      <stop
+         style="stop-color:#b60000;stop-opacity:1;"
+         offset="1"
+         id="stop4941" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3939">
+      <stop
+         style="stop-color:#eece33;stop-opacity:0.95054942;"
+         offset="0"
+         id="stop3941" />
+      <stop
+         id="stop5813"
+         offset="0.61061949"
+         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
+      <stop
+         style="stop-color:#ff2d2d;stop-opacity:0;"
+         offset="1"
+         id="stop3943" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5461">
+      <stop
+         id="stop5463"
+         offset="0"
+         style="stop-color:#b9dcff;stop-opacity:1;" />
+      <stop
+         id="stop5465"
+         offset="1"
+         style="stop-color:#0d0d0d;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5441">
+      <stop
+         style="stop-color:#060606;stop-opacity:1;"
+         offset="0"
+         id="stop5443" />
+      <stop
+         style="stop-color:#343434;stop-opacity:1;"
+         offset="1"
+         id="stop5445" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441-4"
+       id="linearGradient5483-8"
+       x1="345.55801"
+       y1="460.78387"
+       x2="477.52518"
+       y2="506.3692"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient5441-4">
+      <stop
+         style="stop-color:#060606;stop-opacity:1;"
+         offset="0"
+         id="stop5443-2" />
+      <stop
+         style="stop-color:#2a2a2a;stop-opacity:1;"
+         offset="1"
+         id="stop5445-4" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5441-7">
+      <stop
+         style="stop-color:#060606;stop-opacity:1;"
+         offset="0"
+         id="stop5443-4" />
+      <stop
+         style="stop-color:#2a2a2a;stop-opacity:1;"
+         offset="1"
+         id="stop5445-7" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441-4-6"
+       id="linearGradient5573-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.31622183,-0.94868524,0.94868524,-0.31622183,39.645062,974.00808)"
+       x1="345.55801"
+       y1="460.78387"
+       x2="477.52518"
+       y2="506.3692" />
+    <linearGradient
+       id="linearGradient5441-4-6">
+      <stop
+         style="stop-color:#060606;stop-opacity:1;"
+         offset="0"
+         id="stop5443-2-5" />
+      <stop
+         style="stop-color:#2a2a2a;stop-opacity:1;"
+         offset="1"
+         id="stop5445-4-9" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3939"
+       id="radialGradient3945"
+       cx="366.93793"
+       cy="355.35693"
+       fx="366.93793"
+       fy="355.35693"
+       r="21.465742"
+       gradientTransform="matrix(1,0,0,0.98823527,223.83677,381.60387)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441"
+       id="linearGradient5024"
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(54.522364,18.173742)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441-4"
+       id="linearGradient5032"
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-57.471498)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441-4"
+       id="linearGradient5265"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.822937,-35.303175)"
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441"
+       id="linearGradient5267"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)"
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3939"
+       id="radialGradient5791"
+       cx="366.93793"
+       cy="355.35693"
+       fx="366.93793"
+       fy="355.35693"
+       r="21.465742"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381477e-7,4.1806787)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441-4"
+       id="linearGradient5793"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.822937,-35.303175)"
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441"
+       id="linearGradient5795"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)"
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441-4"
+       id="linearGradient5803"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)"
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3939"
+       id="radialGradient5825"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381459e-7,4.1806787)"
+       cx="366.93793"
+       cy="355.35693"
+       fx="366.93793"
+       fy="355.35693"
+       r="21.465742" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441-4"
+       id="linearGradient5845"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)"
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441"
+       id="linearGradient5847"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)"
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441-4"
+       id="linearGradient3354"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)"
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441"
+       id="linearGradient3356"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)"
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3939"
+       id="radialGradient3358"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381495e-7,4.1806787)"
+       cx="366.93793"
+       cy="355.35693"
+       fx="366.93793"
+       fy="355.35693"
+       r="21.465742" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441-4"
+       id="linearGradient3837"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)"
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441"
+       id="linearGradient3839"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)"
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4937"
+       id="linearGradient4945"
+       x1="202.39464"
+       y1="623.47784"
+       x2="202.48778"
+       y2="634.36542"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.257316,0,0,1,-52.110466,0)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3939"
+       id="radialGradient4947"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
+       cx="366.93793"
+       cy="355.35693"
+       fx="366.93793"
+       fy="355.35693"
+       r="21.465742" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="20.482041"
+     inkscape:cx="20.856753"
+     inkscape:cy="14.029772"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer4"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1056"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="shadow"
+     style="display:inline"
+     transform="translate(-182.48349,-619.88674)">
+    <!-- shadow for the top arc -->
+    <g
+       style="display:inline"
+       id="g5840"
+       transform="matrix(0.10676061,0,0,0.10675946,163.27006,587.30226)">
+      <g id="g5835" transform="translate(7,7)">
+        <path
+            style="fill:#000000;fill-opacity:0;fill-rule:nonzero;stroke:#000000;stroke-width:11.79993725;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+            d="m 516.41339,506.23793 c 4.36416,-24.17368 2.9091,-49.74094 -5.40625,-74.6875 -15.35754,-46.0736 -50.70669,-79.86553 -93.1875,-94.9375 0,0 -20.697,-8.14015 -50.19834,-8.20231 -29.50134,-0.0622 -50.92666,8.20231 -50.92666,8.20231 -70.74581,25.01887 -111.59378,97.57954 -98.5625,169.625"
+            id="path4669-1-shadow"
+            inkscape:connector-curvature="0"
+            sodipodi:nodetypes="csczcc" />
+      </g>
+    </g>
+    <!-- shadow for the center oval -->
+    <g
+       id="g3912"
+       style="display:inline;opacity:0.94000006"
+       transform="matrix(0.10676061,0,0,0.10675946,162.71346,586.67292)">
+      <path
+         transform="matrix(-0.31622183,-0.94868528,0.94868528,-0.31622183,49.241524,1000.9691)"
+         d="m 478.8123,472.02954 c 0,59.69443 -48.39189,108.08632 -108.08632,108.08632 -59.69442,0 -108.08632,-48.39189 -108.08632,-108.08632 0,-59.69442 48.3919,-108.08632 108.08632,-108.08632 59.69443,0 108.08632,48.3919 108.08632,108.08632 z"
+         sodipodi:ry="108.08632"
+         sodipodi:rx="108.08632"
+         sodipodi:cy="472.02954"
+         sodipodi:cx="370.72598"
+         id="path4669-2"
+         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:11.79993724999999927;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         sodipodi:type="arc" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="bg"
+     style="display:inline"
+     transform="translate(-182.48349,-619.88674)">
+    <g
+       style="display:inline"
+       id="g5840"
+       transform="matrix(0.10676061,0,0,0.10675946,163.27006,587.30226)">
+      <g
+         id="g5835">
+        <path
+           style="fill:none;stroke:#585858;stroke-width:11.79993725;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+           d="m 516.41339,506.23793 c 4.36416,-24.17368 2.9091,-49.74094 -5.40625,-74.6875 -15.35754,-46.0736 -50.70669,-79.86553 -93.1875,-94.9375 0,0 -20.697,-8.14015 -50.19834,-8.20231 -29.50134,-0.0622 -50.92666,8.20231 -50.92666,8.20231 -70.74581,25.01887 -111.59378,97.57954 -98.5625,169.625"
+           id="path4669-1"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="csczcc" />
+      </g>
+      <path
+         transform="matrix(-0.31622183,-0.94868528,0.94868528,-0.31622183,36.694118,980.42607)"
+         d="m 478.8123,472.02954 c 0,59.69443 -48.39189,108.08632 -108.08632,108.08632 -59.69442,0 -108.08632,-48.39189 -108.08632,-108.08632 0,-59.69442 48.3919,-108.08632 108.08632,-108.08632 59.69443,0 108.08632,48.3919 108.08632,108.08632 z"
+         sodipodi:ry="108.08632"
+         sodipodi:rx="108.08632"
+         sodipodi:cy="472.02954"
+         sodipodi:cx="370.72598"
+         id="path4669"
+         style="fill:url(#linearGradient3839);fill-opacity:1;fill-rule:nonzero;stroke:#585858;stroke-width:11.79993725;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+    </g>
+    <rect
+       style="fill:none;stroke:#252525;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:319.50000000000000000;display:inline"
+       id="rect5530-9"
+       width="5.0000539"
+       height="3"
+       x="184.98351"
+       y="650.38672" />
+    <rect
+       style="fill:none;stroke:#767676;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:319.5"
+       id="rect5530"
+       width="5.0000539"
+       height="3"
+       x="183.98349"
+       y="649.38672" />
+    <rect
+       style="fill:#370000;fill-opacity:0;stroke:#252525;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:319.50000000000000000;display:inline"
+       id="rect5530-9-3"
+       width="5.0000043"
+       height="3"
+       x="215.98349"
+       y="650.38672" />
+    <rect
+       style="fill:#767676;fill-opacity:1;stroke:#767676;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:319.5"
+       id="rect5530-5"
+       width="5.0000043"
+       height="3"
+       x="214.98349"
+       y="649.38672" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/knob_sized.xml b/res/skins/LateNight/knob_sized.xml
index ced4a2dece34..6aabbb9571c9 100644
--- a/res/skins/LateNight/knob_sized.xml
+++ b/res/skins/LateNight/knob_sized.xml
@@ -15,12 +15,12 @@
         <ObjectName>KnobCentered</ObjectName>
         <Children>
           <KnobComposed>
-            <TooltipId><Variable name="tooltip"/></TooltipId>
+            <TooltipId><Variable name="TooltipId"/></TooltipId>
             <Size><Variable name="width"/>f,<Variable name="height"/>f</Size>
             <Knob>knob_indicator.svg</Knob>
             <BackPath scalemode="STRETCH">knob_bg.svg</BackPath>
-            <MinAngle>-135</MinAngle>
-            <MaxAngle>135</MaxAngle>
+            <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
+            <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
             <Connection>
               <ConfigKey><Variable name="group"/>,<Variable name="control"/></ConfigKey>
             </Connection>
@@ -33,4 +33,4 @@
       </Label>
     </Children>
   </WidgetGroup>
-</Template>
\ No newline at end of file
+</Template>
diff --git a/res/skins/LateNight/knob_sized_textless.xml b/res/skins/LateNight/knob_sized_textless.xml
index 9e356bbf0a27..474d26ca3a22 100644
--- a/res/skins/LateNight/knob_sized_textless.xml
+++ b/res/skins/LateNight/knob_sized_textless.xml
@@ -11,16 +11,17 @@
     <ObjectName>KnobCentered</ObjectName>
     <Children>
       <KnobComposed>
-        <TooltipId><Variable name="tooltip"/></TooltipId>
+        <TooltipId><Variable name="TooltipId"/></TooltipId>
         <Size><Variable name="width"/>f,<Variable name="height"/>f</Size>
         <Knob>knob_indicator.svg</Knob>
         <BackPath scalemode="STRETCH">knob_bg.svg</BackPath>
-        <MinAngle>-135</MinAngle>
-        <MaxAngle>135</MaxAngle>
+        <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
+        <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
+        <KnobCenterYOffset>1.602</KnobCenterYOffset>
         <Connection>
           <ConfigKey><Variable name="group"/>,<Variable name="control"/></ConfigKey>
         </Connection>
       </KnobComposed>
     </Children>
   </WidgetGroup>
-</Template>
\ No newline at end of file
+</Template>
diff --git a/res/skins/LateNight/knob_sm_bg.svg b/res/skins/LateNight/knob_sm_bg.svg
new file mode 100644
index 000000000000..0c3bc9d9be16
--- /dev/null
+++ b/res/skins/LateNight/knob_sm_bg.svg
@@ -0,0 +1,387 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="25"
+   height="25"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2pre0 (973e216, 2017-07-25)"
+   sodipodi:docname="knob_sm_bg.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient4937">
+      <stop
+         style="stop-color:#e90808;stop-opacity:1;"
+         offset="0"
+         id="stop4939" />
+      <stop
+         style="stop-color:#b60000;stop-opacity:1;"
+         offset="1"
+         id="stop4941" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3939">
+      <stop
+         style="stop-color:#eece33;stop-opacity:0.95054942;"
+         offset="0"
+         id="stop3941" />
+      <stop
+         id="stop5813"
+         offset="0.61061949"
+         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
+      <stop
+         style="stop-color:#ff2d2d;stop-opacity:0;"
+         offset="1"
+         id="stop3943" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5461">
+      <stop
+         id="stop5463"
+         offset="0"
+         style="stop-color:#b9dcff;stop-opacity:1;" />
+      <stop
+         id="stop5465"
+         offset="1"
+         style="stop-color:#0d0d0d;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5441">
+      <stop
+         style="stop-color:#060606;stop-opacity:1;"
+         offset="0"
+         id="stop5443" />
+      <stop
+         style="stop-color:#343434;stop-opacity:1;"
+         offset="1"
+         id="stop5445" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441-4"
+       id="linearGradient5483-8"
+       x1="345.55801"
+       y1="460.78387"
+       x2="477.52518"
+       y2="506.3692"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient5441-4">
+      <stop
+         style="stop-color:#060606;stop-opacity:1;"
+         offset="0"
+         id="stop5443-2" />
+      <stop
+         style="stop-color:#2a2a2a;stop-opacity:1;"
+         offset="1"
+         id="stop5445-4" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5441-7">
+      <stop
+         style="stop-color:#060606;stop-opacity:1;"
+         offset="0"
+         id="stop5443-4" />
+      <stop
+         style="stop-color:#2a2a2a;stop-opacity:1;"
+         offset="1"
+         id="stop5445-7" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441-4-6"
+       id="linearGradient5573-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="rotate(-108.43459,370.83749,472.71669)"
+       x1="345.55801"
+       y1="460.78387"
+       x2="477.52518"
+       y2="506.3692" />
+    <linearGradient
+       id="linearGradient5441-4-6">
+      <stop
+         style="stop-color:#060606;stop-opacity:1;"
+         offset="0"
+         id="stop5443-2-5" />
+      <stop
+         style="stop-color:#2a2a2a;stop-opacity:1;"
+         offset="1"
+         id="stop5445-4-9" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3939"
+       id="radialGradient3945"
+       cx="366.93793"
+       cy="355.35693"
+       fx="366.93793"
+       fy="355.35693"
+       r="21.465742"
+       gradientTransform="matrix(1,0,0,0.98823527,223.83677,381.60387)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441"
+       id="linearGradient5024"
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(54.522364,18.173742)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441-4"
+       id="linearGradient5032"
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-57.471498)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441-4"
+       id="linearGradient5265"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.822937,-35.303175)"
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441"
+       id="linearGradient5267"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)"
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3939"
+       id="radialGradient5791"
+       cx="366.93793"
+       cy="355.35693"
+       fx="366.93793"
+       fy="355.35693"
+       r="21.465742"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381477e-7,4.1806787)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441-4"
+       id="linearGradient5793"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.822937,-35.303175)"
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441"
+       id="linearGradient5795"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)"
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441-4"
+       id="linearGradient5803"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)"
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3939"
+       id="radialGradient5825"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381459e-7,4.1806787)"
+       cx="366.93793"
+       cy="355.35693"
+       fx="366.93793"
+       fy="355.35693"
+       r="21.465742" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441-4"
+       id="linearGradient5845"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)"
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441"
+       id="linearGradient5847"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)"
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441-4"
+       id="linearGradient3354"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)"
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441"
+       id="linearGradient3356"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)"
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3939"
+       id="radialGradient3358"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381495e-7,4.1806787)"
+       cx="366.93793"
+       cy="355.35693"
+       fx="366.93793"
+       fy="355.35693"
+       r="21.465742" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441-4"
+       id="linearGradient3837"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)"
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441"
+       id="linearGradient3839"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.11185178,-1.892001e-6,-1.8929578e-6,0.11190575,-717.10089,-63.675759)"
+       x1="358.44156"
+       y1="427.03851"
+       x2="505.35883"
+       y2="383.93106" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4937"
+       id="linearGradient4945"
+       x1="202.39464"
+       y1="623.47784"
+       x2="202.48778"
+       y2="634.36542"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.257316,0,0,1,-52.110466,0)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3939"
+       id="radialGradient4947"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
+       cx="366.93793"
+       cy="355.35693"
+       fx="366.93793"
+       fy="355.35693"
+       r="21.465742" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="23.87203"
+     inkscape:cx="16.240422"
+     inkscape:cy="13.185283"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer2"
+     showgrid="false"
+     inkscape:window-width="1678"
+     inkscape:window-height="824"
+     inkscape:window-x="2839"
+     inkscape:window-y="309"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="shadow"
+     style="display:inline"
+     transform="translate(-182.48349,-628.88674)">
+    <!-- shadow for the top arc -->
+    <!-- shadow for the center oval -->
+    <g
+       id="g3912"
+       style="display:inline;opacity:0.94000005;stroke-width:1.06248701"
+       transform="matrix(0.10027963,0,0,0.10068311,157.86455,592.02996)">
+      <circle
+         transform="rotate(-108.43459,385.352,482.73879)"
+         id="path4669-2"
+         style="display:inline;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:12.53728104;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         cx="370.72598"
+         cy="472.02954"
+         r="108.08632" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="bg"
+     style="display:inline"
+     transform="translate(-182.48349,-628.88674)">
+    <ellipse
+       cy="-17.953999"
+       cx="-670.14075"
+       style="fill:url(#linearGradient3839);fill-opacity:1;fill-rule:nonzero;stroke:#585858;stroke-width:1.25976193;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4669"
+       transform="matrix(-0.31637729,-0.94863344,0.94873708,-0.31606638,0,0)"
+       rx="10.863386"
+       ry="10.868135" />
+  </g>
+</svg>
diff --git a/res/skins/LateNight/knob_sm_indicator.svg b/res/skins/LateNight/knob_sm_indicator.svg
new file mode 100644
index 000000000000..da0be6a6a400
--- /dev/null
+++ b/res/skins/LateNight/knob_sm_indicator.svg
@@ -0,0 +1,411 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="25"
+   height="25"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.2pre0 (973e216, 2017-07-25)"
+   sodipodi:docname="knob_sm_indicator.svg">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient873">
+      <stop
+         id="stop867"
+         offset="0"
+         style="stop-color:#eece33;stop-opacity:0.95054942;" />
+      <stop
+         style="stop-color:#ff734e;stop-opacity:0.8186813;"
+         offset="0.61064059"
+         id="stop869" />
+      <stop
+         id="stop871"
+         offset="1"
+         style="stop-color:#ff2d2d;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4937">
+      <stop
+         style="stop-color:#e90808;stop-opacity:1;"
+         offset="0"
+         id="stop4939" />
+      <stop
+         style="stop-color:#b60000;stop-opacity:1;"
+         offset="1"
+         id="stop4941" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3939">
+      <stop
+         style="stop-color:#eece33;stop-opacity:0.95054942;"
+         offset="0"
+         id="stop3941" />
+      <stop
+         id="stop5813"
+         offset="0.61061949"
+         style="stop-color:#ff734e;stop-opacity:0.8186813;" />
+      <stop
+         style="stop-color:#ff2d2d;stop-opacity:0;"
+         offset="1"
+         id="stop3943" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5461">
+      <stop
+         id="stop5463"
+         offset="0"
+         style="stop-color:#b9dcff;stop-opacity:1;" />
+      <stop
+         id="stop5465"
+         offset="1"
+         style="stop-color:#0d0d0d;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5441">
+      <stop
+         style="stop-color:#060606;stop-opacity:1;"
+         offset="0"
+         id="stop5443" />
+      <stop
+         style="stop-color:#343434;stop-opacity:1;"
+         offset="1"
+         id="stop5445" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441-4"
+       id="linearGradient5483-8"
+       x1="345.55801"
+       y1="460.78387"
+       x2="477.52518"
+       y2="506.3692"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient5441-4">
+      <stop
+         style="stop-color:#060606;stop-opacity:1;"
+         offset="0"
+         id="stop5443-2" />
+      <stop
+         style="stop-color:#2a2a2a;stop-opacity:1;"
+         offset="1"
+         id="stop5445-4" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5441-7">
+      <stop
+         style="stop-color:#060606;stop-opacity:1;"
+         offset="0"
+         id="stop5443-4" />
+      <stop
+         style="stop-color:#2a2a2a;stop-opacity:1;"
+         offset="1"
+         id="stop5445-7" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441-4-6"
+       id="linearGradient5573-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="rotate(-108.43459,370.83749,472.71669)"
+       x1="345.55801"
+       y1="460.78387"
+       x2="477.52518"
+       y2="506.3692" />
+    <linearGradient
+       id="linearGradient5441-4-6">
+      <stop
+         style="stop-color:#060606;stop-opacity:1;"
+         offset="0"
+         id="stop5443-2-5" />
+      <stop
+         style="stop-color:#2a2a2a;stop-opacity:1;"
+         offset="1"
+         id="stop5445-4-9" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3939"
+       id="radialGradient3945"
+       cx="366.93793"
+       cy="355.35693"
+       fx="366.93793"
+       fy="355.35693"
+       r="21.465742"
+       gradientTransform="matrix(1,0,0,0.98823527,223.83677,381.60387)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441"
+       id="linearGradient5024"
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(54.522364,18.173742)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441-4"
+       id="linearGradient5032"
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-57.471498)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441-4"
+       id="linearGradient5265"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.822937,-35.303175)"
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441"
+       id="linearGradient5267"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)"
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3939"
+       id="radialGradient5791"
+       cx="366.93793"
+       cy="355.35693"
+       fx="366.93793"
+       fy="355.35693"
+       r="21.465742"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381477e-7,4.1806787)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441-4"
+       id="linearGradient5793"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.822937,-35.303175)"
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441"
+       id="linearGradient5795"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)"
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441-4"
+       id="linearGradient5803"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)"
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509" />
+    <filter
+       inkscape:collect="always"
+       id="filter5815"
+       style="color-interpolation-filters:sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.42678198"
+         id="feGaussianBlur5817" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3939"
+       id="radialGradient5825"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381459e-7,4.1806787)"
+       cx="366.93793"
+       cy="355.35693"
+       fx="366.93793"
+       fy="355.35693"
+       r="21.465742" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441-4"
+       id="linearGradient5845"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)"
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441"
+       id="linearGradient5847"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)"
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441-4"
+       id="linearGradient3354"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)"
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441"
+       id="linearGradient3356"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)"
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3939"
+       id="radialGradient3358"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381495e-7,4.1806787)"
+       cx="366.93793"
+       cy="355.35693"
+       fx="366.93793"
+       fy="355.35693"
+       r="21.465742" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441-4"
+       id="linearGradient3837"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)"
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5441"
+       id="linearGradient3839"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)"
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3939"
+       id="radialGradient3841"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)"
+       cx="366.93793"
+       cy="355.35693"
+       fx="366.93793"
+       fy="355.35693"
+       r="21.465742" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4937"
+       id="linearGradient4945"
+       x1="196.12199"
+       y1="616.5274"
+       x2="196.14745"
+       y2="626.47876"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.257316,0,0,0.99999996,-52.110464,15.000018)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient873"
+       id="radialGradient4947"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2346111,-0.01035386,0.01627188,0.88785582,19.826656,74.037899)"
+       cx="277.23355"
+       cy="316.59467"
+       fx="277.23355"
+       fy="316.59467"
+       r="21.465742" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="35.008311"
+     inkscape:cx="16.024402"
+     inkscape:cy="10.998218"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer3"
+     showgrid="false"
+     inkscape:window-width="1897"
+     inkscape:window-height="1224"
+     inkscape:window-x="512"
+     inkscape:window-y="179"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="pointer"
+     style="display:inline"
+     transform="translate(-182.48349,-628.88674)">
+    <g
+       id="g3269"
+       transform="matrix(1,0,0,1.0434783,0.5,-27.908098)">
+      <path
+         sodipodi:nodetypes="cscczccc"
+         inkscape:connector-curvature="0"
+         id="rect5578"
+         d="m 192.98349,631.98929 c 0,-0.7733 0.4862,-1.60257 1.48566,-1.60257 0.95241,0 1.47688,0.79947 1.49594,1.58508 0,2.20517 0.0184,8.58 0.0184,8.58 -0.0557,0.73809 -0.74136,1.33492 -1.53327,1.33492 -0.79194,0 -1.45277,-0.74079 -1.45277,-1.35203 -0.007,-3.30128 -0.0134,-5.45401 -0.0134,-8.5454 z"
+         style="fill:url(#linearGradient4945);fill-opacity:1;stroke:none;stroke-width:0.99999994" />
+      <ellipse
+         transform="matrix(0.05169752,0,0,0.07642426,175.5038,604.89693)"
+         id="path3936"
+         style="display:inline;fill:url(#radialGradient4947);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.40795457;filter:url(#filter5815)"
+         cx="367.09995"
+         cy="353.17572"
+         rx="24.154331"
+         ry="16.340935" />
+    </g>
+  </g>
+</svg>
diff --git a/res/skins/LateNight/knob_sm_textless.xml b/res/skins/LateNight/knob_sm_textless.xml
new file mode 100644
index 000000000000..dc5dfbae1904
--- /dev/null
+++ b/res/skins/LateNight/knob_sm_textless.xml
@@ -0,0 +1,27 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    A standard knob.
+  Variables:
+    control: The control to connect to.
+-->
+<Template>
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <ObjectName>KnobCentered</ObjectName>
+    <Children>
+      <KnobComposed>
+        <TooltipId><Variable name="TooltipId"/></TooltipId>
+        <Size><Variable name="Size"/></Size>
+        <Knob>knob_sm_indicator.svg</Knob>
+        <BackPath>knob_sm_bg.svg</BackPath>
+        <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
+        <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
+        <KnobCenterYOffset>1.602</KnobCenterYOffset>
+        <Connection>
+          <ConfigKey><Variable name="group"/>,<Variable name="control"/></ConfigKey>
+        </Connection>
+      </KnobComposed>
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/knob_textless.xml b/res/skins/LateNight/knob_textless.xml
index cbc5b5564658..9374103c1850 100644
--- a/res/skins/LateNight/knob_textless.xml
+++ b/res/skins/LateNight/knob_textless.xml
@@ -7,26 +7,21 @@
 -->
 <Template>
   <WidgetGroup>
-    <Layout>vertical</Layout>
-    <SizePolicy>min,min</SizePolicy>
+    <Layout>horizontal</Layout>
+    <ObjectName>KnobCentered</ObjectName>
     <Children>
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <ObjectName>KnobCentered</ObjectName>
-        <Children>
-          <KnobComposed>
-            <TooltipId><Variable name="tooltip"/></TooltipId>
-            <Size>40f,34f</Size>
-            <Knob>knob_indicator.svg</Knob>
-            <BackPath>knob_bg.svg</BackPath>
-            <MinAngle>-135</MinAngle>
-            <MaxAngle>135</MaxAngle>
-            <Connection>
-              <ConfigKey><Variable name="group"/>,<Variable name="control"/></ConfigKey>
-            </Connection>
-          </KnobComposed>
-        </Children>
-      </WidgetGroup>
+      <KnobComposed>
+        <TooltipId><Variable name="TooltipId"/></TooltipId>
+        <Size><Variable name="Size"/></Size>
+        <Knob>knob_indicator.svg</Knob>
+        <BackPath>knob_bg.svg</BackPath>
+        <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
+        <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
+        <KnobCenterYOffset>1.602</KnobCenterYOffset>
+        <Connection>
+          <ConfigKey><Variable name="group"/>,<Variable name="control"/></ConfigKey>
+        </Connection>
+      </KnobComposed>
     </Children>
   </WidgetGroup>
-</Template>
\ No newline at end of file
+</Template>
diff --git a/res/skins/LateNight/left_display_2state_button.xml b/res/skins/LateNight/left_display_2state_button.xml
index 72b1ecffbd4a..b8f99b54fdc2 100644
--- a/res/skins/LateNight/left_display_2state_button.xml
+++ b/res/skins/LateNight/left_display_2state_button.xml
@@ -12,7 +12,7 @@
 -->
 <Template>
   <PushButton>
-    <Size>44max,1me</Size>
+    <Size>1me,1me</Size>
     <ObjectName><Variable name="ObjectName"/></ObjectName>
     <!-- <MinimumSize><Variable name="MinimumSize"/></MinimumSize>
     <MaximumSize><Variable name="MaximumSize"/></MaximumSize>
diff --git a/res/skins/LateNight/library.xml b/res/skins/LateNight/library.xml
index 4c1c1d4ad664..1479c1cda4f9 100644
--- a/res/skins/LateNight/library.xml
+++ b/res/skins/LateNight/library.xml
@@ -1,10 +1,12 @@
 <Template>
-    <WidgetGroup>
+  <WidgetGroup>
 		<ObjectName>Library</ObjectName>
-		<SizePolicy>me,me</SizePolicy>
-		<MinimumSize>1280,50</MinimumSize>
+		<SizePolicy>me,i</SizePolicy>
+		<MinimumSize>1280,-</MinimumSize>
 		<Layout>vertical</Layout>
 		<Children>
+
+      <WidgetGroup><Size>0me,5f</Size></WidgetGroup>
 			<!--
 			**********************************************
 			Library / Preview Deck / Search / Tree view
@@ -12,40 +14,53 @@
 			-->
 			<WidgetGroup>
 				<Layout>horizontal</Layout>
+				<SizePolicy>me,me</SizePolicy>
 				<Children>
+
 					<Splitter>
-                        <ObjectName>LibrarySplitter</ObjectName>
-						<Size>me,me</Size>
+            <ObjectName>LibrarySplitter</ObjectName>
+						<SizePolicy>me,me</SizePolicy>
 						<SplitSizes>1,12</SplitSizes>
-                        <SplitSizesConfigKey>[LateNight],LibrarySidebarSplitSize</SplitSizesConfigKey>
+            <SplitSizesConfigKey>[LateNight],LibrarySidebarSplitSize</SplitSizesConfigKey>
 						<Children>
 							<WidgetGroup>
-								<Style>QGroupBox {}</Style>
 								<Layout>vertical</Layout>
 								<Children>
+
+                  <Template src="skin:preview_deck.xml"/>
+
 									<!--Search Input Field-->
 									<SearchBox></SearchBox>
-                                    <Splitter>
-                                        <ObjectName>CoverArtSplitter</ObjectName>
-                                        <Size>me,me</Size>
-                                        <SplitSizes>1,1</SplitSizes>
-                                        <SplitSizesConfigKey>[LateNight],CoverArtSplitSize</SplitSizesConfigKey>
-                                        <Orientation>vertical</Orientation>
-                                        <Collapsible>0,0</Collapsible>
-                                        <Children>
-                                            <!--Library Tree View-->
-                                            <LibrarySidebar></LibrarySidebar>
-                                            <!--Cover Art-->
-                                            <CoverArt>
-                                                <SizePolicy>me,me</SizePolicy>
-                                                <MinimumSize>40,40</MinimumSize>
-                                                <Connection>
-                                                    <ConfigKey persist="true">[Library],show_coverart</ConfigKey>
-                                                    <BindProperty>visible</BindProperty>
-                                                </Connection>
-                                            </CoverArt>
-                                        </Children>
-                                    </Splitter>
+
+                  <Splitter>
+                    <ObjectName>CoverArtSplitter</ObjectName>
+                    <Size>me,me</Size>
+                    <SplitSizes>1,1</SplitSizes>
+                    <SplitSizesConfigKey>[LateNight],CoverArtSplitSize</SplitSizesConfigKey>
+                    <Orientation>vertical</Orientation>
+                    <Collapsible>0,0</Collapsible>
+                    <Children>
+                      <!--Library Tree View-->
+                      <WidgetGroup>
+                        <ObjectName>SidebarContainer</ObjectName>
+                        <Size>1min,50min</Size>
+                        <Layout>vertical</Layout>
+                        <Children>
+                          <LibrarySidebar></LibrarySidebar>
+                        </Children>
+                      </WidgetGroup>
+                      <!--Cover Art-->
+                      <CoverArt>
+                        <SizePolicy>me,me</SizePolicy>
+                        <MinimumSize>40,40</MinimumSize>
+                        <Connection>
+                          <ConfigKey persist="true">[Library],show_coverart</ConfigKey>
+                          <BindProperty>visible</BindProperty>
+                        </Connection>
+                      </CoverArt>
+                    </Children>
+                  </Splitter>
+
 								</Children>
 							</WidgetGroup>
 							<WidgetGroup>
@@ -61,6 +76,7 @@
 							</WidgetGroup>
 						</Children>
 					</Splitter>
+
 				</Children>
 			</WidgetGroup>
 		</Children>
diff --git a/res/skins/LateNight/lower_half.xml b/res/skins/LateNight/lower_half.xml
index 8daca3f54b03..8a97520672a0 100644
--- a/res/skins/LateNight/lower_half.xml
+++ b/res/skins/LateNight/lower_half.xml
@@ -1,76 +1,52 @@
 <Template>
-    <SizeAwareStack currentpage="[Master],lower_half_size" persist="true">
+  <SizeAwareStack currentpage="[Master],lower_half_size">
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>UILowerHalf</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>me,i</SizePolicy>
+        <MinimumSize>0,0</MinimumSize>
+        <MaximumSize>-1,230</MaximumSize>
         <Children>
-            <WidgetGroup>
-                <ObjectName>UILowerHalf</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,i</SizePolicy>
-                <MinimumSize>0,0</MinimumSize>
-                <MaximumSize>1920,249</MaximumSize>
-                <Children>
-                    <Template src="skin:fx_samplers_container_small.xml"/>
-                    <Template src="skin:toolbar_small.xml"/>
-                </Children>
-            </WidgetGroup>
-            <WidgetGroup>
-                <ObjectName>UILowerHalf</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,i</SizePolicy>
-                <MinimumSize>0,250</MinimumSize>
-                <MaximumSize>1920,419</MaximumSize>
-                <Children>
-                    <Template src="skin:fx_samplers_container_med.xml"/>
-                    <SingletonContainer>
-                        <ObjectName>LibrarySingleton</ObjectName>
-                        <Connection>
-                            <ConfigKey persist="true">[Library],show_library</ConfigKey>
-                            <BindProperty>visible</BindProperty>
-                        </Connection>
-                    </SingletonContainer>
-                    <WidgetGroup>
-                        <Layout>horizontal</Layout>
-                        <SizePolicy>me,me</SizePolicy>
-                        <Children/>
-                        <Connection>
-                            <ConfigKey persist="true">[Library],show_library</ConfigKey>
-                            <BindProperty>visible</BindProperty>
-                            <Transform>
-                              <Not/>
-                            </Transform>
-                        </Connection>
-                    </WidgetGroup>
-                    <Template src="skin:toolbar_med.xml"/>
-                </Children>
-            </WidgetGroup>
-            <WidgetGroup>
-                <ObjectName>UILowerHalf</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,i</SizePolicy>
-                <MinimumSize>0,420</MinimumSize>
-                <Children>
-                    <Template src="skin:fx_samplers_container_full.xml"/>
-                    <SingletonContainer>
-                        <ObjectName>LibrarySingleton</ObjectName>
-                        <Connection>
-                            <ConfigKey persist="true">[Library],show_library</ConfigKey>
-                            <BindProperty>visible</BindProperty>
-                        </Connection>
-                    </SingletonContainer>
-                    <WidgetGroup>
-                        <Layout>horizontal</Layout>
-                        <SizePolicy>me,me</SizePolicy>
-                        <Children/>
-                        <Connection>
-                            <ConfigKey persist="true">[Library],show_library</ConfigKey>
-                            <BindProperty>visible</BindProperty>
-                            <Transform>
-                              <Not/>
-                            </Transform>
-                        </Connection>
-                    </WidgetGroup>
-                    <Template src="skin:toolbar_full.xml"/>
-                </Children>
-            </WidgetGroup>
+          <Template src="skin:mic_samplers_lib_container.xml"/>
+          <WidgetGroup> <!-- Vertical spacer-->
+            <SizePolicy>me,min</SizePolicy>
+          </WidgetGroup>
+          <Template src="skin:toolbar.xml"/>
         </Children>
-    </SizeAwareStack>
-</Template>
\ No newline at end of file
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>UILowerHalf</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>me,me</SizePolicy>
+        <MinimumSize>0,231</MinimumSize>
+        <MaximumSize>-1,300</MaximumSize>
+        <Children>
+          <Template src="skin:mic_samplers_container.xml"/>
+          <SingletonContainer>
+            <ObjectName>LibrarySingleton</ObjectName>
+          </SingletonContainer>
+          <Template src="skin:toolbar_no_library_button.xml"/>
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>UILowerHalf</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>me,me</SizePolicy>
+        <MinimumSize>0,301</MinimumSize>
+        <Children>
+          <Template src="skin:mic_aux_container.xml"/>
+          <Template src="skin:samplers_container.xml"/>
+          <SingletonContainer>
+            <ObjectName>LibrarySingleton</ObjectName>
+          </SingletonContainer>
+          <Template src="skin:toolbar_no_library_button.xml"/>
+        </Children>
+      </WidgetGroup>
+
+    </Children>
+  </SizeAwareStack>
+</Template>
diff --git a/res/skins/LateNight/microphone_rack.xml b/res/skins/LateNight/mic_aux_container.xml
similarity index 80%
rename from res/skins/LateNight/microphone_rack.xml
rename to res/skins/LateNight/mic_aux_container.xml
index f0906a8a1b7b..37d4a9b203cd 100644
--- a/res/skins/LateNight/microphone_rack.xml
+++ b/res/skins/LateNight/mic_aux_container.xml
@@ -1,12 +1,13 @@
 <Template>
   <WidgetGroup>
     <Layout>horizontal</Layout>
+    <SizePolicy>min,min</SizePolicy>
     <Children>
+
       <WidgetGroup>
         <ObjectName>MicContainer</ObjectName>
         <Layout>vertical</Layout>
-        <SizePolicy>max,me</SizePolicy>
-        <MaximumSize>570,160</MaximumSize>
+        <SizePolicy>max,min</SizePolicy>
         <Children>
           <WidgetGroup>
             <Layout>horizontal</Layout>
@@ -55,28 +56,27 @@
             <Layout>horizontal</Layout>
             <SizePolicy>max,min</SizePolicy>
             <Children>
-              <Template src="skin:microphone.xml">
+              <Template src="skin:mic_unit.xml">
                 <SetVariable name="mic1hack">1</SetVariable>
               </Template>
-              <Template src="skin:microphone.xml">
+              <Template src="skin:mic_unit.xml">
                 <SetVariable name="micnum">2</SetVariable>
               </Template>
-              <Template src="skin:microphone.xml">
+              <Template src="skin:mic_unit.xml">
                 <SetVariable name="micnum">3</SetVariable>
               </Template>
-              <Template src="skin:microphone.xml">
+              <Template src="skin:mic_unit.xml">
                 <SetVariable name="micnum">4</SetVariable>
               </Template>
             </Children>
           </WidgetGroup>
         </Children>
-      </WidgetGroup>
+      </WidgetGroup><!-- /Mic -->
       
-      <WidgetGroup>
-        <ObjectName>MicContainer</ObjectName>
+      <WidgetGroup><!-- Aux -->
+        <ObjectName>AuxContainer</ObjectName>
         <Layout>vertical</Layout>
-        <SizePolicy>max,me</SizePolicy>
-        <MaximumSize>570,160</MaximumSize>
+        <SizePolicy>max,min</SizePolicy>
         <Children>
           <WidgetGroup>
             <Layout>horizontal</Layout>
@@ -98,22 +98,27 @@
             <Layout>horizontal</Layout>
             <SizePolicy>max,min</SizePolicy>
             <Children>
-              <Template src="skin:aux_passthrough.xml">
+              <Template src="skin:aux_unit.xml">
                 <SetVariable name="auxnum">1</SetVariable>
               </Template>
-              <Template src="skin:aux_passthrough.xml">
+              <Template src="skin:aux_unit.xml">
                 <SetVariable name="auxnum">2</SetVariable>
               </Template>
-              <Template src="skin:aux_passthrough.xml">
+              <Template src="skin:aux_unit.xml">
                 <SetVariable name="auxnum">3</SetVariable>
               </Template>
-              <Template src="skin:aux_passthrough.xml">
+              <Template src="skin:aux_unit.xml">
                 <SetVariable name="auxnum">4</SetVariable>
               </Template>
             </Children>
           </WidgetGroup>
         </Children>
-      </WidgetGroup>
+      </WidgetGroup><!-- Aux -->
+
     </Children>
-    </WidgetGroup>
+    <Connection>
+      <ConfigKey persist="true">[Microphone],show_microphone</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/mic_samplers_container.xml b/res/skins/LateNight/mic_samplers_container.xml
new file mode 100644
index 000000000000..877f0be123d6
--- /dev/null
+++ b/res/skins/LateNight/mic_samplers_container.xml
@@ -0,0 +1,45 @@
+<Template>
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,max</SizePolicy>
+    <MinimumSize>0,0</MinimumSize>
+    <Children>
+
+      <WidgetStack currentpage="[Master],view_curpage" persist="true">
+        <SizePolicy>me,min</SizePolicy>
+        <Children>
+
+          <!-- First page is blank for when the user just wants the library. -->
+          <WidgetGroup on_hide_select="0">
+            <Layout>vertical</Layout>
+            <SizePolicy>me,min</SizePolicy>
+            <Children/>
+          </WidgetGroup>
+
+          <WidgetGroup trigger="[Microphone],show_microphone" on_hide_select="0">
+            <Layout>vertical</Layout>
+            <SizePolicy>me,min</SizePolicy>
+            <Children>
+              <Template src="skin:mic_aux_container.xml"/>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup trigger="[Samplers],show_samplers" on_hide_select="0">
+            <Layout>vertical</Layout>
+            <SizePolicy>me,min</SizePolicy>
+            <Children>
+              <Template src="skin:samplers_container.xml"/>
+            </Children>
+          </WidgetGroup>
+
+        </Children>
+        <Connection>
+          <ConfigKey>[Master],maximize_library</ConfigKey>
+          <BindProperty>visible</BindProperty>
+          <Transform><Not/></Transform>
+        </Connection>
+      </WidgetStack>
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/mic_samplers_lib_container.xml b/res/skins/LateNight/mic_samplers_lib_container.xml
new file mode 100644
index 000000000000..5cf1e531c732
--- /dev/null
+++ b/res/skins/LateNight/mic_samplers_lib_container.xml
@@ -0,0 +1,57 @@
+<Template>
+  <WidgetGroup>
+    <ObjectName>mic_sam_lib_container</ObjectName>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,me</SizePolicy>
+    <MinimumSize>0,0</MinimumSize>
+    <Children>
+
+      <WidgetStack currentpage="[Master],view_curpage" persist="true">
+        <SizePolicy>me,me</SizePolicy>
+        <Children>
+
+          <!-- First page is blank for when the user just wants the library. -->
+          <WidgetGroup on_hide_select="0">
+            <Layout>vertical</Layout>
+            <SizePolicy>me,max</SizePolicy>
+            <Children/>
+          </WidgetGroup>
+
+          <WidgetGroup trigger="[Microphone],show_microphone" persist="true" on_hide_select="0">
+            <Layout>vertical</Layout>
+            <SizePolicy>me,max</SizePolicy>
+            <Children>
+              <Template src="skin:mic_aux_container.xml"/>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup trigger="[Samplers],show_samplers" persist="true" on_hide_select="0">
+            <Layout>vertical</Layout>
+            <SizePolicy>me,max</SizePolicy>
+            <Children>
+              <Template src="skin:samplers_container.xml"/>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup trigger="[Library],show_library" persist="true" on_hide_select="0">
+            <ObjectName>TEST_LibTrigger</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>me,me</SizePolicy>
+            <Children>
+              <SingletonContainer>
+                <ObjectName>LibrarySingleton</ObjectName>
+              </SingletonContainer>
+            </Children>
+          </WidgetGroup>
+
+        </Children>
+        <Connection>
+          <ConfigKey>[Master],maximize_library</ConfigKey>
+          <BindProperty>visible</BindProperty>
+          <Transform><Not/></Transform>
+        </Connection>
+      </WidgetStack>
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/microphone.xml b/res/skins/LateNight/mic_unit.xml
similarity index 50%
rename from res/skins/LateNight/microphone.xml
rename to res/skins/LateNight/mic_unit.xml
index 024fb49833a4..5799274a858e 100644
--- a/res/skins/LateNight/microphone.xml
+++ b/res/skins/LateNight/mic_unit.xml
@@ -1,32 +1,35 @@
 <Template>
-	<WidgetGroup>
+  <WidgetGroup>
     <ObjectName>MicBorder</ObjectName>
     <Layout>horizontal</Layout>
     <Children>
       <WidgetGroup>
         <ObjectName>MicInterior</ObjectName>
         <BackPath>background_tile.png</BackPath>
-    		<Layout>vertical</Layout>
-    		<SizePolicy>min,min</SizePolicy>
-        <MinimumSize>100, 64</MinimumSize>
-    		<Children>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <MinimumSize>100,-1</MinimumSize>
+        <Children>
           <Label>
             <ObjectName>MicSubTitle</ObjectName>
             <Text>Mic <Variable name="mic1hack"/><Variable name="micnum"/></Text>
           </Label>
-    			<!-- To make each widget centered, we have to put them each in their own
-    				widgetgroup. -->
-    			<WidgetGroup>
+
+          <!-- To make each widget centered, we have to put them each in their own
+            widgetgroup. -->
+          <WidgetGroup><!-- Gain, Talk, Pfl -->
             <Layout>horizontal</Layout>
             <SizePolicy>min,max</SizePolicy>
             <MaximumSize>-1, 26</MaximumSize>
             <Children>
               <Template src="skin:knob_sized_textless.xml">
-                 <SetVariable name="width">28</SetVariable>
-                 <SetVariable name="height">24</SetVariable>
-                 <SetVariable name="group">[Microphone<Variable name="micnum"/>]</SetVariable>
-                 <SetVariable name="control">pregain</SetVariable>
+                <SetVariable name="TooltipId">pregain</SetVariable>
+                <SetVariable name="width">28</SetVariable>
+                <SetVariable name="height">24</SetVariable>
+                <SetVariable name="group">[Microphone<Variable name="micnum"/>]</SetVariable>
+                <SetVariable name="control">pregain</SetVariable>
               </Template>
+
               <WidgetGroup>
                 <ObjectName>GuiToggleContainerPadLeft</ObjectName>
                 <Layout>vertical</Layout>
@@ -52,6 +55,7 @@
                   </PushButton>
                 </Children>
               </WidgetGroup>
+
               <WidgetGroup>
                 <ObjectName>GuiToggleContainerPadLeft</ObjectName>
                 <Layout>vertical</Layout>
@@ -61,27 +65,28 @@
                     <TooltipId>pfl</TooltipId>
                     <NumberStates>2</NumberStates>
                     <State>
-                        <Number>0</Number>
-                        <Pressed>btn_pfl1_down.png</Pressed>
-                        <Unpressed>btn_pfl1.png</Unpressed>
+                      <Number>0</Number>
+                      <Pressed>buttons/btn_pfl1_down.png</Pressed>
+                      <Unpressed>buttons/btn_pfl1.png</Unpressed>
                     </State>
                     <State>
-                        <Number>1</Number>
-                        <Pressed>btn_pfl1_overdown.png</Pressed>
-                        <Unpressed>btn_pfl1_over.png</Unpressed>
+                      <Number>1</Number>
+                      <Pressed>buttons/btn_pfl1_overdown.png</Pressed>
+                      <Unpressed>buttons/btn_pfl1_over.png</Unpressed>
                     </State>
                     <Connection>
-                        <ConfigKey>[Microphone<Variable name="micnum"/>],pfl</ConfigKey>
+                      <ConfigKey>[Microphone<Variable name="micnum"/>],pfl</ConfigKey>
                     </Connection>
                   </PushButton>
                 </Children>
               </WidgetGroup>
-    				</Children>
-    			</WidgetGroup>
-    			<WidgetGroup>
-    				<Layout>horizontal</Layout>
-    				<SizePolicy>min,min</SizePolicy>
-    				<Children>
+            </Children>
+          </WidgetGroup><!-- /Gain, Talk, Pfl -->
+
+          <WidgetGroup><!-- VU meter, xfader orientation -->
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
               <VuMeter>
                 <TooltipId>microphone_VuMeter</TooltipId>
                 <MinimumSize>64,4</MinimumSize>
@@ -94,38 +99,39 @@
                 <PeakHoldTime>500</PeakHoldTime>
                 <PeakFallTime>50</PeakFallTime>
                 <PeakFallStep>2</PeakFallStep>
-    						<Connection>
-    							<ConfigKey>[Microphone<Variable name="micnum"/>],VuMeter</ConfigKey>
-    						</Connection>
+                <Connection>
+                  <ConfigKey>[Microphone<Variable name="micnum"/>],VuMeter</ConfigKey>
+                </Connection>
               </VuMeter>
-    					<PushButton>
-    						<TooltipId>orientation</TooltipId>
-    						<Style></Style>
-    						<NumberStates>3</NumberStates>
-    						<State>
-    							<Number>0</Number>
-    							<Pressed>btn_orientation_microphone_left_over.png</Pressed>
-    							<Unpressed>btn_orientation_microphone_left_over.png</Unpressed>
-    						</State>
-    						<State>
-    							<Number>1</Number>
-    							<Pressed>btn_orientation_microphone_master.png</Pressed>
-    							<Unpressed>btn_orientation_microphone_master.png</Unpressed>
-    						</State>
-    						<State>
-    							<Number>2</Number>
-    							<Pressed>btn_orientation_microphone_right_over.png</Pressed>
-    							<Unpressed>btn_orientation_microphone_right_over.png</Unpressed>
-    						</State>
-    						<Connection>
-    							<ConfigKey>[Microphone<Variable name="micnum"/>],orientation</ConfigKey>
-    							<ButtonState>LeftButton</ButtonState>
-    						</Connection>
-    					</PushButton>
-    				</Children>
-    			</WidgetGroup>
-    		</Children>
-    	</WidgetGroup>
+              <PushButton>
+                <TooltipId>orientation</TooltipId>
+                <Style></Style>
+                <NumberStates>3</NumberStates>
+                <State>
+                  <Number>0</Number>
+                  <Pressed>buttons/btn_orientation_microphone_left_over.png</Pressed>
+                  <Unpressed>buttons/btn_orientation_microphone_left_over.png</Unpressed>
+                </State>
+                <State>
+                  <Number>1</Number>
+                  <Pressed>buttons/btn_orientation_microphone_master.png</Pressed>
+                  <Unpressed>buttons/btn_orientation_microphone_master.png</Unpressed>
+                </State>
+                <State>
+                  <Number>2</Number>
+                  <Pressed>buttons/btn_orientation_microphone_right_over.png</Pressed>
+                  <Unpressed>buttons/btn_orientation_microphone_right_over.png</Unpressed>
+                </State>
+                <Connection>
+                  <ConfigKey>[Microphone<Variable name="micnum"/>],orientation</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+              </PushButton>
+            </Children>
+          </WidgetGroup><!-- VU meter, xfader orientation -->
+
+        </Children>
+      </WidgetGroup><!-- /MicInterior -->
     </Children>
-  </WidgetGroup>
+  </WidgetGroup><!-- /MicBorder -->
 </Template>
diff --git a/res/skins/LateNight/mixer.xml b/res/skins/LateNight/mixer.xml
index 05c098838ca1..1e5fa7c430de 100644
--- a/res/skins/LateNight/mixer.xml
+++ b/res/skins/LateNight/mixer.xml
@@ -1,361 +1,402 @@
 <Template>
-    <WidgetGroup>
+  <WidgetGroup>
+    <SizePolicy>min,min</SizePolicy>
+    <Layout>vertical</Layout>
+    <Children>
+
+      <WidgetGroup>
         <ObjectName>Mixer</ObjectName>
-        <SizePolicy>e,me</SizePolicy>
-        <MinimumSize>450,</MinimumSize>
-        <MaximumSize>1000,</MaximumSize>
+        <SizePolicy>min,me</SizePolicy>
         <Layout>horizontal</Layout>
         <Children>
-            <WidgetGroup>
-                <ObjectName>PrimaryMixer</ObjectName>
+
+          <WidgetGroup>
+            <ObjectName>MixerChannelControls</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Size>7f,min</Size>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <ObjectName>MixerContainer</ObjectName>
                 <Layout>vertical</Layout>
-                <SizePolicy>me,me</SizePolicy>
+                <SizePolicy>min,min</SizePolicy>
                 <Children>
-                   <WidgetGroup>
-                     <ObjectName>MixerChannelControls</ObjectName>
-                     <Layout>horizontal</Layout>
-                     <SizePolicy>me,max</SizePolicy>
-                     <Children>
-                           <!-- <WidgetGroup>
-                              <ObjectName>MasterSync</ObjectName>
-                              <SizePolicy>f,me</SizePolicy>
-                              <Size>50,</Size>
-                              <Layout>vertical</Layout>
-                              <Children>
-                                  <PushButton>
-                                      <TooltipId>sync_master</TooltipId>
-                                      <Style></Style>
-                                      <NumberStates>2</NumberStates>
-                                      <State>
-                                          <Number>0</Number>
-                                          <Pressed>btn_mastersync_master_on.png</Pressed>
-                                          <Unpressed>btn_mastersync_master_off.png</Unpressed>
-                                      </State>
-                                      <State>
-                                          <Number>1</Number>
-                                          <Pressed>btn_mastersync_master_on.png</Pressed>
-                                          <Unpressed>btn_mastersync_master_on.png</Unpressed>
-                                      </State>
-                                      <Pos>4,4</Pos>
-                                      <Connection>
-                                          <ConfigKey>[InternalClock],sync_master</ConfigKey>
-                                          <ButtonState>LeftButton</ButtonState>
-                                      </Connection>
-                                  </PushButton>
-                                  <NumberBpm>
-                                      <TooltipId>visual_bpm</TooltipId>
-                                      <Style>QLabel { font: bold 18px/21px Lucida Grande, Lucida Sans
-                                          Unicode, Arial, Verdana, sans-serif;
-                                          background-color:
-                                          transparent; color: #EECE33; text-align: left;padding-left:
-                                          1px;
-                                          }
-                                      </Style>
-                                      <Channel>1</Channel>
-                                      <NumberOfDigits>2</NumberOfDigits>
-                                      <Connection>
-                                          <ConfigKey>[InternalClock],bpm</ConfigKey>
-                                      </Connection>
-                                  </NumberBpm>
-                              </Children>
-                          </WidgetGroup> -->
-        		          <WidgetGroup>
-        	                <ObjectName>MixerLeftMargin</ObjectName>
-        	                <Layout>horizontal</Layout>
-        	                <SizePolicy>me,min</SizePolicy>
-        	                <MinimumSize>1,</MinimumSize>
-        	                <Children>
-        	                </Children>
-        	              </WidgetGroup>
-        				  <WidgetGroup>
-        					<ObjectName>MixerContainer</ObjectName>
-        					<Layout>vertical</Layout>
-        					<SizePolicy>e,max</SizePolicy>
-        					<Children>
-        						<WidgetGroup>
-        						    <SizePolicy>max,min</SizePolicy>
-        							<Layout>horizontal</Layout>
-									<MaximumSize>400,400</MaximumSize>
-        							<Children>
-        							   <WidgetGroup>
-        							        <SizePolicy>max,min</SizePolicy>
-        						            <Layout>horizontal</Layout>
-        						            <Children>
-        										<Template src="skin:mixer_channel_vertical.xml">
-        											<SetVariable name="channum">3</SetVariable>
-              									</Template>
-        						            </Children>
-        						            <Connection>
-        						                <ConfigKey>[Master],show_4decks</ConfigKey>
-        						                <BindProperty>visible</BindProperty>
-        						            </Connection>
-        						       </WidgetGroup>
-        							   <Template src="skin:mixer_channel.xml">
-        									<SetVariable name="channum">1</SetVariable>
-        							   </Template>
-									   <WidgetGroup>
-											<ObjectName>MasterVuMeter2ch</ObjectName>
-											<Layout>horizontal</Layout>
-											<SizePolicy>max,me</SizePolicy>
-											<Children>
-												<WidgetGroup>
-													<Layout>vertical</Layout>
-													<Children>
-														<StatusLight>
-															<TooltipId>master_PeakIndicator</TooltipId>
-															<Style></Style>
-															<PathStatusLight>btn_clipping1_over.png</PathStatusLight>
-															<PathBack>btn_clipping1.png</PathBack>
-															<Connection>
-																<ConfigKey>[Master],PeakIndicatorL</ConfigKey>
-															</Connection>
-														</StatusLight>
-														<VuMeter>
-															<TooltipId>master_VuMeterL</TooltipId>
-															<Style></Style>
-															<PathVu>btn_volume_display1_over.png</PathVu>
-															<PathBack>btn_volume_display1.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>
-													<Layout>vertical</Layout>
-													<Children>
-														<StatusLight>
-															<TooltipId>master_PeakIndicator</TooltipId>
-															<Style></Style>
-															<PathStatusLight>btn_clipping1_over.png</PathStatusLight>
-															<PathBack>btn_clipping1.png</PathBack>
-															<Connection>
-																<ConfigKey>[Master],PeakIndicatorR</ConfigKey>
-															</Connection>
-														</StatusLight>
-														<VuMeter>
-															<TooltipId>master_VuMeterR</TooltipId>
-															<Style></Style>
-															<PathVu>btn_volume_display1_over.png</PathVu>
-															<PathBack>btn_volume_display1.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>
-											<Connection>
-												<ConfigKey>[Master],show_4decks</ConfigKey>
-												<BindProperty>visible</BindProperty>
-												<Transform>
-													<Invert/>
-													<Not/>
-												</Transform>
-											</Connection>
-										</WidgetGroup>
-        							   <Template src="skin:mixer_channel_reversed.xml">
-        									<SetVariable name="channum">2</SetVariable>
-        							   </Template>
-        	                           <WidgetGroup>
-      	                                  <SizePolicy>max,min</SizePolicy>
-                                          <Layout>horizontal</Layout>
-                                          <Children>
-                                              <Template src="skin:mixer_channel_vertical.xml">
-                                              <SetVariable name="channum">4</SetVariable>
-                                              </Template>
-                                          </Children>
-                                          <Connection>
-                                              <ConfigKey>[Master],show_4decks</ConfigKey>
-                                              <BindProperty>visible</BindProperty>
-                                          </Connection>
-                                       </WidgetGroup>
-        							</Children>
-        						</WidgetGroup>
-								<WidgetGroup>
-									<ObjectName>Crossfader</ObjectName>
-									<Layout>horizontal</Layout>
-									<SizePolicy>me,min</SizePolicy>
-									<Children>
-										<SliderComposed>
-											<TooltipId>crossfader</TooltipId>
-											<Handle>knob_crossfader.png</Handle>
-											<Slider>slider_crossfader.png</Slider>
-											<Horizontal>true</Horizontal>
-											<Connection>
-												<ConfigKey>[Master],crossfader</ConfigKey>
-											</Connection>
-										</SliderComposed>
-									</Children>
-								</WidgetGroup>
-        					</Children>
-        				  </WidgetGroup>
-        				  <WidgetGroup>
-                            <ObjectName>MixerRightMargin</ObjectName>
+                  <WidgetGroup>
+                    <SizePolicy>max,min</SizePolicy>
+                    <Layout>horizontal</Layout>
+                    <Children>
+                      <WidgetGroup>
+                        <SizePolicy>max,min</SizePolicy>
+                        <Layout>horizontal</Layout>
+                        <Children>
+                          <Template src="skin:mixer_channel_4decks.xml">
+                            <SetVariable name="channum">3</SetVariable>
+                          </Template>
+                        </Children>
+                        <Connection>
+                          <ConfigKey persist="true">[Master],show_4decks</ConfigKey>
+                          <BindProperty>visible</BindProperty>
+                        </Connection>
+                      </WidgetGroup>
+
+                      <Template src="skin:mixer_channel_left.xml">
+                        <SetVariable name="channum">1</SetVariable>
+                      </Template>
+
+                      <WidgetGroup>
+                        <ObjectName>MasterVuMeter2ch</ObjectName>
+                        <Layout>vertical</Layout>
+                        <SizePolicy>max,me</SizePolicy>
+                        <Children>
+                          <!-- Spacer -->
+                          <WidgetGroup>
+                            <Layout>vertical</Layout>
+                            <Size>1min,0me</Size>
+                            <Children/>
+                          </WidgetGroup>
+
+                          <WidgetGroup><!-- Peak indicator L +R -->
                             <Layout>horizontal</Layout>
-                            <SizePolicy>me,min</SizePolicy>
-                            <MinimumSize>1,</MinimumSize>
+                            <SizePolicy>max,max</SizePolicy>
                             <Children>
+                              <StatusLight>
+                                <TooltipId>master_PeakIndicator</TooltipId>
+                                <Style></Style>
+                                <PathStatusLight>buttons/btn_clipping1_over.png</PathStatusLight>
+                                <PathBack>buttons/btn_clipping1.png</PathBack>
+                                <Connection>
+                                  <ConfigKey>[Master],PeakIndicatorL</ConfigKey>
+                                </Connection>
+                              </StatusLight>
+                              <StatusLight>
+                                <TooltipId>master_PeakIndicator</TooltipId>
+                                <Style></Style>
+                                <PathStatusLight>buttons/btn_clipping1_over.png</PathStatusLight>
+                                <PathBack>buttons/btn_clipping1.png</PathBack>
+                                <Connection>
+                                  <ConfigKey>[Master],PeakIndicatorR</ConfigKey>
+                                </Connection>
+                              </StatusLight>
                             </Children>
+                          </WidgetGroup><!-- /Peak indicator L +R -->
+
+                          <WidgetGroup><!-- Level L +R -->
+                            <Layout>horizontal</Layout>
+                            <SizePolicy>max,max</SizePolicy>
+                            <Children>
+                              <VuMeter>
+                                <TooltipId>master_VuMeterL</TooltipId>
+                                <Style></Style>
+                                <PathVu>buttons/btn_volume_display1_over.png</PathVu>
+                                <PathBack>buttons/btn_volume_display1.png</PathBack>
+                                <Horizontal>false</Horizontal>
+                                <PeakHoldSize>5</PeakHoldSize>
+                                <PeakHoldTime>500</PeakHoldTime>
+                                <PeakFallTime>50</PeakFallTime>
+                                <PeakFallStep>2</PeakFallStep>
+                                <Connection>
+                                  <ConfigKey>[Master],VuMeterL</ConfigKey>
+                                </Connection>
+                              </VuMeter>
+                              <VuMeter>
+                                <TooltipId>master_VuMeterR</TooltipId>
+                                <Style></Style>
+                                <PathVu>buttons/btn_volume_display1_over.png</PathVu>
+                                <PathBack>buttons/btn_volume_display1.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><!-- /Level L +R -->
+
+                          <!-- Spacer -->
+                          <WidgetGroup>
+                            <Layout>vertical</Layout>
+                            <Size>1min,7f</Size>
+                            <Children/>
                           </WidgetGroup>
-                      </Children>
-                    </WidgetGroup>
-				</Children>
-			</WidgetGroup>
-            <WidgetGroup>
-              <Layout>vertical</Layout>
-              <SizePolicy>min,me</SizePolicy>
-              <Children>
-                <WidgetGroup>
+                        </Children>
+                        <Connection>
+                          <ConfigKey persist="true">[Master],show_4decks</ConfigKey>
+                          <BindProperty>visible</BindProperty>
+                          <Transform><Invert/><Not/></Transform>
+                        </Connection>
+                      </WidgetGroup>
+
+                      <Template src="skin:mixer_channel_right.xml">
+                        <SetVariable name="channum">2</SetVariable>
+                      </Template>
+
+                      <WidgetGroup>
+                        <SizePolicy>max,min</SizePolicy>
+                        <Layout>horizontal</Layout>
+                        <Children>
+                          <Template src="skin:mixer_channel_4decks.xml">
+                            <SetVariable name="channum">4</SetVariable>
+                          </Template>
+                        </Children>
+                        <Connection>
+                          <ConfigKey persist="true">[Master],show_4decks</ConfigKey>
+                          <BindProperty>visible</BindProperty>
+                        </Connection>
+                      </WidgetGroup>
+                    </Children>
+                  </WidgetGroup>
+
+                  <WidgetGroup>
+                    <ObjectName>Crossfader</ObjectName>
                     <Layout>horizontal</Layout>
+                    <SizePolicy>min,min</SizePolicy>
+                    <Children>
+                      <SliderComposed>
+                        <TooltipId>crossfader</TooltipId>
+                        <Handle>knob_crossfader.png</Handle>
+                        <Slider>slider_crossfader.png</Slider>
+                        <Horizontal>true</Horizontal>
+                        <Connection>
+                          <ConfigKey>[Master],crossfader</ConfigKey>
+                        </Connection>
+                      </SliderComposed>
+                    </Children>
+                  </WidgetGroup>
+
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Size>7f,min</Size>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>MasterControls</ObjectName>
+            <SizePolicy>min,min</SizePolicy>
+            <Layout>vertical</Layout>
+            <!--BackPath>background_tile.png</BackPath-->
+            <Children>
+              <WidgetGroup>
+                <ObjectName>MasterKnobs</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+
+                  <WidgetGroup>
+                    <Layout>horizontal</Layout>
+                    <SizePolicy>min,min</SizePolicy>
+                    <Children>
+                      <PushButton>
+                        <Size>35f,22f</Size>
+                        <TooltipId>EffectUnit_master_enabled</TooltipId>
+                        <ObjectName>FxAssignButton</ObjectName>
+                        <NumberStates>2</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Text>FX1</Text>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                          <Text>FX1</Text>
+                        </State>
+                        <Connection>
+                          <ConfigKey>[EffectRack1_EffectUnit1],group_[Master]_enable</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                      </PushButton>
+
+                      <PushButton>
+                        <Size>35f,22f</Size>
+                        <TooltipId>EffectUnit_master_enabled</TooltipId>
+                        <ObjectName>FxAssignButton</ObjectName>
+                        <NumberStates>2</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Text>FX2</Text>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                          <Text>FX2</Text>
+                        </State>
+                        <Connection>
+                          <ConfigKey>[EffectRack1_EffectUnit2],group_[Master]_enable</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                      </PushButton>
+                    </Children>
+                    <Connection>
+                      <ConfigKey persist="true">[Master],show_xfader</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup>
+
+                  <Template src="skin:knob.xml">
+                    <SetVariable name="Size">36f,30f</SetVariable>
+                    <SetVariable name="TooltipId">master_gain</SetVariable>
+                    <SetVariable name="group">[Master]</SetVariable>
+                    <SetVariable name="control">gain</SetVariable>
+                    <SetVariable name="label">Master</SetVariable>
+                  </Template>
+                  <Template src="skin:knob.xml">
+                    <SetVariable name="Size">36f,30f</SetVariable>
+                    <SetVariable name="TooltipId">balance</SetVariable>
+                    <SetVariable name="group">[Master]</SetVariable>
+                    <SetVariable name="control">balance</SetVariable>
+                    <SetVariable name="label">Balance</SetVariable>
+                  </Template>
+
+                  <WidgetGroup><Size>0min,5f</Size></WidgetGroup>
+
+                  <WidgetGroup>
+                    <ObjectName>MasterVuMeter4ch</ObjectName>
+                    <Layout>vertical</Layout>
                     <SizePolicy>min,me</SizePolicy>
                     <Children>
-            			<WidgetGroup>
-            			    <ObjectName>MasterControls</ObjectName>
-            			    <SizePolicy>min,me</SizePolicy>
-                            <Layout>vertical</Layout>
-                            <Children>
-                                <WidgetGroup>
-                                  <ObjectName>MasterKnobs</ObjectName>
-                                  <Layout>horizontal</Layout>
-                                  <SizePolicy>min,me</SizePolicy>
-                                  <Children>
-                                    <WidgetGroup>
-                                      <Layout>vertical</Layout>
-                                      <SizePolicy>min,max</SizePolicy>
-                                      <ObjectName>MasterKnobCol</ObjectName>
-                                      <Children>
-                                        <Template src="skin:knob.xml">
-                                            <SetVariable name="tooltip">master_gain</SetVariable>
-                                            <SetVariable name="group">[Master]</SetVariable>
-                                            <SetVariable name="control">gain</SetVariable>
-                                            <SetVariable name="label">Master</SetVariable>
-                                        </Template>
-                                        <Template src="skin:knob.xml">
-                                            <SetVariable name="tooltip">balance</SetVariable>
-                                            <SetVariable name="group">[Master]</SetVariable>
-                                            <SetVariable name="control">balance</SetVariable>
-                                            <SetVariable name="label">Balance</SetVariable>
-                                        </Template>
-                                      </Children>
-                                    </WidgetGroup>
-                                    <WidgetGroup>
-                                      <Layout>vertical</Layout>
-                                      <SizePolicy>min,max</SizePolicy>
-                                      <ObjectName>MasterKnobCol</ObjectName>
-                                      <Children>
-                                          <Template src="skin:knob.xml">
-                                            <SetVariable name="tooltip">headphone_gain</SetVariable>
-                                            <SetVariable name="group">[Master]</SetVariable>
-                                            <SetVariable name="control">headGain</SetVariable>
-                                            <SetVariable name="label">Head Gain</SetVariable>
-                                          </Template>
-                                          <Template src="skin:knob.xml">
-                                            <SetVariable name="tooltip">headMix</SetVariable>
-                                            <SetVariable name="group">[Master]</SetVariable>
-                                            <SetVariable name="control">headMix</SetVariable>
-                                            <SetVariable name="label">Pre/Main</SetVariable>
-                                          </Template>
-                                      </Children>
-                                    </WidgetGroup>
-                                  </Children>
-                                </WidgetGroup>
-                            </Children>
-                        </WidgetGroup>
-                      </Children>
-                    </WidgetGroup>
-					<WidgetGroup>
-						<ObjectName>MasterVuMeter4ch</ObjectName>
-						<Layout>horizontal</Layout>
-						<SizePolicy>min,me</SizePolicy>
-						<Children>
-							<WidgetGroup>
-								<Layout>vertical</Layout>
-								<Children>
-									<StatusLight>
-										<TooltipId>master_PeakIndicator</TooltipId>
-										<Style></Style>
-										<PathStatusLight>btn_clipping1_over.png</PathStatusLight>
-										<PathBack>btn_clipping1.png</PathBack>
-										<Connection>
-											<ConfigKey>[Master],PeakIndicatorL</ConfigKey>
-										</Connection>
-									</StatusLight>
-									<VuMeter>
-										<TooltipId>master_VuMeterL</TooltipId>
-										<Style></Style>
-										<PathVu>btn_volume_display1_over.png</PathVu>
-										<PathBack>btn_volume_display1.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>
-								<Layout>vertical</Layout>
-								<Children>
-									<StatusLight>
-										<TooltipId>master_PeakIndicator</TooltipId>
-										<Style></Style>
-										<PathStatusLight>btn_clipping1_over.png</PathStatusLight>
-										<PathBack>btn_clipping1.png</PathBack>
-										<Connection>
-											<ConfigKey>[Master],PeakIndicatorR</ConfigKey>
-										</Connection>
-									</StatusLight>
-									<VuMeter>
-										<TooltipId>master_VuMeterR</TooltipId>
-										<Style></Style>
-										<PathVu>btn_volume_display1_over.png</PathVu>
-										<PathBack>btn_volume_display1.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>
-						<Connection>
-							<ConfigKey>[Master],show_4decks</ConfigKey>
-							<BindProperty>visible</BindProperty>
-						</Connection>
-					</WidgetGroup>
-                    <WidgetGroup>
-                        <ObjectName>AlignRightBottom</ObjectName>
+
+                      <WidgetGroup><!-- Peak indicator L + R -->
+                        <ObjectName>Spacer1e</ObjectName>
+                        <Layout>horizontal</Layout>
+                        <SizePolicy>max,max</SizePolicy>
+                        <Children>
+                          <StatusLight>
+                            <TooltipId>master_PeakIndicator</TooltipId>
+                            <PathStatusLight>buttons/btn_clipping1_over.png</PathStatusLight>
+                            <PathBack>buttons/btn_clipping1.png</PathBack>
+                            <Connection>
+                              <ConfigKey>[Master],PeakIndicatorL</ConfigKey>
+                            </Connection>
+                          </StatusLight>
+                          <StatusLight>
+                            <TooltipId>master_PeakIndicator</TooltipId>
+                            <PathStatusLight>buttons/btn_clipping1_over.png</PathStatusLight>
+                            <PathBack>buttons/btn_clipping1.png</PathBack>
+                            <Connection>
+                              <ConfigKey>[Master],PeakIndicatorR</ConfigKey>
+                            </Connection>
+                          </StatusLight>
+                        </Children>
+                      </WidgetGroup><!-- /Peak indicator L + R -->
+
+                      <WidgetGroup><!-- Level L + R -->
+                        <ObjectName>Spacer1e</ObjectName>
                         <Layout>horizontal</Layout>
-                        <SizePolicy>min,f</SizePolicy>
+                        <SizePolicy>max,max</SizePolicy>
                         <Children>
-                            <WidgetGroup>
-                                <Layout>horizontal</Layout>
-                                <SizePolicy>f,f</SizePolicy>
-                                <Size>103,40</Size>
-                                <BackPath>style/mixxx_logo.png</BackPath>
-                            </WidgetGroup>
+                          <VuMeter>
+                            <TooltipId>master_VuMeterL</TooltipId>
+                            <PathVu>buttons/btn_volume_display1_over.png</PathVu>
+                            <PathBack>buttons/btn_volume_display1.png</PathBack>
+                            <Horizontal>false</Horizontal>
+                            <PeakHoldSize>5</PeakHoldSize>
+                            <PeakHoldTime>500</PeakHoldTime>
+                            <PeakFallTime>50</PeakFallTime>
+                            <PeakFallStep>2</PeakFallStep>
+                            <Connection>
+                              <ConfigKey>[Master],VuMeterL</ConfigKey>
+                            </Connection>
+                          </VuMeter>
+                          <VuMeter>
+                            <TooltipId>master_VuMeterR</TooltipId>
+                            <PathVu>buttons/btn_volume_display1_over.png</PathVu>
+                            <PathBack>buttons/btn_volume_display1.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>
+                      </WidgetGroup><!-- /Level L + R -->
+
+                      <WidgetGroup><Size>0min,15f</Size></WidgetGroup>
+                    </Children>
+                    <Connection>
+                      <ConfigKey persist="true">[Master],show_4decks</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup>
+
+                  <WidgetGroup>
+                    <ObjectName>Spacer58</ObjectName>
+                    <Size>0min,1f</Size>
+                  </WidgetGroup>
+
+                  <WidgetGroup><Size>0min,0me</Size></WidgetGroup>
+
+                  <Template src="skin:knob.xml">
+                    <SetVariable name="Size">36f,30f</SetVariable>
+                    <SetVariable name="TooltipId">headphone_gain</SetVariable>
+                    <SetVariable name="group">[Master]</SetVariable>
+                    <SetVariable name="control">headGain</SetVariable>
+                    <SetVariable name="label">Head Gain</SetVariable>
+                  </Template>
+                  <Template src="skin:knob.xml">
+                    <SetVariable name="Size">36f,30f</SetVariable>
+                    <SetVariable name="TooltipId">headMix</SetVariable>
+                    <SetVariable name="group">[Master]</SetVariable>
+                    <SetVariable name="control">headMix</SetVariable>
+                    <SetVariable name="label">Pre/Main</SetVariable>
+                  </Template>
+
+                  <WidgetGroup><Size>0min,0me</Size></WidgetGroup>
                 </Children>
-            </WidgetGroup>
-		</Children>
-	</WidgetGroup>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup><!-- /MasterControls -->
+
+        </Children>
+        <Connection>
+          <ConfigKey persist="true">[Master],show_mixer</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>NoMixer12</ObjectName>
+        <Size>6f,-1me</Size>
+        <Layout>horizontal</Layout>
+        <Connection>
+          <ConfigKey persist="true">[Master],show_mixer</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Size>6f,-1min</Size>
+        <Children>
+          <WidgetGroup>
+            <ObjectName>NoMixer34</ObjectName>
+            <SizePolicy>me,me</SizePolicy>
+            <Layout>horizontal</Layout>
+            <Children/>
+            <Connection>
+              <ConfigKey persist="true">[Master],show_mixer</ConfigKey>
+              <Transform><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+        </Children>
+        <Connection>
+          <ConfigKey persist="true">[Master],show_4decks</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+    </Children>
+  </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/mixer_channel.xml b/res/skins/LateNight/mixer_channel.xml
deleted file mode 100644
index 86debfba64e0..000000000000
--- a/res/skins/LateNight/mixer_channel.xml
+++ /dev/null
@@ -1,133 +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,me</SizePolicy>
-    <Layout>horizontal</Layout>
-    <Children>
-      <WidgetGroup>  <!--  Channel1 controls side-by-side-->
-        <ObjectName>MixerChannelHoriz</ObjectName>
-        <Layout>horizontal</Layout>
-          <Children>
-            <WidgetGroup> <!-- EQs -->
-              <Layout>vertical</Layout>
-              <ObjectName>MixerChannel</ObjectName>
-              <SizePolicy>min,min</SizePolicy>
-              <Children>
-                <WidgetGroup>
-                    <Layout>horizontal</Layout>
-                    <SizePolicy>min,max</SizePolicy>
-                    <Children>
-                        <WidgetGroup>
-                            <Layout>horizontal</Layout>
-                            <Children>
-                                <PushButton>
-                                    <TooltipId>pfl</TooltipId>
-                                    <NumberStates>2</NumberStates>
-                                    <State>
-                                        <Number>0</Number>
-                                        <Pressed>btn_pfl1_down.png</Pressed>
-                                        <Unpressed>btn_pfl1.png</Unpressed>
-                                    </State>
-                                    <State>
-                                        <Number>1</Number>
-                                        <Pressed>btn_pfl1_overdown.png</Pressed>
-                                        <Unpressed>btn_pfl1_over.png</Unpressed>
-                                    </State>
-                                    <Connection>
-                                        <ConfigKey>[Channel<Variable name="channum"/>],pfl</ConfigKey>
-                                    </Connection>
-                                </PushButton>
-                            </Children>
-                        </WidgetGroup>
-                        <Template src="skin:knob_sized.xml">
-                           <SetVariable name="width">48</SetVariable>
-                           <SetVariable name="height">41</SetVariable>
-                           <SetVariable name="group">[Channel<Variable name="channum"/>]</SetVariable>
-                           <SetVariable name="control">pregain</SetVariable>
-                           <SetVariable name="label">gain</SetVariable>
-                        </Template>
-                    </Children>
-                </WidgetGroup>
-                <Template src="skin:eq_knob.xml">
-                    <SetVariable name="parameter">4</SetVariable>
-                </Template>
-                <Template src="skin:eq_knob.xml">
-                    <SetVariable name="parameter">3</SetVariable>
-                </Template>
-                <Template src="skin:eq_knob.xml">
-                    <SetVariable name="parameter">2</SetVariable>
-                </Template>
-                <Template src="skin:eq_knob.xml">
-                    <SetVariable name="parameter">1</SetVariable>
-                </Template>
-                <WidgetGroup>
-                  <Layout>horizontal</Layout>
-                  <SizePolicy>min,me</SizePolicy>
-                  <Children/>
-                </WidgetGroup>
-              </Children>
-            </WidgetGroup>
-            <SliderComposed>   <!-- Volume -->
-                <TooltipId>channel_volume</TooltipId>
-                <Handle>knob_volume1.png</Handle>
-                <Slider>slider_volume1.png</Slider>
-                <Horizontal>false</Horizontal>
-                <Connection>
-                  <ConfigKey>[Channel<Variable name="channum"/>],volume</ConfigKey>
-                </Connection>
-              </SliderComposed>
-            <WidgetGroup>    <!-- VU Meter -->
-                <Layout>vertical</Layout>
-                <SizePolicy>max,max</SizePolicy>
-                <Size>18,0</Size>
-                <Children>
-                    <StatusLight>
-                        <TooltipId>channel_PeakIndicator</TooltipId>
-                        <PathStatusLight>btn_clipping1_over.png</PathStatusLight>
-                        <PathBack>btn_clipping1.png</PathBack>
-                        <Connection>
-                            <ConfigKey>[Channel<Variable name="channum"/>],PeakIndicator</ConfigKey>
-                        </Connection>
-                    </StatusLight>
-                    <VuMeter>
-                        <TooltipId>channel_VuMeter</TooltipId>
-                        <PathVu>btn_volume_display1_over.png</PathVu>
-                        <PathBack>btn_volume_display1.png</PathBack>
-                        <Horizontal>false</Horizontal>
-                        <PeakHoldSize>5</PeakHoldSize>
-                        <PeakHoldTime>500</PeakHoldTime>
-                        <PeakFallTime>50</PeakFallTime>
-                        <PeakFallStep>2</PeakFallStep>
-                        <Connection>
-                            <ConfigKey>[Channel<Variable name="channum"/>],VuMeter</ConfigKey>
-                        </Connection>
-                    </VuMeter>
-                </Children>
-            </WidgetGroup>
-          </Children>
-          <Connection>
-            <ConfigKey>[Master],show_4decks</ConfigKey>
-            <BindProperty>visible</BindProperty>
-            <Transform>
-                <Not/>
-            </Transform>
-          </Connection>
-      </WidgetGroup> <!-- /Channel1 mixer side-by-side -->
-
-      <WidgetGroup>
-          <Layout>horizontal</Layout>
-          <SizePolicy>min,max</SizePolicy>
-          <Children>
-              <Template src="skin:mixer_channel_vertical.xml"/>
-          </Children>
-          <Connection>
-            <ConfigKey>[Master],show_4decks</ConfigKey>
-            <BindProperty>visible</BindProperty>
-          </Connection>
-      </WidgetGroup>
-    </Children>
-  </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..765bb8301fd6
--- /dev/null
+++ b/res/skins/LateNight/mixer_channel_4decks.xml
@@ -0,0 +1,148 @@
+<Template>
+  <SetVariable name="group">[Channel<Variable name="channum"/>]</SetVariable>
+  <WidgetGroup>
+    <ObjectName>MixerChannel</ObjectName>
+    <Layout>vertical</Layout>
+    <SizePolicy>min,min</SizePolicy>
+    <Children>
+
+      <WidgetGroup>
+        <Size>0min,0me</Size>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,max</SizePolicy>
+        <Children>
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <Children>
+              <PushButton>
+                <TooltipId>pfl</TooltipId>
+                <NumberStates>2</NumberStates>
+                <State>
+                  <Number>0</Number>
+                  <Pressed>buttons/btn_pfl1_down.png</Pressed>
+                  <Unpressed>buttons/btn_pfl1.png</Unpressed>
+                </State>
+                <State>
+                  <Number>1</Number>
+                  <Pressed>buttons/btn_pfl1_overdown.png</Pressed>
+                  <Unpressed>buttons/btn_pfl1_over.png</Unpressed>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,pfl</ConfigKey>
+                </Connection>
+              </PushButton>
+              <!-- Spacer to put the PFL button a little bit higher -->
+              <WidgetGroup>
+                <Layout>vertical</Layout>
+                <Size>1min,8f</Size>
+                <Children/>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup>
+          <Template src="skin:knob.xml">
+            <SetVariable name="Size">40f,34f</SetVariable>
+            <SetVariable name="group"><Variable name="group"/></SetVariable>
+            <SetVariable name="control">pregain</SetVariable>
+            <SetVariable name="label">gain</SetVariable>
+            <SetVariable name="TooltipId">pregain</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+
+      <Template src="skin:eq_knob_left.xml">
+        <SetVariable name="FxParameter">4</SetVariable>
+      </Template>
+
+      <Template src="skin:eq_knob_left.xml">
+        <SetVariable name="FxParameter">3</SetVariable>
+      </Template>
+
+      <Template src="skin:eq_knob_left.xml">
+        <SetVariable name="FxParameter">2</SetVariable>
+      </Template>
+
+      <Template src="skin:eq_knob_left.xml">
+        <SetVariable name="FxParameter">1</SetVariable>
+      </Template>
+
+      <Template src="skin:quick_effect_knob_left.xml"/>
+
+      <!-- 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>VuAndSlider</ObjectName>
+        <Layout>horizontal</Layout>
+        <Children>
+          <WidgetGroup>
+            <ObjectName>VuMeter</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,max</SizePolicy>
+            <Size>26,0</Size>
+            <Children>
+              <StatusLight>
+                <TooltipId>channel_PeakIndicator</TooltipId>
+                <PathStatusLight>buttons/btn_clipping1_over.png</PathStatusLight>
+                <PathBack>buttons/btn_clipping1.png</PathBack>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,PeakIndicator</ConfigKey>
+                </Connection>
+              </StatusLight>
+              <VuMeter>
+                <TooltipId>channel_VuMeter</TooltipId>
+                <PathVu>buttons/btn_volume_display1_over.png</PathVu>
+                <PathBack>buttons/btn_volume_display1.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>
+
+          <SliderComposed>
+            <TooltipId>channel_volume</TooltipId>
+            <Handle>knob_volume1.png</Handle>
+            <Slider>slider_volume1.png</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
new file mode 100644
index 000000000000..c2a5e3a07a48
--- /dev/null
+++ b/res/skins/LateNight/mixer_channel_left.xml
@@ -0,0 +1,183 @@
+<!--  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>max,min</SizePolicy>
+    <Layout>horizontal</Layout>
+    <Children>
+
+      <WidgetGroup><!--  Channel1 controls side-by-side-->
+        <ObjectName>MixerChannelHoriz</ObjectName>
+        <Layout>horizontal</Layout>
+        <Children>
+
+          <WidgetGroup><!-- EQs -->
+            <Layout>vertical</Layout>
+            <ObjectName>MixerChannel</ObjectName>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+
+              <!-- 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,34f</Size>
+                    <Children/>
+                    <Connection>
+                      <ConfigKey>[QuickEffectRack1_<Variable name="group"/>_Effect1],loaded</ConfigKey>
+                      <Transform><Not/></Transform>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup>
+                </Children>
+                <Connection>
+                  <ConfigKey>[EqualizerRack1_<Variable name="group"/>_Effect1],parameter4_loaded</ConfigKey>
+                  <Transform><Not/></Transform>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+
+              <Template src="skin:eq_knob_left.xml">
+                <SetVariable name="FxParameter">4</SetVariable>
+              </Template>
+
+              <Template src="skin:eq_knob_left.xml">
+                <SetVariable name="FxParameter">3</SetVariable>
+              </Template>
+
+              <Template src="skin:eq_knob_left.xml">
+                <SetVariable name="FxParameter">2</SetVariable>
+              </Template>
+
+              <Template src="skin:eq_knob_left.xml">
+                <SetVariable name="FxParameter">1</SetVariable>
+              </Template>
+
+              <Template src="skin:quick_effect_knob_left.xml"/>
+
+              <!-- Spacer -->
+              <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
+            </Children>
+          </WidgetGroup><!-- /EQs -->
+
+          <WidgetGroup><!-- Gain knob + Vol fader -->
+            <ObjectName>AlignCenterTop</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <Template src="skin:knob_textless.xml">
+                <SetVariable name="Size">40f,34f</SetVariable>
+                <SetVariable name="group"><Variable name="group"/></SetVariable>
+                <SetVariable name="control">pregain</SetVariable>
+                <SetVariable name="TooltipId">pregain</SetVariable>
+              </Template>
+
+              <!-- Spacer -->
+              <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
+
+              <SliderComposed>   <!-- Volume -->
+                <TooltipId>channel_volume</TooltipId>
+                <Handle>knob_volume1.png</Handle>
+                <Slider>slider_volume1.png</Slider>
+                <Horizontal>false</Horizontal>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,volume</ConfigKey>
+                </Connection>
+              </SliderComposed>
+            </Children>
+          </WidgetGroup><!-- /Gain knob + Vol fader -->
+
+          <WidgetGroup><!-- Pfl button + VU Meter -->
+            <ObjectName>PFLVUMeterBox</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <PushButton>
+                <TooltipId>pfl</TooltipId>
+                <NumberStates>2</NumberStates>
+                <State>
+                  <Number>0</Number>
+                  <Pressed>buttons/btn_pfl1_down.png</Pressed>
+                  <Unpressed>buttons/btn_pfl1.png</Unpressed>
+                </State>
+                <State>
+                  <Number>1</Number>
+                  <Pressed>buttons/btn_pfl1_overdown.png</Pressed>
+                  <Unpressed>buttons/btn_pfl1_over.png</Unpressed>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,pfl</ConfigKey>
+                </Connection>
+              </PushButton>
+
+              <!-- Spacer -->
+              <WidgetGroup>
+                <Layout>vertical</Layout>
+                <Size>1min,0me</Size>
+                <Children/>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <ObjectName>VUMeterBox</ObjectName>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <StatusLight>
+                    <TooltipId>channel_PeakIndicator</TooltipId>
+                    <PathStatusLight>buttons/btn_clipping1_over.png</PathStatusLight>
+                    <PathBack>buttons/btn_clipping1.png</PathBack>
+                    <Connection>
+                      <ConfigKey><Variable name="group"/>,PeakIndicator</ConfigKey>
+                    </Connection>
+                  </StatusLight>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <ObjectName>VUMeterBox</ObjectName>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <VuMeter>
+                    <TooltipId>channel_VuMeter</TooltipId>
+                    <PathVu>buttons/btn_volume_display1_over.png</PathVu>
+                    <PathBack>buttons/btn_volume_display1.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><!-- /Pfl button + VU Meter -->
+        </Children>
+        <Connection>
+          <ConfigKey>[Master],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>[Master],show_4decks</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/mixer_channel_reversed.xml b/res/skins/LateNight/mixer_channel_reversed.xml
deleted file mode 100644
index 387052fa55bd..000000000000
--- a/res/skins/LateNight/mixer_channel_reversed.xml
+++ /dev/null
@@ -1,136 +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,me</SizePolicy>
-    <Layout>horizontal</Layout>
-    <Children>
-      <WidgetGroup>  <!--  Channel2 controls side-by-side-->
-        <ObjectName>MixerChannelHoriz</ObjectName>
-        <Layout>horizontal</Layout>
-          <Children>
-            <WidgetGroup> <!-- VU Meter -->
-                <Layout>vertical</Layout>
-                <SizePolicy>max,max</SizePolicy>
-                <Size>18,0</Size>
-                <Children>
-                    <StatusLight>
-                        <TooltipId>channel_PeakIndicator</TooltipId>
-                        <PathStatusLight>btn_clipping1_over.png</PathStatusLight>
-                        <PathBack>btn_clipping1.png</PathBack>
-                        <Connection>
-                            <ConfigKey>[Channel<Variable name="channum"/>],PeakIndicator</ConfigKey>
-                        </Connection>
-                    </StatusLight>
-                    <VuMeter>
-                        <TooltipId>channel_VuMeter</TooltipId>
-                        <PathVu>btn_volume_display1_over.png</PathVu>
-                        <PathBack>btn_volume_display1.png</PathBack>
-                        <Horizontal>false</Horizontal>
-                        <PeakHoldSize>5</PeakHoldSize>
-                        <PeakHoldTime>500</PeakHoldTime>
-                        <PeakFallTime>50</PeakFallTime>
-                        <PeakFallStep>2</PeakFallStep>
-                        <Connection>
-                            <ConfigKey>[Channel<Variable name="channum"/>],VuMeter</ConfigKey>
-                        </Connection>
-                    </VuMeter>
-                </Children>
-            </WidgetGroup>
-            <SliderComposed>  <!-- Volume slider -->
-                <TooltipId>channel_volume</TooltipId>
-                <Handle>knob_volume1.png</Handle>
-                <Slider>slider_volume1.png</Slider>
-                <Horizontal>false</Horizontal>
-                <Connection>
-                  <ConfigKey>[Channel<Variable name="channum"/>],volume</ConfigKey>
-                </Connection>
-            </SliderComposed>
-            <WidgetGroup>  <!-- EQs -->
-              <Layout>vertical</Layout>
-              <ObjectName>MixerChannelReversed</ObjectName>
-              <SizePolicy>min,min</SizePolicy>
-              <Children>
-                <WidgetGroup>
-                    <Layout>horizontal</Layout>
-                    <SizePolicy>min,max</SizePolicy>
-                    <Children>
-                        <WidgetGroup>
-                            <Layout>horizontal</Layout>
-                            <Children>
-                                <PushButton>
-                                    <TooltipId>pfl</TooltipId>
-                                    <NumberStates>2</NumberStates>
-                                    <State>
-                                        <Number>0</Number>
-                                        <Pressed>btn_pfl1_down.png</Pressed>
-                                        <Unpressed>btn_pfl1.png</Unpressed>
-                                    </State>
-                                    <State>
-                                        <Number>1</Number>
-                                        <Pressed>btn_pfl1_overdown.png</Pressed>
-                                        <Unpressed>btn_pfl1_over.png</Unpressed>
-                                    </State>
-                                    <Connection>
-                                        <ConfigKey>[Channel<Variable name="channum"/>],pfl</ConfigKey>
-                                    </Connection>
-                                </PushButton>
-                            </Children>
-                        </WidgetGroup>
-                        <Template src="skin:knob_sized.xml">
-                           <SetVariable name="width">48</SetVariable>
-                           <SetVariable name="height">41</SetVariable>
-                           <SetVariable name="group">[Channel<Variable name="channum"/>]</SetVariable>
-                           <SetVariable name="control">pregain</SetVariable>
-                           <SetVariable name="label">gain</SetVariable>
-                        </Template>
-                    </Children>
-                </WidgetGroup>
-                <Template src="skin:eq_knob.xml">
-                    <SetVariable name="parameter">4</SetVariable>
-                    <SetVariable name="reversed">Reversed</SetVariable>
-                </Template>
-                <Template src="skin:eq_knob.xml">
-                    <SetVariable name="parameter">3</SetVariable>
-                    <SetVariable name="reversed">Reversed</SetVariable>
-                </Template>
-                <Template src="skin:eq_knob.xml">
-                    <SetVariable name="parameter">2</SetVariable>
-                    <SetVariable name="reversed">Reversed</SetVariable>
-                </Template>
-                <Template src="skin:eq_knob.xml">
-                    <SetVariable name="parameter">1</SetVariable>
-                    <SetVariable name="reversed">Reversed</SetVariable>
-                </Template>
-                <WidgetGroup>
-                  <Layout>horizontal</Layout>
-                  <SizePolicy>min,me</SizePolicy>
-                  <Children/>
-                </WidgetGroup>
-              </Children>
-            </WidgetGroup>
-          </Children>
-          <Connection>
-            <ConfigKey>[Master],show_4decks</ConfigKey>
-            <BindProperty>visible</BindProperty>
-            <Transform>
-                <Not/>
-            </Transform>
-          </Connection>
-      </WidgetGroup> <!-- /Channel2 mixer side-by-side -->
-      <WidgetGroup>
-          <Layout>horizontal</Layout>
-          <SizePolicy>min,max</SizePolicy>
-          <Children>
-              <Template src="skin:mixer_channel_vertical.xml"/>
-          </Children>
-          <Connection>
-            <ConfigKey>[Master],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..10a674a88a2d
--- /dev/null
+++ b/res/skins/LateNight/mixer_channel_right.xml
@@ -0,0 +1,184 @@
+<!--  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>max,min</SizePolicy>
+    <Layout>horizontal</Layout>
+    <Children>
+
+      <WidgetGroup><!--  Channel2 controls side-by-side-->
+        <ObjectName>MixerChannelHoriz</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,max</SizePolicy>
+        <Children>
+
+          <WidgetGroup><!-- Pfl button + VU Meter -->
+            <ObjectName>PFLVUMeterBox</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <PushButton>
+                <TooltipId>pfl</TooltipId>
+                <NumberStates>2</NumberStates>
+                <State>
+                  <Number>0</Number>
+                  <Pressed>buttons/btn_pfl1_down.png</Pressed>
+                  <Unpressed>buttons/btn_pfl1.png</Unpressed>
+                </State>
+                <State>
+                  <Number>1</Number>
+                  <Pressed>buttons/btn_pfl1_overdown.png</Pressed>
+                  <Unpressed>buttons/btn_pfl1_over.png</Unpressed>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,pfl</ConfigKey>
+                </Connection>
+              </PushButton>
+
+              <!-- Spacer -->
+              <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
+
+              <WidgetGroup>
+                <ObjectName>VUMeterBox</ObjectName>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <StatusLight>
+                    <TooltipId>channel_PeakIndicator</TooltipId>
+                    <PathStatusLight>buttons/btn_clipping1_over.png</PathStatusLight>
+                    <PathBack>buttons/btn_clipping1.png</PathBack>
+                    <Connection>
+                      <ConfigKey><Variable name="group"/>,PeakIndicator</ConfigKey>
+                    </Connection>
+                  </StatusLight>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <ObjectName>VUMeterBox</ObjectName>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <VuMeter>
+                    <TooltipId>channel_VuMeter</TooltipId>
+                    <PathVu>buttons/btn_volume_display1_over.png</PathVu>
+                    <PathBack>buttons/btn_volume_display1.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><!-- /Pfl button + VU Meter -->
+
+          <WidgetGroup><!-- Gain knob + Vol fader -->
+            <ObjectName>AlignCenterTop</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <Template src="skin:knob_textless.xml">
+                <SetVariable name="Size">40f,34f</SetVariable>
+                <SetVariable name="group"><Variable name="group"/></SetVariable>
+                <SetVariable name="control">pregain</SetVariable>
+                <SetVariable name="TooltipId">pregain</SetVariable>
+              </Template>
+
+              <!-- Spacer -->
+              <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
+
+              <SliderComposed><!-- Volume -->
+                <TooltipId>channel_volume</TooltipId>
+                <Handle>knob_volume1.png</Handle>
+                <Slider>slider_volume1.png</Slider>
+                <Horizontal>false</Horizontal>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,volume</ConfigKey>
+                </Connection>
+              </SliderComposed>
+            </Children>
+          </WidgetGroup><!-- /Gain knob + Vol fader -->
+
+          <WidgetGroup><!-- EQs -->
+            <Layout>vertical</Layout>
+            <ObjectName>MixerChannelReversed</ObjectName>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+
+              <!-- 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,34f</Size>
+                    <Children/>
+                    <Connection>
+                      <ConfigKey>[QuickEffectRack1_<Variable name="group"/>_Effect1],loaded</ConfigKey>
+                      <Transform><Not/></Transform>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup>
+                </Children>
+                <Connection>
+                  <ConfigKey>[EqualizerRack1_<Variable name="group"/>_Effect1],parameter4_loaded</ConfigKey>
+                  <Transform><Not/></Transform>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+
+              <Template src="skin:eq_knob_right.xml">
+                <SetVariable name="FxParameter">4</SetVariable>
+              </Template>
+
+              <Template src="skin:eq_knob_right.xml">
+                <SetVariable name="FxParameter">3</SetVariable>
+              </Template>
+
+              <Template src="skin:eq_knob_right.xml">
+                <SetVariable name="FxParameter">2</SetVariable>
+              </Template>
+
+              <Template src="skin:eq_knob_right.xml">
+                <SetVariable name="FxParameter">1</SetVariable>
+              </Template>
+
+              <Template src="skin:quick_effect_knob_right.xml"/>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <SizePolicy>min,me</SizePolicy>
+                <Children/>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup><!-- /EQs -->
+
+        </Children>
+        <Connection>
+          <ConfigKey>[Master],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>[Master],show_4decks</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/mixer_channel_vertical.xml b/res/skins/LateNight/mixer_channel_vertical.xml
deleted file mode 100644
index 40325c560c54..000000000000
--- a/res/skins/LateNight/mixer_channel_vertical.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<Template>
-    <SetVariable name="group">[Channel<Variable name="channum"/>]</SetVariable>
-    <WidgetGroup>
-        <ObjectName>MixerChannel</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-            <WidgetGroup>
-                <Layout>horizontal</Layout>
-                <SizePolicy>min,max</SizePolicy>
-                <Children>
-                    <WidgetGroup>
-                        <Layout>horizontal</Layout>
-                        <Children>
-                            <PushButton>
-                                <TooltipId>pfl</TooltipId>
-                                <NumberStates>2</NumberStates>
-                                <State>
-                                    <Number>0</Number>
-                                    <Pressed>btn_pfl1_down.png</Pressed>
-                                    <Unpressed>btn_pfl1.png</Unpressed>
-                                </State>
-                                <State>
-                                    <Number>1</Number>
-                                    <Pressed>btn_pfl1_overdown.png</Pressed>
-                                    <Unpressed>btn_pfl1_over.png</Unpressed>
-                                </State>
-                                <Connection>
-                                    <ConfigKey>[Channel<Variable name="channum"/>],pfl</ConfigKey>
-                                </Connection>
-                            </PushButton>
-                        </Children>
-                    </WidgetGroup>
-                    <Template src="skin:knob_sized.xml">
-                       <SetVariable name="width">48</SetVariable>
-                       <SetVariable name="height">41</SetVariable>
-                       <SetVariable name="group">[Channel<Variable name="channum"/>]</SetVariable>
-                       <SetVariable name="control">pregain</SetVariable>
-                       <SetVariable name="label">gain</SetVariable>
-                    </Template>
-                </Children>
-            </WidgetGroup>
-            <Template src="skin:eq_knob.xml">
-                <SetVariable name="parameter">4</SetVariable>
-            </Template>
-            <Template src="skin:eq_knob.xml">
-                <SetVariable name="parameter">3</SetVariable>
-            </Template>
-            <Template src="skin:eq_knob.xml">
-                <SetVariable name="parameter">2</SetVariable>
-            </Template>
-            <Template src="skin:eq_knob.xml">
-                <SetVariable name="parameter">1</SetVariable>
-            </Template>
-            <WidgetGroup>
-                <Layout>horizontal</Layout>
-                <ObjectName>VuAndSlider</ObjectName>
-                <Children>
-                    <WidgetGroup>
-                        <ObjectName>VuMeter</ObjectName>
-                        <Layout>vertical</Layout>
-                        <SizePolicy>min,max</SizePolicy>
-                        <Size>26,0</Size>
-                        <Children>
-                            <StatusLight>
-                                <TooltipId>channel_PeakIndicator</TooltipId>
-                                <PathStatusLight>btn_clipping1_over.png</PathStatusLight>
-                                <PathBack>btn_clipping1.png</PathBack>
-                                <Connection>
-                                    <ConfigKey>[Channel<Variable name="channum"/>],PeakIndicator</ConfigKey>
-                                </Connection>
-                            </StatusLight>
-                            <VuMeter>
-                                <TooltipId>channel_VuMeter</TooltipId>
-                                <PathVu>btn_volume_display1_over.png</PathVu>
-                                <PathBack>btn_volume_display1.png</PathBack>
-                                <Horizontal>false</Horizontal>
-                                <PeakHoldSize>5</PeakHoldSize>
-                                <PeakHoldTime>500</PeakHoldTime>
-                                <PeakFallTime>50</PeakFallTime>
-                                <PeakFallStep>2</PeakFallStep>
-                                <Connection>
-                                    <ConfigKey>[Channel<Variable name="channum"/>],VuMeter</ConfigKey>
-                                </Connection>
-                            </VuMeter>
-                        </Children>
-                    </WidgetGroup>
-                    <SliderComposed>
-                        <TooltipId>channel_volume</TooltipId>
-                        <Handle>knob_volume1.png</Handle>
-                        <Slider>slider_volume1.png</Slider>
-                        <Horizontal>false</Horizontal>
-                        <Connection>
-                          <ConfigKey>[Channel<Variable name="channum"/>],volume</ConfigKey>
-                        </Connection>
-                      </SliderComposed>
-                </Children>
-            </WidgetGroup>
-        </Children>
-    </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/preview_deck.xml b/res/skins/LateNight/preview_deck.xml
index 601e8effe56f..bcde58622323 100644
--- a/res/skins/LateNight/preview_deck.xml
+++ b/res/skins/LateNight/preview_deck.xml
@@ -2,9 +2,9 @@
   <!-- This outer widget group makes the PreviewDeck borders work correctly -->
   <WidgetGroup>
     <Layout>vertical</Layout>
-    <SizePolicy>me,min</SizePolicy>
-    <MaximumSize>,80</MaximumSize>
+    <SizePolicy>me,max</SizePolicy>
     <Children>
+
       <WidgetGroup>
         <ObjectName>PreviewDeck</ObjectName>
         <Layout>horizontal</Layout>
@@ -60,8 +60,8 @@
                         <NumberStates>1</NumberStates>
                         <State>
                           <Number>0</Number>
-                          <Pressed>btn_eject1_over.png</Pressed>
-                          <Unpressed>btn_eject1.png</Unpressed>
+                          <Pressed>buttons/btn_eject1_over.png</Pressed>
+                          <Unpressed>buttons/btn_eject1.png</Unpressed>
                         </State>
                         <Connection>
                           <ConfigKey>[PreviewDeck1],eject</ConfigKey>
@@ -84,13 +84,13 @@
                     <RightClickIsPushButton>true</RightClickIsPushButton>
                     <State>
                       <Number>0</Number>
-                      <Pressed>btn_play_sampler_down.png</Pressed>
-                      <Unpressed>btn_play_sampler.png</Unpressed>
+                      <Pressed>buttons/btn_play_sampler_down.png</Pressed>
+                      <Unpressed>buttons/btn_play_sampler.png</Unpressed>
                     </State>
                     <State>
                       <Number>1</Number>
-                      <Pressed>btn_play_sampler_overdown.png</Pressed>
-                      <Unpressed>btn_play_sampler_over.png</Unpressed>
+                      <Pressed>buttons/btn_play_sampler_overdown.png</Pressed>
+                      <Unpressed>buttons/btn_play_sampler_over.png</Unpressed>
                     </State>
                     <Connection>
                       <ConfigKey>[PreviewDeck1],play</ConfigKey>
@@ -144,8 +144,8 @@
                 <Children>
                   <StatusLight>
                     <TooltipId>preview_PeakIndicator</TooltipId>
-                    <PathStatusLight>btn_clipping_previewdeck_over.png</PathStatusLight>
-                    <PathBack>btn_clipping_previewdeck.png</PathBack>
+                    <PathStatusLight>buttons/btn_clipping_previewdeck_over.png</PathStatusLight>
+                    <PathBack>buttons/btn_clipping_previewdeck.png</PathBack>
                     <Connection>
                       <ConfigKey>[PreviewDeck1],PeakIndicator</ConfigKey>
                     </Connection>
@@ -153,8 +153,8 @@
 
                   <VuMeter>
                     <TooltipId>preview_VuMeter</TooltipId>
-                    <PathVu>btn_volume_display_previewdeck_over.png</PathVu>
-                    <PathBack>btn_volume_display_previewdeck.png</PathBack>
+                    <PathVu>buttons/btn_volume_display_previewdeck_over.png</PathVu>
+                    <PathBack>buttons/btn_volume_display_previewdeck.png</PathBack>
                     <Horizontal>false</Horizontal>
                     <PeakHoldSize>3</PeakHoldSize>
                     <PeakHoldTime>250</PeakHoldTime>
@@ -180,6 +180,7 @@
           </WidgetGroup>
         </Children>
       </WidgetGroup>
+
     </Children>
     <Connection>
       <ConfigKey>[PreviewDeck],show_previewdeck</ConfigKey>
diff --git a/res/skins/LateNight/quick_effect_knob_left.xml b/res/skins/LateNight/quick_effect_knob_left.xml
new file mode 100644
index 000000000000..38f102a4e3cb
--- /dev/null
+++ b/res/skins/LateNight/quick_effect_knob_left.xml
@@ -0,0 +1,92 @@
+<!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>
+            <ObjectName>KillButtonLeft</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <MinimumSize>26,30</MinimumSize>
+            <Children>
+              <PushButton>
+                <TooltipId>QuickEffectRack_enabled</TooltipId>
+                <Size>18f,18f</Size>
+                <NumberStates>2</NumberStates>
+                <State>
+                  <Number>0</Number>
+                  <Pressed>buttons/btn_kill_down.png</Pressed>
+                  <Unpressed>buttons/btn_kill.png</Unpressed>
+                </State>
+                <State>
+                  <Number>1</Number>
+                  <Pressed>buttons/btn_quickEffect_overdown.png</Pressed>
+                  <Unpressed>buttons/btn_quickEffect_over.png</Unpressed>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="QuickEffect"/>,enabled</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+              </PushButton>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <SizePolicy>me,min</SizePolicy>
+            <Children>
+              <Template src="skin:knob_textless.xml">
+                <SetVariable name="Size">40f,34f</SetVariable>
+                <SetVariable name="group"><Variable name="QuickEffectGroup"/></SetVariable>
+                <SetVariable name="control">super1</SetVariable>
+                <SetVariable name="TooltipId">QuickEffectRack_super1</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+        </Children>
+        <Connection>
+          <ConfigKey><Variable name="QuickEffect"/>,loaded</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- /Kill button + knob -->
+
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <SizePolicy>me,f</SizePolicy>
+        <!--MaximumSize>64,12</MaximumSize-->
+        <Children>
+          <WidgetGroup>
+            <Size>0me,0min</Size>
+            <Children/>
+          </WidgetGroup>
+
+          <EffectName>
+            <ObjectName>KnobLabel</ObjectName>
+            <Size>40min,12f</Size>
+            <EffectRackGroup>[QuickEffectRack1]</EffectRackGroup>
+            <EffectUnitGroup><Variable name="QuickEffectGroup"/></EffectUnitGroup>
+            <Effect>1</Effect>
+          </EffectName>
+        </Children>
+        <Connection>
+          <ConfigKey><Variable name="QuickEffect"/>,loaded</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+    </Children>
+    <Connection>
+      <ConfigKey>[Master],show_eqs</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
new file mode 100644
index 000000000000..efe744e99b3a
--- /dev/null
+++ b/res/skins/LateNight/quick_effect_knob_right.xml
@@ -0,0 +1,92 @@
+<!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>
+            <Layout>horizontal</Layout>
+            <SizePolicy>me,min</SizePolicy>
+            <Children>
+              <Template src="skin:knob_textless.xml">
+                <SetVariable name="Size">40f,34f</SetVariable>
+                <SetVariable name="group"><Variable name="QuickEffectGroup"/></SetVariable>
+                <SetVariable name="control">super1</SetVariable>
+                <SetVariable name="TooltipId">QuickEffectRack_super1</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>KillButtonRight</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <MinimumSize>26,30</MinimumSize>
+            <Children>
+              <PushButton>
+                <TooltipId>QuickEffectRack_enabled</TooltipId>
+                <Size>18f,18f</Size>
+                <NumberStates>2</NumberStates>
+                <State>
+                  <Number>0</Number>
+                  <Pressed>buttons/btn_kill_down.png</Pressed>
+                  <Unpressed>buttons/btn_kill.png</Unpressed>
+                </State>
+                <State>
+                  <Number>1</Number>
+                  <Pressed>buttons/btn_quickEffect_overdown.png</Pressed>
+                  <Unpressed>buttons/btn_quickEffect_over.png</Unpressed>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="QuickEffect"/>,enabled</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+              </PushButton>
+            </Children>
+          </WidgetGroup>
+
+        </Children>
+        <Connection>
+          <ConfigKey><Variable name="QuickEffect"/>,loaded</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- /Kill button + knob -->
+
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <SizePolicy>me,f</SizePolicy>
+        <!--MaximumSize>64,12</MaximumSize-->
+        <Children>
+          <EffectName>
+            <ObjectName>KnobLabel</ObjectName>
+            <Size>40min,12f</Size>
+            <EffectRackGroup>[QuickEffectRack1]</EffectRackGroup>
+            <EffectUnitGroup><Variable name="QuickEffectGroup"/></EffectUnitGroup>
+            <Effect>1</Effect>
+          </EffectName>
+
+          <WidgetGroup>
+            <Size>0me,0min</Size>
+            <Children/>
+          </WidgetGroup>
+        </Children>
+        <Connection>
+          <ConfigKey><Variable name="QuickEffect"/>,loaded</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+    </Children>
+    <Connection>
+      <ConfigKey>[Master],show_eqs</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/sampler.xml b/res/skins/LateNight/sampler.xml
index 95abee4c415f..d8a452afd66e 100644
--- a/res/skins/LateNight/sampler.xml
+++ b/res/skins/LateNight/sampler.xml
@@ -1,414 +1,426 @@
 <Template>
-	<WidgetGroup>
-		<Layout>horizontal</Layout>
-		<SizePolicy>me,min</SizePolicy>
-		<ObjectName>SamplerDeck</ObjectName>
-		<MinimumSize>280,100</MinimumSize>
-		<Children>
-			<!-- Most of the controls -->
-			<WidgetGroup>
-			    <Layout>vertical</Layout>
-			    <SizePolicy>me,min</SizePolicy>
-			    <ObjectName>SamplerMainControls</ObjectName>
-			    <Children>
-			        <WidgetGroup>
-                        <Layout>horizontal</Layout>
-                        <SizePolicy>me,min</SizePolicy>
-                        <ObjectName>SamplerText</ObjectName>
-                        <Children>
-					        <Text>
-			                    <TooltipId>text</TooltipId>
-			                    <Style>QLabel { font: bold 16px/19px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
-			                    background-color: transparent; color: #EECE33; text-align: left; padding-left: 1px; }
-			                    </Style>
-			                    <Group>[Sampler<Variable name="samplernum"/>]</Group>
-			                </Text>
-		                </Children>
-	                </WidgetGroup>
-	                <!-- Second Row -->
-	                <WidgetGroup>
-	                    <Layout>horizontal</Layout>
-	                    <SizePolicy>me,min</SizePolicy>
-	                    <ObjectName>SamplerRowTwo</ObjectName>
-	                    <Children>
-	                        <WidgetGroup>
-                                <Layout>horizontal</Layout>
-	                            <ObjectName>SamplerPlay</ObjectName>
-	                            <SizePolicy>min,min</SizePolicy>
-	                            <Children>
-			                        <PushButton>
-		                                <TooltipId>play_start</TooltipId>
-		                                <NumberStates>2</NumberStates>
-		                                <RightClickIsPushButton>true</RightClickIsPushButton>
-		                                <State>
-		                                    <Number>0</Number>
-		                                    <Pressed>btn_play_sampler_down.png</Pressed>
-		                                    <Unpressed>btn_play_sampler.png</Unpressed>
-		                                </State>
-		                                <State>
-		                                    <Number>1</Number>
-		                                    <Pressed>btn_play_sampler_overdown.png</Pressed>
-		                                    <Unpressed>btn_play_sampler_over.png</Unpressed>
-		                                </State>
-		                                <Connection>
-		                                    <ConfigKey>[Sampler<Variable name="samplernum"/>],cue_gotoandplay</ConfigKey>
-		                                    <ButtonState>LeftButton</ButtonState>
-		                                </Connection>
-		                                <Connection>
-		                                    <ConfigKey>[Sampler<Variable name="samplernum"/>],start_stop</ConfigKey>
-		                                    <ButtonState>RightButton</ButtonState>
-		                                </Connection>
-                                        <Connection>
-                                            <ConfigKey>[Sampler<Variable name="samplernum"/>],play_indicator</ConfigKey>
-                                        </Connection>
-		                            </PushButton>
-	                            </Children>
-                            </WidgetGroup>
-                            <Overview>
-                                <SizePolicy>me,min</SizePolicy>
-                                <TooltipId>waveform_overview</TooltipId>
-                                <Group>[Sampler<Variable name="samplernum"/>]</Group>
-                                <BgColor></BgColor>
-                                <SignalHighColor></SignalHighColor>
-                                <SignalMidColor></SignalMidColor>
-                                <SignalLowColor></SignalLowColor>
-                                <SignalColor>#EECE33</SignalColor>
-                                <MarkerColor>#00FF00</MarkerColor>
-                                <DefaultMark>
-                                    <Align>bottom</Align>
-                                    <Color>#00FF00</Color>
-                                    <TextColor>#FFFFFF</TextColor>
-                                    <Text> %1 </Text>
-                                </DefaultMark>
-                                <Connection>
-                                    <ConfigKey>[Sampler<Variable name="samplernum"/>],playposition</ConfigKey>
-                                </Connection>
-                            </Overview>
-                            <!-- Button Grid -->
-                            <WidgetGroup>
-                                <Layout>vertical</Layout>
-                                <SizePolicy>min,min</SizePolicy>
-                                <ObjectName>SamplerButtonGrid</ObjectName>
-                                <Children>
-                                    <WidgetGroup>
-                                        <Layout>horizontal</Layout>
-                                        <SizePolicy>min,min</SizePolicy>
-                                        <Children>
-                                            <PushButton>
-				                                <TooltipId>repeat</TooltipId>
-				                                <NumberStates>2</NumberStates>
-				                                <State>
-				                                    <Number>0</Number>
-				                                    <Pressed>btn_repeat_sampler.png</Pressed>
-				                                    <Unpressed>btn_repeat_sampler.png</Unpressed>
-				                                </State>
-				                                <State>
-				                                    <Number>1</Number>
-				                                    <Pressed>btn_repeat_sampler_over.png</Pressed>
-				                                    <Unpressed>btn_repeat_sampler_over.png</Unpressed>
-				                                </State>
-				                                <Connection>
-				                                    <ConfigKey>[Sampler<Variable name="samplernum"/>],repeat</ConfigKey>
-				                                </Connection>
-				                            </PushButton>
-				                            <PushButton>
-				                                <TooltipId>eject</TooltipId>
-				                                <NumberStates>1</NumberStates>
-				                                <State>
-				                                    <Number>0</Number>
-				                                    <Pressed>btn_eject_sampler_over.png</Pressed>
-				                                    <Unpressed>btn_eject_sampler.png</Unpressed>
-				                                </State>
-				                                <Connection>
-				                                    <ConfigKey>[Sampler<Variable name="samplernum"/>],eject</ConfigKey>
-				                                    <ButtonState>LeftButton</ButtonState>
-				                                </Connection>
-				                            </PushButton>
-                                        </Children>
-                                    </WidgetGroup>
-                                    <WidgetGroup>
-                                        <Layout>horizontal</Layout>
-                                        <SizePolicy>min,min</SizePolicy>
-                                        <Children>
-                                            <PushButton>
-				                                <TooltipId>orientation</TooltipId>
-				                                <NumberStates>3</NumberStates>
-				                                <State>
-				                                    <Number>0</Number>
-				                                    <Pressed>btn_orientation_sampler_left_over.png</Pressed>
-				                                    <Unpressed>btn_orientation_sampler_left_over.png</Unpressed>
-				                                </State>
-				                                <State>
-				                                    <Number>1</Number>
-				                                    <Pressed>btn_orientation_sampler_master.png</Pressed>
-				                                    <Unpressed>btn_orientation_sampler_master.png</Unpressed>
-				                                </State>
-				                                <State>
-				                                    <Number>2</Number>
-				                                    <Pressed>btn_orientation_sampler_right_over.png</Pressed>
-				                                    <Unpressed>btn_orientation_sampler_right_over.png</Unpressed>
-				                                </State>
-				                                <Connection>
-				                                    <ConfigKey>[Sampler<Variable name="samplernum"/>],orientation</ConfigKey>
-				                                    <ButtonState>LeftButton</ButtonState>
-				                                </Connection>
-				                            </PushButton>
-				                            <PushButton>
-				                                <TooltipId>keylock</TooltipId>
-				                                <NumberStates>2</NumberStates>
-				                                <State>
-				                                    <Number>0</Number>
-				                                    <Pressed>btn_keylock_sampler.png</Pressed>
-				                                    <Unpressed>btn_keylock_sampler.png</Unpressed>
-				                                </State>
-				                                <State>
-				                                    <Number>1</Number>
-				                                    <Pressed>btn_keylock_sampler_over.png</Pressed>
-				                                    <Unpressed>btn_keylock_sampler_over.png</Unpressed>
-				                                </State>
-				                                <Connection>
-				                                    <ConfigKey>[Sampler<Variable name="samplernum"/>],keylock</ConfigKey>
-				                                </Connection>
-				                            </PushButton>
-			                            </Children>
-		                            </WidgetGroup>
-                                </Children>
-                            </WidgetGroup>
-                            <WidgetGroup>
-                               <Layout>horizontal</Layout>
-                               <SizePolicy>min,min</SizePolicy>
-                               <ObjectName>SamplerVol</ObjectName>
-                               <Children>
-                                    <Template src="skin:knob_textless.xml">
-                                       <SetVariable name="group">[Sampler<Variable name="samplernum"/>]</SetVariable>
-                                       <SetVariable name="control">pregain</SetVariable>
-                                    </Template>
-                               </Children>
-                           </WidgetGroup>
-	                    </Children>
-	                </WidgetGroup>
-	                <!-- Third Row -->
-	                <WidgetGroup>
-	                    <Layout>horizontal</Layout>
-	                    <SizePolicy>me,me</SizePolicy>
-	                    <BackPath>background_tile.png</BackPath>
-	                    <ObjectName>SamplerButtons</ObjectName>
-	                    <Children>
-	                       <WidgetGroup>
-	                           <Layout>horizontal</Layout>
-	                           <SizePolicy>me,min</SizePolicy>
-	                           <ObjectName>SamplerSyncButton</ObjectName>
-	                           <Children>
-	                               <PushButton>
-			                           <TooltipId>beatsync_beatsync_tempo</TooltipId>
-			                           <NumberStates>1</NumberStates>
-			                           <State>
-			                               <Number>0</Number>
-			                               <Pressed>btn_sync_sampler_overdown.png</Pressed>
-			                               <Unpressed>btn_sync_sampler.png</Unpressed>
-			                           </State>
-			                           <Connection>
-			                               <ConfigKey>[Sampler<Variable name="samplernum"/>],beatsync</ConfigKey>
-			                               <ButtonState>LeftButton</ButtonState>
-			                           </Connection>
-			                           <Connection>
-			                               <ConfigKey>[Sampler<Variable name="samplernum"/>],beatsync_tempo</ConfigKey>
-			                               <ButtonState>RightButton</ButtonState>
-			                           </Connection>
-			                       </PushButton>
-	                           </Children>
-	                       </WidgetGroup>
-	                       <WidgetGroup>
-	                           <Layout>horizontal</Layout>
-	                           <SizePolicy>min,min</SizePolicy>
-	                           <ObjectNAme>SamplerHotcues</ObjectNAme>
-	                           <Children>
-	                                <PushButton>
-		                                <TooltipId>hotcue</TooltipId>
-		                                <NumberStates>2</NumberStates>
-		                                <LeftClickIsPushButton>true</LeftClickIsPushButton>
-		                                <RightClickIsPushButton>true</RightClickIsPushButton>
-		                                <State>
-		                                    <Number>0</Number>
-		                                    <Pressed>btn_hotcue1_1_down.png</Pressed>
-		                                    <Unpressed>btn_hotcue1_1.png</Unpressed>
-		                                </State>
-		                                <State>
-		                                    <Number>1</Number>
-		                                    <Pressed>btn_hotcue1_1_overdown.png</Pressed>
-		                                    <Unpressed>btn_hotcue1_1_over.png</Unpressed>
-		                                </State>
-		                                <Connection>
-		                                    <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_1_activate</ConfigKey>
-		                                    <ButtonState>LeftButton</ButtonState>
-		                                </Connection>
-		                                <Connection>
-		                                    <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_1_clear</ConfigKey>
-		                                    <ButtonState>RightButton</ButtonState>
-		                                </Connection>
-		                                <Connection>
-		                                    <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_1_enabled</ConfigKey>
-		                                </Connection>
-		                            </PushButton>
-		                            <PushButton>
-		                                <TooltipId>hotcue</TooltipId>
-		                                <NumberStates>2</NumberStates>
-		                                <LeftClickIsPushButton>true</LeftClickIsPushButton>
-		                                <RightClickIsPushButton>true</RightClickIsPushButton>
-		                                <State>
-		                                    <Number>0</Number>
-		                                    <Pressed>btn_hotcue1_2_down.png</Pressed>
-		                                    <Unpressed>btn_hotcue1_2.png</Unpressed>
-		                                </State>
-		                                <State>
-		                                    <Number>1</Number>
-		                                    <Pressed>btn_hotcue1_2_overdown.png</Pressed>
-		                                    <Unpressed>btn_hotcue1_2_over.png</Unpressed>
-		                                </State>
-		                                <Connection>
-		                                    <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_2_activate</ConfigKey>
-		                                    <ButtonState>LeftButton</ButtonState>
-		                                </Connection>
-		                                <Connection>
-		                                    <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_2_clear</ConfigKey>
-		                                    <ButtonState>RightButton</ButtonState>
-		                                </Connection>
-		                                <Connection>
-		                                    <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_2_enabled</ConfigKey>
-		                                </Connection>
-		                            </PushButton>
-		                            <PushButton>
-		                                <TooltipId>hotcue</TooltipId>
-		                                <NumberStates>2</NumberStates>
-		                                <LeftClickIsPushButton>true</LeftClickIsPushButton>
-		                                <RightClickIsPushButton>true</RightClickIsPushButton>
-		                                <State>
-		                                    <Number>0</Number>
-		                                    <Pressed>btn_hotcue1_3_down.png</Pressed>
-		                                    <Unpressed>btn_hotcue1_3.png</Unpressed>
-		                                </State>
-		                                <State>
-		                                    <Number>1</Number>
-		                                    <Pressed>btn_hotcue1_3_overdown.png</Pressed>
-		                                    <Unpressed>btn_hotcue1_3_over.png</Unpressed>
-		                                </State>
-		                                <Connection>
-		                                    <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_3_activate</ConfigKey>
-		                                    <ButtonState>LeftButton</ButtonState>
-		                                </Connection>
-		                                <Connection>
-		                                    <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_3_clear</ConfigKey>
-		                                    <ButtonState>RightButton</ButtonState>
-		                                </Connection>
-		                                <Connection>
-		                                    <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_3_enabled</ConfigKey>
-		                                </Connection>
-		                            </PushButton>
-		                            <PushButton>
-		                                <TooltipId>hotcue</TooltipId>
-		                                <NumberStates>2</NumberStates>
-		                                <LeftClickIsPushButton>true</LeftClickIsPushButton>
-		                                <RightClickIsPushButton>true</RightClickIsPushButton>
-		                                <State>
-		                                    <Number>0</Number>
-		                                    <Pressed>btn_hotcue1_4_down.png</Pressed>
-		                                    <Unpressed>btn_hotcue1_4.png</Unpressed>
-		                                </State>
-		                                <State>
-		                                    <Number>1</Number>
-		                                    <Pressed>btn_hotcue1_4_overdown.png</Pressed>
-		                                    <Unpressed>btn_hotcue1_4_over.png</Unpressed>
-		                                </State>
-		                                <Connection>
-		                                    <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_4_activate</ConfigKey>
-		                                    <ButtonState>LeftButton</ButtonState>
-		                                </Connection>
-		                                <Connection>
-		                                    <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_4_clear</ConfigKey>
-		                                    <ButtonState>RightButton</ButtonState>
-		                                </Connection>
-		                                <Connection>
-		                                    <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_4_enabled</ConfigKey>
-		                                </Connection>
-		                            </PushButton>
-	                           </Children>
-	                       </WidgetGroup>
-	                       <WidgetGroup>
-	                           <Layout>horizontal</Layout>
-	                           <SizePolicy>min,min</SizePolicy>
-	                           <ObjectName>SamplerPfl</ObjectName>
-	                           <Children>
-	                               <PushButton>
-		                                <TooltipId>pfl</TooltipId>
-		                                <NumberStates>2</NumberStates>
-		                                <State>
-		                                    <Number>0</Number>
-		                                    <Pressed>btn_pfl_sampler_down.png</Pressed>
-		                                    <Unpressed>btn_pfl_sampler.png</Unpressed>
-		                                </State>
-		                                <State>
-		                                    <Number>1</Number>
-		                                    <Pressed>btn_pfl_sampler_overdown.png</Pressed>
-		                                    <Unpressed>btn_pfl_sampler_over.png</Unpressed>
-		                                </State>
-		                                <Connection>
-		                                    <ConfigKey>[Sampler<Variable name="samplernum"/>],pfl</ConfigKey>
-		                                </Connection>
-		                            </PushButton>
-	                           </Children>
-	                       </WidgetGroup>
-	                    </Children>
-	                </WidgetGroup>
-			    </Children>
-			</WidgetGroup>
-			<!-- VU Meter -->
-			<WidgetGroup>
-				<Layout>vertical</Layout>
-				<SizePolicy>min,min</SizePolicy>
-				<ObjectName>SamplerVU</ObjectName>
-				<MinimumSize>22,</MinimumSize>
-				<Children>
-					<StatusLight>
-						<TooltipId>sampler_PeakIndicator</TooltipId>
-						<PathStatusLight>btn_clipping_sampler_over.png</PathStatusLight>
-						<PathBack>btn_clipping_sampler.png</PathBack>
-						<Connection>
-							<ConfigKey>[Sampler<Variable name="samplernum"/>],PeakIndicator</ConfigKey>
-						</Connection>
-					</StatusLight>
-					<VuMeter>
-						<TooltipId>sampler_VuMeter</TooltipId>
-						<PathVu>btn_volume_display_sampler_over.png</PathVu>
-						<PathBack>btn_volume_display_sampler.png</PathBack>
-						<Horizontal>false</Horizontal>
-						<PeakHoldSize>5</PeakHoldSize>
-						<PeakHoldTime>500</PeakHoldTime>
-						<PeakFallTime>50</PeakFallTime>
-						<PeakFallStep>2</PeakFallStep>
-						<Connection>
-							<ConfigKey>[Sampler<Variable name="samplernum"/>],VuMeter</ConfigKey>
-						</Connection>
-					</VuMeter>
-				</Children>
-			</WidgetGroup>
-			<!-- Pitch Control -->
-			<WidgetGroup>
-				<Layout>vertical</Layout>
-				<SizePolicy>min,min</SizePolicy>
-				<ObjectName>SamplerPitch</ObjectName>
-				<MinimumSize>40,</MinimumSize>
-				<Children>
-					<SliderComposed>
-						<TooltipId>rate</TooltipId>
-						<Handle>knob_pitch_sampler.png</Handle>
-						<Slider>slider_pitch_sampler.png</Slider>
-						<Horizontal>false</Horizontal>
-						<Connection>
-							<ConfigKey>[Sampler<Variable name="samplernum"/>],rate</ConfigKey>
-						</Connection>
-					</SliderComposed>
-				</Children>
-			</WidgetGroup>
-		</Children>
-	</WidgetGroup>
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,min</SizePolicy>
+    <ObjectName>SamplerDeck</ObjectName>
+    <MinimumSize>280,100</MinimumSize>
+    <Children>
+      <!-- Most of the controls -->
+      <WidgetGroup>
+        <Layout>vertical</Layout>
+        <SizePolicy>me,min</SizePolicy>
+        <ObjectName>SamplerMainControls</ObjectName>
+        <Children>
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <SizePolicy>me,min</SizePolicy>
+            <ObjectName>SamplerText</ObjectName>
+            <Children>
+              <Text>
+                <TooltipId>text</TooltipId>
+                <Style>QLabel { font: bold 16px/19px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
+                background-color: transparent; color: #EECE33; text-align: left; padding-left: 1px; }
+                </Style>
+                <Group>[Sampler<Variable name="samplernum"/>]</Group>
+              </Text>
+            </Children>
+          </WidgetGroup>
+                <!-- Second Row -->
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <SizePolicy>me,min</SizePolicy>
+            <ObjectName>SamplerRowTwo</ObjectName>
+            <Children>
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <ObjectName>SamplerPlay</ObjectName>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                  <PushButton>
+                    <TooltipId>play_start</TooltipId>
+                    <NumberStates>2</NumberStates>
+                    <RightClickIsPushButton>true</RightClickIsPushButton>
+                    <State>
+                      <Number>0</Number>
+                      <Pressed>buttons/btn_play_sampler_down.png</Pressed>
+                      <Unpressed>buttons/btn_play_sampler.png</Unpressed>
+                    </State>
+                    <State>
+                      <Number>1</Number>
+                      <Pressed>buttons/btn_play_sampler_overdown.png</Pressed>
+                      <Unpressed>buttons/btn_play_sampler_over.png</Unpressed>
+                    </State>
+                    <Connection>
+                      <ConfigKey>[Sampler<Variable name="samplernum"/>],cue_gotoandplay</ConfigKey>
+                      <ButtonState>LeftButton</ButtonState>
+                    </Connection>
+                    <Connection>
+                      <ConfigKey>[Sampler<Variable name="samplernum"/>],start_stop</ConfigKey>
+                      <ButtonState>RightButton</ButtonState>
+                    </Connection>
+                    <Connection>
+                      <ConfigKey>[Sampler<Variable name="samplernum"/>],play_indicator</ConfigKey>
+                    </Connection>
+                  </PushButton>
+                </Children>
+              </WidgetGroup>
+
+              <Overview>
+                <SizePolicy>me,min</SizePolicy>
+                <TooltipId>waveform_overview</TooltipId>
+                <Group>[Sampler<Variable name="samplernum"/>]</Group>
+                <BgColor></BgColor>
+                <SignalHighColor></SignalHighColor>
+                <SignalMidColor></SignalMidColor>
+                <SignalLowColor></SignalLowColor>
+                <SignalColor>#EECE33</SignalColor>
+                <MarkerColor>#00FF00</MarkerColor>
+                <DefaultMark>
+                  <Align>bottom</Align>
+                  <Color>#00FF00</Color>
+                  <TextColor>#FFFFFF</TextColor>
+                  <Text> %1 </Text>
+                </DefaultMark>
+                <Connection>
+                  <ConfigKey>[Sampler<Variable name="samplernum"/>],playposition</ConfigKey>
+                </Connection>
+              </Overview>
+                  <!-- Button Grid -->
+              <WidgetGroup>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <ObjectName>SamplerButtonGrid</ObjectName>
+                <Children>
+                  <WidgetGroup>
+                    <Layout>horizontal</Layout>
+                    <SizePolicy>min,min</SizePolicy>
+                    <Children>
+                      <PushButton>
+                        <TooltipId>repeat</TooltipId>
+                        <NumberStates>2</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Pressed>buttons/btn_repeat_sampler.png</Pressed>
+                          <Unpressed>buttons/btn_repeat_sampler.png</Unpressed>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                          <Pressed>buttons/btn_repeat_sampler_over.png</Pressed>
+                          <Unpressed>buttons/btn_repeat_sampler_over.png</Unpressed>
+                        </State>
+                        <Connection>
+                          <ConfigKey>[Sampler<Variable name="samplernum"/>],repeat</ConfigKey>
+                        </Connection>
+                      </PushButton>
+                      <PushButton>
+                        <TooltipId>eject</TooltipId>
+                        <NumberStates>1</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Pressed>buttons/btn_eject_sampler_over.png</Pressed>
+                          <Unpressed>buttons/btn_eject_sampler.png</Unpressed>
+                        </State>
+                        <Connection>
+                          <ConfigKey>[Sampler<Variable name="samplernum"/>],eject</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                      </PushButton>
+                    </Children>
+                  </WidgetGroup>
+
+                  <WidgetGroup>
+                    <Layout>horizontal</Layout>
+                    <SizePolicy>min,min</SizePolicy>
+                    <Children>
+                      <PushButton>
+                        <TooltipId>orientation</TooltipId>
+                        <NumberStates>3</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Pressed>buttons/btn_orientation_sampler_left_over.png</Pressed>
+                          <Unpressed>buttons/btn_orientation_sampler_left_over.png</Unpressed>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                          <Pressed>buttons/btn_orientation_sampler_master.png</Pressed>
+                          <Unpressed>buttons/btn_orientation_sampler_master.png</Unpressed>
+                        </State>
+                        <State>
+                          <Number>2</Number>
+                          <Pressed>buttons/btn_orientation_sampler_right_over.png</Pressed>
+                          <Unpressed>buttons/btn_orientation_sampler_right_over.png</Unpressed>
+                        </State>
+                        <Connection>
+                          <ConfigKey>[Sampler<Variable name="samplernum"/>],orientation</ConfigKey>
+                          <ButtonState>LeftButton</ButtonState>
+                        </Connection>
+                      </PushButton>
+                      <PushButton>
+                        <TooltipId>keylock</TooltipId>
+                        <NumberStates>2</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Pressed>buttons/btn_keylock_sampler.png</Pressed>
+                          <Unpressed>buttons/btn_keylock_sampler.png</Unpressed>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                          <Pressed>buttons/btn_keylock_sampler_over.png</Pressed>
+                          <Unpressed>buttons/btn_keylock_sampler_over.png</Unpressed>
+                        </State>
+                        <Connection>
+                          <ConfigKey>[Sampler<Variable name="samplernum"/>],keylock</ConfigKey>
+                        </Connection>
+                      </PushButton>
+                    </Children>
+                  </WidgetGroup>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <ObjectName>SamplerVol</ObjectName>
+                <Children>
+                  <Template src="skin:knob_sm_textless.xml">
+                    <SetVariable name="TooltipId">pregain</SetVariable>
+                    <SetVariable name="Size">25f,25f</SetVariable>
+                    <SetVariable name="group">[Sampler<Variable name="samplernum"/>]</SetVariable>
+                    <SetVariable name="control">pregain</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup>
+
+          <!-- Third Row -->
+          <WidgetGroup>
+              <Layout>horizontal</Layout>
+              <SizePolicy>me,me</SizePolicy>
+              <BackPath>background_tile.png</BackPath>
+              <ObjectName>SamplerButtons</ObjectName>
+              <Children>
+                <WidgetGroup>
+                  <Layout>horizontal</Layout>
+                  <SizePolicy>me,min</SizePolicy>
+                  <ObjectName>SamplerSyncButton</ObjectName>
+                  <Children>
+                    <PushButton>
+                      <TooltipId>beatsync_beatsync_tempo</TooltipId>
+                      <NumberStates>1</NumberStates>
+                      <State>
+                        <Number>0</Number>
+                        <Pressed>buttons/btn_sync_sampler_overdown.png</Pressed>
+                        <Unpressed>buttons/btn_sync_sampler.png</Unpressed>
+                      </State>
+                      <Connection>
+                        <ConfigKey>[Sampler<Variable name="samplernum"/>],beatsync</ConfigKey>
+                        <ButtonState>LeftButton</ButtonState>
+                      </Connection>
+                      <Connection>
+                        <ConfigKey>[Sampler<Variable name="samplernum"/>],beatsync_tempo</ConfigKey>
+                        <ButtonState>RightButton</ButtonState>
+                      </Connection>
+                    </PushButton>
+                  </Children>
+                </WidgetGroup>
+                <WidgetGroup>
+                  <Layout>horizontal</Layout>
+                  <SizePolicy>min,min</SizePolicy>
+                  <ObjectNAme>SamplerHotcues</ObjectNAme>
+                  <Children>
+                    <PushButton>
+                      <TooltipId>hotcue</TooltipId>
+                      <NumberStates>2</NumberStates>
+                      <LeftClickIsPushButton>true</LeftClickIsPushButton>
+                      <RightClickIsPushButton>true</RightClickIsPushButton>
+                      <State>
+                        <Number>0</Number>
+                        <Pressed>buttons/btn_hotcue1_1_down.png</Pressed>
+                        <Unpressed>buttons/btn_hotcue1_1.png</Unpressed>
+                      </State>
+                      <State>
+                        <Number>1</Number>
+                        <Pressed>buttons/btn_hotcue1_1_overdown.png</Pressed>
+                        <Unpressed>buttons/btn_hotcue1_1_over.png</Unpressed>
+                      </State>
+                      <Connection>
+                        <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_1_activate</ConfigKey>
+                        <ButtonState>LeftButton</ButtonState>
+                      </Connection>
+                      <Connection>
+                        <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_1_clear</ConfigKey>
+                        <ButtonState>RightButton</ButtonState>
+                      </Connection>
+                      <Connection>
+                        <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_1_enabled</ConfigKey>
+                      </Connection>
+                    </PushButton>
+
+                    <PushButton>
+                      <TooltipId>hotcue</TooltipId>
+                      <NumberStates>2</NumberStates>
+                      <LeftClickIsPushButton>true</LeftClickIsPushButton>
+                      <RightClickIsPushButton>true</RightClickIsPushButton>
+                      <State>
+                        <Number>0</Number>
+                        <Pressed>buttons/btn_hotcue1_2_down.png</Pressed>
+                        <Unpressed>buttons/btn_hotcue1_2.png</Unpressed>
+                      </State>
+                      <State>
+                        <Number>1</Number>
+                        <Pressed>buttons/btn_hotcue1_2_overdown.png</Pressed>
+                        <Unpressed>buttons/btn_hotcue1_2_over.png</Unpressed>
+                      </State>
+                      <Connection>
+                        <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_2_activate</ConfigKey>
+                        <ButtonState>LeftButton</ButtonState>
+                      </Connection>
+                      <Connection>
+                        <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_2_clear</ConfigKey>
+                        <ButtonState>RightButton</ButtonState>
+                      </Connection>
+                      <Connection>
+                        <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_2_enabled</ConfigKey>
+                      </Connection>
+                    </PushButton>
+
+                    <PushButton>
+                      <TooltipId>hotcue</TooltipId>
+                      <NumberStates>2</NumberStates>
+                      <LeftClickIsPushButton>true</LeftClickIsPushButton>
+                      <RightClickIsPushButton>true</RightClickIsPushButton>
+                      <State>
+                        <Number>0</Number>
+                        <Pressed>buttons/btn_hotcue1_3_down.png</Pressed>
+                        <Unpressed>buttons/btn_hotcue1_3.png</Unpressed>
+                      </State>
+                      <State>
+                        <Number>1</Number>
+                        <Pressed>buttons/btn_hotcue1_3_overdown.png</Pressed>
+                        <Unpressed>buttons/btn_hotcue1_3_over.png</Unpressed>
+                      </State>
+                      <Connection>
+                        <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_3_activate</ConfigKey>
+                        <ButtonState>LeftButton</ButtonState>
+                      </Connection>
+                      <Connection>
+                        <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_3_clear</ConfigKey>
+                        <ButtonState>RightButton</ButtonState>
+                      </Connection>
+                      <Connection>
+                        <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_3_enabled</ConfigKey>
+                      </Connection>
+                    </PushButton>
+
+                    <PushButton>
+                      <TooltipId>hotcue</TooltipId>
+                      <NumberStates>2</NumberStates>
+                      <LeftClickIsPushButton>true</LeftClickIsPushButton>
+                      <RightClickIsPushButton>true</RightClickIsPushButton>
+                      <State>
+                        <Number>0</Number>
+                        <Pressed>buttons/btn_hotcue1_4_down.png</Pressed>
+                        <Unpressed>buttons/btn_hotcue1_4.png</Unpressed>
+                      </State>
+                      <State>
+                        <Number>1</Number>
+                        <Pressed>buttons/btn_hotcue1_4_overdown.png</Pressed>
+                        <Unpressed>buttons/btn_hotcue1_4_over.png</Unpressed>
+                      </State>
+                      <Connection>
+                        <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_4_activate</ConfigKey>
+                        <ButtonState>LeftButton</ButtonState>
+                      </Connection>
+                      <Connection>
+                        <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_4_clear</ConfigKey>
+                        <ButtonState>RightButton</ButtonState>
+                      </Connection>
+                      <Connection>
+                        <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_4_enabled</ConfigKey>
+                      </Connection>
+                    </PushButton>
+                  </Children>
+                </WidgetGroup>
+                <WidgetGroup>
+                  <Layout>horizontal</Layout>
+                  <SizePolicy>min,min</SizePolicy>
+                  <ObjectName>SamplerPfl</ObjectName>
+                  <Children>
+                    <PushButton>
+                      <TooltipId>pfl</TooltipId>
+                      <NumberStates>2</NumberStates>
+                      <State>
+                        <Number>0</Number>
+                        <Pressed>buttons/btn_pfl_sampler_down.png</Pressed>
+                        <Unpressed>buttons/btn_pfl_sampler.png</Unpressed>
+                      </State>
+                      <State>
+                        <Number>1</Number>
+                        <Pressed>buttons/btn_pfl_sampler_overdown.png</Pressed>
+                        <Unpressed>buttons/btn_pfl_sampler_over.png</Unpressed>
+                      </State>
+                      <Connection>
+                        <ConfigKey>[Sampler<Variable name="samplernum"/>],pfl</ConfigKey>
+                      </Connection>
+                    </PushButton>
+                  </Children>
+                </WidgetGroup>
+              </Children>
+          </WidgetGroup>
+        </Children>
+      </WidgetGroup><!-- /SamplerMainControls -->
+
+      <!-- VU Meter -->
+      <WidgetGroup>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <ObjectName>SamplerVU</ObjectName>
+        <MinimumSize>22,</MinimumSize>
+        <Children>
+          <StatusLight>
+            <TooltipId>sampler_PeakIndicator</TooltipId>
+            <PathStatusLight>buttons/btn_clipping_sampler_over.png</PathStatusLight>
+            <PathBack>buttons/btn_clipping_sampler.png</PathBack>
+            <Connection>
+              <ConfigKey>[Sampler<Variable name="samplernum"/>],PeakIndicator</ConfigKey>
+            </Connection>
+          </StatusLight>
+          <VuMeter>
+            <TooltipId>sampler_VuMeter</TooltipId>
+            <PathVu>buttons/btn_volume_display_sampler_over.png</PathVu>
+            <PathBack>buttons/btn_volume_display_sampler.png</PathBack>
+            <Horizontal>false</Horizontal>
+            <PeakHoldSize>5</PeakHoldSize>
+            <PeakHoldTime>500</PeakHoldTime>
+            <PeakFallTime>50</PeakFallTime>
+            <PeakFallStep>2</PeakFallStep>
+            <Connection>
+              <ConfigKey>[Sampler<Variable name="samplernum"/>],VuMeter</ConfigKey>
+            </Connection>
+          </VuMeter>
+        </Children>
+      </WidgetGroup>
+
+      <!-- Pitch Control -->
+      <WidgetGroup>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <ObjectName>SamplerPitch</ObjectName>
+        <MinimumSize>40,</MinimumSize>
+        <Children>
+          <SliderComposed>
+            <TooltipId>rate</TooltipId>
+            <Handle>knob_pitch_sampler.png</Handle>
+            <Slider>slider_pitch_sampler.png</Slider>
+            <Horizontal>false</Horizontal>
+            <Connection>
+              <ConfigKey>[Sampler<Variable name="samplernum"/>],rate</ConfigKey>
+            </Connection>
+          </SliderComposed>
+        </Children>
+      </WidgetGroup>
+
+    </Children>
+  </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/sampler_decks.xml b/res/skins/LateNight/sampler_decks.xml
deleted file mode 100644
index a0dc8ab50782..000000000000
--- a/res/skins/LateNight/sampler_decks.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<Template>
-    <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <SizePolicy>me,min</SizePolicy>
-        <Children>
-            <Template src="skin:sampler.xml">
-                <SetVariable name="samplernum">1</SetVariable>
-            </Template>
-            <Template src="skin:sampler.xml">
-                <SetVariable name="samplernum">2</SetVariable>
-            </Template>
-            <Template src="skin:sampler.xml">
-                <SetVariable name="samplernum">3</SetVariable>
-            </Template>
-            <Template src="skin:sampler.xml">
-                <SetVariable name="samplernum">4</SetVariable>
-            </Template>
-        </Children>
-    </WidgetGroup>
-</Template>
\ No newline at end of file
diff --git a/res/skins/LateNight/samplers_container.xml b/res/skins/LateNight/samplers_container.xml
new file mode 100644
index 000000000000..d396d6e08aa9
--- /dev/null
+++ b/res/skins/LateNight/samplers_container.xml
@@ -0,0 +1,29 @@
+<Template>
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,max</SizePolicy>
+    <Children>
+
+      <Template src="skin:sampler.xml">
+        <SetVariable name="samplernum">1</SetVariable>
+      </Template>
+
+      <Template src="skin:sampler.xml">
+        <SetVariable name="samplernum">2</SetVariable>
+      </Template>
+
+      <Template src="skin:sampler.xml">
+        <SetVariable name="samplernum">3</SetVariable>
+      </Template>
+
+      <Template src="skin:sampler.xml">
+        <SetVariable name="samplernum">4</SetVariable>
+      </Template>
+
+    </Children>
+    <Connection>
+      <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/skin.xml b/res/skins/LateNight/skin.xml
index 4a9db896c78d..2bf19f7095a1 100644
--- a/res/skins/LateNight/skin.xml
+++ b/res/skins/LateNight/skin.xml
@@ -39,15 +39,11 @@
     <attributes>
       <!-- Set skin defaults. -->
       <attribute config_key="[Master],num_decks">4</attribute>
-      <attribute persist="true" config_key="[Spinny1],show_spinny">1</attribute>
-      <attribute persist="true" config_key="[Spinny2],show_spinny">1</attribute>
-      <attribute persist="true" config_key="[Spinny3],show_spinny">1</attribute>
-      <attribute persist="true" config_key="[Spinny4],show_spinny">1</attribute>
       <attribute persist="true" config_key="[Microphone],show_microphone">0</attribute>
       <attribute persist="true" config_key="[MicrophoneRack],show">0</attribute>
       <attribute persist="true" config_key="[EffectRack1],show">0</attribute>
       <attribute persist="true" config_key="[Samplers],show_samplers">0</attribute>
-      <attribute persist="true" config_key="[VinylControl],show_vinylcontrol">0</attribute>
+      <attribute persist="true" config_key="[Vinylcontrol],show_vinylcontrol">0</attribute>
       <attribute persist="true" config_key="[PreviewDeck],show_previewdeck">0</attribute>
       <attribute persist="true" config_key="[Master],show_mixer">1</attribute>
       <attribute persist="true" config_key="[Master],show_eqs">1</attribute>
@@ -57,7 +53,8 @@
       <attribute persist="true" config_key="[Library],show_current">1</attribute>
       <attribute persist="true" config_key="[Master],show_4decks">0</attribute>
       <attribute persist="true" config_key="[Spinny],show_spinnies">1</attribute>
-      <attribute config_key="[Library],show_library">1</attribute>
+      <attribute persist="true" config_key="[Library],show_library">1</attribute>
+      <attribute persist="true" config_key="[Master],show_xfader">1</attribute>
       <attribute config_key="[Master],maximize_library">0</attribute>
     </attributes>
   </manifest>
@@ -67,59 +64,88 @@
 
   <!-- MinimumSize should not be an exact monitor resolution. There needs
   to be space for the title bar or other chrome at full screen -->
-  <MinimumSize>1280,700</MinimumSize>
+  <MinimumSize>1270,666</MinimumSize>
   <SizePolicy>me,me</SizePolicy>
   <Layout>vertical</Layout>
 
   <Children>
+    <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.
     -->
     <SingletonDefinition>
-        <ObjectName>LibrarySingleton</ObjectName>
-        <Children>
-            <Template src="skin:library.xml"/>
-        </Children>
+      <ObjectName>LibrarySingleton</ObjectName>
+      <Children>
+        <Template src="skin:library.xml"/>
+      </Children>
+    </SingletonDefinition>
+
+    <SingletonDefinition>
+      <ObjectName>ClockRecLogo</ObjectName>
+      <Children>
+        <Template src="skin:toolbar_clock_rec_logo.xml"/>
+      </Children>
     </SingletonDefinition>
 
     <WidgetGroup>
-        <ObjectName>SkinContainer</ObjectName>
-        <Layout>horizontal</Layout>
-        <SizePolicy>me,me</SizePolicy>
-        <Children>
-            <!-- Select between either the full UI or the big library -->
-            <WidgetStack currentpage="[Master],maximize_library">
-                <Children>
-                    <WidgetGroup>
-                        <Layout>vertical</Layout>
-                        <SizePolicy>me,me</SizePolicy>
-                        <Children>
-                            <WidgetGroup>
-                                <Layout>horizontal</Layout>
-                                <SizePolicy>i,max</SizePolicy>
-                                <Children>
-                                    <Template src="skin:decks_left.xml"/>
-                                    <Template src="skin:waveform_and_mixer.xml"/>
-                                    <Template src="skin:decks_right.xml"/>
-                                </Children>
-                            </WidgetGroup>
-                            <Template src="skin:lower_half.xml"/>
-                        </Children>
-                    </WidgetGroup>
+      <ObjectName>SkinContainer</ObjectName>
+      <Layout>horizontal</Layout>
+      <SizePolicy>me,me</SizePolicy>
+      <Children>
+
+        <!-- Select between either the full UI or the big library -->
+        <WidgetStack currentpage="[Master],maximize_library">
+          <Children>
 
+            <!-- Decks, Effects ... Library -->
+            <Splitter>
+              <ObjectName>CoverArtSplitter</ObjectName>
+              <Orientation>vertical</Orientation>
+              <SizePolicy>me,min</SizePolicy>
+              <SplitSizes>100,10000</SplitSizes>
+              <SplitSizesConfigKey>[LateNight],waveform_splitSize</SplitSizesConfigKey>
+              <Collapsible>0,0</Collapsible>
+              <Children>
+
+                <Template src="skin:waveforms.xml"/>
+
+                <WidgetGroup>
+                  <Layout>vertical</Layout>
+                  <SizePolicy>me,me</SizePolicy>
+                  <Children>
                     <WidgetGroup>
-                        <Layout>vertical</Layout>
-                        <SizePolicy>me,me</SizePolicy>
-                        <Children>
-                            <SingletonContainer>
-                                <ObjectName>LibrarySingleton</ObjectName>
-                            </SingletonContainer>
-                            <Template src="skin:toolbar_big_library.xml"/>
-                        </Children>
+                      <Layout>horizontal</Layout>
+                      <SizePolicy>me,max</SizePolicy>
+                      <Children>
+                        <Template src="skin:decks_left.xml"/>
+                        <Template src="skin:mixer.xml"/>
+                        <Template src="skin:decks_right.xml"/>
+                      </Children>
                     </WidgetGroup>
-                </Children>
-            </WidgetStack>
-        </Children>
+                    <Template src="skin:fx_units_12.xml"/>
+                    <Template src="skin:lower_half.xml"/>
+                  </Children>
+                </WidgetGroup>
+
+              </Children>
+            </Splitter><!-- Decks, Effects ... Library -->
+
+            <!-- MAximized Library -->
+            <WidgetGroup trigger="[Master],maximize_library" on_hide_select="0">
+              <Layout>vertical</Layout>
+              <SizePolicy>me,me</SizePolicy>
+              <Children>
+                <SingletonContainer>
+                  <ObjectName>LibrarySingleton</ObjectName>
+                </SingletonContainer>
+                <Template src="skin:toolbar_big_library.xml"/>
+              </Children>
+            </WidgetGroup>
+
+          </Children>
+        </WidgetStack>
+      </Children>
     </WidgetGroup>
   </Children>
 </skin>
diff --git a/res/skins/LateNight/sources/btn_fxButton.xcf b/res/skins/LateNight/sources/btn_fxButton.xcf
new file mode 100644
index 000000000000..94ecc01bb877
Binary files /dev/null and b/res/skins/LateNight/sources/btn_fxButton.xcf differ
diff --git a/res/skins/LateNight/sources/btn_fxButton_down.xcf b/res/skins/LateNight/sources/btn_fxButton_down.xcf
new file mode 100644
index 000000000000..d99395cb2a7a
Binary files /dev/null and b/res/skins/LateNight/sources/btn_fxButton_down.xcf differ
diff --git a/res/skins/LateNight/sources/btn_fxButton_over.xcf b/res/skins/LateNight/sources/btn_fxButton_over.xcf
new file mode 100644
index 000000000000..d538d7bb538c
Binary files /dev/null and b/res/skins/LateNight/sources/btn_fxButton_over.xcf differ
diff --git a/res/skins/LateNight/sources/btn_fxButton_overdown.xcf b/res/skins/LateNight/sources/btn_fxButton_overdown.xcf
new file mode 100644
index 000000000000..4da24252b2d4
Binary files /dev/null and b/res/skins/LateNight/sources/btn_fxButton_overdown.xcf differ
diff --git a/res/skins/LateNight/sources/btn_fxEpand_fxCollapse_30x30.xcf b/res/skins/LateNight/sources/btn_fxEpand_fxCollapse_30x30.xcf
new file mode 100644
index 000000000000..7e6282795ac4
Binary files /dev/null and b/res/skins/LateNight/sources/btn_fxEpand_fxCollapse_30x30.xcf differ
diff --git a/res/skins/LateNight/sources/btn_fxEpand_fxCollapse_40x26.xcf b/res/skins/LateNight/sources/btn_fxEpand_fxCollapse_40x26.xcf
new file mode 100644
index 000000000000..4a7478f57e5b
Binary files /dev/null and b/res/skins/LateNight/sources/btn_fxEpand_fxCollapse_40x26.xcf differ
diff --git a/res/skins/LateNight/sources/btn_fxEpand_fxCollapse_40x30.xcf b/res/skins/LateNight/sources/btn_fxEpand_fxCollapse_40x30.xcf
new file mode 100644
index 000000000000..5c3a705d8b81
Binary files /dev/null and b/res/skins/LateNight/sources/btn_fxEpand_fxCollapse_40x30.xcf differ
diff --git a/res/skins/LateNight/sources/btn_fxToggle.xcf b/res/skins/LateNight/sources/btn_fxToggle.xcf
new file mode 100644
index 000000000000..11717e834379
Binary files /dev/null and b/res/skins/LateNight/sources/btn_fxToggle.xcf differ
diff --git a/res/skins/LateNight/sources/btn_fxToggle_down.xcf b/res/skins/LateNight/sources/btn_fxToggle_down.xcf
new file mode 100644
index 000000000000..befddbdc0bee
Binary files /dev/null and b/res/skins/LateNight/sources/btn_fxToggle_down.xcf differ
diff --git a/res/skins/LateNight/sources/btn_fxToggle_over.xcf b/res/skins/LateNight/sources/btn_fxToggle_over.xcf
new file mode 100644
index 000000000000..910eb193d1f0
Binary files /dev/null and b/res/skins/LateNight/sources/btn_fxToggle_over.xcf differ
diff --git a/res/skins/LateNight/sources/btn_fxToggle_overdown.xcf b/res/skins/LateNight/sources/btn_fxToggle_overdown.xcf
new file mode 100644
index 000000000000..86ca85862428
Binary files /dev/null and b/res/skins/LateNight/sources/btn_fxToggle_overdown.xcf differ
diff --git a/res/skins/LateNight/sources/btn_loop_reloop.xcf b/res/skins/LateNight/sources/btn_loop_reloop.xcf
new file mode 100644
index 000000000000..e2e6d9187efe
Binary files /dev/null and b/res/skins/LateNight/sources/btn_loop_reloop.xcf differ
diff --git a/res/skins/LateNight/sources/btn_loop_reloop_down.xcf b/res/skins/LateNight/sources/btn_loop_reloop_down.xcf
new file mode 100644
index 000000000000..d3b8f822e0db
Binary files /dev/null and b/res/skins/LateNight/sources/btn_loop_reloop_down.xcf differ
diff --git a/res/skins/LateNight/sources/btn_loop_reloop_over.xcf b/res/skins/LateNight/sources/btn_loop_reloop_over.xcf
new file mode 100644
index 000000000000..b10b793ab845
Binary files /dev/null and b/res/skins/LateNight/sources/btn_loop_reloop_over.xcf differ
diff --git a/res/skins/LateNight/sources/btn_loop_reloop_overdown.xcf b/res/skins/LateNight/sources/btn_loop_reloop_overdown.xcf
new file mode 100644
index 000000000000..9a68e0ba22ae
Binary files /dev/null and b/res/skins/LateNight/sources/btn_loop_reloop_overdown.xcf differ
diff --git a/res/skins/LateNight/btn_mastersync.xcf.gz b/res/skins/LateNight/sources/btn_mastersync.xcf.gz
similarity index 100%
rename from res/skins/LateNight/btn_mastersync.xcf.gz
rename to res/skins/LateNight/sources/btn_mastersync.xcf.gz
diff --git a/res/skins/LateNight/btn_mastersync_master.xcf.gz b/res/skins/LateNight/sources/btn_mastersync_master.xcf.gz
similarity index 100%
rename from res/skins/LateNight/btn_mastersync_master.xcf.gz
rename to res/skins/LateNight/sources/btn_mastersync_master.xcf.gz
diff --git a/res/skins/LateNight/btn_mastersync_slave.xcf.gz b/res/skins/LateNight/sources/btn_mastersync_slave.xcf.gz
similarity index 100%
rename from res/skins/LateNight/btn_mastersync_slave.xcf.gz
rename to res/skins/LateNight/sources/btn_mastersync_slave.xcf.gz
diff --git a/res/skins/LateNight/sources/mixxx_logo_24px.svg b/res/skins/LateNight/sources/mixxx_logo_24px.svg
new file mode 100644
index 000000000000..d890039286b7
--- /dev/null
+++ b/res/skins/LateNight/sources/mixxx_logo_24px.svg
@@ -0,0 +1,421 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="78"
+   height="24"
+   id="svg5792">
+  <defs
+     id="defs5794">
+    <linearGradient
+       x1="74.096199"
+       y1="283.0127"
+       x2="74.096199"
+       y2="240.2995"
+       id="SVGID_50_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop722"
+         style="stop-color:#1f1f20;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop724"
+         style="stop-color:#a5a8aa;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="97.754402"
+       y1="283.0127"
+       x2="97.754402"
+       y2="240.2995"
+       id="SVGID_51_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop729"
+         style="stop-color:#1f1f20;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop731"
+         style="stop-color:#a5a8aa;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="121.4106"
+       y1="283.0127"
+       x2="121.4106"
+       y2="240.2995"
+       id="SVGID_52_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop736"
+         style="stop-color:#fead00;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop738"
+         style="stop-color:#ffd73d;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="49.034698"
+       y1="283.0127"
+       x2="49.034698"
+       y2="240.2995"
+       id="SVGID_53_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop743"
+         style="stop-color:#1f1f20;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop745"
+         style="stop-color:#a5a8aa;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="20.309099"
+       y1="283.0127"
+       x2="20.309099"
+       y2="240.2995"
+       id="SVGID_54_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop750"
+         style="stop-color:#1f1f20;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop752"
+         style="stop-color:#a5a8aa;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="109.707"
+       y1="244.08791"
+       x2="85.933998"
+       y2="278.4538"
+       id="SVGID_49_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop701"
+         style="stop-color:#130e1e;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop703"
+         style="stop-color:#1c1426;stop-opacity:1"
+         offset="0.0231" />
+      <stop
+         id="stop705"
+         style="stop-color:#442349;stop-opacity:1"
+         offset="0.1446" />
+      <stop
+         id="stop707"
+         style="stop-color:#652966;stop-opacity:1"
+         offset="0.2552" />
+      <stop
+         id="stop709"
+         style="stop-color:#7c287a;stop-opacity:1"
+         offset="0.3511" />
+      <stop
+         id="stop711"
+         style="stop-color:#8b2688;stop-opacity:1"
+         offset="0.42860001" />
+      <stop
+         id="stop713"
+         style="stop-color:#91278f;stop-opacity:1"
+         offset="0.47799999" />
+      <stop
+         id="stop715"
+         style="stop-color:#ed1c24;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="86.049301"
+       y1="244.08791"
+       x2="62.275299"
+       y2="278.4552"
+       id="SVGID_48_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop676"
+         style="stop-color:#381f1f;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop678"
+         style="stop-color:#3a1f20;stop-opacity:1"
+         offset="0.0017" />
+      <stop
+         id="stop680"
+         style="stop-color:#5b2926;stop-opacity:1"
+         offset="0.0376" />
+      <stop
+         id="stop682"
+         style="stop-color:#7c2f28;stop-opacity:1"
+         offset="0.0757" />
+      <stop
+         id="stop684"
+         style="stop-color:#9b3029;stop-opacity:1"
+         offset="0.1173" />
+      <stop
+         id="stop686"
+         style="stop-color:#b62e28;stop-opacity:1"
+         offset="0.1626" />
+      <stop
+         id="stop688"
+         style="stop-color:#cc2927;stop-opacity:1"
+         offset="0.2129" />
+      <stop
+         id="stop690"
+         style="stop-color:#dc2325;stop-opacity:1"
+         offset="0.271" />
+      <stop
+         id="stop692"
+         style="stop-color:#e81f25;stop-opacity:1"
+         offset="0.34380001" />
+      <stop
+         id="stop694"
+         style="stop-color:#ed1c24;stop-opacity:1"
+         offset="0.47799999" />
+      <stop
+         id="stop696"
+         style="stop-color:#f7931e;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="133.3633"
+       y1="244.0889"
+       x2="109.5902"
+       y2="278.4548"
+       id="linearGradient4939"
+       xlink:href="#SVGID_47_"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="133.3633"
+       y1="244.0889"
+       x2="109.5902"
+       y2="278.4548"
+       id="SVGID_47_"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop669"
+         style="stop-color:#39b54a;stop-opacity:1"
+         offset="0.47799999" />
+      <stop
+         id="stop671"
+         style="stop-color:#1b75bc;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="74.096199"
+       y1="283.0127"
+       x2="74.096199"
+       y2="240.2995"
+       id="linearGradient5755"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop5757"
+         style="stop-color:#1f1f20;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5759"
+         style="stop-color:#a5a8aa;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="97.754402"
+       y1="283.0127"
+       x2="97.754402"
+       y2="240.2995"
+       id="linearGradient5762"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop5764"
+         style="stop-color:#1f1f20;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5766"
+         style="stop-color:#a5a8aa;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="121.4106"
+       y1="283.0127"
+       x2="121.4106"
+       y2="240.2995"
+       id="linearGradient5769"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop5771"
+         style="stop-color:#1f1f20;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5773"
+         style="stop-color:#a5a8aa;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="49.034698"
+       y1="283.0127"
+       x2="49.034698"
+       y2="240.2995"
+       id="linearGradient5776"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop5778"
+         style="stop-color:#1f1f20;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5780"
+         style="stop-color:#a5a8aa;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="20.309099"
+       y1="283.0127"
+       x2="20.309099"
+       y2="240.2995"
+       id="linearGradient5783"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop5785"
+         style="stop-color:#1f1f20;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5787"
+         style="stop-color:#a5a8aa;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="133.3633"
+       y1="244.0889"
+       x2="109.5902"
+       y2="278.4548"
+       id="linearGradient6769"
+       xlink:href="#SVGID_47_"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="86.049301"
+       y1="244.08791"
+       x2="62.275299"
+       y2="278.4552"
+       id="linearGradient6771"
+       xlink:href="#SVGID_48_"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="109.707"
+       y1="244.08791"
+       x2="85.933998"
+       y2="278.4538"
+       id="linearGradient6773"
+       xlink:href="#SVGID_49_"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="76.099983"
+       y1="283.0719"
+       x2="76.099983"
+       y2="240.26669"
+       id="linearGradient6775"
+       xlink:href="#SVGID_52_"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="98.498299"
+       y1="283.0719"
+       x2="98.498299"
+       y2="240.26669"
+       id="linearGradient6777"
+       xlink:href="#SVGID_52_"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="121.4106"
+       y1="283.0127"
+       x2="121.4106"
+       y2="240.2995"
+       id="linearGradient6779"
+       xlink:href="#SVGID_52_"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="63.475838"
+       y1="1065.4941"
+       x2="63.475838"
+       y2="1022.6888"
+       id="linearGradient6781"
+       xlink:href="#SVGID_52_"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.55113038,0,0,0.55113038,0.04919778,465.54229)" />
+    <linearGradient
+       x1="20.920025"
+       y1="283.0719"
+       x2="20.920025"
+       y2="240.26669"
+       id="linearGradient6783"
+       xlink:href="#SVGID_52_"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <metadata
+     id="metadata5797">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>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,-1028.3621)"
+     id="layer1">
+    <g
+       transform="matrix(0.94818195,0,0,0.94818195,-4.1722525,53.487656)"
+       id="g6759">
+      <polygon
+         points="138.439,244.146 114.823,278.591 104.378,278.591 127.999,244.146 "
+         transform="matrix(0.55113038,0,0,0.55113038,7.5642154,896.75892)"
+         id="polygon673"
+         style="fill:url(#linearGradient6769)" />
+      <polygon
+         points="91.126,244.146 67.51,278.591 57.062,278.591 80.68,244.146 "
+         transform="matrix(0.55113038,0,0,0.55113038,7.5642154,896.75892)"
+         id="polygon698"
+         style="fill:url(#linearGradient6771)" />
+      <polygon
+         points="114.783,244.146 91.167,278.591 80.722,278.591 104.342,244.146 "
+         transform="matrix(0.55113038,0,0,0.55113038,7.5642154,896.75892)"
+         id="polygon717"
+         style="fill:url(#linearGradient6773)" />
+      <polygon
+         points="91.126,278.591 67.51,244.146 57.065,244.146 80.68,278.591 "
+         transform="matrix(0.55113038,0,0,0.55113038,7.5642154,896.75892)"
+         id="polygon726"
+         style="fill:url(#linearGradient6775);fill-opacity:1" />
+      <polygon
+         points="114.787,278.591 91.167,244.146 80.722,244.146 104.342,278.591 "
+         transform="matrix(0.55113038,0,0,0.55113038,7.5642154,896.75892)"
+         id="polygon733"
+         style="fill:url(#linearGradient6777);fill-opacity:1" />
+      <polygon
+         points="138.443,278.591 114.823,244.146 104.378,244.146 127.999,278.591 "
+         transform="matrix(0.55113038,0,0,0.55113038,7.5642154,896.75892)"
+         id="polygon740"
+         style="fill:url(#linearGradient6779)" />
+      <rect
+         width="4.9237986"
+         height="18.983686"
+         x="32.126991"
+         y="1031.3152"
+         id="rect747"
+         style="fill:url(#linearGradient6781);fill-opacity:1" />
+      <polygon
+         points="31.74,258.245 31.74,278.591 40.618,278.591 40.618,244.146 30.988,244.146 20.307,261.321 9.631,244.146 0,244.146 0,278.591 8.76,278.591 8.76,258.42 20.076,275.596 20.307,275.596 "
+         transform="matrix(0.55113038,0,0,0.55113038,7.5642154,896.75892)"
+         id="polygon754"
+         style="fill:url(#linearGradient6783);fill-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/res/skins/LateNight/spinny.xml b/res/skins/LateNight/spinny.xml
index d047906cba37..73a11c88e82e 100644
--- a/res/skins/LateNight/spinny.xml
+++ b/res/skins/LateNight/spinny.xml
@@ -1,115 +1,23 @@
 <Template>
   <WidgetGroup>
+    <ObjectName>AlignHCenter</ObjectName>
     <Layout>horizontal</Layout>
-    <SizePolicy>min,min</SizePolicy>
+    <Size>54f,52me</Size>
     <Children>
-      <!-- If the spinnies are hidden, create an invisible margin of the correct
-      height because the waveforms follow that height.  -->
-      <WidgetGroup>
-        <ObjectName>SpinnyBorder</ObjectName>
-        <Layout>horizontal</Layout>
-        <Size>1f,88f</Size>
-        <Children/>
-        <Connection>
-            <ConfigKey>[Master],show_mixer</ConfigKey>
-            <BindProperty>visible</BindProperty>
-            <Transform>
-              <Not/>
-            </Transform>
-        </Connection>
-      </WidgetGroup>
-      <!-- Same, but for the smaller spinny size. -->
-      <WidgetGroup>
-        <ObjectName>SpinnyBorder</ObjectName>
-        <Layout>horizontal</Layout>
-        <Size>1f,50f</Size>
-        <Children/>
-        <Connection>
-            <ConfigKey>[Master],show_mixer</ConfigKey>
-            <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup>
-      <SingletonDefinition>
-        <ObjectName>SpinnySingleton<Variable name="channum"/></ObjectName>
-        <Children>
-          <Spinny>
-            <Group>[Channel<Variable name="channum"/>]</Group>
-            <PathBackground scalemode="STRETCH">spinny_bg.svg</PathBackground>
-            <PathMask>spinny<Variable name="color"/>_mask.svg</PathMask>
-            <PathForeground>spinny_indicator.svg</PathForeground>
-            <PathGhost>spinny_indicator_ghost.svg</PathGhost>
-            <ShowCover>true</ShowCover>
-          </Spinny>
-        </Children>
-      </SingletonDefinition>
-      <!-- The spinnies determine the size of the waveform. -->
-      <WidgetGroup>
-        <SizePolicy>max,min</SizePolicy>
-        <Layout>horizontal</Layout>
-        <Children>
-          <WidgetGroup>
-            <ObjectName>SpinnyContainer</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,min</SizePolicy>
-            <Children>
-              <SingletonContainer>
-                  <Size>50f,50f</Size>
-                  <ObjectName>SpinnySingleton<Variable name="channum"/></ObjectName>
-              </SingletonContainer>
-            </Children>
-            <Connection>
-                <ConfigKey>[Master],show_mixer</ConfigKey>
-                <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup>
-          <WidgetGroup trigger="[Master],show_mixer">
-            <ObjectName>SpinnyContainer</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,min</SizePolicy>
-            <Children>
-                <SingletonContainer>
-                    <Size>88f,88f</Size>
-                    <ObjectName>SpinnySingleton<Variable name="channum"/></ObjectName>
-                </SingletonContainer>
-            </Children>
-            <Connection>
-                <ConfigKey>[Master],show_mixer</ConfigKey>
-                <BindProperty>visible</BindProperty>
-                <Transform><Not/></Transform>
-            </Connection>
-          </WidgetGroup>
-        </Children>
-        <Connection>
-            <ConfigKey persist="true">[Spinny],show_spinnies</ConfigKey>
-            <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup>
-      <!-- If the spinnies are hidden, create an invisible margin of the correct
-      height because the waveforms follow that height.  -->
-      <WidgetGroup>
-        <ObjectName>SpinnyContainer</ObjectName>
-        <Layout>horizontal</Layout>
-        <Size>1f,88f</Size>
-        <Children/>
-        <Connection>
-            <ConfigKey>[Master],show_mixer</ConfigKey>
-            <BindProperty>visible</BindProperty>
-            <Transform>
-              <Not/>
-            </Transform>
-        </Connection>
-      </WidgetGroup>
-      <!-- Same, but for the smaller spinny size. -->
-      <WidgetGroup>
-        <ObjectName>SpinnyContainer</ObjectName>
-        <Layout>horizontal</Layout>
-        <Size>1f,50f</Size>
-        <Children/>
-        <Connection>
-            <ConfigKey>[Master],show_mixer</ConfigKey>
-            <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup>
+      <Spinny>
+        <TooltipId>spinny</TooltipId>
+        <Size>50f,50f</Size>
+        <Group><Variable name="group"/></Group>
+        <PathBackground scalemode="STRETCH_ASPECT">spinny_bg.svg</PathBackground>
+        <PathMask scalemode="STRETCH_ASPECT">spinny<Variable name="channum"/>_mask.svg</PathMask>
+        <PathForeground>spinny_indicator.svg</PathForeground>
+        <PathGhost>spinny_indicator_ghost.svg</PathGhost>
+        <ShowCover>true</ShowCover>
+      </Spinny>
     </Children>
+    <Connection>
+      <ConfigKey persist="true">[Spinny],show_spinnies</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/spinny1_mask.svg b/res/skins/LateNight/spinny1_mask.svg
index 4f84360b23d1..984ed20f6b63 100644
--- a/res/skins/LateNight/spinny1_mask.svg
+++ b/res/skins/LateNight/spinny1_mask.svg
@@ -8,77 +8,72 @@
    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"
+   version="1.1"
    width="96"
    height="96"
    id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="spinny1_mask.svg"
-   enable-background="new">
+   style="enable-background:new">
   <defs
      id="defs4">
     <linearGradient
        id="linearGradient3861">
       <stop
-         style="stop-color:#eece33;stop-opacity:1;"
-         offset="0"
-         id="stop3863" />
+         id="stop3863"
+         style="stop-color:#eece33;stop-opacity:1"
+         offset="0" />
       <stop
-         style="stop-color:#eece33;stop-opacity:0;"
-         offset="1"
-         id="stop3865" />
+         id="stop3865"
+         style="stop-color:#eece33;stop-opacity:0"
+         offset="1" />
     </linearGradient>
     <linearGradient
        id="linearGradient3851">
       <stop
-         style="stop-color:#eece33;stop-opacity:1;"
-         offset="0"
-         id="stop3853" />
+         id="stop3853"
+         style="stop-color:#eece33;stop-opacity:1"
+         offset="0" />
       <stop
-         style="stop-color:#eece33;stop-opacity:0;"
-         offset="1"
-         id="stop3855" />
+         id="stop3855"
+         style="stop-color:#eece33;stop-opacity:0"
+         offset="1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3851"
-       id="linearGradient3857"
        x1="48.010761"
        y1="0.07037171"
        x2="47.827461"
        y2="24.407314"
+       id="linearGradient3857"
+       xlink:href="#linearGradient3851"
        gradientUnits="userSpaceOnUse" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="radialGradient3867"
        cx="50.002552"
        cy="45.492374"
+       r="20.076782"
        fx="50.002552"
        fy="45.492374"
-       r="20.076782"
+       id="radialGradient3867"
+       xlink:href="#linearGradient3861"
        gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="50.002552"
+       cy="45.492374"
+       r="20.076782"
+       fx="50.002552"
+       fy="45.492374"
+       id="radialGradient3335"
+       xlink:href="#linearGradient3861"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-2.002552,2.5076256)" />
+    <linearGradient
+       x1="48.010761"
+       y1="0.07037171"
+       x2="47.827461"
+       y2="24.407314"
+       id="linearGradient3338"
+       xlink:href="#linearGradient3851"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96248721,0,0,0.96503687,1.8784665,1.8438788)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.919596"
-     inkscape:cx="20.05825"
-     inkscape:cy="42.101252"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1056"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -92,94 +87,54 @@
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="orig"
-     inkscape:groupmode="layer"
-     id="layer1"
      transform="translate(0,-956.36218)"
-     style="display:none"
-     sodipodi:insensitive="true">
+     id="layer1"
+     style="display:none">
     <image
-       y="956.36218"
-       x="0"
-       id="image3047"
        xlink:href="data:image/png;base64,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 AABJRU5ErkJggg== "
+       x="0"
+       y="956.36218"
+       width="96"
        height="96"
-       width="96" />
+       id="image3047" />
   </g>
   <g
-     inkscape:groupmode="layer"
      id="layer4"
-     inkscape:label="Layer#1"
      style="display:none">
     <rect
-       style="fill:#0e0e0e;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect4304"
        width="96"
        height="96"
        x="0"
-       y="-8.8817842e-16" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer"
-     style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.4;fill:url(#linearGradient3857);fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3849"
-       sodipodi:cx="47.919113"
-       sodipodi:cy="47.82835"
-       sodipodi:rx="47.792843"
-       sodipodi:ry="47.666573"
-       d="m 95.711956,47.82835 a 47.792843,47.666573 0 1 1 -95.58568571,0 47.792843,47.666573 0 1 1 95.58568571,0 z"
-       transform="matrix(0.96248721,0,0,0.96503687,1.8784665,1.8438788)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.4;fill:url(#radialGradient3867);fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3859"
-       sodipodi:cx="50.002552"
-       sodipodi:cy="45.492374"
-       sodipodi:rx="20.076782"
-       sodipodi:ry="20.076782"
-       d="m 70.079334,45.492374 a 20.076782,20.076782 0 1 1 -40.153564,0 20.076782,20.076782 0 1 1 40.153564,0 z"
-       transform="translate(-2.002552,2.5076256)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3830"
-       sodipodi:cx="48.739861"
-       sodipodi:cy="48.017754"
-       sodipodi:rx="4.2931485"
-       sodipodi:ry="4.2931485"
-       d="m 53.033009,48.017754 a 4.2931485,4.2931485 0 1 1 -8.586297,0 4.2931485,4.2931485 0 1 1 8.586297,0 z"
-       transform="matrix(0.93171713,0,0,0.93171713,2.588237,3.2610364)" />
-    <path
-       style="fill:#0e0e0e;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="M 0,0 0,96 96,96 96,0 0,0 z M 48,2 C 73.405099,2 94,22.594902 94,48 94,73.405099 73.405099,94 48,94 22.594902,94 2,73.405099 2,48 2,22.594902 22.594902,2 48,2 z"
-       id="rect3842"
-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#585858;stroke-opacity:1;stroke-width:1.89960931000000000;stroke-miterlimit:4;stroke-dasharray:none"
-       id="path4919"
-       sodipodi:cx="47.414036"
-       sodipodi:cy="48.144024"
-       sodipodi:rx="42.110733"
-       sodipodi:ry="45.330597"
-       d="m 89.524769,48.144024 a 42.110733,45.330597 0 1 1 -84.2214662,0 42.110733,45.330597 0 1 1 84.2214662,0 z"
-       transform="matrix(1.0923581,0,0,1.0147671,-3.7931057,-0.85497323)" />
+       y="-8.8817842e-16"
+       id="rect4304"
+       style="fill:#2f290a;fill-opacity:1;fill-rule:nonzero;stroke:none" />
   </g>
+  <path
+     d="M 94,48 A 46,46 0 1 1 2,48 46,46 0 1 1 94,48 z"
+     id="path3849"
+     style="opacity:0.4;fill:url(#linearGradient3338);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  <path
+     d="m 68.076782,48 a 20.076782,20.076782 0 0 1 -40.153564,0 20.076782,20.076782 0 1 1 40.153564,0 z"
+     id="path3859"
+     style="opacity:0.4;fill:url(#radialGradient3335);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  <path
+     d="m 52,48 a 4,4 0 0 1 -8,0 4,4 0 1 1 8,0 z"
+     id="path3830"
+     style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
   <g
-     inkscape:groupmode="layer"
      id="layer3"
-     inkscape:label="indicator"
      style="opacity:0.95999995;display:none">
     <path
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
        d="M 46,3.7264493 C 45.96903,2.8335721 46.545072,1.949526 47.936937,1.9914377 49.328802,2.0333497 49.963562,2.675413 49.984216,3.742233 L 50,42.800846 C 50,43.482472 48.712307,43.913653 47.950679,43.9057 47.18905,43.897748 46.015784,43.447975 46,42.800846 z"
        id="rect3776"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="czcczcc" />
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
   </g>
+  <path
+     d="M 0,0 0,96 96,96 96,0 0,0 z M 48,3 C 59.76833,3 71.491034,7.8660391 79.8125,16.1875 88.133966,24.508961 93,36.23167 93,48 93,59.76833 88.133966,71.491039 79.8125,79.8125 l -0.09375,0.09375 C 71.403068,88.170618 59.724203,93 48,93 36.23167,93 24.508966,88.133961 16.1875,79.8125 L 16.09375,79.71875 C 7.8293765,71.403073 3,59.724203 3,48 3,36.23167 7.8660341,24.508961 16.1875,16.1875 24.508966,7.8660391 36.23167,3 48,3 z"
+     id="rect3033"
+     style="color:#000000;fill:#1e1e1e;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:11.19999981;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="M 93.000002,48 A 45.000001,45 0 0 1 3.0000002,48 45.000001,45 0 1 1 93.000002,48 z"
+     id="path4919"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new" />
 </svg>
diff --git a/res/skins/LateNight/spinny2_mask.svg b/res/skins/LateNight/spinny2_mask.svg
index e8bcfceb5f46..984ed20f6b63 100644
--- a/res/skins/LateNight/spinny2_mask.svg
+++ b/res/skins/LateNight/spinny2_mask.svg
@@ -8,79 +8,72 @@
    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"
+   version="1.1"
    width="96"
    height="96"
    id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="spinny2_mask.svg"
-   enable-background="new">
+   style="enable-background:new">
   <defs
      id="defs4">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3861">
       <stop
-         style="stop-color:#09b2ae;stop-opacity:1;"
-         offset="0"
-         id="stop3863" />
+         id="stop3863"
+         style="stop-color:#eece33;stop-opacity:1"
+         offset="0" />
       <stop
-         style="stop-color:#09b2ae;stop-opacity:0;"
-         offset="1"
-         id="stop3865" />
+         id="stop3865"
+         style="stop-color:#eece33;stop-opacity:0"
+         offset="1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3851">
       <stop
-         style="stop-color:#09b2ae;stop-opacity:1;"
-         offset="0"
-         id="stop3853" />
+         id="stop3853"
+         style="stop-color:#eece33;stop-opacity:1"
+         offset="0" />
       <stop
-         style="stop-color:#09b2ae;stop-opacity:0;"
-         offset="1"
-         id="stop3855" />
+         id="stop3855"
+         style="stop-color:#eece33;stop-opacity:0"
+         offset="1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3851"
-       id="linearGradient3857"
        x1="48.010761"
        y1="0.07037171"
        x2="47.827461"
        y2="24.407314"
+       id="linearGradient3857"
+       xlink:href="#linearGradient3851"
        gradientUnits="userSpaceOnUse" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="radialGradient3867"
        cx="50.002552"
        cy="45.492374"
+       r="20.076782"
        fx="50.002552"
        fy="45.492374"
-       r="20.076782"
+       id="radialGradient3867"
+       xlink:href="#linearGradient3861"
        gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="50.002552"
+       cy="45.492374"
+       r="20.076782"
+       fx="50.002552"
+       fy="45.492374"
+       id="radialGradient3335"
+       xlink:href="#linearGradient3861"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-2.002552,2.5076256)" />
+    <linearGradient
+       x1="48.010761"
+       y1="0.07037171"
+       x2="47.827461"
+       y2="24.407314"
+       id="linearGradient3338"
+       xlink:href="#linearGradient3851"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96248721,0,0,0.96503687,1.8784665,1.8438788)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.919596"
-     inkscape:cx="51.499247"
-     inkscape:cy="45.005441"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1056"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -89,86 +82,59 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="orig"
-     inkscape:groupmode="layer"
-     id="layer1"
      transform="translate(0,-956.36218)"
-     style="display:none"
-     sodipodi:insensitive="true">
+     id="layer1"
+     style="display:none">
     <image
-       y="956.36218"
-       x="0"
-       id="image3047"
        xlink:href="data:image/png;base64,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 AABJRU5ErkJggg== "
+       x="0"
+       y="956.36218"
+       width="96"
        height="96"
-       width="96" />
+       id="image3047" />
   </g>
   <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer"
-     style="display:inline">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.4;fill:url(#linearGradient3857);fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3849"
-       sodipodi:cx="47.919113"
-       sodipodi:cy="47.82835"
-       sodipodi:rx="47.792843"
-       sodipodi:ry="47.666573"
-       d="m 95.711956,47.82835 a 47.792843,47.666573 0 1 1 -95.58568571,0 47.792843,47.666573 0 1 1 95.58568571,0 z"
-       transform="matrix(0.96248721,0,0,0.96503687,1.8784665,1.8438788)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.4;fill:url(#radialGradient3867);fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3859"
-       sodipodi:cx="50.002552"
-       sodipodi:cy="45.492374"
-       sodipodi:rx="20.076782"
-       sodipodi:ry="20.076782"
-       d="m 70.079334,45.492374 a 20.076782,20.076782 0 1 1 -40.153564,0 20.076782,20.076782 0 1 1 40.153564,0 z"
-       transform="translate(-2.002552,2.5076256)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3830"
-       sodipodi:cx="48.739861"
-       sodipodi:cy="48.017754"
-       sodipodi:rx="4.2931485"
-       sodipodi:ry="4.2931485"
-       d="m 53.033009,48.017754 a 4.2931485,4.2931485 0 1 1 -8.586297,0 4.2931485,4.2931485 0 1 1 8.586297,0 z"
-       transform="matrix(0.93171713,0,0,0.93171713,2.588237,3.2610364)" />
-    <path
-       style="opacity:1;fill:#0e0e0e;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="M 0,0 0,96 96,96 96,0 0,0 z M 48,2 C 73.405099,2 94,22.594902 94,48 94,73.405099 73.405099,94 48,94 22.594902,94 2,73.405099 2,48 2,22.594902 22.594902,2 48,2 z"
-       id="rect3842"
-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:type="arc"
-       style="fill:none;stroke:#585858;stroke-width:1.94182289;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
-       id="path4919"
-       sodipodi:cx="47.414036"
-       sodipodi:cy="48.144024"
-       sodipodi:rx="42.110733"
-       sodipodi:ry="45.330597"
-       d="m 89.524769,48.144024 a 42.110733,45.330597 0 1 1 -84.2214662,0 42.110733,45.330597 0 1 1 84.2214662,0 z"
-       transform="matrix(1.0686112,0,0,0.99270698,-2.6671686,0.20709149)" />
+     id="layer4"
+     style="display:none">
+    <rect
+       width="96"
+       height="96"
+       x="0"
+       y="-8.8817842e-16"
+       id="rect4304"
+       style="fill:#2f290a;fill-opacity:1;fill-rule:nonzero;stroke:none" />
   </g>
+  <path
+     d="M 94,48 A 46,46 0 1 1 2,48 46,46 0 1 1 94,48 z"
+     id="path3849"
+     style="opacity:0.4;fill:url(#linearGradient3338);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  <path
+     d="m 68.076782,48 a 20.076782,20.076782 0 0 1 -40.153564,0 20.076782,20.076782 0 1 1 40.153564,0 z"
+     id="path3859"
+     style="opacity:0.4;fill:url(#radialGradient3335);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  <path
+     d="m 52,48 a 4,4 0 0 1 -8,0 4,4 0 1 1 8,0 z"
+     id="path3830"
+     style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
   <g
-     inkscape:groupmode="layer"
      id="layer3"
-     inkscape:label="indicator"
      style="opacity:0.95999995;display:none">
     <path
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
        d="M 46,3.7264493 C 45.96903,2.8335721 46.545072,1.949526 47.936937,1.9914377 49.328802,2.0333497 49.963562,2.675413 49.984216,3.742233 L 50,42.800846 C 50,43.482472 48.712307,43.913653 47.950679,43.9057 47.18905,43.897748 46.015784,43.447975 46,42.800846 z"
        id="rect3776"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="czcczcc" />
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
   </g>
+  <path
+     d="M 0,0 0,96 96,96 96,0 0,0 z M 48,3 C 59.76833,3 71.491034,7.8660391 79.8125,16.1875 88.133966,24.508961 93,36.23167 93,48 93,59.76833 88.133966,71.491039 79.8125,79.8125 l -0.09375,0.09375 C 71.403068,88.170618 59.724203,93 48,93 36.23167,93 24.508966,88.133961 16.1875,79.8125 L 16.09375,79.71875 C 7.8293765,71.403073 3,59.724203 3,48 3,36.23167 7.8660341,24.508961 16.1875,16.1875 24.508966,7.8660391 36.23167,3 48,3 z"
+     id="rect3033"
+     style="color:#000000;fill:#1e1e1e;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:11.19999981;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="M 93.000002,48 A 45.000001,45 0 0 1 3.0000002,48 45.000001,45 0 1 1 93.000002,48 z"
+     id="path4919"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new" />
 </svg>
diff --git a/res/skins/LateNight/spinny3_mask.svg b/res/skins/LateNight/spinny3_mask.svg
new file mode 100644
index 000000000000..20f3b367eb96
--- /dev/null
+++ b/res/skins/LateNight/spinny3_mask.svg
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="96"
+   height="96"
+   id="svg2"
+   style="enable-background:new">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3861">
+      <stop
+         id="stop3863"
+         style="stop-color:#09b2ae;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3865"
+         style="stop-color:#09b2ae;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3851">
+      <stop
+         id="stop3853"
+         style="stop-color:#09b2ae;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3855"
+         style="stop-color:#09b2ae;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="48.010761"
+       y1="0.07037171"
+       x2="47.827461"
+       y2="24.407314"
+       id="linearGradient3857"
+       xlink:href="#linearGradient3851"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="50.002552"
+       cy="45.492374"
+       r="20.076782"
+       fx="50.002552"
+       fy="45.492374"
+       id="radialGradient3867"
+       xlink:href="#linearGradient3861"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="50.002552"
+       cy="45.492374"
+       r="20.076782"
+       fx="50.002552"
+       fy="45.492374"
+       id="radialGradient3299"
+       xlink:href="#linearGradient3861"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-2.002552,2.5076256)" />
+    <linearGradient
+       x1="48.010761"
+       y1="0.07037171"
+       x2="47.827461"
+       y2="24.407314"
+       id="linearGradient3302"
+       xlink:href="#linearGradient3851"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96248721,0,0,0.96503687,1.8784665,1.8438788)" />
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-956.36218)"
+     id="layer1"
+     style="display:none">
+    <image
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAYAAADimHc4AAAABHNCSVQICAgIfAhkiAAAEgNJREFU eJztXWtsJNlVPufcW492+1kzHvc87PHMet32vlhWSCFEQoIfKFJW2gRBNmJBsBIICEgILUH5FfiD EMkGFEWJIIEIxEMRrIL4xz8IBIlNFIlAdtc9GdiJN+Px2Ov2zNjdXY97z+FHVfW07W6/xu7yzviT Wl2PW7duna/Oueeee6oKR0ZGBE5RGKjoBjzq0EU3YC8MTV+5MTlQmhYRKwgAAILY/b4RYQAAxFSn UUSg9v3vN6TVGupTcw8MPEkmyDkT3Jw5N1ER3C5kgfUnnvrHZHjw7vZj4iBYd+v1sR113dscGXvz jY+0axAGFEARwYWFBQQAPJ6rOBgKJ8CfnKpND5VnEKndjvXq7NeSoaEtwo7GxtYPWre3vr6FGGdj Y2Ssdu2nAQBEGIGLJ6MQArDk35ubvlIGwva567OzryUD6R0eBaMHFvZ+4dXvjAEAOM3NkeDatZ8B AAAWFBHKyOgr+kqAHgtuzpyfqGBmpeszM/8QDwykQh8ZqbcbpRQAAIi17eVO5Ns7/zvReUxnHdvL +ffuBSICbrM5Ely//rMigsD9JaIvBNBgebU6ORXkd3z96tW/jwcG7oTDw12Fnq/3EnAn9kNAr/Kd 5/DW1wOn0Rg98/bbH+2nRhwrAejoaG7mcZ0Lfm1q+qtJuXwnHBmq73VsUfDvbqRELN74WD+IODYC 5ufnLSIyAMC7U5Nfze74teM413HAv3fvjNtsjp5dfOdjIkLMrGq12pGf5+gJQErm56qIiPLupYt/ F/kDd8Kh8ntG8NvhbzTOeGFz9Mw7P3hJRNRRa8OREqCHhxdnL106DwCwWjn/t3fPnPnfo6q7aIys rT02vnzrJWZWCwsLRxZBODICOk3O6rmJv7lzZuz6UdR7kjC6tj4zvnL754/SJB0JAbnwV8fH/zpy 9HpzYODd9gn28GI6y3RzFx/EG+q1fbub26ve7edGpaC02TzrRq2x8dV3f/EoSHhgAnLhrwTBX90Z HfneA7XmPYTRO3cfH19be/lBSXggAubn5w0iysro6F+uDw1eO3Qr3qMY29icHV9ff5mZ9WFJODQB 7Tt/eOgr9YGBR074OYJmc3b87r1fPqwmHIqAXPi3ywN/Uff9o3eO32MIwrB6brPxK4ch4cAEtIXv eV9e89xHXvg5zkRx9VwY/upBSTjQhIwqld5GxEvLWn95TasFSJL7O4kAmLce0Llt+37KXOnO/fl6 XrbbMb3272d5r/Vu19CrvduOf1erBfHcPzsXRr8GB5hp3DcBAhhXr1y5BAAQgqxKkmxtSTdXrnPb 9v27refLvcp027+f5f2etxt67etoS8i8SkR2bm4O9zti3rcJmp+fNwAgtxH+dJXhrf0c8yhinGB+ QuDX9+sZ7YuAubk5i4i8bPmLK9acCn8PnFN6foLwN0Vkz/5gbxOE1EJEvRzHX7idxG8eVSMfZtxO 4jfAcT9/Tuvfgj2mO/ckYK466wAAN6N4VZK4Rw91iu1oMqyi49hqtbqrKdqVAFS0hIhnb21sfP5u GC6LtYJKYef/1vIKAQC278+3dyIvky93P3/3OnqV73Z8r/b02rafOndrb36+u9YuLxN8bqI08Nuw i1e0KwHVx2fPAQA342iVw5ABACRJpPO/E53bei33Kr/X/r3KHuT4btew3/p3K7e9vibhKg6UuVqt Ui8t6EkAaXUdEaeW6vXPra/fubWfxp1iK9aj6NYtpD+pjI6+Aj20oCcBszOPTwMANxqNFW6Fp7b/ kGg0Gis4NtZTC3oRsIaIQzdv3frj+srK0vE28eFGfWVlaUnrV89PTPwudNGCrgTMzc2NAAA3NjZW DmN7T7EVjY2NFaxUumpBV7uEiHzz5s3P1uv15b608CFHvV5fXlpa+kyekNaJHRqgtX4dAH640Wis 9qV1BwEhoucTOg4iIqYBsuyaWEBERJJEJAoZWE6U5jYajVVJ07e3pPrtIGBmZuY5aF/VyQB6HpHv K/Q8QkWIjktAtHV8YVmELUgSs9ghkShijmOWVmv3Cek+AhG5Wq1uCU/sIAAR5cSYH61RlcsaSyUi 11XouYSOQ6gUIhKC0ggIAMypX2+tSJywsBGJYsY4tuw4yM2mBWMKvakyM/TqhQsXPgkd4YktBBDR NQCYPgnmhwbLigbKmnxfke8Teq5CnRHgagLYNjpmEBALEhsWk7D4CVMUEbuuYtcxHIaWNxuFakM3 M7SFgNnZ2asAULjPT4NlpYaGHBooK/J9hSVfo+MQuS6h4ygkjaAQgei+CUqsiIiAb0WSxEpimB2H 0HEsOg6CbiCQQr53zxR4aYCIUq1WITdD201Q4eaHhoe1Kg9oGhzUqjSg0S8pKnmKXFeB1oTaVagJ gYgAFSAiAmb3lU0YrIgkiRITW3Q0sXYIlSKgtCSwlaI0oV6vLy8uLn5pcnLy4/m2LQQgohRpfmiw rHLhU6msabCsyfcUep5G7SoqeQqVItCaMi8of7pFgFnEuCJsGI1miR0CVAREyADY6XqIZSiqc46i 6HrmjiLASXpIT2sk31e52SHf1+R7GkslTa6ryPc1aJ1qAhGiUgSCqSkCADHMKJaBmTmOGR1DoBAx IkREZK1AWARYRFkWkyRcVMcsIjsJyP3/IhoEAKDKZd3udEtlrQYHFHkljb6vyfc1Oo7OzJBCx6Hs 7ifE+/2wWMuSJKyUshzHRETIRPnjfiLGCgiLJInQwIAqsD9oE98mYGZm5kcAoBC1xFJJke9T9tNU ysyO76b/nqfJdTV6nkalFJImcBShCAIRpjcUMBhmIGJQKjdRQADAzIKGhUpWwBqRJGFVKimJIpYo 6rvTgYiQd8RbngUtqgMm1yX0PIWeq9D1Up9fp2aHXPe+8B1Ho+c56Lsuua6LpZKLnueQ6zqkHJc8 x1We56DntbUGHUeTV9LopR05el7q0nqeIt/f+QDaMaNery/fuHHjtXy9sw8opgMmRHQ0poOszM93 HIWuVug4udDuC1M52pt7fMa9cOFJ8v1hEQGJonvx0tJb0ds3/k9Sk4MiguC6IAzCxjC6msG4jDqx qF1CzyX0PAJC7HfYotVqLebLhXfCWWyHkDSidgg1EWqXyPEIHSe1+UrlZDjl9//oTzjj43MAACgC IgLoeUN6ePiiMz5+ffOb3/oXYABBZBRRwMxgXUvWEieWMmItKo2oCNHzqd8eERE18uU2Ad0idf0A Og6i42J7hKscAoUITupCIqXbUCldevKJZ9yzZ+fs5ibc/sIXYfM/XwcAgMEfez9M/MbHQZ89O1Oa n1tpvbXwXYxYRGsGawmVIlEOgQoRSSO6mtDRhI6LqKjvgS9EjPLl4jUg8+dRq3SkpFMXM9tOqAlR EyEQuRcuPCki8INP/R5sfP3f2nXUFxfBrKzA1Kf/CJzz5+fDa997E5RKB2CI7fpQqdQ1RQRAhQCA qDRBn50PRGzndBb/thRCQEAApHRglf4g8/VTEkSQyiUXPW+EwxA2/v0bO6q5969fBw5DINcdRUe7 QITIQEBEAJCPnLFNOCGg4yBQIW8paCvdFgIKC0GoHVLIR7ipiymZNiCiJEn3BFrmjgew02Cd6Ozy iBBSC3v/PFSM5LdjCwFBEFT63wQEsCwgLJC/j0bueyWICIII3GhFHMcNPTwM/tzcjloGnnsOVLkM bEyD4ygGSDtpAMjD1QJiCw80ZmiTX7wJYgbJNFKABZgFRQCYGZgZcsGhSLK2dh0AYPIP/wBKTz/d rmLg2R+CS7//KQAAMMvLbwELZ9FRBisC6dtq0jmDDMAsYq0A99/3EBEnX9YdG4sxhm1hGAFmACtp SEFExDCLtYxKsVjL4Xff+LYeHb3kTU6eufqVPwduNgEAQJXLIIhgNzdvt2rX3gBjWIA5/xdrGWwi 6b9Iaq5M/t93rRARL18uXAMkSUSSWCQxnE6mxHlIOZ3ZShJmY1istbbVCje/8R//FC8tfUesDVW5 DDQ4CGxMI7l16783v/mtfxZrYjbGgDE2jw2lkVJmMSzCRiQ2LInhdPqy/1aJmcv5cqcbWowGRCFL MsBijYhJWAwzG8OUJCyxseJYQmMI4pgAEbnRCpv/9Z3XQetvk+97wGwlSYwIs1hmMMZCHBs2xkiS WEis5Ti2woaFDaeTNUl6PsvpBH6/r1lkJF/eQkC5XB7vuyfEIhwnTFHM4sdpcMxzLGhN4sQkoSJB RCYCRBR0RDBmwdhYmyTx/Xo4NV3WGjHGSpJkJERWwthKGFuIY5trmUTZuQrInvB9fzJf7uwD4OLF i680Go1P9puELCppJYpJ3ERxHFvQmihCFERkhUCQPtlOzAJKWdGawBgChYDW5n1ravdjY9kmRlot w3FsxMRGTGw5ji2HoZUothJFluP+p9sHQVC5cuXKT+XrbQJqtdqd+fn5Qt4uKFHEHIaMnsfoOAaU RlQKBbJ4PhGwFUDXMjNrJE3o2nSABdmoJrfznPYXEkVWksRAnApboshwK7ISR5bDkG2rZQtMWcFu c8JnACDuWrwPsI2GQc+jbHSaz3QhoQAzC/kswloRswglCAmloQaAtp+fmSCR2FgxcSr0OLYShoZb keVmM82OCEPLzWZhGRLYMYu0JRZUlCsKAADGCDcbBhEBCDGL1QAACKYuqZDnMCfWgpPGdiSfExYE EMtiWEAscxwzGMPcioyY2HCzaTmMDEcty82G5WbDFDUdaa0NOuW8PRhXTEecoZ2tQOkdgiBgrQhZ K+gyg00YVEKoCdsT8ykynz7188XELEmS2vxWZLnVyPKCNo1tNE2R+UGe5z3Tub5DA4rqiHN0CkcS w8paLWyEYsPiaouOowAVZqkpmIcbRETawjfMYhLmVpjbfMvNhrUbG0mRwg+CoDI9Pf2hzm1bCFhY WMAnnniiv63qglxIlCQKmIWShMWL8sw4i1ohKtqamMUsIpJmxiVJ7mpaDkPmZuNEZMYBACAiLSws tNe35wWRiBRqhnLwZsNyGLFKjHAcM7kuo+dSe0JF6VT4RAgCAJKGMyQ27dxQjmMrrRbbRnE2vxOu 6z67vZ/dMSEjIlS0GWrDGLF37yYYhiS+z+jodObMcRFJYTuMbbPk3HZ2NEvq7xeT9dANQRBUpqam Xtq+fQcBJ8UMdUKiiG0Ucfv5AEVpzL8zpM8CYg2LZTiJzwcA7DQ/AN3T00lE6CSYoR1gEWm18od0 C7fnB4HW+gPd3Pyu0dDcDBUzQfPwIfN+PtJtX1cCarVauzM+3qY9GnBd9ykA6PqYas/5ABFRp1rw 4Mg631/qtb8nAadacDTwPO9J6HH3A+wxI3aqBQ+GIAgqk5OTL+9WZlcCMi2gUy04HBzHeR/scvcD 7GNO+FQLDocgCCqXL1/+6F7l9iSgVquhiKhTLTgYEPHD0DHx0gv7yooQEXXhwoXfmZycfHrv0qeo VCoffOyxx358P2X3RUCtVgMR0RcvXnzllITdMTk5+czU1NQvAADs562J+84LqtVqyMyn/cEuCIKg cv78+U/APkxPjgMlZtVqNXXaH/QGET0PAAd6dfGBM+Oy/uATp6ZoK8bHx1+8evXqTx70uAMTkPcH pyTcx8TExAtXrlx5AWB/dr8Th8oN7SDhkfeMJiYmnr98+fKLAAcXPsADJOdmJDiPsiZMTEy8cPny 5Z8DOJzwAR4wO/pRNkfj4+MvPsidn+NIvqJUrVYBEe3S0tKnG43G6ombSTtCBEFQIaLn8w638K8o 5ahWqwAAlojszZs3P/vOO+/8z1HUe5IwOTn5TObnK4AHFz7AMXzKsFqtCiKapaWlVx8mEiqVygez Ee6+B1n7wbF8zPNhMklBEFQQ8cN5bOeoP+h5bF9TzUySZER85r1GRBAEFcdx3peFlBHg6IUP0IcP OmdEcEbEqyediCAIKp7nPZnNZBHA8Qg+R98+aX7SiQiCoOK67lPZBPqxCz5HX78pD7CFCM5NE0Ax T+nnUV2t9QeyvJ2+CT5H3wnIkXXUIiI5Ga/2g4xc6K7rPjs1NfVSnpAM0F/B5yiMgE5sI0MWFxe/ FEXRlu8RH4aUznkLa23ged4z09PTHypa6J04EQR0IjNROSECqScFN27ceK3Vai0SUQMRo+yVL+23 D4qIIyIeM5dFZMT3/cnsaUTEtLJ2XmbRQu/EiSOgG3JSDoOTJOxueE8Q8DDj/wGeBpGeX2BWoQAA AABJRU5ErkJggg== "
+       x="0"
+       y="956.36218"
+       width="96"
+       height="96"
+       id="image3047" />
+  </g>
+  <path
+     d="M 94,48 A 46,46 0 1 1 2,48 46,46 0 1 1 94,48 z"
+     id="path3849"
+     style="opacity:0.4;fill:url(#linearGradient3302);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  <path
+     d="m 68.076782,48 a 20.076782,20.076782 0 0 1 -40.153564,0 20.076782,20.076782 0 1 1 40.153564,0 z"
+     id="path3859"
+     style="opacity:0.4;fill:url(#radialGradient3299);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  <path
+     d="m 52,48 a 4,4 0 0 1 -8,0 4,4 0 1 1 8,0 z"
+     id="path3830"
+     style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  <g
+     id="layer3"
+     style="opacity:0.95999995;display:none">
+    <path
+       d="M 46,3.7264493 C 45.96903,2.8335721 46.545072,1.949526 47.936937,1.9914377 49.328802,2.0333497 49.963562,2.675413 49.984216,3.742233 L 50,42.800846 C 50,43.482472 48.712307,43.913653 47.950679,43.9057 47.18905,43.897748 46.015784,43.447975 46,42.800846 z"
+       id="rect3776"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  </g>
+  <path
+     d="M 0,0 0,96 96,96 96,0 0,0 z M 48,3 C 59.76833,3 71.491034,7.8660391 79.8125,16.1875 88.133966,24.508961 93,36.23167 93,48 93,59.76833 88.133966,71.491039 79.8125,79.8125 l -0.09375,0.09375 C 71.403068,88.170618 59.724203,93 48,93 36.23167,93 24.508966,88.133961 16.1875,79.8125 L 16.09375,79.71875 C 7.8293765,71.403073 3,59.724203 3,48 3,36.23167 7.8660341,24.508961 16.1875,16.1875 24.508966,7.8660391 36.23167,3 48,3 z"
+     id="rect3033"
+     style="color:#000000;fill:#1e1e1e;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:11.19999981;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="M 93.000002,48 A 45.000001,45 0 0 1 3.0000002,48 45.000001,45 0 1 1 93.000002,48 z"
+     id="path4919"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new" />
+</svg>
diff --git a/res/skins/LateNight/spinny4_mask.svg b/res/skins/LateNight/spinny4_mask.svg
new file mode 100644
index 000000000000..20f3b367eb96
--- /dev/null
+++ b/res/skins/LateNight/spinny4_mask.svg
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="96"
+   height="96"
+   id="svg2"
+   style="enable-background:new">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3861">
+      <stop
+         id="stop3863"
+         style="stop-color:#09b2ae;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3865"
+         style="stop-color:#09b2ae;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3851">
+      <stop
+         id="stop3853"
+         style="stop-color:#09b2ae;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3855"
+         style="stop-color:#09b2ae;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="48.010761"
+       y1="0.07037171"
+       x2="47.827461"
+       y2="24.407314"
+       id="linearGradient3857"
+       xlink:href="#linearGradient3851"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="50.002552"
+       cy="45.492374"
+       r="20.076782"
+       fx="50.002552"
+       fy="45.492374"
+       id="radialGradient3867"
+       xlink:href="#linearGradient3861"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="50.002552"
+       cy="45.492374"
+       r="20.076782"
+       fx="50.002552"
+       fy="45.492374"
+       id="radialGradient3299"
+       xlink:href="#linearGradient3861"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-2.002552,2.5076256)" />
+    <linearGradient
+       x1="48.010761"
+       y1="0.07037171"
+       x2="47.827461"
+       y2="24.407314"
+       id="linearGradient3302"
+       xlink:href="#linearGradient3851"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96248721,0,0,0.96503687,1.8784665,1.8438788)" />
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-956.36218)"
+     id="layer1"
+     style="display:none">
+    <image
+       xlink:href="data:image/png;base64,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 AABJRU5ErkJggg== "
+       x="0"
+       y="956.36218"
+       width="96"
+       height="96"
+       id="image3047" />
+  </g>
+  <path
+     d="M 94,48 A 46,46 0 1 1 2,48 46,46 0 1 1 94,48 z"
+     id="path3849"
+     style="opacity:0.4;fill:url(#linearGradient3302);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  <path
+     d="m 68.076782,48 a 20.076782,20.076782 0 0 1 -40.153564,0 20.076782,20.076782 0 1 1 40.153564,0 z"
+     id="path3859"
+     style="opacity:0.4;fill:url(#radialGradient3299);fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  <path
+     d="m 52,48 a 4,4 0 0 1 -8,0 4,4 0 1 1 8,0 z"
+     id="path3830"
+     style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  <g
+     id="layer3"
+     style="opacity:0.95999995;display:none">
+    <path
+       d="M 46,3.7264493 C 45.96903,2.8335721 46.545072,1.949526 47.936937,1.9914377 49.328802,2.0333497 49.963562,2.675413 49.984216,3.742233 L 50,42.800846 C 50,43.482472 48.712307,43.913653 47.950679,43.9057 47.18905,43.897748 46.015784,43.447975 46,42.800846 z"
+       id="rect3776"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  </g>
+  <path
+     d="M 0,0 0,96 96,96 96,0 0,0 z M 48,3 C 59.76833,3 71.491034,7.8660391 79.8125,16.1875 88.133966,24.508961 93,36.23167 93,48 93,59.76833 88.133966,71.491039 79.8125,79.8125 l -0.09375,0.09375 C 71.403068,88.170618 59.724203,93 48,93 36.23167,93 24.508966,88.133961 16.1875,79.8125 L 16.09375,79.71875 C 7.8293765,71.403073 3,59.724203 3,48 3,36.23167 7.8660341,24.508961 16.1875,16.1875 24.508966,7.8660391 36.23167,3 48,3 z"
+     id="rect3033"
+     style="color:#000000;fill:#1e1e1e;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:11.19999981;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  <path
+     d="M 93.000002,48 A 45.000001,45 0 0 1 3.0000002,48 45.000001,45 0 1 1 93.000002,48 z"
+     id="path4919"
+     style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new" />
+</svg>
diff --git a/res/skins/LateNight/spinny_bg.svg b/res/skins/LateNight/spinny_bg.svg
index da849e0bfbca..68b63a0b3efb 100644
--- a/res/skins/LateNight/spinny_bg.svg
+++ b/res/skins/LateNight/spinny_bg.svg
@@ -8,77 +8,53 @@
    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"
+   version="1.1"
    width="96"
    height="96"
    id="svg2"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="spinny_bg.svg"
-   enable-background="new">
+   style="enable-background:new">
   <defs
      id="defs4">
     <linearGradient
        id="linearGradient3861">
       <stop
-         style="stop-color:#eece33;stop-opacity:1;"
-         offset="0"
-         id="stop3863" />
+         id="stop3863"
+         style="stop-color:#eece33;stop-opacity:1"
+         offset="0" />
       <stop
-         style="stop-color:#eece33;stop-opacity:0;"
-         offset="1"
-         id="stop3865" />
+         id="stop3865"
+         style="stop-color:#eece33;stop-opacity:0"
+         offset="1" />
     </linearGradient>
     <linearGradient
        id="linearGradient3851">
       <stop
-         style="stop-color:#eece33;stop-opacity:1;"
-         offset="0"
-         id="stop3853" />
+         id="stop3853"
+         style="stop-color:#eece33;stop-opacity:1"
+         offset="0" />
       <stop
-         style="stop-color:#eece33;stop-opacity:0;"
-         offset="1"
-         id="stop3855" />
+         id="stop3855"
+         style="stop-color:#eece33;stop-opacity:0"
+         offset="1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3851"
-       id="linearGradient3857"
        x1="48.010761"
        y1="0.07037171"
        x2="47.827461"
        y2="24.407314"
+       id="linearGradient3857"
+       xlink:href="#linearGradient3851"
        gradientUnits="userSpaceOnUse" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3861"
-       id="radialGradient3867"
        cx="50.002552"
        cy="45.492374"
+       r="20.076782"
        fx="50.002552"
        fy="45.492374"
-       r="20.076782"
+       id="radialGradient3867"
+       xlink:href="#linearGradient3861"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.919596"
-     inkscape:cx="-5.8900433"
-     inkscape:cy="42.101252"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer4"
-     showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1056"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -87,88 +63,58 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     inkscape:label="orig"
-     inkscape:groupmode="layer"
-     id="layer1"
      transform="translate(0,-956.36218)"
-     style="display:none"
-     sodipodi:insensitive="true">
+     id="layer1"
+     style="display:none">
     <image
-       y="956.36218"
-       x="0"
-       id="image3047"
        xlink:href="data:image/png;base64,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 AABJRU5ErkJggg== "
-       height="96"
-       width="96" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="Layer#1">
-    <rect
-       style="fill:#1e1e1e;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect4304"
+       x="0"
+       y="956.36218"
        width="96"
        height="96"
-       x="0"
-       y="-8.8817842e-16" />
+       id="image3047" />
   </g>
   <g
-     inkscape:groupmode="layer"
      id="layer2"
-     inkscape:label="Layer"
      style="display:none">
     <path
-       sodipodi:type="arc"
-       style="opacity:0.4;fill:url(#linearGradient3857);fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3849"
-       sodipodi:cx="47.919113"
-       sodipodi:cy="47.82835"
-       sodipodi:rx="47.792843"
-       sodipodi:ry="47.666573"
        d="m 95.711956,47.82835 a 47.792843,47.666573 0 1 1 -95.58568571,0 47.792843,47.666573 0 1 1 95.58568571,0 z"
-       transform="matrix(0.96248721,0,0,0.96503687,1.8784665,1.8438788)" />
+       transform="matrix(0.96248721,0,0,0.96503687,1.8784665,1.8438788)"
+       id="path3849"
+       style="opacity:0.4;fill:url(#linearGradient3857);fill-opacity:1;fill-rule:nonzero;stroke:none" />
     <path
-       sodipodi:type="arc"
-       style="opacity:0.4;fill:url(#radialGradient3867);fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3859"
-       sodipodi:cx="50.002552"
-       sodipodi:cy="45.492374"
-       sodipodi:rx="20.076782"
-       sodipodi:ry="20.076782"
        d="m 70.079334,45.492374 a 20.076782,20.076782 0 1 1 -40.153564,0 20.076782,20.076782 0 1 1 40.153564,0 z"
-       transform="translate(-2.002552,2.5076256)" />
+       transform="translate(-2.002552,2.5076256)"
+       id="path3859"
+       style="opacity:0.4;fill:url(#radialGradient3867);fill-opacity:1;fill-rule:nonzero;stroke:none" />
     <path
-       sodipodi:type="arc"
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="path3830"
-       sodipodi:cx="48.739861"
-       sodipodi:cy="48.017754"
-       sodipodi:rx="4.2931485"
-       sodipodi:ry="4.2931485"
        d="m 53.033009,48.017754 a 4.2931485,4.2931485 0 1 1 -8.586297,0 4.2931485,4.2931485 0 1 1 8.586297,0 z"
-       transform="matrix(0.93171713,0,0,0.93171713,2.588237,3.2610364)" />
+       transform="matrix(0.93171713,0,0,0.93171713,2.588237,3.2610364)"
+       id="path3830"
+       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
     <path
-       style="fill:#0e0e0e;fill-opacity:1;fill-rule:nonzero;stroke:none"
        d="M 0,0 0,96 96,96 96,0 0,0 z M 48,2 C 73.405099,2 94,22.594902 94,48 94,73.405099 73.405099,94 48,94 22.594902,94 2,73.405099 2,48 2,22.594902 22.594902,2 48,2 z"
        id="rect3842"
-       inkscape:connector-curvature="0" />
+       style="fill:#0e0e0e;fill-opacity:1;fill-rule:nonzero;stroke:none" />
   </g>
   <g
-     inkscape:groupmode="layer"
      id="layer3"
-     inkscape:label="indicator"
      style="opacity:0.95999995;display:none">
     <path
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
        d="M 46,3.7264493 C 45.96903,2.8335721 46.545072,1.949526 47.936937,1.9914377 49.328802,2.0333497 49.963562,2.675413 49.984216,3.742233 L 50,42.800846 C 50,43.482472 48.712307,43.913653 47.950679,43.9057 47.18905,43.897748 46.015784,43.447975 46,42.800846 z"
        id="rect3776"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="czcczcc" />
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
   </g>
+  <rect
+     width="96"
+     height="96"
+     x="0"
+     y="0"
+     id="rect3001"
+     style="color:#000000;fill:#1e1e1e;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
 </svg>
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index 69fb8204304e..fc4ca8cbe7d3 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -1,8 +1,10 @@
+/* LateNight 2.1 */
+
 #debugbg {
     background-color: #fff;
 }
 
-#UIButtons {
+#ToolBar {
   qproperty-layoutAlignment: 'AlignLeft | AlignTop';
   background-color: #1e1e1e;
   padding-top: 1px;
@@ -16,10 +18,21 @@
   background-color: #1e1e1e;
 }
 
-#Deck {
+#Deck1, #Deck2, #Deck3, #Deck4 {
   qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
 }
 
+#Deck1, #Deck2,
+#NoMixer12 {
+  margin-bottom: 5px;
+}
+
+#Deck3, #Deck4,
+#NoMixer34 {
+  margin-top: 2px;
+  margin-bottom: 3px;
+}
+
 #DecksSizer {
   background-color: #0f0f0f;
   qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
@@ -35,29 +48,24 @@
   background-color: #1e1e1e;
 }
 
-#DecksLeftContainer, #DecksRightContainer, #SkinContainer {
+#DecksLeftContainer,
+#DecksRightContainer,
+#SkinContainer {
   background-color: #0f0f0f;
   qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
 }
 
-#SpinnyBorder {
-  border: 1px solid #585858;
-}
-
-#SpinnyContainer {
-  border: 0px;
-  background-color: #0f0f0f;
-}
-
 #LibrarySingleton {
-  padding-top: 5px;
-  padding-bottom: 2px;
+  /* This doesn't work as expected:
+  it appears LibrarySingleton is displayed twice, so
+  padding/margin would double.
+  Placed a plain spacer in library.xml which works reliably
+  padding-top: 5px;*/
 }
 
 #Library {
   border-left: 0px solid #585858;
   background-color: #0e0e0e;
-  padding-top: 5px;
   padding-bottom: 2px;
   /*border-top: 1px solid #585858;*/
 }
@@ -66,20 +74,18 @@
   qproperty-layoutAlignment: 'AlignLeft | AlignTop';
   border-bottom: 1px solid #585858;
   background-color: #1e1e1e;
-  padding: 2px;
+  padding: 1px 0px 1px 2px;
 }
 
 #DeckRowTwoThreeFour {
   border-bottom: 1px solid #585858;
   background-color: #1e1e1e;
-  /*padding: 3px;*/
 }
 
 #DeckRowFive {
   border-bottom: 1px solid #585858;
   background-color: #1e1e1e;
   padding: 0px;
-  padding-left: 2px;
 }
 
 #DecksAndMixer {
@@ -93,28 +99,19 @@
   border-left: 0px;
 }
 
-#Deck4 {
-  qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
-  border: 1px solid #585858;
-  border-top: 0px;
-}
-
-#Deck2 {
-  qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
-  border: 1px solid #585858;
-}
-
+#Deck1,
 #Deck3 {
   qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
   border: 1px solid #585858;
   border-right: 0px;
-  border-top: 0px;
+
 }
 
-#Deck1 {
+#Deck2,
+#Deck4 {
   qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
   border: 1px solid #585858;
-  border-right: 0px;
+  border-left: 0px;
 }
 
 #DeckContainer {
@@ -138,54 +135,56 @@
   background-color: #0f0f0f;
 }
 
-#Mixer {
-  background-color: #1e1e1e;
-  qproperty-layoutAlignment: 'AlignCenter';
-  border: 1px solid #585858;
-  border-top: 0px;
-}
-
 #ClockWidget {
   qproperty-layoutAlignment: 'AlignVCenter | AlignHCenter';
+  margin-bottom: 2px;
 }
 
 #LatencyMeter {
   margin: 1px;
+  padding-right: 4px;
+  padding-left: 4px;
 }
 
-#PrimaryMixer {
-  qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
-  padding: 0px;
-  margin: 0px;
-  border: 1px solid #585858;
-  border-left: 0px;
-  border-bottom: 0px;
-  border-top: 0px;
-}
-
-#MixerChannelControls {
+#LatencyLabel {
   padding-bottom: 2px;
 }
 
-#MasterControls {
-  qproperty-layoutAlignment: 'AlignRight | AlignTop';
-  padding-right: 2px;
-  padding-top: 10px;
-  padding-left: 5px;
-}
-
-#MasterVuMeter2ch {
-  qproperty-layoutAlignment: 'AlignRight | AlignVCenter';
+#Mixer {/*
+  background-color: #1e1e1e;
+  qproperty-layoutAlignment: 'AlignCenter';
+  border: 1px solid #585858;*/
 }
 
-#MasterVuMeter4ch {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
+#NoMixer12,
+#NoMixer34 {
+  border: 1px solid #585858;
+  border-width: 0px 1px 0px 1px;
+  background-color: #0f0f0f;
 }
 
-#MixerContainer {
-  qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
+#MixerChannelControls {
+  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
+  padding-bottom: 2px;
+  border: 1px solid #585858;
+  border-right: 0px;
   background-color: #1e1e1e;
-  padding-top: 3px;
+  }
+
+  #MixerContainer {
+    qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
+    background-color: #1e1e1e;
+    padding-top: 3px;
+  }
+
+#MasterControls {
+  qproperty-layoutAlignment: 'AlignRight | AlignTop';
+  padding: 2px;
+  /* this wouldn't work:
+  border-left: 1px solid #585858;
+  border-width: 0px 0px 0px 1px; */
+  border: 1px solid #585858;
+  background: transparent url(skin:background_tile.png) repeat;
 }
 
 #MixerChannel {
@@ -204,12 +203,12 @@
   qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
 }
 
-#MixerLeftMargin {
-  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
+#MasterVuMeter2ch {
+  qproperty-layoutAlignment: 'AlignRight | AlignVCenter';
 }
 
-#MixerRightMargin {
-  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
+#MasterVuMeter4ch {
+  qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
 }
 
 #NoMixerLogo {
@@ -229,12 +228,13 @@
 }
 
 #VuAndSlider {
+  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
   padding-top: 3px;
 }
 
 #VuMeter {
   qproperty-layoutAlignment: 'AlignRight | AlignVCenter';
-  padding-right: 6px;
+  padding-right: 4px;
 }
 
 #MasterSync {
@@ -252,12 +252,16 @@
   qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
 }
 
-#KillButton {
+#KillButtonLeft {
   qproperty-layoutAlignment: 'AlignRight | AlignVCenter';
+  padding-left: 2px;
+  margin-top: 2px;
 }
 
-#KillButtonReversed {
+#KillButtonRight {
   qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
+  padding-right: 2px;
+  margin-top: 2px;
 }
 
 #TitleGutter, #AlbumGutter {
@@ -271,8 +275,8 @@
 
 #ArtistGutter{
   qproperty-layoutAlignment: 'AlignLeft | AlignBottom';
-  padding: 1px;
-  padding-bottom: 4px;
+  padding: 1px;/*
+  padding-bottom: 2px;*/
   border: 0px solid #585858;
 }
 
@@ -319,7 +323,7 @@
   qproperty-layoutAlignment: 'AlignRight | AlignBottom';
 }
 
-#RateButtons, #RatePermButtons, #RateTempButtons {
+#RateButtons {
   qproperty-layoutAlignment: 'AlignHCenter | AlignBottom';
 }
 
@@ -335,7 +339,7 @@
 
 #DeckButtons {
   qproperty-layoutAlignment: 'AlignBottom';
-  padding: 3px;
+  padding: 3px 1px 1px 3px;
 }
 
 #ColumnTwo {
@@ -343,30 +347,67 @@
 }
 
 #ToolbarButtons {
+  qproperty-layoutAlignment: 'AlignCenter';
   border: 1px solid #585858;
   border-top: 0px;
   border-right: 0px;
   border-bottom: 0px;
-  padding: 2px;
+  padding: 0px 2px;
 }
 
-#VinylControls {
-  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
+#KeyText {
+  qproperty-alignment: 'AlignCenter';
+  font-size: 13px/16px;
+  font-weight: bold;
+  font-family: Lucida Grande, Lucida Sans Unicode, Segoe UI, Arial, Verdana, sans-serif;
+  background-color: #0f0f0f;
+  border: 1px solid #585858;
+  border-radius: 3px;
+  padding: 0px;
+  margin: 0px 1px;
+}
+
+#ArtistText,
+#TitleText,
+#PlayPositionText {
+ font-size: 18px/21px;
+ font-weight: bold;
+ font-family: Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
 }
 
-#VinylControls2 {
+#DurationText {
+  font-size: 13px/15px;
+  font-weight: bold;
+  font-family: Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
+}
+
+#VinylControls {
   qproperty-layoutAlignment: 'AlignLeft | AlignTop';
 }
 
 #KnobLabel {
   font-family: "Lucida Grande", "Helvetica Neue", "Segoe UI", Arial, "Open Sans Light";
-  font: bold 10px/12px;
+  font: bold 10px/8px;
   text-transform: uppercase;
   color: #585858;
   text-align: center;
   qproperty-alignment: 'AlignCenter | AlignBottom';
-  padding-bottom: 1px;
-  padding-top: -3px;
+  padding-top: -2px;
+}
+
+#FxKnobLabel {
+  font-family: "Lucida Grande", "Helvetica Neue", "Segoe UI", Arial, "Open Sans Light";
+  font: bold 10px/8px;
+  text-transform: uppercase;
+  color: #585858;
+  text-align: center;
+  qproperty-alignment: 'AlignCenter | AlignBottom';
+  padding-top: 26px;
+}
+
+#FxKnobContainer {
+  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';/*
+  background-color: #113397;*/
 }
 
 #SyncControls {
@@ -375,62 +416,107 @@
   border-bottom: 1px solid #585858;
 }
 
-#GuiToggleButton[displayValue="0"] {
-    border: 1px solid #585858;
-    border-radius: 2px;
+#ToolbarDivider {
+  background: transparent url(skin:/buttons/toolbar_divider.png) no-repeat center center;
+}
+
+#RecBox {
+  border: 1px solid #585858;
+  background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #282828, stop:1 #0e0e0e);
+  margin: 2px;
+  border-radius: 2px;
+}
+
+#RecFeedback[displayValue="0"] {
+  background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #282828, stop:1 #0e0e0e);
+}
+
+#RecFeedback[displayValue="1"],
+#RecFeedback[displayValue="2"] {
+  background-color: #840600;
+}
+
+#RecDot {
+  background: none url(skin:/buttons/rec_dot.svg) no-repeat center center;
+}
+
+#RecDuration {
     font-family: "Lucida Grande", "Helvetica Neue", "Segoe UI", Arial, "Open Sans Light";
     font: bold 10px/12px;
     color: #ddd;
-    background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #282828, stop:1 #0e0e0e);
+}
+
+#GuiToggleButton,
+#GuiToggleButtonInverted {
+  margin: 2px;
+}
+
+#GuiToggleButton[displayValue="0"] {
+  border: 1px solid #585858;
+  border-radius: 2px;
+  font-family: "Lucida Grande", "Helvetica Neue", "Segoe UI", Arial, "Open Sans Light";
+  font: bold 10px/12px;
+  color: #ddd;
+  background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #282828, stop:1 #0e0e0e);
 }
 
 #GuiToggleButton[displayValue="1"] {
-    border: 1px solid #585858;
-    border-radius: 2px;
-    font-family: "Lucida Grande", "Helvetica Neue", "Segoe UI", Arial, "Open Sans Light";
-    font: bold 10px/12px;
-    color: #0e0e0e;
-    background-color: #eece33;
+  border: 1px solid #585858;
+  border-radius: 2px;
+  font-family: "Lucida Grande", "Helvetica Neue", "Segoe UI", Arial, "Open Sans Light";
+  font: bold 10px/12px;
+  color: #0e0e0e;
+  background-color: #eece33;
 }
 
 #GuiToggleButton[displayValue="2"] {
-    border: 1px solid #585858;
-    border-radius: 2px;
-    font-family: "Lucida Grande", "Helvetica Neue", "Segoe UI", Arial, "Open Sans Light";
-    font: bold 10px/12px;
-    color: #0e0e0e;
-    background-color: #eece33;
+  border: 1px solid #585858;
+  border-radius: 2px;
+  font-family: "Lucida Grande", "Helvetica Neue", "Segoe UI", Arial, "Open Sans Light";
+  font: bold 10px/12px;
+  color: #0e0e0e;
+  background-color: #eece33;
 }
 
 #GuiToggleButtonInverted[displayValue="0"] {
-    border: 1px solid #585858;
-    border-radius: 2px;
-    font-family: "Lucida Grande", "Helvetica Neue", "Segoe UI", Arial, "Open Sans Light";
-    font: bold 10px/12px;
-    color: #0e0e0e;
-    background-color: #eece33;
+  border: 1px solid #585858;
+  border-radius: 2px;
+  font-family: "Lucida Grande", "Helvetica Neue", "Segoe UI", Arial, "Open Sans Light";
+  font: bold 10px/12px;
+  color: #0e0e0e;
+  background-color: #eece33;
 }
 
 #GuiToggleButtonInverted[displayValue="1"] {
-    border: 1px solid #585858;
-    border-radius: 2px;
-    font-family: "Lucida Grande", "Helvetica Neue", "Segoe UI", Arial, "Open Sans Light";
-    font: bold 10px/12px;
-    color: #ddd;
-    background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #282828, stop:1 #0e0e0e);
+  border: 1px solid #585858;
+  border-radius: 2px;
+  font-family: "Lucida Grande", "Helvetica Neue", "Segoe UI", Arial, "Open Sans Light";
+  font: bold 10px/12px;
+  color: #ddd;
+  background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1,
+                                  stop:0 #282828,
+                                  stop:1 #0e0e0e);
 }
 
-#VinylToggleButtonUL[displayValue="0"] {
-    border: 1px solid #585858;
-    border-radius: 2px;
-    margin: 1px;
-    font-family: "Lucida Grande", "Helvetica Neue", "Segoe UI", Arial, "Open Sans Light";
-    font: bold 10px/12px;
-    color: #ddd;
-    background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #282828, stop:1 #0e0e0e);
+#VinylStatus {
+  border-radius: 5px;
 }
 
-#VinylToggleButtonUL[displayValue="1"] {
+#VinylToggleButtonUL[displayValue="0"],
+#FxAssignButton[displayValue="0"] {
+  border: 1px solid #585858;
+  border-radius: 2px;
+  margin: 1px;
+  font-family: "Lucida Grande", "Helvetica Neue", "Segoe UI", Arial, "Open Sans Light";
+  font: bold 10px/12px;
+  color: #ddd;
+  background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1,
+                                  stop:0 #282828,
+                                  stop:1 #0e0e0e);
+}
+
+#VinylToggleButtonUL[displayValue="1"],
+#FxAssignButton[displayValue="1"] {
     border: 1px solid #585858;
     border-radius: 2px;
     margin: 1px;
@@ -447,7 +533,9 @@
     font-family: "Lucida Grande", "Helvetica Neue", "Segoe UI", Arial, "Open Sans Light";
     font: bold 10px/12px;
     color: #ddd;
-    background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #282828, stop:1 #0e0e0e);
+    background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1,
+                                    stop:0 #282828,
+                                    stop:1 #0e0e0e);
 }
 
 #VinylToggleButtonLL[displayValue="1"] {
@@ -592,58 +680,10 @@
     margin-bottom: 2px;
 }
 
-#BpmContainer {
-  qproperty-layoutAlignment: 'AlignCenter';
-}
-
-#BpmTextColor1, #BpmTextColor2 {
-  qproperty-alignment: 'AlignCenter';
-  font-family: "Lucida Grande", "Helvetica Neue", "Segoe UI", Arial, "Open Sans Light";
-  font: bold 16px/18px;
-  background-color: transparent;
-  text-align: center;
-  padding: 0px;
-  margin: 0px;
-  color: #eece33;
-}
-
-#BpmTextColor3, #BpmTextColor4 {
-  qproperty-alignment: 'AlignCenter';
-  font-family: "Lucida Grande", "Helvetica Neue", "Segoe UI", Arial, "Open Sans Light";
-  font: bold 16px/18px;
-  background-color: transparent;
-  text-align: center;
-  padding: 0px;
-  margin: 0px;
-  color: #09B2AE;
-}
-
-#RateTextColor1, #RateTextColor2 {
-  qproperty-alignment: 'AlignCenter';
-  font-family: "Lucida Grande", "Helvetica Neue", "Segoe UI", Arial, "Open Sans Light";
-  font: bold 12px/13px;
-  background-color: transparent;
-  text-align: center;
-  padding: 0px;
-  margin: 0px;
-  color: #eece33;
-}
-
-#RateTextColor3, #RateTextColor4 {
-  qproperty-alignment: 'AlignCenter';
-  font-family: "Lucida Grande", "Helvetica Neue", "Segoe UI", Arial, "Open Sans Light";
-  font: bold 12px/13px;
-  background-color: transparent;
-  text-align: center;
-  padding: 0px;
-  margin: 0px;
-  color: #09B2AE;
-}
-
 #CrossFadeContainer {
- qproperty-layoutAlignment: 'AlignCenter';
- background-color: #1e1e1e;
- padding-top: 5px;
+qproperty-layoutAlignment: 'AlignCenter';
+background-color: #1e1e1e;
+padding-top: 5px;
 }
 
 #GuiToggleContainer {
@@ -667,10 +707,105 @@
   background-color: transparent;
 }
 
+/*################################################################
+#######  Loop Controls  ########################################
+##############################################################*/
+
+#LoopBeatJumpButton,
+#LoopSizeButton {
+  font-weight: bold;
+  color: #888;
+  background-color: #333;
+  }
+  #LoopSizeButton {
+    font-size: 14px/12px;
+  }
+  #LoopBeatJumpButton:hover,
+  #LoopSizeButton:hover {
+    border: 1px solid #888;
+  }
+  #LoopSizeButton[displayValue="1"] {
+    border: 1px solid #ff8f00;
+    color: #d2d2d2;
+  }
+  #LoopSizeButton[displayValue="1"]:hover {
+    border: 1px solid #eeeeee;
+  }
+
+#ReloopButton[displayValue="0"] {
+  background-color: #333;
+  }
+  #ReloopButton[displayValue="0"]:hover {
+    border: 1px solid #888;
+  }
+  #ReloopButton[displayValue="1"] {
+  /* See also #LoopIndicator near DeckButtons */
+    background-color: #ff8f00;
+    }
+    #ReloopButton[displayValue="1"]:hover {
+      border: 1px solid #eeeeee;
+    }
+
+WBeatSpinBox {
+  /* make it 2px smaller in each dimension,
+    border is added for final size */
+  min-width: 45px;
+  max-width: 180px;
+  min-height: 22px;
+  max-height: 88px;
+  border: 1px solid #666;
+  /* size of spinbox: 54x22px
+  incl. up/down button: 70x22px */
+  border-radius: 2px;
+  color: #aaaaaa;
+  background-color: #0f0f0f;
+  selection-color: #0f0f0f;
+  selection-background-color: #d2d2d2;
+  font-size: 13px/13px;
+  padding: 0px;
+  padding-left: 3px;
+  margin: 0 24px 2px 0;
+}
+  WBeatSpinBox:hover {
+    border-color: #888;
+  }
+  WBeatSpinBox:focus {
+    border-color: #d2d2d2;
+    color: #ccc;
+  }
+
+  WBeatSpinBox::up-button, WBeatSpinBox::down-button {
+    subcontrol-origin: margin;
+    position: relative;
+    /* as with spinbox: border is added to size.
+      define it with same width as hover border, otherwise size jumps */
+    min-width: 16px;
+    min-height: 26px;
+    margin: 1px 0px 1px 0px;
+    padding: 0px;
+    border: 0px;
+    }
+
+  WBeatSpinBox::up-button {
+    subcontrol-position: center right;
+    image: url(skin:/buttons/btn_beatbox_double.svg) no-repeat;
+    }
+    WBeatSpinBox::up-button:pressed {
+      image: url(skin:/buttons/btn_beatbox_double_pressed.svg) no-repeat;
+    }
+  WBeatSpinBox::down-button {
+    subcontrol-position: center right;
+    left: -15px;
+    image: url(skin:/buttons/btn_beatbox_halve.svg) no-repeat;
+    }
+    WBeatSpinBox::down-button:pressed {
+      image: url(skin:/buttons/btn_beatbox_halve_pressed.svg) no-repeat;
+    }
+
 #Crossfader {
   qproperty-layoutAlignment: 'AlignCenter';
   /*background-color:#1e1e1e;*/
-  padding-top: 10px;
+  padding-top: 5px;
 }
 
 #PreviewDeck {
@@ -678,8 +813,7 @@
   border: 1px solid #585858;
   padding: 0px;
   margin: 0px;
-  margin-top: 3px;
-  margin-right: 3px;
+  margin-bottom: 5px;
 }
 
 #PreviewDeckText {
@@ -692,7 +826,7 @@
 }
 
 #PreviewLabel {
-  qproperty-layoutAlignment: 'AlignVCenter | AlignHCenter';
+  qproperty-alignment: 'AlignVCenter | AlignHCenter';
   font: 13px/14px "Lucida Grande", "Helvetica Neue", "Segoe UI", Arial, "Open Sans Light";
   background-color: #1e1e1e;
   font-weight:bold;
@@ -712,7 +846,7 @@
 }
 
 #NoBorder {
- border: 0px;
+border: 0px;
 }
 
 #PreviewColumnOne {
@@ -775,34 +909,44 @@
   qproperty-layoutAlignment: 'AlignLeft | AlignTop';
 }
 
+#AlignCenter {
+  qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
+}
+
 #AlignCenterTop {
   qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
 }
+/**/
+#TEST {
+  background-color: #456113;
+}
 
-#VinylStatusTop1, #VinylStatusTop3 {
-  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
-  border: 1px solid #585858;
-  border-top: 0px;
-  border-left: 0px;
-  border-right: 0px;
-  padding: 0px;
+#Spacer1e {
+  background-color: #1e1e1e;
 }
 
-#VinylStatusTop2, #VinylStatusTop4 {
-  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
+#Spacer58 {
   border: 1px solid #585858;
-  border-top: 0px;
-  border-left: 0px;
-  border-right: 0px;
-  padding: 0px;
 }
 
-#ToolbarTop {
+#PFLVUMeterBox {
+  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
+  padding: 7px 0px 7px 0px;
+}
+
+#VUMeterBox {
+  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
+}
+
+#Toolbar {
   qproperty-layoutAlignment: 'AlignLeft | AlignTop';
   border: 1px solid #585858;
-  border-top: 0px;
   padding: 0px;
-  background-color: #1e1e1e;
+  background-color: #0f0f0f;
+}
+
+#ToolbarLogo {
+  background: url(skin:style/mixxx_logo_toolbar.png) no-repeat center center;
 }
 
 #WaveformMixerContainer {
@@ -810,67 +954,74 @@
 }
 
 #Waveform {
-  border: 1px solid #585858;
-  border-top: 0px;
-  border-left: 0px;
-  border-bottom: 0px;
 }
 
-#RateSlider {
+#RateContainer {
   qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
-  padding-bottom: 2px;
+  border: 1px solid #585858;
+  border-width: 0px 1px 0px 0px;
+  padding: 4px 1px 2px 2px;
 }
 
-#RateContainer3 {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
-  border: 1px solid #585858;
-  border-right: 0px;
-  border-top: 0px;
-  padding: 3px;
+#BpmContainer {
+  qproperty-layoutAlignment: 'AlignCenter';
 }
 
-#RateContainer4 {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
-  border: 1px solid #585858;
-  border-right: 0px;
-  border-left: 0px;
-  border-top: 0px;
-  padding: 3px;
+#BpmText {
+  qproperty-alignment: 'AlignCenter';
+  font-size: 16px/18px;
+  font-weight: bold;
+  font-family: "Lucida Grande", "Helvetica Neue", "Segoe UI", Arial, "Open Sans Light";
+  background-color: transparent;
+  text-align: center;
+  padding: 0px;
+  margin: 0px;
 }
 
-#RateContainer1 {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
-  border: 1px solid #585858;
-  border-right: 0px;
-  padding: 3px;
+#RateText {
+  qproperty-alignment: 'AlignCenter';
+  font-size: 12px/13px;
+  font-weight: bold;
+  font-family: "Lucida Grande", "Helvetica Neue", "Segoe UI", Arial, "Open Sans Light";
+  background-color: transparent;
+  text-align: center;
+  padding: 0px;
+  margin: 0px;
+  color: #eece33;
 }
 
-#RateContainer2 {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
-  border: 1px solid #585858;
-  border-right: 0px;
-  border-left: 0px;
-  padding: 3px;
+#RateControls {
+  qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
 }
 
-#RateAdjust {
-  qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
+#RateSlider {
+  /* no respected since RateSlider has a connection attached
+  margin: 0px 10px 0px 0px; */
 }
 
-#MicContainer {
+#RateButtons {
+  qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
+  padding: 2px 0px 0px 2px;
+}
+
+#MicContainer, #AuxContainer {
   qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
   border: 1px solid #585858;
-  padding: 5px;
-  margin: 2px;
+  padding: 3px;
   background-color: #1e1e1e;
 }
 
+#MicContainer {
+  margin: 5px 2px 0px 0px;
+}
+
+#AuxContainer {
+  margin: 5px 0px 0px 2px;
+}
+
 #MicBorder {
   qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
   border: 1px solid #585858;
-  padding: 2px;
-  padding-left:0px;
-  padding-right:0px;
   margin-left: 3px;
   margin-right: 3px;
 }
@@ -920,7 +1071,7 @@
 }
 
 #SamplerVU {
-  padding: 5px;
+  padding: 0px 5px 0px 5px;
   qproperty-layoutAlignment: 'AlignRight | AlignBottom';
   border: 1px solid #585858;
   border-top: 0px;
@@ -929,7 +1080,7 @@
 }
 
 #SamplerPitch {
-  padding: 5px;
+  padding: 0px 5px 0px 5px;
   qproperty-layoutAlignment: 'AlignRight | AlignBottom';
 }
 
@@ -998,11 +1149,11 @@
   padding: 2px;
 }
 
-#TextColor1, #TextColor2 {
+#Deck1 WLabel, Deck2 WLabel {
   color: #eece33;
 }
 
-#TextColor3, #TextColor4 {
+#Deck3 WLabel, #Deck4 WLabel {
   color: #09B2AE;
 }
 
@@ -1013,86 +1164,88 @@
   text-align: left;
 }
 
-#EffectUnitNameRow {
-  border-bottom: 1px solid #585858;
-  background-color: transparent;
-  margin: 0px;
+#EffectRack {
+  qproperty-layoutAlignment: 'AlignCenter | AlignTop';
+  background-color: #0e0e0e;
 }
 
 #EffectUnit1, #EffectUnit2, #EffectUnit3, #EffectUnit4 {
-  qproperty-layoutAlignment: 'AlignTop';
+  qproperty-layoutAlignment: 'AlignRight | AlignTop';
   border: 1px solid #585858;
-  border-left:none;
-}
-
-#EffectUnit1 {
-  border-left: 1px solid #585858;
-}
-
-#EffectUnitNameContainer {
-  qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
-  padding: 2px;
-}
-
-#EffectUnitNextPrevContainer {
-  qproperty-layoutAlignment: 'AlignRight | AlignVCenter';
+  margin-top: 5px;
 }
 
-#EffectUnitButton {
-  font-family: "Lucida Grande", "Helvetica Neue", "Segoe UI Symbol", Arial, "Open Sans Light";
-  font: bold 16px/19px;
-  text-transform: none;
-  color: #eece33;
+#EffectUnit1,
+#EffectUnit3 {
+  border-left: none;
+  margin-right: 2px;
 }
 
-#EffectUnitNextPrevContainer WPushButton {
-  font-size: 16px;
+#EffectUnit2,
+#EffectUnit4 {
+  border-right: none;
+  margin-left: 2px;
 }
 
-#EffectRackContainer {
-  background-color: #0e0e0e;
-  padding-top: 5px;
-  /*border-bottom: 10px solid #585858;*/
+#EffectRows {
+  qproperty-layoutAlignment: 'AlignRight | AlignTop';
 }
 
-#EffectRackExpanded, #EffectRackCollapsed {
-  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
+#EffectUnitControls {
+  qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
+  background-color: #1e1e1e;
+  border-left: 1px solid #585858;
+  padding: 1px 0px 2px 1px;
 }
 
-#EffectUnitParameters {
-  padding: 2px;
-  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
-  qproperty-layoutSpacing: 2;
+#FxUnit1_ExpandCollapseButton,
+#FxUnit2_ExpandCollapseButton {
+  qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
 }
 
-#EffectUnitControlRow {
-  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
+#FxUnit1_ExpandCollapseButton WPushButton,
+#FxUnit2_ExpandCollapseButton WPushButton {
+  font-size: 13px/13px;
+  font-weight: bold;
+  padding-top: 10px;
+  color: #bfbfbf;
 }
 
-#EffectControlsRight {
-  qproperty-layoutAlignment: 'AlignRight | AlignTop';
+#EffectSlot1,
+#EffectSlot2,
+#EffectSlot3 {
+  qproperty-layoutAlignment: 'AlignRight | AlignVCenter';
+  padding: 2px 4px 2px 4px;
 }
 
-#EffectUnitControls {
-  qproperty-layoutAlignment: 'AlignRight | AlignTop';
-  padding: 2px;
+#EffectSlot_focused {/*
+  background: transparent url(skin:background_tile_focused.png) repeat;
+  background-color: #000;*/
+  background-color:qlineargradient(
+      x1:0, y1:0, x2:0, y2:1,
+        stop:0 #000,
+        stop:0.1 #090909,
+        stop:1 #090909);
 }
 
-#EffectUnitGroupControls {
-  qproperty-layoutAlignment: 'AlignRight | AlignVCenter';
+#EffectFocusButton {
+  qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
+  margin: 0px 0px 0px 0px;
 }
 
-#EffectUnit {
-  font-size: 16px;
+#MetaKnob {
+  qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
+  padding: 0px 2px 0px 5px;
 }
 
-#EffectKnobContainer {
+#EffectKnob {
+  qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
+  margin-left: 1px;
 }
 
-#EffectKnob {
+#EffectButton {
   qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
-  padding-left: 5px;
-  padding-right: 5px;
+  padding-top: 4px;
 }
 
 #EffectUnitKnob {
@@ -1100,6 +1253,83 @@
   padding:3px;
 }
 
+WEffectSelector {
+  font-weight: bold;
+  font-size: 12px/13px;
+  text-transform: uppercase;
+  color: #cfb32c;
+  background-color: #0f0f0f;
+  /* Fixes the white bars on the top/bottom of the popup on Mac OS X */
+  min-height: 13px;
+  margin: 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 5px;
+  /* The 3D frame on the combo box becomes flat when you give it a border */
+  border: 1px solid #666;
+  border-radius: 3px;
+  }
+  WEffectSelector::drop-down {/*
+    width: 16px;
+    height: 24px;
+    padding: 0;
+    margin: 0;*/
+    border: 0;
+  }
+  WEffectSelector::down-arrow {/*
+    width: 16px;
+    height: 24px;*/
+    image: url(skin:/buttons/btn_fxSelector.svg);
+    border: 0;
+    padding: 0;
+    margin: 0;
+    }
+    WEffectSelector::down-arrow:hover {/*
+      width: 16px;
+      height: 24px;*/
+      image: url(skin:/buttons/btn_fxSelector_pressed.svg);
+    border: 0;
+    padding: 0;
+    margin: 0;
+    }
+
+  WEffectSelector QAbstractItemView {
+    min-width: 142px;
+    max-width: 200px;
+    background-color: #0f0f0f;
+    /* padding-left: 6px; */
+    font-size: 12px/13px;
+    /* On Linux, this is not applied but font color from WEffectSelector
+    is inherited.
+    On Windows, it must be defined here */
+    color: #cfb32c;
+    border: 0px;
+    border-radius: 2px;
+  }
+  /* selected item */
+  WEffectSelector::checked {
+    /* not applied
+    padding-left: 5px;
+    font-weight: bold;	*/
+    color: #eee;
+    background-color: #1e1e1e;
+  }
+  /* hovered items */
+  WEffectSelector::item:selected {
+    background-color: #333;
+  /* This moves the tick mark behind item text,
+    text sits at left border now
+    border: 0; */
+  }
+  WEffectSelector::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 -4px 0px -4px;
+    background-color: transparent;
+  }
+
 /* this is now inline in the pushbutton so we can change styles */
 /*#EffectUnitGroupControlButton {
   font-family: "Lucida Grande", "Helvetica Neue", "Segoe UI", Arial, "Open Sans Light";
@@ -1112,6 +1342,83 @@
   margin: 1px;
 }*/
 
+#FxSuperLinkButton,
+#FxSuperLinkInvertButton {
+  /* those buttons are 5px tall, that's why they won't accept
+  3px radius which is set for all WPushButtons
+  border-radius: 2px; */
+  margin: 0px 5px 0px 5px;
+}
+
+#FxSuperLinkButton[value="0"],
+#FxSuperLinkInvertButton[displayValue="0"] {
+  background-color: #4b4b4b;
+}
+#FxSuperLinkButton[value="0"]:hover,
+#FxSuperLinkInvertButton[displayValue="0"]:hover {
+  background-color: #888;
+}
+#FxSuperLinkInvertButton[displayValue="1"] {
+  background-color: #9C0900;
+  }
+  #FxSuperLinkInvertButton[displayValue="1"]:hover {
+    background-color: #B50A00;
+  }
+
+#FxSuperLinkButton[value="1"] {
+  background-color: #A5A5A5;
+  }
+  #FxSuperLinkButton[value="1"]:hover {
+    background-color: #CDCDCD;
+  }
+#FxSuperLinkButton[value="2"] {	/*
+  a simple way to achive a partitioning in thirds	*/
+  background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
+    stop: 0 #A5A5A5,
+    stop: 0.33 #A5A5A5,
+    stop: 0.34 #4b4b4b,
+    stop: 1 #4b4b4b);
+  }
+  #FxSuperLinkButton[value="2"]:hover {
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
+      stop: 0 #CDCDCD,
+      stop: 0.33 #CDCDCD,
+      stop: 0.34 #4b4b4b,
+      stop: 1 #4b4b4b);
+    }
+#FxSuperLinkButton[value="3"] {
+  background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
+    stop: 0 #4b4b4b,
+    stop: 0.66 #4b4b4b,
+    stop: 0.67 #A5A5A5,
+    stop: 1 #A5A5A5);
+  }
+  #FxSuperLinkButton[value="3"]:hover {
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
+      stop: 0 #4b4b4b,
+      stop: 0.66 #4b4b4b,
+      stop: 0.67 #CDCDCD,
+      stop: 1 #CDCDCD);
+    }
+#FxSuperLinkButton[value="4"] {
+  background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
+    stop: 0 #A5A5A5,
+    stop: 0.330000 #A5A5A5,
+    stop: 0.340000 #4b4b4b,
+    stop: 0.660000 #4b4b4b,
+    stop: 0.670000 #A5A5A5,
+    stop: 1 #A5A5A5);
+  }
+  #FxSuperLinkButton[value="4"]:hover {
+    background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
+      stop: 0 #CDCDCD,
+      stop: 0.330000 #CDCDCD,
+      stop: 0.340000 #4b4b4b,
+      stop: 0.660000 #4b4b4b,
+      stop: 0.670000 #CDCDCD,
+      stop: 1 #CDCDCD);
+  }
+
 #EffectUnitGroupControlButton[displayValue="0"] {
     font-family: "Lucida Grande", "Helvetica Neue", "Segoe UI", Arial, "Open Sans Light";
     font: bold 9px/11px;
@@ -1199,11 +1506,12 @@ QPushButton#LibraryPreviewButton:!checked{ image: url(skin:/style/style_library_
 QPushButton#LibraryPreviewButton:checked{ image: url(skin:/style/style_library_preview_pause.png); }
 
 QHeaderView {
-  font: 10pt;
+  font: 13px/15px;
   color: #cfb32c;
   background-color: #0f0f0f;
 }
 QHeaderView::section {
+  height: 18px;
   border: 1px solid #585858;
   border-left: 0px;
   background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #585858, stop:1 #0f0f0f);
@@ -1266,20 +1574,50 @@ QSpinBox { min-height: 20px; max-height: 20px;min-width: 40px; max-width: 40px;}
 WSearchLineEdit { padding: 2px; border: 1px solid #656565; background: #181818; color: #cfb32c; }
 WSearchLineEdit:focus { padding: 2px; border: 2px solid #FF6600; background: #0f0f0f; color: #eece33;}
 
+#SidebarContainer{
+    margin-top: -5px;
+}
+
 /* cover art */
 WCoverArt { background: transparent; color: #ACACAC; }
 
 /* splitter between treeview and library */
-#LibrarySplitter::handle { image: url(skin:/style/style_handle_unchecked.png); background-color: #1e1e1e; }
-#LibrarySplitter::handle:pressed { image: url(skin:/style/style_handle_checked.png); background-color: #1e1e1e; }
-#LibrarySplitter::handle:horizontal { width: 10px; background-color: #0e0e0e;}
-#LibrarySplitter::handle:vertical { height: 10px; background-color: #0e0e0e;}
+#LibrarySplitter::handle {
+  image: url(skin:/style/style_handle_unchecked.png);
+  background-color: #1e1e1e;
+}
+#LibrarySplitter::handle:pressed,
+#LibrarySplitter::handle:hover {
+  image: url(skin:/style/style_handle_checked.png);
+  background-color: #1e1e1e;
+}
+#LibrarySplitter::handle:horizontal {
+  width: 5px;
+  background-color: #0e0e0e;
+}
+#LibrarySplitter::handle:vertical {
+  height: 5px;
+  background-color: #0e0e0e;
+}
 
 /* splitter between treeview and coverart */
-#CoverArtSplitter::handle { image: url(skin:/style/style_handle_horizontal_unchecked.png); background-color: #1e1e1e; }
-#CoverArtSplitter::handle:pressed { image: url(skin:/style/style_handle_horizontal_checked.png); background-color: #1e1e1e; }
-#CoverArtSplitter::handle:horizontal { width: 10px; background-color: #0e0e0e;}
-#CoverArtSplitter::handle:vertical { height: 10px; background-color: #0e0e0e;}
+#CoverArtSplitter::handle {
+  image: url(skin:/style/style_handle_horizontal_unchecked.png);
+  background-color: #1e1e1e;
+  }
+  #CoverArtSplitter::handle:pressed,
+  #CoverArtSplitter::handle:hover {
+    image: url(skin:/style/style_handle_horizontal_checked.png);
+    background-color: #1e1e1e;
+  }
+#CoverArtSplitter::handle:horizontal {
+  width: 10px;
+  background-color: #0e0e0e;
+}
+#CoverArtSplitter::handle:vertical {
+  height: 10px;
+  background-color: #0e0e0e;
+}
 
 /* Extra declaration for QRadioButton otherwise it shows up with wrong colors in Linux with Gnome */
 QLabel, QRadioButton { background: transparent; color: #cfb32c; }
@@ -1332,3 +1670,13 @@ QTreeView::item:selected {
   background-color:qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #585858, stop:1 #0f0f0f);
   color: #cfb32c;
 }
+
+
+
+QToolTip {
+  background-color: #0f0f0f;
+  color: #cfb32c;
+  padding: 3px;
+  border: 1px solid #333;
+  border-radius: 2px;
+}
diff --git a/res/skins/LateNight/style/mixxx_logo_toolbar.png b/res/skins/LateNight/style/mixxx_logo_toolbar.png
new file mode 100644
index 000000000000..913ec8a4eda7
Binary files /dev/null and b/res/skins/LateNight/style/mixxx_logo_toolbar.png differ
diff --git a/res/skins/LateNight/style/style_handle_checked.png b/res/skins/LateNight/style/style_handle_checked.png
index d6bd8ece7cdc..1635a9601973 100644
Binary files a/res/skins/LateNight/style/style_handle_checked.png and b/res/skins/LateNight/style/style_handle_checked.png differ
diff --git a/res/skins/LateNight/style/style_handle_horizontal_checked.png b/res/skins/LateNight/style/style_handle_horizontal_checked.png
index da13f8157777..14060ce6afdf 100644
Binary files a/res/skins/LateNight/style/style_handle_horizontal_checked.png and b/res/skins/LateNight/style/style_handle_horizontal_checked.png differ
diff --git a/res/skins/LateNight/style/style_handle_horizontal_unchecked.png b/res/skins/LateNight/style/style_handle_horizontal_unchecked.png
index fe8a520e502f..df271fa67663 100644
Binary files a/res/skins/LateNight/style/style_handle_horizontal_unchecked.png and b/res/skins/LateNight/style/style_handle_horizontal_unchecked.png differ
diff --git a/res/skins/LateNight/style/style_handle_unchecked.png b/res/skins/LateNight/style/style_handle_unchecked.png
index ffabd6d5b5be..ccb5623827d7 100644
Binary files a/res/skins/LateNight/style/style_handle_unchecked.png and b/res/skins/LateNight/style/style_handle_unchecked.png differ
diff --git a/res/skins/LateNight/style@1x.qss b/res/skins/LateNight/style@1x.qss
new file mode 100644
index 000000000000..d79fd348558a
--- /dev/null
+++ b/res/skins/LateNight/style@1x.qss
@@ -0,0 +1,134 @@
+/* LateNight 2.1 */
+
+WBeatSpinBox {
+  /* make it 2px smaller in each dimension,
+    border is added for final size */
+  min-width: 45px;
+  max-width: 180px;
+  min-height: 22px;
+  max-height: 88px;
+  border: 1px solid #666;
+  /* size of spinbox: 54x22px
+  incl. up/down button: 70x22px */
+  border-radius: 2px;
+  color: #aaaaaa;
+  background-color: #0f0f0f;
+  selection-color: #0f0f0f;
+  selection-background-color: #d2d2d2;
+  font-size: 13px/13px;
+  padding: 0px;
+  padding-left: 3px;
+  margin: 0 24px 2px 0;
+}
+  WBeatSpinBox:hover {
+    border-color: #888;
+  }
+  WBeatSpinBox:focus {
+    border-color: #d2d2d2;
+    color: #ccc;
+  }
+
+  WBeatSpinBox::up-button, WBeatSpinBox::down-button {
+    subcontrol-origin: margin;
+    position: relative;
+    /* as with spinbox: border is added to size.
+      define it with same width as hover border, otherwise size jumps */
+    min-width: 16px;
+    min-height: 26px;
+    margin: 1px 0px 1px 0px;
+    padding: 0px;
+    border: 0px;
+    }
+
+  WBeatSpinBox::up-button {
+    subcontrol-position: center right;
+    image: url(skin:/buttons/btn_beatbox_double.svg) no-repeat;
+    }
+    WBeatSpinBox::up-button:pressed {
+      image: url(skin:/buttons/btn_beatbox_double_pressed.svg) no-repeat;
+    }
+  WBeatSpinBox::down-button {
+    subcontrol-position: center right;
+    left: -15px;
+    image: url(skin:/buttons/btn_beatbox_halve.svg) no-repeat;
+    }
+    WBeatSpinBox::down-button:pressed {
+      image: url(skin:/buttons/btn_beatbox_halve_pressed.svg) no-repeat;
+    }
+
+WEffectSelector {
+  font-weight: bold;
+  font-size: 12px/13px;
+  text-transform: uppercase;
+  color: #ccc;
+  background-color: #0f0f0f;
+  /* Fixes the white bars on the top/bottom of the popup on Mac OS X */
+  min-height: 13px;
+  margin: 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 3px;
+  /* The 3D frame on the combo box becomes flat when you give it a border */
+  border: 1px solid #666;
+  border-radius: 3px;
+  }
+  WEffectSelector::drop-down {/*
+    width: 16px;
+    height: 24px;
+    padding: 0;
+    margin: 0;*/
+    border: 0;
+  }
+  WEffectSelector::down-arrow {/*
+    width: 16px;
+    height: 24px;*/
+    image: url(skin:/buttons/btn_fxSelector.png);
+    border: 0;
+    padding: 0;
+    margin: 0;
+    }
+    WEffectSelector::down-arrow:hover {/*
+      width: 16px;
+      height: 24px;*/
+      image: url(skin:/buttons/btn_fxSelector_pressed.png);
+    border: 0;
+    padding: 0;
+    margin: 0;
+    }
+
+  WEffectSelector QAbstractItemView {
+    min-width: 142px;
+    max-width: 200px;
+    background-color: #0f0f0f;
+    /* padding-left: 6px; */
+    font-size: 12px/13px;
+    /* On Linux, this is not applied but font color from WEffectSelector
+    is inherited.
+    On Windows, it must be defined here */
+    color: #ccc;
+    border: 0px;
+    border-radius: 2px;
+  }
+  /* selected item */
+  WEffectSelector::checked {
+    /* not applied
+    padding-left: 5px;
+    font-weight: bold;	*/
+    color: #eee;
+    background-color: #1e1e1e;
+  }
+  /* hovered items */
+  WEffectSelector::item:selected {
+    background-color: #333;
+  /* This moves the tick mark behind item text,
+    text sits at left border now
+    border: 0; */
+  }
+  WEffectSelector::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 -4px 0px -4px;
+    background-color: transparent;
+  }
diff --git a/res/skins/LateNight/style@2x.qss b/res/skins/LateNight/style@2x.qss
new file mode 100644
index 000000000000..84ba1ab05bcd
--- /dev/null
+++ b/res/skins/LateNight/style@2x.qss
@@ -0,0 +1,134 @@
+/* LateNight 2.1 */
+
+WBeatSpinBox {
+  /* make it 2px smaller in each dimension,
+    border is added for final size */
+  min-width: 45px;
+  max-width: 180px;
+  min-height: 22px;
+  max-height: 88px;
+  border: 1px solid #666;
+  /* size of spinbox: 54x22px
+  incl. up/down button: 70x22px */
+  border-radius: 2px;
+  color: #aaaaaa;
+  background-color: #0f0f0f;
+  selection-color: #0f0f0f;
+  selection-background-color: #d2d2d2;
+  font-size: 13px/13px;
+  padding: 0px;
+  padding-left: 3px;
+  margin: 0 24px 2px 0;
+}
+  WBeatSpinBox:hover {
+    border-color: #888;
+  }
+  WBeatSpinBox:focus {
+    border-color: #d2d2d2;
+    color: #ccc;
+  }
+
+  WBeatSpinBox::up-button, WBeatSpinBox::down-button {
+    subcontrol-origin: margin;
+    position: relative;
+    /* as with spinbox: border is added to size.
+      define it with same width as hover border, otherwise size jumps */
+    min-width: 16px;
+    min-height: 26px;
+    margin: 1px 0px 1px 0px;
+    padding: 0px;
+    border: 0px;
+    }
+
+  WBeatSpinBox::up-button {
+    subcontrol-position: center right;
+    image: url(skin:/buttons/btn_beatbox_double.svg) no-repeat;
+    }
+    WBeatSpinBox::up-button:pressed {
+      image: url(skin:/buttons/btn_beatbox_double_pressed.svg) no-repeat;
+    }
+  WBeatSpinBox::down-button {
+    subcontrol-position: center right;
+    left: -15px;
+    image: url(skin:/buttons/btn_beatbox_halve.svg) no-repeat;
+    }
+    WBeatSpinBox::down-button:pressed {
+      image: url(skin:/buttons/btn_beatbox_halve_pressed.svg) no-repeat;
+    }
+
+WEffectSelector {
+  font-weight: bold;
+  font-size: 12px/13px;
+  text-transform: uppercase;
+  color: #ccc;
+  background-color: #0f0f0f;
+  /* Fixes the white bars on the top/bottom of the popup on Mac OS X */
+  min-height: 13px;
+  margin: 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 3px;
+  /* The 3D frame on the combo box becomes flat when you give it a border */
+  border: 1px solid #666;
+  border-radius: 3px;
+  }
+  WEffectSelector::drop-down {/*
+    padding: 0;
+    margin: 0;*/
+    width: 32px;
+    height: 48px;
+    border: 0;
+  }
+  WEffectSelector::down-arrow {/**/
+    width: 32px;
+    height: 48px;
+    image: url(skin:/buttons/btn_fxSelector_2x.png);
+    border: 0;
+    padding: 0;
+    margin: 0;
+    }
+    WEffectSelector::down-arrow:hover {/**/
+      width: 32px;
+      height: 48px;
+      image: url(skin:/buttons/btn_fxSelector_pressed_2x.png);
+    border: 0;
+    padding: 0;
+    margin: 0;
+    }
+
+  WEffectSelector QAbstractItemView {
+    min-width: 250px;
+    max-width: 400px;
+    background-color: #0f0f0f;
+    /* padding-left: 6px; */
+    font-size: 12px/13px;
+    /* On Linux, this is not applied but font color from WEffectSelector
+    is inherited.
+    On Windows, it must be defined here */
+    color: #ccc;
+    border: 0px;
+    border-radius: 2px;
+  }
+  /* selected item */
+  WEffectSelector::checked {
+    /* not applied
+    padding-left: 5px;
+    font-weight: bold;	*/
+    color: #eee;
+    background-color: #1e1e1e;
+  }
+  /* hovered items */
+  WEffectSelector::item:selected {
+    background-color: #333;
+  /* This moves the tick mark behind item text,
+    text sits at left border now
+    border: 0; */
+  }
+  WEffectSelector::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 -4px 0px -4px;
+    background-color: transparent;
+  }
diff --git a/res/skins/LateNight/toolbar.xml b/res/skins/LateNight/toolbar.xml
new file mode 100644
index 000000000000..2d8ece565c24
--- /dev/null
+++ b/res/skins/LateNight/toolbar.xml
@@ -0,0 +1,292 @@
+<Template>
+  <WidgetGroup>
+    <ObjectName>ToolBar</ObjectName>
+    <Layout>horizontal</Layout>
+    <SizePolicy>e,min</SizePolicy>
+    <Children>
+
+      <PushButton>
+        <Size>84f,24f</Size>
+        <TooltipId>maximize_library</TooltipId>
+        <ObjectName>GuiToggleButton</ObjectName>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Text>BIG LIBRARY</Text>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Text>BIG LIBRARY</Text>
+        </State>
+        <Connection>
+          <ConfigKey>[Master],maximize_library</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey>[Master],maximize_library</ConfigKey>
+        </Connection>
+      </PushButton>
+
+      <WidgetGroup> <!-- Spacer -->
+        <Layout>horizontal</Layout>
+        <Size>5f,min</Size>
+        <Children/>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>ToolbarDivider</ObjectName>
+        <Size>3f,9min</Size>
+      </WidgetGroup>
+
+      <WidgetGroup> <!-- Spacer -->
+        <Layout>horizontal</Layout>
+        <Size>5f,min</Size>
+        <Children/>
+      </WidgetGroup>
+
+      <PushButton>
+        <Size>54f,24f</Size>
+        <TooltipId>toggle_4decks</TooltipId>
+        <ObjectName>GuiToggleButton</ObjectName>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Text>4 DECKS</Text>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Text>4 DECKS</Text>
+        </State>
+        <Connection>
+          <ConfigKey>[Master],show_4decks</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey>[Master],show_4decks</ConfigKey>
+        </Connection>
+      </PushButton>
+
+      <PushButton>
+        <Size>44f,24f</Size>
+        <TooltipId>toggle_4decks</TooltipId>
+        <ObjectName>GuiToggleButton</ObjectName>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Text>MIXER</Text>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Text>MIXER</Text>
+        </State>
+        <Connection>
+          <ConfigKey>[Master],show_mixer</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey>[Master],show_mixer</ConfigKey>
+        </Connection>
+      </PushButton>
+
+      <PushButton>
+        <Size>44f,24f</Size>
+        <ObjectName>GuiToggleButton</ObjectName>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Text>EQ</Text>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Text>EQ</Text>
+        </State>
+        <Connection>
+          <ConfigKey>[Master],show_eqs</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey>[Master],show_eqs</ConfigKey>
+        </Connection>
+      </PushButton>
+
+      <PushButton>
+        <Size>59f,24f</Size>
+        <ObjectName>GuiToggleButton</ObjectName>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Text>PREVIEW</Text>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Text>PREVIEW</Text>
+        </State>
+        <Connection>
+          <ConfigKey persist="true">[PreviewDeck],show_previewdeck</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey persist="true">[PreviewDeck],show_previewdeck</ConfigKey>
+        </Connection>
+      </PushButton>
+
+      <PushButton>
+        <Size>59f,24f</Size>
+        <ObjectName>GuiToggleButton</ObjectName>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Text>SPINNIES</Text>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Text>SPINNIES</Text>
+        </State>
+        <Connection>
+          <ConfigKey persist="true">[Spinny],show_spinnies</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey persist="true">[Spinny],show_spinnies</ConfigKey>
+        </Connection>
+      </PushButton>
+
+      <PushButton>
+        <Size>44f,24f</Size>
+        <ObjectName>GuiToggleButton</ObjectName>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Text>VINYL</Text>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Text>VINYL</Text>
+        </State>
+        <Connection>
+          <ConfigKey persist="true">[VinylControl],show_vinylcontrol</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey persist="true">[VinylControl],show_vinylcontrol</ConfigKey>
+        </Connection>
+      </PushButton>
+
+      <WidgetGroup> <!-- Spacer -->
+        <Layout>horizontal</Layout>
+        <Size>5f,min</Size>
+        <Children/>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>ToolbarDivider</ObjectName>
+        <Size>3f,9min</Size>
+      </WidgetGroup>
+
+      <WidgetGroup> <!-- Spacer -->
+        <Layout>horizontal</Layout>
+        <Size>5f,min</Size>
+        <Children/>
+      </WidgetGroup>
+
+      <PushButton>
+        <Size>59f,24f</Size>
+        <TooltipId>show_effects</TooltipId>
+        <ObjectName>GuiToggleButton</ObjectName>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Text>EFFECTS</Text>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Text>EFFECTS</Text>
+        </State>
+        <Connection>
+          <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
+        </Connection>
+      </PushButton>
+
+      <PushButton>
+        <Size>59f,24f</Size>
+        <ObjectName>GuiToggleButton</ObjectName>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Text>MIC/AUX</Text>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Text>MIC/AUX</Text>
+        </State>
+        <Connection>
+          <ConfigKey persist="true">[Microphone],show_microphone</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey persist="true">[Microphone],show_microphone</ConfigKey>
+        </Connection>
+      </PushButton>
+
+      <PushButton>
+        <Size>66f,24f</Size>
+        <TooltipId>show_samplers</TooltipId>
+        <ObjectName>GuiToggleButton</ObjectName>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Text>SAMPLERS</Text>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Text>SAMPLERS</Text>
+        </State>
+        <Connection>
+          <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
+        </Connection>
+      </PushButton>
+
+      <PushButton>
+        <Size>54f,24f</Size>
+        <TooltipId>show_library</TooltipId>
+        <ObjectName>GuiToggleButton</ObjectName>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Text>LIBRARY</Text>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Text>LIBRARY</Text>
+        </State>
+        <Connection>
+          <ConfigKey persist="true">[Library],show_library</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey persist="true">[Library],show_library</ConfigKey>
+        </Connection>
+      </PushButton>
+
+      <!-- Spacer -->
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Size>me,min</Size>
+        <Children/>
+      </WidgetGroup>
+
+      <SingletonContainer>
+        <ObjectName>ClockRecLogo</ObjectName>
+      </SingletonContainer>
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/toolbar_big_library.xml b/res/skins/LateNight/toolbar_big_library.xml
index 2b4dec1cd05e..74e7bc3d68bf 100644
--- a/res/skins/LateNight/toolbar_big_library.xml
+++ b/res/skins/LateNight/toolbar_big_library.xml
@@ -1,43 +1,43 @@
 <Template>
-    <WidgetGroup>
-        <ObjectName>UIButtons</ObjectName>
+  <WidgetGroup>
+    <ObjectName>ToolBar</ObjectName>
+    <Layout>horizontal</Layout>
+    <SizePolicy>e,min</SizePolicy>
+    <Children>
+
+      <PushButton>
+        <Size>84f,24f</Size>
+        <TooltipId>maximize_library</TooltipId>
+        <ObjectName>GuiToggleButton</ObjectName>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Text>BIG LIBRARY</Text>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Text>BIG LIBRARY</Text>
+        </State>
+        <Connection>
+          <ConfigKey>[Master],maximize_library</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey>[Master],maximize_library</ConfigKey>
+        </Connection>
+      </PushButton>
+
+      <!-- Spacer -->
+      <WidgetGroup>
         <Layout>horizontal</Layout>
-        <SizePolicy>e,min</SizePolicy>
-        <Children>
-            <WidgetGroup>  <!-- spacer -->
-                <ObjectName>UIButtonMargin</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>me,min</SizePolicy>
-                <Children></Children>
-            </WidgetGroup>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>80f,20f</Size>
-                        <TooltipId>maximize_library</TooltipId>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>BIG LIBRARY</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>BIG LIBRARY</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey>[Master],maximize_library</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey>[Master],maximize_library</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-        </Children>
-    </WidgetGroup>
-</Template>
\ No newline at end of file
+        <Size>me,min</Size>
+        <Children/>
+      </WidgetGroup>
+
+      <SingletonContainer>
+        <ObjectName>ClockRecLogo</ObjectName>
+      </SingletonContainer>
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/toolbar_clock_rec_logo.xml b/res/skins/LateNight/toolbar_clock_rec_logo.xml
new file mode 100644
index 000000000000..2db060bc680b
--- /dev/null
+++ b/res/skins/LateNight/toolbar_clock_rec_logo.xml
@@ -0,0 +1,126 @@
+<Template>
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <SizePolicy>min,min</SizePolicy>
+    <Children>
+
+      <WidgetGroup><!-- Recording button & recording duration label -->
+        <ObjectName>RecBox</ObjectName>
+        <Layout>stacked</Layout>
+        <Size>76f,24f</Size>
+        <!-- minus 2px margin, minus 1px border
+            = 70x18 available for text -->
+        <Children>
+          <!-- invisible Rec button -->
+          <Template src="skin:button_2state.xml">
+            <SetVariable name="ObjectName">RecButton</SetVariable>
+            <SetVariable name="TooltipId">toggle_recording</SetVariable>
+            <SetVariable name="Size">70f,18f</SetVariable>
+            <SetVariable name="ConfigKey">[Recording],toggle_recording</SetVariable>
+          </Template>
+
+          <WidgetGroup><!-- Rec dot + RecDuration -->
+            <Layout>horizontal</Layout>
+            <Size>70f,18f</Size>
+            <Children>
+              <Label>
+                <ObjectName>RecDot</ObjectName>
+                <Size>15f,18f</Size>
+              </Label>  
+
+              <RecordingDuration>
+                <ObjectName>RecDuration</ObjectName>
+                <Size>55f,18f</Size>
+                <InactiveText>REC</InactiveText>
+                <Alignment>center</Alignment>
+              </RecordingDuration>
+            </Children>
+          </WidgetGroup><!-- /Rec dot + RecDuration -->
+
+          <!-- invisible Rec button -->
+          <Template src="skin:button_3state_display.xml">
+            <SetVariable name="ObjectName">RecFeedback</SetVariable>
+            <SetVariable name="TooltipId">toggle_recording</SetVariable>
+            <SetVariable name="Size">70f,18f</SetVariable>
+            <SetVariable name="ConfigKey">[Recording],toggle_recording</SetVariable>
+            <SetVariable name="ConfigKeyDisp">[Recording],status</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup><!-- /Recording button & recording duration label -->
+
+      <WidgetGroup> <!-- Spacer -->
+        <Layout>horizontal</Layout>
+        <Size>5f,min</Size>
+        <Children/>
+      </WidgetGroup>
+
+      <Label>
+        <ObjectName>ToolbarLogo</ObjectName>
+        <Size>78f,24f</Size>
+      </Label>
+
+      <WidgetGroup> <!-- Spacer -->
+        <Layout>horizontal</Layout>
+        <Size>5f,min</Size>
+        <Children/>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>ClockWidget</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Time>
+            <TooltipId>time</TooltipId>
+            <Style>QLabel { font: bold 13px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
+                      background-color: transparent; color: #EECE33;}
+            </Style>
+            <ShowSeconds>false</ShowSeconds>
+          </Time>
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup> <!-- Spacer -->
+        <Layout>horizontal</Layout>
+        <Size>5f,min</Size>
+        <Children/>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>ToolbarDivider</ObjectName>
+        <Size>3f,9min</Size>
+      </WidgetGroup>
+
+      <WidgetGroup> <!-- Spacer -->
+        <Layout>horizontal</Layout>
+        <Size>5f,min</Size>
+        <Children/>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <WidgetGroup>
+            <ObjectName>LatencyLabel</ObjectName>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Label>
+                <Style>QLabel { font: bold 10px/10px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
+                          background-color: transparent; color: #EECE33;}
+                </Style>
+                <Text>CPU</Text>
+              </Label>
+            </Children>
+          </WidgetGroup>
+          <Template src="skin:vumeter_latency.xml">
+            <SetVariable name="TooltipId">audio_latency_usage</SetVariable>
+            <SetVariable name="group">[Master]</SetVariable>
+            <SetVariable name="control">audio_latency_usage</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/toolbar_full.xml b/res/skins/LateNight/toolbar_full.xml
deleted file mode 100644
index 1220aa9e27fc..000000000000
--- a/res/skins/LateNight/toolbar_full.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<Template>
-    <WidgetGroup>
-        <ObjectName>UIButtons</ObjectName>
-        <Layout>horizontal</Layout>
-        <SizePolicy>e,min</SizePolicy>
-        <Children>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>50f,20f</Size>
-                        <TooltipId>show_library</TooltipId>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>LIBRARY</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>LIBRARY</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey persist="true">[Library],show_library</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey persist="true">[Library],show_library</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>55f,20f</Size>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>MIC/AUX</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>MIC/AUX</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey persist="true">[Microphone],show_microphone</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey persist="true">[Microphone],show_microphone</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>55f,20f</Size>
-                        <TooltipId>show_effects</TooltipId>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>EFFECTS</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>EFFECTS</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>62f,20f</Size>
-                        <TooltipId>show_samplers</TooltipId>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>SAMPLERS</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>SAMPLERS</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-            <WidgetGroup>  <!-- spacer -->
-                <ObjectName>UIButtonMargin</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>me,min</SizePolicy>
-                <Children></Children>
-            </WidgetGroup>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>80f,20f</Size>
-                        <TooltipId>maximize_library</TooltipId>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>BIG LIBRARY</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>BIG LIBRARY</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey>[Master],maximize_library</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey>[Master],maximize_library</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-        </Children>
-    </WidgetGroup>
-</Template>
\ No newline at end of file
diff --git a/res/skins/LateNight/toolbar_med.xml b/res/skins/LateNight/toolbar_med.xml
deleted file mode 100644
index 1220aa9e27fc..000000000000
--- a/res/skins/LateNight/toolbar_med.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<Template>
-    <WidgetGroup>
-        <ObjectName>UIButtons</ObjectName>
-        <Layout>horizontal</Layout>
-        <SizePolicy>e,min</SizePolicy>
-        <Children>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>50f,20f</Size>
-                        <TooltipId>show_library</TooltipId>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>LIBRARY</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>LIBRARY</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey persist="true">[Library],show_library</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey persist="true">[Library],show_library</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>55f,20f</Size>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>MIC/AUX</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>MIC/AUX</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey persist="true">[Microphone],show_microphone</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey persist="true">[Microphone],show_microphone</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>55f,20f</Size>
-                        <TooltipId>show_effects</TooltipId>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>EFFECTS</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>EFFECTS</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>62f,20f</Size>
-                        <TooltipId>show_samplers</TooltipId>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>SAMPLERS</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>SAMPLERS</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-            <WidgetGroup>  <!-- spacer -->
-                <ObjectName>UIButtonMargin</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>me,min</SizePolicy>
-                <Children></Children>
-            </WidgetGroup>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>80f,20f</Size>
-                        <TooltipId>maximize_library</TooltipId>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>BIG LIBRARY</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>BIG LIBRARY</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey>[Master],maximize_library</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey>[Master],maximize_library</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-        </Children>
-    </WidgetGroup>
-</Template>
\ No newline at end of file
diff --git a/res/skins/LateNight/toolbar_no_library_button.xml b/res/skins/LateNight/toolbar_no_library_button.xml
new file mode 100644
index 000000000000..708257982f2a
--- /dev/null
+++ b/res/skins/LateNight/toolbar_no_library_button.xml
@@ -0,0 +1,270 @@
+<Template>
+  <WidgetGroup>
+    <ObjectName>ToolBar</ObjectName>
+    <Layout>horizontal</Layout>
+    <SizePolicy>e,min</SizePolicy>
+    <Children>
+
+      <PushButton>
+        <Size>84f,24f</Size>
+        <TooltipId>maximize_library</TooltipId>
+        <ObjectName>GuiToggleButton</ObjectName>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Text>BIG LIBRARY</Text>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Text>BIG LIBRARY</Text>
+        </State>
+        <Connection>
+          <ConfigKey>[Master],maximize_library</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey>[Master],maximize_library</ConfigKey>
+        </Connection>
+      </PushButton>
+
+      <WidgetGroup> <!-- Spacer -->
+        <Layout>horizontal</Layout>
+        <Size>5f,min</Size>
+        <Children/>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>ToolbarDivider</ObjectName>
+        <Size>3f,9min</Size>
+      </WidgetGroup>
+
+      <WidgetGroup> <!-- Spacer -->
+        <Layout>horizontal</Layout>
+        <Size>5f,min</Size>
+        <Children/>
+      </WidgetGroup>
+
+      <PushButton>
+        <Size>54f,24f</Size>
+        <TooltipId>toggle_4decks</TooltipId>
+        <ObjectName>GuiToggleButton</ObjectName>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Text>4 DECKS</Text>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Text>4 DECKS</Text>
+        </State>
+        <Connection>
+          <ConfigKey>[Master],show_4decks</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey>[Master],show_4decks</ConfigKey>
+        </Connection>
+      </PushButton>
+
+      <PushButton>
+        <Size>44f,24f</Size>
+        <TooltipId>toggle_4decks</TooltipId>
+        <ObjectName>GuiToggleButton</ObjectName>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Text>MIXER</Text>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Text>MIXER</Text>
+        </State>
+        <Connection>
+          <ConfigKey>[Master],show_mixer</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey>[Master],show_mixer</ConfigKey>
+        </Connection>
+      </PushButton>
+
+      <PushButton>
+        <Size>44f,24f</Size>
+        <ObjectName>GuiToggleButton</ObjectName>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Text>EQ</Text>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Text>EQ</Text>
+        </State>
+        <Connection>
+          <ConfigKey>[Master],show_eqs</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey>[Master],show_eqs</ConfigKey>
+        </Connection>
+      </PushButton>
+
+      <PushButton>
+        <Size>59f,24f</Size>
+        <ObjectName>GuiToggleButton</ObjectName>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Text>PREVIEW</Text>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Text>PREVIEW</Text>
+        </State>
+        <Connection>
+          <ConfigKey persist="true">[PreviewDeck],show_previewdeck</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey persist="true">[PreviewDeck],show_previewdeck</ConfigKey>
+        </Connection>
+      </PushButton>
+
+      <PushButton>
+        <Size>59f,24f</Size>
+        <ObjectName>GuiToggleButton</ObjectName>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Text>SPINNIES</Text>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Text>SPINNIES</Text>
+        </State>
+        <Connection>
+          <ConfigKey persist="true">[Spinny],show_spinnies</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey persist="true">[Spinny],show_spinnies</ConfigKey>
+        </Connection>
+      </PushButton>
+
+      <PushButton>
+        <Size>44f,24f</Size>
+        <ObjectName>GuiToggleButton</ObjectName>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Text>VINYL</Text>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Text>VINYL</Text>
+        </State>
+        <Connection>
+          <ConfigKey persist="true">[VinylControl],show_vinylcontrol</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey persist="true">[VinylControl],show_vinylcontrol</ConfigKey>
+        </Connection>
+      </PushButton>
+
+      <WidgetGroup> <!-- Spacer -->
+        <Layout>horizontal</Layout>
+        <Size>5f,min</Size>
+        <Children/>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>ToolbarDivider</ObjectName>
+        <Size>3f,9min</Size>
+      </WidgetGroup>
+
+      <WidgetGroup> <!-- Spacer -->
+        <Layout>horizontal</Layout>
+        <Size>5f,min</Size>
+        <Children/>
+      </WidgetGroup>
+
+      <PushButton>
+        <Size>59f,24f</Size>
+        <TooltipId>show_effects</TooltipId>
+        <ObjectName>GuiToggleButton</ObjectName>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Text>EFFECTS</Text>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Text>EFFECTS</Text>
+        </State>
+        <Connection>
+          <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
+        </Connection>
+      </PushButton>
+
+      <PushButton>
+        <Size>59f,24f</Size>
+        <ObjectName>GuiToggleButton</ObjectName>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Text>MIC/AUX</Text>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Text>MIC/AUX</Text>
+        </State>
+        <Connection>
+          <ConfigKey persist="true">[Microphone],show_microphone</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey persist="true">[Microphone],show_microphone</ConfigKey>
+        </Connection>
+      </PushButton>
+
+      <PushButton>
+        <Size>66f,24f</Size>
+        <TooltipId>show_samplers</TooltipId>
+        <ObjectName>GuiToggleButton</ObjectName>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Text>SAMPLERS</Text>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Text>SAMPLERS</Text>
+        </State>
+        <Connection>
+          <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
+        </Connection>
+      </PushButton>
+
+      <!-- Spacer -->
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Size>me,min</Size>
+        <Children/>
+      </WidgetGroup>
+
+      <SingletonContainer>
+        <ObjectName>ClockRecLogo</ObjectName>
+      </SingletonContainer>
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/toolbar_small.xml b/res/skins/LateNight/toolbar_small.xml
deleted file mode 100644
index 8a06ed7f9f8a..000000000000
--- a/res/skins/LateNight/toolbar_small.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<Template>
-    <!-- vertical spacer -->
-    <WidgetGroup>
-        <SizePolicy>me,me</SizePolicy>
-        <Children/>
-    </WidgetGroup>
-    <WidgetGroup>
-        <ObjectName>UIButtons</ObjectName>
-        <Layout>horizontal</Layout>
-        <SizePolicy>e,min</SizePolicy>
-        <Children>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>50f,20f</Size>
-                        <TooltipId>show_library</TooltipId>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>LIBRARY</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>LIBRARY</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey persist="true">[Library],show_library_tab_small</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey persist="true">[Library],show_library_tab_small</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>55f,20f</Size>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>MIC/AUX</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>MIC/AUX</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey persist="true">[Microphone],show_microphone</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey persist="true">[Microphone],show_microphone</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>55f,20f</Size>
-                        <TooltipId>show_effects</TooltipId>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>EFFECTS</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>EFFECTS</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>62f,20f</Size>
-                        <TooltipId>show_samplers</TooltipId>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>SAMPLERS</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>SAMPLERS</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-            <WidgetGroup>  <!-- spacer -->
-                <ObjectName>UIButtonMargin</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>me,min</SizePolicy>
-                <Children></Children>
-            </WidgetGroup>
-            <WidgetGroup>
-                <ObjectName>GuiToggleContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                    <PushButton>
-                        <Size>80f,20f</Size>
-                        <TooltipId>maximize_library</TooltipId>
-                        <ObjectName>GuiToggleButton</ObjectName>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Text>BIG LIBRARY</Text>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Text>BIG LIBRARY</Text>
-                        </State>
-                        <Connection>
-                          <ConfigKey>[Master],maximize_library</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey>[Master],maximize_library</ConfigKey>
-                        </Connection>
-                    </PushButton>
-                </Children>
-            </WidgetGroup>
-        </Children>
-    </WidgetGroup>
-</Template>
\ No newline at end of file
diff --git a/res/skins/LateNight/vinyl_controls.xml b/res/skins/LateNight/vinyl_controls.xml
index 9f90de31ca86..c625e7ac2047 100644
--- a/res/skins/LateNight/vinyl_controls.xml
+++ b/res/skins/LateNight/vinyl_controls.xml
@@ -4,118 +4,127 @@
     <Layout>horizontal</Layout>
     <SizePolicy>min,min</SizePolicy>
     <Children>
+
       <WidgetGroup>
-        <ObjectName>VinylControls2</ObjectName>
-        <TooltipId>vinylcontrol_enabled</TooltipId>
-        <Layout>vertical</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Size>,50</Size>
-        <Children>
-          <PushButton>
-          <Size>60f,22f</Size>
-          <ObjectName>VinylToggleButtonUL</ObjectName>
-          <NumberStates>2</NumberStates>
-          <State>
-            <Number>0</Number>
-            <Text>VINYL OFF</Text>
-          </State>
-          <State>
-            <Number>1</Number>
-            <Text>VINYL ON</Text>
-          </State>
-          <Connection>
-            <ConfigKey>[Channel<Variable name="channum" />],vinylcontrol_enabled</ConfigKey>
-            <ButtonState>LeftButton</ButtonState>
-          </Connection>
-          <Connection>
-            <ConfigKey>[Channel<Variable name="channum" />],vinylcontrol_enabled</ConfigKey>
-          </Connection>
-        </PushButton>
-        <PushButton>
-          <Size>60f,22f</Size>
-          <ObjectName>VinylToggleButtonLL</ObjectName>
-          <TooltipId>passthrough_enabled</TooltipId>
-          <NumberStates>2</NumberStates>
-          <State>
-            <Number>0</Number>
-            <Text>PASS OFF</Text>
-          </State>
-          <State>
-            <Number>1</Number>
-            <Text>PASS ON</Text>
-          </State>
-          <Connection>
-            <ConfigKey>[Channel<Variable name="channum" />],passthrough</ConfigKey>
-            <ButtonState>LeftButton</ButtonState>
-          </Connection>
-          <Connection>
-            <ConfigKey>[Channel<Variable name="channum" />],passthrough</ConfigKey>
-          </Connection>
-        </PushButton>
-        </Children>
-      </WidgetGroup>
-      <WidgetGroup>
-        <ObjectName>VinylControls2</ObjectName>
-        <TooltipId>vinylcontrol_mode</TooltipId>
-        <Layout>vertical</Layout>
+        <ObjectName>AlignVCenter</ObjectName>
         <SizePolicy>min,min</SizePolicy>
-        <Size>,50</Size>
+        <Layout>horizontal</Layout>
         <Children>
-          <PushButton>
-            <Size>60f,22f</Size>
-            <ObjectName>TristateButton</ObjectName>
-            <NumberStates>3</NumberStates>
-            <State>
-              <Number>0</Number>
-              <Text>ABS</Text>
-            </State>
-            <State>
-              <Number>1</Number>
-              <Text>REL</Text>
-            </State>
-            <State>
-              <Number>2</Number>
-              <Text>CONST</Text>
-            </State>
+          <StatusLight>
+            <ObjectName>VinylStatus</ObjectName>
+            <Size>10f,10f</Size>
+            <TooltipId>vinylcontrol_status</TooltipId>vinylcontrol_enabled
+            <NumberPos>3</NumberPos>
+            <PathStatusLight scalemode="STRETCH">buttons/btn_vinylcontrol_indicator_horizontal1.png</PathStatusLight>
+            <PathStatusLight2 scalemode="STRETCH">buttons/btn_vinylcontrol_indicator_horizontal2.png</PathStatusLight2>
+            <PathStatusLight3 scalemode="STRETCH">buttons/btn_vinylcontrol_indicator_horizontal3.png</PathStatusLight3>
             <Connection>
-              <ConfigKey persist="true">[Channel<Variable name="channum" />],vinylcontrol_mode</ConfigKey>
-              <ButtonState>LeftButton</ButtonState>
+              <ConfigKey><Variable name="group"/>,vinylcontrol_status</ConfigKey>
             </Connection>
-            <Connection>
-              <ConfigKey persist="true">[Channel<Variable name="channum" />],vinylcontrol_mode</ConfigKey>
-            </Connection>
-          </PushButton>
-          <PushButton>
-            <Size>60f,22f</Size>
-            <TooltipId>vinylcontrol_cueing</TooltipId>
-            <ObjectName>VinylCueButton</ObjectName>
-            <NumberStates>3</NumberStates>
-            <State>
-              <Number>0</Number>
-              <Text>CUE OFF</Text>
-            </State>
-            <State>
-              <Number>1</Number>
-              <Text>CUE ON</Text>
-            </State>
-            <State>
-              <Number>2</Number>
-              <Text>HOTCUE</Text>
-            </State>
-            <Connection>
-              <ConfigKey persist="true">[Channel<Variable name="channum" />],vinylcontrol_cueing</ConfigKey>
-              <ButtonState>LeftButton</ButtonState>
-            </Connection>
-            <Connection>
-              <ConfigKey persist="true">[Channel<Variable name="channum" />],vinylcontrol_cueing</ConfigKey>
-            </Connection>
-          </PushButton>
+          </StatusLight>
         </Children>
       </WidgetGroup>
+
+      <PushButton>
+        <Size>42f,22f</Size>
+        <TooltipId>vinylcontrol_enabled</TooltipId>
+        <ObjectName>VinylToggleButtonUL</ObjectName>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Text>VINYL</Text>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Text>VINYL</Text>
+        </State>
+        <Connection>
+          <ConfigKey><Variable name="group"/>,vinylcontrol_enabled</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey><Variable name="group"/>,vinylcontrol_enabled</ConfigKey>
+        </Connection>
+      </PushButton>
+
+      <PushButton>
+        <Size>42f,22f</Size>
+        <TooltipId>vinylcontrol_mode</TooltipId>
+        <ObjectName>TristateButton</ObjectName>
+        <NumberStates>3</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Text>ABS</Text>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Text>REL</Text>
+        </State>
+        <State>
+          <Number>2</Number>
+          <Text>CONST</Text>
+        </State>
+        <Connection>
+          <ConfigKey persist="true"><Variable name="group"/>,vinylcontrol_mode</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey persist="true"><Variable name="group"/>,vinylcontrol_mode</ConfigKey>
+        </Connection>
+      </PushButton>
+
+      <PushButton>
+        <Size>30f,22f</Size>
+        <TooltipId>vinylcontrol_cueing</TooltipId>
+        <ObjectName>VinylCueButton</ObjectName>
+        <NumberStates>3</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Text>CUE</Text>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Text>CUE</Text>
+        </State>
+        <State>
+          <Number>2</Number>
+          <Text>HOT</Text>
+        </State>
+        <Connection>
+          <ConfigKey persist="true"><Variable name="group"/>,vinylcontrol_cueing</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey persist="true"><Variable name="group"/>,vinylcontrol_cueing</ConfigKey>
+        </Connection>
+      </PushButton>
+
+      <PushButton>
+        <Size>42f,22f</Size>
+        <ObjectName>VinylToggleButtonLL</ObjectName>
+        <TooltipId>passthrough_enabled</TooltipId>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Text>PASS</Text>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Text>PASS</Text>
+        </State>
+        <Connection>
+          <ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+        </Connection>
+        <Connection>
+          <ConfigKey><Variable name="group"/>,passthrough</ConfigKey>
+        </Connection>
+      </PushButton>
+
     </Children>
     <Connection>
       <ConfigKey persist="true">[VinylControl],show_vinylcontrol</ConfigKey>
       <BindProperty>visible</BindProperty>
     </Connection>
   </WidgetGroup>
-</Template>
\ No newline at end of file
+</Template>
diff --git a/res/skins/LateNight/waveform.xml b/res/skins/LateNight/waveform.xml
index 3ab49f58cfbe..73aeadb96775 100644
--- a/res/skins/LateNight/waveform.xml
+++ b/res/skins/LateNight/waveform.xml
@@ -5,7 +5,6 @@
 		<SizePolicy>me,min</SizePolicy>
         <!-- The waveform is at least 50px tall, but the spinnies or the spinny
         margins can make them larger -->
-		<MinimumSize>200,50</MinimumSize>
 		<Children>
 			<!--If you want the waveforms center to adjust when resizing in a collapsing widget
 			(e.g. to display spinning vinyl widget like in this skin) don't put the Waveform in a widget group,
@@ -24,15 +23,14 @@
 				<TooltipId>waveform_display</TooltipId>
 				<Style></Style>
 				<Channel><Variable name="channum"/></Channel>
-				<Pos>0,0</Pos>
 				<!--See comment about <Size> above-->
 				<!--<Size>i,110</Size>-->
 				<BgColor><Variable name="SignalBgColor"/></BgColor>
 				<!--<BgPixmap>style/style_bg_waveform1.png</BgPixmap>-->
 				<SignalColor><Variable name="signal_color"/></SignalColor>
-                <SignalRGBLowColor><Variable name="SignalRGBLowColor"/></SignalRGBLowColor>
-                <SignalRGBMidColor><Variable name="SignalRGBMidColor"/></SignalRGBMidColor>
-                <SignalRGBHighColor><Variable name="SignalRGBHighColor"/></SignalRGBHighColor>
+        <SignalRGBLowColor><Variable name="SignalRGBLowColor"/></SignalRGBLowColor>
+        <SignalRGBMidColor><Variable name="SignalRGBMidColor"/></SignalRGBMidColor>
+        <SignalRGBHighColor><Variable name="SignalRGBHighColor"/></SignalRGBHighColor>
 				<BeatColor>#ffffff</BeatColor>
 				<BeatHighlightColor></BeatHighlightColor>
 				<PlayPosColor>#00FF00</PlayPosColor>
diff --git a/res/skins/LateNight/waveform_and_mixer.xml b/res/skins/LateNight/waveform_and_mixer.xml
deleted file mode 100644
index 284fc6ed18c8..000000000000
--- a/res/skins/LateNight/waveform_and_mixer.xml
+++ /dev/null
@@ -1,344 +0,0 @@
-<Template>
-	<WidgetGroup>
-	  <ObjectName>WaveformMixerContainer</ObjectName>
-		<Layout>vertical</Layout>
-		<SizePolicy>me,me</SizePolicy>
-		<Children>
-            <WidgetGroup>
-                <Layout>horizontal</Layout>
-                <ObjectName>ToolbarTop</ObjectName>
-                <SizePolicy>me,min</SizePolicy>
-                <Children>
-                    <WidgetGroup>
-                        <ObjectName>GuiToggleContainer</ObjectName>
-                        <Layout>vertical</Layout>
-                        <SizePolicy>min,min</SizePolicy>
-                        <Children>
-                            <PushButton>
-                                <Size>50f,20f</Size>
-                                <TooltipId>toggle_4decks</TooltipId>
-                                <ObjectName>GuiToggleButton</ObjectName>
-                                <NumberStates>2</NumberStates>
-                                <State>
-                                  <Number>0</Number>
-                                  <Text>4 DECKS</Text>
-                                </State>
-                                <State>
-                                  <Number>1</Number>
-                                  <Text>4 DECKS</Text>
-                                </State>
-                                <Connection>
-                                  <ConfigKey>[Master],show_4decks</ConfigKey>
-                                  <ButtonState>LeftButton</ButtonState>
-                                </Connection>
-                                <Connection>
-                                  <ConfigKey>[Master],show_4decks</ConfigKey>
-                                </Connection>
-                            </PushButton>
-                        </Children>
-                    </WidgetGroup>
-                    <WidgetGroup>
-                        <ObjectName>GuiToggleContainer</ObjectName>
-                        <Layout>vertical</Layout>
-                        <SizePolicy>min,min</SizePolicy>
-                        <Children>
-                            <PushButton>
-                                <Size>40f,20f</Size>
-                                <TooltipId>show_mixer</TooltipId>
-                                <ObjectName>GuiToggleButton</ObjectName>
-                                <NumberStates>2</NumberStates>
-                                <State>
-                                  <Number>0</Number>
-                                  <Text>MIXER</Text>
-                                </State>
-                                <State>
-                                  <Number>1</Number>
-                                  <Text>MIXER</Text>
-                                </State>
-                                <Connection>
-                                  <ConfigKey>[Master],show_mixer</ConfigKey>
-                                  <ButtonState>LeftButton</ButtonState>
-                                </Connection>
-                                <Connection>
-                                  <ConfigKey>[Master],show_mixer</ConfigKey>
-                                </Connection>
-                            </PushButton>
-                        </Children>
-                    </WidgetGroup>
-                    <WidgetGroup>
-                        <ObjectName>GuiToggleContainer</ObjectName>
-                        <Layout>vertical</Layout>
-                        <SizePolicy>min,min</SizePolicy>
-                        <Children>
-                            <PushButton>
-                                <Size>40f,20f</Size>
-                                <ObjectName>GuiToggleButton</ObjectName>
-                                <NumberStates>2</NumberStates>
-                                <State>
-                                  <Number>0</Number>
-                                  <Text>EQ</Text>
-                                </State>
-                                <State>
-                                  <Number>1</Number>
-                                  <Text>EQ</Text>
-                                </State>
-                                <Connection>
-                                  <ConfigKey>[Master],show_eqs</ConfigKey>
-                                  <ButtonState>LeftButton</ButtonState>
-                                </Connection>
-                                <Connection>
-                                  <ConfigKey>[Master],show_eqs</ConfigKey>
-                                </Connection>
-                            </PushButton>
-                        </Children>
-                    </WidgetGroup>
-                    <WidgetGroup>
-                        <ObjectName>GuiToggleContainer</ObjectName>
-                        <Layout>vertical</Layout>
-                        <SizePolicy>min,min</SizePolicy>
-                        <Children>
-                            <PushButton>
-                                <Size>55f,20f</Size>
-                                <ObjectName>GuiToggleButton</ObjectName>
-                                <NumberStates>2</NumberStates>
-                                <State>
-                                  <Number>0</Number>
-                                  <Text>PREVIEW</Text>
-                                </State>
-                                <State>
-                                  <Number>1</Number>
-                                  <Text>PREVIEW</Text>
-                                </State>
-                                <Connection>
-                                  <ConfigKey persist="true">[PreviewDeck],show_previewdeck</ConfigKey>
-                                  <ButtonState>LeftButton</ButtonState>
-                                </Connection>
-                                <Connection>
-                                  <ConfigKey persist="true">[PreviewDeck],show_previewdeck</ConfigKey>
-                                </Connection>
-                            </PushButton>
-                        </Children>
-                    </WidgetGroup>
-                    <WidgetGroup>
-                        <ObjectName>GuiToggleContainer</ObjectName>
-                        <Layout>vertical</Layout>
-                        <SizePolicy>min,min</SizePolicy>
-                        <Children>
-                            <PushButton>
-                                <Size>55f,20f</Size>
-                                <ObjectName>GuiToggleButton</ObjectName>
-                                <NumberStates>2</NumberStates>
-                                <State>
-                                  <Number>0</Number>
-                                  <Text>SPINNIES</Text>
-                                </State>
-                                <State>
-                                  <Number>1</Number>
-                                  <Text>SPINNIES</Text>
-                                </State>
-                                <Connection>
-                                  <ConfigKey persist="true">[Spinny],show_spinnies</ConfigKey>
-                                  <ButtonState>LeftButton</ButtonState>
-                                </Connection>
-                                <Connection>
-                                  <ConfigKey persist="true">[Spinny],show_spinnies</ConfigKey>
-                                </Connection>
-                            </PushButton>
-                        </Children>
-                    </WidgetGroup>
-                    <WidgetGroup>
-                        <ObjectName>GuiToggleContainer</ObjectName>
-                        <Layout>vertical</Layout>
-                        <SizePolicy>min,min</SizePolicy>
-                        <Children>
-                            <PushButton>
-                                <Size>40f,20f</Size>
-                                <TooltipId>show_vinylcontrol</TooltipId>
-                                <ObjectName>GuiToggleButton</ObjectName>
-                                <NumberStates>2</NumberStates>
-                                <State>
-                                  <Number>0</Number>
-                                  <Text>VINYL</Text>
-                                </State>
-                                <State>
-                                  <Number>1</Number>
-                                  <Text>VINYL</Text>
-                                </State>
-                                <Connection>
-                                  <ConfigKey persist="true">[VinylControl],show_vinylcontrol</ConfigKey>
-                                  <ButtonState>LeftButton</ButtonState>
-                                </Connection>
-                                <Connection>
-                                  <ConfigKey persist="true">[VinylControl],show_vinylcontrol</ConfigKey>
-                                </Connection>
-                            </PushButton>
-                        </Children>
-                    </WidgetGroup>
-                    <WidgetGroup>  <!-- spacer -->
-                        <Layout>horizontal</Layout>
-                        <SizePolicy>me,min</SizePolicy>
-                        <Children></Children>
-                    </WidgetGroup>
-                    <WidgetGroup>
-                      <Layout>vertical</Layout>
-                      <SizePolicy>min,min</SizePolicy>
-                      <Children>
-                        <WidgetGroup>
-                          <ObjectName>ClockWidget</ObjectName>
-                          <Layout>horizontal</Layout>
-                          <SizePolicy>min,max</SizePolicy>
-                          <Children>
-                            <Time>
-                              <TooltipId>time</TooltipId>
-                              <Style>QLabel { font: bold 13px/13px Lucida Grande, Lucida Sans Unicode, Arial, Verdana, sans-serif;
-                                        background-color: transparent; color: #EECE33;}
-                              </Style>
-                              <ShowSeconds>false</ShowSeconds>
-                            </Time>
-                          </Children>
-                        </WidgetGroup>
-                        <Template src="skin:vumeter_latency.xml">
-                          <SetVariable name="TooltipId">audio_latency_usage</SetVariable>
-                          <SetVariable name="group">[Master]</SetVariable>
-                          <SetVariable name="control">audio_latency_usage</SetVariable>
-                        </Template>
-                      </Children>
-                    </WidgetGroup>
-                </Children>
-            </WidgetGroup>
-			<WidgetGroup>
-				<Layout>horizontal</Layout>
-				<SizePolicy>me,f</SizePolicy>
-				<Children>
-					<Template src="skin:spinny.xml">
-						<SetVariable name="channum">3</SetVariable>
-                        <SetVariable name="color">2</SetVariable>
-					</Template>
-					<Template src="skin:waveform.xml">
-						<SetVariable name="channum">3</SetVariable>
-                        <SetVariable name="signal_color">#09B2AE</SetVariable>
-                        <SetVariable name="SignalBgColor">#012322</SetVariable>
-                        <SetVariable name="SignalRGBLowColor">#cb3433</SetVariable>
-                        <SetVariable name="SignalRGBMidColor">#00ff33</SetVariable>
-                        <SetVariable name="SignalRGBHighColor">#0034fe</SetVariable>
-					</Template>
-				</Children>
-				<Connection>
-					<ConfigKey persist="true">[Master],show_4decks</ConfigKey>
-					<BindProperty>visible</BindProperty>
-				</Connection>
-			</WidgetGroup>
-			<WidgetGroup>
-				<Layout>horizontal</Layout>
-                <SizePolicy>me,f</SizePolicy>
-				<Children>
-					<Template src="skin:spinny.xml">
-						<SetVariable name="channum">1</SetVariable>
-                        <SetVariable name="color">1</SetVariable>
-					</Template>
-					<Template src="skin:waveform.xml">
-						<SetVariable name="channum">1</SetVariable>
-                        <SetVariable name="signal_color">#E7C413</SetVariable>
-                        <SetVariable name="SignalBgColor">#2f290a</SetVariable>
-                        <SetVariable name="SignalRGBLowColor">#ff2a00</SetVariable>
-                        <SetVariable name="SignalRGBMidColor">#33f600</SetVariable>
-                        <SetVariable name="SignalRGBHighColor">#332acc</SetVariable>
-					</Template>
-				</Children>
-			</WidgetGroup>
-			<WidgetGroup>
-				<Layout>horizontal</Layout>
-                <SizePolicy>me,f</SizePolicy>
-				<Children>
-					<Template src="skin:spinny.xml">
-						<SetVariable name="channum">2</SetVariable>
-                        <SetVariable name="color">1</SetVariable>
-					</Template>
-					<Template src="skin:waveform.xml">
-						<SetVariable name="channum">2</SetVariable>
-                        <SetVariable name="signal_color">#E7C413</SetVariable>
-                        <SetVariable name="SignalBgColor">#2f290a</SetVariable>
-                        <SetVariable name="SignalRGBLowColor">#ff2a00</SetVariable>
-                        <SetVariable name="SignalRGBMidColor">#33f600</SetVariable>
-                        <SetVariable name="SignalRGBHighColor">#332acc</SetVariable>
-					</Template>
-				</Children>
-			</WidgetGroup>
-			<WidgetGroup>
-				<SizePolicy>me,f</SizePolicy>
-				<Layout>horizontal</Layout>
-				<Children>
-					<Template src="skin:spinny.xml">
-						<SetVariable name="channum">4</SetVariable>
-                        <SetVariable name="color">2</SetVariable>
-					</Template>
-					<Template src="skin:waveform.xml">
-						<SetVariable name="channum">4</SetVariable>
-                        <SetVariable name="signal_color">#09B2AE</SetVariable>
-                        <SetVariable name="SignalBgColor">#012322</SetVariable>
-                        <SetVariable name="SignalRGBLowColor">#cb3433</SetVariable>
-                        <SetVariable name="SignalRGBMidColor">#00ff33</SetVariable>
-                        <SetVariable name="SignalRGBHighColor">#0034fe</SetVariable>
-					</Template>
-				</Children>
-				<Connection>
-					<ConfigKey persist="true">[Master],show_4decks</ConfigKey>
-					<BindProperty>visible</BindProperty>
-				</Connection>
-			</WidgetGroup>
-            <WidgetGroup>
-                <ObjectName>HorizBorder</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>me,f</SizePolicy>
-                <Size>,1</Size>
-                <Children></Children>
-            </WidgetGroup>
-            <WidgetGroup>
-                <Layout>horizontal</Layout>
-                <Children>
-                    <Template src="skin:mixer.xml"/>
-                </Children>
-                <Connection>
-                    <ConfigKey>[Master],show_mixer</ConfigKey>
-                    <BindProperty>visible</BindProperty>
-                </Connection>
-            </WidgetGroup>
-            <WidgetGroup>
-                <ObjectName>NoMixerLogo</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>min,me</SizePolicy>
-                <MinimumSize>450,</MinimumSize>
-                <Children>
-                    <WidgetGroup>
-                        <Layout>horizontal</Layout>
-                        <SizePolicy>e,min</SizePolicy>
-                        <Children/>
-                    </WidgetGroup>
-                    <WidgetGroup>
-                        <Layout>vertical</Layout>
-                        <SizePolicy>max,me</SizePolicy>
-                        <Children>
-                            <WidgetGroup>
-                              <Layout>horizontal</Layout>
-                              <SizePolicy>me,me</SizePolicy>
-                              <Children/>
-                            </WidgetGroup>
-                            <WidgetGroup>
-                              <SizePolicy>f,f</SizePolicy>
-                              <Size>103,40</Size>
-                              <BackPath>style/mixxx_logo.png</BackPath>
-                            </WidgetGroup>
-                        </Children>
-                    </WidgetGroup>
-                </Children>
-                <Connection>
-                    <ConfigKey>[Master],show_mixer</ConfigKey>
-                    <BindProperty>visible</BindProperty>
-                    <Transform>
-                        <Not/>
-                    </Transform>
-                </Connection>
-            </WidgetGroup> 
-		</Children>
-	</WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/waveforms.xml b/res/skins/LateNight/waveforms.xml
new file mode 100644
index 000000000000..032a82fad7e5
--- /dev/null
+++ b/res/skins/LateNight/waveforms.xml
@@ -0,0 +1,140 @@
+<Template>
+  <WidgetGroup>
+    <Layout>vertical</Layout>
+    <Size>0me,0min</Size>
+    <Children>
+
+      <WidgetGroup><!-- Waveform 3 -->
+        <Layout>horizontal</Layout>
+        <SizePolicy>me,me</SizePolicy>
+        <Children>
+          <WidgetGroup><Size>0f,0me</Size></WidgetGroup>
+          <!--Template src="skin:spinny.xml">
+            <SetVariable name="channum">3</SetVariable>
+            <SetVariable name="color">2</SetVariable>
+          </Template-->
+          <Template src="skin:waveform.xml">
+            <SetVariable name="channum">3</SetVariable>
+            <SetVariable name="signal_color">#09B2AE</SetVariable>
+            <SetVariable name="SignalBgColor">#012322</SetVariable>
+            <SetVariable name="SignalRGBLowColor">#cb3433</SetVariable>
+            <SetVariable name="SignalRGBMidColor">#00ff33</SetVariable>
+            <SetVariable name="SignalRGBHighColor">#0034fe</SetVariable>
+          </Template>
+        </Children>
+        <Connection>
+          <ConfigKey persist="true">[Master],show_4decks</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- Waveform 3 -->
+
+      <WidgetGroup>
+        <Layout>stacked</Layout>
+        <SizePolicy>me,me</SizePolicy>
+        <Children>
+
+          <WidgetGroup><!-- Waveform 1 -->
+            <Layout>horizontal</Layout>
+            <SizePolicy>me,me</SizePolicy>
+            <Children>
+
+              <!--Template src="skin:spinny.xml">
+                <SetVariable name="channum">1</SetVariable>
+                <SetVariable name="color">1</SetVariable>
+              </Template-->
+
+              <Template src="skin:waveform.xml">
+                <SetVariable name="channum">1</SetVariable>
+                <SetVariable name="signal_color">#E7C413</SetVariable>
+                <SetVariable name="SignalBgColor">#2f290a</SetVariable>
+                <SetVariable name="SignalRGBLowColor">#ff2a00</SetVariable>
+                <SetVariable name="SignalRGBMidColor">#33f600</SetVariable>
+                <SetVariable name="SignalRGBHighColor">#332acc</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+          <!-- SizeAwareStack detects available height and switches to appropriate spinny size
+          <SizeAwareStack>
+            <SizePolicy>0f,0me</SizePolicy>
+            <Children>
+
+              <WidgetGroup trigger="[Latenight],spinny_20x20">
+                <MinimumSize>0,10</MinimumSize>
+                <MaximumSize>0,39</MaximumSize>
+                <SizePolicy>f,me</SizePolicy>
+                <Children>
+                  <WidgetGroup><Size>1f,1f</Size></WidgetGroup>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup trigger="[Latenight],spinny_40x40">
+                <MinimumSize>0,40</MinimumSize>
+                <MaximumSize>0,69</MaximumSize>
+                <SizePolicy>f,me</SizePolicy>
+                <Children>
+                  <WidgetGroup><Size>1f,1f</Size></WidgetGroup>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup trigger="[Latenight],spinny_70x70">
+                <MinimumSize>0,70</MinimumSize>
+                <MaximumSize>0,-1</MaximumSize>
+                <SizePolicy>f,me</SizePolicy>
+                <Children>
+                  <WidgetGroup><Size>0f,1f</Size></WidgetGroup>
+                </Children>
+              </WidgetGroup>
+
+            </Children>
+          </SizeAwareStack> -->
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup><!-- Waveform 2 -->
+        <Layout>horizontal</Layout>
+        <SizePolicy>me,me</SizePolicy>
+        <Children>
+          <WidgetGroup><Size>1f,0min</Size></WidgetGroup>
+          <!--Template src="skin:spinny.xml">
+            <SetVariable name="channum">2</SetVariable>
+            <SetVariable name="color">1</SetVariable>
+          </Template-->
+          <Template src="skin:waveform.xml">
+            <SetVariable name="channum">2</SetVariable>
+            <SetVariable name="signal_color">#E7C413</SetVariable>
+            <SetVariable name="SignalBgColor">#2f290a</SetVariable>
+            <SetVariable name="SignalRGBLowColor">#ff2a00</SetVariable>
+            <SetVariable name="SignalRGBMidColor">#33f600</SetVariable>
+            <SetVariable name="SignalRGBHighColor">#332acc</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup><!-- Waveform 2 -->
+
+      <WidgetGroup><!-- Waveform 4 -->
+        <Layout>horizontal</Layout>
+        <SizePolicy>me,me</SizePolicy>
+        <Children>
+          <WidgetGroup><Size>0f,0me</Size></WidgetGroup>
+          <!--Template src="skin:spinny.xml">
+            <SetVariable name="channum">4</SetVariable>
+            <SetVariable name="color">2</SetVariable>
+          </Template-->
+          <Template src="skin:waveform.xml">
+            <SetVariable name="channum">4</SetVariable>
+            <SetVariable name="signal_color">#09B2AE</SetVariable>
+            <SetVariable name="SignalBgColor">#012322</SetVariable>
+            <SetVariable name="SignalRGBLowColor">#cb3433</SetVariable>
+            <SetVariable name="SignalRGBMidColor">#00ff33</SetVariable>
+            <SetVariable name="SignalRGBHighColor">#0034fe</SetVariable>
+          </Template>
+        </Children>
+        <Connection>
+          <ConfigKey persist="true">[Master],show_4decks</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- Waveform 4 -->
+
+    </Children>
+  </WidgetGroup>
+</Template>