From 1ce203779ae2e3b46447ae297a67ee7523ff0489 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Fri, 15 Dec 2017 22:53:03 +0100
Subject: [PATCH 01/19] right decks: align play position display with duration

---
 res/skins/Tango/deck_artist_title_right.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/skins/Tango/deck_artist_title_right.xml b/res/skins/Tango/deck_artist_title_right.xml
index 0ae5a8621e28..ed2dc0cddf68 100644
--- a/res/skins/Tango/deck_artist_title_right.xml
+++ b/res/skins/Tango/deck_artist_title_right.xml
@@ -45,7 +45,7 @@ Variables:
                 <ObjectName>PlayPosition</ObjectName>
                 <TooltipId>track_time</TooltipId>
                 <Size>90min,22f</Size>
-                <Alignment>right</Alignment>
+                <Alignment>left</Alignment>
                 <Channel><Variable name="chanNum"/></Channel>
                 <!-- Not respected, see https://answers.launchpad.net/mixxx/+question/635872
                 <NumberOfDigits>1</NumberOfDigits>-->
@@ -64,7 +64,7 @@ Variables:
                 <ObjectName>PlayPosition</ObjectName>
                 <TooltipId>track_time</TooltipId>
                 <Size>175min,22f</Size>
-                <Alignment>right</Alignment>
+                <Alignment>left</Alignment>
                 <Channel><Variable name="chanNum"/></Channel>
                 <Connection>
                   <ConfigKey><Variable name="group"/>,playposition</ConfigKey>

From 0e094b80496aeb1f1883fcadf6210c91d03badd7 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Fri, 15 Dec 2017 23:11:21 +0100
Subject: [PATCH 02/19] use [Master],show_eqs & [],show_superknobs, typo in
 menu

---
 res/skins/Tango/fx_unit_left.xml        | 4 ++--
 res/skins/Tango/fx_unit_left_mini.xml   | 2 +-
 res/skins/Tango/fx_unit_right.xml       | 4 ++--
 res/skins/Tango/fx_unit_right_mini.xml  | 2 +-
 res/skins/Tango/mixer_channel_left.xml  | 2 +-
 res/skins/Tango/mixer_channel_right.xml | 2 +-
 res/skins/Tango/size_detector_stars.xml | 2 +-
 res/skins/Tango/skin.xml                | 3 +--
 res/skins/Tango/skin_settings.xml       | 6 +++---
 res/skins/Tango/spacer_topbar.xml       | 2 +-
 10 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/res/skins/Tango/fx_unit_left.xml b/res/skins/Tango/fx_unit_left.xml
index a0efac754608..f9f41c23fc6d 100644
--- a/res/skins/Tango/fx_unit_left.xml
+++ b/res/skins/Tango/fx_unit_left.xml
@@ -254,7 +254,7 @@ Variables:
                   </Template>
                 </Children>
                 <Connection>
-                  <ConfigKey persist="true">[Tango],fx_super_knob</ConfigKey>
+                  <ConfigKey persist="true">[Master],show_superknobs</ConfigKey>
                   <BindProperty>visible</BindProperty>
                 </Connection>
               </WidgetGroup><!-- /Super Knob, if enabled -->
@@ -262,7 +262,7 @@ Variables:
               <WidgetGroup><!-- additional spacer for Super Knob, if enabled -->
                 <SizePolicy>min,me</SizePolicy>
                 <Connection>
-                  <ConfigKey persist="true">[Tango],fx_super_knob</ConfigKey>
+                  <ConfigKey persist="true">[Master],show_superknobs</ConfigKey>
                   <BindProperty>visible</BindProperty>
                 </Connection>
               </WidgetGroup><!-- /additional spacer for Super Knob, if enabled -->
diff --git a/res/skins/Tango/fx_unit_left_mini.xml b/res/skins/Tango/fx_unit_left_mini.xml
index cb9c327fda24..bb4af06f9a51 100644
--- a/res/skins/Tango/fx_unit_left_mini.xml
+++ b/res/skins/Tango/fx_unit_left_mini.xml
@@ -233,7 +233,7 @@ Variables:
               </Template>
             </Children>
             <Connection>
-              <ConfigKey persist="true">[Tango],fx_super_knob</ConfigKey>
+              <ConfigKey persist="true">[Master],show_superknobs</ConfigKey>
               <BindProperty>visible</BindProperty>
             </Connection>
           </WidgetGroup>
diff --git a/res/skins/Tango/fx_unit_right.xml b/res/skins/Tango/fx_unit_right.xml
index 250fbad31d08..67f3f54289b2 100644
--- a/res/skins/Tango/fx_unit_right.xml
+++ b/res/skins/Tango/fx_unit_right.xml
@@ -70,7 +70,7 @@ Variables:
                   </Template>
                 </Children>
                 <Connection>
-                  <ConfigKey persist="true">[Tango],fx_super_knob</ConfigKey>
+                  <ConfigKey persist="true">[Master],show_superknobs</ConfigKey>
                   <BindProperty>visible</BindProperty>
                 </Connection>
               </WidgetGroup><!-- /Super Knob, if enabled -->
@@ -78,7 +78,7 @@ Variables:
               <WidgetGroup><!-- additional spacer for Super Knob, if enabled -->
                 <SizePolicy>min,me</SizePolicy>
                 <Connection>
-                  <ConfigKey persist="true">[Tango],fx_super_knob</ConfigKey>
+                  <ConfigKey persist="true">[Master],show_superknobs</ConfigKey>
                   <BindProperty>visible</BindProperty>
                 </Connection>
               </WidgetGroup><!-- /additional spacer for Super Knob, if enabled -->
diff --git a/res/skins/Tango/fx_unit_right_mini.xml b/res/skins/Tango/fx_unit_right_mini.xml
index 6bb7cfd7d0a3..8f139352fa07 100644
--- a/res/skins/Tango/fx_unit_right_mini.xml
+++ b/res/skins/Tango/fx_unit_right_mini.xml
@@ -125,7 +125,7 @@ Variables:
               </Template>
             </Children>
             <Connection>
-              <ConfigKey persist="true">[Tango],fx_super_knob</ConfigKey>
+              <ConfigKey persist="true">[Master],show_superknobs</ConfigKey>
               <BindProperty>visible</BindProperty>
             </Connection>
           </WidgetGroup>
diff --git a/res/skins/Tango/mixer_channel_left.xml b/res/skins/Tango/mixer_channel_left.xml
index 83a93f1d313d..8bbc09eb218f 100644
--- a/res/skins/Tango/mixer_channel_left.xml
+++ b/res/skins/Tango/mixer_channel_left.xml
@@ -40,7 +40,7 @@ Variables:
           <Template src="skin:quick_fx_knob_button_left.xml"/><!-- Quick Effect knob -->
         </Children>
         <Connection>
-          <ConfigKey persist="true">[Tango],eq_knobs</ConfigKey>
+          <ConfigKey persist="true">[Master],show_eqs</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
       </WidgetGroup><!-- /EQs + QuickEffect knobs -->
diff --git a/res/skins/Tango/mixer_channel_right.xml b/res/skins/Tango/mixer_channel_right.xml
index 1eeb52a9ccea..31ed6b140e21 100644
--- a/res/skins/Tango/mixer_channel_right.xml
+++ b/res/skins/Tango/mixer_channel_right.xml
@@ -112,7 +112,7 @@ Variables:
           <Template src="skin:quick_fx_knob_button_right.xml"/><!-- Quick Effect knob -->
         </Children>
         <Connection>
-          <ConfigKey persist="true">[Tango],eq_knobs</ConfigKey>
+          <ConfigKey persist="true">[Master],show_eqs</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
       </WidgetGroup><!-- /EQs + QuickEffect knobs -->
diff --git a/res/skins/Tango/size_detector_stars.xml b/res/skins/Tango/size_detector_stars.xml
index b9ca68e08130..efe44444252c 100644
--- a/res/skins/Tango/size_detector_stars.xml
+++ b/res/skins/Tango/size_detector_stars.xml
@@ -63,7 +63,7 @@ Controls:
                 <Layout>horizontal</Layout>
                 <Size>96f,20f</Size>
                 <Connection>
-                  <ConfigKey persist="true">[Tango],eq_knobs</ConfigKey>
+                  <ConfigKey persist="true">[Master],show_eqs</ConfigKey>
                   <BindProperty>visible</BindProperty>
                 </Connection>
               </WidgetGroup>
diff --git a/res/skins/Tango/skin.xml b/res/skins/Tango/skin.xml
index 54632dd42df2..d9c5e44f4db4 100644
--- a/res/skins/Tango/skin.xml
+++ b/res/skins/Tango/skin.xml
@@ -48,6 +48,7 @@
       <attribute config_key="[Master],num_decks">4</attribute>
       <attribute config_key="[Master],num_samplers">64</attribute>
       <attribute persist="true" config_key="[Master],show_mixer">1</attribute>
+      <attribute persist="true" config_key="[Master],show_eqs">1</attribute>
       <attribute persist="true" config_key="[Master],show_4decks">0</attribute>
       <attribute persist="true" config_key="[Master],maximize_library">0</attribute>
       <attribute persist="true" config_key="[Library],show_coverart">1</attribute>
@@ -68,7 +69,6 @@
       <attribute persist="true" config_key="[SamplerRow8],expanded">0</attribute>
       <!-- [Tango] specific defaults -->
       <attribute persist="true" config_key="[Tango],4_fx_units">0</attribute>
-      <attribute persist="true" config_key="[Tango],fx_super_knob">0</attribute>
       <!--attribute persist="true" config_key="[Tango],sampler_fx_buttons">1</attribute-->
       <attribute persist="true" config_key="[Tango],beatgrid_buttons">0</attribute>
       <attribute persist="true" config_key="[Tango],deck_controls_expanded">0</attribute>
@@ -82,7 +82,6 @@
       <attribute persist="true" config_key="[Tango],always_visible_orientation">0</attribute>
       <attribute persist="true" config_key="[Tango],always_visible_quantize">1</attribute>
       <attribute persist="true" config_key="[Tango],[Tango],separate_cue_button">1</attribute>
-      <attribute persist="true" config_key="[Tango],eq_knobs">1</attribute>
       <attribute persist="true" config_key="[Tango],hotcues">1</attribute>
       <attribute persist="true" config_key="[Tango],8_hotcues">0</attribute>
       <attribute persist="true" config_key="[Tango],key_controls">1</attribute>
diff --git a/res/skins/Tango/skin_settings.xml b/res/skins/Tango/skin_settings.xml
index 42f6c4715b32..42723462acc3 100644
--- a/res/skins/Tango/skin_settings.xml
+++ b/res/skins/Tango/skin_settings.xml
@@ -401,7 +401,7 @@ Description:
                     <MaximumSize>182,17</MaximumSize>
                     <SizePolicy>me,me</SizePolicy>
                     <Connection>
-                      <ConfigKey persist="true">[Master],show_mixerr</ConfigKey>
+                      <ConfigKey persist="true">[Master],show_mixer</ConfigKey>
                       <Transform><Not/></Transform>
                       <BindProperty>visible</BindProperty>
                     </Connection>
@@ -410,7 +410,7 @@ Description:
                   <Template src="skin:skin_settings_button_2state.xml">
                     <SetVariable name="state_0_text">      EQ Knobs</SetVariable>
                     <SetVariable name="state_1_text"> &#10004; EQ Knobs</SetVariable>
-                    <SetVariable name="Setting">[Tango],eq_knobs</SetVariable>
+                    <SetVariable name="Setting">[Master],show_eqs</SetVariable>
                   </Template>
 
                 </Children>
@@ -739,7 +739,7 @@ Description:
                   <Template src="skin:skin_settings_button_2state.xml">
                     <SetVariable name="state_0_text">      Super Knobs</SetVariable>
                     <SetVariable name="state_1_text"> &#10004; Super Knobs</SetVariable>
-                    <SetVariable name="Setting">[Tango],fx_super_knob</SetVariable>
+                    <SetVariable name="Setting">[Master],show_superknobs</SetVariable>
                   </Template>
                 </Children>
               </WidgetGroup><!-- /Super Knobs -->
diff --git a/res/skins/Tango/spacer_topbar.xml b/res/skins/Tango/spacer_topbar.xml
index 7395e36a3b1e..003da1effb95 100644
--- a/res/skins/Tango/spacer_topbar.xml
+++ b/res/skins/Tango/spacer_topbar.xml
@@ -82,7 +82,7 @@ Description:
                 <Layout>horizontal</Layout>
                 <Size>96f,0f</Size>
                 <Connection>
-                  <ConfigKey persist="true">[Tango],eq_knobs</ConfigKey>
+                  <ConfigKey persist="true">[Master],show_eqs</ConfigKey>
                   <BindProperty>visible</BindProperty>
                 </Connection>
               </WidgetGroup>

From 399841687c13a579eda4ebfb509b2735eb871d6a Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Fri, 15 Dec 2017 23:21:25 +0100
Subject: [PATCH 03/19] center Waveforms' PlayPosition marker

---
 res/skins/Tango/style.qss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index 02de60470c42..71a3277890e8 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -78,8 +78,8 @@ WWidgetGroup {
 #WaveformContainer3,
 #WaveformContainer4 {
 /* waveform play position should stay centered, so we shift the waveform
-  containers right to compensate for (inactive) beatgrid button toggle */
-  padding-right: 17px;
+  containers right to compensate for (inactive) beatgrid button toggle
+  padding-right: 17px; */
 /* Also add respective padding at the right, so all beatgrid buttons are shown */
   margin-right: -17px;
 }

From 7a5bb56e648df4ae08c49b3d52d7054dded04db1 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Fri, 15 Dec 2017 23:25:50 +0100
Subject: [PATCH 04/19] use Q as main cue point label on waves

---
 res/skins/Tango/deck_overview_left.xml  |  2 +-
 res/skins/Tango/deck_overview_right.xml | 21 +--------------------
 res/skins/Tango/waveform.xml            |  2 +-
 3 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/res/skins/Tango/deck_overview_left.xml b/res/skins/Tango/deck_overview_left.xml
index 9228cf31dcc4..6f0db5bb3adf 100644
--- a/res/skins/Tango/deck_overview_left.xml
+++ b/res/skins/Tango/deck_overview_left.xml
@@ -54,7 +54,7 @@ Variables:
             </MarkRange>
             <Mark>
               <Control>cue_point</Control>
-              <Text>C</Text>
+              <Text>Q</Text>
               <Align>top|right</Align>
               <Color>#FF0080</Color>
               <TextColor>#FFFFFF</TextColor>
diff --git a/res/skins/Tango/deck_overview_right.xml b/res/skins/Tango/deck_overview_right.xml
index a48c3b5b63ab..d03ff3cd0793 100644
--- a/res/skins/Tango/deck_overview_right.xml
+++ b/res/skins/Tango/deck_overview_right.xml
@@ -147,7 +147,7 @@ Variables:
             </MarkRange>
             <Mark>
               <Control>cue_point</Control>
-              <Text>C</Text>
+              <Text>Q</Text>
               <Align>top|right</Align>
               <Color>#FF0080</Color>
               <TextColor>#FFFFFF</TextColor>
@@ -160,25 +160,6 @@ Variables:
         </Children>
       </WidgetGroup><!-- /Overview Row -->
 
-<!-- 	Invisible Waveform, active when stacked Waveform are disabled.
-      Appearently, they needs to be present in skin somewhere (visible or not)
-      to prevent visual glitches (or crashes).
-      <WidgetGroup>
-        <Size>50f,50f</Size>
-        <Children>
-          <Template src="skin:waveform.xml">
-            <SetVariable name="Size">0me,50me</SetVariable>
-            <SetVariable name="chanNum"><Variable name="chanNum"/></SetVariable>
-            <SetVariable name="SignalBgColor"><Variable name="SignalBgColor_1"/></SetVariable>
-            <SetVariable name="SignalColor"><Variable name="SignalColor_1"/></SetVariable>
-          </Template>
-        </Children>
-        <Connection>
-          <ConfigKey persist="true">[Tango],stacked_waveforms</ConfigKey>
-          <BindProperty>visible</BindProperty>
-          <Transform><Not/></Transform>
-        </Connection>
-      </WidgetGroup> --><!-- /Invisible waveform -->
     </Children>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/Tango/waveform.xml b/res/skins/Tango/waveform.xml
index fef4ac2364e9..296ab89d0114 100644
--- a/res/skins/Tango/waveform.xml
+++ b/res/skins/Tango/waveform.xml
@@ -39,7 +39,7 @@ Variables:
         </DefaultMark>
         <Mark>
           <Control>cue_point</Control>
-          <Text>C</Text>
+          <Text>Q</Text>
           <Align>top|right</Align>
           <Color>#FF0080</Color>
           <TextColor>#FFFFFF</TextColor>

From 8eef60f43dfdf20426f3d5875ea997fd7c09e6a7 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Fri, 15 Dec 2017 23:51:03 +0100
Subject: [PATCH 05/19] make loop/jump switch simpler

---
 res/skins/Tango/deck_left.xml   | 6 +-----
 res/skins/Tango/deck_right.xml  | 5 +----
 res/skins/Tango/spinnyCover.xml | 6 +-----
 res/skins/Tango/style.qss       | 3 ++-
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/res/skins/Tango/deck_left.xml b/res/skins/Tango/deck_left.xml
index 02e1f7edcded..afd4c7b49338 100644
--- a/res/skins/Tango/deck_left.xml
+++ b/res/skins/Tango/deck_left.xml
@@ -102,15 +102,11 @@ Variables:
 
           <WidgetGroup>
             <Layout>vertical</Layout>
-            <Size>1me,25min</Size>
+            <SizePolicy>me,i</SizePolicy>
             <Children>
               <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>1me,3f</Size></WidgetGroup>
               <WidgetGroup><ObjectName>RoundFiller25</ObjectName><Size>1me,22me</Size></WidgetGroup>
             </Children>
-            <Connection>
-              <ConfigKey persist="true">[Tango],loop_beatjump_controls</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
           </WidgetGroup>
         </Children>
         <Connection>
diff --git a/res/skins/Tango/deck_right.xml b/res/skins/Tango/deck_right.xml
index 2ffa13c35b90..a1c58e4e436b 100644
--- a/res/skins/Tango/deck_right.xml
+++ b/res/skins/Tango/deck_right.xml
@@ -88,14 +88,11 @@ Variables:
 
           <WidgetGroup>
             <Layout>vertical</Layout>
+            <SizePolicy>me,i</SizePolicy>
             <Children>
               <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>1me,3f</Size></WidgetGroup>
               <WidgetGroup><ObjectName>RoundFiller25</ObjectName><Size>1me,22me</Size></WidgetGroup>
             </Children>
-            <Connection>
-              <ConfigKey persist="true">[Tango],loop_beatjump_controls</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
           </WidgetGroup>
         </Children>
         <Connection>
diff --git a/res/skins/Tango/spinnyCover.xml b/res/skins/Tango/spinnyCover.xml
index b29e7804709d..8b96dce83d8b 100644
--- a/res/skins/Tango/spinnyCover.xml
+++ b/res/skins/Tango/spinnyCover.xml
@@ -81,15 +81,11 @@ Variables:
 
       <WidgetGroup>
         <Layout>vertical</Layout>
-        <Size>0me,25min</Size>
+        <SizePolicy>me,i</SizePolicy>
         <Children>
           <WidgetGroup><ObjectName>Spacer1e</ObjectName><Size>0me,3f</Size></WidgetGroup>
           <WidgetGroup><ObjectName>RoundFiller25</ObjectName><Size>0me,22me</Size></WidgetGroup>
         </Children>
-        <Connection>
-          <ConfigKey>[Tango],loop_beatjump_controls</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
       </WidgetGroup>
 
     </Children>
diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index 71a3277890e8..453d1404fd78 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -1837,9 +1837,10 @@ WTrackProperty#SamplerTitle_mini {
  ######  Spinnies  ##############################################
 ##############################################################*/
 
-#SpinnyContainer {
+#SpinnyCover_Container {
   margin: 0px;
   padding: 0px;
+  background-color: #1e1e1e;
 }
 
 #SpinnyMini {

From 3598cb60c77c501fdc241bd4c5763410f1c9b38d Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Fri, 15 Dec 2017 23:52:06 +0100
Subject: [PATCH 06/19] simplify master vu

---
 res/skins/Tango/spinnyCover.xml              |  4 ++--
 res/skins/Tango/vumeter_master_container.xml | 24 +++++++++++++++++---
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/res/skins/Tango/spinnyCover.xml b/res/skins/Tango/spinnyCover.xml
index 8b96dce83d8b..676e954ab8bf 100644
--- a/res/skins/Tango/spinnyCover.xml
+++ b/res/skins/Tango/spinnyCover.xml
@@ -7,14 +7,14 @@ Variables:
 -->
 <Template>
   <WidgetGroup>
-    <ObjectName>SpinnyCover</ObjectName>
+    <ObjectName>SpinnyCover_Container</ObjectName>
     <SizePolicy>max,me</SizePolicy>
     <Layout>vertical</Layout>
     <Children>
 
       <!-- spinny -->
       <WidgetGroup>
-        <ObjectName>SpinnyCover_Container</ObjectName>
+        <ObjectName>SpinnyCover</ObjectName>
         <Size>111f,111f</Size>
         <Layout>vertical</Layout>
         <Children>
diff --git a/res/skins/Tango/vumeter_master_container.xml b/res/skins/Tango/vumeter_master_container.xml
index 7aa3fbdfff8e..7c86bd5d05bb 100644
--- a/res/skins/Tango/vumeter_master_container.xml
+++ b/res/skins/Tango/vumeter_master_container.xml
@@ -3,6 +3,20 @@ Description:
   Container for the master level meter, suiting various configurations.
 -->
 <Template>
+  <SingletonDefinition>
+    <ObjectName>VuMeterMaster</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <ObjectName></ObjectName>
+        <Size>min,min</Size>
+        <Layout>vertical</Layout>
+        <Children>
+          <Template src="skin:vumeter_master.xml"/>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
   <WidgetGroup>
     <Layout>horizontal</Layout>
     <SizePolicy>max,min</SizePolicy>
@@ -18,7 +32,9 @@ Description:
             <Size>min,min</Size>
             <Layout>vertical</Layout>
             <Children>
-              <Template src="skin:vumeter_master.xml"/>
+              <SingletonContainer>
+                <ObjectName>VuMeterMaster</ObjectName>
+              </SingletonContainer>
             </Children>
             <Connection>
               <ConfigKey persist="true">[Tango],vumeter</ConfigKey>
@@ -38,13 +54,15 @@ Description:
         <Layout>horizontal</Layout>
         <SizePolicy>min,min</SizePolicy>
         <Children>
-          <Template src="skin:vumeter_master.xml"/>
+          <SingletonContainer>
+            <ObjectName>VuMeterMaster</ObjectName>
+          </SingletonContainer>
         </Children>
         <Connection>
           <ConfigKey persist="true">[Master],show_mixer</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
-      </WidgetGroup><!-- /Master VU when mixer is shown -->
+      </WidgetGroup>
 
     </Children>
   </WidgetGroup>

From fe3744d499d8ddec0268637c9465f5cc57e103a1 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Sat, 16 Dec 2017 16:33:22 +0100
Subject: [PATCH 07/19] make Master VU a Singleton

---
 res/skins/Tango/decks_12.xml                 |   2 +-
 res/skins/Tango/vumeter_master.xml           | 185 ++++++++++++-------
 res/skins/Tango/vumeter_master_container.xml |  69 -------
 3 files changed, 120 insertions(+), 136 deletions(-)
 delete mode 100644 res/skins/Tango/vumeter_master_container.xml

diff --git a/res/skins/Tango/decks_12.xml b/res/skins/Tango/decks_12.xml
index 6a1388b72fb8..3e54f1bb44a4 100644
--- a/res/skins/Tango/decks_12.xml
+++ b/res/skins/Tango/decks_12.xml
@@ -18,7 +18,7 @@ Variables:
         <SetVariable name="SignalColor"><Variable name="SignalColor_1"/></SetVariable>
       </Template>
 
-      <Template src="skin:vumeter_master_container.xml"/>
+      <Template src="skin:vumeter_master.xml"/>
 
       <Template src="skin:deck_right.xml">
         <SetVariable name="chanNum">2</SetVariable>
diff --git a/res/skins/Tango/vumeter_master.xml b/res/skins/Tango/vumeter_master.xml
index bfd28dc632ce..051dac396f55 100644
--- a/res/skins/Tango/vumeter_master.xml
+++ b/res/skins/Tango/vumeter_master.xml
@@ -1,84 +1,137 @@
 <!--
 Description:
-  The master level meter.
-  This template is embedded in vumeter_master_container.xml
-  which controls visibility for various configurations.
+  Container for the master level meter, suiting various configurations.
 -->
 <Template>
-  <WidgetGroup><!-- Master VU incl. Label, + spacer -->
-    <ObjectName>VUMeterMasterContainer</ObjectName>
-    <Layout>vertical</Layout>
-    <SizePolicy>min,max</SizePolicy>
+  <SingletonDefinition>
+    <ObjectName>VuMeterMaster</ObjectName>
     <Children>
-      <WidgetGroup><!-- VU -->
-        <ObjectName>VUMeterFloating</ObjectName>
-        <Layout>horizontal</Layout>
+      <WidgetGroup><!-- Master VU incl. Label, + spacer -->
+        <ObjectName>VUMeterMasterContainer</ObjectName>
+        <Layout>vertical</Layout>
         <SizePolicy>min,max</SizePolicy>
         <Children>
-          <WidgetGroup><!-- VU Left -->
-            <Layout>stacked</Layout>
-            <Size>4f,-1min</Size>
+          <WidgetGroup><!-- VU -->
+            <ObjectName>VUMeterFloating</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,max</SizePolicy>
             <Children>
-              <StatusLight>
-                <TooltipId>master_VuMeterL</TooltipId>
-                <PathStatusLight>skin:/graphics/vumeter_floating_clipping_over.png</PathStatusLight>
-                <PathBack>skin:/graphics/vumeter_floating_clipping.png</PathBack>
-                <Connection>
-                  <ConfigKey>[Master],PeakIndicatorL</ConfigKey>
-                </Connection>
-              </StatusLight>
-              <VuMeter>
-                <PathVu>skin:/graphics/vumeter_floating_over.png</PathVu>
-                <PathBack>skin:/graphics/vumeter_floating.png</PathBack>
-                <Horizontal>false</Horizontal>
-                <PeakHoldSize>5</PeakHoldSize>
-                <PeakHoldTime>500</PeakHoldTime>
-                <PeakFallTime>50</PeakFallTime>
-                <PeakFallStep>2</PeakFallStep>
-                <Connection>
-                  <ConfigKey>[Master],VuMeterL</ConfigKey>
-                </Connection>
-              </VuMeter>
-            </Children>
-          </WidgetGroup><!-- /VU Left VU -->
+              <WidgetGroup><!-- VU Left -->
+                <Layout>stacked</Layout>
+                <Size>4f,-1min</Size>
+                <Children>
+                  <StatusLight>
+                    <TooltipId>master_VuMeterL</TooltipId>
+                    <PathStatusLight>skin:/graphics/vumeter_floating_clipping_over.png</PathStatusLight>
+                    <PathBack>skin:/graphics/vumeter_floating_clipping.png</PathBack>
+                    <Connection>
+                      <ConfigKey>[Master],PeakIndicatorL</ConfigKey>
+                    </Connection>
+                  </StatusLight>
+                  <VuMeter>
+                    <PathVu>skin:/graphics/vumeter_floating_over.png</PathVu>
+                    <PathBack>skin:/graphics/vumeter_floating.png</PathBack>
+                    <Horizontal>false</Horizontal>
+                    <PeakHoldSize>5</PeakHoldSize>
+                    <PeakHoldTime>500</PeakHoldTime>
+                    <PeakFallTime>50</PeakFallTime>
+                    <PeakFallStep>2</PeakFallStep>
+                    <Connection>
+                      <ConfigKey>[Master],VuMeterL</ConfigKey>
+                    </Connection>
+                  </VuMeter>
+                </Children>
+              </WidgetGroup><!-- /VU Left VU -->
 
