diff --git a/res/skins/Deere/effect_button_parameter.xml b/res/skins/Deere/effect_button_parameter.xml
index fc50782dce59..54685ca9b578 100644
--- a/res/skins/Deere/effect_button_parameter.xml
+++ b/res/skins/Deere/effect_button_parameter.xml
@@ -17,7 +17,7 @@
         <Layout>vertical</Layout>
         <Children>
           <EffectPushButton>
-            <Size>40f,15f</Size>
+            <Size>55f,15f</Size>
             <ObjectName>EffectButton</ObjectName>
             <TooltipId>EffectSlot_button_parameter</TooltipId>
             <EffectRack><Variable name="EffectRack"/></EffectRack>
@@ -40,7 +40,7 @@
           </EffectPushButton>
 
           <EffectButtonParameterName>
-            <Size>40f,15f</Size>
+            <Size>55f,15f</Size>
             <ObjectName>EffectButtonLabel</ObjectName>
             <EffectRack><Variable name="EffectRack"/></EffectRack>
             <EffectUnit><Variable name="EffectUnit"/></EffectUnit>
diff --git a/res/skins/Deere/effect_buttons.xml b/res/skins/Deere/effect_buttons.xml
new file mode 100644
index 000000000000..4a0117d348fa
--- /dev/null
+++ b/res/skins/Deere/effect_buttons.xml
@@ -0,0 +1,34 @@
+<!DOCTYPE template>
+<!--
+Buttons for a single effect
+
+Variables:
+  EffectRack: the rack
+  EffectUnit: the chain
+  Effect: the effect
+-->
+<Template>
+  <WidgetGroup>
+    <ObjectName>EffectButtonControls</ObjectName>
+    <Layout>horizontal</Layout>
+    <Children>
+      <Template src="skin:effect_focus_button.xml"/>
+
+      <Template src="skin:left_2state_button.xml">
+        <SetVariable name="TooltipId">EffectSlot_enabled</SetVariable>
+        <SetVariable name="ObjectName"></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_power_48px.svg</SetVariable>
+        <SetVariable name="state_0_unpressed">icon/ic_power_48px.svg</SetVariable>
+        <SetVariable name="state_1_text"></SetVariable>
+        <SetVariable name="state_1_pressed">icon/ic_power_48px.svg</SetVariable>
+        <SetVariable name="state_1_unpressed">icon/ic_power_48px.svg</SetVariable>
+        <SetVariable name="left_connection_control">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>_Effect<Variable name="Effect"/>],enabled</SetVariable>
+      </Template>
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Deere/effect_chain.xml b/res/skins/Deere/effect_chain.xml
deleted file mode 100644
index c991e7670130..000000000000
--- a/res/skins/Deere/effect_chain.xml
+++ /dev/null
@@ -1,562 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    An effect chain widget.
-  Variables:
-    group: The group for the controls.
--->
-<Template>
-  <SetVariable name="group">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>]</SetVariable>
-  <WidgetGroup>
-    <ObjectName>EffectUnit<Variable name="EffectUnit"/></ObjectName>
-    <Layout>vertical</Layout>
-    <SizePolicy>me,f</SizePolicy>
-    <MinimumSize>200,150</MinimumSize>
-    <Children>
-      <WidgetGroup>
-        <ObjectName>EffectUnitNameRow</ObjectName>
-        <Layout>horizontal</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <WidgetGroup>
-            <ObjectName>EffectUnitNameContainer</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>me,max</SizePolicy>
-            <Children>
-              <EffectChainName>
-                <EffectRack><Variable name="EffectRack"/></EffectRack>
-                <EffectUnit><Variable name="EffectUnit"/></EffectUnit>
-              </EffectChainName>
-            </Children>
-          </WidgetGroup>
-
-          <WidgetGroup>
-            <ObjectName>EffectUnitNextPrevContainer</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>me,max</SizePolicy>
-            <Children>
-              <Template src="skin:left_2state_button.xml">
-                <SetVariable name="TooltipId">EffectUnit_enabled</SetVariable>
-                <SetVariable name="ObjectName"></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_power_48px.svg</SetVariable>
-                <SetVariable name="state_0_unpressed">icon/ic_power_48px.svg</SetVariable>
-                <SetVariable name="state_1_text"></SetVariable>
-                <SetVariable name="state_1_pressed">icon/ic_power_48px.svg</SetVariable>
-                <SetVariable name="state_1_unpressed">icon/ic_power_48px.svg</SetVariable>
-                <SetVariable name="left_connection_control"><Variable name="group"/>,enabled</SetVariable>
-              </Template>
-
-              <Template src="skin:left_1state_button.xml">
-                <SetVariable name="TooltipId">EffectUnit_clear</SetVariable>
-                <SetVariable name="ObjectName"></SetVariable>
-                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-                <SetVariable name="state_0_text"></SetVariable>
-                <SetVariable name="state_0_pressed">icon/ic_eject_48px.svg</SetVariable>
-                <SetVariable name="state_0_unpressed">icon/ic_eject_48px.svg</SetVariable>
-                <SetVariable name="left_connection_control"><Variable name="group"/>,clear</SetVariable>
-              </Template>
-
-              <Template src="skin:left_1state_button.xml">
-                <SetVariable name="TooltipId">EffectUnit_prev_chain</SetVariable>
-                <SetVariable name="ObjectName"></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_chevron_left_48px.svg</SetVariable>
-                <SetVariable name="state_0_unpressed">icon/ic_chevron_left_48px.svg</SetVariable>
-                <SetVariable name="left_connection_control"><Variable name="group"/>,prev_chain</SetVariable>
-              </Template>
-
-              <Template src="skin:left_1state_button.xml">
-                <SetVariable name="TooltipId">EffectUnit_next_chain</SetVariable>
-                <SetVariable name="ObjectName"></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_chevron_right_48px.svg</SetVariable>
-                <SetVariable name="state_0_unpressed">icon/ic_chevron_right_48px.svg</SetVariable>
-                <SetVariable name="left_connection_control"><Variable name="group"/>,next_chain</SetVariable>
-              </Template>
-            </Children>
-          </WidgetGroup>
-        </Children>
-      </WidgetGroup>
-
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <Children>
-          <WidgetGroup>
-            <Layout>vertical</Layout>
-            <Children>
-              <WidgetGroup>
-                <ObjectName>EffectUnitControlRow</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                  <WidgetGroup>
-                    <ObjectName>EffectUnitParameters</ObjectName>
-                    <SizePolicy>me,max</SizePolicy>
-                    <Layout>horizontal</Layout>
-                    <Children>
-                      <!-- Allow up to 8 parameters, needed to control the graphic eq effect-->
-                      <Template src="skin:effect_selector_buttons.xml">
-                        <SetVariable name="Effect">1</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_parameter_knob.xml">
-                        <SetVariable name="Effect">1</SetVariable>
-                        <SetVariable name="EffectParameter">1</SetVariable>
-                        <SetVariable name="color">blue</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_button_parameter.xml">
-                        <SetVariable name="Effect">1</SetVariable>
-                        <SetVariable name="EffectButtonParameter">1</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_parameter_knob.xml">
-                        <SetVariable name="Effect">1</SetVariable>
-                        <SetVariable name="EffectParameter">2</SetVariable>
-                        <SetVariable name="color">blue</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_button_parameter.xml">
-                        <SetVariable name="Effect">1</SetVariable>
-                        <SetVariable name="EffectButtonParameter">2</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_parameter_knob.xml">
-                        <SetVariable name="Effect">1</SetVariable>
-                        <SetVariable name="EffectParameter">3</SetVariable>
-                        <SetVariable name="color">blue</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_button_parameter.xml">
-                        <SetVariable name="Effect">1</SetVariable>
-                        <SetVariable name="EffectButtonParameter">3</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_parameter_knob.xml">
-                        <SetVariable name="Effect">1</SetVariable>
-                        <SetVariable name="EffectParameter">4</SetVariable>
-                        <SetVariable name="color">blue</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_button_parameter.xml">
-                        <SetVariable name="Effect">1</SetVariable>
-                        <SetVariable name="EffectButtonParameter">4</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_parameter_knob.xml">
-                        <SetVariable name="Effect">1</SetVariable>
-                        <SetVariable name="EffectParameter">5</SetVariable>
-                        <SetVariable name="color">blue</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_button_parameter.xml">
-                        <SetVariable name="Effect">1</SetVariable>
-                        <SetVariable name="EffectButtonParameter">5</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_parameter_knob.xml">
-                        <SetVariable name="Effect">1</SetVariable>
-                        <SetVariable name="EffectParameter">6</SetVariable>
-                        <SetVariable name="color">blue</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_button_parameter.xml">
-                        <SetVariable name="Effect">1</SetVariable>
-                        <SetVariable name="EffectButtonParameter">6</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_parameter_knob.xml">
-                        <SetVariable name="Effect">1</SetVariable>
-                        <SetVariable name="EffectParameter">7</SetVariable>
-                        <SetVariable name="color">blue</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_button_parameter.xml">
-                        <SetVariable name="Effect">1</SetVariable>
-                        <SetVariable name="EffectButtonParameter">7</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_parameter_knob.xml">
-                        <SetVariable name="Effect">1</SetVariable>
-                        <SetVariable name="EffectParameter">8</SetVariable>
-                        <SetVariable name="color">blue</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_button_parameter.xml">
-                        <SetVariable name="Effect">1</SetVariable>
-                        <SetVariable name="EffectButtonParameter">8</SetVariable>
-                      </Template>
-                    </Children>
-                  </WidgetGroup>
-                </Children>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <ObjectName>EffectUnitControlRow</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                  <WidgetGroup>
-                    <ObjectName>EffectUnitParameters</ObjectName>
-                    <SizePolicy>me,max</SizePolicy>
-                    <Layout>horizontal</Layout>
-                    <Children>
-                      <!-- Allow up to 8 parameters, needed to control the graphic eq effect-->
-                      <Template src="skin:effect_selector_buttons.xml">
-                        <SetVariable name="Effect">2</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_parameter_knob.xml">
-                        <SetVariable name="Effect">2</SetVariable>
-                        <SetVariable name="EffectParameter">1</SetVariable>
-                        <SetVariable name="color">blue</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_button_parameter.xml">
-                        <SetVariable name="Effect">2</SetVariable>
-                        <SetVariable name="EffectButtonParameter">1</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_parameter_knob.xml">
-                        <SetVariable name="Effect">2</SetVariable>
-                        <SetVariable name="EffectParameter">2</SetVariable>
-                        <SetVariable name="color">blue</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_button_parameter.xml">
-                        <SetVariable name="Effect">2</SetVariable>
-                        <SetVariable name="EffectButtonParameter">2</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_parameter_knob.xml">
-                        <SetVariable name="Effect">2</SetVariable>
-                        <SetVariable name="EffectParameter">3</SetVariable>
-                        <SetVariable name="color">blue</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_button_parameter.xml">
-                        <SetVariable name="Effect">2</SetVariable>
-                        <SetVariable name="EffectButtonParameter">3</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_parameter_knob.xml">
-                        <SetVariable name="Effect">2</SetVariable>
-                        <SetVariable name="EffectParameter">4</SetVariable>
-                        <SetVariable name="color">blue</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_button_parameter.xml">
-                        <SetVariable name="Effect">2</SetVariable>
-                        <SetVariable name="EffectButtonParameter">4</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_parameter_knob.xml">
-                        <SetVariable name="Effect">2</SetVariable>
-                        <SetVariable name="EffectParameter">5</SetVariable>
-                        <SetVariable name="color">blue</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_button_parameter.xml">
-                        <SetVariable name="Effect">2</SetVariable>
-                        <SetVariable name="EffectButtonParameter">5</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_parameter_knob.xml">
-                        <SetVariable name="Effect">2</SetVariable>
-                        <SetVariable name="EffectParameter">6</SetVariable>
-                        <SetVariable name="color">blue</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_button_parameter.xml">
-                        <SetVariable name="Effect">2</SetVariable>
-                        <SetVariable name="EffectButtonParameter">6</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_parameter_knob.xml">
-                        <SetVariable name="Effect">2</SetVariable>
-                        <SetVariable name="EffectParameter">7</SetVariable>
-                        <SetVariable name="color">blue</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_button_parameter.xml">
-                        <SetVariable name="Effect">2</SetVariable>
-                        <SetVariable name="EffectButtonParameter">7</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_parameter_knob.xml">
-                        <SetVariable name="Effect">2</SetVariable>
-                        <SetVariable name="EffectParameter">8</SetVariable>
-                        <SetVariable name="color">blue</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_button_parameter.xml">
-                        <SetVariable name="Effect">2</SetVariable>
-                        <SetVariable name="EffectButtonParameter">8</SetVariable>
-                      </Template>
-                    </Children>
-                  </WidgetGroup>
-                </Children>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <ObjectName>EffectUnitControlRow</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>min,min</SizePolicy>
-                <Children>
-                  <WidgetGroup>
-                    <ObjectName>EffectUnitParameters</ObjectName>
-                    <SizePolicy>me,max</SizePolicy>
-                    <Layout>horizontal</Layout>
-                    <Children>
-                      <!-- Allow up to 8 parameters, needed to control the graphic eq effect-->
-                      <Template src="skin:effect_selector_buttons.xml">
-                        <SetVariable name="Effect">3</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_parameter_knob.xml">
-                        <SetVariable name="Effect">3</SetVariable>
-                        <SetVariable name="EffectParameter">1</SetVariable>
-                        <SetVariable name="color">blue</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_button_parameter.xml">
-                        <SetVariable name="Effect">3</SetVariable>
-                        <SetVariable name="EffectButtonParameter">1</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_parameter_knob.xml">
-                        <SetVariable name="Effect">3</SetVariable>
-                        <SetVariable name="EffectParameter">2</SetVariable>
-                        <SetVariable name="color">blue</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_button_parameter.xml">
-                        <SetVariable name="Effect">3</SetVariable>
-                        <SetVariable name="EffectButtonParameter">2</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_parameter_knob.xml">
-                        <SetVariable name="Effect">3</SetVariable>
-                        <SetVariable name="EffectParameter">3</SetVariable>
-                        <SetVariable name="color">blue</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_button_parameter.xml">
-                        <SetVariable name="TooltipId">EffectSlot_button_parameter</SetVariable>
-                        <SetVariable name="Effect">3</SetVariable>
-                        <SetVariable name="EffectButtonParameter">3</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_parameter_knob.xml">
-                        <SetVariable name="Effect">3</SetVariable>
-                        <SetVariable name="EffectParameter">4</SetVariable>
-                        <SetVariable name="color">blue</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_button_parameter.xml">
-                        <SetVariable name="TooltipId">EffectSlot_button_parameter</SetVariable>
-                        <SetVariable name="Effect">3</SetVariable>
-                        <SetVariable name="EffectButtonParameter">4</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_parameter_knob.xml">
-                        <SetVariable name="Effect">3</SetVariable>
-                        <SetVariable name="EffectParameter">5</SetVariable>
-                        <SetVariable name="color">blue</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_button_parameter.xml">
-                        <SetVariable name="TooltipId">EffectSlot_button_parameter</SetVariable>
-                        <SetVariable name="Effect">3</SetVariable>
-                        <SetVariable name="EffectButtonParameter">5</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_parameter_knob.xml">
-                        <SetVariable name="Effect">3</SetVariable>
-                        <SetVariable name="EffectParameter">6</SetVariable>
-                        <SetVariable name="color">blue</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_button_parameter.xml">
-                        <SetVariable name="TooltipId">EffectSlot_button_parameter</SetVariable>
-                        <SetVariable name="Effect">3</SetVariable>
-                        <SetVariable name="EffectButtonParameter">6</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_parameter_knob.xml">
-                        <SetVariable name="Effect">3</SetVariable>
-                        <SetVariable name="EffectParameter">7</SetVariable>
-                        <SetVariable name="color">blue</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_button_parameter.xml">
-                        <SetVariable name="Effect">3</SetVariable>
-                        <SetVariable name="EffectButtonParameter">7</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_parameter_knob.xml">
-                        <SetVariable name="Effect">3</SetVariable>
-                        <SetVariable name="EffectParameter">8</SetVariable>
-                        <SetVariable name="color">blue</SetVariable>
-                      </Template>
-                      <Template src="skin:effect_button_parameter.xml">
-                        <SetVariable name="Effect">3</SetVariable>
-                        <SetVariable name="EffectButtonParameter">8</SetVariable>
-                      </Template>
-                    </Children>
-                  </WidgetGroup>
-                </Children>
-              </WidgetGroup>
-            </Children>
-          </WidgetGroup>
-          <WidgetGroup>
-            <ObjectName>EffectUnitControls</ObjectName>
-            <Layout>vertical</Layout>
-            <SizePolicy>me,max</SizePolicy>
-            <Children>
-              <Template src="skin:knob_with_label.xml">
-                <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
-                <SetVariable name="control">super1</SetVariable>
-                <SetVariable name="label">Super</SetVariable>
-                <SetVariable name="color">yellow</SetVariable>
-              </Template>
-
-              <Template src="skin:knob_with_label.xml">
-                <SetVariable name="TooltipId">EffectUnit_mix</SetVariable>
-                <SetVariable name="control">mix</SetVariable>
-                <SetVariable name="label">Mix</SetVariable>
-                <SetVariable name="color">blue</SetVariable>
-              </Template>
-            </Children>
-          </WidgetGroup>
-        </Children>
-      </WidgetGroup>
-
-      <WidgetGroup>
-        <ObjectName>EffectUnitGroupControls</ObjectName>
-        <SizePolicy>me,min</SizePolicy>
-        <Layout>horizontal</Layout>
-        <Children>
-          <Template src="skin:effect_chain_group_control_button.xml">
-            <SetVariable name="group_name">Head</SetVariable>
-            <SetVariable name="group_group">[Headphone]</SetVariable>
-          </Template>
-
-          <Template src="skin:effect_chain_group_control_button.xml">
-            <SetVariable name="group_name">Master</SetVariable>
-            <SetVariable name="group_group">[Master]</SetVariable>
-          </Template>
-
-          <Template src="skin:effect_chain_group_control_button.xml">
-            <SetVariable name="group_name">CH1</SetVariable>
-            <SetVariable name="group_group">[Channel1]</SetVariable>
-          </Template>
-
-          <Template src="skin:effect_chain_group_control_button.xml">
-            <SetVariable name="group_name">CH2</SetVariable>
-            <SetVariable name="group_group">[Channel2]</SetVariable>
-          </Template>
-
-          <Template src="skin:effect_chain_group_control_button.xml">
-            <SetVariable name="group_name">CH3</SetVariable>
-            <SetVariable name="group_group">[Channel3]</SetVariable>
-          </Template>
-
-          <Template src="skin:effect_chain_group_control_button.xml">
-            <SetVariable name="group_name">CH4</SetVariable>
-            <SetVariable name="group_group">[Channel4]</SetVariable>
-          </Template>
-
-          <!-- Optionally display Mic 1-4 and Aux 1-4 FX arm buttons if these
-               channels are configured in the Sound Hardware preferences.
-                We have to use WidgetGroups here, because we can't connect
-               <BindProperty> directly to templates. -->
-          <WidgetGroup>
-            <ObjectName>EffectUnitGroupControls</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>max,min</SizePolicy>
-            <Children>
-              <WidgetGroup>
-                <Layout>vertical</Layout>
-                <Children>
-                  <Template src="skin:effect_chain_group_control_button.xml">
-                    <SetVariable name="group_name">MIC1</SetVariable>
-                    <SetVariable name="group_group">[Microphone]</SetVariable>
-                  </Template>
-                </Children>
-                <Connection>
-                  <ConfigKey>[Microphone],enabled</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <Layout>vertical</Layout>
-                <Children>
-                  <Template src="skin:effect_chain_group_control_button.xml">
-                    <SetVariable name="group_name">MIC2</SetVariable>
-                    <SetVariable name="group_group">[Microphone2]</SetVariable>
-                  </Template>
-                </Children>
-                <Connection>
-                  <ConfigKey>[Microphone2],enabled</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <Layout>vertical</Layout>
-                <Children>
-                  <Template src="skin:effect_chain_group_control_button.xml">
-                    <SetVariable name="group_name">MIC3</SetVariable>
-                    <SetVariable name="group_group">[Microphone3]</SetVariable>
-                  </Template>
-                </Children>
-                <Connection>
-                  <ConfigKey>[Microphone3],enabled</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <Layout>vertical</Layout>
-                <Children>
-                  <Template src="skin:effect_chain_group_control_button.xml">
-                    <SetVariable name="group_name">MIC4</SetVariable>
-                    <SetVariable name="group_group">[Microphone4]</SetVariable>
-                  </Template>
-                </Children>
-                <Connection>
-                  <ConfigKey>[Microphone4],enabled</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <Layout>vertical</Layout>
-                  <Children>
-                  <Template src="skin:effect_chain_group_control_button.xml">
-                    <SetVariable name="group_name">Aux1</SetVariable>
-                    <SetVariable name="group_group">[Auxiliary1]</SetVariable>
-                  </Template>
-                </Children>
-                <Connection>
-                  <ConfigKey>[Auxiliary1],enabled</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <Layout>vertical</Layout>
-                  <Children>
-                  <Template src="skin:effect_chain_group_control_button.xml">
-                    <SetVariable name="group_name">Aux2</SetVariable>
-                    <SetVariable name="group_group">[Auxiliary2]</SetVariable>
-                  </Template>
-                </Children>
-                <Connection>
-                  <ConfigKey>[Auxiliary2],enabled</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <Layout>vertical</Layout>
-                  <Children>
-                  <Template src="skin:effect_chain_group_control_button.xml">
-                    <SetVariable name="group_name">Aux3</SetVariable>
-                    <SetVariable name="group_group">[Auxiliary3]</SetVariable>
-                  </Template>
-                </Children>
-                <Connection>
-                  <ConfigKey>[Auxiliary3],enabled</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <Layout>vertical</Layout>
-                  <Children>
-                  <Template src="skin:effect_chain_group_control_button.xml">
-                    <SetVariable name="group_name">Aux4</SetVariable>
-                    <SetVariable name="group_group">[Auxiliary4]</SetVariable>
-                  </Template>
-                </Children>
-                <Connection>
-                  <ConfigKey>[Auxiliary4],enabled</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
-
-            </Children>
-          </WidgetGroup>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/Deere/effect_chain_simple.xml b/res/skins/Deere/effect_chain_simple.xml
deleted file mode 100644
index fbc1d47e6e2d..000000000000
--- a/res/skins/Deere/effect_chain_simple.xml
+++ /dev/null
@@ -1,273 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    An effect chain widget.
-  Variables:
-    group: The group for the controls.
--->
-<Template>
-  <SetVariable name="group">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>]</SetVariable>
-  <WidgetGroup>
-    <ObjectName>EffectUnit<Variable name="EffectUnit"/></ObjectName>
-    <Layout>vertical</Layout>
-    <SizePolicy>me,f</SizePolicy>
-    <MinimumSize>-1,50</MinimumSize>
-    <MaximumSize>-1,50</MaximumSize>
-    <Children>
-      <WidgetGroup>
-        <ObjectName>EffectUnitNameRow</ObjectName>
-        <Layout>horizontal</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <WidgetGroup>
-            <ObjectName>EffectUnitNextPrevContainer</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>me,max</SizePolicy>
-            <Children>
-              <Template src="skin:left_2state_button.xml">
-                <SetVariable name="TooltipId">EffectUnit_enabled</SetVariable>
-                <SetVariable name="ObjectName"></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_power_48px.svg</SetVariable>
-                <SetVariable name="state_0_unpressed">icon/ic_power_48px.svg</SetVariable>
-                <SetVariable name="state_1_text"></SetVariable>
-                <SetVariable name="state_1_pressed">icon/ic_power_48px.svg</SetVariable>
-                <SetVariable name="state_1_unpressed">icon/ic_power_48px.svg</SetVariable>
-                <SetVariable name="left_connection_control"><Variable name="group"/>,enabled</SetVariable>
-              </Template>
-
-              <Template src="skin:left_1state_button.xml">
-                <SetVariable name="TooltipId">EffectUnit_clear</SetVariable>
-                <SetVariable name="ObjectName"></SetVariable>
-                <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-                <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-                <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-                <SetVariable name="state_0_text"></SetVariable>
-                <SetVariable name="state_0_pressed">icon/ic_eject_48px.svg</SetVariable>
-                <SetVariable name="state_0_unpressed">icon/ic_eject_48px.svg</SetVariable>
-                <SetVariable name="left_connection_control"><Variable name="group"/>,clear</SetVariable>
-              </Template>
-
-              <Template src="skin:left_1state_button.xml">
-                <SetVariable name="TooltipId">EffectUnit_prev_chain</SetVariable>
-                <SetVariable name="ObjectName"></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_chevron_left_48px.svg</SetVariable>
-                <SetVariable name="state_0_unpressed">icon/ic_chevron_left_48px.svg</SetVariable>
-                <SetVariable name="left_connection_control"><Variable name="group"/>,prev_chain</SetVariable>
-              </Template>
-
-              <Template src="skin:left_1state_button.xml">
-                <SetVariable name="TooltipId">EffectUnit_next_chain</SetVariable>
-                <SetVariable name="ObjectName"></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_chevron_right_48px.svg</SetVariable>
-                <SetVariable name="state_0_unpressed">icon/ic_chevron_right_48px.svg</SetVariable>
-                <SetVariable name="left_connection_control"><Variable name="group"/>,next_chain</SetVariable>
-              </Template>
-
-              <WidgetGroup>
-                <ObjectName>EffectUnitNameContainer</ObjectName>
-                <Layout>horizontal</Layout>
-                <SizePolicy>me,max</SizePolicy>
-                <Children>
-                  <EffectChainName>
-                    <EffectRack><Variable name="EffectRack"/></EffectRack>
-                    <EffectUnit><Variable name="EffectUnit"/></EffectUnit>
-                  </EffectChainName>
-                </Children>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <ObjectName>EffectUnitMainKnobsContainer</ObjectName>
-                <Layout>horizontal</Layout>
-                <Children>
-                  <Template src="skin:small_knob.xml">
-                    <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
-                    <SetVariable name="control">super1</SetVariable>
-                    <SetVariable name="label">Super</SetVariable>
-                  </Template>
-                  <Template src="skin:small_knob.xml">
-                    <SetVariable name="TooltipId">EffectUnit_mix</SetVariable>
-                    <SetVariable name="control">mix</SetVariable>
-                    <SetVariable name="label">Mix</SetVariable>
-                  </Template>
-                </Children>
-              </WidgetGroup>
-            </Children>
-          </WidgetGroup>
-        </Children>
-      </WidgetGroup>
-
-      <WidgetGroup>
-        <ObjectName>EffectUnitGroupControls</ObjectName>
-        <SizePolicy>me,min</SizePolicy>
-        <Layout>horizontal</Layout>
-        <Children>
-          <Template src="skin:effect_chain_group_control_button.xml">
-            <SetVariable name="group_name">Head</SetVariable>
-            <SetVariable name="group_group">[Headphone]</SetVariable>
-          </Template>
-
-          <Template src="skin:effect_chain_group_control_button.xml">
-            <SetVariable name="group_name">Master</SetVariable>
-            <SetVariable name="group_group">[Master]</SetVariable>
-          </Template>
-
-          <Template src="skin:effect_chain_group_control_button.xml">
-            <SetVariable name="group_name">CH1</SetVariable>
-            <SetVariable name="group_group">[Channel1]</SetVariable>
-          </Template>
-
-          <Template src="skin:effect_chain_group_control_button.xml">
-            <SetVariable name="group_name">CH2</SetVariable>
-            <SetVariable name="group_group">[Channel2]</SetVariable>
-          </Template>
-
-          <Template src="skin:effect_chain_group_control_button.xml">
-            <SetVariable name="group_name">CH3</SetVariable>
-            <SetVariable name="group_group">[Channel3]</SetVariable>
-          </Template>
-
-          <Template src="skin:effect_chain_group_control_button.xml">
-            <SetVariable name="group_name">CH4</SetVariable>
-            <SetVariable name="group_group">[Channel4]</SetVariable>
-          </Template>
-
-          <!-- Optionally display Mic 1-4 and Aux 1-4 FX arm buttons if these
-               channels are configured in the Sound Hardware preferences.
-                We have to use WidgetGroups here, because we can't connect
-               <BindProperty> directly to templates. -->
-          <WidgetGroup>
-            <ObjectName>EffectUnitGroupControls</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>max,min</SizePolicy>
-            <Children>
-              <WidgetGroup>
-                <Layout>vertical</Layout>
-                <Children>
-                  <Template src="skin:effect_chain_group_control_button.xml">
-                    <SetVariable name="group_name">MIC1</SetVariable>
-                    <SetVariable name="group_group">[Microphone]</SetVariable>
-                  </Template>
-                </Children>
-                <Connection>
-                  <ConfigKey>[Microphone],enabled</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <Layout>vertical</Layout>
-                <Children>
-                  <Template src="skin:effect_chain_group_control_button.xml">
-                    <SetVariable name="group_name">MIC2</SetVariable>
-                    <SetVariable name="group_group">[Microphone2]</SetVariable>
-                  </Template>
-                </Children>
-                <Connection>
-                  <ConfigKey>[Microphone2],enabled</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <Layout>vertical</Layout>
-                <Children>
-                  <Template src="skin:effect_chain_group_control_button.xml">
-                    <SetVariable name="group_name">MIC3</SetVariable>
-                    <SetVariable name="group_group">[Microphone3]</SetVariable>
-                  </Template>
-                </Children>
-                <Connection>
-                  <ConfigKey>[Microphone3],enabled</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <Layout>vertical</Layout>
-                <Children>
-                  <Template src="skin:effect_chain_group_control_button.xml">
-                    <SetVariable name="group_name">MIC4</SetVariable>
-                    <SetVariable name="group_group">[Microphone4]</SetVariable>
-                  </Template>
-                </Children>
-                <Connection>
-                  <ConfigKey>[Microphone4],enabled</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <Layout>vertical</Layout>
-                  <Children>
-                  <Template src="skin:effect_chain_group_control_button.xml">
-                    <SetVariable name="group_name">Aux1</SetVariable>
-                    <SetVariable name="group_group">[Auxiliary1]</SetVariable>
-                  </Template>
-                </Children>
-                <Connection>
-                  <ConfigKey>[Auxiliary1],enabled</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <Layout>vertical</Layout>
-                  <Children>
-                  <Template src="skin:effect_chain_group_control_button.xml">
-                    <SetVariable name="group_name">Aux2</SetVariable>
-                    <SetVariable name="group_group">[Auxiliary2]</SetVariable>
-                  </Template>
-                </Children>
-                <Connection>
-                  <ConfigKey>[Auxiliary2],enabled</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <Layout>vertical</Layout>
-                  <Children>
-                  <Template src="skin:effect_chain_group_control_button.xml">
-                    <SetVariable name="group_name">Aux3</SetVariable>
-                    <SetVariable name="group_group">[Auxiliary3]</SetVariable>
-                  </Template>
-                </Children>
-                <Connection>
-                  <ConfigKey>[Auxiliary3],enabled</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
-
-              <WidgetGroup>
-                <Layout>vertical</Layout>
-                  <Children>
-                  <Template src="skin:effect_chain_group_control_button.xml">
-                    <SetVariable name="group_name">Aux4</SetVariable>
-                    <SetVariable name="group_group">[Auxiliary4]</SetVariable>
-                  </Template>
-                </Children>
-                <Connection>
-                  <ConfigKey>[Auxiliary4],enabled</ConfigKey>
-                  <BindProperty>visible</BindProperty>
-                </Connection>
-              </WidgetGroup>
-
-            </Children>
-          </WidgetGroup>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/Deere/effect_focus_button.xml b/res/skins/Deere/effect_focus_button.xml
new file mode 100644
index 000000000000..36c784f7c756
--- /dev/null
+++ b/res/skins/Deere/effect_focus_button.xml
@@ -0,0 +1,55 @@
+<!--
+Effect focus button
+
+Variables:
+  EffectRack: the rack
+  EffectUnit: the chain
+  Effect: the effect
+-->
+<Template>
+  <WidgetGroup>
+    <ObjectName>EffectFocusButtonContainer</ObjectName>
+    <Layout>horizontal</Layout>
+    <Children>
+      <PushButton>
+        <TooltipId><Variable name="button_TooltipId"/></TooltipId>
+        <ObjectName>CircleButton</ObjectName>
+        <Size>15f,15f</Size>
+        <NumberStates>2</NumberStates>
+        <State>
+          <Number>0</Number>
+          <Text></Text>
+          <Pressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_off_48px.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_off_48px.svg</Unpressed>
+        </State>
+        <State>
+          <Number>1</Number>
+          <Text></Text>
+          <Pressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Pressed>
+          <Unpressed scalemode="STRETCH_ASPECT">icon/ic_radio_button_on_48px.svg</Unpressed>
+        </State>
+        <Connection>
+          <ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],focused_effect</ConfigKey>
+          <ButtonState>LeftButton</ButtonState>
+          <EmitOnPressAndRelease>false</EmitOnPressAndRelease>
+          <Transform>
+            <IsEqual><Variable name="Effect"/></IsEqual>
+          </Transform>
+        </Connection>
+        <Connection>
+          <ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],focused_effect</ConfigKey>
+          <ButtonState>RightButton</ButtonState>
+          <EmitOnPressAndRelease>false</EmitOnPressAndRelease>
+          <Transform>
+            <IsEqual><Variable name="Effect"/></IsEqual>
+            <Not/>
+          </Transform>
+        </Connection>
+      </PushButton>
+    </Children>
+    <Connection>
+      <ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],show_focus</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Deere/effect_meta_knob.xml b/res/skins/Deere/effect_meta_knob.xml
new file mode 100644
index 000000000000..f087e523e2b2
--- /dev/null
+++ b/res/skins/Deere/effect_meta_knob.xml
@@ -0,0 +1,23 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    An effect meta knob.
+  Variables:
+    EffectRack: the rack
+    EffectUnit: the chain
+    Effect: the effect
+-->
+<Template>
+  <WidgetGroup>
+    <ObjectName>EffectMetaKnob</ObjectName>
+    <Layout>vertical</Layout>
+    <Size>40f,34f</Size>
+    <Children>
+      <Template src="skin:knob.xml">
+        <SetVariable name="group">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>_Effect<Variable name="Effect"/>]</SetVariable>
+        <SetVariable name="control">meta</SetVariable>
+        <SetVariable name="color">yellow</SetVariable>
+      </Template>
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Deere/effect_parameter_knob.xml b/res/skins/Deere/effect_parameter_knob.xml
index 1f77eca9b71e..05491fd49ae5 100644
--- a/res/skins/Deere/effect_parameter_knob.xml
+++ b/res/skins/Deere/effect_parameter_knob.xml
@@ -11,16 +11,29 @@
 <Template>
   <WidgetGroup>
     <Layout>vertical</Layout>
