diff --git a/res/skins/LateNight/aux_unit.xml b/res/skins/LateNight/aux_unit.xml
index 6baabdddb091..fd631fc7ec2f 100644
--- a/res/skins/LateNight/aux_unit.xml
+++ b/res/skins/LateNight/aux_unit.xml
@@ -1,11 +1,11 @@
 <Template>
   <SetVariable name="group">[Auxiliary<Variable name="auxnum"/>]</SetVariable>
   <WidgetGroup>
-    <ObjectName>MicBorder</ObjectName>
+    <ObjectName>MicAuxUnit</ObjectName>
     <Layout>horizontal</Layout>
     <Children>
       <WidgetGroup>
-        <ObjectName>MicInterior</ObjectName>
+        <ObjectName>MicAuxInterior</ObjectName>
         <BackPath>style/background_tile.png</BackPath>
         <Layout>horizontal</Layout>
         <SizePolicy>min,max</SizePolicy>
diff --git a/res/skins/LateNight/buttons/btn_micDuck.svg b/res/skins/LateNight/buttons/btn_micDuck.svg
index 0f0f68efcd99..594d825cf4e0 100644
--- a/res/skins/LateNight/buttons/btn_micDuck.svg
+++ b/res/skins/LateNight/buttons/btn_micDuck.svg
@@ -1 +1 @@
-<svg id="svg2" width="62" height="28" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient6467" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="matrix(2.6957 0 0 1 1.1522 -1024.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7" stop-color="#242424" offset="0"/><stop id="stop3805-5" stop-color="#101010" offset="1"/></linearGradient></defs><path id="rect3029-6-6" d="m59.812 3.1875c0.11225 0.24927 0.1875 0.52278 0.1875 0.8125v20c0 1.0994-0.90065 2-2 2h-54c-0.28972 0-0.56323-0.075246-0.8125-0.1875 0.31167 0.69758 0.9965 1.1875 1.8125 1.1875h54c1.108 0 2-0.892 2-2v-20c0-0.816-0.48992-1.5008-1.1875-1.8125z" color="#000000" opacity=".9"/><path id="rect3029-6" d="m60.812 4.1875c0.11153 0.24962 0.1875 0.5205 0.1875 0.8125v20c0 1.108-0.892 2-2 2h-54c-0.292 0-0.56288-0.075973-0.8125-0.1875 0.31167 0.69758 0.9965 1.1875 1.8125 1.1875h54c1.108 0 2-0.892 2-2v-20c0-0.816-0.48992-1.5008-1.1875-1.8125z" color="#000000" fill="#060606" opacity=".62085"/><path id="rect3029" d="m4.5 2.5h53c1.108 0 2 0.892 2 2v19c0 1.108-0.892 2-2 2h-53c-1.108 0-2-0.892-2-2v-19c0-1.108 0.892-2 2-2z" color="#000000" fill="url(#linearGradient6467)"/><path id="rect3029-96-0" d="m4 2c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h54c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h53.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-53.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#585858" style="text-decoration-line:none;text-indent:0;text-transform:none"/></svg>
+<svg width="72" height="29" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1="13" x2="13" y1="1027.4" y2="1049" gradientTransform="matrix(2.6957 0 0 1 -.8478 -1023.4)" gradientUnits="userSpaceOnUse"><stop stop-color="#242424" offset="0"/><stop stop-color="#101010" offset="1"/></linearGradient></defs><path d="m70.062 3.1875c.11225.24927.1875.52278.1875.8125l-6.2e-5 21c-3e-6 1.0994-.90065 2-2 2h-66.25c-.28972 0-.56323-.07525-.8125-.1875.31167.69758.9965 1.1875 1.8125 1.1875h66.25c1.108 0 2-.892 2-2l6.3e-5-21c2e-6-.816-.48992-1.5008-1.1875-1.8125z" color="#000000" fill-opacity=".8"/><path d="m71.062 4.1875c.11153.24962.1875.5205.1875.8125l-6.2e-5 21c-3e-6 1.108-.892 2-2 2h-66.25c-.292 0-.56288-.07597-.8125-.1875.31167.69758.9965 1.1875 1.8125 1.1875h66.25c1.108 0 2-.892 2-2l6.3e-5-21c2e-6-.816-.48992-1.5008-1.1875-1.8125z" color="#000000" fill="#010101" fill-opacity=".48627"/><path d="m2.5002 2.5h65.25c1.108 0 2 .892 2 2l-6.2e-5 20c-3e-6 1.108-.892 2-2 2h-65.25c-1.108 0-2-.892-2-2l6.225e-5-20c3.45e-6-1.108.892-2 2-2z" color="#000000" fill="url(#a)"/><path d="m2.0002 2c-1.0994 0-2 .90065-2 2l-6.225e-5 21c-3.2589e-6 1.0994.90065 2 2 2h66.25c1.0994 0 2-.90065 2-2l6.2e-5-21c3e-6-1.0994-.90065-2-2-2zm.3 1h65.65c.56265 0 1.3.73735 1.3 1.3l-6.2e-5 20.4c-1e-6.56265-.73735 1.3-1.3 1.3h-65.65c-.56265 0-1.3-.73735-1.3-1.3l6.23e-5-20.4c1.7e-6-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#585858" style="text-decoration-line:none;text-indent:0;text-transform:none"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_micDuck_over.svg b/res/skins/LateNight/buttons/btn_micDuck_over.svg
index 23ab8e19b7eb..cf33f085bca4 100644
--- a/res/skins/LateNight/buttons/btn_micDuck_over.svg
+++ b/res/skins/LateNight/buttons/btn_micDuck_over.svg
@@ -1 +1 @@
-<svg id="svg2" width="62" height="28" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4"><linearGradient id="linearGradient6467" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="matrix(2.6957 0 0 1 1.1522 -1024.4)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7" stop-color="#b69700" offset="0"/><stop id="stop3805-5" stop-color="#eece33" offset="1"/></linearGradient></defs><path id="rect3029" d="m4.5 2.5h53c1.108 0 2 0.892 2 2v19c0 1.108-0.892 2-2 2h-53c-1.108 0-2-0.892-2-2v-19c0-1.108 0.892-2 2-2z" color="#000000" fill="url(#linearGradient6467)"/><path id="rect3029-96-0" d="m4 2c-1.0994 0-2 0.90065-2 2v20c0 1.0994 0.90065 2 2 2h54c1.0994 0 2-0.90065 2-2v-20c0-1.0994-0.90065-2-2-2zm0.3 1h53.4c0.56265 0 1.3 0.73735 1.3 1.3v19.4c0 0.56265-0.73735 1.3-1.3 1.3h-53.4c-0.56265 0-1.3-0.73735-1.3-1.3v-19.4c0-0.56265 0.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="text-decoration-line:none;text-indent:0;text-transform:none"/></svg>
+<svg width="72" height="29" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="a" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="matrix(2.6957 0 0 1 -.8478 -1024.4)" gradientUnits="userSpaceOnUse"><stop stop-color="#b69700" offset="0"/><stop stop-color="#eece33" offset="1"/></linearGradient></defs><path d="m2.5 2.5h65c1.108 0 2 .892 2 2v20c0 1.108-.892 2-2 2h-65c-1.108 0-2-.892-2-2v-20c0-1.108.892-2 2-2z" color="#000000" fill="url(#a)"/><path d="m2 2c-1.0994 0-2 .90065-2 2v21c0 1.0994.90065 2 2 2h66c1.0994 0 2-.90065 2-2v-21c0-1.0994-.90065-2-2-2zm.3 1h65.4c.56265 0 1.3.73735 1.3 1.3v20.4c0 .56265-.73735 1.3-1.3 1.3h-65.4c-.56265 0-1.3-.73735-1.3-1.3v-20.4c0-.56265.73735-1.3 1.3-1.3z" color="#000000" fill="#979797" style="text-decoration-line:none;text-indent:0;text-transform:none"/></svg>
diff --git a/res/skins/LateNight/mic_aux_rack.xml b/res/skins/LateNight/mic_aux_rack.xml
index 5c75008b578b..04abe5b815db 100644
--- a/res/skins/LateNight/mic_aux_rack.xml
+++ b/res/skins/LateNight/mic_aux_rack.xml
@@ -7,128 +7,79 @@
       <WidgetGroup><SizePolicy>me,min</SizePolicy></WidgetGroup>
 
       <WidgetGroup>
-        <ObjectName>MicContainer</ObjectName>
-        <Layout>vertical</Layout>
+        <ObjectName>MicRack</ObjectName>
+        <Layout>horizontal</Layout>
         <SizePolicy>max,min</SizePolicy>
         <Children>
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,min</SizePolicy>
-            <Children>
-              <Label>
-                <ObjectName>MicTitle</ObjectName>
-                <Text>Microphones</Text>
-              </Label>
-
-              <WidgetGroup>
-                <SizePolicy>me,min</SizePolicy>
-              </WidgetGroup>
 
-              <Label>
-                <ObjectName>DuckingTitle</ObjectName>
-                <Size>60f,17f</Size>
-                <Text>Ducking</Text>
-                <Alignment>center</Alignment>
-              </Label>
-            </Children>
-          </WidgetGroup>
+          <Template src="skin:mic_unit.xml">
+            <SetVariable name="mic1hack">1</SetVariable>
+          </Template>
+          <Template src="skin:mic_unit.xml">
+            <SetVariable name="micnum">2</SetVariable>
+          </Template>
+          <Template src="skin:mic_unit.xml">
+            <SetVariable name="micnum">3</SetVariable>
+          </Template>
+          <Template src="skin:mic_unit.xml">
+            <SetVariable name="micnum">4</SetVariable>
+          </Template>
 
-          <WidgetGroup><!-- Mic units -->
-            <Layout>horizontal</Layout>
-            <SizePolicy>max,min</SizePolicy>
+          <WidgetGroup><!-- Ducking controls -->
+            <ObjectName>MicDuckingContainer</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,min</SizePolicy>
             <Children>
-              <Template src="skin:mic_unit.xml">
-                <SetVariable name="mic1hack">1</SetVariable>
-              </Template>
-              <Template src="skin:mic_unit.xml">
-                <SetVariable name="micnum">2</SetVariable>
-              </Template>
-              <Template src="skin:mic_unit.xml">
-                <SetVariable name="micnum">3</SetVariable>
-              </Template>
-              <Template src="skin:mic_unit.xml">
-                <SetVariable name="micnum">4</SetVariable>
+
+              <Template src="skin:button_3state.xml">
+                <SetVariable name="TooltipId">talkover_duck_mode</SetVariable>
+                <SetVariable name="ObjectName">MicDuckingButton</SetVariable>
+                <SetVariable name="Size">72f,29f</SetVariable>
+                <SetVariable name="state_0">micDuck</SetVariable>
+                <SetVariable name="state_0_text">DUCK OFF</SetVariable>
+                <SetVariable name="state_1">micDuck_over</SetVariable>
+                <SetVariable name="state_1_text">DUCK AUTO</SetVariable>
+                <SetVariable name="state_2">micDuck_over</SetVariable>
+                <SetVariable name="state_2_text">DUCK MAN</SetVariable>
+                <SetVariable name="ConfigKey">[Master],talkoverDucking</SetVariable>
               </Template>
 
-              <WidgetGroup><!-- Ducking controls -->
-                <ObjectName>MicDuckingContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>min,min</SizePolicy>
+              <WidgetGroup>
+                <ObjectName>MicDuckingStrengthKnob</ObjectName>
+                <Layout>horizontal</Layout>
+                <SizePolicy>me,min</SizePolicy>
                 <Children>
-                  <Template src="skin:button_3state.xml">
-                    <SetVariable name="TooltipId">talkover_duck_mode</SetVariable>
-                    <SetVariable name="ObjectName">MicDuckingButton</SetVariable>
-                    <SetVariable name="Size">62f,28f</SetVariable>
-                    <SetVariable name="state_0">micDuck</SetVariable>
-                    <SetVariable name="state_0_text">OFF</SetVariable>
-                    <SetVariable name="state_1">micDuck_over</SetVariable>
-                    <SetVariable name="state_1_text">AUTO</SetVariable>
-                    <SetVariable name="state_2">micDuck_over</SetVariable>
-                    <SetVariable name="state_2_text">MANUAL</SetVariable>
-                    <SetVariable name="ConfigKey">[Master],talkoverDucking</SetVariable>
+                  <Template src="skin:knob_textless.xml">
+                    <SetVariable name="TooltipId">talkover_duck_strength</SetVariable>
+                    <SetVariable name="Size">40f,34f</SetVariable>
+                    <SetVariable name="Color">red</SetVariable>
+                    <SetVariable name="group">[Master]</SetVariable>
+                    <SetVariable name="control">duckStrength</SetVariable>
                   </Template>
-
-                  <WidgetGroup>
-                    <ObjectName>MicDuckingStrengthKnob</ObjectName>
-                    <Layout>horizontal</Layout>
-                    <SizePolicy>me,min</SizePolicy>
-                    <Children>
-                      <Template src="skin:knob_textless.xml">
-                        <SetVariable name="TooltipId">talkover_duck_strength</SetVariable>
-                        <SetVariable name="Size">40f,34f</SetVariable>
-                        <SetVariable name="Color">red</SetVariable>
-                        <SetVariable name="group">[Master]</SetVariable>
-                        <SetVariable name="control">duckStrength</SetVariable>
-                      </Template>
-                    </Children>
-                  </WidgetGroup>
                 </Children>
-              </WidgetGroup><!-- /Ducking controls -->
+              </WidgetGroup>
             </Children>
-          </WidgetGroup><!-- /Mic units -->
-
+          </WidgetGroup><!-- /Ducking controls -->
         </Children>
       </WidgetGroup><!-- /Mic -->
       
       <WidgetGroup><!-- Aux -->
-        <ObjectName>AuxContainer</ObjectName>
-        <Layout>vertical</Layout>
+        <ObjectName>AuxRack</ObjectName>
+        <Layout>horizontal</Layout>
         <SizePolicy>max,min</SizePolicy>
         <Children>
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,min</SizePolicy>
-            <Children>
-              <Label>
-                <ObjectName>MicTitle</ObjectName>
-                <Text>Aux Inputs</Text>
-              </Label>
-              <WidgetGroup>
-                <Layout>vertical</Layout>
-                <SizePolicy>me,min</SizePolicy>
-                <Children/>
-              </WidgetGroup>
-            </Children>
-          </WidgetGroup>
-
-          <WidgetGroup>
-            <Layout>horizontal</Layout>
-            <SizePolicy>max,min</SizePolicy>
-            <Children>
-              <Template src="skin:aux_unit.xml">
-                <SetVariable name="auxnum">1</SetVariable>
-              </Template>
-              <Template src="skin:aux_unit.xml">
-                <SetVariable name="auxnum">2</SetVariable>
-              </Template>
-              <Template src="skin:aux_unit.xml">
-                <SetVariable name="auxnum">3</SetVariable>
-              </Template>
-              <Template src="skin:aux_unit.xml">
-                <SetVariable name="auxnum">4</SetVariable>
-              </Template>
-            </Children>
-          </WidgetGroup>
+          <Template src="skin:aux_unit.xml">
+            <SetVariable name="auxnum">1</SetVariable>
+          </Template>
+          <Template src="skin:aux_unit.xml">
+            <SetVariable name="auxnum">2</SetVariable>
+          </Template>
+          <Template src="skin:aux_unit.xml">
+            <SetVariable name="auxnum">3</SetVariable>
+          </Template>
+          <Template src="skin:aux_unit.xml">
+            <SetVariable name="auxnum">4</SetVariable>
+          </Template>
         </Children>
       </WidgetGroup><!-- Aux -->
 
diff --git a/res/skins/LateNight/mic_unit.xml b/res/skins/LateNight/mic_unit.xml
index 0fac4c8687b0..ec9509775d3c 100644
--- a/res/skins/LateNight/mic_unit.xml
+++ b/res/skins/LateNight/mic_unit.xml
@@ -1,12 +1,12 @@
 <Template>
   <SetVariable name="group">[Microphone<Variable name="micnum"/>]</SetVariable>
   <WidgetGroup>
-    <ObjectName>MicBorder</ObjectName>
+    <ObjectName>MicAuxUnit</ObjectName>
     <Layout>horizontal</Layout>
     <SizePolicy>min,max</SizePolicy>
     <Children>
       <WidgetGroup>
-        <ObjectName>MicInterior</ObjectName>
+        <ObjectName>MicAuxInterior</ObjectName>
         <BackPath>style/background_tile.png</BackPath>
         <Layout>horizontal</Layout>
         <SizePolicy>min,max</SizePolicy>
@@ -124,6 +124,9 @@
                 <Layout>horizontal</Layout>
                 <SizePolicy>min,min</SizePolicy>
                 <Children>
+
+                  <WidgetGroup><Size>2f,0min</Size></WidgetGroup>
+
                   <Template src="skin:button_2state.xml">
                     <SetVariable name="TooltipId">EffectUnit_auxiliary_enabled</SetVariable>
                     <SetVariable name="ObjectName">FxAssignButton</SetVariable>
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index 1220f19ffc2c..f9caa1165165 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -527,10 +527,10 @@ WEffectButtonParameter*/
   }
 
 #VinylButton[displayValue="0"],
