diff --git a/res/skins/Deere/auxiliary.xml b/res/skins/Deere/auxiliary.xml
index e27bcbac306b..0d2cbd312dd8 100644
--- a/res/skins/Deere/auxiliary.xml
+++ b/res/skins/Deere/auxiliary.xml
@@ -10,34 +10,42 @@
   <SetVariable name="group">[Auxiliary<Variable name="i"/>]</SetVariable>
   <WidgetGroup>
     <ObjectName>AuxiliaryContainer</ObjectName>
-    <Layout>vertical</Layout>
-    <SizePolicy>max,max</SizePolicy>
+    <Layout>horizontal</Layout>
+    <SizePolicy>max,min</SizePolicy>
     <Children>
 
-      <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>
+            <Layout>vertical</Layout>
+            <ObjectName>AuxiliaryControls</ObjectName>
+            <Children>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <ObjectName>AuxLabelContainer</ObjectName>
+                <Children>
+                  <Label>
+                    <ObjectName>AuxLabel</ObjectName>
+                    <Text>Aux <Variable name="i"/></Text>
+                  </Label>
+                </Children>
+              </WidgetGroup>
+
+
+              <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>
+            </Children>
+          </WidgetGroup>
 
           <WidgetGroup>
             <ObjectName>AuxiliaryButtonsAndMeter</ObjectName>
diff --git a/res/skins/Deere/effect_rack.xml b/res/skins/Deere/effect_rack.xml
index 655ffb7feb11..556920b22198 100644
--- a/res/skins/Deere/effect_rack.xml
+++ b/res/skins/Deere/effect_rack.xml
@@ -14,74 +14,61 @@ Container for all the effect units
          minimum size of the current stack widget. -->
     <SizePolicy>me,f</SizePolicy>
     <Children>
-      <WidgetStack>
+      <WidgetGroup>
         <ObjectName>EffectRackContainer</ObjectName>
-        <SizePolicy>me,min</SizePolicy>
+        <Layout>vertical</Layout>
         <Children>
 
-          <!-- Use another WidgetGroup wrapper so the WidgetStack does not interfere with showing
-          the second row. -->
           <WidgetGroup>
-            <Layout>vertical</Layout>
+            <ObjectName>EffectUnitsRow</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>me,me</SizePolicy>
             <Children>
+              <Template src="skin:effect_unit.xml">
+                <SetVariable name="EffectRack">1</SetVariable>
+                <SetVariable name="EffectUnit">1</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:spacer_hx.xml">
+                <SetVariable name="width">4</SetVariable>
+                <SetVariable name="color">22</SetVariable>
+              </Template>
 
-                  <Template src="skin:spacer_hx.xml">
-                    <SetVariable name="width">4</SetVariable>
-                    <SetVariable name="color">22</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">2</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
 
-                  <Template src="skin:spacer_hx.xml">
-                    <SetVariable name="width">4</SetVariable>
-                    <SetVariable name="color">22</SetVariable>
-                  </Template>
+          <WidgetGroup>
+            <ObjectName>EffectUnitsRow</ObjectName>
+            <Layout>horizontal</Layout>
+            <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>
+              <Template src="skin:spacer_hx.xml">
+                <SetVariable name="width">4</SetVariable>
+                <SetVariable name="color">22</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>
-      </WidgetStack>
+      </WidgetGroup>
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/effect_unit.xml b/res/skins/Deere/effect_unit.xml
index 075398656fed..9ecc9ce0da5c 100644
--- a/res/skins/Deere/effect_unit.xml
+++ b/res/skins/Deere/effect_unit.xml
@@ -12,12 +12,9 @@
     <ObjectName>EffectUnit<Variable name="EffectUnit"/></ObjectName>
     <Layout>vertical</Layout>
     <SizePolicy>me,me</SizePolicy>