-    <Size>40f,30f</Size>
+    <Size>55f,42f</Size>
     <Children>
-      <Template src="skin:small_knob.xml">
-        <SetVariable name="TooltipId">EffectSlot_parameter</SetVariable>
-        <SetVariable name="group">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>_Effect<Variable name="Effect"/>]</SetVariable>
-        <SetVariable name="control">parameter<Variable name="EffectParameter"/></SetVariable>
-        <SetVariable name="color"><Variable name="color"/></SetVariable>
-      </Template>
+
+      <WidgetGroup>
+        <ObjectName>EffectParameterSmallKnob</ObjectName>
+        <Layout>horizontal</Layout>
+        <Size>me,20f</Size>
+        <Children>
+          <KnobComposed>
+            <TooltipId><Variable name="TooltipId"/></TooltipId>
+            <Size>20f,20f</Size>
+            <Knob>knob_small.svg</Knob>
+            <MinAngle>-230</MinAngle>
+            <MaxAngle>50</MaxAngle>
+            <Connection>
+              <ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>_Effect<Variable name="Effect"/>],parameter<Variable name="EffectParameter"/></ConfigKey>
+            </Connection>
+          </KnobComposed>
+        </Children>
+      </WidgetGroup>
+
       <EffectParameterName>
-        <Size>40f,10f</Size>
+        <Size>55f,12f</Size>
         <ObjectName>EffectKnobLabel</ObjectName>
         <EffectRack><Variable name="EffectRack"/></EffectRack>
         <EffectUnit><Variable name="EffectUnit"/></EffectUnit>
