From efbf0fb26a46058af16ac5617fb24000a0b9b9e5 Mon Sep 17 00:00:00 2001
From: be_ <be.0@gmx.com>
Date: Mon, 5 Dec 2016 01:47:25 -0600
Subject: [PATCH 01/22] initial commit of new effects racks for Deere with meta
 knobs

---
 res/skins/Deere/effect_button_parameter.xml |   4 +-
 res/skins/Deere/effect_chain_collapsed.xml  |  54 ++++
 res/skins/Deere/effect_chain_expanded.xml   |  63 +++++
 res/skins/Deere/effect_meta_knob.xml        |  21 ++
 res/skins/Deere/effect_parameter_knob.xml   |  24 +-
 res/skins/Deere/effect_rack.xml             |  71 +----
 res/skins/Deere/effect_selector_buttons.xml |   4 +-
 res/skins/Deere/effect_single_condensed.xml |  27 ++
 res/skins/Deere/effect_single_controls.xml  | 100 +++++++
 res/skins/Deere/effect_single_expanded.xml  |  85 ++++++
 res/skins/Deere/effect_unit.xml             | 280 ++++++++++++++++++++
 res/skins/Deere/skin.xml                    |   4 +-
 res/skins/Deere/style.qss                   |  30 ++-
 13 files changed, 683 insertions(+), 84 deletions(-)
 create mode 100644 res/skins/Deere/effect_chain_collapsed.xml
 create mode 100644 res/skins/Deere/effect_chain_expanded.xml
 create mode 100644 res/skins/Deere/effect_meta_knob.xml
 create mode 100644 res/skins/Deere/effect_single_condensed.xml
 create mode 100644 res/skins/Deere/effect_single_controls.xml
 create mode 100644 res/skins/Deere/effect_single_expanded.xml
 create mode 100644 res/skins/Deere/effect_unit.xml

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_chain_collapsed.xml b/res/skins/Deere/effect_chain_collapsed.xml
new file mode 100644
index 000000000000..da715b08c882
--- /dev/null
+++ b/res/skins/Deere/effect_chain_collapsed.xml
@@ -0,0 +1,54 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    An effect chain widget collapsed.
+  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,150</MaximumSize>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>EffectUnitCollapsedControlRow</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>me,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>
+
+          <Template src="skin:effect_single_condensed.xml">
+            <SetVariable name="Effect">1</SetVariable>
+          </Template>
+
+          <Template src="skin:effect_single_condensed.xml">
+            <SetVariable name="Effect">2</SetVariable>
+          </Template>
+
+          <Template src="skin:effect_single_condensed.xml">
+            <SetVariable name="Effect">3</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+
+    </Children>
+  </WidgetGroup>
+
+</Template>
diff --git a/res/skins/Deere/effect_chain_expanded.xml b/res/skins/Deere/effect_chain_expanded.xml
new file mode 100644
index 000000000000..48788fe17369
--- /dev/null
+++ b/res/skins/Deere/effect_chain_expanded.xml
@@ -0,0 +1,63 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    An expanded 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>
+        <Layout>horizontal</Layout>
+        <Children>
+          <WidgetGroup>
+            <Layout>vertical</Layout>
+            <Children>
+
+              <Template src="skin:effect_single_expanded.xml">
+                <SetVariable name="Effect">1</SetVariable>
+              </Template>
+
+              <Template src="skin:effect_single_expanded.xml">
+                <SetVariable name="Effect">2</SetVariable>
+              </Template>
+
+              <Template src="skin:effect_single_expanded.xml">
+                <SetVariable name="Effect">3</SetVariable>
+              </Template>
+            </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>
+
+    </Children>
+  </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..6fca05c06c10
--- /dev/null
+++ b/res/skins/Deere/effect_meta_knob.xml
@@ -0,0 +1,21 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    An effect meta knob.
+  Variables:
+    control: The control to connect to.
+-->
+<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..278d1c5e7773 100644
--- a/res/skins/Deere/effect_parameter_knob.xml
+++ b/res/skins/Deere/effect_parameter_knob.xml
@@ -11,16 +11,24 @@
 <Template>
   <WidgetGroup>
     <Layout>vertical</Layout>
-    <Size>40f,30f</Size>
+    <Size>55f,36f</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>
+        <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>
+        </Children>
+      </WidgetGroup>
+
       <EffectParameterName>
-        <Size>40f,10f</Size>
+        <Size>50f,12f</Size>
         <ObjectName>EffectKnobLabel</ObjectName>
         <EffectRack><Variable name="EffectRack"/></EffectRack>
         <EffectUnit><Variable name="EffectUnit"/></EffectUnit>
diff --git a/res/skins/Deere/effect_rack.xml b/res/skins/Deere/effect_rack.xml
index 28fab8b0a6d0..e83d62e5d3df 100644
--- a/res/skins/Deere/effect_rack.xml
+++ b/res/skins/Deere/effect_rack.xml
@@ -17,83 +17,22 @@
         <ObjectName>EffectRackContainer</ObjectName>
         <SizePolicy>me,min</SizePolicy>
         <Children>
-          <!-- Collapsed EffectRack -->
           <WidgetGroup>
-            <ObjectName>EffectRackCollapsed</ObjectName>
+            <ObjectName>EffectUnitsRow</ObjectName>
             <Layout>horizontal</Layout>
             <MinimumSize>-1,50</MinimumSize>
-            <MaximumSize>-1,50</MaximumSize>
-            <SizePolicy>me,f</SizePolicy>
+            <MaximumSize>-1,150</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
index c40fe49d8ab9..2086ef1ddf75 100644
--- a/res/skins/Deere/effect_selector_buttons.xml
+++ b/res/skins/Deere/effect_selector_buttons.xml
@@ -12,6 +12,8 @@
     <Layout>horizontal</Layout>
     <Children>
 
+      <Template src="skin:effect_meta_knob.xml"/>
+
       <Template src="skin:left_2state_button.xml">
         <SetVariable name="TooltipId">EffectSlot_enabled</SetVariable>
         <SetVariable name="ObjectName"></SetVariable>
@@ -41,7 +43,7 @@
 
       <EffectName>
         <MinimumSize>50,-1</MinimumSize>
-        <MaximumSize>50,-1</MaximumSize>
+        <MaximumSize>100,-1</MaximumSize>
         <EffectRack><Variable name="EffectRack"/></EffectRack>
         <EffectUnit><Variable name="EffectUnit"/></EffectUnit>
         <Effect><Variable name="Effect"/></Effect>
diff --git a/res/skins/Deere/effect_single_condensed.xml b/res/skins/Deere/effect_single_condensed.xml
new file mode 100644
index 000000000000..a0212e7703e1
--- /dev/null
+++ b/res/skins/Deere/effect_single_condensed.xml
@@ -0,0 +1,27 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    A condensed single effect.
+  Variables:
+    control: The control to connect to.
+-->
+<Template>
+  <WidgetGroup>
+    <Layout>vertical</Layout>
+    <SizePolicy>me,f</SizePolicy>
+    <MinimumSize>-1,50</MinimumSize>
+    <MaximumSize>-1,50</MaximumSize>
+    <Children>
+
+      <EffectName>
+        <EffectRack><Variable name="EffectRack"/></EffectRack>
+        <EffectUnit><Variable name="EffectUnit"/></EffectUnit>
+        <Effect><Variable name="Effect"/></Effect>
+      </EffectName>
+
+      <Template src="skin:effect_single_controls.xml"/>
+
+    </Children>
+  </WidgetGroup>
+
+</Template>
diff --git a/res/skins/Deere/effect_single_controls.xml b/res/skins/Deere/effect_single_controls.xml
new file mode 100644
index 000000000000..584fdb7f7103
--- /dev/null
+++ b/res/skins/Deere/effect_single_controls.xml
@@ -0,0 +1,100 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    A condensed single effect.
+  Variables:
+-->
+<Template>
+  <WidgetGroup>
+    <ObjectName>EffectSingleControls</ObjectName>
+    <Layout>horizontal</Layout>
+    <Children>
+      <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Children>
+
+          <WidgetGroup>
+            <ObjectName>EffectSingleButtonGrid</ObjectName>
+            <Layout>vertical</Layout>
+            <Children>
+              <WidgetGroup>
+                <ObjectName>EffectControlsRow1</ObjectName>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:left_2state_button.xml">
+                    <SetVariable name="TooltipId">EffectSlot_enabled</SetVariable>
+                    <SetVariable name="ObjectName"></SetVariable>
+                    <SetVariable name="MinimumSize">15,15</SetVariable>
+                    <SetVariable name="MaximumSize">15,15</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">15,15</SetVariable>
+                  <SetVariable name="MaximumSize">15,15</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>
+              </Children>
+            </WidgetGroup>
+
+            <WidgetGroup>
+              <ObjectName>EffectControlsRow2</ObjectName>
+              <Layout>horizontal</Layout>
+                <Children>
+                  <WidgetGroup>
+                    <ObjectName>EffectSelectButtons</ObjectName>
+                    <Layout>horizontal</Layout>
+                    <Children>
+                      <Template src="skin:left_1state_button.xml">
+                        <SetVariable name="TooltipId">EffectSlot_prev_effect</SetVariable>
+                        <SetVariable name="ObjectName"></SetVariable>
+                        <SetVariable name="MinimumSize">15,15</SetVariable>
+                        <SetVariable name="MaximumSize">15,15</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">15,15</SetVariable>
+                        <SetVariable name="MaximumSize">15,15</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>
+
+                </Children>
+              </WidgetGroup>
+
+            </Children>
+          </WidgetGroup>
+
+          <Template src="skin:effect_meta_knob.xml"/>
+
+        </Children>
+      </WidgetGroup>
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Deere/effect_single_expanded.xml b/res/skins/Deere/effect_single_expanded.xml
new file mode 100644
index 000000000000..395246ab869c
--- /dev/null
+++ b/res/skins/Deere/effect_single_expanded.xml
@@ -0,0 +1,85 @@
+<!DOCTYPE template>
+<Template>
+  <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_single_controls.xml"/>
+
+          <EffectName>
+            <MinimumSize>150,-1</MinimumSize>
+            <MaximumSize>150,-1</MaximumSize>
+            <EffectRack><Variable name="EffectRack"/></EffectRack>
+            <EffectUnit><Variable name="EffectUnit"/></EffectUnit>
+            <Effect><Variable name="Effect"/></Effect>
+          </EffectName>
+
+          <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..6dd948d9a813
--- /dev/null
+++ b/res/skins/Deere/effect_unit.xml
@@ -0,0 +1,280 @@
+<!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,150</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">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],expanded</SetVariable>
+              </Template>
+
+              <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>
+
+          <WidgetGroup>
+            <ObjectName>EffectUnitGroupControlsRight</ObjectName>
+            <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>
+
+      <WidgetGroup>
+        <Layout>vertical</Layout>
+        <Children>
+          <Template src="skin:effect_chain_collapsed.xml">
+              <SetVariable name="EffectRack"><Variable name="EffectRack"/></SetVariable>
+              <SetVariable name="EffectUnit"><Variable name="EffectUnit"/></SetVariable>
+          </Template>
+        </Children>
+        <Connection>
+          <ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],expanded</ConfigKey>
+          <BindProperty>visible</BindProperty>
+          <Transform><Not/></Transform>
+        </Connection>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <Layout>vertical</Layout>
+        <Children>
+          <Template src="skin:effect_chain_expanded.xml">
+              <SetVariable name="EffectRack"><Variable name="EffectRack"/></SetVariable>
+              <SetVariable name="EffectUnit"><Variable name="EffectUnit"/></SetVariable>
+          </Template>
+        </Children>
+        <Connection>
+          <ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],expanded</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/Deere/skin.xml b/res/skins/Deere/skin.xml
index 6e271eedbca2..5ba306a5f949 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">30,20</SetVariable>
+    <SetVariable name="SmallWideButtonMaximumSize">30,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..d964e01a9d64 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -808,6 +808,25 @@ WWidget, QLabel {
   font-size: 11px;
 }
 