-    <MinimumSize>-1,65</MinimumSize>
-    <MaximumSize>-1,195</MaximumSize>
     <Children>
       <WidgetGroup>
         <ObjectName>EffectUnitGroupControls</ObjectName>
-        <Size>-1,20</Size>
         <SizePolicy>me,max</SizePolicy>
         <Layout>horizontal</Layout>
         <Children>
@@ -77,9 +74,13 @@
 
       <WidgetGroup>
         <Layout>vertical</Layout>
+        <SizePolicy>me,min</SizePolicy>
         <Children>
-          <Template src="skin:effect_unit_no_parameters.xml">
-          </Template>
+          <Template src="skin:effect_unit_no_parameters.xml"/>
+          <WidgetGroup>
+            <ObjectName>EffectUnitFiller</ObjectName>
+            <SizePolicy>me,me</SizePolicy>
+          </WidgetGroup>
         </Children>
         <Connection>
           <ConfigKey><Variable name="group"/>,show_parameters</ConfigKey>
@@ -93,8 +94,7 @@
       <WidgetGroup>
         <Layout>vertical</Layout>
         <Children>
-          <Template src="skin:effect_unit_with_parameters.xml">
-          </Template>
+          <Template src="skin:effect_unit_with_parameters.xml"/>
         </Children>
         <Connection>
           <ConfigKey><Variable name="group"/>,show_parameters</ConfigKey>
diff --git a/res/skins/Deere/effect_unit_group_control_button.xml b/res/skins/Deere/effect_unit_group_control_button.xml
deleted file mode 100644
index 6825df69351c..000000000000
--- a/res/skins/Deere/effect_unit_group_control_button.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    An effect group control button.
-  Variables:
-    group_name: The text to show on the button.
-    group_group: The group to enable the effect chain for.
--->
-<Template>
-  <Template src="skin:left_2state_button.xml">
-    <SetVariable name="TooltipId">EffectUnit_group_enabled</SetVariable>
-    <SetVariable name="ObjectName">EffectChainGroupControlButton</SetVariable>
-    <SetVariable name="MinimumSize"><Variable name="SmallWideButtonMinimumSize"/></SetVariable>
-    <SetVariable name="MaximumSize"><Variable name="SmallWideButtonMaximumSize"/></SetVariable>
-    <SetVariable name="SizePolicy"><Variable name="SmallWideButtonSizePolicy"/></SetVariable>
-    <SetVariable name="state_0_pressed"></SetVariable>
-    <SetVariable name="state_0_unpressed"></SetVariable>
-    <SetVariable name="state_0_text"><Variable name="group_name"/></SetVariable>
-    <SetVariable name="state_1_pressed"></SetVariable>
-    <SetVariable name="state_1_unpressed"></SetVariable>
-    <SetVariable name="state_1_text"><Variable name="group_name"/></SetVariable>
-    <SetVariable name="left_connection_control"><Variable name="group"/>,group_<Variable name="group_group"/>_enable</SetVariable>
-  </Template>
-</Template>
diff --git a/res/skins/Deere/microphone.xml b/res/skins/Deere/microphone.xml
index 32054a792c6e..b64e89e0671a 100644
--- a/res/skins/Deere/microphone.xml
+++ b/res/skins/Deere/microphone.xml
@@ -10,26 +10,26 @@
   <SetVariable name="group">[Microphone<Variable name="i"/>]</SetVariable>
   <WidgetGroup>
     <ObjectName>MicrophoneContainer</ObjectName>
-    <Layout>vertical</Layout>
-    <SizePolicy>max,max</SizePolicy>
+    <Layout>horizontal</Layout>
+    <SizePolicy>max,me</SizePolicy>
     <Children>
 
-      <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>
+        <Layout>vertical</Layout>
         <Children>
 
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <ObjectName>MicLabelContainer</ObjectName>
+            <Children>
+              <Label>
+                <ObjectName>MicLabel</ObjectName>
+                <Text>Mic <Variable name="i"/></Text>
+              </Label>
+            </Children>
+          </WidgetGroup>
+
           <Template src="skin:knob_with_button.xml">
             <SetVariable name="TooltipId">microphone_pregain</SetVariable>
             <SetVariable name="control">pregain</SetVariable>