@@ -53,6 +66,29 @@
         <SetVariable name="left_connection_control">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>_Effect<Variable name="Effect"/>],parameter<Variable name="EffectParameter"/>_link_type</SetVariable>
       </Template>
 
+      <WidgetGroup>
+        <ObjectName>EffectSlotParameterLinkInversionButtonContainer</ObjectName>
+        <Layout>vertical</Layout>
+        <Size>-1,6f</Size>
+        <Children>
+          <Template src="skin:left_2state_button.xml">
+            <!-- Button has no text/images, qss only -->
+            <SetVariable name="TooltipId">EffectSlot_parameter_inversion</SetVariable>
+            <SetVariable name="ObjectName">EffectSlotParameterLinkInversionButton</SetVariable>
+            <SetVariable name="MinimumSize"><Variable name="SmallHorizontalStretchLinkButtonMinimumSize"/></SetVariable>
+            <SetVariable name="MaximumSize"><Variable name="SmallHorizontalStretchLinkButtonMaximumSize"/></SetVariable>
+            <SetVariable name="SizePolicy"><Variable name="SmallHorizontalStretchLinkButtonSizePolicy"/></SetVariable>
+            <SetVariable name="state_0_text"></SetVariable>
+            <SetVariable name="state_0_pressed"></SetVariable>
+            <SetVariable name="state_0_unpressed"></SetVariable>
+            <SetVariable name="state_1_text"></SetVariable>
+            <SetVariable name="state_1_pressed"></SetVariable>
+            <SetVariable name="state_1_unpressed"></SetVariable>
+            <SetVariable name="left_connection_control">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>_Effect<Variable name="Effect"/>],parameter<Variable name="EffectParameter"/>_link_inverse</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+
     </Children>
     <Connection>
       <ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>_Effect<Variable name="Effect"/>],parameter<Variable name="EffectParameter"/>_loaded</ConfigKey>
