diff --git a/res/skins/LateNight/decks/decks_left.xml b/res/skins/LateNight/decks/decks_left.xml
index 8b44b3f82491..c91bd48f159f 100644
--- a/res/skins/LateNight/decks/decks_left.xml
+++ b/res/skins/LateNight/decks/decks_left.xml
@@ -25,5 +25,41 @@
       </WidgetGroup>
 
     </Children>
+    <Connection>
+      <ConfigKey>[Skin],show_4decks_row</ConfigKey>
+      <BindProperty>visible</BindProperty>
+      <Transform><Not/></Transform>
+    </Connection>
+  </WidgetGroup>
+
+  <WidgetGroup>
+    <ObjectName>DecksLeft</ObjectName>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,min</SizePolicy>
+    <Children>
+
+      <WidgetGroup>
+        <Layout>vertical</Layout>
+        <SizePolicy>me,min</SizePolicy>
+        <Children>
+          <SingletonContainer>
+            <ObjectName>Deck3_Src</ObjectName>
+          </SingletonContainer>
+        </Children>
+        <Connection>
+          <ConfigKey>[Skin],show_4decks</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+      <SingletonContainer>
+        <ObjectName>Deck1_Src</ObjectName>
+      </SingletonContainer>
+
+    </Children>
+    <Connection>
+      <ConfigKey>[Skin],show_4decks_row</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/decks/decks_right.xml b/res/skins/LateNight/decks/decks_right.xml
index 981b1c87830f..79f6ade80ff5 100644
--- a/res/skins/LateNight/decks/decks_right.xml
+++ b/res/skins/LateNight/decks/decks_right.xml
@@ -1,7 +1,7 @@
 <Template>
   <SetVariable name="Type">deck</SetVariable>
   <WidgetGroup>
-    <ObjectName>DecksRight</ObjectName>
+    <ObjectName>DecksLeft</ObjectName>
     <Layout>vertical</Layout>
     <SizePolicy>me,min</SizePolicy>
     <Children>
@@ -25,5 +25,41 @@
       </WidgetGroup>
 
     </Children>
+    <Connection>
+      <ConfigKey>[Skin],show_4decks_row</ConfigKey>
+      <BindProperty>visible</BindProperty>
+      <Transform><Not/></Transform>
+    </Connection>
+  </WidgetGroup>
+
+  <WidgetGroup>
+    <ObjectName>DecksLeft</ObjectName>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,min</SizePolicy>
+    <Children>
+
+      <SingletonContainer>
+        <ObjectName>Deck2_Src</ObjectName>
+      </SingletonContainer>
+
+      <WidgetGroup>
+        <Layout>vertical</Layout>
+        <SizePolicy>me,min</SizePolicy>
+        <Children>
+          <SingletonContainer>
+            <ObjectName>Deck4_Src</ObjectName>
+          </SingletonContainer>
+        </Children>
+        <Connection>
+          <ConfigKey>[Skin],show_4decks</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+    </Children>
+    <Connection>
+      <ConfigKey>[Skin],show_4decks_row</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/mixer.xml b/res/skins/LateNight/mixer.xml
index 35dbedd49843..495550b7c771 100644
--- a/res/skins/LateNight/mixer.xml
+++ b/res/skins/LateNight/mixer.xml
@@ -15,9 +15,23 @@
           <WidgetGroup>
             <ObjectName>MixerDecks</ObjectName>
             <SizePolicy>max,min</SizePolicy>
-            <Layout>vertical</Layout>
+            <!-- <Layout>vertical</Layout> -->
+            <Layout>horizontal</Layout>
             <Children>
               <Template src="skins:LateNight/mixer/mixer_2decks.xml"/>
+              <WidgetGroup>
+                <!-- <ObjectName>MixerDecks</ObjectName> -->
+                <SizePolicy>max,min</SizePolicy>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skins:LateNight/mixer/mixer_4decks.xml"/>
+                  <Template src="skins:LateNight/mixer/mixer_4decks_row.xml"/>
+                </Children>
+                <Connection>
+                  <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
               <Template src="skins:LateNight/mixer/mixer_4decks.xml"/>
             </Children>
             <Connection>
diff --git a/res/skins/LateNight/mixer/channel_left.xml b/res/skins/LateNight/mixer/channel_left.xml
index 5e2acdee9af1..f5057d80aabf 100644
--- a/res/skins/LateNight/mixer/channel_left.xml
+++ b/res/skins/LateNight/mixer/channel_left.xml
@@ -13,87 +13,117 @@ vertical layout and a side-by-side layout for two-deck mode -->
 
   <WidgetGroup>
     <ObjectName>MixerChannel_2Decks</ObjectName>
-    <Layout>horizontal</Layout>
+    <Layout>vertical</Layout>
     <SizePolicy>min,min</SizePolicy>
     <Children>
 
-      <WidgetGroup><!-- EQs -->
-        <Layout>vertical</Layout>
-        <ObjectName>MixerChannel_2Decks_Left</ObjectName>
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
         <SizePolicy>min,min</SizePolicy>
         <Children>
 