@@ -38,42 +38,58 @@
             <SetVariable name="button_control">mute</SetVariable>
             <SetVariable name="label">Gain</SetVariable>
           </Template>
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>MicrophoneButtonsAndMeter</ObjectName>
+        <Layout>vertical</Layout>
+        <Children>
 
           <WidgetGroup>
-            <ObjectName>MicrophoneButtonsAndMeter</ObjectName>
-            <Layout>vertical</Layout>
+            <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>
 
-              <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: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>
+            </Children>
+          </WidgetGroup>
 
-                </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:vumeter.xml">
-                <SetVariable name="TooltipId">microphone_VuMeter</SetVariable>
-                <SetVariable name="control">VuMeter</SetVariable>
+              <Template src="skin:fx_unit_group_assignment_button.xml">
+                <SetVariable name="EffectUnit">2</SetVariable>
+                <SetVariable name="SourceType">microphone</SetVariable>
               </Template>
 
               <WidgetGroup>
@@ -81,36 +97,19 @@
                 <Layout>horizontal</Layout>
                 <Children>
                   <Template src="skin:fx_unit_group_assignment_button.xml">
-                    <SetVariable name="EffectUnit">1</SetVariable>
+                    <SetVariable name="EffectUnit">3</SetVariable>
                     <SetVariable name="SourceType">microphone</SetVariable>
                   </Template>
 
                   <Template src="skin:fx_unit_group_assignment_button.xml">
-                    <SetVariable name="EffectUnit">2</SetVariable>
+                    <SetVariable name="EffectUnit">4</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>
+                <Connection>
+                  <ConfigKey>[Master],show_4effectunits</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
               </WidgetGroup>
 
             </Children>
diff --git a/res/skins/Deere/microphone_rack.xml b/res/skins/Deere/microphone_rack.xml
index f1176b066c6e..090e4afcc06a 100644
--- a/res/skins/Deere/microphone_rack.xml
+++ b/res/skins/Deere/microphone_rack.xml
@@ -12,198 +12,211 @@
     <SizePolicy>me,f</SizePolicy>
 
     <Children>
-      <WidgetStack>
-        <ObjectName>MicrophonesContainer</ObjectName>
+
+      <WidgetGroup>
+        <ObjectName>MicAuxRack</ObjectName>
         <SizePolicy>me,min</SizePolicy>
+        <Layout>horizontal</Layout>
         <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>
-            <ObjectName>MicrophoneRackExpanded</ObjectName>
-            <SizePolicy>me,min</SizePolicy>
             <Layout>horizontal</Layout>
+            <SizePolicy>max,me</SizePolicy>
             <Children>
+              <Template src="skin:microphone.xml">
+                <SetVariable name="i">2</SetVariable>
+              </Template>
+            </Children>
+            <Connection>
+              <ConfigKey>[Microphone2],enabled</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
 
-              <!-- 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. -->
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <SizePolicy>max,me</SizePolicy>
+            <Children>
+              <Template src="skin:microphone.xml">
+                <SetVariable name="i">3</SetVariable>
+              </Template>
+            </Children>
+            <Connection>
+              <ConfigKey>[Microphone3],enabled</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
 
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <SizePolicy>max,me</SizePolicy>
+            <Children>
               <Template src="skin:microphone.xml">
-                <SetVariable name="i"></SetVariable>
+                <SetVariable name="i">4</SetVariable>
               </Template>
+            </Children>
+            <Connection>
+              <ConfigKey>[Microphone4],enabled</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
 