diff --git a/res/skins/Deere/effect_rack.xml b/res/skins/Deere/effect_rack.xml
index 28fab8b0a6d0..cb810ffd035b 100644
--- a/res/skins/Deere/effect_rack.xml
+++ b/res/skins/Deere/effect_rack.xml
@@ -1,9 +1,6 @@
 <!DOCTYPE template>
 <!--
-  Description:
-    An effect rack widget.
-  Variables:
-    group: The group for the controls.
+Container for all the effect units
 -->
 <Template>
   <WidgetGroup>
@@ -17,83 +14,22 @@
         <ObjectName>EffectRackContainer</ObjectName>
         <SizePolicy>me,min</SizePolicy>
         <Children>
-          <!-- Collapsed EffectRack -->
           <WidgetGroup>
-            <ObjectName>EffectRackCollapsed</ObjectName>
+            <ObjectName>EffectUnitsRow1</ObjectName>
             <Layout>horizontal</Layout>
             <MinimumSize>-1,50</MinimumSize>
-            <MaximumSize>-1,50</MaximumSize>
-            <SizePolicy>me,f</SizePolicy>
+            <MaximumSize>-1,195</MaximumSize>
+            <SizePolicy>me,me</SizePolicy>
             <Children>
-              <WidgetGroup>
-                <Layout>vertical</Layout>
-                <ObjectName>ShowHideToggle</ObjectName>
-                <Children>
-                  <Template src="skin:hide_show_button.xml">
-                    <SetVariable name="object_name">EffectRackToggle</SetVariable>
-                    <SetVariable name="control">[EffectRack1],show</SetVariable>
-                  </Template>
-                </Children>
-              </WidgetGroup>
-
-              <Template src="skin:effect_chain_simple.xml">
-                <SetVariable name="EffectRack">1</SetVariable>
-                <SetVariable name="EffectUnit">1</SetVariable>
-              </Template>
-
-              <Template src="skin:effect_chain_simple.xml">
-                <SetVariable name="EffectRack">1</SetVariable>
-                <SetVariable name="EffectUnit">2</SetVariable>
-              </Template>
-
-              <Template src="skin:effect_chain_simple.xml">
-                <SetVariable name="EffectRack">1</SetVariable>
-                <SetVariable name="EffectUnit">3</SetVariable>
-              </Template>
-
-              <Template src="skin:effect_chain_simple.xml">
-                <SetVariable name="EffectRack">1</SetVariable>
-                <SetVariable name="EffectUnit">4</SetVariable>
-              </Template>
-            </Children>
-          </WidgetGroup>
-
-          <!-- Expanded EffectRack -->
-          <WidgetGroup trigger="[EffectRack1],show">
-            <ObjectName>EffectRackExpanded</ObjectName>
-            <SizePolicy>me,min</SizePolicy>
-            <Layout>horizontal</Layout>
-            <Children>
-              <WidgetGroup>
-                <Layout>vertical</Layout>
-                <ObjectName>ShowHideToggle</ObjectName>
-                <Children>
-                  <Template src="skin:hide_show_button.xml">
-                    <SetVariable name="object_name">EffectRackToggle</SetVariable>
-                    <SetVariable name="control">[EffectRack1],show</SetVariable>
-                  </Template>
-                </Children>
-              </WidgetGroup>
-
-              <Template src="skin:effect_chain.xml">
+              <Template src="skin:effect_unit.xml">
                 <SetVariable name="EffectRack">1</SetVariable>
                 <SetVariable name="EffectUnit">1</SetVariable>
               </Template>
 