-          <!-- In case an EQ/non-EQ effect has less than 3 knobs we need
-               center those vertically. This spacer and the one below knob 3
-               push Gain and QuickEffect etc. to the top/bottom -->
-          <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
+          <WidgetGroup><!-- EQs -->
+            <Layout>vertical</Layout>
+            <ObjectName>MixerChannel_2Decks_Left</ObjectName>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+
+              <!-- In case an EQ/non-EQ effect has less than 3 knobs we need
+                   center those vertically. This spacer and the one below knob 3
+                   push Gain and QuickEffect etc. to the top/bottom -->
+              <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
 
-          <Template src="skins:LateNight/mixer/eq_knob_left.xml">
-            <SetVariable name="EqParameter">3</SetVariable>
-            <SetVariable name="EqRange">High</SetVariable>
-          </Template>
+              <Template src="skins:LateNight/mixer/eq_knob_left.xml">
+                <SetVariable name="EqParameter">3</SetVariable>
+                <SetVariable name="EqRange">High</SetVariable>
+              </Template>
 
-          <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
+              <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
 
-          <Template src="skins:LateNight/mixer/eq_knob_left.xml">
-            <SetVariable name="EqParameter">2</SetVariable>
-            <SetVariable name="EqRange">Mid</SetVariable>
-          </Template>
+              <Template src="skins:LateNight/mixer/eq_knob_left.xml">
+                <SetVariable name="EqParameter">2</SetVariable>
+                <SetVariable name="EqRange">Mid</SetVariable>
+              </Template>
 
-          <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
+              <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
 
-          <Template src="skins:LateNight/mixer/eq_knob_left.xml">
-            <SetVariable name="EqParameter">1</SetVariable>
-            <SetVariable name="EqRange">Low</SetVariable>
-          </Template>
+              <Template src="skins:LateNight/mixer/eq_knob_left.xml">
+                <SetVariable name="EqParameter">1</SetVariable>
+                <SetVariable name="EqRange">Low</SetVariable>
+              </Template>
 
-          <WidgetGroup><Size>1min,2me</Size></WidgetGroup>
+              <WidgetGroup><Size>1min,2me</Size></WidgetGroup>
 
 
-          <Template src="skins:LateNight/mixer/quick_effect_knob_left.xml"/>
+              <Template src="skins:LateNight/mixer/quick_effect_knob_left.xml"/>
 
-          <WidgetGroup><Size>1min,3f</Size></WidgetGroup>
+              <!-- <WidgetGroup><Size>1min,3f</Size></WidgetGroup> -->
+            </Children>
+            <Connection>
+              <ConfigKey>[Skin],show_eq_knobs</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup><!-- /EQs -->
+
+          <WidgetGroup>
+            <ObjectName>VolumeGain2Decks</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <Template src="skins:LateNight/controls/knob.xml">
+                <SetVariable name="Size">40f,34f</SetVariable>
+                <SetVariable name="KnobColor">orange</SetVariable>
+                <SetVariable name="ArcColor"><Variable name="ArcColorGain"/></SetVariable>
+                <SetVariable name="Control">pregain</SetVariable>
+                <SetVariable name="TooltipId">pregain</SetVariable>
+              </Template>
+
+              <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
+
+              <SliderComposed><!-- Volume -->
+                <TooltipId>channel_volume</TooltipId>
+                <Size>42f,107f</Size>
+                <Handle scalemode="STRETCH_ASPECT">skins:LateNight/<Variable name="SliderScheme"/>/sliders/knob_volume_deck.svg</Handle>
+                <Slider scalemode="STRETCH_ASPECT">skins:LateNight/<Variable name="SliderScheme"/>/sliders/slider_volume_deck.svg</Slider>
+                <Horizontal>false</Horizontal>
+                <BarColor><Variable name="BarColorVolume"/></BarColor>
+                <BarWidth><Variable name="BarWidth"/></BarWidth>
+                <BarMargins><Variable name="BarMarginVolume"/></BarMargins>
+                <BarRoundCaps>true</BarRoundCaps>
+                <BarAxisPos>21.0</BarAxisPos>
+                <Connection>
+                  <ConfigKey><Variable name="Group"/>,volume</ConfigKey>
+                </Connection>
+              </SliderComposed>
+
+              <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
+            </Children>
+          </WidgetGroup><!-- VolumeGain2Decks -->
         </Children>
-        <Connection>
-          <ConfigKey>[Skin],show_eq_knobs</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup><!-- /EQs -->
+      </WidgetGroup><!-- EQs + Pfl/VU -->
 
       <WidgetGroup>
-        <ObjectName>VolumeGain2Decks</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>me,min</SizePolicy>
+        <Layout>horizontal</Layout>
+        <SizePolicy>i,min</SizePolicy>
+        <MinimumSize>40,18</MinimumSize>
+        <MaximumSize>,18</MaximumSize>
         <Children>