-#BroadcastButton[displayValue="0"],
-#SettingsButton[displayValue="0"],
+#FxAssignButton[displayValue="0"],
 #GuiToggleButton[displayValue="0"],
-#FxAssignButton[displayValue="0"] {
+#BroadcastButton[displayValue="0"],
+#SettingsButton[displayValue="0"] {
   color: #ddd;
   background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
     stop:0 #282828,
@@ -539,11 +539,11 @@ WEffectButtonParameter*/
 
 #VinylButton[displayValue="1"],
 #VinylButton[displayValue="2"],
+#FxAssignButton[displayValue="1"],
 #GuiToggleButton[displayValue="1"],
 #GuiToggleButton[displayValue="2"],
 #BroadcastButton[displayValue="1"], /* connecting: yellow */
-#SettingsButton[displayValue="1"],
-#FxAssignButton[displayValue="1"] {
+#SettingsButton[displayValue="1"] {
   color: #0e0e0e;
   background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
     stop:0 #B69700,
@@ -1094,60 +1094,53 @@ border: 0px;
   padding: 2px 0px 0px 2px;
 }
 
-#MicContainer, #AuxContainer {
+#MicRack, #AuxRack {
   qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
   border: 1px solid #585858;
   background-color: #1e1e1e;
-}
-
-#MicContainer {
-  margin: 5px 5px 0px 0px;
-  padding: 1px 6px 3px 6px;
-}
-
-#AuxContainer {
-  margin: 5px 0px 0px 5px;
-  padding: 1px 0px 3px 6px;
-}
-
-#MicTitle {
-  qproperty-alignment: 'AlignLeft | AlignTop';
-  text-transform: uppercase;
-  font-size: 15px/17px;
-}
+  padding: 4px;
+  qproperty-layoutSpacing: 5;
+  }
+  #MicRack {
+    margin: 5px 5px 0px 0px;
+  }
+  #AuxRack {
+    margin: 5px 0px 0px 5px;
+  }
 