-              <WidgetGroup>
-                <Layout>horizontal</Layout>
-                <Children>
-                  <Template src="skin:microphone.xml">
-                    <SetVariable name="i">2</SetVariable>
-                  </Template>
-                </Children>
-                <Connection>
-                  <ConfigKey>[Microphone2],enabled</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
+          <WidgetGroup>
+            <ObjectName>MicDuckingContainer</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>max,me</SizePolicy>
+            <Children>
 
               <WidgetGroup>
-                <Layout>horizontal</Layout>
+                <ObjectName>MicDuckingControls</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,me</SizePolicy>
                 <Children>
-                  <Template src="skin:microphone.xml">
-                    <SetVariable name="i">3</SetVariable>
-                  </Template>
-                </Children>
-                <Connection>
-                  <ConfigKey>[Microphone3],enabled</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
 
-              <WidgetGroup>
-                <Layout>horizontal</Layout>
-                <Children>
-                  <Template src="skin:microphone.xml">
-                    <SetVariable name="i">4</SetVariable>
+                  <Template src="skin:spacer_vx.xml">
+                    <SetVariable name="height">,0f</SetVariable>
                   </Template>
-                </Children>
-                <Connection>
-                  <ConfigKey>[Microphone4],enabled</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <ObjectName>MicDuckingContainer</ObjectName>
-                <Layout>vertical</Layout>
-                <SizePolicy>max,e</SizePolicy>
-                <Children>
 
                   <WidgetGroup>
                     <Layout>horizontal</Layout>
+                    <SizePolicy>min,min</SizePolicy>
                     <Children>
                       <Label>
+                        <ObjectName>DuckingLabel</ObjectName>
                         <Text>DUCKING</Text>
                       </Label>
                     </Children>
                   </WidgetGroup>
 
+                  <Template src="skin:spacer_vx.xml">
+                    <SetVariable name="height">,2f</SetVariable>
+                  </Template>
+
+                  <PushButton>
+                    <!-- TODO(jus): Add missing string to src/skin/tooltips.cpp -->
+                    <TooltipId></TooltipId>
+                    <Size>66f,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>
+
+                  <Template src="skin:spacer_vx.xml">
+                    <SetVariable name="height">,2me</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+
+              <!-- knob_with_label.xml template will not work here because
+              "Strength" label exceeds width of knob. -->
+              <WidgetGroup>
+                <ObjectName>MicDuckingControls</ObjectName>
+                <Layout>vertical</Layout>
+                <SizePolicy>min,me</SizePolicy>
+                <Children>
+
                   <WidgetGroup>
-                    <ObjectName>MicDuckingControls</ObjectName>
                     <Layout>horizontal</Layout>
                     <Children>
-
-                      <PushButton>
+                      <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 -->
-                        <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>
-
+                        <SetVariable name="TooltipId"></SetVariable>
+                        <SetVariable name="color">blue</SetVariable>
+                      </Template>
                     </Children>
                   </WidgetGroup>
 
+                  <Label>
+                    <ObjectName>KnobLabel</ObjectName>
+                    <Text>Strength</Text>
+                  </Label>
                 </Children>
               </WidgetGroup>
 
-              <Template src="skin:spacer_h.xml"/>
+            </Children>
+          </WidgetGroup>
 
-              <!-- Auxiliary input controls -->
+          <Template src="skin:spacer_h.xml"/>
 
-              <Template src="skin:auxiliary.xml">
-                <SetVariable name="i">1</SetVariable>
-              </Template>
+          <!-- Auxiliary input controls -->
 
-              <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>
+          <Template src="skin:auxiliary.xml">
+            <SetVariable name="i">1</SetVariable>
+          </Template>
 
-              <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">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">4</SetVariable>
-                  </Template>
-                </Children>
-                <Connection>
-                  <ConfigKey>[Auxiliary4],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>
-        <Connection>
-          <ConfigKey>[Microphone],show_microphone</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetStack>
+      </WidgetGroup>
+
     </Children>