-              <Template src="skin:effect_chain.xml">
+              <Template src="skin:effect_unit.xml">
                 <SetVariable name="EffectRack">1</SetVariable>
                 <SetVariable name="EffectUnit">2</SetVariable>
               </Template>
-
-              <Template src="skin:effect_chain.xml">
-                <SetVariable name="EffectRack">1</SetVariable>
-                <SetVariable name="EffectUnit">3</SetVariable>
-              </Template>
-
-              <Template src="skin:effect_chain.xml">
-                <SetVariable name="EffectRack">1</SetVariable>
-                <SetVariable name="EffectUnit">4</SetVariable>
-              </Template>
             </Children>
           </WidgetGroup>
         </Children>
diff --git a/res/skins/Deere/effect_selector_buttons.xml b/res/skins/Deere/effect_selector_buttons.xml
deleted file mode 100644
index c40fe49d8ab9..000000000000
--- a/res/skins/Deere/effect_selector_buttons.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    Effect selector buttons.
-  Variables:
-    EffectRack: the rack
-    EffectUnit: the chain
-    Effect: the effect
--->
-<Template>
-  <WidgetGroup>
-    <Layout>horizontal</Layout>
-    <Children>
-
-      <Template src="skin:left_2state_button.xml">
-        <SetVariable name="TooltipId">EffectSlot_enabled</SetVariable>
-        <SetVariable name="ObjectName"></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_power_48px.svg</SetVariable>
-        <SetVariable name="state_0_unpressed">icon/ic_power_48px.svg</SetVariable>
-        <SetVariable name="state_1_text"></SetVariable>
-        <SetVariable name="state_1_pressed">icon/ic_power_48px.svg</SetVariable>
-        <SetVariable name="state_1_unpressed">icon/ic_power_48px.svg</SetVariable>
-        <SetVariable name="left_connection_control">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>_Effect<Variable name="Effect"/>],enabled</SetVariable>
-      </Template>
-
-      <Template src="skin:left_1state_button.xml">
-        <SetVariable name="TooltipId">EffectSlot_clear</SetVariable>
-        <SetVariable name="ObjectName"></SetVariable>
-        <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-        <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-        <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-        <SetVariable name="state_0_text"></SetVariable>
-        <SetVariable name="state_0_pressed">icon/ic_eject_48px.svg</SetVariable>
-        <SetVariable name="state_0_unpressed">icon/ic_eject_48px.svg</SetVariable>
-        <SetVariable name="left_connection_control">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>_Effect<Variable name="Effect"/>],clear</SetVariable>
-      </Template>
-
-      <EffectName>
-        <MinimumSize>50,-1</MinimumSize>
-        <MaximumSize>50,-1</MaximumSize>
-        <EffectRack><Variable name="EffectRack"/></EffectRack>
-        <EffectUnit><Variable name="EffectUnit"/></EffectUnit>
-        <Effect><Variable name="Effect"/></Effect>
-      </EffectName>
-
-      <Template src="skin:left_1state_button.xml">
-        <SetVariable name="TooltipId">EffectSlot_prev_effect</SetVariable>
-        <SetVariable name="ObjectName"></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_chevron_left_48px.svg</SetVariable>
-        <SetVariable name="state_0_unpressed">icon/ic_chevron_left_48px.svg</SetVariable>
-        <SetVariable name="left_connection_control">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>_Effect<Variable name="Effect"/>],prev_effect</SetVariable>
-      </Template>
-
-      <Template src="skin:left_1state_button.xml">
-        <SetVariable name="TooltipId">EffectSlot_next_effect</SetVariable>
-        <SetVariable name="ObjectName"></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_chevron_right_48px.svg</SetVariable>
-        <SetVariable name="state_0_unpressed">icon/ic_chevron_right_48px.svg</SetVariable>
-        <SetVariable name="left_connection_control">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>_Effect<Variable name="Effect"/>],next_effect</SetVariable>
-      </Template>
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/Deere/effect_single_no_parameters.xml b/res/skins/Deere/effect_single_no_parameters.xml
new file mode 100644
index 000000000000..94f2284b2b44
--- /dev/null
+++ b/res/skins/Deere/effect_single_no_parameters.xml
@@ -0,0 +1,101 @@
+<!DOCTYPE template>
+<!--
+An effect with just the metaknob but no parameters showing
+
+Variables:
+  EffectRack: the rack
+  EffectUnit: the chain
+  Effect: the effect
+-->
+<Template>
+  <WidgetGroup>
+    <ObjectName>FocusableEffect</ObjectName>
+    <Layout>vertical</Layout>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>EffectHighlightable</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>max,f</SizePolicy>
+        <MinimumSize>-1,65</MinimumSize>
+        <MaximumSize>-1,75</MaximumSize>
+        <Children>
+
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <Children>
+
+              <Template src="skin:effect_buttons.xml"/>
+
+              <Template src="skin:effect_meta_knob.xml"/>
+
+            </Children>
+          </WidgetGroup>
+
+          <EffectSelector>
+            <EffectRack><Variable name="EffectRack"/></EffectRack>
+            <EffectUnit><Variable name="EffectUnit"/></EffectUnit>
+            <Effect><Variable name="Effect"/></Effect>
+          </EffectSelector>
+
+        </Children>
+        <Connection>
+          <ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],focused_effect</ConfigKey>
+          <BindProperty>highlight</BindProperty>
+          <Transform>
+            <IsEqual><Variable name="Effect"/></IsEqual>
+          </Transform>
+        </Connection>
+      </WidgetGroup>
+
+    </Children>
+    <Connection>
+      <ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],show_focus</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+
+  <WidgetGroup>
+    <ObjectName>NotFocusableEffect</ObjectName>
+    <Layout>vertical</Layout>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>EffectNotHighlightable</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>me,f</SizePolicy>
+        <MinimumSize>-1,65</MinimumSize>
+        <MaximumSize>-1,65</MaximumSize>
+        <Children>
+
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <Children>
+
+              <Template src="skin:effect_buttons.xml"/>
+
+              <Template src="skin:effect_meta_knob.xml"/>
+
+            </Children>
+          </WidgetGroup>
+
+          <EffectSelector>
+            <EffectRack><Variable name="EffectRack"/></EffectRack>
+            <EffectUnit><Variable name="EffectUnit"/></EffectUnit>
+            <Effect><Variable name="Effect"/></Effect>
+          </EffectSelector>
+
+        </Children>
+      </WidgetGroup>
+
+    </Children>
+    <Connection>
+      <ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],show_focus</ConfigKey>
+      <BindProperty>visible</BindProperty>
+      <Transform>
+        <Not/>
+      </Transform>
+    </Connection>
+  </WidgetGroup>
+
+</Template>
diff --git a/res/skins/Deere/effect_single_with_parameters.xml b/res/skins/Deere/effect_single_with_parameters.xml
new file mode 100644
index 000000000000..3c67143c93c5
--- /dev/null
+++ b/res/skins/Deere/effect_single_with_parameters.xml
@@ -0,0 +1,54 @@
+<!--
+A single effect with all parameters showing, highlightable and not highlightable versions
+
+Variables:
+  EffectRack: the rack
+  EffectUnit: the chain
+  Effect: the effect
+-->
+<!DOCTYPE template>
+<Template>
+  <WidgetGroup>
+    <ObjectName>EffectHighlightable</ObjectName>
+    <Layout>horizontal</Layout>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>EffectHighlightable</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>me,min</SizePolicy>
+        <Children>
+          <Template src="skin:effect_single_with_parameters_row.xml" />
+        </Children>
+        <Connection>
+          <ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],focused_effect</ConfigKey>
+          <BindProperty>highlight</BindProperty>
+          <Transform>
+            <IsEqual><Variable name="Effect"/></IsEqual>
+          </Transform>
+        </Connection>
+      </WidgetGroup>
+
+    </Children>
+    <Connection>
+      <ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],show_focus</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+
+  <WidgetGroup>
+    <ObjectName>EffectNotHighlightable</ObjectName>
+    <Layout>horizontal</Layout>
+    <Children>
+      <Template src="skin:effect_single_with_parameters_row.xml" />
+    </Children>
+    <Connection>
+      <ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],show_focus</ConfigKey>
+      <BindProperty>visible</BindProperty>
+      <Transform>
+        <Not/>
+      </Transform>
+    </Connection>
+  </WidgetGroup>
+
+</Template>
diff --git a/res/skins/Deere/effect_single_with_parameters_row.xml b/res/skins/Deere/effect_single_with_parameters_row.xml
new file mode 100644
index 000000000000..7c56b5e47f95
--- /dev/null
+++ b/res/skins/Deere/effect_single_with_parameters_row.xml
@@ -0,0 +1,121 @@
+<!DOCTYPE template>
+<!--
+A single effect with all parameters showing
+
+Variables:
+  EffectRack: the rack
+  EffectUnit: the chain
+  Effect: the effect
+-->
+<Template>
+  <WidgetGroup>
+    <ObjectName>EffectUnitControlRow</ObjectName>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,min</SizePolicy>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>EffectUnitParameters</ObjectName>
+        <SizePolicy>me,max</SizePolicy>
+        <Layout>horizontal</Layout>
+        <Children>
+
+          <WidgetGroup>
+            <ObjectName>EffectSingleControls</ObjectName>
+            <Layout>horizontal</Layout>
+            <Children>
+              <WidgetGroup>
+                <ObjectName>EffectButtonContainer</ObjectName>
+                <Layout>horizontal</Layout>
+                <Children>
+
+                  <Template src="skin:effect_buttons.xml"/>
+
+                  <WidgetGroup>
+                    <Layout>vertical</Layout>
+                    <Children>
+                      <Template src="skin:effect_meta_knob.xml"/>
+
+                      <Label>
+                        <Size>40f,10f</Size>
+                        <ObjectName>KnobLabel</ObjectName>
+                        <Text>Meta</Text>
+                      </Label>
+                    </Children>
+                  </WidgetGroup>
+
+                </Children>
+              </WidgetGroup>
+
+            </Children>
+          </WidgetGroup>
+
+          <!-- Allow up to 8 parameters, needed to control the graphic eq effect-->
+
+          <EffectSelector>
+            <EffectRack><Variable name="EffectRack"/></EffectRack>
+            <EffectUnit><Variable name="EffectUnit"/></EffectUnit>
+            <Effect><Variable name="Effect"/></Effect>
+          </EffectSelector>
+
+          <Template src="skin:effect_parameter_knob.xml">
+            <SetVariable name="EffectParameter">1</SetVariable>
+            <SetVariable name="color">blue</SetVariable>
+          </Template>
+          <Template src="skin:effect_parameter_knob.xml">
+            <SetVariable name="EffectParameter">2</SetVariable>
+            <SetVariable name="color">blue</SetVariable>
+          </Template>
+          <Template src="skin:effect_parameter_knob.xml">
+            <SetVariable name="EffectParameter">3</SetVariable>
+            <SetVariable name="color">blue</SetVariable>
+          </Template>
+          <Template src="skin:effect_parameter_knob.xml">
+            <SetVariable name="EffectParameter">4</SetVariable>
+            <SetVariable name="color">blue</SetVariable>
+          </Template>
+          <Template src="skin:effect_parameter_knob.xml">
+            <SetVariable name="EffectParameter">5</SetVariable>
+            <SetVariable name="color">blue</SetVariable>
+          </Template>
+          <Template src="skin:effect_parameter_knob.xml">
+            <SetVariable name="EffectParameter">6</SetVariable>
+            <SetVariable name="color">blue</SetVariable>
+          </Template>
+          <Template src="skin:effect_parameter_knob.xml">
+            <SetVariable name="EffectParameter">7</SetVariable>
+            <SetVariable name="color">blue</SetVariable>
+          </Template>
+          <Template src="skin:effect_parameter_knob.xml">
+            <SetVariable name="EffectParameter">8</SetVariable>
+            <SetVariable name="color">blue</SetVariable>
+          </Template>
+
+          <Template src="skin:effect_button_parameter.xml">
+            <SetVariable name="EffectButtonParameter">1</SetVariable>
+          </Template>
+          <Template src="skin:effect_button_parameter.xml">
+            <SetVariable name="EffectButtonParameter">2</SetVariable>
+          </Template>
+          <Template src="skin:effect_button_parameter.xml">
+            <SetVariable name="EffectButtonParameter">3</SetVariable>
+          </Template>
+          <Template src="skin:effect_button_parameter.xml">
+            <SetVariable name="EffectButtonParameter">4</SetVariable>
+          </Template>
+          <Template src="skin:effect_button_parameter.xml">
+            <SetVariable name="EffectButtonParameter">5</SetVariable>
+          </Template>
+          <Template src="skin:effect_button_parameter.xml">
+            <SetVariable name="EffectButtonParameter">6</SetVariable>
+          </Template>
+          <Template src="skin:effect_button_parameter.xml">
+            <SetVariable name="EffectButtonParameter">7</SetVariable>
+          </Template>
+          <Template src="skin:effect_button_parameter.xml">
+            <SetVariable name="EffectButtonParameter">8</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Deere/effect_unit.xml b/res/skins/Deere/effect_unit.xml
new file mode 100644
index 000000000000..ad59515ebbde
--- /dev/null
+++ b/res/skins/Deere/effect_unit.xml
@@ -0,0 +1,230 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    An effect chain widget.
+  Variables:
+    EffectRack: number of the effect rack (1)
+    EffectUnit: number of this effect unit
+-->
+<Template>
+  <SetVariable name="group">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>]</SetVariable>
+  <WidgetGroup>
+    <ObjectName>EffectUnit<Variable name="EffectUnit"/></ObjectName>
+    <Layout>vertical</Layout>
+    <SizePolicy>me,min</SizePolicy>
+    <MinimumSize>-1,50</MinimumSize>
+    <MaximumSize>-1,195</MaximumSize>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>EffectUnitGroupControls</ObjectName>
+        <Size>-1,20</Size>
+        <SizePolicy>me,max</SizePolicy>
+        <Layout>horizontal</Layout>
+        <Children>
+          <WidgetGroup>
+            <ObjectName>EffectUnitGroupControlsLeft</ObjectName>
+            <Layout>horizontal</Layout>
+            <Children>
+
+              <Template src="skin:hide_show_button.xml">
+                <SetVariable name="object_name">EffectUnitToggle</SetVariable>
+                <SetVariable name="control"><Variable name="group"/>,show_parameters</SetVariable>
+              </Template>
+
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>EffectUnitGroupControlsRight</ObjectName>
+            <Layout>horizontal</Layout>
+            <Children>
+
+              <Template src="skin:effect_unit_group_control_button.xml">
+                <SetVariable name="group_name">Head</SetVariable>
+                <SetVariable name="group_group">[Headphone]</SetVariable>
+              </Template>
+
+              <Template src="skin:effect_unit_group_control_button.xml">
+                <SetVariable name="group_name">Master</SetVariable>
+                <SetVariable name="group_group">[Master]</SetVariable>
+              </Template>
+
+              <Template src="skin:effect_unit_group_control_button.xml">
+                <SetVariable name="group_name">CH1</SetVariable>
+                <SetVariable name="group_group">[Channel1]</SetVariable>
+              </Template>
+
+              <Template src="skin:effect_unit_group_control_button.xml">
+                <SetVariable name="group_name">CH2</SetVariable>
+                <SetVariable name="group_group">[Channel2]</SetVariable>
+              </Template>
+
+              <Template src="skin:effect_unit_group_control_button.xml">
+                <SetVariable name="group_name">CH3</SetVariable>
+                <SetVariable name="group_group">[Channel3]</SetVariable>
+              </Template>
+
+              <Template src="skin:effect_unit_group_control_button.xml">
+                <SetVariable name="group_name">CH4</SetVariable>
+                <SetVariable name="group_group">[Channel4]</SetVariable>
+              </Template>
+
+              <!-- Optionally display Mic 1-4 and Aux 1-4 FX arm buttons if these
+                  channels are configured in the Sound Hardware preferences.
+                    We have to use WidgetGroups here, because we can't connect
+                  <BindProperty> directly to templates. -->
+              <WidgetGroup>
+                <ObjectName>EffectUnitGroupControls</ObjectName>
+                <Layout>horizontal</Layout>
+                <SizePolicy>max,min</SizePolicy>
+                <Children>
+                  <WidgetGroup>
+                    <Layout>vertical</Layout>
+                    <Children>
+                      <Template src="skin:effect_unit_group_control_button.xml">
+                        <SetVariable name="group_name">MIC1</SetVariable>
+                        <SetVariable name="group_group">[Microphone]</SetVariable>
+                      </Template>
+                    </Children>
+                    <Connection>
+                      <ConfigKey>[Microphone],enabled</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup>
+
+                  <WidgetGroup>
+                    <Layout>vertical</Layout>
+                    <Children>
+                      <Template src="skin:effect_unit_group_control_button.xml">
+                        <SetVariable name="group_name">MIC2</SetVariable>
+                        <SetVariable name="group_group">[Microphone2]</SetVariable>
+                      </Template>
+                    </Children>
+                    <Connection>
+                      <ConfigKey>[Microphone2],enabled</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup>
+
+                  <WidgetGroup>
+                    <Layout>vertical</Layout>
+                    <Children>
+                      <Template src="skin:effect_unit_group_control_button.xml">
+                        <SetVariable name="group_name">MIC3</SetVariable>
+                        <SetVariable name="group_group">[Microphone3]</SetVariable>
+                      </Template>
+                    </Children>
+                    <Connection>
+                      <ConfigKey>[Microphone3],enabled</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup>
+
+                  <WidgetGroup>
+                    <Layout>vertical</Layout>
+                    <Children>
+                      <Template src="skin:effect_unit_group_control_button.xml">
+                        <SetVariable name="group_name">MIC4</SetVariable>
+                        <SetVariable name="group_group">[Microphone4]</SetVariable>
+                      </Template>
+                    </Children>
+                    <Connection>
+                      <ConfigKey>[Microphone4],enabled</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup>
+
+                  <WidgetGroup>
+                    <Layout>vertical</Layout>
+                      <Children>
+                      <Template src="skin:effect_unit_group_control_button.xml">
+                        <SetVariable name="group_name">Aux1</SetVariable>
+                        <SetVariable name="group_group">[Auxiliary1]</SetVariable>
+                      </Template>
+                    </Children>
+                    <Connection>
+                      <ConfigKey>[Auxiliary1],enabled</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup>
+
+                  <WidgetGroup>
+                    <Layout>vertical</Layout>
+                      <Children>
+                      <Template src="skin:effect_unit_group_control_button.xml">
+                        <SetVariable name="group_name">Aux2</SetVariable>
+                        <SetVariable name="group_group">[Auxiliary2]</SetVariable>
+                      </Template>
+                    </Children>
+                    <Connection>
+                      <ConfigKey>[Auxiliary2],enabled</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup>
+
+                  <WidgetGroup>
+                    <Layout>vertical</Layout>
+                      <Children>
+                      <Template src="skin:effect_unit_group_control_button.xml">
+                        <SetVariable name="group_name">Aux3</SetVariable>
+                        <SetVariable name="group_group">[Auxiliary3]</SetVariable>
+                      </Template>
+                    </Children>
+                    <Connection>
+                      <ConfigKey>[Auxiliary3],enabled</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup>
+
+                  <WidgetGroup>
+                    <Layout>vertical</Layout>
+                      <Children>
+                      <Template src="skin:effect_unit_group_control_button.xml">
+                        <SetVariable name="group_name">Aux4</SetVariable>
+                        <SetVariable name="group_group">[Auxiliary4]</SetVariable>
+                      </Template>
+                    </Children>
+                    <Connection>
+                      <ConfigKey>[Auxiliary4],enabled</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup>
+
+                </Children>
+              </WidgetGroup>
+
+            </Children>
+          </WidgetGroup>
+
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <Layout>vertical</Layout>
+        <Children>
+          <Template src="skin:effect_unit_no_parameters.xml">
+          </Template>
+        </Children>
+        <Connection>
+          <ConfigKey><Variable name="group"/>,show_parameters</ConfigKey>
+          <BindProperty>visible</BindProperty>
+          <Transform>
+            <Not/>
+          </Transform>
+        </Connection>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <Layout>vertical</Layout>
+        <Children>
+          <Template src="skin:effect_unit_with_parameters.xml">
+          </Template>
+        </Children>
+        <Connection>
+          <ConfigKey><Variable name="group"/>,show_parameters</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Deere/effect_chain_group_control_button.xml b/res/skins/Deere/effect_unit_group_control_button.xml
similarity index 100%
rename from res/skins/Deere/effect_chain_group_control_button.xml
rename to res/skins/Deere/effect_unit_group_control_button.xml
diff --git a/res/skins/Deere/effect_unit_no_parameters.xml b/res/skins/Deere/effect_unit_no_parameters.xml
new file mode 100644
index 000000000000..095a9d66ba40
--- /dev/null
+++ b/res/skins/Deere/effect_unit_no_parameters.xml
@@ -0,0 +1,75 @@
+<!DOCTYPE template>
+<!--
+EffectUnit with just metaknobs, but not individual parameter knobs showing
+
+Variables:
+  EffectRack: the rack
+  EffectUnit: the chain
+-->
+<Template>
+  <SetVariable name="group">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>]</SetVariable>
+  <WidgetGroup>
+    <ObjectName>EffectUnit<Variable name="EffectUnit"/></ObjectName>
+    <Layout>vertical</Layout>
+    <SizePolicy>me,f</SizePolicy>
+    <!-- A little more vertical space is needed when show_focus is 1 because of the focused effect's border.-->
+    <MinimumSize>-1,65</MinimumSize>
+    <MaximumSize>-1,75</MaximumSize>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>EffectUnitNoParameters</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>me,max</SizePolicy>
+        <Children>
+
+          <WidgetGroup>
+            <ObjectName>EffectUnitEffectsNoParameters</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <Template src="skin:effect_single_no_parameters.xml">
+                <SetVariable name="Effect">1</SetVariable>
+              </Template>
+
+              <Template src="skin:effect_single_no_parameters.xml">
+                <SetVariable name="Effect">2</SetVariable>
+              </Template>
+
+              <Template src="skin:effect_single_no_parameters.xml">
+                <SetVariable name="Effect">3</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+          <Template src="skin:spacer_h.xml" />
+
+          <WidgetGroup>
+            <ObjectName>EffectUnitControls</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <MaximumSize>100,50</MaximumSize>
+            <Children>
+              <Template src="skin:knob_with_label.xml">
+                <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
+                <SetVariable name="control">super1</SetVariable>
+                <SetVariable name="label">Super</SetVariable>
+                <SetVariable name="color">yellow</SetVariable>
+              </Template>
+
+              <Template src="skin:knob_with_label.xml">
+                <SetVariable name="TooltipId">EffectUnit_mix</SetVariable>
+                <SetVariable name="control">mix</SetVariable>
+                <SetVariable name="label">Mix</SetVariable>
+                <SetVariable name="color">blue</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+        </Children>
+      </WidgetGroup>
+
+    </Children>
+  </WidgetGroup>
+
+</Template>
diff --git a/res/skins/Deere/effect_unit_with_parameters.xml b/res/skins/Deere/effect_unit_with_parameters.xml
new file mode 100644
index 000000000000..79abb92648a1
--- /dev/null
+++ b/res/skins/Deere/effect_unit_with_parameters.xml
@@ -0,0 +1,70 @@
+<!DOCTYPE template>
+<!--
+EffectUnit with all parameters showing
+
+Variables:
+  EffectRack: the rack
+  EffectUnit: the chain
+-->
+<Template>
+  <SetVariable name="group">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>]</SetVariable>
+  <WidgetGroup>
+    <ObjectName>EffectUnit<Variable name="EffectUnit"/></ObjectName>
+    <Layout>vertical</Layout>
+    <SizePolicy>me,max</SizePolicy>
+    <!-- A little more vertical space is needed when show_focus is 1 because of the focused effect's border.-->
+    <MinimumSize>-1,150</MinimumSize>
+    <MaximumSize>-1,180</MaximumSize>
+    <Children>
+
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Children>
+          <WidgetGroup>
+            <ObjectName>EffectUnitEffects</ObjectName>
+            <SizePolicy>me,min</SizePolicy>
+            <Layout>vertical</Layout>
+            <Children>
+
+              <Template src="skin:effect_single_with_parameters.xml">
+                <SetVariable name="Effect">1</SetVariable>
+              </Template>
+
+              <Template src="skin:effect_single_with_parameters.xml">
+                <SetVariable name="Effect">2</SetVariable>
+              </Template>
+
+              <Template src="skin:effect_single_with_parameters.xml">
+                <SetVariable name="Effect">3</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>EffectUnitControls</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>max,max</SizePolicy>
+            <Children>
+
+              <Template src="skin:knob_with_label.xml">
+                <SetVariable name="TooltipId">EffectUnit_mix</SetVariable>
+                <SetVariable name="control">mix</SetVariable>
+                <SetVariable name="label">Mix</SetVariable>
+                <SetVariable name="color">blue</SetVariable>
+              </Template>
+
+              <Template src="skin:knob_with_label.xml">
+                <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
+                <SetVariable name="control">super1</SetVariable>
+                <SetVariable name="label">Super</SetVariable>
+                <SetVariable name="color">yellow</SetVariable>
+              </Template>
+
+            </Children>
+          </WidgetGroup>
+        </Children>
+      </WidgetGroup>
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Deere/icon/ic_chevron_down_48px.svg b/res/skins/Deere/icon/ic_chevron_down_48px.svg
new file mode 100644
index 000000000000..88e0b7c8d2dc
--- /dev/null
+++ b/res/skins/Deere/icon/ic_chevron_down_48px.svg
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.0 r"
+   sodipodi:docname="ic_chevron_down_48px.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="696"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="4.9166667"
+     inkscape:cx="-3.0508473"
+     inkscape:cy="29.82263"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     d="m 14.245,16.585 -2.83,2.83 12,12 12,-12 -2.83,-2.83 -9.17,9.17 z"
+     id="path4"
+     inkscape:connector-curvature="0"
+     style="fill:#d2d2d2;fill-opacity:1" />
+  <path
+     d="M0 0h48v48h-48z"
+     fill="none"
+     id="path6" />
+</svg>
diff --git a/res/skins/Deere/skin.xml b/res/skins/Deere/skin.xml
index 6e271eedbca2..71af160d2a82 100644
--- a/res/skins/Deere/skin.xml
+++ b/res/skins/Deere/skin.xml
@@ -37,8 +37,8 @@
     <SetVariable name="SmallSquareButtonMaximumSize">15,15</SetVariable>
     <SetVariable name="SmallSquareButtonSizePolicy">f,f</SetVariable>
 