-          <WidgetGroup><!-- Right -->
-            <Layout>stacked</Layout>
-            <Size>4f,-1min</Size>
-            <Children>
-              <StatusLight>
-                <TooltipId>master_VuMeterR</TooltipId>
-                <PathStatusLight>skin:/graphics/vumeter_floating_clipping_over.png</PathStatusLight>
-                <PathBack>skin:/graphics/vumeter_floating_clipping.png</PathBack>
-                <Connection>
-                  <ConfigKey>[Master],PeakIndicatorR</ConfigKey>
-                </Connection>
-              </StatusLight>
-              <VuMeter>
-                <PathVu>skin:/graphics/vumeter_floating_over.png</PathVu>
-                <PathBack>skin:/graphics/vumeter_floating.png</PathBack>
-                <Horizontal>false</Horizontal>
-                <PeakHoldSize>5</PeakHoldSize>
-                <PeakHoldTime>500</PeakHoldTime>
-                <PeakFallTime>50</PeakFallTime>
-                <PeakFallStep>2</PeakFallStep>
-                <Connection>
-                  <ConfigKey>[Master],VuMeterR</ConfigKey>
-                </Connection>
-              </VuMeter>
+              <WidgetGroup><!-- Right -->
+                <Layout>stacked</Layout>
+                <Size>4f,-1min</Size>
+                <Children>
+                  <StatusLight>
+                    <TooltipId>master_VuMeterR</TooltipId>
+                    <PathStatusLight>skin:/graphics/vumeter_floating_clipping_over.png</PathStatusLight>
+                    <PathBack>skin:/graphics/vumeter_floating_clipping.png</PathBack>
+                    <Connection>
+                      <ConfigKey>[Master],PeakIndicatorR</ConfigKey>
+                    </Connection>
+                  </StatusLight>
+                  <VuMeter>
+                    <PathVu>skin:/graphics/vumeter_floating_over.png</PathVu>
+                    <PathBack>skin:/graphics/vumeter_floating.png</PathBack>
+                    <Horizontal>false</Horizontal>
+                    <PeakHoldSize>5</PeakHoldSize>
+                    <PeakHoldTime>500</PeakHoldTime>
+                    <PeakFallTime>50</PeakFallTime>
+                    <PeakFallStep>2</PeakFallStep>
+                    <Connection>
+                      <ConfigKey>[Master],VuMeterR</ConfigKey>
+                    </Connection>
+                  </VuMeter>
+                </Children>
+              </WidgetGroup><!-- /VU Right -->
             </Children>
-          </WidgetGroup><!-- /VU Right -->
+          </WidgetGroup><!-- /VU -->
+
+          <WidgetGroup><Size>0min,2f</Size></WidgetGroup>
+
+          <WidgetGroup>
+            <ObjectName>VUMeterMasterLabel</ObjectName>
+            <Size>16f,20f</Size>
+          </WidgetGroup>
+
+          <WidgetGroup><Size>0min,3me</Size></WidgetGroup>
         </Children>
-      </WidgetGroup><!-- /VU -->
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
 
-      <WidgetGroup><Size>0min,2f</Size></WidgetGroup>
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <SizePolicy>max,min</SizePolicy>
+    <Children>
 
+      <!-- Master VU when mixer is hidden but permament level meters are shown -->
       <WidgetGroup>
-        <ObjectName>VUMeterMasterLabel</ObjectName>
-        <Size>16f,20f</Size>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <WidgetGroup>
+            <ObjectName></ObjectName>
+            <Size>min,min</Size>
+            <Layout>vertical</Layout>
+            <Children>
+              <SingletonContainer>
+                <ObjectName>VuMeterMaster</ObjectName>
+              </SingletonContainer>
+            </Children>
+            <Connection>
+              <ConfigKey persist="true">[Tango],vumeter</ConfigKey>
+              <BindProperty>visible</BindProperty>
+            </Connection>
+          </WidgetGroup>
+        </Children>
+        <Connection>
+          <ConfigKey persist="true">[Master],show_mixer</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </WidgetGroup>
+      <!-- /Master VU when mixer is hidden but permament level meters are shown -->
+
+      <WidgetGroup><!-- Master VU when mixer is shown -->
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <SingletonContainer>
+            <ObjectName>VuMeterMaster</ObjectName>
+          </SingletonContainer>
+        </Children>
+        <Connection>
+          <ConfigKey persist="true">[Master],show_mixer</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
       </WidgetGroup>
 
-      <WidgetGroup><Size>0min,3f</Size></WidgetGroup>
     </Children>
-  </WidgetGroup><!-- /Master meter incl. Label, + spacer -->
+  </WidgetGroup>
 </Template>
diff --git a/res/skins/Tango/vumeter_master_container.xml b/res/skins/Tango/vumeter_master_container.xml
deleted file mode 100644
index 7c86bd5d05bb..000000000000
--- a/res/skins/Tango/vumeter_master_container.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<!--
-Description:
-  Container for the master level meter, suiting various configurations.
--->
-<Template>
-  <SingletonDefinition>
-    <ObjectName>VuMeterMaster</ObjectName>
-    <Children>
-      <WidgetGroup>
-        <ObjectName></ObjectName>
-        <Size>min,min</Size>
-        <Layout>vertical</Layout>
-        <Children>
-          <Template src="skin:vumeter_master.xml"/>
-        </Children>
-      </WidgetGroup>
-    </Children>
-  </SingletonDefinition>
-
-  <WidgetGroup>
-    <Layout>horizontal</Layout>
-    <SizePolicy>max,min</SizePolicy>
-    <Children>
-
-      <!-- Master VU when mixer is hidden but permament level meters are shown -->
-      <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <WidgetGroup>
-            <ObjectName></ObjectName>
-            <Size>min,min</Size>
-            <Layout>vertical</Layout>
-            <Children>
-              <SingletonContainer>
-                <ObjectName>VuMeterMaster</ObjectName>
-              </SingletonContainer>
-            </Children>
-            <Connection>
-              <ConfigKey persist="true">[Tango],vumeter</ConfigKey>
-              <BindProperty>visible</BindProperty>
-            </Connection>
-          </WidgetGroup>
-        </Children>
-        <Connection>
-          <ConfigKey persist="true">[Master],show_mixer</ConfigKey>
-          <Transform><Not/></Transform>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup>
-      <!-- /Master VU when mixer is hidden but permament level meters are shown -->
-
-      <WidgetGroup><!-- Master VU when mixer is shown -->
-        <Layout>horizontal</Layout>
-        <SizePolicy>min,min</SizePolicy>
-        <Children>
-          <SingletonContainer>
-            <ObjectName>VuMeterMaster</ObjectName>
-          </SingletonContainer>
-        </Children>
-        <Connection>
-          <ConfigKey persist="true">[Master],show_mixer</ConfigKey>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-      </WidgetGroup>
-
-    </Children>
-  </WidgetGroup>
-</Template>

From 56494fa301c076e7cd55427d7f982a0aba5a4c6a Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Sat, 16 Dec 2017 16:34:18 +0100
Subject: [PATCH 08/19] adjust big Spinny/Cover bottom border

---
 res/skins/Tango/spinnyCover.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/res/skins/Tango/spinnyCover.xml b/res/skins/Tango/spinnyCover.xml
index 676e954ab8bf..8a4c3fb8eb13 100644
--- a/res/skins/Tango/spinnyCover.xml
+++ b/res/skins/Tango/spinnyCover.xml
@@ -69,14 +69,12 @@ Variables:
       </CoverArt>
 
       <WidgetGroup>
-        <MinimumSize>0,0</MinimumSize>
-        <MaximumSize>-1,3</MaximumSize>
-        <SizePolicy>me,me</SizePolicy>
+        <Size>0me,1f</Size>
       </WidgetGroup>
 
       <WidgetGroup>
         <ObjectName>RoundFiller25</ObjectName>
-        <Size>0me,22f</Size>
+        <Size>0me,24f</Size>
       </WidgetGroup>
 
       <WidgetGroup>

From 246e4e3065261156eeb13c502dcc3e6402f6058c Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Sat, 16 Dec 2017 17:17:22 +0100
Subject: [PATCH 09/19] restore Master VU style

---
 res/skins/Tango/style.qss          |   6 --
 res/skins/Tango/vumeter_master.xml | 133 +++++++++++++++--------------
 2 files changed, 69 insertions(+), 70 deletions(-)

diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index 453d1404fd78..043ba5e1d02d 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -1260,12 +1260,6 @@ decks, samplers, mic, aux */
   padding: 0px 2px 0px 1px;
 }
 
-#VUMeterMasterContainer {
-  margin: 0px 1px 0px 1px;
-  background-color: #252525;
-  border-radius: 3px;
-}
-
 #VUMeterMasterLabel {
   image: url(skin:/buttons/btn_master_vu_label.svg) no-repeat center center;
 }
diff --git a/res/skins/Tango/vumeter_master.xml b/res/skins/Tango/vumeter_master.xml
index 051dac396f55..899d685acdb4 100644
--- a/res/skins/Tango/vumeter_master.xml
+++ b/res/skins/Tango/vumeter_master.xml
@@ -6,80 +6,85 @@ Description:
   <SingletonDefinition>
     <ObjectName>VuMeterMaster</ObjectName>
     <Children>
-      <WidgetGroup><!-- Master VU incl. Label, + spacer -->
-        <ObjectName>VUMeterMasterContainer</ObjectName>
+      <WidgetGroup><!-- Nest meter so that style gets applied -->
         <Layout>vertical</Layout>
-        <SizePolicy>min,max</SizePolicy>
+        <SizePolicy>min,min</SizePolicy>
         <Children>
-          <WidgetGroup><!-- VU -->
+          <WidgetGroup><!-- Master VU incl. Label, + spacer -->
             <ObjectName>VUMeterFloating</ObjectName>
-            <Layout>horizontal</Layout>
-            <SizePolicy>min,max</SizePolicy>
+            <Layout>vertical</Layout>
+            <SizePolicy>min,min</SizePolicy>
             <Children>
-              <WidgetGroup><!-- VU Left -->
-                <Layout>stacked</Layout>
-                <Size>4f,-1min</Size>
+              <WidgetGroup><!-- VU -->
+                <Layout>horizontal</Layout>
+                <SizePolicy>min,max</SizePolicy>
                 <Children>
-                  <StatusLight>
-                    <TooltipId>master_VuMeterL</TooltipId>
-                    <PathStatusLight>skin:/graphics/vumeter_floating_clipping_over.png</PathStatusLight>
-                    <PathBack>skin:/graphics/vumeter_floating_clipping.png</PathBack>
-                    <Connection>
-                      <ConfigKey>[Master],PeakIndicatorL</ConfigKey>
-                    </Connection>
-                  </StatusLight>
-                  <VuMeter>
-                    <PathVu>skin:/graphics/vumeter_floating_over.png</PathVu>
-                    <PathBack>skin:/graphics/vumeter_floating.png</PathBack>
-                    <Horizontal>false</Horizontal>
-                    <PeakHoldSize>5</PeakHoldSize>
-                    <PeakHoldTime>500</PeakHoldTime>
-                    <PeakFallTime>50</PeakFallTime>
-                    <PeakFallStep>2</PeakFallStep>
-                    <Connection>
-                      <ConfigKey>[Master],VuMeterL</ConfigKey>
-                    </Connection>
-                  </VuMeter>
-                </Children>
-              </WidgetGroup><!-- /VU Left VU -->
+                  <WidgetGroup><!-- VU Left -->
+                    <Layout>stacked</Layout>
+                    <Size>4f,-1min</Size>
+                    <Children>
+                      <StatusLight>
+                        <TooltipId>master_VuMeterL</TooltipId>
+                        <PathStatusLight>skin:/graphics/vumeter_floating_clipping_over.png</PathStatusLight>
+                        <PathBack>skin:/graphics/vumeter_floating_clipping.png</PathBack>
+                        <Connection>
+                          <ConfigKey>[Master],PeakIndicatorL</ConfigKey>
+                        </Connection>
+                      </StatusLight>
+                      <VuMeter>
+                        <PathVu>skin:/graphics/vumeter_floating_over.png</PathVu>
+                        <PathBack>skin:/graphics/vumeter_floating.png</PathBack>
+                        <Horizontal>false</Horizontal>
+                        <PeakHoldSize>5</PeakHoldSize>
+                        <PeakHoldTime>500</PeakHoldTime>
+                        <PeakFallTime>50</PeakFallTime>
+                        <PeakFallStep>2</PeakFallStep>
+                        <Connection>
+                          <ConfigKey>[Master],VuMeterL</ConfigKey>
+                        </Connection>
+                      </VuMeter>
+                    </Children>
+                  </WidgetGroup><!-- /VU Left VU -->
 
-              <WidgetGroup><!-- Right -->
-                <Layout>stacked</Layout>
-                <Size>4f,-1min</Size>
-                <Children>
-                  <StatusLight>
-                    <TooltipId>master_VuMeterR</TooltipId>
-                    <PathStatusLight>skin:/graphics/vumeter_floating_clipping_over.png</PathStatusLight>
-                    <PathBack>skin:/graphics/vumeter_floating_clipping.png</PathBack>
-                    <Connection>
-                      <ConfigKey>[Master],PeakIndicatorR</ConfigKey>
-                    </Connection>
-                  </StatusLight>
-                  <VuMeter>
-                    <PathVu>skin:/graphics/vumeter_floating_over.png</PathVu>
-                    <PathBack>skin:/graphics/vumeter_floating.png</PathBack>
-                    <Horizontal>false</Horizontal>
-                    <PeakHoldSize>5</PeakHoldSize>
-                    <PeakHoldTime>500</PeakHoldTime>
-                    <PeakFallTime>50</PeakFallTime>
-                    <PeakFallStep>2</PeakFallStep>
-                    <Connection>
-                      <ConfigKey>[Master],VuMeterR</ConfigKey>
-                    </Connection>
-                  </VuMeter>
+                  <WidgetGroup><!-- Right -->
+                    <Layout>stacked</Layout>
+                    <Size>4f,-1min</Size>
+                    <Children>
+                      <StatusLight>
+                        <TooltipId>master_VuMeterR</TooltipId>
+                        <PathStatusLight>skin:/graphics/vumeter_floating_clipping_over.png</PathStatusLight>
+                        <PathBack>skin:/graphics/vumeter_floating_clipping.png</PathBack>
+                        <Connection>
+                          <ConfigKey>[Master],PeakIndicatorR</ConfigKey>
+                        </Connection>
+                      </StatusLight>
+                      <VuMeter>
+                        <PathVu>skin:/graphics/vumeter_floating_over.png</PathVu>
+                        <PathBack>skin:/graphics/vumeter_floating.png</PathBack>
+                        <Horizontal>false</Horizontal>
+                        <PeakHoldSize>5</PeakHoldSize>
+                        <PeakHoldTime>500</PeakHoldTime>
+                        <PeakFallTime>50</PeakFallTime>
+                        <PeakFallStep>2</PeakFallStep>
+                        <Connection>
+                          <ConfigKey>[Master],VuMeterR</ConfigKey>
+                        </Connection>
+                      </VuMeter>
+                    </Children>
+                  </WidgetGroup><!-- /VU Right -->
                 </Children>
-              </WidgetGroup><!-- /VU Right -->
-            </Children>
-          </WidgetGroup><!-- /VU -->
+              </WidgetGroup><!-- /VU -->
 
-          <WidgetGroup><Size>0min,2f</Size></WidgetGroup>
+              <WidgetGroup><Size>0f,2f</Size></WidgetGroup>
 
-          <WidgetGroup>
-            <ObjectName>VUMeterMasterLabel</ObjectName>
-            <Size>16f,20f</Size>
-          </WidgetGroup>
+              <WidgetGroup>
+                <ObjectName>VUMeterMasterLabel</ObjectName>
+                <Size>16f,20f</Size>
+              </WidgetGroup>
 
-          <WidgetGroup><Size>0min,3me</Size></WidgetGroup>
+              <WidgetGroup><Size>0f,3f</Size></WidgetGroup>
+            </Children>
+          </WidgetGroup>
         </Children>
       </WidgetGroup>
     </Children>

From 64f9d355ca207c8ef6622b3d7128535c4ac9ed49 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Sat, 16 Dec 2017 17:26:44 +0100
Subject: [PATCH 10/19] put FX units 1&2 into Singleton, make COs consistent

---
 res/skins/Tango/aux_unit.xml             |  9 +++---
 res/skins/Tango/deck_comment_left.xml    | 11 ++++---
 res/skins/Tango/deck_comment_right.xml   | 10 ++++---
 res/skins/Tango/eq_knob_button_left.xml  |  9 +++---
 res/skins/Tango/eq_knob_button_right.xml |  9 +++---
 res/skins/Tango/fx_assign_button.xml     |  8 ++---
 res/skins/Tango/fx_button.xml            | 18 +++++------
 res/skins/Tango/fx_focus_button.xml      | 14 ++++-----
 res/skins/Tango/fx_master_button.xml     |  6 ++--
 res/skins/Tango/fx_metaknob.xml          |  4 +--
 res/skins/Tango/fx_parameter_button.xml  | 25 ++++++++--------
 res/skins/Tango/fx_parameter_knob.xml    | 16 +++++-----
 res/skins/Tango/fx_parameter_row.xml     |  5 ++--
 res/skins/Tango/fx_toggle_selector.xml   | 22 +++++++-------
 res/skins/Tango/fx_unit_left.xml         | 26 ++++++++--------
 res/skins/Tango/fx_unit_left_mini.xml    | 38 ++++++++++++------------
 res/skins/Tango/fx_unit_right.xml        | 26 ++++++++--------
 res/skins/Tango/fx_unit_right_mini.xml   | 38 ++++++++++++------------
 res/skins/Tango/fx_units_12.xml          | 11 ++++---
 res/skins/Tango/fx_units_34.xml          | 11 ++++---
 res/skins/Tango/mic_unit.xml             |  9 +++---
 res/skins/Tango/mixer_master_booth.xml   |  9 +++---
 res/skins/Tango/skin.xml                 | 29 +++++++++++++-----
 res/skins/Tango/skin_settings.xml        |  4 +--
 res/skins/Tango/style.qss                |  4 +--
 25 files changed, 196 insertions(+), 175 deletions(-)

diff --git a/res/skins/Tango/aux_unit.xml b/res/skins/Tango/aux_unit.xml
index f79c780127b0..fada7cda535f 100644
--- a/res/skins/Tango/aux_unit.xml
+++ b/res/skins/Tango/aux_unit.xml
@@ -10,6 +10,7 @@ Variables:
 <Template>
   <SetVariable name="sourceType">auxiliary</SetVariable>
   <SetVariable name="group">[Auxiliary<Variable name="auxNum"/>]</SetVariable>
+  <SetVariable name="FxRack">1</SetVariable>
   <WidgetGroup>
     <ObjectName>AlignCenter</ObjectName>
     <Layout>horizontal</Layout>
@@ -128,12 +129,12 @@ Variables:
                 <Children>
                   <Template src="skin:fx_assign_button.xml">
                     <SetVariable name="Size">26f,16f</SetVariable>
-                    <SetVariable name="FxUnitNum">1</SetVariable>
+                    <SetVariable name="FxUnit">1</SetVariable>
                   </Template>
                     <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
                   <Template src="skin:fx_assign_button.xml">
                     <SetVariable name="Size">26f,16f</SetVariable>
-                    <SetVariable name="FxUnitNum">3</SetVariable>
+                    <SetVariable name="FxUnit">3</SetVariable>
                   </Template>
                 </Children>
               </WidgetGroup>
@@ -146,12 +147,12 @@ Variables:
                 <Children>
                   <Template src="skin:fx_assign_button.xml">
                     <SetVariable name="Size">26f,16f</SetVariable>
-                    <SetVariable name="FxUnitNum">2</SetVariable>
+                    <SetVariable name="FxUnit">2</SetVariable>
                   </Template>
                     <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
                   <Template src="skin:fx_assign_button.xml">
                     <SetVariable name="Size">26f,16f</SetVariable>
-                    <SetVariable name="FxUnitNum">4</SetVariable>
+                    <SetVariable name="FxUnit">4</SetVariable>
                   </Template>
                 </Children>
               </WidgetGroup>
diff --git a/res/skins/Tango/deck_comment_left.xml b/res/skins/Tango/deck_comment_left.xml
index f3889f63c06b..5179a4c010b8 100644
--- a/res/skins/Tango/deck_comment_left.xml
+++ b/res/skins/Tango/deck_comment_left.xml
@@ -7,6 +7,8 @@ Variables:
 -->
 <Template>
   <SetVariable name="sourceType">deck</SetVariable>
+  <SetVariable name="FxRack">1</SetVariable>
+
   <WidgetGroup>
     <ObjectName>TrackCommentContainer</ObjectName>
     <Layout>vertical</Layout>
@@ -42,24 +44,25 @@ Variables:
           </WidgetGroup>
 
             <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
+
           <Template src="skin:fx_assign_button.xml">
             <SetVariable name="Size">32f,16f</SetVariable>
-            <SetVariable name="FxUnitNum">1</SetVariable>
+            <SetVariable name="FxUnit">1</SetVariable>
           </Template>
             <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
           <Template src="skin:fx_assign_button.xml">
             <SetVariable name="Size">32f,16f</SetVariable>
-            <SetVariable name="FxUnitNum">2</SetVariable>
+            <SetVariable name="FxUnit">2</SetVariable>
           </Template>
             <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
           <Template src="skin:fx_assign_button.xml">
             <SetVariable name="Size">32f,16f</SetVariable>
-            <SetVariable name="FxUnitNum">3</SetVariable>
+            <SetVariable name="FxUnit">3</SetVariable>
           </Template>
             <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
           <Template src="skin:fx_assign_button.xml">
             <SetVariable name="Size">32f,16f</SetVariable>
-            <SetVariable name="FxUnitNum">4</SetVariable>
+            <SetVariable name="FxUnit">4</SetVariable>
           </Template>
 
         </Children>
diff --git a/res/skins/Tango/deck_comment_right.xml b/res/skins/Tango/deck_comment_right.xml
index 03793ff02df3..0a4f48f437cd 100644
--- a/res/skins/Tango/deck_comment_right.xml
+++ b/res/skins/Tango/deck_comment_right.xml
@@ -7,6 +7,8 @@ Variables:
 -->
 <Template>
   <SetVariable name="sourceType">deck</SetVariable>
+  <SetVariable name="FxRack">1</SetVariable>
+
   <WidgetGroup>
     <ObjectName>TrackCommentContainer</ObjectName>
     <Layout>vertical</Layout>
@@ -28,22 +30,22 @@ Variables:
 
           <Template src="skin:fx_assign_button.xml">
             <SetVariable name="Size">32f,16f</SetVariable>
-            <SetVariable name="FxUnitNum">1</SetVariable>
+            <SetVariable name="FxUnit">1</SetVariable>
           </Template>
             <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
           <Template src="skin:fx_assign_button.xml">
             <SetVariable name="Size">32f,16f</SetVariable>
-            <SetVariable name="FxUnitNum">2</SetVariable>
+            <SetVariable name="FxUnit">2</SetVariable>
           </Template>
             <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
           <Template src="skin:fx_assign_button.xml">
             <SetVariable name="Size">32f,16f</SetVariable>
-            <SetVariable name="FxUnitNum">3</SetVariable>
+            <SetVariable name="FxUnit">3</SetVariable>
           </Template>
             <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
           <Template src="skin:fx_assign_button.xml">
             <SetVariable name="Size">32f,16f</SetVariable>
-            <SetVariable name="FxUnitNum">4</SetVariable>
+            <SetVariable name="FxUnit">4</SetVariable>
           </Template>
             <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
diff --git a/res/skins/Tango/eq_knob_button_left.xml b/res/skins/Tango/eq_knob_button_left.xml
index a5497e7c38e3..d575f66ac81e 100644
--- a/res/skins/Tango/eq_knob_button_left.xml
+++ b/res/skins/Tango/eq_knob_button_left.xml
@@ -11,7 +11,8 @@ Variables:
 <Template>
   <SetVariable name="FxRack">EqualizerRack1</SetVariable>
   <SetVariable name="FxNum">1</SetVariable>
-  <SetVariable name="EQEffect">[EqualizerRack1_<Variable name="group"/>_Effect1]</SetVariable>
+  <SetVariable name="FxRack_FxUnit_FxNum">[EqualizerRack1_<Variable name="group"/>_Effect1]</SetVariable>
+
   <WidgetGroup>
     <ObjectName>EQKnobContainerLeft</ObjectName>
     <SizePolicy>min,min</SizePolicy>
@@ -33,7 +34,7 @@ Variables:
                 <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
                 <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
                 <Connection>
-                  <ConfigKey><Variable name="EQEffect"/>,parameter<Variable name="parameter"/></ConfigKey>
+                  <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="parameter"/></ConfigKey>
                 </Connection>
               </EffectParameterKnobComposed>
 
@@ -53,14 +54,14 @@ Variables:
           </Template>
         </Children>
         <Connection>
-          <ConfigKey><Variable name="EQEffect"/>,loaded</ConfigKey>
+          <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,loaded</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
       </WidgetGroup><!-- /EQ knob + Kill button -->
       <WidgetGroup><!-- Spacer when no EQ plugin is loaded -->
         <Size>42me,30f</Size>
         <Connection>
-          <ConfigKey><Variable name="EQEffect"/>,loaded</ConfigKey>
+          <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,loaded</ConfigKey>
           <Transform><Not/></Transform>
           <BindProperty>visible</BindProperty>
         </Connection>
diff --git a/res/skins/Tango/eq_knob_button_right.xml b/res/skins/Tango/eq_knob_button_right.xml
index 01ef8b1fadf1..981ea349feae 100644
--- a/res/skins/Tango/eq_knob_button_right.xml
+++ b/res/skins/Tango/eq_knob_button_right.xml
@@ -11,7 +11,8 @@ Variables:
 <Template>
   <SetVariable name="FxRack">EqualizerRack1</SetVariable>
   <SetVariable name="FxNum">1</SetVariable>
-  <SetVariable name="EQEffect">[EqualizerRack1_<Variable name="group"/>_Effect1]</SetVariable>
+  <SetVariable name="FxRack_FxUnit_FxNum">[EqualizerRack1_<Variable name="group"/>_Effect1]</SetVariable>
+
   <WidgetGroup>
     <ObjectName>EQKnobContainerRight</ObjectName>
     <SizePolicy>min,min</SizePolicy>
@@ -40,7 +41,7 @@ Variables:
                 <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
                 <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
                 <Connection>
-                  <ConfigKey><Variable name="EQEffect"/>,parameter<Variable name="parameter"/></ConfigKey>
+                  <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="parameter"/></ConfigKey>
                 </Connection>
               </EffectParameterKnobComposed>
 
@@ -53,14 +54,14 @@ Variables:
           </WidgetGroup><!-- /EQ knob + Kill indicator underneath -->
         </Children>
         <Connection>
-          <ConfigKey><Variable name="EQEffect"/>,loaded</ConfigKey>
+          <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,loaded</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
       </WidgetGroup><!-- /EQ knob + Kill button -->
       <WidgetGroup><!-- Spacer when no EQ plugin is loaded -->
         <Size>42me,30f</Size>
         <Connection>
-          <ConfigKey><Variable name="EQEffect"/>,loaded</ConfigKey>
+          <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,loaded</ConfigKey>
           <Transform><Not/></Transform>
           <BindProperty>visible</BindProperty>
         </Connection>
diff --git a/res/skins/Tango/fx_assign_button.xml b/res/skins/Tango/fx_assign_button.xml
index ebf69b8f2424..0451f3abc7b0 100644
--- a/res/skins/Tango/fx_assign_button.xml
+++ b/res/skins/Tango/fx_assign_button.xml
@@ -3,7 +3,7 @@ Description:
   A button to assign an effect unit to parent deck,
   used in decks' artist/duration row.
 Variables:
-  FxUnitNum: [EffectRack1_EffectUnitN]
+  FxUnit_FxNum: [EffectRack1_EffectUnitN]
   group:  [ChannelN]
 -->
 <Template>
@@ -15,16 +15,16 @@ Variables:
     <RightClickIsPushButton>false</RightClickIsPushButton>
     <State>
       <Number>0</Number>
-      <Text>FX<Variable name="FxUnitNum"/></Text>
+      <Text>FX<Variable name="FxUnit"/></Text>
       <Alignment>center</Alignment>
     </State>
     <State>
       <Number>1</Number>
-      <Text>FX<Variable name="FxUnitNum"/></Text>
+      <Text>FX<Variable name="FxUnit"/></Text>
       <Alignment>center</Alignment>
     </State>
     <Connection>
-      <ConfigKey>[EffectRack1_EffectUnit<Variable name="FxUnitNum"/>],group_<Variable name="group"/>_enable</ConfigKey>
+      <ConfigKey>[EffectRack<Variable name="FxRack"/>_EffectUnit<Variable name="FxUnit"/>],group_<Variable name="group"/>_enable</ConfigKey>
       <ButtonState>LeftButton</ButtonState>
     </Connection>
   </PushButton>
diff --git a/res/skins/Tango/fx_button.xml b/res/skins/Tango/fx_button.xml
index c31610cad721..85d0eee34a52 100644
--- a/res/skins/Tango/fx_button.xml
+++ b/res/skins/Tango/fx_button.xml
@@ -1,19 +1,19 @@
 <!--
 Description:
-  An EffectPushButton template used for EQ kill buttons and
-  effect parameter buttons.
+  An EffectPushButton template used for FX parameter buttons,
+  EQ kill buttons and QuickEffect buttons.
 Variables:
   ObjectName:
   Size      :
-  FxRack    : [EffectRack1]
-  FxNum     : [EffectY]
-  group     : [ChannelN], [EffectUnitX]
   parameter : 1, 2, 3, ...
-  labelOn  : button graphic for ON state
-  labelOff  : button graphic for OFF state
+  labelOn   : optional button graphic for ON state
+  labelOff  : optional button graphic for OFF state
+  FxRack_FxUnit_FxNum : various, might be
+      [EffectRack1_EffectUnitX_EffectY]
+      [EqualizerRack1_[ChannelA]_EffectY]
+      [QuickEffectRack1_[ChannelA]_EffectY]
 -->
 <Template>
-  <SetVariable name="FxGroup"><Variable name="FxRack"/>_<Variable name="group"/></SetVariable>
   <EffectPushButton>
     <ObjectName><Variable name="ObjectName"/></ObjectName>
     <Size><Variable name="Size"/></Size>
@@ -30,7 +30,7 @@ Variables:
       <Unpressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="labelOn"/>.svg</Unpressed>
     </State>
     <Connection>
-      <ConfigKey>[<Variable name="FxGroup"/>_Effect<Variable name="FxNum"/>],<Variable name="parameter"/></ConfigKey>
+      <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,<Variable name="parameter"/></ConfigKey>
       <ButtonState>LeftButton</ButtonState>
     </Connection>
   </EffectPushButton>
diff --git a/res/skins/Tango/fx_focus_button.xml b/res/skins/Tango/fx_focus_button.xml
index a310fe5a16f8..f50d6414dc4c 100644
--- a/res/skins/Tango/fx_focus_button.xml
+++ b/res/skins/Tango/fx_focus_button.xml
@@ -21,19 +21,19 @@ Variables:
         <NumberStates>2</NumberStates>
         <RightClickIsPushButton>true</RightClickIsPushButton>
         <Connection>
-          <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+          <ConfigKey>[<Variable name="FxRack_FxUnit"/>],focused_effect</ConfigKey>
           <ButtonState>LeftButton</ButtonState>
           <EmitOnDownPress>true</EmitOnDownPress>
           <Transform><IsEqual><Variable name="FxNum"/></IsEqual></Transform>
         </Connection>
         <Connection>
-          <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+          <ConfigKey>[<Variable name="FxRack_FxUnit"/>],focused_effect</ConfigKey>
           <ButtonState>RightButton</ButtonState>
           <EmitOnDownPress>true</EmitOnDownPress>
           <Transform><IsEqual><Variable name="FxNum"/></IsEqual><Not/></Transform>
         </Connection>
         <Connection>
-          <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+          <ConfigKey>[<Variable name="FxRack_FxUnit"/>],focused_effect</ConfigKey>
           <Transform><IsEqual><Variable name="FxNum"/></IsEqual><Not/></Transform>
           <BindProperty>visible</BindProperty>
         </Connection>
@@ -47,24 +47,24 @@ Variables:
         <NumberStates>2</NumberStates>
         <RightClickIsPushButton>true</RightClickIsPushButton>
         <Connection>
-          <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+          <ConfigKey>[<Variable name="FxRack_FxUnit"/>],focused_effect</ConfigKey>
           <ButtonState>LeftButton</ButtonState>
           <EmitOnDownPress>true</EmitOnDownPress>
           <Transform><IsEqual><Variable name="FxNum"/></IsEqual><Not/></Transform>
         </Connection>
         <Connection>
-          <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+          <ConfigKey>[<Variable name="FxRack_FxUnit"/>],focused_effect</ConfigKey>
           <ButtonState>RightButton</ButtonState>
           <EmitOnDownPress>true</EmitOnDownPress>
           <Transform><IsEqual><Variable name="FxNum"/></IsEqual><Not/></Transform>
         </Connection>
         <Connection>
-          <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+          <ConfigKey>[<Variable name="FxRack_FxUnit"/>],focused_effect</ConfigKey>
           <Transform><IsEqual><Variable name="FxNum"/></IsEqual></Transform>
           <ConnectValueFromWidget>false</ConnectValueFromWidget>
         </Connection>
         <Connection>
-          <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+          <ConfigKey>[<Variable name="FxRack_FxUnit"/>],focused_effect</ConfigKey>
           <Transform><IsEqual><Variable name="FxNum"/></IsEqual></Transform>
           <BindProperty>visible</BindProperty>
         </Connection>
diff --git a/res/skins/Tango/fx_master_button.xml b/res/skins/Tango/fx_master_button.xml
index 6be79458390c..6fcdbbc2a27e 100644
--- a/res/skins/Tango/fx_master_button.xml
+++ b/res/skins/Tango/fx_master_button.xml
@@ -14,16 +14,16 @@ Variables:
     <RightClickIsPushButton>false</RightClickIsPushButton>
     <State>
       <Number>0</Number>
-      <Text>FX<Variable name="FxUnitNum"/></Text>
+      <Text>FX<Variable name="FxUnit"/></Text>
       <Alignment>center</Alignment>
     </State>
     <State>
       <Number>1</Number>
-      <Text>FX<Variable name="FxUnitNum"/></Text>
+      <Text>FX<Variable name="FxUnit"/></Text>
       <Alignment>center</Alignment>
     </State>
     <Connection>
-      <ConfigKey>[EffectRack1_EffectUnit<Variable name="FxUnitNum"/>],group_[Master]_enable</ConfigKey>
+      <ConfigKey>[EffectRack1_EffectUnit<Variable name="FxUnit"/>],group_[Master]_enable</ConfigKey>
       <ButtonState>LeftButton</ButtonState>
     </Connection>
   </PushButton>
diff --git a/res/skins/Tango/fx_metaknob.xml b/res/skins/Tango/fx_metaknob.xml
index 88c68a769ca7..08acb6a422f9 100644
--- a/res/skins/Tango/fx_metaknob.xml
+++ b/res/skins/Tango/fx_metaknob.xml
@@ -8,7 +8,7 @@ Variables:
   FxNum       : EffectX
 -->
 <Template>
-  <SetVariable name="FxGroup_FxNum">[<Variable name="FxGroup"/>_Effect<Variable name="FxNum"/>]</SetVariable>
+  <SetVariable name="FxRack_FxUnit_FxNum">[<Variable name="FxRack_FxUnit"/>_Effect<Variable name="FxNum"/>]</SetVariable>
   <KnobComposed>
     <TooltipId>EffectSlot_metaknob</TooltipId>
     <ObjectName>FxMetaknob</ObjectName>
@@ -18,7 +18,7 @@ Variables:
     <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
     <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
     <Connection>
-      <ConfigKey><Variable name="FxGroup_FxNum"/>,meta</ConfigKey>
+      <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,meta</ConfigKey>
     </Connection>
   </KnobComposed>
 </Template>
diff --git a/res/skins/Tango/fx_parameter_button.xml b/res/skins/Tango/fx_parameter_button.xml
index e72c7447123a..e7748074ebd5 100644
--- a/res/skins/Tango/fx_parameter_button.xml
+++ b/res/skins/Tango/fx_parameter_button.xml
@@ -4,16 +4,15 @@ Description:
   Stacked layout of invisible button, parameter name
   and button display underneath.
 Variables:
-  FxRackNum     : rack number
-  FxUnitNum     : unit number
-  FxGroup_FxNum : EffectRack1_EffectUnitX_EffectY
+  FxRack     : rack number
+  FxUnit     : unit number
+  FxRack_FxUnit_FxNum : EffectRack1_EffectUnitX_EffectY
   FxNum         : effect number
   parameter     : the parameter
 -->
 <Template>
-  <SetVariable name="group">EffectUnit<Variable name="FxUnitNum"/></SetVariable>
-  <SetVariable name="FxGroup">EffectRack1_EffectUnit<Variable name="FxUnitNum"/></SetVariable>
-  <SetVariable name="FxGroup_FxNum">[<Variable name="FxGroup"/>_Effect<Variable name="FxNum"/>]</SetVariable>
+  <SetVariable name="FxRack_FxUnit_FxNum">[<Variable name="FxRack_FxUnit"/>_Effect<Variable name="FxNum"/>]</SetVariable>
+
   <WidgetGroup>
     <Layout>stacked</Layout>
     <ObjectName>FxParameterButton</ObjectName>
@@ -36,8 +35,8 @@ Variables:
           <EffectButtonParameterName>
             <SizePolicy>min,me</SizePolicy>
             <ObjectName>FxParameterButtonName_inactive</ObjectName>
-            <EffectRack><Variable name="FxRackNum"/></EffectRack>
-            <EffectUnit><Variable name="FxUnitNum"/></EffectUnit>
+            <EffectRack><Variable name="FxRack"/></EffectRack>
+            <EffectUnit><Variable name="FxUnit"/></EffectUnit>
             <Effect><Variable name="FxNum"/></Effect>
             <EffectButtonParameter><Variable name="parameter"/></EffectButtonParameter>
             <Alignment>center</Alignment>
@@ -45,7 +44,7 @@ Variables:
           <WidgetGroup><SizePolicy>me,min</SizePolicy></WidgetGroup>
         </Children>
         <Connection>
-          <ConfigKey><Variable name="FxGroup_FxNum"/>,button_parameter<Variable name="parameter"/></ConfigKey>
+          <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,button_parameter<Variable name="parameter"/></ConfigKey>
           <Transform><IsEqual>0</IsEqual></Transform>
           <BindProperty>visible</BindProperty>
         </Connection>
@@ -60,8 +59,8 @@ Variables:
           <EffectButtonParameterName>
             <SizePolicy>min,me</SizePolicy>
             <ObjectName>FxParameterButtonName_active</ObjectName>
-            <EffectRack><Variable name="FxRackNum"/></EffectRack>
-            <EffectUnit><Variable name="FxUnitNum"/></EffectUnit>
+            <EffectRack><Variable name="FxRack"/></EffectRack>
+            <EffectUnit><Variable name="FxUnit"/></EffectUnit>
             <Effect><Variable name="FxNum"/></Effect>
             <EffectButtonParameter><Variable name="parameter"/></EffectButtonParameter>
             <Alignment>center</Alignment>
@@ -69,7 +68,7 @@ Variables:
           <WidgetGroup><SizePolicy>me,min</SizePolicy></WidgetGroup>
         </Children>
         <Connection>
-          <ConfigKey><Variable name="FxGroup_FxNum"/>,button_parameter<Variable name="parameter"/></ConfigKey>
+          <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,button_parameter<Variable name="parameter"/></ConfigKey>
           <Transform><IsEqual>1</IsEqual></Transform>
           <BindProperty>visible</BindProperty>
         </Connection>
@@ -84,7 +83,7 @@ Variables:
     </Children>
     <!-- show only if button parameter is loaded -->
     <Connection>
-      <ConfigKey><Variable name="FxGroup_FxNum"/>,button_parameter<Variable name="parameter"/>_loaded</ConfigKey>
+      <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,button_parameter<Variable name="parameter"/>_loaded</ConfigKey>
       <BindProperty>visible</BindProperty>
     </Connection>
   </WidgetGroup>
diff --git a/res/skins/Tango/fx_parameter_knob.xml b/res/skins/Tango/fx_parameter_knob.xml
index aa9a82f07a20..1be1d9f90397 100644
--- a/res/skins/Tango/fx_parameter_knob.xml
+++ b/res/skins/Tango/fx_parameter_knob.xml
@@ -10,6 +10,8 @@ Variables:
   parameter     : the parameter
 -->
 <Template>
+  <SetVariable name="FxRack_FxUnit_FxNum">[<Variable name="FxRack_FxUnit"/>_Effect<Variable name="FxNum"/>]</SetVariable>
+
   <WidgetGroup>
     <Layout>vertical</Layout>
     <Size>52f,45f</Size>
@@ -33,7 +35,7 @@ Variables:
                 <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
                 <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
                 <Connection>
-                  <ConfigKey><Variable name="FxGroup_FxNum"/>,parameter<Variable name="parameter"/></ConfigKey>
+                  <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="parameter"/></ConfigKey>
                 </Connection>
               </EffectParameterKnobComposed>
             </Children>
@@ -43,13 +45,13 @@ Variables:
             <Size>51f,34f</Size>
             <Layout>horizontal</Layout>
             <Children>
-              <!-- To keep text centered it's in an container with spacer on the left/right -->
+              <!-- To keep text centered it's in an container with spacers on the left/right -->
               <WidgetGroup><SizePolicy>me,min</SizePolicy></WidgetGroup>
               <EffectParameterName>
                 <ObjectName>FxParameterKnobName</ObjectName>
                 <Size>-1min,34f</Size>
-                <EffectRack><Variable name="FxRackNum"/></EffectRack>
-                <EffectUnit><Variable name="FxUnitNum"/></EffectUnit>
+                <EffectRack><Variable name="FxRack"/></EffectRack>
+                <EffectUnit><Variable name="FxUnit"/></EffectUnit>
                 <Effect><Variable name="FxNum"/></Effect>
                 <EffectParameter><Variable name="parameter"/></EffectParameter>
                 <Alignment>left</Alignment>
@@ -67,7 +69,7 @@ Variables:
         <SetVariable name="TooltipId">EffectSlot_parameter_link_type</SetVariable>
         <SetVariable name="ObjectName">FxSuperLinkButton</SetVariable>
         <SetVariable name="Size">51f,5f</SetVariable>
-        <SetVariable name="ConfigKey"><Variable name="FxGroup_FxNum"/>,parameter<Variable name="parameter"/>_link_type</SetVariable>
+        <SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="parameter"/>_link_type</SetVariable>
       </Template>
 
       <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
@@ -77,13 +79,13 @@ Variables:
         <SetVariable name="TooltipId">EffectSlot_parameter_inversion</SetVariable>
         <SetVariable name="ObjectName">FxSuperLinkInvertButton</SetVariable>
         <SetVariable name="Size">51f,5f</SetVariable>
-        <SetVariable name="ConfigKey"><Variable name="FxGroup_FxNum"/>,parameter<Variable name="parameter"/>_link_inverse</SetVariable>
+        <SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="parameter"/>_link_inverse</SetVariable>
       </Template>
 
     </Children>
     <!-- show only if parameter is loaded -->
     <Connection>
-      <ConfigKey><Variable name="FxGroup_FxNum"/>,parameter<Variable name="parameter"/>_loaded</ConfigKey>
+      <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="parameter"/>_loaded</ConfigKey>
       <BindProperty>visible</BindProperty>
     </Connection>
   </WidgetGroup>
diff --git a/res/skins/Tango/fx_parameter_row.xml b/res/skins/Tango/fx_parameter_row.xml
index 3269cb5643d8..5a4b189dd272 100644
--- a/res/skins/Tango/fx_parameter_row.xml
+++ b/res/skins/Tango/fx_parameter_row.xml
@@ -1,12 +1,11 @@
 <!--
 Description:
   A row of up to 8 effect parameter knobs and up to 8 parameter buttons.
-Variables:
-  FxGroup : EffectRack1_EffectUnitX
+Variables passed through from fx_unit:
+  FxRack_FxUnit : EffectRack1_EffectUnitX
   FxNum   : effect number
 -->
 <Template>
-  <SetVariable name="FxGroup_FxNum">[<Variable name="FxGroup"/>_Effect<Variable name="FxNum"/>]</SetVariable>
   <WidgetGroup>
     <ObjectName>FxParameters</ObjectName>
     <Layout>horizontal</Layout>
diff --git a/res/skins/Tango/fx_toggle_selector.xml b/res/skins/Tango/fx_toggle_selector.xml
index 26d14c2bb311..cb28bfa1787a 100644
--- a/res/skins/Tango/fx_toggle_selector.xml
+++ b/res/skins/Tango/fx_toggle_selector.xml
@@ -6,13 +6,13 @@ Description:
   * enable feedback
   * effect selector drop-down list
 Variables:
-  FxRack    : effect rack number
-  FxUnitNum : effect unit number
-  FxGroup   : EffectRack1_EffectUnitX
-  FxNum     : effect number
+  FxRack        : effect rack number
+  FxUnitNum     : effect unit number
+  FxRack_FxUnit : EffectRack1_EffectUnitX
+  FxNum         : effect number
 -->
 <Template>
-  <SetVariable name="FxGroup_FxNum">[<Variable name="FxGroup"/>_Effect<Variable name="FxNum"/>]</SetVariable>
+  <SetVariable name="FxRack_FxUnit_FxNum">[<Variable name="FxRack_FxUnit"/>_Effect<Variable name="FxNum"/>]</SetVariable>
   <WidgetGroup>
     <ObjectName>FxToggleSelector</ObjectName>
     <Layout>stacked</Layout>
@@ -23,7 +23,7 @@ Variables:
         <SetVariable name="TooltipId">EffectSlot_enabled</SetVariable>
         <SetVariable name="ObjectName">FxToggleButton</SetVariable>
         <SetVariable name="Size">71f,20f</SetVariable>
-        <SetVariable name="ConfigKey"><Variable name="FxGroup_FxNum"/>,enabled</SetVariable>
+        <SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,enabled</SetVariable>
       </Template>
 
       <WidgetGroup>
@@ -34,8 +34,8 @@ Variables:
           <WidgetGroup><Size>0me,1min</Size></WidgetGroup>
           <EffectName>
             <ObjectName>FxName</ObjectName>
-            <EffectRack><Variable name="FxRackNum"/></EffectRack>
-            <EffectUnit><Variable name="FxUnitNum"/></EffectUnit>
+            <EffectRack><Variable name="FxRack"/></EffectRack>
+            <EffectUnit><Variable name="FxUnit"/></EffectUnit>
             <Effect><Variable name="FxNum"/></Effect>
           </EffectName>
           <WidgetGroup><Size>0me,1min</Size></WidgetGroup>
@@ -46,13 +46,13 @@ Variables:
       <Template src="skin:button_2state.xml">
         <SetVariable name="ObjectName">FxToggleButtonUnderlay</SetVariable>
         <SetVariable name="Size">71f,20f</SetVariable>
-        <SetVariable name="ConfigKey"><Variable name="FxGroup_FxNum"/>,enabled</SetVariable>
+        <SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,enabled</SetVariable>
       </Template>
 
       <EffectSelector>
         <Size>82f,20f</Size>
-        <EffectRack><Variable name="FxRackNum"/></EffectRack>
-        <EffectUnit><Variable name="FxUnitNum"/></EffectUnit>
+        <EffectRack><Variable name="FxRack"/></EffectRack>
+        <EffectUnit><Variable name="FxUnit"/></EffectUnit>
         <Effect><Variable name="FxNum"/></Effect>
       </EffectSelector>
 
diff --git a/res/skins/Tango/fx_unit_left.xml b/res/skins/Tango/fx_unit_left.xml
index f9f41c23fc6d..54ef0299821e 100644
--- a/res/skins/Tango/fx_unit_left.xml
+++ b/res/skins/Tango/fx_unit_left.xml
@@ -5,11 +5,11 @@ Description:
   * mixer with Wet/Dry knob and Super knob (optional)
   * assignment buttons for master & headphone
 Variables:
-  FxUnitNum:   number of effect unit for FX label
+  FxUnit:   number of effect unit for FX label
 -->
 <Template>
-  <SetVariable name="FxGroup">EffectRack1_EffectUnit<Variable name="FxUnitNum"/></SetVariable>
-  <SetVariable name="group">EffectUnit<Variable name="FxUnitNum"/></SetVariable>
+  <SetVariable name="FxRack_FxUnit">EffectRack<Variable name="FxRack"/>_EffectUnit<Variable name="FxUnit"/></SetVariable>
+
   <WidgetGroup><!-- EffectUnit -->
     <Layout>horizontal</Layout>
     <SizePolicy>me,min</SizePolicy>
@@ -83,7 +83,7 @@ Variables:
                 <ObjectName>FxFlowUnderlay_left_focus1</ObjectName>
                 <Size>1me,53f</Size>
                 <Connection>
-                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <ConfigKey>[<Variable name="FxRack_FxUnit"/>],focused_effect</ConfigKey>
                   <BindProperty>highlight</BindProperty>
                   <Transform><IsEqual>1</IsEqual></Transform>
                 </Connection>
@@ -93,7 +93,7 @@ Variables:
                 <ObjectName>FxFlowUnderlay_left_focus2</ObjectName>
                 <Size>1me,99f</Size>
                 <Connection>
-                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <ConfigKey>[<Variable name="FxRack_FxUnit"/>],focused_effect</ConfigKey>
                   <BindProperty>highlight</BindProperty>
                   <Transform><IsEqual>2</IsEqual></Transform>
                 </Connection>
@@ -103,7 +103,7 @@ Variables:
                 <ObjectName>FxFlowUnderlay_left_focus3</ObjectName>
                 <Size>1me,137f</Size>
                 <Connection>
-                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <ConfigKey>[<Variable name="FxRack_FxUnit"/>],focused_effect</ConfigKey>
                   <BindProperty>highlight</BindProperty>
                   <Transform><IsEqual>3</IsEqual></Transform>
                 </Connection>
@@ -112,7 +112,7 @@ Variables:
           </WidgetGroup><!-- /Underlays with focus -->
         </Children>
         <Connection>
-          <ConfigKey>[<Variable name="FxGroup"/>],show_focus</ConfigKey>
+          <ConfigKey>[<Variable name="FxRack_FxUnit"/>],show_focus</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
       </WidgetGroup><!-- /EffectSlots + Underlays, with focus button -->
@@ -193,7 +193,7 @@ Variables:
           </WidgetGroup><!-- /Underlays, no focus -->
         </Children>
         <Connection>
-          <ConfigKey>[<Variable name="FxGroup"/>],show_focus</ConfigKey>
+          <ConfigKey>[<Variable name="FxRack_FxUnit"/>],show_focus</ConfigKey>
           <Transform><Not/></Transform>
           <BindProperty>visible</BindProperty>
         </Connection>
@@ -208,7 +208,7 @@ Variables:
             <SetVariable name="ObjectName">FxSamplersMiniMaxi</SetVariable>
             <SetVariable name="TooltipId">EffectUnit_show_parameters</SetVariable>
             <SetVariable name="Size">22min,14f</SetVariable>
-            <SetVariable name="ConfigKey">[<Variable name="FxGroup"/>],show_parameters</SetVariable>
+            <SetVariable name="ConfigKey">[<Variable name="FxRack_FxUnit"/>],show_parameters</SetVariable>
           </Template>
 
           <Label>
@@ -217,7 +217,7 @@ Variables:
                 there, it has a 4px spacer above. here, we need some margin
                 to FX mixer below. Text is centerd vertically -->
             <Size>30min,20f</Size>
-            <Text>FX<Variable name="FxUnitNum"/></Text>
+            <Text>FX<Variable name="FxUnit"/></Text>
             <Alignment>center</Alignment>
           </Label>
 
@@ -233,7 +233,7 @@ Variables:
                 <SetVariable name="TooltipId">EffectUnit_mix</SetVariable>
                 <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
                 <SetVariable name="Size">30f,30f</SetVariable>
-                <SetVariable name="group">[<Variable name="FxGroup"/>]</SetVariable>
+                <SetVariable name="group">[<Variable name="FxRack_FxUnit"/>]</SetVariable>
                 <SetVariable name="ConfigKey">mix</SetVariable>
                 <SetVariable name="Color">red</SetVariable>
               </Template>
@@ -248,7 +248,7 @@ Variables:
                     <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
                     <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
                     <SetVariable name="Size">30f,30f</SetVariable>
-                    <SetVariable name="group">[<Variable name="FxGroup"/>]</SetVariable>
+                    <SetVariable name="group">[<Variable name="FxRack_FxUnit"/>]</SetVariable>
                     <SetVariable name="ConfigKey">super1</SetVariable>
                     <SetVariable name="Color">blue</SetVariable>
                   </Template>
@@ -299,7 +299,7 @@ Variables:
                         <SetVariable name="state_0_unpressed">pfl_off.svg</SetVariable>
                         <SetVariable name="state_1_pressed">pfl_on.svg</SetVariable>
                         <SetVariable name="state_1_unpressed">pfl_on.svg</SetVariable>
-                        <SetVariable name="ConfigKey">[EffectRack1_EffectUnit<Variable name="FxUnitNum"/>],group_[Headphone]_enable</SetVariable>
+                        <SetVariable name="ConfigKey">[<Variable name="FxRack_FxUnit"/>],group_[Headphone]_enable</SetVariable>
                       </Template>
                     </Children>
                   </WidgetGroup>
diff --git a/res/skins/Tango/fx_unit_left_mini.xml b/res/skins/Tango/fx_unit_left_mini.xml
index bb4af06f9a51..2fd2307f30a5 100644
--- a/res/skins/Tango/fx_unit_left_mini.xml
+++ b/res/skins/Tango/fx_unit_left_mini.xml
@@ -5,11 +5,11 @@ Description:
   * mixer with Wet/Dry knob and Super knob (optional)
   * assignment buttons for master & headphone
 Variables:
-  FxUnitNum:   number of effect unit for FX label
+  FxUnit:   number of effect unit for FX label
 -->
 <Template>
-  <SetVariable name="FxGroup">EffectRack1_EffectUnit<Variable name="FxUnitNum"/></SetVariable>
-  <SetVariable name="group">EffectUnit<Variable name="FxUnitNum"/></SetVariable>
+  <SetVariable name="FxRack_FxUnit">EffectRack<Variable name="FxRack"/>_EffectUnit<Variable name="FxUnit"/></SetVariable>
+
   <WidgetGroup>
     <Layout>horizontal</Layout>
     <SizePolicy>me,max</SizePolicy>
@@ -82,7 +82,7 @@ Variables:
           </WidgetGroup><!-- /Underlays, no focus -->
         </Children>
         <Connection>
-          <ConfigKey>[<Variable name="FxGroup"/>],show_focus</ConfigKey>
+          <ConfigKey>[<Variable name="FxRack_FxUnit"/>],show_focus</ConfigKey>
           <Transform><Not/></Transform>
           <BindProperty>visible</BindProperty>
         </Connection>
@@ -140,7 +140,7 @@ Variables:
                 <ObjectName>FxFlowUnderlay_mini_focus1</ObjectName>
                 <Size>134f,30f</Size>
                 <Connection>