+#EffectMetaKnobControls > WPushButton {
+  qproperty-alignment: 'AlignHCenter';
+}
+
+#EffectUnitGroupControlsLeft {
+  qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
+}
+
+#EffectUnitGroupControlsRight {
+  qproperty-layoutAlignment: 'AlignRight | AlignVCenter';
+}
+
+#EffectMetaKnob, WEffect {
+  font-size: 12px;
+  background-color: none;
+  border: none;
+  qproperty-alignment: 'AlignHCenter';
+}
+
 #EffectKnob {
 }
 
@@ -841,11 +860,15 @@ WWidget, QLabel {
     qproperty-layoutSpacing: 7;
 }
 
+#EffectParameterSmallKnob {
+  qproperty-alignment: 'AlignHCenter | AlignTop';
+}
+
 #EffectKnobLabel {
   background-color: none;
   border: none;
   qproperty-alignment: 'AlignHCenter | AlignTop';
-  font: 8px;
+  font: 10px;
   margin-top: -2px;
 }
 
@@ -853,7 +876,7 @@ WWidget, QLabel {
   background-color: none;
   border: none;
   qproperty-alignment: 'AlignHCenter';
-  font: 8px;
+  font: 10px;
   margin-top: 1px;
 }
 
@@ -1009,9 +1032,6 @@ WStarRating {
   background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
                                     stop: 0 #333333,
                                     stop: 1.0 #333333);
-}
-
-#EffectRackExpanded, #EffectRackCollapsed {
   qproperty-layoutAlignment: 'AlignLeft | AlignTop';
 }
 

From 9a49dc96a14954002784d4a722051400d6f78df8 Mon Sep 17 00:00:00 2001
From: be_ <be.0@gmx.com>
Date: Mon, 5 Dec 2016 13:10:52 -0600
Subject: [PATCH 02/22] Deere effects UI refinement

---
 res/skins/Deere/effect_chain_collapsed.xml  | 68 +++++++++++++--------
 res/skins/Deere/effect_chain_expanded.xml   | 15 +++--
 res/skins/Deere/effect_parameter_knob.xml   |  2 +-
 res/skins/Deere/effect_single_condensed.xml |  4 +-
 res/skins/Deere/effect_single_expanded.xml  |  4 +-
 res/skins/Deere/style.qss                   |  2 +-
 6 files changed, 56 insertions(+), 39 deletions(-)

diff --git a/res/skins/Deere/effect_chain_collapsed.xml b/res/skins/Deere/effect_chain_collapsed.xml
index da715b08c882..051dafc99441 100644
--- a/res/skins/Deere/effect_chain_collapsed.xml
+++ b/res/skins/Deere/effect_chain_collapsed.xml
@@ -11,8 +11,8 @@
     <ObjectName>EffectUnit<Variable name="EffectUnit"/></ObjectName>
     <Layout>vertical</Layout>
     <SizePolicy>me,f</SizePolicy>
-    <MinimumSize>-1,50</MinimumSize>
-    <MaximumSize>-1,150</MaximumSize>
+    <MinimumSize>-1,55</MinimumSize>
+    <MaximumSize>-1,55</MaximumSize>
     <Children>
 
       <WidgetGroup>
@@ -20,31 +20,45 @@
         <Layout>horizontal</Layout>
         <SizePolicy>me,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>
-
-          <Template src="skin:effect_single_condensed.xml">
-            <SetVariable name="Effect">1</SetVariable>
-          </Template>
-
-          <Template src="skin:effect_single_condensed.xml">
-            <SetVariable name="Effect">2</SetVariable>
-          </Template>
-
-          <Template src="skin:effect_single_condensed.xml">
-            <SetVariable name="Effect">3</SetVariable>
-          </Template>
+
+          <WidgetGroup>
+            <ObjectName>EffectUnitEffects</ObjectName>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Template src="skin:effect_single_condensed.xml">
+                <SetVariable name="Effect">1</SetVariable>
+              </Template>
+
+              <Template src="skin:effect_single_condensed.xml">
+                <SetVariable name="Effect">2</SetVariable>
+              </Template>
+
+              <Template src="skin:effect_single_condensed.xml">
+                <SetVariable name="Effect">3</SetVariable>
+              </Template>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>EffectUnitControls</ObjectName>
+            <Layout>horizontal</Layout>
+            <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>
 
diff --git a/res/skins/Deere/effect_chain_expanded.xml b/res/skins/Deere/effect_chain_expanded.xml
index 48788fe17369..85366d340933 100644
--- a/res/skins/Deere/effect_chain_expanded.xml
+++ b/res/skins/Deere/effect_chain_expanded.xml
@@ -18,6 +18,7 @@
         <Layout>horizontal</Layout>
         <Children>
           <WidgetGroup>
+            <ObjectName>EffectUnitEffects</ObjectName>
             <Layout>vertical</Layout>
             <Children>
 
@@ -40,12 +41,6 @@
             <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>
@@ -53,6 +48,14 @@
                 <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>
diff --git a/res/skins/Deere/effect_parameter_knob.xml b/res/skins/Deere/effect_parameter_knob.xml
index 278d1c5e7773..a8733923f372 100644
--- a/res/skins/Deere/effect_parameter_knob.xml
+++ b/res/skins/Deere/effect_parameter_knob.xml
@@ -28,7 +28,7 @@
       </WidgetGroup>
 
       <EffectParameterName>
-        <Size>50f,12f</Size>
+        <Size>55f,12f</Size>
         <ObjectName>EffectKnobLabel</ObjectName>
         <EffectRack><Variable name="EffectRack"/></EffectRack>
         <EffectUnit><Variable name="EffectUnit"/></EffectUnit>
diff --git a/res/skins/Deere/effect_single_condensed.xml b/res/skins/Deere/effect_single_condensed.xml
index a0212e7703e1..8286178000e0 100644
--- a/res/skins/Deere/effect_single_condensed.xml
+++ b/res/skins/Deere/effect_single_condensed.xml
@@ -13,14 +13,14 @@
     <MaximumSize>-1,50</MaximumSize>
     <Children>
 
+      <Template src="skin:effect_single_controls.xml"/>
+
       <EffectName>
         <EffectRack><Variable name="EffectRack"/></EffectRack>
         <EffectUnit><Variable name="EffectUnit"/></EffectUnit>
         <Effect><Variable name="Effect"/></Effect>
       </EffectName>
 
-      <Template src="skin:effect_single_controls.xml"/>
-
     </Children>
   </WidgetGroup>
 
diff --git a/res/skins/Deere/effect_single_expanded.xml b/res/skins/Deere/effect_single_expanded.xml
index 395246ab869c..847fbdf4c60c 100644
--- a/res/skins/Deere/effect_single_expanded.xml
+++ b/res/skins/Deere/effect_single_expanded.xml
@@ -14,8 +14,8 @@
           <Template src="skin:effect_single_controls.xml"/>
 
           <EffectName>
-            <MinimumSize>150,-1</MinimumSize>
-            <MaximumSize>150,-1</MaximumSize>
+            <MinimumSize>80,-1</MinimumSize>
+            <MaximumSize>80,-1</MaximumSize>
             <EffectRack><Variable name="EffectRack"/></EffectRack>
             <EffectUnit><Variable name="EffectUnit"/></EffectUnit>
             <Effect><Variable name="Effect"/></Effect>
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index d964e01a9d64..2c1b8354ab9e 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -1035,7 +1035,7 @@ WStarRating {
   qproperty-layoutAlignment: 'AlignLeft | AlignTop';
 }
 
-#EffectUnitParameters {
+#EffectUnitEffects, #EffectUnitParameters {
   padding: 2px;
   qproperty-layoutAlignment: 'AlignLeft | AlignTop';
   qproperty-layoutSpacing: 2;

From 9e3be5a83bf6ad033aafe91f3a04b2f4bb0b1343 Mon Sep 17 00:00:00 2001
From: be_ <be.0@gmx.com>
Date: Mon, 5 Dec 2016 14:52:41 -0600
Subject: [PATCH 03/22] Deere: add superknob link inversion buttons for
 expanded effects units

---
 res/skins/Deere/effect_chain_expanded.xml |  1 +
 res/skins/Deere/effect_parameter_knob.xml | 42 +++++++++++++++++++----
 res/skins/Deere/effect_rack.xml           |  2 +-
 res/skins/Deere/effect_unit.xml           |  4 +--
 4 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/res/skins/Deere/effect_chain_expanded.xml b/res/skins/Deere/effect_chain_expanded.xml
index 85366d340933..efd589202f58 100644
--- a/res/skins/Deere/effect_chain_expanded.xml
+++ b/res/skins/Deere/effect_chain_expanded.xml
@@ -19,6 +19,7 @@
         <Children>
           <WidgetGroup>
             <ObjectName>EffectUnitEffects</ObjectName>
+            <SizePolicy>me,min</SizePolicy>
             <Layout>vertical</Layout>
             <Children>
 