-          <Template src="skins:LateNight/controls/knob.xml">
-            <SetVariable name="Size">40f,34f</SetVariable>
-            <SetVariable name="KnobColor">orange</SetVariable>
-            <SetVariable name="ArcColor"><Variable name="ArcColorGain"/></SetVariable>
-            <SetVariable name="Control">pregain</SetVariable>
-            <SetVariable name="TooltipId">pregain</SetVariable>
-          </Template>
-
-          <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
-
-          <SliderComposed><!-- Volume -->
-            <TooltipId>channel_volume</TooltipId>
-            <Size>42f,107f</Size>
-            <Handle scalemode="STRETCH_ASPECT">skins:LateNight/<Variable name="SliderScheme"/>/sliders/knob_volume_deck.svg</Handle>
-            <Slider scalemode="STRETCH_ASPECT">skins:LateNight/<Variable name="SliderScheme"/>/sliders/slider_volume_deck.svg</Slider>
-            <Horizontal>false</Horizontal>
-            <BarColor><Variable name="BarColorVolume"/></BarColor>
-            <BarWidth><Variable name="BarWidth"/></BarWidth>
-            <BarMargins><Variable name="BarMarginVolume"/></BarMargins>
-            <BarRoundCaps>true</BarRoundCaps>
-            <BarAxisPos>21.0</BarAxisPos>
+          <EffectChainPresetSelector>
+            <ObjectName>QuickEffectSelectorLeft</ObjectName>
+            <SizePolicy>p,min</SizePolicy>
+            <EffectUnitGroup>[QuickEffectRack1_<Variable name="Group"/>]</EffectUnitGroup>
             <Connection>
-              <ConfigKey><Variable name="Group"/>,volume</ConfigKey>
+              <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
+              <BindProperty>visible</BindProperty>
             </Connection>
-          </SliderComposed>
-
-          <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
+          </EffectChainPresetSelector>
         </Children>
-      </WidgetGroup><!-- VolumeGain2Decks -->
+        <Connection>
+          <ConfigKey persist="true">[Skin],show_eq_knobs</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
     </Children>
   </WidgetGroup><!-- MixerChannel_2Decks -->
 </Template>
diff --git a/res/skins/LateNight/mixer/channel_right.xml b/res/skins/LateNight/mixer/channel_right.xml
index 2ca990726a1c..b397667a6d2d 100644
--- a/res/skins/LateNight/mixer/channel_right.xml
+++ b/res/skins/LateNight/mixer/channel_right.xml
@@ -11,90 +11,119 @@ vertical layout and a reversed side-by-side layout for two-deck mode -->
   <SetVariable name="ArcRadius"><Variable name="ArcRadiusBig"/></SetVariable>
   <SetVariable name="ArcThickness"><Variable name="ArcThicknessBig"/></SetVariable>
 
-
   <WidgetGroup>
     <ObjectName>MixerChannel_2Decks</ObjectName>
-    <Layout>horizontal</Layout>
+    <Layout>vertical</Layout>
     <SizePolicy>min,min</SizePolicy>
     <Children>
 
       <WidgetGroup>
-        <ObjectName>VolumeGain2Decks</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>me,min</SizePolicy>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
         <Children>