-                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <ConfigKey>[<Variable name="FxRack_FxUnit"/>],focused_effect</ConfigKey>
                   <Transform><IsEqual>1</IsEqual></Transform>
                   <BindProperty>highlight</BindProperty>
                 </Connection>
@@ -150,7 +150,7 @@ Variables:
                 <ObjectName>FxFlowUnderlay_mini_focus2</ObjectName>
                 <Size>268f,30f</Size>
                 <Connection>
-                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <ConfigKey>[<Variable name="FxRack_FxUnit"/>],focused_effect</ConfigKey>
                   <Transform><IsEqual>2</IsEqual></Transform>
                   <BindProperty>highlight</BindProperty>
                 </Connection>
@@ -160,7 +160,7 @@ Variables:
                 <ObjectName>FxFlowUnderlay_mini_focus3</ObjectName>
                 <Size>402f,30f</Size>
                 <Connection>
-                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <ConfigKey>[<Variable name="FxRack_FxUnit"/>],focused_effect</ConfigKey>
                   <Transform><IsEqual>3</IsEqual></Transform>
                   <BindProperty>highlight</BindProperty>
                 </Connection>
@@ -169,7 +169,7 @@ Variables:
           </WidgetGroup><!-- /Underlays with focus -->
         </Children>
         <Connection>
-          <ConfigKey>[<Variable name="FxGroup"/>],show_focus</ConfigKey>
+          <ConfigKey>[<Variable name="FxRack_FxUnit"/>],show_focus</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
       </WidgetGroup><!-- /EffectSlots + Underlays, with focus -->
@@ -212,7 +212,7 @@ Variables:
                     <SetVariable name="state_0_unpressed">pfl_off.svg</SetVariable>
                     <SetVariable name="state_1_pressed">pfl_on.svg</SetVariable>
                     <SetVariable name="state_1_unpressed">pfl_on.svg</SetVariable>
-                    <SetVariable name="ConfigKey">[EffectRack1_EffectUnit<Variable name="FxUnitNum"/>],group_[Headphone]_enable</SetVariable>
+                    <SetVariable name="ConfigKey">[EffectRack1_EffectUnit<Variable name="FxUnit"/>],group_[Headphone]_enable</SetVariable>
                   </Template>
                 </Children>
               </WidgetGroup>
@@ -227,7 +227,7 @@ Variables:
                 <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
                 <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
                 <SetVariable name="Size">30f,30f</SetVariable>
-                <SetVariable name="group">[<Variable name="FxGroup"/>]</SetVariable>
+                <SetVariable name="group">[<Variable name="FxRack_FxUnit"/>]</SetVariable>
                 <SetVariable name="ConfigKey">super1</SetVariable>
                 <SetVariable name="Color">blue</SetVariable>
               </Template>
@@ -242,7 +242,7 @@ Variables:
             <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
             <SetVariable name="TooltipId">EffectUnit_mix</SetVariable>
             <SetVariable name="Size">30f,30f</SetVariable>
-            <SetVariable name="group">[<Variable name="FxGroup"/>]</SetVariable>
+            <SetVariable name="group">[<Variable name="FxRack_FxUnit"/>]</SetVariable>
             <SetVariable name="ConfigKey">mix</SetVariable>
             <SetVariable name="Color">red</SetVariable>
           </Template>
@@ -263,11 +263,11 @@ Variables:
                 <SetVariable name="ObjectName">FxSamplersMiniMaxi</SetVariable>
                 <SetVariable name="TooltipId">EffectUnit_show_parameters</SetVariable>
                 <SetVariable name="Size">28f,14f</SetVariable>
-                <SetVariable name="ConfigKey">[<Variable name="FxGroup"/>],show_parameters</SetVariable>
+                <SetVariable name="ConfigKey">[<Variable name="FxRack_FxUnit"/>],show_parameters</SetVariable>
               </Template>
             </Children>
             <Connection>
-              <ConfigKey>[<Variable name="FxGroup"/>],show_focus</ConfigKey>
+              <ConfigKey>[<Variable name="FxRack_FxUnit"/>],show_focus</ConfigKey>
               <Transform><Not/></Transform>
               <BindProperty>visible</BindProperty>
             </Connection>
@@ -285,11 +285,11 @@ Variables:
                     <SetVariable name="ObjectName">FxSamplersMiniMaxi</SetVariable>
                     <SetVariable name="TooltipId">EffectUnit_show_parameters</SetVariable>
                     <SetVariable name="Size">28f,14f</SetVariable>
-                    <SetVariable name="ConfigKey">[<Variable name="FxGroup"/>],show_parameters</SetVariable>
+                    <SetVariable name="ConfigKey">[<Variable name="FxRack_FxUnit"/>],show_parameters</SetVariable>
                   </Template>
                 </Children>
                 <Connection>
-                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <ConfigKey>[<Variable name="FxRack_FxUnit"/>],focused_effect</ConfigKey>
                   <Transform><IsEqual>0</IsEqual></Transform>
                   <BindProperty>visible</BindProperty>
                 </Connection>
@@ -303,18 +303,18 @@ Variables:
                     <SetVariable name="ObjectName">FxSamplersMiniMaxi_Focus</SetVariable>
                     <SetVariable name="TooltipId">EffectUnit_show_parameters</SetVariable>
                     <SetVariable name="Size">28f,14f</SetVariable>
-                    <SetVariable name="ConfigKey">[<Variable name="FxGroup"/>],show_parameters</SetVariable>
+                    <SetVariable name="ConfigKey">[<Variable name="FxRack_FxUnit"/>],show_parameters</SetVariable>
                   </Template>
                 </Children>
                 <Connection>
-                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <ConfigKey>[<Variable name="FxRack_FxUnit"/>],focused_effect</ConfigKey>
                   <Transform><IsEqual>0</IsEqual><Not/></Transform>
                   <BindProperty>visible</BindProperty>
                 </Connection>
               </WidgetGroup>
             </Children>
             <Connection>
-              <ConfigKey>[<Variable name="FxGroup"/>],show_focus</ConfigKey>
+              <ConfigKey>[<Variable name="FxRack_FxUnit"/>],show_focus</ConfigKey>
               <BindProperty>visible</BindProperty>
             </Connection>
           </WidgetGroup><!-- /FX expand button when focus is shown -->
@@ -325,7 +325,7 @@ Variables:
           <Label>
             <ObjectName>FxUnitLabel</ObjectName>
             <Size>28f,12f</Size>
-            <Text>FX<Variable name="FxUnitNum"/></Text>
+            <Text>FX<Variable name="FxUnit"/></Text>
             <Alignment>center</Alignment>
           </Label>
         </Children>
diff --git a/res/skins/Tango/fx_unit_right.xml b/res/skins/Tango/fx_unit_right.xml
index 67f3f54289b2..3ba159e175c8 100644
--- a/res/skins/Tango/fx_unit_right.xml
+++ b/res/skins/Tango/fx_unit_right.xml
@@ -5,11 +5,11 @@ Description:
   * mixer with Wet/Dry knob and Super knob (optional)
   * assignment buttons for master & headphone
 Variables:
-  FxUnitNum: number of effect unit for FX label
+  FxUnit: number of effect unit for FX label
 -->
 <Template>
-  <SetVariable name="FxGroup">EffectRack1_EffectUnit<Variable name="FxUnitNum"/></SetVariable>
-  <SetVariable name="group">EffectUnit<Variable name="FxUnitNum"/></SetVariable>
+  <SetVariable name="FxRack_FxUnit">EffectRack<Variable name="FxRack"/>_EffectUnit<Variable name="FxUnit"/></SetVariable>
+
   <WidgetGroup>
     <Layout>horizontal</Layout>
     <SizePolicy>me,min</SizePolicy>
@@ -24,7 +24,7 @@ Variables:
             <SetVariable name="ObjectName">FxSamplersMiniMaxi</SetVariable>
             <SetVariable name="TooltipId">EffectUnit_show_parameters</SetVariable>
             <SetVariable name="Size">22me,14f</SetVariable>
-            <SetVariable name="ConfigKey">[<Variable name="FxGroup"/>],show_parameters</SetVariable>
+            <SetVariable name="ConfigKey">[<Variable name="FxRack_FxUnit"/>],show_parameters</SetVariable>
           </Template>
 
           <Label>
@@ -33,7 +33,7 @@ Variables:
                 there, it has a 4px spacer above. here, we need some margin
                 to FX mixer below. Text is centerd vertically -->
             <Size>30min,20f</Size>
-            <Text>FX<Variable name="FxUnitNum"/></Text>
+            <Text>FX<Variable name="FxUnit"/></Text>
             <Alignment>center</Alignment>
           </Label>
 
@@ -49,7 +49,7 @@ Variables:
                 <SetVariable name="TooltipId">EffectUnit_mix</SetVariable>
                 <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
                 <SetVariable name="Size">30f,30f</SetVariable>
-                <SetVariable name="group">[<Variable name="FxGroup"/>]</SetVariable>
+                <SetVariable name="group">[<Variable name="FxRack_FxUnit"/>]</SetVariable>
                 <SetVariable name="ConfigKey">mix</SetVariable>
                 <SetVariable name="Color">red</SetVariable>
               </Template>
@@ -64,7 +64,7 @@ Variables:
                     <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
                     <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
                     <SetVariable name="Size">30f,30f</SetVariable>
-                    <SetVariable name="group">[<Variable name="FxGroup"/>]</SetVariable>
+                    <SetVariable name="group">[<Variable name="FxRack_FxUnit"/>]</SetVariable>
                     <SetVariable name="ConfigKey">super1</SetVariable>
                     <SetVariable name="Color">blue</SetVariable>
                   </Template>
@@ -115,7 +115,7 @@ Variables:
                         <SetVariable name="state_0_unpressed">pfl_off.svg</SetVariable>
                         <SetVariable name="state_1_pressed">pfl_on.svg</SetVariable>
                         <SetVariable name="state_1_unpressed">pfl_on.svg</SetVariable>
-                        <SetVariable name="ConfigKey">[EffectRack1_EffectUnit<Variable name="FxUnitNum"/>],group_[Headphone]_enable</SetVariable>
+                        <SetVariable name="ConfigKey">[<Variable name="FxRack_FxUnit"/>],group_[Headphone]_enable</SetVariable>
                       </Template>
                     </Children>
                   </WidgetGroup>
@@ -194,7 +194,7 @@ Variables:
                 <ObjectName>FxFlowUnderlay_right_focus1</ObjectName>
                 <Size>1me,53f</Size>
                 <Connection>
-                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <ConfigKey>[<Variable name="FxRack_FxUnit"/>],focused_effect</ConfigKey>
                   <BindProperty>highlight</BindProperty>
                   <Transform><IsEqual>1</IsEqual></Transform>
                 </Connection>
@@ -204,7 +204,7 @@ Variables:
                 <ObjectName>FxFlowUnderlay_right_focus2</ObjectName>
                 <Size>1me,99f</Size>
                 <Connection>
-                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <ConfigKey>[<Variable name="FxRack_FxUnit"/>],focused_effect</ConfigKey>
                   <BindProperty>highlight</BindProperty>
                   <Transform><IsEqual>2</IsEqual></Transform>
                 </Connection>
@@ -214,7 +214,7 @@ Variables:
                 <ObjectName>FxFlowUnderlay_right_focus3</ObjectName>
                 <Size>1me,137f</Size>
                 <Connection>
-                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <ConfigKey>[<Variable name="FxRack_FxUnit"/>],focused_effect</ConfigKey>
                   <BindProperty>highlight</BindProperty>
                   <Transform><IsEqual>3</IsEqual></Transform>
                 </Connection>
@@ -223,7 +223,7 @@ Variables:
           </WidgetGroup><!-- /Underlays with focus -->
         </Children>
         <Connection>
-          <ConfigKey>[<Variable name="FxGroup"/>],show_focus</ConfigKey>
+          <ConfigKey>[<Variable name="FxRack_FxUnit"/>],show_focus</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
       </WidgetGroup><!-- /EffectSlots + Underlays, with focus button -->
@@ -304,7 +304,7 @@ Variables:
           </WidgetGroup><!-- /Underlays, no focus -->
         </Children>
         <Connection>
-          <ConfigKey>[<Variable name="FxGroup"/>],show_focus</ConfigKey>
+          <ConfigKey>[<Variable name="FxRack_FxUnit"/>],show_focus</ConfigKey>
           <Transform><Not/></Transform>
           <BindProperty>visible</BindProperty>
         </Connection>
diff --git a/res/skins/Tango/fx_unit_right_mini.xml b/res/skins/Tango/fx_unit_right_mini.xml
index 8f139352fa07..4a8f8e39a97e 100644
--- a/res/skins/Tango/fx_unit_right_mini.xml
+++ b/res/skins/Tango/fx_unit_right_mini.xml
@@ -5,11 +5,11 @@ Description:
   * mixer with Wet/Dry knob and Super knob (optional)
   * assignment buttons for master & headphone
 Variables:
-  FxUnitNum:   number of effect unit for FX label
+  FxUnit:   number of effect unit for FX label
 -->
 <Template>
-  <SetVariable name="FxGroup">EffectRack1_EffectUnit<Variable name="FxUnitNum"/></SetVariable>
-  <SetVariable name="group">EffectUnit<Variable name="FxUnitNum"/></SetVariable>
+  <SetVariable name="FxRack_FxUnit">EffectRack<Variable name="FxRack"/>_EffectUnit<Variable name="FxUnit"/></SetVariable>
+
   <WidgetGroup>
     <Layout>horizontal</Layout>
     <SizePolicy>me,max</SizePolicy>
@@ -27,11 +27,11 @@ Variables:
                 <SetVariable name="ObjectName">FxSamplersMiniMaxi</SetVariable>
                 <SetVariable name="TooltipId">EffectUnit_show_parameters</SetVariable>
                 <SetVariable name="Size">28f,14f</SetVariable>
-                <SetVariable name="ConfigKey">[<Variable name="FxGroup"/>],show_parameters</SetVariable>
+                <SetVariable name="ConfigKey">[<Variable name="FxRack_FxUnit"/>],show_parameters</SetVariable>
               </Template>
             </Children>
             <Connection>
-              <ConfigKey>[<Variable name="FxGroup"/>],show_focus</ConfigKey>
+              <ConfigKey>[<Variable name="FxRack_FxUnit"/>],show_focus</ConfigKey>
               <Transform><Not/></Transform>
               <BindProperty>visible</BindProperty>
             </Connection>
@@ -49,11 +49,11 @@ Variables:
                     <SetVariable name="ObjectName">FxSamplersMiniMaxi</SetVariable>
                     <SetVariable name="TooltipId">EffectUnit_show_parameters</SetVariable>
                     <SetVariable name="Size">28f,14f</SetVariable>
-                    <SetVariable name="ConfigKey">[<Variable name="FxGroup"/>],show_parameters</SetVariable>
+                    <SetVariable name="ConfigKey">[<Variable name="FxRack_FxUnit"/>],show_parameters</SetVariable>
                   </Template>
                 </Children>
                 <Connection>
-                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <ConfigKey>[<Variable name="FxRack_FxUnit"/>],focused_effect</ConfigKey>
                   <Transform><IsEqual>0</IsEqual></Transform>
                   <BindProperty>visible</BindProperty>
                 </Connection>
@@ -67,18 +67,18 @@ Variables:
                     <SetVariable name="ObjectName">FxSamplersMiniMaxi_Focus</SetVariable>
                     <SetVariable name="TooltipId">EffectUnit_show_parameters</SetVariable>
                     <SetVariable name="Size">28f,14f</SetVariable>
-                    <SetVariable name="ConfigKey">[<Variable name="FxGroup"/>],show_parameters</SetVariable>
+                    <SetVariable name="ConfigKey">[<Variable name="FxRack_FxUnit"/>],show_parameters</SetVariable>
                   </Template>
                 </Children>
                 <Connection>
-                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <ConfigKey>[<Variable name="FxRack_FxUnit"/>],focused_effect</ConfigKey>
                   <Transform><IsEqual>0</IsEqual><Not/></Transform>
                   <BindProperty>visible</BindProperty>
                 </Connection>
               </WidgetGroup>
             </Children>
             <Connection>
-              <ConfigKey>[<Variable name="FxGroup"/>],show_focus</ConfigKey>
+              <ConfigKey>[<Variable name="FxRack_FxUnit"/>],show_focus</ConfigKey>
               <BindProperty>visible</BindProperty>
             </Connection>
           </WidgetGroup><!-- /FX expand button when focus is shown -->
@@ -88,7 +88,7 @@ Variables:
           <Label>
             <ObjectName>FxUnitLabel</ObjectName>
             <Size>28f,12f</Size>
-            <Text>FX<Variable name="FxUnitNum"/></Text>
+            <Text>FX<Variable name="FxUnit"/></Text>
             <Alignment>center</Alignment>
           </Label>
         </Children>
@@ -106,7 +106,7 @@ Variables:
             <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
             <SetVariable name="TooltipId">EffectUnit_mix</SetVariable>
             <SetVariable name="Size">30f,30f</SetVariable>
-            <SetVariable name="group">[<Variable name="FxGroup"/>]</SetVariable>
+            <SetVariable name="group">[<Variable name="FxRack_FxUnit"/>]</SetVariable>
             <SetVariable name="ConfigKey">mix</SetVariable>
             <SetVariable name="Color">red</SetVariable>
           </Template>
@@ -119,7 +119,7 @@ Variables:
                 <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
                 <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
                 <SetVariable name="Size">30f,30f</SetVariable>
-                <SetVariable name="group">[<Variable name="FxGroup"/>]</SetVariable>
+                <SetVariable name="group">[<Variable name="FxRack_FxUnit"/>]</SetVariable>
                 <SetVariable name="ConfigKey">super1</SetVariable>
                 <SetVariable name="Color">blue</SetVariable>
               </Template>
@@ -162,7 +162,7 @@ Variables:
                     <SetVariable name="state_0_unpressed">pfl_off.svg</SetVariable>
                     <SetVariable name="state_1_pressed">pfl_on.svg</SetVariable>
                     <SetVariable name="state_1_unpressed">pfl_on.svg</SetVariable>
-                    <SetVariable name="ConfigKey">[EffectRack1_EffectUnit<Variable name="FxUnitNum"/>],group_[Headphone]_enable</SetVariable>
+                    <SetVariable name="ConfigKey">[<Variable name="FxRack_FxUnit"/>],group_[Headphone]_enable</SetVariable>
                   </Template>
                 </Children>
               </WidgetGroup>
@@ -234,7 +234,7 @@ Variables:
           </WidgetGroup><!-- /Underlays, no focus -->
         </Children>
         <Connection>
-          <ConfigKey>[<Variable name="FxGroup"/>],show_focus</ConfigKey>
+          <ConfigKey>[<Variable name="FxRack_FxUnit"/>],show_focus</ConfigKey>
           <Transform><Not/></Transform>
           <BindProperty>visible</BindProperty>
         </Connection>
@@ -292,7 +292,7 @@ Variables:
                 <ObjectName>FxFlowUnderlay_mini_focus1</ObjectName>
                 <Size>134f,30f</Size>
                 <Connection>
-                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <ConfigKey>[<Variable name="FxRack_FxUnit"/>],focused_effect</ConfigKey>
                   <Transform><IsEqual>1</IsEqual></Transform>
                   <BindProperty>highlight</BindProperty>
                 </Connection>
@@ -302,7 +302,7 @@ Variables:
                 <ObjectName>FxFlowUnderlay_mini_focus2</ObjectName>
                 <Size>268f,30f</Size>
                 <Connection>
-                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <ConfigKey>[<Variable name="FxRack_FxUnit"/>],focused_effect</ConfigKey>
                   <Transform><IsEqual>2</IsEqual></Transform>
                   <BindProperty>highlight</BindProperty>
                 </Connection>
@@ -312,7 +312,7 @@ Variables:
                 <ObjectName>FxFlowUnderlay_mini_focus3</ObjectName>
                 <Size>402f,30f</Size>
                 <Connection>
-                  <ConfigKey>[<Variable name="FxGroup"/>],focused_effect</ConfigKey>
+                  <ConfigKey>[<Variable name="FxRack_FxUnit"/>],focused_effect</ConfigKey>
                   <Transform><IsEqual>3</IsEqual></Transform>
                   <BindProperty>highlight</BindProperty>
                 </Connection>
@@ -321,7 +321,7 @@ Variables:
           </WidgetGroup><!-- /Underlays with focus -->
         </Children>
         <Connection>
-          <ConfigKey>[<Variable name="FxGroup"/>],show_focus</ConfigKey>
+          <ConfigKey>[<Variable name="FxRack_FxUnit"/>],show_focus</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
       </WidgetGroup><!-- /EffectSlots + Underlays, with focus -->
diff --git a/res/skins/Tango/fx_units_12.xml b/res/skins/Tango/fx_units_12.xml
index dd8e47021810..c891d379ca3f 100644
--- a/res/skins/Tango/fx_units_12.xml
+++ b/res/skins/Tango/fx_units_12.xml
@@ -4,8 +4,7 @@ Description:
   Units are pushed apart by spacers, see fx_units_spacer.xml.
 -->
 <Template>
-  <SetVariable name="FxRack">EffectRack1</SetVariable>
-  <SetVariable name="FxRackNum">1</SetVariable>
+  <SetVariable name="FxRack">1</SetVariable>
   <WidgetGroup>
     <ObjectName>FxUnits12</ObjectName>
     <SizePolicy>me,max</SizePolicy>
@@ -28,7 +27,7 @@ Description:
             <SizePolicy>min,max</SizePolicy>
             <Children>
               <Template src="skin:fx_unit_left.xml">
-                <SetVariable name="FxUnitNum">1</SetVariable>
+                <SetVariable name="FxUnit">1</SetVariable>
               </Template>
               <WidgetGroup><Size>1min,5f</Size></WidgetGroup>
             </Children>
@@ -39,7 +38,7 @@ Description:
             <SizePolicy>min,me</SizePolicy>
             <Children>
               <Template src="skin:fx_unit_left_mini.xml">
-                <SetVariable name="FxUnitNum">1</SetVariable>
+                <SetVariable name="FxUnit">1</SetVariable>
               </Template>
               <WidgetGroup><Size>1min,5me</Size></WidgetGroup>
             </Children>
@@ -68,7 +67,7 @@ Description:
             <SizePolicy>min,max</SizePolicy>
             <Children>
               <Template src="skin:fx_unit_right.xml">
-                <SetVariable name="FxUnitNum">2</SetVariable>
+                <SetVariable name="FxUnit">2</SetVariable>
               </Template>
               <WidgetGroup><Size>1min,5f</Size></WidgetGroup>
             </Children>
@@ -79,7 +78,7 @@ Description:
             <SizePolicy>min,me</SizePolicy>
             <Children>
               <Template src="skin:fx_unit_right_mini.xml">
-                <SetVariable name="FxUnitNum">2</SetVariable>
+                <SetVariable name="FxUnit">2</SetVariable>
               </Template>
               <WidgetGroup><Size>1min,5me</Size></WidgetGroup>
             </Children>
diff --git a/res/skins/Tango/fx_units_34.xml b/res/skins/Tango/fx_units_34.xml
index 5b3f41d4aa55..357380efa352 100644
--- a/res/skins/Tango/fx_units_34.xml
+++ b/res/skins/Tango/fx_units_34.xml
@@ -4,8 +4,7 @@ Description:
   Units are pushed apart by spacers, see fx_units_spacer.xml.
 -->
 <Template>
-  <SetVariable name="FxRack">EffectRack1</SetVariable>
-  <SetVariable name="FxRackNum">1</SetVariable>
+  <SetVariable name="FxRack">1</SetVariable>
   <WidgetGroup>
     <ObjectName>Spacer1e</ObjectName>
     <SizePolicy>me,max</SizePolicy>
@@ -28,7 +27,7 @@ Description:
             <SizePolicy>min,max</SizePolicy>
             <Children>
               <Template src="skin:fx_unit_left.xml">
-                <SetVariable name="FxUnitNum">3</SetVariable>
+                <SetVariable name="FxUnit">3</SetVariable>
               </Template>
               <WidgetGroup><Size>1min,5f</Size></WidgetGroup>
             </Children>
@@ -39,7 +38,7 @@ Description:
             <SizePolicy>min,me</SizePolicy>
             <Children>
               <Template src="skin:fx_unit_left_mini.xml">
-                <SetVariable name="FxUnitNum">3</SetVariable>
+                <SetVariable name="FxUnit">3</SetVariable>
               </Template>
               <WidgetGroup><Size>1min,5me</Size></WidgetGroup>
             </Children>
@@ -68,7 +67,7 @@ Description:
             <SizePolicy>min,max</SizePolicy>
             <Children>
               <Template src="skin:fx_unit_right.xml">
-                <SetVariable name="FxUnitNum">4</SetVariable>
+                <SetVariable name="FxUnit">4</SetVariable>
               </Template>
               <WidgetGroup><Size>1min,5f</Size></WidgetGroup>
             </Children>
@@ -79,7 +78,7 @@ Description:
             <SizePolicy>min,me</SizePolicy>
             <Children>
               <Template src="skin:fx_unit_right_mini.xml">
-                <SetVariable name="FxUnitNum">4</SetVariable>
+                <SetVariable name="FxUnit">4</SetVariable>
               </Template>
               <WidgetGroup><Size>1min,5me</Size></WidgetGroup>
             </Children>
diff --git a/res/skins/Tango/mic_unit.xml b/res/skins/Tango/mic_unit.xml
index 0759bfa1cf8c..807456738176 100644
--- a/res/skins/Tango/mic_unit.xml
+++ b/res/skins/Tango/mic_unit.xml
@@ -13,6 +13,7 @@ Variables:
 <Template>
   <SetVariable name="sourceType">microphone</SetVariable>
   <SetVariable name="group">[Microphone<Variable name="micNum"/>]</SetVariable>
+  <SetVariable name="FxRack">1</SetVariable>
   <WidgetGroup>
     <ObjectName>AlignCenter</ObjectName>
     <Layout>horizontal</Layout>
@@ -112,12 +113,12 @@ Variables:
                 <Children>
                   <Template src="skin:fx_assign_button.xml">
                     <SetVariable name="Size">26f,16f</SetVariable>
-                    <SetVariable name="FxUnitNum">1</SetVariable>
+                    <SetVariable name="FxUnit">1</SetVariable>
                   </Template>
                     <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
                   <Template src="skin:fx_assign_button.xml">
                     <SetVariable name="Size">26f,16f</SetVariable>
-                    <SetVariable name="FxUnitNum">3</SetVariable>
+                    <SetVariable name="FxUnit">3</SetVariable>
                   </Template>
                 </Children>
               </WidgetGroup>
@@ -130,12 +131,12 @@ Variables:
                 <Children>
                   <Template src="skin:fx_assign_button.xml">
                     <SetVariable name="Size">26f,16f</SetVariable>
-                    <SetVariable name="FxUnitNum">2</SetVariable>
+                    <SetVariable name="FxUnit">2</SetVariable>
                   </Template>
                     <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
                   <Template src="skin:fx_assign_button.xml">
                     <SetVariable name="Size">26f,16f</SetVariable>
-                    <SetVariable name="FxUnitNum">4</SetVariable>
+                    <SetVariable name="FxUnit">4</SetVariable>
                   </Template>
                 </Children>
               </WidgetGroup>
diff --git a/res/skins/Tango/mixer_master_booth.xml b/res/skins/Tango/mixer_master_booth.xml
index c307da487337..5fe555a80a97 100644
--- a/res/skins/Tango/mixer_master_booth.xml
+++ b/res/skins/Tango/mixer_master_booth.xml
@@ -44,6 +44,7 @@ Description:
             <Layout>vertical</Layout>
             <SizePolicy>min,min</SizePolicy>
             <Children>
+              <SetVariable name="FxRack">1</SetVariable>
 
               <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
 
@@ -53,12 +54,12 @@ Description:
                 <Children>
                   <Template src="skin:fx_master_button.xml">
                     <SetVariable name="Size">26f,13f</SetVariable>
