1 files changed, 30 insertions, 30 deletions
diff --git a/res/skins/LateNight/mixer.xml b/res/skins/LateNight/mixer.xml
index 5371b860d3..aa35146118 100644
--- a/res/skins/LateNight/mixer.xml
+++ b/res/skins/LateNight/mixer.xml
@@ -4,10 +4,6 @@
   <WidgetGroup>
     <SizePolicy>max,me</SizePolicy>
     <Layout>horizontal</Layout>
-    <Connection>
-      <ConfigKey persist="true">[Master],show_mixer</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
     <Children>
 
       <WidgetGroup>
@@ -16,7 +12,19 @@
         <Layout>horizontal</Layout>
         <Children>
 
-          <Template src="skin:/mixer/mixer_decks.xml"/>
+          <WidgetGroup>
+            <ObjectName>MixerDecks</ObjectName>
+            <SizePolicy>max,min</SizePolicy>
+            <Layout>vertical</Layout>
+            <Children>
+              <Template src="skin:/mixer/mixer_2decks.xml"/>
+              <Template src="skin:/mixer/mixer_4decks.xml"/>
+            </Children>
+            <Connection>
+              <ConfigKey persist="true">[Skin],show_master_head_mixer</ConfigKey>
+              <BindProperty>highlight</BindProperty>
+            </Connection>
+          </WidgetGroup>
 
           <Template src="skin:/mixer/mixer_master_headphone.xml"/>
 
@@ -24,49 +32,41 @@
       </WidgetGroup><!-- MixerContainer -->
 
     </Children>
-  </WidgetGroup><!-- show_mixer -->
-
-  <WidgetGroup>
-    <SizePolicy>max,me</SizePolicy>
-    <Layout>horizontal</Layout>
     <Connection>
       <ConfigKey persist="true">[Master],show_mixer</ConfigKey>
-      <Transform><Not/></Transform>
       <BindProperty>visible</BindProperty>
     </Connection>
+  </WidgetGroup>
+
+  <WidgetGroup>
+    <SizePolicy>max,me</SizePolicy>
+    <Layout>horizontal</Layout>
     <Children>
 
       <WidgetGroup>
         <ObjectName></ObjectName>
         <SizePolicy>min,me</SizePolicy>
         <Layout>vertical</Layout>
-        <Connection>
-          <ConfigKey>[LateNight],show_compact_deck</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
         <Children>
 
-          <WidgetGroup>
-            <!--  width set in qss  -->
+          <WidgetGroup><!--  width set in qss  -->
             <ObjectName>CompactDecksCenterSpacer</ObjectName>
           </WidgetGroup>
 
-          <WidgetGroup>
-            <ObjectName></ObjectName>
-            <SizePolicy>min,me</SizePolicy>
-            <Layout>vertical</Layout>
-            <Connection>
-              <ConfigKey persist="true">[LateNight],show_vumeters_compact</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-            <Children>
-              <Template src="skin:/mixer/vumeters_compact.xml"/>
-            </Children>
-          </WidgetGroup>
+          <Template src="skin:/mixer/vumeters_compact.xml"/>
 
         </Children>
-      </WidgetGroup><!-- !show_mixer -->
+        <Connection>
+          <ConfigKey>[LateNight],show_compact_deck</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
 
     </Children>
+    <Connection>
+      <ConfigKey persist="true">[Master],show_mixer</ConfigKey>
+      <Transform><Not/></Transform>
+      <BindProperty>visible</BindProperty>
+    </Connection>
   </WidgetGroup>
 </Template>