diff --git a/res/skins/Deere/beatjump.xml b/res/skins/Deere/beatjump.xml
index b6dc76c6cedd..6c72a093a684 100644
--- a/res/skins/Deere/beatjump.xml
+++ b/res/skins/Deere/beatjump.xml
@@ -7,49 +7,57 @@
 -->
 <Template>
   <WidgetGroup>
-    <ObjectName>BeatJumpContainer</ObjectName>
-    <Layout>horizontal</Layout>
+    <Layout>vertical</Layout>
     <Children>
 
-      <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>
+      <!-- Workaround for layout spacing -->
+      <Template src="skin:spacer_vx.xml">
+        <SetVariable name="height">,2f</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>
+      <WidgetGroup><!-- backward + forward -->
+        <Layout>horizontal</Layout>
+        <Children>
+
+          <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>
+
+          <!-- Workaround for layout spacing -->
+          <Template src="skin:spacer_hx.xml">
+            <SetVariable name="width">2f,</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>
+
+        </Children>
+      </WidgetGroup><!-- backward + forward -->
 
     </Children>
   </WidgetGroup>
diff --git a/res/skins/Deere/deck.xml b/res/skins/Deere/deck.xml
index e783ca31ddec..0c115803b0f1 100644
--- a/res/skins/Deere/deck.xml
+++ b/res/skins/Deere/deck.xml
@@ -46,7 +46,7 @@
         <Layout>vertical</Layout>
         <SizePolicy>min,min</SizePolicy>
         <Children>
-          <Template src="skin:deck_inner_column.xml"/>
+          <Template src="skin:deck_tempo_column.xml"/>
         </Children>
       </WidgetGroup>
     </Children>
diff --git a/res/skins/Deere/deck_controls_row.xml b/res/skins/Deere/deck_controls_row.xml
index 2a4026d1aef9..67215b732064 100644
--- a/res/skins/Deere/deck_controls_row.xml
+++ b/res/skins/Deere/deck_controls_row.xml
@@ -9,12 +9,12 @@
   <WidgetGroup>
     <ObjectName>ControlsRow</ObjectName>
     <Layout>horizontal</Layout>
-    <SizePolicy>me,me</SizePolicy>
+    <SizePolicy>me,min</SizePolicy>
     <Children>
       <WidgetGroup>
         <ObjectName>FullControlsRow</ObjectName>
         <Layout>horizontal</Layout>
-        <Size>-1,-1me</Size>
+        <SizePolicy>me,min</SizePolicy>
         <Children>
           <Template src="skin:hotcue.xml"/>
           <!-- Expanding spacers in between control contexts -->
@@ -22,6 +22,49 @@
           <Template src="skin:loop.xml"/>
           <WidgetGroup><Size>-1me,1min</Size><Children/></WidgetGroup>
           <Template src="skin:beatjump.xml"/>
+          <WidgetGroup><Size>-1me,1min</Size><Children/></WidgetGroup>
+
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <MinimumSize>40,42</MinimumSize>
+            <MaximumSize>60, -1</MaximumSize>
+            <SizePolicy>me,me</SizePolicy>
+            <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_1_text">CUE</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="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>
         </Children>
       </WidgetGroup>
     </Children>
diff --git a/res/skins/Deere/deck_overview_row.xml b/res/skins/Deere/deck_overview_row.xml
index 0b686011a233..7441cf6c1eb0 100644
--- a/res/skins/Deere/deck_overview_row.xml
+++ b/res/skins/Deere/deck_overview_row.xml
@@ -11,10 +11,9 @@
     <Layout>horizontal</Layout>
     <SizePolicy>me,me</SizePolicy>
     <MinimumSize>-1,40</MinimumSize>
-    <MaximumSize>-1,65</MaximumSize>
+    <MaximumSize>-1,80</MaximumSize>
     <Children>
       <WidgetGroup>
-        <ObjectName>ButtonGrid</ObjectName>
         <Layout>vertical</Layout>
         <Children>
           <WidgetGroup>
@@ -52,19 +51,17 @@
                 <SetVariable name="left_connection_control"><Variable name="group"/>,repeat</SetVariable>
               </Template>
 
-              <Template src="skin:left_2state_button.xml">
-                <SetVariable name="TooltipId">eject</SetVariable>
-                <SetVariable name="ObjectName">EjectButton</SetVariable>
+              <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_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>
+                <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>
 
             </Children>
@@ -74,17 +71,19 @@
             <ObjectName>ButtonGrid</ObjectName>
             <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:left_right_1state_button.xml">
-                <SetVariable name="TooltipId">beats_translate_curpos</SetVariable>
-                <SetVariable name="ObjectName">BeatsTranslateCurposButton</SetVariable>
+              <Template src="skin:left_2state_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_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>
+                <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>
 
               <Template src="skin:left_2state_button.xml">
@@ -193,7 +192,6 @@
       </WidgetGroup>
 
       <WidgetGroup>
-        <ObjectName>ButtonGrid</ObjectName>
         <Layout>vertical</Layout>
         <Connection>
           <ConfigKey>[Master],show_4effectunits</ConfigKey>
diff --git a/res/skins/Deere/deck_inner_column.xml b/res/skins/Deere/deck_tempo_column.xml
similarity index 57%
rename from res/skins/Deere/deck_inner_column.xml
rename to res/skins/Deere/deck_tempo_column.xml
index c6f106ee81aa..a56064dd6b3c 100644
--- a/res/skins/Deere/deck_inner_column.xml
+++ b/res/skins/Deere/deck_tempo_column.xml
@@ -96,59 +96,6 @@
         </Children>
       </WidgetGroup>
 
-      <Template src="skin:spacer_vx.xml">
-        <SetVariable name="height">2</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>
-      </WidgetGroup>
-
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/deck_text_row.xml b/res/skins/Deere/deck_text_row.xml
index 168117602dd5..587fe0cc2041 100644
--- a/res/skins/Deere/deck_text_row.xml
+++ b/res/skins/Deere/deck_text_row.xml
@@ -96,6 +96,7 @@
                         <PrevControl>[Deere],key_layout_prev</PrevControl>
                         <Children>
                           <WidgetGroup>
+                            <ObjectName>KeyEditRowCollapsed</ObjectName>
                             <Layout>stacked</Layout>
                             <Children>
                               <PushButton>
@@ -130,42 +131,6 @@
                             <ObjectName>KeyEditRowExpanded</ObjectName>
                             <Layout>horizontal</Layout>
                             <Children>
-                              <WidgetGroup>
-                                <!-- The key edit controls are aligned to the right because the key
-                                     widget widths can rapidly change, especially with traditional
-                                     notation selected in the preferences. The controls stay calm
-                                     this way. -->
-                                <Layout>stacked</Layout>
-                                <MinimumSize>60,</MinimumSize>
-                                <Children>
-                                  <PushButton>
-                                    <ObjectName>KeyEditTrigger</ObjectName>
-                                    <TooltipId>visual_key</TooltipId>
-                                    <NumberStates>1</NumberStates>
-                                    <State>
-                                      <Number>0</Number>
-                                      <!-- <Text>&#9998;</Text>
-                                      <Alignment>right</Alignment> -->
-                                      <Pressed scalemode="STRETCH"></Pressed>
-                                      <Unpressed scalemode="STRETCH"></Unpressed>
-                                    </State>
-                                    <Connection>
-                                      <ConfigKey>[Deere],key_layout_next</ConfigKey>
-                                    </Connection>
-                                  </PushButton>
-
-                                  <Key>
-                                    <ObjectName>KeyEditTriggerLabel</ObjectName>
-                                    <Group><Variable name="group"/></Group>
-                                    <SizePolicy>min,</SizePolicy>
-                                    <DisplayCents>true</DisplayCents>
-                                    <Connection>
-                                      <ConfigKey><Variable name="group"/>,visual_key</ConfigKey>
-                                    </Connection>
-                                  </Key>
-                                </Children>
-                              </WidgetGroup>
-
                               <WidgetGroup>
                                 <ObjectName>KeyEditRowControls</ObjectName>
                                 <Layout>horizontal</Layout>
@@ -202,9 +167,9 @@
                                   <Template src="skin:left_right_1state_button.xml">
                                     <SetVariable name="TooltipId">sync_reset_key</SetVariable>
                                     <SetVariable name="ObjectName">SyncKeyButton</SetVariable>
-                                    <SetVariable name="MinimumSize"><Variable name="WideButtonMinimumSize"/></SetVariable>
-                                    <SetVariable name="MaximumSize"><Variable name="WideButtonMaximumSize"/></SetVariable>
-                                    <SetVariable name="SizePolicy"><Variable name="WideButtonSizePolicy"/></SetVariable>
+                                    <SetVariable name="MinimumSize">42,22</SetVariable>
+                                    <SetVariable name="MaximumSize">42,22</SetVariable>
+                                    <SetVariable name="SizePolicy">f,f</SetVariable>
                                     <SetVariable name="state_0_text">Match</SetVariable>
                                     <SetVariable name="state_0_pressed"></SetVariable>
                                     <SetVariable name="state_0_unpressed"></SetVariable>
@@ -212,11 +177,47 @@
                                     <SetVariable name="right_connection_control"><Variable name="group"/>,reset_key</SetVariable>
                                   </Template>
                                 </Children>
-                              </WidgetGroup>
+                              </WidgetGroup><!-- KeyEditRowControls -->
+
+                              <WidgetGroup>
+                                <!-- The key edit controls are aligned to the right because the key
+                                     widget widths can rapidly change, especially with traditional
+                                     notation selected in the preferences. The controls stay calm
+                                     this way. -->
+                                <Layout>stacked</Layout>
+                                <MinimumSize>60,</MinimumSize>
+                                <Children>
+                                  <PushButton>
+                                    <ObjectName>KeyEditTrigger</ObjectName>
+                                    <TooltipId>visual_key</TooltipId>
+                                    <NumberStates>1</NumberStates>
+                                    <State>
+                                      <Number>0</Number>
+                                      <!-- <Text>&#9998;</Text>
+                                      <Alignment>right</Alignment> -->
+                                      <Pressed scalemode="STRETCH"></Pressed>
+                                      <Unpressed scalemode="STRETCH"></Unpressed>
+                                    </State>
+                                    <Connection>
+                                      <ConfigKey>[Deere],key_layout_next</ConfigKey>
+                                    </Connection>
+                                  </PushButton>
+
+                                  <Key>
+                                    <ObjectName>KeyEditTriggerLabel</ObjectName>
+                                    <Group><Variable name="group"/></Group>
+                                    <SizePolicy>min,</SizePolicy>
+                                    <DisplayCents>true</DisplayCents>
+                                    <Connection>
+                                      <ConfigKey><Variable name="group"/>,visual_key</ConfigKey>
+                                    </Connection>
+                                  </Key>
+                                </Children>
+                              </WidgetGroup><!-- KeyEditTrigger -->
                             </Children>
-                          </WidgetGroup>
+                          </WidgetGroup><!-- KeyEditRowExpanded -->
                         </Children>
-                      </WidgetStack>
+                      </WidgetStack><!-- KeyEditRow -->
 
                       <!-- Fake a click-able multi-state widget by stacking a
                            transparent PushButton dummy (the trigger) on top of the
@@ -233,6 +234,7 @@
                         <PrevControl>[Deere],bpm_layout_prev</PrevControl>
                         <Children>
                           <WidgetGroup>
+                            <ObjectName>KeyEditRowCollapsed</ObjectName>
                             <Layout>stacked</Layout>
                             <Children>
                               <PushButton>
@@ -281,44 +283,13 @@
                                   </Transform>
                                 </Connection>
                               </Label>
-
                             </Children>
-                          </WidgetGroup>
+                          </WidgetGroup><!-- BpmEditTrigger -->
 
                           <WidgetGroup>
                             <ObjectName>BpmEditRowExpanded</ObjectName>
                             <Layout>horizontal</Layout>
                             <Children>
-                              <WidgetGroup>
-                                <Layout>stacked</Layout>
-                                <Children>
-                                  <PushButton>
-                                    <ObjectName>BpmEditTrigger</ObjectName>
-                                    <TooltipId>visual_bpm</TooltipId>
-                                    <NumberStates>1</NumberStates>
-                                    <State>
-                                      <Number>0</Number>
-                                      <!-- <Text>&#9998;</Text>
-                                      <Alignment>right</Alignment> -->
-                                      <Pressed scalemode="STRETCH"></Pressed>
-                                      <Unpressed scalemode="STRETCH"></Unpressed>
-                                    </State>
-                                    <Connection>
-                                      <ConfigKey>[Deere],bpm_layout_next</ConfigKey>
-                                    </Connection>
-                                  </PushButton>
-
-                                  <NumberBpm>
-                                    <ObjectName>BpmEditTriggerLabel</ObjectName>
-                                    <Group><Variable name="group"/></Group>
-                                    <Alignment>right</Alignment>
-                                    <Connection>
-                                      <ConfigKey><Variable name="group"/>,visual_bpm</ConfigKey>
-                                    </Connection>
-                                  </NumberBpm>
-                                </Children>
-                              </WidgetGroup>
-
                               <WidgetGroup>
                                 <ObjectName>BpmEditRowControls</ObjectName>
                                 <Layout>horizontal</Layout>
@@ -375,6 +346,19 @@
                                     <SetVariable name="left_connection_control"><Variable name="group"/>,beats_translate_later</SetVariable>
                                   </Template>
 
+                                  <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>
+
                                   <PushButton>
                                     <TooltipId>bpm_tap</TooltipId>
                                     <MinimumSize>40,20</MinimumSize>
@@ -393,16 +377,43 @@
                                 </Children>
                               </WidgetGroup>
 
+                              <WidgetGroup>
+                                <Layout>stacked</Layout>
+                                <Children>
+                                  <PushButton>
+                                    <ObjectName>BpmEditTrigger</ObjectName>
+                                    <TooltipId>visual_bpm</TooltipId>
+                                    <NumberStates>1</NumberStates>
+                                    <State>
+                                      <Number>0</Number>
+                                      <Pressed scalemode="STRETCH"></Pressed>
+                                      <Unpressed scalemode="STRETCH"></Unpressed>
+                                    </State>
+                                    <Connection>
+                                      <ConfigKey>[Deere],bpm_layout_next</ConfigKey>
+                                    </Connection>
+                                  </PushButton>
+
+                                  <NumberBpm>
+                                    <ObjectName>BpmEditTriggerLabel</ObjectName>
+                                    <Group><Variable name="group"/></Group>
+                                    <Alignment>right</Alignment>
+                                    <Connection>
+                                      <ConfigKey><Variable name="group"/>,visual_bpm</ConfigKey>
+                                    </Connection>
+                                  </NumberBpm>
+                                </Children>
+                              </WidgetGroup><!-- BpmEditTrigger -->
                             </Children>
-                          </WidgetGroup>
+                          </WidgetGroup><!-- BpmEditRowExpanded -->
                         </Children>
-                      </WidgetStack>
+                      </WidgetStack><!-- BpmEditRow -->
                     </Children>
-                  </WidgetGroup>
+                  </WidgetGroup><!-- BPMGutter -->
                 </Children>
-              </WidgetGroup>
+              </WidgetGroup><!-- TitleGutter -->
             </Children>
-          </WidgetGroup>
+          </WidgetGroup><!-- UpperTextRow -->
 
           <WidgetGroup>
             <ObjectName>LowerTextRow</ObjectName>
@@ -475,11 +486,11 @@
                     </Children>
                   </WidgetGroup>
                 </Children>
-              </WidgetGroup>
+              </WidgetGroup><!-- ArtistGutter -->
             </Children>
-          </WidgetGroup>
+          </WidgetGroup><!-- LowerTextRow -->
         </Children>
-      </WidgetGroup>
+      </WidgetGroup><!-- DeckTextColumn -->
     </Children>
-  </WidgetGroup>
+  </WidgetGroup><!-- DeckTextRow -->
 </Template>
diff --git a/res/skins/Deere/effect_focus_button.xml b/res/skins/Deere/effect_focus_button.xml
index 31737fff674f..347d42e6a517 100644
--- a/res/skins/Deere/effect_focus_button.xml
+++ b/res/skins/Deere/effect_focus_button.xml
@@ -7,10 +7,13 @@ Variables:
   Effect: the effect
 -->
 <Template>
+  <SetVariable name="EffectGroup">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>]</SetVariable>
   <WidgetGroup>
     <ObjectName>EffectFocusButtonContainer</ObjectName>
-    <Layout>horizontal</Layout>
+    <!-- use 'vertical' to prevent effect slot from flickering when un/foussing an effect -->
+    <Layout>vertical</Layout>
     <Children>
+      <!-- visible if focused: left-click > unfocus, right click > unfocus -->
       <PushButton>
         <TooltipId>EffectSlot_focus</TooltipId>
         <ObjectName>CircleButton</ObjectName>
@@ -29,26 +32,70 @@ Variables:
           <Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Unpressed>
         </State>
         <Connection>
-          <ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],focused_effect</ConfigKey>
+          <ConfigKey><Variable name="EffectGroup"/>,focused_effect</ConfigKey>
           <ButtonState>LeftButton</ButtonState>
           <EmitOnDownPress>true</EmitOnDownPress>
-          <Transform>
-            <IsEqual><Variable name="Effect"/></IsEqual>
-          </Transform>
+          <Transform><IsEqual><Variable name="Effect"/></IsEqual><Not/></Transform>
         </Connection>
         <Connection>
-          <ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],focused_effect</ConfigKey>
+          <ConfigKey><Variable name="EffectGroup"/>,focused_effect</ConfigKey>
           <ButtonState>RightButton</ButtonState>
           <EmitOnDownPress>true</EmitOnDownPress>
-          <Transform>
-            <IsEqual><Variable name="Effect"/></IsEqual>
-            <Not/>
-          </Transform>
+          <Transform><IsEqual><Variable name="Effect"/></IsEqual><Not/></Transform>
+        </Connection>
+        <!-- Without this, focus button wouldn't display actual button state -->
+        <Connection>
+          <ConfigKey><Variable name="EffectGroup"/>,focused_effect</ConfigKey>
+          <Transform><IsEqual><Variable name="Effect"/></IsEqual></Transform>
+          <ConnectValueFromWidget>false</ConnectValueFromWidget>
+        </Connection>
+        <Connection>
+          <ConfigKey><Variable name="EffectGroup"/>,focused_effect</ConfigKey>
+          <Transform><IsEqual><Variable name="Effect"/></IsEqual></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </PushButton>
+
+      <!-- visible if unfocused: left-click > focus, right click > unfocus -->
+      <PushButton>
+        <TooltipId>EffectSlot_focus</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="EffectGroup"/>,focused_effect</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+          <EmitOnDownPress>true</EmitOnDownPress>
+          <Transform><IsEqual><Variable name="Effect"/></IsEqual></Transform>
+        </Connection>
+        <Connection>
+          <ConfigKey><Variable name="EffectGroup"/>,focused_effect</ConfigKey>
+          <ButtonState>RightButton</ButtonState>
+          <EmitOnDownPress>true</EmitOnDownPress>
+          <Transform><IsEqual><Variable name="Effect"/></IsEqual><Not/></Transform>
+        </Connection>
+        <Connection>
+          <ConfigKey><Variable name="EffectGroup"/>,focused_effect</ConfigKey>
+          <Transform><IsEqual><Variable name="Effect"/></IsEqual><Not/></Transform>
+          <BindProperty>visible</BindProperty>
         </Connection>
       </PushButton>