diff --git a/res/skins/Deere/effect_parameter_knob.xml b/res/skins/Deere/effect_parameter_knob.xml
index a8733923f372..05491fd49ae5 100644
--- a/res/skins/Deere/effect_parameter_knob.xml
+++ b/res/skins/Deere/effect_parameter_knob.xml
@@ -11,19 +11,24 @@
 <Template>
   <WidgetGroup>
     <Layout>vertical</Layout>
-    <Size>55f,36f</Size>
+    <Size>55f,42f</Size>
     <Children>
 
       <WidgetGroup>
         <ObjectName>EffectParameterSmallKnob</ObjectName>
         <Layout>horizontal</Layout>
+        <Size>me,20f</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>
+          <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>
 
@@ -61,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 e83d62e5d3df..8ec375b958fa 100644
--- a/res/skins/Deere/effect_rack.xml
+++ b/res/skins/Deere/effect_rack.xml
@@ -21,7 +21,7 @@
             <ObjectName>EffectUnitsRow</ObjectName>
             <Layout>horizontal</Layout>
             <MinimumSize>-1,50</MinimumSize>
-            <MaximumSize>-1,150</MaximumSize>
+            <MaximumSize>-1,166</MaximumSize>
             <SizePolicy>me,me</SizePolicy>
             <Children>
               <Template src="skin:effect_unit.xml">
diff --git a/res/skins/Deere/effect_unit.xml b/res/skins/Deere/effect_unit.xml
index 6dd948d9a813..2b92feb1418a 100644
--- a/res/skins/Deere/effect_unit.xml
+++ b/res/skins/Deere/effect_unit.xml
@@ -10,9 +10,9 @@
   <WidgetGroup>
     <ObjectName>EffectUnit<Variable name="EffectUnit"/></ObjectName>
     <Layout>vertical</Layout>
-    <SizePolicy>me,f</SizePolicy>
+    <SizePolicy>me,min</SizePolicy>
     <MinimumSize>-1,50</MinimumSize>
-    <MaximumSize>-1,150</MaximumSize>
+    <MaximumSize>-1,166</MaximumSize>
     <Children>
       <WidgetGroup>
         <ObjectName>EffectUnitGroupControls</ObjectName>

From 31e99d2e58c0c735c84d871a38d88b7354a81efe Mon Sep 17 00:00:00 2001
From: be_ <be.0@gmx.com>
Date: Mon, 5 Dec 2016 14:53:02 -0600
Subject: [PATCH 04/22] Deere: increase font size of effect group enable
 buttons

---
 res/skins/Deere/skin.xml  |  4 ++--
 res/skins/Deere/style.qss | 35 ++++++++++++++++++++++-------------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/res/skins/Deere/skin.xml b/res/skins/Deere/skin.xml
index 5ba306a5f949..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,20</SetVariable>
-    <SetVariable name="SmallWideButtonMaximumSize">30,20</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 2c1b8354ab9e..85eae122d2e6 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -788,6 +788,10 @@ WWidget, QLabel {
   border-left:none;
 }
 
+#EffectChainGroupControlButton {
+  font: 10px;
+}
+
 #EffectUnit1 {
   border-left: 1px solid #222;
 }
@@ -830,9 +834,6 @@ WWidget, QLabel {
 #EffectKnob {
 }
 
-#EffectButton {
-}
-
 #EffectButtonParameter {
   margin-top: 3px;
 }
@@ -872,6 +873,10 @@ WWidget, QLabel {
   margin-top: -2px;
 }
 
+#EffectButton {
+  font: 10px;
+}
+
 #EffectButtonLabel {
   background-color: none;
   border: none;
@@ -1056,16 +1061,8 @@ WStarRating {
   font-size: 15px;
 }
 
-#EffectUnit1 {
-}
-
-#EffectUnit2 {
-}
-
-#EffectUnit3 {
-}
-
-#EffectUnit4 {
+#EffectUnit1, #EffectUnit2 {
+  /*border-bottom: none;*/
 }
 
 #SampleDecksContainer {
@@ -1304,6 +1301,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.

From d46cf097e285f125ccf183a99ed080a532efd516 Mon Sep 17 00:00:00 2001
From: be_ <be.0@gmx.com>
Date: Mon, 5 Dec 2016 15:25:10 -0600
Subject: [PATCH 05/22] add tooltip for new meta/superknob link inversion
 button

---
 src/skin/tooltips.cpp | 4 ++++
 1 file changed, 4 insertions(+)

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.")

From 55c55b1161dfadc1b432d547eaef2253dd32de29 Mon Sep 17 00:00:00 2001
From: be_ <be.0@gmx.com>
Date: Mon, 5 Dec 2016 16:31:33 -0600
Subject: [PATCH 06/22] Deere: label meta knobs

---
 res/skins/Deere/effect_single_expanded.xml | 106 ++++++++++++++++++++-
 1 file changed, 105 insertions(+), 1 deletion(-)

diff --git a/res/skins/Deere/effect_single_expanded.xml b/res/skins/Deere/effect_single_expanded.xml
index 847fbdf4c60c..c78aa724a624 100644
--- a/res/skins/Deere/effect_single_expanded.xml
+++ b/res/skins/Deere/effect_single_expanded.xml
@@ -10,8 +10,112 @@
         <SizePolicy>me,max</SizePolicy>
         <Layout>horizontal</Layout>
         <Children>
+
+          <WidgetGroup>
+            <ObjectName>EffectSingleControls</ObjectName>
+            <Layout>horizontal</Layout>
+            <Children>
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Children>
+
+                  <WidgetGroup>
+                    <ObjectName>EffectSingleButtonGrid</ObjectName>
+                    <Layout>vertical</Layout>
+                    <Children>
+                      <WidgetGroup>
+                        <ObjectName>EffectControlsRow1</ObjectName>
+                        <Layout>horizontal</Layout>
+                        <Children>
+                          <Template src="skin:left_2state_button.xml">
+                            <SetVariable name="TooltipId">EffectSlot_enabled</SetVariable>
+                            <SetVariable name="ObjectName"></SetVariable>
+                            <SetVariable name="MinimumSize">15,15</SetVariable>
+                            <SetVariable name="MaximumSize">15,15</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">15,15</SetVariable>
+                          <SetVariable name="MaximumSize">15,15</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>
+                      </Children>
+                    </WidgetGroup>
+
+                    <WidgetGroup>
+                      <ObjectName>EffectControlsRow2</ObjectName>
+                      <Layout>horizontal</Layout>
+                        <Children>
+                          <WidgetGroup>
+                            <ObjectName>EffectSelectButtons</ObjectName>
+                            <Layout>horizontal</Layout>
+                            <Children>
+                              <Template src="skin:left_1state_button.xml">
+                                <SetVariable name="TooltipId">EffectSlot_prev_effect</SetVariable>
+                                <SetVariable name="ObjectName"></SetVariable>
+                                <SetVariable name="MinimumSize">15,15</SetVariable>
+                                <SetVariable name="MaximumSize">15,15</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">15,15</SetVariable>
+                                <SetVariable name="MaximumSize">15,15</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>
+
+                        </Children>
+                      </WidgetGroup>
+
+                    </Children>
+                  </WidgetGroup>
+
+                  <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-->
-          <Template src="skin:effect_single_controls.xml"/>
 
           <EffectName>
             <MinimumSize>80,-1</MinimumSize>

From 7420500c0a4058a5d67946572653762e36a9ef6e Mon Sep 17 00:00:00 2001
From: be_ <be.0@gmx.com>
Date: Fri, 23 Dec 2016 00:18:21 -0600
Subject: [PATCH 07/22] Deere: implement new effect interface

as discussed in PR #1062
---
 res/skins/Deere/effect_buttons.xml            |  96 +++
 res/skins/Deere/effect_chain.xml              | 562 ------------------
 res/skins/Deere/effect_chain_simple.xml       | 273 ---------
 res/skins/Deere/effect_focus_button.xml       |  55 ++
 res/skins/Deere/effect_meta_knob.xml          |   4 +-
 res/skins/Deere/effect_rack.xml               |   9 +-
 res/skins/Deere/effect_selector_buttons.xml   |  77 ---
 res/skins/Deere/effect_single_condensed.xml   |  27 -
 res/skins/Deere/effect_single_controls.xml    | 100 ----
 res/skins/Deere/effect_single_expanded.xml    | 189 ------
 .../Deere/effect_single_no_parameters.xml     | 101 ++++
 .../Deere/effect_single_with_parameters.xml   |  54 ++
 .../effect_single_with_parameters_row.xml     | 123 ++++
 res/skins/Deere/effect_unit.xml               |  82 +--
 ...l => effect_unit_group_control_button.xml} |   0
 ...psed.xml => effect_unit_no_parameters.xml} |  18 +-
 ...ed.xml => effect_unit_with_parameters.xml} |  21 +-
 res/skins/Deere/skin.xml                      |   1 +
 res/skins/Deere/style.qss                     |  20 +-
 19 files changed, 494 insertions(+), 1318 deletions(-)
 create mode 100644 res/skins/Deere/effect_buttons.xml
 delete mode 100644 res/skins/Deere/effect_chain.xml
 delete mode 100644 res/skins/Deere/effect_chain_simple.xml
 create mode 100644 res/skins/Deere/effect_focus_button.xml
 delete mode 100644 res/skins/Deere/effect_selector_buttons.xml
 delete mode 100644 res/skins/Deere/effect_single_condensed.xml
 delete mode 100644 res/skins/Deere/effect_single_controls.xml
 delete mode 100644 res/skins/Deere/effect_single_expanded.xml
 create mode 100644 res/skins/Deere/effect_single_no_parameters.xml
 create mode 100644 res/skins/Deere/effect_single_with_parameters.xml
 create mode 100644 res/skins/Deere/effect_single_with_parameters_row.xml
 rename res/skins/Deere/{effect_chain_group_control_button.xml => effect_unit_group_control_button.xml} (100%)
 rename res/skins/Deere/{effect_chain_collapsed.xml => effect_unit_no_parameters.xml} (80%)
 rename res/skins/Deere/{effect_chain_expanded.xml => effect_unit_with_parameters.xml} (77%)