+    <Connection>
+      <ConfigKey>[Microphone],show_microphone</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/sampler_row.xml b/res/skins/Deere/sampler_row.xml
index 6a27bbc2625f..bee7378c0986 100644
--- a/res/skins/Deere/sampler_row.xml
+++ b/res/skins/Deere/sampler_row.xml
@@ -1,6 +1,7 @@
 <Template>
   <WidgetGroup>
     <ObjectName>SamplerRow</ObjectName>
+    <SizePolicy>min,min</SizePolicy>
     <Layout>horizontal</Layout>
     <Children>
 
@@ -10,7 +11,7 @@
         <Size>20f,-1me</Size>
         <Children>
           <Template src="skin:spacer_vx.xml">
-            <SetVariable name="height">4</SetVariable>
+            <SetVariable name="height">3</SetVariable>
           </Template>
 
           <Template src="skin:hide_show_button.xml">
@@ -38,7 +39,7 @@
 
       <WidgetGroup>
         <ObjectName>SamplerMiddleSpacer</ObjectName>
-        <Size>-1me,-1max</Size>
+        <SizePolicy>me,min</SizePolicy>
       </WidgetGroup>
 
       <Template src="skin:sampler.xml">
diff --git a/res/skins/Deere/skin.xml b/res/skins/Deere/skin.xml
index 5bb3707b2ab3..a4209ab3db69 100644
--- a/res/skins/Deere/skin.xml
+++ b/res/skins/Deere/skin.xml
@@ -53,8 +53,8 @@
     <SetVariable name="SmallSquareButtonMaximumSize">15,15</SetVariable>
     <SetVariable name="SmallSquareButtonSizePolicy">f,f</SetVariable>
 
-    <SetVariable name="SmallWideButtonMinimumSize">50,20</SetVariable>
-    <SetVariable name="SmallWideButtonMaximumSize">50,20</SetVariable>
+    <SetVariable name="SmallWideButtonMinimumSize">50,18</SetVariable>
+    <SetVariable name="SmallWideButtonMaximumSize">50,22</SetVariable>
     <SetVariable name="SmallWideButtonSizePolicy">f,f</SetVariable>
 
     <SetVariable name="MinimalControlsButtonMinimumSize">34,22</SetVariable>
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index f153d3928e54..5009f22dccbd 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -110,7 +110,7 @@
   /* FIXME */
   border-style: solid;
   border-color: #222;
-  border-width: 1px 0px;
+  border-width: 0px 2px;
 }
 
 #Spacer22 {
@@ -129,6 +129,15 @@ TEST1 {
   qproperty-layoutAlignment: 'AlignRight';
 }
 
+#SampleDecksContainer {
+  border-color: #222;
+  border-style: solid;
+  border-width: 1px 0px 2px 0px;
+}
+
+#SamplerRows {
+}
+
 #SamplerRow1,
 #SamplerRow2,
 #SamplerRow3,
@@ -136,11 +145,15 @@ TEST1 {
 #SamplerRow6,
 #SamplerRow7,
 #SamplerRow8 {
-  border-top: 1px solid #222;
+  border-color: #222;
+  border-style: solid;
+  border-width: 0px 0px 1px 0px;
 }
 
 #SamplerRow5 {
-  border-top: 2px solid #222;
+  border-color: #222;
+  border-style: solid;
+  border-width: 1px 0px 1px 0px;
 }
 
 /*******************************************************************************
@@ -631,7 +644,7 @@ WWidget, QLabel {
 /* Start spacing for Deck overview row (small waveform, option grid) */
 #OptionGrid, #ButtonGrid {
   background-color: #333333;
-  padding: 1px;
+  /*padding: 1px;*/
   qproperty-layoutSpacing: 2;
 }
 
@@ -871,8 +884,11 @@ WBeatSpinBox {
 
 #EffectUnit1, #EffectUnit2, #EffectUnit3, #EffectUnit4 {
   qproperty-layoutAlignment: 'AlignTop';
+}
+
+#EffectUnitFiller {
   border: 1px solid #222;