+
     </Children>
     <Connection>
-      <ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],show_focus</ConfigKey>
+      <ConfigKey><Variable name="EffectGroup"/>,show_focus</ConfigKey>
       <BindProperty>visible</BindProperty>
     </Connection>
   </WidgetGroup>
diff --git a/res/skins/Deere/equalizer_rack_parameter_left.xml b/res/skins/Deere/equalizer_rack_parameter_left.xml
index 22dcaea9a8f8..591b84b4cde8 100644
--- a/res/skins/Deere/equalizer_rack_parameter_left.xml
+++ b/res/skins/Deere/equalizer_rack_parameter_left.xml
@@ -16,7 +16,7 @@
   <SetVariable name="EqualizerEffectGroup">[EqualizerRack<Variable name="EqualizerNumber"/>_<Variable name="group"/>_Effect<Variable name="EffectNumber"/>]</SetVariable>
   <WidgetGroup>
     <Layout>horizontal</Layout>
-    <Size>-1max,-1me</Size>
+    <SizePolicy>me,me</SizePolicy>
     <Children>
 
       <EffectPushButton>
@@ -46,6 +46,16 @@
         </Connection>
       </EffectPushButton>
 
+      <WidgetGroup><!-- Expanding spacer to push EQ knob to opposite side -->
+        <Size>0me,1min</Size>
+        <Children/>
+        <Connection>
+          <ConfigKey>[Master],show_killswitches</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
       <WidgetGroup>
         <ObjectName>EQKnob</ObjectName>
         <MinimumSize>40,34</MinimumSize>
diff --git a/res/skins/Deere/equalizer_rack_parameter_right.xml b/res/skins/Deere/equalizer_rack_parameter_right.xml
index 2d37df34767c..ea402ef265a2 100644
--- a/res/skins/Deere/equalizer_rack_parameter_right.xml
+++ b/res/skins/Deere/equalizer_rack_parameter_right.xml
@@ -16,7 +16,7 @@
   <SetVariable name="EqualizerEffectGroup">[EqualizerRack<Variable name="EqualizerNumber"/>_<Variable name="group"/>_Effect<Variable name="EffectNumber"/>]</SetVariable>
   <WidgetGroup>
     <Layout>horizontal</Layout>
-    <Size>-1max,-1me</Size>
+    <SizePolicy>me,me</SizePolicy>
     <Children>
 
       <WidgetGroup>
@@ -66,6 +66,16 @@
         </Connection>
       </EffectPushButton>
 
+      <WidgetGroup><!-- Expanding spacer to push EQ knob to opposite side -->
+        <Size>0me,1min</Size>
+        <Children/>
+        <Connection>
+          <ConfigKey>[Master],show_killswitches</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
     </Children>
     <Connection>
       <ConfigKey><Variable name="EqualizerEffectGroup"/>,parameter<Variable name="parameter"/>_loaded</ConfigKey>
diff --git a/res/skins/Deere/handle-horizontal.svg b/res/skins/Deere/handle-crossfader.svg
similarity index 100%
rename from res/skins/Deere/handle-horizontal.svg
rename to res/skins/Deere/handle-crossfader.svg
diff --git a/res/skins/Deere/icon/ic_autodj_32px.svg b/res/skins/Deere/icon/ic_autodj_32px.svg
index 9ae0f3db493b..bcca289a4507 100644
--- a/res/skins/Deere/icon/ic_autodj_32px.svg
+++ b/res/skins/Deere/icon/ic_autodj_32px.svg
@@ -51,5 +51,5 @@
      inkscape:connector-curvature="0"
      id="path6"
      d="m 27,12 2,0 c 0.554,0 1,0.446 1,1 l 0,8 c 0,0.554 -0.446,1 -1,1 l -2,0 c -0.554,0 -1,-0.446 -1,-1 l 0,-8 c 0,-0.554 0.446,-1 1,-1 z m -24,0 2,0 c 0.554,0 1,0.446 1,1 l 0,8 c 0,0.554 -0.446,1 -1,1 L 3,22 C 2.446,22 2,21.554 2,21 L 2,13 C 2,12.446 2.446,12 3,12 Z M 8,12 8,13.1563 8,14 8,24.844 c 0,0.6463 0.446,1.1562 1,1.1562 l 1,0 0,3 c 0,0.554 0.446,1 1,1 l 2,0 c 0.554,0 1,-0.446 1,-1 l 0,-3 4,0 0,3 c 0,0.554 0.446,1 1,1 l 2,0 c 0.554,0 1,-0.446 1,-1 l 0,-3 1,0 c 0.554,0 1,-0.5099 1,-1.1562 L 24,14 24,13.1563 24,12 23,12 9,12 8,12 Z M 16,1.938 c -4.4183,0 -8,3.5967 -8,8.0313 0,0.011 -4.09e-5,0.021 0,0.031 l 16,0 c 4.1e-5,-0.011 0,-0.021 0,-0.031 C 24,5.5347 20.4183,1.938 16,1.938 Z m -3.5,3.0625 c 0.82843,0 1.5,0.6716 1.5,1.5 0,0.8284 -0.67157,1.5 -1.5,1.5 -0.82843,0 -1.5,-0.6716 -1.5,-1.5 0,-0.8284 0.67157,-1.5 1.5,-1.5 z m 7,0 c 0.82843,0 1.5,0.6716 1.5,1.5 0,0.8284 -0.67157,1.5 -1.5,1.5 -0.82843,0 -1.5,-0.6716 -1.5,-1.5 0,-0.8284 0.67157,-1.5 1.5,-1.5 z"
-     style="color:#000000;fill:#d2d2d2;fill-opacity:1" />
+     style="color:#000000;fill:#ff6600;fill-opacity:1" />
 </svg>
diff --git a/res/skins/Deere/icon/ic_broadcast_0_32px.svg b/res/skins/Deere/icon/ic_broadcast_0_32px.svg
new file mode 100644
index 000000000000..9d3dabf3d841
--- /dev/null
+++ b/res/skins/Deere/icon/ic_broadcast_0_32px.svg
@@ -0,0 +1,56 @@
+<?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"
+   height="32"
+   width="32"
+   version="1.1"
+   viewBox="0 0 31.999999 31.999998"
+   id="svg2"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="ic_broadcast_0_32px.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="747"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="7.375"
+     inkscape:cx="14.440678"
+     inkscape:cy="16.542373"
+     inkscape:window-x="0"
+     inkscape:window-y="21"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     inkscape:snap-page="true" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path6"
+     d="m 25.938578,5.2812486 a 0.76570156,0.76570156 0 0 0 -0.526367,0.2317547 l -4.59375,4.5937497 a 0.76570156,0.76570156 0 1 0 1.08267,1.08267 l 4.59375,-4.5937495 A 0.76570156,0.76570156 0 0 0 25.938609,5.2812486 z M 11.429218,20.601405 c -0.222153,-0.0076 -0.436069,0.0843 -0.586177,0.248216 l -3.9821693,4.344003 -0.8000016,-0.0076 c -0.1862688,0 -0.366497,0.06584 -0.506928,0.188419 -0.01441,0.01225 -0.028382,0.0245 -0.041872,0.03751 l -0.00751,0.0092 c -0.1509966,0.151441 -0.2317777,0.359078 -0.2228122,0.572765 0.019186,0.408766 0.356406,0.730176 0.765625,0.729793 l 1.1439203,0 8.4042658,0 0.02392,0 8.801625,0 0.0015,0 c 1.006568,-0.01301 1.008022,-1.516014 0.0016,-1.53125 l -0.0016,0 -3.826593,-0.0077 -0.003,0 -4.638616,0.0077 -3.982169,-4.345534 c -0.139869,-0.152738 -0.335708,-0.242316 -0.542772,-0.248211 z m 15.290298,-1.359214 a 9.8666091,9.8666091 0 0 1 -9.530501,2.553743 9.8666091,9.8666091 0 0 1 -6.97691,-6.976912 9.8666091,9.8666091 0 0 1 2.553742,-9.5305"
+     style="text-indent:0;text-decoration:none;text-transform:none;block-progression:tb;color:#000000;fill:#d2d2d2;fill-opacity:1" />
+</svg>
diff --git a/res/skins/Deere/icon/ic_broadcast_32px.svg b/res/skins/Deere/icon/ic_broadcast_1_32px.svg
similarity index 50%
rename from res/skins/Deere/icon/ic_broadcast_32px.svg
rename to res/skins/Deere/icon/ic_broadcast_1_32px.svg
index 6567a3ce33e2..ecb3a134ee6b 100644
--- a/res/skins/Deere/icon/ic_broadcast_32px.svg
+++ b/res/skins/Deere/icon/ic_broadcast_1_32px.svg
@@ -12,8 +12,8 @@
    version="1.1"
    viewBox="0 0 31.999999 31.999998"
    id="svg2"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ic_broadcast_32px.svg">
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="ic_broadcast_1_32px.svg">
   <metadata
      id="metadata12">
     <rdf:RDF>
@@ -37,19 +37,19 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1366"
-     inkscape:window-height="702"
+     inkscape:window-height="747"
      id="namedview8"
      showgrid="false"
      inkscape:zoom="7.375"
-     inkscape:cx="16.813559"
+     inkscape:cx="-6.1016952"
      inkscape:cy="16.542373"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="21"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg2" />
   <path
      inkscape:connector-curvature="0"
      id="path6"
-     d="m 28.981,2 a 1.0001,1.0001 0 0 0 -0.6875,0.3027 l -6,6 a 1.0001,1.0001 0 1 0 1.4141,1.4141 l 6,-6 A 1.0001,1.0001 0 0 0 28.98104,2 Z M 10.03,22.01 C 9.7398397,22 9.4604397,22.1201 9.2643797,22.3342 l -5.2012,5.6738 -1.0449,-0.01 c -0.24329,0 -0.47869,0.086 -0.66211,0.2461 -0.01882,0.016 -0.03707,0.032 -0.05469,0.049 l -0.0098,0.012 c -0.19722,0.1978 -0.30273,0.469 -0.29102,0.7481 0.02506,0.5339 0.46551,0.9537 1,0.9532 l 1.4941,0 10.9770003,0 0.03125,0 11.496,0 0.002,0 c 1.3147,-0.017 1.3166,-1.9801 0.002,-2 l -0.002,0 -4.998,-0.01 -0.0039,0 -6.0586,0.01 -5.2012,-5.6758 C 10.55657,22.1311 10.30078,22.0141 10.03033,22.0064 Z M 30.001,20.2347 A 12.887,12.887 0 0 1 17.553,23.5702 12.887,12.887 0 0 1 8.4402997,14.4575 12.887,12.887 0 0 1 11.7758,2.0095"
-     style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;block-progression:tb;white-space:normal;isolation:auto;mix-blend-mode:normal;solid-color:#000000;fill:#d2d2d2;color-rendering:auto;image-rendering:auto;shape-rendering:auto;fill-opacity:1" />
+     d="M 25.93858,5.2812483 A 0.7657016,0.7657016 0 0 0 25.412212,5.513003 l -4.59375,4.59375 a 0.7657016,0.7657016 0 1 0 1.082671,1.08267 l 4.59375,-4.5937496 A 0.7657016,0.7657016 0 0 0 25.93861,5.2812483 z M 11.429219,20.601406 c -0.222154,-0.0076 -0.436069,0.0843 -0.586177,0.248215 l -3.98217,4.344004 -0.8000016,-0.0077 c -0.1862689,0 -0.3664971,0.06584 -0.5069281,0.18842 -0.01441,0.01225 -0.028382,0.0245 -0.041872,0.03751 l -0.00751,0.0092 c -0.1509966,0.151441 -0.2317777,0.359078 -0.2228122,0.572765 0.019186,0.408766 0.3564061,0.730176 0.765625,0.729793 l 1.1439204,0 8.4042665,0 0.02392,0 8.801625,0 0.0015,0 c 1.006568,-0.01301 1.008022,-1.516014 0.0016,-1.53125 l -0.0016,0 -3.826593,-0.0077 -0.003,0 -4.638616,0.0077 -3.982169,-4.345534 c -0.13987,-0.152738 -0.335709,-0.242317 -0.542772,-0.248211 z m 15.290298,-1.359215 a 9.8666097,9.8666097 0 0 1 -9.530501,2.553743 9.8666097,9.8666097 0 0 1 -6.976911,-6.976912 9.8666097,9.8666097 0 0 1 2.553742,-9.5305002"
+     style="text-indent:0;text-decoration:none;text-transform:none;block-progression:tb;color:#000000;fill:#ffd615;fill-opacity:1" />
 </svg>
diff --git a/res/skins/Deere/icon/ic_broadcast_2_32px.svg b/res/skins/Deere/icon/ic_broadcast_2_32px.svg
new file mode 100644
index 000000000000..b3f26e9c47fb
--- /dev/null
+++ b/res/skins/Deere/icon/ic_broadcast_2_32px.svg
@@ -0,0 +1,57 @@
+<?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"
+   height="32"
+   width="32"
+   version="1.1"
+   viewBox="0 0 31.999999 31.999998"
+   id="svg2"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="ic_broadcast_0_32px.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="747"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="7.375"
+     inkscape:cx="-6.779661"
+     inkscape:cy="16.542373"
+     inkscape:window-x="0"
+     inkscape:window-y="21"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     inkscape:snap-page="true" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path6"
+     d="m 25.938578,5.2812486 a 0.76570156,0.76570156 0 0 0 -0.526367,0.2317547 l -4.59375,4.5937497 a 0.76570156,0.76570156 0 1 0 1.08267,1.08267 l 4.59375,-4.5937495 A 0.76570156,0.76570156 0 0 0 25.938609,5.2812486 z M 11.429218,20.601405 c -0.222153,-0.0076 -0.436069,0.0843 -0.586177,0.248216 l -3.9821693,4.344003 -0.8000016,-0.0076 c -0.1862688,0 -0.366497,0.06584 -0.506928,0.188419 -0.01441,0.01225 -0.028382,0.0245 -0.041872,0.03751 l -0.00751,0.0092 c -0.1509966,0.151441 -0.2317777,0.359078 -0.2228122,0.572765 0.019186,0.408766 0.356406,0.730176 0.765625,0.729793 l 1.1439203,0 8.4042658,0 0.02392,0 8.801625,0 0.0015,0 c 1.006568,-0.01301 1.008022,-1.516014 0.0016,-1.53125 l -0.0016,0 -3.826593,-0.0077 -0.003,0 -4.638616,0.0077 -3.982169,-4.345534 c -0.139869,-0.152738 -0.335708,-0.242316 -0.542772,-0.248211 z m 15.290298,-1.359214 a 9.8666091,9.8666091 0 0 1 -9.530501,2.553743 9.8666091,9.8666091 0 0 1 -6.97691,-6.976912 9.8666091,9.8666091 0 0 1 2.553742,-9.5305"
+     style="text-indent:0;text-decoration:none;text-transform:none;block-progression:tb;color:#000000;fill:#eeeeee;fill-opacity:1" />
+</svg>
diff --git a/res/skins/Deere/icon/ic_broadcast_3_32px.svg b/res/skins/Deere/icon/ic_broadcast_3_32px.svg
new file mode 100644
index 000000000000..31d92baa3848
--- /dev/null
+++ b/res/skins/Deere/icon/ic_broadcast_3_32px.svg
@@ -0,0 +1,55 @@
+<?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"
+   height="32"
+   width="32"
+   version="1.1"
+   viewBox="0 0 31.999999 31.999998"
+   id="svg2"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="ic_broadcast_3_32px.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="747"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="4"
+     inkscape:cx="21.774089"
+     inkscape:cy="21.843223"
+     inkscape:window-x="0"
+     inkscape:window-y="21"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path6"
+     d="M 25.93858,5.2812483 A 0.7657016,0.7657016 0 0 0 25.412212,5.513003 l -4.59375,4.59375 a 0.7657016,0.7657016 0 1 0 1.082671,1.08267 l 4.59375,-4.5937496 A 0.7657016,0.7657016 0 0 0 25.93861,5.2812483 z M 11.429219,20.601406 c -0.222154,-0.0076 -0.436069,0.0843 -0.586177,0.248215 l -3.98217,4.344004 -0.8000016,-0.0077 c -0.1862689,0 -0.3664971,0.06584 -0.5069281,0.18842 -0.01441,0.01225 -0.028382,0.0245 -0.041872,0.03751 l -0.00751,0.0092 c -0.1509966,0.151441 -0.2317777,0.359078 -0.2228122,0.572765 0.019186,0.408766 0.3564061,0.730176 0.765625,0.729793 l 1.1439204,0 8.4042665,0 0.02392,0 8.801625,0 0.0015,0 c 1.006568,-0.01301 1.008022,-1.516014 0.0016,-1.53125 l -0.0016,0 -3.826593,-0.0077 -0.003,0 -4.638616,0.0077 -3.982169,-4.345534 c -0.13987,-0.152738 -0.335709,-0.242317 -0.542772,-0.248211 z m 15.290298,-1.359215 a 9.8666097,9.8666097 0 0 1 -9.530501,2.553743 9.8666097,9.8666097 0 0 1 -6.976911,-6.976912 9.8666097,9.8666097 0 0 1 2.553742,-9.5305002"
+     style="text-indent:0;text-decoration:none;text-transform:none;block-progression:tb;color:#000000;fill:#ff13ed;fill-opacity:1" />
+</svg>
diff --git a/res/skins/Deere/icon/ic_recording_32px.svg b/res/skins/Deere/icon/ic_recording_0_32px.svg
similarity index 52%
rename from res/skins/Deere/icon/ic_recording_32px.svg
rename to res/skins/Deere/icon/ic_recording_0_32px.svg
index b2e58f377db2..35cf3f004481 100644
--- a/res/skins/Deere/icon/ic_recording_32px.svg
+++ b/res/skins/Deere/icon/ic_recording_0_32px.svg
@@ -12,8 +12,8 @@
    version="1.1"
    viewBox="0 0 31.999999 31.999998"
    id="svg2"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ic_recording_32px.svg">
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="ic_recording_0_32px.svg">
   <metadata
      id="metadata12">
     <rdf:RDF>