-    <SetVariable name="SmallWideButtonMinimumSize">30,15</SetVariable>
-    <SetVariable name="SmallWideButtonMaximumSize">30,15</SetVariable>
+    <SetVariable name="SmallWideButtonMinimumSize">40,20</SetVariable>
+    <SetVariable name="SmallWideButtonMaximumSize">40,20</SetVariable>
     <SetVariable name="SmallWideButtonSizePolicy">me,me</SetVariable>
 
     <SetVariable name="SmallHorizontalStretchButtonMinimumSize">-1,15</SetVariable>
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index cd82be4f4009..404b70106388 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -788,6 +788,24 @@ WWidget, QLabel {
   border-left:none;
 }
 
+#EffectButtonControls {
+  qproperty-layoutSpacing: 5;
+}
+
+#EffectHighlightable[highlight="0"] {
+  border: 0px;
+  padding: 4px;
+}
+
+#EffectHighlightable[highlight="1"] {
+  border: 2px solid #0081bd;
+  padding: 2px;
+}
+
+#EffectChainGroupControlButton {
+  font: 10px;
+}
+
 #EffectUnit1 {
   border-left: 1px solid #222;
 }
@@ -808,10 +826,64 @@ WWidget, QLabel {
   font-size: 11px;
 }
 
-#EffectKnob {
+#EffectMetaKnobControls > WPushButton {
+  qproperty-alignment: 'AlignHCenter';
 }
 