-          <Template src="skins:LateNight/controls/knob.xml">
-            <SetVariable name="Size">40f,34f</SetVariable>
-            <SetVariable name="KnobColor">orange</SetVariable>
-            <SetVariable name="ArcColor"><Variable name="ArcColorGain"/></SetVariable>
-            <SetVariable name="Control">pregain</SetVariable>
-            <SetVariable name="TooltipId">pregain</SetVariable>
-          </Template>
-
-          <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
-
-          <SliderComposed><!-- Volume -->
-            <TooltipId>channel_volume</TooltipId>
-            <Size>42f,107f</Size>
-            <Handle scalemode="STRETCH_ASPECT">skins:LateNight/<Variable name="SliderScheme"/>/sliders/knob_volume_deck.svg</Handle>
-            <Slider scalemode="STRETCH_ASPECT">skins:LateNight/<Variable name="SliderScheme"/>/sliders/slider_volume_deck.svg</Slider>
-            <Horizontal>false</Horizontal>
-            <BarColor><Variable name="BarColorVolume"/></BarColor>
-            <BarWidth><Variable name="BarWidth"/></BarWidth>
-            <BarMargins><Variable name="BarMarginVolume"/></BarMargins>
-            <BarRoundCaps>true</BarRoundCaps>
-            <BarAxisPos>21.0</BarAxisPos>
+
+          <WidgetGroup>
+            <ObjectName>VolumeGain2Decks</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <Template src="skins:LateNight/controls/knob.xml">
+                <SetVariable name="Size">40f,34f</SetVariable>
+                <SetVariable name="KnobColor">orange</SetVariable>
+                <SetVariable name="ArcColor"><Variable name="ArcColorGain"/></SetVariable>
+                <SetVariable name="Control">pregain</SetVariable>
+                <SetVariable name="TooltipId">pregain</SetVariable>
+              </Template>
+
+              <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
+
+              <SliderComposed><!-- Volume -->
+                <TooltipId>channel_volume</TooltipId>
+                <Size>42f,107f</Size>
+                <Handle scalemode="STRETCH_ASPECT">skins:LateNight/<Variable name="SliderScheme"/>/sliders/knob_volume_deck.svg</Handle>
+                <Slider scalemode="STRETCH_ASPECT">skins:LateNight/<Variable name="SliderScheme"/>/sliders/slider_volume_deck.svg</Slider>
+                <Horizontal>false</Horizontal>
+                <BarColor><Variable name="BarColorVolume"/></BarColor>
+                <BarWidth><Variable name="BarWidth"/></BarWidth>
+                <BarMargins><Variable name="BarMarginVolume"/></BarMargins>
+                <BarRoundCaps>true</BarRoundCaps>
+                <BarAxisPos>21.0</BarAxisPos>
+                <Connection>
+                  <ConfigKey><Variable name="Group"/>,volume</ConfigKey>
+                </Connection>
+              </SliderComposed>
+
+              <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
+            </Children>
+          </WidgetGroup><!-- VolumeGain2Decks -->
+
+          <WidgetGroup>
+            <ObjectName>MixerChannel_2Decks_Right</ObjectName>
+            <SizePolicy>min,min</SizePolicy>
+            <Layout>vertical</Layout>
+            <Children>
+
+              <!-- In case an EQ/non-EQ effect has less than 3 knobs we need
+                   center those vertically. This spacer and the one below knob 3
+                   push Gain and QuickEffect etc. to the top/bottom -->
+              <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
+
+              <Template src="skins:LateNight/mixer/eq_knob_right.xml">
+                <SetVariable name="EqParameter">3</SetVariable>
+                <SetVariable name="EqRange">High</SetVariable>
+              </Template>
+
+              <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
+
+              <Template src="skins:LateNight/mixer/eq_knob_right.xml">
+                <SetVariable name="EqParameter">2</SetVariable>
+                <SetVariable name="EqRange">Mid</SetVariable>
+              </Template>
+
+              <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
+
+              <Template src="skins:LateNight/mixer/eq_knob_right.xml">
+                <SetVariable name="EqParameter">1</SetVariable>
+                <SetVariable name="EqRange">Low</SetVariable>
+              </Template>
+
+              <WidgetGroup><Size>1min,2me</Size></WidgetGroup>
+
+              <Template src="skins:LateNight/mixer/quick_effect_knob_right.xml"/>
+
+              <!-- <WidgetGroup><Size>0min,3f</Size></WidgetGroup> -->
+            </Children>
             <Connection>
-              <ConfigKey><Variable name="Group"/>,volume</ConfigKey>
+              <ConfigKey>[Skin],show_eq_knobs</ConfigKey>
+              <BindProperty>visible</BindProperty>
             </Connection>
-          </SliderComposed>
+          </WidgetGroup><!-- EQs + Pfl/VU -->
 
-          <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
         </Children>
-      </WidgetGroup><!-- VolumeGain2Decks -->
+      </WidgetGroup>
 
       <WidgetGroup>
-        <ObjectName>MixerChannel_2Decks_Right</ObjectName>
-        <SizePolicy>min,min</SizePolicy>
-        <Layout>vertical</Layout>
+        <Layout>horizontal</Layout>
+        <SizePolicy>i,min</SizePolicy>
+        <MinimumSize>40,18</MinimumSize>
+        <MaximumSize>,18</MaximumSize>
         <Children>
-
-          <!-- In case an EQ/non-EQ effect has less than 3 knobs we need
-               center those vertically. This spacer and the one below knob 3
-               push Gain and QuickEffect etc. to the top/bottom -->
-          <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
-
-          <Template src="skins:LateNight/mixer/eq_knob_right.xml">
-            <SetVariable name="EqParameter">3</SetVariable>
-            <SetVariable name="EqRange">High</SetVariable>
-          </Template>
-
-          <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
-
-          <Template src="skins:LateNight/mixer/eq_knob_right.xml">
-            <SetVariable name="EqParameter">2</SetVariable>
-            <SetVariable name="EqRange">Mid</SetVariable>
-          </Template>
-
-          <WidgetGroup><Size>1min,2f</Size></WidgetGroup>
-
-          <Template src="skins:LateNight/mixer/eq_knob_right.xml">
-            <SetVariable name="EqParameter">1</SetVariable>
-            <SetVariable name="EqRange">Low</SetVariable>
-          </Template>
-
-          <WidgetGroup><Size>1min,2me</Size></WidgetGroup>
-
-          <Template src="skins:LateNight/mixer/quick_effect_knob_right.xml"/>
-
-          <WidgetGroup><Size>0min,3f</Size></WidgetGroup>
+          <EffectChainPresetSelector>
+            <ObjectName>QuickEffectSelectorRight</ObjectName>
+            <SizePolicy>p,min</SizePolicy>
+            <EffectUnitGroup>[QuickEffectRack1_<Variable name="Group"/>]</EffectUnitGroup>
+            <Connection>
+              <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </EffectChainPresetSelector>
         </Children>
         <Connection>