@@ -37,19 +37,19 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1366"
-     inkscape:window-height="702"
+     inkscape:window-height="747"
      id="namedview8"
      showgrid="false"
      inkscape:zoom="7.375"
      inkscape:cx="16.813559"
      inkscape:cy="16.542373"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="21"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg2" />
   <path
      style="fill:#d2d2d2;fill-opacity:1"
      inkscape:connector-curvature="0"
      id="path6"
-     d="M 2.875,5 C 1.8362,5 1,5.892 1,7 l 0,18 c 0,1.108 0.83625,2 1.875,2 l 26.25,0 C 30.1638,27 31,26.108 31,25 L 31,7 C 31,5.892 30.16375,5 29.125,5 L 25,5 25,9 7,9 7,5 2.875,5 Z M 9,5 9,7 23,7 23,5 9,5 Z M 8,15 c 1.6569,0 3,1.3431 3,3 0,1.6569 -1.3431,3 -3,3 -1.6569,0 -3,-1.3431 -3,-3 0,-1.6569 1.3431,-3 3,-3 z m 16,0 c 1.6569,0 3,1.3431 3,3 0,1.6569 -1.3431,3 -3,3 -1.6569,0 -3,-1.3431 -3,-3 0,-1.6569 1.3431,-3 3,-3 z m -10.5,2 5,0 c 0.277,0 0.5,0.223 0.5,0.5 l 0,1 c 0,0.277 -0.223,0.5 -0.5,0.5 l -5,0 C 13.223,19 13,18.777 13,18.5 l 0,-1 C 13,17.223 13.223,17 13.5,17 Z" />
+     d="m 5.9511719,7.5781235 c -0.7953314,0 -1.435547,0.6829375 -1.435547,1.53125 l 0,13.7812515 c 0,0.848312 0.6402539,1.53125 1.435547,1.53125 l 20.0976581,0 c 0.795331,0 1.435547,-0.682938 1.435547,-1.53125 l 0,-13.7812515 c 0,-0.8483125 -0.640255,-1.53125 -1.435547,-1.53125 l -3.158204,0 0,3.0625005 -13.7812508,0 0,-3.0625005 -3.1582033,0 z m 4.6894531,0 0,1.53125 10.718751,0 0,-1.53125 -10.718751,0 z M 9.8750002,15.234374 c 1.2685648,0 2.2968748,1.028311 2.2968748,2.296875 0,1.268564 -1.02831,2.296876 -2.2968748,2.296876 -1.2685641,0 -2.2968751,-1.028312 -2.2968751,-2.296876 0,-1.268564 1.028311,-2.296875 2.2968751,-2.296875 z m 12.2500008,0 c 1.268564,0 2.296875,1.028311 2.296875,2.296875 0,1.268564 -1.028311,2.296876 -2.296875,2.296876 -1.268564,0 -2.296875,-1.028312 -2.296875,-2.296876 0,-1.268564 1.028311,-2.296875 2.296875,-2.296875 z m -8.039063,1.53125 3.828125,0 c 0.212078,0 0.382812,0.170734 0.382812,0.382812 l 0,0.765625 c 0,0.212078 -0.170734,0.382813 -0.382812,0.382813 l -3.828125,0 c -0.212078,0 -0.382813,-0.170735 -0.382813,-0.382813 l 0,-0.765625 c 0,-0.212078 0.170735,-0.382812 0.382813,-0.382812 z" />
 </svg>
diff --git a/res/skins/Deere/icon/ic_recording_1_32px.svg b/res/skins/Deere/icon/ic_recording_1_32px.svg
new file mode 100644
index 000000000000..668951942af9
--- /dev/null
+++ b/res/skins/Deere/icon/ic_recording_1_32px.svg
@@ -0,0 +1,55 @@
+<?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"
+   height="32"
+   width="32"
+   version="1.1"
+   viewBox="0 0 31.999999 31.999998"
+   id="svg2"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="ic_recording_1_32px.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="747"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="7.375"
+     inkscape:cx="-6.1016952"
+     inkscape:cy="16.542373"
+     inkscape:window-x="0"
+     inkscape:window-y="21"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     style="fill:#ffd615;fill-opacity:1"
+     inkscape:connector-curvature="0"
+     id="path6"
+     d="m 5.9511719,7.5781235 c -0.7953314,0 -1.435547,0.6829375 -1.435547,1.53125 l 0,13.7812515 c 0,0.848312 0.6402539,1.53125 1.435547,1.53125 l 20.0976581,0 c 0.795331,0 1.435547,-0.682938 1.435547,-1.53125 l 0,-13.7812515 c 0,-0.8483125 -0.640255,-1.53125 -1.435547,-1.53125 l -3.158204,0 0,3.0625005 -13.7812508,0 0,-3.0625005 -3.1582033,0 z m 4.6894531,0 0,1.53125 10.718751,0 0,-1.53125 -10.718751,0 z M 9.8750002,15.234374 c 1.2685648,0 2.2968748,1.028311 2.2968748,2.296875 0,1.268564 -1.02831,2.296876 -2.2968748,2.296876 -1.2685641,0 -2.2968751,-1.028312 -2.2968751,-2.296876 0,-1.268564 1.028311,-2.296875 2.2968751,-2.296875 z m 12.2500008,0 c 1.268564,0 2.296875,1.028311 2.296875,2.296875 0,1.268564 -1.028311,2.296876 -2.296875,2.296876 -1.268564,0 -2.296875,-1.028312 -2.296875,-2.296876 0,-1.268564 1.028311,-2.296875 2.296875,-2.296875 z m -8.039063,1.53125 3.828125,0 c 0.212078,0 0.382812,0.170734 0.382812,0.382812 l 0,0.765625 c 0,0.212078 -0.170734,0.382813 -0.382812,0.382813 l -3.828125,0 c -0.212078,0 -0.382813,-0.170735 -0.382813,-0.382813 l 0,-0.765625 c 0,-0.212078 0.170735,-0.382812 0.382813,-0.382812 z" />
+</svg>
diff --git a/res/skins/Deere/icon/ic_recording_2_32px.svg b/res/skins/Deere/icon/ic_recording_2_32px.svg
new file mode 100644
index 000000000000..7f78546ed4fb
--- /dev/null
+++ b/res/skins/Deere/icon/ic_recording_2_32px.svg
@@ -0,0 +1,55 @@
+<?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"
+   height="32"
+   width="32"
+   version="1.1"
+   viewBox="0 0 31.999999 31.999998"
+   id="svg2"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="ic_recording_2_32px.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="747"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="7.375"
+     inkscape:cx="-44.067797"
+     inkscape:cy="16.542373"
+     inkscape:window-x="0"
+     inkscape:window-y="21"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     style="fill:#eeeeee;fill-opacity:1"
+     inkscape:connector-curvature="0"
+     id="path6"
+     d="m 5.951171,7.5781235 c -0.7953314,0 -1.435547,0.6829375 -1.435547,1.53125 l 0,13.7812515 c 0,0.848312 0.640254,1.53125 1.435547,1.53125 l 20.097658,0 c 0.795331,0 1.435547,-0.682938 1.435547,-1.53125 l 0,-13.7812515 c 0,-0.8483125 -0.640254,-1.53125 -1.435547,-1.53125 l -3.158203,0 0,3.0625005 -13.7812517,0 0,-3.0625005 -3.1582033,0 z m 4.689453,0 0,1.53125 10.718752,0 0,-1.53125 -10.718752,0 z M 9.8749993,15.234374 c 1.2685647,0 2.2968747,1.028311 2.2968747,2.296875 0,1.268564 -1.02831,2.296876 -2.2968747,2.296876 -1.2685641,0 -2.2968751,-1.028312 -2.2968751,-2.296876 0,-1.268564 1.028311,-2.296875 2.2968751,-2.296875 z m 12.2500017,0 c 1.268563,0 2.296875,1.028311 2.296875,2.296875 0,1.268564 -1.028312,2.296876 -2.296875,2.296876 -1.268565,0 -2.296876,-1.028312 -2.296876,-2.296876 0,-1.268564 1.028311,-2.296875 2.296876,-2.296875 z m -8.039064,1.53125 3.828125,0 c 0.212078,0 0.382813,0.170734 0.382813,0.382812 l 0,0.765625 c 0,0.212078 -0.170735,0.382813 -0.382813,0.382813 l -3.828125,0 c -0.212078,0 -0.382813,-0.170735 -0.382813,-0.382813 l 0,-0.765625 c 0,-0.212078 0.170735,-0.382812 0.382813,-0.382812 z" />
+</svg>
diff --git a/res/skins/Deere/icon/ic_recording_3_32px.svg b/res/skins/Deere/icon/ic_recording_3_32px.svg
new file mode 100644
index 000000000000..bf719dcdc2b4
--- /dev/null
+++ b/res/skins/Deere/icon/ic_recording_3_32px.svg
@@ -0,0 +1,55 @@
+<?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"
+   height="32"
+   width="32"
+   version="1.1"
+   viewBox="0 0 31.999999 31.999998"
+   id="svg2"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="ic_recording_3_32px.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="747"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="7.375"
+     inkscape:cx="-6.1016952"
+     inkscape:cy="16.542373"
+     inkscape:window-x="0"
+     inkscape:window-y="21"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     style="fill:#ff13ed;fill-opacity:1"
+     inkscape:connector-curvature="0"
+     id="path6"
+     d="m 5.9511719,7.5781235 c -0.7953314,0 -1.435547,0.6829375 -1.435547,1.53125 l 0,13.7812515 c 0,0.848312 0.6402539,1.53125 1.435547,1.53125 l 20.0976581,0 c 0.795331,0 1.435547,-0.682938 1.435547,-1.53125 l 0,-13.7812515 c 0,-0.8483125 -0.640255,-1.53125 -1.435547,-1.53125 l -3.158204,0 0,3.0625005 -13.7812508,0 0,-3.0625005 -3.1582033,0 z m 4.6894531,0 0,1.53125 10.718751,0 0,-1.53125 -10.718751,0 z M 9.8750002,15.234374 c 1.2685648,0 2.2968748,1.028311 2.2968748,2.296875 0,1.268564 -1.02831,2.296876 -2.2968748,2.296876 -1.2685641,0 -2.2968751,-1.028312 -2.2968751,-2.296876 0,-1.268564 1.028311,-2.296875 2.2968751,-2.296875 z m 12.2500008,0 c 1.268564,0 2.296875,1.028311 2.296875,2.296875 0,1.268564 -1.028311,2.296876 -2.296875,2.296876 -1.268564,0 -2.296875,-1.028312 -2.296875,-2.296876 0,-1.268564 1.028311,-2.296875 2.296875,-2.296875 z m -8.039063,1.53125 3.828125,0 c 0.212078,0 0.382812,0.170734 0.382812,0.382812 l 0,0.765625 c 0,0.212078 -0.170734,0.382813 -0.382812,0.382813 l -3.828125,0 c -0.212078,0 -0.382813,-0.170735 -0.382813,-0.382813 l 0,-0.765625 c 0,-0.212078 0.170735,-0.382812 0.382813,-0.382812 z" />
+</svg>
diff --git a/res/skins/Deere/icon/ic_vinylcontrol_32px.svg b/res/skins/Deere/icon/ic_vinylcontrol_32px.svg
index b011f22b71a5..429ca2654715 100644
--- a/res/skins/Deere/icon/ic_vinylcontrol_32px.svg
+++ b/res/skins/Deere/icon/ic_vinylcontrol_32px.svg
@@ -12,7 +12,7 @@
    version="1.1"
    viewBox="0 0 31.999999 31.999998"
    id="svg2"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.48.4 r9939"
    sodipodi:docname="ic_vinylcontrol_32px.svg">
   <metadata
      id="metadata12">
@@ -37,19 +37,20 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1366"
-     inkscape:window-height="702"
+     inkscape:window-height="746"
      id="namedview8"
      showgrid="false"
      inkscape:zoom="7.375"
-     inkscape:cx="16.813559"
+     inkscape:cx="-6.1016952"
      inkscape:cy="16.542373"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
+     inkscape:current-layer="svg2"
+     inkscape:snap-page="true" />
   <path
      inkscape:connector-curvature="0"
      id="path6"
-     d="M 16,2 C 8.32,2 2,8.32 2,16 2,23.6801 8.32,30 16,30 23.68,30 30,23.6801 30,16 30,8.32 23.68,2 16,2 Z m 0,8.7773 c 2.9365,0 5.2227,2.2862 5.2227,5.2227 0,2.9366 -2.2861,5.2227 -5.2227,5.2227 -2.9365,0 -5.2227,-2.2861 -5.2227,-5.2227 0,-2.9365 2.2861,-5.2227 5.2227,-5.2227 z m 0,2.5528 c -1.4665,0 -2.6699,1.2035 -2.6699,2.6699 0,1.4665 1.2034,2.6699 2.6699,2.6699 1.4665,0 2.6699,-1.2034 2.6699,-2.6699 0,-1.4664 -1.2035,-2.6699 -2.6699,-2.6699 z"
-     style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;text-transform:none;block-progression:tb;white-space:normal;isolation:auto;mix-blend-mode:normal;solid-color:#000000;fill:#d2d2d2;color-rendering:auto;image-rendering:auto;shape-rendering:auto;fill-opacity:1" />
+     d="m 16,3.7499994 c -6.7200002,0 -12.2500002,5.5299998 -12.2500002,12.2499996 0,6.720088 5.53,12.25 12.2500002,12.25 6.719999,0 12.249999,-5.529912 12.249999,-12.25 0,-6.7199998 -5.53,-12.2499996 -12.249999,-12.2499996 z m 0,7.6801376 c 2.569437,0 4.569862,2.000425 4.569862,4.569862 0,2.569525 -2.000338,4.569863 -4.569862,4.569863 -2.569438,0 -4.569863,-2.000338 -4.569863,-4.569863 0,-2.569437 2.000338,-4.569862 4.569863,-4.569862 z m 0,2.2337 c -1.283188,0 -2.336163,1.053062 -2.336163,2.336162 0,1.283188 1.052975,2.336163 2.336163,2.336163 1.283187,0 2.336162,-1.052975 2.336162,-2.336163 0,-1.2831 -1.053062,-2.336162 -2.336162,-2.336162 z"
+     style="text-indent:0;text-decoration:none;text-transform:none;block-progression:tb;color:#000000;fill:#d2d2d2;fill-opacity:1" />
 </svg>
diff --git a/res/skins/Deere/knob_bg.svg b/res/skins/Deere/knob_bg.svg
index c1784f5dac4c..f51ec1e16d01 100644
--- a/res/skins/Deere/knob_bg.svg
+++ b/res/skins/Deere/knob_bg.svg
@@ -12,7 +12,7 @@
    id="svg2"
    height="34"
    width="40"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.48.4 r9939"
    sodipodi:docname="knob_bg.svg">
   <sodipodi:namedview
      pagecolor="#ffffff"
@@ -24,14 +24,14 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1366"
-     inkscape:window-height="702"
+     inkscape:window-height="746"
      id="namedview17"
      showgrid="false"
-     inkscape:zoom="13.882353"
-     inkscape:cx="-9.5352971"
-     inkscape:cy="14.406656"
+     inkscape:zoom="6.9411765"
+     inkscape:cx="3.5582517"
+     inkscape:cy="18.39944"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg2" />
   <defs
@@ -93,13 +93,6 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <ellipse
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
-     id="path4202"
-     cx="-13.524048"
-     cy="0.45841381"
-     rx="2.5876327"
-     ry="2.4899862" />
   <path
      inkscape:connector-curvature="0"
      style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#d2d2d2;stroke-width:1.85;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
diff --git a/res/skins/Deere/knob_yellow.svg b/res/skins/Deere/knob_yellow.svg
index 83209e56a51e..eea3dc517ebe 100644
--- a/res/skins/Deere/knob_yellow.svg
+++ b/res/skins/Deere/knob_yellow.svg
@@ -12,7 +12,7 @@
    id="svg2"
    height="34"
    width="40"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.48.4 r9939"
    sodipodi:docname="knob_yellow.svg">
   <sodipodi:namedview
      pagecolor="#ffffff"
@@ -24,14 +24,14 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1366"
-     inkscape:window-height="702"
+     inkscape:window-height="746"
      id="namedview17"
      showgrid="false"
-     inkscape:zoom="13.882353"
-     inkscape:cx="0.76792018"
-     inkscape:cy="15.452775"
+     inkscape:zoom="9.8163059"
+     inkscape:cx="-1.4203399"
+     inkscape:cy="12.795823"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg2" />
   <defs
@@ -93,13 +93,6 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <ellipse
-     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
-     id="path4202"
-     cx="-13.524048"
-     cy="0.45841381"
-     rx="2.5876327"
-     ry="2.4899862" />
   <path
      style="opacity:1;fill:#d2d2d2;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      d="M 16.15039,7.7363283 A 11.539,11.539 0 0 0 8.460938,18.601562 11.539,11.539 0 0 0 20.000001,30.140625 11.539,11.539 0 0 0 31.539063,18.601562 11.539,11.539 0 0 0 23.84961,7.7382814 l 0,10.8632806 c 0,2.091956 -1.757654,3.84961 -3.849609,3.84961 -2.091956,0 -3.849611,-1.757654 -3.849611,-3.84961 l 0,-10.8652337 z"