diff --git a/res/skins/Deere/effect_buttons.xml b/res/skins/Deere/effect_buttons.xml
new file mode 100644
index 000000000000..ed724c7f5d35
--- /dev/null
+++ b/res/skins/Deere/effect_buttons.xml
@@ -0,0 +1,96 @@
+<!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"/>
+
+      <WidgetGroup>
+        <ObjectName>EffectSingleButtonGrid</ObjectName>
+        <Layout>vertical</Layout>
+        <Children>
+          <WidgetGroup>
+            <ObjectName>EffectControlsRow1</ObjectName>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Template src="skin:left_2state_button.xml">
+                <SetVariable name="TooltipId">EffectSlot_enabled</SetVariable>
+                <SetVariable name="ObjectName"></SetVariable>
+                <SetVariable name="MinimumSize">15,15</SetVariable>
+                <SetVariable name="MaximumSize">15,15</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">15,15</SetVariable>
+              <SetVariable name="MaximumSize">15,15</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>
+          </Children>
+        </WidgetGroup>
+
+        <WidgetGroup>
+          <ObjectName>EffectControlsRow2</ObjectName>
+          <Layout>horizontal</Layout>
+            <Children>
+              <WidgetGroup>
+                <ObjectName>EffectSelectButtons</ObjectName>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:left_1state_button.xml">
+                    <SetVariable name="TooltipId">EffectSlot_prev_effect</SetVariable>
+                    <SetVariable name="ObjectName"></SetVariable>
+                    <SetVariable name="MinimumSize">15,15</SetVariable>
+                    <SetVariable name="MaximumSize">15,15</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">15,15</SetVariable>
+                    <SetVariable name="MaximumSize">15,15</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>
+
+            </Children>
+          </WidgetGroup>
+
+        </Children>
+      </WidgetGroup>
+
+    </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..17d863a42c83
--- /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>EffectFocusButton</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
index 6fca05c06c10..f087e523e2b2 100644
--- a/res/skins/Deere/effect_meta_knob.xml
+++ b/res/skins/Deere/effect_meta_knob.xml
@@ -3,7 +3,9 @@
   Description:
     An effect meta knob.
   Variables:
-    control: The control to connect to.
+    EffectRack: the rack
+    EffectUnit: the chain
+    Effect: the effect
 -->
 <Template>
   <WidgetGroup>
diff --git a/res/skins/Deere/effect_rack.xml b/res/skins/Deere/effect_rack.xml
index 8ec375b958fa..2a42130938a5 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>
@@ -18,10 +15,10 @@
         <SizePolicy>me,min</SizePolicy>
         <Children>
           <WidgetGroup>
-            <ObjectName>EffectUnitsRow</ObjectName>
+            <ObjectName>EffectUnitsRow1</ObjectName>
             <Layout>horizontal</Layout>
             <MinimumSize>-1,50</MinimumSize>
-            <MaximumSize>-1,166</MaximumSize>
+            <MaximumSize>-1,185</MaximumSize>
             <SizePolicy>me,me</SizePolicy>
             <Children>
               <Template src="skin:effect_unit.xml">
diff --git a/res/skins/Deere/effect_selector_buttons.xml b/res/skins/Deere/effect_selector_buttons.xml
deleted file mode 100644
index 2086ef1ddf75..000000000000
--- a/res/skins/Deere/effect_selector_buttons.xml
+++ /dev/null
@@ -1,77 +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:effect_meta_knob.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>
-
-      <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>100,-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_condensed.xml b/res/skins/Deere/effect_single_condensed.xml
deleted file mode 100644
index 8286178000e0..000000000000
--- a/res/skins/Deere/effect_single_condensed.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    A condensed single effect.
-  Variables:
-    control: The control to connect to.
--->
-<Template>
-  <WidgetGroup>
-    <Layout>vertical</Layout>
-    <SizePolicy>me,f</SizePolicy>
-    <MinimumSize>-1,50</MinimumSize>
-    <MaximumSize>-1,50</MaximumSize>
-    <Children>
-
-      <Template src="skin:effect_single_controls.xml"/>
-
-      <EffectName>
-        <EffectRack><Variable name="EffectRack"/></EffectRack>
-        <EffectUnit><Variable name="EffectUnit"/></EffectUnit>
-        <Effect><Variable name="Effect"/></Effect>
-      </EffectName>
-
-    </Children>
-  </WidgetGroup>
-
-</Template>
diff --git a/res/skins/Deere/effect_single_controls.xml b/res/skins/Deere/effect_single_controls.xml
deleted file mode 100644
index 584fdb7f7103..000000000000
--- a/res/skins/Deere/effect_single_controls.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<!DOCTYPE template>
-<!--
-  Description:
-    A condensed single effect.
-  Variables:
--->
-<Template>
-  <WidgetGroup>
-    <ObjectName>EffectSingleControls</ObjectName>
-    <Layout>horizontal</Layout>
-    <Children>
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <Children>
-
-          <WidgetGroup>
-            <ObjectName>EffectSingleButtonGrid</ObjectName>
-            <Layout>vertical</Layout>
-            <Children>
-              <WidgetGroup>
-                <ObjectName>EffectControlsRow1</ObjectName>
-                <Layout>horizontal</Layout>
-                <Children>
-                  <Template src="skin:left_2state_button.xml">
-                    <SetVariable name="TooltipId">EffectSlot_enabled</SetVariable>
-                    <SetVariable name="ObjectName"></SetVariable>
-                    <SetVariable name="MinimumSize">15,15</SetVariable>
-                    <SetVariable name="MaximumSize">15,15</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">15,15</SetVariable>
-                  <SetVariable name="MaximumSize">15,15</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>
-              </Children>
-            </WidgetGroup>
-
-            <WidgetGroup>
-              <ObjectName>EffectControlsRow2</ObjectName>
-              <Layout>horizontal</Layout>
-                <Children>
-                  <WidgetGroup>
-                    <ObjectName>EffectSelectButtons</ObjectName>
-                    <Layout>horizontal</Layout>
-                    <Children>
-                      <Template src="skin:left_1state_button.xml">
-                        <SetVariable name="TooltipId">EffectSlot_prev_effect</SetVariable>
-                        <SetVariable name="ObjectName"></SetVariable>
-                        <SetVariable name="MinimumSize">15,15</SetVariable>
-                        <SetVariable name="MaximumSize">15,15</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">15,15</SetVariable>
-                        <SetVariable name="MaximumSize">15,15</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>
-
-                </Children>
-              </WidgetGroup>
-
-            </Children>
-          </WidgetGroup>
-
-          <Template src="skin:effect_meta_knob.xml"/>
-
-        </Children>
-      </WidgetGroup>
-
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/Deere/effect_single_expanded.xml b/res/skins/Deere/effect_single_expanded.xml
deleted file mode 100644
index c78aa724a624..000000000000
--- a/res/skins/Deere/effect_single_expanded.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<!DOCTYPE template>
-<Template>
-  <WidgetGroup>
-    <ObjectName>EffectUnitControlRow</ObjectName>
-    <Layout>horizontal</Layout>
-    <SizePolicy>min,min</SizePolicy>
-    <Children>
-      <WidgetGroup>
-        <ObjectName>EffectUnitParameters</ObjectName>
-        <SizePolicy>me,max</SizePolicy>
-        <Layout>horizontal</Layout>
-        <Children>
-
-          <WidgetGroup>
-            <ObjectName>EffectSingleControls</ObjectName>
-            <Layout>horizontal</Layout>
-            <Children>
-              <WidgetGroup>
-                <Layout>horizontal</Layout>
-                <Children>
-
-                  <WidgetGroup>
-                    <ObjectName>EffectSingleButtonGrid</ObjectName>
-                    <Layout>vertical</Layout>
-                    <Children>
-                      <WidgetGroup>
-                        <ObjectName>EffectControlsRow1</ObjectName>
-                        <Layout>horizontal</Layout>
-                        <Children>
-                          <Template src="skin:left_2state_button.xml">
-                            <SetVariable name="TooltipId">EffectSlot_enabled</SetVariable>
-                            <SetVariable name="ObjectName"></SetVariable>
-                            <SetVariable name="MinimumSize">15,15</SetVariable>
-                            <SetVariable name="MaximumSize">15,15</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">15,15</SetVariable>
-                          <SetVariable name="MaximumSize">15,15</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>
-                      </Children>
-                    </WidgetGroup>
-
-                    <WidgetGroup>
-                      <ObjectName>EffectControlsRow2</ObjectName>
-                      <Layout>horizontal</Layout>
-                        <Children>
-                          <WidgetGroup>
-                            <ObjectName>EffectSelectButtons</ObjectName>
-                            <Layout>horizontal</Layout>
-                            <Children>
-                              <Template src="skin:left_1state_button.xml">
-                                <SetVariable name="TooltipId">EffectSlot_prev_effect</SetVariable>
-                                <SetVariable name="ObjectName"></SetVariable>
-                                <SetVariable name="MinimumSize">15,15</SetVariable>
-                                <SetVariable name="MaximumSize">15,15</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">15,15</SetVariable>
-                                <SetVariable name="MaximumSize">15,15</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>
-
-                        </Children>
-                      </WidgetGroup>
-
-                    </Children>
-                  </WidgetGroup>
-
-                  <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-->
-
-          <EffectName>
-            <MinimumSize>80,-1</MinimumSize>
-            <MaximumSize>80,-1</MaximumSize>
-            <EffectRack><Variable name="EffectRack"/></EffectRack>
-            <EffectUnit><Variable name="EffectUnit"/></EffectUnit>
-            <Effect><Variable name="Effect"/></Effect>
-          </EffectName>
-
-          <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_single_no_parameters.xml b/res/skins/Deere/effect_single_no_parameters.xml
new file mode 100644
index 000000000000..4ccde74a1099
--- /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>me,f</SizePolicy>
+        <MinimumSize>-1,55</MinimumSize>
+        <MaximumSize>-1,55</MaximumSize>
+        <Children>
+
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <Children>
+
+              <Template src="skin:effect_buttons.xml"/>
+
+              <Template src="skin:effect_meta_knob.xml"/>
+
+            </Children>
+          </WidgetGroup>
+
+          <EffectName>
+            <EffectRack><Variable name="EffectRack"/></EffectRack>
+            <EffectUnit><Variable name="EffectUnit"/></EffectUnit>
+            <Effect><Variable name="Effect"/></Effect>
+          </EffectName>
+
+        </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,55</MinimumSize>
+        <MaximumSize>-1,55</MaximumSize>
+        <Children>
+
+          <WidgetGroup>
+            <Layout>horizontal</Layout>
+            <Children>
+
+              <Template src="skin:effect_buttons.xml"/>
+
+              <Template src="skin:effect_meta_knob.xml"/>
+
+            </Children>
+          </WidgetGroup>
+
+          <EffectName>
+            <EffectRack><Variable name="EffectRack"/></EffectRack>
+            <EffectUnit><Variable name="EffectUnit"/></EffectUnit>
+            <Effect><Variable name="Effect"/></Effect>
+          </EffectName>
+
+        </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..c4b96dfd798a
--- /dev/null
+++ b/res/skins/Deere/effect_single_with_parameters_row.xml
@@ -0,0 +1,123 @@
+<!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-->
+
+          <EffectName>
+            <MinimumSize>80,-1</MinimumSize>
+            <MaximumSize>80,-1</MaximumSize>
+            <EffectRack><Variable name="EffectRack"/></EffectRack>
+            <EffectUnit><Variable name="EffectUnit"/></EffectUnit>
+            <Effect><Variable name="Effect"/></Effect>
+          </EffectName>
+
+          <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
index 2b92feb1418a..56647ff1bed5 100644
--- a/res/skins/Deere/effect_unit.xml
+++ b/res/skins/Deere/effect_unit.xml
@@ -3,7 +3,8 @@
   Description:
     An effect chain widget.
   Variables:
-    group: The group for the controls.
+    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>
@@ -12,7 +13,7 @@
     <Layout>vertical</Layout>
     <SizePolicy>me,min</SizePolicy>
     <MinimumSize>-1,50</MinimumSize>
-    <MaximumSize>-1,166</MaximumSize>
+    <MaximumSize>-1,185</MaximumSize>
     <Children>
       <WidgetGroup>
         <ObjectName>EffectUnitGroupControls</ObjectName>
@@ -26,7 +27,7 @@
             <Children>
               <Template src="skin:hide_show_button.xml">
                 <SetVariable name="object_name">EffectUnitToggle</SetVariable>
-                <SetVariable name="control">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],expanded</SetVariable>
+                <SetVariable name="control">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],show_parameters</SetVariable>
               </Template>
 
               <Template src="skin:left_2state_button.xml">
@@ -44,41 +45,6 @@
                 <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>
 
@@ -87,32 +53,32 @@
             <Layout>horizontal</Layout>
             <Children>
 
-              <Template src="skin:effect_chain_group_control_button.xml">
+              <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_chain_group_control_button.xml">
+              <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_chain_group_control_button.xml">
+              <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_chain_group_control_button.xml">
+              <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_chain_group_control_button.xml">
+              <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_chain_group_control_button.xml">
+              <Template src="skin:effect_unit_group_control_button.xml">
                 <SetVariable name="group_name">CH4</SetVariable>
                 <SetVariable name="group_group">[Channel4]</SetVariable>
               </Template>
@@ -129,7 +95,7 @@
                   <WidgetGroup>
                     <Layout>vertical</Layout>
                     <Children>
-                      <Template src="skin:effect_chain_group_control_button.xml">
+                      <Template src="skin:effect_unit_group_control_button.xml">
                         <SetVariable name="group_name">MIC1</SetVariable>
                         <SetVariable name="group_group">[Microphone]</SetVariable>
                       </Template>
@@ -143,7 +109,7 @@
                   <WidgetGroup>
                     <Layout>vertical</Layout>
                     <Children>
-                      <Template src="skin:effect_chain_group_control_button.xml">
+                      <Template src="skin:effect_unit_group_control_button.xml">
                         <SetVariable name="group_name">MIC2</SetVariable>
                         <SetVariable name="group_group">[Microphone2]</SetVariable>
                       </Template>
@@ -157,7 +123,7 @@
                   <WidgetGroup>
                     <Layout>vertical</Layout>
                     <Children>
-                      <Template src="skin:effect_chain_group_control_button.xml">
+                      <Template src="skin:effect_unit_group_control_button.xml">
                         <SetVariable name="group_name">MIC3</SetVariable>
                         <SetVariable name="group_group">[Microphone3]</SetVariable>
                       </Template>
@@ -171,7 +137,7 @@
                   <WidgetGroup>
                     <Layout>vertical</Layout>
                     <Children>
-                      <Template src="skin:effect_chain_group_control_button.xml">
+                      <Template src="skin:effect_unit_group_control_button.xml">
                         <SetVariable name="group_name">MIC4</SetVariable>
                         <SetVariable name="group_group">[Microphone4]</SetVariable>
                       </Template>
@@ -185,7 +151,7 @@
                   <WidgetGroup>
                     <Layout>vertical</Layout>
                       <Children>
-                      <Template src="skin:effect_chain_group_control_button.xml">
+                      <Template src="skin:effect_unit_group_control_button.xml">
                         <SetVariable name="group_name">Aux1</SetVariable>
                         <SetVariable name="group_group">[Auxiliary1]</SetVariable>
                       </Template>
@@ -199,7 +165,7 @@
                   <WidgetGroup>
                     <Layout>vertical</Layout>
                       <Children>
-                      <Template src="skin:effect_chain_group_control_button.xml">
+                      <Template src="skin:effect_unit_group_control_button.xml">
                         <SetVariable name="group_name">Aux2</SetVariable>
                         <SetVariable name="group_group">[Auxiliary2]</SetVariable>
                       </Template>
@@ -213,7 +179,7 @@
                   <WidgetGroup>
                     <Layout>vertical</Layout>
                       <Children>
-                      <Template src="skin:effect_chain_group_control_button.xml">
+                      <Template src="skin:effect_unit_group_control_button.xml">
                         <SetVariable name="group_name">Aux3</SetVariable>
                         <SetVariable name="group_group">[Auxiliary3]</SetVariable>
                       </Template>
@@ -227,7 +193,7 @@
                   <WidgetGroup>
                     <Layout>vertical</Layout>
                       <Children>
-                      <Template src="skin:effect_chain_group_control_button.xml">
+                      <Template src="skin:effect_unit_group_control_button.xml">
                         <SetVariable name="group_name">Aux4</SetVariable>
                         <SetVariable name="group_group">[Auxiliary4]</SetVariable>
                       </Template>
@@ -250,13 +216,11 @@
       <WidgetGroup>
         <Layout>vertical</Layout>
         <Children>
-          <Template src="skin:effect_chain_collapsed.xml">
-              <SetVariable name="EffectRack"><Variable name="EffectRack"/></SetVariable>
-              <SetVariable name="EffectUnit"><Variable name="EffectUnit"/></SetVariable>
+          <Template src="skin:effect_unit_no_parameters.xml">
           </Template>
         </Children>
         <Connection>
-          <ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],expanded</ConfigKey>
+          <ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],show_parameters</ConfigKey>
           <BindProperty>visible</BindProperty>
           <Transform><Not/></Transform>
         </Connection>
@@ -265,13 +229,11 @@
       <WidgetGroup>
         <Layout>vertical</Layout>
         <Children>
-          <Template src="skin:effect_chain_expanded.xml">
-              <SetVariable name="EffectRack"><Variable name="EffectRack"/></SetVariable>
-              <SetVariable name="EffectUnit"><Variable name="EffectUnit"/></SetVariable>
+          <Template src="skin:effect_unit_with_parameters.xml">
           </Template>
         </Children>
         <Connection>
-          <ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],expanded</ConfigKey>
+          <ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],show_parameters</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
       </WidgetGroup>
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_chain_collapsed.xml b/res/skins/Deere/effect_unit_no_parameters.xml
similarity index 80%
rename from res/skins/Deere/effect_chain_collapsed.xml
rename to res/skins/Deere/effect_unit_no_parameters.xml
index 051dafc99441..31c064b83a7c 100644
--- a/res/skins/Deere/effect_chain_collapsed.xml
+++ b/res/skins/Deere/effect_unit_no_parameters.xml
@@ -1,9 +1,10 @@
 <!DOCTYPE template>
 <!--
-  Description:
-    An effect chain widget collapsed.
-  Variables:
-    group: The group for the controls.
+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>
@@ -11,8 +12,9 @@
     <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,55</MinimumSize>
-    <MaximumSize>-1,55</MaximumSize>
+    <MaximumSize>-1,65</MaximumSize>
     <Children>
 
       <WidgetGroup>
@@ -25,15 +27,15 @@
             <ObjectName>EffectUnitEffects</ObjectName>
             <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:effect_single_condensed.xml">
+              <Template src="skin:effect_single_no_parameters.xml">
                 <SetVariable name="Effect">1</SetVariable>
               </Template>
 
-              <Template src="skin:effect_single_condensed.xml">
+              <Template src="skin:effect_single_no_parameters.xml">
                 <SetVariable name="Effect">2</SetVariable>
               </Template>
 
-              <Template src="skin:effect_single_condensed.xml">
+              <Template src="skin:effect_single_no_parameters.xml">
                 <SetVariable name="Effect">3</SetVariable>
               </Template>
             </Children>
diff --git a/res/skins/Deere/effect_chain_expanded.xml b/res/skins/Deere/effect_unit_with_parameters.xml
similarity index 77%
rename from res/skins/Deere/effect_chain_expanded.xml
rename to res/skins/Deere/effect_unit_with_parameters.xml
index efd589202f58..2da572d339c9 100644
--- a/res/skins/Deere/effect_chain_expanded.xml
+++ b/res/skins/Deere/effect_unit_with_parameters.xml
@@ -1,17 +1,20 @@
 <!DOCTYPE template>
 <!--
-  Description:
-    An expanded effect chain widget.
-  Variables:
-    group: The group for the controls.
+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,f</SizePolicy>
-    <MinimumSize>200,150</MinimumSize>
+    <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,170</MaximumSize>
     <Children>
 
       <WidgetGroup>
@@ -23,15 +26,15 @@
             <Layout>vertical</Layout>
             <Children>
 
-              <Template src="skin:effect_single_expanded.xml">
+              <Template src="skin:effect_single_with_parameters.xml">
                 <SetVariable name="Effect">1</SetVariable>
               </Template>
 
-              <Template src="skin:effect_single_expanded.xml">
+              <Template src="skin:effect_single_with_parameters.xml">
                 <SetVariable name="Effect">2</SetVariable>
               </Template>
 
-              <Template src="skin:effect_single_expanded.xml">
+              <Template src="skin:effect_single_with_parameters.xml">
                 <SetVariable name="Effect">3</SetVariable>
               </Template>
             </Children>
diff --git a/res/skins/Deere/skin.xml b/res/skins/Deere/skin.xml
index 71af160d2a82..97085986c0e9 100644
--- a/res/skins/Deere/skin.xml
+++ b/res/skins/Deere/skin.xml
@@ -11,6 +11,7 @@
       <attribute config_key="[Master],num_decks">4</attribute>
       <attribute config_key="[Master],num_samplers">16</attribute>
       <attribute config_key="[Master],num_preview_decks">1</attribute>