-                    <SetVariable name="FxUnitNum">1</SetVariable>
+                    <SetVariable name="FxUnit">1</SetVariable>
                   </Template>
                     <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
                   <Template src="skin:fx_master_button.xml">
                     <SetVariable name="Size">26f,13f</SetVariable>
-                    <SetVariable name="FxUnitNum">2</SetVariable>
+                    <SetVariable name="FxUnit">2</SetVariable>
                   </Template>
                     <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
                 </Children>
@@ -72,12 +73,12 @@ Description:
                 <Children>
                   <Template src="skin:fx_master_button.xml">
                     <SetVariable name="Size">26f,13f</SetVariable>
-                    <SetVariable name="FxUnitNum">3</SetVariable>
+                    <SetVariable name="FxUnit">3</SetVariable>
                   </Template>
                     <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
                   <Template src="skin:fx_master_button.xml">
                     <SetVariable name="Size">26f,13f</SetVariable>
-                    <SetVariable name="FxUnitNum">4</SetVariable>
+                    <SetVariable name="FxUnit">4</SetVariable>
                   </Template>
                     <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
                 </Children>
diff --git a/res/skins/Tango/skin.xml b/res/skins/Tango/skin.xml
index d9c5e44f4db4..9da2c9f7052c 100644
--- a/res/skins/Tango/skin.xml
+++ b/res/skins/Tango/skin.xml
@@ -68,7 +68,7 @@
       <attribute persist="true" config_key="[SamplerRow7],expanded">0</attribute>
       <attribute persist="true" config_key="[SamplerRow8],expanded">0</attribute>
       <!-- [Tango] specific defaults -->
-      <attribute persist="true" config_key="[Tango],4_fx_units">0</attribute>
+      <attribute persist="true" config_key="[Tango],4_FxUnits">0</attribute>
       <!--attribute persist="true" config_key="[Tango],sampler_fx_buttons">1</attribute-->
       <attribute persist="true" config_key="[Tango],beatgrid_buttons">0</attribute>
       <attribute persist="true" config_key="[Tango],deck_controls_expanded">0</attribute>
@@ -183,6 +183,13 @@
       </Children>
     </SingletonDefinition>
 
+    <SingletonDefinition>
+      <ObjectName>FxUnits_12_Singleton</ObjectName>
+      <Children>
+        <Template src="skin:fx_units_12.xml"/>
+      </Children>
+    </SingletonDefinition>
+
 <!--  ################################################################
        SkinContainer  ###############################################
      ############################################################### -->
@@ -252,10 +259,12 @@
                           <Layout>vertical</Layout>
                           <SizePolicy>me,min</SizePolicy>
                           <Children>
-                            <Template src="skin:fx_units_12.xml"/>
+                            <SingletonContainer>
+                              <ObjectName>FxUnits_12_Singleton</ObjectName>
+                            </SingletonContainer>
                           </Children>
                           <Connection>
-                            <ConfigKey persist="true">[Tango],2or4_FxUnits</ConfigKey>
+                            <ConfigKey persist="true">[Tango],4_FxUnits</ConfigKey>
                             <BindProperty>visible</BindProperty>
                           </Connection>
                         </WidgetGroup>
@@ -269,7 +278,7 @@
                             <Template src="skin:fx_units_34.xml"/>
                           </Children>
                           <Connection>
-                            <ConfigKey persist="true">[Tango],2or4_FxUnits</ConfigKey>
+                            <ConfigKey persist="true">[Tango],4_FxUnits</ConfigKey>
                             <BindProperty>visible</BindProperty>
                           </Connection>
                         </WidgetGroup>
@@ -277,10 +286,12 @@
                         <WidgetGroup>
                           <Layout>vertical</Layout>
                           <Children>
-                            <Template src="skin:fx_units_12.xml"/>
+                            <SingletonContainer>
+                              <ObjectName>FxUnits_12_Singleton</ObjectName>
+                            </SingletonContainer>
                           </Children>
                           <Connection>
-                            <ConfigKey persist="true">[Tango],2or4_FxUnits</ConfigKey>
+                            <ConfigKey persist="true">[Tango],4_FxUnits</ConfigKey>
                             <Transform><Not/></Transform>
                             <BindProperty>visible</BindProperty>
                           </Connection>
@@ -326,10 +337,12 @@
           </Children>
         </WidgetGroup><!-- /All skin elements + Skin menu -->
 
-        <!-- Detect if screen (window) size is netbook-like -->
+        <!-- Detect if screen (window) size is netbook-like.
+            Center spacer in top bar will adapt to size. -->
         <Template src="skin:size_detector_screen.xml"/>
 
-        <!-- Detect if Star rating fits into deck buttons row -->
+        <!-- Detect if Star rating fits into deck buttons row.
+            Do this here, so it doesn't interfere with expanded skin menu -->
         <Template src="skin:size_detector_stars.xml"/>
 
       </Children>
diff --git a/res/skins/Tango/skin_settings.xml b/res/skins/Tango/skin_settings.xml
index 42723462acc3..8087edf4179b 100644
--- a/res/skins/Tango/skin_settings.xml
+++ b/res/skins/Tango/skin_settings.xml
@@ -700,13 +700,13 @@ Description:
                             <SetVariable name="state_x_text"> [ 2 ] </SetVariable>
                             <SetVariable name="width">26</SetVariable>
                             <SetVariable name="stateX">0</SetVariable>
-                            <SetVariable name="Setting">[Tango],4_fx_units</SetVariable>
+                            <SetVariable name="Setting">[Tango],4_FxUnits</SetVariable>
                           </Template>
                           <Template src="skin:skin_settings_button_multi.xml">
                             <SetVariable name="state_x_text"> [ 4 ] </SetVariable>
                             <SetVariable name="width">26</SetVariable>
                             <SetVariable name="stateX">1</SetVariable>
-                            <SetVariable name="Setting">[Tango],4_fx_units</SetVariable>
+                            <SetVariable name="Setting">[Tango],4_FxUnits</SetVariable>
                           </Template>
                           <WidgetGroup><Size>0me,1min</Size></WidgetGroup>
                         </Children>
diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index 043ba5e1d02d..b8eac7b71c9a 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -1591,8 +1591,8 @@ decks, samplers, mic, aux */
   #FxParameterButtonUnderlay[displayValue="1"] {
     background-color: #006596;
   }
-  #FxParameterButtonName_0,
-  #FxParameterButtonName_1 {
+  #FxParameterButtonName_inactive,
+  #FxParameterButtonName_active {
     font-size: 10px/10px;
     font-weight: bold;
     qproperty-alignment: 'AlignLeft | AlignVCenter';

From 56cf732893aaf3e15131f4398ef6119fe1b5f034 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Sat, 16 Dec 2017 23:38:28 +0100
Subject: [PATCH 11/19] finally persistent: [EffectRack1],show

With <attribute persist="true" config_key="[EffectRack1],show">1</attribute>
in skin.xml, the effect rack would always show up, but quick toggle in top bar
indicates it's off...
---
 res/skins/Tango/fx_units_12.xml | 14 +++++++++-----
 res/skins/Tango/fx_units_34.xml | 14 +++++++++-----
 res/skins/Tango/skin.xml        |  4 +---
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/res/skins/Tango/fx_units_12.xml b/res/skins/Tango/fx_units_12.xml
index c891d379ca3f..2fa19bf4d222 100644
--- a/res/skins/Tango/fx_units_12.xml
+++ b/res/skins/Tango/fx_units_12.xml
@@ -45,9 +45,13 @@ Description:
           </WidgetGroup>
 
         </Children>
+        <Connection>
+          <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
       </WidgetStack><!-- /EffectUnit 1 -->
 
-      <WidgetGroup><Size>5f,0min</Size></WidgetGroup>
+      <WidgetGroup><Size>5f,0f</Size></WidgetGroup>
 
       <WidgetGroup>
         <Size>5f,0min</Size>
@@ -85,12 +89,12 @@ Description:
           </WidgetGroup>
 
         </Children>
+        <Connection>
+          <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
       </WidgetStack><!-- /EffectUnit 2 -->
 
     </Children>
-    <Connection>
-      <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
   </WidgetGroup><!-- /EffectUnits 1 & 2 -->
 </Template>
diff --git a/res/skins/Tango/fx_units_34.xml b/res/skins/Tango/fx_units_34.xml
index 357380efa352..816b0fdfd8d6 100644
--- a/res/skins/Tango/fx_units_34.xml
+++ b/res/skins/Tango/fx_units_34.xml
@@ -45,9 +45,13 @@ Description:
           </WidgetGroup>
 
         </Children>
+        <Connection>
+          <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
       </WidgetStack><!-- /EffectUnit 3 -->
 
-      <WidgetGroup><Size>5f,0min</Size></WidgetGroup>
+      <WidgetGroup><Size>5f,0f</Size></WidgetGroup>
 
       <WidgetGroup>
         <Size>5f,0min</Size>
@@ -85,12 +89,12 @@ Description:
           </WidgetGroup>
 
         </Children>
+        <Connection>
+          <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
       </WidgetStack>
 
     </Children>
-    <Connection>
-      <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
   </WidgetGroup><!-- /EffectUnits 3 & 4 -->
 </Template>
diff --git a/res/skins/Tango/skin.xml b/res/skins/Tango/skin.xml
index 9da2c9f7052c..eb0af02d1d91 100644
--- a/res/skins/Tango/skin.xml
+++ b/res/skins/Tango/skin.xml
@@ -53,7 +53,6 @@
       <attribute persist="true" config_key="[Master],maximize_library">0</attribute>
       <attribute persist="true" config_key="[Library],show_coverart">1</attribute>
       <attribute persist="true" config_key="[Library],show_library">1</attribute>
-      <attribute persist="true" config_key="[EffectRack1],show">1</attribute>
       <attribute persist="true" config_key="[Microphone],show_microphone">0</attribute>
       <attribute persist="true" config_key="[PreviewDeck],show_previewdeck">0</attribute>
       <attribute persist="true" config_key="[Samplers],show_samplers">0</attribute>
@@ -74,14 +73,13 @@
       <attribute persist="true" config_key="[Tango],deck_controls_expanded">0</attribute>
       <attribute persist="true" config_key="[Tango],colorLogo">0</attribute>
       <attribute persist="true" config_key="[Tango],crossfader">1</attribute>
-      <attribute persist="true" config_key="[Tango],deck_controls">1</attribute>
       <attribute persist="true" config_key="[Tango],always_visible_keylock">1</attribute>
       <attribute persist="true" config_key="[Tango],always_visible_eject">0</attribute>
       <attribute persist="true" config_key="[Tango],always_visible_slipMode">1</attribute>
       <attribute persist="true" config_key="[Tango],always_visible_repeat">0</attribute>
       <attribute persist="true" config_key="[Tango],always_visible_orientation">0</attribute>
       <attribute persist="true" config_key="[Tango],always_visible_quantize">1</attribute>
-      <attribute persist="true" config_key="[Tango],[Tango],separate_cue_button">1</attribute>
+      <attribute persist="true" config_key="[Tango],separate_cue_button">1</attribute>
       <attribute persist="true" config_key="[Tango],hotcues">1</attribute>
       <attribute persist="true" config_key="[Tango],8_hotcues">0</attribute>
       <attribute persist="true" config_key="[Tango],key_controls">1</attribute>

From 252337bce0c5b5d41eb54821919c5a5e161d9970 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Sun, 17 Dec 2017 01:07:36 +0100
Subject: [PATCH 12/19] make Master & Headphone controls optional

This was the first thing I'd hide when making my personal branch.
To make it discoverable, there's a nice mixer icon when Master & Headphone
mixer controls are hidden
---
 .../Tango/buttons/btn_master_head_mixer.svg   | 786 ++++++++++++++++++
 res/skins/Tango/buttons/btn_mixer_off.svg     | 781 ++++++++++++++++-
 res/skins/Tango/buttons/btn_mixer_on.svg      | 781 ++++++++++++++++-
 res/skins/Tango/mixer_headphone.xml           |   4 +
 res/skins/Tango/mixer_master_booth.xml        |   4 +
 res/skins/Tango/style.qss                     |  29 +-
 res/skins/Tango/topbar.xml                    |  23 +
 7 files changed, 2396 insertions(+), 12 deletions(-)
 create mode 100644 res/skins/Tango/buttons/btn_master_head_mixer.svg