diff --git a/res/skins/Deere/left_display_4state_button.xml b/res/skins/Deere/left_display_4state_button.xml
new file mode 100644
index 000000000000..4bd94a84546c
--- /dev/null
+++ b/res/skins/Deere/left_display_4state_button.xml
@@ -0,0 +1,54 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    A button that has a left-click control, a right-click control, and a 2-state
+    display control.
+  Variables:
+    ObjectName: The object name.
+    Size: the button size.
+    state_X_text:
+    state_X_pressed:
+    state_X_unpressed:
+-->
+<Template>
+  <PushButton>
+    <TooltipId><Variable name="TooltipId"/></TooltipId>
+    <ObjectName><Variable name="ObjectName"/></ObjectName>
+    <MinimumSize><Variable name="MinimumSize"/></MinimumSize>
+    <MaximumSize><Variable name="MaximumSize"/></MaximumSize>
+    <SizePolicy><Variable name="SizePolicy"/></SizePolicy>
+    <NumberStates>4</NumberStates>
+    <State>
+      <Number>0</Number>
+      <Text><Variable name="state_0_text"/></Text>
+      <Pressed scalemode="STRETCH_ASPECT"><Variable name="state_0"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT"><Variable name="state_0"/></Unpressed>
+    </State>
+    <State>
+      <Number>1</Number>
+      <Text><Variable name="state_1_text"/></Text>
+      <Pressed scalemode="STRETCH_ASPECT"><Variable name="state_1"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT"><Variable name="state_1"/></Unpressed>
+    </State>
+    <State>
+      <Number>2</Number>
+      <Text><Variable name="state_2_text"/></Text>
+      <Pressed scalemode="STRETCH_ASPECT"><Variable name="state_2"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT"><Variable name="state_2"/></Unpressed>
+    </State>
+    <State>
+      <Number>3</Number>
+      <Text><Variable name="state_3_text"/></Text>
+      <Pressed scalemode="STRETCH_ASPECT"><Variable name="state_3"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT"><Variable name="state_3"/></Unpressed>
+    </State>
+    <Connection>
+      <ConfigKey><Variable name="left_connection_control"/></ConfigKey>
+      <ButtonState>LeftButton</ButtonState>
+    </Connection>
+    <Connection>
+      <ConfigKey><Variable name="display_connection_control"/></ConfigKey>
+      <ConnectValueFromWidget>false</ConnectValueFromWidget>
+    </Connection>
+  </PushButton>
+</Template>
diff --git a/res/skins/Deere/loop.xml b/res/skins/Deere/loop.xml
index b061fcc98da4..7a6164fe16ab 100644
--- a/res/skins/Deere/loop.xml
+++ b/res/skins/Deere/loop.xml
@@ -8,106 +8,113 @@
 <Template>
   <WidgetGroup>
     <ObjectName>LoopContainer</ObjectName>
-    <Layout>horizontal</Layout>
+    <Layout>vertical</Layout>
+    <Children>
 
-    <MinimumSize>-1,-1</MinimumSize>
-    <SizePolicy>max,max</SizePolicy>
+      <WidgetGroup><!-- SpinBox + loop_activate -->
+        <Layout>horizontal</Layout>
+        <Children>
 
-    <Children>
+          <BeatSpinBox>
+            <ObjectName>BeatloopSizeSpinBox</ObjectName>
+            <TooltipId>beatloop_size</TooltipId>
+            <Value><Variable name="group"/>,beatloop_size</Value>
+          </BeatSpinBox>
 
-      <BeatSpinBox>
-        <ObjectName>BeatloopSizeSpinBox</ObjectName>
-        <TooltipId>beatloop_size</TooltipId>
-        <Value><Variable name="group"/>,beatloop_size</Value>
-      </BeatSpinBox>
+          <!-- Workaround for layout spacing -->
+          <Template src="skin:spacer_hx.xml">
+            <SetVariable name="width">2f,</SetVariable>
+          </Template>
 
-      <Template src="skin:spacer_hx.xml">
-        <SetVariable name="width">2</SetVariable>
-      </Template>
+          <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>
 
-      <WidgetGroup>
-        <ObjectName>LoopButtons</ObjectName>
-        <Layout>vertical</Layout>
-        <Children>
+        </Children>
+      </WidgetGroup><!-- SpinBox + loop_activate -->
 
-          <WidgetGroup>
-            <ObjectName>LoopButtonsTopRow</ObjectName>
-            <Layout>horizontal</Layout>
-            <Children>
+      <!-- Workaround for layout spacing -->
+      <Template src="skin:spacer_vx.xml">
+        <SetVariable name="height">,2f</SetVariable>
+      </Template>
 
-              <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>
+      <WidgetGroup><!-- loop_in, loop_out, reloop -->
+        <Layout>horizontal</Layout>
+        <Children>
 
-              <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>
+          <!-- Workaround for layout spacing -->
+          <Template src="skin:spacer_hx.xml">
+            <SetVariable name="width">6f,</SetVariable>
+          </Template>
 
-            </Children>
-          </WidgetGroup>
+          <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>
 
-          <WidgetGroup>
-            <ObjectName>LoopButtonsBottomRow</ObjectName>
-            <Layout>horizontal</Layout>
-            <Children>
+          <!-- Workaround for layout spacing -->
+          <Template src="skin:spacer_hx.xml">
+            <SetVariable name="width">2f,</SetVariable>
+          </Template>
 
-              <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>
 
-              <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>
+          <!-- Workaround for layout spacing -->
+          <Template src="skin:spacer_hx.xml">
+            <SetVariable name="width">9f,</SetVariable>
+          </Template>
 
-            </Children>
-          </WidgetGroup>
+          <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><!-- loop_in, loop_out, reloop -->
 
     </Children>
-  </WidgetGroup>
+  </WidgetGroup><!-- LoopContainer -->
 </Template>
diff --git a/res/skins/Deere/loopmove.xml b/res/skins/Deere/loopmove.xml
deleted file mode 100644
index b46cc354d7db..000000000000
--- a/res/skins/Deere/loopmove.xml
+++ /dev/null
@@ -1,418 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    A stack of loop move controls that move loops forward or backward.
-  Variables:
-    group: The group for the controls.
--->
-<Template>
-  <WidgetStack>
-    <ObjectName>LoopMoveContainer</ObjectName>
-    <Layout>horizontal</Layout>
-    <MinimumSize>-1,-1</MinimumSize>
-    <SizePolicy>max,min</SizePolicy>
-    <NextControl>[LoopMove],next</NextControl>
-    <PrevControl>[LoopMove],prev</PrevControl>
-    <Children>
-       <!-- Set moving loops 4 beats as default for audible effect on first try. Later user changes persist. -->
-       <WidgetGroup>
-         <Layout>horizontal</Layout>
-         <Children>
-           <Template src="skin:loopmove_button.xml">
-             <SetVariable name="control_length">4</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_loop_move_backward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_loop_move_backward_48px.svg</SetVariable>
-             <SetVariable name="direction">backward</SetVariable>
-           </Template>
-
-           <Template src="skin:left_right_1state_button.xml">
-             <SetVariable name="ObjectName">LoopMoveValue</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">[LoopMove],next</SetVariable>
-             <SetVariable name="right_connection_control">[LoopMove],prev</SetVariable>
-           </Template>
-
-           <Template src="skin:loopmove_button.xml">
-             <SetVariable name="control_length">4</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_loop_move_forward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_loop_move_forward_48px.svg</SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_loop_move_forward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_loop_move_forward_48px.svg</SetVariable>
-             <SetVariable name="direction">forward</SetVariable>
-           </Template>
-         </Children>
-       </WidgetGroup>
-
-       <WidgetGroup>
-         <Layout>horizontal</Layout>
-         <Children>
-           <Template src="skin:loopmove_button.xml">
-             <SetVariable name="control_length">8</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_loop_move_backward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_loop_move_backward_48px.svg</SetVariable>
-             <SetVariable name="direction">backward</SetVariable>
-           </Template>
-
-           <Template src="skin:left_right_1state_button.xml">
-             <SetVariable name="ObjectName">LoopMoveValue</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">[LoopMove],next</SetVariable>
-             <SetVariable name="right_connection_control">[LoopMove],prev</SetVariable>
-           </Template>
-
-          <Template src="skin:loopmove_button.xml">
-             <SetVariable name="control_length">8</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_loop_move_forward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_loop_move_forward_48px.svg</SetVariable>
-             <SetVariable name="direction">forward</SetVariable>
-           </Template>
-         </Children>
-       </WidgetGroup>
-
-       <WidgetGroup>
-         <Layout>horizontal</Layout>
-         <Children>
-           <Template src="skin:loopmove_button.xml">
-             <SetVariable name="control_length">16</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_loop_move_backward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_loop_move_backward_48px.svg</SetVariable>
-             <SetVariable name="direction">backward</SetVariable>
-           </Template>
-
-           <Template src="skin:left_right_1state_button.xml">
-             <SetVariable name="ObjectName">LoopMoveValue</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">[LoopMove],next</SetVariable>
-             <SetVariable name="right_connection_control">[LoopMove],prev</SetVariable>
-           </Template>
-
-           <Template src="skin:loopmove_button.xml">
-             <SetVariable name="control_length">16</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_loop_move_forward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_loop_move_forward_48px.svg</SetVariable>
-             <SetVariable name="direction">forward</SetVariable>
-           </Template>
-         </Children>
-       </WidgetGroup>
-
-       <WidgetGroup>
-         <Layout>horizontal</Layout>
-         <Children>
-           <Template src="skin:loopmove_button.xml">
-             <SetVariable name="control_length">32</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_loop_move_backward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_loop_move_backward_48px.svg</SetVariable>
-             <SetVariable name="direction">backward</SetVariable>
-           </Template>
-
-           <Template src="skin:left_right_1state_button.xml">
-             <SetVariable name="ObjectName">LoopMoveValue</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">[LoopMove],next</SetVariable>
-             <SetVariable name="right_connection_control">[LoopMove],prev</SetVariable>
-           </Template>
-
-          <Template src="skin:loopmove_button.xml">
-             <SetVariable name="control_length">32</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_loop_move_forward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_loop_move_forward_48px.svg</SetVariable>
-             <SetVariable name="direction">forward</SetVariable>
-           </Template>
-         </Children>
-       </WidgetGroup>
-
-       <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <Children>
-          <Template src="skin:loopmove_button.xml">
-            <SetVariable name="control_length">64</SetVariable>
-            <SetVariable name="text_length"></SetVariable>
-            <SetVariable name="state_0_pressed">icon/ic_loop_move_backward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_loop_move_backward_48px.svg</SetVariable>
-            <SetVariable name="direction">backward</SetVariable>
-          </Template>
-
-          <Template src="skin:left_right_1state_button.xml">
-            <SetVariable name="ObjectName">LoopMoveValue</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">[LoopMove],next</SetVariable>
-            <SetVariable name="right_connection_control">[LoopMove],prev</SetVariable>
-          </Template>
-
-          <Template src="skin:loopmove_button.xml">
-            <SetVariable name="control_length">64</SetVariable>
-            <SetVariable name="text_length"></SetVariable>
-            <SetVariable name="state_0_pressed">icon/ic_loop_move_forward_48px.svg</SetVariable>
-            <SetVariable name="state_0_unpressed">icon/ic_loop_move_forward_48px.svg</SetVariable>
-            <SetVariable name="direction">forward</SetVariable>
-          </Template>
-        </Children>
-       </WidgetGroup>
-
-       <WidgetGroup>
-         <Layout>horizontal</Layout>
-         <Children>
-           <Template src="skin:loopmove_button.xml">
-             <SetVariable name="control_length">0.03125</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_loop_move_backward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_loop_move_backward_48px.svg</SetVariable>
-             <SetVariable name="direction">backward</SetVariable>
-           </Template>
-
-           <Template src="skin:left_right_1state_button.xml">
-             <SetVariable name="ObjectName">LoopMoveValue</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">[LoopMove],next</SetVariable>
-             <SetVariable name="right_connection_control">[LoopMove],prev</SetVariable>
-           </Template>
-
-         <Template src="skin:loopmove_button.xml">
-             <SetVariable name="control_length">0.03125</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_loop_move_forward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_loop_move_forward_48px.svg</SetVariable>
-             <SetVariable name="direction">forward</SetVariable>
-           </Template>
-         </Children>
-       </WidgetGroup>
-
-       <WidgetGroup>
-         <Layout>horizontal</Layout>
-         <Children>
-           <Template src="skin:loopmove_button.xml">
-             <SetVariable name="control_length">0.0625</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_loop_move_backward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_loop_move_backward_48px.svg</SetVariable>
-             <SetVariable name="direction">backward</SetVariable>
-           </Template>
-
-           <Template src="skin:left_right_1state_button.xml">
-             <SetVariable name="ObjectName">LoopMoveValue</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">[LoopMove],next</SetVariable>
-             <SetVariable name="right_connection_control">[LoopMove],prev</SetVariable>
-           </Template>
-
-         <Template src="skin:loopmove_button.xml">
-             <SetVariable name="control_length">0.0625</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_loop_move_forward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_loop_move_forward_48px.svg</SetVariable>
-             <SetVariable name="direction">forward</SetVariable>
-           </Template>
-         </Children>
-       </WidgetGroup>
-
-       <WidgetGroup>
-         <Layout>horizontal</Layout>
-         <Children>
-           <Template src="skin:loopmove_button.xml">
-             <SetVariable name="control_length">0.125</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_loop_move_backward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_loop_move_backward_48px.svg</SetVariable>
-             <SetVariable name="direction">backward</SetVariable>
-           </Template>
-
-           <Template src="skin:left_right_1state_button.xml">
-             <SetVariable name="ObjectName">LoopMoveValue</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">[LoopMove],next</SetVariable>
-             <SetVariable name="right_connection_control">[LoopMove],prev</SetVariable>
-           </Template>
-
-           <Template src="skin:loopmove_button.xml">
-             <SetVariable name="control_length">0.125</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_loop_move_forward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_loop_move_forward_48px.svg</SetVariable>
-             <SetVariable name="direction">forward</SetVariable>
-           </Template>
-         </Children>
-       </WidgetGroup>
-
-       <WidgetGroup>
-         <Layout>horizontal</Layout>
-         <Children>
-           <Template src="skin:loopmove_button.xml">
-             <SetVariable name="control_length">0.25</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_loop_move_backward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_loop_move_backward_48px.svg</SetVariable>
-             <SetVariable name="direction">backward</SetVariable>
-           </Template>
-
-           <Template src="skin:left_right_1state_button.xml">
-             <SetVariable name="ObjectName">LoopMoveValue</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">[LoopMove],next</SetVariable>
-             <SetVariable name="right_connection_control">[LoopMove],prev</SetVariable>
-           </Template>
-
-           <Template src="skin:loopmove_button.xml">
-             <SetVariable name="control_length">0.25</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_loop_move_forward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_loop_move_forward_48px.svg</SetVariable>
-             <SetVariable name="direction">forward</SetVariable>
-           </Template>
-         </Children>
-       </WidgetGroup>
-
-       <WidgetGroup>
-         <Layout>horizontal</Layout>
-         <Children>
-           <Template src="skin:loopmove_button.xml">
-             <SetVariable name="control_length">0.5</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_loop_move_backward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_loop_move_backward_48px.svg</SetVariable>
-             <SetVariable name="direction">backward</SetVariable>
-           </Template>
-
-           <Template src="skin:left_right_1state_button.xml">
-             <SetVariable name="ObjectName">LoopMoveValue</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">[LoopMove],next</SetVariable>
-             <SetVariable name="right_connection_control">[LoopMove],prev</SetVariable>
-           </Template>
-
-           <Template src="skin:loopmove_button.xml">
-             <SetVariable name="control_length">0.5</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_loop_move_forward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_loop_move_forward_48px.svg</SetVariable>
-             <SetVariable name="direction">forward</SetVariable>
-           </Template>
-         </Children>
-       </WidgetGroup>
-
-       <WidgetGroup>
-         <Layout>horizontal</Layout>
-         <Children>
-           <Template src="skin:loopmove_button.xml">
-             <SetVariable name="control_length">1</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_loop_move_backward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_loop_move_backward_48px.svg</SetVariable>
-             <SetVariable name="direction">backward</SetVariable>
-           </Template>
-
-           <Template src="skin:left_right_1state_button.xml">
-             <SetVariable name="ObjectName">LoopMoveValue</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">[LoopMove],next</SetVariable>
-             <SetVariable name="right_connection_control">[LoopMove],prev</SetVariable>
-           </Template>
-
-           <Template src="skin:loopmove_button.xml">
-             <SetVariable name="control_length">1</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_loop_move_forward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_loop_move_forward_48px.svg</SetVariable>
-             <SetVariable name="direction">forward</SetVariable>
-           </Template>
-         </Children>
-       </WidgetGroup>
-
-       <WidgetGroup>
-         <Layout>horizontal</Layout>
-         <Children>
-           <Template src="skin:loopmove_button.xml">
-             <SetVariable name="control_length">2</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_loop_move_backward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_loop_move_backward_48px.svg</SetVariable>
-             <SetVariable name="direction">backward</SetVariable>
-           </Template>
-
-           <Template src="skin:left_right_1state_button.xml">
-             <SetVariable name="ObjectName">LoopMoveValue</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">[LoopMove],next</SetVariable>
-             <SetVariable name="right_connection_control">[LoopMove],prev</SetVariable>
-           </Template>
-
-           <Template src="skin:loopmove_button.xml">
-             <SetVariable name="control_length">2</SetVariable>
-             <SetVariable name="text_length"></SetVariable>
-             <SetVariable name="state_0_pressed">icon/ic_loop_move_forward_48px.svg</SetVariable>
-             <SetVariable name="state_0_unpressed">icon/ic_loop_move_forward_48px.svg</SetVariable>
-             <SetVariable name="direction">forward</SetVariable>
-           </Template>
-         </Children>
-       </WidgetGroup>
-    </Children>
-  </WidgetStack>
-
-</Template>
diff --git a/res/skins/Deere/mixer.xml b/res/skins/Deere/mixer.xml
index 9d9c0519040e..47444ffa302b 100644
--- a/res/skins/Deere/mixer.xml
+++ b/res/skins/Deere/mixer.xml
@@ -5,264 +5,247 @@
 -->
 <Template>
   <WidgetGroup>
-    <ObjectName>Mixer</ObjectName>
+    <ObjectName>MixerBorder</ObjectName>
     <Layout>vertical</Layout>
-    <SizePolicy>max,me</SizePolicy>
+    <SizePolicy>min,me</SizePolicy>
     <Children>
       <WidgetGroup>
-        <ObjectName>DeckControls</ObjectName>
-        <SizePolicy>max,me</SizePolicy>
-        <Layout>horizontal</Layout>
+        <ObjectName>Mixer</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>max,min</SizePolicy>
         <Children>
-
           <WidgetGroup>
-            <ObjectName>DeckControlsSplitWaveforms</ObjectName>
-            <Layout>horizontal</Layout>
+            <ObjectName>DeckControls</ObjectName>
+            <SizePolicy>max,me</SizePolicy>
+            <Layout>vertical</Layout>
             <Children>
 
               <WidgetGroup>
-                <ObjectName>DeckControlsSplitWaveforms2Decks</ObjectName>
+                <ObjectName>DeckControls_SplitWaveforms</ObjectName>
                 <Layout>horizontal</Layout>
                 <Children>
 