-          <ConfigKey>[Skin],show_eq_knobs</ConfigKey>
+          <ConfigKey persist="true">[Skin],show_eq_knobs</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
-      </WidgetGroup><!-- MixerChannel_2Decks_Right -->
+      </WidgetGroup>
 
     </Children>
-  </WidgetGroup>
+  </WidgetGroup><!-- MixerChannel_2Decks -->
 </Template>
diff --git a/res/skins/LateNight/mixer/mixer_4decks.xml b/res/skins/LateNight/mixer/mixer_4decks.xml
index 71eb43f435de..8698309dd932 100644
--- a/res/skins/LateNight/mixer/mixer_4decks.xml
+++ b/res/skins/LateNight/mixer/mixer_4decks.xml
@@ -74,8 +74,9 @@
 
     </Children>
     <Connection>
-      <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
+      <ConfigKey persist="true">[Skin],show_4decks_row</ConfigKey>
       <BindProperty>visible</BindProperty>
+      <Transform><Not/></Transform>
     </Connection>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/mixer/mixer_4decks_row.xml b/res/skins/LateNight/mixer/mixer_4decks_row.xml
new file mode 100644
index 000000000000..a4cd2b74998a
--- /dev/null
+++ b/res/skins/LateNight/mixer/mixer_4decks_row.xml
@@ -0,0 +1,386 @@
+<Template>
+  <WidgetGroup>
+    <Layout>vertical</Layout>
+    <SizePolicy>max,min</SizePolicy>
+    <Children>
+
+      <!-- spacer to center channel controls without crossfader without
+          stretching them -->
+      <WidgetGroup><SizePolicy>min,e</SizePolicy></WidgetGroup>
+
+      <WidgetGroup><!-- Channel controls -->
+        <ObjectName>AlignHCenter</ObjectName>
+        <SizePolicy>min,min</SizePolicy>
+        <Layout>horizontal</Layout>
+        <Children>
+
+          <Template src="skins:LateNight/mixer/channel_left.xml">
+            <SetVariable name="ChanNum">3</SetVariable>
+            <SetVariable name="xfaderLeft">default</SetVariable>
+            <SetVariable name="xfaderRight">warning</SetVariable>
+          </Template>
+
+          <WidgetGroup><!-- Pfl + VU 3 -->
+            <Layout>vertical</Layout>
+            <SizePolicy>max,max</SizePolicy>
+            <Children>
+
+              <WidgetGroup>
+                <ObjectName></ObjectName>
+                <Layout>horizontal</Layout>
+                <Size>0min,26f</Size>
+                <Children>
+                  <Template src="skins:LateNight/controls/button_2state.xml">
+                    <SetVariable name="TooltipId">pfl</SetVariable>
+                    <SetVariable name="ObjectName">PflButton</SetVariable>
+                    <SetVariable name="Size">26f,26f</SetVariable>
+                    <SetVariable name="BtnSize">square</SetVariable>
+                    <SetVariable name="ConfigKey">[Channel3],pfl</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup><Size>1min,13f</Size></WidgetGroup>
+
+              <WidgetGroup>
+                <ObjectName>VuMeterBoxFull</ObjectName>
+                <Layout>horizontal</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                  <WidgetGroup><Size>7f,0min</Size></WidgetGroup>
+                  <SingletonContainer>
+                    <ObjectName>VuMeterChannel3</ObjectName>
+                  </SingletonContainer>
+                  <WidgetGroup><Size>7f,0min</Size></WidgetGroup>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Size>0,18f</Size>
+                <Children/>
+                <Connection>
+                  <ConfigKey persist="true">[Skin],show_eq_knobs</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup><!-- Pfl + VU 3 -->
+
+          <Template src="skins:LateNight/mixer/channel_left.xml">
+            <SetVariable name="ChanNum">1</SetVariable>
+            <SetVariable name="xfaderLeft">default</SetVariable>
+            <SetVariable name="xfaderRight">warning</SetVariable>
+          </Template>
+
+          <WidgetGroup><!-- Pfl + VU 1/2 + Main -->
+            <Layout>vertical</Layout>
+            <SizePolicy>max,max</SizePolicy>
+            <Children>
+
+              <WidgetGroup>
+                <ObjectName></ObjectName>
+                <Layout>horizontal</Layout>
+                <Size>0min,26f</Size>
+                <Children>
+                  <Template src="skins:LateNight/controls/button_2state.xml">
+                    <SetVariable name="TooltipId">pfl</SetVariable>
+                    <SetVariable name="ObjectName">PflButton</SetVariable>
+                    <SetVariable name="Size">26f,26f</SetVariable>
+                    <SetVariable name="BtnSize">square</SetVariable>
+                    <SetVariable name="ConfigKey">[Channel1],pfl</SetVariable>
+                  </Template>
+                  <WidgetGroup><Size>3f,0min</Size></WidgetGroup>
+                  <Template src="skins:LateNight/controls/button_2state.xml">
+                    <SetVariable name="TooltipId">pfl</SetVariable>
+                    <SetVariable name="ObjectName">PflButton</SetVariable>
+                    <SetVariable name="Size">26f,26f</SetVariable>
+                    <SetVariable name="BtnSize">square</SetVariable>
+                    <SetVariable name="ConfigKey">[Channel2],pfl</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup><Size>1min,13f</Size></WidgetGroup>
+
+              <WidgetGroup>
+                <ObjectName>VuMeterBoxFull</ObjectName>
+                <Layout>horizontal</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                  <SingletonContainer>
+                    <ObjectName>VuMeterChannel1</ObjectName>
+                  </SingletonContainer>
+                  <WidgetGroup><Size>7f,0min</Size></WidgetGroup>
+                  <SingletonContainer>
+                    <ObjectName>VuMeterMain_Dark</ObjectName>
+                  </SingletonContainer>
+                  <WidgetGroup><Size>7f,0min</Size></WidgetGroup>
+                  <SingletonContainer>
+                    <ObjectName>VuMeterChannel2</ObjectName>
+                  </SingletonContainer>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Size>0,18f</Size>
+                <Children/>
+                <Connection>
+                  <ConfigKey persist="true">[Skin],show_eq_knobs</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup><!-- Pfl + VU 1/2 + Main -->
+
+          <Template src="skins:LateNight/mixer/channel_right.xml">
+            <SetVariable name="ChanNum">2</SetVariable>
+            <SetVariable name="xfaderLeft">warning</SetVariable>
+            <SetVariable name="xfaderRight">default</SetVariable>
+          </Template>
+
+          <WidgetGroup><!-- Pfl + VU 4 -->
+            <Layout>vertical</Layout>
+            <SizePolicy>max,max</SizePolicy>
+            <Children>
+
+              <WidgetGroup>
+                <ObjectName></ObjectName>
+                <Layout>horizontal</Layout>
+                <Size>0min,26f</Size>
+                <Children>
+                  <Template src="skins:LateNight/controls/button_2state.xml">
+                    <SetVariable name="TooltipId">pfl</SetVariable>
+                    <SetVariable name="ObjectName">PflButton</SetVariable>
+                    <SetVariable name="Size">26f,26f</SetVariable>
+                    <SetVariable name="BtnSize">square</SetVariable>
+                    <SetVariable name="ConfigKey">[Channel4],pfl</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup><Size>1min,13f</Size></WidgetGroup>
+
+              <WidgetGroup>
+                <ObjectName>VuMeterBoxFull</ObjectName>
+                <Layout>horizontal</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                  <WidgetGroup><Size>7f,0min</Size></WidgetGroup>
+                  <SingletonContainer>
+                    <ObjectName>VuMeterChannel4</ObjectName>
+                  </SingletonContainer>
+                  <WidgetGroup><Size>7f,0min</Size></WidgetGroup>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Size>0,18f</Size>
+                <Children/>
+                <Connection>
+                  <ConfigKey persist="true">[Skin],show_eq_knobs</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+
+            </Children>
+          </WidgetGroup><!-- Pfl + VU 4 -->
+
+          <Template src="skins:LateNight/mixer/channel_right.xml">
+            <SetVariable name="ChanNum">4</SetVariable>
+            <SetVariable name="xfaderLeft">warning</SetVariable>
+            <SetVariable name="xfaderRight">default</SetVariable>
+          </Template>
+
+        </Children>
+      </WidgetGroup><!-- /Channel controls -->
+
+      <WidgetGroup><!-- Crossfader + Channel3/1/2/4 assign switches -->
+        <ObjectName>CrossfaderAndSwitches4Decks</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+
+          <WidgetGroup><Size>0min,0min</Size></WidgetGroup>
+
+          <!-- Channel 3 xFader switch -->
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <SizePolicy>max,min</SizePolicy>
+            <Children>
+
+              <WidgetGroup>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                  <WidgetGroup><Size>min,2f</Size></WidgetGroup>
+                  <Template src="skins:LateNight/controls/button_xfader_deck.xml">
+                    <SetVariable name="Group">[Channel3]</SetVariable>
+                    <SetVariable name="xfaderLeft">default</SetVariable>
+                    <SetVariable name="xfaderRight">warning</SetVariable>
+                  </Template>
+                </Children>
+                <Connection>
+                  <ConfigKey persist="true">[Skin],show_xfader</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+
+            </Children>
+          </WidgetGroup><!-- Channel 3 xFader switch -->
+
+          <WidgetGroup><Size>0min,0min</Size></WidgetGroup>
+
+          <!-- Channel 1 xFader switch -->
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <SizePolicy>max,min</SizePolicy>
+            <Children>
+
+              <WidgetGroup>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                  <WidgetGroup><Size>min,2f</Size></WidgetGroup>
+                  <Template src="skins:LateNight/controls/button_xfader_deck.xml">
+                    <SetVariable name="Group">[Channel1]</SetVariable>
+                    <SetVariable name="xfaderLeft">default</SetVariable>
+                    <SetVariable name="xfaderRight">warning</SetVariable>
+                  </Template>
+                </Children>
+                <Connection>
+                  <ConfigKey persist="true">[Skin],show_xfader</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+
+            </Children>
+          </WidgetGroup><!-- Channel 1 xFader switch -->
+
+          <!--  Regular crossfader for
+                * 2 decks with EQ knobs visible
+                * 4 decks
+                Narrow crossfader for
+                * 2 decks with EQ knobs hidden -->
+          <WidgetGroup>
+            <ObjectName>CrossfaderContainer</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>max,min</SizePolicy>
+            <Children>
+
+              <WidgetGroup><!-- with EQ knobs -->
+                <Layout>horizontal</Layout>
+                <SizePolicy>max,min</SizePolicy>
+                <Children>
+                  <SingletonContainer>
+                    <ObjectName>CrossfaderSingleton</ObjectName>
+                  </SingletonContainer>
+                </Children>
+                <Connection>
+                  <ConfigKey persist="true">[Skin],show_eq_knobs</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+
+
+              <SliderComposed><!-- without EQ knobs -->
+                <TooltipId>crossfader</TooltipId>
+                <Size>85f,40f</Size>
+                <Handle scalemode="STRETCH_ASPECT">skins:LateNight/<Variable name="SliderScheme"/>/sliders/knob_crossfader.svg</Handle>
+                <Slider scalemode="STRETCH_ASPECT">skins:LateNight/<Variable name="SliderScheme"/>/sliders/slider_crossfader_small.svg</Slider>
+                <Horizontal>true</Horizontal>
+                <BarColor><Variable name="BarColorCrossfader"/></BarColor>
+                <BarWidth><Variable name="BarWidth"/></BarWidth>
+                <BarMargins><Variable name="BarMarginCrossfader"/></BarMargins>
+                <BarMargins><Variable name="BarMarginVolume"/></BarMargins>
+                <BarRoundCaps>true</BarRoundCaps>
+                <BarAxisPos>19.0</BarAxisPos>
+                <BarUnipolar>false</BarUnipolar>
+                <Connection>
+                  <ConfigKey>[Master],crossfader</ConfigKey>
+                </Connection>
+                <Connection>
+                  <ConfigKey persist="true">[Skin],show_eq_knobs</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                  <Transform><Not/></Transform>
+                </Connection>
+              </SliderComposed>
+
+            </Children>
+            <Connection>
+              <ConfigKey persist="true">[Skin],show_xfader</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup><!-- CrossfaderContainer -->
+
+          <!-- Channel 2 xFader switch -->
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <SizePolicy>max,me</SizePolicy>
+            <Children>
+
+              <WidgetGroup>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                  <WidgetGroup><Size>min,2f</Size></WidgetGroup>
+                  <Template src="skins:LateNight/controls/button_xfader_deck.xml">
+                    <SetVariable name="Group">[Channel2]</SetVariable>
+                    <SetVariable name="xfaderLeft">warning</SetVariable>
+                    <SetVariable name="xfaderRight">default</SetVariable>
+                  </Template>
+                </Children>
+                <Connection>
+                  <ConfigKey persist="true">[Skin],show_xfader</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup><!-- Channel 2 xFader switch -->
+
+          <WidgetGroup><Size>0min,0min</Size></WidgetGroup>
+
+          <!-- Channel 4 xFader switch -->
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <SizePolicy>max,me</SizePolicy>
+            <Children>
+
+              <WidgetGroup>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+                  <WidgetGroup><Size>min,2f</Size></WidgetGroup>
+                  <Template src="skins:LateNight/controls/button_xfader_deck.xml">
+                    <SetVariable name="Group">[Channel4]</SetVariable>
+                    <SetVariable name="xfaderLeft">warning</SetVariable>
+                    <SetVariable name="xfaderRight">default</SetVariable>
+                  </Template>
+                </Children>
+                <Connection>
+                  <ConfigKey persist="true">[Skin],show_xfader</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+
+            </Children>
+          </WidgetGroup><!-- Channel 4 xFader switch -->
+
+          <WidgetGroup><Size>0min,0min</Size></WidgetGroup>
+
+        </Children>
+      </WidgetGroup><!-- /Crossfader + Channel3/1/2/4 assign switches -->
+
+      <!-- spacer to center channel controls without crossfader without
+          stretching them -->
+      <WidgetGroup><SizePolicy>min,e</SizePolicy></WidgetGroup>
+
+    </Children>
+    <Connection>
+      <ConfigKey persist="true">[Skin],show_4decks_row</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup><!-- MixerDecks -->
+</Template>
diff --git a/res/skins/LateNight/mixer/mixer_main_headphone.xml b/res/skins/LateNight/mixer/mixer_main_headphone.xml
index 1d603b5d2bf0..ba8b0f5737aa 100644
--- a/res/skins/LateNight/mixer/mixer_main_headphone.xml
+++ b/res/skins/LateNight/mixer/mixer_main_headphone.xml
@@ -135,30 +135,41 @@
                 <Layout>vertical</Layout>
                 <SizePolicy>min,min</SizePolicy>
                 <Children>