diff --git a/res/skins/Tango/buttons/btn_master_head_mixer.svg b/res/skins/Tango/buttons/btn_master_head_mixer.svg
new file mode 100644
index 000000000000..2f5c4e8c41dc
--- /dev/null
+++ b/res/skins/Tango/buttons/btn_master_head_mixer.svg
@@ -0,0 +1,786 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="28"
+   height="28"
+   id="svg2">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient4574">
+      <stop
+         id="stop4576"
+         style="stop-color:#ffb401;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4578"
+         style="stop-color:#c68c00;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3846">
+      <stop
+         id="stop3848"
+         style="stop-color:#b0b0b0;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3850"
+         style="stop-color:#585858;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4937">
+      <stop
+         id="stop4939"
+         style="stop-color:#e90808;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4941"
+         style="stop-color:#b60000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3939">
+      <stop
+         id="stop3941"
+         style="stop-color:#eece33;stop-opacity:0.95054942"
+         offset="0" />
+      <stop
+         id="stop5813"
+         style="stop-color:#ff734e;stop-opacity:0.8186813"
+         offset="0.61061949" />
+      <stop
+         id="stop3943"
+         style="stop-color:#ff2d2d;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5461">
+      <stop
+         id="stop5463"
+         style="stop-color:#b9dcff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5465"
+         style="stop-color:#0d0d0d;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5441">
+      <stop
+         id="stop5443"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5445"
+         style="stop-color:#343434;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="345.55801"
+       y1="460.78387"
+       x2="477.52518"
+       y2="506.3692"
+       id="linearGradient5483-8"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient5441-4">
+      <stop
+         id="stop5443-2"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5445-4"
+         style="stop-color:#2a2a2a;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5441-7">
+      <stop
+         id="stop5443-4"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5445-7"
+         style="stop-color:#2a2a2a;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="345.55801"
+       y1="460.78387"
+       x2="477.52518"
+       y2="506.3692"
+       id="linearGradient5573-4"
+       xlink:href="#linearGradient5441-4-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.31622183,-0.94868524,0.94868524,-0.31622183,39.645062,974.00808)" />
+    <linearGradient
+       id="linearGradient5441-4-6">
+      <stop
+         id="stop5443-2-5"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5445-4-9"
+         style="stop-color:#2a2a2a;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient3945"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,223.83677,381.60387)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient5024"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(54.522364,18.173742)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient5032"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-57.471498)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient5265"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.822937,-35.303175)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient5267"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient5791"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381477e-7,4.1806787)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient5793"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.822937,-35.303175)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient5795"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient5803"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient5825"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381459e-7,4.1806787)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient5845"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient5847"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient3354"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient3356"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient3358"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381495e-7,4.1806787)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient3837"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient3839"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient3841"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)" />
+    <linearGradient
+       x1="202.49004"
+       y1="623.47784"
+       x2="202.48778"
+       y2="634.36542"
+       id="linearGradient4945"
+       xlink:href="#linearGradient4937"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.257316,0,0,1,-52.110466,0)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient4947"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient4947-4"
+       xlink:href="#linearGradient3939-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)" />
+    <linearGradient
+       id="linearGradient3939-3">
+      <stop
+         id="stop3941-2"
+         style="stop-color:#eece33;stop-opacity:0.95054942"
+         offset="0" />
+      <stop
+         id="stop5813-8"
+         style="stop-color:#ff734e;stop-opacity:0.8186813"
+         offset="0.61061949" />
+      <stop
+         id="stop3943-54"
+         style="stop-color:#ff2d2d;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="202.49004"
+       y1="623.47784"
+       x2="202.48849"
+       y2="628.41626"
+       id="linearGradient3142"
+       xlink:href="#linearGradient4937-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.257316,0,0,1,-234.5901,-615.11102)" />
+    <linearGradient
+       id="linearGradient4937-6">
+      <stop
+         id="stop4939-3"
+         style="stop-color:#e90808;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4941-8"
+         style="stop-color:#b60000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="202.49004"
+       y1="623.47784"
+       x2="202.48849"
+       y2="628.41626"
+       id="linearGradient3935"
+       xlink:href="#linearGradient4937-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.257316,0,0,1,-252.5901,-618.29518)" />
+    <linearGradient
+       x1="16.8985"
+       y1="20.7381"
+       x2="9.2021799"
+       y2="-2.3512399"
+       id="linearGradient3006-9"
+       xlink:href="#Grad0-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
+    <linearGradient
+       x1="16.8985"
+       y1="20.7381"
+       x2="9.2021799"
+       y2="-2.3512399"
+       id="Grad0-8"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop10-5"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop12-7"
+         style="stop-color:#343434;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="6.2958603"
+       y1="17.003906"
+       x2="27.70414"
+       y2="17.003906"
+       id="linearGradient3852"
+       xlink:href="#linearGradient3846"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="16.8985"
+       y1="20.7381"
+       x2="9.2021799"
+       y2="-2.3512399"
+       id="linearGradient3006-9-5"
+       xlink:href="#Grad0-8-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
+    <linearGradient
+       x1="16.8985"
+       y1="20.7381"
+       x2="9.2021799"
+       y2="-2.3512399"
+       id="Grad0-8-9"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop10-5-4"
+         style="stop-color:#060606;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop3929"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0.34285715" />
+      <stop
+         id="stop12-7-9"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="6.2958603"
+       y1="17.003906"
+       x2="27.70414"
+       y2="17.003906"
+       id="linearGradient3852-5"
+       xlink:href="#linearGradient3846-6"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3846-6">
+      <stop
+         id="stop3927"
+         style="stop-color:#7c7c7c;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop3850-6"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="6.2958603"
+       y1="17.003906"
+       x2="27.70414"
+       y2="17.003906"
+       id="linearGradient3898"
+       xlink:href="#Grad0-8-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient4006-6"
+       xlink:href="#linearGradient3939-3-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)" />
+    <linearGradient
+       id="linearGradient3939-3-2">
+      <stop
+         id="stop3941-2-1"
+         style="stop-color:#eece33;stop-opacity:0.95054942"
+         offset="0" />
+      <stop
+         id="stop5813-8-8"
+         style="stop-color:#ff734e;stop-opacity:0.8186813"
+         offset="0.61061949" />
+      <stop
+         id="stop3943-54-5"
+         style="stop-color:#ff2d2d;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="202.49004"
+       y1="623.47784"
+       x2="202.48849"
+       y2="628.41626"
+       id="linearGradient4004-8"
+       xlink:href="#linearGradient4937-6-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)" />
+    <linearGradient
+       id="linearGradient4937-6-9">
+      <stop
+         id="stop4939-3-0"
+         style="stop-color:#e90808;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4941-8-7"
+         style="stop-color:#b60000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="6.2958603"
+       y1="17.003906"
+       x2="27.70414"
+       y2="17.003906"
+       id="linearGradient3898-0"
+       xlink:href="#Grad0-8-9-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)" />
+    <linearGradient
+       x1="16.8985"
+       y1="20.7381"
+       x2="9.2021799"
+       y2="-2.3512399"
+       id="Grad0-8-9-5"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop10-5-4-7"
+         style="stop-color:#060606;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop3929-9"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0.34285715" />
+      <stop
+         id="stop12-7-9-6"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="202.49004"
+       y1="623.47784"
+       x2="202.48849"
+       y2="628.41626"
+       id="linearGradient4004-8-1"
+       xlink:href="#linearGradient4937-6-9-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)" />
+    <linearGradient
+       id="linearGradient4937-6-9-7">
+      <stop
+         id="stop4939-3-0-9"
+         style="stop-color:#e90808;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4941-8-7-5"
+         style="stop-color:#b60000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient4006-2"
+       xlink:href="#linearGradient3939-3-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)" />
+    <linearGradient
+       id="linearGradient3939-3-7">
+      <stop
+         id="stop3941-2-5"
+         style="stop-color:#eece33;stop-opacity:0.95054942"
+         offset="0" />
+      <stop
+         id="stop5813-8-1"
+         style="stop-color:#e85708;stop-opacity:0.95686275"
+         offset="0.51428574" />
+      <stop
+         id="stop3943-54-9"
+         style="stop-color:#e80808;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="202.49004"
+       y1="623.47784"
+       x2="202.48849"
+       y2="628.41626"
+       id="linearGradient4004-9"
+       xlink:href="#linearGradient4937-6-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0687186,0,0,0.85000057,-13.919877,95.08267)" />
+    <linearGradient
+       id="linearGradient4937-6-6">
+      <stop
+         id="stop4939-3-8"
+         style="stop-color:#e90808;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4941-8-6"
+         style="stop-color:#b60000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient4337"
+       xlink:href="#linearGradient3939-3-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient4337-8"
+       xlink:href="#linearGradient3939-3-7-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)" />
+    <linearGradient
+       id="linearGradient3939-3-7-5">
+      <stop
+         id="stop3941-2-5-0"
+         style="stop-color:#33aaee;stop-opacity:0.95054942"
+         offset="0" />
+      <stop
+         id="stop5813-8-1-6"
+         style="stop-color:#4ebeff;stop-opacity:0.8186813"
+         offset="0.61061949" />
+      <stop
+         id="stop3943-54-9-4"
+         style="stop-color:#2db2ff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="202.49004"
+       y1="623.47784"
+       x2="202.48849"
+       y2="628.41626"
+       id="linearGradient4302-4"
+       xlink:href="#linearGradient4937-6-6-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)" />
+    <linearGradient
+       id="linearGradient4937-6-6-2">
+      <stop
+         id="stop4939-3-8-2"
+         style="stop-color:#0897e9;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4941-8-6-9"
+         style="stop-color:#0074b6;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="202.49004"
+       y1="623.47784"
+       x2="202.48849"
+       y2="628.41626"
+       id="linearGradient3130"
+       xlink:href="#linearGradient4937-6-6-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)" />
+    <linearGradient
+       id="linearGradient3939-3-7-2">
+      <stop
+         id="stop3941-2-5-05"
+         style="stop-color:#eece33;stop-opacity:0.95054942"
+         offset="0" />
+      <stop
+         id="stop5813-8-1-2"
+         style="stop-color:#ff734e;stop-opacity:0.8186813"
+         offset="0.61061949" />
+      <stop
+         id="stop3943-54-9-1"
+         style="stop-color:#ff2d2d;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="202.49004"
+       y1="623.47784"
+       x2="202.48849"
+       y2="628.41626"
+       id="linearGradient4302-6"
+       xlink:href="#linearGradient4937-6-6-24"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)" />
+    <linearGradient
+       id="linearGradient4937-6-6-24">
+      <stop
+         id="stop4939-3-8-4"
+         style="stop-color:#e90808;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4941-8-6-4"
+         style="stop-color:#b60000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="202.49004"
+       y1="623.47784"
+       x2="202.48849"
+       y2="628.41626"
+       id="linearGradient3130-8"
+       xlink:href="#linearGradient4937-6-6-2-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)" />
+    <linearGradient
+       id="linearGradient4937-6-6-2-7">
+      <stop
+         id="stop4939-3-8-2-4"
+         style="stop-color:#0897e9;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4941-8-6-9-4"
+         style="stop-color:#0074b6;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="202.48863"
+       y1="621.81409"
+       x2="202.48849"
+       y2="628.41626"
+       id="linearGradient4865"
+       xlink:href="#linearGradient4574"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)" />
+  </defs>
+  <metadata
+     id="metadata7">
+    <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>
+  <rect
+     width="1"
+     height="18"
+     rx="0.5"
+     ry="0.44999999"
+     x="-12"
+     y="5"
+     transform="matrix(0,-1,1,0,0,0)"
+     id="rect3893"
+     style="fill:#888888;fill-opacity:1;stroke:none;display:inline" />
+  <rect
+     width="11"
+     height="2"
+     rx="1"
+     ry="1"
+     x="-16"
+     y="10"
+     transform="matrix(0,-1,1,0,0,0)"
+     id="rect3895"
+     style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
+  <g
+     transform="matrix(1.2878787,0,0,1.2878787,-4.0303024,-2.8257567)"
+     id="g3891">
+    <path
+       d="m 7.4246207,5.8370504 a 1.5909902,1.5909902 0 1 1 -3.1819803,0 1.5909902,1.5909902 0 1 1 3.1819803,0 z"
+       transform="matrix(0,-0.94280908,0.94280908,0,2.996776,24)"
+       id="path3897"
+       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
+    <path
+       d="m 7.4246207,5.8370504 a 1.5909902,1.5909902 0 1 1 -3.1819803,0 1.5909902,1.5909902 0 1 1 3.1819803,0 z"
+       transform="matrix(0,-0.94280908,0.94280908,0,8.496776,24)"
+       id="path3897-5"
+       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
+    <path
+       d="m 7.4246207,5.8370504 a 1.5909902,1.5909902 0 1 1 -3.1819803,0 1.5909902,1.5909902 0 1 1 3.1819803,0 z"
+       transform="matrix(0,-0.94280908,0.94280908,0,13.996776,24)"
+       id="path3897-5-6"
+       style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
+  </g>
+</svg>
diff --git a/res/skins/Tango/buttons/btn_mixer_off.svg b/res/skins/Tango/buttons/btn_mixer_off.svg
index 6d8360be6006..2c412dc47c80 100644
--- a/res/skins/Tango/buttons/btn_mixer_off.svg
+++ b/res/skins/Tango/buttons/btn_mixer_off.svg
@@ -1 +1,780 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><defs><linearGradient id="v"><stop offset="0" stop-color="#ffb401"/><stop offset="1" stop-color="#c68c00"/></linearGradient><linearGradient id="i"><stop offset="0" stop-color="#b0b0b0"/><stop offset="1" stop-color="#585858" stop-opacity="0"/></linearGradient><linearGradient id="e"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="c"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#ff734e" stop-opacity=".8186813"/><stop offset="1" stop-color="#ff2d2d" stop-opacity="0"/></linearGradient><linearGradient id="d"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#343434"/></linearGradient><linearGradient id="a"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="b"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="f"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#ff734e" stop-opacity=".8186813"/><stop offset="1" stop-color="#ff2d2d" stop-opacity="0"/></linearGradient><linearGradient id="g"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient x1="16.8985" y1="20.7381" x2="9.2021799" y2="-2.3512399" id="h" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#343434"/></linearGradient><linearGradient x1="16.8985" y1="20.7381" x2="9.2021799" y2="-2.3512399" id="j" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#060606" stop-opacity="0"/><stop offset=".34285715" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="k"><stop offset="0" stop-color="#7c7c7c" stop-opacity="0"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="l"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#ff734e" stop-opacity=".8186813"/><stop offset="1" stop-color="#ff2d2d" stop-opacity="0"/></linearGradient><linearGradient id="m"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient x1="16.8985" y1="20.7381" x2="9.2021799" y2="-2.3512399" id="n" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#060606" stop-opacity="0"/><stop offset=".34285715" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="o"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="p"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".51428574" stop-color="#e85708" stop-opacity=".95686275"/><stop offset="1" stop-color="#e80808" stop-opacity="0"/></linearGradient><linearGradient id="q"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="r"><stop offset="0" stop-color="#3ae" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#4ebeff" stop-opacity=".8186813"/><stop offset="1" stop-color="#2db2ff" stop-opacity="0"/></linearGradient><linearGradient id="s"><stop offset="0" stop-color="#0897e9"/><stop offset="1" stop-color="#0074b6"/></linearGradient><linearGradient id="t"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="u"><stop offset="0" stop-color="#0897e9"/><stop offset="1" stop-color="#0074b6"/></linearGradient></defs><rect width="1" height="14" x="13.5" y="3" rx=".5" ry=".5" fill="#888"/><rect width="8" height="2" x="10" y="6" rx="1" ry="1" fill="#888"/><path d="M6.9999999418 4.5000001175a1.5000000068 1.5000000068 0 1 1-2.9999999193 0 1.5000000068 1.5000000068 0 1 1 2.9999999193 0zM6.9999999418 10.0000001175a1.5000000068 1.5000000068 0 1 1-2.9999999193 0 1.5000000068 1.5000000068 0 1 1 2.9999999193 0zM6.9999999418 15.5000001175a1.5000000068 1.5000000068 0 1 1-2.9999999193 0 1.5000000068 1.5000000068 0 1 1 2.9999999193 0z" fill="#888"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="20"
+   height="20"
+   id="svg2">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient4574">
+      <stop
+         id="stop4576"
+         style="stop-color:#ffb401;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4578"
+         style="stop-color:#c68c00;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3846">
+      <stop
+         id="stop3848"
+         style="stop-color:#b0b0b0;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3850"
+         style="stop-color:#585858;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4937">
+      <stop
+         id="stop4939"
+         style="stop-color:#e90808;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4941"
+         style="stop-color:#b60000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3939">
+      <stop
+         id="stop3941"
+         style="stop-color:#eece33;stop-opacity:0.95054942"
+         offset="0" />
+      <stop
+         id="stop5813"
+         style="stop-color:#ff734e;stop-opacity:0.8186813"
+         offset="0.61061949" />
+      <stop
+         id="stop3943"
+         style="stop-color:#ff2d2d;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5461">
+      <stop
+         id="stop5463"
+         style="stop-color:#b9dcff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5465"
+         style="stop-color:#0d0d0d;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5441">
+      <stop
+         id="stop5443"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5445"
+         style="stop-color:#343434;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="345.55801"
+       y1="460.78387"
+       x2="477.52518"
+       y2="506.3692"
+       id="linearGradient5483-8"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient5441-4">
+      <stop
+         id="stop5443-2"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5445-4"
+         style="stop-color:#2a2a2a;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5441-7">
+      <stop
+         id="stop5443-4"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5445-7"
+         style="stop-color:#2a2a2a;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="345.55801"
+       y1="460.78387"
+       x2="477.52518"
+       y2="506.3692"
+       id="linearGradient5573-4"
+       xlink:href="#linearGradient5441-4-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.31622183,-0.94868524,0.94868524,-0.31622183,39.645062,974.00808)" />
+    <linearGradient
+       id="linearGradient5441-4-6">
+      <stop
+         id="stop5443-2-5"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5445-4-9"
+         style="stop-color:#2a2a2a;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient3945"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,223.83677,381.60387)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient5024"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(54.522364,18.173742)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient5032"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-57.471498)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient5265"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.822937,-35.303175)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient5267"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient5791"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381477e-7,4.1806787)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient5793"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.822937,-35.303175)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient5795"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient5803"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient5825"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381459e-7,4.1806787)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient5845"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient5847"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient3354"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient3356"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient3358"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381495e-7,4.1806787)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient3837"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient3839"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient3841"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)" />
+    <linearGradient
+       x1="202.49004"
+       y1="623.47784"
+       x2="202.48778"
+       y2="634.36542"
+       id="linearGradient4945"
+       xlink:href="#linearGradient4937"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.257316,0,0,1,-52.110466,0)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient4947"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient4947-4"
+       xlink:href="#linearGradient3939-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)" />
+    <linearGradient
+       id="linearGradient3939-3">
+      <stop
+         id="stop3941-2"
+         style="stop-color:#eece33;stop-opacity:0.95054942"
+         offset="0" />
+      <stop
+         id="stop5813-8"
+         style="stop-color:#ff734e;stop-opacity:0.8186813"
+         offset="0.61061949" />
+      <stop
+         id="stop3943-54"
+         style="stop-color:#ff2d2d;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="202.49004"
+       y1="623.47784"
+       x2="202.48849"
+       y2="628.41626"
+       id="linearGradient3142"
+       xlink:href="#linearGradient4937-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.257316,0,0,1,-234.5901,-615.11102)" />
+    <linearGradient
+       id="linearGradient4937-6">
+      <stop
+         id="stop4939-3"
+         style="stop-color:#e90808;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4941-8"
+         style="stop-color:#b60000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="202.49004"
+       y1="623.47784"
+       x2="202.48849"
+       y2="628.41626"
+       id="linearGradient3935"
+       xlink:href="#linearGradient4937-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.257316,0,0,1,-252.5901,-618.29518)" />
+    <linearGradient
+       x1="16.8985"
+       y1="20.7381"
+       x2="9.2021799"
+       y2="-2.3512399"
+       id="linearGradient3006-9"
+       xlink:href="#Grad0-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
+    <linearGradient
+       x1="16.8985"
+       y1="20.7381"
+       x2="9.2021799"
+       y2="-2.3512399"
+       id="Grad0-8"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop10-5"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop12-7"
+         style="stop-color:#343434;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="6.2958603"
+       y1="17.003906"
+       x2="27.70414"
+       y2="17.003906"
+       id="linearGradient3852"
+       xlink:href="#linearGradient3846"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="16.8985"
+       y1="20.7381"
+       x2="9.2021799"
+       y2="-2.3512399"
+       id="linearGradient3006-9-5"
+       xlink:href="#Grad0-8-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
+    <linearGradient
+       x1="16.8985"
+       y1="20.7381"
+       x2="9.2021799"
+       y2="-2.3512399"
+       id="Grad0-8-9"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop10-5-4"
+         style="stop-color:#060606;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop3929"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0.34285715" />
+      <stop
+         id="stop12-7-9"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="6.2958603"
+       y1="17.003906"
+       x2="27.70414"
+       y2="17.003906"
+       id="linearGradient3852-5"
+       xlink:href="#linearGradient3846-6"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3846-6">
+      <stop
+         id="stop3927"
+         style="stop-color:#7c7c7c;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop3850-6"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="6.2958603"
+       y1="17.003906"
+       x2="27.70414"
+       y2="17.003906"
+       id="linearGradient3898"
+       xlink:href="#Grad0-8-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient4006-6"
+       xlink:href="#linearGradient3939-3-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)" />
+    <linearGradient
+       id="linearGradient3939-3-2">
+      <stop
+         id="stop3941-2-1"
+         style="stop-color:#eece33;stop-opacity:0.95054942"
+         offset="0" />
+      <stop
+         id="stop5813-8-8"
+         style="stop-color:#ff734e;stop-opacity:0.8186813"
+         offset="0.61061949" />
+      <stop
+         id="stop3943-54-5"
+         style="stop-color:#ff2d2d;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="202.49004"
+       y1="623.47784"
+       x2="202.48849"
+       y2="628.41626"
+       id="linearGradient4004-8"
+       xlink:href="#linearGradient4937-6-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)" />
+    <linearGradient
+       id="linearGradient4937-6-9">
+      <stop
+         id="stop4939-3-0"
+         style="stop-color:#e90808;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4941-8-7"
+         style="stop-color:#b60000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="6.2958603"
+       y1="17.003906"
+       x2="27.70414"
+       y2="17.003906"
+       id="linearGradient3898-0"
+       xlink:href="#Grad0-8-9-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)" />
+    <linearGradient
+       x1="16.8985"
+       y1="20.7381"
+       x2="9.2021799"
+       y2="-2.3512399"
+       id="Grad0-8-9-5"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop10-5-4-7"
+         style="stop-color:#060606;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop3929-9"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0.34285715" />
+      <stop
+         id="stop12-7-9-6"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="202.49004"
+       y1="623.47784"
+       x2="202.48849"
+       y2="628.41626"
+       id="linearGradient4004-8-1"
+       xlink:href="#linearGradient4937-6-9-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)" />
+    <linearGradient
+       id="linearGradient4937-6-9-7">
+      <stop
+         id="stop4939-3-0-9"
+         style="stop-color:#e90808;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4941-8-7-5"
+         style="stop-color:#b60000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient4006-2"
+       xlink:href="#linearGradient3939-3-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)" />
+    <linearGradient
+       id="linearGradient3939-3-7">
+      <stop
+         id="stop3941-2-5"
+         style="stop-color:#eece33;stop-opacity:0.95054942"
+         offset="0" />
+      <stop
+         id="stop5813-8-1"
+         style="stop-color:#e85708;stop-opacity:0.95686275"
+         offset="0.51428574" />
+      <stop
+         id="stop3943-54-9"
+         style="stop-color:#e80808;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="202.49004"
+       y1="623.47784"
+       x2="202.48849"
+       y2="628.41626"
+       id="linearGradient4004-9"
+       xlink:href="#linearGradient4937-6-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0687186,0,0,0.85000057,-13.919877,95.08267)" />
+    <linearGradient
+       id="linearGradient4937-6-6">
+      <stop
+         id="stop4939-3-8"
+         style="stop-color:#e90808;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4941-8-6"
+         style="stop-color:#b60000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient4337"
+       xlink:href="#linearGradient3939-3-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient4337-8"
+       xlink:href="#linearGradient3939-3-7-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)" />
+    <linearGradient
+       id="linearGradient3939-3-7-5">
+      <stop
+         id="stop3941-2-5-0"
+         style="stop-color:#33aaee;stop-opacity:0.95054942"
+         offset="0" />
+      <stop
+         id="stop5813-8-1-6"
+         style="stop-color:#4ebeff;stop-opacity:0.8186813"
+         offset="0.61061949" />
+      <stop
+         id="stop3943-54-9-4"
+         style="stop-color:#2db2ff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="202.49004"
+       y1="623.47784"
+       x2="202.48849"
+       y2="628.41626"
+       id="linearGradient4302-4"
+       xlink:href="#linearGradient4937-6-6-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)" />
+    <linearGradient
+       id="linearGradient4937-6-6-2">
+      <stop
+         id="stop4939-3-8-2"
+         style="stop-color:#0897e9;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4941-8-6-9"
+         style="stop-color:#0074b6;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="202.49004"
+       y1="623.47784"
+       x2="202.48849"
+       y2="628.41626"
+       id="linearGradient3130"
+       xlink:href="#linearGradient4937-6-6-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)" />
+    <linearGradient
+       id="linearGradient3939-3-7-2">
+      <stop
+         id="stop3941-2-5-05"
+         style="stop-color:#eece33;stop-opacity:0.95054942"
+         offset="0" />
+      <stop
+         id="stop5813-8-1-2"
+         style="stop-color:#ff734e;stop-opacity:0.8186813"
+         offset="0.61061949" />
+      <stop
+         id="stop3943-54-9-1"
+         style="stop-color:#ff2d2d;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="202.49004"
+       y1="623.47784"
+       x2="202.48849"
+       y2="628.41626"
+       id="linearGradient4302-6"
+       xlink:href="#linearGradient4937-6-6-24"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)" />
+    <linearGradient
+       id="linearGradient4937-6-6-24">
+      <stop
+         id="stop4939-3-8-4"
+         style="stop-color:#e90808;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4941-8-6-4"
+         style="stop-color:#b60000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="202.49004"
+       y1="623.47784"
+       x2="202.48849"
+       y2="628.41626"
+       id="linearGradient3130-8"
+       xlink:href="#linearGradient4937-6-6-2-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)" />
+    <linearGradient
+       id="linearGradient4937-6-6-2-7">
+      <stop
+         id="stop4939-3-8-2-4"
+         style="stop-color:#0897e9;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4941-8-6-9-4"
+         style="stop-color:#0074b6;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="202.48863"
+       y1="621.81409"
+       x2="202.48849"
+       y2="628.41626"
+       id="linearGradient4865"
+       xlink:href="#linearGradient4574"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)" />
+  </defs>
+  <metadata
+     id="metadata7">
+    <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>
+  <rect
+     width="1"
+     height="14"
+     rx="0.5"
+     ry="0.5"
+     x="13.5"
+     y="3"
+     id="rect3893"
+     style="fill:#888888;fill-opacity:1;stroke:none;display:inline" />
+  <rect
+     width="8"
+     height="2"
+     rx="1"
+     ry="1"
+     x="10"
+     y="6"
+     id="rect3895"
+     style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
+  <path
+     d="m 7.4246207,5.8370504 a 1.5909902,1.5909902 0 1 1 -3.1819803,0 1.5909902,1.5909902 0 1 1 3.1819803,0 z"
+     transform="matrix(0.94280908,0,0,0.94280908,1.3024679e-7,-1.003224)"
+     id="path3897"
+     style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
+  <path
+     d="m 7.4246207,5.8370504 a 1.5909902,1.5909902 0 1 1 -3.1819803,0 1.5909902,1.5909902 0 1 1 3.1819803,0 z"
+     transform="matrix(0.94280908,0,0,0.94280908,1.3024679e-7,4.496776)"
+     id="path3897-5"
+     style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
+  <path
+     d="m 7.4246207,5.8370504 a 1.5909902,1.5909902 0 1 1 -3.1819803,0 1.5909902,1.5909902 0 1 1 3.1819803,0 z"
+     transform="matrix(0.94280908,0,0,0.94280908,1.3024679e-7,9.996776)"
+     id="path3897-5-6"
+     style="fill:#888888;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
+</svg>
diff --git a/res/skins/Tango/buttons/btn_mixer_on.svg b/res/skins/Tango/buttons/btn_mixer_on.svg
index 26d83320f5b5..f0acca99c46c 100644
--- a/res/skins/Tango/buttons/btn_mixer_on.svg
+++ b/res/skins/Tango/buttons/btn_mixer_on.svg
@@ -1 +1,780 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20"><defs><linearGradient id="v"><stop offset="0" stop-color="#ffb401"/><stop offset="1" stop-color="#c68c00"/></linearGradient><linearGradient id="i"><stop offset="0" stop-color="#b0b0b0"/><stop offset="1" stop-color="#585858" stop-opacity="0"/></linearGradient><linearGradient id="e"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="c"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#ff734e" stop-opacity=".8186813"/><stop offset="1" stop-color="#ff2d2d" stop-opacity="0"/></linearGradient><linearGradient id="d"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#343434"/></linearGradient><linearGradient id="a"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="b"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#2a2a2a"/></linearGradient><linearGradient id="f"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#ff734e" stop-opacity=".8186813"/><stop offset="1" stop-color="#ff2d2d" stop-opacity="0"/></linearGradient><linearGradient id="g"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient x1="16.8985" y1="20.7381" x2="9.2021799" y2="-2.3512399" id="h" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#060606"/><stop offset="1" stop-color="#343434"/></linearGradient><linearGradient x1="16.8985" y1="20.7381" x2="9.2021799" y2="-2.3512399" id="j" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#060606" stop-opacity="0"/><stop offset=".34285715" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="k"><stop offset="0" stop-color="#7c7c7c" stop-opacity="0"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="l"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#ff734e" stop-opacity=".8186813"/><stop offset="1" stop-color="#ff2d2d" stop-opacity="0"/></linearGradient><linearGradient id="m"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient x1="16.8985" y1="20.7381" x2="9.2021799" y2="-2.3512399" id="n" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#060606" stop-opacity="0"/><stop offset=".34285715" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#fff"/></linearGradient><linearGradient id="o"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="p"><stop offset="0" stop-color="#eece33" stop-opacity=".95054942"/><stop offset=".51428574" stop-color="#e85708" stop-opacity=".95686275"/><stop offset="1" stop-color="#e80808" stop-opacity="0"/></linearGradient><linearGradient id="q"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="r"><stop offset="0" stop-color="#3ae" stop-opacity=".95054942"/><stop offset=".61061949" stop-color="#4ebeff" stop-opacity=".8186813"/><stop offset="1" stop-color="#2db2ff" stop-opacity="0"/></linearGradient><linearGradient id="s"><stop offset="0" stop-color="#0897e9"/><stop offset="1" stop-color="#0074b6"/></linearGradient><linearGradient id="t"><stop offset="0" stop-color="#e90808"/><stop offset="1" stop-color="#b60000"/></linearGradient><linearGradient id="u"><stop offset="0" stop-color="#0897e9"/><stop offset="1" stop-color="#0074b6"/></linearGradient></defs><rect width="1" height="14" x="13.5" y="3" rx=".5" ry=".5" fill="#d2d2d2"/><rect width="8" height="2" x="10" y="6" rx="1" ry="1" fill="#d2d2d2"/><path d="M6.9999999418 4.5000001175a1.5000000068 1.5000000068 0 1 1-2.9999999193 0 1.5000000068 1.5000000068 0 1 1 2.9999999193 0zM6.9999999418 10.0000001175a1.5000000068 1.5000000068 0 1 1-2.9999999193 0 1.5000000068 1.5000000068 0 1 1 2.9999999193 0zM6.9999999418 15.5000001175a1.5000000068 1.5000000068 0 1 1-2.9999999193 0 1.5000000068 1.5000000068 0 1 1 2.9999999193 0z" fill="#d2d2d2"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
+   width="20"
+   height="20"
+   id="svg2">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient4574">
+      <stop
+         id="stop4576"
+         style="stop-color:#ffb401;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4578"
+         style="stop-color:#c68c00;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3846">
+      <stop
+         id="stop3848"
+         style="stop-color:#b0b0b0;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3850"
+         style="stop-color:#585858;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4937">
+      <stop
+         id="stop4939"
+         style="stop-color:#e90808;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4941"
+         style="stop-color:#b60000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3939">
+      <stop
+         id="stop3941"
+         style="stop-color:#eece33;stop-opacity:0.95054942"
+         offset="0" />
+      <stop
+         id="stop5813"
+         style="stop-color:#ff734e;stop-opacity:0.8186813"
+         offset="0.61061949" />
+      <stop
+         id="stop3943"
+         style="stop-color:#ff2d2d;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5461">
+      <stop
+         id="stop5463"
+         style="stop-color:#b9dcff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5465"
+         style="stop-color:#0d0d0d;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5441">
+      <stop
+         id="stop5443"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5445"
+         style="stop-color:#343434;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="345.55801"
+       y1="460.78387"
+       x2="477.52518"
+       y2="506.3692"
+       id="linearGradient5483-8"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient5441-4">
+      <stop
+         id="stop5443-2"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5445-4"
+         style="stop-color:#2a2a2a;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5441-7">
+      <stop
+         id="stop5443-4"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5445-7"
+         style="stop-color:#2a2a2a;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="345.55801"
+       y1="460.78387"
+       x2="477.52518"
+       y2="506.3692"
+       id="linearGradient5573-4"
+       xlink:href="#linearGradient5441-4-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.31622183,-0.94868524,0.94868524,-0.31622183,39.645062,974.00808)" />
+    <linearGradient
+       id="linearGradient5441-4-6">
+      <stop
+         id="stop5443-2-5"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5445-4-9"
+         style="stop-color:#2a2a2a;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient3945"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,223.83677,381.60387)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient5024"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(54.522364,18.173742)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient5032"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-57.471498)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient5265"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.822937,-35.303175)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient5267"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient5791"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381477e-7,4.1806787)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient5793"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.822937,-35.303175)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient5795"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient5803"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient5825"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381459e-7,4.1806787)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient5845"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient5847"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient3354"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient3356"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient3358"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381495e-7,4.1806787)" />
+    <linearGradient
+       x1="366.71561"
+       y1="515.51764"
+       x2="368.96512"
+       y2="333.18509"
+       id="linearGradient3837"
+       xlink:href="#linearGradient5441-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-37.471498)" />
+    <linearGradient
+       x1="256.73965"
+       y1="472.02954"
+       x2="484.71231"
+       y2="472.02954"
+       id="linearGradient3839"
+       xlink:href="#linearGradient5441"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(33.231373,11.944343)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient3841"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)" />
+    <linearGradient
+       x1="202.49004"
+       y1="623.47784"
+       x2="202.48778"
+       y2="634.36542"
+       id="linearGradient4945"
+       xlink:href="#linearGradient4937"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.257316,0,0,1,-52.110466,0)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient4947"
+       xlink:href="#linearGradient3939"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient4947-4"
+       xlink:href="#linearGradient3939-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)" />
+    <linearGradient
+       id="linearGradient3939-3">
+      <stop
+         id="stop3941-2"
+         style="stop-color:#eece33;stop-opacity:0.95054942"
+         offset="0" />
+      <stop
+         id="stop5813-8"
+         style="stop-color:#ff734e;stop-opacity:0.8186813"
+         offset="0.61061949" />
+      <stop
+         id="stop3943-54"
+         style="stop-color:#ff2d2d;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="202.49004"
+       y1="623.47784"
+       x2="202.48849"
+       y2="628.41626"
+       id="linearGradient3142"
+       xlink:href="#linearGradient4937-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.257316,0,0,1,-234.5901,-615.11102)" />
+    <linearGradient
+       id="linearGradient4937-6">
+      <stop
+         id="stop4939-3"
+         style="stop-color:#e90808;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4941-8"
+         style="stop-color:#b60000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="202.49004"
+       y1="623.47784"
+       x2="202.48849"
+       y2="628.41626"
+       id="linearGradient3935"
+       xlink:href="#linearGradient4937-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.257316,0,0,1,-252.5901,-618.29518)" />
+    <linearGradient
+       x1="16.8985"
+       y1="20.7381"
+       x2="9.2021799"
+       y2="-2.3512399"
+       id="linearGradient3006-9"
+       xlink:href="#Grad0-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
+    <linearGradient
+       x1="16.8985"
+       y1="20.7381"
+       x2="9.2021799"
+       y2="-2.3512399"
+       id="Grad0-8"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop10-5"
+         style="stop-color:#060606;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop12-7"
+         style="stop-color:#343434;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="6.2958603"
+       y1="17.003906"
+       x2="27.70414"
+       y2="17.003906"
+       id="linearGradient3852"
+       xlink:href="#linearGradient3846"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="16.8985"
+       y1="20.7381"
+       x2="9.2021799"
+       y2="-2.3512399"
+       id="linearGradient3006-9-5"
+       xlink:href="#Grad0-8-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.87938072,0,0,0.87938072,5.601027,5.6050519)" />
+    <linearGradient
+       x1="16.8985"
+       y1="20.7381"
+       x2="9.2021799"
+       y2="-2.3512399"
+       id="Grad0-8-9"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop10-5-4"
+         style="stop-color:#060606;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop3929"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0.34285715" />
+      <stop
+         id="stop12-7-9"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="6.2958603"
+       y1="17.003906"
+       x2="27.70414"
+       y2="17.003906"
+       id="linearGradient3852-5"
+       xlink:href="#linearGradient3846-6"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3846-6">
+      <stop
+         id="stop3927"
+         style="stop-color:#7c7c7c;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop3850-6"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="6.2958603"
+       y1="17.003906"
+       x2="27.70414"
+       y2="17.003906"
+       id="linearGradient3898"
+       xlink:href="#Grad0-8-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient4006-6"
+       xlink:href="#linearGradient3939-3-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)" />
+    <linearGradient
+       id="linearGradient3939-3-2">
+      <stop
+         id="stop3941-2-1"
+         style="stop-color:#eece33;stop-opacity:0.95054942"
+         offset="0" />
+      <stop
+         id="stop5813-8-8"
+         style="stop-color:#ff734e;stop-opacity:0.8186813"
+         offset="0.61061949" />
+      <stop
+         id="stop3943-54-5"
+         style="stop-color:#ff2d2d;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="202.49004"
+       y1="623.47784"
+       x2="202.48849"
+       y2="628.41626"
+       id="linearGradient4004-8"
+       xlink:href="#linearGradient4937-6-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)" />
+    <linearGradient
+       id="linearGradient4937-6-9">
+      <stop
+         id="stop4939-3-0"
+         style="stop-color:#e90808;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4941-8-7"
+         style="stop-color:#b60000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="6.2958603"
+       y1="17.003906"
+       x2="27.70414"
+       y2="17.003906"
+       id="linearGradient3898-0"
+       xlink:href="#Grad0-8-9-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1,-1,0,219.4874,616.89065)" />
+    <linearGradient
+       x1="16.8985"
+       y1="20.7381"
+       x2="9.2021799"
+       y2="-2.3512399"
+       id="Grad0-8-9-5"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop10-5-4-7"
+         style="stop-color:#060606;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop3929-9"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0.34285715" />
+      <stop
+         id="stop12-7-9-6"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="202.49004"
+       y1="623.47784"
+       x2="202.48849"
+       y2="628.41626"
+       id="linearGradient4004-8-1"
+       xlink:href="#linearGradient4937-6-9-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40337,-521.80407)" />
+    <linearGradient
+       id="linearGradient4937-6-9-7">
+      <stop
+         id="stop4939-3-0-9"
+         style="stop-color:#e90808;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4941-8-7-5"
+         style="stop-color:#b60000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient4006-2"
+       xlink:href="#linearGradient3939-3-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)" />
+    <linearGradient
+       id="linearGradient3939-3-7">
+      <stop
+         id="stop3941-2-5"
+         style="stop-color:#eece33;stop-opacity:0.95054942"
+         offset="0" />
+      <stop
+         id="stop5813-8-1"
+         style="stop-color:#e85708;stop-opacity:0.95686275"
+         offset="0.51428574" />
+      <stop
+         id="stop3943-54-9"
+         style="stop-color:#e80808;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="202.49004"
+       y1="623.47784"
+       x2="202.48849"
+       y2="628.41626"
+       id="linearGradient4004-9"
+       xlink:href="#linearGradient4937-6-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0687186,0,0,0.85000057,-13.919877,95.08267)" />
+    <linearGradient
+       id="linearGradient4937-6-6">
+      <stop
+         id="stop4939-3-8"
+         style="stop-color:#e90808;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4941-8-6"
+         style="stop-color:#b60000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient4337"
+       xlink:href="#linearGradient3939-3-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)" />
+    <radialGradient
+       cx="366.93793"
+       cy="355.35693"
+       r="21.465742"
+       fx="366.93793"
+       fy="355.35693"
+       id="radialGradient4337-8"
+       xlink:href="#linearGradient3939-3-7-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.98823527,-5.7381549e-7,4.1806787)" />
+    <linearGradient
+       id="linearGradient3939-3-7-5">
+      <stop
+         id="stop3941-2-5-0"
+         style="stop-color:#33aaee;stop-opacity:0.95054942"
+         offset="0" />
+      <stop
+         id="stop5813-8-1-6"
+         style="stop-color:#4ebeff;stop-opacity:0.8186813"
+         offset="0.61061949" />
+      <stop
+         id="stop3943-54-9-4"
+         style="stop-color:#2db2ff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="202.49004"
+       y1="623.47784"
+       x2="202.48849"
+       y2="628.41626"
+       id="linearGradient4302-4"
+       xlink:href="#linearGradient4937-6-6-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)" />
+    <linearGradient
+       id="linearGradient4937-6-6-2">
+      <stop
+         id="stop4939-3-8-2"
+         style="stop-color:#0897e9;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4941-8-6-9"
+         style="stop-color:#0074b6;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="202.49004"
+       y1="623.47784"
+       x2="202.48849"
+       y2="628.41626"
+       id="linearGradient3130"
+       xlink:href="#linearGradient4937-6-6-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)" />
+    <linearGradient
+       id="linearGradient3939-3-7-2">
+      <stop
+         id="stop3941-2-5-05"
+         style="stop-color:#eece33;stop-opacity:0.95054942"
+         offset="0" />
+      <stop
+         id="stop5813-8-1-2"
+         style="stop-color:#ff734e;stop-opacity:0.8186813"
+         offset="0.61061949" />
+      <stop
+         id="stop3943-54-9-1"
+         style="stop-color:#ff2d2d;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="202.49004"
+       y1="623.47784"
+       x2="202.48849"
+       y2="628.41626"
+       id="linearGradient4302-6"
+       xlink:href="#linearGradient4937-6-6-24"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)" />
+    <linearGradient
+       id="linearGradient4937-6-6-24">
+      <stop
+         id="stop4939-3-8-4"
+         style="stop-color:#e90808;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4941-8-6-4"
+         style="stop-color:#b60000;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="202.49004"
+       y1="623.47784"
+       x2="202.48849"
+       y2="628.41626"
+       id="linearGradient3130-8"
+       xlink:href="#linearGradient4937-6-6-2-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)" />
+    <linearGradient
+       id="linearGradient4937-6-6-2-7">
+      <stop
+         id="stop4939-3-8-2-4"
+         style="stop-color:#0897e9;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4941-8-6-9-4"
+         style="stop-color:#0074b6;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="202.48863"
+       y1="621.81409"
+       x2="202.48849"
+       y2="628.41626"
+       id="linearGradient4865"
+       xlink:href="#linearGradient4574"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0687186,0,0,0.85000057,-199.40336,-521.80407)" />
+  </defs>
+  <metadata
+     id="metadata7">
+    <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>
+  <rect
+     width="1"
+     height="14"
+     rx="0.5"
+     ry="0.5"
+     x="13.5"
+     y="3"
+     id="rect3893"
+     style="fill:#d2d2d2;fill-opacity:1;stroke:none;display:inline" />
+  <rect
+     width="8"
+     height="2"
+     rx="1"
+     ry="1"
+     x="10"
+     y="6"
+     id="rect3895"
+     style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
+  <path
+     d="m 7.4246207,5.8370504 a 1.5909902,1.5909902 0 1 1 -3.1819803,0 1.5909902,1.5909902 0 1 1 3.1819803,0 z"
+     transform="matrix(0.94280908,0,0,0.94280908,1.3024679e-7,-1.003224)"
+     id="path3897"
+     style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
+  <path
+     d="m 7.4246207,5.8370504 a 1.5909902,1.5909902 0 1 1 -3.1819803,0 1.5909902,1.5909902 0 1 1 3.1819803,0 z"
+     transform="matrix(0.94280908,0,0,0.94280908,1.3024679e-7,4.496776)"
+     id="path3897-5"
+     style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
+  <path
+     d="m 7.4246207,5.8370504 a 1.5909902,1.5909902 0 1 1 -3.1819803,0 1.5909902,1.5909902 0 1 1 3.1819803,0 z"
+     transform="matrix(0.94280908,0,0,0.94280908,1.3024679e-7,9.996776)"
+     id="path3897-5-6"
+     style="fill:#d2d2d2;fill-opacity:1;fill-rule:nonzero;stroke:none;display:inline" />
+</svg>
diff --git a/res/skins/Tango/mixer_headphone.xml b/res/skins/Tango/mixer_headphone.xml
index 7eab862d5c32..c37665784be3 100644
--- a/res/skins/Tango/mixer_headphone.xml
+++ b/res/skins/Tango/mixer_headphone.xml
@@ -82,5 +82,9 @@ Description:
         </Children>
       </WidgetGroup><!-- /actual headphone controls -->
     </Children>