-                  <Template src="skin:mixer_controls_left.xml">
-                    <SetVariable name="i">1</SetVariable>
-                  </Template>
+                  <WidgetGroup>
+                    <ObjectName>DeckControls_SplitWaveforms_2Decks</ObjectName>
+                    <Layout>horizontal</Layout>
+                    <Children>
 
-                  <Template src="skin:vumeter_master.xml"/>
+                      <Template src="skin:mixer_controls_left.xml">
+                        <SetVariable name="i">1</SetVariable>
+                      </Template>
 
-                  <Template src="skin:mixer_controls_right.xml">
-                    <SetVariable name="i">2</SetVariable>
-                  </Template>
+                      <Template src="skin:mixer_column_master_vu.xml"/>
 
-                </Children>
-                <Connection>
-                  <ConfigKey>[Master],show_4decks</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                  <Transform>
-                    <Not/>
-                  </Transform>
-                </Connection>
-              </WidgetGroup> <!-- DeckControlsSplitWaveforms2Decks -->
+                      <Template src="skin:mixer_controls_right.xml">
+                        <SetVariable name="i">2</SetVariable>
+                      </Template>
 
-              <WidgetGroup>
-                <ObjectName>DeckControlsSplitWaveforms4Decks</ObjectName>
-                <Layout>horizontal</Layout>
-                <Children>
+                    </Children>
+                    <Connection>
+                      <ConfigKey>[Master],show_4decks</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                      <Transform>
+                        <Not/>
+                      </Transform>
+                    </Connection>
+                  </WidgetGroup> <!-- DeckControls_SplitWaveforms_2Decks -->
 
-                  <Template src="skin:mixer_controls_left.xml">
-                    <SetVariable name="i">3</SetVariable>
-                  </Template>
-                  <Template src="skin:mixer_controls_left.xml">
-                    <SetVariable name="i">1</SetVariable>
-                  </Template>
+                  <WidgetGroup>
+                    <ObjectName>DeckControls_SplitWaveforms_4Decks</ObjectName>
+                    <Layout>horizontal</Layout>
+                    <Children>
 
-                  <Template src="skin:vumeter_master.xml"/>
+                      <Template src="skin:mixer_controls_left.xml">
+                        <SetVariable name="i">3</SetVariable>
+                      </Template>
+                      <Template src="skin:mixer_controls_left.xml">
+                        <SetVariable name="i">1</SetVariable>
+                      </Template>
 
-                  <Template src="skin:mixer_controls_right.xml">
-                    <SetVariable name="i">2</SetVariable>
-                  </Template>
-                  <Template src="skin:mixer_controls_right.xml">
-                    <SetVariable name="i">4</SetVariable>
-                  </Template>
+                      <Template src="skin:mixer_column_master_vu.xml"/>
 
-                </Children>
-                <Connection>
-                  <ConfigKey>[Master],show_4decks</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup> <!-- DeckControlsSplitWaveforms4Decks -->
-
-            </Children>
-            <Connection>
-              <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
-              <BindProperty>visible</BindProperty>
-              <Transform>
-                <Not/>
-              </Transform>
-            </Connection>
-          </WidgetGroup>
+                      <Template src="skin:mixer_controls_right.xml">
+                        <SetVariable name="i">2</SetVariable>
+                      </Template>
+                      <Template src="skin:mixer_controls_right.xml">
+                        <SetVariable name="i">4</SetVariable>
+                      </Template>
 
-          <WidgetGroup>
-            <ObjectName>DeckControlsStackedWaveforms</ObjectName>
-            <Layout>horizontal</Layout>
-            <Children>
-              <WidgetGroup>
-                <ObjectName>DeckControlsStackedWaveforms2Decks</ObjectName>
-                <Layout>horizontal</Layout>
-                <Children>
-                  <Template src="skin:mixer_controls_left.xml">
-                    <SetVariable name="i">1</SetVariable>
-                  </Template>
-
-                  <Template src="skin:vumeter_master.xml"/>
+                    </Children>
+                    <Connection>
+                      <ConfigKey>[Master],show_4decks</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup> <!-- DeckControls_SplitWaveforms_4Decks -->
 
-                  <Template src="skin:mixer_controls_right.xml">
-                    <SetVariable name="i">2</SetVariable>
-                  </Template>
                 </Children>
                 <Connection>
-                  <ConfigKey>[Master],show_4decks</ConfigKey>
+                  <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
                   <BindProperty>visible</BindProperty>
                   <Transform>
                     <Not/>
                   </Transform>
                 </Connection>
-              </WidgetGroup> <!-- DeckControlsStackedWaveforms2Decks -->
+              </WidgetGroup><!-- DeckControls_SplitWaveforms -->
 
               <WidgetGroup>
-                <ObjectName>DeckControlsStackedWaveforms4Decks</ObjectName>
+                <ObjectName>DeckControls_StackedWaveforms</ObjectName>
                 <Layout>horizontal</Layout>
                 <Children>
                   <WidgetGroup>
+                    <ObjectName>DeckControls_StackedWaveforms_2Decks</ObjectName>
                     <Layout>horizontal</Layout>
                     <Children>
+                      <Template src="skin:mixer_controls_left.xml">
+                        <SetVariable name="i">1</SetVariable>
+                      </Template>
 
-                      <WidgetGroup>
-                        <ObjectName>DeckControlsStackedWaveforms4DecksNoEQs</ObjectName>
-                        <Layout>horizontal</Layout>
-                        <Children>
-                          <Template src="skin:mixer_controls_left.xml">
-                            <SetVariable name="i">3</SetVariable>
-                          </Template>
-                          <Template src="skin:mixer_controls_left.xml">
-                            <SetVariable name="i">1</SetVariable>
-                          </Template>
-
-                          <Template src="skin:vumeter_master.xml"/>
+                      <Template src="skin:mixer_column_master_vu.xml"/>
 
-                          <Template src="skin:mixer_controls_right.xml">
-                            <SetVariable name="i">2</SetVariable>
-                          </Template>
-                          <Template src="skin:mixer_controls_right.xml">
-                            <SetVariable name="i">4</SetVariable>
-                          </Template>
-                        </Children>
-                        <Connection>
-                          <ConfigKey>[Master],show_eqs</ConfigKey>
-                          <BindProperty>visible</BindProperty>
-                          <Transform>
-                            <Not/>
-                          </Transform>
-                        </Connection>
-                      </WidgetGroup> <!-- DeckControlsStackedWaveforms4DecksNoEQs -->
+                      <Template src="skin:mixer_controls_right.xml">
+                        <SetVariable name="i">2</SetVariable>
+                      </Template>
+                    </Children>
+                    <Connection>
+                      <ConfigKey>[Master],show_4decks</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                      <Transform>
+                        <Not/>
+                      </Transform>
+                    </Connection>
+                  </WidgetGroup> <!-- DeckControls_StackedWaveforms_2Decks -->
 
+                  <WidgetGroup>
+                    <ObjectName>DeckControls_StackedWaveforms_4Decks</ObjectName>
+                    <Layout>horizontal</Layout>
+                    <Children>
                       <WidgetGroup>
-                        <ObjectName>DeckControlsStackedWaveforms4DecksWithEQs</ObjectName>
                         <Layout>horizontal</Layout>
                         <Children>
-                          <Template src="skin:mixer_controls_condensed_left.xml">
-                            <SetVariable name="i">3</SetVariable>
-                          </Template>
-                          <Template src="skin:mixer_controls_condensed_left.xml">
-                            <SetVariable name="i">1</SetVariable>
-                          </Template>
 
-                          <Template src="skin:vumeter_master.xml"/>
+                          <WidgetGroup>
+                            <ObjectName>DeckControls_StackedWaveforms_4Decks_NoEQs</ObjectName>
+                            <Layout>horizontal</Layout>
+                            <Children>
+                              <Template src="skin:mixer_controls_left.xml">
+                                <SetVariable name="i">3</SetVariable>
+                              </Template>
+                              <Template src="skin:mixer_controls_left.xml">
+                                <SetVariable name="i">1</SetVariable>
+                              </Template>
+
+                              <Template src="skin:mixer_column_master_vu.xml"/>
+
+                              <Template src="skin:mixer_controls_right.xml">
+                                <SetVariable name="i">2</SetVariable>
+                              </Template>
+                              <Template src="skin:mixer_controls_right.xml">
+                                <SetVariable name="i">4</SetVariable>
+                              </Template>
+                            </Children>
+                            <Connection>
+                              <ConfigKey>[Master],show_eqs</ConfigKey>
+                              <BindProperty>visible</BindProperty>
+                              <Transform>
+                                <Not/>
+                              </Transform>
+                            </Connection>
+                          </WidgetGroup> <!-- DeckControls_StackedWaveforms_4Decks_NoEQs -->
+
+                          <WidgetGroup>
+                            <ObjectName>DeckControls_StackedWaveforms_4Decks_WithEQs</ObjectName>
+                            <Layout>horizontal</Layout>
+                            <Children>
+                              <Template src="skin:mixer_controls_condensed_left.xml">
+                                <SetVariable name="i">3</SetVariable>
+                              </Template>
+                              <Template src="skin:mixer_controls_condensed_left.xml">
+                                <SetVariable name="i">1</SetVariable>
+                              </Template>
+
+                              <Template src="skin:mixer_column_master_vu.xml"/>
+
+                              <Template src="skin:mixer_controls_condensed_right.xml">
+                                <SetVariable name="i">2</SetVariable>
+                              </Template>
+                              <Template src="skin:mixer_controls_condensed_right.xml">
+                                <SetVariable name="i">4</SetVariable>
+                              </Template>
+                            </Children>
+                            <Connection>
+                              <ConfigKey>[Master],show_eqs</ConfigKey>
+                              <BindProperty>visible</BindProperty>
+                            </Connection>
+                          </WidgetGroup> <!-- DeckControls_StackedWaveforms_4Decks_WithEQs -->
 
-                          <Template src="skin:mixer_controls_condensed_right.xml">
-                            <SetVariable name="i">2</SetVariable>
-                          </Template>
-                          <Template src="skin:mixer_controls_condensed_right.xml">
-                            <SetVariable name="i">4</SetVariable>
-                          </Template>
                         </Children>
-                        <Connection>
-                          <ConfigKey>[Master],show_eqs</ConfigKey>
-                          <BindProperty>visible</BindProperty>
-                        </Connection>
-                      </WidgetGroup> <!-- DeckControlsStackedWaveforms4DecksWithEQs -->
+                      </WidgetGroup> <!-- DeckControls_StackedWaveforms_4Decks -->
 
                     </Children>
-                  </WidgetGroup> <!-- DeckControlsStackedWaveforms4Decks -->
+                    <Connection>
+                      <ConfigKey>[Master],show_4decks</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup><!-- DeckControls_StackedWaveforms_4Decks -->
 
                 </Children>
                 <Connection>
-                  <ConfigKey>[Master],show_4decks</ConfigKey>
+                  <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
                   <BindProperty>visible</BindProperty>
                 </Connection>
-              </WidgetGroup>
+              </WidgetGroup><!-- DeckControls_StackedWaveforms -->
 
             </Children>
-            <Connection>
-              <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup>
-
-        </Children>
-      </WidgetGroup> <!-- DeckControlsStackedWaveforms -->
+          </WidgetGroup><!-- DeckControls -->
 
-      <WidgetGroup>
-        <ObjectName>CrossfaderContainer</ObjectName>
-        <Layout>horizontal</Layout>
-        <Children>
-          <WidgetGroup>
-            <ObjectName>Crossfader</ObjectName>
-            <SizePolicy>me,min</SizePolicy>
+          <WidgetGroup><!-- CrossfaderContainer -->
             <Layout>horizontal</Layout>
-            <Children>
-              <SliderComposed>
-                <TooltipId>crossfader</TooltipId>
-                <SizePolicy>me,min</SizePolicy>
-                <MinimumSize>-1,40</MinimumSize>
-                <MaximumSize>-1,40</MaximumSize>
-                <Slider scalemode="STRETCH">slider-horizontal.svg</Slider>
-                <Handle scalemode="STRETCH_ASPECT">handle-horizontal.svg</Handle>
-                <Horizontal>true</Horizontal>
-                <Connection>
-                  <ConfigKey>[Master],crossfader</ConfigKey>
-                  <EmitOnDownPress>false</EmitOnDownPress>
-                </Connection>
-              </SliderComposed>
-            </Children>
-            <Connection>
-              <ConfigKey>[AutoDJ],enabled</ConfigKey>
-              <BindProperty>visible</BindProperty>
-              <Transform>
-                <Not/>
-              </Transform>
-            </Connection>
-          </WidgetGroup>
-
-          <!-- Change crossfader background color if AutoDj is active,
-               https://bugs.launchpad.net/mixxx/+bug/995955 -->
-          <WidgetGroup>
-            <ObjectName>CrossfaderAutoDjActive</ObjectName>
             <SizePolicy>me,min</SizePolicy>
-            <Layout>horizontal</Layout>
             <Children>
-              <SliderComposed>
-                <TooltipId>crossfader</TooltipId>
+              <WidgetGroup>
+                <ObjectName>CrossfaderContainer</ObjectName>
+                <Layout>horizontal</Layout>
                 <SizePolicy>me,min</SizePolicy>
-                <MinimumSize>-1,40</MinimumSize>
-                <MaximumSize>-1,40</MaximumSize>
-                <Slider scalemode="STRETCH">slider-horizontal.svg</Slider>
-                <Handle scalemode="STRETCH_ASPECT">handle-horizontal.svg</Handle>
-                <Horizontal>true</Horizontal>
-                <Connection>
-                  <ConfigKey>[Master],crossfader</ConfigKey>
-                  <EmitOnDownPress>false</EmitOnDownPress>
-                </Connection>
-              </SliderComposed>
+                <Children>
+                  <!-- Slider background is highlighted orange if AutoDJ is enabled -->
+                  <WidgetGroup>
+                    <ObjectName>Crossfader</ObjectName>
+                    <SizePolicy>me,min</SizePolicy>
+                    <Layout>horizontal</Layout>
+                    <Children>
+                      <SliderComposed>
+                        <TooltipId>crossfader</TooltipId>
+                        <Size>1me,40f</Size>
+                        <Slider scalemode="STRETCH">slider-crossfader.svg</Slider>
+                        <Handle scalemode="STRETCH_ASPECT">handle-crossfader.svg</Handle>
+                        <Horizontal>true</Horizontal>
+                        <Connection>
+                          <ConfigKey>[Master],crossfader</ConfigKey>
+                          <EmitOnDownPress>false</EmitOnDownPress>
+                        </Connection>
+                      </SliderComposed>
+                    </Children>
+                    <Connection>
+                      <ConfigKey>[AutoDJ],enabled</ConfigKey>
+                      <BindProperty>highlight</BindProperty>
+                    </Connection>
+                  </WidgetGroup><!-- Crossfader -->
+
+                </Children>
+              </WidgetGroup>
             </Children>
             <Connection>
-              <ConfigKey>[AutoDJ],enabled</ConfigKey>
+              <ConfigKey>[Deere],show_crossfader</ConfigKey>
               <BindProperty>visible</BindProperty>
             </Connection>
-          </WidgetGroup>
-
-          </Children>
-          <Connection>
-            <ConfigKey>[Deere],show_crossfader</ConfigKey>
-            <BindProperty>visible</BindProperty>
-          </Connection>
-      </WidgetGroup>
+          </WidgetGroup><!-- CrossfaderContainer -->
 
+        </Children>
+      </WidgetGroup><!-- Mixer -->
     </Children>
     <Connection>
       <ConfigKey>[Master],show_mixer</ConfigKey>
       <BindProperty>visible</BindProperty>
     </Connection>
-  </WidgetGroup>
+  </WidgetGroup><!-- MixerBorder -->
 </Template>
diff --git a/res/skins/Deere/mixer_controls_col1_left.xml b/res/skins/Deere/mixer_column_eq_left.xml
similarity index 67%
rename from res/skins/Deere/mixer_controls_col1_left.xml
rename to res/skins/Deere/mixer_column_eq_left.xml
index 0e45fd6957d3..949829a2e2c2 100644
--- a/res/skins/Deere/mixer_controls_col1_left.xml
+++ b/res/skins/Deere/mixer_column_eq_left.xml
@@ -6,21 +6,21 @@
 <Template>
   <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
   <WidgetGroup>
-    <ObjectName>DeckMixer<Variable name="i"/>_Column1</ObjectName>
+    <ObjectName>DeckMixer_Column1</ObjectName>
     <Layout>vertical</Layout>
-    <SizePolicy>max,min</SizePolicy>
+    <SizePolicy>min,min</SizePolicy>
     <Children>
 
       <!--In 4 deck mode, show the gain knob above the EQs rather than above the level meters.-->
       <WidgetGroup>
         <Layout>vertical</Layout>
+        <MinimumSize>40,34</MinimumSize>
+        <MaximumSize>-1,40</MaximumSize>
+        <SizePolicy>me,me</SizePolicy>
         <Children>
           <WidgetGroup>
-            <Connection>
-              <ConfigKey>[Master],show_killswitches</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
             <Layout>vertical</Layout>
+            <SizePolicy>me,min</SizePolicy>
             <Children>
               <Template src="skin:knob_with_button_left.xml">
                 <SetVariable name="TooltipId">pregain</SetVariable>
@@ -30,22 +30,32 @@
                 <SetVariable name="button_control">mute</SetVariable>
               </Template>
             </Children>
-          </WidgetGroup>
-
-          <WidgetGroup>
             <Connection>
               <ConfigKey>[Master],show_killswitches</ConfigKey>
               <BindProperty>visible</BindProperty>
-              <Transform><Not/></Transform>
             </Connection>
-            <Layout>vertical</Layout>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <SizePolicy>me,min</SizePolicy>
             <Children>
+              <WidgetGroup><!-- Expanding spacer to push EQ knob to right side -->
+                <Size>0me,1min</Size>
+                <Children/>
+              </WidgetGroup>
+
               <Template src="skin:knob.xml">
                 <SetVariable name="TooltipId">pregain</SetVariable>
                 <SetVariable name="control">pregain</SetVariable>
                 <SetVariable name="color">red</SetVariable>
               </Template>
             </Children>
+            <Connection>
+              <ConfigKey>[Master],show_killswitches</ConfigKey>
+              <BindProperty>visible</BindProperty>
+              <Transform><Not/></Transform>
+            </Connection>
           </WidgetGroup>
 
         </Children>
@@ -55,6 +65,44 @@
         </Connection>
       </WidgetGroup>
 