-#EffectButton {
+#EffectUnitGroupControlsLeft {
+  qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
+}
+
+#EffectUnitGroupControlsRight {
+  qproperty-layoutAlignment: 'AlignRight | AlignVCenter';
+}
+
+#EffectMetaKnob, WEffect {
+  font-size: 12px;
+  background-color: none;
+  border: none;
+}
+
+WEffectSelector {
+  color: #c1cabe;
+  background-color: #444342;
+  /* TODO: use a linear gradient for the background color */
+
+  /* Fixes the white bars on the top/bottom of the popup on Mac OS X */
+  margin-top: 0px;
+  margin-bottom: 0px;
+
+  /* If you use margin top/bottom 0, the combo box shrinks in width (go figure) and
+   * names start getting cut off. Adding explicit padding improves this. */
+  padding: 0px 6px;
+
+  /* The 3D frame on the combo box becomes flat when you give it a border */
+  border: 1px solid #444342;
+  border-radius: 3px;
+}
+
+  WEffectSelector:hover {
+    border: 1px ridge #015d8d;
+  }
+
+  WEffectSelector::drop-down {
+    /* This causes the Qt theme's widget style to magically not apply. Go figure. */
+    border: 0;
+  }
+
+  WEffectSelector::down-arrow {
+    width: 20px;
+    height: 20px;
+    image: url(skin:/icon/ic_chevron_down_48px.svg);
+  }
+
+  WEffectSelector QAbstractItemView {
+    color: #c1cabe;
+    background-color: #201f1f;
+    selection-background-color: #184880;
+  }
+
+#EffectKnob {
 }
 
 #EffectButtonParameter {