+    <Connection>
+      <ConfigKey>[Tango],master_mixer</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
   </WidgetGroup><!-- /Headphone Mixer -->
 </Template>
diff --git a/res/skins/Tango/mixer_master_booth.xml b/res/skins/Tango/mixer_master_booth.xml
index 5fe555a80a97..52a6b105a599 100644
--- a/res/skins/Tango/mixer_master_booth.xml
+++ b/res/skins/Tango/mixer_master_booth.xml
@@ -128,5 +128,9 @@ Description:
         </Connection>
       </WidgetGroup><!-- /Booth Gain -->
     </Children>
+    <Connection>
+      <ConfigKey>[Tango],master_mixer</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
   </WidgetGroup><!-- Booth & Master Mixer -->
 </Template>
diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index b8eac7b71c9a..be5a236a82ca 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -239,15 +239,18 @@ WWidgetGroup {
     background-color: #0f0f0f;
   }
 
-#MasterMixerLabel {
-  image: url(skin:/buttons/btn_master.svg) no-repeat center center;
-}
+#MasterHeadMixerLabel {
+  image: url(skin:/buttons/btn_master_head_mixer.svg) no-repeat center center;
+  }
+  #MasterMixerLabel {
+    image: url(skin:/buttons/btn_master.svg) no-repeat center center;
+  }
+  #HeadphoneMixerLabel {
+    image: url(skin:/buttons/btn_head.svg) no-repeat center center;
+  }
 #BoothMixerLabel {
   image: url(skin:/buttons/btn_booth.svg) no-repeat center center;
 }
-#HeadphoneMixerLabel {
-  image: url(skin:/buttons/btn_head.svg) no-repeat center center;
-}
 
 #MixerbarButton,
 #MixerbarPflButton,
@@ -749,21 +752,27 @@ padding-left: 2px;
   #DeckButtonExpanded:hover {
     background-color: #000;
   }
-  #DeckControlsToggler_Left[displayValue="0"] {
+  #DeckControlsToggler_Left[displayValue="0"],
+  #MasterHeadMixerToggle[displayValue="0"] {
     background: transparent url(skin:/buttons/btn_arrow_right.svg) no-repeat center center;
     }
-    #DeckControlsToggler_Left[displayValue="0"]:hover {
+    #DeckControlsToggler_Left[displayValue="0"]:hover,
+    #MasterHeadMixerToggle[displayValue="0"]:hover {
       background: #151515 url(skin:/buttons/btn_arrow_right_hover.svg) no-repeat center center;
     }
-    #DeckControlsToggler_Left[displayValue="1"] {
+    #DeckControlsToggler_Left[displayValue="1"],
+    #MasterHeadMixerToggle[displayValue="1"] {
       background: transparent url(skin:/buttons/btn_arrow_left.svg) no-repeat center center;
+    }
+    #DeckControlsToggler_Left[displayValue="1"] {
       border-color: #0f0f0f;
       border-style: solid;
       border-top-right-radius: 0px;
       border-bottom-right-radius: 0px;
       border-width: 1px 0px 1px 1px;
     }
-    #DeckControlsToggler_Left[displayValue="1"]:hover {
+    #DeckControlsToggler_Left[displayValue="1"]:hover,
+    #MasterHeadMixerToggle[displayValue="1"]:hover {
       background: #000 url(skin:/buttons/btn_arrow_left_hover.svg) no-repeat center center;
     }
 
diff --git a/res/skins/Tango/topbar.xml b/res/skins/Tango/topbar.xml
index 31643ed9de81..a86b8414bf55 100644
--- a/res/skins/Tango/topbar.xml
+++ b/res/skins/Tango/topbar.xml
@@ -56,6 +56,29 @@ Description:
                 </Connection>
               </PushButton>
 
+              <WidgetGroup><!-- Master & Headphone mixer -->
+                <Size>28f,28f</Size>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Label>
+                    <Size>28f,28f</Size>
+                    <ObjectName>MasterHeadMixerLabel</ObjectName>
+                  </Label>
+                </Children>
+                <Connection>
+                  <ConfigKey persist="true">[Tango],master_mixer</ConfigKey>
+                  <Transform><Not/></Transform>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+
+              <Template src="skin:button_2state_persist.xml">
+                <SetVariable name="ObjectName">MasterHeadMixerToggle</SetVariable>
+                <!-- Size needs to be changed in size_detector_stars.xml, too -->
+                <SetVariable name="Size">15f,28f</SetVariable>
+                <SetVariable name="ConfigKey">[Tango],master_mixer</SetVariable>
+              </Template>
+
               <WidgetGroup><Size>0min,1min</Size></WidgetGroup>
 
               <Template src="skin:mixer_master_booth.xml"/>

From 2da00aa8e996387ca7823ee9c3650c3bd77f2a2f Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Sun, 17 Dec 2017 21:34:21 +0100
Subject: [PATCH 13/19] restore Master VU style pt.II

---
 res/skins/Tango/vumeter_master.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/skins/Tango/vumeter_master.xml b/res/skins/Tango/vumeter_master.xml
index 899d685acdb4..f0dff7ce05ef 100644
--- a/res/skins/Tango/vumeter_master.xml
+++ b/res/skins/Tango/vumeter_master.xml
@@ -75,14 +75,14 @@ Description:
                 </Children>
               </WidgetGroup><!-- /VU -->
 
-              <WidgetGroup><Size>0f,2f</Size></WidgetGroup>
+              <WidgetGroup><Size>0f,4f</Size></WidgetGroup>
 
               <WidgetGroup>
                 <ObjectName>VUMeterMasterLabel</ObjectName>
                 <Size>16f,20f</Size>
               </WidgetGroup>
 
-              <WidgetGroup><Size>0f,3f</Size></WidgetGroup>
+              <WidgetGroup><Size>0f,1f</Size></WidgetGroup>
             </Children>
           </WidgetGroup>
         </Children>

From da9015561f6364e58220c796a8d1337e61400f32 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Sun, 17 Dec 2017 21:53:18 +0100
Subject: [PATCH 14/19] make '[EffectUnitX],show-parameters' persist when
 switching skins

---
 res/skins/Tango/fx_units_12.xml | 51 +++++++++++++++++++------------
 res/skins/Tango/fx_units_34.xml | 53 ++++++++++++++++++++-------------
 2 files changed, 65 insertions(+), 39 deletions(-)

diff --git a/res/skins/Tango/fx_units_12.xml b/res/skins/Tango/fx_units_12.xml
index 2fa19bf4d222..39b6059a6211 100644
--- a/res/skins/Tango/fx_units_12.xml
+++ b/res/skins/Tango/fx_units_12.xml
@@ -17,30 +17,40 @@ Description:
           later in xml (collapsed) to the earlier (expanded), since none of both versions
           was visible at that moment and opposing EffectUnit tries to expand horizontally.
           Putting both versions into a vertical layout fixes this issue.
+          UPDATE: now using WidgetStacks, it appears they are even more stable when switching
+
+          Normally the first widget in stack is shown. currentpage="[XYZ],blabla" makes the
+          WidgetStack remember which item was visible when stack was hidden or Mixxx restarted.
+          To make this persistent, I used the same CO that controls if the parameters are visible.
+          For that to work index of item in stack must match ...,show_parameters
       -->
-      <WidgetStack currentpage="[Tango],SwitchStack_fx_unit1_expanded" persist="true"><!-- EffectUnit 1 -->
+
+      <!-- EffectUnit 1 -->
+      <WidgetStack currentpage="[EffectRack1_EffectUnit1],show_parameters" persist="true">
         <SizePolicy>me,min</SizePolicy>
         <Children>
 
-          <WidgetGroup trigger="[EffectRack1_EffectUnit1],show_parameters" on_hide_select="1" persist="true"><!-- EffectUnit 1 maxi -->
+          <!-- EffectUnit 1 mini -->
+          <WidgetGroup>
             <Layout>vertical</Layout>
-            <SizePolicy>min,max</SizePolicy>
+            <SizePolicy>min,me</SizePolicy>
             <Children>
-              <Template src="skin:fx_unit_left.xml">
+              <Template src="skin:fx_unit_left_mini.xml">
                 <SetVariable name="FxUnit">1</SetVariable>
               </Template>
-              <WidgetGroup><Size>1min,5f</Size></WidgetGroup>
+              <WidgetGroup><Size>1min,5me</Size></WidgetGroup>
             </Children>
           </WidgetGroup>
 
-          <WidgetGroup><!-- EffectUnit 1 mini -->
+          <!-- EffectUnit 1 maxi -->
+          <WidgetGroup trigger="[EffectRack1_EffectUnit1],show_parameters" on_hide_select="0" persist="true">
             <Layout>vertical</Layout>
-            <SizePolicy>min,me</SizePolicy>
+            <SizePolicy>min,max</SizePolicy>
             <Children>
-              <Template src="skin:fx_unit_left_mini.xml">
+              <Template src="skin:fx_unit_left.xml">
                 <SetVariable name="FxUnit">1</SetVariable>
               </Template>
-              <WidgetGroup><Size>1min,5me</Size></WidgetGroup>
+              <WidgetGroup><Size>1min,5f</Size></WidgetGroup>
             </Children>
           </WidgetGroup>
 
@@ -62,29 +72,32 @@ Description:
         </Connection>
       </WidgetGroup>
 
-      <WidgetStack currentpage="[Tango],SwitchStack_fx_unit2_expanded" persist="true"><!-- EffectUnit 2 -->
+      <!-- EffectUnit 2 -->
+      <WidgetStack currentpage="[EffectRack1_EffectUnit2],show_parameters" persist="true">
         <SizePolicy>me,min</SizePolicy>
         <Children>
-        
-          <WidgetGroup trigger="[EffectRack1_EffectUnit2],show_parameters" on_hide_select="1" persist="true"><!-- EffectUnit 2 maxi -->
+
+          <!-- EffectUnit 2 mini -->
+          <WidgetGroup>
             <Layout>vertical</Layout>
-            <SizePolicy>min,max</SizePolicy>
+            <SizePolicy>min,me</SizePolicy>
             <Children>
-              <Template src="skin:fx_unit_right.xml">
+              <Template src="skin:fx_unit_right_mini.xml">
                 <SetVariable name="FxUnit">2</SetVariable>
               </Template>
-              <WidgetGroup><Size>1min,5f</Size></WidgetGroup>
+              <WidgetGroup><Size>1min,5me</Size></WidgetGroup>
             </Children>
           </WidgetGroup>
 
-          <WidgetGroup><!-- EffectUnit 2 mini -->
+          <!-- EffectUnit 2 maxi -->
+          <WidgetGroup trigger="[EffectRack1_EffectUnit2],show_parameters" on_hide_select="1" persist="true">
             <Layout>vertical</Layout>
-            <SizePolicy>min,me</SizePolicy>
+            <SizePolicy>min,max</SizePolicy>
             <Children>
-              <Template src="skin:fx_unit_right_mini.xml">
+              <Template src="skin:fx_unit_right.xml">
                 <SetVariable name="FxUnit">2</SetVariable>
               </Template>
-              <WidgetGroup><Size>1min,5me</Size></WidgetGroup>
+              <WidgetGroup><Size>1min,5f</Size></WidgetGroup>
             </Children>
           </WidgetGroup>
 
diff --git a/res/skins/Tango/fx_units_34.xml b/res/skins/Tango/fx_units_34.xml
index 816b0fdfd8d6..92ec6d9e01e7 100644
--- a/res/skins/Tango/fx_units_34.xml
+++ b/res/skins/Tango/fx_units_34.xml
@@ -17,30 +17,40 @@ Description:
           later in xml (collapsed) to the earlier (expanded), since none of both versions
           was visible at that moment and opposing EffectUnit tries to expand horizontally.
           Putting both versions into a vertical layout fixes this issue.
+          UPDATE: now using WidgetStacks, it appears they are even more stable when switching
+
+          Normally the first widget in stack is shown. currentpage="[XYZ],blabla" makes the
+          WidgetStack remember which item was visible when stack was hidden or Mixxx restarted.
+          To make this persistent, I used the same CO that controls if the parameters are visible.
+          For that to work index of item in stack must match ...,show_parameters
       -->
-      <WidgetStack currentpage="[Tango],SwitchStack_fx_unit3_expanded" persist="true"><!-- EffectUnit 1 -->
+
+      <!-- EffectUnit 3 -->
+      <WidgetStack currentpage="[EffectRack1_EffectUnit3],show_parameters" persist="true"><!-- EffectUnit 1 -->
         <SizePolicy>me,min</SizePolicy>
         <Children>
 
-          <WidgetGroup trigger="[EffectRack1_EffectUnit3],show_parameters" on_hide_select="1" persist="true"><!-- EffectUnit 3 maxi -->
+          <!-- EffectUnit 3 mini -->
+          <WidgetGroup>
             <Layout>vertical</Layout>
-            <SizePolicy>min,max</SizePolicy>
+            <SizePolicy>min,me</SizePolicy>
             <Children>
-              <Template src="skin:fx_unit_left.xml">
+              <Template src="skin:fx_unit_left_mini.xml">
                 <SetVariable name="FxUnit">3</SetVariable>
               </Template>
-              <WidgetGroup><Size>1min,5f</Size></WidgetGroup>
+              <WidgetGroup><Size>1min,5me</Size></WidgetGroup>
             </Children>
           </WidgetGroup>
 
-          <WidgetGroup><!-- EffectUnit 3 mini -->
+          <!-- EffectUnit 3 maxi -->
+          <WidgetGroup trigger="[EffectRack1_EffectUnit3],show_parameters" persist="true" on_hide_select="0">
             <Layout>vertical</Layout>
-            <SizePolicy>min,me</SizePolicy>
+            <SizePolicy>min,max</SizePolicy>
             <Children>
-              <Template src="skin:fx_unit_left_mini.xml">
+              <Template src="skin:fx_unit_left.xml">
                 <SetVariable name="FxUnit">3</SetVariable>
               </Template>
-              <WidgetGroup><Size>1min,5me</Size></WidgetGroup>
+              <WidgetGroup><Size>1min,5f</Size></WidgetGroup>
             </Children>
           </WidgetGroup>
 
@@ -62,29 +72,32 @@ Description:
         </Connection>
       </WidgetGroup>
 
-      <WidgetStack currentpage="[Tango],SwitchStack_fx_unit4_expanded" persist="true"><!-- EffectUnit 2 -->
+      <!-- EffectUnit 4 -->
+      <WidgetStack currentpage="[EffectRack1_EffectUnit4],show_parameters" persist="true">
         <SizePolicy>me,min</SizePolicy>
         <Children>
-        
-          <WidgetGroup trigger="[EffectRack1_EffectUnit4],show_parameters" on_hide_select="1" persist="true"><!-- EffectUnit 4 maxi -->
+
+          <!-- EffectUnit 4 mini -->
+          <WidgetGroup>
             <Layout>vertical</Layout>
-            <SizePolicy>min,max</SizePolicy>
+            <SizePolicy>min,me</SizePolicy>
             <Children>
-              <Template src="skin:fx_unit_right.xml">
+              <Template src="skin:fx_unit_right_mini.xml">
                 <SetVariable name="FxUnit">4</SetVariable>
               </Template>
-              <WidgetGroup><Size>1min,5f</Size></WidgetGroup>
+              <WidgetGroup><Size>1min,5me</Size></WidgetGroup>
             </Children>
           </WidgetGroup>
 
-          <WidgetGroup><!-- EffectUnit 4 mini -->
+          <!-- EffectUnit 4 maxi -->
+          <WidgetGroup trigger="[EffectRack1_EffectUnit4],show_parameters" persist="true" on_hide_select="0">
             <Layout>vertical</Layout>
-            <SizePolicy>min,me</SizePolicy>
+            <SizePolicy>min,max</SizePolicy>
             <Children>
-              <Template src="skin:fx_unit_right_mini.xml">
+              <Template src="skin:fx_unit_right.xml">
                 <SetVariable name="FxUnit">4</SetVariable>
               </Template>
-              <WidgetGroup><Size>1min,5me</Size></WidgetGroup>
+              <WidgetGroup><Size>1min,5f</Size></WidgetGroup>
             </Children>
           </WidgetGroup>
 
@@ -93,7 +106,7 @@ Description:
           <ConfigKey persist="true">[EffectRack1],show</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
-      </WidgetStack>
+      </WidgetStack><!-- /EffectUnit 4 -->
 
     </Children>
   </WidgetGroup><!-- /EffectUnits 3 & 4 -->

From 5920096a9840ef1085c66e677997de9ae46d772e Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Mon, 18 Dec 2017 01:50:45 +0100
Subject: [PATCH 15/19] allow to set number of samplers in skin.xml:

in skin.xml change these in order to switch between 16 or 64 samplers
 <attribute config_key="[Master],num_samplers">XX</attribute>
 <Template src="skin:skin_settings_sampler_rows_16.xml"/>
 <Template src="skin:sample_decks_16.xml"/>
---
 res/skins/Tango/sample_decks_16.xml           | 90 +++++++++++++++++++
 .../{sample_decks.xml => sample_decks_64.xml} |  0
 res/skins/Tango/skin.xml                      | 33 ++++++-
 res/skins/Tango/skin_settings.xml             |  8 +-
 .../Tango/skin_settings_sampler_rows_16.xml   | 37 ++++++++
 ....xml => skin_settings_sampler_rows_64.xml} |  4 -
 6 files changed, 162 insertions(+), 10 deletions(-)
 create mode 100644 res/skins/Tango/sample_decks_16.xml
 rename res/skins/Tango/{sample_decks.xml => sample_decks_64.xml} (100%)
 create mode 100644 res/skins/Tango/skin_settings_sampler_rows_16.xml
 rename res/skins/Tango/{skin_settings_sampler_rows.xml => skin_settings_sampler_rows_64.xml} (93%)

diff --git a/res/skins/Tango/sample_decks_16.xml b/res/skins/Tango/sample_decks_16.xml
new file mode 100644
index 000000000000..bde9a42bb31c
--- /dev/null
+++ b/res/skins/Tango/sample_decks_16.xml
@@ -0,0 +1,90 @@
+<!DOCTYPE template>
+<!--
+  Description:
+    Sample deck container widget.
+-->
+<Template>
+  <SingletonDefinition>
+    <ObjectName>SamplerRow1</ObjectName>
+    <Children>
+      <Template src="skin:sampler_row.xml">
+        <SetVariable name="row">1</SetVariable>
+        <SetVariable name="sampler1">1</SetVariable>
+        <SetVariable name="sampler2">2</SetVariable>
+        <SetVariable name="sampler3">3</SetVariable>
+        <SetVariable name="sampler4">4</SetVariable>
+        <SetVariable name="sampler5">5</SetVariable>
+        <SetVariable name="sampler6">6</SetVariable>
+        <SetVariable name="sampler7">7</SetVariable>
+        <SetVariable name="sampler8">8</SetVariable>
+      </Template>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>SamplerRow2</ObjectName>
+    <Children>
+      <Template src="skin:sampler_row.xml">
+        <SetVariable name="row">2</SetVariable>
+        <SetVariable name="sampler1">9</SetVariable>
+        <SetVariable name="sampler2">10</SetVariable>
+        <SetVariable name="sampler3">11</SetVariable>
+        <SetVariable name="sampler4">12</SetVariable>
+        <SetVariable name="sampler5">13</SetVariable>
+        <SetVariable name="sampler6">14</SetVariable>
+        <SetVariable name="sampler7">15</SetVariable>
+        <SetVariable name="sampler8">16</SetVariable>
+      </Template>
+    </Children>
+  </SingletonDefinition>
+
+  <WidgetGroup>
+    <Layout>vertical</Layout>
+    <!-- I don't now why this works but a WidgetGroup wrapper around a
+         WidgetStack with a 'fixed' size policy makes the group track the
+         minimum size of the current stack widget. -->
+    <SizePolicy>me,f</SizePolicy>
+    <Children>
+
+      <WidgetStack currentpage="[Tango],sampler_rows" persist="true">
+        <ObjectName>SampleDecksContainer</ObjectName>
+        <NextControl>[Tango],sampler_row_next</NextControl>
+        <PrevControl>[Tango],sampler_row_prev</PrevControl>
+        <Children>
+
+          <WidgetGroup trigger="[Tango],sampler_row_1">
+            <ObjectName>SamplerRows</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>me,min</SizePolicy>
+            <Children>
+              <SingletonContainer>
+                <ObjectName>SamplerRow1</ObjectName>
+              </SingletonContainer>
+            </Children>
+          </WidgetGroup>
+
+          <WidgetGroup trigger="[Tango],sampler_row_2">
+            <ObjectName>SamplerRows</ObjectName>
+            <Layout>vertical</Layout>
+            <SizePolicy>me,min</SizePolicy>
+            <Children>
+              <SingletonContainer>
+                <ObjectName>SamplerRow1</ObjectName>
+              </SingletonContainer>
+              <SingletonContainer>
+                <ObjectName>SamplerRow2</ObjectName>
+              </SingletonContainer>
+            </Children>
+          </WidgetGroup>
+
+        </Children>
+      </WidgetStack>
+
+    </Children>
+    <Connection>
+      <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
+</Template>
+
diff --git a/res/skins/Tango/sample_decks.xml b/res/skins/Tango/sample_decks_64.xml
similarity index 100%
rename from res/skins/Tango/sample_decks.xml
rename to res/skins/Tango/sample_decks_64.xml
diff --git a/res/skins/Tango/skin.xml b/res/skins/Tango/skin.xml
index eb0af02d1d91..77662902113a 100644
--- a/res/skins/Tango/skin.xml
+++ b/res/skins/Tango/skin.xml
@@ -28,6 +28,16 @@
           U	    U   P P P
             U	U	    P        to mixxx devs for their work over the past years!!
 
+
+    Note - Number of samplers:
+    To set the number of available sample decks, three numbers need to be changed
+    * how many samplers are instantiated in the engine
+      line 61:  <attribute config_key="[Master],num_samplers">XX</attribute>
+    * how many sample decks are loaded in the skin
+      line 322:  <Template src="skin:sample_decks_XX.xml"/>
+    * the selection button insied the skin menu (instantiated here as Singleton)
+      line 210:  <Template src="skin:skin_settings_sampler_rows_16.xml"/
+
 -->
 
 <skin>
@@ -35,7 +45,8 @@
     <title>Tango</title>
     <author>ronso0</author>
     <version>2.1.6</version>
-    <description>A flat nightime skin. Almost all controls can be hidden with Skin Settings menu.</description>
+    <description>A controller-focused nightime skin. Almost all controls can be hidden with skin menu.
+    This version features 16 sample decks only, to shorten Mixxx shut down duration.</description>
     <language>en</language>
     <license>Creative Commons Attribution, Share-Alike 3.0 Unported</license>
 
@@ -46,7 +57,9 @@
     <attributes>
       <!-- Set skin defaults. -->
       <attribute config_key="[Master],num_decks">4</attribute>
-      <attribute config_key="[Master],num_samplers">64</attribute>
+      <!-- First setting to choose between 16 or 64 samplers -->
+      <attribute config_key="[Master],num_samplers">16</attribute>
+      <!--attribute config_key="[Master],num_samplers">64</attribute-->
       <attribute persist="true" config_key="[Master],show_mixer">1</attribute>
       <attribute persist="true" config_key="[Master],show_eqs">1</attribute>
       <attribute persist="true" config_key="[Master],show_4decks">0</attribute>
@@ -147,7 +160,7 @@
      ###############################################################
       Put these variable definitions at the beginning in order to have
       have all variables available for SingletonDefinitions -->
-        
+
 <!--  Knob range in degrees, 0-360
       Initially I was trying to match the responsive area on Reloop TerminalMix 2,
       but tweak to your liking.
@@ -181,6 +194,8 @@
       </Children>
     </SingletonDefinition>
 
+    <!-- FX units 1 & 2 show up at different places, depending on the number
+    of units enabled (2 or 4). -->
     <SingletonDefinition>
       <ObjectName>FxUnits_12_Singleton</ObjectName>
       <Children>
@@ -188,6 +203,15 @@
       </Children>
     </SingletonDefinition>
 
+    <!-- Here we can choose between 16 or 64 sample decks -->
+    <SingletonDefinition>
+      <ObjectName>SamplerRowsButton_Singleton</ObjectName>
+      <Children>
+        <Template src="skin:skin_settings_sampler_rows_16.xml"/>
+        <!--Template src="skin:skin_settings_sampler_rows_64.xml"/-->
+      </Children>
+    </SingletonDefinition>
+
 <!--  ################################################################
        SkinContainer  ###############################################
      ############################################################### -->
@@ -295,7 +319,8 @@
                           </Connection>
                         </WidgetGroup>
 
-                        <Template src="skin:sample_decks.xml"/>
+                        <Template src="skin:sample_decks_16.xml"/>
+                        <!--Template src="skin:sample_decks_64.xml"/-->
 
                         <Template src="skin:mic_aux.xml"/>
 
diff --git a/res/skins/Tango/skin_settings.xml b/res/skins/Tango/skin_settings.xml
index 8087edf4179b..dfa50aeefa11 100644
--- a/res/skins/Tango/skin_settings.xml
+++ b/res/skins/Tango/skin_settings.xml
@@ -810,13 +810,17 @@ Description:
                         </Connection>
                       </WidgetGroup>
 