+      <attribute config_key="[Master],show_4effects">1</attribute>
       <!--Optionally, make elements visible on skin load-->
       <attribute persist="true" config_key="[Spinny1],show_spinny">1</attribute>
       <attribute persist="true" config_key="[Spinny2],show_spinny">1</attribute>
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index 85eae122d2e6..823257092f7b 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -788,6 +788,20 @@ WWidget, QLabel {
   border-left:none;
 }
 
+#EffectButtonControls {
+  qproperty-layoutSpacing: 5;
+}
+
+#EffectHighlightable[highlight="0"] {
+  border: 0px;
+  padding: 1px;
+}
+
+#EffectHighlightable[highlight="1"] {
+  border: 2px solid #e81010;
+  padding: 1px;
+}
+
 #EffectChainGroupControlButton {
   font: 10px;
 }
@@ -828,7 +842,6 @@ WWidget, QLabel {
   font-size: 12px;
   background-color: none;
   border: none;
-  qproperty-alignment: 'AlignHCenter';
 }
 
 #EffectKnob {
@@ -861,10 +874,6 @@ WWidget, QLabel {
     qproperty-layoutSpacing: 7;
 }
 
-#EffectParameterSmallKnob {
-  qproperty-alignment: 'AlignHCenter | AlignTop';
-}
-
 #EffectKnobLabel {
   background-color: none;
   border: none;
@@ -1037,7 +1046,6 @@ WStarRating {
   background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
                                     stop: 0 #333333,
                                     stop: 1.0 #333333);
-  qproperty-layoutAlignment: 'AlignLeft | AlignTop';
 }
 
 #EffectUnitEffects, #EffectUnitParameters {

From 435279ab6d0551eea9eb5a8a55a11fbff8e8c526 Mon Sep 17 00:00:00 2001
From: be_ <be.0@gmx.com>
Date: Sat, 24 Dec 2016 11:13:59 -0600
Subject: [PATCH 08/22] Deere: change effect highlight border to grayish

---
 res/skins/Deere/skin.xml  | 1 -
 res/skins/Deere/style.qss | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/res/skins/Deere/skin.xml b/res/skins/Deere/skin.xml
index 97085986c0e9..71af160d2a82 100644
--- a/res/skins/Deere/skin.xml
+++ b/res/skins/Deere/skin.xml
@@ -11,7 +11,6 @@
       <attribute config_key="[Master],num_decks">4</attribute>
       <attribute config_key="[Master],num_samplers">16</attribute>
       <attribute config_key="[Master],num_preview_decks">1</attribute>
-      <attribute config_key="[Master],show_4effects">1</attribute>
       <!--Optionally, make elements visible on skin load-->
       <attribute persist="true" config_key="[Spinny1],show_spinny">1</attribute>
       <attribute persist="true" config_key="[Spinny2],show_spinny">1</attribute>
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index 823257092f7b..d592d76bdb5f 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -798,7 +798,7 @@ WWidget, QLabel {
 }
 
 #EffectHighlightable[highlight="1"] {
-  border: 2px solid #e81010;
+  border: 2px solid #b0b0b0;
   padding: 1px;
 }
 

From fd749f10f9330966079434f7551656702ef20abf Mon Sep 17 00:00:00 2001
From: be_ <be.0@gmx.com>
Date: Sat, 24 Dec 2016 11:23:39 -0600
Subject: [PATCH 09/22] Deere: make effect focus button right clickable only
 when focused

This makes the skin flicker when the focus changes, so I'm not sure if it's worth keeping this change.
---
 res/skins/Deere/effect_focus_button.xml | 106 +++++++++++++++++++-----
 1 file changed, 83 insertions(+), 23 deletions(-)

diff --git a/res/skins/Deere/effect_focus_button.xml b/res/skins/Deere/effect_focus_button.xml
index 17d863a42c83..9c0dbd9c44ca 100644
--- a/res/skins/Deere/effect_focus_button.xml
+++ b/res/skins/Deere/effect_focus_button.xml
@@ -11,41 +11,101 @@ Variables:
     <ObjectName>EffectFocusButtonContainer</ObjectName>
     <Layout>horizontal</Layout>
     <Children>
-      <PushButton>
-        <TooltipId><Variable name="button_TooltipId"/></TooltipId>
-        <ObjectName>EffectFocusButton</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>
+
+      <WidgetGroup>
+        <ObjectName>EffectFocusButtonNotRightClickable</ObjectName>
+        <Layout>horizontal</Layout>
+        <Children>
+
+          <PushButton>
+            <TooltipId><Variable name="button_TooltipId"/></TooltipId>
+            <ObjectName>EffectFocusButton</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>
+          </PushButton>
+
+        </Children>
         <Connection>
           <ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],focused_effect</ConfigKey>
-          <ButtonState>LeftButton</ButtonState>
-          <EmitOnPressAndRelease>false</EmitOnPressAndRelease>
+          <BindProperty>visible</BindProperty>
           <Transform>
             <IsEqual><Variable name="Effect"/></IsEqual>
+            <Not/>
           </Transform>
         </Connection>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>EffectFocusButtonRightClickable</ObjectName>
+        <Layout>horizontal</Layout>
+        <Children>
+
+          <PushButton>
+            <TooltipId><Variable name="button_TooltipId"/></TooltipId>
+            <ObjectName>EffectFocusButton</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"/>],focused_effect</ConfigKey>
-          <ButtonState>RightButton</ButtonState>
-          <EmitOnPressAndRelease>false</EmitOnPressAndRelease>
+          <BindProperty>visible</BindProperty>
           <Transform>
             <IsEqual><Variable name="Effect"/></IsEqual>
-            <Not/>
           </Transform>
         </Connection>
-      </PushButton>
+      </WidgetGroup>
+
     </Children>
     <Connection>
       <ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],show_focus</ConfigKey>

From cfdf4c44ca00696a10afa5a6af393386d921e477 Mon Sep 17 00:00:00 2001
From: be_ <be.0@gmx.com>
Date: Sat, 24 Dec 2016 13:45:10 -0600
Subject: [PATCH 10/22] Deere: revert last commit that made effects flicker
 when shifting focus

---
 res/skins/Deere/effect_focus_button.xml | 106 +++++-------------------
 1 file changed, 23 insertions(+), 83 deletions(-)

diff --git a/res/skins/Deere/effect_focus_button.xml b/res/skins/Deere/effect_focus_button.xml
index 9c0dbd9c44ca..17d863a42c83 100644
--- a/res/skins/Deere/effect_focus_button.xml
+++ b/res/skins/Deere/effect_focus_button.xml
@@ -11,101 +11,41 @@ Variables:
     <ObjectName>EffectFocusButtonContainer</ObjectName>
     <Layout>horizontal</Layout>
     <Children>
-
-      <WidgetGroup>
-        <ObjectName>EffectFocusButtonNotRightClickable</ObjectName>
-        <Layout>horizontal</Layout>
-        <Children>
-
-          <PushButton>
-            <TooltipId><Variable name="button_TooltipId"/></TooltipId>
-            <ObjectName>EffectFocusButton</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>
-          </PushButton>
-
-        </Children>
+      <PushButton>
+        <TooltipId><Variable name="button_TooltipId"/></TooltipId>
+        <ObjectName>EffectFocusButton</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>
-          <BindProperty>visible</BindProperty>
+          <ButtonState>LeftButton</ButtonState>
+          <EmitOnPressAndRelease>false</EmitOnPressAndRelease>
           <Transform>
             <IsEqual><Variable name="Effect"/></IsEqual>
-            <Not/>
           </Transform>
         </Connection>
-      </WidgetGroup>
-
-      <WidgetGroup>
-        <ObjectName>EffectFocusButtonRightClickable</ObjectName>
-        <Layout>horizontal</Layout>
-        <Children>
-
-          <PushButton>
-            <TooltipId><Variable name="button_TooltipId"/></TooltipId>
-            <ObjectName>EffectFocusButton</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"/>],focused_effect</ConfigKey>
-          <BindProperty>visible</BindProperty>
+          <ButtonState>RightButton</ButtonState>
+          <EmitOnPressAndRelease>false</EmitOnPressAndRelease>
           <Transform>
             <IsEqual><Variable name="Effect"/></IsEqual>
+            <Not/>
           </Transform>
         </Connection>
-      </WidgetGroup>
-
+      </PushButton>
     </Children>
     <Connection>
       <ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],show_focus</ConfigKey>

From 54c3d51f9989fb2adcdccb6b4a4aad23f7453ba7 Mon Sep 17 00:00:00 2001
From: be_ <be.0@gmx.com>
Date: Thu, 29 Dec 2016 23:47:21 -0600
Subject: [PATCH 11/22] Deere: effects layout adjustments

---
 res/skins/Deere/effect_single_no_parameters.xml | 2 +-
 res/skins/Deere/effect_unit_no_parameters.xml   | 9 +++++++--
 res/skins/Deere/effect_unit_with_parameters.xml | 2 +-
 res/skins/Deere/style.qss                       | 8 ++++++++
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/res/skins/Deere/effect_single_no_parameters.xml b/res/skins/Deere/effect_single_no_parameters.xml
index 4ccde74a1099..8ce3b401b2cb 100644
--- a/res/skins/Deere/effect_single_no_parameters.xml
+++ b/res/skins/Deere/effect_single_no_parameters.xml
@@ -16,7 +16,7 @@ Variables:
       <WidgetGroup>
         <ObjectName>EffectHighlightable</ObjectName>
         <Layout>vertical</Layout>
-        <SizePolicy>me,f</SizePolicy>
+        <SizePolicy>max,f</SizePolicy>
         <MinimumSize>-1,55</MinimumSize>
         <MaximumSize>-1,55</MaximumSize>
         <Children>
diff --git a/res/skins/Deere/effect_unit_no_parameters.xml b/res/skins/Deere/effect_unit_no_parameters.xml
index 31c064b83a7c..154936b82a78 100644
--- a/res/skins/Deere/effect_unit_no_parameters.xml
+++ b/res/skins/Deere/effect_unit_no_parameters.xml
@@ -18,14 +18,15 @@ Variables:
     <Children>
 
       <WidgetGroup>
-        <ObjectName>EffectUnitCollapsedControlRow</ObjectName>
+        <ObjectName>EffectUnitNoParameters</ObjectName>
         <Layout>horizontal</Layout>
         <SizePolicy>me,max</SizePolicy>
         <Children>
 
           <WidgetGroup>