+      <!-- Spacer to push EQ knobs down with
+          - 2decks and
+          - split waveforms and
+          - no QuickEffect loaded-->
+      <WidgetGroup>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <WidgetGroup>
+                <Layout>vertical</Layout>
+                <Size>0min,34f</Size>
+                <Children>
+                </Children>
+                <Connection>
+                  <ConfigKey>[QuickEffectRack1_[Channel1]_Effect1],loaded</ConfigKey>
+                  <Transform><Not/></Transform>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+            </Children>
+            <Connection>
+              <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
+              <Transform><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+        </Children>
+        <Connection>
+          <ConfigKey>[Master],show_4decks</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- Spacer -->
+
       <Template src="skin:equalizer_rack_parameter_left.xml">
         <SetVariable name="parameter">4</SetVariable>
         <SetVariable name="color">yellow</SetVariable>
diff --git a/res/skins/Deere/mixer_controls_col1_right.xml b/res/skins/Deere/mixer_column_eq_right.xml
similarity index 66%
rename from res/skins/Deere/mixer_controls_col1_right.xml
rename to res/skins/Deere/mixer_column_eq_right.xml
index 6e99a87ff9b3..0fd93e835cd9 100644
--- a/res/skins/Deere/mixer_controls_col1_right.xml
+++ b/res/skins/Deere/mixer_column_eq_right.xml
@@ -6,23 +6,23 @@
 <Template>
   <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
   <WidgetGroup>
-    <ObjectName>DeckMixer<Variable name="i"/>_Column1</ObjectName>
+    <ObjectName>DeckMixer_Column1</ObjectName>
     <Layout>vertical</Layout>
-    <SizePolicy>max,min</SizePolicy>
+    <SizePolicy>min,min</SizePolicy>
     <Children>
 
       <!--In 4 deck mode, show the gain knob above the EQs rather than above the level meters.-->
       <WidgetGroup>
         <Layout>vertical</Layout>
+        <MinimumSize>40,34</MinimumSize>
+        <MaximumSize>-1,40</MaximumSize>
+        <SizePolicy>me,me</SizePolicy>
         <Children>
           <WidgetGroup>
-            <Connection>
-              <ConfigKey>[Master],show_killswitches</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
             <Layout>vertical</Layout>
+            <SizePolicy>me,min</SizePolicy>
             <Children>
-              <Template src="skin:knob_with_button_left.xml">
+              <Template src="skin:knob_with_button_right.xml">
                 <SetVariable name="TooltipId">pregain</SetVariable>
                 <SetVariable name="control">pregain</SetVariable>
                 <SetVariable name="color">red</SetVariable>
@@ -30,22 +30,32 @@
                 <SetVariable name="button_control">mute</SetVariable>
               </Template>
             </Children>
-          </WidgetGroup>
-
-          <WidgetGroup>
             <Connection>
               <ConfigKey>[Master],show_killswitches</ConfigKey>
               <BindProperty>visible</BindProperty>
-              <Transform><Not/></Transform>
             </Connection>
-            <Layout>vertical</Layout>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <SizePolicy>me,min</SizePolicy>
             <Children>
               <Template src="skin:knob.xml">
                 <SetVariable name="TooltipId">pregain</SetVariable>
                 <SetVariable name="control">pregain</SetVariable>
                 <SetVariable name="color">red</SetVariable>
               </Template>
+
+              <WidgetGroup><!-- Expanding spacer to push EQ knob to opposite side -->
+                <Size>0me,1min</Size>
+                <Children/>
+              </WidgetGroup>
             </Children>
+            <Connection>
+              <ConfigKey>[Master],show_killswitches</ConfigKey>
+              <BindProperty>visible</BindProperty>
+              <Transform><Not/></Transform>
+            </Connection>
           </WidgetGroup>
 
         </Children>
@@ -55,6 +65,44 @@
         </Connection>
       </WidgetGroup>
 
+      <!-- Spacer to push EQ knobs down with
+          - 2decks and
+          - split waveforms and
+          - no QuickEffect loaded-->
+      <WidgetGroup>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <WidgetGroup>
+                <Layout>vertical</Layout>
+                <Size>0min,34f</Size>
+                <Children>
+                </Children>
+                <Connection>
+                  <ConfigKey>[QuickEffectRack1_[Channel1]_Effect1],loaded</ConfigKey>
+                  <Transform><Not/></Transform>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+            </Children>
+            <Connection>
+              <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
+              <Transform><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+        </Children>
+        <Connection>
+          <ConfigKey>[Master],show_4decks</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- Spacer -->
+
       <Template src="skin:equalizer_rack_parameter_right.xml">
         <SetVariable name="parameter">4</SetVariable>
         <SetVariable name="color">yellow</SetVariable>
diff --git a/res/skins/Deere/mixer_controls_col3.xml b/res/skins/Deere/mixer_column_gain_levels.xml
similarity index 94%
rename from res/skins/Deere/mixer_controls_col3.xml
rename to res/skins/Deere/mixer_column_gain_levels.xml
index efc2bb0046ee..9ece1083c983 100644
--- a/res/skins/Deere/mixer_controls_col3.xml
+++ b/res/skins/Deere/mixer_column_gain_levels.xml
@@ -6,7 +6,7 @@
 <Template>
   <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
   <WidgetGroup>
-    <ObjectName>DeckMixer<Variable name="i"/>_Column3</ObjectName>
+    <ObjectName>DeckMixer_Column3</ObjectName>
     <Layout>vertical</Layout>
     <Size>40f,-1me</Size>
     <Children>
@@ -61,13 +61,14 @@
       </WidgetGroup>
 
       <WidgetGroup>
-        <Size>22me,110me</Size>
+        <ObjectName>Channel_VU_Container</ObjectName>
+        <Size>22me,90me</Size>
         <Layout>horizontal</Layout>
         <Children>
           <WidgetGroup>
             <ObjectName>channel_VuMeter_Group</ObjectName>
             <Layout>horizontal</Layout>
-            <MaximumSize>22,130</MaximumSize>
+            <MaximumSize>22,150</MaximumSize>
             <Children>
               <Template src="skin:vumeter_v.xml">
                 <SetVariable name="group"><Variable name="group"/></SetVariable>
diff --git a/res/skins/Deere/mixer_column_master_vu.xml b/res/skins/Deere/mixer_column_master_vu.xml
new file mode 100644
index 000000000000..c015c5bb5e74
--- /dev/null
+++ b/res/skins/Deere/mixer_column_master_vu.xml
@@ -0,0 +1,236 @@
+<!DOCTYPE template>
+<!-- Master level meter -->
+<Template>
+  <WidgetGroup>
+    <Layout>vertical</Layout>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>MasterVu2Deck</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,me</SizePolicy>
+        <Children>
+
+          <!-- Spacer to align with top of channels VUs -->
+          <WidgetGroup>
+            <Size>-1,34f</Size>
+            <Layout>vertical</Layout>
+            <Children/>
+          </WidgetGroup>
+
+          <Template src="skin:vumeter_master.xml"/>
+
+        </Children>
+        <Connection>
+          <ConfigKey>[Master],show_4decks</ConfigKey>
+          <BindProperty>visible</BindProperty>
+          <Transform>
+            <Not/>
+          </Transform>
+        </Connection>
+      </WidgetGroup><!-- MasterVu2Deck -->
+
+      <WidgetGroup>
+        <ObjectName>MasterVu4Deck_Container</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,me</SizePolicy>
+        <Children>
+
+          <!-- There's a spacer & VU configuration for every posible combination
+              of split/parallel waveforms, in/visible EQ knob and in/visible
+              volume faders -->
+
+          <WidgetGroup><!-- split waveforms -->
+            <Layout>vertical</Layout>
+            <SizePolicy>min,me</SizePolicy>
+            <Children>
+              <WidgetGroup><!-- show EQ -->
+                <Layout>vertical</Layout>
+                <SizePolicy>min,me</SizePolicy>
+                <Children>
+                  <WidgetGroup><!-- show EQ, show faders -->
+                    <SizePolicy>min,me</SizePolicy>
+                    <Layout>vertical</Layout>
+                    <Children>
+                      <WidgetGroup>
+                        <ObjectName>MasterVU_Spacer</ObjectName>
+                        <Size>10min,0me</Size>
+                        <Layout>vertical</Layout>
+                        <Children/>
+                      </WidgetGroup>
+
+                      <WidgetGroup>
+                        <SizePolicy>min,p</SizePolicy>
+                        <Layout>vertical</Layout>
+                        <Children>
+                          <Template src="skin:vumeter_master.xml"/>
+
+                          <Template src="skin:spacer_vx.xml">
+                            <SetVariable name="height">10f,136f</SetVariable>
+                          </Template>
+                        </Children>
+                      </WidgetGroup>
+                    </Children>
+                    <Connection>
+                      <ConfigKey>[Master],show_faders</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup><!-- show EQ, show faders -->
+
+                  <WidgetGroup><!-- show EQ, no faders -->
+                    <SizePolicy>min,me</SizePolicy>
+                    <Layout>vertical</Layout>
+                    <Children>
+                      <WidgetGroup>
+                        <ObjectName>MasterVU_Spacer</ObjectName>
+                        <Size>10min,me</Size>
+                        <Layout>vertical</Layout>
+                        <Children/>
+                      </WidgetGroup>
+
+                      <WidgetGroup>
+                        <ObjectName>MasterVU</ObjectName>
+                        <Size>10min,me</Size>
+                        <Layout>vertical</Layout>
+                        <Children>
+                          <Template src="skin:vumeter_master.xml"/>
+                        </Children>
+                      </WidgetGroup>
+                    </Children>
+                    <Connection>
+                      <ConfigKey>[Master],show_faders</ConfigKey>
+                      <Transform><Not/></Transform>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup><!-- show EQ, no faders -->
+                </Children>
+                <Connection>
+                  <ConfigKey>[Master],show_eqs</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup><!-- show EQ -->
+
+              <WidgetGroup><!-- no EQ -->
+                <Layout>vertical</Layout>
+                <SizePolicy>min,me</SizePolicy>
+                <Children>
+                  <WidgetGroup><!-- no EQ, no faders -->
+                    <SizePolicy>min,me</SizePolicy>
+                    <Layout>vertical</Layout>
+                    <Children>
+                      <Template src="skin:spacer_vx.xml">
+                        <SetVariable name="height">10f,34f</SetVariable>
+                      </Template>
+
+                      <Template src="skin:vumeter_master.xml"/>
+                    </Children>
+                  </WidgetGroup><!-- no EQ, no faders -->
+
+                  <WidgetGroup><!-- no EQ, show faders -->
+                    <SizePolicy>min,me</SizePolicy>
+                    <Layout>vertical</Layout>
+                    <Children>
+                    </Children>
+                    <Connection>
+                      <ConfigKey>[Master],show_faders</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup><!-- no EQ, show faders -->
+                </Children>
+                <Connection>
+                  <ConfigKey>[Master],show_eqs</ConfigKey>
+                  <Transform><Not/></Transform>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup><!-- no EQ -->
+            </Children>
+            <Connection>
+              <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
+              <Transform><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup><!-- split waveforms -->
+
+          <WidgetGroup><!-- parallel waveforms -->
+            <Layout>vertical</Layout>
+            <SizePolicy>min,me</SizePolicy>
+            <Children>
+              <WidgetGroup><!-- show EQ -->
+                <SizePolicy>min,me</SizePolicy>
+                <Layout>vertical</Layout>
+                <Children>
+                  <WidgetGroup>
+                    <ObjectName>MasterVU_Spacer</ObjectName>
+                    <Size>10min,0me</Size>
+                    <Layout>vertical</Layout>
+                    <Children/>
+                  </WidgetGroup>
+
+                  <WidgetGroup>
+                    <SizePolicy>min,p</SizePolicy>
+                    <Layout>vertical</Layout>
+                    <Children>
+                      <Template src="skin:vumeter_master.xml"/>
+
+                      <Template src="skin:spacer_vx.xml">
+                        <SetVariable name="height">10f,28f</SetVariable>
+                      </Template>
+                    </Children>
+                  </WidgetGroup>
+                </Children>
+                <Connection>
+                  <ConfigKey>[Master],show_eqs</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup><!-- show EQ -->
+
+              <WidgetGroup><!-- no EQ -->
+                <Layout>vertical</Layout>
+                <SizePolicy>min,me</SizePolicy>
+                <Children>
+                  <WidgetGroup><!-- no EQ, no faders -->
+                    <SizePolicy>min,me</SizePolicy>
+                    <Layout>vertical</Layout>
+                    <Children>
+                      <Template src="skin:spacer_vx.xml">
+                        <SetVariable name="height">10f,34f</SetVariable>
+                      </Template>
+
+                      <Template src="skin:vumeter_master.xml"/>
+                    </Children>
+                  </WidgetGroup><!-- no EQ, no faders -->
+
+                  <WidgetGroup><!-- no EQ, show faders -->
+                    <SizePolicy>min,me</SizePolicy>
+                    <Layout>vertical</Layout>
+                    <Children>
+                    </Children>
+                    <Connection>
+                      <ConfigKey>[Master],show_faders</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup><!-- no EQ, show faders -->
+                </Children>
+                <Connection>
+                  <ConfigKey>[Master],show_eqs</ConfigKey>
+                  <Transform><Not/></Transform>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup><!-- no EQ -->
+            </Children>
+            <Connection>
+              <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup><!-- parallel waveforms -->
+
+        </Children>
+        <Connection>
+          <ConfigKey>[Master],show_4decks</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup><!-- MasterVu4Deck -->
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Deere/mixer_controls_col2.xml b/res/skins/Deere/mixer_column_volume.xml
similarity index 89%
rename from res/skins/Deere/mixer_controls_col2.xml
rename to res/skins/Deere/mixer_column_volume.xml
index 62ce45298ca4..7cc5f390910c 100644
--- a/res/skins/Deere/mixer_controls_col2.xml
+++ b/res/skins/Deere/mixer_column_volume.xml
@@ -6,18 +6,14 @@
 <Template>
   <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
   <WidgetGroup>
-    <ObjectName>DeckMixer<Variable name="i"/>_Column2</ObjectName>
+    <ObjectName>DeckMixer_Column2</ObjectName>
     <Layout>vertical</Layout>
     <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>
-        <ObjectName>DeckPFLButton2Decks</ObjectName>
+      <WidgetGroup><!-- 2 decks -->
+        <ObjectName>ButtonContainer</ObjectName>
         <Layout>horizontal</Layout>
         <Size>40f,35f</Size>
         <Children>
@@ -43,11 +39,11 @@
             <Not/>
           </Transform>
         </Connection>
-      </WidgetGroup>
+      </WidgetGroup><!-- 2 decks -->
 
-      <WidgetGroup>
-        <ObjectName>DeckPFLButton4Decks</ObjectName>
-        <Size>40f,25f</Size>
+      <WidgetGroup><!-- 4 decks -->
+        <ObjectName>ButtonContainer</ObjectName>
+        <Size>-1me,28f</Size>
         <Layout>horizontal</Layout>
         <Children>
           <Template src="skin:left_2state_button.xml">
@@ -70,7 +66,7 @@
           <ConfigKey>[Master],show_4decks</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
-      </WidgetGroup>
+      </WidgetGroup><!-- 4 decks -->
 
       <WidgetGroup>
         <ObjectName>VolumeSlider</ObjectName>
@@ -78,14 +74,14 @@
         <Children>
 
           <WidgetGroup>
-            <ObjectName>Channel<Variable name="i"/>Volume</ObjectName>
+            <ObjectName>ChannelVolume</ObjectName>
             <Layout>vertical</Layout>
             <Children>
               <SliderComposed>
                 <TooltipId>channel_volume</TooltipId>
                 <SizePolicy>min,me</SizePolicy>
                 <MinimumSize>40,50</MinimumSize>
-                <MaximumSize>40,130</MaximumSize>
+                <MaximumSize>40,150</MaximumSize>
                 <Slider scalemode="STRETCH">slider-vertical.svg</Slider>
                 <Handle scalemode="STRETCH_ASPECT">handle-vertical.svg</Handle>
                 <Horizontal>false</Horizontal>
@@ -105,13 +101,14 @@
           </WidgetGroup>
 
           <WidgetGroup>
-            <ObjectName>Channel<Variable name="i"/>Volume</ObjectName>
+            <ObjectName>ChannelVolume</ObjectName>
             <Layout>vertical</Layout>
+            <Size>40min,80me</Size>
             <Children>
               <SliderComposed>
                 <TooltipId>channel_volume</TooltipId>
                 <SizePolicy>min,me</SizePolicy>
-                <MinimumSize>40,110</MinimumSize>
+                <MinimumSize>40,80</MinimumSize>
                 <Slider scalemode="STRETCH">slider-vertical.svg</Slider>
                 <Handle scalemode="STRETCH_ASPECT">handle-vertical.svg</Handle>
                 <Horizontal>false</Horizontal>
@@ -128,10 +125,12 @@
           </WidgetGroup>
 
         </Children>
-      </WidgetGroup>
+      </WidgetGroup><!-- VolumeSlider -->
 
       <WidgetGroup>
+        <ObjectName>ButtonContainer</ObjectName>
         <Layout>horizontal</Layout>
+        <Size>-1me,28f</Size>
         <Children>
           <Template src="skin:crossfader_orientation_button.xml">
             <SetVariable name="Unit">Deck<Variable name="i"/></SetVariable>
@@ -143,5 +142,9 @@
         </Connection>
       </WidgetGroup>
     </Children>
+    <Connection>
+      <ConfigKey>[Master],show_faders</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/mixer_controls_condensed_left.xml b/res/skins/Deere/mixer_controls_condensed_left.xml
index dd5934b7316d..5e3243005350 100644
--- a/res/skins/Deere/mixer_controls_condensed_left.xml
+++ b/res/skins/Deere/mixer_controls_condensed_left.xml
@@ -6,7 +6,7 @@
 <Template>
   <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
   <WidgetGroup>
-    <ObjectName>DeckMixer<Variable name="i"/>_ColumnCondensed</ObjectName>
+    <ObjectName>DeckMixer_ColumnCondensed</ObjectName>
     <Layout>vertical</Layout>
     <Children>
 
@@ -14,7 +14,7 @@
         <Layout>vertical</Layout>
         <Children>
 
-          <Template src="skin:mixer_controls_col1_left.xml" />
+          <Template src="skin:mixer_column_eq_left.xml" />
 
         </Children>
         <Connection>
@@ -29,7 +29,7 @@
 
           <WidgetGroup>
             <ObjectName>CondensedButtonContainerLeft</ObjectName>
-            <Size>-1me,30f</Size>
+            <SizePolicy>min,min</SizePolicy>
             <Layout>horizontal</Layout>
             <Children>
               <Template src="skin:left_2state_button.xml">