-                      <Template src="skin:skin_settings_sampler_rows.xml"/>
+                      <!--Template src="skin:skin_settings_sampler_rows.xml"/-->
+
+                      <SingletonContainer>
+                        <ObjectName>SamplerRowsButton_Singleton</ObjectName>
+                      </SingletonContainer>
 
                     </Children>
                   </WidgetGroup><!-- /Sampler row buttons -->
                 </Children>
               </WidgetGroup><!-- /Sampler rows -->
-          
+
               <WidgetGroup><!-- Load/Save Sampler Bank -->
                 <ObjectName>AlignLeft</ObjectName>
                 <Layout>horizontal</Layout>
diff --git a/res/skins/Tango/skin_settings_sampler_rows_16.xml b/res/skins/Tango/skin_settings_sampler_rows_16.xml
new file mode 100644
index 000000000000..2a126e379581
--- /dev/null
+++ b/res/skins/Tango/skin_settings_sampler_rows_16.xml
@@ -0,0 +1,37 @@
+<!--
+Description:
+-->
+<Template>
+  <WidgetStack currentpage="[Tango],sampler_rows" persist="true">
+    <Size>112me,13min</Size>
+    <NextControl>[Tango],sampler_bank_next</NextControl>
+    <PrevControl>[Tango],sampler_bank_prev</PrevControl>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>AlignLeft</ObjectName>
+        <Layout>horizontal</Layout>
+        <Children>
+          <Template src="skin:skin_settings_button_sampler_rows.xml">
+            <SetVariable name="current">1</SetVariable>
+            <SetVariable name="next">2</SetVariable>
+            <SetVariable name="prev">2</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup>
+        <ObjectName>AlignLeft</ObjectName>
+        <Layout>horizontal</Layout>
+        <Children>
+          <Template src="skin:skin_settings_button_sampler_rows.xml">
+            <SetVariable name="current">2</SetVariable>
+            <SetVariable name="next">1</SetVariable>
+            <SetVariable name="prev">1</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+
+    </Children>
+  </WidgetStack>
+</Template>
diff --git a/res/skins/Tango/skin_settings_sampler_rows.xml b/res/skins/Tango/skin_settings_sampler_rows_64.xml
similarity index 93%
rename from res/skins/Tango/skin_settings_sampler_rows.xml
rename to res/skins/Tango/skin_settings_sampler_rows_64.xml
index 23eae1cbaf6a..9495f003a4c4 100644
--- a/res/skins/Tango/skin_settings_sampler_rows.xml
+++ b/res/skins/Tango/skin_settings_sampler_rows_64.xml
@@ -1,9 +1,5 @@
 <!--
 Description:
-  The skin settings menu, floating on top of main skin window.
-
-  Bug: qss 'qproperty-layoutAlignment' is not respected for stacked layout.
-  No way to push SkinSettings to the right edge while keeping the area underneath clickable.
 -->
 <Template>
   <WidgetStack currentpage="[Tango],sampler_rows" persist="true">

From 48e4b423ed566b48bf438f2d240bd87b627d818a Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Fri, 22 Dec 2017 17:33:27 +0100
Subject: [PATCH 16/19] unifying FX variables

---
 res/skins/Tango/fx_button.xml           |  2 +-
 res/skins/Tango/fx_parameter_button.xml | 14 +++++------
 res/skins/Tango/fx_parameter_knob.xml   | 10 ++++----
 res/skins/Tango/fx_parameter_row.xml    | 32 ++++++++++++-------------
 res/skins/Tango/fx_toggle_selector.xml  |  1 +
 5 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/res/skins/Tango/fx_button.xml b/res/skins/Tango/fx_button.xml
index 85d0eee34a52..75bfeb7a1e37 100644
--- a/res/skins/Tango/fx_button.xml
+++ b/res/skins/Tango/fx_button.xml
@@ -30,7 +30,7 @@ Variables:
       <Unpressed scalemode="STRETCH">skin:/buttons/btn_<Variable name="labelOn"/>.svg</Unpressed>
     </State>
     <Connection>
-      <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,<Variable name="parameter"/></ConfigKey>
+      <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,<Variable name="FxParameter"/></ConfigKey>
       <ButtonState>LeftButton</ButtonState>
     </Connection>
   </EffectPushButton>
diff --git a/res/skins/Tango/fx_parameter_button.xml b/res/skins/Tango/fx_parameter_button.xml
index e7748074ebd5..4cd52cabb533 100644
--- a/res/skins/Tango/fx_parameter_button.xml
+++ b/res/skins/Tango/fx_parameter_button.xml
@@ -23,7 +23,7 @@ Variables:
       <Template src="skin:fx_button.xml">
         <SetVariable name="ObjectName">FxParameterButtonOverlay</SetVariable>
         <SetVariable name="Size">51f,18f</SetVariable>
-        <SetVariable name="parameter">button_parameter<Variable name="parameter"/></SetVariable>
+        <SetVariable name="FxParameter">button_parameter<Variable name="FxParameter"/></SetVariable>
       </Template>
 
       <!-- Name of effect parameter when inactive-->
@@ -38,13 +38,13 @@ Variables:
             <EffectRack><Variable name="FxRack"/></EffectRack>
             <EffectUnit><Variable name="FxUnit"/></EffectUnit>
             <Effect><Variable name="FxNum"/></Effect>
-            <EffectButtonParameter><Variable name="parameter"/></EffectButtonParameter>
+            <EffectButtonParameter><Variable name="FxParameter"/></EffectButtonParameter>
             <Alignment>center</Alignment>
           </EffectButtonParameterName>
           <WidgetGroup><SizePolicy>me,min</SizePolicy></WidgetGroup>
         </Children>
         <Connection>
-          <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,button_parameter<Variable name="parameter"/></ConfigKey>
+          <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,button_parameter<Variable name="FxParameter"/></ConfigKey>
           <Transform><IsEqual>0</IsEqual></Transform>
           <BindProperty>visible</BindProperty>
         </Connection>
@@ -62,13 +62,13 @@ Variables:
             <EffectRack><Variable name="FxRack"/></EffectRack>
             <EffectUnit><Variable name="FxUnit"/></EffectUnit>
             <Effect><Variable name="FxNum"/></Effect>
-            <EffectButtonParameter><Variable name="parameter"/></EffectButtonParameter>
+            <EffectButtonParameter><Variable name="FxParameter"/></EffectButtonParameter>
             <Alignment>center</Alignment>
           </EffectButtonParameterName>
           <WidgetGroup><SizePolicy>me,min</SizePolicy></WidgetGroup>
         </Children>
         <Connection>
-          <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,button_parameter<Variable name="parameter"/></ConfigKey>
+          <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,button_parameter<Variable name="FxParameter"/></ConfigKey>
           <Transform><IsEqual>1</IsEqual></Transform>
           <BindProperty>visible</BindProperty>
         </Connection>
@@ -78,12 +78,12 @@ Variables:
       <Template src="skin:fx_button.xml">
         <SetVariable name="ObjectName">FxParameterButtonUnderlay</SetVariable>
         <SetVariable name="Size">51f,18f</SetVariable>
-        <SetVariable name="parameter">button_parameter<Variable name="parameter"/></SetVariable>
+        <SetVariable name="FxParameter">button_parameter<Variable name="FxParameter"/></SetVariable>
       </Template>
     </Children>
     <!-- show only if button parameter is loaded -->
     <Connection>
-      <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,button_parameter<Variable name="parameter"/>_loaded</ConfigKey>
+      <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,button_parameter<Variable name="FxParameter"/>_loaded</ConfigKey>
       <BindProperty>visible</BindProperty>
     </Connection>
   </WidgetGroup>
diff --git a/res/skins/Tango/fx_parameter_knob.xml b/res/skins/Tango/fx_parameter_knob.xml
index 1be1d9f90397..7b09fae4600a 100644
--- a/res/skins/Tango/fx_parameter_knob.xml
+++ b/res/skins/Tango/fx_parameter_knob.xml
@@ -35,7 +35,7 @@ Variables:
                 <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
                 <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
                 <Connection>
-                  <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="parameter"/></ConfigKey>
+                  <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/></ConfigKey>
                 </Connection>
               </EffectParameterKnobComposed>
             </Children>
@@ -53,7 +53,7 @@ Variables:
                 <EffectRack><Variable name="FxRack"/></EffectRack>
                 <EffectUnit><Variable name="FxUnit"/></EffectUnit>
                 <Effect><Variable name="FxNum"/></Effect>
-                <EffectParameter><Variable name="parameter"/></EffectParameter>
+                <EffectParameter><Variable name="FxParameter"/></EffectParameter>
                 <Alignment>left</Alignment>
               </EffectParameterName>
               <WidgetGroup><SizePolicy>me,min</SizePolicy></WidgetGroup>
@@ -69,7 +69,7 @@ Variables:
         <SetVariable name="TooltipId">EffectSlot_parameter_link_type</SetVariable>
         <SetVariable name="ObjectName">FxSuperLinkButton</SetVariable>
         <SetVariable name="Size">51f,5f</SetVariable>
-        <SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="parameter"/>_link_type</SetVariable>
+        <SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_link_type</SetVariable>
       </Template>
 
       <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
@@ -79,13 +79,13 @@ Variables:
         <SetVariable name="TooltipId">EffectSlot_parameter_inversion</SetVariable>
         <SetVariable name="ObjectName">FxSuperLinkInvertButton</SetVariable>
         <SetVariable name="Size">51f,5f</SetVariable>
-        <SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="parameter"/>_link_inverse</SetVariable>
+        <SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_link_inverse</SetVariable>
       </Template>
 
     </Children>
     <!-- show only if parameter is loaded -->
     <Connection>
-      <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="parameter"/>_loaded</ConfigKey>
+      <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/>_loaded</ConfigKey>
       <BindProperty>visible</BindProperty>
     </Connection>
   </WidgetGroup>
diff --git a/res/skins/Tango/fx_parameter_row.xml b/res/skins/Tango/fx_parameter_row.xml
index 5a4b189dd272..fb33843eabdd 100644
--- a/res/skins/Tango/fx_parameter_row.xml
+++ b/res/skins/Tango/fx_parameter_row.xml
@@ -13,59 +13,59 @@ Variables passed through from fx_unit:
     <Children>
 
       <Template src="skin:fx_parameter_knob.xml">
-        <SetVariable name="parameter">1</SetVariable>
+        <SetVariable name="FxParameter">1</SetVariable>
       </Template>
       <Template src="skin:fx_parameter_button.xml">
-        <SetVariable name="parameter">1</SetVariable>
+        <SetVariable name="FxParameter">1</SetVariable>
       </Template>
 
       <Template src="skin:fx_parameter_knob.xml">
-        <SetVariable name="parameter">2</SetVariable>
+        <SetVariable name="FxParameter">2</SetVariable>
       </Template>
       <Template src="skin:fx_parameter_button.xml">
-        <SetVariable name="parameter">2</SetVariable>
+        <SetVariable name="FxParameter">2</SetVariable>
       </Template>
 
       <Template src="skin:fx_parameter_knob.xml">
-        <SetVariable name="parameter">3</SetVariable>
+        <SetVariable name="FxParameter">3</SetVariable>
       </Template>
       <Template src="skin:fx_parameter_button.xml">
-        <SetVariable name="parameter">3</SetVariable>
+        <SetVariable name="FxParameter">3</SetVariable>
       </Template>
 
       <Template src="skin:fx_parameter_knob.xml">
-        <SetVariable name="parameter">4</SetVariable>
+        <SetVariable name="FxParameter">4</SetVariable>
       </Template>
       <Template src="skin:fx_parameter_button.xml">
-        <SetVariable name="parameter">4</SetVariable>
+        <SetVariable name="FxParameter">4</SetVariable>
       </Template>
 
       <Template src="skin:fx_parameter_knob.xml">
-        <SetVariable name="parameter">5</SetVariable>
+        <SetVariable name="FxParameter">5</SetVariable>
       </Template>
       <Template src="skin:fx_parameter_button.xml">
-        <SetVariable name="parameter">5</SetVariable>
+        <SetVariable name="FxParameter">5</SetVariable>
       </Template>
 
       <Template src="skin:fx_parameter_knob.xml">
-        <SetVariable name="parameter">6</SetVariable>
+        <SetVariable name="FxParameter">6</SetVariable>
       </Template>
       <Template src="skin:fx_parameter_button.xml">
-        <SetVariable name="parameter">6</SetVariable>
+        <SetVariable name="FxParameter">6</SetVariable>
       </Template>
 
       <Template src="skin:fx_parameter_knob.xml">
-        <SetVariable name="parameter">7</SetVariable>
+        <SetVariable name="FxParameter">7</SetVariable>
       </Template>
       <Template src="skin:fx_parameter_button.xml">
-        <SetVariable name="parameter">7</SetVariable>
+        <SetVariable name="FxParameter">7</SetVariable>
       </Template>
 
       <Template src="skin:fx_parameter_knob.xml">
-        <SetVariable name="parameter">8</SetVariable>
+        <SetVariable name="FxParameter">8</SetVariable>
       </Template>
       <Template src="skin:fx_parameter_button.xml">
-        <SetVariable name="parameter">8</SetVariable>
+        <SetVariable name="FxParameter">8</SetVariable>
       </Template>
 
     </Children>
diff --git a/res/skins/Tango/fx_toggle_selector.xml b/res/skins/Tango/fx_toggle_selector.xml
index cb28bfa1787a..1f1f91166512 100644
--- a/res/skins/Tango/fx_toggle_selector.xml
+++ b/res/skins/Tango/fx_toggle_selector.xml
@@ -13,6 +13,7 @@ Variables:
 -->
 <Template>
   <SetVariable name="FxRack_FxUnit_FxNum">[<Variable name="FxRack_FxUnit"/>_Effect<Variable name="FxNum"/>]</SetVariable>
+
   <WidgetGroup>
     <ObjectName>FxToggleSelector</ObjectName>
     <Layout>stacked</Layout>

From 591f318378031f6ed0ec9e3c3d861fae154219a3 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Fri, 22 Dec 2017 17:34:04 +0100
Subject: [PATCH 17/19] fix mixer CO, unify templates

---
 ...{eq_knob_button_left.xml => eq_knob_left.xml} |  7 +++----
 ...q_knob_button_right.xml => eq_knob_right.xml} |  6 +++---
 res/skins/Tango/mixer_channel_left.xml           | 16 ++++++++--------
 res/skins/Tango/mixer_channel_right.xml          | 16 ++++++++--------
 ...ob_button_left.xml => quick_fx_knob_left.xml} |  0
 ..._button_right.xml => quick_fx_knob_right.xml} |  0
 res/skins/Tango/skin_settings.xml                |  6 +++---
 7 files changed, 25 insertions(+), 26 deletions(-)
 rename res/skins/Tango/{eq_knob_button_left.xml => eq_knob_left.xml} (89%)
 rename res/skins/Tango/{eq_knob_button_right.xml => eq_knob_right.xml} (90%)
 rename res/skins/Tango/{quick_fx_knob_button_left.xml => quick_fx_knob_left.xml} (100%)
 rename res/skins/Tango/{quick_fx_knob_button_right.xml => quick_fx_knob_right.xml} (100%)

diff --git a/res/skins/Tango/eq_knob_button_left.xml b/res/skins/Tango/eq_knob_left.xml
similarity index 89%
rename from res/skins/Tango/eq_knob_button_left.xml
rename to res/skins/Tango/eq_knob_left.xml
index d575f66ac81e..886912eb8c98 100644
--- a/res/skins/Tango/eq_knob_button_left.xml
+++ b/res/skins/Tango/eq_knob_left.xml
@@ -9,7 +9,6 @@ Variables:
   parameter   : 1, 2, 3 (low, mid, high)
 -->
 <Template>
-  <SetVariable name="FxRack">EqualizerRack1</SetVariable>
   <SetVariable name="FxNum">1</SetVariable>
   <SetVariable name="FxRack_FxUnit_FxNum">[EqualizerRack1_<Variable name="group"/>_Effect1]</SetVariable>
 
@@ -34,14 +33,14 @@ Variables:
                 <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
                 <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
                 <Connection>
-                  <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="parameter"/></ConfigKey>
+                  <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/></ConfigKey>
                 </Connection>
               </EffectParameterKnobComposed>
 
               <Template src="skin:fx_button.xml">
                 <SetVariable name="ObjectName">EQKillUnderlayLeft</SetVariable>
                 <SetVariable name="Size">30f,30f</SetVariable>
-                <SetVariable name="parameter">button_parameter<Variable name="parameter"/></SetVariable>
+                <SetVariable name="FxParameter">button_parameter<Variable name="FxParameter"/></SetVariable>
               </Template>
             </Children>
           </WidgetGroup><!-- /EQ knob + Kill indicator underneath -->
@@ -50,7 +49,7 @@ Variables:
           <Template src="skin:fx_button.xml">
             <SetVariable name="ObjectName">EQKillButton</SetVariable>
             <SetVariable name="Size">12f,30f</SetVariable>
-            <SetVariable name="parameter">button_parameter<Variable name="parameter"/></SetVariable>
+            <SetVariable name="FxParameter">button_parameter<Variable name="FxParameter"/></SetVariable>
           </Template>
         </Children>
         <Connection>
diff --git a/res/skins/Tango/eq_knob_button_right.xml b/res/skins/Tango/eq_knob_right.xml
similarity index 90%
rename from res/skins/Tango/eq_knob_button_right.xml
rename to res/skins/Tango/eq_knob_right.xml
index 981ea349feae..517a98eed834 100644
--- a/res/skins/Tango/eq_knob_button_right.xml
+++ b/res/skins/Tango/eq_knob_right.xml
@@ -26,7 +26,7 @@ Variables:
           <Template src="skin:fx_button.xml">
             <SetVariable name="ObjectName">EQKillButton</SetVariable>
             <SetVariable name="Size">12f,30f</SetVariable>
-            <SetVariable name="parameter">button_parameter<Variable name="parameter"/></SetVariable>
+            <SetVariable name="FxParameter">button_parameter<Variable name="FxParameter"/></SetVariable>
           </Template>
 
           <!-- EQ knob + Kill indicator underneath -->
@@ -41,14 +41,14 @@ Variables:
                 <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
                 <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
                 <Connection>
-                  <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="parameter"/></ConfigKey>
+                  <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,parameter<Variable name="FxParameter"/></ConfigKey>
                 </Connection>
               </EffectParameterKnobComposed>
 
               <Template src="skin:fx_button.xml">
                 <SetVariable name="ObjectName">EQKillUnderlayRight</SetVariable>
                 <SetVariable name="Size">30f,30f</SetVariable>
-                <SetVariable name="parameter">button_parameter<Variable name="parameter"/></SetVariable>
+                <SetVariable name="FxParameter">button_parameter<Variable name="FxParameter"/></SetVariable>
               </Template>
             </Children>
           </WidgetGroup><!-- /EQ knob + Kill indicator underneath -->
diff --git a/res/skins/Tango/mixer_channel_left.xml b/res/skins/Tango/mixer_channel_left.xml
index 8bbc09eb218f..262492fb47da 100644
--- a/res/skins/Tango/mixer_channel_left.xml
+++ b/res/skins/Tango/mixer_channel_left.xml
@@ -14,7 +14,7 @@ Variables:
   <WidgetGroup>
     <ObjectName>MixerChannelLeft</ObjectName>
     <Layout>horizontal</Layout>
-    <SizePolicy>min,min</SizePolicy>
+    <Size>-1min,136f</Size>
     <Children>
       <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
 
@@ -25,19 +25,19 @@ Variables:
         <SizePolicy>min,min</SizePolicy>
         <Children>
             <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
-          <Template src="skin:eq_knob_button_left.xml"><!-- High EQ -->
-            <SetVariable name="parameter">3</SetVariable>
+          <Template src="skin:eq_knob_left.xml"><!-- High EQ -->
+            <SetVariable name="FxParameter">3</SetVariable>
           </Template>
             <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
-          <Template src="skin:eq_knob_button_left.xml"><!-- Mid EQ -->
-            <SetVariable name="parameter">2</SetVariable>
+          <Template src="skin:eq_knob_left.xml"><!-- Mid EQ -->
+            <SetVariable name="FxParameter">2</SetVariable>
           </Template>
             <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
-          <Template src="skin:eq_knob_button_left.xml"><!-- Low EQ -->
-            <SetVariable name="parameter">1</SetVariable>
+          <Template src="skin:eq_knob_left.xml"><!-- Low EQ -->
+            <SetVariable name="FxParameter">1</SetVariable>
           </Template>
             <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
-          <Template src="skin:quick_fx_knob_button_left.xml"/><!-- Quick Effect knob -->
+          <Template src="skin:quick_fx_knob_left.xml"/><!-- Quick Effect knob -->
         </Children>
         <Connection>
           <ConfigKey persist="true">[Master],show_eqs</ConfigKey>
diff --git a/res/skins/Tango/mixer_channel_right.xml b/res/skins/Tango/mixer_channel_right.xml
index 31ed6b140e21..11d79b34c331 100644
--- a/res/skins/Tango/mixer_channel_right.xml
+++ b/res/skins/Tango/mixer_channel_right.xml
@@ -14,7 +14,7 @@ Variables:
   <WidgetGroup>
     <ObjectName>MixerChannelRight</ObjectName>
     <Layout>horizontal</Layout>
-    <SizePolicy>min,min</SizePolicy>
+    <Size>-1min,136f</Size>
     <Children>
 
       <WidgetGroup><!-- VU Meter + Pfl button -->
@@ -97,19 +97,19 @@ Variables:
         <SizePolicy>min,min</SizePolicy>
         <Children>
             <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
-          <Template src="skin:eq_knob_button_right.xml"><!-- High EQ -->
-            <SetVariable name="parameter">3</SetVariable>
+          <Template src="skin:eq_knob_right.xml"><!-- High EQ -->
+            <SetVariable name="FxParameter">3</SetVariable>
           </Template>
             <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
-          <Template src="skin:eq_knob_button_right.xml"><!-- Mid EQ -->
-            <SetVariable name="parameter">2</SetVariable>
+          <Template src="skin:eq_knob_right.xml"><!-- Mid EQ -->
+            <SetVariable name="FxParameter">2</SetVariable>
           </Template>
             <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
-          <Template src="skin:eq_knob_button_right.xml"><!-- Low EQ -->
-            <SetVariable name="parameter">1</SetVariable>
+          <Template src="skin:eq_knob_right.xml"><!-- Low EQ -->
+            <SetVariable name="FxParameter">1</SetVariable>
           </Template>
             <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
-          <Template src="skin:quick_fx_knob_button_right.xml"/><!-- Quick Effect knob -->
+          <Template src="skin:quick_fx_knob_right.xml"/><!-- Quick Effect knob -->
         </Children>
         <Connection>
           <ConfigKey persist="true">[Master],show_eqs</ConfigKey>
diff --git a/res/skins/Tango/quick_fx_knob_button_left.xml b/res/skins/Tango/quick_fx_knob_left.xml
similarity index 100%
rename from res/skins/Tango/quick_fx_knob_button_left.xml
rename to res/skins/Tango/quick_fx_knob_left.xml
diff --git a/res/skins/Tango/quick_fx_knob_button_right.xml b/res/skins/Tango/quick_fx_knob_right.xml
similarity index 100%
rename from res/skins/Tango/quick_fx_knob_button_right.xml
rename to res/skins/Tango/quick_fx_knob_right.xml
diff --git a/res/skins/Tango/skin_settings.xml b/res/skins/Tango/skin_settings.xml
index dfa50aeefa11..59e586befe4e 100644
--- a/res/skins/Tango/skin_settings.xml
+++ b/res/skins/Tango/skin_settings.xml
@@ -365,7 +365,7 @@ Description:
                             <SizePolicy>me,f</SizePolicy>
                             <Text>!</Text>
                             <Connection>
-                              <ConfigKey persist="true">[Master],show_mixerr</ConfigKey>
+                              <ConfigKey persist="true">[Master],show_mixer</ConfigKey>
                               <BindProperty>visible</BindProperty>
                             </Connection>
                           </Label>
@@ -432,7 +432,7 @@ Description:
                     <MaximumSize>182,17</MaximumSize>
                     <SizePolicy>me,me</SizePolicy>
                     <Connection>
-                      <ConfigKey persist="true">[Master],show_mixerr</ConfigKey>
+                      <ConfigKey persist="true">[Master],show_mixer</ConfigKey>
                       <BindProperty>visible</BindProperty>
                     </Connection>
                   </WidgetGroup>
@@ -527,7 +527,7 @@ Description:
                           <WidgetGroup><Size>0me,1min</Size></WidgetGroup>
                         </Children>
                         <Connection>
-                          <ConfigKey persist="true">[Master],show_mixerr</ConfigKey>
+                          <ConfigKey persist="true">[Master],show_mixer</ConfigKey>
                           <BindProperty>visible</BindProperty>
                         </Connection>
                       </WidgetGroup><!-- /hint: enforced small cover/spinny with mixer-->

From cc7613fa0edea86886cd1390b3aa19ddfaf1971c Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Fri, 22 Dec 2017 19:19:37 +0100
Subject: [PATCH 18/19] default to 64 sample decks

---
 res/skins/Tango/skin.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/skins/Tango/skin.xml b/res/skins/Tango/skin.xml
index 77662902113a..d0ee6ae33473 100644
--- a/res/skins/Tango/skin.xml
+++ b/res/skins/Tango/skin.xml
@@ -58,8 +58,8 @@
       <!-- Set skin defaults. -->
       <attribute config_key="[Master],num_decks">4</attribute>
       <!-- First setting to choose between 16 or 64 samplers -->
-      <attribute config_key="[Master],num_samplers">16</attribute>
-      <!--attribute config_key="[Master],num_samplers">64</attribute-->
+      <attribute config_key="[Master],num_samplers">64</attribute>
+      <!--attribute config_key="[Master],num_samplers">16</attribute-->
       <attribute persist="true" config_key="[Master],show_mixer">1</attribute>
       <attribute persist="true" config_key="[Master],show_eqs">1</attribute>
       <attribute persist="true" config_key="[Master],show_4decks">0</attribute>
@@ -207,8 +207,8 @@
     <SingletonDefinition>
       <ObjectName>SamplerRowsButton_Singleton</ObjectName>
       <Children>
-        <Template src="skin:skin_settings_sampler_rows_16.xml"/>
-        <!--Template src="skin:skin_settings_sampler_rows_64.xml"/-->
+        <Template src="skin:skin_settings_sampler_rows_64.xml"/>
+        <!--Template src="skin:skin_settings_sampler_rows_16.xml"/-->
       </Children>
     </SingletonDefinition>
 
@@ -319,8 +319,8 @@
                           </Connection>
                         </WidgetGroup>
 
-                        <Template src="skin:sample_decks_16.xml"/>
-                        <!--Template src="skin:sample_decks_64.xml"/-->
+                        <Template src="skin:sample_decks_64.xml"/>
+                        <!--Template src="skin:sample_decks_16.xml"/-->
 
                         <Template src="skin:mic_aux.xml"/>
 

From 7a31204b9b2303c9834aed73bee71e4055ead28c Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Fri, 22 Dec 2017 19:21:48 +0100
Subject: [PATCH 19/19] set Master/Headphone mixer default (1, visible)

---
 res/skins/Tango/skin.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/skins/Tango/skin.xml b/res/skins/Tango/skin.xml
index d0ee6ae33473..00fb2dffd58b 100644
--- a/res/skins/Tango/skin.xml
+++ b/res/skins/Tango/skin.xml
@@ -80,6 +80,7 @@
       <attribute persist="true" config_key="[SamplerRow7],expanded">0</attribute>
       <attribute persist="true" config_key="[SamplerRow8],expanded">0</attribute>
       <!-- [Tango] specific defaults -->
+      <attribute persist="true" config_key="[Tango],master_mixer">1</attribute>
       <attribute persist="true" config_key="[Tango],4_FxUnits">0</attribute>
       <!--attribute persist="true" config_key="[Tango],sampler_fx_buttons">1</attribute-->
       <attribute persist="true" config_key="[Tango],beatgrid_buttons">0</attribute>