-            <ObjectName>EffectUnitEffects</ObjectName>
+            <ObjectName>EffectUnitEffectsNoParameters</ObjectName>
             <Layout>horizontal</Layout>
+            <SizePolicy>min,min</SizePolicy>
             <Children>
               <Template src="skin:effect_single_no_parameters.xml">
                 <SetVariable name="Effect">1</SetVariable>
@@ -41,9 +42,13 @@ Variables:
             </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>
diff --git a/res/skins/Deere/effect_unit_with_parameters.xml b/res/skins/Deere/effect_unit_with_parameters.xml
index 2da572d339c9..c914b9e6b305 100644
--- a/res/skins/Deere/effect_unit_with_parameters.xml
+++ b/res/skins/Deere/effect_unit_with_parameters.xml
@@ -43,7 +43,7 @@ Variables:
           <WidgetGroup>
             <ObjectName>EffectUnitControls</ObjectName>
             <Layout>vertical</Layout>
-            <SizePolicy>me,max</SizePolicy>
+            <SizePolicy>max,max</SizePolicy>
             <Children>
 
               <Template src="skin:knob_with_label.xml">
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index d592d76bdb5f..a38bef73f2e8 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -1048,6 +1048,14 @@ WStarRating {
                                     stop: 1.0 #333333);
 }
 
+#EffectUnitNoParameters {
+  padding-left: 5px;
+}
+
+#EffectUnitEffectsNoParameters {
+  qproperty-layoutSpacing: 40;
+}
+
 #EffectUnitEffects, #EffectUnitParameters {
   padding: 2px;
   qproperty-layoutAlignment: 'AlignLeft | AlignTop';

From 404e3932e38735fe472e00b1b68175651e3fe5ad Mon Sep 17 00:00:00 2001
From: be_ <be.0@gmx.com>
Date: Sat, 7 Jan 2017 18:46:33 -0600
Subject: [PATCH 12/22] Deere: more padding for highlighted effects

---
 res/skins/Deere/effect_rack.xml                 |  2 +-
 res/skins/Deere/effect_unit.xml                 | 10 ++++++----
 res/skins/Deere/effect_unit_with_parameters.xml |  2 +-
 res/skins/Deere/style.qss                       |  4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/res/skins/Deere/effect_rack.xml b/res/skins/Deere/effect_rack.xml
index 2a42130938a5..cb810ffd035b 100644
--- a/res/skins/Deere/effect_rack.xml
+++ b/res/skins/Deere/effect_rack.xml
@@ -18,7 +18,7 @@ Container for all the effect units
             <ObjectName>EffectUnitsRow1</ObjectName>
             <Layout>horizontal</Layout>
             <MinimumSize>-1,50</MinimumSize>
-            <MaximumSize>-1,185</MaximumSize>
+            <MaximumSize>-1,195</MaximumSize>
             <SizePolicy>me,me</SizePolicy>
             <Children>
               <Template src="skin:effect_unit.xml">
diff --git a/res/skins/Deere/effect_unit.xml b/res/skins/Deere/effect_unit.xml
index 56647ff1bed5..b4bb139a52c0 100644
--- a/res/skins/Deere/effect_unit.xml
+++ b/res/skins/Deere/effect_unit.xml
@@ -13,7 +13,7 @@
     <Layout>vertical</Layout>
     <SizePolicy>me,min</SizePolicy>
     <MinimumSize>-1,50</MinimumSize>
-    <MaximumSize>-1,185</MaximumSize>
+    <MaximumSize>-1,195</MaximumSize>
     <Children>
       <WidgetGroup>
         <ObjectName>EffectUnitGroupControls</ObjectName>
@@ -220,9 +220,11 @@
           </Template>
         </Children>
         <Connection>
-          <ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],show_parameters</ConfigKey>
+          <ConfigKey><Variable name="group"/>,show_parameters</ConfigKey>
           <BindProperty>visible</BindProperty>
-          <Transform><Not/></Transform>
+          <Transform>
+            <Not/>
+          </Transform>
         </Connection>
       </WidgetGroup>
 
@@ -233,7 +235,7 @@
           </Template>
         </Children>
         <Connection>
-          <ConfigKey>[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],show_parameters</ConfigKey>
+          <ConfigKey><Variable name="group"/>,show_parameters</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
       </WidgetGroup>
diff --git a/res/skins/Deere/effect_unit_with_parameters.xml b/res/skins/Deere/effect_unit_with_parameters.xml
index c914b9e6b305..6a2c3c67b632 100644
--- a/res/skins/Deere/effect_unit_with_parameters.xml
+++ b/res/skins/Deere/effect_unit_with_parameters.xml
@@ -14,7 +14,7 @@ Variables:
     <SizePolicy>me,max</SizePolicy>
     <!-- A little more vertical space is needed when show_focus is 1 because of the focused effect's border.-->
     <MinimumSize>-1,150</MinimumSize>
-    <MaximumSize>-1,170</MaximumSize>
+    <MaximumSize>-1,175</MaximumSize>
     <Children>
 
       <WidgetGroup>
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index a38bef73f2e8..f468f51f726f 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -794,12 +794,12 @@ WWidget, QLabel {
 
 #EffectHighlightable[highlight="0"] {
   border: 0px;
-  padding: 1px;
+  padding: 4px;
 }
 
 #EffectHighlightable[highlight="1"] {
   border: 2px solid #b0b0b0;
-  padding: 1px;
+  padding: 2px;
 }
 
 #EffectChainGroupControlButton {

From 78cff2ea69c20138690e617a780567e0a43a7dc9 Mon Sep 17 00:00:00 2001
From: be_ <be.0@gmx.com>
Date: Sat, 7 Jan 2017 18:47:08 -0600
Subject: [PATCH 13/22] Deere: remove effect chain enable button

as per discussion on PR #1103
---
 res/skins/Deere/effect_unit.xml | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/res/skins/Deere/effect_unit.xml b/res/skins/Deere/effect_unit.xml
index b4bb139a52c0..ad59515ebbde 100644
--- a/res/skins/Deere/effect_unit.xml
+++ b/res/skins/Deere/effect_unit.xml
@@ -25,24 +25,10 @@
             <ObjectName>EffectUnitGroupControlsLeft</ObjectName>
             <Layout>horizontal</Layout>
             <Children>
+
               <Template src="skin:hide_show_button.xml">
                 <SetVariable name="object_name">EffectUnitToggle</SetVariable>
-                <SetVariable name="control">[EffectRack<Variable name="EffectRack"/>_EffectUnit<Variable name="EffectUnit"/>],show_parameters</SetVariable>
-              </Template>
-
-              <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>
+                <SetVariable name="control"><Variable name="group"/>,show_parameters</SetVariable>
               </Template>
 
             </Children>

From 7bec54b8e0aa5d08e7339b6cb05d7649b195e930 Mon Sep 17 00:00:00 2001
From: be_ <be.0@gmx.com>
Date: Sat, 28 Jan 2017 16:15:18 -0600
Subject: [PATCH 14/22] Deere: change color of effect highlight border to blue

---
 res/skins/Deere/style.qss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index f468f51f726f..504bbeeb5d30 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -798,7 +798,7 @@ WWidget, QLabel {
 }
 
 #EffectHighlightable[highlight="1"] {
-  border: 2px solid #b0b0b0;
+  border: 2px solid #0081bd;
   padding: 2px;
 }
 

From 791e8a5756d44e22b2be0672159d6e93c0b75dba Mon Sep 17 00:00:00 2001
From: be_ <be.0@gmx.com>
Date: Sat, 28 Jan 2017 16:15:44 -0600
Subject: [PATCH 15/22] Deere: make effect focus button a circle

---
 res/skins/Deere/effect_focus_button.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/skins/Deere/effect_focus_button.xml b/res/skins/Deere/effect_focus_button.xml
index 17d863a42c83..36c784f7c756 100644
--- a/res/skins/Deere/effect_focus_button.xml
+++ b/res/skins/Deere/effect_focus_button.xml
@@ -13,7 +13,7 @@ Variables:
     <Children>
       <PushButton>
         <TooltipId><Variable name="button_TooltipId"/></TooltipId>
-        <ObjectName>EffectFocusButton</ObjectName>
+        <ObjectName>CircleButton</ObjectName>
         <Size>15f,15f</Size>
         <NumberStates>2</NumberStates>
         <State>

From 1c0e2917e7e58c7e528eb370cbb4a9714f50d1b1 Mon Sep 17 00:00:00 2001
From: be_ <be.0@gmx.com>
Date: Sat, 28 Jan 2017 16:16:03 -0600
Subject: [PATCH 16/22] Deere: use WEffectSelector

---
 res/skins/Deere/effect_buttons.xml            | 90 +++----------------
 .../Deere/effect_single_no_parameters.xml     | 16 ++--
 .../effect_single_with_parameters_row.xml     |  6 +-
 res/skins/Deere/effect_unit_no_parameters.xml |  4 +-
 4 files changed, 26 insertions(+), 90 deletions(-)

diff --git a/res/skins/Deere/effect_buttons.xml b/res/skins/Deere/effect_buttons.xml
index ed724c7f5d35..4a0117d348fa 100644
--- a/res/skins/Deere/effect_buttons.xml
+++ b/res/skins/Deere/effect_buttons.xml
@@ -14,82 +14,20 @@ Variables:
     <Children>
       <Template src="skin:effect_focus_button.xml"/>
 