-#MicBorder {
+#MicAuxUnit {
   qproperty-layoutAlignment: 'AlignHCenter | AlignTop';
-  border: 1px solid #585858;
-  margin: 1px 6px 1px 0px;
+  border-top: 1px solid #000;
+  border-left: 1px solid #000;
+  border-right: 1px solid #585858;
+  border-bottom: 1px solid #585858;
 }
 
-#MicInterior {
-  padding: 0px 3px 2px 3px;
+#MicAuxInterior {
+  padding: 0px 2px 3px 2px;
 }
 
-#MicSubTitle {
+#MicTitle {
   qproperty-alignment: 'AlignCenter | AlignTop';
   font-size: 12px/13px;
   text-align: center;
 }
 
-#MicDuckingTitle {
-  qproperty-alignment: 'AlignCenter | AlignTop';
-  font-size: 12px/13px;
-  font-weight: bold;
-  color: #585858;
-  text-align: center;
+#MicDuckingContainer {
+  qproperty-alignment: 'AlignCenter | AlignTop'; /*
+  background-color: #548731;  */
 }
 
-#MicDuckingContainer {
-  margin: 0px 0px 3px 0px;
+#MicDuckingStrengthKnob {
+  margin: 2px 0px;
 }
 
-#MicDuckingButton[displayValue="0"] {
-  color: #ddd;
+/* styled like GuiToggleButton, VinylButton etc */
+#MicDuckingButton {
+  }
+  #MicDuckingButton[displayValue="0"] {
+    color: #ddd;
   }
-
   #MicDuckingButton[displayValue="1"],
   #MicDuckingButton[displayValue="2"] {
     color: #0e0e0e;
@@ -1197,12 +1190,6 @@ border: 0px;
   background-color: #1e1e1e;
 }
 
-#SamplerExpandbutton {
-}
-
-#SamplerMainControls {
-}
-
 #SamplerText {
   qproperty-layoutAlignment: 'AlignLeft | AlignTop';
   padding: 3px 3px 3px 5px;