@@ -53,10 +53,6 @@
             <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>
@@ -84,29 +80,23 @@
                 </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>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <SizePolicy>me,min</SizePolicy>
             <Children>
 
-              <Template src="skin:spacer_hx.xml">
-                <SetVariable name="width">15</SetVariable>
-              </Template>
+              <Template src="skin:spacer_h.xml"/>
 
               <WidgetGroup>
                 <ObjectName>channel_VuMeter_Group</ObjectName>
                 <Layout>horizontal</Layout>
-                <MaximumSize>22,141</MaximumSize>
+                <Size>22max,-1min</Size>
                 <Children>
                   <Template src="skin:vumeter_v.xml">
                     <SetVariable name="group"><Variable name="group"/></SetVariable>
@@ -123,19 +113,24 @@
                 </Children>
               </WidgetGroup>
 
+              <Template src="skin:spacer_hx.xml">
+                <SetVariable name="width">9</SetVariable>
+              </Template>
+
             </Children>
+            <Connection>
+              <ConfigKey>[Master],show_faders</ConfigKey>
+              <Transform><Not/></Transform>
+              <BindProperty>visible</BindProperty>
+            </Connection>
           </WidgetGroup>
 
           <WidgetGroup>
             <ObjectName>CondensedButtonContainerLeft</ObjectName>
-            <Size>-1me,25f</Size>
+            <SizePolicy>me,min</SizePolicy>
             <Layout>vertical</Layout>
             <Children>
 
-              <Template src="skin:spacer_vx.xml">
-                <SetVariable name="height">2</SetVariable>
-              </Template>
-
               <Template src="skin:crossfader_orientation_button.xml">
                 <SetVariable name="Unit">Deck<Variable name="i"/></SetVariable>
               </Template>
diff --git a/res/skins/Deere/mixer_controls_condensed_right.xml b/res/skins/Deere/mixer_controls_condensed_right.xml
index 5e6381a45318..a5ab9b1ae393 100644
--- a/res/skins/Deere/mixer_controls_condensed_right.xml
+++ b/res/skins/Deere/mixer_controls_condensed_right.xml
@@ -6,7 +6,7 @@
 <Template>
   <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
   <WidgetGroup>
-    <ObjectName>DeckMixer<Variable name="i"/>_ColumnCondensed</ObjectName>
+    <ObjectName>DeckMixer_ColumnCondensed</ObjectName>
     <Layout>vertical</Layout>
     <Children>
 
@@ -14,7 +14,7 @@
         <Layout>vertical</Layout>
         <Children>
 
-          <Template src="skin:mixer_controls_col1_right.xml" />
+          <Template src="skin:mixer_column_eq_right.xml" />
 
         </Children>
         <Connection>
@@ -29,7 +29,7 @@
 
           <WidgetGroup>
             <ObjectName>CondensedButtonContainerRight</ObjectName>
-            <Size>-1me,30f</Size>
+            <SizePolicy>min,min</SizePolicy>
             <Layout>horizontal</Layout>
             <Children>
               <Template src="skin:left_2state_button.xml">
@@ -47,16 +47,13 @@
                 <SetVariable name="left_connection_control"><Variable name="group"/>,pfl</SetVariable>
               </Template>
             </Children>
-          </WidgetGroup>
+          </WidgetGroup><!-- PFL -->
 
-          <WidgetGroup>
+          <WidgetGroup><!-- VU + Vol fader -->
             <GroupName>CondensedVolumeAndMonoMeter</GroupName>
             <Layout>horizontal</Layout>
             <MaximumSize>60,141</MaximumSize>
-            <Connection>
-              <ConfigKey>[Master],show_faders</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
+            <SizePolicy>min,min</SizePolicy>
             <Children>
               <SliderComposed>
                 <TooltipId>channel_volume</TooltipId>
@@ -85,25 +82,25 @@
               </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>
+          </WidgetGroup><!-- VU + Vol fader -->
+
+          <WidgetGroup><!-- VU + spacer -->
+            <Layout>horizontal</Layout>
+            <SizePolicy>me,min</SizePolicy>
             <Children>
 
+              <Template src="skin:spacer_hx.xml">
+                <SetVariable name="width">9</SetVariable>
+              </Template>
+
               <WidgetGroup>
                 <ObjectName>channel_VuMeter_Group</ObjectName>
                 <Layout>horizontal</Layout>
-                <MaximumSize>22,141</MaximumSize>
+                <Size>22max,-1min</Size>
                 <Children>
                   <Template src="skin:vumeter_v.xml">
                     <SetVariable name="group"><Variable name="group"/></SetVariable>
@@ -120,23 +117,22 @@
                 </Children>
               </WidgetGroup>
 
-              <Template src="skin:spacer_hx.xml">
-                <SetVariable name="width">15</SetVariable>
-              </Template>
+              <Template src="skin:spacer_h.xml"/>
 
             </Children>
-          </WidgetGroup>
+            <Connection>
+              <ConfigKey>[Master],show_faders</ConfigKey>
+              <BindProperty>visible</BindProperty>
+              <Transform><Not/></Transform>
+            </Connection>
+          </WidgetGroup><!-- VU + spacer -->
 
           <WidgetGroup>
             <ObjectName>CondensedButtonContainerRight</ObjectName>
-            <Size>-1me,25f</Size>
+            <SizePolicy>me,min</SizePolicy>
             <Layout>vertical</Layout>
             <Children>
 
-              <Template src="skin:spacer_vx.xml">
-                <SetVariable name="height">2</SetVariable>
-              </Template>
-
               <Template src="skin:crossfader_orientation_button.xml">
                 <SetVariable name="Unit">Deck<Variable name="i"/></SetVariable>
               </Template>
@@ -145,8 +141,8 @@
           </WidgetGroup>
 
         </Children>
-      </WidgetGroup>
+      </WidgetGroup><!--  -->
 
     </Children>
-  </WidgetGroup>
+  </WidgetGroup><!-- DeckMixer_ColumnCondensed -->
 </Template>
diff --git a/res/skins/Deere/mixer_controls_left.xml b/res/skins/Deere/mixer_controls_left.xml
index a659306730a3..2ae62cb0b0a5 100644
--- a/res/skins/Deere/mixer_controls_left.xml
+++ b/res/skins/Deere/mixer_controls_left.xml
@@ -6,7 +6,7 @@
 <Template>
   <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
   <WidgetGroup>
-    <ObjectName>DeckMixer<Variable name="i"/></ObjectName>
+    <ObjectName>DeckMixer</ObjectName>
     <Layout>vertical</Layout>
     <SizePolicy>min,me</SizePolicy>
     <Children>
@@ -16,12 +16,12 @@
         <Layout>horizontal</Layout>
         <SizePolicy>min,min</SizePolicy>
         <Children>
-          <Template src="skin:mixer_controls_col1_left.xml"/>
+          <Template src="skin:mixer_column_eq_left.xml"/>
           <WidgetGroup>
             <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:mixer_controls_col2.xml"/>
-              <Template src="skin:mixer_controls_col3.xml"/>
+              <Template src="skin:mixer_column_volume.xml"/>
+              <Template src="skin:mixer_column_gain_levels.xml"/>
             </Children>
           </WidgetGroup>
         </Children>
@@ -39,13 +39,13 @@
         <Layout>vertical</Layout>
         <SizePolicy>min,min</SizePolicy>
         <Children>
-          <Template src="skin:mixer_controls_col1_left.xml"/>
+          <Template src="skin:mixer_column_eq_left.xml"/>
           <WidgetGroup>
             <Layout>vertical</Layout>
             <ObjectName>4DecksMixerCol2ContainerLeft</ObjectName>
             <Children>
-              <Template src="skin:mixer_controls_col3.xml"/>
-              <Template src="skin:mixer_controls_col2.xml"/>
+              <Template src="skin:mixer_column_gain_levels.xml"/>
+              <Template src="skin:mixer_column_volume.xml"/>
             </Children>
           </WidgetGroup>
         </Children>
diff --git a/res/skins/Deere/mixer_controls_right.xml b/res/skins/Deere/mixer_controls_right.xml
index 2852bc0385a2..46355f2d6c54 100644
--- a/res/skins/Deere/mixer_controls_right.xml
+++ b/res/skins/Deere/mixer_controls_right.xml
@@ -6,7 +6,7 @@
 <Template>
   <SetVariable name="group">[Channel<Variable name="i"/>]</SetVariable>
   <WidgetGroup>
-    <ObjectName>DeckMixer<Variable name="i"/></ObjectName>
+    <ObjectName>DeckMixer</ObjectName>
     <Layout>vertical</Layout>
     <SizePolicy>min,me</SizePolicy>
     <Children>
@@ -19,11 +19,11 @@
           <WidgetGroup>
             <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:mixer_controls_col3.xml"/>
-              <Template src="skin:mixer_controls_col2.xml"/>
+              <Template src="skin:mixer_column_gain_levels.xml"/>
+              <Template src="skin:mixer_column_volume.xml"/>
             </Children>
           </WidgetGroup>
-          <Template src="skin:mixer_controls_col1_right.xml"/>
+          <Template src="skin:mixer_column_eq_right.xml"/>
         </Children>
         <Connection>
           <ConfigKey>[Master],show_4decks</ConfigKey>
@@ -39,13 +39,13 @@
         <Layout>vertical</Layout>
         <SizePolicy>min,min</SizePolicy>
         <Children>
-          <Template src="skin:mixer_controls_col1_right.xml"/>
+          <Template src="skin:mixer_column_eq_right.xml"/>
           <WidgetGroup>
             <Layout>vertical</Layout>
             <ObjectName>4DecksMixerCol2ContainerRight</ObjectName>
             <Children>
-              <Template src="skin:mixer_controls_col3.xml"/>
-              <Template src="skin:mixer_controls_col2.xml"/>
+              <Template src="skin:mixer_column_gain_levels.xml"/>
+              <Template src="skin:mixer_column_volume.xml"/>
             </Children>
           </WidgetGroup>
         </Children>
diff --git a/res/skins/Deere/quick_effect_superknob_left.xml b/res/skins/Deere/quick_effect_superknob_left.xml
index 85c0fbb0a7cc..6684976abe93 100644
--- a/res/skins/Deere/quick_effect_superknob_left.xml
+++ b/res/skins/Deere/quick_effect_superknob_left.xml
@@ -13,6 +13,7 @@
   <SetVariable name="QuickEffectEffectGroup">[QuickEffectRack<Variable name="QuickEffect"/>_<Variable name="group"/>_Effect1]</SetVariable>
   <WidgetGroup>
     <Layout>horizontal</Layout>
+    <SizePolicy>me,me</SizePolicy>
     <Children>
 
       <!-- Invert the on/off icons so they match the EQ kill switches. -->
@@ -43,6 +44,17 @@
         </Connection>
       </PushButton>
 
+      <WidgetGroup><!-- Expanding spacer to push EQ knob to opposite side -->
+        <ObjectName>TEST1</ObjectName>
+        <Size>0me,1min</Size>
+        <Children/>
+        <Connection>
+          <ConfigKey>[Master],show_killswitches</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
       <Template src="skin:knob.xml">
         <SetVariable name="group"><Variable name="QuickEffectUnitGroup"/></SetVariable>
         <SetVariable name="control">super1</SetVariable>
diff --git a/res/skins/Deere/quick_effect_superknob_right.xml b/res/skins/Deere/quick_effect_superknob_right.xml
index d048fc1c02ff..5e49022a84f6 100644
--- a/res/skins/Deere/quick_effect_superknob_right.xml
+++ b/res/skins/Deere/quick_effect_superknob_right.xml
@@ -13,6 +13,7 @@
   <SetVariable name="QuickEffectEffectGroup">[QuickEffectRack<Variable name="QuickEffect"/>_<Variable name="group"/>_Effect1]</SetVariable>
   <WidgetGroup>
     <Layout>horizontal</Layout>
+    <SizePolicy>me,me</SizePolicy>
     <Children>
 
       <Template src="skin:knob.xml">
@@ -49,6 +50,17 @@
         </Connection>
       </PushButton>
 
+      <WidgetGroup><!-- Expanding spacer to push EQ knob to opposite side -->
+        <ObjectName>TEST1</ObjectName>
+        <Size>0me,1min</Size>
+        <Children/>
+        <Connection>
+          <ConfigKey>[Master],show_killswitches</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+
     </Children>
     <Connection>
       <ConfigKey><Variable name="QuickEffectEffectGroup"/>,loaded</ConfigKey>
diff --git a/res/skins/Deere/skin.xml b/res/skins/Deere/skin.xml
index 6a9bf4bed2ff..5bb3707b2ab3 100644
--- a/res/skins/Deere/skin.xml
+++ b/res/skins/Deere/skin.xml
@@ -165,12 +165,8 @@
           <Size>-1me,-1me</Size>
           <Children>
             <WidgetGroup>
-              <Connection>
-                <ConfigKey>[Master],maximize_library</ConfigKey>
-                <BindProperty>visible</BindProperty>
-                <Transform><Not/></Transform>
-              </Connection>
               <Layout>vertical</Layout>
+              <SizePolicy>min,max</SizePolicy>
               <Children>
 
                 <Template src="skin:main_decks.xml"/>
@@ -179,6 +175,11 @@
                 <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"/>
diff --git a/res/skins/Deere/skin_settings.xml b/res/skins/Deere/skin_settings.xml
index bde839e0e41d..f8080549fe6d 100644
--- a/res/skins/Deere/skin_settings.xml
+++ b/res/skins/Deere/skin_settings.xml
@@ -293,7 +293,7 @@
           </PushButton>
 
           <PushButton>
-            <TooltipId>show_eqs</TooltipId>
+            <TooltipId>show_faders</TooltipId>
             <Size>80me,20f</Size>
             <NumberStates>2</NumberStates>
             <State>
diff --git a/res/skins/Deere/slider-crossfader-AutoDJ.svg b/res/skins/Deere/slider-crossfader-AutoDJ.svg
new file mode 100644
index 000000000000..bb33e75eda77
--- /dev/null
+++ b/res/skins/Deere/slider-crossfader-AutoDJ.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"
+   version="1.1"
+   width="180"
+   height="40"
+   id="svg2"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="slider-crossfader-AutoDJ.svg">
+  <metadata
+     id="metadata76">
+    <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="defs74" />
+  <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="747"
+     id="namedview72"
+     showgrid="false"
+     inkscape:zoom="3.5905311"
+     inkscape:cx="63.197016"
+     inkscape:cy="48.226665"
+     inkscape:window-x="0"
+     inkscape:window-y="21"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     inkscape:snap-page="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true" />
+  <rect
+     style="opacity:1;color:#000000;fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:134.64567566000002330;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+     id="rect2984"
+     width="172.04665"
+     height="14.482537"
+     x="3.9766769"
+     y="12.758732" />
+  <!-- marker lines every 5px -->
+  <!-- end marker -->
+  <!-- quarter marker -->
+  <!-- middle marker -->
+  <!-- quarter marker -->
+  <!-- end marker -->
+</svg>
diff --git a/res/skins/Deere/slider-horizontal.svg b/res/skins/Deere/slider-crossfader.svg
similarity index 73%
rename from res/skins/Deere/slider-horizontal.svg
rename to res/skins/Deere/slider-crossfader.svg
index be1da24081fb..11f1c9d43752 100644
--- a/res/skins/Deere/slider-horizontal.svg
+++ b/res/skins/Deere/slider-crossfader.svg
@@ -11,7 +11,7 @@
    width="180"
    height="40"
    id="svg2"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.48.4 r9939"
    sodipodi:docname="slider-horizontal.svg">
   <metadata
      id="metadata76">
@@ -36,16 +36,19 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1366"
-     inkscape:window-height="702"
+     inkscape:window-height="746"
      id="namedview72"
      showgrid="false"
      inkscape:zoom="2.5388889"
-     inkscape:cx="13.588622"
-     inkscape:cy="20.787746"
+     inkscape:cx="88.665961"
+     inkscape:cy="52.335148"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
+     inkscape:current-layer="svg2"
+     inkscape:snap-page="true"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true" />
   <!-- marker lines every 5px -->
   <!-- end marker -->
   <!-- quarter marker -->
@@ -54,20 +57,20 @@
   <!-- end marker -->
   <g
      id="g4768"
-     transform="matrix(0,1,-1,0,55.164124,-15.054704)">
+     transform="matrix(0,1,-1.0808731,0,52.353048,-15.054704)">
     <rect
-       rx="1"
+       rx="0.92517799"
        ry="1"
        y="-114.58588"
        x="27.687683"
        height="159.5"
        width="14.734042"
        id="rect4167"
-       style="opacity:1;fill:none;fill-opacity:1;stroke:#222222;stroke-width:2.5;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       style="fill:none;stroke:#222222;stroke-width:2.40465426;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       d="m 18.064453,15.681641 0,148.636719 3.871094,0 0,-148.636719 -3.871094,0 z"
+       d="m 18.0625,15.6875 0,148.625 3.875,0 0,-148.625 -3.875,0 z"
        id="path4175"
-       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"
+       style="fill:#222222;fill-opacity:1;stroke:#222222;stroke-width:2.40465426;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        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 "
        inkscape:radius="-5.4322028"
        sodipodi:type="inkscape:offset"
diff --git a/res/skins/Deere/spacer_hx.xml b/res/skins/Deere/spacer_hx.xml
index 42b27813ab89..3be436dfb8b8 100644
--- a/res/skins/Deere/spacer_hx.xml
+++ b/res/skins/Deere/spacer_hx.xml
@@ -6,10 +6,7 @@ Description: Spacer.
   <WidgetGroup>
     <ObjectName>Spacer<Variable name="color"/></ObjectName>
     <Layout>horizontal</Layout>
-    <SizePolicy>min,min</SizePolicy>
     <Size><Variable name="width"/></Size>
-    <MinimumSize><Variable name="width"/>,-1</MinimumSize>
-    <MaximumSize><Variable name="width"/>,-1</MaximumSize>
     <Children>
     </Children>
   </WidgetGroup>
diff --git a/res/skins/Deere/spacer_vx.xml b/res/skins/Deere/spacer_vx.xml
index 0f05c0e206f1..96a9c32d826b 100644
--- a/res/skins/Deere/spacer_vx.xml
+++ b/res/skins/Deere/spacer_vx.xml
@@ -6,10 +6,7 @@ Description: Spacer.
   <WidgetGroup>
     <ObjectName>Spacer</ObjectName>
     <Layout>horizontal</Layout>
-    <SizePolicy>min,min</SizePolicy>
     <Size><Variable name="height"/></Size>