-  border-left:none;
+  border-width: 1px 0px 0px 0px;
 }
 
 #EffectButtonControls {
@@ -893,10 +909,6 @@ WBeatSpinBox {
   font: 10px;
 }
 
-#EffectUnit1 {
-  border-left: 1px solid #222;
-}
-
 #EffectUnitNameContainer {
   padding: 2px;
   qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
@@ -906,6 +918,11 @@ WBeatSpinBox {
   qproperty-alignment: 'AlignHCenter';
 }
 
+#EffectUnitGroupControls {
+  border: 1px solid #222222;
+  border-width: 0px 0px 1px 0px;
+}
+
 #EffectUnitGroupControlsLeft {
   qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
 }
@@ -1195,19 +1212,17 @@ WStarRating {
 }
 
 #SampleDecksContainer {
-  background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-                                    stop: 0 #333333,
-                                    stop: 1.0 #333333);
+  background-color: #333333;
 }
 
 #MicrophonesContainer {
 }
 
-#MicrophoneRackExpanded {
-  background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-                                    stop: 0 #333333,
-                                    stop: 1.0 #333333);
-  qproperty-layoutSpacing: 6;
+#MicAuxRack {
+  background-color: #333333;
+  qproperty-layoutSpacing: 3;
+  padding-left: 2px;
+  border-bottom: 2px solid #222222;
 }
 
 #MicLabelContainer,
@@ -1216,9 +1231,22 @@ WStarRating {
 }
 
 #MicrophoneContainer, #MicDuckingContainer, #AuxiliaryContainer {
-  padding: 2px 5px;
-  margin: 2px 0px;
+  padding: 4px 4px;
+  margin: 0px;
+}
+
+#MicrophoneContainer, #MicDuckingContainer {
+  border: 3px solid #222222;
+  border-width: 0px 3px 0px 0px;
+}
+
+#MicDuckingContainer {
+  qproperty-layoutSpacing: 2;
+}
+
+#AuxiliaryContainer {
   border: 3px solid #222222;
+  border-width: 0px 0px 0px 3px;
 }
 
 #MicrophoneContainer, #AuxiliaryContainer,
@@ -1231,13 +1259,17 @@ WStarRating {
   qproperty-layoutSpacing: 4;
 }
 
+#AuxLabel, #MicLabel, #DuckingLabel {
+  font-weight: bold;
+}
+
 #MicrophoneButtonsAndMeter, #AuxiliaryButtonsAndMeter {
   qproperty-layoutSpacing: 3;
 }
 
 #LibraryContainer {
   background-color: #222;
-  padding-top: 4px;
+  padding-top: 2px;
 }
 
 #LibraryExpanded, #LibraryCollapsed {
@@ -1245,9 +1277,12 @@ WStarRating {
 }
 
 #EffectRackContainer {
-  background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-                                    stop: 0 #333333,
-                                    stop: 1.0 #333333);
+  background-color: #333333;
+}
+
+#EffectUnitsRow {
+  border: 1px solid #222222;
+  border-width: 0px 0px 3px 0px;
 }
 
 #EffectUnitNoParameters {
@@ -1286,18 +1321,9 @@ WStarRating {
   font-size: 15px;
 }
 
-#EffectUnit1, #EffectUnit2 {
-  /*border-bottom: none;*/
-}
-
 #SampleDecksContainer {
 }
 
-#SamplerBankContainer {
-  padding: 4px;
-  qproperty-layoutSpacing: 2;
-}
-
 #SamplerTopRowOuter {
   padding: 2px;
 }
@@ -1306,10 +1332,6 @@ WStarRating {
   qproperty-layoutSpacing: 2;
 }
 
-#SamplerBankGrid {
-  qproperty-layoutSpacing: 2;
-}
-
 #SamplerExpansion {
   padding: 2px;
   qproperty-layoutSpacing: 2;