diff --git a/res/skins/Deere/auxiliary.xml b/res/skins/Deere/auxiliary.xml
index e96c94b320a0..331609a6d01a 100644
--- a/res/skins/Deere/auxiliary.xml
+++ b/res/skins/Deere/auxiliary.xml
@@ -1,36 +1,122 @@
 <!DOCTYPE template>
 <!--
   Description:
-    The auxiliary channel controls.
+    The auxiliary input controls.
   Variables:
-    i: The auxiliary channel number (1-indexed)
+    i: The Auxiliary input number (1-indexed)
 -->
 
 <Template>
+  <SetVariable name="group">[Auxiliary<Variable name="i"/>]</SetVariable>
   <WidgetGroup>
     <ObjectName>AuxiliaryContainer</ObjectName>
-    <Layout>horizontal</Layout>
-    <SizePolicy>min,min</SizePolicy>
+    <Layout>vertical</Layout>
+    <SizePolicy>max,max</SizePolicy>
     <Children>
-      <Template src="skin:vumeter.xml">
-        <SetVariable name="group">[Auxiliary<Variable name="i"/>]</SetVariable>
-        <SetVariable name="TooltipId">channel_VuMeter</SetVariable>
-        <SetVariable name="control">VuMeter</SetVariable>
-      </Template>
-
-      <Template src="skin:knob_with_button.xml">
-        <SetVariable name="TooltipId">pregain</SetVariable>
-        <SetVariable name="group">[Auxiliary<Variable name="i"/>]</SetVariable>
-        <SetVariable name="control">pregain</SetVariable>
-        <SetVariable name="color">red</SetVariable>
-        <SetVariable name="button_TooltipId">mute</SetVariable>
-        <SetVariable name="button_control">mute</SetVariable>
-        <SetVariable name="label">Gain</SetVariable>
-      </Template>
+
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <ObjectName>AuxLabelContainer</ObjectName>
+        <Children>
+          <Label>
+            <ObjectName>AuxLabel</ObjectName>
+            <Text>Aux <Variable name="i"/></Text>
+          </Label>
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>AuxiliaryControls</ObjectName>
+        <Layout>horizontal</Layout>
+        <Children>
+
+          <Template src="skin:knob_with_button.xml">
+            <SetVariable name="TooltipId">microphone_pregain</SetVariable>
+            <SetVariable name="control">pregain</SetVariable>
+            <SetVariable name="color">red</SetVariable>
+            <SetVariable name="button_TooltipId">mute</SetVariable>
+            <SetVariable name="button_control">mute</SetVariable>
+            <SetVariable name="label">Gain</SetVariable>
+          </Template>
+
+          <WidgetGroup>
+            <ObjectName>AuxiliaryButtonsAndMeter</ObjectName>
+            <Layout>vertical</Layout>
+            <Children>
+
+              <WidgetGroup>
+                <ObjectName>AuxiliaryControlButtons</ObjectName>
+                <Layout>horizontal</Layout>
+                <Children>
+
+                  <Template src="skin:left_2state_button.xml">
+                    <SetVariable name="TooltipId">pfl</SetVariable>
+                    <SetVariable name="ObjectName">AuxPFLButton</SetVariable>
+                    <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                    <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                    <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                    <SetVariable name="state_0_text"></SetVariable>
+                    <SetVariable name="state_0_pressed">icon/ic_headphones_48px.svg</SetVariable>
+                    <SetVariable name="state_0_unpressed">icon/ic_headphones_48px.svg</SetVariable>
+                    <SetVariable name="state_1_text"></SetVariable>
+                    <SetVariable name="state_1_pressed">icon/ic_headphones_48px.svg</SetVariable>
+                    <SetVariable name="state_1_unpressed">icon/ic_headphones_48px.svg</SetVariable>
+                    <SetVariable name="left_connection_control"><Variable name="group"/>,pfl</SetVariable>
+                  </Template>
+
+                  <Template src="skin:crossfader_orientation_button.xml" />
+
+                </Children>
+              </WidgetGroup>
+
+              <Template src="skin:vumeter.xml">
+                <SetVariable name="TooltipId">microphone_VuMeter</SetVariable>
+                <SetVariable name="control">VuMeter</SetVariable>
+              </Template>
+
+              <WidgetGroup>
+                <ObjectName>ButtonGrid</ObjectName>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:fx_unit_group_assignment_button.xml">
+                    <SetVariable name="EffectUnit">1</SetVariable>
+                    <SetVariable name="SourceType">auxiliary</SetVariable>
+                  </Template>
+
+                  <Template src="skin:fx_unit_group_assignment_button.xml">
+                    <SetVariable name="EffectUnit">2</SetVariable>
+                    <SetVariable name="SourceType">auxiliary</SetVariable>
+                  </Template>
+
+                  <WidgetGroup>
+                    <ObjectName>ButtonGrid</ObjectName>
+                    <Layout>horizontal</Layout>
+                    <Children>
+                      <Template src="skin:fx_unit_group_assignment_button.xml">
+                        <SetVariable name="EffectUnit">3</SetVariable>
+                        <SetVariable name="SourceType">auxiliary</SetVariable>
+                      </Template>
+
+                      <Template src="skin:fx_unit_group_assignment_button.xml">
+                        <SetVariable name="EffectUnit">4</SetVariable>
+                        <SetVariable name="SourceType">auxiliary</SetVariable>
+                      </Template>
+                    </Children>
+                    <Connection>
+                      <ConfigKey>[Master],show_4effectunits</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup>
+
+                </Children>
+              </WidgetGroup>
+
+            </Children>
+          </WidgetGroup>
+
+        </Children>
+      </WidgetGroup>
+
     </Children>
-    <Connection>
-      <ConfigKey>[Auxiliary<Variable name="i"/>],enabled</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/beatjump.xml b/res/skins/Deere/beatjump.xml
index 779720c782b2..b6dc76c6cedd 100644
--- a/res/skins/Deere/beatjump.xml
+++ b/res/skins/Deere/beatjump.xml
@@ -6,411 +6,51 @@
     group: The group for the controls.
 -->
 <Template>
-  <WidgetStack>
+  <WidgetGroup>
     <ObjectName>BeatJumpContainer</ObjectName>
     <Layout>horizontal</Layout>
-    <MinimumSize>-1,-1</MinimumSize>
-    <SizePolicy>max,max</SizePolicy>
-    <NextControl>[BeatJump],next</NextControl>
-    <PrevControl>[BeatJump],prev</PrevControl>
     <Children>
-      <!-- Set jumping 4 beats as default for audible effect on first try. Later user changes persist. -->
-       <WidgetGroup>
-         <Layout>horizontal</Layout>
-         <Children>
-           <Template src="skin:beatjump_button.xml">
-             <SetVariable name="control_length">4</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_beatjump_backward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_beatjump_backward_48px.svg</SetVariable>
-             <SetVariable name="direction">backward</SetVariable>
-           </Template>
 
-           <Template src="skin:left_right_1state_button.xml">
-             <SetVariable name="ObjectName">BeatJumpValue</SetVariable>
-             <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-             <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-             <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-             <SetVariable name="state_0_text">4</SetVariable>
-             <SetVariable name="state_0_pressed"></SetVariable>
-             <SetVariable name="state_0_unpressed"></SetVariable>
-             <SetVariable name="left_connection_control">[BeatJump],next</SetVariable>
-             <SetVariable name="right_connection_control">[BeatJump],prev</SetVariable>
-           </Template>
+      <Template src="skin:left_right_1state_button.xml">
+        <SetVariable name="TooltipId">beatjump_backward</SetVariable>
+        <SetVariable name="ObjectName">BeatJumpButton</SetVariable>
+        <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+        <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+        <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+        <SetVariable name="state_0_pressed">icon/ic_beatjump_backward_48px.svg</SetVariable>
+        <SetVariable name="state_0_unpressed">icon/ic_beatjump_backward_48px.svg</SetVariable>
+        <SetVariable name="state_0_text"><Variable name="text_length"/></SetVariable>
+        <SetVariable name="left_connection_control"><Variable name="group"/>,beatjump_backward</SetVariable>
+        <SetVariable name="right_connection_control"><Variable name="group"/>,beatjump_1_backward</SetVariable>
+      </Template>
+
+      <Template src="skin:spacer_hx.xml">
+        <SetVariable name="width">2</SetVariable>
+      </Template>
+
+      <BeatSpinBox>
+        <ObjectName>BeatjumpSizeSpinBox</ObjectName>
+        <TooltipId>beatjump_size</TooltipId>
+        <Value><Variable name="group"/>,beatjump_size</Value>
+      </BeatSpinBox>
+
+      <Template src="skin:spacer_hx.xml">
+        <SetVariable name="width">2</SetVariable>
+      </Template>
+
+      <Template src="skin:left_right_1state_button.xml">
+        <SetVariable name="TooltipId">beatjump_forward</SetVariable>
+        <SetVariable name="ObjectName">BeatJumpButton</SetVariable>
+        <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+        <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+        <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+        <SetVariable name="state_0_pressed">icon/ic_beatjump_forward_48px.svg</SetVariable>
+        <SetVariable name="state_0_unpressed">icon/ic_beatjump_forward_48px.svg</SetVariable>
+        <SetVariable name="state_0_text"><Variable name="text_length"/></SetVariable>
+        <SetVariable name="left_connection_control"><Variable name="group"/>,beatjump_forward</SetVariable>
+        <SetVariable name="right_connection_control"><Variable name="group"/>,beatjump_1_forward</SetVariable>
+      </Template>
 
-           <Template src="skin:beatjump_button.xml">
-             <SetVariable name="control_length">4</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_beatjump_forward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_beatjump_forward_48px.svg</SetVariable>
-             <SetVariable name="direction">forward</SetVariable>
-           </Template>
-         </Children>
-       </WidgetGroup>
-
-       <WidgetGroup>
-         <Layout>horizontal</Layout>
-         <Children>
-           <Template src="skin:beatjump_button.xml">
-             <SetVariable name="control_length">8</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_beatjump_backward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_beatjump_backward_48px.svg</SetVariable>
-             <SetVariable name="direction">backward</SetVariable>
-           </Template>
-
-          <Template src="skin:left_right_1state_button.xml">
-             <SetVariable name="ObjectName">BeatJumpValue</SetVariable>
-             <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-             <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-             <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-             <SetVariable name="state_0_text">8</SetVariable>
-             <SetVariable name="state_0_pressed"></SetVariable>
-             <SetVariable name="state_0_unpressed"></SetVariable>
-             <SetVariable name="left_connection_control">[BeatJump],next</SetVariable>
-             <SetVariable name="right_connection_control">[BeatJump],prev</SetVariable>
-           </Template>
-
-          <Template src="skin:beatjump_button.xml">
-             <SetVariable name="control_length">8</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_beatjump_forward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_beatjump_forward_48px.svg</SetVariable>
-             <SetVariable name="direction">forward</SetVariable>
-           </Template>
-         </Children>
-       </WidgetGroup>
-
-       <WidgetGroup>
-         <Layout>horizontal</Layout>
-         <Children>
-           <Template src="skin:beatjump_button.xml">
-             <SetVariable name="control_length">16</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_beatjump_backward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_beatjump_backward_48px.svg</SetVariable>
-             <SetVariable name="direction">backward</SetVariable>
-           </Template>
-
-           <Template src="skin:left_right_1state_button.xml">
-             <SetVariable name="ObjectName">BeatJumpValue</SetVariable>
-             <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-             <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-             <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-             <SetVariable name="state_0_text">16</SetVariable>
-             <SetVariable name="state_0_pressed"></SetVariable>
-             <SetVariable name="state_0_unpressed"></SetVariable>
-             <SetVariable name="left_connection_control">[BeatJump],next</SetVariable>
-             <SetVariable name="right_connection_control">[BeatJump],prev</SetVariable>
-           </Template>
-
-           <Template src="skin:beatjump_button.xml">
-             <SetVariable name="control_length">16</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_beatjump_forward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_beatjump_forward_48px.svg</SetVariable>
-             <SetVariable name="direction">forward</SetVariable>
-           </Template>
-         </Children>
-       </WidgetGroup>
-
-       <WidgetGroup>
-         <Layout>horizontal</Layout>
-         <Children>
-           <Template src="skin:beatjump_button.xml">
-             <SetVariable name="control_length">32</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_beatjump_backward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_beatjump_backward_48px.svg</SetVariable>
-             <SetVariable name="direction">backward</SetVariable>
-           </Template>
-
-          <Template src="skin:left_right_1state_button.xml">
-             <SetVariable name="ObjectName">BeatJumpValue</SetVariable>
-             <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-             <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-             <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-             <SetVariable name="state_0_text">32</SetVariable>
-             <SetVariable name="state_0_pressed"></SetVariable>
-             <SetVariable name="state_0_unpressed"></SetVariable>
-             <SetVariable name="left_connection_control">[BeatJump],next</SetVariable>
-             <SetVariable name="right_connection_control">[BeatJump],prev</SetVariable>
-           </Template>
-
-          <Template src="skin:beatjump_button.xml">
-             <SetVariable name="control_length">32</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_beatjump_forward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_beatjump_forward_48px.svg</SetVariable>
-             <SetVariable name="direction">forward</SetVariable>
-           </Template>
-         </Children>
-       </WidgetGroup>
-
-       <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <Children>
-          <Template src="skin:beatjump_button.xml">
-            <SetVariable name="control_length">64</SetVariable>
-            <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_beatjump_backward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_beatjump_backward_48px.svg</SetVariable>
-            <SetVariable name="direction">backward</SetVariable>
-          </Template>
-
-          <Template src="skin:left_right_1state_button.xml">
-            <SetVariable name="ObjectName">BeatJumpValue</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-            <SetVariable name="state_0_text">64</SetVariable>
-            <SetVariable name="state_0_pressed"></SetVariable>
-            <SetVariable name="state_0_unpressed"></SetVariable>
-            <SetVariable name="left_connection_control">[BeatJump],next</SetVariable>
-            <SetVariable name="right_connection_control">[BeatJump],prev</SetVariable>
-          </Template>
-
-          <Template src="skin:beatjump_button.xml">
-            <SetVariable name="control_length">64</SetVariable>
-            <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_beatjump_forward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_beatjump_forward_48px.svg</SetVariable>
-            <SetVariable name="direction">forward</SetVariable>
-          </Template>
-        </Children>
-       </WidgetGroup>
-
-       <WidgetGroup>
-         <Layout>horizontal</Layout>
-         <Children>
-           <Template src="skin:beatjump_button.xml">
-             <SetVariable name="control_length">0.03125</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_beatjump_backward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_beatjump_backward_48px.svg</SetVariable>
-             <SetVariable name="direction">backward</SetVariable>
-           </Template>
-
-         <Template src="skin:left_right_1state_button.xml">
-             <SetVariable name="ObjectName">BeatJumpValue</SetVariable>
-             <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-             <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-             <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-             <SetVariable name="state_0_text">1/32</SetVariable>
-             <SetVariable name="state_0_pressed"></SetVariable>
-             <SetVariable name="state_0_unpressed"></SetVariable>
-             <SetVariable name="left_connection_control">[BeatJump],next</SetVariable>
-             <SetVariable name="right_connection_control">[BeatJump],prev</SetVariable>
-           </Template>
-
-         <Template src="skin:beatjump_button.xml">
-             <SetVariable name="control_length">0.03125</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_beatjump_forward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_beatjump_forward_48px.svg</SetVariable>
-             <SetVariable name="direction">forward</SetVariable>
-           </Template>
-         </Children>
-       </WidgetGroup>
-
-       <WidgetGroup>
-         <Layout>horizontal</Layout>
-         <Children>
-           <Template src="skin:beatjump_button.xml">
-             <SetVariable name="control_length">0.0625</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_beatjump_backward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_beatjump_backward_48px.svg</SetVariable>
-             <SetVariable name="direction">backward</SetVariable>
-           </Template>
-
-         <Template src="skin:left_right_1state_button.xml">
-             <SetVariable name="ObjectName">BeatJumpValue</SetVariable>
-             <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-             <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-             <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-             <SetVariable name="state_0_text">1/16</SetVariable>
-             <SetVariable name="state_0_pressed"></SetVariable>
-             <SetVariable name="state_0_unpressed"></SetVariable>
-             <SetVariable name="left_connection_control">[BeatJump],next</SetVariable>
-             <SetVariable name="right_connection_control">[BeatJump],prev</SetVariable>
-           </Template>
-
-         <Template src="skin:beatjump_button.xml">
-             <SetVariable name="control_length">0.0625</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_beatjump_forward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_beatjump_forward_48px.svg</SetVariable>
-             <SetVariable name="direction">forward</SetVariable>
-           </Template>
-         </Children>
-       </WidgetGroup>
-
-       <WidgetGroup>
-         <Layout>horizontal</Layout>
-         <Children>
-           <Template src="skin:beatjump_button.xml">
-             <SetVariable name="control_length">0.125</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_beatjump_backward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_beatjump_backward_48px.svg</SetVariable>
-             <SetVariable name="direction">backward</SetVariable>
-           </Template>
-
-           <Template src="skin:left_right_1state_button.xml">
-             <SetVariable name="ObjectName">BeatJumpValue</SetVariable>
-             <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-             <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-             <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-             <SetVariable name="state_0_text">1/8</SetVariable>
-             <SetVariable name="state_0_pressed"></SetVariable>
-             <SetVariable name="state_0_unpressed"></SetVariable>
-             <SetVariable name="left_connection_control">[BeatJump],next</SetVariable>
-             <SetVariable name="right_connection_control">[BeatJump],prev</SetVariable>
-           </Template>
-
-           <Template src="skin:beatjump_button.xml">
-             <SetVariable name="control_length">0.125</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_beatjump_forward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_beatjump_forward_48px.svg</SetVariable>
-             <SetVariable name="direction">forward</SetVariable>
-           </Template>
-         </Children>
-       </WidgetGroup>
-
-       <WidgetGroup>
-         <Layout>horizontal</Layout>
-         <Children>
-           <Template src="skin:beatjump_button.xml">
-             <SetVariable name="control_length">0.25</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_beatjump_backward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_beatjump_backward_48px.svg</SetVariable>
-             <SetVariable name="direction">backward</SetVariable>
-           </Template>
-
-           <Template src="skin:left_right_1state_button.xml">
-             <SetVariable name="ObjectName">BeatJumpValue</SetVariable>
-             <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-             <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-             <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-             <SetVariable name="state_0_text">1/4</SetVariable>
-             <SetVariable name="state_0_pressed"></SetVariable>
-             <SetVariable name="state_0_unpressed"></SetVariable>
-             <SetVariable name="left_connection_control">[BeatJump],next</SetVariable>
-             <SetVariable name="right_connection_control">[BeatJump],prev</SetVariable>
-           </Template>
-
-           <Template src="skin:beatjump_button.xml">
-             <SetVariable name="control_length">0.25</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_beatjump_forward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_beatjump_forward_48px.svg</SetVariable>
-             <SetVariable name="direction">forward</SetVariable>
-           </Template>
-         </Children>
-       </WidgetGroup>
-
-       <WidgetGroup>
-         <Layout>horizontal</Layout>
-         <Children>
-           <Template src="skin:beatjump_button.xml">
-             <SetVariable name="control_length">0.5</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_beatjump_backward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_beatjump_backward_48px.svg</SetVariable>
-             <SetVariable name="direction">backward</SetVariable>
-           </Template>
-
-           <Template src="skin:left_right_1state_button.xml">
-             <SetVariable name="ObjectName">BeatJumpValue</SetVariable>
-             <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-             <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-             <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-             <SetVariable name="state_0_text">1/2</SetVariable>
-             <SetVariable name="state_0_pressed"></SetVariable>
-             <SetVariable name="state_0_unpressed"></SetVariable>
-             <SetVariable name="left_connection_control">[BeatJump],next</SetVariable>
-             <SetVariable name="right_connection_control">[BeatJump],prev</SetVariable>
-           </Template>
-
-           <Template src="skin:beatjump_button.xml">
-             <SetVariable name="control_length">0.5</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_beatjump_forward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_beatjump_forward_48px.svg</SetVariable>
-             <SetVariable name="direction">forward</SetVariable>
-           </Template>
-         </Children>
-       </WidgetGroup>
-
-       <WidgetGroup>
-         <Layout>horizontal</Layout>
-         <Children>
-           <Template src="skin:beatjump_button.xml">
-             <SetVariable name="control_length">1</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_beatjump_backward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_beatjump_backward_48px.svg</SetVariable>
-             <SetVariable name="direction">backward</SetVariable>
-           </Template>
-
-           <Template src="skin:left_right_1state_button.xml">
-             <SetVariable name="ObjectName">BeatJumpValue</SetVariable>
-             <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-             <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-             <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-             <SetVariable name="state_0_text">1</SetVariable>
-             <SetVariable name="state_0_pressed"></SetVariable>
-             <SetVariable name="state_0_unpressed"></SetVariable>
-             <SetVariable name="left_connection_control">[BeatJump],next</SetVariable>
-             <SetVariable name="right_connection_control">[BeatJump],prev</SetVariable>
-           </Template>
-
-           <Template src="skin:beatjump_button.xml">
-             <SetVariable name="control_length">1</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_beatjump_forward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_beatjump_forward_48px.svg</SetVariable>
-             <SetVariable name="direction">forward</SetVariable>
-           </Template>
-         </Children>
-       </WidgetGroup>
-
-       <WidgetGroup>
-         <Layout>horizontal</Layout>
-         <Children>
-           <Template src="skin:beatjump_button.xml">
-             <SetVariable name="control_length">2</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_beatjump_backward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_beatjump_backward_48px.svg</SetVariable>
-             <SetVariable name="direction">backward</SetVariable>
-           </Template>
-
-           <Template src="skin:left_right_1state_button.xml">
-             <SetVariable name="ObjectName">BeatJumpValue</SetVariable>
-             <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-             <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-             <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-             <SetVariable name="state_0_text">2</SetVariable>
-             <SetVariable name="state_0_pressed"></SetVariable>
-             <SetVariable name="state_0_unpressed"></SetVariable>
-             <SetVariable name="left_connection_control">[BeatJump],next</SetVariable>
-             <SetVariable name="right_connection_control">[BeatJump],prev</SetVariable>
-           </Template>
-
-           <Template src="skin:beatjump_button.xml">
-             <SetVariable name="control_length">2</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_beatjump_forward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_beatjump_forward_48px.svg</SetVariable>
-             <SetVariable name="direction">forward</SetVariable>
-           </Template>
-         </Children>
-       </WidgetGroup>
     </Children>
-  </WidgetStack>
-
+  </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/beatjump_button.xml b/res/skins/Deere/beatjump_button.xml
deleted file mode 100644
index e0b78ae71d03..000000000000
--- a/res/skins/Deere/beatjump_button.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    An individual beatjump button.
-    Beatjump jumps the player forward or backward by X beats.
-  Variables:
-    group: The group for the controls.
-    control_length: The length as used in control names.
-    state_X_pressed: The (optional) image file used for this state.
-    state_X_unpressed: The (optional) image file used for this state.
-    text_length: The length in text form.
-    direction: ``forward`` or ``backward`` jump
-    SmallSquareButtonSize: The button size
-
--->
-<Template>
-  <Template src="skin:left_1state_button.xml">
-    <SetVariable name="TooltipId">beatjump</SetVariable>
-    <SetVariable name="ObjectName">BeatJumpButton</SetVariable>
-    <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-    <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-    <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-    <SetVariable name="state_0_pressed"><Variable name="state_0_pressed"/></SetVariable>
-    <SetVariable name="state_0_unpressed"><Variable name="state_0_unpressed"/></SetVariable>
-    <SetVariable name="state_0_text"><Variable name="text_length"/></SetVariable>
-    <SetVariable name="state_1_pressed"><Variable name="state_1_pressed"/></SetVariable>
-    <SetVariable name="state_1_unpressed"><Variable name="state_1_unpressed"/></SetVariable>
-    <SetVariable name="state_1_text"><Variable name="text_length"/></SetVariable>
-    <SetVariable name="left_connection_control"><Variable name="group"/>,beatjump_<Variable name="control_length"/>_<Variable name="direction"/></SetVariable>
-  </Template>
-</Template>
diff --git a/res/skins/Deere/beatloop.xml b/res/skins/Deere/beatloop.xml
deleted file mode 100644
index b5c82ff1e4c6..000000000000
--- a/res/skins/Deere/beatloop.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    A grid of beatloop controls with a loop double and halve on the left and right.
-  Variables:
-    group: The group for the controls.
--->
-<Template>
-  <WidgetGroup>
-    <ObjectName>BeatLoopContainer</ObjectName>
-    <Layout>horizontal</Layout>
-
-    <MinimumSize>-1,-1</MinimumSize>
-    <SizePolicy>min,max</SizePolicy>
-
-    <Children>
-      <!-- Grow to be as tall as the outer WidgetGroup -->
-      <Template src="skin:left_1state_button.xml">
-        <SetVariable name="TooltipId">loop_halve</SetVariable>
-        <SetVariable name="ObjectName">LoopHalveButton</SetVariable>
-        <SetVariable name="MinimumSize"><Variable name="VerticalStretchButtonMinimumSize"/></SetVariable>
-        <SetVariable name="MaximumSize"><Variable name="VerticalStretchButtonMaximumSize"/></SetVariable>
-        <SetVariable name="SizePolicy"><Variable name="VerticalStretchButtonSizePolicy"/></SetVariable>
-        <SetVariable name="state_0_text"></SetVariable>
-        <SetVariable name="state_0_pressed">icon/ic_chevron_left_48px.svg</SetVariable>
-        <SetVariable name="state_0_unpressed">icon/ic_chevron_left_48px.svg</SetVariable>
-        <SetVariable name="left_connection_control"><Variable name="group"/>,loop_halve</SetVariable>
-      </Template>
-
-      <WidgetGroup>
-        <Layout>vertical</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <WidgetGroup>
-            <ObjectName>BeatLoopUpperRow</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,min</SizePolicy>
-            <Children>
-              <Template src="skin:beatloop_button.xml">
-                <SetVariable name="control_length">0.125</SetVariable>
-                <SetVariable name="text_length">1/8</SetVariable>
-              </Template>
-
-              <Template src="skin:beatloop_button.xml">
-                <SetVariable name="control_length">0.25</SetVariable>
-                <SetVariable name="text_length">1/4</SetVariable>
-              </Template>
-
-              <Template src="skin:beatloop_button.xml">
-                <SetVariable name="control_length">0.5</SetVariable>
-                <SetVariable name="text_length">1/2</SetVariable>
-              </Template>
-
-              <Template src="skin:beatloop_button.xml">
-                <SetVariable name="control_length">1</SetVariable>
-                <SetVariable name="text_length">1</SetVariable>
-              </Template>
-            </Children>
-          </WidgetGroup>
-
-          <WidgetGroup>
-            <ObjectName>BeatLoopLowerRow</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,min</SizePolicy>
-            <Children>
-              <Template src="skin:beatloop_button.xml">
-                <SetVariable name="control_length">2</SetVariable>
-                <SetVariable name="text_length">2</SetVariable>
-              </Template>
-
-              <Template src="skin:beatloop_button.xml">
-                <SetVariable name="control_length">4</SetVariable>
-                <SetVariable name="text_length">4</SetVariable>
-              </Template>
-
-              <Template src="skin:beatloop_button.xml">
-                <SetVariable name="control_length">8</SetVariable>
-                <SetVariable name="text_length">8</SetVariable>
-              </Template>
-
-              <Template src="skin:beatloop_button.xml">
-                <SetVariable name="control_length">16</SetVariable>
-                <SetVariable name="text_length">16</SetVariable>
-              </Template>
-            </Children>
-          </WidgetGroup>
-        </Children>
-      </WidgetGroup>
-
-      <!-- Grow to be as tall as the outer WidgetGroup -->
-      <Template src="skin:left_1state_button.xml">
-        <SetVariable name="TooltipId">loop_double</SetVariable>
-        <SetVariable name="ObjectName">LoopDoubleButton</SetVariable>
-        <SetVariable name="MinimumSize"><Variable name="VerticalStretchButtonMinimumSize"/></SetVariable>
-        <SetVariable name="MaximumSize"><Variable name="VerticalStretchButtonMaximumSize"/></SetVariable>
-        <SetVariable name="SizePolicy"><Variable name="VerticalStretchButtonSizePolicy"/></SetVariable>
-        <SetVariable name="state_0_text"></SetVariable>
-        <SetVariable name="state_0_pressed">icon/ic_chevron_right_48px.svg</SetVariable>
-        <SetVariable name="state_0_unpressed">icon/ic_chevron_right_48px.svg</SetVariable>
-        <SetVariable name="left_connection_control"><Variable name="group"/>,loop_double</SetVariable>
-      </Template>
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/Deere/beatloop_button.xml b/res/skins/Deere/beatloop_button.xml
index 0312f826c372..8bd703f28d78 100644
--- a/res/skins/Deere/beatloop_button.xml
+++ b/res/skins/Deere/beatloop_button.xml
@@ -14,9 +14,9 @@
   <Template src="skin:left_right_display_2state_button.xml">
     <SetVariable name="TooltipId">beatloop</SetVariable>
     <SetVariable name="ObjectName">BeatLoopButton</SetVariable>
-    <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-    <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-    <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+    <SetVariable name="MinimumSize">40,46</SetVariable>
+    <SetVariable name="MaximumSize">40,46</SetVariable>
+    <SetVariable name="SizePolicy">f,f</SetVariable>
     <SetVariable name="state_0_pressed"><Variable name="state_0_pressed"/></SetVariable>
     <SetVariable name="state_0_unpressed"><Variable name="state_0_unpressed"/></SetVariable>
     <SetVariable name="state_0_text"><Variable name="text_length"/></SetVariable>
diff --git a/res/skins/Deere/crossfader_orientation_button.xml b/res/skins/Deere/crossfader_orientation_button.xml
new file mode 100644
index 000000000000..228dae192e65
--- /dev/null
+++ b/res/skins/Deere/crossfader_orientation_button.xml
@@ -0,0 +1,19 @@
+<Template>
+  <Template src="skin:left_3state_button.xml">
+    <SetVariable name="TooltipId">orientation</SetVariable>
+    <SetVariable name="ObjectName">OrientationButton</SetVariable>
+    <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+    <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+    <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+    <SetVariable name="state_0_text"></SetVariable>
+    <SetVariable name="state_0_pressed">icon/ic_orientation_left_48px.svg</SetVariable>
+    <SetVariable name="state_0_unpressed">icon/ic_orientation_left_48px.svg</SetVariable>
+    <SetVariable name="state_1_text"></SetVariable>
+    <SetVariable name="state_1_pressed">icon/ic_orientation_48px.svg</SetVariable>
+    <SetVariable name="state_1_unpressed">icon/ic_orientation_48px.svg</SetVariable>
+    <SetVariable name="state_2_text"></SetVariable>
+    <SetVariable name="state_2_pressed">icon/ic_orientation_right_48px.svg</SetVariable>
+    <SetVariable name="state_2_unpressed">icon/ic_orientation_right_48px.svg</SetVariable>
+    <SetVariable name="left_connection_control"><Variable name="group"/>,orientation</SetVariable>
+  </Template>
+</Template>
diff --git a/res/skins/Deere/deck_right.xml b/res/skins/Deere/deck.xml
similarity index 78%
rename from res/skins/Deere/deck_right.xml
rename to res/skins/Deere/deck.xml
index caee46686b20..e783ca31ddec 100644
--- a/res/skins/Deere/deck_right.xml
+++ b/res/skins/Deere/deck.xml
@@ -11,30 +11,25 @@
   <WidgetGroup>
     <ObjectName>Deck<Variable name="i"/></ObjectName>
     <Layout>horizontal</Layout>
-    <SizePolicy>me,min</SizePolicy>
+    <SizePolicy>me,me</SizePolicy>
+    <MinimumSize>-1,150</MinimumSize>
     <Children>
-      <WidgetGroup>
-        <ObjectName>DeckInnerColumn</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <Template src="skin:deck_inner_column.xml"/>
-        </Children>
-      </WidgetGroup>
       <WidgetGroup>
         <ObjectName>DeckRows</ObjectName>
         <Layout>vertical</Layout>
-        <SizePolicy>me,min</SizePolicy>
+        <SizePolicy>me,me</SizePolicy>
         <Children>
           <Template src="skin:deck_text_row.xml"/>
           <!--Hides if the stacked waveforms option is activated in the skin settings -->
           <WidgetGroup>
             <Layout>vertical</Layout>
             <Children>
-              <Template src="skin:deck_visual_row.xml"/>
+              <SingletonContainer>
+                <ObjectName>DeckVisualRow<Variable name="i" /></ObjectName>
+              </SingletonContainer>
             </Children>
             <Connection>
-              <ConfigKey persist="true">[Deere],show_stacked_waveforms</ConfigKey>
+              <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
               <BindProperty>visible</BindProperty>
               <Transform>
                 <Not/>
@@ -45,6 +40,15 @@
           <Template src="skin:deck_controls_row.xml"/>
         </Children>
       </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>DeckRateSlider</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:deck_inner_column.xml"/>
+        </Children>
+      </WidgetGroup>
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/deck_controls_row.xml b/res/skins/Deere/deck_controls_row.xml
index 0cf8146e17e8..3ed23cff03fa 100644
--- a/res/skins/Deere/deck_controls_row.xml
+++ b/res/skins/Deere/deck_controls_row.xml
@@ -9,12 +9,165 @@
   <WidgetGroup>
     <ObjectName>ControlsRow</ObjectName>
     <Layout>horizontal</Layout>
-    <SizePolicy>me,max</SizePolicy>
+    <SizePolicy>me,me</SizePolicy>
     <Children>
-      <Template src="skin:transport.xml"/>
-      <Template src="skin:beatloop.xml"/>
-      <Template src="skin:loop.xml"/>
-      <Template src="skin:hotcue.xml"/>
+      <WidgetGroup>
+        <ObjectName>FullControlsRow</ObjectName>
+        <Layout>horizontal</Layout>
+        <Size>-1,-1me</Size>
+        <Children>
+          <Template src="skin:hotcue.xml"/>
+          <!-- Expanding spacers in between control contexts -->
+          <WidgetGroup><Size>-1me,1min</Size><Children/></WidgetGroup>
+          <Template src="skin:loop.xml"/>
+          <WidgetGroup><Size>-1me,1min</Size><Children/></WidgetGroup>
+          <Template src="skin:beatjump.xml"/>
+        </Children>
+        <Connection>
+          <ConfigKey>[Deere],show_minimal_deck_controls</ConfigKey>
+          <BindProperty>visible</BindProperty>
+          <Transform>
+            <Not/>
+          </Transform>
+        </Connection>
+      </WidgetGroup>
+
+
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Size>-1,-1me</Size>
+        <ObjectName>MinimalControlsContainer</ObjectName>
+        <Children>
+
+          <Template src="skin:left_2state_button.xml">
+            <SetVariable name="TooltipId">quantize</SetVariable>
+            <SetVariable name="ObjectName">QuantizeButton</SetVariable>
+            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+            <SetVariable name="state_0_text"></SetVariable>
+            <SetVariable name="state_0_pressed">icon/ic_quantize_48px.svg</SetVariable>
+            <SetVariable name="state_0_unpressed">icon/ic_quantize_48px.svg</SetVariable>
+            <SetVariable name="state_1_text"></SetVariable>
+            <SetVariable name="state_1_pressed">icon/ic_quantize_48px.svg</SetVariable>
+            <SetVariable name="state_1_unpressed">icon/ic_quantize_48px.svg</SetVariable>
+            <SetVariable name="left_connection_control"><Variable name="group"/>,quantize</SetVariable>
+          </Template>
+
+          <Template src="skin:left_2state_button.xml">
+            <SetVariable name="TooltipId">keylock</SetVariable>
+            <SetVariable name="ObjectName">KeylockButton</SetVariable>
+            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+            <SetVariable name="state_0_text"></SetVariable>
+            <SetVariable name="state_0_pressed">icon/ic_key_48px.svg</SetVariable>
+            <SetVariable name="state_0_unpressed">icon/ic_key_48px.svg</SetVariable>
+            <SetVariable name="state_1_text"></SetVariable>
+            <SetVariable name="state_1_pressed">icon/ic_key_48px.svg</SetVariable>
+            <SetVariable name="state_1_unpressed">icon/ic_key_48px.svg</SetVariable>
+            <SetVariable name="left_connection_control"><Variable name="group"/>,keylock</SetVariable>
+          </Template>
+
+          <Template src="skin:left_2state_button.xml">
+            <SetVariable name="TooltipId">slip_mode</SetVariable>
+            <SetVariable name="ObjectName">SlipModeButton</SetVariable>
+            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+            <SetVariable name="state_0_text"></SetVariable>
+            <SetVariable name="state_0_pressed">icon/ic_slip_48px.svg</SetVariable>
+            <SetVariable name="state_0_unpressed">icon/ic_slip_48px.svg</SetVariable>
+            <SetVariable name="state_1_text"></SetVariable>
+            <SetVariable name="state_1_pressed">icon/ic_slip_48px.svg</SetVariable>
+            <SetVariable name="state_1_unpressed">icon/ic_slip_48px.svg</SetVariable>
+            <SetVariable name="left_connection_control"><Variable name="group"/>,slip_enabled</SetVariable>
+          </Template>
+
+          <Template src="skin:spacer_h.xml"/>
+
+          <BeatSpinBox>
+            <TooltipId>beatloop_size</TooltipId>
+            <Value><Variable name="group"/>,beatloop_size</Value>
+          </BeatSpinBox>
+
+          <Template src="skin:left_right_display_2state_button.xml">
+            <SetVariable name="TooltipId">reloop_toggle</SetVariable>
+            <SetVariable name="ObjectName">Reloop</SetVariable>
+            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+            <SetVariable name="state_0_text"></SetVariable>
+            <SetVariable name="state_0_pressed">icon/ic_loop_48px.svg</SetVariable>
+            <SetVariable name="state_0_unpressed">icon/ic_loop_48px.svg</SetVariable>
+            <SetVariable name="state_1_text"></SetVariable>
+            <SetVariable name="state_1_pressed">icon/ic_loop_48px.svg</SetVariable>
+            <SetVariable name="state_1_unpressed">icon/ic_loop_48px.svg</SetVariable>
+            <SetVariable name="left_connection_control"><Variable name="group"/>,reloop_toggle</SetVariable>
+            <SetVariable name="right_connection_control"><Variable name="group"/>,reloop_andstop</SetVariable>
+            <SetVariable name="display_connection_control"><Variable name="group"/>,loop_enabled</SetVariable>
+          </Template>
+
+          <Template src="skin:spacer_h.xml"/>
+
+          <Template src="skin:left_2state_button.xml">
+            <SetVariable name="TooltipId">sync_enabled</SetVariable>
+            <SetVariable name="ObjectName">DeckSync</SetVariable>
+            <SetVariable name="MinimumSize"><Variable name="MinimalControlsButtonMinimumSize"/></SetVariable>
+            <SetVariable name="MaximumSize"><Variable name="MinimalControlsButtonMaximumSize"/></SetVariable>
+            <SetVariable name="SizePolicy"><Variable name="MinimalControlsButtonSizePolicy"/></SetVariable>
+            <SetVariable name="state_0_text">Sync</SetVariable>
+            <SetVariable name="state_0_pressed"></SetVariable>
+            <SetVariable name="state_0_unpressed"></SetVariable>
+            <SetVariable name="state_1_text">Sync</SetVariable>
+            <SetVariable name="state_1_pressed"></SetVariable>
+            <SetVariable name="state_1_unpressed"></SetVariable>
+            <SetVariable name="left_connection_control"><Variable name="group"/>,sync_enabled</SetVariable>
+          </Template>
+
+          <Template src="skin:left_right_display_2state_button.xml">
+            <SetVariable name="TooltipId">cue_default_cue_gotoandstop</SetVariable>
+            <SetVariable name="ObjectName">DeckCue</SetVariable>
+            <SetVariable name="MinimumSize"><Variable name="MinimalControlsButtonMinimumSize"/></SetVariable>
+            <SetVariable name="MaximumSize"><Variable name="MinimalControlsButtonMaximumSize"/></SetVariable>
+            <SetVariable name="SizePolicy"><Variable name="MinimalControlsButtonSizePolicy"/></SetVariable>
+            <SetVariable name="LeftClickIsPushButton">true</SetVariable>
+            <SetVariable name="RightClickIsPushButton">true</SetVariable>
+            <SetVariable name="state_0_text">CUE</SetVariable>
+            <SetVariable name="state_0_pressed"></SetVariable>
+            <SetVariable name="state_0_unpressed"></SetVariable>
+            <SetVariable name="state_1_text">CUE</SetVariable>
+            <SetVariable name="state_1_pressed"></SetVariable>
+            <SetVariable name="state_1_unpressed"></SetVariable>
+            <SetVariable name="left_connection_control"><Variable name="group"/>,cue_default</SetVariable>
+            <SetVariable name="right_connection_control"><Variable name="group"/>,cue_gotoandstop</SetVariable>
+            <SetVariable name="display_connection_control"><Variable name="group"/>,cue_indicator</SetVariable>
+          </Template>
+
+          <Template src="skin:left_right_display_2state_button.xml">
+            <SetVariable name="TooltipId">play_cue_set</SetVariable>
+            <SetVariable name="ObjectName">PlayToggle</SetVariable>
+            <SetVariable name="MinimumSize"><Variable name="MinimalControlsButtonMinimumSize"/></SetVariable>
+            <SetVariable name="MaximumSize"><Variable name="MinimalControlsButtonMaximumSize"/></SetVariable>
+            <SetVariable name="SizePolicy"><Variable name="MinimalControlsButtonSizePolicy"/></SetVariable>
+            <SetVariable name="LeftClickIsPushButton">false</SetVariable>
+            <SetVariable name="RightClickIsPushButton">false</SetVariable>
+            <SetVariable name="state_0_text"></SetVariable>
+            <SetVariable name="state_0_pressed">icon/ic_play_48px.svg</SetVariable>
+            <SetVariable name="state_0_unpressed">icon/ic_play_48px.svg</SetVariable>
+            <SetVariable name="state_1_text"></SetVariable>
+            <SetVariable name="state_1_pressed">icon/ic_play_48px.svg</SetVariable>
+            <SetVariable name="state_1_unpressed">icon/ic_play_48px.svg</SetVariable>
+            <SetVariable name="left_connection_control"><Variable name="group"/>,play</SetVariable>
+            <SetVariable name="right_connection_control"><Variable name="group"/>,cue_set</SetVariable>
+            <SetVariable name="display_connection_control"><Variable name="group"/>,play_indicator</SetVariable>
+          </Template>
+        </Children>
+        <Connection>
+          <ConfigKey>[Deere],show_minimal_deck_controls</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/deck_inner_column.xml b/res/skins/Deere/deck_inner_column.xml
index cd15ced09517..fe342637d746 100644
--- a/res/skins/Deere/deck_inner_column.xml
+++ b/res/skins/Deere/deck_inner_column.xml
@@ -1,133 +1,168 @@
 <!DOCTYPE template>
 <!--
   Description:
-    Deck inner column.
+    Deck rate slider column.
   Variables:
     group: The deck group.
 -->
 <Template>
   <WidgetGroup>
-    <ObjectName>Deck<Variable name="i"/>InnerColumn</ObjectName>
+    <ObjectName>DeckRateSliderColumn</ObjectName>
     <Layout>vertical</Layout>
     <SizePolicy>max,min</SizePolicy>
     <Children>
-      <Template src="skin:left_2state_button.xml">
-        <SetVariable name="TooltipId">sync_enabled</SetVariable>
-        <SetVariable name="ObjectName">DeckSync</SetVariable>
-        <SetVariable name="MinimumSize"><Variable name="HorizontalStretchButtonMinimumSize"/></SetVariable>
-        <SetVariable name="MaximumSize"><Variable name="HorizontalStretchButtonMaximumSize"/></SetVariable>
-        <SetVariable name="SizePolicy"><Variable name="HorizontalStretchButtonSizePolicy"/></SetVariable>
-        <SetVariable name="state_0_text">Sync</SetVariable>
-        <SetVariable name="state_0_pressed"></SetVariable>
-        <SetVariable name="state_0_unpressed"></SetVariable>
-        <SetVariable name="state_1_text">Sync</SetVariable>
-        <SetVariable name="state_1_pressed"></SetVariable>
-        <SetVariable name="state_1_unpressed"></SetVariable>
-        <SetVariable name="left_connection_control"><Variable name="group"/>,sync_enabled</SetVariable>
-      </Template>
+      <WidgetGroup>
+        <ObjectName>TempoControlButtons</ObjectName>
+        <Layout>vertical</Layout>
+        <Children>
+          <Template src="skin:left_2state_button.xml">
+            <SetVariable name="TooltipId">sync_enabled</SetVariable>
+            <SetVariable name="ObjectName">DeckSync</SetVariable>
+            <SetVariable name="MinimumSize">-1,18</SetVariable>
+            <SetVariable name="MaximumSize">-1,18</SetVariable>
+            <SetVariable name="SizePolicy"><Variable name="HorizontalStretchButtonSizePolicy"/></SetVariable>
+            <SetVariable name="state_0_text">Sync</SetVariable>
+            <SetVariable name="state_0_pressed"></SetVariable>
+            <SetVariable name="state_0_unpressed"></SetVariable>
+            <SetVariable name="state_1_text">Sync</SetVariable>
+            <SetVariable name="state_1_pressed"></SetVariable>
+            <SetVariable name="state_1_unpressed"></SetVariable>
+            <SetVariable name="left_connection_control"><Variable name="group"/>,sync_enabled</SetVariable>
+          </Template>
 
-      <!-- Disabled because Master Sync is not fully supported yet, see lp:1403232
-      <Template src="skin:left_2state_button.xml">
-        <SetVariable name="TooltipId">sync_master</SetVariable>
-        <SetVariable name="ObjectName">DeckSyncMaster</SetVariable>
-        <SetVariable name="MinimumSize"><Variable name="HorizontalStretchButtonMinimumSize"/></SetVariable>
-        <SetVariable name="MaximumSize"><Variable name="HorizontalStretchButtonMaximumSize"/></SetVariable>
-        <SetVariable name="SizePolicy"><Variable name="HorizontalStretchButtonSizePolicy"/></SetVariable>
-        <SetVariable name="state_0_text">Master</SetVariable>
-        <SetVariable name="state_0_pressed"></SetVariable>
-        <SetVariable name="state_0_unpressed"></SetVariable>
-        <SetVariable name="state_1_text">Master</SetVariable>
-        <SetVariable name="state_1_pressed"></SetVariable>
-        <SetVariable name="state_1_unpressed"></SetVariable>
-        <SetVariable name="left_connection_control"><Variable name="group"/>,sync_master</SetVariable>
-      </Template>
-      -->
+          <WidgetGroup>
+            <ObjectName>RateTempButtons</ObjectName>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Template src="skin:left_right_1state_button.xml">
+                <SetVariable name="ObjectName">TempRateDown</SetVariable>
+                <SetVariable name="TooltipId">rate_temp_down_rate_temp_down_small</SetVariable>
+                <SetVariable name="MinimumSize">20,20</SetVariable>
+                <SetVariable name="MaximumSize">20,20</SetVariable>
+                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                <SetVariable name="state_0_text"></SetVariable>
+                <SetVariable name="state_0_pressed">icon/ic_remove_48px.svg</SetVariable>
+                <SetVariable name="state_0_unpressed">icon/ic_remove_48px.svg</SetVariable>
+                <SetVariable name="left_connection_control"><Variable name="group"/>,rate_temp_down</SetVariable>
+                <SetVariable name="right_connection_control"><Variable name="group"/>,rate_temp_down_small</SetVariable>
+              </Template>
 
-      <SliderComposed>
-        <TooltipId>rate</TooltipId>
-        <MinimumSize>40,50</MinimumSize>
-        <MaximumSize>40,-1</MaximumSize>
-        <SizePolicy>,me</SizePolicy>
-        <Slider scalemode="STRETCH">slider-vertical.svg</Slider>
-        <Handle scalemode="STRETCH_ASPECT">handle-vertical.svg</Handle>
+              <Template src="skin:left_right_1state_button.xml">
+                <SetVariable name="TooltipId">rate_temp_up_rate_temp_up_small</SetVariable>
+                <SetVariable name="ObjectName">TempRateUp</SetVariable>
+                <SetVariable name="MinimumSize">20,20</SetVariable>
+                <SetVariable name="MaximumSize">20,20</SetVariable>
+                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                <SetVariable name="state_0_text"></SetVariable>
+                <SetVariable name="state_0_pressed">icon/ic_add_48px.svg</SetVariable>
+                <SetVariable name="state_0_unpressed">icon/ic_add_48px.svg</SetVariable>
+                <SetVariable name="left_connection_control"><Variable name="group"/>,rate_temp_up</SetVariable>
+                <SetVariable name="right_connection_control"><Variable name="group"/>,rate_temp_up_small</SetVariable>
+              </Template>
+
+            </Children>
+          </WidgetGroup>
+
+        </Children>
         <Connection>
-          <ConfigKey><Variable name="group"/>,rate</ConfigKey>
+          <ConfigKey>[Deere],show_minimal_deck_controls</ConfigKey>
+          <BindProperty>visible</BindProperty>
+          <Transform>
+            <Not/>
+          </Transform>
         </Connection>
-      </SliderComposed>
+      </WidgetGroup>
 
       <WidgetGroup>
-        <ObjectName>RateTempButtons</ObjectName>
-        <Layout>horizontal</Layout>
+        <ObjectName>RateDisplay<Variable name="i"/></ObjectName>
+        <Layout>vertical</Layout>
         <Children>
-          <Template src="skin:left_right_1state_button.xml">
-            <SetVariable name="ObjectName">TempRateDown</SetVariable>
-            <SetVariable name="TooltipId">rate_temp_down_rate_temp_down_small</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-            <SetVariable name="state_0_text"></SetVariable>
-            <SetVariable name="state_0_pressed">icon/ic_remove_48px.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">icon/ic_remove_48px.svg</SetVariable>
-            <SetVariable name="left_connection_control"><Variable name="group"/>,rate_temp_down</SetVariable>
-            <SetVariable name="right_connection_control"><Variable name="group"/>,rate_temp_down_small</SetVariable>
-          </Template>
+          <NumberRate>
+            <TooltipId>rate_display</TooltipId>
+            <Channel>
+                <Variable name="i"/>
+            </Channel>
+            <NumberOfDigits>2</NumberOfDigits>
+          </NumberRate>
+        </Children>
+      </WidgetGroup>
 
-          <Template src="skin:left_right_1state_button.xml">
-            <SetVariable name="TooltipId">rate_temp_up_rate_temp_up_small</SetVariable>
-            <SetVariable name="ObjectName">TempRateUp</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-            <SetVariable name="state_0_text"></SetVariable>
-            <SetVariable name="state_0_pressed">icon/ic_add_48px.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">icon/ic_add_48px.svg</SetVariable>
-            <SetVariable name="left_connection_control"><Variable name="group"/>,rate_temp_up</SetVariable>
-            <SetVariable name="right_connection_control"><Variable name="group"/>,rate_temp_up_small</SetVariable>
-          </Template>
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Children>
+          <SliderComposed>
+            <TooltipId>rate</TooltipId>
+            <Size>40f,-1me</Size>
+            <MaximumSize>40,200</MaximumSize>
+            <Slider scalemode="STRETCH">slider-vertical.svg</Slider>
+            <Handle scalemode="STRETCH_ASPECT">handle-vertical.svg</Handle>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,rate</ConfigKey>
+            </Connection>
+          </SliderComposed>
         </Children>
       </WidgetGroup>
 
       <Template src="skin:spacer_vx.xml">
-        <SetVariable name="height">8</SetVariable>
+        <SetVariable name="height">2</SetVariable>
       </Template>
 
-     <Template src="skin:left_right_display_2state_button.xml">
-        <SetVariable name="TooltipId">cue_default_cue_gotoandstop</SetVariable>
-        <SetVariable name="ObjectName">DeckCue</SetVariable>
-        <SetVariable name="MinimumSize"><Variable name="HorizontalStretchButtonMinimumSize"/></SetVariable>
-        <SetVariable name="MaximumSize"><Variable name="HorizontalStretchButtonMaximumSize"/></SetVariable>
-        <SetVariable name="SizePolicy"><Variable name="HorizontalStretchButtonSizePolicy"/></SetVariable>
-        <SetVariable name="LeftClickIsPushButton">true</SetVariable>
-        <SetVariable name="RightClickIsPushButton">true</SetVariable>
-        <SetVariable name="state_0_text">CUE</SetVariable>
-        <SetVariable name="state_0_pressed"></SetVariable>
-        <SetVariable name="state_0_unpressed"></SetVariable>
-        <SetVariable name="state_1_text">CUE</SetVariable>
-        <SetVariable name="state_1_pressed"></SetVariable>
-        <SetVariable name="state_1_unpressed"></SetVariable>
-        <SetVariable name="left_connection_control"><Variable name="group"/>,cue_default</SetVariable>
-        <SetVariable name="right_connection_control"><Variable name="group"/>,cue_gotoandstop</SetVariable>
-        <SetVariable name="display_connection_control"><Variable name="group"/>,cue_indicator</SetVariable>
-      </Template>
+      <WidgetGroup>
+        <Layout>vertical</Layout>
+        <Children>
+
+          <Template src="skin:left_right_display_2state_button.xml">
+            <SetVariable name="TooltipId">cue_default_cue_gotoandstop</SetVariable>
+            <SetVariable name="ObjectName">DeckCue</SetVariable>
+            <SetVariable name="MinimumSize"><Variable name="HorizontalStretchButtonMinimumSize"/></SetVariable>
+            <SetVariable name="MaximumSize"><Variable name="HorizontalStretchButtonMaximumSize"/></SetVariable>
+            <SetVariable name="SizePolicy"><Variable name="HorizontalStretchButtonSizePolicy"/></SetVariable>
+            <SetVariable name="LeftClickIsPushButton">true</SetVariable>
+            <SetVariable name="RightClickIsPushButton">true</SetVariable>
+            <SetVariable name="state_0_text">CUE</SetVariable>
+            <SetVariable name="state_0_pressed"></SetVariable>
+            <SetVariable name="state_0_unpressed"></SetVariable>
+            <SetVariable name="state_1_text">CUE</SetVariable>
+            <SetVariable name="state_1_pressed"></SetVariable>
+            <SetVariable name="state_1_unpressed"></SetVariable>
+            <SetVariable name="left_connection_control"><Variable name="group"/>,cue_default</SetVariable>
+            <SetVariable name="right_connection_control"><Variable name="group"/>,cue_gotoandstop</SetVariable>
+            <SetVariable name="display_connection_control"><Variable name="group"/>,cue_indicator</SetVariable>
+          </Template>
+
+          <!-- Workaround for layout spacing -->
+          <Template src="skin:spacer_vx.xml">
+            <SetVariable name="height">2</SetVariable>
+          </Template>
+
+          <Template src="skin:left_right_display_2state_button.xml">
+            <SetVariable name="TooltipId">play_cue_set</SetVariable>
+            <SetVariable name="ObjectName">PlayToggle</SetVariable>
+            <SetVariable name="MinimumSize"><Variable name="HorizontalStretchButtonMinimumSize"/></SetVariable>
+            <SetVariable name="MaximumSize"><Variable name="HorizontalStretchButtonMaximumSize"/></SetVariable>
+            <SetVariable name="SizePolicy"><Variable name="HorizontalStretchButtonSizePolicy"/></SetVariable>
+            <SetVariable name="LeftClickIsPushButton">false</SetVariable>
+            <SetVariable name="RightClickIsPushButton">false</SetVariable>
+            <SetVariable name="state_0_text"></SetVariable>
+            <SetVariable name="state_0_pressed">icon/ic_play_48px.svg</SetVariable>
+            <SetVariable name="state_0_unpressed">icon/ic_play_48px.svg</SetVariable>
+            <SetVariable name="state_1_text"></SetVariable>
+            <SetVariable name="state_1_pressed">icon/ic_play_48px.svg</SetVariable>
+            <SetVariable name="state_1_unpressed">icon/ic_play_48px.svg</SetVariable>
+            <SetVariable name="left_connection_control"><Variable name="group"/>,play</SetVariable>
+            <SetVariable name="right_connection_control"><Variable name="group"/>,cue_set</SetVariable>
+            <SetVariable name="display_connection_control"><Variable name="group"/>,play_indicator</SetVariable>
+          </Template>
+        </Children>
+        <Connection>
+          <ConfigKey>[Deere],show_minimal_deck_controls</ConfigKey>
+          <BindProperty>visible</BindProperty>
+          <Transform>
+            <Not/>
+          </Transform>
+        </Connection>
+      </WidgetGroup>
 
-      <Template src="skin:left_right_display_2state_button.xml">
-        <SetVariable name="TooltipId">play_cue_set</SetVariable>
-        <SetVariable name="ObjectName">PlayToggle</SetVariable>
-        <SetVariable name="MinimumSize"><Variable name="HorizontalStretchButtonMinimumSize"/></SetVariable>
-        <SetVariable name="MaximumSize"><Variable name="HorizontalStretchButtonMaximumSize"/></SetVariable>
-        <SetVariable name="SizePolicy"><Variable name="HorizontalStretchButtonSizePolicy"/></SetVariable>
-        <SetVariable name="LeftClickIsPushButton">false</SetVariable>
-        <SetVariable name="RightClickIsPushButton">false</SetVariable>
-        <SetVariable name="state_0_text"></SetVariable>
-        <SetVariable name="state_0_pressed">icon/ic_play_48px.svg</SetVariable>
-        <SetVariable name="state_0_unpressed">icon/ic_play_48px.svg</SetVariable>
-        <SetVariable name="state_1_text"></SetVariable>
-        <SetVariable name="state_1_pressed">icon/ic_play_48px.svg</SetVariable>
-        <SetVariable name="state_1_unpressed">icon/ic_play_48px.svg</SetVariable>
-        <SetVariable name="left_connection_control"><Variable name="group"/>,play</SetVariable>
-        <SetVariable name="right_connection_control"><Variable name="group"/>,cue_set</SetVariable>
-        <SetVariable name="display_connection_control"><Variable name="group"/>,play_indicator</SetVariable>
-      </Template>
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/deck_left.xml b/res/skins/Deere/deck_left.xml
deleted file mode 100644
index 8512dde86838..000000000000
--- a/res/skins/Deere/deck_left.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    Deck widget.
-  Variables:
-    i: The deck number (1-indexed)
--->
-<Template>
-  <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
-  <SetVariable name="control_show_spinny">[Spinny<Variable name="i"/>],show_spinny</SetVariable>
-  <WidgetGroup>
-    <ObjectName>Deck<Variable name="i"/></ObjectName>
-    <Layout>horizontal</Layout>
-    <SizePolicy>me,min</SizePolicy>
-    <Children>
-      <WidgetGroup>
-        <ObjectName>DeckRows</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>me,min</SizePolicy>
-        <Children>
-          <Template src="skin:deck_text_row.xml"/>
-          <!--Hides if the stacked waveforms option is activated in the skin settings -->
-          <WidgetGroup>
-            <Layout>vertical</Layout>
-            <Children>
-              <Template src="skin:deck_visual_row.xml"/>
-            </Children>
-            <Connection>
-              <ConfigKey persist="true">[Deere],show_stacked_waveforms</ConfigKey>
-              <BindProperty>visible</BindProperty>
-              <Transform>
-                <Not/>
-              </Transform>
-            </Connection>
-          </WidgetGroup>
-          <Template src="skin:deck_overview_row.xml"/>
-          <Template src="skin:deck_controls_row.xml"/>
-        </Children>
-      </WidgetGroup>
-      <WidgetGroup>
-        <ObjectName>DeckInnerColumn</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <Template src="skin:deck_inner_column.xml"/>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/Deere/deck_mixer_controls_col1.xml b/res/skins/Deere/deck_mixer_controls_col1_left.xml
similarity index 67%
rename from res/skins/Deere/deck_mixer_controls_col1.xml
rename to res/skins/Deere/deck_mixer_controls_col1_left.xml
index 2c39db57055d..9b67b2c74433 100644
--- a/res/skins/Deere/deck_mixer_controls_col1.xml
+++ b/res/skins/Deere/deck_mixer_controls_col1_left.xml
@@ -8,67 +8,65 @@
   <WidgetGroup>
     <ObjectName>DeckMixer<Variable name="i"/>_Column1</ObjectName>
     <Layout>vertical</Layout>
-    <SizePolicy>min,min</SizePolicy>
+    <SizePolicy>max,min</SizePolicy>
     <Children>
+
+      <!--In 4 deck mode, show the gain knob above the EQs rather than above the level meters.-->
       <WidgetGroup>
-        <Layout>horizontal</Layout>
+        <Layout>vertical</Layout>
         <Children>
-          <Template src="skin:knob_with_button_horizontal.xml">
+          <Template src="skin:knob_with_button_left.xml">
             <SetVariable name="TooltipId">pregain</SetVariable>
             <SetVariable name="control">pregain</SetVariable>
             <SetVariable name="color">red</SetVariable>
+            <SetVariable name="label">Gain</SetVariable>
             <SetVariable name="button_TooltipId">mute</SetVariable>
             <SetVariable name="button_control">mute</SetVariable>
-            <SetVariable name="label">Gain</SetVariable>
           </Template>
         </Children>
+        <Connection>
+          <ConfigKey>[Master],show_4decks</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
       </WidgetGroup>
 
-      <Template src="skin:equalizer_rack_parameter.xml">
+      <Template src="skin:equalizer_rack_parameter_left.xml">
         <SetVariable name="parameter">4</SetVariable>
         <SetVariable name="color">yellow</SetVariable>
       </Template>
 
-      <Template src="skin:equalizer_rack_parameter.xml">
+      <Template src="skin:equalizer_rack_parameter_left.xml">
         <SetVariable name="TooltipId">EqualizerRack_effect_parameter</SetVariable>
         <SetVariable name="button_TooltipId">EqualizerRack_effect_button_parameter</SetVariable>
         <SetVariable name="parameter">3</SetVariable>
         <SetVariable name="color">yellow</SetVariable>
       </Template>
 
-      <Template src="skin:equalizer_rack_parameter.xml">
+      <Template src="skin:equalizer_rack_parameter_left.xml">
         <SetVariable name="TooltipId">EqualizerRack_effect_parameter</SetVariable>
         <SetVariable name="button_TooltipId">EqualizerRack_effect_button_parameter</SetVariable>
         <SetVariable name="parameter">2</SetVariable>
         <SetVariable name="color">yellow</SetVariable>
       </Template>
 
-      <Template src="skin:equalizer_rack_parameter.xml">
+      <Template src="skin:equalizer_rack_parameter_left.xml">
         <SetVariable name="TooltipId">EqualizerRack_effect_parameter</SetVariable>
         <SetVariable name="button_TooltipId">EqualizerRack_effect_button_parameter</SetVariable>
         <SetVariable name="parameter">1</SetVariable>
         <SetVariable name="color">yellow</SetVariable>
       </Template>
 
-      <Template src="skin:quick_effect_superknob.xml">
+      <Template src="skin:quick_effect_superknob_left.xml">
         <SetVariable name="TooltipId">QuickEffectRack_super1</SetVariable>
         <SetVariable name="button_TooltipId">QuickEffectRack_enabled</SetVariable>
         <SetVariable name="QuickEffect">1</SetVariable>
         <SetVariable name="color">blue</SetVariable>
       </Template>
 
-      <Template src="skin:knob_with_button_horizontal.xml">
-        <SetVariable name="TooltipId">pitch_adjust</SetVariable>
-        <SetVariable name="control">pitch_adjust</SetVariable>
-        <SetVariable name="color">blue</SetVariable>
-        <SetVariable name="button_TooltipId">keylock</SetVariable>
-        <SetVariable name="button_control">keylock</SetVariable>
-        <SetVariable name="label">Key</SetVariable>
-      </Template>
-
-      <!-- Needed to pin above controls to top, if ``None``  is
-           selected in Preferences>Equalizers>Quick-Effect -->
-      <Template src="skin:spacer_v.xml"></Template>
     </Children>
+    <Connection>
+      <ConfigKey>[Master],show_eqs</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/deck_mixer_controls_col1_right.xml b/res/skins/Deere/deck_mixer_controls_col1_right.xml
new file mode 100644
index 000000000000..902816042492
--- /dev/null
+++ b/res/skins/Deere/deck_mixer_controls_col1_right.xml
@@ -0,0 +1,72 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    The deck mixer controls.
+-->
+<Template>
+  <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
+  <WidgetGroup>
+    <ObjectName>DeckMixer<Variable name="i"/>_Column1</ObjectName>
+    <Layout>vertical</Layout>
+    <SizePolicy>max,min</SizePolicy>
+    <Children>
+
+      <!--In 4 deck mode, show the gain knob above the EQs rather than above the level meters.-->
+      <WidgetGroup>
+        <Layout>vertical</Layout>
+        <Children>
+          <Template src="skin:knob_with_button_right.xml">
+            <SetVariable name="TooltipId">pregain</SetVariable>
+            <SetVariable name="control">pregain</SetVariable>
+            <SetVariable name="color">red</SetVariable>
+            <SetVariable name="label">Gain</SetVariable>
+            <SetVariable name="button_TooltipId">mute</SetVariable>
+            <SetVariable name="button_control">mute</SetVariable>
+          </Template>
+        </Children>
+        <Connection>
+          <ConfigKey>[Master],show_4decks</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+      <Template src="skin:equalizer_rack_parameter_right.xml">
+        <SetVariable name="parameter">4</SetVariable>
+        <SetVariable name="color">yellow</SetVariable>
+      </Template>
+
+      <Template src="skin:equalizer_rack_parameter_right.xml">
+        <SetVariable name="TooltipId">EqualizerRack_effect_parameter</SetVariable>
+        <SetVariable name="button_TooltipId">EqualizerRack_effect_button_parameter</SetVariable>
+        <SetVariable name="parameter">3</SetVariable>
+        <SetVariable name="color">yellow</SetVariable>
+      </Template>
+
+      <Template src="skin:equalizer_rack_parameter_right.xml">
+        <SetVariable name="TooltipId">EqualizerRack_effect_parameter</SetVariable>
+        <SetVariable name="button_TooltipId">EqualizerRack_effect_button_parameter</SetVariable>
+        <SetVariable name="parameter">2</SetVariable>
+        <SetVariable name="color">yellow</SetVariable>
+      </Template>
+
+      <Template src="skin:equalizer_rack_parameter_right.xml">
+        <SetVariable name="TooltipId">EqualizerRack_effect_parameter</SetVariable>
+        <SetVariable name="button_TooltipId">EqualizerRack_effect_button_parameter</SetVariable>
+        <SetVariable name="parameter">1</SetVariable>
+        <SetVariable name="color">yellow</SetVariable>
+      </Template>
+
+      <Template src="skin:quick_effect_superknob_right.xml">
+        <SetVariable name="TooltipId">QuickEffectRack_super1</SetVariable>
+        <SetVariable name="button_TooltipId">QuickEffectRack_enabled</SetVariable>
+        <SetVariable name="QuickEffect">1</SetVariable>
+        <SetVariable name="color">blue</SetVariable>
+      </Template>
+
+    </Children>
+    <Connection>
+      <ConfigKey>[Master],show_eqs</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Deere/deck_mixer_controls_col2.xml b/res/skins/Deere/deck_mixer_controls_col2.xml
index b7c38a093b67..79e0d8ea51db 100644
--- a/res/skins/Deere/deck_mixer_controls_col2.xml
+++ b/res/skins/Deere/deck_mixer_controls_col2.xml
@@ -8,63 +8,138 @@
   <WidgetGroup>
     <ObjectName>DeckMixer<Variable name="i"/>_Column2</ObjectName>
     <Layout>vertical</Layout>
-    <SizePolicy>me,min</SizePolicy>
+    <SizePolicy>max,me</SizePolicy>
+    <Connection>
+      <ConfigKey>[Master],show_faders</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
     <Children>
+
+      <!-- PFL buttons need different spacing in 2 and 4 deck mixers. -->
       <WidgetGroup>
-        <Size>22min,-1me</Size>
-        <MaximumSize>-1,91</MaximumSize>
+        <ObjectName>DeckPFLButton2Decks</ObjectName>
         <Layout>horizontal</Layout>
+        <Size>40f,35f</Size>
         <Children>
+          <Template src="skin:left_2state_button.xml">
+            <SetVariable name="TooltipId">pfl</SetVariable>
+            <SetVariable name="ObjectName">DeckPFLButton</SetVariable>
+            <SetVariable name="MinimumSize">22,22</SetVariable>
+            <SetVariable name="MaximumSize">22,22</SetVariable>
+            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+            <SetVariable name="state_0_text"></SetVariable>
+            <SetVariable name="state_0_pressed">icon/ic_headphones_48px.svg</SetVariable>
+            <SetVariable name="state_0_unpressed">icon/ic_headphones_48px.svg</SetVariable>
+            <SetVariable name="state_1_text"></SetVariable>
+            <SetVariable name="state_1_pressed">icon/ic_headphones_48px.svg</SetVariable>
+            <SetVariable name="state_1_unpressed">icon/ic_headphones_48px.svg</SetVariable>
+            <SetVariable name="left_connection_control"><Variable name="group"/>,pfl</SetVariable>
+          </Template>
+        </Children>
+        <Connection>
+          <ConfigKey>[Master],show_4decks</ConfigKey>
+          <BindProperty>visible</BindProperty>
+          <Transform>
+            <Not/>
+          </Transform>
+        </Connection>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>DeckPFLButton4Decks</ObjectName>
+        <Size>40f,25f</Size>
+        <Layout>horizontal</Layout>
+        <Children>
+          <Template src="skin:left_2state_button.xml">
+            <SetVariable name="TooltipId">pfl</SetVariable>
+            <SetVariable name="ObjectName">DeckPFLButton</SetVariable>
+            <!-- make Pfl button bigger because it's important and space is occupied anyway -->
+            <SetVariable name="MinimumSize">22,22</SetVariable>
+            <SetVariable name="MaximumSize">22,22</SetVariable>
+            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+            <SetVariable name="state_0_text"></SetVariable>
+            <SetVariable name="state_0_pressed">icon/ic_headphones_48px.svg</SetVariable>
+            <SetVariable name="state_0_unpressed">icon/ic_headphones_48px.svg</SetVariable>
+            <SetVariable name="state_1_text"></SetVariable>
+            <SetVariable name="state_1_pressed">icon/ic_headphones_48px.svg</SetVariable>
+            <SetVariable name="state_1_unpressed">icon/ic_headphones_48px.svg</SetVariable>
+            <SetVariable name="left_connection_control"><Variable name="group"/>,pfl</SetVariable>
+          </Template>
+        </Children>
+        <Connection>
+          <ConfigKey>[Master],show_4decks</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>VolumeSlider</ObjectName>
+        <Layout>vertical</Layout>
+        <Children>
+
+          <WidgetGroup>
+            <ObjectName>Channel<Variable name="i"/>Volume</ObjectName>
+            <Layout>vertical</Layout>
+            <Children>
+              <SliderComposed>
+                <TooltipId>channel_volume</TooltipId>
+                <SizePolicy>min,me</SizePolicy>
+                <MinimumSize>40,50</MinimumSize>
+                <MaximumSize>40,130</MaximumSize>
+                <Slider scalemode="STRETCH">slider-vertical.svg</Slider>
+                <Handle scalemode="STRETCH_ASPECT">handle-vertical.svg</Handle>
+                <Horizontal>false</Horizontal>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,volume</ConfigKey>
+                  <EmitOnDownPress>false</EmitOnDownPress>
+                </Connection>
+              </SliderComposed>
+            </Children>
+            <Connection>
+              <ConfigKey>[Master],show_4decks</ConfigKey>
+              <BindProperty>visible</BindProperty>
+              <Transform>
+                <Not/>
+              </Transform>
+            </Connection>
+          </WidgetGroup>
+
           <WidgetGroup>
-            <ObjectName>channel_VuMeter_Group</ObjectName>
-            <Layout>horizontal</Layout>
-            <MaximumSize>22,91</MaximumSize>
+            <ObjectName>Channel<Variable name="i"/>Volume</ObjectName>
+            <Layout>vertical</Layout>
             <Children>
-              <Template src="skin:vumeter_v.xml">
-                <SetVariable name="group"><Variable name="group"/></SetVariable>
-                <SetVariable name="side">L</SetVariable>
-                <SetVariable name="tooltip_meter">channel_VuMeterL</SetVariable>
-                <SetVariable name="tooltip_clip">channel_PeakIndicatorL</SetVariable>
-              </Template>
-              <Template src="skin:vumeter_v.xml">
-                <SetVariable name="group"><Variable name="group"/></SetVariable>
-                <SetVariable name="side">R</SetVariable>
-                <SetVariable name="tooltip_meter">channel_VuMeterR</SetVariable>
-                <SetVariable name="tooltip_clip">channel_PeakIndicatorR</SetVariable>
-              </Template>
+              <SliderComposed>
+                <TooltipId>channel_volume</TooltipId>
+                <SizePolicy>min,me</SizePolicy>
+                <MinimumSize>40,110</MinimumSize>
+                <Slider scalemode="STRETCH">slider-vertical.svg</Slider>
+                <Handle scalemode="STRETCH_ASPECT">handle-vertical.svg</Handle>
+                <Horizontal>false</Horizontal>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,volume</ConfigKey>
+                  <EmitOnDownPress>false</EmitOnDownPress>
+                </Connection>
+              </SliderComposed>
             </Children>
+            <Connection>
+              <ConfigKey>[Master],show_4decks</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
           </WidgetGroup>
+
         </Children>
       </WidgetGroup>
-      <Template src="skin:left_2state_button.xml">
-        <SetVariable name="TooltipId">pfl</SetVariable>
-        <SetVariable name="ObjectName">DeckPFLButton</SetVariable>
-        <SetVariable name="MinimumSize"><Variable name="WideButtonMinimumSize"/></SetVariable>
-        <SetVariable name="MaximumSize"><Variable name="WideButtonMaximumSize"/></SetVariable>
-        <SetVariable name="SizePolicy"><Variable name="WideButtonSizePolicy"/></SetVariable>
-        <SetVariable name="state_0_text"></SetVariable>
-        <SetVariable name="state_0_pressed">icon/ic_headphones_48px.svg</SetVariable>
-        <SetVariable name="state_0_unpressed">icon/ic_headphones_48px.svg</SetVariable>
-        <SetVariable name="state_1_text"></SetVariable>
-        <SetVariable name="state_1_pressed">icon/ic_headphones_48px.svg</SetVariable>
-        <SetVariable name="state_1_unpressed">icon/ic_headphones_48px.svg</SetVariable>
-        <SetVariable name="left_connection_control"><Variable name="group"/>,pfl</SetVariable>
-      </Template>
 
-      <SliderComposed>
-        <TooltipId>channel_volume</TooltipId>
-        <SizePolicy>min,me</SizePolicy>
-        <MinimumSize>40,100</MinimumSize>
-        <MaximumSize>40,-1</MaximumSize>
-        <Slider scalemode="STRETCH">slider-vertical.svg</Slider>
-        <Handle scalemode="STRETCH_ASPECT">handle-vertical.svg</Handle>
-        <Horizontal>false</Horizontal>
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Children>
+          <Template src="skin:crossfader_orientation_button.xml" />
+        </Children>
         <Connection>
-          <ConfigKey><Variable name="group"/>,volume</ConfigKey>
-          <EmitOnDownPress>false</EmitOnDownPress>
+          <ConfigKey>[Master],show_4decks</ConfigKey>
+          <BindProperty>visible</BindProperty>
         </Connection>
-      </SliderComposed>
-
+      </WidgetGroup>
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/deck_mixer_controls_col3.xml b/res/skins/Deere/deck_mixer_controls_col3.xml
new file mode 100644
index 000000000000..45539d7375f7
--- /dev/null
+++ b/res/skins/Deere/deck_mixer_controls_col3.xml
@@ -0,0 +1,92 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    The deck mixer controls.
+-->
+<Template>
+  <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
+  <WidgetGroup>
+    <ObjectName>DeckMixer<Variable name="i"/>_Column3</ObjectName>
+    <Layout>vertical</Layout>
+    <Size>40f,160me</Size>
+    <Children>
+      <!--In 4 deck mode with EQs showing, hide the gain knob here and show it above the EQs.-->
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Children>
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Template src="skin:knob_with_label.xml">
+                <SetVariable name="TooltipId">pregain</SetVariable>
+                <SetVariable name="control">pregain</SetVariable>
+                <SetVariable name="color">red</SetVariable>
+                <SetVariable name="label">Gain</SetVariable>
+              </Template>
+            </Children>
+            <Connection>
+              <ConfigKey>[Master],show_eqs</ConfigKey>
+              <BindProperty>visible</BindProperty>
+              <Transform>
+                <Not/>
+              </Transform>
+            </Connection>
+          </WidgetGroup>
+        </Children>
+        <Connection>
+          <ConfigKey>[Master],show_4decks</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+      <!--In 2 deck mode, show the gain knob above the channel level meters.-->
+      <WidgetGroup>
+        <Layout>vertical</Layout>
+        <Size>40f,-1</Size>
+        <MinimumSize>40,34</MinimumSize>
+        <MaximumSize>40,46</MaximumSize>
+        <Children>
+          <Template src="skin:knob_with_label.xml">
+            <SetVariable name="TooltipId">pregain</SetVariable>
+            <SetVariable name="control">pregain</SetVariable>
+            <SetVariable name="color">red</SetVariable>
+            <SetVariable name="label">Gain</SetVariable>
+          </Template>
+        </Children>
+        <Connection>
+          <ConfigKey>[Master],show_4decks</ConfigKey>
+          <BindProperty>visible</BindProperty>
+          <Transform>
+            <Not/>
+          </Transform>
+        </Connection>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <Size>22min,100me</Size>
+        <Layout>horizontal</Layout>
+        <Children>
+          <WidgetGroup>
+            <ObjectName>channel_VuMeter_Group</ObjectName>
+            <Layout>horizontal</Layout>
+            <MaximumSize>22,130</MaximumSize>
+            <Children>
+              <Template src="skin:vumeter_v.xml">
+                <SetVariable name="group"><Variable name="group"/></SetVariable>
+                <SetVariable name="side">L</SetVariable>
+                <SetVariable name="tooltip_meter">channel_VuMeterL</SetVariable>
+                <SetVariable name="tooltip_clip">channel_PeakIndicatorL</SetVariable>
+              </Template>
+              <Template src="skin:vumeter_v.xml">
+                <SetVariable name="group"><Variable name="group"/></SetVariable>
+                <SetVariable name="side">R</SetVariable>
+                <SetVariable name="tooltip_meter">channel_VuMeterR</SetVariable>
+                <SetVariable name="tooltip_clip">channel_PeakIndicatorR</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Deere/deck_mixer_controls_condensed_left.xml b/res/skins/Deere/deck_mixer_controls_condensed_left.xml
new file mode 100644
index 000000000000..d6f6af0d3abb
--- /dev/null
+++ b/res/skins/Deere/deck_mixer_controls_condensed_left.xml
@@ -0,0 +1,159 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    Condensed mixer controls, for 4 decks with stacked waveforms and EQs.
+-->
+<Template>
+  <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
+  <WidgetGroup>
+    <ObjectName>DeckMixer<Variable name="i"/>_ColumnCondensed</ObjectName>
+    <Layout>vertical</Layout>
+    <Children>
+
+      <WidgetGroup>
+        <Layout>vertical</Layout>
+        <Children>
+
+          <Template src="skin:deck_mixer_controls_col1_left.xml" />
+
+        </Children>
+        <Connection>
+          <ConfigKey>[Master],show_eqs</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <Layout>vertical</Layout>
+        <Children>
+
+          <WidgetGroup>
+            <ObjectName>CondensedButtonContainerLeft</ObjectName>
+            <Size>-1me,30f</Size>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Template src="skin:left_2state_button.xml">
+                <SetVariable name="TooltipId">pfl</SetVariable>
+                <SetVariable name="ObjectName">DeckPFLButton</SetVariable>
+                <SetVariable name="MinimumSize">22,22</SetVariable>
+                <SetVariable name="MaximumSize">22,22</SetVariable>
+                <SetVariable name="SizePolicy">f,f</SetVariable>
+                <SetVariable name="state_0_text"></SetVariable>
+                <SetVariable name="state_0_pressed">icon/ic_headphones_48px.svg</SetVariable>
+                <SetVariable name="state_0_unpressed">icon/ic_headphones_48px.svg</SetVariable>
+                <SetVariable name="state_1_text"></SetVariable>
+                <SetVariable name="state_1_pressed">icon/ic_headphones_48px.svg</SetVariable>
+                <SetVariable name="state_1_unpressed">icon/ic_headphones_48px.svg</SetVariable>
+                <SetVariable name="left_connection_control"><Variable name="group"/>,pfl</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <GroupName>CondensedVolumeAndMonoMeter</GroupName>
+            <Layout>horizontal</Layout>
+            <MaximumSize>60,141</MaximumSize>
+            <Connection>
+              <ConfigKey>[Master],show_faders</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+            <Children>
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <ObjectName>4DecksMixerCondensedMonoMeterLeft</ObjectName>
+                <Children>
+                  <Template src="skin:vumeter_v.xml">
+                    <SetVariable name="group"><Variable name="group"/></SetVariable>
+                    <SetVariable name="side">L</SetVariable>
+                    <SetVariable name="tooltip_meter">channel_VuMeter</SetVariable>
+                    <SetVariable name="tooltip_clip">channel_PeakIndicator</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+
+              <SliderComposed>
+                <TooltipId>channel_volume</TooltipId>
+                <SizePolicy>min,me</SizePolicy>
+                <MinimumSize>40,50</MinimumSize>
+                <MaximumSize>40,-1</MaximumSize>
+                <Slider scalemode="STRETCH">slider-vertical.svg</Slider>
+                <Handle scalemode="STRETCH_ASPECT">handle-vertical.svg</Handle>
+                <Horizontal>false</Horizontal>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,volume</ConfigKey>
+                  <EmitOnDownPress>false</EmitOnDownPress>
+                </Connection>
+              </SliderComposed>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>4DecksMixerCondensedStereoMeterLeft</ObjectName>
+            <Layout>horizontal</Layout>
+            <MaximumSize>60,141</MaximumSize>
+            <Connection>
+              <ConfigKey>[Master],show_faders</ConfigKey>
+              <BindProperty>visible</BindProperty>
+              <Transform>
+                <Not/>
+              </Transform>
+            </Connection>
+            <Children>
+
+              <Template src="skin:spacer_hx.xml">
+                <SetVariable name="width">15</SetVariable>
+              </Template>
+
+              <WidgetGroup>
+                <ObjectName>channel_VuMeter_Group</ObjectName>
+                <Layout>horizontal</Layout>
+                <MaximumSize>22,141</MaximumSize>
+                <Children>
+                  <Template src="skin:vumeter_v.xml">
+                    <SetVariable name="group"><Variable name="group"/></SetVariable>
+                    <SetVariable name="side">L</SetVariable>
+                    <SetVariable name="tooltip_meter">channel_VuMeterL</SetVariable>
+                    <SetVariable name="tooltip_clip">channel_PeakIndicatorL</SetVariable>
+                  </Template>
+                  <Template src="skin:vumeter_v.xml">
+                    <SetVariable name="group"><Variable name="group"/></SetVariable>
+                    <SetVariable name="side">R</SetVariable>
+                    <SetVariable name="tooltip_meter">channel_VuMeterR</SetVariable>
+                    <SetVariable name="tooltip_clip">channel_PeakIndicatorR</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>CondensedButtonContainerLeft</ObjectName>
+            <Size>-1me,25f</Size>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Template src="skin:left_3state_button.xml">
+                <SetVariable name="TooltipId">orientation</SetVariable>
+                <SetVariable name="ObjectName">OrientationButton</SetVariable>
+                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                <SetVariable name="state_0_text"></SetVariable>
+                <SetVariable name="state_0_pressed">icon/ic_orientation_left_48px.svg</SetVariable>
+                <SetVariable name="state_0_unpressed">icon/ic_orientation_left_48px.svg</SetVariable>
+                <SetVariable name="state_1_text"></SetVariable>
+                <SetVariable name="state_1_pressed">icon/ic_orientation_48px.svg</SetVariable>
+                <SetVariable name="state_1_unpressed">icon/ic_orientation_48px.svg</SetVariable>
+                <SetVariable name="state_2_text"></SetVariable>
+                <SetVariable name="state_2_pressed">icon/ic_orientation_right_48px.svg</SetVariable>
+                <SetVariable name="state_2_unpressed">icon/ic_orientation_right_48px.svg</SetVariable>
+                <SetVariable name="left_connection_control"><Variable name="group"/>,orientation</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+        </Children>
+      </WidgetGroup>
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Deere/deck_mixer_controls_condensed_right.xml b/res/skins/Deere/deck_mixer_controls_condensed_right.xml
new file mode 100644
index 000000000000..267dba69a154
--- /dev/null
+++ b/res/skins/Deere/deck_mixer_controls_condensed_right.xml
@@ -0,0 +1,161 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    Condensed mixer controls, for 4 decks with stacked waveforms and EQs.
+-->
+<Template>
+  <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
+  <WidgetGroup>
+    <ObjectName>DeckMixer<Variable name="i"/>_ColumnCondensed</ObjectName>
+    <Layout>vertical</Layout>
+    <Children>
+
+      <WidgetGroup>
+        <Layout>vertical</Layout>
+        <Children>
+
+          <Template src="skin:deck_mixer_controls_col1_right.xml" />
+
+        </Children>
+        <Connection>
+          <ConfigKey>[Master],show_eqs</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <Layout>vertical</Layout>
+        <Children>
+
+          <WidgetGroup>
+            <ObjectName>CondensedButtonContainerRight</ObjectName>
+            <Size>-1me,30f</Size>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Template src="skin:left_2state_button.xml">
+                <SetVariable name="TooltipId">pfl</SetVariable>
+                <SetVariable name="ObjectName">DeckPFLButton</SetVariable>
+                <SetVariable name="MinimumSize">22,22</SetVariable>
+                <SetVariable name="MaximumSize">22,22</SetVariable>
+                <SetVariable name="SizePolicy">f,f</SetVariable>
+                <SetVariable name="state_0_text"></SetVariable>
+                <SetVariable name="state_0_pressed">icon/ic_headphones_48px.svg</SetVariable>
+                <SetVariable name="state_0_unpressed">icon/ic_headphones_48px.svg</SetVariable>
+                <SetVariable name="state_1_text"></SetVariable>
+                <SetVariable name="state_1_pressed">icon/ic_headphones_48px.svg</SetVariable>
+                <SetVariable name="state_1_unpressed">icon/ic_headphones_48px.svg</SetVariable>
+                <SetVariable name="left_connection_control"><Variable name="group"/>,pfl</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <GroupName>CondensedVolumeAndMonoMeter</GroupName>
+            <Layout>horizontal</Layout>
+            <MaximumSize>60,141</MaximumSize>
+            <Connection>
+              <ConfigKey>[Master],show_faders</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+            <Children>
+              <SliderComposed>
+                <TooltipId>channel_volume</TooltipId>
+                <SizePolicy>min,me</SizePolicy>
+                <MinimumSize>40,50</MinimumSize>
+                <MaximumSize>40,-1</MaximumSize>
+                <Slider scalemode="STRETCH">slider-vertical.svg</Slider>
+                <Handle scalemode="STRETCH_ASPECT">handle-vertical.svg</Handle>
+                <Horizontal>false</Horizontal>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,volume</ConfigKey>
+                  <EmitOnDownPress>false</EmitOnDownPress>
+                </Connection>
+              </SliderComposed>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <ObjectName>4DecksMixerCondensedMonoMeterRight</ObjectName>
+                <Children>
+                  <Template src="skin:vumeter_v.xml">
+                    <SetVariable name="group"><Variable name="group"/></SetVariable>
+                    <SetVariable name="side">L</SetVariable>
+                    <SetVariable name="tooltip_meter">channel_VuMeter</SetVariable>
+                    <SetVariable name="tooltip_clip">channel_PeakIndicator</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>4DecksMixerCondensedStereoMeterRight</ObjectName>
+            <Layout>horizontal</Layout>
+            <MaximumSize>60,141</MaximumSize>
+            <Connection>
+              <ConfigKey>[Master],show_faders</ConfigKey>
+              <BindProperty>visible</BindProperty>
+              <Transform>
+                <Not/>
+              </Transform>
+            </Connection>
+            <Children>
+
+              <WidgetGroup>
+                <ObjectName>channel_VuMeter_Group</ObjectName>
+                <Layout>horizontal</Layout>
+                <MaximumSize>22,141</MaximumSize>
+                <Children>
+                  <Template src="skin:vumeter_v.xml">
+                    <SetVariable name="group"><Variable name="group"/></SetVariable>
+                    <SetVariable name="side">L</SetVariable>
+                    <SetVariable name="tooltip_meter">channel_VuMeterL</SetVariable>
+                    <SetVariable name="tooltip_clip">channel_PeakIndicatorL</SetVariable>
+                  </Template>
+                  <Template src="skin:vumeter_v.xml">
+                    <SetVariable name="group"><Variable name="group"/></SetVariable>
+                    <SetVariable name="side">R</SetVariable>
+                    <SetVariable name="tooltip_meter">channel_VuMeterR</SetVariable>
+                    <SetVariable name="tooltip_clip">channel_PeakIndicatorR</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+
+              <Template src="skin:spacer_hx.xml">
+                <SetVariable name="width">15</SetVariable>
+              </Template>
+
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>CondensedButtonContainerRight</ObjectName>
+            <Size>-1me,25f</Size>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Template src="skin:left_3state_button.xml">
+                <SetVariable name="TooltipId">orientation</SetVariable>
+                <SetVariable name="ObjectName">OrientationButton</SetVariable>
+                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                <SetVariable name="state_0_text"></SetVariable>
+                <SetVariable name="state_0_pressed">icon/ic_orientation_left_48px.svg</SetVariable>
+                <SetVariable name="state_0_unpressed">icon/ic_orientation_left_48px.svg</SetVariable>
+                <SetVariable name="state_1_text"></SetVariable>
+                <SetVariable name="state_1_pressed">icon/ic_orientation_48px.svg</SetVariable>
+                <SetVariable name="state_1_unpressed">icon/ic_orientation_48px.svg</SetVariable>
+                <SetVariable name="state_2_text"></SetVariable>
+                <SetVariable name="state_2_pressed">icon/ic_orientation_right_48px.svg</SetVariable>
+                <SetVariable name="state_2_unpressed">icon/ic_orientation_right_48px.svg</SetVariable>
+                <SetVariable name="left_connection_control"><Variable name="group"/>,orientation</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+        </Children>
+      </WidgetGroup>
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Deere/deck_overview_row.xml b/res/skins/Deere/deck_overview_row.xml
index d84db544e67e..0b686011a233 100644
--- a/res/skins/Deere/deck_overview_row.xml
+++ b/res/skins/Deere/deck_overview_row.xml
@@ -9,75 +9,32 @@
   <WidgetGroup>
     <ObjectName>OverviewRow</ObjectName>
     <Layout>horizontal</Layout>
-    <SizePolicy>me,max</SizePolicy>
+    <SizePolicy>me,me</SizePolicy>
     <MinimumSize>-1,40</MinimumSize>
-    <MaximumSize>-1,60</MaximumSize>
+    <MaximumSize>-1,65</MaximumSize>
     <Children>
-      <Overview>
-        <TooltipId>waveform_overview</TooltipId>
-        <Group><Variable name="group"/></Group>
-        <SizePolicy>me,me</SizePolicy>
-        <BgColor></BgColor>
-        <SignalHighColor></SignalHighColor>
-        <SignalMidColor></SignalMidColor>
-        <SignalLowColor></SignalLowColor>
-        <SignalRGBHighColor></SignalRGBHighColor>
-        <SignalRGBMidColor></SignalRGBMidColor>
-        <SignalRGBLowColor></SignalRGBLowColor>
-        <SignalColor><Variable name="DeckSignalColor"/></SignalColor>
-        <PlayPosColor>#00FF00</PlayPosColor>
-        <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>
-          <Align>top|right</Align>
-          <Color>#FF001C</Color>
-          <TextColor>#FFFFFF</TextColor>
-          <Text>C</Text>
-        </Mark>
-        <Connection>
-          <ConfigKey><Variable name="group"/>,playposition</ConfigKey>
-          <EmitOnDownPress>false</EmitOnDownPress>
-        </Connection>
-      </Overview>
       <WidgetGroup>
-        <ObjectName>OptionGrid</ObjectName>
+        <ObjectName>ButtonGrid</ObjectName>
         <Layout>vertical</Layout>
-        <SizePolicy>min,me</SizePolicy>
-        <MinimumSize>60,40</MinimumSize>
-        <MaximumSize>90,60</MaximumSize>
         <Children>
           <WidgetGroup>
-            <ObjectName>OptionGridRow1</ObjectName>
+            <ObjectName>ButtonGrid</ObjectName>
             <Layout>horizontal</Layout>
-            <SizePolicy>p,me</SizePolicy>
-            <MinimumSize>60,20</MinimumSize>
-            <MaximumSize>90,30</MaximumSize>
             <Children>
+
               <Template src="skin:left_2state_button.xml">
-                <SetVariable name="TooltipId">show_spinny</SetVariable>
-                <SetVariable name="ObjectName">ShowSpinnyButton</SetVariable>
+                <SetVariable name="TooltipId">slip_mode</SetVariable>
+                <SetVariable name="ObjectName">SlipModeButton</SetVariable>
                 <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
                 <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
                 <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
                 <SetVariable name="state_0_text"></SetVariable>
-                <SetVariable name="state_0_pressed">icon/ic_spinny_48px.svg</SetVariable>
-                <SetVariable name="state_0_unpressed">icon/ic_spinny_48px.svg</SetVariable>
+                <SetVariable name="state_0_pressed">icon/ic_slip_48px.svg</SetVariable>
+                <SetVariable name="state_0_unpressed">icon/ic_slip_48px.svg</SetVariable>
                 <SetVariable name="state_1_text"></SetVariable>
-                <SetVariable name="state_1_pressed">icon/ic_spinny_48px.svg</SetVariable>
-                <SetVariable name="state_1_unpressed">icon/ic_spinny_48px.svg</SetVariable>
-                <SetVariable name="left_connection_control"><Variable name="control_show_spinny"/></SetVariable>
+                <SetVariable name="state_1_pressed">icon/ic_slip_48px.svg</SetVariable>
+                <SetVariable name="state_1_unpressed">icon/ic_slip_48px.svg</SetVariable>
+                <SetVariable name="left_connection_control"><Variable name="group"/>,slip_enabled</SetVariable>
               </Template>
 
               <Template src="skin:left_2state_button.xml">
@@ -95,7 +52,7 @@
                 <SetVariable name="left_connection_control"><Variable name="group"/>,repeat</SetVariable>
               </Template>
 
-              <Template src="skin:left_1state_button.xml">
+              <Template src="skin:left_2state_button.xml">
                 <SetVariable name="TooltipId">eject</SetVariable>
                 <SetVariable name="ObjectName">EjectButton</SetVariable>
                 <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
@@ -104,18 +61,32 @@
                 <SetVariable name="state_0_text"></SetVariable>
                 <SetVariable name="state_0_pressed">icon/ic_eject_48px.svg</SetVariable>
                 <SetVariable name="state_0_unpressed">icon/ic_eject_48px.svg</SetVariable>
+                <SetVariable name="state_1_text"></SetVariable>
+                <SetVariable name="state_1_pressed">icon/ic_eject_48px.svg</SetVariable>
+                <SetVariable name="state_1_unpressed">icon/ic_eject_48px.svg</SetVariable>
                 <SetVariable name="left_connection_control"><Variable name="group"/>,eject</SetVariable>
               </Template>
+
             </Children>
           </WidgetGroup>
 
           <WidgetGroup>
-            <ObjectName>OptionGridRow2</ObjectName>
+            <ObjectName>ButtonGrid</ObjectName>
             <Layout>horizontal</Layout>
-            <SizePolicy>p,me</SizePolicy>
-            <MinimumSize>60,20</MinimumSize>
-            <MaximumSize>90,30</MaximumSize>
             <Children>
+              <Template src="skin:left_right_1state_button.xml">
+                <SetVariable name="TooltipId">beats_translate_curpos</SetVariable>
+                <SetVariable name="ObjectName">BeatsTranslateCurposButton</SetVariable>
+                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                <SetVariable name="state_0_text"></SetVariable>
+                <SetVariable name="state_0_pressed">icon/ic_beats_translate_curpos_48px.svg</SetVariable>
+                <SetVariable name="state_0_unpressed">icon/ic_beats_translate_curpos_48px.svg</SetVariable>
+                <SetVariable name="left_connection_control"><Variable name="group"/>,beats_translate_curpos</SetVariable>
+                <SetVariable name="right_connection_control"><Variable name="group"/>,beats_translate_match_alignment</SetVariable>
+              </Template>
+
               <Template src="skin:left_2state_button.xml">
                 <SetVariable name="TooltipId">quantize</SetVariable>
                 <SetVariable name="ObjectName">QuantizeButton</SetVariable>
@@ -146,22 +117,121 @@
                 <SetVariable name="left_connection_control"><Variable name="group"/>,keylock</SetVariable>
               </Template>
 
-              <Template src="skin:left_2state_button.xml">
-                <SetVariable name="TooltipId">slip_mode</SetVariable>
-                <SetVariable name="ObjectName">SlipModeButton</SetVariable>
-                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-                <SetVariable name="state_0_text"></SetVariable>
-                <SetVariable name="state_0_pressed">icon/ic_slip_48px.svg</SetVariable>
-                <SetVariable name="state_0_unpressed">icon/ic_slip_48px.svg</SetVariable>
-                <SetVariable name="state_1_text"></SetVariable>
-                <SetVariable name="state_1_pressed">icon/ic_slip_48px.svg</SetVariable>
-                <SetVariable name="state_1_unpressed">icon/ic_slip_48px.svg</SetVariable>
-                <SetVariable name="left_connection_control"><Variable name="group"/>,slip_enabled</SetVariable>
+            </Children>
+          </WidgetGroup>
+        </Children>
+        <Connection>
+          <ConfigKey>[Deere],show_minimal_deck_controls</ConfigKey>
+          <BindProperty>visible</BindProperty>
+          <Transform>
+            <Not/>
+          </Transform>
+        </Connection>
+      </WidgetGroup>
+
+      <Overview>
+        <TooltipId>waveform_overview</TooltipId>
+        <Group><Variable name="group"/></Group>
+        <SizePolicy>me,me</SizePolicy>
+        <BgColor><Variable name="DeckBackgroundColor"/></BgColor>
+        <PlayedOverlayColor><Variable name="PlayedOverlayColor"/></PlayedOverlayColor>
+        <SignalHighColor></SignalHighColor>
+        <SignalMidColor></SignalMidColor>
+        <SignalLowColor></SignalLowColor>
+        <SignalRGBHighColor></SignalRGBHighColor>
+        <SignalRGBMidColor></SignalRGBMidColor>
+        <SignalRGBLowColor></SignalRGBLowColor>
+        <SignalColor><Variable name="DeckSignalColor"/></SignalColor>
+        <PlayPosColor>#00FF00</PlayPosColor>
+        <DefaultMark>
+          <Align>bottom|right</Align>
+          <Color>#619dea</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>
+          <Align>top|right</Align>
+          <Color>#FF001C</Color>
+          <TextColor>#FFFFFF</TextColor>
+          <Text>C</Text>
+        </Mark>
+        <Connection>
+          <ConfigKey><Variable name="group"/>,playposition</ConfigKey>
+          <EmitOnDownPress>false</EmitOnDownPress>
+        </Connection>
+      </Overview>
+
+      <WidgetGroup>
+        <ObjectName>ButtonGrid</ObjectName>
+        <Layout>vertical</Layout>
+        <Connection>
+          <ConfigKey>[Master],show_4effectunits</ConfigKey>
+          <BindProperty>visible</BindProperty>
+          <Transform>
+            <Not/>
+          </Transform>
+        </Connection>
+        <Children>
+          <Template src="skin:fx_unit_group_assignment_button.xml">
+            <SetVariable name="EffectUnit">1</SetVariable>
+            <SetVariable name="SourceType">deck</SetVariable>
+          </Template>
+
+          <Template src="skin:fx_unit_group_assignment_button.xml">
+            <SetVariable name="EffectUnit">2</SetVariable>
+            <SetVariable name="SourceType">deck</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>ButtonGrid</ObjectName>
+        <Layout>vertical</Layout>
+        <Connection>
+          <ConfigKey>[Master],show_4effectunits</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+        <Children>
+          <WidgetGroup>
+            <ObjectName>ButtonGrid</ObjectName>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Template src="skin:fx_unit_group_assignment_button.xml">
+                <SetVariable name="EffectUnit">1</SetVariable>
+                <SetVariable name="SourceType">deck</SetVariable>
+              </Template>
+
+              <Template src="skin:fx_unit_group_assignment_button.xml">
+                <SetVariable name="EffectUnit">2</SetVariable>
+                <SetVariable name="SourceType">deck</SetVariable>
               </Template>
             </Children>
           </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>ButtonGrid</ObjectName>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Template src="skin:fx_unit_group_assignment_button.xml">
+                <SetVariable name="EffectUnit">3</SetVariable>
+                <SetVariable name="SourceType">deck</SetVariable>
+              </Template>
+
+              <Template src="skin:fx_unit_group_assignment_button.xml">
+                <SetVariable name="EffectUnit">4</SetVariable>
+                <SetVariable name="SourceType">deck</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
         </Children>
       </WidgetGroup>
     </Children>
diff --git a/res/skins/Deere/deck_text_row.xml b/res/skins/Deere/deck_text_row.xml
index 66b9b791e782..168117602dd5 100644
--- a/res/skins/Deere/deck_text_row.xml
+++ b/res/skins/Deere/deck_text_row.xml
@@ -11,6 +11,7 @@
     <Layout>horizontal</Layout>
     <SizePolicy>me,max</SizePolicy>
     <Children>
+
       <WidgetGroup>
         <Layout>horizontal</Layout>
         <SizePolicy>min,min</SizePolicy>
@@ -24,13 +25,8 @@
           </CoverArt>
         </Children>
         <Connection>
-          <ConfigKey persist="true">[Deere],show_coverart</ConfigKey>
+          <ConfigKey persist="true">[Master],show_coverart</ConfigKey>
           <BindProperty>visible</BindProperty>
-          <!-- Needed for the show/hide logic to work when circling through
-               the cover art display options: none/vinyl cover/text row -->
-          <Transform>
-            <Add>-1</Add>
-          </Transform>
         </Connection>
       </WidgetGroup>
 
@@ -61,11 +57,8 @@
                     <Group><Variable name="group"/></Group>
                     <Elide>right</Elide>
                     <Connection>
-                      <ConfigKey>[Deere],show_no_track_info</ConfigKey>
+                      <ConfigKey>[Deere],show_track_info</ConfigKey>
                       <BindProperty>visible</BindProperty>
-                      <Transform>
-                        <Not/>
-                      </Transform>
                     </Connection>
                   </TrackProperty>
 
@@ -75,8 +68,11 @@
                     <ObjectName>HiddenTrackTitleInfo</ObjectName>
                     <Text>***</Text>
                     <Connection>
-                      <ConfigKey>[Deere],show_no_track_info</ConfigKey>
+                      <ConfigKey>[Deere],show_track_info</ConfigKey>
                       <BindProperty>visible</BindProperty>
+                      <Transform>
+                        <Not/>
+                      </Transform>
                     </Connection>
                   </Label>
 
@@ -267,11 +263,8 @@
                                   <ConfigKey><Variable name="group"/>,visual_bpm</ConfigKey>
                                 </Connection>
                                 <Connection>
-                                  <ConfigKey>[Deere],show_no_bpm_info</ConfigKey>
+                                  <ConfigKey>[Deere],show_bpm_info</ConfigKey>
                                   <BindProperty>visible</BindProperty>
-                                  <Transform>
-                                    <Not/>
-                                  </Transform>
                                 </Connection>
                               </NumberBpm>
 
@@ -281,8 +274,11 @@
                                 <ObjectName>HiddenBpmInfo</ObjectName>
                                 <Text>***.**</Text>
                                 <Connection>
-                                  <ConfigKey>[Deere],show_no_bpm_info</ConfigKey>
+                                  <ConfigKey>[Deere],show_bpm_info</ConfigKey>
                                   <BindProperty>visible</BindProperty>
+                                  <Transform>
+                                    <Not/>
+                                  </Transform>
                                 </Connection>
                               </Label>
 
@@ -330,30 +326,6 @@
                                 <MinimumSize>100,20</MinimumSize>
                                 <MaximumSize>180,30</MaximumSize>
                                 <Children>
-                                  <Template src="skin:left_right_1state_button.xml">
-                                    <SetVariable name="TooltipId">beats_translate_curpos</SetVariable>
-                                    <SetVariable name="ObjectName">BeatsTranslateCurposButton</SetVariable>
-                                    <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-                                    <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-                                    <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-                                    <SetVariable name="state_0_text"></SetVariable>
-                                    <SetVariable name="state_0_pressed">icon/ic_beats_translate_curpos_48px.svg</SetVariable>
-                                    <SetVariable name="state_0_unpressed">icon/ic_beats_translate_curpos_48px.svg</SetVariable>
-                                    <SetVariable name="left_connection_control"><Variable name="group"/>,beats_translate_curpos</SetVariable>
-                                  </Template>
-
-                                  <Template src="skin:left_right_1state_button.xml">
-                                    <SetVariable name="TooltipId">beats_translate_match_alignment</SetVariable>
-                                    <SetVariable name="ObjectName">BeatsTranslateAlignmentButton</SetVariable>
-                                    <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-                                    <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-                                    <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-                                    <SetVariable name="state_0_text"></SetVariable>
-                                    <SetVariable name="state_0_pressed">icon/ic_beats_translate_alignment_48px.svg</SetVariable>
-                                    <SetVariable name="state_0_unpressed">icon/ic_beats_translate_alignment_48px.svg</SetVariable>
-                                    <SetVariable name="left_connection_control"><Variable name="group"/>,beats_translate_match_alignment</SetVariable>
-                                  </Template>
-
 
                                   <Template src="skin:left_right_1state_button.xml">
                                     <SetVariable name="TooltipId">beats_adjust_faster</SetVariable>
@@ -454,11 +426,8 @@
                     <Elide>right</Elide>
                     <Group><Variable name="group"/></Group>
                     <Connection>
-                      <ConfigKey>[Deere],show_no_track_info</ConfigKey>
+                      <ConfigKey>[Deere],show_track_info</ConfigKey>
                       <BindProperty>visible</BindProperty>
-                      <Transform>
-                        <Not/>
-                      </Transform>
                     </Connection>
                   </TrackProperty>
 
@@ -468,8 +437,11 @@
                     <ObjectName>HiddenTrackArtistInfo</ObjectName>
                     <Text>***</Text>
                     <Connection>
-                      <ConfigKey>[Deere],show_no_track_info</ConfigKey>
+                      <ConfigKey>[Deere],show_track_info</ConfigKey>
                       <BindProperty>visible</BindProperty>
+                      <Transform>
+                        <Not/>
+                      </Transform>
                     </Connection>
                   </Label>
 
@@ -484,7 +456,7 @@
                       </StarRating>
                     </Children>
                     <Connection>
-                      <ConfigKey persist="true">[Deere],show_starrating</ConfigKey>
+                      <ConfigKey>[Deere],show_starrating</ConfigKey>
                       <BindProperty>visible</BindProperty>
                     </Connection>
                   </WidgetGroup>
diff --git a/res/skins/Deere/deck_visual_row.xml b/res/skins/Deere/deck_visual_row.xml
index 04508cea593f..ae6b2527d3aa 100644
--- a/res/skins/Deere/deck_visual_row.xml
+++ b/res/skins/Deere/deck_visual_row.xml
@@ -9,11 +9,13 @@
   <WidgetGroup>
     <ObjectName>VisualRow</ObjectName>
     <Layout>horizontal</Layout>
-    <SizePolicy>me,max</SizePolicy>
-    <!-- Because the spinny hides itself and throws off the size
-         calculation we set our minimum size to the spinny size. -->
-    <MinimumSize>-1,101</MinimumSize>
+    <SizePolicy>me,me</SizePolicy>
     <Children>
+
+      <Template src="skin:vinylcontrol.xml"/>
+
+      <Template src="skin:spinny.xml"/>
+
       <Visual>
         <TooltipId>waveform_display</TooltipId>
         <Group><Variable name="group"/></Group>
@@ -147,66 +149,15 @@
             <SetVariable name="left_connection_control"><Variable name="group"/>,waveform_zoom_up</SetVariable>
           </Template>
         </Children>
-      </WidgetGroup>
-
-      <!-- We allow for the following options in the skin settings:
-           : Show no cover
-           : Show cover on spinning vinyl images
-           : Show cover in text row of decks
-      -->
-      <WidgetStack>
-        <ObjectName>SpinnyContainer</ObjectName>
-        <Layout>horizontal</Layout>
-        <SizePolicy>max,max</SizePolicy>
-        <MinimumSize>-1,100</MinimumSize>
-        <NextControl>[Deere],show_coverart</NextControl>
-        <PrevControl></PrevControl>
-        <Children>
-          <WidgetGroup>
-            <ObjectName>SpinnyHolder</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>max,max</SizePolicy>
-            <Children>
-              <Spinny>
-                <TooltipId>spinny</TooltipId>
-                <Group><Variable name="group"/></Group>
-                <PathBackground>image/vinyl_spinny_background.svg</PathBackground>
-                <PathForeground>image/vinyl_spinny_foreground.svg</PathForeground>
-                <PathGhost>image/vinyl_spinny_foreground_ghost.svg</PathGhost>
-                <PathMask>image/vinyl_spinny_cover_mask.svg</PathMask>
-                <ShowCover>false</ShowCover>
-              </Spinny>
-            </Children>
-          </WidgetGroup>
-
-          <WidgetGroup>
-            <ObjectName>SpinnyHolder</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>max,max</SizePolicy>
-            <Children>
-              <Spinny>
-                <TooltipId>spinny</TooltipId>
-                <Group><Variable name="group"/></Group>
-                <PathBackground>image/vinyl_spinny_background.svg</PathBackground>
-                <PathForeground>image/vinyl_spinny_foreground.svg</PathForeground>
-                <PathGhost>image/vinyl_spinny_foreground_ghost.svg</PathGhost>
-                <PathMask>image/vinyl_spinny_cover_mask.svg</PathMask>
-                <!--
-                 If you want to have cover art beneath the spinning vinyl images,
-                 set <ShowCover> to "true" AND make the <PathMask> image semi-transparent.
-                -->
-                <ShowCover>true</ShowCover>
-              </Spinny>
-            </Children>
-          </WidgetGroup>
-        </Children>
+        <!--The zoom buttons shift the center line off center in stacked waveform mode.-->
         <Connection>
-          <ConfigKey persist="true"><Variable name="control_show_spinny"/></ConfigKey>
+          <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
           <BindProperty>visible</BindProperty>
+          <Transform>
+            <Not/>
+          </Transform>
         </Connection>
-      </WidgetStack>
-
-      <Template src="skin:vinylcontrol.xml"/>
+      </WidgetGroup>
 
     </Children>
   </WidgetGroup>
diff --git a/res/skins/Deere/effect_button_parameter.xml b/res/skins/Deere/effect_button_parameter.xml
index 54685ca9b578..38084b77780e 100644
--- a/res/skins/Deere/effect_button_parameter.xml
+++ b/res/skins/Deere/effect_button_parameter.xml
@@ -19,7 +19,6 @@
           <EffectPushButton>
             <Size>55f,15f</Size>
             <ObjectName>EffectButton</ObjectName>
-            <TooltipId>EffectSlot_button_parameter</TooltipId>
             <EffectRack><Variable name="EffectRack"/></EffectRack>
             <EffectUnit><Variable name="EffectUnit"/></EffectUnit>
             <Effect><Variable name="Effect"/></Effect>
diff --git a/res/skins/Deere/effect_focus_button.xml b/res/skins/Deere/effect_focus_button.xml
index 36c784f7c756..31737fff674f 100644
--- a/res/skins/Deere/effect_focus_button.xml
+++ b/res/skins/Deere/effect_focus_button.xml
@@ -12,7 +12,7 @@ Variables:
     <Layout>horizontal</Layout>
     <Children>
       <PushButton>
-        <TooltipId><Variable name="button_TooltipId"/></TooltipId>
+        <TooltipId>EffectSlot_focus</TooltipId>
         <ObjectName>CircleButton</ObjectName>
         <Size>15f,15f</Size>
         <NumberStates>2</NumberStates>
@@ -31,7 +31,7 @@ Variables:
         <Connection>
           <ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],focused_effect</ConfigKey>
           <ButtonState>LeftButton</ButtonState>
-          <EmitOnPressAndRelease>false</EmitOnPressAndRelease>
+          <EmitOnDownPress>true</EmitOnDownPress>
           <Transform>
             <IsEqual><Variable name="Effect"/></IsEqual>
           </Transform>
@@ -39,7 +39,7 @@ Variables:
         <Connection>
           <ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],focused_effect</ConfigKey>
           <ButtonState>RightButton</ButtonState>
-          <EmitOnPressAndRelease>false</EmitOnPressAndRelease>
+          <EmitOnDownPress>true</EmitOnDownPress>
           <Transform>
             <IsEqual><Variable name="Effect"/></IsEqual>
             <Not/>
diff --git a/res/skins/Deere/effect_meta_knob.xml b/res/skins/Deere/effect_meta_knob.xml
index f087e523e2b2..14bd0b3ed110 100644
--- a/res/skins/Deere/effect_meta_knob.xml
+++ b/res/skins/Deere/effect_meta_knob.xml
@@ -14,6 +14,7 @@
     <Size>40f,34f</Size>
     <Children>
       <Template src="skin:knob.xml">
+        <SetVariable name="TooltipId">EffectSlot_metaknob</SetVariable>
         <SetVariable name="group">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>_Effect<Variable name="Effect"/>]</SetVariable>
         <SetVariable name="control">meta</SetVariable>
         <SetVariable name="color">yellow</SetVariable>
diff --git a/res/skins/Deere/effect_rack.xml b/res/skins/Deere/effect_rack.xml
index cb810ffd035b..df17c4c97daa 100644
--- a/res/skins/Deere/effect_rack.xml
+++ b/res/skins/Deere/effect_rack.xml
@@ -14,33 +14,60 @@ Container for all the effect units
         <ObjectName>EffectRackContainer</ObjectName>
         <SizePolicy>me,min</SizePolicy>
         <Children>
+
+          <!-- Use another WidgetGroup wrapper so the WidgetStack does not interfere with showing
+          the second row. -->
           <WidgetGroup>
-            <ObjectName>EffectUnitsRow1</ObjectName>
-            <Layout>horizontal</Layout>
-            <MinimumSize>-1,50</MinimumSize>
-            <MaximumSize>-1,195</MaximumSize>
-            <SizePolicy>me,me</SizePolicy>
+            <Layout>vertical</Layout>
             <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>
+              <WidgetGroup>
+                <ObjectName>EffectUnitsRow1</ObjectName>
+                <Layout>horizontal</Layout>
+                <MinimumSize>-1,50</MinimumSize>
+                <MaximumSize>-1,195</MaximumSize>
+                <SizePolicy>me,me</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>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <ObjectName>EffectUnitsRow2</ObjectName>
+                <Layout>horizontal</Layout>
+                <MinimumSize>-1,50</MinimumSize>
+                <MaximumSize>-1,195</MaximumSize>
+                <SizePolicy>me,me</SizePolicy>
+                <Children>
+                  <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>
+                <Connection>
+                  <ConfigKey>[Master],show_4effectunits</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+
             </Children>
           </WidgetGroup>
+
         </Children>
       </WidgetStack>
     </Children>
-    <Connection>
-      <ConfigKey>[Master],maximize_library</ConfigKey>
-      <BindProperty>visible</BindProperty>
-      <Transform>
-        <Not/>
-      </Transform>
-    </Connection>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/effect_single_no_parameters.xml b/res/skins/Deere/effect_single_no_parameters.xml
index 94f2284b2b44..cbf178493577 100644
--- a/res/skins/Deere/effect_single_no_parameters.xml
+++ b/res/skins/Deere/effect_single_no_parameters.xml
@@ -11,14 +11,13 @@ Variables:
   <WidgetGroup>
     <ObjectName>FocusableEffect</ObjectName>
     <Layout>vertical</Layout>
+    <SizePolicy>max,max</SizePolicy>
     <Children>
 
       <WidgetGroup>
         <ObjectName>EffectHighlightable</ObjectName>
         <Layout>vertical</Layout>
-        <SizePolicy>max,f</SizePolicy>
-        <MinimumSize>-1,65</MinimumSize>
-        <MaximumSize>-1,75</MaximumSize>
+        <Size>-1max,70f</Size>
         <Children>
 
           <WidgetGroup>
diff --git a/res/skins/Deere/effect_single_with_parameters.xml b/res/skins/Deere/effect_single_with_parameters.xml
index 3c67143c93c5..db8ea1c2e0ad 100644
--- a/res/skins/Deere/effect_single_with_parameters.xml
+++ b/res/skins/Deere/effect_single_with_parameters.xml
@@ -9,7 +9,7 @@ Variables:
 <!DOCTYPE template>
 <Template>
   <WidgetGroup>
-    <ObjectName>EffectHighlightable</ObjectName>
+    <ObjectName>EffectHighlightableContainer</ObjectName>
     <Layout>horizontal</Layout>
     <Children>
 
diff --git a/res/skins/Deere/effect_unit.xml b/res/skins/Deere/effect_unit.xml
index ad59515ebbde..075398656fed 100644
--- a/res/skins/Deere/effect_unit.xml
+++ b/res/skins/Deere/effect_unit.xml
@@ -11,8 +11,8 @@
   <WidgetGroup>
     <ObjectName>EffectUnit<Variable name="EffectUnit"/></ObjectName>
     <Layout>vertical</Layout>
-    <SizePolicy>me,min</SizePolicy>
-    <MinimumSize>-1,50</MinimumSize>
+    <SizePolicy>me,me</SizePolicy>
+    <MinimumSize>-1,65</MinimumSize>
     <MaximumSize>-1,195</MaximumSize>
     <Children>
       <WidgetGroup>
@@ -25,174 +25,50 @@
             <ObjectName>EffectUnitGroupControlsLeft</ObjectName>
             <Layout>horizontal</Layout>
             <Children>
-
               <Template src="skin:hide_show_button.xml">
                 <SetVariable name="object_name">EffectUnitToggle</SetVariable>
-                <SetVariable name="control"><Variable name="group"/>,show_parameters</SetVariable>
+                <SetVariable name="TooltipId">EffectUnit_show_parameters</SetVariable>
+                <SetVariable name="control">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],show_parameters</SetVariable>
               </Template>
-
             </Children>
           </WidgetGroup>
 
+          <Template src="skin:spacer_h.xml"/>
+          <Label>
+            <ObjectName>EffectUnitLabel</ObjectName>
+            <Text>FX<Variable name="EffectUnit"/></Text>
+          </Label>
+          <Template src="skin:spacer_h.xml"/>
+
           <WidgetGroup>
             <ObjectName>EffectUnitGroupControlsRight</ObjectName>
             <Layout>horizontal</Layout>
             <Children>
 
-              <Template src="skin:effect_unit_group_control_button.xml">
-                <SetVariable name="group_name">Head</SetVariable>
-                <SetVariable name="group_group">[Headphone]</SetVariable>
-              </Template>
-
-              <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">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>
-
-              <Template src="skin:effect_unit_group_control_button.xml">
-                <SetVariable name="group_name">CH3</SetVariable>
-                <SetVariable name="group_group">[Channel3]</SetVariable>
+              <Template src="skin:left_2state_button.xml">
+                <SetVariable name="TooltipId">EffectUnit_headphones_enabled</SetVariable>
+                <SetVariable name="ObjectName">FxAssignmentButton</SetVariable>
+                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                <SetVariable name="state_0_pressed">icon/ic_headphones_48px.svg</SetVariable>
+                <SetVariable name="state_0_unpressed">icon/ic_headphones_48px.svg</SetVariable>
+                <SetVariable name="state_1_pressed">icon/ic_headphones_48px.svg</SetVariable>
+                <SetVariable name="state_1_unpressed">icon/ic_headphones_48px.svg</SetVariable>
+                <SetVariable name="left_connection_control">[EffectRack1_EffectUnit<Variable name="EffectUnit"/>],group_[Headphone]_enable</SetVariable>
               </Template>
 
-              <Template src="skin:effect_unit_group_control_button.xml">
-                <SetVariable name="group_name">CH4</SetVariable>
-                <SetVariable name="group_group">[Channel4]</SetVariable>
+              <Template src="skin:left_2state_button.xml">
+                <SetVariable name="TooltipId">EffectUnit_master_enabled</SetVariable>
+                <SetVariable name="ObjectName">FxAssignmentButton</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_text">Master</SetVariable>
+                <SetVariable name="state_1_text">Master</SetVariable>
+                <SetVariable name="left_connection_control">[EffectRack1_EffectUnit<Variable name="EffectUnit"/>],group_[Master]_enable</SetVariable>
               </Template>
 
-              <!-- Optionally display Mic 1-4 and Aux 1-4 FX arm buttons if these
-                  channels are configured in the Sound Hardware preferences.
-                    We have to use WidgetGroups here, because we can't connect
-                  <BindProperty> directly to templates. -->
-              <WidgetGroup>
-                <ObjectName>EffectUnitGroupControls</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>max,min</SizePolicy>
-                <Children>
-                  <WidgetGroup>
-                    <Layout>vertical</Layout>
-                    <Children>
-                      <Template src="skin:effect_unit_group_control_button.xml">
-                        <SetVariable name="group_name">MIC1</SetVariable>
-                        <SetVariable name="group_group">[Microphone]</SetVariable>
-                      </Template>
-                    </Children>
-                    <Connection>
-                      <ConfigKey>[Microphone],enabled</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup>
-
-                  <WidgetGroup>
-                    <Layout>vertical</Layout>
-                    <Children>
-                      <Template src="skin:effect_unit_group_control_button.xml">
-                        <SetVariable name="group_name">MIC2</SetVariable>
-                        <SetVariable name="group_group">[Microphone2]</SetVariable>
-                      </Template>
-                    </Children>
-                    <Connection>
-                      <ConfigKey>[Microphone2],enabled</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup>
-
-                  <WidgetGroup>
-                    <Layout>vertical</Layout>
-                    <Children>
-                      <Template src="skin:effect_unit_group_control_button.xml">
-                        <SetVariable name="group_name">MIC3</SetVariable>
-                        <SetVariable name="group_group">[Microphone3]</SetVariable>
-                      </Template>
-                    </Children>
-                    <Connection>
-                      <ConfigKey>[Microphone3],enabled</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup>
-
-                  <WidgetGroup>
-                    <Layout>vertical</Layout>
-                    <Children>
-                      <Template src="skin:effect_unit_group_control_button.xml">
-                        <SetVariable name="group_name">MIC4</SetVariable>
-                        <SetVariable name="group_group">[Microphone4]</SetVariable>
-                      </Template>
-                    </Children>
-                    <Connection>
-                      <ConfigKey>[Microphone4],enabled</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup>
-
-                  <WidgetGroup>
-                    <Layout>vertical</Layout>
-                      <Children>
-                      <Template src="skin:effect_unit_group_control_button.xml">
-                        <SetVariable name="group_name">Aux1</SetVariable>
-                        <SetVariable name="group_group">[Auxiliary1]</SetVariable>
-                      </Template>
-                    </Children>
-                    <Connection>
-                      <ConfigKey>[Auxiliary1],enabled</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup>
-
-                  <WidgetGroup>
-                    <Layout>vertical</Layout>
-                      <Children>
-                      <Template src="skin:effect_unit_group_control_button.xml">
-                        <SetVariable name="group_name">Aux2</SetVariable>
-                        <SetVariable name="group_group">[Auxiliary2]</SetVariable>
-                      </Template>
-                    </Children>
-                    <Connection>
-                      <ConfigKey>[Auxiliary2],enabled</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup>
-
-                  <WidgetGroup>
-                    <Layout>vertical</Layout>
-                      <Children>
-                      <Template src="skin:effect_unit_group_control_button.xml">
-                        <SetVariable name="group_name">Aux3</SetVariable>
-                        <SetVariable name="group_group">[Auxiliary3]</SetVariable>
-                      </Template>
-                    </Children>
-                    <Connection>
-                      <ConfigKey>[Auxiliary3],enabled</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup>
-
-                  <WidgetGroup>
-                    <Layout>vertical</Layout>
-                      <Children>
-                      <Template src="skin:effect_unit_group_control_button.xml">
-                        <SetVariable name="group_name">Aux4</SetVariable>
-                        <SetVariable name="group_group">[Auxiliary4]</SetVariable>
-                      </Template>
-                    </Children>
-                    <Connection>
-                      <ConfigKey>[Auxiliary4],enabled</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
-                  </WidgetGroup>
-
-                </Children>
-              </WidgetGroup>
-
             </Children>
           </WidgetGroup>
 
diff --git a/res/skins/Deere/effect_unit_no_parameters.xml b/res/skins/Deere/effect_unit_no_parameters.xml
index 095a9d66ba40..eb9d8d58ea93 100644
--- a/res/skins/Deere/effect_unit_no_parameters.xml
+++ b/res/skins/Deere/effect_unit_no_parameters.xml
@@ -47,15 +47,25 @@ Variables:
           <WidgetGroup>
             <ObjectName>EffectUnitControls</ObjectName>
             <Layout>horizontal</Layout>
-            <SizePolicy>min,min</SizePolicy>
+            <SizePolicy>max,min</SizePolicy>
             <MaximumSize>100,50</MaximumSize>
             <Children>
-              <Template src="skin:knob_with_label.xml">
-                <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
-                <SetVariable name="control">super1</SetVariable>
-                <SetVariable name="label">Super</SetVariable>
-                <SetVariable name="color">yellow</SetVariable>
-              </Template>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Connection>
+                  <ConfigKey>[Master],show_superknobs</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+                <Children>
+                  <Template src="skin:knob_with_label.xml">
+                    <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
+                    <SetVariable name="control">super1</SetVariable>
+                    <SetVariable name="label">Super</SetVariable>
+                    <SetVariable name="color">yellow</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
 
               <Template src="skin:knob_with_label.xml">
                 <SetVariable name="TooltipId">EffectUnit_mix</SetVariable>
diff --git a/res/skins/Deere/effect_unit_with_parameters.xml b/res/skins/Deere/effect_unit_with_parameters.xml
index 79abb92648a1..2ecccfdcc239 100644
--- a/res/skins/Deere/effect_unit_with_parameters.xml
+++ b/res/skins/Deere/effect_unit_with_parameters.xml
@@ -14,7 +14,7 @@ Variables:
     <SizePolicy>me,max</SizePolicy>
     <!-- A little more vertical space is needed when show_focus is 1 because of the focused effect's border.-->
     <MinimumSize>-1,150</MinimumSize>
-    <MaximumSize>-1,180</MaximumSize>
+    <MaximumSize>-1,190</MaximumSize>
     <Children>
 
       <WidgetGroup>
@@ -53,12 +53,21 @@ Variables:
                 <SetVariable name="color">blue</SetVariable>
               </Template>
 
-              <Template src="skin:knob_with_label.xml">
-                <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
-                <SetVariable name="control">super1</SetVariable>
-                <SetVariable name="label">Super</SetVariable>
-                <SetVariable name="color">yellow</SetVariable>
-              </Template>
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Connection>
+                  <ConfigKey>[Master],show_superknobs</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+                <Children>
+                  <Template src="skin:knob_with_label.xml">
+                    <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
+                    <SetVariable name="control">super1</SetVariable>
+                    <SetVariable name="label">Super</SetVariable>
+                    <SetVariable name="color">yellow</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
 
             </Children>
           </WidgetGroup>
diff --git a/res/skins/Deere/equalizer_rack_parameter.xml b/res/skins/Deere/equalizer_rack_parameter.xml
deleted file mode 100644
index 3e365950dfef..000000000000
--- a/res/skins/Deere/equalizer_rack_parameter.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    An equalizer rack parameter for the provided group.
-    Assumes the equalizer is effect 1 in the unit.
-  Variables:
-    group: the group
-    parameter: the parameter number
-    color: the notch color. red, green, yellow, blue or light_blue.
--->
-<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>
-    <Children>
-      <WidgetGroup>
-        <Layout>vertical</Layout>
-        <Children>
-          <WidgetGroup>
-            <Size>15f,21f</Size>
-            <Children>
-              <EffectPushButton>
-                <TooltipId><Variable name="button_TooltipId"/></TooltipId>
-                <Size>15f,15f</Size>
-                <ObjectName>MixerButton</ObjectName>
-                <EffectRackGroup><Variable name="EqualizerRackGroup"/></EffectRackGroup>
-                <EffectUnitGroup><Variable name="EqualizerEffectUnitGroup"/></EffectUnitGroup>
-                <Effect><Variable name="EffectNumber"/></Effect>
-                <EffectButtonParameter><Variable name="parameter"/></EffectButtonParameter>
-                <NumberStates>2</NumberStates>
-                <State>
-                  <Number>0</Number>
-                  <Text></Text>
-                  <Pressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_off_48px.svg</Pressed>
-                  <Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_off_48px.svg</Unpressed>
-                </State>
-                <State>
-                  <Number>1</Number>
-                  <Text></Text>
-                  <Pressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Pressed>
-                  <Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Unpressed>
-                </State>
-                <Connection>
-                  <ConfigKey><Variable name="EqualizerEffectGroup"/>,button_parameter<Variable name="parameter"/></ConfigKey>
-                  <ButtonState>LeftButton</ButtonState>
-                </Connection>
-              </EffectPushButton>
-            </Children>
-          </WidgetGroup>
-
-          <!-- Button parameter names for the eqs are too long.
-               Commented out until we have short parameter names -->
-<!--
-          <EffectButtonParameterName>
-            <Size>30f,10f</Size>
-            <ObjectName>KnobLabel</ObjectName>
-            <EffectRackGroup><Variable name="EqualizerRackGroup"/></EffectRackGroup>
-            <EffectUnitGroup><Variable name="EqualizerEffectUnitGroup"/></EffectUnitGroup>
-            <Effect><Variable name="EffectNumber"/></Effect>
-            <EffectButtonParameter><Variable name="parameter"/></EffectButtonParameter>
-          </EffectButtonParameterName>
--->
-        </Children>
-      </WidgetGroup>
-      <WidgetGroup>
-        <Layout>vertical</Layout>
-        <Children>
-          <Template src="skin:knob.xml">
-            <SetVariable name="group"><Variable name="EqualizerEffectGroup"/></SetVariable>
-            <SetVariable name="control">parameter<Variable name="parameter"/></SetVariable>
-            <SetVariable name="color"><Variable name="color"/></SetVariable>
-          </Template>
-          <EffectParameterName>
-            <Size>40f,10f</Size>
-            <ObjectName>KnobLabel</ObjectName>
-            <EffectRackGroup><Variable name="EqualizerRackGroup"/></EffectRackGroup>
-            <EffectUnitGroup><Variable name="EqualizerEffectUnitGroup"/></EffectUnitGroup>
-            <Effect><Variable name="EffectNumber"/></Effect>
-            <EffectParameter><Variable name="parameter"/></EffectParameter>
-          </EffectParameterName>
-        </Children>
-      </WidgetGroup>
-    </Children>
-    <Connection>
-      <ConfigKey><Variable name="EqualizerEffectGroup"/>,parameter<Variable name="parameter"/>_loaded</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/Deere/equalizer_rack_parameter_left.xml b/res/skins/Deere/equalizer_rack_parameter_left.xml
new file mode 100644
index 000000000000..5cc2f31b543b
--- /dev/null
+++ b/res/skins/Deere/equalizer_rack_parameter_left.xml
@@ -0,0 +1,118 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    An equalizer rack parameter for the provided group.
+    Assumes the equalizer is effect 1 in the unit.
+  Variables:
+    group: the group
+    parameter: the parameter number
+    color: the notch color. red, green, yellow, blue or light_blue.
+-->
+<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>
+    <Children>
+
+      <!--Wrap the EffectPushButton in a vertical WidgetGroup with spacers to ensure it stays in the
+      correct position when the knobs get further apart and closer together.-->
+      <WidgetGroup>
+        <Layout>vertical</Layout>
+        <Children>
+
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <Size>15f,12f</Size>
+            <Children/>
+          </WidgetGroup>
+
+          <EffectPushButton>
+            <TooltipId><Variable name="button_TooltipId"/></TooltipId>
+            <Size>15f,15f</Size>
+            <ObjectName>CircleButton</ObjectName>
+            <EffectRackGroup><Variable name="EqualizerRackGroup"/></EffectRackGroup>
+            <EffectUnitGroup><Variable name="EqualizerEffectUnitGroup"/></EffectUnitGroup>
+            <Effect><Variable name="EffectNumber"/></Effect>
+            <EffectButtonParameter><Variable name="parameter"/></EffectButtonParameter>
+            <NumberStates>2</NumberStates>
+            <State>
+              <Number>0</Number>
+              <Text></Text>
+              <Pressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_off_48px.svg</Pressed>
+              <Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_off_48px.svg</Unpressed>
+            </State>
+            <State>
+              <Number>1</Number>
+              <Text></Text>
+              <Pressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Pressed>
+              <Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Unpressed>
+            </State>
+            <Connection>
+              <ConfigKey><Variable name="EqualizerEffectGroup"/>,button_parameter<Variable name="parameter"/></ConfigKey>
+              <ButtonState>LeftButton</ButtonState>
+            </Connection>
+          </EffectPushButton>
+
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <Size>15f,-1me</Size>
+            <Children/>
+          </WidgetGroup>
+
+        </Children>
+      </WidgetGroup>
+
+      <SizeAwareStack>
+        <Size>40f,-1me</Size>
+        <Children>
+
+          <WidgetGroup>
+            <ObjectName>EQKnobNoLabel</ObjectName>
+            <MinimumSize>40,34</MinimumSize>
+            <MaximumSize>40,41</MaximumSize>
+            <Layout>vertical</Layout>
+            <Children>
+              <Template src="skin:knob.xml">
+                <SetVariable name="group"><Variable name="EqualizerEffectGroup"/></SetVariable>
+                <SetVariable name="control">parameter<Variable name="parameter"/></SetVariable>
+                <SetVariable name="color"><Variable name="color"/></SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>EQKnobWithLabel</ObjectName>
+            <MinimumSize>40,42</MinimumSize>
+            <MaximumSize>40,45</MaximumSize>
+            <Layout>vertical</Layout>
+            <Children>
+              <Template src="skin:knob.xml">
+                <SetVariable name="group"><Variable name="EqualizerEffectGroup"/></SetVariable>
+                <SetVariable name="control">parameter<Variable name="parameter"/></SetVariable>
+                <SetVariable name="color"><Variable name="color"/></SetVariable>
+              </Template>
+              <EffectParameterName>
+                <Size>40f,10f</Size>
+                <ObjectName>KnobLabel</ObjectName>
+                <EffectRackGroup><Variable name="EqualizerRackGroup"/></EffectRackGroup>
+                <EffectUnitGroup><Variable name="EqualizerEffectUnitGroup"/></EffectUnitGroup>
+                <Effect><Variable name="EffectNumber"/></Effect>
+                <EffectParameter><Variable name="parameter"/></EffectParameter>
+              </EffectParameterName>
+            </Children>
+          </WidgetGroup>
+
+        </Children>
+      </SizeAwareStack>
+
+    </Children>
+    <Connection>
+      <ConfigKey><Variable name="EqualizerEffectGroup"/>,parameter<Variable name="parameter"/>_loaded</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Deere/equalizer_rack_parameter_right.xml b/res/skins/Deere/equalizer_rack_parameter_right.xml
new file mode 100644
index 000000000000..b5d455718018
--- /dev/null
+++ b/res/skins/Deere/equalizer_rack_parameter_right.xml
@@ -0,0 +1,118 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    An equalizer rack parameter for the provided group.
+    Assumes the equalizer is effect 1 in the unit.
+  Variables:
+    group: the group
+    parameter: the parameter number
+    color: the notch color. red, green, yellow, blue or light_blue.
+-->
+<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>
+    <Children>
+
+      <SizeAwareStack>
+        <Size>40f,-1me</Size>
+        <Children>
+
+          <WidgetGroup>
+            <ObjectName>EQKnobNoLabel</ObjectName>
+            <MinimumSize>40,34</MinimumSize>
+            <MaximumSize>40,41</MaximumSize>
+            <Layout>vertical</Layout>
+            <Children>
+              <Template src="skin:knob.xml">
+                <SetVariable name="group"><Variable name="EqualizerEffectGroup"/></SetVariable>
+                <SetVariable name="control">parameter<Variable name="parameter"/></SetVariable>
+                <SetVariable name="color"><Variable name="color"/></SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>EQKnobWithLabel</ObjectName>
+            <MinimumSize>40,42</MinimumSize>
+            <MaximumSize>40,45</MaximumSize>
+            <Layout>vertical</Layout>
+            <Children>
+              <Template src="skin:knob.xml">
+                <SetVariable name="group"><Variable name="EqualizerEffectGroup"/></SetVariable>
+                <SetVariable name="control">parameter<Variable name="parameter"/></SetVariable>
+                <SetVariable name="color"><Variable name="color"/></SetVariable>
+              </Template>
+              <EffectParameterName>
+                <Size>40f,10f</Size>
+                <ObjectName>KnobLabel</ObjectName>
+                <EffectRackGroup><Variable name="EqualizerRackGroup"/></EffectRackGroup>
+                <EffectUnitGroup><Variable name="EqualizerEffectUnitGroup"/></EffectUnitGroup>
+                <Effect><Variable name="EffectNumber"/></Effect>
+                <EffectParameter><Variable name="parameter"/></EffectParameter>
+              </EffectParameterName>
+            </Children>
+          </WidgetGroup>
+
+        </Children>
+      </SizeAwareStack>
+
+      <!--Wrap the EffectPushButton in a vertical WidgetGroup with spacers to ensure it stays in the
+      correct position when the knobs get further apart and closer together.-->
+      <WidgetGroup>
+        <Layout>vertical</Layout>
+        <Children>
+
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <Size>15f,12f</Size>
+            <Children/>
+          </WidgetGroup>
+
+          <EffectPushButton>
+            <TooltipId><Variable name="button_TooltipId"/></TooltipId>
+            <Size>15f,15f</Size>
+            <ObjectName>CircleButton</ObjectName>
+            <EffectRackGroup><Variable name="EqualizerRackGroup"/></EffectRackGroup>
+            <EffectUnitGroup><Variable name="EqualizerEffectUnitGroup"/></EffectUnitGroup>
+            <Effect><Variable name="EffectNumber"/></Effect>
+            <EffectButtonParameter><Variable name="parameter"/></EffectButtonParameter>
+            <NumberStates>2</NumberStates>
+            <State>
+              <Number>0</Number>
+              <Text></Text>
+              <Pressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_off_48px.svg</Pressed>
+              <Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_off_48px.svg</Unpressed>
+            </State>
+            <State>
+              <Number>1</Number>
+              <Text></Text>
+              <Pressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Pressed>
+              <Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Unpressed>
+            </State>
+            <Connection>
+              <ConfigKey><Variable name="EqualizerEffectGroup"/>,button_parameter<Variable name="parameter"/></ConfigKey>
+              <ButtonState>LeftButton</ButtonState>
+            </Connection>
+          </EffectPushButton>
+
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <Size>15f,-1me</Size>
+            <Children/>
+          </WidgetGroup>
+
+        </Children>
+      </WidgetGroup>
+
+    </Children>
+    <Connection>
+      <ConfigKey><Variable name="EqualizerEffectGroup"/>,parameter<Variable name="parameter"/>_loaded</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Deere/fx_unit_group_assignment_button.xml b/res/skins/Deere/fx_unit_group_assignment_button.xml
new file mode 100644
index 000000000000..e2cdc6c87715
--- /dev/null
+++ b/res/skins/Deere/fx_unit_group_assignment_button.xml
@@ -0,0 +1,12 @@
+<Template>
+  <Template src="skin:left_2state_button.xml">
+    <SetVariable name="TooltipId">EffectUnit_<Variable name="SourceType"/>_enabled</SetVariable>
+    <SetVariable name="ObjectName">FxAssignmentButton</SetVariable>
+    <SetVariable name="MinimumSize"><Variable name="FXAssignmentButtonMinimumSize"/></SetVariable>
+    <SetVariable name="MaximumSize"><Variable name="FXAssignmentButtonMaximumSize"/></SetVariable>
+    <SetVariable name="SizePolicy"><Variable name="FXAssignmentButtonSizePolicy"/></SetVariable>
+    <SetVariable name="state_0_text">FX<Variable name="EffectUnit"/></SetVariable>
+    <SetVariable name="state_1_text">FX<Variable name="EffectUnit"/></SetVariable>
+    <SetVariable name="left_connection_control">[EffectRack1_EffectUnit<Variable name="EffectUnit"/>],group_<Variable name="group"/>_enable</SetVariable>
+  </Template>
+</Template>
diff --git a/res/skins/Deere/hide_show_button.xml b/res/skins/Deere/hide_show_button.xml
index 2f0f1c3a3155..bc77db3bdb4d 100644
--- a/res/skins/Deere/hide_show_button.xml
+++ b/res/skins/Deere/hide_show_button.xml
@@ -8,6 +8,7 @@
 <Template>
   <PushButton>
     <ObjectName><Variable name="object_name"/></ObjectName>
+    <TooltipId><Variable name="TooltipId"/></TooltipId>
     <Size>20f,20f</Size>
     <NumberStates>2</NumberStates>
     <State>
diff --git a/res/skins/Deere/hotcue.xml b/res/skins/Deere/hotcue.xml
index 54af96d7f4ca..b2f0bccb9dfa 100644
--- a/res/skins/Deere/hotcue.xml
+++ b/res/skins/Deere/hotcue.xml
@@ -10,10 +10,11 @@
   <WidgetGroup>
     <ObjectName>HotcueGrid</ObjectName>
     <Layout>vertical</Layout>
-    <SizePolicy>max,max</SizePolicy>
+    <SizePolicy>min,min</SizePolicy>
     <Children>
       <WidgetGroup>
         <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
         <Children>
           <Template src="skin:hotcue_button.xml">
             <SetVariable name="hotcue">1</SetVariable>
@@ -26,6 +27,7 @@
 
       <WidgetGroup>
         <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
         <Children>
           <Template src="skin:hotcue_button.xml">
             <SetVariable name="hotcue">3</SetVariable>
@@ -37,7 +39,7 @@
       </WidgetGroup>
     </Children>
     <Connection>
-      <ConfigKey persist="true">[Deere],show_more_hotcues</ConfigKey>
+      <ConfigKey>[Deere],show_more_hotcues</ConfigKey>
       <BindProperty>visible</BindProperty>
       <Transform>
         <Not/>
@@ -49,11 +51,11 @@
   <WidgetGroup>
     <ObjectName>HotcueGridExtended</ObjectName>
     <Layout>vertical</Layout>
-    <SizePolicy>max,max</SizePolicy>
+    <SizePolicy>min,min</SizePolicy>
     <Children>
       <WidgetGroup>
-        <ObjectName>HotcueGridExtendedRow1</ObjectName>
         <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
         <Children>
           <Template src="skin:hotcue_button.xml">
             <SetVariable name="hotcue">1</SetVariable>
@@ -71,8 +73,8 @@
       </WidgetGroup>
 
       <WidgetGroup>
-        <ObjectName>HotcueGridExtendedRow2</ObjectName>
         <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
         <Children>
           <Template src="skin:hotcue_button.xml">
             <SetVariable name="hotcue">5</SetVariable>
@@ -90,7 +92,7 @@
       </WidgetGroup>
     </Children>
     <Connection>
-      <ConfigKey persist="true">[Deere],show_more_hotcues</ConfigKey>
+      <ConfigKey>[Deere],show_more_hotcues</ConfigKey>
       <BindProperty>visible</BindProperty>
     </Connection>
   </WidgetGroup>
diff --git a/res/skins/Deere/icon/ic_beatjump_backward_48px.svg b/res/skins/Deere/icon/ic_beatjump_backward_48px.svg
index f42779c50001..abfa27ef0814 100644
--- a/res/skins/Deere/icon/ic_beatjump_backward_48px.svg
+++ b/res/skins/Deere/icon/ic_beatjump_backward_48px.svg
@@ -12,7 +12,7 @@
    version="1.1"
    viewBox="0 0 48 48.000001"
    id="svg2"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.92.0 r"
    sodipodi:docname="ic_beatjump_backward_48px.svg">
   <metadata
      id="metadata10">
@@ -22,6 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -37,19 +38,20 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1366"
-     inkscape:window-height="702"
+     inkscape:window-height="696"
      id="namedview6"
      showgrid="false"
-     inkscape:zoom="4.9166667"
-     inkscape:cx="25.220339"
-     inkscape:cy="24"
+     inkscape:zoom="6.9532167"
+     inkscape:cx="22.167859"
+     inkscape:cy="16.318391"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg2" />
   <path
-     d="m 29,38 0,-8 12,0 0,-12 -12,0 0,-8 -14,14 14,14 z m -18,-28 -4,0 0,28 4,0 0,-28 z"
-     id="path4"
+     style="fill:#d2d2d2;fill-opacity:1"
+     d="m 23,10.143818 v 8 h 16 v 12 H 23 v 8 l -14,-14 z"
+     id="path815"
      inkscape:connector-curvature="0"
-     style="fill:#d2d2d2;fill-opacity:1" />
+     sodipodi:nodetypes="cccccccc" />
 </svg>
diff --git a/res/skins/Deere/icon/ic_beatjump_forward_48px.svg b/res/skins/Deere/icon/ic_beatjump_forward_48px.svg
index 59f8c4772e75..9d37219e529c 100644
--- a/res/skins/Deere/icon/ic_beatjump_forward_48px.svg
+++ b/res/skins/Deere/icon/ic_beatjump_forward_48px.svg
@@ -12,7 +12,7 @@
    version="1.1"
    viewBox="0 0 48 48.000001"
    id="svg2"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.92.0 r"
    sodipodi:docname="ic_beatjump_forward_48px.svg">
   <metadata
      id="metadata10">
@@ -22,6 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -37,19 +38,20 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1366"
-     inkscape:window-height="702"
+     inkscape:window-height="696"
      id="namedview6"
      showgrid="false"
-     inkscape:zoom="4.9166667"
-     inkscape:cx="25.220339"
-     inkscape:cy="24.813559"
+     inkscape:zoom="6.9532167"
+     inkscape:cx="22.167859"
+     inkscape:cy="16.318391"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg2" />
   <path
-     d="m 19,38 0,-8 -12,0 0,-12 12,0 0,-8 14,14 -14,14 z m 18,-28 4,0 0,28 -4,0 0,-28 z"
-     id="path4"
+     style="fill:#d2d2d2;fill-opacity:1"
+     d="m 25,10.143818 v 8 H 9 v 12 h 16 v 8 l 14,-14 z"
+     id="path815"
      inkscape:connector-curvature="0"
-     style="fill:#d2d2d2;fill-opacity:1" />
+     sodipodi:nodetypes="cccccccc" />
 </svg>
diff --git a/res/skins/Deere/icon/ic_beatloop_activate_48px.svg b/res/skins/Deere/icon/ic_beatloop_activate_48px.svg
new file mode 100644
index 000000000000..7ba4d7bf471c
--- /dev/null
+++ b/res/skins/Deere/icon/ic_beatloop_activate_48px.svg
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.1 r"
+   sodipodi:docname="ic_beatloop_activate_48px.svg">
+  <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" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="696"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="8"
+     inkscape:cx="26.242536"
+     inkscape:cy="23.664913"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g4582"
+     showguides="false" />
+  <g
+     id="g1442"
+     transform="translate(-0.57527331,-3.5954582)">
+    <g
+       id="g1483">
+      <g
+         id="g1529">
+        <g
+           id="g1599">
+          <g
+             id="g1682">
+            <g
+               id="g5584">
+              <g
+                 id="g4512"
+                 transform="matrix(0.91901433,0,0,0.91901433,3.2709235,0.4847081)">
+                <g
+                   id="g4582"
+                   transform="translate(1.0827335,2.6254634)">
+                  <g
+                     id="g4665"
+                     transform="translate(-0.22111811,0.33681175)">
+                    <path
+                       id="path1420"
+                       d="M 21.103425,5.6576367 9.8499648,14.394813 21.103425,23.13199 c 0,-17.4743533 0,-17.4743533 0,-17.4743533 z"
+                       style="fill:#d2d2d2;fill-opacity:1;stroke-width:1.2394774"
+                       inkscape:connector-curvature="0" />
+                    <rect
+                       ry="1.7515807"
+                       y="12.321955"
+                       x="17.019028"
+                       height="3.5031614"
+                       width="21.394632"
+                       id="rect4490"
+                       style="opacity:1;fill:#d2d2d2;fill-opacity:1;fill-rule:evenodd;stroke:#d2d2d2;stroke-width:0.06048824;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+                    <rect
+                       transform="rotate(90)"
+                       ry="1.7515807"
+                       y="-38.413658"
+                       x="12.321955"
+                       height="3.5031614"
+                       width="21.394632"
+                       id="rect4490-2"
+                       style="opacity:1;fill:#d2d2d2;fill-opacity:1;fill-rule:evenodd;stroke:#d2d2d2;stroke-width:0.06048824;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+                  </g>
+                  <g
+                     id="g4665-9"
+                     transform="rotate(-180,22.209564,26.705943)">
+                    <path
+                       id="path1420-2"
+                       d="M 21.103425,5.6576367 9.8499648,14.394813 21.103425,23.13199 c 0,-17.4743533 0,-17.4743533 0,-17.4743533 z"
+                       style="fill:#d2d2d2;fill-opacity:1;stroke-width:1.2394774"
+                       inkscape:connector-curvature="0" />
+                    <rect
+                       ry="1.7515807"
+                       y="12.321955"
+                       x="17.019028"
+                       height="3.5031614"
+                       width="21.394632"
+                       id="rect4490-0"
+                       style="opacity:1;fill:#d2d2d2;fill-opacity:1;fill-rule:evenodd;stroke:#d2d2d2;stroke-width:0.06048824;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+                    <rect
+                       transform="rotate(90)"
+                       ry="1.7515807"
+                       y="-38.413658"
+                       x="12.321955"
+                       height="3.5031614"
+                       width="21.394632"
+                       id="rect4490-2-2"
+                       style="opacity:1;fill:#d2d2d2;fill-opacity:1;fill-rule:evenodd;stroke:#d2d2d2;stroke-width:0.06048824;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+                  </g>
+                </g>
+              </g>
+            </g>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+  <g
+     transform="rotate(-90,35.771503,12.99943)"
+     id="g1442-5" />
+</svg>
diff --git a/res/skins/Deere/icon/ic_chevron_down_selector.svg b/res/skins/Deere/icon/ic_chevron_down_selector.svg
new file mode 100644
index 000000000000..044787d6c5b8
--- /dev/null
+++ b/res/skins/Deere/icon/ic_chevron_down_selector.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="14.83"
+   viewBox="0 0 24 14.83"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.0 r"
+   sodipodi:docname="ic_chevron_down_selector.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="696"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="4.9166667"
+     inkscape:cx="-6.330254"
+     inkscape:cy="13.23763"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <path
+     d="M 2.83,0 0,2.83 12,14.83 24,2.83 21.17,0 12,9.17 Z"
+     id="path4"
+     inkscape:connector-curvature="0"
+     style="fill:#d2d2d2;fill-opacity:1" />
+  <path
+     d="m -11.415,-16.585 h 48 v 48 h -48 z"
+     id="path6"
+     inkscape:connector-curvature="0"
+     style="fill:none" />
+</svg>
diff --git a/res/skins/Deere/icon/ic_chevron_down_selector_hover.svg b/res/skins/Deere/icon/ic_chevron_down_selector_hover.svg
new file mode 100644
index 000000000000..850e008c77eb
--- /dev/null
+++ b/res/skins/Deere/icon/ic_chevron_down_selector_hover.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="14.83"
+   viewBox="0 0 24 14.83"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.0 r"
+   sodipodi:docname="ic_chevron_down_selector_hover.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="696"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="4.9166667"
+     inkscape:cx="28.144322"
+     inkscape:cy="12.627461"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <path
+     d="M 2.83,0 0,2.83 12,14.83 24,2.83 21.17,0 12,9.17 Z"
+     id="path4"
+     inkscape:connector-curvature="0"
+     style="fill:#00a7f8;fill-opacity:1" />
+  <path
+     d="m -11.415,-16.585 h 48 v 48 h -48 z"
+     id="path6"
+     inkscape:connector-curvature="0"
+     style="fill:none" />
+</svg>
diff --git a/res/skins/Deere/icon/ic_chevron_up_48px.svg b/res/skins/Deere/icon/ic_chevron_up_48px.svg
new file mode 100644
index 000000000000..568a0b4600b9
--- /dev/null
+++ b/res/skins/Deere/icon/ic_chevron_up_48px.svg
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.0 r"
+   sodipodi:docname="ic_chevron_up_48px.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="696"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="4.9166667"
+     inkscape:cx="-21.864407"
+     inkscape:cy="29.212461"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     d="m 32.585,31.415 2.83,-2.83 -12,-12 -12,12 2.83,2.83 9.17,-9.17 z"
+     id="path4"
+     inkscape:connector-curvature="0"
+     style="fill:#d2d2d2;fill-opacity:1" />
+  <path
+     d="M0 0h48v48h-48z"
+     fill="none"
+     id="path6" />
+</svg>
diff --git a/res/skins/Deere/icon/ic_chevron_up_selector.svg b/res/skins/Deere/icon/ic_chevron_up_selector.svg
new file mode 100644
index 000000000000..09ea5cd16fb1
--- /dev/null
+++ b/res/skins/Deere/icon/ic_chevron_up_selector.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="14.83"
+   viewBox="0 0 24 14.83"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.0 r"
+   sodipodi:docname="ic_chevron_up_selector.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="696"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="4.9166667"
+     inkscape:cx="26.758448"
+     inkscape:cy="12.627461"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <path
+     d="M 21.17,14.83 24,12 12,0 0,12 2.83,14.83 12,5.66 Z"
+     id="path4"
+     inkscape:connector-curvature="0"
+     style="fill:#d2d2d2;fill-opacity:1" />
+  <path
+     d="m -11.415,-16.585 h 48 v 48 h -48 z"
+     id="path6"
+     inkscape:connector-curvature="0"
+     style="fill:none" />
+</svg>
diff --git a/res/skins/Deere/icon/ic_chevron_up_selector_hover.svg b/res/skins/Deere/icon/ic_chevron_up_selector_hover.svg
new file mode 100644
index 000000000000..5fc048f7d68d
--- /dev/null
+++ b/res/skins/Deere/icon/ic_chevron_up_selector_hover.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24"
+   height="14.83"
+   viewBox="0 0 24 14.83"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.0 r"
+   sodipodi:docname="ic_chevron_up_selector_hover.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="696"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="4.9166667"
+     inkscape:cx="28.144322"
+     inkscape:cy="12.627461"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <path
+     d="M 2.83,14.83 0,12 12,0 24,12 21.17,14.83 12,5.66 Z"
+     id="path4"
+     inkscape:connector-curvature="0"
+     style="fill:#00a7f8;fill-opacity:1" />
+  <path
+     d="m -11.415,-16.585 h 48 v 48 h -48 z"
+     id="path6"
+     inkscape:connector-curvature="0"
+     style="fill:none" />
+</svg>
diff --git a/res/skins/Deere/icon/ic_loop_48px.svg b/res/skins/Deere/icon/ic_loop_48px.svg
index 5381820ee031..edc617e33b18 100644
--- a/res/skins/Deere/icon/ic_loop_48px.svg
+++ b/res/skins/Deere/icon/ic_loop_48px.svg
@@ -12,7 +12,7 @@
    viewBox="0 0 48 48"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.92.1 r"
    sodipodi:docname="ic_loop_48px.svg">
   <metadata
      id="metadata12">
@@ -37,24 +37,72 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1366"
-     inkscape:window-height="702"
+     inkscape:window-height="696"
      id="namedview8"
      showgrid="false"
-     inkscape:zoom="4.9166667"
-     inkscape:cx="25.220339"
-     inkscape:cy="24.813559"
+     inkscape:zoom="6.9532167"
+     inkscape:cx="11.220471"
+     inkscape:cy="20.840735"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
+     inkscape:current-layer="g6198" />
   <path
-     d="m 24,8 0,-6 -8,8 8,8 0,-6 c 6.63,0 12,5.37 12,12 0,2.03 -0.51,3.93 -1.39,5.61 l 2.92,2.92 C 39.08,30.05 40,27.14 40,24 40,15.16 32.84,8 24,8 Z m 0,28 c -6.63,0 -12,-5.37 -12,-12 0,-2.03 0.51,-3.93 1.39,-5.61 L 10.47,15.47 C 8.92,17.95 8,20.86 8,24 c 0,8.84 7.16,16 16,16 l 0,6 8,-8 -8,-8 0,6 z"
-     id="path4"
-     inkscape:connector-curvature="0"
-     style="fill:#d2d2d2;fill-opacity:1" />
-  <path
-     d="M 0,0 48,0 48,48 0,48 Z"
+     d="M 0,2 H 48 V 50 H 0 Z"
      id="path6"
      inkscape:connector-curvature="0"
      style="fill:none" />
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:none"
+     d="M 48,-2e-7 H 96 V 48 H 48 Z"
+     id="path4-9" />
+  <g
+     id="g6137"
+     transform="translate(-1.5820024,-0.40981284)">
+    <g
+       id="g6198"
+       transform="translate(-0.57599546)">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke-width:0.98033118"
+         d="M 2.1579978,1.3446317 H 50.157998 V 47.474994 H 2.1579978 Z"
+         id="path4" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#d2d2d2;fill-opacity:1;stroke-width:0.98033118"
+         d="m 28.157998,4.2277794 h -4 V 23.448764 h 4 z"
+         id="path6269" />
+      <path
+         id="path1420"
+         d="M 17.110011,43.016738 27.958204,36.07353 19.478011,26.375733 c -2.368012,16.641 -2.368012,16.641 -2.368012,16.641 z"
+         style="fill:#d2d2d2;fill-opacity:1;stroke-width:1.13221049"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:1;fill:#ffffff;fill-opacity:0;fill-rule:evenodd;stroke:#d2d2d2;stroke-width:2.82139301;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         id="path6273"
+         sodipodi:type="arc"
+         sodipodi:cx="23.658358"
+         sodipodi:cy="22.74576"
+         sodipodi:rx="13.755358"
+         sodipodi:ry="13.219576"
+         sodipodi:start="1.9493777"
+         sodipodi:end="4.2245083"
+         d="M 18.574341,35.029256 A 13.755358,13.219576 0 0 1 9.9235355,23.467846 13.755358,13.219576 0 0 1 17.210466,11.068535"
+         sodipodi:open="true" />
+      <path
+         style="opacity:1;fill:#ffffff;fill-opacity:0;fill-rule:evenodd;stroke:#d2d2d2;stroke-width:2.82139301;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         id="path6273-8"
+         sodipodi:type="arc"
+         sodipodi:cx="-27.837582"
+         sodipodi:cy="22.74576"
+         sodipodi:rx="13.755358"
+         sodipodi:ry="13.219576"
+         sodipodi:start="1.7820981"
+         sodipodi:end="4.2223144"
+         d="m -30.722533,35.671316 a 13.755358,13.219576 0 0 1 -10.736999,-11.088888 13.755358,13.219576 0 0 1 7.147418,-13.50027"
+         sodipodi:open="true"
+         transform="scale(-1,1)" />
+    </g>
+  </g>
 </svg>
diff --git a/res/skins/Deere/icon/ic_loop_move_backward_48px.svg b/res/skins/Deere/icon/ic_loop_move_backward_48px.svg
index 504f70573288..7e6487b998f0 100644
--- a/res/skins/Deere/icon/ic_loop_move_backward_48px.svg
+++ b/res/skins/Deere/icon/ic_loop_move_backward_48px.svg
@@ -12,7 +12,7 @@
    version="1.1"
    viewBox="0 0 48 48.000001"
    id="svg2"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.92.0 r"
    sodipodi:docname="ic_loop_move_backward_48px.svg">
   <metadata
      id="metadata10">
@@ -22,6 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -37,19 +38,25 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1366"
-     inkscape:window-height="702"
+     inkscape:window-height="696"
      id="namedview6"
      showgrid="false"
-     inkscape:zoom="4.9166667"
-     inkscape:cx="25.220339"
-     inkscape:cy="24.813559"
+     inkscape:zoom="6.9532167"
+     inkscape:cx="10.631095"
+     inkscape:cy="24.525604"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg2" />
   <path
-     d="m 16,24 8,-8 0,6 8,0 0,4 -8,0 0,6 z m -8,-12 0,24 4,0 0,-24 z m 28,0 0,24 4,0 0,-24 z"
+     style="fill:#d2d2d2;fill-opacity:1"
+     d="m 20.928091,10.143818 v 8 h 12 v 12 h -12 v 8 l -14,-14 z"
+     id="path815"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#d2d2d2;fill-opacity:1"
+     d="m 45.071909,10 v 28 h -6 V 10 Z"
      id="path4"
      inkscape:connector-curvature="0"
-     style="fill:#d2d2d2;fill-opacity:1" />
+     sodipodi:nodetypes="ccccc" />
 </svg>
diff --git a/res/skins/Deere/icon/ic_loop_move_forward_48px.svg b/res/skins/Deere/icon/ic_loop_move_forward_48px.svg
index ffe3362f062b..5057039b628c 100644
--- a/res/skins/Deere/icon/ic_loop_move_forward_48px.svg
+++ b/res/skins/Deere/icon/ic_loop_move_forward_48px.svg
@@ -12,7 +12,7 @@
    version="1.1"
    viewBox="0 0 48 48.000001"
    id="svg2"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.92.0 r"
    sodipodi:docname="ic_loop_move_forward_48px.svg">
   <metadata
      id="metadata10">
@@ -22,6 +22,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -37,19 +38,25 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1366"
-     inkscape:window-height="702"
+     inkscape:window-height="696"
      id="namedview6"
      showgrid="false"
-     inkscape:zoom="4.9166667"
-     inkscape:cx="-14.237288"
-     inkscape:cy="24.813559"
+     inkscape:zoom="6.9532167"
+     inkscape:cx="10.631095"
+     inkscape:cy="24.525604"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg2" />
   <path
-     d="m 32,24 -8,-8 0,6 -8,0 0,4 8,0 0,6 z m 8,-12 0,24 -4,0 0,-24 z m -28,0 0,24 -4,0 0,-24 z"
+     style="fill:#d2d2d2;fill-opacity:1"
+     d="m 31.071909,10.143818 v 8 h -12 v 12 h 12 v 8 l 14,-14 z"
+     id="path815"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#d2d2d2;fill-opacity:1"
+     d="m 6.928091,10 v 28 h 6 V 10 Z"
      id="path4"
      inkscape:connector-curvature="0"
-     style="fill:#d2d2d2;fill-opacity:1" />
+     sodipodi:nodetypes="ccccc" />
 </svg>
diff --git a/res/skins/Deere/image/mixxx_logo.svg b/res/skins/Deere/image/mixxx_logo.svg
new file mode 100644
index 000000000000..4c4fddcf9c7d
--- /dev/null
+++ b/res/skins/Deere/image/mixxx_logo.svg
@@ -0,0 +1,376 @@
+<?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"
+   width="107"
+   height="25"
+   viewBox="0 0 106.99999 25.000001"
+   id="svg5498"
+   version="1.1"
+   inkscape:version="0.92.0 r"
+   sodipodi:docname="mixxx_logo.svg"
+   inkscape:export-filename="/home/be/sw/mixxx/deere/res/skins/Deere/image/mixxx_logo.png"
+   inkscape:export-xdpi="74.117645"
+   inkscape:export-ydpi="74.117645">
+  <defs
+     id="defs5500">
+    <linearGradient
+       id="SVGID_50_"
+       gradientUnits="userSpaceOnUse"
+       x1="74.096199"
+       y1="283.0127"
+       x2="74.096199"
+       y2="240.2995">
+      <stop
+         offset="0"
+         style="stop-color:#1F1F20"
+         id="stop4854" />
+      <stop
+         offset="1"
+         style="stop-color:#A5A8AA"
+         id="stop4856" />
+    </linearGradient>
+    <linearGradient
+       id="SVGID_51_"
+       gradientUnits="userSpaceOnUse"
+       x1="97.754402"
+       y1="283.0127"
+       x2="97.754402"
+       y2="240.2995">
+      <stop
+         offset="0"
+         style="stop-color:#1F1F20"
+         id="stop4861" />
+      <stop
+         offset="1"
+         style="stop-color:#A5A8AA"
+         id="stop4863" />
+    </linearGradient>
+    <linearGradient
+       id="SVGID_52_"
+       gradientUnits="userSpaceOnUse"
+       x1="121.4106"
+       y1="283.0127"
+       x2="121.4106"
+       y2="240.2995">
+      <stop
+         offset="0"
+         style="stop-color:#1F1F20"
+         id="stop4868" />
+      <stop
+         offset="1"
+         style="stop-color:#A5A8AA"
+         id="stop4870" />
+    </linearGradient>
+    <linearGradient
+       id="SVGID_53_"
+       gradientUnits="userSpaceOnUse"
+       x1="49.034698"
+       y1="283.0127"
+       x2="49.034698"
+       y2="240.2995">
+      <stop
+         offset="0"
+         style="stop-color:#1F1F20"
+         id="stop4875" />
+      <stop
+         offset="1"
+         style="stop-color:#A5A8AA"
+         id="stop4877" />
+    </linearGradient>
+    <linearGradient
+       id="SVGID_54_"
+       gradientUnits="userSpaceOnUse"
+       x1="20.309099"
+       y1="283.0127"
+       x2="20.309099"
+       y2="240.2995">
+      <stop
+         offset="0"
+         style="stop-color:#1F1F20"
+         id="stop4882" />
+      <stop
+         offset="1"
+         style="stop-color:#A5A8AA"
+         id="stop4884" />
+    </linearGradient>
+    <linearGradient
+       id="SVGID_49_"
+       gradientUnits="userSpaceOnUse"
+       x1="109.707"
+       y1="244.08791"
+       x2="85.933998"
+       y2="278.4538">
+      <stop
+         offset="0"
+         style="stop-color:#130E1E"
+         id="stop4833" />
+      <stop
+         offset="0.0231"
+         style="stop-color:#1C1426"
+         id="stop4835" />
+      <stop
+         offset="0.1446"
+         style="stop-color:#442349"
+         id="stop4837" />
+      <stop
+         offset="0.2552"
+         style="stop-color:#652966"
+         id="stop4839" />
+      <stop
+         offset="0.3511"
+         style="stop-color:#7C287A"
+         id="stop4841" />
+      <stop
+         offset="0.4286"
+         style="stop-color:#8B2688"
+         id="stop4843" />
+      <stop
+         offset="0.478"
+         style="stop-color:#91278F"
+         id="stop4845" />
+      <stop
+         offset="1"
+         style="stop-color:#ED1C24"
+         id="stop4847" />
+    </linearGradient>
+    <linearGradient
+       id="SVGID_48_"
+       gradientUnits="userSpaceOnUse"
+       x1="86.049301"
+       y1="244.08791"
+       x2="62.275299"
+       y2="278.4552">
+      <stop
+         offset="0"
+         style="stop-color:#381F1F"
+         id="stop4808" />
+      <stop
+         offset="0.0017"
+         style="stop-color:#3A1F20"
+         id="stop4810" />
+      <stop
+         offset="0.0376"
+         style="stop-color:#5B2926"
+         id="stop4812" />
+      <stop
+         offset="0.0757"
+         style="stop-color:#7C2F28"
+         id="stop4814" />
+      <stop
+         offset="0.1173"
+         style="stop-color:#9B3029"
+         id="stop4816" />
+      <stop
+         offset="0.1626"
+         style="stop-color:#B62E28"
+         id="stop4818" />
+      <stop
+         offset="0.2129"
+         style="stop-color:#CC2927"
+         id="stop4820" />
+      <stop
+         offset="0.271"
+         style="stop-color:#DC2325"
+         id="stop4822" />
+      <stop
+         offset="0.3438"
+         style="stop-color:#E81F25"
+         id="stop4824" />
+      <stop
+         offset="0.478"
+         style="stop-color:#ED1C24"
+         id="stop4826" />
+      <stop
+         offset="1"
+         style="stop-color:#F7931E"
+         id="stop4828" />
+    </linearGradient>
+    <linearGradient
+       id="SVGID_47_"
+       gradientUnits="userSpaceOnUse"
+       x1="133.3633"
+       y1="244.0889"
+       x2="109.5902"
+       y2="278.4548">
+      <stop
+         offset="0.478"
+         style="stop-color:#39B54A"
+         id="stop4801" />
+      <stop
+         offset="1"
+         style="stop-color:#1B75BC"
+         id="stop4803" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="70.101057"
+     inkscape:cy="27.74398"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1366"
+     inkscape:window-height="696"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0" />
+  <metadata
+     id="metadata5503">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>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
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-309.41899,-348.79076)">
+    <polygon
+       transform="matrix(0.7684889,0,0,0.72579466,309.41899,171.5909)"
+       style="fill:url(#SVGID_47_)"
+       points="104.378,278.591 127.999,244.146 138.439,244.146 114.823,278.591 "
+       id="polygon4805" />
+    <polygon
+       transform="matrix(0.7684889,0,0,0.72579466,309.41899,171.5909)"
+       style="fill:url(#SVGID_48_)"
+       points="57.062,278.591 80.68,244.146 91.126,244.146 67.51,278.591 "
+       id="polygon4830" />
+    <polygon
+       transform="matrix(0.7684889,0,0,0.72579466,309.41899,171.5909)"
+       style="fill:url(#SVGID_49_)"
+       points="80.722,278.591 104.342,244.146 114.783,244.146 91.167,278.591 "
+       id="polygon4849" />
+    <g
+       transform="matrix(0.7684889,0,0,0.72579466,309.41899,171.5909)"
+       id="g4851">
+      <linearGradient
+         id="linearGradient5463"
+         gradientUnits="userSpaceOnUse"
+         x1="74.096199"
+         y1="283.0127"
+         x2="74.096199"
+         y2="240.2995">
+        <stop
+           offset="0"
+           style="stop-color:#1F1F20"
+           id="stop5465" />
+        <stop
+           offset="1"
+           style="stop-color:#A5A8AA"
+           id="stop5467" />
+      </linearGradient>
+      <polygon
+         style="fill:url(#SVGID_50_)"
+         points="91.126,278.591 67.51,244.146 57.065,244.146 80.68,278.591 "
+         id="polygon4858" />
+      <linearGradient
+         id="linearGradient5470"
+         gradientUnits="userSpaceOnUse"
+         x1="97.754402"
+         y1="283.0127"
+         x2="97.754402"
+         y2="240.2995">
+        <stop
+           offset="0"
+           style="stop-color:#1F1F20"
+           id="stop5472" />
+        <stop
+           offset="1"
+           style="stop-color:#A5A8AA"
+           id="stop5474" />
+      </linearGradient>
+      <polygon
+         style="fill:url(#SVGID_51_)"
+         points="114.787,278.591 91.167,244.146 80.722,244.146 104.342,278.591 "
+         id="polygon4865" />
+      <linearGradient
+         id="linearGradient5477"
+         gradientUnits="userSpaceOnUse"
+         x1="121.4106"
+         y1="283.0127"
+         x2="121.4106"
+         y2="240.2995">
+        <stop
+           offset="0"
+           style="stop-color:#1F1F20"
+           id="stop5479" />
+        <stop
+           offset="1"
+           style="stop-color:#A5A8AA"
+           id="stop5481" />
+      </linearGradient>
+      <polygon
+         style="fill:url(#SVGID_52_)"
+         points="138.443,278.591 114.823,244.146 104.378,244.146 127.999,278.591 "
+         id="polygon4872" />
+      <linearGradient
+         id="linearGradient5484"
+         gradientUnits="userSpaceOnUse"
+         x1="49.034698"
+         y1="283.0127"
+         x2="49.034698"
+         y2="240.2995">
+        <stop
+           offset="0"
+           style="stop-color:#1F1F20"
+           id="stop5486" />
+        <stop
+           offset="1"
+           style="stop-color:#A5A8AA"
+           id="stop5488" />
+      </linearGradient>
+      <rect
+         style="fill:url(#SVGID_53_)"
+         x="44.568001"
+         y="244.146"
+         width="8.934"
+         height="34.445"
+         id="rect4879" />
+      <linearGradient
+         id="linearGradient5491"
+         gradientUnits="userSpaceOnUse"
+         x1="20.309099"
+         y1="283.0127"
+         x2="20.309099"
+         y2="240.2995">
+        <stop
+           offset="0"
+           style="stop-color:#1F1F20"
+           id="stop5493" />
+        <stop
+           offset="1"
+           style="stop-color:#A5A8AA"
+           id="stop5495" />
+      </linearGradient>
+      <polygon
+         style="fill:url(#SVGID_54_)"
+         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 "
+         id="polygon4886" />
+    </g>
+  </g>
+</svg>
diff --git a/res/skins/Deere/image/vinyl_spinny_foreground.svg b/res/skins/Deere/image/vinyl_spinny_foreground.svg
index 05eefbc75c43..f83dc414b404 100644
--- a/res/skins/Deere/image/vinyl_spinny_foreground.svg
+++ b/res/skins/Deere/image/vinyl_spinny_foreground.svg
@@ -5,11 +5,36 @@
    xmlns:rdf="http://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"
    id="svg4744"
    viewBox="0 0 100 100"
    height="100"
-   width="100">
+   width="100"
+   sodipodi:docname="vinyl_spinny_foreground.svg"
+   inkscape:version="0.92.1 r">
+  <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="696"
+     id="namedview5806"
+     showgrid="false"
+     inkscape:zoom="6.8447936"
+     inkscape:cx="52.472712"
+     inkscape:cy="62.257903"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     showguides="false" />
   <defs
      id="defs4746" />
   <metadata
@@ -30,38 +55,28 @@
      id="layer1">
     <path
        d=""
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d2d2d2;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d2d2d2;stroke-width:9.98934269;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
        id="path10197"
-       transform="matrix(0,-1,1,0,0,0)"
        r="41"
        cy="50"
-       cx="-1002.3622" />
+       cx="-1002.3622"
+       inkscape:connector-curvature="0" />
     <path
        d=""
        cx="-1002.3622"
        cy="50"
        r="44"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d2d2d2;stroke-width:3.99999976;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d2d2d2;stroke-width:3.99573684;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
        id="circle11130-0-1"
-       transform="matrix(0,-1,1,0,0,0)" />
-    <path
-       d="m -971.74384,45.150532 a 31,31 0 0 1 0,9.698936"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#333ff0;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0;marker:none;enable-background:accumulate"
-       id="circle10199-6-5"
-       transform="matrix(0,-1,1,0,0,0)" />
-    <path
-       d="m -976.19923,23.837048 a 37,37 0 0 1 10.83705,26.162951 37,37 0 0 1 -10.83705,26.162952"
-       transform="matrix(0,-1,1,0,0,0)"
-       id="path5294-4-2-7"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#d2d2d2;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-    <path
-       id="circle12929-5-4"
-       d="m 50,960.36215 c -0.01177,0 -0.02339,0.002 -0.03516,0.002 -1.668161,10e-4 -3.324986,0.10807 -4.96484,0.30469 l 0,4.69335 0,6.19922 c 1.643619,-0.25995 3.314601,-0.39843 5,-0.39843 1.685399,0 3.356381,0.13848 5,0.39843 l 0,-6.19922 0,-4.68945 c -1.638947,-0.19653 -3.29369,-0.30899 -4.960938,-0.31053 -0.01305,-2e-5 -0.02601,0 -0.03906,0 z"
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#333333;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-    <path
-       d="m -973.37081,21.008621 a 41,41 0 0 1 12.00863,28.991378 41,41 0 0 1 -12.00862,28.991379"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#222222;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       id="circle11130-2-0-5-5"
-       transform="matrix(0,-1,1,0,0,0)" />
+       inkscape:connector-curvature="0" />
+    <rect
+       style="opacity:1;fill:#333333;fill-opacity:1;stroke:#f0f0f0;stroke-width:2.77503943;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="rect6204"
+       width="5.5749602"
+       height="37.22496"
+       x="47.212521"
+       y="963.74969"
+       ry="4.3845601"
+       rx="2.7874801" />
   </g>
 </svg>
diff --git a/res/skins/Deere/knob_label_horizontal.xml b/res/skins/Deere/knob_label_horizontal.xml
deleted file mode 100644
index 4919b09c9ce6..000000000000
--- a/res/skins/Deere/knob_label_horizontal.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    A standard knob.
-  Variables:
-    control: The control to connect to.
--->
-<Template>
-  <WidgetGroup>
-    <Layout>horizontal</Layout>
-    <Children>
-      <Template src="skin:knob.xml"/>
-      <Label>
-        <Size>40m,10f</Size>
-        <ObjectName>KnobLabelH</ObjectName>
-        <Text><Variable name="label"/></Text>
-      </Label>
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/Deere/knob_toolbar.xml b/res/skins/Deere/knob_toolbar.xml
new file mode 100644
index 000000000000..495c4cac4be8
--- /dev/null
+++ b/res/skins/Deere/knob_toolbar.xml
@@ -0,0 +1,31 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    A standard knob.
+  Variables:
+    control: The control to connect to.
+-->
+<Template>
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <Children>
+      <KnobComposed>
+        <TooltipId><Variable name="TooltipId"/></TooltipId>
+        <Size>34f,28f</Size>
+        <Knob>knob_<Variable name="color"/>.svg</Knob>
+        <BackPath>knob_bg.svg</BackPath>
+        <MinAngle>-135</MinAngle>
+        <MaxAngle>135</MaxAngle>
+        <KnobCenterYOffset>1.32</KnobCenterYOffset>
+        <Connection>
+          <ConfigKey><Variable name="group"/>,<Variable name="control"/></ConfigKey>
+        </Connection>
+      </KnobComposed>
+      <Label>
+        <Size>40m,10f</Size>
+        <ObjectName>KnobLabelH</ObjectName>
+        <Text><Variable name="label"/></Text>
+      </Label>
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Deere/knob_with_button.xml b/res/skins/Deere/knob_with_button.xml
index 32d87501a9bb..5e02e9e79b05 100644
--- a/res/skins/Deere/knob_with_button.xml
+++ b/res/skins/Deere/knob_with_button.xml
@@ -17,7 +17,7 @@
         <Children>
           <PushButton>
             <TooltipId><Variable name="button_TooltipId"/></TooltipId>
-            <ObjectName>KillButtons</ObjectName>
+            <ObjectName>SmallCircleButton</ObjectName>
             <Size>10f,10f</Size>
             <NumberStates>2</NumberStates>
             <State>
diff --git a/res/skins/Deere/knob_with_button_left.xml b/res/skins/Deere/knob_with_button_left.xml
new file mode 100644
index 000000000000..eb94e0dd3335
--- /dev/null
+++ b/res/skins/Deere/knob_with_button_left.xml
@@ -0,0 +1,64 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    A standard knob with an additional pushbutton
+    (e.g. for adding kill buttons next to a knob).
+  Variables:
+    control: The control to connect the knob to.
+    button_control: The control to connect the pushbutton to.
+-->
+<Template>
+  <WidgetGroup>
+    <ObjectName>KnobWithButtonHorizontal</ObjectName>
+    <Layout>horizontal</Layout>
+    <Children>
+
+      <!--Wrap the PushButton in a vertical WidgetGroup with spacers to ensure it stays in the
+      correct position when the knobs get further apart and closer together.-->
+      <WidgetGroup>
+        <Layout>vertical</Layout>
+        <Children>
+
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <Size>15f,12f</Size>
+            <Children/>
+          </WidgetGroup>
+
+          <PushButton>
+            <TooltipId><Variable name="button_TooltipId"/></TooltipId>
+            <ObjectName>CircleButton</ObjectName>
+            <Size>15f,15f</Size>
+            <NumberStates>2</NumberStates>
+            <State>
+              <Number>0</Number>
+              <Text></Text>
+              <Pressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_off_48px.svg</Pressed>
+              <Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_off_48px.svg</Unpressed>
+            </State>
+            <State>
+              <Number>1</Number>
+              <Text></Text>
+              <Pressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Pressed>
+              <Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Unpressed>
+            </State>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,<Variable name="button_control"/></ConfigKey>
+              <ButtonState>LeftButton</ButtonState>
+            </Connection>
+          </PushButton>
+
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <Size>15f,-1me</Size>
+            <Children/>
+          </WidgetGroup>
+
+        </Children>
+      </WidgetGroup>
+
+      <Template src="skin:knob_with_label.xml"/>
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Deere/knob_with_button_horizontal.xml b/res/skins/Deere/knob_with_button_right.xml
similarity index 79%
rename from res/skins/Deere/knob_with_button_horizontal.xml
rename to res/skins/Deere/knob_with_button_right.xml
index d426b9749ba7..ccfe36644a2e 100644
--- a/res/skins/Deere/knob_with_button_horizontal.xml
+++ b/res/skins/Deere/knob_with_button_right.xml
@@ -12,12 +12,22 @@
     <ObjectName>KnobWithButtonHorizontal</ObjectName>
     <Layout>horizontal</Layout>
     <Children>
+
+      <Template src="skin:knob_with_label.xml"/>
+
       <WidgetGroup>
-        <Size>15f,21f</Size>
+        <Layout>vertical</Layout>
         <Children>
+
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <Size>15f,12f</Size>
+            <Children/>
+          </WidgetGroup>
+
           <PushButton>
             <TooltipId><Variable name="button_TooltipId"/></TooltipId>
-            <ObjectName>MixerButton</ObjectName>
+            <ObjectName>CircleButton</ObjectName>
             <Size>15f,15f</Size>
             <NumberStates>2</NumberStates>
             <State>
@@ -37,19 +47,16 @@
               <ButtonState>LeftButton</ButtonState>
             </Connection>
           </PushButton>
+
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <Size>15f,-1me</Size>
+            <Children/>
+          </WidgetGroup>
+
         </Children>
       </WidgetGroup>
-      <WidgetGroup>
-        <Layout>vertical</Layout>
-        <Children>
-          <Template src="skin:knob.xml"/>
-          <Label>
-            <Size>40f,10f</Size>
-            <ObjectName>KnobLabel</ObjectName>
-            <Text><Variable name="label"/></Text>
-          </Label>
-        </Children>
-      </WidgetGroup>
+
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/knob_with_label.xml b/res/skins/Deere/knob_with_label.xml
index 28a808159ca2..e93cac2a2596 100644
--- a/res/skins/Deere/knob_with_label.xml
+++ b/res/skins/Deere/knob_with_label.xml
@@ -6,15 +6,32 @@
     control: The control to connect to.
 -->
 <Template>
-  <WidgetGroup>
-    <Layout>vertical</Layout>
+  <SizeAwareStack>
     <Children>
-      <Template src="skin:knob.xml"/>
-      <Label>
-        <Size>40f,10f</Size>
-        <ObjectName>KnobLabel</ObjectName>
-        <Text><Variable name="label"/></Text>
-      </Label>
+
+      <WidgetGroup>
+        <MinimumSize>40,34</MinimumSize>
+        <MaximumSize>40,41</MaximumSize>
+        <Layout>vertical</Layout>
+        <Children>
+          <Template src="skin:knob.xml"/>
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <MinimumSize>40,42</MinimumSize>
+        <MaximumSize>40,45</MaximumSize>
+        <Layout>vertical</Layout>
+        <Children>
+          <Template src="skin:knob.xml"/>
+          <Label>
+            <Size>40f,10f</Size>
+            <ObjectName>KnobLabel</ObjectName>
+            <Text><Variable name="label"/></Text>
+          </Label>
+        </Children>
+      </WidgetGroup>
+
     </Children>
-  </WidgetGroup>
+  </SizeAwareStack>
 </Template>
diff --git a/res/skins/Deere/left_deck_mixer_controls.xml b/res/skins/Deere/left_deck_mixer_controls.xml
index 9c1da702d21b..3159f5ed11c2 100644
--- a/res/skins/Deere/left_deck_mixer_controls.xml
+++ b/res/skins/Deere/left_deck_mixer_controls.xml
@@ -11,12 +11,19 @@
     <SizePolicy>min,me</SizePolicy>
     <Children>
 
-      <!-- In 2 deck mode, we show a 2-column mixer section -->
+      <!-- In 2 deck mode, we show a 3-column mixer section -->
       <WidgetGroup>
         <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
         <Children>
-          <Template src="skin:deck_mixer_controls_col1.xml"/>
-          <Template src="skin:deck_mixer_controls_col2.xml"/>
+          <Template src="skin:deck_mixer_controls_col1_left.xml"/>
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Template src="skin:deck_mixer_controls_col2.xml"/>
+              <Template src="skin:deck_mixer_controls_col3.xml"/>
+            </Children>
+          </WidgetGroup>
         </Children>
         <Connection>
           <ConfigKey>[Master],show_4decks</ConfigKey>
@@ -27,15 +34,16 @@
         </Connection>
       </WidgetGroup>
 
-      <!-- In 4 deck mode, we show a 2-column mixer section -->
+      <!-- In 4 deck mode, we show all controls in one column per deck. -->
       <WidgetGroup>
         <Layout>vertical</Layout>
         <Children>
-          <Template src="skin:deck_mixer_controls_col1.xml"/>
+          <Template src="skin:deck_mixer_controls_col1_left.xml"/>
           <WidgetGroup>
             <Layout>vertical</Layout>
-            <ObjectName>4DecksMixerCol2Container</ObjectName>
+            <ObjectName>4DecksMixerCol2ContainerLeft</ObjectName>
             <Children>
+              <Template src="skin:deck_mixer_controls_col3.xml"/>
               <Template src="skin:deck_mixer_controls_col2.xml"/>
             </Children>
           </WidgetGroup>
diff --git a/res/skins/Deere/left_gutter.xml b/res/skins/Deere/left_gutter.xml
index f4054c21f7cc..48b8cc87d2a5 100644
--- a/res/skins/Deere/left_gutter.xml
+++ b/res/skins/Deere/left_gutter.xml
@@ -7,32 +7,32 @@
   <WidgetGroup>
     <ObjectName>LeftGutter</ObjectName>
     <Layout>vertical</Layout>
-    <SizePolicy>me,min</SizePolicy>
+    <SizePolicy>me,me</SizePolicy>
     <Children>
-      <Template src="skin:spacer.xml"/>
-      <Template src="skin:deck_left.xml">
+      <Template src="skin:deck.xml">
         <SetVariable name="i">1</SetVariable>
         <!-- Traditional Blue -->
         <SetVariable name="DeckSignalColor">#007BCD</SetVariable>
         <SetVariable name="DeckBackgroundColor">#333333</SetVariable>
+        <SetVariable name="PlayedOverlayColor">#88000000</SetVariable>
       </Template>
 
       <WidgetGroup>
         <Layout>horizontal</Layout>
         <Children>
-          <Template src="skin:deck_left.xml">
+          <Template src="skin:deck.xml">
             <SetVariable name="i">3</SetVariable>
             <!-- Violet -->
             <SetVariable name="DeckSignalColor">#B500B5</SetVariable>
-            <SetVariable name="DeckBackgroundColor">#333333</SetVariable>
+            <SetVariable name="DeckBackgroundColor">#35335a</SetVariable>
+            <SetVariable name="PlayedOverlayColor">#b8000000</SetVariable>
           </Template>
         </Children>
         <Connection>
-          <ConfigKey persist="true">[Master],show_4decks</ConfigKey>
+          <ConfigKey>[Master],show_4decks</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
       </WidgetGroup>
-      <Template src="skin:spacer.xml"/>
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/library.xml b/res/skins/Deere/library.xml
index 0745dd779beb..b06a7659e8b2 100644
--- a/res/skins/Deere/library.xml
+++ b/res/skins/Deere/library.xml
@@ -31,18 +31,6 @@
               <WidgetGroup>
                 <Layout>vertical</Layout>
                 <Children>
-                  <WidgetGroup>
-                    <Layout>horizontal</Layout>
-                    <Children>
-                      <Template src="skin:hide_show_button.xml">
-                        <SetVariable name="TooltipId">show_library</SetVariable>
-                        <SetVariable name="object_name">LibraryToggle</SetVariable>
-                        <SetVariable name="control">[Library],show_library</SetVariable>
-                      </Template>
-                      <SearchBox>
-                      </SearchBox>
-                    </Children>
-                  </WidgetGroup>
                   <WidgetGroup>
                     <ObjectName>PreviewDeckContainer</ObjectName>
                     <Layout>vertical</Layout>
@@ -138,11 +126,22 @@
                       </WidgetGroup>
                     </Children>
                     <Connection>
-                      <ConfigKey persist="true">[PreviewDeck],show_previewdeck</ConfigKey>
+                      <ConfigKey>[PreviewDeck],show_previewdeck</ConfigKey>
                       <BindProperty>visible</BindProperty>
                     </Connection>
                   </WidgetGroup>
-
+                  <WidgetGroup>
+                    <Layout>horizontal</Layout>
+                    <Children>
+                      <Template src="skin:hide_show_button.xml">
+                        <SetVariable name="TooltipId">maximize_library</SetVariable>
+                        <SetVariable name="object_name">LibraryToggle</SetVariable>
+                        <SetVariable name="control">[Master],maximize_library</SetVariable>
+                      </Template>
+                      <SearchBox>
+                      </SearchBox>
+                    </Children>
+                  </WidgetGroup>
                   <!-- QSplitter between LibrarySidebar and CoverArt -->
                   <Splitter>
                     <ObjectName>LibraryCoverArtSplitter</ObjectName>
@@ -162,7 +161,7 @@
                         <SizePolicy>me,me</SizePolicy>
                         <MinimumSize>30,30</MinimumSize>
                         <Connection>
-                          <ConfigKey persist="true">[Library],show_coverart</ConfigKey>
+                          <ConfigKey>[Library],show_coverart</ConfigKey>
                           <BindProperty>visible</BindProperty>
                         </Connection>
                       </CoverArt>
@@ -177,20 +176,13 @@
         </Children>
       </WidgetGroup>
 
-      <!-- Collapsed Library -->
+      <!-- Hidden Library -->
       <WidgetGroup>
         <ObjectName>LibraryCollapsed</ObjectName>
         <Layout>vertical</Layout>
         <MinimumSize>-1,20</MinimumSize>
         <MaximumSize>-1,20</MaximumSize>
         <SizePolicy>me,min</SizePolicy>
-        <Children>
-          <Template src="skin:hide_show_button.xml">
-            <SetVariable name="TooltipId">show_library</SetVariable>
-            <SetVariable name="object_name">LibraryToggle</SetVariable>
-            <SetVariable name="control">[Library],show_library</SetVariable>
-          </Template>
-        </Children>
       </WidgetGroup>
 
     </Children>
diff --git a/res/skins/Deere/loop.xml b/res/skins/Deere/loop.xml
index 9905a3d84013..b061fcc98da4 100644
--- a/res/skins/Deere/loop.xml
+++ b/res/skins/Deere/loop.xml
@@ -1,67 +1,113 @@
 <!DOCTYPE template>
 <!--
   Description:
-    Looping controls (in, out, reloop, loop move).
+    A grid of beatloop controls with a loop double and halve on the left and right.
   Variables:
     group: The group for the controls.
 -->
 <Template>
   <WidgetGroup>
-    <ObjectName>LoopingContainer</ObjectName>
-    <Layout>vertical</Layout>
+    <ObjectName>LoopContainer</ObjectName>
+    <Layout>horizontal</Layout>
+
+    <MinimumSize>-1,-1</MinimumSize>
     <SizePolicy>max,max</SizePolicy>
+
     <Children>
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <Children>
-          <Template src="skin:left_1state_button.xml">
-            <SetVariable name="TooltipId">loop_in</SetVariable>
-            <SetVariable name="ObjectName">LoopIn</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-            <SetVariable name="state_0_text"></SetVariable>
-            <SetVariable name="state_0_pressed">icon/ic_loop_in_48px.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">icon/ic_loop_in_48px.svg</SetVariable>
-            <SetVariable name="left_connection_control"><Variable name="group"/>,loop_in</SetVariable>
-          </Template>
 
-          <Template src="skin:left_1state_button.xml">
-            <SetVariable name="TooltipId">loop_out</SetVariable>
-            <SetVariable name="ObjectName">LoopOut</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-            <SetVariable name="state_0_text"></SetVariable>
-            <SetVariable name="state_0_pressed">icon/ic_loop_out_48px.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">icon/ic_loop_out_48px.svg</SetVariable>
-            <SetVariable name="left_connection_control"><Variable name="group"/>,loop_out</SetVariable>
-          </Template>
+      <BeatSpinBox>
+        <ObjectName>BeatloopSizeSpinBox</ObjectName>
+        <TooltipId>beatloop_size</TooltipId>
+        <Value><Variable name="group"/>,beatloop_size</Value>
+      </BeatSpinBox>
 
-          <Template src="skin:left_display_2state_button.xml">
-            <SetVariable name="TooltipId">reloop_exit</SetVariable>
-            <SetVariable name="ObjectName">ReloopExit</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-            <SetVariable name="state_0_text"></SetVariable>
-            <SetVariable name="state_0_pressed">icon/ic_loop_48px.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">icon/ic_loop_48px.svg</SetVariable>
-            <SetVariable name="state_1_text"></SetVariable>
-            <SetVariable name="state_1_pressed">icon/ic_loop_48px.svg</SetVariable>
-            <SetVariable name="state_1_unpressed">icon/ic_loop_48px.svg</SetVariable>
-            <SetVariable name="left_connection_control"><Variable name="group"/>,reloop_exit</SetVariable>
-            <SetVariable name="display_connection_control"><Variable name="group"/>,loop_enabled</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
+      <Template src="skin:spacer_hx.xml">
+        <SetVariable name="width">2</SetVariable>
+      </Template>
 
       <WidgetGroup>
-        <Layout>horizontal</Layout>
+        <ObjectName>LoopButtons</ObjectName>
+        <Layout>vertical</Layout>
         <Children>
-          <Template src="skin:loopmove.xml"/>
+
+          <WidgetGroup>
+            <ObjectName>LoopButtonsTopRow</ObjectName>
+            <Layout>horizontal</Layout>
+            <Children>
+
+              <Template src="skin:left_right_2state_button.xml">
+                <SetVariable name="TooltipId">beatloop_activate</SetVariable>
+                <SetVariable name="ObjectName">BeatloopActivate</SetVariable>
+                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                <SetVariable name="state_0_text"></SetVariable>
+                <SetVariable name="state_0_pressed">icon/ic_beatloop_activate_48px.svg</SetVariable>
+                <SetVariable name="state_0_unpressed">icon/ic_beatloop_activate_48px.svg</SetVariable>
+                <SetVariable name="state_1_text"></SetVariable>
+                <SetVariable name="state_1_pressed">icon/ic_beatloop_activate_48px.svg</SetVariable>
+                <SetVariable name="state_1_unpressed">icon/ic_beatloop_activate_48px.svg</SetVariable>
+                <SetVariable name="left_connection_control"><Variable name="group"/>,beatloop_activate</SetVariable>
+                <SetVariable name="right_connection_control"><Variable name="group"/>,beatlooproll_activate</SetVariable>
+              </Template>
+
+              <Template src="skin:left_right_display_2state_button.xml">
+                <SetVariable name="TooltipId">reloop_toggle</SetVariable>
+                <SetVariable name="ObjectName">Reloop</SetVariable>
+                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                <SetVariable name="state_0_text"></SetVariable>
+                <SetVariable name="state_0_pressed">icon/ic_loop_48px.svg</SetVariable>
+                <SetVariable name="state_0_unpressed">icon/ic_loop_48px.svg</SetVariable>
+                <SetVariable name="state_1_text"></SetVariable>
+                <SetVariable name="state_1_pressed">icon/ic_loop_48px.svg</SetVariable>
+                <SetVariable name="state_1_unpressed">icon/ic_loop_48px.svg</SetVariable>
+                <SetVariable name="left_connection_control"><Variable name="group"/>,reloop_toggle</SetVariable>
+                <SetVariable name="right_connection_control"><Variable name="group"/>,reloop_andstop</SetVariable>
+                <SetVariable name="display_connection_control"><Variable name="group"/>,loop_enabled</SetVariable>
+              </Template>
+
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>LoopButtonsBottomRow</ObjectName>
+            <Layout>horizontal</Layout>
+            <Children>
+
+              <Template src="skin:left_right_1state_button.xml">
+                <SetVariable name="TooltipId">loop_in</SetVariable>
+                <SetVariable name="ObjectName">LoopIn</SetVariable>
+                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                <SetVariable name="state_0_text"></SetVariable>
+                <SetVariable name="state_0_pressed">icon/ic_loop_in_48px.svg</SetVariable>
+                <SetVariable name="state_0_unpressed">icon/ic_loop_in_48px.svg</SetVariable>
+                <SetVariable name="left_connection_control"><Variable name="group"/>,loop_in</SetVariable>
+                <SetVariable name="right_connection_control"><Variable name="group"/>,loop_in_goto</SetVariable>
+              </Template>
+
+              <Template src="skin:left_right_1state_button.xml">
+                <SetVariable name="TooltipId">loop_out</SetVariable>
+                <SetVariable name="ObjectName">LoopOut</SetVariable>
+                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                <SetVariable name="state_0_text"></SetVariable>
+                <SetVariable name="state_0_pressed">icon/ic_loop_out_48px.svg</SetVariable>
+                <SetVariable name="state_0_unpressed">icon/ic_loop_out_48px.svg</SetVariable>
+                <SetVariable name="left_connection_control"><Variable name="group"/>,loop_out</SetVariable>
+                <SetVariable name="right_connection_control"><Variable name="group"/>,loop_out_goto</SetVariable>
+              </Template>
+
+            </Children>
+          </WidgetGroup>
+
         </Children>
       </WidgetGroup>
+
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/loopmove_button.xml b/res/skins/Deere/loopmove_button.xml
deleted file mode 100644
index 9a49704e51cb..000000000000
--- a/res/skins/Deere/loopmove_button.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    An individual loop move button.
-    Loop moves forward or backward by X beats.
-  Variables:
-    group: The group for the controls.
-    control_length: The length as used in control names.
-    state_X_pressed: The (optional) image file used for this state.
-    state_X_unpressed: The (optional) image file used for this state.
-    text_length: The length in text form.
-    direction: ``forward`` or ``backward`` move
-    SmallSquareButtonSize: The button size
--->
-<Template>
-  <Template src="skin:left_1state_button.xml">
-    <SetVariable name="TooltipId">loop_move</SetVariable>
-    <SetVariable name="ObjectName">LoopMoveButton</SetVariable>
-    <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-    <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-    <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-    <SetVariable name="state_0_pressed"><Variable name="state_0_pressed"/></SetVariable>
-    <SetVariable name="state_0_unpressed"><Variable name="state_0_unpressed"/></SetVariable>
-    <SetVariable name="state_0_text"><Variable name="text_length"/></SetVariable>
-    <SetVariable name="left_connection_control"><Variable name="group"/>,loop_move_<Variable name="control_length"/>_<Variable name="direction"/></SetVariable>
-  </Template>
-</Template>
diff --git a/res/skins/Deere/main_decks.xml b/res/skins/Deere/main_decks.xml
index 91e2be715472..ad5ac37eb900 100644
--- a/res/skins/Deere/main_decks.xml
+++ b/res/skins/Deere/main_decks.xml
@@ -7,107 +7,366 @@
   <WidgetGroup>
     <ObjectName>MainDeckContainer</ObjectName>
     <Layout>vertical</Layout>
-    <SizePolicy>me,f</SizePolicy>
+    <SizePolicy>me,me</SizePolicy>
     <Children>
 
-      <!-- Is displayed if the stacked waveforms option is activated in the skin settings -->
+      <!-- If the Quick Effect superknob is showing, the minimum height for the
+      mixer needs to be higher to prevent knobs from getting cut off. -->
       <WidgetGroup>
-        <ObjectName>StackedWaveformsContainer</ObjectName>
+        <ObjectName>2DecksNoQuickEffect</ObjectName>
         <Layout>vertical</Layout>
         <Children>
-          <!-- In 2-deck mode, we show 2 waveforms -->
+
           <WidgetGroup>
             <Layout>vertical</Layout>
             <Children>
-              <Template src="skin:deck_visual_row.xml">
-                <SetVariable name="i">1</SetVariable>
-                <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
-                <!-- Traditional Blue -->
-                <SetVariable name="DeckSignalColor">#007BCD</SetVariable>
-                <SetVariable name="DeckBackgroundColor">#333333</SetVariable>
-                <SetVariable name="control_show_spinny">[Spinny<Variable name="i"/>],show_spinny</SetVariable>
-              </Template>
-              <Template src="skin:deck_visual_row.xml">
-                <SetVariable name="i">2</SetVariable>
-                <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
-                <!-- Violet -->
-                <SetVariable name="DeckSignalColor">#B500B5</SetVariable>
-                <SetVariable name="DeckBackgroundColor">#333333</SetVariable>
-                <SetVariable name="control_show_spinny">[Spinny<Variable name="i"/>],show_spinny</SetVariable>
-              </Template>
+
+              <!-- 2 decks stacked no QuickEffect -->
+              <Splitter>
+                <ObjectName>DeckSplitter</ObjectName>
+                <Orientation>vertical</Orientation>
+                <Size>-1me,-1me</Size>
+                <SplitSizesConfigKey>[Deere],WaveformSplitter2DecksNoQE</SplitSizesConfigKey>
+                <SplitSizes>166,230</SplitSizes>
+                <Children>
+                  <WidgetGroup>
+                    <ObjectName>StackedWaveformsContainer</ObjectName>
+                    <Layout>vertical</Layout>
+                    <Children>
+
+                      <SingletonContainer>
+                        <ObjectName>DeckVisualRow1</ObjectName>
+                      </SingletonContainer>
+                      <SingletonContainer>
+                        <ObjectName>DeckVisualRow2</ObjectName>
+                      </SingletonContainer>
+
+                    </Children>
+                  </WidgetGroup>
+
+                  <WidgetGroup>
+                    <Layout>horizontal</Layout>
+                    <Size>-1,150min</Size>
+                    <MaximumSize>-1,230</MaximumSize>
+                    <Children>
+                      <SingletonContainer>
+                        <ObjectName>DecksMixerSingleton</ObjectName>
+                      </SingletonContainer>
+                    </Children>
+                  </WidgetGroup>
+
+                </Children>
+              </Splitter>
+
             </Children>
-              <Connection>
-              <ConfigKey>[Master],show_4decks</ConfigKey>
+            <Connection>
+              <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
               <BindProperty>visible</BindProperty>
-              <Transform>
-                <Not/>
-              </Transform>
             </Connection>
           </WidgetGroup>
-          <!-- In 4-deck mode, we show 4 waveforms in the 3-2-1-4 order just like the mixer columns-->
+
+          <!-- 2 decks split no QuickEffect -->
           <WidgetGroup>
             <Layout>vertical</Layout>
+            <ObjectName>DeckSplitter</ObjectName>
+            <Orientation>vertical</Orientation>
+            <Size>-1,155max</Size>
+            <MaximumSize>-1,330</MaximumSize>
             <Children>
-              <Template src="skin:deck_visual_row.xml">
-                <SetVariable name="i">3</SetVariable>
-                <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
-                <!-- Traditional Orange -->
-                <SetVariable name="DeckSignalColor">#E67A00</SetVariable>
-                <SetVariable name="DeckBackgroundColor">#333333</SetVariable>
-                <SetVariable name="control_show_spinny">[Spinny<Variable name="i"/>],show_spinny</SetVariable>
-              </Template>
-              <Template src="skin:deck_visual_row.xml">
-                <SetVariable name="i">1</SetVariable>
-                <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
-                <!-- Traditional Blue -->
-                <SetVariable name="DeckSignalColor">#007BCD</SetVariable>
-                <SetVariable name="DeckBackgroundColor">#333333</SetVariable>
-                <SetVariable name="control_show_spinny">[Spinny<Variable name="i"/>],show_spinny</SetVariable>
-              </Template>
-              <Template src="skin:deck_visual_row.xml">
-                <SetVariable name="i">2</SetVariable>
-                <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
-                <!-- Violet -->
-                <SetVariable name="DeckSignalColor">#B500B5</SetVariable>
-                <SetVariable name="DeckBackgroundColor">#333333</SetVariable>
-                <SetVariable name="control_show_spinny">[Spinny<Variable name="i"/>],show_spinny</SetVariable>
-              </Template>
-              <Template src="skin:deck_visual_row.xml">
-                <SetVariable name="i">4</SetVariable>
-                <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
-                <!-- Lime -->
-                <SetVariable name="DeckSignalColor">#AABD00</SetVariable>
-                <SetVariable name="DeckBackgroundColor">#333333</SetVariable>
-                <SetVariable name="control_show_spinny">[Spinny<Variable name="i"/>],show_spinny</SetVariable>
-              </Template>
+              <SingletonContainer>
+                <ObjectName>DecksMixerSingleton</ObjectName>
+              </SingletonContainer>
             </Children>
-              <Connection>
-              <ConfigKey>[Master],show_4decks</ConfigKey>
+            <Connection>
+              <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
               <BindProperty>visible</BindProperty>
+              <Transform>
+                <Not/>
+              </Transform>
             </Connection>
           </WidgetGroup>
+
         </Children>
         <Connection>
-          <ConfigKey persist="true">[Deere],show_stacked_waveforms</ConfigKey>
+          <ConfigKey>[QuickEffectRack1_[Channel1]_Effect1],loaded</ConfigKey>
           <BindProperty>visible</BindProperty>
+          <Transform>
+            <Not/>
+          </Transform>
         </Connection>
       </WidgetGroup>
 
       <WidgetGroup>
-        <Layout>horizontal</Layout>
+        <ObjectName>2DecksWithQuickEffect</ObjectName>
+        <Layout>vertical</Layout>
         <Children>
-          <Template src="skin:left_gutter.xml"/>
-          <Template src="skin:mixer.xml"/>
-          <Template src="skin:right_gutter.xml"/>
+
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <Children>
+
+              <!-- 2 decks stacked with QuickEffect -->
+              <Splitter>
+                <ObjectName>DeckSplitter</ObjectName>
+                <Orientation>vertical</Orientation>
+                <Size>-1me,-1me</Size>
+                <SplitSizesConfigKey>[Deere],WaveformSplitter2DecksWithQE</SplitSizesConfigKey>
+                <SplitSizes>158,230</SplitSizes>
+                <Children>
+                  <WidgetGroup>
+                    <ObjectName>StackedWaveformsContainer</ObjectName>
+                    <Layout>vertical</Layout>
+                    <Children>
+
+                      <SingletonContainer>
+                        <ObjectName>DeckVisualRow1</ObjectName>
+                      </SingletonContainer>
+                      <SingletonContainer>
+                        <ObjectName>DeckVisualRow2</ObjectName>
+                      </SingletonContainer>
+
+                    </Children>
+                  </WidgetGroup>
+
+                  <WidgetGroup>
+                    <Layout>horizontal</Layout>
+                    <Size>-1,185min</Size>
+                    <MaximumSize>-1,230</MaximumSize>
+                    <Children>
+                      <SingletonContainer>
+                        <ObjectName>DecksMixerSingleton</ObjectName>
+                      </SingletonContainer>
+                    </Children>
+                  </WidgetGroup>
+
+                </Children>
+              </Splitter>
+
+            </Children>
+            <Connection>
+              <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+
+          <!-- 2 decks split with QuickEffect -->
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <Size>-1,160max</Size>
+            <MaximumSize>-1,260</MaximumSize>
+            <Children>
+              <SingletonContainer>
+                <ObjectName>DecksMixerSingleton</ObjectName>
+              </SingletonContainer>
+            </Children>
+            <Connection>
+              <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
+              <BindProperty>visible</BindProperty>
+              <Transform>
+                <Not/>
+              </Transform>
+            </Connection>
+          </WidgetGroup>
+
         </Children>
+        <Connection>
+          <ConfigKey>[QuickEffectRack1_[Channel1]_Effect1],loaded</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
       </WidgetGroup>
+
     </Children>
     <Connection>
-      <ConfigKey>[Master],maximize_library</ConfigKey>
+      <ConfigKey>[Master],show_4decks</ConfigKey>
       <BindProperty>visible</BindProperty>
       <Transform>
         <Not/>
       </Transform>
     </Connection>
   </WidgetGroup>
+
+  <WidgetGroup>
+    <ObjectName>MainDeckContainer</ObjectName>
+    <Layout>vertical</Layout>
+    <SizePolicy>me,me</SizePolicy>
+    <Children>
+
+      <!-- If the Quick Effect superknob is showing, the minimum height for the
+      mixer needs to be higher to prevent knobs from getting cut off. -->
+      <WidgetGroup>
+        <ObjectName>4DecksNoQuickEffect</ObjectName>
+        <Layout>vertical</Layout>
+        <Children>
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <Children>
+
+              <!-- 4 decks stacked no QuickEffect -->
+              <Splitter>
+                <ObjectName>DeckSplitter</ObjectName>
+                <Orientation>vertical</Orientation>
+                <Size>-1me,-1me</Size>
+                <SplitSizesConfigKey>[Deere],WaveformSplitter4DecksNoQE</SplitSizesConfigKey>
+                <SplitSizes>220,362</SplitSizes>
+                <Children>
+                  <WidgetGroup>
+                    <ObjectName>StackedWaveformsContainer</ObjectName>
+                    <Layout>vertical</Layout>
+                    <Children>
+
+                      <SingletonContainer>
+                        <ObjectName>DeckVisualRow3</ObjectName>
+                      </SingletonContainer>
+                      <SingletonContainer>
+                        <ObjectName>DeckVisualRow1</ObjectName>
+                      </SingletonContainer>
+                      <SingletonContainer>
+                        <ObjectName>DeckVisualRow2</ObjectName>
+                      </SingletonContainer>
+                      <SingletonContainer>
+                        <ObjectName>DeckVisualRow4</ObjectName>
+                      </SingletonContainer>
+
+                    </Children>
+                  </WidgetGroup>
+
+                  <WidgetGroup>
+                    <Layout>horizontal</Layout>
+                    <Size>-1,310min</Size>
+                    <MaximumSize>-1,460</MaximumSize>
+                    <Children>
+                      <SingletonContainer>
+                        <ObjectName>DecksMixerSingleton</ObjectName>
+                      </SingletonContainer>
+                    </Children>
+                  </WidgetGroup>
+
+                </Children>
+              </Splitter>
+
+            </Children>
+            <Connection>
+              <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+
+          <!-- 4 decks split no QuickEffect -->
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <Size>-1me,-1me</Size>
+            <MaximumSize>-1,630</MaximumSize>
+            <Children>
+              <SingletonContainer>
+                <ObjectName>DecksMixerSingleton</ObjectName>
+              </SingletonContainer>
+            </Children>
+            <Connection>
+              <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
+              <BindProperty>visible</BindProperty>
+              <Transform>
+                <Not/>
+              </Transform>
+            </Connection>
+          </WidgetGroup>
+
+        </Children>
+        <Connection>
+          <ConfigKey>[QuickEffectRack1_[Channel1]_Effect1],loaded</ConfigKey>
+          <BindProperty>visible</BindProperty>
+          <Transform>
+            <Not/>
+          </Transform>
+        </Connection>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>4DecksWithQuickEffect</ObjectName>
+        <Layout>vertical</Layout>
+        <Children>
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <Children>
+
+              <!-- 4 decks stacked with QuickEffect -->
+              <Splitter>
+                <ObjectName>DeckSplitter</ObjectName>
+                <Orientation>vertical</Orientation>
+                <Size>-1me,-1me</Size>
+                <SplitSizesConfigKey>[Deere],WaveformSplitter4DecksWithQE</SplitSizesConfigKey>
+                <SplitSizes>149,350</SplitSizes>
+                <Children>
+                  <WidgetGroup>
+                    <ObjectName>StackedWaveformsContainer</ObjectName>
+                    <Layout>vertical</Layout>
+                    <Children>
+
+                      <SingletonContainer>
+                        <ObjectName>DeckVisualRow3</ObjectName>
+                      </SingletonContainer>
+                      <SingletonContainer>
+                        <ObjectName>DeckVisualRow1</ObjectName>
+                      </SingletonContainer>
+                      <SingletonContainer>
+                        <ObjectName>DeckVisualRow2</ObjectName>
+                      </SingletonContainer>
+                      <SingletonContainer>
+                        <ObjectName>DeckVisualRow4</ObjectName>
+                      </SingletonContainer>
+
+                    </Children>
+                  </WidgetGroup>
+
+                  <WidgetGroup>
+                    <Layout>horizontal</Layout>
+                    <Size>-1,350min</Size>
+                    <MaximumSize>-1,460</MaximumSize>
+                    <Children>
+                      <SingletonContainer>
+                        <ObjectName>DecksMixerSingleton</ObjectName>
+                      </SingletonContainer>
+                    </Children>
+                  </WidgetGroup>
+
+                </Children>
+              </Splitter>
+
+            </Children>
+            <Connection>
+              <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+
+          <!-- 4 decks split with QuickEffect -->
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <MaximumSize>-1,630</MaximumSize>
+            <Children>
+              <SingletonContainer>
+                <ObjectName>DecksMixerSingleton</ObjectName>
+              </SingletonContainer>
+            </Children>
+            <Connection>
+              <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
+              <BindProperty>visible</BindProperty>
+              <Transform>
+                <Not/>
+              </Transform>
+            </Connection>
+          </WidgetGroup>
+
+        </Children>
+        <Connection>
+          <ConfigKey>[QuickEffectRack1_[Channel1]_Effect1],loaded</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+    </Children>
+    <Connection>
+      <ConfigKey>[Master],show_4decks</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/microphone.xml b/res/skins/Deere/microphone.xml
index d7a9e6470c0a..9edcf26d5127 100644
--- a/res/skins/Deere/microphone.xml
+++ b/res/skins/Deere/microphone.xml
@@ -7,36 +7,120 @@
 -->
 
 <Template>
+  <SetVariable name="group">[Microphone<Variable name="i"/>]</SetVariable>
   <WidgetGroup>
     <ObjectName>MicrophoneContainer</ObjectName>
-    <Layout>horizontal</Layout>
-    <SizePolicy>min,min</SizePolicy>
+    <Layout>vertical</Layout>
+    <SizePolicy>max,max</SizePolicy>
     <Children>
-      <Template src="skin:microphone_talkover_button.xml">
-        <SetVariable name="group">[Microphone<Variable name="i"/>]</SetVariable>
-        <SetVariable name="TooltipId">microphone_talkover</SetVariable>
-        <SetVariable name="talk_text">Talk <Variable name="i"/></SetVariable>
-      </Template>
-
-      <Template src="skin:vumeter.xml">
-        <SetVariable name="group">[Microphone<Variable name="i"/>]</SetVariable>
-        <SetVariable name="TooltipId">microphone_VuMeter</SetVariable>
-        <SetVariable name="control">VuMeter</SetVariable>
-      </Template>
-
-      <Template src="skin:knob_with_button.xml">
-        <SetVariable name="TooltipId">microphone_pregain</SetVariable>
-        <SetVariable name="group">[Microphone<Variable name="i"/>]</SetVariable>
-        <SetVariable name="control">pregain</SetVariable>
-        <SetVariable name="color">red</SetVariable>
-        <SetVariable name="button_TooltipId">mute</SetVariable>
-        <SetVariable name="button_control">mute</SetVariable>
-        <SetVariable name="label">Gain</SetVariable>
-      </Template>
+
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <ObjectName>MicLabelContainer</ObjectName>
+        <Children>
+          <Label>
+            <ObjectName>MicLabel</ObjectName>
+            <Text>Mic <Variable name="i"/></Text>
+          </Label>
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>MicrophoneControls</ObjectName>
+        <Layout>horizontal</Layout>
+        <Children>
+
+          <Template src="skin:knob_with_button.xml">
+            <SetVariable name="TooltipId">microphone_pregain</SetVariable>
+            <SetVariable name="control">pregain</SetVariable>
+            <SetVariable name="color">red</SetVariable>
+            <SetVariable name="button_TooltipId">mute</SetVariable>
+            <SetVariable name="button_control">mute</SetVariable>
+            <SetVariable name="label">Gain</SetVariable>
+          </Template>
+
+          <WidgetGroup>
+            <ObjectName>MicrophoneButtonsAndMeter</ObjectName>
+            <Layout>vertical</Layout>
+            <Children>
+
+              <WidgetGroup>
+                <ObjectName>MicrophoneControlButtons</ObjectName>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:microphone_talkover_button.xml">
+                    <SetVariable name="TooltipId">microphone_talkover</SetVariable>
+                    <SetVariable name="talk_text">Talk</SetVariable>
+                  </Template>
+
+                  <Template src="skin:left_2state_button.xml">
+                    <SetVariable name="TooltipId">pfl</SetVariable>
+                    <SetVariable name="ObjectName">MicPFLButton</SetVariable>
+                    <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                    <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                    <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                    <SetVariable name="state_0_text"></SetVariable>
+                    <SetVariable name="state_0_pressed">icon/ic_headphones_48px.svg</SetVariable>
+                    <SetVariable name="state_0_unpressed">icon/ic_headphones_48px.svg</SetVariable>
+                    <SetVariable name="state_1_text"></SetVariable>
+                    <SetVariable name="state_1_pressed">icon/ic_headphones_48px.svg</SetVariable>
+                    <SetVariable name="state_1_unpressed">icon/ic_headphones_48px.svg</SetVariable>
+                    <SetVariable name="left_connection_control"><Variable name="group"/>,pfl</SetVariable>
+                  </Template>
+
+                  <Template src="skin:crossfader_orientation_button.xml" />
+
+                </Children>
+              </WidgetGroup>
+
+              <Template src="skin:vumeter.xml">
+                <SetVariable name="TooltipId">microphone_VuMeter</SetVariable>
+                <SetVariable name="control">VuMeter</SetVariable>
+              </Template>
+
+              <WidgetGroup>
+                <ObjectName>ButtonGrid</ObjectName>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:fx_unit_group_assignment_button.xml">
+                    <SetVariable name="EffectUnit">1</SetVariable>
+                    <SetVariable name="SourceType">microphone</SetVariable>
+                  </Template>
+
+                  <Template src="skin:fx_unit_group_assignment_button.xml">
+                    <SetVariable name="EffectUnit">2</SetVariable>
+                    <SetVariable name="SourceType">microphone</SetVariable>
+                  </Template>
+
+                  <WidgetGroup>
+                    <ObjectName>ButtonGrid</ObjectName>
+                    <Layout>horizontal</Layout>
+                    <Children>
+                      <Template src="skin:fx_unit_group_assignment_button.xml">
+                        <SetVariable name="EffectUnit">3</SetVariable>
+                        <SetVariable name="SourceType">microphone</SetVariable>
+                      </Template>
+
+                      <Template src="skin:fx_unit_group_assignment_button.xml">
+                        <SetVariable name="EffectUnit">4</SetVariable>
+                        <SetVariable name="SourceType">microphone</SetVariable>
+                      </Template>
+                    </Children>
+                    <Connection>
+                      <ConfigKey>[Master],show_4effectunits</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup>
+
+                </Children>
+              </WidgetGroup>
+
+            </Children>
+          </WidgetGroup>
+
+        </Children>
+      </WidgetGroup>
+
     </Children>
-    <Connection>
-      <ConfigKey>[Microphone<Variable name="i"/>],enabled</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/microphone_rack.xml b/res/skins/Deere/microphone_rack.xml
index d4f6834ce173..f1176b066c6e 100644
--- a/res/skins/Deere/microphone_rack.xml
+++ b/res/skins/Deere/microphone_rack.xml
@@ -24,121 +24,186 @@
             <Children>
 
               <!-- Microphone input controls -->
+              <!-- Hide all mic controls but for Mic 1, if not enabled in
+                the sound hardware preferences. Clicking the Mic 1 TALK
+                button opens a modal window which allows to go straight
+                to the preferences pane for easy set up. Once Mic 1 is
+                set up, this widget hides itself. -->
+
+              <Template src="skin:microphone.xml">
+                <SetVariable name="i"></SetVariable>
+              </Template>
+
               <WidgetGroup>
                 <Layout>horizontal</Layout>
                 <Children>
-                  <!-- Hide all mic controls but for Mic 1, if not enabled in
-                       the sound hardware preferences. Clicking the Mic 1 TALK
-                       button opens a modal window which allows to go straight
-                       to the preferences pane for easy set up. Once Mic 1 is
-                       set up, this widget hides itself. -->
-                  <Template src="skin:microphone_talkover_button.xml">
-                    <SetVariable name="group">[Microphone<Variable name="i"/>]</SetVariable>
-                    <SetVariable name="TooltipId">microphone_talkover</SetVariable>
-                    <SetVariable name="talk_text">Talk</SetVariable>
+                  <Template src="skin:microphone.xml">
+                    <SetVariable name="i">2</SetVariable>
                   </Template>
+                </Children>
+                <Connection>
+                  <ConfigKey>[Microphone2],enabled</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
 
-                  <Template src="skin:vumeter.xml">
-                    <SetVariable name="group">[Microphone<Variable name="i"/>]</SetVariable>
-                    <SetVariable name="TooltipId">microphone_VuMeter</SetVariable>
-                    <SetVariable name="control">VuMeter</SetVariable>
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:microphone.xml">
+                    <SetVariable name="i">3</SetVariable>
                   </Template>
+                </Children>
+                <Connection>
+                  <ConfigKey>[Microphone3],enabled</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
 
-                  <Template src="skin:knob_with_button.xml">
-                    <SetVariable name="TooltipId">microphone_pregain</SetVariable>
-                    <SetVariable name="group">[Microphone<Variable name="i"/>]</SetVariable>
-                    <SetVariable name="control">pregain</SetVariable>
-                    <SetVariable name="color">red</SetVariable>
-                    <SetVariable name="button_TooltipId">mute</SetVariable>
-                    <SetVariable name="button_control">mute</SetVariable>
-                    <SetVariable name="label">Gain</SetVariable>
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:microphone.xml">
+                    <SetVariable name="i">4</SetVariable>
                   </Template>
                 </Children>
                 <Connection>
-                  <ConfigKey>[Microphone],enabled</ConfigKey>
+                  <ConfigKey>[Microphone4],enabled</ConfigKey>
                   <BindProperty>visible</BindProperty>
-                  <Transform>
-                    <Not/>
-                  </Transform>
                 </Connection>
               </WidgetGroup>
 
-              <Template src="skin:microphone.xml">
-                <SetVariable name="i"></SetVariable>
-              </Template>
-              <Template src="skin:microphone.xml">
-                <SetVariable name="i">2</SetVariable>
-              </Template>
-              <Template src="skin:microphone.xml">
-                <SetVariable name="i">3</SetVariable>
-              </Template>
-              <Template src="skin:microphone.xml">
-                <SetVariable name="i">4</SetVariable>
-              </Template>
+              <WidgetGroup>
+                <ObjectName>MicDuckingContainer</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>max,e</SizePolicy>
+                <Children>
 
-              <PushButton>
-                <!-- TODO(jus): Add missing string to src/skin/tooltips.cpp -->
-                <TooltipId></TooltipId>
-                <Size>70f,20f</Size>
-                <NumberStates>3</NumberStates>
-                <State>
-                  <Number>0</Number>
-                  <Text>Ducking</Text>
-                </State>
-                <State>
-                  <Number>1</Number>
-                  <Text>Ducking</Text>
-                </State>
-                <State>
-                  <Number>2</Number>
-                  <Text>Manual</Text>
-                </State>
-                <Connection>
-                  <ConfigKey>[Master],talkoverDucking</ConfigKey>
-                  <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-                </Connection>
-              </PushButton>
-
-              <Template src="skin:knob_with_label.xml">
-                <SetVariable name="group">[Master]</SetVariable>
-                <SetVariable name="control">duckStrength</SetVariable>
-                <!-- TODO(jus): Add missing string to src/skin/tooltips.cpp -->
-                <SetVariable name="TooltipId"></SetVariable>
-                <SetVariable name="color">blue</SetVariable>
-                <SetVariable name="label">Strength</SetVariable>
-              </Template>
+                  <WidgetGroup>
+                    <Layout>horizontal</Layout>
+                    <Children>
+                      <Label>
+                        <Text>DUCKING</Text>
+                      </Label>
+                    </Children>
+                  </WidgetGroup>
+
+                  <WidgetGroup>
+                    <ObjectName>MicDuckingControls</ObjectName>
+                    <Layout>horizontal</Layout>
+                    <Children>
+
+                      <PushButton>
+                        <!-- TODO(jus): Add missing string to src/skin/tooltips.cpp -->
+                        <TooltipId></TooltipId>
+                        <Size>70f,20f</Size>
+                        <NumberStates>3</NumberStates>
+                        <State>
+                          <Number>0</Number>
+                          <Text>OFF</Text>
+                        </State>
+                        <State>
+                          <Number>1</Number>
+                          <Text>AUTO</Text>
+                        </State>
+                        <State>
+                          <Number>2</Number>
+                          <Text>MANUAL</Text>
+                        </State>
+                        <Connection>
+                          <ConfigKey>[Master],talkoverDucking</ConfigKey>
+                          <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+                        </Connection>
+                      </PushButton>
+
+                      <!-- knob_with_label.xml template will not work here because
+                      "Strength" label exceeds width of knob. -->
+                      <WidgetGroup>
+                        <Layout>vertical</Layout>
+                        <Children>
+
+                          <WidgetGroup>
+                            <Layout>horizontal</Layout>
+                            <Children>
+                              <Template src="skin:knob.xml">
+                                <SetVariable name="group">[Master]</SetVariable>
+                                <SetVariable name="control">duckStrength</SetVariable>
+                                <!-- TODO(jus): Add missing string to src/skin/tooltips.cpp -->
+                                <SetVariable name="TooltipId"></SetVariable>
+                                <SetVariable name="color">blue</SetVariable>
+                              </Template>
+                            </Children>
+                          </WidgetGroup>
+
+                          <Label>
+                            <ObjectName>KnobLabel</ObjectName>
+                            <Text>Strength</Text>
+                          </Label>
+                        </Children>
+                      </WidgetGroup>
+
+                    </Children>
+                  </WidgetGroup>
+
+                </Children>
+              </WidgetGroup>
+
+              <Template src="skin:spacer_h.xml"/>
 
               <!-- Auxiliary input controls -->
-              <Template src="skin:spacer_h.xml"></Template>
 
               <Template src="skin:auxiliary.xml">
                 <SetVariable name="i">1</SetVariable>
               </Template>
-              <Template src="skin:auxiliary.xml">
-                <SetVariable name="i">2</SetVariable>
-              </Template>
-              <Template src="skin:auxiliary.xml">
-                <SetVariable name="i">3</SetVariable>
-              </Template>
-              <Template src="skin:auxiliary.xml">
-                <SetVariable name="i">4</SetVariable>
-              </Template>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:auxiliary.xml">
+                    <SetVariable name="i">2</SetVariable>
+                  </Template>
+                </Children>
+                <Connection>
+                  <ConfigKey>[Auxiliary2],enabled</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:auxiliary.xml">
+                    <SetVariable name="i">3</SetVariable>
+                  </Template>
+                </Children>
+                <Connection>
+                  <ConfigKey>[Auxiliary3],enabled</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:auxiliary.xml">
+                    <SetVariable name="i">4</SetVariable>
+                  </Template>
+                </Children>
+                <Connection>
+                  <ConfigKey>[Auxiliary4],enabled</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+
             </Children>
           </WidgetGroup>
 
         </Children>
         <Connection>
-          <ConfigKey persist="true">[Microphone],show_microphone</ConfigKey>
+          <ConfigKey>[Microphone],show_microphone</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
       </WidgetStack>
     </Children>
-    <Connection>
-      <ConfigKey>[Master],maximize_library</ConfigKey>
-      <BindProperty>visible</BindProperty>
-      <Transform>
-        <Not/>
-      </Transform>
-    </Connection>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/mixer.xml b/res/skins/Deere/mixer.xml
index 70a562d39e45..2ec79ebd43cd 100644
--- a/res/skins/Deere/mixer.xml
+++ b/res/skins/Deere/mixer.xml
@@ -14,38 +14,184 @@
         <SizePolicy>min,min</SizePolicy>
         <Layout>horizontal</Layout>
         <Children>
+
           <WidgetGroup>
+            <ObjectName>DeckControlsSplitWaveforms</ObjectName>
             <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:left_deck_mixer_controls.xml">
-                <SetVariable name="i">3</SetVariable>
-              </Template>
+
+              <WidgetGroup>
+                <ObjectName>DeckControlsSplitWaveforms2Decks</ObjectName>
+                <Layout>horizontal</Layout>
+                <Children>
+
+                  <Template src="skin:left_deck_mixer_controls.xml">
+                    <SetVariable name="i">1</SetVariable>
+                  </Template>
+
+                  <Template src="skin:vumeter_master.xml"/>
+
+                  <Template src="skin:right_deck_mixer_controls.xml">
+                    <SetVariable name="i">2</SetVariable>
+                  </Template>
+
+                </Children>
+                <Connection>
+                  <ConfigKey>[Master],show_4decks</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                  <Transform>
+                    <Not/>
+                  </Transform>
+                </Connection>
+              </WidgetGroup> <!-- DeckControlsSplitWaveforms2Decks -->
+
+              <WidgetGroup>
+                <ObjectName>DeckControlsSplitWaveforms4Decks</ObjectName>
+                <Layout>horizontal</Layout>
+                <Children>
+
+                  <Template src="skin:left_deck_mixer_controls.xml">
+                    <SetVariable name="i">3</SetVariable>
+                  </Template>
+                  <Template src="skin:left_deck_mixer_controls.xml">
+                    <SetVariable name="i">1</SetVariable>
+                  </Template>
+
+                  <Template src="skin:vumeter_master.xml"/>
+
+                  <Template src="skin:right_deck_mixer_controls.xml">
+                    <SetVariable name="i">2</SetVariable>
+                  </Template>
+                  <Template src="skin:right_deck_mixer_controls.xml">
+                    <SetVariable name="i">4</SetVariable>
+                  </Template>
+
+                </Children>
+                <Connection>
+                  <ConfigKey>[Master],show_4decks</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup> <!-- DeckControlsSplitWaveforms4Decks -->
+
             </Children>
             <Connection>
-              <ConfigKey>[Master],show_4decks</ConfigKey>
+              <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
               <BindProperty>visible</BindProperty>
+              <Transform>
+                <Not/>
+              </Transform>
             </Connection>
           </WidgetGroup>
-          <Template src="skin:left_deck_mixer_controls.xml">
-            <SetVariable name="i">1</SetVariable>
-          </Template>
-          <Template src="skin:right_deck_mixer_controls.xml">
-            <SetVariable name="i">2</SetVariable>
-          </Template>
+
           <WidgetGroup>
+            <ObjectName>DeckControlsStackedWaveforms</ObjectName>
             <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:right_deck_mixer_controls.xml">
-                <SetVariable name="i">4</SetVariable>
-              </Template>
+              <WidgetGroup>
+                <ObjectName>DeckControlsStackedWaveforms2Decks</ObjectName>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:left_deck_mixer_controls.xml">
+                    <SetVariable name="i">1</SetVariable>
+                  </Template>
+
+                  <Template src="skin:vumeter_master.xml"/>
+
+                  <Template src="skin:right_deck_mixer_controls.xml">
+                    <SetVariable name="i">2</SetVariable>
+                  </Template>
+                </Children>
+                <Connection>
+                  <ConfigKey>[Master],show_4decks</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                  <Transform>
+                    <Not/>
+                  </Transform>
+                </Connection>
+              </WidgetGroup> <!-- DeckControlsStackedWaveforms2Decks -->
+
+              <WidgetGroup>
+                <ObjectName>DeckControlsStackedWaveforms4Decks</ObjectName>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <WidgetGroup>
+                    <Layout>horizontal</Layout>
+                    <Children>
+
+                      <WidgetGroup>
+                        <ObjectName>DeckControlsStackedWaveforms4DecksNoEQs</ObjectName>
+                        <Layout>horizontal</Layout>
+                        <Children>
+                          <Template src="skin:left_deck_mixer_controls.xml">
+                            <SetVariable name="i">3</SetVariable>
+                          </Template>
+                          <Template src="skin:left_deck_mixer_controls.xml">
+                            <SetVariable name="i">1</SetVariable>
+                          </Template>
+
+                          <Template src="skin:vumeter_master.xml"/>
+
+                          <Template src="skin:right_deck_mixer_controls.xml">
+                            <SetVariable name="i">2</SetVariable>
+                          </Template>
+                          <Template src="skin:right_deck_mixer_controls.xml">
+                            <SetVariable name="i">4</SetVariable>
+                          </Template>
+                        </Children>
+                        <Connection>
+                          <ConfigKey>[Master],show_eqs</ConfigKey>
+                          <BindProperty>visible</BindProperty>
+                          <Transform>
+                            <Not/>
+                          </Transform>
+                        </Connection>
+                      </WidgetGroup> <!-- DeckControlsStackedWaveforms4DecksNoEQs -->
+
+                      <WidgetGroup>
+                        <ObjectName>DeckControlsStackedWaveforms4DecksWithEQs</ObjectName>
+                        <Layout>horizontal</Layout>
+                        <Children>
+                          <Template src="skin:deck_mixer_controls_condensed_left.xml">
+                            <SetVariable name="i">3</SetVariable>
+                          </Template>
+                          <Template src="skin:deck_mixer_controls_condensed_left.xml">
+                            <SetVariable name="i">1</SetVariable>
+                          </Template>
+
+                          <Template src="skin:vumeter_master.xml"/>
+
+                          <Template src="skin:deck_mixer_controls_condensed_right.xml">
+                            <SetVariable name="i">2</SetVariable>
+                          </Template>
+                          <Template src="skin:deck_mixer_controls_condensed_right.xml">
+                            <SetVariable name="i">4</SetVariable>
+                          </Template>
+                        </Children>
+                        <Connection>
+                          <ConfigKey>[Master],show_eqs</ConfigKey>
+                          <BindProperty>visible</BindProperty>
+                        </Connection>
+                      </WidgetGroup> <!-- DeckControlsStackedWaveforms4DecksWithEQs -->
+
+                    </Children>
+                  </WidgetGroup> <!-- DeckControlsStackedWaveforms4Decks -->
+
+                </Children>
+                <Connection>
+                  <ConfigKey>[Master],show_4decks</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+
             </Children>
             <Connection>
-              <ConfigKey>[Master],show_4decks</ConfigKey>
+              <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
               <BindProperty>visible</BindProperty>
             </Connection>
           </WidgetGroup>
+
         </Children>
-      </WidgetGroup>
+      </WidgetGroup> <!-- DeckControlsStackedWaveforms -->
 
       <WidgetGroup>
         <ObjectName>CrossfaderContainer</ObjectName>
@@ -108,21 +254,15 @@
 
           </Children>
           <Connection>
-            <ConfigKey>[Deere],hide_crossfader</ConfigKey>
+            <ConfigKey>[Deere],show_crossfader</ConfigKey>
             <BindProperty>visible</BindProperty>
-            <Transform>
-              <Not/>
-            </Transform>
           </Connection>
       </WidgetGroup>
 
     </Children>
     <Connection>
-      <ConfigKey>[Master],hide_mixer</ConfigKey>
+      <ConfigKey>[Master],show_mixer</ConfigKey>
       <BindProperty>visible</BindProperty>
-      <Transform>
-        <Not/>
-      </Transform>
     </Connection>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/quick_effect_superknob.xml b/res/skins/Deere/quick_effect_superknob_left.xml
similarity index 50%
rename from res/skins/Deere/quick_effect_superknob.xml
rename to res/skins/Deere/quick_effect_superknob_left.xml
index 50e43e69f160..dc723690be82 100644
--- a/res/skins/Deere/quick_effect_superknob.xml
+++ b/res/skins/Deere/quick_effect_superknob_left.xml
@@ -14,16 +14,26 @@
   <WidgetGroup>
     <Layout>horizontal</Layout>
     <Children>
+
+      <!--Wrap the EffectPushButton in a vertical WidgetGroup with spacers to ensure it stays in the
+      correct position when the knobs get further apart and closer together.-->
       <WidgetGroup>
-        <Size>15f,21f</Size>
+        <Layout>vertical</Layout>
         <Children>
+
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <Size>15f,12f</Size>
+            <Children/>
+          </WidgetGroup>
+
           <EffectPushButton>
             <TooltipId><Variable name="button_TooltipId"/></TooltipId>
             <Size>15f,15f</Size>
-            <ObjectName>MixerButton</ObjectName>
+            <ObjectName>CircleButton</ObjectName>
             <EffectRackGroup><Variable name="QuickEffectRackGroup"/></EffectRackGroup>
             <EffectUnitGroup><Variable name="QuickEffectUnitGroup"/></EffectUnitGroup>
-            <Effect>1</Effect>
+            <Effect><Variable name="QuickEffect"/></Effect>
             <EffectButtonParameter><Variable name="QuickEffect"/></EffectButtonParameter>
             <NumberStates>2</NumberStates>
             <State>
@@ -43,25 +53,58 @@
               <ButtonState>LeftButton</ButtonState>
             </Connection>
           </EffectPushButton>
+
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <Size>15f,-1me</Size>
+            <Children/>
+          </WidgetGroup>
+
         </Children>
       </WidgetGroup>
-      <WidgetGroup>
-        <Layout>vertical</Layout>
+
+      <SizeAwareStack>
         <Children>
-          <Template src="skin:knob.xml">
-            <SetVariable name="group"><Variable name="QuickEffectUnitGroup"/></SetVariable>
-            <SetVariable name="control">super1</SetVariable>
-            <SetVariable name="color"><Variable name="color"/></SetVariable>
-          </Template>
-          <EffectName>
-            <Size>40f,10f</Size>
-            <ObjectName>KnobLabel</ObjectName>
-            <EffectRackGroup><Variable name="QuickEffectRackGroup"/></EffectRackGroup>
-            <EffectUnitGroup><Variable name="QuickEffectUnitGroup"/></EffectUnitGroup>
-            <Effect>1</Effect>
-          </EffectName>
+
+          <WidgetGroup>
+            <ObjectName>EQKnobNoLabel</ObjectName>
+            <MinimumSize>40,34</MinimumSize>
+            <MaximumSize>40,41</MaximumSize>
+            <Layout>vertical</Layout>
+            <Children>
+              <Template src="skin:knob.xml">
+                <SetVariable name="group"><Variable name="QuickEffectUnitGroup"/></SetVariable>
+                <SetVariable name="control">super1</SetVariable>
+                <SetVariable name="color"><Variable name="color"/></SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>EQKnobWithLabel</ObjectName>
+            <MinimumSize>40,42</MinimumSize>
+            <MaximumSize>40,45</MaximumSize>
+            <Layout>vertical</Layout>
+            <Children>
+              <Template src="skin:knob.xml">
+                <SetVariable name="group"><Variable name="QuickEffectUnitGroup"/></SetVariable>
+                <SetVariable name="control">super1</SetVariable>
+                <SetVariable name="color"><Variable name="color"/></SetVariable>
+              </Template>
+              <EffectName>
+                <Size>40f,10f</Size>
+                <ObjectName>KnobLabel</ObjectName>
+                <EffectRackGroup><Variable name="QuickEffectRackGroup"/></EffectRackGroup>
+                <EffectUnitGroup><Variable name="QuickEffectUnitGroup"/></EffectUnitGroup>
+                <Effect>1</Effect>
+                <Elide>middle</Elide>
+              </EffectName>
+            </Children>
+          </WidgetGroup>
+
         </Children>
-      </WidgetGroup>
+      </SizeAwareStack>
+
     </Children>
     <Connection>
       <ConfigKey><Variable name="QuickEffectEffectGroup"/>,loaded</ConfigKey>
diff --git a/res/skins/Deere/quick_effect_superknob_right.xml b/res/skins/Deere/quick_effect_superknob_right.xml
new file mode 100644
index 000000000000..299eccc44860
--- /dev/null
+++ b/res/skins/Deere/quick_effect_superknob_right.xml
@@ -0,0 +1,114 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    The QuickEffect rack superknob.
+  Variables:
+    QuickEffect: the quick effect rack
+    group: the group
+    color: the notch color. red, green, yellow, blue or light_blue
+-->
+<Template>
+  <SetVariable name="QuickEffectRackGroup">[QuickEffectRack<Variable name="QuickEffect"/>]</SetVariable>
+  <SetVariable name="QuickEffectUnitGroup">[QuickEffectRack<Variable name="QuickEffect"/>_<Variable name="group"/>]</SetVariable>
+  <SetVariable name="QuickEffectEffectGroup">[QuickEffectRack<Variable name="QuickEffect"/>_<Variable name="group"/>_Effect1]</SetVariable>
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <Children>
+
+      <SizeAwareStack>
+        <Children>
+
+          <WidgetGroup>
+            <ObjectName>EQKnobNoLabel</ObjectName>
+            <MinimumSize>40,34</MinimumSize>
+            <MaximumSize>40,41</MaximumSize>
+            <Layout>vertical</Layout>
+            <Children>
+              <Template src="skin:knob.xml">
+                <SetVariable name="group"><Variable name="QuickEffectUnitGroup"/></SetVariable>
+                <SetVariable name="control">super1</SetVariable>
+                <SetVariable name="color"><Variable name="color"/></SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>EQKnobWithLabel</ObjectName>
+            <MinimumSize>40,42</MinimumSize>
+            <MaximumSize>40,45</MaximumSize>
+            <Layout>vertical</Layout>
+            <Children>
+              <Template src="skin:knob.xml">
+                <SetVariable name="group"><Variable name="QuickEffectUnitGroup"/></SetVariable>
+                <SetVariable name="control">super1</SetVariable>
+                <SetVariable name="color"><Variable name="color"/></SetVariable>
+              </Template>
+              <EffectName>
+                <Size>40f,10f</Size>
+                <ObjectName>KnobLabel</ObjectName>
+                <EffectRackGroup><Variable name="QuickEffectRackGroup"/></EffectRackGroup>
+                <EffectUnitGroup><Variable name="QuickEffectUnitGroup"/></EffectUnitGroup>
+                <Effect>1</Effect>
+                <Elide>middle</Elide>
+              </EffectName>
+            </Children>
+          </WidgetGroup>
+
+        </Children>
+      </SizeAwareStack>
+
+      <!--Wrap the EffectPushButton in a vertical WidgetGroup with spacers to ensure it stays in the
+      correct position when the knobs get further apart and closer together.-->
+      <WidgetGroup>
+        <Layout>vertical</Layout>
+        <Children>
+
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <Size>15f,12f</Size>
+            <Children/>
+          </WidgetGroup>
+
+          <EffectPushButton>
+            <TooltipId><Variable name="button_TooltipId"/></TooltipId>
+            <Size>15f,15f</Size>
+            <ObjectName>CircleButton</ObjectName>
+            <EffectRackGroup><Variable name="QuickEffectRackGroup"/></EffectRackGroup>
+            <EffectUnitGroup><Variable name="QuickEffectUnitGroup"/></EffectUnitGroup>
+            <Effect><Variable name="QuickEffect"/></Effect>
+            <EffectButtonParameter><Variable name="QuickEffect"/></EffectButtonParameter>
+            <NumberStates>2</NumberStates>
+            <State>
+              <Number>0</Number>
+              <Text></Text>
+              <Pressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_off_48px.svg</Pressed>
+              <Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_off_48px.svg</Unpressed>
+            </State>
+            <State>
+              <Number>1</Number>
+              <Text></Text>
+              <Pressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Pressed>
+              <Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Unpressed>
+            </State>
+            <Connection>
+              <ConfigKey><Variable name="QuickEffectEffectGroup"/>,enabled</ConfigKey>
+              <ButtonState>LeftButton</ButtonState>
+            </Connection>
+          </EffectPushButton>
+
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <Size>15f,-1me</Size>
+            <Children/>
+          </WidgetGroup>
+
+        </Children>
+      </WidgetGroup>
+
+    </Children>
+    <Connection>
+      <ConfigKey><Variable name="QuickEffectEffectGroup"/>,loaded</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Deere/right_deck_mixer_controls.xml b/res/skins/Deere/right_deck_mixer_controls.xml
index a76e5e78d210..a87f41060329 100644
--- a/res/skins/Deere/right_deck_mixer_controls.xml
+++ b/res/skins/Deere/right_deck_mixer_controls.xml
@@ -11,12 +11,18 @@
     <SizePolicy>min,me</SizePolicy>
     <Children>
 
-      <!-- In 2 deck mode, we show a 2-column mixer section -->
+      <!-- In 2 deck mode, we show a 3-column mixer section -->
       <WidgetGroup>
         <Layout>horizontal</Layout>
         <Children>
-          <Template src="skin:deck_mixer_controls_col2.xml"/>
-          <Template src="skin:deck_mixer_controls_col1.xml"/>
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Template src="skin:deck_mixer_controls_col3.xml"/>
+              <Template src="skin:deck_mixer_controls_col2.xml"/>
+            </Children>
+          </WidgetGroup>
+          <Template src="skin:deck_mixer_controls_col1_right.xml"/>
         </Children>
         <Connection>
           <ConfigKey>[Master],show_4decks</ConfigKey>
@@ -27,15 +33,16 @@
         </Connection>
       </WidgetGroup>
 
-      <!-- In 4 deck mode, we show a 2-column mixer section -->
+      <!-- In 4 deck mode, we show all controls in one column per deck. -->
       <WidgetGroup>
         <Layout>vertical</Layout>
         <Children>
-          <Template src="skin:deck_mixer_controls_col1.xml"/>
+          <Template src="skin:deck_mixer_controls_col1_right.xml"/>
           <WidgetGroup>
             <Layout>vertical</Layout>
-            <ObjectName>4DecksMixerCol2Container</ObjectName>
+            <ObjectName>4DecksMixerCol2ContainerRight</ObjectName>
             <Children>
+              <Template src="skin:deck_mixer_controls_col3.xml"/>
               <Template src="skin:deck_mixer_controls_col2.xml"/>
             </Children>
           </WidgetGroup>
diff --git a/res/skins/Deere/right_gutter.xml b/res/skins/Deere/right_gutter.xml
index 97ac3aadd9ad..7b56b8585331 100644
--- a/res/skins/Deere/right_gutter.xml
+++ b/res/skins/Deere/right_gutter.xml
@@ -9,30 +9,30 @@
     <Layout>vertical</Layout>
     <SizePolicy>me,min</SizePolicy>
     <Children>
-      <Template src="skin:spacer.xml"/>
-      <Template src="skin:deck_right.xml">
+      <Template src="skin:deck.xml">
         <SetVariable name="i">2</SetVariable>
         <!-- Traditional Orange -->
         <SetVariable name="DeckSignalColor">#E67A00</SetVariable>
         <SetVariable name="DeckBackgroundColor">#333333</SetVariable>
+        <SetVariable name="PlayedOverlayColor">#88000000</SetVariable>
       </Template>
 
       <WidgetGroup>
         <Layout>horizontal</Layout>
         <Children>
-          <Template src="skin:deck_right.xml">
+          <Template src="skin:deck.xml">
             <SetVariable name="i">4</SetVariable>
             <!-- Lime -->
             <SetVariable name="DeckSignalColor">#AABD00</SetVariable>
-            <SetVariable name="DeckBackgroundColor">#333333</SetVariable>
+            <SetVariable name="DeckBackgroundColor">#35335a</SetVariable>
+            <SetVariable name="PlayedOverlayColor">#b8000000</SetVariable>
           </Template>
         </Children>
         <Connection>
-          <ConfigKey persist="true">[Master],show_4decks</ConfigKey>
+          <ConfigKey>[Master],show_4decks</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
       </WidgetGroup>
-      <Template src="skin:spacer.xml"/>
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/sample_decks.xml b/res/skins/Deere/sample_decks.xml
index cc035f26f604..e5c738aa9669 100644
--- a/res/skins/Deere/sample_decks.xml
+++ b/res/skins/Deere/sample_decks.xml
@@ -4,6 +4,142 @@
     Sample deck container widget.
 -->
 <Template>
+  <SingletonDefinition>
+    <ObjectName>SamplerRow1</ObjectName>
+    <Children>
+      <Template src="skin:sampler_row.xml">
+        <SetVariable name="row">1</SetVariable>
+        <SetVariable name="1">1</SetVariable>
+        <SetVariable name="2">2</SetVariable>
+        <SetVariable name="3">3</SetVariable>
+        <SetVariable name="4">4</SetVariable>
+        <SetVariable name="5">5</SetVariable>
+        <SetVariable name="6">6</SetVariable>
+        <SetVariable name="7">7</SetVariable>
+        <SetVariable name="8">8</SetVariable>
+      </Template>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>SamplerRow2</ObjectName>
+    <Children>
+      <Template src="skin:sampler_row.xml">
+        <SetVariable name="row">2</SetVariable>
+        <SetVariable name="1">9</SetVariable>
+        <SetVariable name="2">10</SetVariable>
+        <SetVariable name="3">11</SetVariable>
+        <SetVariable name="4">12</SetVariable>
+        <SetVariable name="5">13</SetVariable>
+        <SetVariable name="6">14</SetVariable>
+        <SetVariable name="7">15</SetVariable>
+        <SetVariable name="8">16</SetVariable>
+      </Template>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>SamplerRow3</ObjectName>
+    <Children>
+      <Template src="skin:sampler_row.xml">
+        <SetVariable name="row">3</SetVariable>
+        <SetVariable name="1">17</SetVariable>
+        <SetVariable name="2">18</SetVariable>
+        <SetVariable name="3">19</SetVariable>
+        <SetVariable name="4">20</SetVariable>
+        <SetVariable name="5">21</SetVariable>
+        <SetVariable name="6">22</SetVariable>
+        <SetVariable name="7">23</SetVariable>
+        <SetVariable name="8">24</SetVariable>
+      </Template>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>SamplerRow4</ObjectName>
+    <Children>
+      <Template src="skin:sampler_row.xml">
+        <SetVariable name="row">4</SetVariable>
+        <SetVariable name="1">25</SetVariable>
+        <SetVariable name="2">26</SetVariable>
+        <SetVariable name="3">27</SetVariable>
+        <SetVariable name="4">28</SetVariable>
+        <SetVariable name="5">29</SetVariable>
+        <SetVariable name="6">30</SetVariable>
+        <SetVariable name="7">31</SetVariable>
+        <SetVariable name="8">32</SetVariable>
+      </Template>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>SamplerRow5</ObjectName>
+    <Children>
+      <Template src="skin:sampler_row.xml">
+        <SetVariable name="row">5</SetVariable>
+        <SetVariable name="1">33</SetVariable>
+        <SetVariable name="2">34</SetVariable>
+        <SetVariable name="3">35</SetVariable>
+        <SetVariable name="4">36</SetVariable>
+        <SetVariable name="5">37</SetVariable>
+        <SetVariable name="6">38</SetVariable>
+        <SetVariable name="7">39</SetVariable>
+        <SetVariable name="8">40</SetVariable>
+      </Template>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>SamplerRow6</ObjectName>
+    <Children>
+      <Template src="skin:sampler_row.xml">
+        <SetVariable name="row">6</SetVariable>
+        <SetVariable name="1">41</SetVariable>
+        <SetVariable name="2">42</SetVariable>
+        <SetVariable name="3">43</SetVariable>
+        <SetVariable name="4">44</SetVariable>
+        <SetVariable name="5">45</SetVariable>
+        <SetVariable name="6">46</SetVariable>
+        <SetVariable name="7">47</SetVariable>
+        <SetVariable name="8">48</SetVariable>
+      </Template>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>SamplerRow7</ObjectName>
+    <Children>
+      <Template src="skin:sampler_row.xml">
+        <SetVariable name="row">7</SetVariable>
+        <SetVariable name="1">49</SetVariable>
+        <SetVariable name="2">50</SetVariable>
+        <SetVariable name="3">51</SetVariable>
+        <SetVariable name="4">52</SetVariable>
+        <SetVariable name="5">53</SetVariable>
+        <SetVariable name="6">54</SetVariable>
+        <SetVariable name="7">55</SetVariable>
+        <SetVariable name="8">56</SetVariable>
+      </Template>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>SamplerRow8</ObjectName>
+    <Children>
+      <Template src="skin:sampler_row.xml">
+        <SetVariable name="row">8</SetVariable>
+        <SetVariable name="1">57</SetVariable>
+        <SetVariable name="2">58</SetVariable>
+        <SetVariable name="3">59</SetVariable>
+        <SetVariable name="4">60</SetVariable>
+        <SetVariable name="5">61</SetVariable>
+        <SetVariable name="6">62</SetVariable>
+        <SetVariable name="7">63</SetVariable>
+        <SetVariable name="8">64</SetVariable>
+      </Template>
+    </Children>
+  </SingletonDefinition>
+
   <WidgetGroup>
     <Layout>vertical</Layout>
     <!-- I don't now why this works but a WidgetGroup wrapper around a
@@ -12,246 +148,232 @@
     <SizePolicy>me,f</SizePolicy>
 
     <Children>
-      <WidgetStack>
+      <WidgetStack currentpage="[Deere],sampler_row_current" persist="true">
         <ObjectName>SampleDecksContainer</ObjectName>
-        <SizePolicy>me,min</SizePolicy>
+        <NextControl>[Deere],sampler_row_next</NextControl>
+        <PrevControl>[Deere],sampler_row_prev</PrevControl>
         <Children>
 
-          <!-- Collapsed SampleDecks -->
-          <WidgetStack currentpage="[Deere],sampler_bank_current" persist="true">
-            <NextControl>[Deere],sampler_bank_next</NextControl>
-            <PrevControl>[Deere],sampler_bank_prev</PrevControl>
+          <WidgetGroup trigger="[Deere],sampler_row_1">
+            <ObjectName>SamplerRows</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>me,min</SizePolicy>
+            <Children>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow1</ObjectName>
+              </SingletonContainer>
+
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup trigger="[Deere],sampler_row_2">
+            <ObjectName>SamplerRows</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>me,min</SizePolicy>
+            <Children>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow1</ObjectName>
+              </SingletonContainer>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow2</ObjectName>
+              </SingletonContainer>
+
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup trigger="[Deere],sampler_row_3">
+            <ObjectName>SamplerRows</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>me,min</SizePolicy>
+            <Children>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow1</ObjectName>
+              </SingletonContainer>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow2</ObjectName>
+              </SingletonContainer>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow3</ObjectName>
+              </SingletonContainer>
+
+            </Children>
+          </WidgetGroup>
+
+        <WidgetGroup trigger="[Deere],sampler_row_4">
+            <ObjectName>SamplerRows</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>me,min</SizePolicy>
+            <Children>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow1</ObjectName>
+              </SingletonContainer>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow2</ObjectName>
+              </SingletonContainer>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow3</ObjectName>
+              </SingletonContainer>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow4</ObjectName>
+              </SingletonContainer>
+
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup trigger="[Deere],sampler_row_5">
+            <ObjectName>SamplerRows</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>me,min</SizePolicy>
+            <Children>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow1</ObjectName>
+              </SingletonContainer>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow2</ObjectName>
+              </SingletonContainer>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow3</ObjectName>
+              </SingletonContainer>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow4</ObjectName>
+              </SingletonContainer>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow5</ObjectName>
+              </SingletonContainer>
+
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup trigger="[Deere],sampler_row_6">
+            <ObjectName>SamplerRows</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>me,min</SizePolicy>
+            <Children>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow1</ObjectName>
+              </SingletonContainer>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow2</ObjectName>
+              </SingletonContainer>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow3</ObjectName>
+              </SingletonContainer>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow4</ObjectName>
+              </SingletonContainer>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow5</ObjectName>
+              </SingletonContainer>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow6</ObjectName>
+              </SingletonContainer>
+
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup trigger="[Deere],sampler_row_7">
+            <ObjectName>SamplerRows</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>me,min</SizePolicy>
             <Children>
-              <WidgetGroup trigger="[Deere],sampler_bank_1">
-                <ObjectName>SampleDecksCollapsed</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>me,min</SizePolicy>
-                <Children>
-                  <WidgetGroup>
-                    <Layout>vertical</Layout>
-                    <ObjectName>ShowHideToggle</ObjectName>
-                    <Children>
-                      <Template src="skin:hide_show_button.xml">
-                        <SetVariable name="object_name">SampleDeckToggle</SetVariable>
-                        <SetVariable name="control">[Samplers],show_samplers</SetVariable>
-                      </Template>
-                    </Children>
-                  </WidgetGroup>
-                  <Template src="skin:sampler_simple.xml">
-                    <SetVariable name="i">1</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler_simple.xml">
-                    <SetVariable name="i">2</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler_simple.xml">
-                    <SetVariable name="i">3</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler_simple.xml">
-                    <SetVariable name="i">4</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler_bank_controls.xml"/>
-                </Children>
-              </WidgetGroup>
-
-              <WidgetGroup trigger="[Deere],sampler_bank_2">
-                <ObjectName>SampleDecksCollapsed</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>me,min</SizePolicy>
-                <Children>
-                  <Template src="skin:hide_show_button.xml">
-                    <SetVariable name="object_name">SampleDeckToggle</SetVariable>
-                    <SetVariable name="control">[Samplers],show_samplers</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler_simple.xml">
-                    <SetVariable name="i">5</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler_simple.xml">
-                    <SetVariable name="i">6</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler_simple.xml">
-                    <SetVariable name="i">7</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler_simple.xml">
-                    <SetVariable name="i">8</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler_bank_controls.xml"/>
-                </Children>
-              </WidgetGroup>
-
-              <WidgetGroup trigger="[Deere],sampler_bank_3">
-                <ObjectName>SampleDecksCollapsed</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>me,min</SizePolicy>
-                <Children>
-                  <Template src="skin:hide_show_button.xml">
-                    <SetVariable name="object_name">SampleDeckToggle</SetVariable>
-                    <SetVariable name="control">[Samplers],show_samplers</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler_simple.xml">
-                    <SetVariable name="i">9</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler_simple.xml">
-                    <SetVariable name="i">10</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler_simple.xml">
-                    <SetVariable name="i">11</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler_simple.xml">
-                    <SetVariable name="i">12</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler_bank_controls.xml"/>
-                </Children>
-              </WidgetGroup>
-
-              <WidgetGroup trigger="[Deere],sampler_bank_4">
-                <ObjectName>SampleDecksCollapsed</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>me,min</SizePolicy>
-                <Children>
-                  <Template src="skin:hide_show_button.xml">
-                    <SetVariable name="object_name">SampleDeckToggle</SetVariable>
-                    <SetVariable name="control">[Samplers],show_samplers</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler_simple.xml">
-                    <SetVariable name="i">13</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler_simple.xml">
-                    <SetVariable name="i">14</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler_simple.xml">
-                    <SetVariable name="i">15</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler_simple.xml">
-                    <SetVariable name="i">16</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler_bank_controls.xml"/>
-                </Children>
-              </WidgetGroup>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow1</ObjectName>
+              </SingletonContainer>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow2</ObjectName>
+              </SingletonContainer>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow3</ObjectName>
+              </SingletonContainer>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow4</ObjectName>
+              </SingletonContainer>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow5</ObjectName>
+              </SingletonContainer>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow6</ObjectName>
+              </SingletonContainer>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow7</ObjectName>
+              </SingletonContainer>
+
             </Children>
-          </WidgetStack>
+          </WidgetGroup>
 
-          <!-- Expanded SampleDecks -->
-          <WidgetStack trigger="[Samplers],show_samplers" currentpage="[Deere],sampler_bank_current" persist="true">
-            <NextControl>[Deere],sampler_bank_next</NextControl>
-            <PrevControl>[Deere],sampler_bank_prev</PrevControl>
+          <WidgetGroup trigger="[Deere],sampler_row_8">
+            <ObjectName>SamplerRows</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>me,min</SizePolicy>
             <Children>
-              <WidgetGroup trigger="[Deere],sampler_bank_1">
-                <ObjectName>SampleDecksExpanded</ObjectName>
-                <SizePolicy>me,min</SizePolicy>
-                <Layout>horizontal</Layout>
-                <Children>
-                  <WidgetGroup>
-                    <Layout>vertical</Layout>
-                    <ObjectName>ShowHideToggle</ObjectName>
-                    <Children>
-                      <Template src="skin:hide_show_button.xml">
-                        <SetVariable name="object_name">SampleDeckToggle</SetVariable>
-                        <SetVariable name="control">[Samplers],show_samplers</SetVariable>
-                      </Template>
-                    </Children>
-                  </WidgetGroup>
-                  <Template src="skin:sampler.xml">
-                    <SetVariable name="i">1</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler.xml">
-                    <SetVariable name="i">2</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler.xml">
-                    <SetVariable name="i">3</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler.xml">
-                    <SetVariable name="i">4</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler_bank_controls.xml"/>
-                </Children>
-              </WidgetGroup>
-
-              <WidgetGroup trigger="[Deere],sampler_bank_2">
-                <ObjectName>SampleDecksExpanded</ObjectName>
-                <SizePolicy>me,min</SizePolicy>
-                <Layout>horizontal</Layout>
-                <Children>
-                  <Template src="skin:hide_show_button.xml">
-                    <SetVariable name="object_name">SampleDeckToggle</SetVariable>
-                    <SetVariable name="control">[Samplers],show_samplers</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler.xml">
-                    <SetVariable name="i">5</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler.xml">
-                    <SetVariable name="i">6</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler.xml">
-                    <SetVariable name="i">7</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler.xml">
-                    <SetVariable name="i">8</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler_bank_controls.xml"/>
-                </Children>
-              </WidgetGroup>
-
-              <WidgetGroup trigger="[Deere],sampler_bank_3">
-                <ObjectName>SampleDecksExpanded</ObjectName>
-                <SizePolicy>me,min</SizePolicy>
-                <Layout>horizontal</Layout>
-                <Children>
-                  <Template src="skin:hide_show_button.xml">
-                    <SetVariable name="object_name">SampleDeckToggle</SetVariable>
-                    <SetVariable name="control">[Samplers],show_samplers</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler.xml">
-                    <SetVariable name="i">9</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler.xml">
-                    <SetVariable name="i">10</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler.xml">
-                    <SetVariable name="i">11</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler.xml">
-                    <SetVariable name="i">12</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler_bank_controls.xml"/>
-                </Children>
-              </WidgetGroup>
-
-              <WidgetGroup trigger="[Deere],sampler_bank_4">
-                <ObjectName>SampleDecksExpanded</ObjectName>
-                <SizePolicy>me,min</SizePolicy>
-                <Layout>horizontal</Layout>
-                <Children>
-                  <Template src="skin:hide_show_button.xml">
-                    <SetVariable name="object_name">SampleDeckToggle</SetVariable>
-                    <SetVariable name="control">[Samplers],show_samplers</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler.xml">
-                    <SetVariable name="i">13</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler.xml">
-                    <SetVariable name="i">14</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler.xml">
-                    <SetVariable name="i">15</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler.xml">
-                    <SetVariable name="i">16</SetVariable>
-                  </Template>
-                  <Template src="skin:sampler_bank_controls.xml"/>
-                </Children>
-              </WidgetGroup>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow1</ObjectName>
+              </SingletonContainer>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow2</ObjectName>
+              </SingletonContainer>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow3</ObjectName>
+              </SingletonContainer>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow4</ObjectName>
+              </SingletonContainer>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow5</ObjectName>
+              </SingletonContainer>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow6</ObjectName>
+              </SingletonContainer>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow7</ObjectName>
+              </SingletonContainer>
+
+              <SingletonContainer>
+                <ObjectName>SamplerRow8</ObjectName>
+              </SingletonContainer>
+
             </Children>
-          </WidgetStack>
+          </WidgetGroup>
 
         </Children>
       </WidgetStack>
+
     </Children>
-    <Connection>
-      <ConfigKey>[Master],maximize_library</ConfigKey>
-      <BindProperty>visible</BindProperty>
-      <Transform>
-        <Not/>
-      </Transform>
-    </Connection>
   </WidgetGroup>
 </Template>
+
diff --git a/res/skins/Deere/sampler.xml b/res/skins/Deere/sampler.xml
index 8f62e67a923e..36af0c86d45f 100644
--- a/res/skins/Deere/sampler.xml
+++ b/res/skins/Deere/sampler.xml
@@ -11,8 +11,9 @@
     <ObjectName>Sampler</ObjectName>
     <Layout>vertical</Layout>
     <SizePolicy>me,f</SizePolicy>
+    <MinimumSize>167,-1</MinimumSize>
     <Children>
-      <Template src="skin:sampler_overview_row.xml"/>
+      <Template src="skin:sampler_text_row.xml"/>
       <Template src="skin:sampler_controls_row.xml"/>
     </Children>
   </WidgetGroup>
diff --git a/res/skins/Deere/sampler_bank_controls.xml b/res/skins/Deere/sampler_bank_controls.xml
deleted file mode 100644
index 6efed45e0f3f..000000000000
--- a/res/skins/Deere/sampler_bank_controls.xml
+++ /dev/null
@@ -1,214 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    Sampler bank controls row column.
-    Allows to show/hide single sampler bank 1-4 in the sampler rack, and to load
-    and save sampler bank configurations.
-  Variables:
--->
-<Template>
-  <!-- Controls used when in simple sampler view -->
-  <WidgetGroup>
-    <ObjectName>SamplerBankContainer</ObjectName>
-    <Layout>horizontal</Layout>
-    <SizePolicy>min,f</SizePolicy>
-    <Children>
-      <Label>
-        <ObjectName>SamplerBankLabel</ObjectName>
-        <Text>Bank</Text>
-      </Label>
-
-      <Template src="skin:left_2state_button.xml">
-        <!-- TODO(jus): Add missing string to src/skin/tooltips.cpp -->
-        <SetVariable name="TooltipId"></SetVariable>
-        <SetVariable name="ObjectName">SamplerBankToggle</SetVariable>
-        <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-        <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-        <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-        <SetVariable name="state_0_text">1</SetVariable>
-        <SetVariable name="state_0_pressed"></SetVariable>
-        <SetVariable name="state_0_unpressed"></SetVariable>
-        <SetVariable name="state_1_text">1</SetVariable>
-        <SetVariable name="state_1_pressed"></SetVariable>
-        <SetVariable name="state_1_unpressed"></SetVariable>
-        <SetVariable name="left_connection_control">[Deere],sampler_bank_1</SetVariable>
-      </Template>
-
-      <Template src="skin:left_2state_button.xml">
-        <!-- TODO(jus): Add missing string to src/skin/tooltips.cpp -->
-        <SetVariable name="TooltipId"></SetVariable>
-        <SetVariable name="ObjectName">SamplerBankToggle</SetVariable>
-        <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-        <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-        <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-        <SetVariable name="state_0_text">2</SetVariable>
-        <SetVariable name="state_0_pressed"></SetVariable>
-        <SetVariable name="state_0_unpressed"></SetVariable>
-        <SetVariable name="state_1_text">2</SetVariable>
-        <SetVariable name="state_1_pressed"></SetVariable>
-        <SetVariable name="state_1_unpressed"></SetVariable>
-        <SetVariable name="left_connection_control">[Deere],sampler_bank_2</SetVariable>
-      </Template>
-
-      <Template src="skin:left_2state_button.xml">
-        <!-- TODO(jus): Add missing string to src/skin/tooltips.cpp -->
-        <SetVariable name="TooltipId"></SetVariable>
-        <SetVariable name="ObjectName">SamplerBankToggle</SetVariable>
-        <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-        <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-        <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-        <SetVariable name="state_0_text">3</SetVariable>
-        <SetVariable name="state_0_pressed"></SetVariable>
-        <SetVariable name="state_0_unpressed"></SetVariable>
-        <SetVariable name="state_1_text">3</SetVariable>
-        <SetVariable name="state_1_pressed"></SetVariable>
-        <SetVariable name="state_1_unpressed"></SetVariable>
-        <SetVariable name="left_connection_control">[Deere],sampler_bank_3</SetVariable>
-      </Template>
-
-      <Template src="skin:left_2state_button.xml">
-        <!-- TODO(jus): Add missing string to src/skin/tooltips.cpp -->
-        <SetVariable name="TooltipId"></SetVariable>
-        <SetVariable name="ObjectName">SamplerBankToggle</SetVariable>
-        <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-        <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-        <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-        <SetVariable name="state_0_text">4</SetVariable>
-        <SetVariable name="state_0_pressed"></SetVariable>
-        <SetVariable name="state_0_unpressed"></SetVariable>
-        <SetVariable name="state_1_text">4</SetVariable>
-        <SetVariable name="state_1_pressed"></SetVariable>
-        <SetVariable name="state_1_unpressed"></SetVariable>
-        <SetVariable name="left_connection_control">[Deere],sampler_bank_4</SetVariable>
-      </Template>
-    </Children>
-    <Connection>
-      <ConfigKey>[Samplers],show_samplers</ConfigKey>
-      <BindProperty>visible</BindProperty>
-      <Transform>
-        <Not/>
-      </Transform>
-    </Connection>
-  </WidgetGroup>
-
-  <!-- Controls used when in advanced sampler view -->
-  <WidgetGroup>
-    <ObjectName>SamplerBankContainer</ObjectName>
-    <Layout>vertical</Layout>
-    <Children>
-      <Label>
-        <ObjectName>SamplerBankLabel</ObjectName>
-        <Text>Bank</Text>
-      </Label>
-
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <Children>
-          <Template src="skin:left_2state_button.xml">
-            <!-- TODO(jus): Add missing string to src/skin/tooltips.cpp -->
-            <SetVariable name="TooltipId"></SetVariable>
-            <SetVariable name="ObjectName">SamplerBankToggle</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-            <SetVariable name="state_0_text">1</SetVariable>
-            <SetVariable name="state_0_pressed"></SetVariable>
-            <SetVariable name="state_0_unpressed"></SetVariable>
-            <SetVariable name="state_1_text">1</SetVariable>
-            <SetVariable name="state_1_pressed"></SetVariable>
-            <SetVariable name="state_1_unpressed"></SetVariable>
-            <SetVariable name="left_connection_control">[Deere],sampler_bank_1</SetVariable>
-          </Template>
-          <Template src="skin:left_2state_button.xml">
-            <!-- TODO(jus): Add missing string to src/skin/tooltips.cpp -->
-            <SetVariable name="TooltipId"></SetVariable>
-            <SetVariable name="ObjectName">SamplerBankToggle</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-            <SetVariable name="state_0_text">2</SetVariable>
-            <SetVariable name="state_0_pressed"></SetVariable>
-            <SetVariable name="state_0_unpressed"></SetVariable>
-            <SetVariable name="state_1_text">2</SetVariable>
-            <SetVariable name="state_1_pressed"></SetVariable>
-            <SetVariable name="state_1_unpressed"></SetVariable>
-            <SetVariable name="left_connection_control">[Deere],sampler_bank_2</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <Children>
-          <Template src="skin:left_2state_button.xml">
-            <!-- TODO(jus): Add missing string to src/skin/tooltips.cpp -->
-            <SetVariable name="TooltipId"></SetVariable>
-            <SetVariable name="ObjectName">SamplerBankToggle</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-            <SetVariable name="state_0_text">3</SetVariable>
-            <SetVariable name="state_0_pressed"></SetVariable>
-            <SetVariable name="state_0_unpressed"></SetVariable>
-            <SetVariable name="state_1_text">3</SetVariable>
-            <SetVariable name="state_1_pressed"></SetVariable>
-            <SetVariable name="state_1_unpressed"></SetVariable>
-            <SetVariable name="left_connection_control">[Deere],sampler_bank_3</SetVariable>
-          </Template>
-          <Template src="skin:left_2state_button.xml">
-            <!-- TODO(jus): Add missing string to src/skin/tooltips.cpp -->
-            <SetVariable name="TooltipId"></SetVariable>
-            <SetVariable name="ObjectName">SamplerBankToggle</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-            <SetVariable name="state_0_text">4</SetVariable>
-            <SetVariable name="state_0_pressed"></SetVariable>
-            <SetVariable name="state_0_unpressed"></SetVariable>
-            <SetVariable name="state_1_text">4</SetVariable>
-            <SetVariable name="state_1_pressed"></SetVariable>
-            <SetVariable name="state_1_unpressed"></SetVariable>
-            <SetVariable name="left_connection_control">[Deere],sampler_bank_4</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-
-      <Template src="skin:spacer_v.xml"/>
-
-      <WidgetGroup>
-        <Layout>vertical</Layout>
-        <Children>
-          <Template src="skin:left_1state_button.xml">
-            <!-- TODO(jus): Add missing string to src/skin/tooltips.cpp -->
-            <SetVariable name="TooltipId"></SetVariable>
-            <SetVariable name="ObjectName">SamplerBankLoadButton</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="WideButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="WideButtonMaximumSize"/></SetVariable>
-            <SetVariable name="SizePolicy"><Variable name="WideButtonSizePolicy"/></SetVariable>
-            <SetVariable name="state_0_text">Load</SetVariable>
-            <SetVariable name="state_0_pressed"></SetVariable>
-            <SetVariable name="state_0_unpressed"></SetVariable>
-            <SetVariable name="left_connection_control">[Sampler],LoadSamplerBank</SetVariable>
-          </Template>
-
-          <Template src="skin:left_1state_button.xml">
-            <!-- TODO(jus): Add missing string to src/skin/tooltips.cpp -->
-            <SetVariable name="TooltipId"></SetVariable>
-            <SetVariable name="ObjectName">SamplerBankSaveButton</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="WideButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="WideButtonMaximumSize"/></SetVariable>
-            <SetVariable name="SizePolicy"><Variable name="WideButtonSizePolicy"/></SetVariable>
-            <SetVariable name="state_0_text">Save</SetVariable>
-            <SetVariable name="state_0_pressed"></SetVariable>
-            <SetVariable name="state_0_unpressed"></SetVariable>
-            <SetVariable name="left_connection_control">[Sampler],SaveSamplerBank</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-    </Children>
-    <Connection>
-      <ConfigKey>[Samplers],show_samplers</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/Deere/sampler_controls_row.xml b/res/skins/Deere/sampler_controls_row.xml
index 0a58a52ae101..f70a896f2cea 100644
--- a/res/skins/Deere/sampler_controls_row.xml
+++ b/res/skins/Deere/sampler_controls_row.xml
@@ -7,77 +7,346 @@
 -->
 <Template>
   <WidgetGroup>
-    <ObjectName>ControlsRow</ObjectName>
-    <Layout>horizontal</Layout>
+    <ObjectName>SamplerExpansion</ObjectName>
+    <Layout>vertical</Layout>
     <SizePolicy>me,max</SizePolicy>
     <Children>
-      <Template src="skin:left_right_1state_button.xml">
-        <SetVariable name="TooltipId">beatsync_beatsync_tempo</SetVariable>
-        <SetVariable name="ObjectName">BeatsyncButton</SetVariable>
-        <SetVariable name="MinimumSize"><Variable name="WideButtonMinimumSize"/></SetVariable>
-        <SetVariable name="MaximumSize"><Variable name="WideButtonMaximumSize"/></SetVariable>
-        <SetVariable name="SizePolicy"><Variable name="WideButtonSizePolicy"/></SetVariable>
-        <SetVariable name="state_0_text">Sync</SetVariable>
-        <SetVariable name="state_0_pressed"></SetVariable>
-        <SetVariable name="state_0_unpressed"></SetVariable>
-        <SetVariable name="left_connection_control"><Variable name="group"/>,beatsync</SetVariable>
-        <SetVariable name="right_connection_control"><Variable name="group"/>,beatsync_tempo</SetVariable>
-      </Template>
 
       <WidgetGroup>
-        <ObjectName>HotcueGrid</ObjectName>
         <Layout>horizontal</Layout>
-        <SizePolicy>max,max</SizePolicy>
         <Children>
-          <Template src="skin:hotcue_button.xml">
-            <SetVariable name="hotcue">1</SetVariable>
-          </Template>
-          <Template src="skin:hotcue_button.xml">
-            <SetVariable name="hotcue">2</SetVariable>
-          </Template>
-          <Template src="skin:hotcue_button.xml">
-            <SetVariable name="hotcue">3</SetVariable>
-          </Template>
-          <Template src="skin:hotcue_button.xml">
-            <SetVariable name="hotcue">4</SetVariable>
+          <Template src="skin:left_2state_button.xml">
+            <SetVariable name="TooltipId">repeat</SetVariable>
+            <SetVariable name="ObjectName">RepeatButton</SetVariable>
+            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+            <SetVariable name="state_0_text"></SetVariable>
+            <SetVariable name="state_0_pressed">icon/ic_repeat_48px.svg</SetVariable>
+            <SetVariable name="state_0_unpressed">icon/ic_repeat_48px.svg</SetVariable>
+            <SetVariable name="state_1_text"></SetVariable>
+            <SetVariable name="state_1_pressed">icon/ic_repeat_48px.svg</SetVariable>
+            <SetVariable name="state_1_unpressed">icon/ic_repeat_48px.svg</SetVariable>
+            <SetVariable name="left_connection_control"><Variable name="group"/>,repeat</SetVariable>
           </Template>
+
+          <Overview>
+            <TooltipId>waveform_overview</TooltipId>
+            <Group><Variable name="group"/></Group>
+            <SizePolicy>me,me</SizePolicy>
+            <BgColor>#333333</BgColor>
+            <SignalHighColor>#FFE300</SignalHighColor>
+            <SignalMidColor>#0099FF</SignalMidColor>
+            <SignalLowColor>#FF0035</SignalLowColor>
+            <SignalRGBHighColor></SignalRGBHighColor>
+            <SignalRGBMidColor></SignalRGBMidColor>
+            <SignalRGBLowColor></SignalRGBLowColor>
+            <SignalColor>#FF8000</SignalColor>
+            <PlayPosColor>#00FF00</PlayPosColor>
+            <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>
+              <Align>top</Align>
+              <Color>#FF001C</Color>
+              <TextColor>#FFFFFF</TextColor>
+              <Text>C</Text>
+            </Mark>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,playposition</ConfigKey>
+              <EmitOnDownPress>false</EmitOnDownPress>
+            </Connection>
+          </Overview>
+
         </Children>
       </WidgetGroup>
 
-      <Template src="skin:spacer_h.xml"></Template>
-
-      <Template src="skin:left_2state_button.xml">
-        <SetVariable name="TooltipId">pfl</SetVariable>
-        <SetVariable name="ObjectName">SamplerPflButton</SetVariable>
-        <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-        <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-        <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-        <SetVariable name="state_0_text"></SetVariable>
-        <SetVariable name="state_0_pressed">icon/ic_headphones_48px.svg</SetVariable>
-        <SetVariable name="state_0_unpressed">icon/ic_headphones_48px.svg</SetVariable>
-        <SetVariable name="state_1_text"></SetVariable>
-        <SetVariable name="state_1_pressed">icon/ic_headphones_48px.svg</SetVariable>
-        <SetVariable name="state_1_unpressed">icon/ic_headphones_48px.svg</SetVariable>
-        <SetVariable name="left_connection_control"><Variable name="group"/>,pfl</SetVariable>
-      </Template>
-
-      <Template src="skin:knob_with_button.xml">
-        <SetVariable name="TooltipId">pregain</SetVariable>
-        <SetVariable name="group">[Sampler<Variable name="i"/>]</SetVariable>
-        <SetVariable name="control">pregain</SetVariable>
-        <SetVariable name="color">red</SetVariable>
-        <SetVariable name="button_TooltipId">mute</SetVariable>
-        <SetVariable name="button_control">mute</SetVariable>
-        <SetVariable name="label">Gain</SetVariable>
-      </Template>
-
-      <Template src="skin:vumeter_v.xml">
-        <SetVariable name="TooltipId">channel_VuMeter</SetVariable>
-        <SetVariable name="group"><Variable name="group"/></SetVariable>
-        <SetVariable name="control">VuMeter</SetVariable>
-        <SetVariable name="tooltip_meter">sampler_VuMeter</SetVariable>
-        <SetVariable name="tooltip_clip">sampler_PeakIndicator</SetVariable>
-      </Template>
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Children>
+
+          <WidgetGroup>
+            <ObjectName>ButtonGrid</ObjectName>
+            <Layout>vertical</Layout>
+            <Children>
+              <Template src="skin:left_display_2state_button.xml">
+                <SetVariable name="TooltipId">cueset</SetVariable>
+                <SetVariable name="ObjectName">SamplerCueButton</SetVariable>
+                <SetVariable name="MinimumSize"><Variable name="WideButtonMinimumSize"/></SetVariable>
+                <SetVariable name="MaximumSize"><Variable name="WideButtonMaximumSize"/></SetVariable>
+                <SetVariable name="SizePolicy"><Variable name="WideButtonSizePolicy"/></SetVariable>
+                <SetVariable name="state_0_text">CUE</SetVariable>
+                <SetVariable name="state_1_text">CUE</SetVariable>
+                <SetVariable name="left_connection_control"><Variable name="group"/>,cue_set</SetVariable>
+                <SetVariable name="display_connection_control"><Variable name="group"/>,cue_indicator</SetVariable>
+              </Template>
+
+              <Template src="skin:left_right_1state_button.xml">
+                <SetVariable name="TooltipId">beatsync_beatsync_tempo</SetVariable>
+                <SetVariable name="ObjectName">BeatsyncButton</SetVariable>
+                <SetVariable name="MinimumSize"><Variable name="WideButtonMinimumSize"/></SetVariable>
+                <SetVariable name="MaximumSize"><Variable name="WideButtonMaximumSize"/></SetVariable>
+                <SetVariable name="SizePolicy"><Variable name="WideButtonSizePolicy"/></SetVariable>
+                <SetVariable name="state_0_text">Sync</SetVariable>
+                <SetVariable name="state_0_pressed"></SetVariable>
+                <SetVariable name="state_0_unpressed"></SetVariable>
+                <SetVariable name="left_connection_control"><Variable name="group"/>,beatsync</SetVariable>
+                <SetVariable name="right_connection_control"><Variable name="group"/>,beatsync_tempo</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+          <Template src="skin:spacer_h.xml"/>
+
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,max</SizePolicy>
+            <MinimumSize>44,42</MinimumSize>
+            <MaximumSize>600,60</MaximumSize>
+            <Children>
+              <WidgetGroup>
+                <ObjectName>ButtonGrid</ObjectName>
+                <Layout>horizontal</Layout>
+                <SizePolicy>p,me</SizePolicy>
+                <MinimumSize>44,22</MinimumSize>
+                <MaximumSize>600,30</MaximumSize>
+                <Children>
+
+                  <Template src="skin:left_2state_button.xml">
+                    <SetVariable name="TooltipId">pfl</SetVariable>
+                    <SetVariable name="ObjectName">SamplerPflButton</SetVariable>
+                    <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                    <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                    <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                    <SetVariable name="state_0_text"></SetVariable>
+                    <SetVariable name="state_0_pressed">icon/ic_headphones_48px.svg</SetVariable>
+                    <SetVariable name="state_0_unpressed">icon/ic_headphones_48px.svg</SetVariable>
+                    <SetVariable name="state_1_text"></SetVariable>
+                    <SetVariable name="state_1_pressed">icon/ic_headphones_48px.svg</SetVariable>
+                    <SetVariable name="state_1_unpressed">icon/ic_headphones_48px.svg</SetVariable>
+                    <SetVariable name="left_connection_control"><Variable name="group"/>,pfl</SetVariable>
+                  </Template>
+
+                  <Template src="skin:left_1state_button.xml">
+                    <SetVariable name="TooltipId">eject</SetVariable>
+                    <SetVariable name="ObjectName">EjectButton</SetVariable>
+                    <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                    <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                    <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                    <SetVariable name="state_0_text"></SetVariable>
+                    <SetVariable name="state_0_pressed">icon/ic_eject_48px.svg</SetVariable>
+                    <SetVariable name="state_0_unpressed">icon/ic_eject_48px.svg</SetVariable>
+                    <SetVariable name="left_connection_control"><Variable name="group"/>,eject</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <ObjectName>ButtonGrid</ObjectName>
+                <Layout>horizontal</Layout>
+                <SizePolicy>p,me</SizePolicy>
+                <MinimumSize>44,22</MinimumSize>
+                <MaximumSize>60,30</MaximumSize>
+                <Children>
+
+                  <Template src="skin:left_3state_button.xml">
+                    <SetVariable name="TooltipId">orientation</SetVariable>
+                    <SetVariable name="ObjectName">OrientationButton</SetVariable>
+                    <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                    <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                    <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                    <SetVariable name="state_0_text"></SetVariable>
+                    <SetVariable name="state_0_pressed">icon/ic_orientation_left_48px.svg</SetVariable>
+                    <SetVariable name="state_0_unpressed">icon/ic_orientation_left_48px.svg</SetVariable>
+                    <SetVariable name="state_1_text"></SetVariable>
+                    <SetVariable name="state_1_pressed">icon/ic_orientation_48px.svg</SetVariable>
+                    <SetVariable name="state_1_unpressed">icon/ic_orientation_48px.svg</SetVariable>
+                    <SetVariable name="state_2_text"></SetVariable>
+                    <SetVariable name="state_2_pressed">icon/ic_orientation_right_48px.svg</SetVariable>
+                    <SetVariable name="state_2_unpressed">icon/ic_orientation_right_48px.svg</SetVariable>
+                    <SetVariable name="left_connection_control"><Variable name="group"/>,orientation</SetVariable>
+                  </Template>
+
+                  <Template src="skin:left_2state_button.xml">
+                    <SetVariable name="TooltipId">keylock</SetVariable>
+                    <SetVariable name="ObjectName">KeylockButton</SetVariable>
+                    <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                    <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                    <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                    <SetVariable name="state_0_text"></SetVariable>
+                    <SetVariable name="state_0_pressed">icon/ic_key_48px.svg</SetVariable>
+                    <SetVariable name="state_0_unpressed">icon/ic_key_48px.svg</SetVariable>
+                    <SetVariable name="state_1_text"></SetVariable>
+                    <SetVariable name="state_1_pressed">icon/ic_key_48px.svg</SetVariable>
+                    <SetVariable name="state_1_unpressed">icon/ic_key_48px.svg</SetVariable>
+                    <SetVariable name="left_connection_control"><Variable name="group"/>,keylock</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup>
+
+          <Template src="skin:spacer_h.xml"></Template>
+
+          <WidgetGroup>
+            <ObjectName>ButtonGrid</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>p,me</SizePolicy>
+            <MinimumSize>26,44</MinimumSize>
+            <MaximumSize>26,50</MaximumSize>
+            <Children>
+
+              <Template src="skin:fx_unit_group_assignment_button.xml">
+                <SetVariable name="EffectUnit">1</SetVariable>
+                <SetVariable name="SourceType">sampler</SetVariable>
+              </Template>
+
+              <Template src="skin:fx_unit_group_assignment_button.xml">
+                <SetVariable name="EffectUnit">2</SetVariable>
+                <SetVariable name="SourceType">sampler</SetVariable>
+              </Template>
+
+            </Children>
+            <Connection>
+              <ConfigKey>[Master],show_4effectunits</ConfigKey>
+              <BindProperty>visible</BindProperty>
+              <Transform>
+                <Not/>
+              </Transform>
+            </Connection>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <Children>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <KnobComposed>
+                    <TooltipId>pregain</TooltipId>
+                    <Size>24f,20f</Size>
+                    <Knob>knob_red.svg</Knob>
+                    <BackPath>knob_bg.svg</BackPath>
+                    <MinAngle>-135</MinAngle>
+                    <MaxAngle>135</MaxAngle>
+                    <KnobCenterYOffset>0.9423</KnobCenterYOffset>
+                    <Connection>
+                      <ConfigKey><Variable name="group"/>,pregain</ConfigKey>
+                    </Connection>
+                  </KnobComposed>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <ObjectName>vumeter_v</ObjectName>
+                <Layout>vertical</Layout>
+                <Children>
+                  <StatusLight>
+                    <ObjectName>PeakIndicator</ObjectName>
+                    <TooltipId><Variable name="tooltip_clip"/>sampler_PeakIndicator</TooltipId>
+                    <Size>8f,6f</Size>
+                    <PathStatusLight scalemode="STRETCH">vumeter_clip.svg</PathStatusLight>
+                    <Connection>
+                        <ConfigKey><Variable name="group"/>,PeakIndicator</ConfigKey>
+                    </Connection>
+                  </StatusLight>
+
+                  <VuMeter>
+                    <TooltipId>sampler_VuMeter</TooltipId>
+                    <Size>3me,me</Size>
+                    <MinimumSize>8,15</MinimumSize>
+                    <MaximumSize>8,-1</MaximumSize>
+                    <PathVu scalemode="STRETCH">vumeter_v.svg</PathVu>
+                    <Horizontal>false</Horizontal>
+                    <PeakHoldSize>5</PeakHoldSize>
+                    <PeakHoldTime>600</PeakHoldTime>
+                    <PeakFallTime>100</PeakFallTime>
+                    <PeakFallStep>1</PeakFallStep>
+                    <Connection>
+                      <ConfigKey><Variable name="group"/>,VuMeter</ConfigKey>
+                    </Connection>
+                  </VuMeter>
+
+                </Children>
+              </WidgetGroup>
+
+              </Children>
+            </WidgetGroup>
+
+            <SliderComposed>
+              <TooltipId>rate</TooltipId>
+              <Size>20f,-1me</Size>
+              <Slider scalemode="STRETCH">slider-vertical.svg</Slider>
+              <Handle scalemode="STRETCH_ASPECT">handle-vertical.svg</Handle>
+              <Connection>
+                <ConfigKey><Variable name="group"/>,rate</ConfigKey>
+              </Connection>
+            </SliderComposed>
+
+          </Children>
+        </WidgetGroup>
+
+        <WidgetGroup>
+          <ObjectName>ButtonGrid</ObjectName>
+          <Layout>horizontal</Layout>
+          <Children>
+            <Template src="skin:fx_unit_group_assignment_button.xml">
+              <SetVariable name="EffectUnit">1</SetVariable>
+              <SetVariable name="SourceType">sampler</SetVariable>
+            </Template>
+
+            <Template src="skin:fx_unit_group_assignment_button.xml">
+              <SetVariable name="EffectUnit">2</SetVariable>
+              <SetVariable name="SourceType">sampler</SetVariable>
+            </Template>
+
+            <Template src="skin:fx_unit_group_assignment_button.xml">
+              <SetVariable name="EffectUnit">3</SetVariable>
+              <SetVariable name="SourceType">sampler</SetVariable>
+            </Template>
+
+            <Template src="skin:fx_unit_group_assignment_button.xml">
+              <SetVariable name="EffectUnit">4</SetVariable>
+              <SetVariable name="SourceType">sampler</SetVariable>
+            </Template>
+          </Children>
+          <Connection>
+            <ConfigKey>[Master],show_4effectunits</ConfigKey>
+            <BindProperty>visible</BindProperty>
+          </Connection>
+        </WidgetGroup>
+
+        <WidgetGroup>
+          <ObjectName>ButtonGrid</ObjectName>
+          <Layout>horizontal</Layout>
+          <Children>
+            <Template src="skin:hotcue_button.xml">
+              <SetVariable name="hotcue">1</SetVariable>
+            </Template>
+            <Template src="skin:hotcue_button.xml">
+              <SetVariable name="hotcue">2</SetVariable>
+            </Template>
+            <Template src="skin:hotcue_button.xml">
+              <SetVariable name="hotcue">3</SetVariable>
+            </Template>
+            <Template src="skin:hotcue_button.xml">
+              <SetVariable name="hotcue">4</SetVariable>
+            </Template>
+          </Children>
+        </WidgetGroup>
+
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/sampler_overview_row.xml b/res/skins/Deere/sampler_overview_row.xml
index d0f237090c44..cff378211cf6 100644
--- a/res/skins/Deere/sampler_overview_row.xml
+++ b/res/skins/Deere/sampler_overview_row.xml
@@ -50,7 +50,7 @@
                 <SetVariable name="state_1_unpressed">icon/ic_play_48px.svg</SetVariable>
                 <SetVariable name="left_connection_control"><Variable name="group"/>,cue_gotoandplay</SetVariable>
                 <SetVariable name="right_connection_control"><Variable name="group"/>,start_stop</SetVariable>
-                <SetVariable name="display_connection_control"><Variable name="group"/>,play_indicator</SetVariable>
+                <SetVariable name="display_connection_control"><Variable name="group"/>,play</SetVariable>
               </Template>
 
               <Overview>
@@ -91,25 +91,7 @@
                   <EmitOnDownPress>false</EmitOnDownPress>
                 </Connection>
               </Overview>
-            </Children>
-          </WidgetGroup>
-        </Children>
-      </WidgetGroup>
 
-      <WidgetGroup>
-        <ObjectName>OptionGrid</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>min,me</SizePolicy>
-        <MinimumSize>40,40</MinimumSize>
-        <MaximumSize>60,60</MaximumSize>
-        <Children>
-          <WidgetGroup>
-            <ObjectName>OptionGridRow1</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>p,me</SizePolicy>
-            <MinimumSize>40,20</MinimumSize>
-            <MaximumSize>60,30</MaximumSize>
-            <Children>
               <Template src="skin:left_2state_button.xml">
                 <SetVariable name="TooltipId">repeat</SetVariable>
                 <SetVariable name="ObjectName">RepeatButton</SetVariable>
@@ -125,63 +107,12 @@
                 <SetVariable name="left_connection_control"><Variable name="group"/>,repeat</SetVariable>
               </Template>
 
-              <Template src="skin:left_1state_button.xml">
-                <SetVariable name="TooltipId">eject</SetVariable>
-                <SetVariable name="ObjectName">EjectButton</SetVariable>
-                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-                <SetVariable name="state_0_text"></SetVariable>
-                <SetVariable name="state_0_pressed">icon/ic_eject_48px.svg</SetVariable>
-                <SetVariable name="state_0_unpressed">icon/ic_eject_48px.svg</SetVariable>
-                <SetVariable name="left_connection_control"><Variable name="group"/>,eject</SetVariable>
-              </Template>
             </Children>
           </WidgetGroup>
 
-          <WidgetGroup>
-            <ObjectName>OptionGridRow2</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>p,me</SizePolicy>
-            <MinimumSize>40,20</MinimumSize>
-            <MaximumSize>60,30</MaximumSize>
-            <Children>
-              <Template src="skin:left_3state_button.xml">
-                <SetVariable name="TooltipId">orientation</SetVariable>
-                <SetVariable name="ObjectName">OrientationButton</SetVariable>
-                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-                <SetVariable name="state_0_text"></SetVariable>
-                <SetVariable name="state_0_pressed">icon/ic_orientation_left_48px.svg</SetVariable>
-                <SetVariable name="state_0_unpressed">icon/ic_orientation_left_48px.svg</SetVariable>
-                <SetVariable name="state_1_text"></SetVariable>
-                <SetVariable name="state_1_pressed">icon/ic_orientation_48px.svg</SetVariable>
-                <SetVariable name="state_1_unpressed">icon/ic_orientation_48px.svg</SetVariable>
-                <SetVariable name="state_2_text"></SetVariable>
-                <SetVariable name="state_2_pressed">icon/ic_orientation_right_48px.svg</SetVariable>
-                <SetVariable name="state_2_unpressed">icon/ic_orientation_right_48px.svg</SetVariable>
-                <SetVariable name="left_connection_control"><Variable name="group"/>,orientation</SetVariable>
-              </Template>
-
-              <Template src="skin:left_2state_button.xml">
-                <SetVariable name="TooltipId">keylock</SetVariable>
-                <SetVariable name="ObjectName">KeylockButton</SetVariable>
-                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-                <SetVariable name="state_0_text"></SetVariable>
-                <SetVariable name="state_0_pressed">icon/ic_key_48px.svg</SetVariable>
-                <SetVariable name="state_0_unpressed">icon/ic_key_48px.svg</SetVariable>
-                <SetVariable name="state_1_text"></SetVariable>
-                <SetVariable name="state_1_pressed">icon/ic_key_48px.svg</SetVariable>
-                <SetVariable name="state_1_unpressed">icon/ic_key_48px.svg</SetVariable>
-                <SetVariable name="left_connection_control"><Variable name="group"/>,keylock</SetVariable>
-              </Template>
-            </Children>
-          </WidgetGroup>
         </Children>
       </WidgetGroup>
+
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/sampler_row.xml b/res/skins/Deere/sampler_row.xml
new file mode 100644
index 000000000000..56b15a1d0ae1
--- /dev/null
+++ b/res/skins/Deere/sampler_row.xml
@@ -0,0 +1,118 @@
+<Template>
+  <WidgetGroup>
+    <ObjectName>SamplerRow</ObjectName>
+    <Layout>horizontal</Layout>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>SamplerExpandButtonContainer</ObjectName>
+        <Layout>vertical</Layout>
+        <Size>20f,-1me</Size>
+        <Children>
+          <Template src="skin:spacer_vx.xml">
+            <SetVariable name="height">4</SetVariable>
+          </Template>
+
+          <Template src="skin:hide_show_button.xml">
+            <SetVariable name="object_name">SamplerRowExpandButton</SetVariable>
+            <SetVariable name="control">[SamplerRow<Variable name="row"/>],expanded</SetVariable>
+          </Template>
+
+          <!-- Push the button up to the top. -->
+          <Template src="skin:spacer_v.xml"/>
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>SamplerRowCollapsed</ObjectName>
+        <Layout>horizontal</Layout>
+        <Children>
+
+          <Template src="skin:sampler_simple.xml">
+            <SetVariable name="i"><Variable name="1"/></SetVariable>
+          </Template>
+          <Template src="skin:sampler_simple.xml">
+            <SetVariable name="i"><Variable name="2"/></SetVariable>
+          </Template>
+          <Template src="skin:sampler_simple.xml">
+            <SetVariable name="i"><Variable name="3"/></SetVariable>
+          </Template>
+          <Template src="skin:sampler_simple.xml">
+            <SetVariable name="i"><Variable name="4"/></SetVariable>
+          </Template>
+
+          <WidgetGroup>
+            <ObjectName>SamplerMiddleSpacer</ObjectName>
+            <Size>-1me,-1max</Size>
+            <Children/>
+          </WidgetGroup>
+
+          <Template src="skin:sampler_simple.xml">
+            <SetVariable name="i"><Variable name="5"/></SetVariable>
+          </Template>
+          <Template src="skin:sampler_simple.xml">
+            <SetVariable name="i"><Variable name="6"/></SetVariable>
+          </Template>
+          <Template src="skin:sampler_simple.xml">
+            <SetVariable name="i"><Variable name="7"/></SetVariable>
+          </Template>
+          <Template src="skin:sampler_simple.xml">
+            <SetVariable name="i"><Variable name="8"/></SetVariable>
+          </Template>
+
+        </Children>
+        <Connection>
+          <ConfigKey>[SamplerRow<Variable name="row"/>],expanded</ConfigKey>
+          <BindProperty>visible</BindProperty>
+          <Transform>
+            <Not/>
+          </Transform>
+        </Connection>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>SamplerRowExpanded</ObjectName>
+        <Layout>horizontal</Layout>
+        <Children>
+
+          <Template src="skin:sampler.xml">
+            <SetVariable name="i"><Variable name="1"/></SetVariable>
+          </Template>
+          <Template src="skin:sampler.xml">
+            <SetVariable name="i"><Variable name="2"/></SetVariable>
+          </Template>
+          <Template src="skin:sampler.xml">
+            <SetVariable name="i"><Variable name="3"/></SetVariable>
+          </Template>
+          <Template src="skin:sampler.xml">
+            <SetVariable name="i"><Variable name="4"/></SetVariable>
+          </Template>
+
+          <WidgetGroup>
+            <ObjectName>SamplerMiddleSpacer</ObjectName>
+            <Size>-1me,-1max</Size>
+          </WidgetGroup>
+
+          <Template src="skin:sampler.xml">
+            <SetVariable name="i"><Variable name="5"/></SetVariable>
+          </Template>
+          <Template src="skin:sampler.xml">
+            <SetVariable name="i"><Variable name="6"/></SetVariable>
+          </Template>
+          <Template src="skin:sampler.xml">
+            <SetVariable name="i"><Variable name="7"/></SetVariable>
+          </Template>
+          <Template src="skin:sampler.xml">
+            <SetVariable name="i"><Variable name="8"/></SetVariable>
+          </Template>
+
+        </Children>
+        <Connection>
+          <ConfigKey>[SamplerRow<Variable name="row"/>],expanded</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Deere/sampler_rows_selection_button.xml b/res/skins/Deere/sampler_rows_selection_button.xml
new file mode 100644
index 000000000000..363c79e5fc24
--- /dev/null
+++ b/res/skins/Deere/sampler_rows_selection_button.xml
@@ -0,0 +1,21 @@
+<Template>
+  <PushButton>
+    <TooltipId><Variable name="TooltipId"/></TooltipId>
+    <ObjectName><Variable name="ObjectName"/></ObjectName>
+    <Size>80me,20f</Size>
+    <NumberStates>1</NumberStates>
+    <State>
+      <Number>0</Number>
+      <Text>[<Variable name="current"/>] Rows</Text>
+      <Alignment>left</Alignment>
+    </State>
+    <Connection>
+      <ConfigKey>[Deere],sampler_row_<Variable name="next"/></ConfigKey>
+      <ButtonState>LeftButton</ButtonState>
+    </Connection>
+    <Connection>
+      <ConfigKey>[Deere],sampler_row_<Variable name="prev"/></ConfigKey>
+      <ButtonState>RightButton</ButtonState>
+    </Connection>
+  </PushButton>
+</Template>
diff --git a/res/skins/Deere/sampler_simple.xml b/res/skins/Deere/sampler_simple.xml
index 6a9c496922af..af273086e8cc 100644
--- a/res/skins/Deere/sampler_simple.xml
+++ b/res/skins/Deere/sampler_simple.xml
@@ -13,14 +13,6 @@
     <SizePolicy>me,f</SizePolicy>
     <Children>
       <Template src="skin:sampler_text_row.xml"/>
-
-      <Template src="skin:vumeter_h.xml">
-        <SetVariable name="TooltipId">channel_VuMeter</SetVariable>
-        <SetVariable name="group"><Variable name="group"/></SetVariable>
-        <SetVariable name="control">VuMeter</SetVariable>
-        <SetVariable name="tooltip_meter">sampler_VuMeter</SetVariable>
-        <SetVariable name="tooltip_clip">sampler_PeakIndicator</SetVariable>
-      </Template>
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/sampler_text_row.xml b/res/skins/Deere/sampler_text_row.xml
index 114f8e07c391..334505cba2cd 100644
--- a/res/skins/Deere/sampler_text_row.xml
+++ b/res/skins/Deere/sampler_text_row.xml
@@ -7,34 +7,76 @@
 -->
 <Template>
   <WidgetGroup>
-    <ObjectName>SamplerTextRow</ObjectName>
-    <Layout>vertical</Layout>
+    <ObjectName>SamplerTopRowOuter</ObjectName>
+    <Layout>horizontal</Layout>
     <SizePolicy>me,max</SizePolicy>
     <Children>
       <WidgetGroup>
-        <ObjectName>TitleGutter</ObjectName>
+        <ObjectName>SamplerTopRowInner</ObjectName>
         <Layout>horizontal</Layout>
         <!-- When TextRow is laid out, we need to ignore our children. Otherwise
              decks might end up with different widths based on the size of the
              labels in this row -->
         <SizePolicy>i,max</SizePolicy>
         <Children>
-          <Template src="skin:left_right_display_2state_button.xml">
-            <SetVariable name="TooltipId">play_start</SetVariable>
-            <SetVariable name="ObjectName">SamplerPlayButton</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-            <SetVariable name="state_0_text"></SetVariable>
-            <SetVariable name="state_0_pressed">icon/ic_play_48px.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">icon/ic_play_48px.svg</SetVariable>
-            <SetVariable name="state_1_text"></SetVariable>
-            <SetVariable name="state_1_pressed">icon/ic_play_48px.svg</SetVariable>
-            <SetVariable name="state_1_unpressed">icon/ic_play_48px.svg</SetVariable>
-            <SetVariable name="left_connection_control"><Variable name="group"/>,cue_gotoandplay</SetVariable>
-            <SetVariable name="right_connection_control"><Variable name="group"/>,start_stop</SetVariable>
-            <SetVariable name="display_connection_control"><Variable name="group"/>,play_indicator</SetVariable>
-          </Template>
+
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Template src="skin:left_right_display_2state_button.xml">
+                <SetVariable name="TooltipId">play_start</SetVariable>
+                <SetVariable name="ObjectName">SamplerPlayButton</SetVariable>
+                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                <SetVariable name="state_0_text"></SetVariable>
+                <SetVariable name="state_0_pressed">icon/ic_play_48px.svg</SetVariable>
+                <SetVariable name="state_0_unpressed">icon/ic_play_48px.svg</SetVariable>
+                <SetVariable name="state_1_text"></SetVariable>
+                <SetVariable name="state_1_pressed">icon/ic_play_48px.svg</SetVariable>
+                <SetVariable name="state_1_unpressed">icon/ic_play_48px.svg</SetVariable>
+                <SetVariable name="left_connection_control"><Variable name="group"/>,cue_gotoandplay</SetVariable>
+                <SetVariable name="right_connection_control"><Variable name="group"/>,cue_gotoandstop</SetVariable>
+                <SetVariable name="display_connection_control"><Variable name="group"/>,play</SetVariable>
+              </Template>
+
+            </Children>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,repeat</ConfigKey>
+              <BindProperty>visible</BindProperty>
+              <Transform>
+                <Not/>
+              </Transform>
+            </Connection>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <Children>
+
+              <Template src="skin:left_right_display_2state_button.xml">
+                <SetVariable name="TooltipId">play_start</SetVariable>
+                <SetVariable name="ObjectName">SamplerPlayButtonRepeating</SetVariable>
+                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                <SetVariable name="state_0_text"></SetVariable>
+                <SetVariable name="state_0_pressed">icon/ic_play_48px.svg</SetVariable>
+                <SetVariable name="state_0_unpressed">icon/ic_play_48px.svg</SetVariable>
+                <SetVariable name="state_1_text"></SetVariable>
+                <SetVariable name="state_1_pressed">icon/ic_play_48px.svg</SetVariable>
+                <SetVariable name="state_1_unpressed">icon/ic_play_48px.svg</SetVariable>
+                <SetVariable name="left_connection_control"><Variable name="group"/>,cue_gotoandplay</SetVariable>
+                <SetVariable name="right_connection_control"><Variable name="group"/>,cue_gotoandstop</SetVariable>
+                <SetVariable name="display_connection_control"><Variable name="group"/>,play</SetVariable>
+              </Template>
+
+            </Children>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,repeat</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
 
           <TrackProperty>
             <TooltipId>track_title</TooltipId>
@@ -43,31 +85,10 @@
             <Group><Variable name="group"/></Group>
             <Elide>right</Elide>
           </TrackProperty>
+
         </Children>
       </WidgetGroup>
-      <!--
-      <WidgetGroup>
-        <ObjectName>BPMGutter</ObjectName>
-        <Layout>horizontal</Layout>
-        <SizePolicy>min,max</SizePolicy>
-        <Children>
-          <Key>
-            <Group><Variable name="group"/></Group>
-            <SizePolicy>min,</SizePolicy>
-            <Connection>
-              <ConfigKey><Variable name="group"/>,visual_key</ConfigKey>
-            </Connection>
-          </Key>
-          <NumberBpm>
-            <Group><Variable name="group"/></Group>
-            <SizePolicy>min,</SizePolicy>
-            <Connection>
-              <ConfigKey><Variable name="group"/>,visual_bpm</ConfigKey>
-            </Connection>
-          </NumberBpm>
-        </Children>
-      </WidgetGroup>
-      -->
+
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/skin.xml b/res/skins/Deere/skin.xml
index 71af160d2a82..724ae8e8962e 100644
--- a/res/skins/Deere/skin.xml
+++ b/res/skins/Deere/skin.xml
@@ -9,27 +9,43 @@
     <license>Creative Commons Attribution, Share-Alike 3.0 Unported</license>
     <attributes>
       <attribute config_key="[Master],num_decks">4</attribute>
-      <attribute config_key="[Master],num_samplers">16</attribute>
+      <attribute config_key="[Master],num_samplers">64</attribute>
       <attribute config_key="[Master],num_preview_decks">1</attribute>
-      <!--Optionally, make elements visible on skin load-->
-      <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="[Samplers],show_samplers">0</attribute>
+      <attribute config_key="[Library],show_library">1</attribute>
+
+      <!--Skin settings-->
+      <attribute persist="true" config_key="[Deere],show_parallel_waveforms">0</attribute>
       <attribute persist="true" config_key="[Microphone],show_microphone">0</attribute>
-      <attribute persist="true" config_key="[VinylControl],show_vinylcontrol">0</attribute>
       <attribute persist="true" config_key="[PreviewDeck],show_previewdeck">0</attribute>
-      <attribute config_key="[Library],show_library">1</attribute>
-      <attribute persist="true" config_key="[Library],show_coverart">0</attribute>
+
+      <attribute persist="true" config_key="[Master],show_4decks">0</attribute>
+      <attribute persist="true" config_key="[Master],show_4effectunits">0</attribute>
+      <attribute persist="true" config_key="[Master],show_coverart">0</attribute>
+      <attribute persist="true" config_key="[Master],show_spinnies">1</attribute>
+      <attribute persist="true" config_key="[Deere],show_starrating">0</attribute>
+      <attribute persist="true" config_key="[Deere],show_track_info">1</attribute>
+      <attribute persist="true" config_key="[Deere],show_bpm_info">1</attribute>
+      <attribute persist="true" config_key="[Deere],show_more_hotcues">0</attribute>
+      <attribute persist="true" config_key="[Deere],show_minimal_deck_controls">0</attribute>
+
+      <attribute persist="true" config_key="[Master],show_mixer">1</attribute>
+      <attribute persist="true" config_key="[Deere],show_crossfader">1</attribute>
+      <attribute persist="true" config_key="[Master],show_eqs">1</attribute>
+      <attribute persist="true" config_key="[Master],show_faders">1</attribute>
+      <attribute persist="true" config_key="[VinylControl],show_vinylcontrol">0</attribute>
+
+      <attribute persist="true" config_key="[Samplers],show_samplers">1</attribute>
+      <attribute persist="true" config_key="[Samplers],show_expanded">0</attribute>
+
+      <attribute persist="true" config_key="[EffectRack1],show">1</attribute>
+      <attribute persist="true" config_key="[Master],show_superknobs">0</attribute>
     </attributes>
   </manifest>
 
   <ObjectName>Mixxx</ObjectName>
   <Style src="skin:style.qss"/>
 
-  <MinimumSize>1024,700</MinimumSize>
-  <SizePolicy>me,me</SizePolicy>
+  <Size>1024me,550me</Size>
   <Layout>horizontal</Layout>
 
   <Children>
@@ -37,9 +53,13 @@
     <SetVariable name="SmallSquareButtonMaximumSize">15,15</SetVariable>
     <SetVariable name="SmallSquareButtonSizePolicy">f,f</SetVariable>
 
-    <SetVariable name="SmallWideButtonMinimumSize">40,20</SetVariable>
-    <SetVariable name="SmallWideButtonMaximumSize">40,20</SetVariable>
-    <SetVariable name="SmallWideButtonSizePolicy">me,me</SetVariable>
+    <SetVariable name="SmallWideButtonMinimumSize">50,20</SetVariable>
+    <SetVariable name="SmallWideButtonMaximumSize">50,20</SetVariable>
+    <SetVariable name="SmallWideButtonSizePolicy">f,f</SetVariable>
+
+    <SetVariable name="MinimalControlsButtonMinimumSize">34,22</SetVariable>
+    <SetVariable name="MinimalControlsButtonMaximumSize">34,22</SetVariable>
+    <SetVariable name="MinimalControlsButtonSizePolicy">f,f</SetVariable>
 
     <SetVariable name="SmallHorizontalStretchButtonMinimumSize">-1,15</SetVariable>
     <SetVariable name="SmallHorizontalStretchButtonMaximumSize">-1,15</SetVariable>
@@ -53,32 +73,366 @@
     <SetVariable name="SmallHorizontalStretchLinkButtonMaximumSize">-1,4</SetVariable>
     <SetVariable name="SmallHorizontalStretchLinkButtonSizePolicy">me,f</SetVariable>
 
-    <SetVariable name="SquareButtonMinimumSize">20,20</SetVariable>
-    <SetVariable name="SquareButtonMaximumSize">20,20</SetVariable>
+    <SetVariable name="SquareButtonMinimumSize">22,22</SetVariable>
+    <SetVariable name="SquareButtonMaximumSize">22,22</SetVariable>
     <SetVariable name="SquareButtonSizePolicy">f,f</SetVariable>
 
-    <SetVariable name="WideButtonMinimumSize">40,20</SetVariable>
-    <SetVariable name="WideButtonMaximumSize">40,20</SetVariable>
+    <SetVariable name="FXAssignmentButtonMinimumSize">26,22</SetVariable>
+    <SetVariable name="FXAssignmentButtonMaximumSize">26,22</SetVariable>
+    <SetVariable name="FXAssignmentButtonSizePolicy">f,f</SetVariable>
+
+    <SetVariable name="WideButtonMinimumSize">40,22</SetVariable>
+    <SetVariable name="WideButtonMaximumSize">40,22</SetVariable>
     <SetVariable name="WideButtonSizePolicy">f,f</SetVariable>
 
-    <SetVariable name="HorizontalStretchButtonMinimumSize">-1,20</SetVariable>
-    <SetVariable name="HorizontalStretchButtonMaximumSize">-1,20</SetVariable>
+    <SetVariable name="ToolbarButtonMinimumSize">75,22</SetVariable>
+    <SetVariable name="ToolbarButtonMaximumSize">75,22</SetVariable>
+    <SetVariable name="ToolbarButtonSizePolicy">f,f</SetVariable>
+
+    <SetVariable name="HorizontalStretchButtonMinimumSize">-1,22</SetVariable>
+    <SetVariable name="HorizontalStretchButtonMaximumSize">-1,22</SetVariable>
     <SetVariable name="HorizontalStretchButtonSizePolicy">me,f</SetVariable>
 
     <SetVariable name="VerticalStretchButtonMinimumSize">20,-1</SetVariable>
     <SetVariable name="VerticalStretchButtonMaximumSize">20,-1</SetVariable>
     <SetVariable name="VerticalStretchButtonSizePolicy">f,me</SetVariable>
 
+    <!-- The waveforms (zoomed and overview) use a lot of memory. They appear in multiple places in
+    main_decks.xml, left_deck.xml, and right_deck.xml, so define them in singletons. This makes
+    toggling between 2/4 decks and stacked/split waveforms slower, but it makes Mixxx startup
+    and shutdown much faster and saves a lot of memory.-->
+    <SingletonDefinition>
+      <ObjectName>DeckVisualRow1</ObjectName>
+      <Children>
+        <Template src="skin:deck_visual_row.xml">
+          <SetVariable name="i">1</SetVariable>
+          <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
+          <!-- Traditional Blue -->
+          <SetVariable name="DeckSignalColor">#007BCD</SetVariable>
+          <SetVariable name="DeckBackgroundColor">#333333</SetVariable>
+          <SetVariable name="control_show_spinny">[Spinny<Variable name="i"/>],show_spinny</SetVariable>
+        </Template>
+      </Children>
+    </SingletonDefinition>
+
+    <SingletonDefinition>
+      <ObjectName>DeckVisualRow2</ObjectName>
+      <Children>
+        <Template src="skin:deck_visual_row.xml">
+          <SetVariable name="i">2</SetVariable>
+          <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
+          <!-- Traditional Orange -->
+          <SetVariable name="DeckSignalColor">#E67A00</SetVariable>
+          <SetVariable name="DeckBackgroundColor">#333333</SetVariable>
+          <SetVariable name="control_show_spinny">[Spinny<Variable name="i"/>],show_spinny</SetVariable>
+        </Template>
+      </Children>
+    </SingletonDefinition>
+
+    <SingletonDefinition>
+      <ObjectName>DeckVisualRow3</ObjectName>
+      <Children>
+        <Template src="skin:deck_visual_row.xml">
+          <SetVariable name="i">3</SetVariable>
+          <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
+          <!-- Violet -->
+          <SetVariable name="DeckSignalColor">#B500B5</SetVariable>
+          <SetVariable name="DeckBackgroundColor">#35335a</SetVariable>
+          <SetVariable name="control_show_spinny">[Spinny<Variable name="i"/>],show_spinny</SetVariable>
+        </Template>
+      </Children>
+    </SingletonDefinition>
+
+  <SingletonDefinition>
+      <ObjectName>DeckVisualRow4</ObjectName>
+      <Children>
+        <Template src="skin:deck_visual_row.xml">
+          <SetVariable name="i">4</SetVariable>
+          <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
+          <!-- Lime -->
+          <SetVariable name="DeckSignalColor">#AABD00</SetVariable>
+          <SetVariable name="DeckBackgroundColor">#35335a</SetVariable>
+          <SetVariable name="control_show_spinny">[Spinny<Variable name="i"/>],show_spinny</SetVariable>
+        </Template>
+      </Children>
+    </SingletonDefinition>
+
+    <SingletonDefinition>
+      <ObjectName>DecksMixerSingleton</ObjectName>
+      <Children>
+        <WidgetGroup>
+          <Layout>horizontal</Layout>
+          <SizePolicy>me,min</SizePolicy>
+          <Children>
+            <Template src="skin:left_gutter.xml"/>
+            <Template src="skin:mixer.xml"/>
+            <Template src="skin:right_gutter.xml"/>
+          </Children>
+        </WidgetGroup>
+      </Children>
+    </SingletonDefinition>
+
+<!--    <SingletonDefinition>
+      <ObjectName>MainDecks</ObjectName>
+      <Children>
+        <Template src="skin:main_decks.xml"/>
+      </Children>
+    </SingletonDefinition>-->
+
+    <SingletonDefinition>
+      <ObjectName>BelowDecks</ObjectName>
+      <Children>
+        <WidgetGroup>
+          <Layout>vertical</Layout>
+          <Size>-1me,-1me</Size>
+          <Children>
+            <WidgetGroup>
+              <Layout>vertical</Layout>
+              <Children>
+
+                <WidgetGroup>
+                  <Layout>horizontal</Layout>
+                  <Children>
+                    <Template src="skin:effect_rack.xml"/>
+                  </Children>
+                  <Connection>
+                    <ConfigKey>[EffectRack1],show</ConfigKey>
+                    <BindProperty>visible</BindProperty>
+                  </Connection>
+                </WidgetGroup>
+                <WidgetGroup>
+                  <Layout>horizontal</Layout>
+                  <Children>
+                    <Template src="skin:sample_decks.xml"/>
+                  </Children>
+                  <Connection>
+                    <ConfigKey>[Samplers],show_samplers</ConfigKey>
+                    <BindProperty>visible</BindProperty>
+                  </Connection>
+                </WidgetGroup>
+                <Template src="skin:microphone_rack.xml"/>
+
+              </Children>
+              <Connection>
+                <ConfigKey>[Master],maximize_library</ConfigKey>
+                <BindProperty>visible</BindProperty>
+                <Transform>
+                  <Not/>
+                </Transform>
+              </Connection>
+            </WidgetGroup>
+
+            <Template src="skin:library.xml"/>
+          </Children>
+        </WidgetGroup>
+      </Children>
+    </SingletonDefinition>
+
     <WidgetGroup>
       <SizePolicy>me,me</SizePolicy>
       <Layout>vertical</Layout>
       <Children>
         <Template src="skin:tool_bar.xml"/>
-        <Template src="skin:main_decks.xml"/>
-        <Template src="skin:sample_decks.xml"/>
-        <Template src="skin:effect_rack.xml"/>
-        <Template src="skin:microphone_rack.xml"/>
-        <Template src="skin:library.xml"/>
+
+        <WidgetGroup>
+          <Layout>vertical</Layout>
+          <Size>-1me,-1me</Size>
+          <Children>
+
+            <WidgetGroup>
+              <Layout>vertical</Layout>
+              <Size>-1me,-1me</Size>
+              <Children>
+
+                <Splitter>
+                  <ObjectName>LibraryVerticalSplitter</ObjectName>
+                  <Orientation>vertical</Orientation>
+                  <SplitSizesConfigKey>[Deere],LibrarySplitter2DecksSplit</SplitSizesConfigKey>
+                  <SplitSizes>246,454</SplitSizes>
+                  <Size>-1me,-1me</Size>
+                  <Children>
+                    <WidgetGroup>
+                      <Layout>vertical</Layout>
+                      <Size>-1me,-1me</Size>
+                      <MaximumSize>-1,300</MaximumSize>
+                      <Children>
+                        <Template src="skin:main_decks.xml"/>
+                      </Children>
+                      <Connection>
+                        <ConfigKey>[Master],maximize_library</ConfigKey>
+                        <BindProperty>visible</BindProperty>
+                        <Transform>
+                          <Not/>
+                        </Transform>
+                      </Connection>
+                    </WidgetGroup>
+
+                    <SingletonContainer>
+                      <ObjectName>BelowDecks</ObjectName>
+                    </SingletonContainer>
+
+                  </Children>
+                </Splitter>
+
+              </Children>
+              <Connection>
+                <BindProperty>visible</BindProperty>
+                <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
+                <Transform>
+                  <Not/>
+                </Transform>
+              </Connection>
+            </WidgetGroup>
+
+            <WidgetGroup>
+              <Layout>vertical</Layout>
+              <Size>-1me,-1me</Size>
+              <Children>
+
+                <Splitter>
+                  <ObjectName>LibraryVerticalSplitter</ObjectName>
+                  <Orientation>vertical</Orientation>
+                  <SplitSizesConfigKey>[Deere],LibrarySplitter2DecksStacked</SplitSizesConfigKey>
+                  <SplitSizes>395,233 </SplitSizes>
+                  <Size>-1me,-1me</Size>
+                  <Children>
+                    <WidgetGroup>
+                      <Layout>vertical</Layout>
+                      <Size>-1me,-1me</Size>
+                      <Children>
+                        <Template src="skin:main_decks.xml"/>
+                      </Children>
+                      <Connection>
+                        <ConfigKey>[Master],maximize_library</ConfigKey>
+                        <BindProperty>visible</BindProperty>
+                        <Transform>
+                          <Not/>
+                        </Transform>
+                      </Connection>
+                    </WidgetGroup>
+
+                    <SingletonContainer>
+                      <ObjectName>BelowDecks</ObjectName>
+                    </SingletonContainer>
+
+                  </Children>
+                </Splitter>
+
+              </Children>
+              <Connection>
+                <BindProperty>visible</BindProperty>
+                <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
+              </Connection>
+            </WidgetGroup>
+
+          </Children>
+          <Connection>
+            <BindProperty>visible</BindProperty>
+            <ConfigKey>[Master],show_4decks</ConfigKey>
+            <Transform>
+              <Not/>
+            </Transform>
+          </Connection>
+        </WidgetGroup>
+
+        <WidgetGroup>
+          <Layout>vertical</Layout>
+          <Size>-1me,-1me</Size>
+          <Children>
+
+            <WidgetGroup>
+              <Layout>vertical</Layout>
+              <Size>-1me,-1me</Size>
+              <Children>
+
+                <Splitter>
+                  <ObjectName>LibraryVerticalSplitter</ObjectName>
+                  <Orientation>vertical</Orientation>
+                  <SplitSizesConfigKey>[Deere],LibrarySplitter4DecksSplit</SplitSizesConfigKey>
+                  <SplitSizes>519,181</SplitSizes>
+                  <Size>-1me,-1me</Size>
+                  <Children>
+                    <WidgetGroup>
+                      <Layout>vertical</Layout>
+                      <Size>-1me,-1me</Size>
+                      <MaximumSize>-1,700</MaximumSize>
+                      <Children>
+                        <Template src="skin:main_decks.xml"/>
+                      </Children>
+                      <Connection>
+                        <ConfigKey>[Master],maximize_library</ConfigKey>
+                        <BindProperty>visible</BindProperty>
+                        <Transform>
+                          <Not/>
+                        </Transform>
+                      </Connection>
+                    </WidgetGroup>
+
+                    <SingletonContainer>
+                      <ObjectName>BelowDecks</ObjectName>
+                    </SingletonContainer>
+
+                  </Children>
+                </Splitter>
+
+              </Children>
+              <Connection>
+                <BindProperty>visible</BindProperty>
+                <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
+                <Transform>
+                  <Not/>
+                </Transform>
+              </Connection>
+            </WidgetGroup>
+
+            <WidgetGroup>
+              <Layout>vertical</Layout>
+              <Size>-1me,-1me</Size>
+              <Children>
+
+                <Splitter>
+                  <ObjectName>LibraryVerticalSplitter</ObjectName>
+                  <Orientation>vertical</Orientation>
+                  <SplitSizesConfigKey>[Deere],LibrarySplitter4DecksStacked</SplitSizesConfigKey>
+                  <SplitSizes>647,53</SplitSizes>
+                  <Size>-1me,-1me</Size>
+                  <Children>
+                    <WidgetGroup>
+                      <Layout>vertical</Layout>
+                      <Size>-1me,-1me</Size>
+                      <Children>
+                        <Template src="skin:main_decks.xml"/>
+                      </Children>
+                      <Connection>
+                        <ConfigKey>[Master],maximize_library</ConfigKey>
+                        <BindProperty>visible</BindProperty>
+                        <Transform>
+                          <Not/>
+                        </Transform>
+                      </Connection>
+                    </WidgetGroup>
+
+                    <SingletonContainer>
+                      <ObjectName>BelowDecks</ObjectName>
+                    </SingletonContainer>
+
+                  </Children>
+                </Splitter>
+
+              </Children>
+              <Connection>
+                <BindProperty>visible</BindProperty>
+                <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
+              </Connection>
+            </WidgetGroup>
+
+          </Children>
+          <Connection>
+            <BindProperty>visible</BindProperty>
+            <ConfigKey>[Master],show_4decks</ConfigKey>
+          </Connection>
+        </WidgetGroup>
+
       </Children>
     </WidgetGroup>
     <Template src="skin:skin_settings.xml"/>
diff --git a/res/skins/Deere/skin_settings.xml b/res/skins/Deere/skin_settings.xml
index 54d94977b6fb..336a8c410f54 100644
--- a/res/skins/Deere/skin_settings.xml
+++ b/res/skins/Deere/skin_settings.xml
@@ -7,9 +7,7 @@
   <WidgetGroup>
     <ObjectName>SkinSettings</ObjectName>
     <Layout>vertical</Layout>
-    <SizePolicy>min,min</SizePolicy>
-    <MinimumSize>180,-1</MinimumSize>
-    <MaximumSize>300,-1</MaximumSize>
+    <Size>180f,-1min</Size>
     <Children>
       <WidgetGroup>
         <ObjectName>SkinSettingsTop</ObjectName>
@@ -38,190 +36,171 @@
         </Children>
       </WidgetGroup>
 
-      <!-- Global Skin Settings -->
-      <Label>
-        <ObjectName>h2</ObjectName>
-        <Text>View</Text>
-      </Label>
-
       <WidgetGroup>
         <ObjectName>h3</ObjectName>
         <Layout>vertical</Layout>
         <SizePolicy>me,min</SizePolicy>
         <Children>
+
           <PushButton>
-            <TooltipId>show_mixer</TooltipId>
+            <TooltipId>toggle_parallel_waveforms</TooltipId>
             <Size>80me,20f</Size>
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Show Mixer</Text>
+              <Text>&#9898; Parallel Waveforms</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Show Mixer</Text>
+              <Text>&#9899; Parallel Waveforms</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
-              <ConfigKey persist="true">[Master],hide_mixer</ConfigKey>
-              <Transform>
-                <Not/>
-              </Transform>
+              <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
             </Connection>
           </PushButton>
 
           <PushButton>
+            <TooltipId>toggle_4decks</TooltipId>
             <Size>80me,20f</Size>
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Show Crossfader</Text>
+              <Text>&#9898; 4 Decks</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Show Crossfader</Text>
+              <Text>&#9899; 4 Decks</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
-              <ConfigKey>[Deere],hide_crossfader</ConfigKey>
-              <Transform>
-                <Not/>
-              </Transform>
+              <ConfigKey>[Master],show_4decks</ConfigKey>
+              <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
             </Connection>
           </PushButton>
 
+        </Children>
+      </WidgetGroup>
+
+      <!-- Deck Settings -->
+      <Label>
+      <ObjectName>h2</ObjectName>
+      <Text>Decks</Text>
+      </Label>
+
+      <WidgetGroup>
+        <ObjectName>h3</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>me,min</SizePolicy>
+        <Children>
+
           <PushButton>
-            <TooltipId>show_microphone</TooltipId>
             <Size>80me,20f</Size>
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Show Microphone</Text>
+              <Text>&#9898; Cover Art</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Show Microphone</Text>
+              <Text>&#9899; Cover Art</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
-              <ConfigKey persist="true">[Microphone],show_microphone</ConfigKey>
+              <ConfigKey>[Master],show_coverart</ConfigKey>
             </Connection>
           </PushButton>
 
           <PushButton>
-            <TooltipId>show_previewdeck</TooltipId>
             <Size>80me,20f</Size>
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Show Preview Deck</Text>
+              <Text>&#9898; Spinnies</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Show Preview Deck</Text>
+              <Text>&#9899; Spinnies</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
-              <ConfigKey persist="true">[PreviewDeck],show_previewdeck</ConfigKey>
+              <ConfigKey>[Master],show_spinnies</ConfigKey>
             </Connection>
           </PushButton>
 
           <PushButton>
-            <TooltipId>toggle_4decks</TooltipId>
             <Size>80me,20f</Size>
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Show 4 Decks</Text>
+              <Text>&#9898; Artist &amp; Track Title</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Show 4 Decks</Text>
+              <Text>&#9899; Artist &amp; Track Title</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
-              <ConfigKey persist="true">[Master],show_4decks</ConfigKey>
-              <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+              <ConfigKey>[Deere],show_track_info</ConfigKey>
             </Connection>
           </PushButton>
 
           <PushButton>
-            <TooltipId>show_coverart</TooltipId>
             <Size>80me,20f</Size>
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Show Cover Art in Library</Text>
+              <Text>&#9898; BPM</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Show Cover Art in Library</Text>
+              <Text>&#9899; BPM</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
-              <ConfigKey persist="true">[Library],show_coverart</ConfigKey>
+              <ConfigKey>[Deere],show_bpm_info</ConfigKey>
             </Connection>
           </PushButton>
 
           <PushButton>
-            <TooltipId>maximize_library</TooltipId>
             <Size>80me,20f</Size>
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Maximize Library</Text>
+              <Text>&#9898; Star Rating</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Maximize Library</Text>
+              <Text>&#9899; Star Rating</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
-              <ConfigKey persist="true">[Master],maximize_library</ConfigKey>
-              <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+              <ConfigKey>[Deere],show_starrating</ConfigKey>
             </Connection>
           </PushButton>
-        </Children>
-      </WidgetGroup>
-
-      <!-- Deck Settings -->
-      <Label>
-      <ObjectName>h2</ObjectName>
-      <Text>Main Decks</Text>
-      </Label>
 
-      <WidgetGroup>
-        <ObjectName>h3</ObjectName>
-        <Layout>vertical</Layout>
-        <SizePolicy>me,min</SizePolicy>
-        <Children>
           <PushButton>
             <Size>80me,20f</Size>
-            <NumberStates>3</NumberStates>
+            <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Show Cover Art</Text>
+              <Text>&#9898; More Hotcues</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Show Cover Art &#9679; &#9675;</Text>
-              <Alignment>left</Alignment>
-            </State>
-            <State>
-              <Number>2</Number>
-              <Text>&#9745; Show Cover Art &#9675; &#9679;</Text>
+              <Text>&#9899; More Hotcues</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
-              <ConfigKey persist="true">[Deere],show_coverart</ConfigKey>
+              <ConfigKey>[Deere],show_more_hotcues</ConfigKey>
             </Connection>
           </PushButton>
 
@@ -230,89 +209,104 @@
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Show Star Rating</Text>
+              <Text>&#9898; Vinyl Control Options</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Show Star Rating</Text>
+              <Text>&#9899; Vinyl Control Options</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
-              <ConfigKey persist="true">[Deere],show_starrating</ConfigKey>
+              <ConfigKey>[VinylControl],show_vinylcontrol</ConfigKey>
             </Connection>
           </PushButton>
 
           <PushButton>
+            <TooltipId>toggle_deck_controls</TooltipId>
             <Size>80me,20f</Size>
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Show More Hotcues</Text>
+              <Text>&#9898; Minimal Controls</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Show More Hotcues</Text>
+              <Text>&#9899; Minimal Controls</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
-              <ConfigKey persist="true">[Deere],show_more_hotcues</ConfigKey>
+              <ConfigKey>[Deere],show_minimal_deck_controls</ConfigKey>
             </Connection>
           </PushButton>
+        </Children>
+      </WidgetGroup>
+
+      <Label>
+        <ObjectName>h2</ObjectName>
+        <Text>Mixer</Text>
+      </Label>
 
+      <WidgetGroup>
+        <ObjectName>h3</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>me,min</SizePolicy>
+        <Children>
           <PushButton>
+            <TooltipId>show_mixer</TooltipId>
             <Size>80me,20f</Size>
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Conceal Artist/Track Info</Text>
+              <Text>&#9898; Show</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Conceal Artist/Track Info</Text>
+              <Text>&#9899; Show</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
-              <ConfigKey>[Deere],show_no_track_info</ConfigKey>
+              <ConfigKey>[Master],show_mixer</ConfigKey>
             </Connection>
           </PushButton>
 
           <PushButton>
+            <TooltipId>show_eqs</TooltipId>
             <Size>80me,20f</Size>
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Conceal BPM Info</Text>
+              <Text>&#9898; Equalizers</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Conceal BPM Info</Text>
+              <Text>&#9899; Equalizers</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
-              <ConfigKey>[Deere],show_no_bpm_info</ConfigKey>
+              <ConfigKey>[Master],show_eqs</ConfigKey>
             </Connection>
           </PushButton>
 
           <PushButton>
-            <TooltipId>toggle_waveforms_stacked</TooltipId>
+            <TooltipId>show_eqs</TooltipId>
             <Size>80me,20f</Size>
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Show Stacked Waveforms</Text>
+              <Text>&#9898; Faders</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Show Stacked Waveforms</Text>
+              <Text>&#9899; Faders</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
-              <ConfigKey persist="true">[Deere],show_stacked_waveforms</ConfigKey>
+              <ConfigKey>[Master],show_faders</ConfigKey>
             </Connection>
           </PushButton>
 
@@ -321,16 +315,16 @@
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Show Vinyl Control Options</Text>
+              <Text>&#9898; Crossfader</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Show Vinyl Control Options</Text>
+              <Text>&#9899; Crossfader</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
-              <ConfigKey persist="true">[VinylControl],show_vinylcontrol</ConfigKey>
+              <ConfigKey>[Deere],show_crossfader</ConfigKey>
             </Connection>
           </PushButton>
 
@@ -343,35 +337,165 @@
         <Text>Samplers</Text>
       </Label>
 
+      <WidgetGroup>
+        <ObjectName>h3</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>me,max</SizePolicy>
+        <Children>
+
+          <WidgetStack currentpage="[Deere],sampler_row_current" >
+            <NextControl>[Deere],sampler_bank_next</NextControl>
+            <PrevControl>[Deere],sampler_bank_prev</PrevControl>
+            <Children>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:sampler_rows_selection_button.xml">
+                    <SetVariable name="current">1</SetVariable>
+                    <SetVariable name="next">2</SetVariable>
+                    <SetVariable name="prev">8</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:sampler_rows_selection_button.xml">
+                    <SetVariable name="current">2</SetVariable>
+                    <SetVariable name="next">3</SetVariable>
+                    <SetVariable name="prev">1</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:sampler_rows_selection_button.xml">
+                    <SetVariable name="current">3</SetVariable>
+                    <SetVariable name="next">4</SetVariable>
+                    <SetVariable name="prev">2</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:sampler_rows_selection_button.xml">
+                    <SetVariable name="current">4</SetVariable>
+                    <SetVariable name="next">5</SetVariable>
+                    <SetVariable name="prev">3</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:sampler_rows_selection_button.xml">
+                    <SetVariable name="current">5</SetVariable>
+                    <SetVariable name="next">6</SetVariable>
+                    <SetVariable name="prev">4</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:sampler_rows_selection_button.xml">
+                    <SetVariable name="current">6</SetVariable>
+                    <SetVariable name="next">7</SetVariable>
+                    <SetVariable name="prev">5</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:sampler_rows_selection_button.xml">
+                    <SetVariable name="current">7</SetVariable>
+                    <SetVariable name="next">8</SetVariable>
+                    <SetVariable name="prev">6</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:sampler_rows_selection_button.xml">
+                    <SetVariable name="current">8</SetVariable>
+                    <SetVariable name="next">1</SetVariable>
+                    <SetVariable name="prev">7</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+
+            </Children>
+          </WidgetStack>
+
+        </Children>
+      </WidgetGroup>
+
+      <!-- Effects Settings -->
+      <Label>
+        <ObjectName>h2</ObjectName>
+        <Text>Effects</Text>
+      </Label>
+
       <WidgetGroup>
         <ObjectName>h3</ObjectName>
         <Layout>vertical</Layout>
         <SizePolicy>me,min</SizePolicy>
         <Children>
+
+          <PushButton>
+            <Size>80me,20f</Size>
+            <NumberStates>2</NumberStates>
+            <State>
+              <Number>0</Number>
+              <Text>&#9898; Superknob</Text>
+              <Alignment>left</Alignment>
+            </State>
+            <State>
+              <Number>1</Number>
+              <Text>&#9899; Superknob</Text>
+              <Alignment>left</Alignment>
+            </State>
+            <Connection>
+              <ConfigKey>[Master],show_superknobs</ConfigKey>
+            </Connection>
+          </PushButton>
+
           <PushButton>
             <Size>80me,20f</Size>
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Show Advanced Mode</Text>
+              <Text>&#9898; 4 Effect Units</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Show Advanced Mode</Text>
+              <Text>&#9899; 4 Effect Units</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
-              <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
+              <ConfigKey>[Master],show_4effectunits</ConfigKey>
             </Connection>
           </PushButton>
         </Children>
       </WidgetGroup>
 
-      <!-- Effects Settings -->
+      <!-- Library Settings -->
       <Label>
         <ObjectName>h2</ObjectName>
-        <Text>Effect Rack</Text>
+        <Text>Library</Text>
       </Label>
 
       <WidgetGroup>
@@ -380,20 +504,60 @@
         <SizePolicy>me,min</SizePolicy>
         <Children>
           <PushButton>
+            <TooltipId>show_library</TooltipId>
+            <Size>80me,20f</Size>
+            <NumberStates>2</NumberStates>
+            <State>
+              <Number>0</Number>
+              <Text>&#9898; Show</Text>
+              <Alignment>left</Alignment>
+            </State>
+            <State>
+              <Number>1</Number>
+              <Text>&#9899; Show</Text>
+              <Alignment>left</Alignment>
+            </State>
+            <Connection>
+              <ConfigKey>[Library],show_library</ConfigKey>
+              <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+            </Connection>
+          </PushButton>
+
+          <PushButton>
+            <TooltipId>show_previewdeck</TooltipId>
+            <Size>80me,20f</Size>
+            <NumberStates>2</NumberStates>
+            <State>
+              <Number>0</Number>
+              <Text>&#9898; Preview Deck</Text>
+              <Alignment>left</Alignment>
+            </State>
+            <State>
+              <Number>1</Number>
+              <Text>&#9899; Preview Deck</Text>
+              <Alignment>left</Alignment>
+            </State>
+            <Connection>
+              <ConfigKey>[PreviewDeck],show_previewdeck</ConfigKey>
+            </Connection>
+          </PushButton>
+
+          <PushButton>
+            <TooltipId>show_coverart</TooltipId>
             <Size>80me,20f</Size>
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Text>&#9744; Show Advanced Mode</Text>
+              <Text>&#9898; Cover Art</Text>
               <Alignment>left</Alignment>
             </State>
             <State>
               <Number>1</Number>
-              <Text>&#9745; Show Advanced Mode</Text>
+              <Text>&#9899; Cover Art</Text>
               <Alignment>left</Alignment>
             </State>
             <Connection>
-              <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
+              <ConfigKey>[Library],show_coverart</ConfigKey>
             </Connection>
           </PushButton>
         </Children>
@@ -403,7 +567,7 @@
 
     </Children>
     <Connection>
-      <ConfigKey persist="true">[Deere],show_skin_settings</ConfigKey>
+      <ConfigKey>[Deere],show_skin_settings</ConfigKey>
       <BindProperty>visible</BindProperty>
     </Connection>
   </WidgetGroup>
diff --git a/res/skins/Deere/slider-vertical.svg b/res/skins/Deere/slider-vertical.svg
index e656e7a2a9fd..db055b0073e9 100644
--- a/res/skins/Deere/slider-vertical.svg
+++ b/res/skins/Deere/slider-vertical.svg
@@ -9,7 +9,7 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
    width="40"
-   height="180"
+   height="162"
    id="svg2"
    inkscape:version="0.91 r13725"
    sodipodi:docname="slider-vertical.svg">
@@ -21,6 +21,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -36,14 +37,14 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1366"
-     inkscape:window-height="702"
+     inkscape:window-height="696"
      id="namedview72"
      showgrid="false"
      inkscape:zoom="2.6222222"
-     inkscape:cx="-28.786214"
-     inkscape:cy="89.202864"
+     inkscape:cx="-60.771531"
+     inkscape:cy="88.448764"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg2" />
   <!-- marker lines every 5px -->
@@ -58,7 +59,7 @@
      width="14.734042"
      height="159.5"
      x="12.632978"
-     y="10.25"
+     y="1.25"
      ry="1"
      rx="1" />
   <path
@@ -67,5 +68,6 @@
      inkscape:original="M 14.632812 10.25 C 13.524812 10.25 12.632812 11.142 12.632812 12.25 L 12.632812 167.75 C 12.632812 168.858 13.524812 169.75 14.632812 169.75 L 25.367188 169.75 C 26.475188 169.75 27.367188 168.858 27.367188 167.75 L 27.367188 12.25 C 27.367187 11.142 26.475188 10.25 25.367188 10.25 L 14.632812 10.25 z "
      style="opacity:1;fill:#222222;fill-opacity:1;stroke:#222222;stroke-width:2.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      id="path4175"
-     d="m 18.064453,15.681641 0,148.636719 3.871094,0 0,-148.636719 -3.871094,0 z" />
+     d="m 18.064453,15.681641 0,148.636719 3.871094,0 0,-148.636719 -3.871094,0 z"
+     transform="translate(0,-9)" />
 </svg>
diff --git a/res/skins/Deere/spacer_hx.xml b/res/skins/Deere/spacer_hx.xml
new file mode 100644
index 000000000000..536e6d040cab
--- /dev/null
+++ b/res/skins/Deere/spacer_hx.xml
@@ -0,0 +1,16 @@
+<!DOCTYPE template>
+<!--
+Description: Spacer.
+-->
+<Template>
+  <WidgetGroup>
+    <ObjectName>Spacer</ObjectName>
+    <Layout>horizontal</Layout>
+    <SizePolicy>min,min</SizePolicy>
+    <Size><Variable name="width"/></Size>
+    <MinimumSize><Variable name="width"/></MinimumSize>
+    <MaximumSize><Variable name="width"/></MaximumSize>
+    <Children>
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Deere/spacer_v.xml b/res/skins/Deere/spacer_v.xml
index 6bcce5bc3912..61312ae3387f 100644
--- a/res/skins/Deere/spacer_v.xml
+++ b/res/skins/Deere/spacer_v.xml
@@ -4,12 +4,11 @@ Description:
 A vertical space filling widget. Grows to fit available space.
 -->
 <Template>
-	<WidgetGroup>
-		<Layout>horizontal</Layout>
-		<SizePolicy>min,me</SizePolicy>
-		<Children>
-		</Children>
-	</WidgetGroup>
+  <WidgetGroup>
+    <Layout>vertical</Layout>
+    <SizePolicy>min,me</SizePolicy>
+    <Children/>
+  </WidgetGroup>
 </Template>
 
 
diff --git a/res/skins/Deere/spinny.xml b/res/skins/Deere/spinny.xml
new file mode 100644
index 000000000000..2b67cb9c0671
--- /dev/null
+++ b/res/skins/Deere/spinny.xml
@@ -0,0 +1,196 @@
+<!--
+Spinny template
+Stacked waveforms: always show cover art in spinny
+Split waveforms: show cover art in spinny when it is not showing in deck text row,
+but do not show cover art in spinny when the cover art is showing right above it
+in the deck text row.
+
+Use smaller spinny sizes for 4 decks than 2 decks.
+-->
+<Template>
+  <SingletonDefinition>
+    <ObjectName>SpinnySingletonWithCover<Variable name="group"/></ObjectName>
+    <Children>
+      <Spinny>
+        <TooltipId>spinny</TooltipId>
+        <Group><Variable name="group"/></Group>
+        <PathBackground scalemode="STRETCH">image/vinyl_spinny_background.svg</PathBackground>
+        <PathForeground>image/vinyl_spinny_foreground.svg</PathForeground>
+        <PathGhost>image/vinyl_spinny_foreground_ghost.svg</PathGhost>
+        <PathMask>image/vinyl_spinny_cover_mask.svg</PathMask>
+        <ShowCover>true</ShowCover>
+      </Spinny>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>SpinnySingletonNoCover<Variable name="group"/></ObjectName>
+    <Children>
+      <Spinny>
+        <TooltipId>spinny</TooltipId>
+        <Group><Variable name="group"/></Group>
+        <PathBackground scalemode="STRETCH">image/vinyl_spinny_background.svg</PathBackground>
+        <PathForeground>image/vinyl_spinny_foreground.svg</PathForeground>
+        <PathGhost>image/vinyl_spinny_foreground_ghost.svg</PathGhost>
+        <PathMask>image/vinyl_spinny_cover_mask.svg</PathMask>
+        <ShowCover>false</ShowCover>
+      </Spinny>
+    </Children>
+  </SingletonDefinition>
+
+  <WidgetGroup>
+    <ObjectName>SpinnyHolder</ObjectName>
+    <Layout>horizontal</Layout>
+    <SizePolicy>max,max</SizePolicy>
+    <Children>
+
+      <!-- ===================== TWO DECKS ===================== -->
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Children>
+
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <Connection>
+              <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+            <Children>
+              <SingletonContainer>
+                  <ObjectName>SpinnySingletonWithCover<Variable name="group"/></ObjectName>
+                  <Size>75f,75f</Size>
+              </SingletonContainer>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <Connection>
+              <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
+              <BindProperty>visible</BindProperty>
+              <Transform>
+                <Not/>
+              </Transform>
+            </Connection>
+            <Children>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Connection>
+                  <ConfigKey>[Master],show_coverart</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+                <Children>
+                  <SingletonContainer>
+                      <ObjectName>SpinnySingletonNoCover<Variable name="group"/></ObjectName>
+                      <Size>75f,75f</Size>
+                  </SingletonContainer>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Connection>
+                  <ConfigKey>[Master],show_coverart</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                  <Transform>
+                    <Not/>
+                  </Transform>
+                </Connection>
+                <Children>
+                  <SingletonContainer>
+                      <ObjectName>SpinnySingletonWithCover<Variable name="group"/></ObjectName>
+                      <Size>75f,75f</Size>
+                  </SingletonContainer>
+                </Children>
+              </WidgetGroup>
+
+            </Children>
+          </WidgetGroup>
+
+        </Children>
+        <Connection>
+          <ConfigKey>[Master],show_4decks</ConfigKey>
+          <Transform>
+            <Not/>
+          </Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+
+      <!-- ===================== FOUR DECKS ===================== -->
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Children>
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <Connection>
+              <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+            <Children>
+              <SingletonContainer>
+                  <ObjectName>SpinnySingletonWithCover<Variable name="group"/></ObjectName>
+                  <Size>55f,55f</Size>
+              </SingletonContainer>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <Connection>
+              <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
+              <BindProperty>visible</BindProperty>
+              <Transform>
+                <Not/>
+              </Transform>
+            </Connection>
+            <Children>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Connection>
+                  <ConfigKey>[Master],show_coverart</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+                <Children>
+                  <SingletonContainer>
+                      <ObjectName>SpinnySingletonNoCover<Variable name="group"/></ObjectName>
+                      <Size>55f,55f</Size>
+                  </SingletonContainer>
+                </Children>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Connection>
+                  <ConfigKey>[Master],show_coverart</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                  <Transform>
+                    <Not/>
+                  </Transform>
+                </Connection>
+                <Children>
+                  <SingletonContainer>
+                      <ObjectName>SpinnySingletonWithCover<Variable name="group"/></ObjectName>
+                      <Size>55f,55f</Size>
+                  </SingletonContainer>
+                </Children>
+              </WidgetGroup>
+
+            </Children>
+          </WidgetGroup>
+        </Children>
+        <Connection>
+          <ConfigKey>[Master],show_4decks</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+    </Children>
+    <Connection>
+      <ConfigKey>[Master],show_spinnies</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index 61504dee8190..80fef43abd2b 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -22,20 +22,18 @@
  *******************************************************************************/
 /* These definitions put a faint border around all the widgets. We have to be
    tricky with top/bottom-ness to get things right. */
-#DeckControls {
+#Mixer {
   border-color: #222;
   border-style: solid;
-  border-left-width: 3px;
-  border-right-width: 3px;
-  padding-bottom: 5px;
+  border-width: 3px 1.5px 3px 1.5px;
 }
 
-#Crossfader {
-  border-color: #222;
-  border-style: solid;
-  border-left-width: 3px;
-  border-right-width: 3px;
-  border-bottom-width: 3px;
+#DeckControls {
+  padding: 7.5px;
+}
+
+#CrossfaderContainer {
+  padding: 0px 7.5px 7.5px 7.5px;
 }
 
 #DeckTextRow {
@@ -54,19 +52,13 @@
   border-top: none;
 }
 
-#Deck1InnerColumn, #Deck3InnerColumn {
-  border: 0px solid #222;
-  border-left: 1px solid #222;
+#TempoControlButtons {
+  qproperty-layoutSpacing: 2;
 }
 
-#Deck2InnerColumn, #Deck4InnerColumn {
+#DeckRateSliderColumn {
   border: 0px solid #222;
-  border-right: 1px solid #222;
-}
-
-/* Prevent a 2px border where the decks meet. */
-#Deck3 #DeckRows, #Deck4 #DeckRows {
-  border-top: none;
+  border-left: 2px solid #222;
 }
 
 #VisualRow {
@@ -78,8 +70,8 @@
 #OverviewRow {
   border-top: 1px solid #222;
   background-color: transparent;
-  margin: 0px;
-  padding: 4px;
+  margin: 0;
+  padding: 0 4px 0 0;
 }
 
 #ControlsRow {
@@ -92,7 +84,7 @@
 #Deck1, #Deck3 {
   border-bottom-right-radius:5px;
   border-top-right-radius:5px;
-  border-width: 1px;
+  border-width: 3px 1.5px 3px 3px;
   border-style: solid;
   border-color: #222;
 }
@@ -100,13 +92,40 @@
 #Deck2, #Deck4 {
   border-bottom-left-radius:5px;
   border-top-left-radius:5px;
-  border-width: 1px;
+  border-width: 3px 3px 3px 1.5px;
   border-style: solid;
   border-color: #222;
 }
 
+#Deck3, #Deck4 {
+  border-top-width: 0;
+}
+
 #Sampler {
-  border: 1px solid #222;
+  border-style: solid;
+  border-color: #222;
+  border-width: 0px 1px;
+}
+
+#SamplerMiddleSpacer {
+  /* FIXME */
+  border-style: solid;
+  border-color: #222;
+  border-width: 1px 0px;
+}
+
+#SamplerRow1,
+#SamplerRow2,
+#SamplerRow3,
+#SamplerRow4,
+#SamplerRow6,
+#SamplerRow7,
+#SamplerRow8 {
+  border-top: 1px solid #222;
+}
+
+#SamplerRow5 {
+  border-top: 2px solid #222;
 }
 
 /*******************************************************************************
@@ -295,22 +314,30 @@ QTreeView::branch:open:has-children:has-siblings {
   height: 6px;
 }
 
-/* QSplitter between LibrarySidebar and CoverArt */
-#LibraryCoverArtSplitter::handle {
+/* vertical splitters */
+#LibraryCoverArtSplitter::handle,
+#LibraryVerticalSplitter::handle,
+#DeckSplitter::handle {
   image: url(skin:/image/style_handle_vertical_unchecked.svg);
   background: none;
 }
 
-#LibraryCoverArtSplitter::handle:pressed {
+#LibraryCoverArtSplitter::handle:pressed,
+#LibraryVerticalSplitter::handle:pressed,
+#DeckSplitter::handle:pressed {
   image: url(skin:/image/style_handle_vertical_checked.svg);
   background: none;
 }
 
-#LibraryCoverArtSplitter::handle:horizontal {
+#LibraryCoverArtSplitter::handle:horizontal,
+#LibraryVerticalSplitter::handle:horizontal,
+#DeckSplitter::handle:horizontal {
   width: 6px;
 }
 
-#LibraryCoverArtSplitter::handle:vertical {
+#LibraryCoverArtSplitter::handle:vertical,
+#LibraryVerticalSplitter::handle:vertical,
+#DeckSplitter::handle::vertical {
   height: 6px;
 }
 
@@ -533,6 +560,7 @@ QScrollBar::sub-line:horizontal, QScrollBar::sub-line:vertical {
 
 #SkinSettingsTop {
   margin: 7px 4px 6px 6px;
+  border-bottom: 1px solid #A9A9A9;
 }
 
 #SkinSettingsTop > #h1 {
@@ -547,7 +575,7 @@ QScrollBar::sub-line:horizontal, QScrollBar::sub-line:vertical {
   text-align: left;
   color: #d2d2d2;
   background-color: none;
-  margin: 0.2em;
+  margin: 0 0.2em .1em 0;
   border-top: none;
   border-bottom: 1px solid #A9A9A9;
 }
@@ -556,7 +584,7 @@ QScrollBar::sub-line:horizontal, QScrollBar::sub-line:vertical {
   font: 12px/14px;
   background-color: none;
   text-align: left;
-  margin: 0.5em;
+  margin: .05em 0.5em;
 }
 
 #SkinSettings > #h3 WPushButton {
@@ -586,12 +614,16 @@ WWidget, QLabel {
 }
 
 /* Start spacing for Deck overview row (small waveform, option grid) */
-#OptionGrid {
+#OptionGrid, #ButtonGrid {
   background-color: #333333;
   padding: 1px;
   qproperty-layoutSpacing: 2;
 }
 
+#ButtonGrid {
+  qproperty-layoutSpacing: 2;
+}
+
 #OptionGridRow1, #OptionGridRow2 {
   qproperty-layoutSpacing: 2;
 }
@@ -608,13 +640,7 @@ WWidget, QLabel {
 }
 
 /* Start spacing for Deck inner column (tempo slider, rate change) */
-#Deck1InnerColumn, #Deck3InnerColumn {
-  background-color: #333333;
-  padding: 4px;
-  qproperty-layoutSpacing: 2;
-}
-
-#Deck2InnerColumn, #Deck4InnerColumn {
+#DeckRateSliderColumn {
   background-color: #333333;
   padding: 4px;
   qproperty-layoutSpacing: 2;
@@ -627,39 +653,79 @@ WWidget, QLabel {
 
 
 /* Start spacing for Deck controls row (transport, beatgrid, looping, hotcue, vinylcontrol) */
-#ControlsRow {
-  qproperty-layoutSpacing: 5;
+
+#FullControlsRow, #MinimalControlsContainer {
+  qproperty-layoutSpacing: 3;
+  qproperty-layoutAlignment: 'AlignBottom';
 }
 
-#HotcueGrid, #HotcueGridExtended {
+#BeatjumpContainer, #LoopContainer,
+#HotcueGrid, #HotcueGridExtended,
+#VinylControlsContainer {
   background-color: #333333;
   padding: 1px;
   qproperty-layoutSpacing: 2;
 }
-#HotcueGridExtendedRow1, #HotcueGridExtendedRow1 {
-  qproperty-layoutSpacing: 2;
-}
 
-#HotcueGrid WWidgetGroup, #HotcueGridExtended WWidgetGroup {
+#BeatjumpContainer WWidgetGroup,
+#LoopContainer WWidgetGroup, #LoopButtons, #LoopButtons WWidgetGroup,
+#HotcueGrid WWidgetGroup, #HotcueGridExtended WWidgetGroup,
+#VinylControlsContainer WWidgetGroup {
   qproperty-layoutSpacing: 2;
 }
 
-#HotcueGrid WPushButton, #HotcueGridExtended WPushButton {
-}
+WBeatSpinBox {
+  color: #c1cabe;
+  background-color: #1f1e1e;
 
+  border: 1px solid #444342;
+  border-radius: 3px;
 
-#LoopingContainer, #BeatLoopContainer, #TransportContainer, #VinylControlsContainer {
-  background-color: #333333;
-  padding: 1px;
-  qproperty-layoutSpacing: 2;
-}
+  padding: 2px;
 
-#LoopingContainer WWidgetGroup, #BeatLoopContainer WWidgetGroup, #TransportContainer WWidgetGroup, #VinylControlsContainer WWidgetGroup {
-  qproperty-layoutSpacing: 2;
+  font: 15px;
 }
 
-#LoopingContainer WPushButton, #BeatLoopContainer WPushButton, #TransportContainer WPushButton, #VinylControlsContainer WPushButton {
-}
+  WBeatSpinBox:hover {
+    border: 1px ridge #015d8d;
+  }
+
+  WBeatSpinBox::down-button {
+    subcontrol-origin: border;
+    subcontrol-position: bottom right; /* position at the top right corner */
+    padding-right: 4px;
+    padding-top: -3px;
+    border: 0;
+  }
+
+  WBeatSpinBox::down-arrow {
+    width: 9px;
+    height: 7px;
+    image: url(skin:/icon/ic_chevron_down_selector.svg);
+  }
+
+  WBeatSpinBox::down-arrow:hover {
+    image: url(skin:/icon/ic_chevron_down_selector_hover.svg);
+  }
+
+  WBeatSpinBox::up-button {
+    subcontrol-origin: border;
+    subcontrol-position: top right; /* position at the top right corner */
+    padding-right: 4px;
+    padding-bottom: -3px;
+    border: 0;
+  }
+
+  WBeatSpinBox::up-arrow {
+    width: 9px;
+    height: 7px;
+    image: url(skin:/icon/ic_chevron_up_selector.svg);
+  }
+
+  WBeatSpinBox::up-arrow:hover {
+    image: url(skin:/icon/ic_chevron_up_selector_hover.svg);
+  }
+
 /* End spacing for Deck controls row */
 
 /* Start spacing for toolbar */
@@ -669,6 +735,14 @@ WWidget, QLabel {
   background-color: #111111;
 }
 
+#ToolBarLeft {
+  qproperty-layoutSpacing: 0;
+}
+
+#ToolBarRight {
+  qproperty-layoutSpacing: 12;
+}
+
 #NotificationsContainer {
   qproperty-layoutSpacing: 4;
 }
@@ -679,9 +753,6 @@ WWidget, QLabel {
     margin-top: 1px;
 }
 
-#HeadphoneControls {
-    margin-right: 30px;
-}
 /* End spacing for toolbar */
 
 #Time {
@@ -689,7 +760,7 @@ WWidget, QLabel {
 }
 
 #KnobLabelH, #HeadSplit {
-  font: bold 10px;
+  font: bold 11px;
 }
 
 /* All widget groups that are children of #DeckRows should AlignTop. */
@@ -744,12 +815,6 @@ WWidget, QLabel {
   text-transform: none;
 }
 
-#SamplerTextRow #ArtistGutter WLabel, #SamplerTextRow #BPMGutter WLabel, #SamplerTextRow #PositionGutter WLabel {
-  font-weight: bold;
-  font-size: 11px;
-  text-transform: none;
-}
-
 #BPMGutter WLabel, #PositionGutter WLabel {
   qproperty-alignment: 'AlignRight | AlignVCenter';
 }
@@ -761,14 +826,14 @@ WWidget, QLabel {
   text-align: left;
 }
 
-#SamplerTextRow #TitleGutter WLabel {
+#SamplerTopRowInner WLabel {
   font-weight: bold;
-  font-size: 13px;
+  font-size: 15px;
   text-transform: none;
   text-align: left;
 }
 
-#EffectRackCollapsed #EffectUnitNameContainer WLabel {
+#EffectUnitLabel, #EffectRackCollapsed #EffectUnitNameContainer WLabel {
   font-weight: bold;
   font-size: 15px;
   text-transform: none;
@@ -814,17 +879,6 @@ WWidget, QLabel {
   qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
 }
 
-#EffectUnitNextPrevContainer {
-  background-color: #333333;
-  padding: 1px;
-  qproperty-layoutSpacing: 2;
-  qproperty-layoutAlignment: 'AlignRight | AlignVCenter';
-}
-
-#EffectUnitNextPrevContainer WPushButton {
-  font-size: 11px;
-}
-
 #EffectMetaKnobControls > WPushButton {
   qproperty-alignment: 'AlignHCenter';
 }
@@ -859,8 +913,8 @@ WEffectSelector {
   /* The 3D frame on the combo box becomes flat when you give it a border */
   border: 1px solid #444342;
   border-radius: 3px;
-  
-  font: 12px;
+
+  font: 15px;
 }
 
   WEffectSelector:hover {
@@ -895,8 +949,8 @@ WEffectSelector {
   background-color: none;
   border: none;
   qproperty-alignment: 'AlignHCenter';
-  font: 9px;
-  margin-top: -3px;
+  font: 10px;
+  margin-top: -2px;
 }
 
 #SmallKnobLabel {
@@ -950,7 +1004,7 @@ WEffectSelector {
   qproperty-layoutSpacing: 0;
 }
 
-#MainDeckContainer {
+#MainDecks, #MainDeckContainer {
   background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
                                     stop: 0 #333333,
                                     stop: 1.0 #333333);
@@ -977,60 +1031,89 @@ WEffectSelector {
 WWidget, WLabel {
   /* All labels should default to a grey that is readable on black. */
   color: #D2D2D2;
+  font-size: 12px;
 }
 
 /* Track text, etc. should be in the deck color. */
-#Deck1 WLabel {
+#Deck1 WLabel, #Deck2 WLabel, #Deck3 WLabel, #Deck4 WLabel {
   color: #D2D2D2;
 }
 
-#DeckMixer1 {
+#DeckMixer1, #DeckMixer2, #DeckMixer3, #DeckMixer4 {
   background-color: #333333;
 }
 
-/* Track text, etc. should be in the deck color. */
-#Deck2 WLabel {
-  color: #D2D2D2;
+WNumberRate {
+  font-size: 13px;
 }
-
-#DeckMixer2 {
-  background-color: #333333;
+#RateDisplay1, #RateDisplay2, #RateDisplay3, #RateDisplay4 {
+  qproperty-layoutAlignment: 'AlignHCenter';
 }
 
-#Deck3 WLabel {
-  color: #D2D2D2;
+#DeckMixer1_Column2, #DeckMixer2_Column2, #DeckMixer3_Column2, #DeckMixer4_Column2 {
+  qproperty-layoutSpacing: 5;
 }
 
-#DeckMixer3 {
-  background-color: #333333;
+#CircleButton {
+  border: 3px solid #333333;
+  border-radius: 2px;
 }
 
-#Deck4 WLabel {
-  color: #D2D2D2;
+#SmallCircleButton {
+  border: 2px solid #333333;
+  border-radius: 1px;
 }
 
-#DeckMixer4 {
-  background-color: #333333;
+#DeckControlsSplitWaveforms4Decks #channel_VuMeter_Group,
+#DeckControlsStackedWaveforms4Decks #channel_VuMeter_Group {
+  padding-bottom: 5px;
 }
 
-#DeckMixer1_Column2, #DeckMixer2_Column2, #DeckMixer3_Column2,
-#DeckMixer4_Column2 {
-  qproperty-layoutSpacing: 7;
+#DeckMixer1_ColumnCondensed, #DeckMixer2_ColumnCondensed, #DeckMixer3_ColumnCondensed,
+#DeckMixer4_ColumnCondensed {
   padding: 5;
   qproperty-layoutAlignment: 'AlignHCenter';
 }
 
-#4DecksMixerCol2Container {
+/* pad 4 deck mixer colums left/right
+to avoid EQ kill buttons from shifting center of rest of column */
+#4DecksMixerCol2ContainerRight,
+#CondensedButtonContainerRight {
+  padding-right: 14px;
+}
+#4DecksMixerCol2ContainerLeft,
+#CondensedButtonContainerLeft {
   padding-left: 14px;
 }
 
+#4DecksMixerCondensedMonoMeterLeft {
+  padding-left: 2px;
+  padding-right: 4px;
+}
+#4DecksMixerCondensedMonoMeterRight {
+  padding-left: 4px;
+  padding-right: 2px;
+}
+
+#CondensedVolumeAndMonoMeter {
+  padding-bottom: 5px;
+}
+
 #channel_VuMeter_Group {
   qproperty-layoutSpacing: 3;
   qproperty-layoutAlignment: 'AlignHCenter';
 }
 
+#master_VuMeter_Group {
+  qproperty-layoutSpacing: 3;
+  qproperty-layoutAlignment: 'AlignHCenter';
+  padding-left: 5px;
+  padding-right: 5px;
+}
+
 #MasterVumeter {
-  qproperty-layoutSpacing: 2;
+  qproperty-layoutSpacing: 3;
+  qproperty-layoutAlignment: 'AlignHCenter';
   padding-left: 10px;
   padding-right: 10px;
 }
@@ -1065,12 +1148,32 @@ WStarRating {
   background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
                                     stop: 0 #333333,
                                     stop: 1.0 #333333);
+  qproperty-layoutSpacing: 6;
+}
+
+#MicLabelContainer,
+#DuckingLabelContainer {
+  qproperty-layoutAlignment: 'AlignHCenter';
 }
 
-#MicrophoneContainer {
+#MicrophoneContainer, #MicDuckingContainer, #AuxiliaryContainer {
+  padding: 2px 5px;
+  margin: 2px 0px;
+  border: 3px solid #222222;
 }
 
-#AuxiliaryContainer {
+#MicrophoneContainer, #AuxiliaryContainer,
+#MicrophoneControlButtons, #AuxiliaryControlButtons,
+#MicDuckingControls {
+  qproperty-layoutSpacing: 3;
+}
+
+#MicrophoneControls, #AuxiliaryControls {
+  qproperty-layoutSpacing: 4;
+}
+
+#MicrophoneButtonsAndMeter, #AuxiliaryButtonsAndMeter {
+  qproperty-layoutSpacing: 3;
 }
 
 #LibraryContainer {
@@ -1093,24 +1196,31 @@ WStarRating {
 }
 
 #EffectUnitEffectsNoParameters {
-  qproperty-layoutSpacing: 40;
+  qproperty-layoutSpacing: 30;
 }
 
-#EffectUnitEffects, #EffectUnitParameters {
+#EffectUnitEffects {
   padding: 2px;
   qproperty-layoutAlignment: 'AlignLeft | AlignTop';
   qproperty-layoutSpacing: 2;
 }
 
+#EffectUnitParameters {
+  padding: 0 2px;
+  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
+  qproperty-layoutSpacing: 2;
+}
+
 #EffectUnitControls {
   padding: 2px;
   qproperty-layoutAlignment: 'AlignRight | AlignTop';
   qproperty-layoutSpacing: 2;
 }
 
-#EffectUnitGroupControls {
-  qproperty-layoutAlignment: 'AlignRight | AlignTop';
-  qproperty-layoutSpacing: 1;
+#EffectUnitGroupControlsLeft,
+#EffectUnitGroupControlsRight,
+#EffectUnitGroupControlsInputs {
+  qproperty-layoutSpacing: 2;
 }
 
 #EffectUnit {
@@ -1129,6 +1239,23 @@ WStarRating {
   qproperty-layoutSpacing: 2;
 }
 
+#SamplerTopRowOuter {
+  padding: 2px;
+}
+
+#SamplerTopRowInner {
+  qproperty-layoutSpacing: 2;
+}
+
+#SamplerBankGrid {
+  qproperty-layoutSpacing: 2;
+}
+
+#SamplerExpansion {
+  padding: 2px;
+  qproperty-layoutSpacing: 2;
+}
+
 #SampleDecksExpanded, #SampleDecksCollapsed {
   qproperty-layoutAlignment: 'AlignLeft | AlignTop';
 }
@@ -1152,19 +1279,17 @@ WWidgetGroup {
 
 WPushButton {
     color: #D2D2D2;
-    background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0,
-                                      stop: 0 #4B4B4B,
-                                      stop: 1 #4B4B4B);
+    background-color: #4B4B4B;
     border: 1px solid #4B4B4B;
     border-radius: 2px;
     outline: none;
+    font-size: 12px;
+    font-weight: bold;
 }
 
 WPushButton:hover {
     color: #D2D2D2;
-    background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0,
-                                      stop: 0 #5F5F5F,
-                                      stop: 1 #5F5F5F);
+    background-color: #5F5F5F;
     border: 0px solid #5F5F5F;
 }
 
@@ -1172,17 +1297,13 @@ WPushButton:hover {
 WPushButton[value="1"] {
     /*color: #FDFDFD;*/
     color: #FDFDFD;
-    background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0,
-                                      stop: 0 #006596,
-                                      stop: 1 #006596);
+    background-color: #006596;
     border: 0px solid #006596;
 }
 
 WPushButton[value="1"]:hover {
     color: #FDFDFD;
-    background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0,
-                                      stop: 0 #0080bE,
-                                      stop: 1 #0080BE);
+    background-color: #0080BE;
     border: 0px solid #0080BE;
 }
 
@@ -1193,20 +1314,30 @@ WPushButton[value="1"]:hover {
 */
 WPushButton[value="2"] {
     color: #FDFDFD;
-    background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0,
-                                      stop: 0 #006596,
-                                      stop: 1 #006596);
+    background-color: #4B4B4B;
     border: 0px solid #006596;
 }
 
 WPushButton[value="2"]:hover {
     color: #FDFDFD;
-    background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0,
-                                      stop: 0 #0080BE,
-                                      stop: 1 #0080BE);
+    background-color: #4B4B4B;
     border: 0px solid #0080BE;
 }
 
+#ToolbarButton[value="1"] {
+    color: #D2D2D2;
+    background-color: #5a5a5a;
+    border: 3px solid #006596;
+    border-radius: 3px;
+}
+
+#SkinSectionToggleButton[value="1"]:hover {
+    color: #D2D2D2;
+    background-color: #5F5F5F;
+    border: 3px solid #0080BE;
+    border-radius: 3px;
+}
+
 /* Special case "orientation" controls
   1 -- center / default (off)
   2 -- right
@@ -1214,9 +1345,7 @@ WPushButton[value="2"]:hover {
 */
 #OrientationButton[value="1"] {
     color: #D2D2D2;
-    background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0,
-                                      stop: 0 #4B4B4B,
-                                      stop: 1 #4B4B4B);
+    background-color: #4B4B4B;
     border: 1px solid #4B4B4B;
     border-radius: 2px;
     outline: none;
@@ -1224,44 +1353,51 @@ WPushButton[value="2"]:hover {
 
 #OrientationButton:hover {
     color: #D2D2D2;
-    background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0,
-                                      stop: 0 #5F5F5F,
-                                      stop: 1 #5F5F5F);
+    background-color: #5F5F5F;
     border: 0px solid #5F5F5F;
 }
 
 #OrientationButton[value="2"] {
     color: #FDFDFD;
-    background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0,
-                                      stop: 0 #006596,
-                                      stop: 1 #006596);
+    background-color: #006596;
     border: 0px solid #006596;
 }
 
 #OrientationButton[value="2"]:hover {
     color: #FDFDFD;
-    background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0,
-                                      stop: 0 #0080BE,
-                                      stop: 1 #0080BE);
+    background-color: #0080BE;
     border: 0px solid #0080BE;
 }
 
 #OrientationButton[value="0"] {
     color: #FDFDFD;
-    background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0,
-                                      stop: 0 #006596,
-                                      stop: 1 #006596);
+    background-color: #006596;
     border: 0px solid #006596;
 }
 
 #OrientationButton[value="0"]:hover {
     color: #FDFDFD;
-    background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0,
-                                      stop: 0 #0080BE,
-                                      stop: 1 #0080BE);
+    background-color: #0080BE;
     border: 0px solid #0080BE;
 }
 
+/* Special case SamplerPlayButtonRepeating controls
+  When sampler is playing, displays same play icon as normal, but
+  background is red instead of blue.
+*/
+
+#SamplerPlayButtonRepeating[value="1"] {
+    color: #711ada;
+    background-color: #711ada;
+    border: 0px solid #711ada;
+}
+
+#SamplerPlayButtonRepeating[value="1"]:hover {
+    color: #8b32ff;
+    background-color: #8b32ff;
+    border: 0px solid #8b32ff;
+}
+
 /* Special case link_type button for effect parameters
   0 -- not linked / default (off)
   1 -- linked (on)
@@ -1403,18 +1539,10 @@ WPushButton[value="2"]:hover {
   border: none;
 }
 
-#DeckCue {
+#BeatJumpValue, #LoopMoveValue, #HotcueButton, #DeckCue, #DeckSync, #BeatsyncButton {
   font: bold 12px;
 }
 
-#DeckSync {
-  font: bold 10px;
-}
-
-#BeatJumpValue, #BeatLoopButton, #LoopMoveValue, #HotcueButton {
-  font: bold 9px;
-}
-
 /*******************************************************************************
  ** End Buttons  ***************************************************************
  *******************************************************************************/
diff --git a/res/skins/Deere/tool_bar.xml b/res/skins/Deere/tool_bar.xml
index 61ba49915bec..185535531f51 100644
--- a/res/skins/Deere/tool_bar.xml
+++ b/res/skins/Deere/tool_bar.xml
@@ -7,295 +7,355 @@
   <WidgetGroup>
     <ObjectName>ToolBar</ObjectName>
     <Layout>horizontal</Layout>
-    <SizePolicy>me,f</SizePolicy>
+    <SizePolicy>min,f</SizePolicy>
     <Children>
+
       <WidgetGroup>
-        <ObjectName>NotificationsContainer</ObjectName>
+        <ObjectName>ToolBarLeft</ObjectName>
         <Layout>horizontal</Layout>
+        <SizePolicy>max,min</SizePolicy>
         <Children>
-          <!--
-            Disable the recording button for now. You can start and stop recording from the library.
-            Additionally we now have a statuslight in the toolbars notification section, see below.
-            Re-enable this working button if you like (jus 2015-06)
-
-          <PushButton>
-            <TooltipId></TooltipId>
-            <Tooltip>Start / Stop recording</Tooltip>
-            <Size>20f,20f</Size>
-            <NumberStates>3</NumberStates>
-            <State>
-              <Number>0</Number>
-              <Text></Text>
-              <Pressed scalemode="STRETCH_ASPECT">icon/ic_record_48px.svg</Pressed>
-              <Unpressed scalemode="STRETCH_ASPECT">icon/ic_record_48px.svg</Unpressed>
-            </State>
-            <State>
-              <Number>1</Number>
-              <Text></Text>
-              <Pressed scalemode="STRETCH_ASPECT">icon/ic_record_48px.svg</Pressed>
-              <Unpressed scalemode="STRETCH_ASPECT">icon/ic_record_48px.svg</Unpressed>
-            </State>
-            <State>
-              <Number>2</Number>
-              <Text></Text>
-              <Pressed scalemode="STRETCH_ASPECT">icon/ic_record_48px.svg</Pressed>
-              <Unpressed scalemode="STRETCH_ASPECT">icon/ic_record_48px.svg</Unpressed>
-            </State>
-            <Connection>
-              <ConfigKey>[Recording],toggle_recording</ConfigKey>
-              <ButtonState>LeftButton</ButtonState>
-            </Connection>
-            <Connection>
-              <ConfigKey>[Recording],status</ConfigKey>
-            </Connection>
-          </PushButton>
-          -->
-
-          <Template src="skin:statuslight_3state.xml">
-           <SetVariable name="TooltipId"></SetVariable>
-           <SetVariable name="Tooltip">Recording active</SetVariable>
-            <SetVariable name="ObjectName">RecordingNotification</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-            <SetVariable name="state_0">icon/ic_recording_32px.svg</SetVariable>
-            <SetVariable name="state_1">icon/ic_recording_32px.svg</SetVariable>
-            <SetVariable name="state_2">icon/ic_recording_32px.svg</SetVariable>
-            <SetVariable name="left_connection_control">[Recording],status</SetVariable>
-          </Template>
 
-          <!--
-            You could map the ``[AutoDJ],enabled`` control to a button, and start/stop AutoDJ from anywhere in the GUI,
-            but using the ``Enable AutoDJ`` button in the library is preferable. Reason is only that button guards
-            against enabling AutoDj with an empty queue. You would throw off button states easily. So we stick with
-            just displaying the AutoDJ status here.
-          -->
-          <Template src="skin:statuslight_3state.xml">
-           <SetVariable name="TooltipId"></SetVariable>
-           <SetVariable name="Tooltip">AutoDJ active</SetVariable>
-            <SetVariable name="ObjectName">AutoDjNotification</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-            <SetVariable name="state_0">icon/ic_autodj_32px.svg</SetVariable>
-            <SetVariable name="state_1">icon/ic_autodj_32px.svg</SetVariable>
-            <SetVariable name="state_2">icon/ic_autodj_32px.svg</SetVariable>
-            <SetVariable name="left_connection_control">[AutoDJ],enabled</SetVariable>
-          </Template>
-
-          <!--
-            No control for enabling Shoutcast available, see https://bugs.launchpad.net/mixxx/+bug/1432647
-            Display only status for now.
-          -->
-          <Template src="skin:statuslight_3state.xml">
-           <SetVariable name="TooltipId"></SetVariable>
-           <SetVariable name="Tooltip">Live Broadcasting active</SetVariable>
-            <SetVariable name="ObjectName">LiveBroadcastingNotification</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-            <SetVariable name="state_0">icon/ic_broadcast_32px.svg</SetVariable>
-            <SetVariable name="state_1">icon/ic_broadcast_32px.svg</SetVariable>
-            <SetVariable name="state_2">icon/ic_broadcast_32px.svg</SetVariable>
-            <SetVariable name="left_connection_control">[Shoutcast],status</SetVariable>
-          </Template>
-
-          <Template src="skin:statuslight_3state.xml">
-           <SetVariable name="TooltipId">vinylcontrol_status</SetVariable>
-           <SetVariable name="Tooltip">Vinyl Control 1 active</SetVariable>
-            <SetVariable name="ObjectName">VinylControlNotification</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-            <SetVariable name="state_0">icon/ic_vinylcontrol_1_32px.svg</SetVariable>
-            <SetVariable name="state_1">icon/ic_vinylcontrol_2_32px.svg</SetVariable>
-            <SetVariable name="state_2">icon/ic_vinylcontrol_3_32px.svg</SetVariable>
-            <SetVariable name="left_connection_control">[Channel1],vinylcontrol_status</SetVariable>
-          </Template>
-
-          <Template src="skin:statuslight_3state.xml">
-           <SetVariable name="TooltipId">vinylcontrol_status</SetVariable>
-           <SetVariable name="Tooltip">Vinyl Control 2 active</SetVariable>
-            <SetVariable name="ObjectName">VinylControlNotification</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-            <SetVariable name="state_0">icon/ic_vinylcontrol_1_32px.svg</SetVariable>
-            <SetVariable name="state_1">icon/ic_vinylcontrol_2_32px.svg</SetVariable>
-            <SetVariable name="state_2">icon/ic_vinylcontrol_3_32px.svg</SetVariable>
-            <SetVariable name="left_connection_control">[Channel2],vinylcontrol_status</SetVariable>
-          </Template>
+          <WidgetGroup>
+            <SizePolicy>me,min</SizePolicy>
+            <Layout>vertical</Layout>
+            <Children>
+              <Time>
+                <TooltipId>time</TooltipId>
+                <ObjectName>Time</ObjectName>
+                <Size>60f,20f</Size>
+                <ShowSeconds>false</ShowSeconds>
+              </Time>
 
-          <Template src="skin:statuslight_3state.xml">
-           <SetVariable name="TooltipId">vinylcontrol_status</SetVariable>
-           <SetVariable name="Tooltip">Vinyl Control 3 active</SetVariable>
-            <SetVariable name="ObjectName">VinylControlNotification</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-            <SetVariable name="state_0">icon/ic_vinylcontrol_1_32px.svg</SetVariable>
-            <SetVariable name="state_1">icon/ic_vinylcontrol_2_32px.svg</SetVariable>
-            <SetVariable name="state_2">icon/ic_vinylcontrol_3_32px.svg</SetVariable>
-            <SetVariable name="left_connection_control">[Channel3],vinylcontrol_status</SetVariable>
-          </Template>
+            <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>
 
-          <Template src="skin:statuslight_3state.xml">
-           <SetVariable name="TooltipId">vinylcontrol_status</SetVariable>
-           <SetVariable name="Tooltip">Vinyl Control 4 active</SetVariable>
-            <SetVariable name="ObjectName">VinylControlNotification</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-            <SetVariable name="state_0">icon/ic_vinylcontrol_1_32px.svg</SetVariable>
-            <SetVariable name="state_1">icon/ic_vinylcontrol_2_32px.svg</SetVariable>
-            <SetVariable name="state_2">icon/ic_vinylcontrol_3_32px.svg</SetVariable>
-            <SetVariable name="left_connection_control">[Channel4],vinylcontrol_status</SetVariable>
+          <Template src="skin:spacer_hx.xml">
+            <SetVariable name="width">15</SetVariable>
           </Template>
-        </Children>
-      </WidgetGroup>
 
-      <Template src="skin:spacer_h.xml"></Template>
+          <WidgetGroup>
+            <ObjectName>HeadphoneControls</ObjectName>
+            <SizePolicy>me,min</SizePolicy>
+            <Layout>horizontal</Layout>
+            <Children>
 
-      <WidgetGroup>
-        <ObjectName>HeadphoneControls</ObjectName>
-        <SizePolicy>min,min</SizePolicy>
-        <Layout>horizontal</Layout>
-        <Children>
-          <Template src="skin:knob_label_horizontal.xml">
-            <SetVariable name="TooltipId">headMix</SetVariable>
-            <SetVariable name="group">[Master]</SetVariable>
-            <SetVariable name="control">headMix</SetVariable>
-            <SetVariable name="color">blue</SetVariable>
-            <SetVariable name="label">Head Mix</SetVariable>
-          </Template>
+              <Template src="skin:knob_toolbar.xml">
+                <SetVariable name="TooltipId">headMix</SetVariable>
+                <SetVariable name="group">[Master]</SetVariable>
+                <SetVariable name="control">headMix</SetVariable>
+                <SetVariable name="color">blue</SetVariable>
+                <SetVariable name="label">Head Mix</SetVariable>
+              </Template>
 
-          <Template src="skin:knob_label_horizontal.xml">
-            <SetVariable name="TooltipId">headphone_gain</SetVariable>
-            <SetVariable name="group">[Master]</SetVariable>
-            <SetVariable name="control">headGain</SetVariable>
-            <SetVariable name="color">red</SetVariable>
-            <SetVariable name="label">Head Gain</SetVariable>
-          </Template>
+              <Template src="skin:knob_toolbar.xml">
+                <SetVariable name="TooltipId">headphone_gain</SetVariable>
+                <SetVariable name="group">[Master]</SetVariable>
+                <SetVariable name="control">headGain</SetVariable>
+                <SetVariable name="color">red</SetVariable>
+                <SetVariable name="label">Head Gain</SetVariable>
+              </Template>
 
-          <PushButton>
-            <TooltipId>headSplit</TooltipId>
-            <ObjectName>HeadSplit</ObjectName>
-            <Size>55f,20f</Size>
-            <NumberStates>2</NumberStates>
-            <State>
-              <Number>0</Number>
-              <Text>Split Cue</Text>
-            </State>
-            <State>
-              <Number>1</Number>
-              <Text>Split Cue</Text>
-            </State>
-            <Connection>
-              <ConfigKey>[Master],headSplit</ConfigKey>
-              <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-            </Connection>
-          </PushButton>
-        </Children>
-      </WidgetGroup>
+              <Template src="skin:left_2state_button.xml">
+                <SetVariable name="TooltipId">headSplit</SetVariable>
+                <SetVariable name="MinimumSize">65,22</SetVariable>
+                <SetVariable name="MaximumSize">65,22</SetVariable>
+                <SetVariable name="SizePolicy"><Variable name="ToolbarButtonSizePolicy"/></SetVariable>
+                <SetVariable name="ObjectName">ToolbarButton</SetVariable>
+                <SetVariable name="state_0_text">SPLIT CUE</SetVariable>
+                <SetVariable name="state_1_text">SPLIT CUE</SetVariable>
+                <SetVariable name="left_connection_control">[Master],headSplit</SetVariable>
+              </Template>
 
-      <WidgetGroup>
-        <ObjectName>MasterControls</ObjectName>
-        <SizePolicy>min,min</SizePolicy>
-        <Layout>horizontal</Layout>
-        <Children>
-          <Template src="skin:knob_label_horizontal.xml">
-            <SetVariable name="TooltipId">balance</SetVariable>
-            <SetVariable name="group">[Master]</SetVariable>
-            <SetVariable name="control">balance</SetVariable>
-            <SetVariable name="color">blue</SetVariable>
-            <SetVariable name="label">Balance</SetVariable>
-          </Template>
+            </Children>
+          </WidgetGroup>
 
-          <Template src="skin:knob_label_horizontal.xml">
-            <SetVariable name="TooltipId">master_gain</SetVariable>
-            <SetVariable name="group">[Master]</SetVariable>
-            <SetVariable name="control">gain</SetVariable>
-            <SetVariable name="color">red</SetVariable>
-            <SetVariable name="label">Gain</SetVariable>
+          <Template src="skin:spacer_hx.xml">
+            <SetVariable name="width">15</SetVariable>
           </Template>
-        </Children>
-      </WidgetGroup>
 
-      <WidgetGroup>
-        <ObjectName>MasterVumeter</ObjectName>
-        <Size>-1me,22min</Size>
-        <MaximumSize>110,-1</MaximumSize>
-        <Layout>vertical</Layout>
-        <Children>
           <WidgetGroup>
-            <Layout>vertical</Layout>
-            <MaximumSize>110,22</MaximumSize>
+            <ObjectName>MasterControls</ObjectName>
+            <SizePolicy>min,min</SizePolicy>
+            <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:vumeter_h.xml">
+              <Template src="skin:knob_toolbar.xml">
+                <SetVariable name="TooltipId">balance</SetVariable>
                 <SetVariable name="group">[Master]</SetVariable>
-                <SetVariable name="side">L</SetVariable>
-                <SetVariable name="tooltip_meter">master_VuMeterL</SetVariable>
-                <SetVariable name="tooltip_clip">master_PeakIndicatorL</SetVariable>
+                <SetVariable name="control">balance</SetVariable>
+                <SetVariable name="color">blue</SetVariable>
+                <SetVariable name="label">Balance</SetVariable>
               </Template>
-              <Template src="skin:vumeter_h.xml">
+
+              <Template src="skin:knob_toolbar.xml">
+                <SetVariable name="TooltipId">master_gain</SetVariable>
                 <SetVariable name="group">[Master]</SetVariable>
-                <SetVariable name="side">R</SetVariable>
-                <SetVariable name="tooltip_meter">master_VuMeterR</SetVariable>
-                <SetVariable name="tooltip_clip">master_PeakIndicatorR</SetVariable>
+                <SetVariable name="control">gain</SetVariable>
+                <SetVariable name="color">red</SetVariable>
+                <SetVariable name="label">Gain</SetVariable>
               </Template>
+
             </Children>
           </WidgetGroup>
-        </Children>
-      </WidgetGroup>
 
-      <WidgetGroup>
-        <ObjectName></ObjectName>
-        <SizePolicy>min,min</SizePolicy>
-        <Layout>vertical</Layout>
-        <Children>
-          <Time>
-            <TooltipId>time</TooltipId>
-            <ObjectName>Time</ObjectName>
-            <Size>60f,20f</Size>
-            <ShowSeconds>false</ShowSeconds>
-          </Time>
-
-         <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>
 
+
+      <Template src="skin:spacer_h.xml"/>
+
       <WidgetGroup>
+        <ObjectName>ToolBarRight</ObjectName>
+        <Layout>horizontal</Layout>
         <SizePolicy>min,min</SizePolicy>
-        <Layout>vertical</Layout>
         <Children>
+          <WidgetGroup>
+            <ObjectName>NotificationsContainer</ObjectName>
+            <Layout>horizontal</Layout>
+            <Children>
+              <!--
+                Disable the recording button for now. You can start and stop recording from the library.
+                Additionally we now have a statuslight in the toolbars notification section, see below.
+                Re-enable this working button if you like (jus 2015-06)
+
+              <PushButton>
+                <TooltipId></TooltipId>
+                <Tooltip>Start / Stop recording</Tooltip>
+                <Size>20f,20f</Size>
+                <NumberStates>3</NumberStates>
+                <State>
+                  <Number>0</Number>
+                  <Text></Text>
+                  <Pressed scalemode="STRETCH_ASPECT">icon/ic_record_48px.svg</Pressed>
+                  <Unpressed scalemode="STRETCH_ASPECT">icon/ic_record_48px.svg</Unpressed>
+                </State>
+                <State>
+                  <Number>1</Number>
+                  <Text></Text>
+                  <Pressed scalemode="STRETCH_ASPECT">icon/ic_record_48px.svg</Pressed>
+                  <Unpressed scalemode="STRETCH_ASPECT">icon/ic_record_48px.svg</Unpressed>
+                </State>
+                <State>
+                  <Number>2</Number>
+                  <Text></Text>
+                  <Pressed scalemode="STRETCH_ASPECT">icon/ic_record_48px.svg</Pressed>
+                  <Unpressed scalemode="STRETCH_ASPECT">icon/ic_record_48px.svg</Unpressed>
+                </State>
+                <Connection>
+                  <ConfigKey>[Recording],toggle_recording</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+                <Connection>
+                  <ConfigKey>[Recording],status</ConfigKey>
+                </Connection>
+              </PushButton>
+              -->
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Connection>
+                  <ConfigKey>[Recording],status</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+                <Children>
+                  <RecordingDuration/>
+                </Children>
+              </WidgetGroup>
+
+              <Template src="skin:statuslight_3state.xml">
+                <SetVariable name="TooltipId"></SetVariable>
+                <SetVariable name="Tooltip">Recording active</SetVariable>
+                <SetVariable name="ObjectName">RecordingNotification</SetVariable>
+                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                <SetVariable name="state_0">icon/ic_recording_32px.svg</SetVariable>
+                <SetVariable name="state_1">icon/ic_recording_32px.svg</SetVariable>
+                <SetVariable name="state_2">icon/ic_recording_32px.svg</SetVariable>
+                <SetVariable name="left_connection_control">[Recording],status</SetVariable>
+              </Template>
+
+              <!--
+                You could map the ``[AutoDJ],enabled`` control to a button, and start/stop AutoDJ from anywhere in the GUI,
+                but using the ``Enable AutoDJ`` button in the library is preferable. Reason is only that button guards
+                against enabling AutoDj with an empty queue. You would throw off button states easily. So we stick with
+                just displaying the AutoDJ status here.
+              -->
+              <Template src="skin:statuslight_3state.xml">
+                <SetVariable name="TooltipId"></SetVariable>
+                <SetVariable name="Tooltip">AutoDJ active</SetVariable>
+                <SetVariable name="ObjectName">AutoDjNotification</SetVariable>
+                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                <SetVariable name="state_0">icon/ic_autodj_32px.svg</SetVariable>
+                <SetVariable name="state_1">icon/ic_autodj_32px.svg</SetVariable>
+                <SetVariable name="state_2">icon/ic_autodj_32px.svg</SetVariable>
+                <SetVariable name="left_connection_control">[AutoDJ],enabled</SetVariable>
+              </Template>
+
+              <!--
+                No control for enabling Shoutcast available, see https://bugs.launchpad.net/mixxx/+bug/1432647
+                Display only status for now.
+              -->
+              <Template src="skin:statuslight_3state.xml">
+                <SetVariable name="TooltipId"></SetVariable>
+                <SetVariable name="Tooltip">Live Broadcasting active</SetVariable>
+                <SetVariable name="ObjectName">LiveBroadcastingNotification</SetVariable>
+                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                <SetVariable name="state_0">icon/ic_broadcast_32px.svg</SetVariable>
+                <SetVariable name="state_1">icon/ic_broadcast_32px.svg</SetVariable>
+                <SetVariable name="state_2">icon/ic_broadcast_32px.svg</SetVariable>
+                <SetVariable name="left_connection_control">[Shoutcast],status</SetVariable>
+              </Template>
+
+              <Template src="skin:statuslight_3state.xml">
+                <SetVariable name="TooltipId">vinylcontrol_status</SetVariable>
+                <SetVariable name="Tooltip">Vinyl Control 1 active</SetVariable>
+                <SetVariable name="ObjectName">VinylControlNotification</SetVariable>
+                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                <SetVariable name="state_0">icon/ic_vinylcontrol_1_32px.svg</SetVariable>
+                <SetVariable name="state_1">icon/ic_vinylcontrol_2_32px.svg</SetVariable>
+                <SetVariable name="state_2">icon/ic_vinylcontrol_3_32px.svg</SetVariable>
+                <SetVariable name="left_connection_control">[Channel1],vinylcontrol_status</SetVariable>
+              </Template>
+
+              <Template src="skin:statuslight_3state.xml">
+                <SetVariable name="TooltipId">vinylcontrol_status</SetVariable>
+                <SetVariable name="Tooltip">Vinyl Control 2 active</SetVariable>
+                <SetVariable name="ObjectName">VinylControlNotification</SetVariable>
+                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                <SetVariable name="state_0">icon/ic_vinylcontrol_1_32px.svg</SetVariable>
+                <SetVariable name="state_1">icon/ic_vinylcontrol_2_32px.svg</SetVariable>
+                <SetVariable name="state_2">icon/ic_vinylcontrol_3_32px.svg</SetVariable>
+                <SetVariable name="left_connection_control">[Channel2],vinylcontrol_status</SetVariable>
+              </Template>
+
+              <Template src="skin:statuslight_3state.xml">
+                <SetVariable name="TooltipId">vinylcontrol_status</SetVariable>
+                <SetVariable name="Tooltip">Vinyl Control 3 active</SetVariable>
+                <SetVariable name="ObjectName">VinylControlNotification</SetVariable>
+                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                <SetVariable name="state_0">icon/ic_vinylcontrol_1_32px.svg</SetVariable>
+                <SetVariable name="state_1">icon/ic_vinylcontrol_2_32px.svg</SetVariable>
+                <SetVariable name="state_2">icon/ic_vinylcontrol_3_32px.svg</SetVariable>
+                <SetVariable name="left_connection_control">[Channel3],vinylcontrol_status</SetVariable>
+              </Template>
+
+              <Template src="skin:statuslight_3state.xml">
+                <SetVariable name="TooltipId">vinylcontrol_status</SetVariable>
+                <SetVariable name="Tooltip">Vinyl Control 4 active</SetVariable>
+                <SetVariable name="ObjectName">VinylControlNotification</SetVariable>
+                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                <SetVariable name="state_0">icon/ic_vinylcontrol_1_32px.svg</SetVariable>
+                <SetVariable name="state_1">icon/ic_vinylcontrol_2_32px.svg</SetVariable>
+                <SetVariable name="state_2">icon/ic_vinylcontrol_3_32px.svg</SetVariable>
+                <SetVariable name="left_connection_control">[Channel4],vinylcontrol_status</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+          <Template src="skin:left_2state_button.xml">
+            <SetVariable name="MinimumSize"><Variable name="ToolbarButtonMinimumSize"/></SetVariable>
+            <SetVariable name="MaximumSize"><Variable name="ToolbarButtonMaximumSize"/></SetVariable>
+            <SetVariable name="SizePolicy"><Variable name="ToolbarButtonSizePolicy"/></SetVariable>
+            <SetVariable name="ObjectName">ToolbarButton</SetVariable>
+            <SetVariable name="state_0_text">EFFECTS</SetVariable>
+            <SetVariable name="state_1_text">EFFECTS</SetVariable>
+            <SetVariable name="left_connection_control">[EffectRack1],show</SetVariable>
+          </Template>
+
           <Template src="skin:left_2state_button.xml">
-            <SetVariable name="TooltipId"></SetVariable>
-            <SetVariable name="Tooltip">Show/hide skin settings</SetVariable>
-            <SetVariable name="ObjectName">ShowHideSkinSettingsButton</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-            <SetVariable name="state_0_text"></SetVariable>
-            <SetVariable name="state_0_pressed">icon/ic_menu_48px.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">icon/ic_menu_48px.svg</SetVariable>
-            <SetVariable name="state_1_text"></SetVariable>
-            <SetVariable name="state_1_pressed">icon/ic_menu_48px.svg</SetVariable>
-            <SetVariable name="state_1_unpressed">icon/ic_menu_48px.svg</SetVariable>
-            <SetVariable name="left_connection_control">[Deere],show_skin_settings</SetVariable>
+            <SetVariable name="MinimumSize"><Variable name="ToolbarButtonMinimumSize"/></SetVariable>
+            <SetVariable name="MaximumSize"><Variable name="ToolbarButtonMaximumSize"/></SetVariable>
+            <SetVariable name="SizePolicy"><Variable name="ToolbarButtonSizePolicy"/></SetVariable>
+            <SetVariable name="ObjectName">ToolbarButton</SetVariable>
+            <SetVariable name="state_0_text">SAMPLERS</SetVariable>
+            <SetVariable name="state_1_text">SAMPLERS</SetVariable>
+            <SetVariable name="left_connection_control">[Samplers],show_samplers</SetVariable>
           </Template>
+
+          <Template src="skin:left_2state_button.xml">
+            <SetVariable name="MinimumSize"><Variable name="ToolbarButtonMinimumSize"/></SetVariable>
+            <SetVariable name="MaximumSize"><Variable name="ToolbarButtonMaximumSize"/></SetVariable>
+            <SetVariable name="SizePolicy"><Variable name="ToolbarButtonSizePolicy"/></SetVariable>
+            <SetVariable name="ObjectName">ToolbarButton</SetVariable>
+            <SetVariable name="state_0_text">MICS &amp; AUX</SetVariable>
+            <SetVariable name="state_1_text">MICS &amp; AUX</SetVariable>
+            <SetVariable name="left_connection_control">[Microphone],show_microphone</SetVariable>
+          </Template>
+
+          <WidgetGroup>
+            <Size>107f,25f</Size>
+            <BackPath>image/mixxx_logo.svg</BackPath>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <SizePolicy>min,min</SizePolicy>
+            <Layout>horizontal</Layout>
+            <Children>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Label>
+                    <ObjectName>KnobLabelH</ObjectName> <!--Hack to make the text a readable size.-->
+                    <Size>80f, 25f</Size>
+                    <Text>SKIN SETTINGS</Text>
+                  </Label>
+                </Children>
+                <Connection>
+                  <ConfigKey>[Deere],show_skin_settings</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                  <Transform>
+                    <Not/>
+                  </Transform>
+                </Connection>
+              </WidgetGroup>
+
+              <Template src="skin:left_2state_button.xml">
+                <SetVariable name="TooltipId"></SetVariable>
+                <SetVariable name="Tooltip">Show/hide skin settings</SetVariable>
+                <SetVariable name="ObjectName">ShowHideSkinSettingsButton</SetVariable>
+                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                <SetVariable name="state_0_text"></SetVariable>
+                <SetVariable name="state_0_pressed">icon/ic_menu_48px.svg</SetVariable>
+                <SetVariable name="state_0_unpressed">icon/ic_menu_48px.svg</SetVariable>
+                <SetVariable name="state_1_text"></SetVariable>
+                <SetVariable name="state_1_pressed">icon/ic_menu_48px.svg</SetVariable>
+                <SetVariable name="state_1_unpressed">icon/ic_menu_48px.svg</SetVariable>
+                <SetVariable name="left_connection_control">[Deere],show_skin_settings</SetVariable>
+              </Template>
+            </Children>
+            <Connection>
+              <ConfigKey>[Deere],show_skin_settings</ConfigKey>
+              <BindProperty>visible</BindProperty>
+              <Transform>
+                <Not/>
+              </Transform>
+            </Connection>
+          </WidgetGroup>
+
         </Children>
-        <Connection>
-          <ConfigKey>[Deere],show_skin_settings</ConfigKey>
-          <BindProperty>visible</BindProperty>
-          <Transform>
-            <Not/>
-          </Transform>
-        </Connection>
       </WidgetGroup>
+
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/transport.xml b/res/skins/Deere/transport.xml
deleted file mode 100644
index 39be140849e5..000000000000
--- a/res/skins/Deere/transport.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    A grid of transport controls (rev/fwd/back/beatjump).
-  Variables:
-    group: The group for the controls.
--->
-<Template>
-  <WidgetGroup>
-    <ObjectName>TransportContainer</ObjectName>
-    <Layout>vertical</Layout>
-    <SizePolicy>max,max</SizePolicy>
-    <Children>
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <Children>
-          <Template src="skin:left_right_1state_button.xml">
-            <SetVariable name="TooltipId">back_start</SetVariable>
-            <SetVariable name="ObjectName">FastBackButton</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-            <SetVariable name="state_0_text"></SetVariable>
-            <SetVariable name="state_0_pressed">icon/ic_fast_rewind_48px.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">icon/ic_fast_rewind_48px.svg</SetVariable>
-            <SetVariable name="left_connection_control"><Variable name="group"/>,back</SetVariable>
-            <SetVariable name="right_connection_control"><Variable name="group"/>,start</SetVariable>
-          </Template>
-
-          <Template src="skin:left_right_1state_button.xml">
-            <SetVariable name="TooltipId">reverse</SetVariable>
-            <SetVariable name="ObjectName">ReverseButton</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-            <SetVariable name="state_0_text"></SetVariable>
-            <SetVariable name="state_0_pressed">icon/ic_reverse_48px.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">icon/ic_reverse_48px.svg</SetVariable>
-            <SetVariable name="left_connection_control"><Variable name="group"/>,reverse</SetVariable>
-            <SetVariable name="right_connection_control"><Variable name="group"/>,reverseroll</SetVariable>
-          </Template>
-
-          <Template src="skin:left_right_1state_button.xml">
-            <SetVariable name="TooltipId">fwd_end</SetVariable>
-            <SetVariable name="ObjectName">FastFwdButton</SetVariable>
-            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-            <SetVariable name="state_0_text"></SetVariable>
-            <SetVariable name="state_0_pressed">icon/ic_fast_forward_48px.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">icon/ic_fast_forward_48px.svg</SetVariable>
-            <SetVariable name="left_connection_control"><Variable name="group"/>,fwd</SetVariable>
-            <SetVariable name="right_connection_control"><Variable name="group"/>,end</SetVariable>
-          </Template>
-        </Children>
-      </WidgetGroup>
-
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <Children>
-          <Template src="skin:beatjump.xml"/>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/Deere/vinylcontrol.xml b/res/skins/Deere/vinylcontrol.xml
index fb22bda6da34..4462f95a55b9 100644
--- a/res/skins/Deere/vinylcontrol.xml
+++ b/res/skins/Deere/vinylcontrol.xml
@@ -4,9 +4,9 @@
     <WidgetGroup>
     <ObjectName>VinylControlsContainer</ObjectName>
     <Layout>vertical</Layout>
-    <SizePolicy>max,max</SizePolicy>
+    <SizePolicy>min,min</SizePolicy>
     <Connection>
-      <ConfigKey persist="true">[VinylControl],show_vinylcontrol</ConfigKey>
+      <ConfigKey>[VinylControl],show_vinylcontrol</ConfigKey>
       <BindProperty>visible</BindProperty>
     </Connection>
     <Children>
@@ -58,4 +58,4 @@
 
     </Children>
   </WidgetGroup>
-</Template>
\ No newline at end of file
+</Template>
diff --git a/res/skins/Deere/vumeter_master.xml b/res/skins/Deere/vumeter_master.xml
new file mode 100644
index 000000000000..0b008e3a81f0
--- /dev/null
+++ b/res/skins/Deere/vumeter_master.xml
@@ -0,0 +1,87 @@
+<!DOCTYPE template>
+<!-- Master level meter -->
+<Template>
+  <WidgetGroup>
+    <Layout>vertical</Layout>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>MasterVu2Deck</ObjectName>
+        <Layout>vertical</Layout>
+        <Children>
+
+          <!-- Spacer to align with bottom of mixer-->
+          <WidgetGroup>
+            <Size>-1,-1me</Size>
+            <MaximumSize>-1,15</MaximumSize>
+            <Layout>vertical</Layout>
+            <Children/>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>master_VuMeter_Group</ObjectName>
+            <Size>22min,-1me</Size>
+            <MaximumSize>-1,160</MaximumSize>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Template src="skin:vumeter_v.xml">
+                <SetVariable name="group">[Master]</SetVariable>
+                <SetVariable name="side">L</SetVariable>
+                <SetVariable name="tooltip_meter">master_VuMeterL</SetVariable>
+                <SetVariable name="tooltip_clip">master_PeakIndicatorL</SetVariable>
+              </Template>
+              <Template src="skin:vumeter_v.xml">
+                <SetVariable name="group">[Master]</SetVariable>
+                <SetVariable name="side">R</SetVariable>
+                <SetVariable name="tooltip_meter">master_VuMeterR</SetVariable>
+                <SetVariable name="tooltip_clip">master_PeakIndicatorR</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+        </Children>
+        <Connection>
+          <ConfigKey>[Master],show_4decks</ConfigKey>
+          <BindProperty>visible</BindProperty>
+          <Transform>
+            <Not/>
+          </Transform>
+        </Connection>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>MasterVu4Deck</ObjectName>
+        <Layout>vertical</Layout>
+        <Children>
+
+          <WidgetGroup>
+            <ObjectName>master_VuMeter_Group</ObjectName>
+            <Size>22min,-1me</Size>
+            <MaximumSize>-1,120</MaximumSize>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Template src="skin:vumeter_v.xml">
+                <SetVariable name="group">[Master]</SetVariable>
+                <SetVariable name="side">L</SetVariable>
+                <SetVariable name="tooltip_meter">master_VuMeterL</SetVariable>
+                <SetVariable name="tooltip_clip">master_PeakIndicatorL</SetVariable>
+              </Template>
+              <Template src="skin:vumeter_v.xml">
+                <SetVariable name="group">[Master]</SetVariable>
+                <SetVariable name="side">R</SetVariable>
+                <SetVariable name="tooltip_meter">master_VuMeterR</SetVariable>
+                <SetVariable name="tooltip_clip">master_PeakIndicatorR</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+        </Children>
+        <Connection>
+          <ConfigKey>[Master],show_4decks</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Deere/vumeter_v.xml b/res/skins/Deere/vumeter_v.xml
index 7ca3c76d0ae1..d7f954ed99fe 100644
--- a/res/skins/Deere/vumeter_v.xml
+++ b/res/skins/Deere/vumeter_v.xml
@@ -16,27 +16,73 @@
           <StatusLight>
             <ObjectName>PeakIndicator</ObjectName>
             <TooltipId><Variable name="tooltip_clip"/></TooltipId>
-            <Size>3me,3min</Size>
-            <MaximumSize>8,8</MaximumSize>
+            <Size>8f,8f</Size>
             <PathStatusLight scalemode="STRETCH">vumeter_clip.svg</PathStatusLight>
             <Connection>
                 <ConfigKey><Variable name="group"/>,PeakIndicator<Variable name="side"/></ConfigKey>
             </Connection>
           </StatusLight>
-          <VuMeter>
-            <TooltipId><Variable name="tooltip_meter"/></TooltipId>
-            <Size>3me,9me</Size>
-            <MaximumSize>8,80</MaximumSize>
-            <PathVu scalemode="STRETCH">vumeter_v.svg</PathVu>
-            <Horizontal>false</Horizontal>
-            <PeakHoldSize>5</PeakHoldSize>
-            <PeakHoldTime>600</PeakHoldTime>
-            <PeakFallTime>100</PeakFallTime>
-            <PeakFallStep>1</PeakFallStep>
-            <Connection>
-              <ConfigKey><Variable name="group"/>,VuMeter<Variable name="side"/></ConfigKey>
-            </Connection>
-          </VuMeter>
+
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <Children>
+
+              <WidgetGroup>
+                <Layout>vertical</Layout>
+                <Children>
+                  <VuMeter>
+                    <TooltipId><Variable name="tooltip_meter"/></TooltipId>
+                    <Size>3me,me</Size>
+                    <MinimumSize>8,40</MinimumSize>
+                    <MaximumSize>8,-1</MaximumSize>
+                    <PathVu scalemode="STRETCH">vumeter_v.svg</PathVu>
+                    <Horizontal>false</Horizontal>
+                    <PeakHoldSize>5</PeakHoldSize>
+                    <PeakHoldTime>600</PeakHoldTime>
+                    <PeakFallTime>100</PeakFallTime>
+                    <PeakFallStep>1</PeakFallStep>
+                    <Connection>
+                      <ConfigKey><Variable name="group"/>,VuMeter<Variable name="side"/></ConfigKey>
+                    </Connection>
+                  </VuMeter>
+                </Children>
+                <Connection>
+                  <ConfigKey>[Master],show_4decks</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                  <Transform>
+                    <Not/>
+                  </Transform>
+                </Connection>
+              </WidgetGroup>
+
+              <WidgetGroup>
+                <Layout>vertical</Layout>
+                <Children>
+                  <VuMeter>
+                    <TooltipId><Variable name="tooltip_meter"/></TooltipId>
+                    <Size>3me,me</Size>
+                    <MinimumSize>8,60</MinimumSize>
+                    <MaximumSize>8,-1</MaximumSize>
+                    <PathVu scalemode="STRETCH">vumeter_v.svg</PathVu>
+                    <Horizontal>false</Horizontal>
+                    <PeakHoldSize>5</PeakHoldSize>
+                    <PeakHoldTime>600</PeakHoldTime>
+                    <PeakFallTime>100</PeakFallTime>
+                    <PeakFallStep>1</PeakFallStep>
+                    <Connection>
+                      <ConfigKey><Variable name="group"/>,VuMeter<Variable name="side"/></ConfigKey>
+                    </Connection>
+                  </VuMeter>
+                </Children>
+                <Connection>
+                  <ConfigKey>[Master],show_4decks</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+
+            </Children>
+          </WidgetGroup>
+
     </Children>
   </WidgetGroup>
 </Template>