-
-                  <WidgetGroup>
-                    <MinimumSize>0,10</MinimumSize>
-                    <MaximumSize>,10</MaximumSize>
-                    <SizePolicy>min,me</SizePolicy>
-                  </WidgetGroup>
-
                   <WidgetGroup>
-                    <ObjectName>VuMeterMain_4Decks</ObjectName>
-                    <Layout>horizontal</Layout>
-                    <SizePolicy>max,max</SizePolicy>
+                    <Layout>vertical</Layout>
+                    <SizePolicy>min,min</SizePolicy>
                     <Children>
-                      <SingletonContainer>
-                        <ObjectName>VuMeterMain_Light</ObjectName>
-                      </SingletonContainer>
-                    </Children>
-                  </WidgetGroup><!-- VuMeterMain_4Decks -->
 
-                  <WidgetGroup>
-                    <MinimumSize>0,20</MinimumSize>
-                    <MaximumSize>,20</MaximumSize>
-                    <SizePolicy>min,me</SizePolicy>
-                  </WidgetGroup>
+                      <WidgetGroup>
+                        <MinimumSize>0,10</MinimumSize>
+                        <MaximumSize>,10</MaximumSize>
+                        <SizePolicy>min,me</SizePolicy>
+                      </WidgetGroup>
+
+                      <WidgetGroup>
+                        <ObjectName>VuMeterMain_4Decks</ObjectName>
+                        <Layout>horizontal</Layout>
+                        <SizePolicy>max,max</SizePolicy>
+                        <Children>
+                          <SingletonContainer>
+                            <ObjectName>VuMeterMain_Light</ObjectName>
+                          </SingletonContainer>
+                        </Children>
+                      </WidgetGroup><!-- VuMeterMain_4Decks -->
+
+                      <WidgetGroup>
+                        <MinimumSize>0,20</MinimumSize>
+                        <MaximumSize>,20</MaximumSize>
+                        <SizePolicy>min,me</SizePolicy>
+                      </WidgetGroup>
 