@@ -845,15 +917,19 @@ WWidget, QLabel {
   background-color: none;
   border: none;
   qproperty-alignment: 'AlignHCenter | AlignTop';
-  font: 8px;
+  font: 10px;
   margin-top: -2px;
 }
 
+#EffectButton {
+  font: 10px;
+}
+
 #EffectButtonLabel {
   background-color: none;
   border: none;
   qproperty-alignment: 'AlignHCenter';
-  font: 8px;
+  font: 10px;
   margin-top: 1px;
 }
 
@@ -1011,11 +1087,15 @@ WStarRating {
                                     stop: 1.0 #333333);
 }
 
-#EffectRackExpanded, #EffectRackCollapsed {
-  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
+#EffectUnitNoParameters {
+  padding-left: 5px;
+}
+
+#EffectUnitEffectsNoParameters {
+  qproperty-layoutSpacing: 40;
 }
 
-#EffectUnitParameters {
+#EffectUnitEffects, #EffectUnitParameters {
   padding: 2px;
   qproperty-layoutAlignment: 'AlignLeft | AlignTop';
   qproperty-layoutSpacing: 2;
@@ -1036,16 +1116,8 @@ WStarRating {
   font-size: 15px;
 }
 
-#EffectUnit1 {
-}
-
-#EffectUnit2 {
-}
-
-#EffectUnit3 {
-}
-
-#EffectUnit4 {
+#EffectUnit1, #EffectUnit2 {
+  /*border-bottom: none;*/
 }
 
 #SampleDecksContainer {
@@ -1284,6 +1356,18 @@ WPushButton[value="2"]:hover {
     border: 0px solid #0080BE;
 }
 
+#EffectSlotParameterLinkInversionButton {
+    margin: 0px 4px 0px 4px;
+}
+
+#EffectSlotParameterLinkInversionButton[value="1"] {
+    background-color: #b90505;
+}
+
+#EffectSlotParameterLinkInversionButton[value="1"]:hover {
+    background-color: #e80808;
+}
+
 /* Special case "hide/show" button
    The button unfolds/folds widgets. We display different icons per state, but
    do not want an active or active:hover color like with the other buttons.
diff --git a/src/skin/tooltips.cpp b/src/skin/tooltips.cpp
index 1000f3e46450..1c490912821b 100644
--- a/src/skin/tooltips.cpp
+++ b/src/skin/tooltips.cpp
@@ -727,6 +727,10 @@ void Tooltips::addStandardTooltips() {
             << tr("Super Knob Mode")
             << tr("Set how linked effect parameters change when turning the Super Knob.");
 
+    add("EffectSlot_parameter_inversion")
+            << tr("Super Knob Inversion")
+            << tr("Inverts how linked effect parameters change when turning the Super Knob.");
+
     add("EffectSlot_button_parameter")
             << tr("Equalizer Parameter Kill")
             << tr("Holds the gain of the EQ to zero while active.")