-      <WidgetGroup>
-        <ObjectName>EffectSingleButtonGrid</ObjectName>
-        <Layout>vertical</Layout>
-        <Children>
-          <WidgetGroup>
-            <ObjectName>EffectControlsRow1</ObjectName>
-            <Layout>horizontal</Layout>
-            <Children>
-              <Template src="skin:left_2state_button.xml">
-                <SetVariable name="TooltipId">EffectSlot_enabled</SetVariable>
-                <SetVariable name="ObjectName"></SetVariable>
-                <SetVariable name="MinimumSize">15,15</SetVariable>
-                <SetVariable name="MaximumSize">15,15</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">15,15</SetVariable>
-              <SetVariable name="MaximumSize">15,15</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>
-          </Children>
-        </WidgetGroup>
-
-        <WidgetGroup>
-          <ObjectName>EffectControlsRow2</ObjectName>
-          <Layout>horizontal</Layout>
-            <Children>
-              <WidgetGroup>
-                <ObjectName>EffectSelectButtons</ObjectName>
-                <Layout>horizontal</Layout>
-                <Children>
-                  <Template src="skin:left_1state_button.xml">
-                    <SetVariable name="TooltipId">EffectSlot_prev_effect</SetVariable>
-                    <SetVariable name="ObjectName"></SetVariable>
-                    <SetVariable name="MinimumSize">15,15</SetVariable>
-                    <SetVariable name="MaximumSize">15,15</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">15,15</SetVariable>
-                    <SetVariable name="MaximumSize">15,15</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>
-
-            </Children>
-          </WidgetGroup>
-
-        </Children>
-      </WidgetGroup>
+      <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>
diff --git a/res/skins/Deere/effect_single_no_parameters.xml b/res/skins/Deere/effect_single_no_parameters.xml
index 8ce3b401b2cb..19a27f89f8e0 100644
--- a/res/skins/Deere/effect_single_no_parameters.xml
+++ b/res/skins/Deere/effect_single_no_parameters.xml
@@ -17,8 +17,8 @@ Variables:
         <ObjectName>EffectHighlightable</ObjectName>
         <Layout>vertical</Layout>
         <SizePolicy>max,f</SizePolicy>
-        <MinimumSize>-1,55</MinimumSize>
-        <MaximumSize>-1,55</MaximumSize>
+        <MinimumSize>-1,65</MinimumSize>
+        <MaximumSize>-1,65</MaximumSize>
         <Children>
 
           <WidgetGroup>
@@ -32,11 +32,11 @@ Variables:
             </Children>
           </WidgetGroup>
 
-          <EffectName>
+          <EffectSelector>
             <EffectRack><Variable name="EffectRack"/></EffectRack>
             <EffectUnit><Variable name="EffectUnit"/></EffectUnit>
             <Effect><Variable name="Effect"/></Effect>
-          </EffectName>
+          </EffectSelector>
 
         </Children>
         <Connection>
@@ -64,8 +64,8 @@ Variables:
         <ObjectName>EffectNotHighlightable</ObjectName>
         <Layout>vertical</Layout>
         <SizePolicy>me,f</SizePolicy>
-        <MinimumSize>-1,55</MinimumSize>
-        <MaximumSize>-1,55</MaximumSize>
+        <MinimumSize>-1,65</MinimumSize>
+        <MaximumSize>-1,65</MaximumSize>
         <Children>
 
           <WidgetGroup>
@@ -79,11 +79,11 @@ Variables:
             </Children>
           </WidgetGroup>
 
-          <EffectName>
+          <EffectSelector>
             <EffectRack><Variable name="EffectRack"/></EffectRack>
             <EffectUnit><Variable name="EffectUnit"/></EffectUnit>
             <Effect><Variable name="Effect"/></Effect>
-          </EffectName>
+          </EffectSelector>
 
         </Children>
       </WidgetGroup>
diff --git a/res/skins/Deere/effect_single_with_parameters_row.xml b/res/skins/Deere/effect_single_with_parameters_row.xml
index c4b96dfd798a..7c56b5e47f95 100644
--- a/res/skins/Deere/effect_single_with_parameters_row.xml
+++ b/res/skins/Deere/effect_single_with_parameters_row.xml
@@ -51,13 +51,11 @@ Variables:
 
           <!-- Allow up to 8 parameters, needed to control the graphic eq effect-->
 
-          <EffectName>
-            <MinimumSize>80,-1</MinimumSize>
-            <MaximumSize>80,-1</MaximumSize>
+          <EffectSelector>
             <EffectRack><Variable name="EffectRack"/></EffectRack>
             <EffectUnit><Variable name="EffectUnit"/></EffectUnit>
             <Effect><Variable name="Effect"/></Effect>
-          </EffectName>
+          </EffectSelector>
 
           <Template src="skin:effect_parameter_knob.xml">
             <SetVariable name="EffectParameter">1</SetVariable>
diff --git a/res/skins/Deere/effect_unit_no_parameters.xml b/res/skins/Deere/effect_unit_no_parameters.xml
index 154936b82a78..095a9d66ba40 100644
--- a/res/skins/Deere/effect_unit_no_parameters.xml
+++ b/res/skins/Deere/effect_unit_no_parameters.xml
@@ -13,8 +13,8 @@ Variables:
     <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,55</MinimumSize>
-    <MaximumSize>-1,65</MaximumSize>
+    <MinimumSize>-1,65</MinimumSize>
+    <MaximumSize>-1,75</MaximumSize>
     <Children>
 
       <WidgetGroup>

From 6ec202356d70e8107ef7d70e51e1dd818dd633e7 Mon Sep 17 00:00:00 2001
From: be_ <be.0@gmx.com>
Date: Sat, 28 Jan 2017 17:02:28 -0600
Subject: [PATCH 17/22] Deere: style WEffectSelector

don't rely on Qt theme to provide appropriate colors
---
 res/skins/Deere/style.qss | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index 504bbeeb5d30..68788b6dfb85 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -844,6 +844,18 @@ WWidget, QLabel {
   border: none;
 }
 
+WEffectSelector {
+  color: #c1cabe;
+  background-color: #444342;
+  /* TODO: use a linear gradient for the background color */
+}
+
+WEffectSelector QAbstractItemView {
+  color: #c1cabe;
+  background-color: #201f1f;
+  selection-background-color: #184880;
+}
+
 #EffectKnob {
 }
 

From e4e3a2bfca68e1526f4f4053ff02329cbc05c769 Mon Sep 17 00:00:00 2001
From: be_ <be.0@gmx.com>
Date: Wed, 1 Feb 2017 13:50:44 -0600
Subject: [PATCH 18/22] Deere: WEffectSelector styling fixes

for cross platform compatibility
---
 res/skins/Deere/icon/ic_chevron_down_48px.svg | 60 +++++++++++++++++++
 res/skins/Deere/style.qss                     | 40 +++++++++++--
 2 files changed, 95 insertions(+), 5 deletions(-)
 create mode 100644 res/skins/Deere/icon/ic_chevron_down_48px.svg

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/style.qss b/res/skins/Deere/style.qss
index 68788b6dfb85..d98274cdf01c 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -848,14 +848,44 @@ WEffectSelector {
   color: #c1cabe;
   background-color: #444342;
   /* TODO: use a linear gradient for the background color */
-}
 
-WEffectSelector QAbstractItemView {
-  color: #c1cabe;
-  background-color: #201f1f;
-  selection-background-color: #184880;
+  /* 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: 1px 4px;
+
+  /* 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: 2px ridge #015d8d;
+    /* reduce padding to compensate for the 1px thicker border, otherwise the contents of
+       the combobox shift to the side */
+    padding: 1px 3px;
+  }
+
+  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 {
 }
 

From 06212d07bfec0a5f54cfc6ac18afed00197a3bca Mon Sep 17 00:00:00 2001
From: be_ <be.0@gmx.com>
Date: Wed, 1 Feb 2017 14:38:36 -0600
Subject: [PATCH 19/22] Deere: fix effect unit spacing with show_focus = 1

---
 res/skins/Deere/effect_single_no_parameters.xml | 2 +-
 res/skins/Deere/effect_unit_with_parameters.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/skins/Deere/effect_single_no_parameters.xml b/res/skins/Deere/effect_single_no_parameters.xml
index 19a27f89f8e0..94f2284b2b44 100644
--- a/res/skins/Deere/effect_single_no_parameters.xml
+++ b/res/skins/Deere/effect_single_no_parameters.xml
@@ -18,7 +18,7 @@ Variables:
         <Layout>vertical</Layout>
         <SizePolicy>max,f</SizePolicy>
         <MinimumSize>-1,65</MinimumSize>
-        <MaximumSize>-1,65</MaximumSize>
+        <MaximumSize>-1,75</MaximumSize>
         <Children>
 
           <WidgetGroup>
diff --git a/res/skins/Deere/effect_unit_with_parameters.xml b/res/skins/Deere/effect_unit_with_parameters.xml
index 6a2c3c67b632..79abb92648a1 100644
--- a/res/skins/Deere/effect_unit_with_parameters.xml
+++ b/res/skins/Deere/effect_unit_with_parameters.xml
@@ -14,7 +14,7 @@ Variables:
     <SizePolicy>me,max</SizePolicy>
     <!-- A little more vertical space is needed when show_focus is 1 because of the focused effect's border.-->
     <MinimumSize>-1,150</MinimumSize>
-    <MaximumSize>-1,175</MaximumSize>
+    <MaximumSize>-1,180</MaximumSize>
     <Children>
 
       <WidgetGroup>

From a3c1d80dcd48241b81a7edab65e88d254654978d Mon Sep 17 00:00:00 2001
From: be_ <be.0@gmx.com>
Date: Thu, 2 Feb 2017 12:09:35 -0600
Subject: [PATCH 20/22] Deere: fix WEffectSelector white lines on Mac OS X

---
 res/skins/Deere/style.qss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index d98274cdf01c..a7826996ae1f 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -855,7 +855,7 @@ WEffectSelector {
 
   /* 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: 1px 4px;
+  padding: 0px 4px;
 
   /* The 3D frame on the combo box becomes flat when you give it a border */
   border: 1px solid #444342;

From aad246b03f756be731242784112651787797140b Mon Sep 17 00:00:00 2001
From: be_ <be.0@gmx.com>
Date: Thu, 2 Feb 2017 12:10:16 -0600
Subject: [PATCH 21/22] Deere: fix down arrow shifting position on hover

---
 res/skins/Deere/style.qss | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index a7826996ae1f..3c66ebfb3d32 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -863,10 +863,7 @@ WEffectSelector {
 }
 
   WEffectSelector:hover {
-    border: 2px ridge #015d8d;
-    /* reduce padding to compensate for the 1px thicker border, otherwise the contents of
-       the combobox shift to the side */
-    padding: 1px 3px;
+    border: 1px ridge #015d8d;
   }
 
   WEffectSelector::drop-down {

From f5be31612e4e73de2d58b9e665ff048606b0251b Mon Sep 17 00:00:00 2001
From: be_ <be.0@gmx.com>
Date: Thu, 2 Feb 2017 12:30:19 -0600
Subject: [PATCH 22/22] Deere: fix text getting cut off on Mac

---
 res/skins/Deere/style.qss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index 3c66ebfb3d32..404b70106388 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -855,7 +855,7 @@ WEffectSelector {
 
   /* 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 4px;
+  padding: 0px 6px;
 
   /* The 3D frame on the combo box becomes flat when you give it a border */
   border: 1px solid #444342;