-    <MinimumSize><Variable name="height"/></MinimumSize>
-    <MaximumSize><Variable name="height"/></MaximumSize>
     <Children>
     </Children>
   </WidgetGroup>
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index a6b4f28f9d82..f153d3928e54 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -22,19 +22,13 @@
  *******************************************************************************/
 /* These definitions put a faint border around all the widgets. We have to be
    tricky with top/bottom-ness to get things right. */
-#Mixer {
-  border-color: #222;
-  border-style: solid;
-  border-width: 0px 1.5px 3px 1.5px;
-  background-color: #333;
-}
-
 #DeckControls {
-  padding: 7.5px;
+  padding: 5px 7.5px 2px 7.5px;
+  /* background-color: #456789; */
 }
 
 #CrossfaderContainer {
-  padding: 0px 7.5px 7.5px 7.5px;
+  padding: 3px;
 }
 
 #DeckTextRow {
@@ -80,6 +74,10 @@
   padding: 4px;
 }
 
+#MixerBorder {
+  background-color: #222;
+}
+
 /* Rounded corners to split things up */
 
 #Deck1, #Deck3 {
@@ -119,6 +117,18 @@
   background-color: #222222;
 }
 
+TEST1 {
+  background-color: #00B824;
+}
+
+#AlignLeft {
+  qproperty-layoutAlignment: 'AlignLeft';
+}
+
+#AlignRight {
+  qproperty-layoutAlignment: 'AlignRight';
+}
+
 #SamplerRow1,
 #SamplerRow2,
 #SamplerRow3,
@@ -625,10 +635,6 @@ WWidget, QLabel {
   qproperty-layoutSpacing: 2;
 }
 
-#ButtonGrid {
-  qproperty-layoutSpacing: 2;
-}
-
 #OptionGridRow1, #OptionGridRow2 {
   qproperty-layoutSpacing: 2;
 }
@@ -638,6 +644,10 @@ WWidget, QLabel {
 }
 /* End spacing for Deck overview row */
 
+#Waveforms {
+  background-color: #333;
+}
+
 #WaveformZoomContainer {
   background-color: #333333;
   padding: 1px;
@@ -659,12 +669,11 @@ WWidget, QLabel {
 
 /* Start spacing for Deck controls row (transport, beatgrid, looping, hotcue, vinylcontrol) */
 
-#FullControlsRow, #MinimalControlsContainer {
+#FullControlsRow {
   qproperty-layoutSpacing: 3;
   qproperty-layoutAlignment: 'AlignBottom';
 }
 
-#BeatjumpContainer, #LoopContainer,
 #HotcueGrid, #HotcueGridExtended,
 #VinylControlsContainer {
   background-color: #333333;
@@ -672,8 +681,6 @@ WWidget, QLabel {
   qproperty-layoutSpacing: 2;
 }
 
-#BeatjumpContainer WWidgetGroup,
-#LoopContainer WWidgetGroup, #LoopButtons, #LoopButtons WWidgetGroup,
 #HotcueGrid WWidgetGroup, #HotcueGridExtended WWidgetGroup,
 #VinylControlsContainer WWidgetGroup {
   qproperty-layoutSpacing: 2;
@@ -682,12 +689,9 @@ WWidget, QLabel {
 WBeatSpinBox {
   color: #c1cabe;
   background-color: #1f1e1e;
-
   border: 1px solid #444342;
   border-radius: 3px;
-
   padding: 2px;
-
   font: 15px;
 }
 
@@ -783,16 +787,23 @@ WBeatSpinBox {
 
 #BPMGutter, #PositionGutter {
   qproperty-layoutAlignment: 'AlignRight | AlignTop';
-  qproperty-layoutSpacing: 10;
+  qproperty-layoutSpacing: 4;
   padding: 2px;
 }
 
 /* Start editable widgets in decks */
-#BpmEditRow:hover, #KeyEditRow:hover, #PositionGutter:hover, #StarratingGutter:hover {
+#BpmEditRowCollapsed:hover, #KeyEditRowCollapsed:hover,
+#BpmEditRowExpanded:hover, #KeyEditRowExpanded:hover,
+#PositionGutter:hover, #StarratingGutter:hover {
   /* emphasize editable widgets on hover */
   border: 1px solid #FF6600;
   background-color: rgba(255, 102, 0, 128);
 }
+#BpmEditRowCollapsed, #KeyEditRowCollapsed {
+  qproperty-layoutAlignment: 'AlignCenter';
+  /* emphasize active widget */
+  border: 1px solid #666666;
+}
 
 #BpmEditRowExpanded, #KeyEditRowExpanded {
   /* emphasize active widget */
@@ -810,11 +821,15 @@ WBeatSpinBox {
 #BpmEditRowControls, #KeyEditRowControls {
   /* Make room between buttons */
   background-color: #333333;
-  padding-left: 2px;
-  padding-right: 2px;
-  margin-left: 2px;
+  padding-left: 1px;
+  padding-right: 1px;
+  margin-right: 2px;
   qproperty-layoutSpacing: 2;
 }
+
+#BpmEditTriggerLabel, #KeyEditTriggerLabel {
+  padding-right: 1px;
+}
 /* End editable widgets in decks */
 
 #DeckTextRow #ArtistGutter WLabel, #DeckTextRow #BPMGutter WLabel, #DeckTextRow #PositionGutter WLabel {
@@ -996,12 +1011,12 @@ WEffectSelector {
   margin-top: 1px;
 }
 
-#Mixer {
-  qproperty-layoutAlignment: 'AlignTop';
+#Crossfader[highlight="0"] {
+  border-image: none;
 }
 
-#CrossfaderAutoDjActive {
-  background-color: #001726;
+#Crossfader[highlight="1"] {
+  border-image: url(skin:slider-crossfader-AutoDJ.svg) 0 0 0 0 stretch stretch;
 }
 
 #MasterControls {
@@ -1058,9 +1073,19 @@ WNumberRate {
   qproperty-layoutAlignment: 'AlignHCenter';
 }
 
-#DeckMixer1_Column2, #DeckMixer2_Column2,
-#DeckMixer3_Column2, #DeckMixer4_Column2 {
-  qproperty-layoutSpacing: 5;
+#Mixer {
+  qproperty-layoutAlignment: 'AlignTop';
+  background-color: #333;
+  margin: 0px 1.5px 3px 1.5px;
+}
+
+#DeckMixer {
+  background-color: #333333;
+}
+
+#DeckMixer_Column2, #DeckMixer_Column3 {
+  /* qproperty-layoutSpacing: 5; */
+  /* background-color: #006596; */
 }
 
 #CircleButton, #QuickEffectKillButton {
@@ -1081,35 +1106,52 @@ WNumberRate {
   border-radius: 1px;
 }
 
-#DeckControlsSplitWaveforms4Decks #channel_VuMeter_Group,
-#DeckControlsStackedWaveforms4Decks #channel_VuMeter_Group {
-  padding-bottom: 5px;
+#DeckControls_SplitWaveforms_4Decks #channel_VuMeter_Group,
+#DeckControls_StackedWaveforms_4Decks #channel_VuMeter_Group {
+  /* padding-bottom: 5px; */
+  /* background-color: #116611; */
 }
 
-#DeckMixer1_ColumnCondensed, #DeckMixer2_ColumnCondensed,
-#DeckMixer3_ColumnCondensed, #DeckMixer4_ColumnCondensed {
-  padding: 5;
+#DeckMixer_ColumnCondensed {
+  padding: 0px 5px 0px 5px;
   qproperty-layoutAlignment: 'AlignHCenter';
+  /* background-color: #911661; */
 }
 
 /* pad 4 deck mixer colums left/right
 to avoid EQ kill buttons from shifting center of rest of column */
-#4DecksMixerCol2ContainerRight,
+#4DecksMixerCol2ContainerRight {
+  qproperty-layoutAlignment: 'AlignLeft';
+  padding-right: 6px;
+}
+
+#4DecksMixerCol2ContainerLeft {
+  qproperty-layoutAlignment: 'AlignRight';
+  padding-left: 6px;
+}
+
+#ButtonContainer {
+  qproperty-layoutAlignment: 'AlignCenter';
+  padding: 3px 0px 3px 0px;
+}
+
 #CondensedButtonContainerRight {
-  padding-right: 14px;
+  qproperty-layoutAlignment: 'AlignLeft';
+  padding: 3px 0px 3px 9px;
 }
-#4DecksMixerCol2ContainerLeft,
+
 #CondensedButtonContainerLeft {
-  padding-left: 14px;
+  qproperty-layoutAlignment: 'AlignRight';
+  padding: 3px 9px 3px 0px;
 }
 
 #4DecksMixerCondensedMonoMeterLeft {
-  padding-left: 2px;
+  padding-left: 3px;
   padding-right: 4px;
 }
 #4DecksMixerCondensedMonoMeterRight {
   padding-left: 4px;
-  padding-right: 2px;
+  padding-right: 3px;
 }
 
 #CondensedVolumeAndMonoMeter {
@@ -1117,26 +1159,26 @@ to avoid EQ kill buttons from shifting center of rest of column */
 }
 
 #channel_VuMeter_Group {
-  qproperty-layoutSpacing: 3;
+  qproperty-layoutSpacing: 2;
   qproperty-layoutAlignment: 'AlignHCenter';
+  /* background-color: #828315; */
 }
 
 #master_VuMeter_Group {
-  qproperty-layoutSpacing: 3;
+  qproperty-layoutSpacing: 2;
   qproperty-layoutAlignment: 'AlignHCenter';
   padding-left: 5px;
   padding-right: 5px;
+  /* background-color: #828315; */
 }
 
-#MasterVumeter {
-  qproperty-layoutSpacing: 3;
-  qproperty-layoutAlignment: 'AlignHCenter';
-  padding-left: 10px;
-  padding-right: 10px;
+#MasterVu {
+  qproperty-layoutAlignment: 'AlignCenter';
+  /* background-color: #582831; */
 }
 
 #vumeter_v, #vumeter_h {
-  qproperty-layoutSpacing: 3;
+  qproperty-layoutSpacing: 2;
 }
 
 WVuMeter, #PeakIndicator {
@@ -1311,14 +1353,16 @@ WPushButton:hover {
 }
 
 /*"Pressed" state*/
-WPushButton[value="1"] {
+WPushButton[value="1"],
+WPushButton[value="2"] {
     /*color: #FDFDFD;*/
     color: #FDFDFD;
     background-color: #006596;
     border: 0px solid #006596;
 }
 
-WPushButton[value="1"]:hover {
+WPushButton[value="1"]:hover,
+WPushButton[value="2"]:hover {
     color: #FDFDFD;
     background-color: #0080BE;
     border: 0px solid #0080BE;
@@ -1328,7 +1372,6 @@ WPushButton[value="1"]:hover {
   0 -- disconnected / off
   1 -- connecting / enabling
   2 -- connected / enabled
-*/
 WPushButton[value="2"] {
     color: #FDFDFD;
     background-color: #4B4B4B;
@@ -1340,6 +1383,15 @@ WPushButton[value="2"]:hover {
     background-color: #4B4B4B;
     border: 0px solid #0080BE;
 }
+*/
+
+#PlayToggle[value="0"] {
+  image: url(skin:/icon/ic_play_48px.svg) no-repeat center center;
+}
+
+#PlayToggle[value="1"] {
+  image: url(skin:/icon/ic_pause_48px.svg) no-repeat center center;
+}
 
 #ToolbarButton[value="1"] {
     color: #D2D2D2;
@@ -1355,6 +1407,10 @@ WPushButton[value="2"]:hover {
     border-radius: 3px;
 }
 
+WRecordingDuration {
+  font-weight: bold;
+}
+
 /* Special case "orientation" controls
   0 -- left
   1 -- center / off
diff --git a/res/skins/Deere/tool_bar.xml b/res/skins/Deere/tool_bar.xml
index e3537b7e6af7..a9de248cdd5c 100644
--- a/res/skins/Deere/tool_bar.xml
+++ b/res/skins/Deere/tool_bar.xml
@@ -144,103 +144,6 @@
             <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>
@@ -293,9 +196,78 @@
                 <SetVariable name="state_2">icon/ic_vinylcontrol_3_32px.svg</SetVariable>
                 <SetVariable name="left_connection_control">[Channel4],vinylcontrol_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>
             </Children>
           </WidgetGroup>
 
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <Children>
+
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Connection>
+                  <ConfigKey>[Recording],status</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+                <Children>
+                  <RecordingDuration/>
+
+                  <Template src="skin:spacer_hx.xml">
+                    <SetVariable name="width">2f,</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup>
+
+              <Template src="skin:left_display_4state_button.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_0_32px.svg</SetVariable>
+                <SetVariable name="state_1">icon/ic_recording_1_32px.svg</SetVariable>
+                <SetVariable name="state_2">icon/ic_recording_2_32px.svg</SetVariable>
+                <SetVariable name="state_3">icon/ic_recording_3_32px.svg</SetVariable>
+                <SetVariable name="left_connection_control">[Recording],toggle_recording</SetVariable>
+                <SetVariable name="display_connection_control">[Recording],status</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+          <Template src="skin:left_display_4state_button.xml">
+            <SetVariable name="TooltipId">broadcast_enabled</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_0_32px.svg</SetVariable>
+            <SetVariable name="state_1">icon/ic_broadcast_1_32px.svg</SetVariable>
+            <SetVariable name="state_2">icon/ic_broadcast_2_32px.svg</SetVariable>
+            <SetVariable name="state_3">icon/ic_broadcast_3_32px.svg</SetVariable>
+            <SetVariable name="left_connection_control">[Shoutcast],enabled</SetVariable>
+            <SetVariable name="display_connection_control">[Shoutcast],status</SetVariable>
+          </Template>
+
           <Template src="skin:left_2state_button.xml">
             <SetVariable name="MinimumSize"><Variable name="ToolbarButtonMinimumSize"/></SetVariable>
             <SetVariable name="MaximumSize"><Variable name="ToolbarButtonMaximumSize"/></SetVariable>
diff --git a/res/skins/Deere/vinylcontrol.xml b/res/skins/Deere/vinylcontrol.xml
index 4462f95a55b9..12947e450824 100644
--- a/res/skins/Deere/vinylcontrol.xml
+++ b/res/skins/Deere/vinylcontrol.xml
@@ -1,16 +1,15 @@
 <!DOCTYPE template>
 <Template>
-
-    <WidgetGroup>
-    <ObjectName>VinylControlsContainer</ObjectName>
-    <Layout>vertical</Layout>
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
     <SizePolicy>min,min</SizePolicy>
-    <Connection>
-      <ConfigKey>[VinylControl],show_vinylcontrol</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
     <Children>
 
+      <WidgetGroup>
+        <ObjectName>VinylControlsContainer</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
           <Template src="skin:left_2state_button.xml">
             <SetVariable name="TooltipId">vinylcontrol_enabled</SetVariable>
             <SetVariable name="ObjectName">VinylToggleButtonUL</SetVariable>
@@ -22,17 +21,6 @@
             <SetVariable name="left_connection_control"><Variable name="group"/>,vinylcontrol_enabled</SetVariable>
           </Template>
 
-          <Template src="skin:left_2state_button.xml">
-            <SetVariable name="TooltipId">passthrough_enabled</SetVariable>
-            <SetVariable name="ObjectName">VinylToggleButtonLL</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">PASS</SetVariable>
-            <SetVariable name="state_1_text">PASS</SetVariable>
-            <SetVariable name="left_connection_control"><Variable name="group"/>,passthrough</SetVariable>
-          </Template>
-
           <Template src="skin:left_3state_button.xml">
             <SetVariable name="ObjectName">TristateButton</SetVariable>
             <SetVariable name="MinimumSize"><Variable name="WideButtonMinimumSize"/></SetVariable>
@@ -43,6 +31,24 @@
             <SetVariable name="state_2_text">CONST</SetVariable>
             <SetVariable name="left_connection_control"><Variable name="group"/>,vinylcontrol_mode</SetVariable>
           </Template>
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>VinylControlsContainer</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:left_2state_button.xml">
+            <SetVariable name="TooltipId">passthrough_enabled</SetVariable>
+            <SetVariable name="ObjectName">VinylToggleButtonLL</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">PASS</SetVariable>
+            <SetVariable name="state_1_text">PASS</SetVariable>
+            <SetVariable name="left_connection_control"><Variable name="group"/>,passthrough</SetVariable>
+          </Template>
 
           <Template src="skin:left_3state_button.xml">
             <SetVariable name="ObjectName">VinylCueButton</SetVariable>
@@ -52,10 +58,16 @@
             <SetVariable name="SizePolicy"><Variable name="WideButtonSizePolicy"/></SetVariable>
             <SetVariable name="state_0_text">CUE</SetVariable>
             <SetVariable name="state_1_text">CUE</SetVariable>
-            <SetVariable name="state_2_text">HOTCUE</SetVariable>
+            <SetVariable name="state_2_text">HOT</SetVariable>
             <SetVariable name="left_connection_control"><Variable name="group"/>,vinylcontrol_cueing</SetVariable>
           </Template>
+        </Children>
+      </WidgetGroup>
 
     </Children>
+    <Connection>
+      <ConfigKey>[VinylControl],show_vinylcontrol</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/vumeter_master.xml b/res/skins/Deere/vumeter_master.xml
index 6e5467f07d73..9a9be5707875 100644
--- a/res/skins/Deere/vumeter_master.xml
+++ b/res/skins/Deere/vumeter_master.xml
@@ -2,82 +2,31 @@
 <!-- Master level meter -->
 <Template>
   <WidgetGroup>
+    <ObjectName>MasterVu</ObjectName>
     <Layout>vertical</Layout>
+    <MinimumSize>28,90</MinimumSize>
+    <MaximumSize>28,150</MaximumSize>
+    <SizePolicy>min,me</SizePolicy>
     <Children>
 
       <WidgetGroup>
-        <ObjectName>MasterVu2Deck</ObjectName>
-        <Layout>vertical</Layout>
+        <ObjectName>master_VuMeter_Group</ObjectName>
+        <SizePolicy>f,me</SizePolicy>
+        <Layout>horizontal</Layout>
         <Children>
-
-          <!-- Spacer to align with bottom of mixer-->
-          <WidgetGroup>
-            <Size>-1,34f</Size>
-            <Layout>vertical</Layout>
-            <Children/>
-          </WidgetGroup>
-
-          <WidgetGroup>
-            <ObjectName>master_VuMeter_Group</ObjectName>
-            <Size>28f,-1me</Size>
-            <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>
-
+          <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>
-        <Connection>
-          <ConfigKey>[Master],show_4decks</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
       </WidgetGroup>
 
     </Children>