+                    </Children>
+                    <Connection>
+                      <ConfigKey persist="true">[Skin],show_4decks_row</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                      <Transform><Not/></Transform>
+                    </Connection>
+                  </WidgetGroup>
                 </Children>
                 <Connection>
                   <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
diff --git a/res/skins/LateNight/skin_settings.xml b/res/skins/LateNight/skin_settings.xml
index 0b2ceb611ab5..bcc889fdaf5e 100644
--- a/res/skins/LateNight/skin_settings.xml
+++ b/res/skins/LateNight/skin_settings.xml
@@ -22,7 +22,7 @@ Description:
       <WidgetGroup>
         <ObjectName>SkinSettings</ObjectName>
         <Layout>vertical</Layout>
-        <Size>240f,1me</Size>
+        <Size>263f,1me</Size>
         <Children>
 
           <!-- Decks -->
@@ -53,6 +53,22 @@ Description:
             </Children>
           </WidgetGroup>
 
+          <WidgetGroup><!-- 4 deck in horizontal layout -->
+            <SizePolicy>me,f</SizePolicy>
+            <Layout>stacked</Layout>
+            <Children>
+              <!-- translucent cover when 2 decks are shown -->
+              <Template src="skins:LateNight/helpers/skin_settings_cover_inverted.xml">
+                <SetVariable name="Setting">[Skin],show_4decks</SetVariable>
+              </Template>
+              <Template src="skins:LateNight/helpers/skin_settings_button_2state.xml">
+                <SetVariable name="Text">4 Decks in a Row</SetVariable>
+                <SetVariable name="Setting">[Skin],show_4decks_row</SetVariable>
+                <SetVariable name="Width">190me</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
 <!-- Deck size selector -->
           <WidgetGroup>
             <ObjectName>DeckSizeSettings</ObjectName>
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index 20f09b6729fa..7456451dbcd7 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -554,11 +554,9 @@ WTrackProperty[selected="false"] {
     qproperty-layoutAlignment: 'AlignHCenter | AlignBottom';
     }
 
-#CrossfaderAndSwitches2Decks {
+#CrossfaderAndSwitches2Decks,
+#CrossfaderSwitches4Decks {
   qproperty-layoutAlignment: 'AlignHCenter';
-}
-#CrossfaderSwitch_4Decks {
-  qproperty-layoutAlignment: 'AlignRight';
   }
   #CrossfaderContainer {
     qproperty-layoutAlignment: 'AlignHCenter | AlignBottom';