From adf6362add4a9b18f430f7bbb9d2f67fdeddb30f Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 20 Apr 2021 01:56:32 +0200
Subject: [PATCH] Tango: sort templates into subfolders

---
 res/skins/Tango (64 Samplers)/skin.xml        |  16 +-
 .../Tango (64 Samplers)/skin_settings.xml     |  84 ++---
 .../skin_settings_sampler_rows_64.xml         |  16 +-
 res/skins/Tango/buttons/btn_beatbox_up.svg    |  62 +++-
 .../Tango/{ => controls}/button_1state.xml    |   4 +-
 .../{ => controls}/button_1state_right.xml    |   4 +-
 .../button_1state_right_display.xml           |   4 +-
 .../button_1state_right_persist.xml           |   4 +-
 .../Tango/{ => controls}/button_2state.xml    |   8 +-
 .../{ => controls}/button_2state_display.xml  |   8 +-
 .../button_2state_highlight.xml               |   8 +-
 .../{ => controls}/button_2state_persist.xml  |   8 +-
 .../{ => controls}/button_2state_right.xml    |   8 +-
 .../button_2state_right_display.xml           |   8 +-
 .../Tango/{ => controls}/button_3state.xml    |  12 +-
 .../{ => controls}/button_3state_display.xml  |  12 +-
 .../{ => controls}/button_3state_persist.xml  |  12 +-
 .../{ => controls}/button_4state_display.xml  |  16 +-
 .../Tango/{ => controls}/button_5state.xml    |  20 +-
 .../{ => controls}/button_5state_display.xml  |  20 +-
 .../button_deck_control_1state_opt.xml        |   6 +-
 .../button_deck_control_1state_perm.xml       |   6 +-
 .../button_deck_control_2state_opt.xml        |  10 +-
 .../button_deck_control_2state_perm.xml       |  10 +-
 .../button_deck_control_3state_opt.xml        |  14 +-
 .../button_deck_control_3state_perm.xml       |  14 +-
 .../{ => controls}/button_hotcue_deck.xml     |   0
 .../{ => controls}/button_hotcue_sam_pre.xml  |   0
 .../Tango/{ => controls}/button_loopsize.xml  |   2 +-
 .../{ => controls}/button_specialcue_deck.xml |   0
 .../Tango/{ => controls}/knob_textless.xml    |   4 +-
 .../skin_settings_button_2state.xml           |   0
 .../skin_settings_button_multi.xml            |   0
 .../skin_settings_button_sampler_rows.xml     |   0
 .../skin_settings_category_button_2state.xml  |   0
 .../{ => controls}/statuslight_4state.xml     |   0
 res/skins/Tango/{ => decks}/deck_left.xml     |  20 +-
 .../Tango/{ => decks}/deck_left_mini.xml      |  14 +-
 res/skins/Tango/{ => decks}/deck_right.xml    |  26 +-
 .../Tango/{ => decks}/deck_right_mini.xml     |  14 +-
 .../Tango/{ => decks}/hotcues_deck_left.xml   |  34 +-
 .../Tango/{ => decks}/hotcues_deck_right.xml  |  34 +-
 .../{ => decks}/hotcues_sampler_preview.xml   |  24 +-
 res/skins/Tango/{ => decks}/jump_controls.xml |   6 +-
 res/skins/Tango/{ => decks}/loop_controls.xml |  14 +-
 .../Tango/{ => decks}/loop_indicator.xml      |   2 +-
 res/skins/Tango/{ => decks}/loop_sizes.xml    |  18 +-
 .../{deck_overview.xml => decks/overview.xml} |   0
 res/skins/Tango/{ => decks}/preview_deck.xml  |  14 +-
 .../Tango/{ => decks}/rate_pitch_key.xml      |  16 +-
 .../row_comment_fx_left.xml}                  |   8 +-
 .../row_comment_fx_right.xml}                 |   8 +-
 .../row_loop_jump.xml}                        |   4 +-
 .../row_overview_left.xml}                    |   4 +-
 .../row_overview_right.xml}                   |   4 +-
 .../row_text_left.xml}                        |   0
 .../row_text_right.xml}                       |   0
 .../row_transport_left.xml}                   |  40 +--
 .../row_transport_right.xml}                  |  36 +--
 .../Tango/{ => decks}/spinny_cover_maxi.xml   |  18 +-
 .../Tango/{ => decks}/spinny_cover_mini.xml   |  18 +-
 .../Tango/{ => decks}/vinyl_controls_left.xml |  10 +-
 .../{ => decks}/vinyl_controls_right.xml      |  10 +-
 res/skins/Tango/decks_12.xml                  |   6 +-
 res/skins/Tango/decks_34.xml                  |   6 +-
 .../assign_button.xml}                        |   0
 .../Tango/{fx_button.xml => fx/button.xml}    |   8 +-
 .../flow_focus_background.xml}                |   0
 .../flow_focus_separator.xml}                 |   2 +-
 .../flow_noFocus_separator.xml}               |   4 +-
 .../focus_button.xml}                         |   0
 .../master_button.xml}                        |   2 +-
 .../{fx_metaknob.xml => fx/metaknob.xml}      |   4 +-
 .../parameter_button.xml}                     |   4 +-
 .../parameter_knob.xml}                       |   8 +-
 .../parameter_row.xml}                        |  32 +-
 .../toggle_selector.xml}                      |   4 +-
 .../{fx_unit_left.xml => fx/unit_left.xml}    |  54 ++--
 .../unit_left_mini.xml}                       |  38 +--
 .../{fx_unit_right.xml => fx/unit_right.xml}  |  54 ++--
 .../unit_right_mini.xml}                      |  38 +--
 res/skins/Tango/fx_units_12.xml               |   8 +-
 res/skins/Tango/fx_units_34.xml               |   8 +-
 res/skins/Tango/{ => helpers}/pfl_cover.xml   |   0
 .../size_detector_deck_controls_toggle.xml    |   0
 .../{ => helpers}/size_detector_stars.xml     |   2 +-
 .../Tango/{ => helpers}/spacer_center.xml     |   0
 res/skins/Tango/library.xml                   |   4 +-
 res/skins/Tango/mic_aux_rack.xml              |  36 +--
 .../Tango/{ => mic_aux_sampler}/aux_unit.xml  |  20 +-
 .../aux_unit_unconfigured.xml                 |   2 +-
 .../Tango/{ => mic_aux_sampler}/mic_unit.xml  |  18 +-
 .../mic_unit_unconfigured.xml                 |   2 +-
 .../Tango/{ => mic_aux_sampler}/sampler.xml   |  40 +--
 .../{ => mic_aux_sampler}/sampler_row.xml     |  18 +-
 res/skins/Tango/{ => mixer}/eq_knob_left.xml  |   8 +-
 res/skins/Tango/{ => mixer}/eq_knob_right.xml |   8 +-
 .../Tango/{ => mixer}/mixer_channel_left.xml  |  20 +-
 .../Tango/{ => mixer}/mixer_channel_right.xml |  20 +-
 .../Tango/{ => mixer}/mixer_headphone.xml     |  10 +-
 res/skins/Tango/{ => mixer}/mixer_master.xml  |  20 +-
 .../Tango/{ => mixer}/quick_fx_knob_left.xml  |  14 +-
 .../Tango/{ => mixer}/quick_fx_knob_right.xml |  14 +-
 .../Tango/{ => mixer}/vumeter_floating.xml    |   0
 .../Tango/{ => mixer}/vumeter_master.xml      |   2 +-
 res/skins/Tango/{ => mixer}/vumeter_mini.xml  |  10 +-
 res/skins/Tango/{ => mixer}/vumeter_mixer.xml |   2 +-
 .../Tango/{ => mixer}/vumeter_single.xml      |  16 +-
 res/skins/Tango/preview_headmixer_cover.xml   |  32 --
 res/skins/Tango/sampler_rack.xml              |   5 +-
 res/skins/Tango/skin.xml                      |  44 +--
 res/skins/Tango/skin_settings.xml             |  80 ++---
 .../Tango/skin_settings_sampler_rows_16.xml   |   4 +-
 res/skins/Tango/style.qss                     | 298 +++++++++---------
 res/skins/Tango/topbar.xml                    |  54 ++--
 res/skins/Tango/waveform.xml                  |  14 +-
 res/skins/Tango/waveforms_container.xml       |  10 +-
 117 files changed, 962 insertions(+), 941 deletions(-)
 rename res/skins/Tango/{ => controls}/button_1state.xml (82%)
 rename res/skins/Tango/{ => controls}/button_1state_right.xml (84%)
 rename res/skins/Tango/{ => controls}/button_1state_right_display.xml (86%)
 rename res/skins/Tango/{ => controls}/button_1state_right_persist.xml (85%)
 rename res/skins/Tango/{ => controls}/button_2state.xml (73%)
 rename res/skins/Tango/{ => controls}/button_2state_display.xml (75%)
 rename res/skins/Tango/{ => controls}/button_2state_highlight.xml (75%)
 rename res/skins/Tango/{ => controls}/button_2state_persist.xml (73%)
 rename res/skins/Tango/{ => controls}/button_2state_right.xml (76%)
 rename res/skins/Tango/{ => controls}/button_2state_right_display.xml (78%)
 rename res/skins/Tango/{ => controls}/button_3state.xml (67%)
 rename res/skins/Tango/{ => controls}/button_3state_display.xml (70%)
 rename res/skins/Tango/{ => controls}/button_3state_persist.xml (67%)
 rename res/skins/Tango/{ => controls}/button_4state_display.xml (65%)
 rename res/skins/Tango/{ => controls}/button_5state.xml (60%)
 rename res/skins/Tango/{ => controls}/button_5state_display.xml (62%)
 rename res/skins/Tango/{ => controls}/button_deck_control_1state_opt.xml (82%)
 rename res/skins/Tango/{ => controls}/button_deck_control_1state_perm.xml (81%)
 rename res/skins/Tango/{ => controls}/button_deck_control_2state_opt.xml (73%)
 rename res/skins/Tango/{ => controls}/button_deck_control_2state_perm.xml (72%)
 rename res/skins/Tango/{ => controls}/button_deck_control_3state_opt.xml (66%)
 rename res/skins/Tango/{ => controls}/button_deck_control_3state_perm.xml (65%)
 rename res/skins/Tango/{ => controls}/button_hotcue_deck.xml (100%)
 rename res/skins/Tango/{ => controls}/button_hotcue_sam_pre.xml (100%)
 rename res/skins/Tango/{ => controls}/button_loopsize.xml (93%)
 rename res/skins/Tango/{ => controls}/button_specialcue_deck.xml (100%)
 rename res/skins/Tango/{ => controls}/knob_textless.xml (87%)
 rename res/skins/Tango/{ => controls}/skin_settings_button_2state.xml (100%)
 rename res/skins/Tango/{ => controls}/skin_settings_button_multi.xml (100%)
 rename res/skins/Tango/{ => controls}/skin_settings_button_sampler_rows.xml (100%)
 rename res/skins/Tango/{ => controls}/skin_settings_category_button_2state.xml (100%)
 rename res/skins/Tango/{ => controls}/statuslight_4state.xml (100%)
 rename res/skins/Tango/{ => decks}/deck_left.xml (88%)
 rename res/skins/Tango/{ => decks}/deck_left_mini.xml (94%)
 rename res/skins/Tango/{ => decks}/deck_right.xml (89%)
 rename res/skins/Tango/{ => decks}/deck_right_mini.xml (94%)
 rename res/skins/Tango/{ => decks}/hotcues_deck_left.xml (79%)
 rename res/skins/Tango/{ => decks}/hotcues_deck_right.xml (79%)
 rename res/skins/Tango/{ => decks}/hotcues_sampler_preview.xml (79%)
 rename res/skins/Tango/{ => decks}/jump_controls.xml (93%)
 rename res/skins/Tango/{ => decks}/loop_controls.xml (89%)
 rename res/skins/Tango/{ => decks}/loop_indicator.xml (94%)
 rename res/skins/Tango/{ => decks}/loop_sizes.xml (82%)
 rename res/skins/Tango/{deck_overview.xml => decks/overview.xml} (100%)
 rename res/skins/Tango/{ => decks}/preview_deck.xml (92%)
 rename res/skins/Tango/{ => decks}/rate_pitch_key.xml (94%)
 rename res/skins/Tango/{deck_row_comment_fx_left.xml => decks/row_comment_fx_left.xml} (91%)
 rename res/skins/Tango/{deck_row_comment_fx_right.xml => decks/row_comment_fx_right.xml} (92%)
 rename res/skins/Tango/{deck_row_loop_jump.xml => decks/row_loop_jump.xml} (94%)
 rename res/skins/Tango/{deck_row_overview_left.xml => decks/row_overview_left.xml} (95%)
 rename res/skins/Tango/{deck_row_overview_right.xml => decks/row_overview_right.xml} (95%)
 rename res/skins/Tango/{deck_row_text_left.xml => decks/row_text_left.xml} (100%)
 rename res/skins/Tango/{deck_row_text_right.xml => decks/row_text_right.xml} (100%)
 rename res/skins/Tango/{deck_row_transport_left.xml => decks/row_transport_left.xml} (87%)
 rename res/skins/Tango/{deck_row_transport_right.xml => decks/row_transport_right.xml} (87%)
 rename res/skins/Tango/{ => decks}/spinny_cover_maxi.xml (77%)
 rename res/skins/Tango/{ => decks}/spinny_cover_mini.xml (68%)
 rename res/skins/Tango/{ => decks}/vinyl_controls_left.xml (93%)
 rename res/skins/Tango/{ => decks}/vinyl_controls_right.xml (93%)
 rename res/skins/Tango/{fx_assign_button.xml => fx/assign_button.xml} (100%)
 rename res/skins/Tango/{fx_button.xml => fx/button.xml} (69%)
 rename res/skins/Tango/{fx_flow_focus_background.xml => fx/flow_focus_background.xml} (100%)
 rename res/skins/Tango/{fx_flow_focus_separator.xml => fx/flow_focus_separator.xml} (98%)
 rename res/skins/Tango/{fx_flow_noFocus_separator.xml => fx/flow_noFocus_separator.xml} (93%)
 rename res/skins/Tango/{fx_focus_button.xml => fx/focus_button.xml} (100%)
 rename res/skins/Tango/{fx_master_button.xml => fx/master_button.xml} (93%)
 rename res/skins/Tango/{fx_metaknob.xml => fx/metaknob.xml} (88%)
 rename res/skins/Tango/{fx_parameter_button.xml => fx/parameter_button.xml} (95%)
 rename res/skins/Tango/{fx_parameter_knob.xml => fx/parameter_knob.xml} (93%)
 rename res/skins/Tango/{fx_parameter_row.xml => fx/parameter_row.xml} (62%)
 rename res/skins/Tango/{fx_toggle_selector.xml => fx/toggle_selector.xml} (94%)
 rename res/skins/Tango/{fx_unit_left.xml => fx/unit_left.xml} (82%)
 rename res/skins/Tango/{fx_unit_left_mini.xml => fx/unit_left_mini.xml} (84%)
 rename res/skins/Tango/{fx_unit_right.xml => fx/unit_right.xml} (82%)
 rename res/skins/Tango/{fx_unit_right_mini.xml => fx/unit_right_mini.xml} (84%)
 rename res/skins/Tango/{ => helpers}/pfl_cover.xml (100%)
 rename res/skins/Tango/{ => helpers}/size_detector_deck_controls_toggle.xml (100%)
 rename res/skins/Tango/{ => helpers}/size_detector_stars.xml (99%)
 rename res/skins/Tango/{ => helpers}/spacer_center.xml (100%)
 rename res/skins/Tango/{ => mic_aux_sampler}/aux_unit.xml (88%)
 rename res/skins/Tango/{ => mic_aux_sampler}/aux_unit_unconfigured.xml (96%)
 rename res/skins/Tango/{ => mic_aux_sampler}/mic_unit.xml (88%)
 rename res/skins/Tango/{ => mic_aux_sampler}/mic_unit_unconfigured.xml (96%)
 rename res/skins/Tango/{ => mic_aux_sampler}/sampler.xml (90%)
 rename res/skins/Tango/{ => mic_aux_sampler}/sampler_row.xml (81%)
 rename res/skins/Tango/{ => mixer}/eq_knob_left.xml (94%)
 rename res/skins/Tango/{ => mixer}/eq_knob_right.xml (94%)
 rename res/skins/Tango/{ => mixer}/mixer_channel_left.xml (83%)
 rename res/skins/Tango/{ => mixer}/mixer_channel_right.xml (83%)
 rename res/skins/Tango/{ => mixer}/mixer_headphone.xml (88%)
 rename res/skins/Tango/{ => mixer}/mixer_master.xml (81%)
 rename res/skins/Tango/{ => mixer}/quick_fx_knob_left.xml (93%)
 rename res/skins/Tango/{ => mixer}/quick_fx_knob_right.xml (93%)
 rename res/skins/Tango/{ => mixer}/vumeter_floating.xml (100%)
 rename res/skins/Tango/{ => mixer}/vumeter_master.xml (99%)
 rename res/skins/Tango/{ => mixer}/vumeter_mini.xml (71%)
 rename res/skins/Tango/{ => mixer}/vumeter_mixer.xml (99%)
 rename res/skins/Tango/{ => mixer}/vumeter_single.xml (78%)
 delete mode 100644 res/skins/Tango/preview_headmixer_cover.xml

diff --git a/res/skins/Tango (64 Samplers)/skin.xml b/res/skins/Tango (64 Samplers)/skin.xml
index 98b477b9b1a2..762b824c4c62 100644
--- a/res/skins/Tango (64 Samplers)/skin.xml	
+++ b/res/skins/Tango (64 Samplers)/skin.xml	
@@ -203,7 +203,7 @@
     <SingletonDefinition>
       <ObjectName>DeckOverviewSingleton1</ObjectName>
       <Children>
-        <Template src="skin:../Tango/deck_overview.xml">
+        <Template src="skin:../Tango/decks/overview.xml">
           <SetVariable name="chanNum">1</SetVariable>
           <SetVariable name="SignalBgColor"><Variable name="SignalBgColor_12"/></SetVariable>
           <SetVariable name="SignalColor"><Variable name="SignalColor_12"/></SetVariable>
@@ -214,7 +214,7 @@
     <SingletonDefinition>
       <ObjectName>DeckOverviewSingleton2</ObjectName>
       <Children>
-        <Template src="skin:../Tango/deck_overview.xml">
+        <Template src="skin:../Tango/decks/overview.xml">
           <SetVariable name="chanNum">2</SetVariable>
           <SetVariable name="SignalBgColor"><Variable name="SignalBgColor_12"/></SetVariable>
           <SetVariable name="SignalColor"><Variable name="SignalColor_12"/></SetVariable>
@@ -225,7 +225,7 @@
     <SingletonDefinition>
       <ObjectName>DeckOverviewSingleton3</ObjectName>
       <Children>
-        <Template src="skin:../Tango/deck_overview.xml">
+        <Template src="skin:../Tango/decks/overview.xml">
           <SetVariable name="chanNum">3</SetVariable>
           <SetVariable name="SignalBgColor"><Variable name="SignalBgColor_34"/></SetVariable>
           <SetVariable name="SignalColor"><Variable name="SignalColor_34"/></SetVariable>
@@ -236,7 +236,7 @@
     <SingletonDefinition>
       <ObjectName>DeckOverviewSingleton4</ObjectName>
       <Children>
-        <Template src="skin:../Tango/deck_overview.xml">
+        <Template src="skin:../Tango/decks/overview.xml">
           <SetVariable name="chanNum">4</SetVariable>
           <SetVariable name="SignalBgColor"><Variable name="SignalBgColor_34"/></SetVariable>
           <SetVariable name="SignalColor"><Variable name="SignalColor_34"/></SetVariable>
@@ -520,10 +520,10 @@
                           <Layout>horizontal</Layout>
                           <SizePolicy>me,max</SizePolicy>
                           <Children>
-                            <Template src="skin:../Tango/deck_left_mini.xml">
+                            <Template src="skin:../Tango/decks/deck_left_mini.xml">
                               <SetVariable name="chanNum">1</SetVariable>
                             </Template>
-                            <Template src="skin:../Tango/deck_right_mini.xml">
+                            <Template src="skin:../Tango/decks/deck_right_mini.xml">
                               <SetVariable name="chanNum">2</SetVariable>
                             </Template>
                           </Children>
@@ -533,10 +533,10 @@
                           <Layout>horizontal</Layout>
                           <SizePolicy>me,max</SizePolicy>
                           <Children>
-                            <Template src="skin:../Tango/deck_left_mini.xml">
+                            <Template src="skin:../Tango/decks/deck_left_mini.xml">
                               <SetVariable name="chanNum">3</SetVariable>
                             </Template>
-                            <Template src="skin:../Tango/deck_right_mini.xml">
+                            <Template src="skin:../Tango/decks/deck_right_mini.xml">
                               <SetVariable name="chanNum">4</SetVariable>
                             </Template>
                           </Children>
diff --git a/res/skins/Tango (64 Samplers)/skin_settings.xml b/res/skins/Tango (64 Samplers)/skin_settings.xml
index 72d57a027f62..d7cabaa13f48 100644
--- a/res/skins/Tango (64 Samplers)/skin_settings.xml	
+++ b/res/skins/Tango (64 Samplers)/skin_settings.xml	
@@ -53,17 +53,17 @@ Description:
             </Children>
           </WidgetGroup>
 
-          <Template src="skin:../Tango/skin_settings_button_2state.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
             <SetVariable name="text">4 Decks</SetVariable>
             <SetVariable name="Setting">[Skin],show_4decks</SetVariable>
           </Template>
 
-          <Template src="skin:../Tango/skin_settings_button_2state.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
             <SetVariable name="text">Symmetric Overviews</SetVariable>
             <SetVariable name="Setting">[Tango],symmetric_overviews</SetVariable>
           </Template>
 
-          <Template src="skin:../Tango/skin_settings_button_2state.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
             <SetVariable name="text">Symmetric Time/Duration</SetVariable>
             <SetVariable name="Setting">[Tango],symmetric_time</SetVariable>
           </Template>
@@ -80,7 +80,7 @@ Description:
             <SizePolicy>me,me</SizePolicy>
             <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:../Tango/skin_settings_button_2state.xml">
+              <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
                 <SetVariable name="text">Hotcue buttons</SetVariable>
                 <SetVariable name="width">135</SetVariable>
                 <SetVariable name="Setting">[Tango],hotcues</SetVariable>
@@ -109,13 +109,13 @@ Description:
                     <SizePolicy>me,me</SizePolicy>
                     <Layout>horizontal</Layout>
                     <Children>
-                      <Template src="skin:../Tango/skin_settings_button_multi.xml">
+                      <Template src="skin:../Tango/controls/skin_settings_button_multi.xml">
                         <SetVariable name="state_x_text">  4  </SetVariable>
                         <SetVariable name="width">20</SetVariable>
                         <SetVariable name="stateX">0</SetVariable>
                         <SetVariable name="Setting">[Skin],show_8_hotcues</SetVariable>
                       </Template>
-                      <Template src="skin:../Tango/skin_settings_button_multi.xml">
+                      <Template src="skin:../Tango/controls/skin_settings_button_multi.xml">
                         <SetVariable name="state_x_text">  8  </SetVariable>
                         <SetVariable name="width">20</SetVariable>
                         <SetVariable name="stateX">1</SetVariable>
@@ -129,23 +129,23 @@ Description:
             </Children>
           </WidgetGroup><!-- /HotCue settings -->
 
-          <Template src="skin:../Tango/skin_settings_button_2state.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
             <SetVariable name="text">Hotcue shift buttons</SetVariable>
             <SetVariable name="Setting">[Skin],timing_shift_buttons</SetVariable>
           </Template>
 
-          <Template src="skin:../Tango/skin_settings_button_2state.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
             <SetVariable name="text">Intro &amp; Outro Cues</SetVariable>
             <SetVariable name="Setting">[Skin],show_intro_outro_cues</SetVariable>
           </Template>
 
 
-          <Template src="skin:../Tango/skin_settings_button_2state.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
             <SetVariable name="text">Loop / Beatjump Buttons</SetVariable>
             <SetVariable name="Setting">[Skin],show_loop_beatjump_controls</SetVariable>
           </Template>
 
-          <Template src="skin:../Tango/skin_settings_button_2state.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
             <SetVariable name="text">Track Comment</SetVariable>
             <SetVariable name="Setting">[Tango],trackComment</SetVariable>
           </Template>
@@ -171,7 +171,7 @@ Description:
                 <Layout>horizontal</Layout>
                 <Children>
                   <!-- button graphics are 15x15px + 1px margin-right -->
-                  <Template src="skin:../Tango/button_2state_persist.xml">
+                  <Template src="skin:../Tango/controls/button_2state_persist.xml">
                     <SetVariable name="ObjectName">DeckButtonVisibility</SetVariable>
                     <SetVariable name="Size">20f,15f</SetVariable>
                     <SetVariable name="state_0_text">Q</SetVariable>
@@ -195,7 +195,7 @@ Description:
                           <BindProperty>visible</BindProperty>
                         </Connection>
                       </WidgetGroup>
-                      <Template src="skin:../Tango/button_2state_persist.xml">
+                      <Template src="skin:../Tango/controls/button_2state_persist.xml">
                         <SetVariable name="ObjectName">DeckButtonVisibility</SetVariable>
                         <SetVariable name="Size">16f,15f</SetVariable>
                         <SetVariable name="state_0_icon">stars_hidden.svg</SetVariable>
@@ -207,7 +207,7 @@ Description:
 
                   <WidgetGroup><Size>6f,0f</Size></WidgetGroup>
 
-                  <Template src="skin:../Tango/button_2state_persist.xml"><!-- Keylock -->
+                  <Template src="skin:../Tango/controls/button_2state_persist.xml"><!-- Keylock -->
                     <SetVariable name="ObjectName">DeckButtonVisibility</SetVariable>
                     <SetVariable name="Size">16f,15f</SetVariable>
                     <SetVariable name="state_0_icon">keylock_off.svg</SetVariable>
@@ -215,7 +215,7 @@ Description:
                     <SetVariable name="ConfigKey">[Tango],always_visible_keylock</SetVariable>
                   </Template>
 
-                  <Template src="skin:../Tango/button_2state_persist.xml">
+                  <Template src="skin:../Tango/controls/button_2state_persist.xml">
                     <SetVariable name="ObjectName">DeckButtonVisibility</SetVariable>
                     <SetVariable name="Size">16f,15f</SetVariable>
                     <SetVariable name="state_0_icon">eject.svg</SetVariable>
@@ -223,7 +223,7 @@ Description:
                     <SetVariable name="ConfigKey">[Tango],always_visible_eject</SetVariable>
                   </Template>
 
-                  <Template src="skin:../Tango/button_2state_persist.xml">
+                  <Template src="skin:../Tango/controls/button_2state_persist.xml">
                     <SetVariable name="ObjectName">DeckButtonVisibility</SetVariable>
                     <SetVariable name="Size">16f,15f</SetVariable>
                     <SetVariable name="state_0_icon">slipmode_hidden.svg</SetVariable>
@@ -231,7 +231,7 @@ Description:
                     <SetVariable name="ConfigKey">[Tango],always_visible_slip_enabled</SetVariable>
                   </Template>
 
-                  <Template src="skin:../Tango/button_2state_persist.xml">
+                  <Template src="skin:../Tango/controls/button_2state_persist.xml">
                     <SetVariable name="ObjectName">DeckButtonVisibility</SetVariable>
                     <SetVariable name="Size">16f,15f</SetVariable>
                     <SetVariable name="state_0_icon">repeat_hidden.svg</SetVariable>
@@ -239,7 +239,7 @@ Description:
                     <SetVariable name="ConfigKey">[Tango],always_visible_repeat</SetVariable>
                   </Template>
 
-                  <Template src="skin:../Tango/button_2state_persist.xml">
+                  <Template src="skin:../Tango/controls/button_2state_persist.xml">
                     <SetVariable name="ObjectName">DeckButtonVisibility</SetVariable>
                     <SetVariable name="Size">16f,15f</SetVariable>
                     <SetVariable name="state_0_icon">xfader_center.svg</SetVariable>
@@ -247,7 +247,7 @@ Description:
                     <SetVariable name="ConfigKey">[Tango],always_visible_orientation</SetVariable>
                   </Template>
 
-                  <Template src="skin:../Tango/button_2state_persist.xml">
+                  <Template src="skin:../Tango/controls/button_2state_persist.xml">
                     <SetVariable name="ObjectName">DeckButtonVisibility</SetVariable>
                     <SetVariable name="Size">16f,15f</SetVariable>
                     <SetVariable name="state_0_icon">quantize_hidden.svg</SetVariable>
@@ -265,7 +265,7 @@ Description:
             <SizePolicy>me,min</SizePolicy>
           </WidgetGroup>
 
-          <Template src="skin:../Tango/skin_settings_button_2state.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
             <SetVariable name="text">BPM/Sync &amp; Pitch Fader</SetVariable>
             <SetVariable name="Setting">[Skin],show_rate_controls</SetVariable>
           </Template>
@@ -292,12 +292,12 @@ Description:
                 <Layout>vertical</Layout>
                 <Size>182f,0me</Size>
                 <Children>
-                  <Template src="skin:../Tango/skin_settings_button_2state.xml">
+                  <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
                     <SetVariable name="text">Key/Key Match</SetVariable>
                     <SetVariable name="width">182</SetVariable>
                     <SetVariable name="Setting">[Tango],key_display_match</SetVariable>
                   </Template>
-                  <Template src="skin:../Tango/skin_settings_button_2state.xml">
+                  <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
                     <SetVariable name="text">Rate/Key Adjustment Buttons</SetVariable>
                     <SetVariable name="width">182</SetVariable>
                     <SetVariable name="Setting">[Tango],rate_key_controls</SetVariable>
@@ -313,12 +313,12 @@ Description:
             <SizePolicy>me,min</SizePolicy>
           </WidgetGroup>
 
-          <Template src="skin:../Tango/skin_settings_button_2state.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
             <SetVariable name="text">Spinny</SetVariable>
             <SetVariable name="Setting">[Skin],show_spinnies</SetVariable>
           </Template>
 
-          <Template src="skin:../Tango/skin_settings_button_2state.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
             <SetVariable name="text">Cover Art</SetVariable>
             <SetVariable name="Setting">[Skin],show_coverart</SetVariable>
           </Template>
@@ -423,13 +423,13 @@ Description:
                     <Text>Size: </Text>
                     <Alignment>center</Alignment>
                   </Label>
-                  <Template src="skin:../Tango/skin_settings_button_multi.xml">
+                  <Template src="skin:../Tango/controls/skin_settings_button_multi.xml">
                     <SetVariable name="state_x_text">  °  </SetVariable>
                     <SetVariable name="width">20</SetVariable>
                     <SetVariable name="stateX">0</SetVariable>
                     <SetVariable name="Setting">[Skin],show_big_spinny_coverart</SetVariable>
                   </Template>
-                  <Template src="skin:../Tango/skin_settings_button_multi.xml">
+                  <Template src="skin:../Tango/controls/skin_settings_button_multi.xml">
                     <SetVariable name="state_x_text">  O  </SetVariable>
                     <SetVariable name="width">20</SetVariable>
                     <SetVariable name="stateX">1</SetVariable>
@@ -441,7 +441,7 @@ Description:
             </Children>
           </WidgetGroup><!-- /small/BIG selector -->
 
-          <Template src="skin:../Tango/skin_settings_button_2state.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
             <SetVariable name="text">Hotcue Shift Buttons</SetVariable>
             <SetVariable name="Setting">[Skin],timing_shift_buttons</SetVariable>
           </Template>
@@ -459,7 +459,7 @@ Description:
             <Size>182f,21f</Size>
             <Text>Mixer</Text>
           </Label>
-          <Template src="skin:../Tango/skin_settings_button_2state.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
             <SetVariable name="text">Master/Headphone Mixer</SetVariable>
             <SetVariable name="width">105</SetVariable>
             <SetVariable name="Setting">[Tango],master_mixer</SetVariable>
@@ -471,7 +471,7 @@ Description:
             <MaximumSize>182,17</MaximumSize>
             <SizePolicy>me,me</SizePolicy>
             <Children>
-              <Template src="skin:../Tango/skin_settings_button_2state.xml">
+              <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
                 <SetVariable name="text">Channel Mixer</SetVariable>
                 <SetVariable name="width">105</SetVariable>
                 <SetVariable name="Setting">[Master],show_mixer</SetVariable>
@@ -538,7 +538,7 @@ Description:
               <WidgetGroup>
                 <Layout>vertical</Layout>
                 <Children>
-                  <Template src="skin:../Tango/skin_settings_button_2state.xml">
+                  <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
                     <SetVariable name="text">EQ &amp; QuickEffect Knobs</SetVariable>
                     <SetVariable name="Setting">[Skin],show_eq_knobs</SetVariable>
                   </Template>
@@ -560,14 +560,14 @@ Description:
                           <BindProperty>visible</BindProperty>
                         </Connection>
                       </WidgetGroup>
-                      <Template src="skin:../Tango/skin_settings_button_2state.xml">
+                      <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
                         <SetVariable name="text">EQ Kill Buttons</SetVariable>
                         <SetVariable name="Setting">[Skin],show_eq_kill_buttons</SetVariable>
                       </Template>
                     </Children>
                   </WidgetGroup><!-- /EQ Kill buttons -->
 
-                  <Template src="skin:../Tango/skin_settings_button_2state.xml">
+                  <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
                     <SetVariable name="text">Crossfader</SetVariable>
                     <SetVariable name="Setting">[Skin],show_xfader</SetVariable>
                   </Template>
@@ -595,7 +595,7 @@ Description:
                   <BindProperty>visible</BindProperty>
                 </Connection>
               </WidgetGroup>
-              <Template src="skin:../Tango/skin_settings_button_2state.xml">
+              <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
                 <SetVariable name="text">Always Show Level Meters</SetVariable>
                 <SetVariable name="Setting">[Tango],vumeter</SetVariable>
               </Template>
@@ -620,7 +620,7 @@ Description:
             <ObjectName>AlignLeft</ObjectName>
             <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:../Tango/skin_settings_category_button_2state.xml">
+              <Template src="skin:../Tango/controls/skin_settings_category_button_2state.xml">
                 <SetVariable name="variant">Big</SetVariable>
                 <SetVariable name="text">Effect Units</SetVariable>
                 <SetVariable name="size">120f,18f</SetVariable>
@@ -646,13 +646,13 @@ Description:
                     <Size>40f,20f</Size>
                     <Layout>horizontal</Layout>
                     <Children>
-                      <Template src="skin:../Tango/skin_settings_button_multi.xml">
+                      <Template src="skin:../Tango/controls/skin_settings_button_multi.xml">
                         <SetVariable name="state_x_text">  2  </SetVariable>
                         <SetVariable name="width">20</SetVariable>
                         <SetVariable name="stateX">0</SetVariable>
                         <SetVariable name="Setting">[Skin],show_4effectunits</SetVariable>
                       </Template>
-                      <Template src="skin:../Tango/skin_settings_button_multi.xml">
+                      <Template src="skin:../Tango/controls/skin_settings_button_multi.xml">
                         <SetVariable name="state_x_text">  4  </SetVariable>
                         <SetVariable name="width">20</SetVariable>
                         <SetVariable name="stateX">1</SetVariable>
@@ -681,7 +681,7 @@ Description:
                   <BindProperty>visible</BindProperty>
                 </Connection>
               </WidgetGroup>
-              <Template src="skin:../Tango/skin_settings_button_2state.xml">
+              <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
                 <SetVariable name="text">Super Knobs</SetVariable>
                 <SetVariable name="Setting">[Skin],show_superknobs</SetVariable>
               </Template>
@@ -689,7 +689,7 @@ Description:
           </WidgetGroup><!-- /Super Knobs -->
 
           <!-- Buttons in samplers were removed for now
-          <Template src="skin:../Tango/skin_settings_button_2state.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
             <SetVariable name="text">Sampler FX buttons</SetVariable>
             <SetVariable name="Setting">[Tango],sampler_fx_buttons</SetVariable>
           </Template>
@@ -708,12 +708,12 @@ Description:
             <Size>182f,3f</Size>
           </Label>
 
-          <Template src="skin:../Tango/skin_settings_button_2state.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
             <SetVariable name="text">Preview Deck</SetVariable>
             <SetVariable name="Setting">[PreviewDeck],show_previewdeck</SetVariable>
           </Template>
 
-          <Template src="skin:../Tango/skin_settings_button_2state.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
             <SetVariable name="text">Cover Art in Library</SetVariable>
             <SetVariable name="Setting">[Library],show_coverart</SetVariable>
           </Template>
@@ -724,7 +724,7 @@ Description:
             <SizePolicy>me,me</SizePolicy>
             <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:../Tango/skin_settings_button_2state.xml">
+              <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
                 <SetVariable name="text">Samplers</SetVariable>
                 <SetVariable name="width">71</SetVariable>
                 <SetVariable name="Setting">[Samplers],show_samplers</SetVariable>
@@ -763,7 +763,7 @@ Description:
             <SizePolicy>me,me</SizePolicy>
             <Children>
               <WidgetGroup><Size>14f,13me</Size></WidgetGroup>
-              <Template src="skin:../Tango/button_1state.xml">
+              <Template src="skin:../Tango/controls/button_1state.xml">
                 <SetVariable name="TooltipId">LoadSamplerBank</SetVariable>
                 <SetVariable name="ObjectName">SkinSettingsButton</SetVariable>
                 <SetVariable name="Size">31f,17f</SetVariable>
@@ -777,7 +777,7 @@ Description:
                 <Text> / </Text>
                 <Alignment>center</Alignment>
               </Label>
-              <Template src="skin:../Tango/button_1state.xml">
+              <Template src="skin:../Tango/controls/button_1state.xml">
                 <SetVariable name="TooltipId">SaveSamplerBank</SetVariable>
                 <SetVariable name="ObjectName">SkinSettingsButton</SetVariable>
                 <SetVariable name="Size">31f,17f</SetVariable>
diff --git a/res/skins/Tango (64 Samplers)/skin_settings_sampler_rows_64.xml b/res/skins/Tango (64 Samplers)/skin_settings_sampler_rows_64.xml
index 427ce5d9b4d6..0ebc26a8d1d1 100644
--- a/res/skins/Tango (64 Samplers)/skin_settings_sampler_rows_64.xml	
+++ b/res/skins/Tango (64 Samplers)/skin_settings_sampler_rows_64.xml	
@@ -12,7 +12,7 @@ Description:
         <ObjectName>AlignLeft</ObjectName>
         <Layout>horizontal</Layout>
         <Children>
-          <Template src="skin:../Tango/skin_settings_button_sampler_rows.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_sampler_rows.xml">
             <SetVariable name="current">1</SetVariable>
             <SetVariable name="next">2</SetVariable>
             <SetVariable name="prev">8</SetVariable>
@@ -24,7 +24,7 @@ Description:
         <ObjectName>AlignLeft</ObjectName>
         <Layout>horizontal</Layout>
         <Children>
-          <Template src="skin:../Tango/skin_settings_button_sampler_rows.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_sampler_rows.xml">
             <SetVariable name="current">2</SetVariable>
             <SetVariable name="next">3</SetVariable>
             <SetVariable name="prev">1</SetVariable>
@@ -36,7 +36,7 @@ Description:
         <ObjectName>AlignLeft</ObjectName>
         <Layout>horizontal</Layout>
         <Children>
-          <Template src="skin:../Tango/skin_settings_button_sampler_rows.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_sampler_rows.xml">
             <SetVariable name="current">3</SetVariable>
             <SetVariable name="next">4</SetVariable>
             <SetVariable name="prev">2</SetVariable>
@@ -48,7 +48,7 @@ Description:
         <ObjectName>AlignLeft</ObjectName>
         <Layout>horizontal</Layout>
         <Children>
-          <Template src="skin:../Tango/skin_settings_button_sampler_rows.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_sampler_rows.xml">
             <SetVariable name="current">4</SetVariable>
             <SetVariable name="next">5</SetVariable>
             <SetVariable name="prev">3</SetVariable>
@@ -60,7 +60,7 @@ Description:
         <ObjectName>AlignLeft</ObjectName>
         <Layout>horizontal</Layout>
         <Children>
-          <Template src="skin:../Tango/skin_settings_button_sampler_rows.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_sampler_rows.xml">
             <SetVariable name="current">5</SetVariable>
             <SetVariable name="next">6</SetVariable>
             <SetVariable name="prev">4</SetVariable>
@@ -72,7 +72,7 @@ Description:
         <ObjectName>AlignLeft</ObjectName>
         <Layout>horizontal</Layout>
         <Children>
-          <Template src="skin:../Tango/skin_settings_button_sampler_rows.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_sampler_rows.xml">
             <SetVariable name="current">6</SetVariable>
             <SetVariable name="next">7</SetVariable>
             <SetVariable name="prev">5</SetVariable>
@@ -84,7 +84,7 @@ Description:
         <ObjectName>AlignLeft</ObjectName>
         <Layout>horizontal</Layout>
         <Children>
-          <Template src="skin:../Tango/skin_settings_button_sampler_rows.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_sampler_rows.xml">
             <SetVariable name="current">7</SetVariable>
             <SetVariable name="next">8</SetVariable>
             <SetVariable name="prev">6</SetVariable>
@@ -96,7 +96,7 @@ Description:
         <ObjectName>AlignLeft</ObjectName>
         <Layout>horizontal</Layout>
         <Children>
-          <Template src="skin:../Tango/skin_settings_button_sampler_rows.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_sampler_rows.xml">
             <SetVariable name="current">8</SetVariable>
             <SetVariable name="next">1</SetVariable>
             <SetVariable name="prev">7</SetVariable>
diff --git a/res/skins/Tango/buttons/btn_beatbox_up.svg b/res/skins/Tango/buttons/btn_beatbox_up.svg
index 5d17fe9c9888..7515412c97d1 100644
--- a/res/skins/Tango/buttons/btn_beatbox_up.svg
+++ b/res/skins/Tango/buttons/btn_beatbox_up.svg
@@ -1,2 +1,60 @@
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg id="svg3063" width="16" height="20" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path3065" d="m6.9997 5.0819-4.5715 7.9181h9.143z" fill="#888"/><path id="path3067" d="m12.5 0c1.9304 0 3.5 1.5696 3.5 3.5v13c0 1.9304-1.5696 3.5-3.5 3.5h-10c-0.9806 0-1.864-0.3796-2.5-1.0312v-2.4688c0 1.3936 1.1064 2.5 2.5 2.5h10c1.3936 0 2.5-1.1064 2.5-2.5v-13c0-1.3936-1.1064-2.5-2.5-2.5h-10c-1.3936 0-2.5 1.1064-2.5 2.5v-2.4375c0.63596-0.6516 1.5194-1.0625 2.5-1.0625h10z" color="#000000" fill="#666" style="block-progression:tb;text-indent:0;text-transform:none"/></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg3063"
+   width="16"
+   height="20"
+   version="1.1"
+   sodipodi:docname="btn_beatbox_up.svg"
+   inkscape:version="1.0.2 (394de47547, 2021-03-26)">
+  <metadata
+     id="metadata9">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs7" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1056"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="40.55"
+     inkscape:cx="8.0493218"
+     inkscape:cy="10"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg3063" />
+  <path
+     id="path3065"
+     d="m6.9997 5.0819-4.5715 7.9181h9.143z"
+     fill="#888" />
+  <path
+     id="path3067"
+     d="m12.5 0c1.9304 0 3.5 1.5696 3.5 3.5v13c0 1.9304-1.5696 3.5-3.5 3.5h-10c-0.9806 0-1.864-0.3796-2.5-1.0312v-2.4688c0 1.3936 1.1064 2.5 2.5 2.5h10c1.3936 0 2.5-1.1064 2.5-2.5v-13c0-1.3936-1.1064-2.5-2.5-2.5h-10c-1.3936 0-2.5 1.1064-2.5 2.5v-2.4375c0.63596-0.6516 1.5194-1.0625 2.5-1.0625h10z"
+     color="#000000"
+     fill="#666"
+     style="block-progression:tb;text-indent:0;text-transform:none" />
+</svg>
diff --git a/res/skins/Tango/button_1state.xml b/res/skins/Tango/controls/button_1state.xml
similarity index 82%
rename from res/skins/Tango/button_1state.xml
rename to res/skins/Tango/controls/button_1state.xml
index 09817a86d241..1f24bf6dabbe 100644
--- a/res/skins/Tango/button_1state.xml
+++ b/res/skins/Tango/controls/button_1state.xml
@@ -21,8 +21,8 @@ Variables:
     <State>
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <Connection>
diff --git a/res/skins/Tango/button_1state_right.xml b/res/skins/Tango/controls/button_1state_right.xml
similarity index 84%
rename from res/skins/Tango/button_1state_right.xml
rename to res/skins/Tango/controls/button_1state_right.xml
index 4294d65c4e94..c7fbdd8fefa6 100644
--- a/res/skins/Tango/button_1state_right.xml
+++ b/res/skins/Tango/controls/button_1state_right.xml
@@ -23,8 +23,8 @@ Variables:
     <State>
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <Connection>
diff --git a/res/skins/Tango/button_1state_right_display.xml b/res/skins/Tango/controls/button_1state_right_display.xml
similarity index 86%
rename from res/skins/Tango/button_1state_right_display.xml
rename to res/skins/Tango/controls/button_1state_right_display.xml
index b64b8fea6c81..22885198c9b0 100644
--- a/res/skins/Tango/button_1state_right_display.xml
+++ b/res/skins/Tango/controls/button_1state_right_display.xml
@@ -24,8 +24,8 @@ Variables:
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
     </State>
     <Connection>
       <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
diff --git a/res/skins/Tango/button_1state_right_persist.xml b/res/skins/Tango/controls/button_1state_right_persist.xml
similarity index 85%
rename from res/skins/Tango/button_1state_right_persist.xml
rename to res/skins/Tango/controls/button_1state_right_persist.xml
index 2ef1e25631b8..9cc0a14116da 100644
--- a/res/skins/Tango/button_1state_right_persist.xml
+++ b/res/skins/Tango/controls/button_1state_right_persist.xml
@@ -23,8 +23,8 @@ Variables:
     <State>
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <Connection>
diff --git a/res/skins/Tango/button_2state.xml b/res/skins/Tango/controls/button_2state.xml
similarity index 73%
rename from res/skins/Tango/button_2state.xml
rename to res/skins/Tango/controls/button_2state.xml
index d97fe7f24e50..a0f372f3d016 100644
--- a/res/skins/Tango/button_2state.xml
+++ b/res/skins/Tango/controls/button_2state.xml
@@ -22,15 +22,15 @@ Variables:
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Unpressed>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Unpressed>
     </State>
     <Connection>
       <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
diff --git a/res/skins/Tango/button_2state_display.xml b/res/skins/Tango/controls/button_2state_display.xml
similarity index 75%
rename from res/skins/Tango/button_2state_display.xml
rename to res/skins/Tango/controls/button_2state_display.xml
index 4caad4997a8d..23f162df2b22 100644
--- a/res/skins/Tango/button_2state_display.xml
+++ b/res/skins/Tango/controls/button_2state_display.xml
@@ -23,15 +23,15 @@ Variables:
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Unpressed>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Unpressed>
     </State>
     <Connection>
       <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
diff --git a/res/skins/Tango/button_2state_highlight.xml b/res/skins/Tango/controls/button_2state_highlight.xml
similarity index 75%
rename from res/skins/Tango/button_2state_highlight.xml
rename to res/skins/Tango/controls/button_2state_highlight.xml
index 47fc8f2cdcd2..22ad446384da 100644
--- a/res/skins/Tango/button_2state_highlight.xml
+++ b/res/skins/Tango/controls/button_2state_highlight.xml
@@ -23,15 +23,15 @@ Variables:
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Unpressed>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Unpressed>
     </State>
     <Connection>
       <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
diff --git a/res/skins/Tango/button_2state_persist.xml b/res/skins/Tango/controls/button_2state_persist.xml
similarity index 73%
rename from res/skins/Tango/button_2state_persist.xml
rename to res/skins/Tango/controls/button_2state_persist.xml
index be23913f0a67..9d96fca1a9ee 100644
--- a/res/skins/Tango/button_2state_persist.xml
+++ b/res/skins/Tango/controls/button_2state_persist.xml
@@ -22,15 +22,15 @@ Variables:
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Unpressed>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Unpressed>
     </State>
     <Connection>
       <ConfigKey persist="true"><Variable name="ConfigKey"/></ConfigKey>
diff --git a/res/skins/Tango/button_2state_right.xml b/res/skins/Tango/controls/button_2state_right.xml
similarity index 76%
rename from res/skins/Tango/button_2state_right.xml
rename to res/skins/Tango/controls/button_2state_right.xml
index b42bc658ec41..01ad2e223f16 100644
--- a/res/skins/Tango/button_2state_right.xml
+++ b/res/skins/Tango/controls/button_2state_right.xml
@@ -24,15 +24,15 @@ Variables:
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Unpressed>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Unpressed>
     </State>
     <Connection>
       <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
diff --git a/res/skins/Tango/button_2state_right_display.xml b/res/skins/Tango/controls/button_2state_right_display.xml
similarity index 78%
rename from res/skins/Tango/button_2state_right_display.xml
rename to res/skins/Tango/controls/button_2state_right_display.xml
index b58e12682def..beef2ef70679 100644
--- a/res/skins/Tango/button_2state_right_display.xml
+++ b/res/skins/Tango/controls/button_2state_right_display.xml
@@ -25,15 +25,15 @@ Variables:
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Unpressed>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
       <Alignment><Variable name="Align"/></Alignment>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Unpressed>
     </State>
     <Connection>
       <ConfigKey><Variable name="ConfigKey"/></ConfigKey>
diff --git a/res/skins/Tango/button_3state.xml b/res/skins/Tango/controls/button_3state.xml
similarity index 67%
rename from res/skins/Tango/button_3state.xml
rename to res/skins/Tango/controls/button_3state.xml
index d637c5590865..2537fa4c08e6 100644
--- a/res/skins/Tango/button_3state.xml
+++ b/res/skins/Tango/controls/button_3state.xml
@@ -21,22 +21,22 @@ Variables:
     <State>
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <State>
       <Number>2</Number>
       <Text><Variable name="state_2_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_2_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_2_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_2_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_2_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <Connection>
diff --git a/res/skins/Tango/button_3state_display.xml b/res/skins/Tango/controls/button_3state_display.xml
similarity index 70%
rename from res/skins/Tango/button_3state_display.xml
rename to res/skins/Tango/controls/button_3state_display.xml
index 5c85e6c1f659..7dd14fec94b9 100644
--- a/res/skins/Tango/button_3state_display.xml
+++ b/res/skins/Tango/controls/button_3state_display.xml
@@ -22,22 +22,22 @@ Variables:
     <State>
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <State>
       <Number>2</Number>
       <Text><Variable name="state_2_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_2_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_2_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_2_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_2_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <Connection>
diff --git a/res/skins/Tango/button_3state_persist.xml b/res/skins/Tango/controls/button_3state_persist.xml
similarity index 67%
rename from res/skins/Tango/button_3state_persist.xml
rename to res/skins/Tango/controls/button_3state_persist.xml
index 1ce315a53b3f..43ecf5272ee9 100644
--- a/res/skins/Tango/button_3state_persist.xml
+++ b/res/skins/Tango/controls/button_3state_persist.xml
@@ -21,22 +21,22 @@ Variables:
     <State>
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <State>
       <Number>2</Number>
       <Text><Variable name="state_2_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_2_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_2_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_2_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_2_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <Connection>
diff --git a/res/skins/Tango/button_4state_display.xml b/res/skins/Tango/controls/button_4state_display.xml
similarity index 65%
rename from res/skins/Tango/button_4state_display.xml
rename to res/skins/Tango/controls/button_4state_display.xml
index 5d7113329a52..b432ee6f2a5c 100644
--- a/res/skins/Tango/button_4state_display.xml
+++ b/res/skins/Tango/controls/button_4state_display.xml
@@ -22,29 +22,29 @@ Variables:
     <State>
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <State>
       <Number>2</Number>
       <Text><Variable name="state_2_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_2_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_2_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_2_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_2_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <State>
       <Number>3</Number>
       <Text><Variable name="state_3_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_3_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_3_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_3_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_3_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <Connection>
diff --git a/res/skins/Tango/button_5state.xml b/res/skins/Tango/controls/button_5state.xml
similarity index 60%
rename from res/skins/Tango/button_5state.xml
rename to res/skins/Tango/controls/button_5state.xml
index c276deb654a3..be226228b82c 100644
--- a/res/skins/Tango/button_5state.xml
+++ b/res/skins/Tango/controls/button_5state.xml
@@ -21,36 +21,36 @@ Variables:
     <State>
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <State>
       <Number>2</Number>
       <Text><Variable name="state_2_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_2_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_2_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_2_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_2_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <State>
       <Number>3</Number>
       <Text><Variable name="state_3_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_3_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_3_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_3_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_3_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <State>
       <Number>4</Number>
       <Text><Variable name="state_4_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_4_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_4_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_4_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_4_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <Connection>
diff --git a/res/skins/Tango/button_5state_display.xml b/res/skins/Tango/controls/button_5state_display.xml
similarity index 62%
rename from res/skins/Tango/button_5state_display.xml
rename to res/skins/Tango/controls/button_5state_display.xml
index c8672c9a0eec..0701c7c45433 100644
--- a/res/skins/Tango/button_5state_display.xml
+++ b/res/skins/Tango/controls/button_5state_display.xml
@@ -22,36 +22,36 @@ Variables:
     <State>
       <Number>0</Number>
       <Text><Variable name="state_0_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <State>
       <Number>1</Number>
       <Text><Variable name="state_1_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <State>
       <Number>2</Number>
       <Text><Variable name="state_2_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_2_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_2_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_2_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_2_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <State>
       <Number>3</Number>
       <Text><Variable name="state_3_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_3_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_3_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_3_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_3_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
 	<State>
       <Number>4</Number>
       <Text><Variable name="state_4_text"/></Text>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_4_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_4_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_4_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_4_icon"/></Unpressed>
       <Alignment><Variable name="Align"/></Alignment>
     </State>
     <Connection>
diff --git a/res/skins/Tango/button_deck_control_1state_opt.xml b/res/skins/Tango/controls/button_deck_control_1state_opt.xml
similarity index 82%
rename from res/skins/Tango/button_deck_control_1state_opt.xml
rename to res/skins/Tango/controls/button_deck_control_1state_opt.xml
index 34f046f68482..54804ea2a634 100644
--- a/res/skins/Tango/button_deck_control_1state_opt.xml
+++ b/res/skins/Tango/controls/button_deck_control_1state_opt.xml
@@ -13,7 +13,7 @@ Variables:
   state_X_unpressed : background graphic for unpressed state X
   Align             : alignment of text
   Control           : persistent left-click control, also used as
-                      visibility condition 
+                      visibility condition
 -->
 <Template>
   <PushButton>
@@ -23,8 +23,8 @@ Variables:
     <NumberStates>1</NumberStates>
     <State>
       <Number>0</Number>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
     </State>
     <Connection>
       <ConfigKey persist="true"><Variable name="group"/>,<Variable name="Control"/></ConfigKey>
diff --git a/res/skins/Tango/button_deck_control_1state_perm.xml b/res/skins/Tango/controls/button_deck_control_1state_perm.xml
similarity index 81%
rename from res/skins/Tango/button_deck_control_1state_perm.xml
rename to res/skins/Tango/controls/button_deck_control_1state_perm.xml
index db58950c8ab6..faf83e40ec33 100644
--- a/res/skins/Tango/button_deck_control_1state_perm.xml
+++ b/res/skins/Tango/controls/button_deck_control_1state_perm.xml
@@ -12,7 +12,7 @@ Variables:
   state_X_unpressed : background graphic for unpressed state X
   Align             : alignment of text
   Control           : persistent left-click control, also used as
-                      visibility condition 
+                      visibility condition
 -->
 <Template>
   <PushButton>
@@ -22,8 +22,8 @@ Variables:
     <NumberStates>1</NumberStates>
     <State>
       <Number>0</Number>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_pressed"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_pressed"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_unpressed"/></Unpressed>
     </State>
     <Connection>
       <ConfigKey persist="true"><Variable name="group"/>,<Variable name="Control"/></ConfigKey>
diff --git a/res/skins/Tango/button_deck_control_2state_opt.xml b/res/skins/Tango/controls/button_deck_control_2state_opt.xml
similarity index 73%
rename from res/skins/Tango/button_deck_control_2state_opt.xml
rename to res/skins/Tango/controls/button_deck_control_2state_opt.xml
index 013119b693d4..a224b933760e 100644
--- a/res/skins/Tango/button_deck_control_2state_opt.xml
+++ b/res/skins/Tango/controls/button_deck_control_2state_opt.xml
@@ -13,7 +13,7 @@ Variables:
   state_X_unpressed : background graphic for unpressed state X
   Align             : alignment of text
   Control           : persistent left-click control, also used as
-                      visibility condition 
+                      visibility condition
 -->
 <Template>
   <PushButton>
@@ -23,13 +23,13 @@ Variables:
     <NumberStates>2</NumberStates>
     <State>
       <Number>0</Number>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Unpressed>
     </State>
     <State>
       <Number>1</Number>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Unpressed>
     </State>
     <Connection>
       <ConfigKey persist="true"><Variable name="group"/>,<Variable name="Control"/></ConfigKey>
diff --git a/res/skins/Tango/button_deck_control_2state_perm.xml b/res/skins/Tango/controls/button_deck_control_2state_perm.xml
similarity index 72%
rename from res/skins/Tango/button_deck_control_2state_perm.xml
rename to res/skins/Tango/controls/button_deck_control_2state_perm.xml
index 6ebcf37c23c8..4fbaf790d5d7 100644
--- a/res/skins/Tango/button_deck_control_2state_perm.xml
+++ b/res/skins/Tango/controls/button_deck_control_2state_perm.xml
@@ -12,7 +12,7 @@ Variables:
   state_X_unpressed : background graphic for unpressed state X
   Align             : alignment of text
   Control           : persistent left-click control, also used as
-                      visibility condition 
+                      visibility condition
 -->
 <Template>
   <PushButton>
@@ -22,13 +22,13 @@ Variables:
     <NumberStates>2</NumberStates>
     <State>
       <Number>0</Number>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Unpressed>
     </State>
     <State>
       <Number>1</Number>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Unpressed>
     </State>
     <Connection>
       <ConfigKey persist="true"><Variable name="group"/>,<Variable name="Control"/></ConfigKey>
diff --git a/res/skins/Tango/button_deck_control_3state_opt.xml b/res/skins/Tango/controls/button_deck_control_3state_opt.xml
similarity index 66%
rename from res/skins/Tango/button_deck_control_3state_opt.xml
rename to res/skins/Tango/controls/button_deck_control_3state_opt.xml
index 8653bec4be23..93a53066587a 100644
--- a/res/skins/Tango/button_deck_control_3state_opt.xml
+++ b/res/skins/Tango/controls/button_deck_control_3state_opt.xml
@@ -13,7 +13,7 @@ Variables:
   state_X_unpressed : background graphic for unpressed state X
   Align             : alignment of text
   Control           : persistent left-click control, also used as
-                      visibility condition 
+                      visibility condition
 -->
 <Template>
   <PushButton>
@@ -23,18 +23,18 @@ Variables:
     <NumberStates>3</NumberStates>
     <State>
       <Number>0</Number>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Unpressed>
     </State>
     <State>
       <Number>1</Number>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Unpressed>
     </State>
     <State>
       <Number>2</Number>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_2_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_2_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_2_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_2_icon"/></Unpressed>
     </State>
     <Connection>
       <ConfigKey persist="true"><Variable name="group"/>,<Variable name="Control"/></ConfigKey>
diff --git a/res/skins/Tango/button_deck_control_3state_perm.xml b/res/skins/Tango/controls/button_deck_control_3state_perm.xml
similarity index 65%
rename from res/skins/Tango/button_deck_control_3state_perm.xml
rename to res/skins/Tango/controls/button_deck_control_3state_perm.xml
index 16c78a2112af..c56b7b058e7d 100644
--- a/res/skins/Tango/button_deck_control_3state_perm.xml
+++ b/res/skins/Tango/controls/button_deck_control_3state_perm.xml
@@ -12,7 +12,7 @@ Variables:
   state_X_unpressed : background graphic for unpressed state X
   Align             : alignment of text
   Control           : persistent left-click control, also used as
-                      visibility condition 
+                      visibility condition
 -->
 <Template>
   <PushButton>
@@ -22,18 +22,18 @@ Variables:
     <NumberStates>3</NumberStates>
     <State>
       <Number>0</Number>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_0_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_0_icon"/></Unpressed>
     </State>
     <State>
       <Number>1</Number>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_1_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_1_icon"/></Unpressed>
     </State>
     <State>
       <Number>2</Number>
-      <Pressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_2_icon"/></Pressed>
-      <Unpressed scalemode="STRETCH_ASPECT">buttons/btn_<Variable name="state_2_icon"/></Unpressed>
+      <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_2_icon"/></Pressed>
+      <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/buttons/btn_<Variable name="state_2_icon"/></Unpressed>
     </State>
     <Connection>
       <ConfigKey persist="true"><Variable name="group"/>,<Variable name="Control"/></ConfigKey>
diff --git a/res/skins/Tango/button_hotcue_deck.xml b/res/skins/Tango/controls/button_hotcue_deck.xml
similarity index 100%
rename from res/skins/Tango/button_hotcue_deck.xml
rename to res/skins/Tango/controls/button_hotcue_deck.xml
diff --git a/res/skins/Tango/button_hotcue_sam_pre.xml b/res/skins/Tango/controls/button_hotcue_sam_pre.xml
similarity index 100%
rename from res/skins/Tango/button_hotcue_sam_pre.xml
rename to res/skins/Tango/controls/button_hotcue_sam_pre.xml
diff --git a/res/skins/Tango/button_loopsize.xml b/res/skins/Tango/controls/button_loopsize.xml
similarity index 93%
rename from res/skins/Tango/button_loopsize.xml
rename to res/skins/Tango/controls/button_loopsize.xml
index db51c07eb386..fbbb2aa1cf85 100644
--- a/res/skins/Tango/button_loopsize.xml
+++ b/res/skins/Tango/controls/button_loopsize.xml
@@ -7,7 +7,7 @@ Variables:
   LoopLength_Control: length of the beatloop as config value
 -->
 <Template>
-  <Template src="skin:button_2state_right_display.xml">
+  <Template src="skin:../Tango/controls/button_2state_right_display.xml">
     <SetVariable name="TooltipId">beatloop_activate</SetVariable>
     <SetVariable name="ObjectName">LoopSizeButton</SetVariable>
     <SetVariable name="Size">22f,21f</SetVariable>
diff --git a/res/skins/Tango/button_specialcue_deck.xml b/res/skins/Tango/controls/button_specialcue_deck.xml
similarity index 100%
rename from res/skins/Tango/button_specialcue_deck.xml
rename to res/skins/Tango/controls/button_specialcue_deck.xml
diff --git a/res/skins/Tango/knob_textless.xml b/res/skins/Tango/controls/knob_textless.xml
similarity index 87%
rename from res/skins/Tango/knob_textless.xml
rename to res/skins/Tango/controls/knob_textless.xml
index 98469d308001..7ed7e8e6c762 100644
--- a/res/skins/Tango/knob_textless.xml
+++ b/res/skins/Tango/controls/knob_textless.xml
@@ -21,8 +21,8 @@ Variables:
       <KnobComposed>
         <TooltipId><Variable name="TooltipId"/></TooltipId>
         <Size>30f,26f</Size>
-        <Knob>knobs_sliders/knob_<Variable name="Color"/>.svg</Knob>
-        <BackPath>knobs_sliders/knob_bg.svg</BackPath>
+        <Knob>skin:../Tango/knobs_sliders/knob_<Variable name="Color"/>.svg</Knob>
+        <BackPath>skin:../Tango/knobs_sliders/knob_bg.svg</BackPath>
         <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
         <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
         <KnobCenterYOffset>2.000</KnobCenterYOffset>
diff --git a/res/skins/Tango/skin_settings_button_2state.xml b/res/skins/Tango/controls/skin_settings_button_2state.xml
similarity index 100%
rename from res/skins/Tango/skin_settings_button_2state.xml
rename to res/skins/Tango/controls/skin_settings_button_2state.xml
diff --git a/res/skins/Tango/skin_settings_button_multi.xml b/res/skins/Tango/controls/skin_settings_button_multi.xml
similarity index 100%
rename from res/skins/Tango/skin_settings_button_multi.xml
rename to res/skins/Tango/controls/skin_settings_button_multi.xml
diff --git a/res/skins/Tango/skin_settings_button_sampler_rows.xml b/res/skins/Tango/controls/skin_settings_button_sampler_rows.xml
similarity index 100%
rename from res/skins/Tango/skin_settings_button_sampler_rows.xml
rename to res/skins/Tango/controls/skin_settings_button_sampler_rows.xml
diff --git a/res/skins/Tango/skin_settings_category_button_2state.xml b/res/skins/Tango/controls/skin_settings_category_button_2state.xml
similarity index 100%
rename from res/skins/Tango/skin_settings_category_button_2state.xml
rename to res/skins/Tango/controls/skin_settings_category_button_2state.xml
diff --git a/res/skins/Tango/statuslight_4state.xml b/res/skins/Tango/controls/statuslight_4state.xml
similarity index 100%
rename from res/skins/Tango/statuslight_4state.xml
rename to res/skins/Tango/controls/statuslight_4state.xml
diff --git a/res/skins/Tango/deck_left.xml b/res/skins/Tango/decks/deck_left.xml
similarity index 88%
rename from res/skins/Tango/deck_left.xml
rename to res/skins/Tango/decks/deck_left.xml
index d4cb9846e8ec..91d4bed5a134 100644
--- a/res/skins/Tango/deck_left.xml
+++ b/res/skins/Tango/decks/deck_left.xml
@@ -37,18 +37,18 @@ Variables:
                 <Layout>horizontal</Layout>
                 <Size>0me,50f</Size>
                 <Children>
-                  <Template src="skin:deck_row_overview_left.xml"/>
+                  <Template src="skin:../Tango/decks/row_overview_left.xml"/>
                 </Children>
               </WidgetGroup>
 
-              <Template src="skin:deck_row_comment_fx_left.xml"/>
+              <Template src="skin:../Tango/decks/row_comment_fx_left.xml"/>
 
               <WidgetGroup><!-- Parallel Artist + Time -->
                 <Layout>horizontal</Layout>
                 <SizePolicy>me,min</SizePolicy>
                 <Children>
-                  <Template src="skin:deck_row_text_left.xml"/>
-                  <Template src="skin:loop_indicator.xml"/>
+                  <Template src="skin:../Tango/decks/row_text_left.xml"/>
+                  <Template src="skin:../Tango/decks/loop_indicator.xml"/>
                 </Children>
               </WidgetGroup>
 
@@ -57,9 +57,9 @@ Variables:
 
           <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1min,1f</Size></WidgetGroup>
 
-          <Template src="skin:deck_row_transport_left.xml"/>
+          <Template src="skin:../Tango/decks/row_transport_left.xml"/>
 
-          <Template src="skin:deck_row_loop_jump.xml">
+          <Template src="skin:../Tango/decks/row_loop_jump.xml">
             <SetVariable name="SpaceLeft">-1</SetVariable>
             <SetVariable name="SpaceRight">70</SetVariable>
           </Template>
@@ -88,7 +88,7 @@ Variables:
                 </Connection>
               </WidgetGroup>
 
-              <Template src="skin:spinny_cover_maxi.xml"/>
+              <Template src="skin:../Tango/decks/spinny_cover_maxi.xml"/>
 
             </Children>
             <Connection>
@@ -109,7 +109,7 @@ Variables:
         <Layout>vertical</Layout>
         <SizePolicy>f,min</SizePolicy>
         <Children>
-          <Template src="skin:mixer_channel_left.xml"/>
+          <Template src="skin:../Tango/mixer/mixer_channel_left.xml"/>
 
           <WidgetGroup>
             <Layout>vertical</Layout>
@@ -142,7 +142,7 @@ Variables:
         </Connection>
       </WidgetGroup>
 
-      <Template src="skin:rate_pitch_key.xml"/>
+      <Template src="skin:../Tango/decks/rate_pitch_key.xml"/>
       <!-- /Pitch slider & Key controls -->
 
       <WidgetGroup><!-- VUMeter -->
@@ -155,7 +155,7 @@ Variables:
             <Layout>horizontal</Layout>
             <Children>
               <WidgetGroup><Size>3f,1min</Size></WidgetGroup>
-              <Template src="skin:vumeter_floating.xml">
+              <Template src="skin:../Tango/mixer/vumeter_floating.xml">
                 <SetVariable name="Label">Deck<Variable name="chanNum"/></SetVariable>
               </Template>
             </Children>
diff --git a/res/skins/Tango/deck_left_mini.xml b/res/skins/Tango/decks/deck_left_mini.xml
similarity index 94%
rename from res/skins/Tango/deck_left_mini.xml
rename to res/skins/Tango/decks/deck_left_mini.xml
index 16b98bd8eb98..3a4d368d4ee9 100644
--- a/res/skins/Tango/deck_left_mini.xml
+++ b/res/skins/Tango/decks/deck_left_mini.xml
@@ -92,7 +92,7 @@ Variables:
                     <Alignment>center</Alignment>
                     <Children>
                       <!-- KeyMatch, transparent -->
-                      <Template src="skin:button_1state_right.xml">
+                      <Template src="skin:../Tango/controls/button_1state_right.xml">
                         <SetVariable name="TooltipId">sync_reset_key</SetVariable>
                         <SetVariable name="ObjectName">KeyMatchMini</SetVariable>
                         <SetVariable name="Size">30me,20f</SetVariable>
@@ -126,7 +126,7 @@ Variables:
                     <MaximumSize>65,20</MaximumSize>
                     <SizePolicy>min,me</SizePolicy>
                     <Children>
-                      <Template src="skin:button_2state_right.xml">
+                      <Template src="skin:../Tango/controls/button_2state_right.xml">
                         <SetVariable name="TooltipId">sync_enabled</SetVariable>
                         <SetVariable name="ObjectName">SyncButtonOverlayMini</SetVariable>
                         <SetVariable name="Size">50me,20f</SetVariable>
@@ -165,7 +165,7 @@ Variables:
             </Children>
           </WidgetGroup>
 
-          <Template src="skin:loop_indicator.xml"/>
+          <Template src="skin:../Tango/decks/loop_indicator.xml"/>
 
           <WidgetGroup>
             <Size>1f,1min</Size>
@@ -181,7 +181,7 @@ Variables:
             <Size>30f,40f</Size>
             <Children>
 
-              <Template src="skin:button_2state_right_display.xml">
+              <Template src="skin:../Tango/controls/button_2state_right_display.xml">
                 <SetVariable name="TooltipId">cue_default_cue_gotoandstop</SetVariable>
                 <SetVariable name="ObjectName">CueButton</SetVariable>
                 <SetVariable name="Size">30f,19f</SetVariable>
@@ -199,7 +199,7 @@ Variables:
                 <Size>30f,40f</Size>
                 <Children>
                   <!-- Play -->
-                  <Template src="skin:button_2state_right_display.xml">
+                  <Template src="skin:../Tango/controls/button_2state_right_display.xml">
                     <SetVariable name="ObjectName">PlayCue</SetVariable>
                     <SetVariable name="TooltipId">play_cue_set</SetVariable>
                     <SetVariable name="Size">30f,20f</SetVariable>
@@ -210,13 +210,13 @@ Variables:
                     <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,play_latched</SetVariable>
                   </Template>
                   <!-- Preview indicator, indicates previewing from Cue or Hotcue -->
-                  <Template src="skin:button_2state.xml">
+                  <Template src="skin:../Tango/controls/button_2state.xml">
                     <SetVariable name="ObjectName">PreviewIndicator</SetVariable>
                     <SetVariable name="Size">30f,20f</SetVariable>
                     <SetVariable name="ConfigKey"><Variable name="group"/>,play</SetVariable>
                   </Template>
                   <!-- Play indicator, blinks depending on Cue mode -->
-                  <Template src="skin:button_2state.xml">
+                  <Template src="skin:../Tango/controls/button_2state.xml">
                     <SetVariable name="ObjectName">PlayIndicator</SetVariable>
                     <SetVariable name="Size">30f,20f</SetVariable>
                     <SetVariable name="ConfigKey"><Variable name="group"/>,play_indicator</SetVariable>
diff --git a/res/skins/Tango/deck_right.xml b/res/skins/Tango/decks/deck_right.xml
similarity index 89%
rename from res/skins/Tango/deck_right.xml
rename to res/skins/Tango/decks/deck_right.xml
index 796c25f6cd3f..4e1bf836ffe7 100644
--- a/res/skins/Tango/deck_right.xml
+++ b/res/skins/Tango/decks/deck_right.xml
@@ -17,7 +17,7 @@ Variables:
   <SingletonDefinition>
     <ObjectName>DeckOverviewRow<Variable name="chanNum"/></ObjectName>
     <Children>
-      <Template src="skin:deck_row_overview_right.xml"/>
+      <Template src="skin:../Tango/decks/row_overview_right.xml"/>
     </Children>
   </SingletonDefinition>
 
@@ -30,8 +30,8 @@ Variables:
           <WidgetGroup><!-- Symmetric Artist + Time -->
             <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:loop_indicator.xml"/>
-              <Template src="skin:deck_row_text_right.xml"/>
+              <Template src="skin:../Tango/decks/loop_indicator.xml"/>
+              <Template src="skin:../Tango/decks/row_text_right.xml"/>
             </Children>
             <Connection>
               <ConfigKey persist="true">[Tango],symmetric_time</ConfigKey>
@@ -42,8 +42,8 @@ Variables:
           <WidgetGroup><!-- Parallel Artist + Time -->
             <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:loop_indicator.xml"/>
-              <Template src="skin:deck_row_text_left.xml"/>
+              <Template src="skin:../Tango/decks/loop_indicator.xml"/>
+              <Template src="skin:../Tango/decks/row_text_left.xml"/>
             </Children>
             <Connection>
               <ConfigKey persist="true">[Tango],symmetric_time</ConfigKey>
@@ -73,7 +73,7 @@ Variables:
             <SizePolicy>min,min</SizePolicy>
             <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:vumeter_floating.xml">
+              <Template src="skin:../Tango/mixer/vumeter_floating.xml">
                 <SetVariable name="Label">Deck<Variable name="chanNum"/></SetVariable>
               </Template>
               <WidgetGroup><Size>3f,1min</Size></WidgetGroup>
@@ -93,7 +93,7 @@ Variables:
       </WidgetGroup><!-- /VUMeter -->
 
       <!-- Pitch slider & Key controls -->
-      <Template src="skin:rate_pitch_key.xml"/>
+      <Template src="skin:../Tango/decks/rate_pitch_key.xml"/>
 
       <WidgetGroup>
         <Size>3f,1min</Size>
@@ -115,7 +115,7 @@ Variables:
             <Layout>horizontal</Layout>
             <Children>
 
-              <Template src="skin:spinny_cover_maxi.xml"/>
+              <Template src="skin:../Tango/decks/spinny_cover_maxi.xml"/>
 
               <!-- 3px margin to main deck -->
               <WidgetGroup>
@@ -145,7 +145,7 @@ Variables:
         <Layout>vertical</Layout>
         <SizePolicy>f,min</SizePolicy>
         <Children>
-          <Template src="skin:mixer_channel_right.xml"/>
+          <Template src="skin:../Tango/mixer/mixer_channel_right.xml"/>
 
           <WidgetGroup>
             <Layout>vertical</Layout>
@@ -191,7 +191,7 @@ Variables:
                 <ObjectName>DeckOverviewRow<Variable name="chanNum"/></ObjectName>
               </SingletonContainer>
 
-              <Template src="skin:deck_row_comment_fx_right.xml"/>
+              <Template src="skin:../Tango/decks/row_comment_fx_right.xml"/>
 
               <SingletonContainer>
                 <ObjectName>DeckTextRow<Variable name="chanNum"/></ObjectName>
@@ -213,7 +213,7 @@ Variables:
                 <ObjectName>DeckTextRow<Variable name="chanNum"/></ObjectName>
               </SingletonContainer>
 
-              <Template src="skin:deck_row_comment_fx_right.xml"/>
+              <Template src="skin:../Tango/decks/row_comment_fx_right.xml"/>
 
               <WidgetGroup><!--
                 <ObjectName>DeckOverviewBox<Variable name="chanNum"/></ObjectName> -->
@@ -236,9 +236,9 @@ Variables:
 
           <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1min,1f</Size></WidgetGroup>
 
-          <Template src="skin:deck_row_transport_right.xml" />
+          <Template src="skin:../Tango/decks/row_transport_right.xml" />
 
-          <Template src="skin:deck_row_loop_jump.xml">
+          <Template src="skin:../Tango/decks/row_loop_jump.xml">
             <SetVariable name="SpaceLeft">70</SetVariable>
             <SetVariable name="SpaceRight">-1</SetVariable>
           </Template>
diff --git a/res/skins/Tango/deck_right_mini.xml b/res/skins/Tango/decks/deck_right_mini.xml
similarity index 94%
rename from res/skins/Tango/deck_right_mini.xml
rename to res/skins/Tango/decks/deck_right_mini.xml
index ac464e2eabfc..d781e02112be 100644
--- a/res/skins/Tango/deck_right_mini.xml
+++ b/res/skins/Tango/decks/deck_right_mini.xml
@@ -25,7 +25,7 @@ Variables:
             <Size>30f,40f</Size>
             <Children>
 
-              <Template src="skin:button_2state_right_display.xml">
+              <Template src="skin:../Tango/controls/button_2state_right_display.xml">
                 <SetVariable name="TooltipId">cue_default_cue_gotoandstop</SetVariable>
                 <SetVariable name="ObjectName">CueButton</SetVariable>
                 <SetVariable name="Size">30f,19f</SetVariable>
@@ -43,7 +43,7 @@ Variables:
                 <Size>30f,40f</Size>
                 <Children>
                   <!-- Play -->
-                  <Template src="skin:button_2state_right_display.xml">
+                  <Template src="skin:../Tango/controls/button_2state_right_display.xml">
                     <SetVariable name="ObjectName">PlayCue</SetVariable>
                     <SetVariable name="TooltipId">play_cue_set</SetVariable>
                     <SetVariable name="Size">30f,20f</SetVariable>
@@ -54,13 +54,13 @@ Variables:
                     <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,play_latched</SetVariable>
                   </Template>
                   <!-- Preview indicator, indicates previewing from Cue or Hotcue -->
-                  <Template src="skin:button_2state.xml">
+                  <Template src="skin:../Tango/controls/button_2state.xml">
                     <SetVariable name="ObjectName">PreviewIndicator</SetVariable>
                     <SetVariable name="Size">30f,20f</SetVariable>
                     <SetVariable name="ConfigKey"><Variable name="group"/>,play</SetVariable>
                   </Template>
                   <!-- Play indicator, blinks depending on Cue mode -->
-                  <Template src="skin:button_2state.xml">
+                  <Template src="skin:../Tango/controls/button_2state.xml">
                     <SetVariable name="ObjectName">PlayIndicator</SetVariable>
                     <SetVariable name="Size">30f,20f</SetVariable>
                     <SetVariable name="ConfigKey"><Variable name="group"/>,play_indicator</SetVariable>
@@ -78,7 +78,7 @@ Variables:
             </Connection>
           </WidgetGroup>
 
-          <Template src="skin:loop_indicator.xml"/>
+          <Template src="skin:../Tango/decks/loop_indicator.xml"/>
 
           <WidgetGroup>
             <Layout>horizontal</Layout>
@@ -144,7 +144,7 @@ Variables:
                     <MaximumSize>65,20</MaximumSize>
                     <SizePolicy>min,me</SizePolicy>
                     <Children>
-                      <Template src="skin:button_2state_right.xml">
+                      <Template src="skin:../Tango/controls/button_2state_right.xml">
                         <SetVariable name="TooltipId">sync_enabled</SetVariable>
                         <SetVariable name="ObjectName">SyncButtonOverlayMini</SetVariable>
                         <SetVariable name="Size">50me,20f</SetVariable>
@@ -175,7 +175,7 @@ Variables:
                     <Alignment>center</Alignment>
                     <Children>
                       <!-- KeyMatch, transparent -->
-                      <Template src="skin:button_1state_right.xml">
+                      <Template src="skin:../Tango/controls/button_1state_right.xml">
                         <SetVariable name="TooltipId">sync_reset_key</SetVariable>
                         <SetVariable name="ObjectName">KeyMatchMini</SetVariable>
                         <SetVariable name="Size">30me,20f</SetVariable>
diff --git a/res/skins/Tango/hotcues_deck_left.xml b/res/skins/Tango/decks/hotcues_deck_left.xml
similarity index 79%
rename from res/skins/Tango/hotcues_deck_left.xml
rename to res/skins/Tango/decks/hotcues_deck_left.xml
index b9b3fe85965e..d6e2fc776584 100644
--- a/res/skins/Tango/hotcues_deck_left.xml
+++ b/res/skins/Tango/decks/hotcues_deck_left.xml
@@ -2,7 +2,7 @@
 Description:
   A widget containing hotcue buttons whose number can be set to 4 or 8.
   They're laid out in a way that they either expand or get squeezed,
-  depending on how many deck buttons/star rating are visible.
+  depending on how many deck skin:../Tango/buttons/star rating are visible.
 -->
 <Template>
   <WidgetGroup>
@@ -29,22 +29,22 @@ Description:
             <SizePolicy>me,f</SizePolicy>
             <Children>
                 <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
-              <Template src="skin:button_specialcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_specialcue_deck.xml">
                 <SetVariable name="cue_type">intro_start</SetVariable>
                 <SetVariable name="label">|&#9698;</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
-              <Template src="skin:button_specialcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_specialcue_deck.xml">
                 <SetVariable name="cue_type">intro_end</SetVariable>
                 <SetVariable name="label">&#9698;|</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
-              <Template src="skin:button_specialcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_specialcue_deck.xml">
                 <SetVariable name="cue_type">outro_start</SetVariable>
                 <SetVariable name="label">|&#9699;</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
-              <Template src="skin:button_specialcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_specialcue_deck.xml">
                 <SetVariable name="cue_type">outro_end</SetVariable>
                 <SetVariable name="label">&#9699;|</SetVariable>
               </Template>
@@ -63,19 +63,19 @@ Description:
             <SizePolicy>me,f</SizePolicy>
             <Children>
                 <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_deck.xml">
                 <SetVariable name="HotCue">1</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_deck.xml">
                 <SetVariable name="HotCue">2</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_deck.xml">
                 <SetVariable name="HotCue">3</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_deck.xml">
                 <SetVariable name="HotCue">4</SetVariable>
               </Template>
             </Children>
@@ -94,35 +94,35 @@ Description:
             <SizePolicy>me,f</SizePolicy>
             <Children>
                 <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_deck.xml">
                 <SetVariable name="HotCue">1</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_deck.xml">
                 <SetVariable name="HotCue">2</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_deck.xml">
                 <SetVariable name="HotCue">3</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_deck.xml">
                 <SetVariable name="HotCue">4</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_deck.xml">
                 <SetVariable name="HotCue">5</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_deck.xml">
                 <SetVariable name="HotCue">6</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_deck.xml">
                 <SetVariable name="HotCue">7</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_deck.xml">
                 <SetVariable name="HotCue">8</SetVariable>
               </Template>
             </Children>
diff --git a/res/skins/Tango/hotcues_deck_right.xml b/res/skins/Tango/decks/hotcues_deck_right.xml
similarity index 79%
rename from res/skins/Tango/hotcues_deck_right.xml
rename to res/skins/Tango/decks/hotcues_deck_right.xml
index 80b41279018a..2f3550dac489 100644
--- a/res/skins/Tango/hotcues_deck_right.xml
+++ b/res/skins/Tango/decks/hotcues_deck_right.xml
@@ -2,7 +2,7 @@
 Description:
   A widget containing hotcue buttons whose number can be set to 4 or 8.
   They're laid out in a way that they either expand or get squeezed,
-  depending on how many deck buttons/star rating are visible.
+  depending on how many deck skin:../Tango/buttons/star rating are visible.
 -->
 <Template>
   <WidgetGroup>
@@ -21,19 +21,19 @@ Description:
             <MaximumSize>96,24</MaximumSize>
             <SizePolicy>me,f</SizePolicy>
             <Children>
-              <Template src="skin:button_hotcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_deck.xml">
                 <SetVariable name="HotCue">1</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_deck.xml">
                 <SetVariable name="HotCue">2</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_deck.xml">
                 <SetVariable name="HotCue">3</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_deck.xml">
                 <SetVariable name="HotCue">4</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
@@ -52,35 +52,35 @@ Description:
             <MaximumSize>192,24</MaximumSize>
             <SizePolicy>me,f</SizePolicy>
             <Children>
-              <Template src="skin:button_hotcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_deck.xml">
                 <SetVariable name="HotCue">1</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_deck.xml">
                 <SetVariable name="HotCue">2</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_deck.xml">
                 <SetVariable name="HotCue">3</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_deck.xml">
                 <SetVariable name="HotCue">4</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_deck.xml">
                 <SetVariable name="HotCue">5</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_deck.xml">
                 <SetVariable name="HotCue">6</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_deck.xml">
                 <SetVariable name="HotCue">7</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_deck.xml">
                 <SetVariable name="HotCue">8</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
@@ -98,22 +98,22 @@ Description:
             <MaximumSize>96,24</MaximumSize>
             <SizePolicy>me,f</SizePolicy>
             <Children>
-              <Template src="skin:button_specialcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_specialcue_deck.xml">
                 <SetVariable name="cue_type">intro_start</SetVariable>
                 <SetVariable name="label">|&#9698;</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
-              <Template src="skin:button_specialcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_specialcue_deck.xml">
                 <SetVariable name="cue_type">intro_end</SetVariable>
                 <SetVariable name="label">&#9698;|</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
-              <Template src="skin:button_specialcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_specialcue_deck.xml">
                 <SetVariable name="cue_type">outro_start</SetVariable>
                 <SetVariable name="label">|&#9699;</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
-              <Template src="skin:button_specialcue_deck.xml">
+              <Template src="skin:../Tango/controls/button_specialcue_deck.xml">
                 <SetVariable name="cue_type">outro_end</SetVariable>
                 <SetVariable name="label">&#9699;|</SetVariable>
               </Template>
diff --git a/res/skins/Tango/hotcues_sampler_preview.xml b/res/skins/Tango/decks/hotcues_sampler_preview.xml
similarity index 79%
rename from res/skins/Tango/hotcues_sampler_preview.xml
rename to res/skins/Tango/decks/hotcues_sampler_preview.xml
index d7fe39bcbf73..fcd97113d280 100644
--- a/res/skins/Tango/hotcues_sampler_preview.xml
+++ b/res/skins/Tango/decks/hotcues_sampler_preview.xml
@@ -23,19 +23,19 @@ Description:
             <MaximumSize>83,18</MaximumSize>
             <SizePolicy>me,f</SizePolicy>
             <Children>
-              <Template src="skin:button_hotcue_sam_pre.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_sam_pre.xml">
                 <SetVariable name="HotCue">1</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_sam_pre.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_sam_pre.xml">
                 <SetVariable name="HotCue">2</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_sam_pre.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_sam_pre.xml">
                 <SetVariable name="HotCue">3</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_sam_pre.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_sam_pre.xml">
                 <SetVariable name="HotCue">4</SetVariable>
               </Template>
             </Children>
@@ -52,35 +52,35 @@ Description:
             <MaximumSize>167,18</MaximumSize>
             <SizePolicy>me,f</SizePolicy>
             <Children>
-              <Template src="skin:button_hotcue_sam_pre.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_sam_pre.xml">
                 <SetVariable name="HotCue">1</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_sam_pre.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_sam_pre.xml">
                 <SetVariable name="HotCue">2</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_sam_pre.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_sam_pre.xml">
                 <SetVariable name="HotCue">3</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_sam_pre.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_sam_pre.xml">
                 <SetVariable name="HotCue">4</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_sam_pre.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_sam_pre.xml">
                 <SetVariable name="HotCue">5</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_sam_pre.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_sam_pre.xml">
                 <SetVariable name="HotCue">6</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_sam_pre.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_sam_pre.xml">
                 <SetVariable name="HotCue">7</SetVariable>
               </Template>
                 <WidgetGroup><Size>1f,1me</Size></WidgetGroup>
-              <Template src="skin:button_hotcue_sam_pre.xml">
+              <Template src="skin:../Tango/controls/button_hotcue_sam_pre.xml">
                 <SetVariable name="HotCue">8</SetVariable>
               </Template>
             </Children>
diff --git a/res/skins/Tango/jump_controls.xml b/res/skins/Tango/decks/jump_controls.xml
similarity index 93%
rename from res/skins/Tango/jump_controls.xml
rename to res/skins/Tango/decks/jump_controls.xml
index 4ad6609a5850..f00cd9c9f693 100644
--- a/res/skins/Tango/jump_controls.xml
+++ b/res/skins/Tango/decks/jump_controls.xml
@@ -24,7 +24,7 @@ Variables:
             <SizePolicy>min,min</SizePolicy>
             <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:button_1state_right.xml">
+              <Template src="skin:../Tango/controls/button_1state_right.xml">
                 <SetVariable name="TooltipId">beatjump_backward</SetVariable>
                 <SetVariable name="ObjectName">LoopBeatJumpButton</SetVariable>
                 <SetVariable name="Size">22f,22f</SetVariable>
@@ -36,7 +36,7 @@ Variables:
 
               <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
-              <Template src="skin:button_1state_right.xml">
+              <Template src="skin:../Tango/controls/button_1state_right.xml">
                 <SetVariable name="TooltipId">beatjump_forward</SetVariable>
                 <SetVariable name="ObjectName">LoopBeatJumpButton</SetVariable>
                 <SetVariable name="Size">22f,22f</SetVariable>
@@ -78,7 +78,7 @@ Variables:
           <WidgetGroup><SizePolicy>me,me</SizePolicy></WidgetGroup>
         </Children>
         <Connection>
-          <ConfigKey persist="true">[Tango],loop_sizes</ConfigKey>
+          <ConfigKey persist="true">[Tango],decks/loop_sizes</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
       </WidgetGroup>
diff --git a/res/skins/Tango/loop_controls.xml b/res/skins/Tango/decks/loop_controls.xml
similarity index 89%
rename from res/skins/Tango/loop_controls.xml
rename to res/skins/Tango/decks/loop_controls.xml
index 402ed3a0a3b7..6bd6ee3a798c 100644
--- a/res/skins/Tango/loop_controls.xml
+++ b/res/skins/Tango/decks/loop_controls.xml
@@ -21,7 +21,7 @@ Variables:
 
           <WidgetGroup><Size>3f,1min</Size></WidgetGroup>
 
-          <Template src="skin:button_2state_right.xml">
+          <Template src="skin:../Tango/controls/button_2state_right.xml">
             <SetVariable name="TooltipId">beatloop_activate</SetVariable>
             <SetVariable name="ObjectName">LoopActivateButton</SetVariable>
             <SetVariable name="Size">30f,22f</SetVariable>
@@ -52,7 +52,7 @@ Variables:
             <Layout>horizontal</Layout>
             <SizePolicy>f,min</SizePolicy>
             <Children>
-              <Template src="skin:button_2state_right_display.xml">
+              <Template src="skin:../Tango/controls/button_2state_right_display.xml">
                 <SetVariable name="TooltipId">reloop_toggle</SetVariable>
                 <SetVariable name="ObjectName">ReloopButton</SetVariable>
                 <SetVariable name="Size">22f,22f</SetVariable>
@@ -65,7 +65,7 @@ Variables:
 
               <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
-              <Template src="skin:button_1state_right.xml">
+              <Template src="skin:../Tango/controls/button_1state_right.xml">
                 <SetVariable name="TooltipId">loop_in</SetVariable>
                 <SetVariable name="ObjectName">LoopBeatJumpButton</SetVariable>
                 <SetVariable name="Size">22f,22f</SetVariable>
@@ -77,7 +77,7 @@ Variables:
 
               <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
-              <Template src="skin:button_1state_right.xml">
+              <Template src="skin:../Tango/controls/button_1state_right.xml">
                 <SetVariable name="TooltipId">loop_out</SetVariable>
                 <SetVariable name="ObjectName">LoopBeatJumpButton</SetVariable>
                 <SetVariable name="Size">22f,22f</SetVariable>
@@ -91,10 +91,10 @@ Variables:
 
           <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
 
-          <Template src="skin:button_2state_persist.xml">
+          <Template src="skin:../Tango/controls/button_2state_persist.xml">
             <SetVariable name="ObjectName">FixedLoopSizesMiniMaxi</SetVariable>
             <SetVariable name="Size">14f,22me</SetVariable>
-            <SetVariable name="ConfigKey">[Tango],loop_sizes</SetVariable>
+            <SetVariable name="ConfigKey">[Tango],decks/loop_sizes</SetVariable>
           </Template>
 
           <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
@@ -102,7 +102,7 @@ Variables:
       </WidgetGroup><!-- /Beatloop controls -->
 
       <!-- Fixed-size beatloop buttons -->
-      <Template src="skin:loop_sizes.xml"/>
+      <Template src="skin:../Tango/decks/loop_sizes.xml"/>
 
     </Children>
   </WidgetGroup>
diff --git a/res/skins/Tango/loop_indicator.xml b/res/skins/Tango/decks/loop_indicator.xml
similarity index 94%
rename from res/skins/Tango/loop_indicator.xml
rename to res/skins/Tango/decks/loop_indicator.xml
index 61f5ae56d02b..d4948c650afa 100644
--- a/res/skins/Tango/loop_indicator.xml
+++ b/res/skins/Tango/decks/loop_indicator.xml
@@ -14,7 +14,7 @@ Variables:
         <SizePolicy>max,min</SizePolicy>
         <Layout>horizontal</Layout>
         <Children>
-          <Template src="skin:button_2state_display.xml">
+          <Template src="skin:../Tango/controls/button_2state_display.xml">
             <SetVariable name="TooltipId">reloop_toggle</SetVariable>
             <SetVariable name="ObjectName">LoopIndicator</SetVariable>
             <SetVariable name="Size">30f,40me</SetVariable>
diff --git a/res/skins/Tango/loop_sizes.xml b/res/skins/Tango/decks/loop_sizes.xml
similarity index 82%
rename from res/skins/Tango/loop_sizes.xml
rename to res/skins/Tango/decks/loop_sizes.xml
index 193ed71acd36..0b1102c95b86 100644
--- a/res/skins/Tango/loop_sizes.xml
+++ b/res/skins/Tango/decks/loop_sizes.xml
@@ -31,42 +31,42 @@ Variables:
                 <Layout>horizontal</Layout>
                 <SizePolicy>min,min</SizePolicy>
                 <Children>
-                  <Template src="skin:button_loopsize.xml">
+                  <Template src="skin:../Tango/controls/button_loopsize.xml">
                     <SetVariable name="LoopLength_Control">0.125</SetVariable>
                     <SetVariable name="LoopLength_Text">/8</SetVariable>
                   </Template>
                     <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-                  <Template src="skin:button_loopsize.xml">
+                  <Template src="skin:../Tango/controls/button_loopsize.xml">
                     <SetVariable name="LoopLength_Control">0.25</SetVariable>
                     <SetVariable name="LoopLength_Text">/4</SetVariable>
                   </Template>
                     <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-                  <Template src="skin:button_loopsize.xml">
+                  <Template src="skin:../Tango/controls/button_loopsize.xml">
                     <SetVariable name="LoopLength_Control">0.5</SetVariable>
                     <SetVariable name="LoopLength_Text">/2</SetVariable>
                   </Template>
                     <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-                  <Template src="skin:button_loopsize.xml">
+                  <Template src="skin:../Tango/controls/button_loopsize.xml">
                     <SetVariable name="LoopLength_Control">1</SetVariable>
                     <SetVariable name="LoopLength_Text">1</SetVariable>
                   </Template>
                     <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-                  <Template src="skin:button_loopsize.xml">
+                  <Template src="skin:../Tango/controls/button_loopsize.xml">
                     <SetVariable name="LoopLength_Control">2</SetVariable>
                     <SetVariable name="LoopLength_Text">2</SetVariable>
                   </Template>
                     <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-                  <Template src="skin:button_loopsize.xml">
+                  <Template src="skin:../Tango/controls/button_loopsize.xml">
                     <SetVariable name="LoopLength_Control">4</SetVariable>
                     <SetVariable name="LoopLength_Text">4</SetVariable>
                   </Template>
                     <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-                  <Template src="skin:button_loopsize.xml">
+                  <Template src="skin:../Tango/controls/button_loopsize.xml">
                     <SetVariable name="LoopLength_Control">8</SetVariable>
                     <SetVariable name="LoopLength_Text">8</SetVariable>
                   </Template>
                     <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-                  <Template src="skin:button_loopsize.xml">
+                  <Template src="skin:../Tango/controls/button_loopsize.xml">
                     <SetVariable name="LoopLength_Control">16</SetVariable>
                     <SetVariable name="LoopLength_Text">16</SetVariable>
                   </Template>
@@ -82,7 +82,7 @@ Variables:
 
     </Children>
     <Connection>
-      <ConfigKey persist="true">[Tango],loop_sizes</ConfigKey>
+      <ConfigKey persist="true">[Tango],decks/loop_sizes</ConfigKey>
       <BindProperty>visible</BindProperty>
     </Connection>
   </WidgetGroup>
diff --git a/res/skins/Tango/deck_overview.xml b/res/skins/Tango/decks/overview.xml
similarity index 100%
rename from res/skins/Tango/deck_overview.xml
rename to res/skins/Tango/decks/overview.xml
diff --git a/res/skins/Tango/preview_deck.xml b/res/skins/Tango/decks/preview_deck.xml
similarity index 92%
rename from res/skins/Tango/preview_deck.xml
rename to res/skins/Tango/decks/preview_deck.xml
index b7471b1516b8..ac1fb6f006ba 100644
--- a/res/skins/Tango/preview_deck.xml
+++ b/res/skins/Tango/decks/preview_deck.xml
@@ -68,7 +68,7 @@ Variables:
 
               <WidgetGroup><Size>1f,0min</Size></WidgetGroup>
 
-              <Template src="skin:button_1state.xml">
+              <Template src="skin:../Tango/controls/button_1state.xml">
                 <SetVariable name="TooltipId">eject</SetVariable>
                 <SetVariable name="ObjectName">PreviewEject</SetVariable>
                 <SetVariable name="Size">18f,18f</SetVariable>
@@ -89,7 +89,7 @@ Variables:
                 <Layout>stacked</Layout>
                 <Size>25f,34f</Size>
                 <Children>
-                  <Template src="skin:button_2state_right_display.xml">
+                  <Template src="skin:../Tango/controls/button_2state_right_display.xml">
                     <SetVariable name="ObjectName">PlayCue</SetVariable>
                     <SetVariable name="TooltipId">play_start</SetVariable>
                     <SetVariable name="Size">24f,34f</SetVariable>
@@ -100,7 +100,7 @@ Variables:
                     <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,play_indicator</SetVariable>
                   </Template>
                   <!-- Preview indicator, indicates previewing from Cue or Hotcue -->
-                  <Template src="skin:button_2state.xml">
+                  <Template src="skin:../Tango/controls/button_2state.xml">
                     <SetVariable name="ObjectName">PreviewIndicator</SetVariable>
                     <SetVariable name="Size">24f,34f</SetVariable>
                     <SetVariable name="ConfigKey"><Variable name="group"/>,play</SetVariable>
@@ -138,7 +138,7 @@ Variables:
                 </Connection>
               </Overview>
 
-              <Template src="skin:vumeter_mini.xml">
+              <Template src="skin:../Tango/mixer/vumeter_mini.xml">
                 <SetVariable name="Size">5f,1me</SetVariable>
                 <SetVariable name="sourceType">preview</SetVariable>
               </Template>
@@ -150,8 +150,8 @@ Variables:
                   <KnobComposed>
                     <TooltipId>pregain</TooltipId>
                     <Size>24f,20f</Size>
-                    <Knob>knobs_sliders/knob_tiny_red.svg</Knob>
-                    <BackPath>knobs_sliders/knob_bg.svg</BackPath>
+                    <Knob>skin:../Tango/knobs_sliders/knob_tiny_red.svg</Knob>
+                    <BackPath>skin:../Tango/knobs_sliders/knob_bg.svg</BackPath>
                     <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
                     <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
                     <Connection>
@@ -164,7 +164,7 @@ Variables:
             </Children>
           </WidgetGroup><!-- /Play-Overview-Gain -->
 
-          <Template src="skin:hotcues_sampler_preview.xml"/>
+          <Template src="skin:../Tango/decks/hotcues_sampler_preview.xml"/>
 
         </Children>
       </WidgetGroup>
diff --git a/res/skins/Tango/rate_pitch_key.xml b/res/skins/Tango/decks/rate_pitch_key.xml
similarity index 94%
rename from res/skins/Tango/rate_pitch_key.xml
rename to res/skins/Tango/decks/rate_pitch_key.xml
index adc43c2f05e6..168cdd7a7f10 100644
--- a/res/skins/Tango/rate_pitch_key.xml
+++ b/res/skins/Tango/decks/rate_pitch_key.xml
@@ -29,7 +29,7 @@ Variables:
                 <Layout>horizontal</Layout>
                 <Size>1me,13f</Size>
                 <Children>
-                  <Template src="skin:button_1state_right.xml">
+                  <Template src="skin:../Tango/controls/button_1state_right.xml">
                     <SetVariable name="TooltipId">pitch_down</SetVariable>
                     <SetVariable name="ObjectName">KeyDown</SetVariable>
                     <SetVariable name="Size">12me,13f</SetVariable>
@@ -37,7 +37,7 @@ Variables:
                     <SetVariable name="ConfigKeyRight"><Variable name="group"/>,pitch_down_small</SetVariable>
                   </Template>
 
-                  <Template src="skin:button_1state_right.xml">
+                  <Template src="skin:../Tango/controls/button_1state_right.xml">
                     <SetVariable name="TooltipId">pitch_up</SetVariable>
                     <SetVariable name="ObjectName">KeyUp</SetVariable>
                     <SetVariable name="Size">12me,13f</SetVariable>
@@ -57,7 +57,7 @@ Variables:
                 <Size>1me,13f</Size>
                 <Children>
                   <!-- KeyMatch, transparent -->
-                  <Template src="skin:button_1state_right.xml">
+                  <Template src="skin:../Tango/controls/button_1state_right.xml">
                     <SetVariable name="TooltipId">sync_reset_key</SetVariable>
                     <SetVariable name="ObjectName">KeyMatch</SetVariable>
                     <SetVariable name="Size">26me,13f</SetVariable>
@@ -106,7 +106,7 @@ Variables:
             <MaximumSize>50,18</MaximumSize>
             <SizePolicy>f,min</SizePolicy>
             <Children>
-              <Template src="skin:button_2state_right.xml">
+              <Template src="skin:../Tango/controls/button_2state_right.xml">
                 <SetVariable name="TooltipId">sync_enabled</SetVariable>
                 <SetVariable name="ObjectName">SyncButtonOverlay</SetVariable>
                 <SetVariable name="Size">50f,18min</SetVariable>
@@ -135,7 +135,7 @@ Variables:
                 <Layout>horizontal</Layout>
                 <Size>50f,14f</Size>
                 <Children>
-                  <Template src="skin:button_1state_right.xml">
+                  <Template src="skin:../Tango/controls/button_1state_right.xml">
                     <SetVariable name="TooltipId">rate_temp_down_rate_temp_down_small</SetVariable>
                     <SetVariable name="ObjectName">RateDown</SetVariable>
                     <SetVariable name="Size">13me,13f</SetVariable>
@@ -143,7 +143,7 @@ Variables:
                     <SetVariable name="ConfigKeyRight"><Variable name="group"/>,rate_temp_down_small</SetVariable>
                   </Template>
 
-                  <Template src="skin:button_1state_right.xml">
+                  <Template src="skin:../Tango/controls/button_1state_right.xml">
                     <SetVariable name="TooltipId">rate_temp_up_rate_temp_up_small</SetVariable>
                     <SetVariable name="ObjectName">RateUp</SetVariable>
                     <SetVariable name="Size">13me,13f</SetVariable>
@@ -170,8 +170,8 @@ Variables:
                 <MaximumSize>50,136</MaximumSize>
                 <SizePolicy>f,me</SizePolicy>
                 <TooltipId>rate</TooltipId>
-                <Handle scalemode="STRETCH_ASPECT">knobs_sliders/pitch_handle.svg</Handle>
-                <Slider scalemode="STRETCH">knobs_sliders/pitch_scale.svg</Slider>
+                <Handle scalemode="STRETCH_ASPECT">skin:../Tango/knobs_sliders/pitch_handle.svg</Handle>
+                <Slider scalemode="STRETCH">skin:../Tango/knobs_sliders/pitch_scale.svg</Slider>
                 <Horizontal>false</Horizontal>
                 <Connection>
                   <ConfigKey><Variable name="group"/>,rate</ConfigKey>
diff --git a/res/skins/Tango/deck_row_comment_fx_left.xml b/res/skins/Tango/decks/row_comment_fx_left.xml
similarity index 91%
rename from res/skins/Tango/deck_row_comment_fx_left.xml
rename to res/skins/Tango/decks/row_comment_fx_left.xml
index 019ddbb5a697..e3bbc9f023b9 100644
--- a/res/skins/Tango/deck_row_comment_fx_left.xml
+++ b/res/skins/Tango/decks/row_comment_fx_left.xml
@@ -45,22 +45,22 @@ Variables:
 
             <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
-          <Template src="skin:fx_assign_button.xml">
+          <Template src="skin:../Tango/fx/assign_button.xml">
             <SetVariable name="Size">32f,16f</SetVariable>
             <SetVariable name="FxUnit">1</SetVariable>
           </Template>
             <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-          <Template src="skin:fx_assign_button.xml">
+          <Template src="skin:../Tango/fx/assign_button.xml">
             <SetVariable name="Size">32f,16f</SetVariable>
             <SetVariable name="FxUnit">2</SetVariable>
           </Template>
             <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-          <Template src="skin:fx_assign_button.xml">
+          <Template src="skin:../Tango/fx/assign_button.xml">
             <SetVariable name="Size">32f,16f</SetVariable>
             <SetVariable name="FxUnit">3</SetVariable>
           </Template>
             <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-          <Template src="skin:fx_assign_button.xml">
+          <Template src="skin:../Tango/fx/assign_button.xml">
             <SetVariable name="Size">32f,16f</SetVariable>
             <SetVariable name="FxUnit">4</SetVariable>
           </Template>
diff --git a/res/skins/Tango/deck_row_comment_fx_right.xml b/res/skins/Tango/decks/row_comment_fx_right.xml
similarity index 92%
rename from res/skins/Tango/deck_row_comment_fx_right.xml
rename to res/skins/Tango/decks/row_comment_fx_right.xml
index b8c0791d6789..54e7156c48dd 100644
--- a/res/skins/Tango/deck_row_comment_fx_right.xml
+++ b/res/skins/Tango/decks/row_comment_fx_right.xml
@@ -28,22 +28,22 @@ Variables:
         <SizePolicy>i,min</SizePolicy>
         <Children>
 
-          <Template src="skin:fx_assign_button.xml">
+          <Template src="skin:../Tango/fx/assign_button.xml">
             <SetVariable name="Size">32f,16f</SetVariable>
             <SetVariable name="FxUnit">1</SetVariable>
           </Template>
             <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-          <Template src="skin:fx_assign_button.xml">
+          <Template src="skin:../Tango/fx/assign_button.xml">
             <SetVariable name="Size">32f,16f</SetVariable>
             <SetVariable name="FxUnit">2</SetVariable>
           </Template>
             <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-          <Template src="skin:fx_assign_button.xml">
+          <Template src="skin:../Tango/fx/assign_button.xml">
             <SetVariable name="Size">32f,16f</SetVariable>
             <SetVariable name="FxUnit">3</SetVariable>
           </Template>
             <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-          <Template src="skin:fx_assign_button.xml">
+          <Template src="skin:../Tango/fx/assign_button.xml">
             <SetVariable name="Size">32f,16f</SetVariable>
             <SetVariable name="FxUnit">4</SetVariable>
           </Template>
diff --git a/res/skins/Tango/deck_row_loop_jump.xml b/res/skins/Tango/decks/row_loop_jump.xml
similarity index 94%
rename from res/skins/Tango/deck_row_loop_jump.xml
rename to res/skins/Tango/decks/row_loop_jump.xml
index 20b02e4212b4..227a7345483d 100644
--- a/res/skins/Tango/deck_row_loop_jump.xml
+++ b/res/skins/Tango/decks/row_loop_jump.xml
@@ -30,7 +30,7 @@ Variables:
                 <MaximumSize><Variable name="SpaceLeft"/>,-1</MaximumSize>
               </WidgetGroup>
 
-              <Template src="skin:loop_controls.xml"/>
+              <Template src="skin:../Tango/decks/loop_controls.xml"/>
 
               <WidgetGroup>
                 <SizePolicy>me,me</SizePolicy>
@@ -38,7 +38,7 @@ Variables:
                 <MaximumSize>70,-1</MaximumSize>
               </WidgetGroup>
 
-              <Template src="skin:jump_controls.xml"/>
+              <Template src="skin:../Tango/decks/jump_controls.xml"/>
 
               <WidgetGroup>
                 <SizePolicy>me,me</SizePolicy>
diff --git a/res/skins/Tango/deck_row_overview_left.xml b/res/skins/Tango/decks/row_overview_left.xml
similarity index 95%
rename from res/skins/Tango/deck_row_overview_left.xml
rename to res/skins/Tango/decks/row_overview_left.xml
index 54ad9df02336..065b8edc3b18 100644
--- a/res/skins/Tango/deck_row_overview_left.xml
+++ b/res/skins/Tango/decks/row_overview_left.xml
@@ -31,9 +31,9 @@ Variables:
 
           <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
 
-          <Template src="skin:vinyl_controls_left.xml"/>
+          <Template src="skin:../Tango/decks/vinyl_controls_left.xml"/>
 
-          <Template src="skin:button_2state.xml">
+          <Template src="skin:../Tango/controls/button_2state.xml">
             <SetVariable name="ObjectName">VinylTogglerLeft</SetVariable>
             <SetVariable name="TooltipId">show_vinylcontrol</SetVariable>
             <SetVariable name="Size">15f,50f</SetVariable>
diff --git a/res/skins/Tango/deck_row_overview_right.xml b/res/skins/Tango/decks/row_overview_right.xml
similarity index 95%
rename from res/skins/Tango/deck_row_overview_right.xml
rename to res/skins/Tango/decks/row_overview_right.xml
index d1104912d074..0bf6e4c0c1fb 100644
--- a/res/skins/Tango/deck_row_overview_right.xml
+++ b/res/skins/Tango/decks/row_overview_right.xml
@@ -71,7 +71,7 @@ Variables:
             </Connection>
           </WidgetGroup><!-- / Small Cover/Spinny 2 -->
 
-          <Template src="skin:button_2state.xml">
+          <Template src="skin:../Tango/controls/button_2state.xml">
             <SetVariable name="ObjectName">VinylTogglerLeft</SetVariable>
             <SetVariable name="TooltipId">show_vinylcontrol</SetVariable>
             <SetVariable name="Size">15f,50f</SetVariable>
@@ -80,7 +80,7 @@ Variables:
 
           <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
 
-          <Template src="skin:vinyl_controls_right.xml"/>
+          <Template src="skin:../Tango/decks/vinyl_controls_right.xml"/>
 
           <SingletonContainer>
             <ObjectName>DeckOverviewSingleton<Variable name="chanNum"/></ObjectName>
diff --git a/res/skins/Tango/deck_row_text_left.xml b/res/skins/Tango/decks/row_text_left.xml
similarity index 100%
rename from res/skins/Tango/deck_row_text_left.xml
rename to res/skins/Tango/decks/row_text_left.xml
diff --git a/res/skins/Tango/deck_row_text_right.xml b/res/skins/Tango/decks/row_text_right.xml
similarity index 100%
rename from res/skins/Tango/deck_row_text_right.xml
rename to res/skins/Tango/decks/row_text_right.xml
diff --git a/res/skins/Tango/deck_row_transport_left.xml b/res/skins/Tango/decks/row_transport_left.xml
similarity index 87%
rename from res/skins/Tango/deck_row_transport_left.xml
rename to res/skins/Tango/decks/row_transport_left.xml
index 1a72df21203a..dd8c05df9e6c 100644
--- a/res/skins/Tango/deck_row_transport_left.xml
+++ b/res/skins/Tango/decks/row_transport_left.xml
@@ -40,7 +40,7 @@ Variables:
                 <Layout>vertical</Layout>
                 <SizePolicy>min,min</SizePolicy>
                 <Children>
-                  <Template src="skin:button_2state_persist.xml">
+                  <Template src="skin:../Tango/controls/button_2state_persist.xml">
                     <SetVariable name="ObjectName">DeckControlsToggle_Left</SetVariable>
                     <!-- Size needs to be changed in size_detector_stars.xml, too -->
                     <SetVariable name="Size">15f,22f</SetVariable>
@@ -58,7 +58,7 @@ Variables:
                 <Layout>horizontal</Layout>
                 <SizePolicy>min,min</SizePolicy>
                 <Children>
-                  <Template src="skin:button_deck_control_2state_opt.xml">
+                  <Template src="skin:../Tango/controls/button_deck_control_2state_opt.xml">
                     <SetVariable name="Width">18f</SetVariable>
                     <SetVariable name="TooltipId">keylock</SetVariable>
                     <SetVariable name="state_0_icon">keylock_off.svg</SetVariable>
@@ -66,7 +66,7 @@ Variables:
                     <SetVariable name="Control">keylock</SetVariable>
                   </Template>
 
-                  <Template src="skin:button_deck_control_1state_opt.xml">
+                  <Template src="skin:../Tango/controls/button_deck_control_1state_opt.xml">
                     <SetVariable name="Width">18f</SetVariable>
                     <SetVariable name="TooltipId">eject</SetVariable>
                     <SetVariable name="state_0_pressed">eject_pressed.svg</SetVariable>
@@ -74,7 +74,7 @@ Variables:
                     <SetVariable name="Control">eject</SetVariable>
                   </Template>
 
-                  <Template src="skin:button_deck_control_2state_opt.xml">
+                  <Template src="skin:../Tango/controls/button_deck_control_2state_opt.xml">
                     <SetVariable name="Width">22f</SetVariable>
                     <SetVariable name="TooltipId">slip_mode</SetVariable>
                     <SetVariable name="state_0_icon">slipmode_off.svg</SetVariable>
@@ -82,7 +82,7 @@ Variables:
                     <SetVariable name="Control">slip_enabled</SetVariable>
                   </Template>
 
-                  <Template src="skin:button_deck_control_2state_opt.xml">
+                  <Template src="skin:../Tango/controls/button_deck_control_2state_opt.xml">
                     <SetVariable name="Width">22f</SetVariable>
                     <SetVariable name="TooltipId">repeat</SetVariable>
                     <SetVariable name="state_0_icon">repeat_off.svg</SetVariable>
@@ -90,7 +90,7 @@ Variables:
                     <SetVariable name="Control">repeat</SetVariable>
                   </Template>
 
-                  <Template src="skin:button_deck_control_3state_opt.xml">
+                  <Template src="skin:../Tango/controls/button_deck_control_3state_opt.xml">
                     <SetVariable name="Width">20f</SetVariable>
                     <SetVariable name="TooltipId">orientation</SetVariable>
                     <SetVariable name="state_0_icon">xfader_left.svg</SetVariable>
@@ -99,7 +99,7 @@ Variables:
                     <SetVariable name="Control">orientation</SetVariable>
                   </Template>
 
-                  <Template src="skin:button_deck_control_2state_opt.xml">
+                  <Template src="skin:../Tango/controls/button_deck_control_2state_opt.xml">
                     <SetVariable name="Width">20f</SetVariable>
                     <SetVariable name="TooltipId">quantize</SetVariable>
                     <SetVariable name="state_0_icon">quantize_off.svg</SetVariable>
@@ -116,7 +116,7 @@ Variables:
               <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
               <!-- Deck Controls which are always visible -->
-              <Template src="skin:button_deck_control_2state_perm.xml">
+              <Template src="skin:../Tango/controls/button_deck_control_2state_perm.xml">
                 <SetVariable name="Width">18max</SetVariable>
                 <SetVariable name="TooltipId">keylock</SetVariable>
                 <SetVariable name="state_0_icon">keylock_off.svg</SetVariable>
@@ -124,7 +124,7 @@ Variables:
                 <SetVariable name="Control">keylock</SetVariable>
               </Template>
 
-              <Template src="skin:button_deck_control_1state_perm.xml">
+              <Template src="skin:../Tango/controls/button_deck_control_1state_perm.xml">
                 <SetVariable name="Width">18max</SetVariable>
                 <SetVariable name="TooltipId">eject</SetVariable>
                 <SetVariable name="state_0_pressed">eject_pressed.svg</SetVariable>
@@ -132,7 +132,7 @@ Variables:
                 <SetVariable name="Control">eject</SetVariable>
               </Template>
 
-              <Template src="skin:button_deck_control_2state_perm.xml">
+              <Template src="skin:../Tango/controls/button_deck_control_2state_perm.xml">
                 <SetVariable name="Width">22max</SetVariable>
                 <SetVariable name="TooltipId">slip_mode</SetVariable>
                 <SetVariable name="state_0_icon">slipmode_off.svg</SetVariable>
@@ -140,7 +140,7 @@ Variables:
                 <SetVariable name="Control">slip_enabled</SetVariable>
               </Template>
 
-              <Template src="skin:button_deck_control_2state_perm.xml">
+              <Template src="skin:../Tango/controls/button_deck_control_2state_perm.xml">
                 <SetVariable name="Width">22max</SetVariable>
                 <SetVariable name="TooltipId">repeat</SetVariable>
                 <SetVariable name="state_0_icon">repeat_off.svg</SetVariable>
@@ -148,7 +148,7 @@ Variables:
                 <SetVariable name="Control">repeat</SetVariable>
               </Template>
 
-              <Template src="skin:button_deck_control_3state_perm.xml">
+              <Template src="skin:../Tango/controls/button_deck_control_3state_perm.xml">
                 <SetVariable name="Width">20max</SetVariable>
                 <SetVariable name="TooltipId">orientation</SetVariable>
                 <SetVariable name="state_0_icon">xfader_left.svg</SetVariable>
@@ -157,7 +157,7 @@ Variables:
                 <SetVariable name="Control">orientation</SetVariable>
               </Template>
 
-              <Template src="skin:button_deck_control_2state_perm.xml">
+              <Template src="skin:../Tango/controls/button_deck_control_2state_perm.xml">
                 <SetVariable name="Width">20max</SetVariable>
                 <SetVariable name="TooltipId">quantize</SetVariable>
                 <SetVariable name="state_0_icon">quantize_off.svg</SetVariable>
@@ -198,12 +198,12 @@ Variables:
             </Children>
           </WidgetGroup><!-- /Deck Controls + Star rating -->
 
-          <Template src="skin:hotcues_deck_left.xml"/>
+          <Template src="skin:../Tango/decks/hotcues_deck_left.xml"/>
 
           <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
 
           <!--	Cue button -->
-          <Template src="skin:button_2state_right_display.xml">
+          <Template src="skin:../Tango/controls/button_2state_right_display.xml">
             <SetVariable name="TooltipId">cue_default_cue_gotoandstop</SetVariable>
             <SetVariable name="ObjectName">CueButton</SetVariable>
             <SetVariable name="Size">24f,24f</SetVariable>
@@ -222,7 +222,7 @@ Variables:
             <Size>50f,24f</Size>
             <Children>
               <!-- Play -->
-              <Template src="skin:button_2state_right_display.xml">
+              <Template src="skin:../Tango/controls/button_2state_right_display.xml">
                 <SetVariable name="ObjectName">PlayCue</SetVariable>
                 <SetVariable name="TooltipId">play_cue_set</SetVariable>
                 <SetVariable name="Size">50f,24f</SetVariable>
@@ -233,13 +233,13 @@ Variables:
                 <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,play_latched</SetVariable>
               </Template>
               <!-- Preview indicator, indicates previewing from Cue or Hotcue -->
-              <Template src="skin:button_2state.xml">
+              <Template src="skin:../Tango/controls/button_2state.xml">
                 <SetVariable name="ObjectName">PreviewIndicator</SetVariable>
                 <SetVariable name="Size">50f,24f</SetVariable>
                 <SetVariable name="ConfigKey"><Variable name="group"/>,play</SetVariable>
               </Template>
               <!-- Play indicator, blinks depending on Cue mode -->
-              <Template src="skin:button_2state.xml">
+              <Template src="skin:../Tango/controls/button_2state.xml">
                 <SetVariable name="ObjectName">PlayIndicator</SetVariable>
                 <SetVariable name="Size">50f,24f</SetVariable>
                 <SetVariable name="ConfigKey"><Variable name="group"/>,play_indicator</SetVariable>
@@ -251,10 +251,10 @@ Variables:
       </WidgetGroup><!-- /Play + deck controls -->
 
       <!-- Detect if Star rating fits into deck buttons row
-      <Template src="skin:size_detector_stars.xml"/> -->
+      <Template src="skin:../Tango/helpers/size_detector_stars.xml"/> -->
 
       <!-- hidden detector to show deck controls toggle if necessary -->
-      <Template src="skin:size_detector_deck_controls_toggle.xml"/>
+      <Template src="skin:../Tango/helpers/size_detector_deck_controls_toggle.xml"/>
 
     </Children>
   </WidgetGroup>
diff --git a/res/skins/Tango/deck_row_transport_right.xml b/res/skins/Tango/decks/row_transport_right.xml
similarity index 87%
rename from res/skins/Tango/deck_row_transport_right.xml
rename to res/skins/Tango/decks/row_transport_right.xml
index b202b4e5ac2e..4b8d0094c9ec 100644
--- a/res/skins/Tango/deck_row_transport_right.xml
+++ b/res/skins/Tango/decks/row_transport_right.xml
@@ -24,7 +24,7 @@ Variables:
         <Size>50f,24f</Size>
         <Children>
           <!-- Play -->
-          <Template src="skin:button_2state_right_display.xml">
+          <Template src="skin:../Tango/controls/button_2state_right_display.xml">
             <SetVariable name="ObjectName">PlayCue</SetVariable>
             <SetVariable name="TooltipId">play_cue_set</SetVariable>
             <SetVariable name="Size">50f,24f</SetVariable>
@@ -35,13 +35,13 @@ Variables:
             <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,play_latched</SetVariable>
           </Template>
           <!-- Preview indicator, indicates previewing from Cue or Hotcue -->
-          <Template src="skin:button_2state.xml">
+          <Template src="skin:../Tango/controls/button_2state.xml">
             <SetVariable name="ObjectName">PreviewIndicator</SetVariable>
             <SetVariable name="Size">50f,24f</SetVariable>
             <SetVariable name="ConfigKey"><Variable name="group"/>,play</SetVariable>
           </Template>
           <!-- Play indicator, blinks depending on Cue mode -->
-          <Template src="skin:button_2state.xml">
+          <Template src="skin:../Tango/controls/button_2state.xml">
             <SetVariable name="ObjectName">PlayIndicator</SetVariable>
             <SetVariable name="Size">50f,24f</SetVariable>
             <SetVariable name="ConfigKey"><Variable name="group"/>,play_indicator</SetVariable>
@@ -51,7 +51,7 @@ Variables:
 
       <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
 
-      <Template src="skin:button_2state_right_display.xml">
+      <Template src="skin:../Tango/controls/button_2state_right_display.xml">
         <SetVariable name="TooltipId">cue_default_cue_gotoandstop</SetVariable>
         <SetVariable name="ObjectName">CueButton</SetVariable>
         <SetVariable name="Size">24f,24f</SetVariable>
@@ -64,7 +64,7 @@ Variables:
 
       <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1min</Size></WidgetGroup>
 
-      <Template src="skin:hotcues_deck_right.xml"/>
+      <Template src="skin:../Tango/decks/hotcues_deck_right.xml"/>
 
       <WidgetGroup><!-- Deck Controls + Star rating -->
         <ObjectName>DeckControlsRight</ObjectName>
@@ -102,7 +102,7 @@ Variables:
           </WidgetGroup><!-- /Stars -->
 
           <!-- Deck Controls which are always visible -->
-          <Template src="skin:button_deck_control_2state_perm.xml">
+          <Template src="skin:../Tango/controls/button_deck_control_2state_perm.xml">
             <SetVariable name="Width">20max</SetVariable>
             <SetVariable name="TooltipId">quantize</SetVariable>
             <SetVariable name="state_0_icon">quantize_off.svg</SetVariable>
@@ -110,7 +110,7 @@ Variables:
             <SetVariable name="Control">quantize</SetVariable>
           </Template>
 
-          <Template src="skin:button_deck_control_3state_perm.xml">
+          <Template src="skin:../Tango/controls/button_deck_control_3state_perm.xml">
             <SetVariable name="Width">20max</SetVariable>
             <SetVariable name="TooltipId">orientation</SetVariable>
             <SetVariable name="state_0_icon">xfader_left_attention.svg</SetVariable>
@@ -119,7 +119,7 @@ Variables:
             <SetVariable name="Control">orientation</SetVariable>
           </Template>
 
-          <Template src="skin:button_deck_control_2state_perm.xml">
+          <Template src="skin:../Tango/controls/button_deck_control_2state_perm.xml">
             <SetVariable name="Width">22max</SetVariable>
             <SetVariable name="TooltipId">repeat</SetVariable>
             <SetVariable name="state_0_icon">repeat_off.svg</SetVariable>
@@ -127,7 +127,7 @@ Variables:
             <SetVariable name="Control">repeat</SetVariable>
           </Template>
 
-          <Template src="skin:button_deck_control_2state_perm.xml">
+          <Template src="skin:../Tango/controls/button_deck_control_2state_perm.xml">
             <SetVariable name="Width">22max</SetVariable>
             <SetVariable name="TooltipId">slip_mode</SetVariable>
             <SetVariable name="state_0_icon">slipmode_off.svg</SetVariable>
@@ -135,7 +135,7 @@ Variables:
             <SetVariable name="Control">slip_enabled</SetVariable>
           </Template>
 
-          <Template src="skin:button_deck_control_1state_perm.xml">
+          <Template src="skin:../Tango/controls/button_deck_control_1state_perm.xml">
             <SetVariable name="Width">18max</SetVariable>
             <SetVariable name="TooltipId">eject</SetVariable>
             <SetVariable name="state_0_pressed">eject_pressed.svg</SetVariable>
@@ -143,7 +143,7 @@ Variables:
             <SetVariable name="Control">eject</SetVariable>
           </Template>
 
-          <Template src="skin:button_deck_control_2state_perm.xml">
+          <Template src="skin:../Tango/controls/button_deck_control_2state_perm.xml">
             <SetVariable name="Width">18max</SetVariable>
             <SetVariable name="TooltipId">keylock</SetVariable>
             <SetVariable name="state_0_icon">keylock_off.svg</SetVariable>
@@ -159,7 +159,7 @@ Variables:
             <Layout>horizontal</Layout>
             <SizePolicy>min,min</SizePolicy>
             <Children>
-              <Template src="skin:button_deck_control_2state_opt.xml">
+              <Template src="skin:../Tango/controls/button_deck_control_2state_opt.xml">
                 <SetVariable name="Width">20f</SetVariable>
                 <SetVariable name="TooltipId">quantize</SetVariable>
                 <SetVariable name="state_0_icon">quantize_off.svg</SetVariable>
@@ -167,7 +167,7 @@ Variables:
                 <SetVariable name="Control">quantize</SetVariable>
               </Template>
 
-              <Template src="skin:button_deck_control_3state_opt.xml">
+              <Template src="skin:../Tango/controls/button_deck_control_3state_opt.xml">
                 <SetVariable name="Width">20f</SetVariable>
                 <SetVariable name="TooltipId">orientation</SetVariable>
                 <SetVariable name="state_0_icon">xfader_left_attention.svg</SetVariable>
@@ -176,7 +176,7 @@ Variables:
                 <SetVariable name="Control">orientation</SetVariable>
               </Template>
 
-              <Template src="skin:button_deck_control_2state_opt.xml">
+              <Template src="skin:../Tango/controls/button_deck_control_2state_opt.xml">
                 <SetVariable name="Width">22f</SetVariable>
                 <SetVariable name="TooltipId">repeat</SetVariable>
                 <SetVariable name="state_0_icon">repeat_off.svg</SetVariable>
@@ -184,7 +184,7 @@ Variables:
                 <SetVariable name="Control">repeat</SetVariable>
               </Template>
 
-              <Template src="skin:button_deck_control_2state_opt.xml">
+              <Template src="skin:../Tango/controls/button_deck_control_2state_opt.xml">
                 <SetVariable name="Width">22f</SetVariable>
                 <SetVariable name="TooltipId">slip_mode</SetVariable>
                 <SetVariable name="state_0_icon">slipmode_off.svg</SetVariable>
@@ -192,7 +192,7 @@ Variables:
                 <SetVariable name="Control">slip_enabled</SetVariable>
               </Template>
 
-              <Template src="skin:button_deck_control_1state_opt.xml">
+              <Template src="skin:../Tango/controls/button_deck_control_1state_opt.xml">
                 <SetVariable name="Width">18f</SetVariable>
                 <SetVariable name="TooltipId">eject</SetVariable>
                 <SetVariable name="state_0_pressed">eject_pressed.svg</SetVariable>
@@ -200,7 +200,7 @@ Variables:
                 <SetVariable name="Control">eject</SetVariable>
               </Template>
 
-              <Template src="skin:button_deck_control_2state_opt.xml">
+              <Template src="skin:../Tango/controls/button_deck_control_2state_opt.xml">
                 <SetVariable name="Width">18f</SetVariable>
                 <SetVariable name="TooltipId">keylock</SetVariable>
                 <SetVariable name="state_0_icon">keylock_off.svg</SetVariable>
@@ -220,7 +220,7 @@ Variables:
             <Layout>vertical</Layout>
             <SizePolicy>min,min</SizePolicy>
             <Children>
-              <Template src="skin:button_2state_persist.xml">
+              <Template src="skin:../Tango/controls/button_2state_persist.xml">
                 <SetVariable name="ObjectName">DeckControlsToggle_Right</SetVariable>
                 <!-- Size needs to be changed in size_detector_stars.xml, too -->
                 <SetVariable name="Size">15f,22f</SetVariable>
diff --git a/res/skins/Tango/spinny_cover_maxi.xml b/res/skins/Tango/decks/spinny_cover_maxi.xml
similarity index 77%
rename from res/skins/Tango/spinny_cover_maxi.xml
rename to res/skins/Tango/decks/spinny_cover_maxi.xml
index e01626a43388..6e25a76d4798 100644
--- a/res/skins/Tango/spinny_cover_maxi.xml
+++ b/res/skins/Tango/decks/spinny_cover_maxi.xml
@@ -30,10 +30,10 @@ Variables:
                 <TooltipId>spinny</TooltipId>
                 <Size>111f,111f</Size>
                 <Group><Variable name="group"/></Group>
-                <PathBackground scalemode="STRETCH_ASPECT">graphics/spinny_bg.svg</PathBackground>
-                <PathMask scalemode="STRETCH_ASPECT">graphics/spinny_mask.svg</PathMask>
-                <PathForeground scalemode="STRETCH_ASPECT">graphics/spinny_indicator.svg</PathForeground>
-                <PathGhost scalemode="STRETCH_ASPECT">graphics/spinny_indicator_ghost.svg</PathGhost>
+                <PathBackground scalemode="STRETCH_ASPECT">skin:../Tango/graphics/spinny_bg.svg</PathBackground>
+                <PathMask scalemode="STRETCH_ASPECT">skin:../Tango/graphics/spinny_mask.svg</PathMask>
+                <PathForeground scalemode="STRETCH_ASPECT">skin:../Tango/graphics/spinny_indicator.svg</PathForeground>
+                <PathGhost scalemode="STRETCH_ASPECT">skin:../Tango/graphics/spinny_indicator_ghost.svg</PathGhost>
                 <ShowCover>false</ShowCover>
                 <Connection>
                   <ConfigKey persist="true">[Skin],show_coverart</ConfigKey>
@@ -46,10 +46,10 @@ Variables:
                 <TooltipId>spinny</TooltipId>
                 <Size>111f,111f</Size>
                 <Group><Variable name="group"/></Group>
-                <PathBackground scalemode="STRETCH_ASPECT">graphics/spinny_bg.svg</PathBackground>
-                <PathMask scalemode="STRETCH_ASPECT">graphics/spinny_mask.svg</PathMask>
-                <PathForeground scalemode="STRETCH_ASPECT">graphics/spinny_indicator.svg</PathForeground>
-                <PathGhost scalemode="STRETCH_ASPECT">graphics/spinny_indicator_ghost.svg</PathGhost>
+                <PathBackground scalemode="STRETCH_ASPECT">skin:../Tango/graphics/spinny_bg.svg</PathBackground>
+                <PathMask scalemode="STRETCH_ASPECT">skin:../Tango/graphics/spinny_mask.svg</PathMask>
+                <PathForeground scalemode="STRETCH_ASPECT">skin:../Tango/graphics/spinny_indicator.svg</PathForeground>
+                <PathGhost scalemode="STRETCH_ASPECT">skin:../Tango/graphics/spinny_indicator_ghost.svg</PathGhost>
                 <ShowCover>true</ShowCover>
                 <Connection>
                   <ConfigKey persist="true">[Skin],show_coverart</ConfigKey>
@@ -74,7 +74,7 @@ Variables:
                 <TooltipId>coverart</TooltipId>
                 <Size>111f,111f</Size>
                 <Group><Variable name="group"/></Group>
-                <DefaultCover scalemode="STRETCH_ASPECT">skin:/graphics/cover_default.svg</DefaultCover>
+                <DefaultCover scalemode="STRETCH_ASPECT">skin:../Tango/graphics/cover_default.svg</DefaultCover>
                 <Connection>
                   <ConfigKey persist="true">[Skin],show_coverart</ConfigKey>
                   <BindProperty>visible</BindProperty>
diff --git a/res/skins/Tango/spinny_cover_mini.xml b/res/skins/Tango/decks/spinny_cover_mini.xml
similarity index 68%
rename from res/skins/Tango/spinny_cover_mini.xml
rename to res/skins/Tango/decks/spinny_cover_mini.xml
index 35a9d357693f..721b0fcf3109 100644
--- a/res/skins/Tango/spinny_cover_mini.xml
+++ b/res/skins/Tango/decks/spinny_cover_mini.xml
@@ -23,10 +23,10 @@ Variables:
             <TooltipId>spinny</TooltipId>
             <Size>40me,40me</Size>
             <Group><Variable name="group"/></Group>
-            <PathBackground scalemode="STRETCH_ASPECT">graphics/spinny_mini_bg.svg</PathBackground>
-            <PathForeground scalemode="STRETCH_ASPECT">graphics/spinny_mini_indicator.svg</PathForeground>
-            <PathMask scalemode="STRETCH_ASPECT">graphics/spinny_mini_mask_<Variable name="SpinnyCoverColor"/>.svg</PathMask>
-            <PathGhost scalemode="STRETCH_ASPECT">graphics/spinny_mini_indicator_ghost.svg</PathGhost>
+            <PathBackground scalemode="STRETCH_ASPECT">skin:../Tango/graphics/spinny_mini_bg.svg</PathBackground>
+            <PathForeground scalemode="STRETCH_ASPECT">skin:../Tango/graphics/spinny_mini_indicator.svg</PathForeground>
+            <PathMask scalemode="STRETCH_ASPECT">skin:../Tango/graphics/spinny_mini_mask_<Variable name="SpinnyCoverColor"/>.svg</PathMask>
+            <PathGhost scalemode="STRETCH_ASPECT">skin:../Tango/graphics/spinny_mini_indicator_ghost.svg</PathGhost>
             <ShowCover>false</ShowCover>
             <Connection>
               <ConfigKey persist="true">[Skin],show_coverart</ConfigKey>
@@ -39,10 +39,10 @@ Variables:
             <TooltipId>spinny</TooltipId>
             <Size>40me,40me</Size>
             <Group><Variable name="group"/></Group>
-            <PathBackground scalemode="STRETCH_ASPECT">graphics/spinny_mini_bg.svg</PathBackground>
-            <PathForeground scalemode="STRETCH_ASPECT">graphics/spinny_mini_indicator.svg</PathForeground>
-            <PathMask scalemode="STRETCH_ASPECT">graphics/spinny_mini_mask_<Variable name="SpinnyCoverColor"/>.svg</PathMask>
-            <PathGhost scalemode="STRETCH_ASPECT">graphics/spinny_mini_indicator_ghost.svg</PathGhost>
+            <PathBackground scalemode="STRETCH_ASPECT">skin:../Tango/graphics/spinny_mini_bg.svg</PathBackground>
+            <PathForeground scalemode="STRETCH_ASPECT">skin:../Tango/graphics/spinny_mini_indicator.svg</PathForeground>
+            <PathMask scalemode="STRETCH_ASPECT">skin:../Tango/graphics/spinny_mini_mask_<Variable name="SpinnyCoverColor"/>.svg</PathMask>
+            <PathGhost scalemode="STRETCH_ASPECT">skin:../Tango/graphics/spinny_mini_indicator_ghost.svg</PathGhost>
             <ShowCover>true</ShowCover>
             <Connection>
               <ConfigKey persist="true">[Skin],show_coverart</ConfigKey>
@@ -66,7 +66,7 @@ Variables:
             <TooltipId>coverart</TooltipId>
             <Size>40me,40me</Size>
             <Group>[Channel<Variable name="chanNum"/>]</Group>
-            <DefaultCover>skin:/graphics/cover_default_mini_<Variable name="SpinnyCoverColor"/>.svg</DefaultCover>
+            <DefaultCover>skin:../Tango/graphics/cover_default_mini_<Variable name="SpinnyCoverColor"/>.svg</DefaultCover>
             <Connection>
               <ConfigKey persist="true">[Skin],show_coverart</ConfigKey>
               <BindProperty>visible</BindProperty>
diff --git a/res/skins/Tango/vinyl_controls_left.xml b/res/skins/Tango/decks/vinyl_controls_left.xml
similarity index 93%
rename from res/skins/Tango/vinyl_controls_left.xml
rename to res/skins/Tango/decks/vinyl_controls_left.xml
index bc4d2ad7e8c2..4ec6e091d1c6 100644
--- a/res/skins/Tango/vinyl_controls_left.xml
+++ b/res/skins/Tango/decks/vinyl_controls_left.xml
@@ -25,7 +25,7 @@ Variables:
             <Layout>stacked</Layout>
             <SizePolicy>min,min</SizePolicy>
             <Children>
-              <Template src="skin:button_2state.xml">
+              <Template src="skin:../Tango/controls/button_2state.xml">
                 <SetVariable name="TooltipId">vinylcontrol_enabled</SetVariable>
                 <SetVariable name="ObjectName">VinylControlButton</SetVariable>
                 <SetVariable name="Size">40f,27f</SetVariable>
@@ -34,7 +34,7 @@ Variables:
                 <SetVariable name="ConfigKey"><Variable name="group"/>,vinylcontrol_enabled</SetVariable>
                 <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,vinylcontrol_status</SetVariable>
               </Template>
-              <Template src="skin:statuslight_4state.xml">
+              <Template src="skin:../Tango/controls/statuslight_4state.xml">
                 <SetVariable name="ObjectName">VinylControlStatus</SetVariable>
                 <SetVariable name="Size">40f,27f</SetVariable>
                 <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,vinylcontrol_status</SetVariable>
@@ -44,7 +44,7 @@ Variables:
 
           <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
-          <Template src="skin:button_2state.xml">
+          <Template src="skin:../Tango/controls/button_2state.xml">
             <SetVariable name="TooltipId">passthrough_enabled</SetVariable>
             <SetVariable name="ObjectName">PassthroughButton</SetVariable>
             <SetVariable name="Size">40f,27f</SetVariable>
@@ -66,7 +66,7 @@ Variables:
         <SizePolicy>min,min</SizePolicy>
         <Children>
 
-          <Template src="skin:button_3state_persist.xml">
+          <Template src="skin:../Tango/controls/button_3state_persist.xml">
             <SetVariable name="TooltipId">vinylcontrol_mode</SetVariable>
             <SetVariable name="ObjectName">VinylModeButton</SetVariable>
             <SetVariable name="Size">40f,21f</SetVariable>
@@ -94,7 +94,7 @@ Variables:
                   <BindProperty>visible</BindProperty>
                 </Connection>
               </WidgetGroup>
-              <Template src="skin:button_3state_persist.xml">
+              <Template src="skin:../Tango/controls/button_3state_persist.xml">
                 <SetVariable name="TooltipId">vinylcontrol_cueing</SetVariable>
                 <SetVariable name="ObjectName">VinylModeButton</SetVariable>
                 <SetVariable name="Size">40f,21f</SetVariable>
diff --git a/res/skins/Tango/vinyl_controls_right.xml b/res/skins/Tango/decks/vinyl_controls_right.xml
similarity index 93%
rename from res/skins/Tango/vinyl_controls_right.xml
rename to res/skins/Tango/decks/vinyl_controls_right.xml
index 320d8ce7848b..453015ac7b50 100644
--- a/res/skins/Tango/vinyl_controls_right.xml
+++ b/res/skins/Tango/decks/vinyl_controls_right.xml
@@ -34,7 +34,7 @@ Variables:
             <Layout>stacked</Layout>
             <SizePolicy>min,min</SizePolicy>
             <Children>
-              <Template src="skin:button_2state.xml">
+              <Template src="skin:../Tango/controls/button_2state.xml">
                 <SetVariable name="TooltipId">vinylcontrol_enabled</SetVariable>
                 <SetVariable name="ObjectName">VinylControlButton</SetVariable>
                 <SetVariable name="Size">40f,27f</SetVariable>
@@ -43,7 +43,7 @@ Variables:
                 <SetVariable name="ConfigKey"><Variable name="group"/>,vinylcontrol_enabled</SetVariable>
                 <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,vinylcontrol_status</SetVariable>
               </Template>
-              <Template src="skin:statuslight_4state.xml">
+              <Template src="skin:../Tango/controls/statuslight_4state.xml">
                 <SetVariable name="ObjectName">VinylControlStatus</SetVariable>
                 <SetVariable name="Size">40f,27f</SetVariable>
                 <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,vinylcontrol_status</SetVariable>
@@ -53,7 +53,7 @@ Variables:
 
           <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
-          <Template src="skin:button_2state.xml">
+          <Template src="skin:../Tango/controls/button_2state.xml">
             <SetVariable name="TooltipId">passthrough_enabled</SetVariable>
             <SetVariable name="ObjectName">PassthroughButton</SetVariable>
             <SetVariable name="Size">40f,27f</SetVariable>
@@ -75,7 +75,7 @@ Variables:
         <SizePolicy>min,min</SizePolicy>
         <Children>
 
-          <Template src="skin:button_3state_persist.xml">
+          <Template src="skin:../Tango/controls/button_3state_persist.xml">
             <SetVariable name="TooltipId">vinylcontrol_mode</SetVariable>
             <SetVariable name="ObjectName">VinylModeButton</SetVariable>
             <SetVariable name="Size">40f,21f</SetVariable>
@@ -103,7 +103,7 @@ Variables:
                   <BindProperty>visible</BindProperty>
                 </Connection>
               </WidgetGroup>
-              <Template src="skin:button_3state_persist.xml">
+              <Template src="skin:../Tango/controls/button_3state_persist.xml">
                 <SetVariable name="TooltipId">vinylcontrol_cueing</SetVariable>
                 <SetVariable name="ObjectName">VinylModeButton</SetVariable>
                 <SetVariable name="Size">40f,21f</SetVariable>
diff --git a/res/skins/Tango/decks_12.xml b/res/skins/Tango/decks_12.xml
index 312121a66ec9..82d29518b74e 100644
--- a/res/skins/Tango/decks_12.xml
+++ b/res/skins/Tango/decks_12.xml
@@ -16,13 +16,13 @@ Variables:
     <Layout>horizontal</Layout>
     <SizePolicy>me,f</SizePolicy>
     <Children>
-      <Template src="skin:deck_left.xml">
+      <Template src="skin:../Tango/decks/deck_left.xml">
         <SetVariable name="chanNum">1</SetVariable>
       </Template>
 
-      <Template src="skin:vumeter_master.xml"/>
+      <Template src="skin:../Tango/mixer/vumeter_master.xml"/>
 
-      <Template src="skin:deck_right.xml">
+      <Template src="skin:../Tango/decks/deck_right.xml">
         <SetVariable name="chanNum">2</SetVariable>
       </Template>
     </Children>
diff --git a/res/skins/Tango/decks_34.xml b/res/skins/Tango/decks_34.xml
index 2b266ed9a27c..497f8e9ca595 100644
--- a/res/skins/Tango/decks_34.xml
+++ b/res/skins/Tango/decks_34.xml
@@ -14,13 +14,13 @@ Variables:
     <SizePolicy>me,f</SizePolicy>
     <Children>
 
-      <Template src="skin:deck_left.xml">
+      <Template src="skin:../Tango/decks/deck_left.xml">
         <SetVariable name="chanNum">3</SetVariable>
       </Template>
 
-      <Template src="skin:spacer_center.xml"/>
+      <Template src="skin:../Tango/helpers/spacer_center.xml"/>
 
-      <Template src="skin:deck_right.xml">
+      <Template src="skin:../Tango/decks/deck_right.xml">
         <SetVariable name="chanNum">4</SetVariable>
       </Template>
 
diff --git a/res/skins/Tango/fx_assign_button.xml b/res/skins/Tango/fx/assign_button.xml
similarity index 100%
rename from res/skins/Tango/fx_assign_button.xml
rename to res/skins/Tango/fx/assign_button.xml
diff --git a/res/skins/Tango/fx_button.xml b/res/skins/Tango/fx/button.xml
similarity index 69%
rename from res/skins/Tango/fx_button.xml
rename to res/skins/Tango/fx/button.xml
index 1bc365fb0161..6857f28d1625 100644
--- a/res/skins/Tango/fx_button.xml
+++ b/res/skins/Tango/fx/button.xml
@@ -20,13 +20,13 @@ Variables:
     <NumberStates>2</NumberStates>
     <State>
       <Number>0</Number>
-      <Pressed scalemode="STRETCH">buttons/btn_<Variable name="labelOff"/>.svg</Pressed>
-      <Unpressed scalemode="STRETCH">buttons/btn_<Variable name="labelOff"/>.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:../Tango/buttons/btn_<Variable name="labelOff"/>.svg</Pressed>
+      <Unpressed scalemode="STRETCH">skin:../Tango/buttons/btn_<Variable name="labelOff"/>.svg</Unpressed>
     </State>
     <State>
       <Number>1</Number>
-      <Pressed scalemode="STRETCH">buttons/btn_<Variable name="labelOn"/>.svg</Pressed>
-      <Unpressed scalemode="STRETCH">buttons/btn_<Variable name="labelOn"/>.svg</Unpressed>
+      <Pressed scalemode="STRETCH">skin:../Tango/buttons/btn_<Variable name="labelOn"/>.svg</Pressed>
+      <Unpressed scalemode="STRETCH">skin:../Tango/buttons/btn_<Variable name="labelOn"/>.svg</Unpressed>
     </State>
     <Connection>
       <ConfigKey><Variable name="FxRack_FxUnit_FxNum"/>,<Variable name="FxParameter"/></ConfigKey>
diff --git a/res/skins/Tango/fx_flow_focus_background.xml b/res/skins/Tango/fx/flow_focus_background.xml
similarity index 100%
rename from res/skins/Tango/fx_flow_focus_background.xml
rename to res/skins/Tango/fx/flow_focus_background.xml
diff --git a/res/skins/Tango/fx_flow_focus_separator.xml b/res/skins/Tango/fx/flow_focus_separator.xml
similarity index 98%
rename from res/skins/Tango/fx_flow_focus_separator.xml
rename to res/skins/Tango/fx/flow_focus_separator.xml
index 47369bb4a7c0..ebda554f1cad 100644
--- a/res/skins/Tango/fx_flow_focus_separator.xml
+++ b/res/skins/Tango/fx/flow_focus_separator.xml
@@ -9,7 +9,7 @@ Description:
   The unfocused effect slot is painted #333. If focused, it turns transparent
   and the black effect unit background is visible.
 Variables:
-  widthLeft     : distance between arrow and left border 
+  widthLeft     : distance between arrow and left border
   widthRight    : distance between arrow and right border
   FxRack_FxUnit :
   FxTop         : Effect slot above separator
diff --git a/res/skins/Tango/fx_flow_noFocus_separator.xml b/res/skins/Tango/fx/flow_noFocus_separator.xml
similarity index 93%
rename from res/skins/Tango/fx_flow_noFocus_separator.xml
rename to res/skins/Tango/fx/flow_noFocus_separator.xml
index a3a366e69651..79861d6fe77f 100644
--- a/res/skins/Tango/fx_flow_noFocus_separator.xml
+++ b/res/skins/Tango/fx/flow_noFocus_separator.xml
@@ -3,9 +3,9 @@ Description:
   An horizontally expanding filler that draws the horizontal border in
   between two effect slots. It contains an 'arrow' below/above effect toggle
   that indicates how a signal flows through the effect unit: 1 > 2 > 3
-  It's used for left and right oriented effect units. 
+  It's used for left and right oriented effect units.
 Variables:
-  widthLeft     : distance between arrow and left border 
+  widthLeft     : distance between arrow and left border
   widthRight    : distance between arrow and right border
   FxRack_FxUnit :
 -->
diff --git a/res/skins/Tango/fx_focus_button.xml b/res/skins/Tango/fx/focus_button.xml
similarity index 100%
rename from res/skins/Tango/fx_focus_button.xml
rename to res/skins/Tango/fx/focus_button.xml
diff --git a/res/skins/Tango/fx_master_button.xml b/res/skins/Tango/fx/master_button.xml
similarity index 93%
rename from res/skins/Tango/fx_master_button.xml
rename to res/skins/Tango/fx/master_button.xml
index f2dbd93e16b7..101c99b9705a 100644
--- a/res/skins/Tango/fx_master_button.xml
+++ b/res/skins/Tango/fx/master_button.xml
@@ -1,6 +1,6 @@
 <!--
 Description:
-  A button to assign an effect unit to master output. 
+  A button to assign an effect unit to master output.
 Variables:
   Size
   FxUnitNum      : [EffectRack1_EffectUnitN]
diff --git a/res/skins/Tango/fx_metaknob.xml b/res/skins/Tango/fx/metaknob.xml
similarity index 88%
rename from res/skins/Tango/fx_metaknob.xml
rename to res/skins/Tango/fx/metaknob.xml
index 87d6227958cd..33aadb1d9818 100644
--- a/res/skins/Tango/fx_metaknob.xml
+++ b/res/skins/Tango/fx/metaknob.xml
@@ -18,8 +18,8 @@ Variables:
       <KnobComposed>
         <TooltipId>EffectSlot_metaknob</TooltipId>
         <Size>30f,26f</Size>
-        <Knob>knobs_sliders/knob_blue.svg</Knob>
-        <BackPath>knobs_sliders/knob_bg.svg</BackPath>
+        <Knob>skin:../Tango/knobs_sliders/knob_blue.svg</Knob>
+        <BackPath>skin:../Tango/knobs_sliders/knob_bg.svg</BackPath>
         <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
         <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
         <KnobCenterYOffset>2.000</KnobCenterYOffset>
diff --git a/res/skins/Tango/fx_parameter_button.xml b/res/skins/Tango/fx/parameter_button.xml
similarity index 95%
rename from res/skins/Tango/fx_parameter_button.xml
rename to res/skins/Tango/fx/parameter_button.xml
index 21c274163124..c9b276f13a09 100644
--- a/res/skins/Tango/fx_parameter_button.xml
+++ b/res/skins/Tango/fx/parameter_button.xml
@@ -20,7 +20,7 @@ Variables:
     <Size>52f,26f</Size>
     <Children>
       <!-- Actual button, invisible except hover border -->
-      <Template src="skin:fx_button.xml">
+      <Template src="skin:../Tango/fx/button.xml">
         <SetVariable name="ObjectName">FxParameterButtonOverlay</SetVariable>
         <SetVariable name="Size">51f,18f</SetVariable>
         <SetVariable name="FxParameter">button_parameter<Variable name="FxParameter"/></SetVariable>
@@ -43,7 +43,7 @@ Variables:
       </EffectButtonParameterName>
 
       <!-- Button to indicate parameter state -->
-      <Template src="skin:fx_button.xml">
+      <Template src="skin:../Tango/fx/button.xml">
         <SetVariable name="ObjectName">FxParameterButtonUnderlay</SetVariable>
         <SetVariable name="Size">51f,18f</SetVariable>
         <SetVariable name="FxParameter">button_parameter<Variable name="FxParameter"/></SetVariable>
diff --git a/res/skins/Tango/fx_parameter_knob.xml b/res/skins/Tango/fx/parameter_knob.xml
similarity index 93%
rename from res/skins/Tango/fx_parameter_knob.xml
rename to res/skins/Tango/fx/parameter_knob.xml
index 6171d3ab1d8c..ac2ebcb1b079 100644
--- a/res/skins/Tango/fx_parameter_knob.xml
+++ b/res/skins/Tango/fx/parameter_knob.xml
@@ -36,8 +36,8 @@ Variables:
             <Children>
               <EffectParameterKnobComposed>
                 <Size>26f,22f</Size>
-                <Knob>knobs_sliders/knob_fx_yellow.svg</Knob>
-                <BackPath>knobs_sliders/knob_bg_fx_parameter.svg</BackPath>
+                <Knob>skin:../Tango/knobs_sliders/knob_fx_yellow.svg</Knob>
+                <BackPath>skin:../Tango/knobs_sliders/knob_bg_fx_parameter.svg</BackPath>
                 <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
                 <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
                 <KnobCenterYOffset>1.500</KnobCenterYOffset>
@@ -85,7 +85,7 @@ Variables:
             <SizePolicy>me,min</SizePolicy>
             <Children>
               <!-- Meta knob link invert button -->
-              <Template src="skin:button_2state.xml">
+              <Template src="skin:../Tango/controls/button_2state.xml">
                 <SetVariable name="TooltipId">EffectSlot_parameter_inversion</SetVariable>
                 <SetVariable name="ObjectName">FxSuperLinkInvertButton</SetVariable>
                 <SetVariable name="Size">10f,5f</SetVariable>
@@ -93,7 +93,7 @@ Variables:
               </Template>
 
               <!-- Meta knob link button -->
-              <Template src="skin:button_5state.xml">
+              <Template src="skin:../Tango/controls/button_5state.xml">
                 <SetVariable name="TooltipId">EffectSlot_parameter_link_type</SetVariable>
                 <SetVariable name="ObjectName">FxSuperLinkButton</SetVariable>
                 <SetVariable name="Size">25me,5f</SetVariable>
diff --git a/res/skins/Tango/fx_parameter_row.xml b/res/skins/Tango/fx/parameter_row.xml
similarity index 62%
rename from res/skins/Tango/fx_parameter_row.xml
rename to res/skins/Tango/fx/parameter_row.xml
index 43136fbfd966..049fc8c2ddb7 100644
--- a/res/skins/Tango/fx_parameter_row.xml
+++ b/res/skins/Tango/fx/parameter_row.xml
@@ -12,59 +12,59 @@ Variables passed through from fx_unit:
     <Size>min,min</Size>
     <Children>
 
-      <Template src="skin:fx_parameter_knob.xml">
+      <Template src="skin:../Tango/fx/parameter_knob.xml">
         <SetVariable name="FxParameter">1</SetVariable>
       </Template>
-      <Template src="skin:fx_parameter_button.xml">
+      <Template src="skin:../Tango/fx/parameter_button.xml">
         <SetVariable name="FxParameter">1</SetVariable>
       </Template>
 
-      <Template src="skin:fx_parameter_knob.xml">
+      <Template src="skin:../Tango/fx/parameter_knob.xml">
         <SetVariable name="FxParameter">2</SetVariable>
       </Template>
-      <Template src="skin:fx_parameter_button.xml">
+      <Template src="skin:../Tango/fx/parameter_button.xml">
         <SetVariable name="FxParameter">2</SetVariable>
       </Template>
 
-      <Template src="skin:fx_parameter_knob.xml">
+      <Template src="skin:../Tango/fx/parameter_knob.xml">
         <SetVariable name="FxParameter">3</SetVariable>
       </Template>
-      <Template src="skin:fx_parameter_button.xml">
+      <Template src="skin:../Tango/fx/parameter_button.xml">
         <SetVariable name="FxParameter">3</SetVariable>
       </Template>
 
-      <Template src="skin:fx_parameter_knob.xml">
+      <Template src="skin:../Tango/fx/parameter_knob.xml">
         <SetVariable name="FxParameter">4</SetVariable>
       </Template>
-      <Template src="skin:fx_parameter_button.xml">
+      <Template src="skin:../Tango/fx/parameter_button.xml">
         <SetVariable name="FxParameter">4</SetVariable>
       </Template>
 
-      <Template src="skin:fx_parameter_knob.xml">
+      <Template src="skin:../Tango/fx/parameter_knob.xml">
         <SetVariable name="FxParameter">5</SetVariable>
       </Template>
-      <Template src="skin:fx_parameter_button.xml">
+      <Template src="skin:../Tango/fx/parameter_button.xml">
         <SetVariable name="FxParameter">5</SetVariable>
       </Template>
 
-      <Template src="skin:fx_parameter_knob.xml">
+      <Template src="skin:../Tango/fx/parameter_knob.xml">
         <SetVariable name="FxParameter">6</SetVariable>
       </Template>
-      <Template src="skin:fx_parameter_button.xml">
+      <Template src="skin:../Tango/fx/parameter_button.xml">
         <SetVariable name="FxParameter">6</SetVariable>
       </Template>
 
-      <Template src="skin:fx_parameter_knob.xml">
+      <Template src="skin:../Tango/fx/parameter_knob.xml">
         <SetVariable name="FxParameter">7</SetVariable>
       </Template>
-      <Template src="skin:fx_parameter_button.xml">
+      <Template src="skin:../Tango/fx/parameter_button.xml">
         <SetVariable name="FxParameter">7</SetVariable>
       </Template>
 
-      <Template src="skin:fx_parameter_knob.xml">
+      <Template src="skin:../Tango/fx/parameter_knob.xml">
         <SetVariable name="FxParameter">8</SetVariable>
       </Template>
-      <Template src="skin:fx_parameter_button.xml">
+      <Template src="skin:../Tango/fx/parameter_button.xml">
         <SetVariable name="FxParameter">8</SetVariable>
       </Template>
 
diff --git a/res/skins/Tango/fx_toggle_selector.xml b/res/skins/Tango/fx/toggle_selector.xml
similarity index 94%
rename from res/skins/Tango/fx_toggle_selector.xml
rename to res/skins/Tango/fx/toggle_selector.xml
index 59ba542581e3..82d1f43296f8 100644
--- a/res/skins/Tango/fx_toggle_selector.xml
+++ b/res/skins/Tango/fx/toggle_selector.xml
@@ -20,7 +20,7 @@ Variables:
     <Size>82f,20f</Size>
     <Children>
       <!-- invisible, clickable Overlay to toggle Effect -->
-      <Template src="skin:button_2state.xml">
+      <Template src="skin:../Tango/controls/button_2state.xml">
         <SetVariable name="TooltipId">EffectSlot_enabled</SetVariable>
         <SetVariable name="ObjectName">FxToggleButton</SetVariable>
         <SetVariable name="Size">69f,20f</SetVariable>
@@ -44,7 +44,7 @@ Variables:
       </WidgetGroup>
 
        <!-- Colored background to communicate the Effect's ON/OFF status -->
-      <Template src="skin:button_2state.xml">
+      <Template src="skin:../Tango/controls/button_2state.xml">
         <SetVariable name="ObjectName">FxToggleButtonUnderlay</SetVariable>
         <SetVariable name="Size">69f,20f</SetVariable>
         <SetVariable name="ConfigKey"><Variable name="FxRack_FxUnit_FxNum"/>,enabled</SetVariable>
diff --git a/res/skins/Tango/fx_unit_left.xml b/res/skins/Tango/fx/unit_left.xml
similarity index 82%
rename from res/skins/Tango/fx_unit_left.xml
rename to res/skins/Tango/fx/unit_left.xml
index fe5e81042e34..f209399c0d14 100644
--- a/res/skins/Tango/fx_unit_left.xml
+++ b/res/skins/Tango/fx/unit_left.xml
@@ -31,15 +31,15 @@ Variables:
                 <Layout>horizontal</Layout>
                 <Children>
                   <WidgetGroup><Size>0min,1min</Size></WidgetGroup>
-                  <Template src="skin:fx_parameter_row.xml">
+                  <Template src="skin:../Tango/fx/parameter_row.xml">
                     <SetVariable name="FxNum">1</SetVariable>
                     <SetVariable name="Side">Left</SetVariable>
                   </Template>
                   <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
-                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/toggle_selector.xml"><SetVariable name="FxNum">1</SetVariable></Template>
                   <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
-                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">1</SetVariable></Template>
-                  <Template src="skin:fx_focus_button.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/metaknob.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/focus_button.xml"><SetVariable name="FxNum">1</SetVariable></Template>
                   <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
                 </Children>
               </WidgetGroup>
@@ -52,15 +52,15 @@ Variables:
                 <Layout>horizontal</Layout>
                 <Children>
                   <WidgetGroup><Size>0min,1min</Size></WidgetGroup>
-                  <Template src="skin:fx_parameter_row.xml">
+                  <Template src="skin:../Tango/fx/parameter_row.xml">
                     <SetVariable name="FxNum">2</SetVariable>
                     <SetVariable name="Side">Left</SetVariable>
                   </Template>
                   <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
-                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/toggle_selector.xml"><SetVariable name="FxNum">2</SetVariable></Template>
                   <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
-                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">2</SetVariable></Template>
-                  <Template src="skin:fx_focus_button.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/metaknob.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/focus_button.xml"><SetVariable name="FxNum">2</SetVariable></Template>
                   <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
                 </Children>
               </WidgetGroup>
@@ -73,15 +73,15 @@ Variables:
                 <Layout>horizontal</Layout>
                 <Children>
                   <WidgetGroup><Size>0min,1min</Size></WidgetGroup>
-                  <Template src="skin:fx_parameter_row.xml">
+                  <Template src="skin:../Tango/fx/parameter_row.xml">
                     <SetVariable name="FxNum">3</SetVariable>
                     <SetVariable name="Side">Left</SetVariable>
                   </Template>
                   <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
-                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/toggle_selector.xml"><SetVariable name="FxNum">3</SetVariable></Template>
                   <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
-                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">3</SetVariable></Template>
-                  <Template src="skin:fx_focus_button.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/metaknob.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/focus_button.xml"><SetVariable name="FxNum">3</SetVariable></Template>
                   <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
                 </Children>
               </WidgetGroup>
@@ -101,7 +101,7 @@ Variables:
                 <SizePolicy>me,me</SizePolicy>
               </WidgetGroup>
 
-              <Template src="skin:fx_flow_noFocus_separator.xml">
+              <Template src="skin:../Tango/fx/flow_noFocus_separator.xml">
                 <SetVariable name="widthLeft">-1me</SetVariable>
                 <SetVariable name="widthRight">65f</SetVariable>
               </Template>
@@ -111,7 +111,7 @@ Variables:
                 <SizePolicy>me,me</SizePolicy>
               </WidgetGroup>
 
-              <Template src="skin:fx_flow_noFocus_separator.xml">
+              <Template src="skin:../Tango/fx/flow_noFocus_separator.xml">
                 <SetVariable name="widthLeft">-1me</SetVariable>
                 <SetVariable name="widthRight">65f</SetVariable>
               </Template>
@@ -136,39 +136,39 @@ Variables:
             <Layout>vertical</Layout>
             <SizePolicy>me,me</SizePolicy>
             <Children>
-              <Template src="skin:fx_flow_focus_background.xml">
+              <Template src="skin:../Tango/fx/flow_focus_background.xml">
                 <SetVariable name="Size">-1me,8f</SetVariable>
                 <SetVariable name="FxNum">1</SetVariable>
               </Template>
-              <Template src="skin:fx_flow_focus_background.xml">
+              <Template src="skin:../Tango/fx/flow_focus_background.xml">
                 <SetVariable name="Size">-1me,-1me</SetVariable>
                 <SetVariable name="FxNum">1</SetVariable>
               </Template>
 
-              <Template src="skin:fx_flow_focus_separator.xml">
+              <Template src="skin:../Tango/fx/flow_focus_separator.xml">
                 <SetVariable name="widthLeft">-1me</SetVariable>
                 <SetVariable name="widthRight">80f</SetVariable>
                 <SetVariable name="FxTop">1</SetVariable>
                 <SetVariable name="FxBottom">2</SetVariable>
               </Template>
 
-              <Template src="skin:fx_flow_focus_background.xml">
+              <Template src="skin:../Tango/fx/flow_focus_background.xml">
                 <SetVariable name="Size">-1me,-1me</SetVariable>
                 <SetVariable name="FxNum">2</SetVariable>
               </Template>
 
-              <Template src="skin:fx_flow_focus_separator.xml">
+              <Template src="skin:../Tango/fx/flow_focus_separator.xml">
                 <SetVariable name="widthLeft">-1me</SetVariable>
                 <SetVariable name="widthRight">80f</SetVariable>
                 <SetVariable name="FxTop">2</SetVariable>
                 <SetVariable name="FxBottom">3</SetVariable>
               </Template>
 
-              <Template src="skin:fx_flow_focus_background.xml">
+              <Template src="skin:../Tango/fx/flow_focus_background.xml">
                 <SetVariable name="Size">-1me,-1me</SetVariable>
                 <SetVariable name="FxNum">3</SetVariable>
               </Template>
-              <Template src="skin:fx_flow_focus_background.xml">
+              <Template src="skin:../Tango/fx/flow_focus_background.xml">
                 <SetVariable name="Size">-1me,8f</SetVariable>
                 <SetVariable name="FxNum">3</SetVariable>
               </Template>
@@ -193,7 +193,7 @@ Variables:
             <Layout>stacked</Layout>
             <Size>34f,30f</Size>
             <Children>
-              <Template src="skin:button_2state_persist.xml">
+              <Template src="skin:../Tango/controls/button_2state_persist.xml">
                 <SetVariable name="ObjectName">FxMiniMaxi</SetVariable>
                 <SetVariable name="TooltipId">EffectUnit_show_parameters</SetVariable>
                 <SetVariable name="Size">34f,30f</SetVariable>
@@ -214,7 +214,7 @@ Variables:
             <SizePolicy>min,me</SizePolicy>
             <Children>
 
-              <Template src="skin:knob_textless.xml">
+              <Template src="skin:../Tango/controls/knob_textless.xml">
                 <SetVariable name="TooltipId">EffectUnit_mix</SetVariable>
                 <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
                 <SetVariable name="Size">30min,26f</SetVariable>
@@ -223,7 +223,7 @@ Variables:
                 <SetVariable name="Color">red</SetVariable>
               </Template>
 
-              <Template src="skin:button_2state_persist.xml">
+              <Template src="skin:../Tango/controls/button_2state_persist.xml">
                 <SetVariable name="ObjectName">MixModeButton</SetVariable>
                 <SetVariable name="TooltipId">EffectUnit_mix_mode</SetVariable>
                 <SetVariable name="Size">30f,18f</SetVariable>
@@ -238,7 +238,7 @@ Variables:
                 <SizePolicy>min,min</SizePolicy>
                 <Layout>vertical</Layout>
                 <Children>
-                  <Template src="skin:knob_textless.xml">
+                  <Template src="skin:../Tango/controls/knob_textless.xml">
                     <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
                     <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
                     <SetVariable name="Size">30f,26f</SetVariable>
@@ -271,9 +271,9 @@ Variables:
                     <Layout>stacked</Layout>
                     <Children>
                       <!-- Greyed out if no headphone device is configured -->
-                      <Template src="skin:pfl_cover.xml"/>
+                      <Template src="skin:../Tango/helpers/pfl_cover.xml"/>
 
-                      <Template src="skin:button_2state.xml">
+                      <Template src="skin:../Tango/controls/button_2state.xml">
                         <SetVariable name="ObjectName">PflButton</SetVariable>
                         <SetVariable name="TooltipId">EffectUnit_headphones_enabled</SetVariable>
                         <SetVariable name="Size">24f,24f</SetVariable>
diff --git a/res/skins/Tango/fx_unit_left_mini.xml b/res/skins/Tango/fx/unit_left_mini.xml
similarity index 84%
rename from res/skins/Tango/fx_unit_left_mini.xml
rename to res/skins/Tango/fx/unit_left_mini.xml
index 037edea26f32..87bdda3795d7 100644
--- a/res/skins/Tango/fx_unit_left_mini.xml
+++ b/res/skins/Tango/fx/unit_left_mini.xml
@@ -35,9 +35,9 @@ Variables:
                 <SizePolicy>me,me</SizePolicy>
                 <Children>
                   <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">1</SetVariable></Template>
-                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">1</SetVariable></Template>
-                  <Template src="skin:fx_focus_button.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/toggle_selector.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/metaknob.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/focus_button.xml"><SetVariable name="FxNum">1</SetVariable></Template>
                   <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
                 </Children>
               </WidgetGroup>
@@ -48,9 +48,9 @@ Variables:
                 <SizePolicy>me,me</SizePolicy>
                 <Children>
                   <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">2</SetVariable></Template>
-                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">2</SetVariable></Template>
-                  <Template src="skin:fx_focus_button.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/toggle_selector.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/metaknob.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/focus_button.xml"><SetVariable name="FxNum">2</SetVariable></Template>
                   <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
                 </Children>
               </WidgetGroup>
@@ -61,9 +61,9 @@ Variables:
                 <SizePolicy>me,me</SizePolicy>
                 <Children>
                   <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">3</SetVariable></Template>
-                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">3</SetVariable></Template>
-                  <Template src="skin:fx_focus_button.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/toggle_selector.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/metaknob.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/focus_button.xml"><SetVariable name="FxNum">3</SetVariable></Template>
                   <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
                 </Children>
               </WidgetGroup>
@@ -116,7 +116,7 @@ Variables:
             <SizePolicy>min,min</SizePolicy>
             <Children>
               <!-- EffectSlot 1 -->
-              <Template src="skin:fx_flow_focus_background.xml">
+              <Template src="skin:../Tango/fx/flow_focus_background.xml">
                 <SetVariable name="Size">-1me,-1min</SetVariable>
                 <SetVariable name="FxNum">1</SetVariable>
               </Template>
@@ -131,7 +131,7 @@ Variables:
               </WidgetGroup>
 
               <!-- EffectSlot 2 -->
-              <Template src="skin:fx_flow_focus_background.xml">
+              <Template src="skin:../Tango/fx/flow_focus_background.xml">
                 <SetVariable name="Size">-1me,-1min</SetVariable>
                 <SetVariable name="FxNum">2</SetVariable>
               </Template>
@@ -146,11 +146,11 @@ Variables:
               </WidgetGroup>
 
               <!-- EffectSlot 3 -->
-              <Template src="skin:fx_flow_focus_background.xml">
+              <Template src="skin:../Tango/fx/flow_focus_background.xml">
                 <SetVariable name="Size">-1me,-1min</SetVariable>
                 <SetVariable name="FxNum">3</SetVariable>
               </Template>
-              <Template src="skin:fx_flow_focus_background.xml">
+              <Template src="skin:../Tango/fx/flow_focus_background.xml">
                 <SetVariable name="Size">11f,30f</SetVariable>
                 <SetVariable name="FxNum">3</SetVariable>
               </Template>
@@ -182,8 +182,8 @@ Variables:
                 <Layout>stacked</Layout>
                 <Children>
                   <!-- Greyed out if no headphone device is configured -->
-                  <Template src="skin:pfl_cover.xml"/>
-                  <Template src="skin:button_2state.xml">
+                  <Template src="skin:../Tango/helpers/pfl_cover.xml"/>
+                  <Template src="skin:../Tango/controls/button_2state.xml">
                     <SetVariable name="ObjectName">PflButton</SetVariable>
                     <SetVariable name="TooltipId">EffectUnit_headphones_enabled</SetVariable>
                     <SetVariable name="Size">20f,20f</SetVariable>
@@ -200,7 +200,7 @@ Variables:
             <SizePolicy>max,min</SizePolicy>
             <Layout>vertical</Layout>
             <Children>
-              <Template src="skin:knob_textless.xml">
+              <Template src="skin:../Tango/controls/knob_textless.xml">
                 <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
                 <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
                 <SetVariable name="Size">30f,30f</SetVariable>
@@ -224,7 +224,7 @@ Variables:
             </Connection>
           </WidgetGroup>
 
-          <Template src="skin:button_2state_persist.xml">
+          <Template src="skin:../Tango/controls/button_2state_persist.xml">
             <SetVariable name="ObjectName">MixModeButton</SetVariable>
             <SetVariable name="TooltipId">EffectUnit_mix_mode</SetVariable>
             <SetVariable name="Size">30f,18f</SetVariable>
@@ -233,7 +233,7 @@ Variables:
             <SetVariable name="ConfigKey">[EffectRack1_EffectUnit<Variable name="FxUnit"/>],mix_mode</SetVariable>
           </Template>
 
-          <Template src="skin:knob_textless.xml">
+          <Template src="skin:../Tango/controls/knob_textless.xml">
             <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
             <SetVariable name="TooltipId">EffectUnit_mix</SetVariable>
             <SetVariable name="Size">30f,30f</SetVariable>
@@ -249,7 +249,7 @@ Variables:
         <Layout>stacked</Layout>
         <Size>30f,30f</Size>
         <Children>
-          <Template src="skin:button_2state_persist.xml">
+          <Template src="skin:../Tango/controls/button_2state_persist.xml">
             <SetVariable name="ObjectName">FxMiniMaxi</SetVariable>
             <SetVariable name="TooltipId">EffectUnit_show_parameters</SetVariable>
             <SetVariable name="Size">30f,30f</SetVariable>
diff --git a/res/skins/Tango/fx_unit_right.xml b/res/skins/Tango/fx/unit_right.xml
similarity index 82%
rename from res/skins/Tango/fx_unit_right.xml
rename to res/skins/Tango/fx/unit_right.xml
index 85db61d9829b..9e187c72f355 100644
--- a/res/skins/Tango/fx_unit_right.xml
+++ b/res/skins/Tango/fx/unit_right.xml
@@ -27,7 +27,7 @@ Variables:
             <Layout>stacked</Layout>
             <Size>34f,30f</Size>
             <Children>
-              <Template src="skin:button_2state_persist.xml">
+              <Template src="skin:../Tango/controls/button_2state_persist.xml">
                 <SetVariable name="ObjectName">FxMiniMaxi</SetVariable>
                 <SetVariable name="TooltipId">EffectUnit_show_parameters</SetVariable>
                 <SetVariable name="Size">34f,30f</SetVariable>
@@ -48,7 +48,7 @@ Variables:
             <SizePolicy>min,me</SizePolicy>
             <Children>
 
-              <Template src="skin:knob_textless.xml">
+              <Template src="skin:../Tango/controls/knob_textless.xml">
                 <SetVariable name="TooltipId">EffectUnit_mix</SetVariable>
                 <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
                 <SetVariable name="Size">30min,26f</SetVariable>
@@ -57,7 +57,7 @@ Variables:
                 <SetVariable name="Color">red</SetVariable>
               </Template>
 
-              <Template src="skin:button_2state_persist.xml">
+              <Template src="skin:../Tango/controls/button_2state_persist.xml">
                 <SetVariable name="ObjectName">MixModeButton</SetVariable>
                 <SetVariable name="TooltipId">EffectUnit_mix_mode</SetVariable>
                 <SetVariable name="Size">30f,18f</SetVariable>
@@ -72,7 +72,7 @@ Variables:
                 <SizePolicy>min,min</SizePolicy>
                 <Layout>vertical</Layout>
                 <Children>
-                  <Template src="skin:knob_textless.xml">
+                  <Template src="skin:../Tango/controls/knob_textless.xml">
                     <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
                     <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
                     <SetVariable name="Size">30f,30f</SetVariable>
@@ -105,8 +105,8 @@ Variables:
                     <Layout>stacked</Layout>
                     <Children>
                       <!-- Greyed out if no headphone device is configured -->
-                      <Template src="skin:pfl_cover.xml"/>
-                      <Template src="skin:button_2state.xml">
+                      <Template src="skin:../Tango/helpers/pfl_cover.xml"/>
+                      <Template src="skin:../Tango/controls/button_2state.xml">
                         <SetVariable name="ObjectName">PflButton</SetVariable>
                         <SetVariable name="TooltipId">EffectUnit_headphones_enabled</SetVariable>
                         <SetVariable name="Size">24f,24f</SetVariable>
@@ -140,12 +140,12 @@ Variables:
                 <Layout>horizontal</Layout>
                 <Children>
                   <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-                  <Template src="skin:fx_focus_button.xml"><SetVariable name="FxNum">1</SetVariable></Template>
-                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/focus_button.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/metaknob.xml"><SetVariable name="FxNum">1</SetVariable></Template>
                   <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
-                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/toggle_selector.xml"><SetVariable name="FxNum">1</SetVariable></Template>
                   <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
-                  <Template src="skin:fx_parameter_row.xml">
+                  <Template src="skin:../Tango/fx/parameter_row.xml">
                     <SetVariable name="FxNum">1</SetVariable>
                     <SetVariable name="Side">Right</SetVariable>
                   </Template>
@@ -161,12 +161,12 @@ Variables:
                 <Layout>horizontal</Layout>
                 <Children>
                   <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-                  <Template src="skin:fx_focus_button.xml"><SetVariable name="FxNum">2</SetVariable></Template>
-                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/focus_button.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/metaknob.xml"><SetVariable name="FxNum">2</SetVariable></Template>
                   <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
-                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/toggle_selector.xml"><SetVariable name="FxNum">2</SetVariable></Template>
                   <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
-                  <Template src="skin:fx_parameter_row.xml">
+                  <Template src="skin:../Tango/fx/parameter_row.xml">
                     <SetVariable name="FxNum">2</SetVariable>
                     <SetVariable name="Side">Right</SetVariable>
                   </Template>
@@ -182,12 +182,12 @@ Variables:
                 <Layout>horizontal</Layout>
                 <Children>
                   <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-                  <Template src="skin:fx_focus_button.xml"><SetVariable name="FxNum">3</SetVariable></Template>
-                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/focus_button.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/metaknob.xml"><SetVariable name="FxNum">3</SetVariable></Template>
                   <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
-                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/toggle_selector.xml"><SetVariable name="FxNum">3</SetVariable></Template>
                   <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
-                  <Template src="skin:fx_parameter_row.xml">
+                  <Template src="skin:../Tango/fx/parameter_row.xml">
                     <SetVariable name="FxNum">3</SetVariable>
                     <SetVariable name="Side">Right</SetVariable>
                   </Template>
@@ -209,7 +209,7 @@ Variables:
                 <SizePolicy>me,me</SizePolicy>
               </WidgetGroup>
 
-              <Template src="skin:fx_flow_noFocus_separator.xml">
+              <Template src="skin:../Tango/fx/flow_noFocus_separator.xml">
                 <SetVariable name="widthLeft">57f</SetVariable>
                 <SetVariable name="widthRight">-1me</SetVariable>
               </Template>
@@ -219,7 +219,7 @@ Variables:
                 <SizePolicy>me,me</SizePolicy>
               </WidgetGroup>
 
-              <Template src="skin:fx_flow_noFocus_separator.xml">
+              <Template src="skin:../Tango/fx/flow_noFocus_separator.xml">
                 <SetVariable name="widthLeft">57f</SetVariable>
                 <SetVariable name="widthRight">-1me</SetVariable>
               </Template>
@@ -244,39 +244,39 @@ Variables:
             <Layout>vertical</Layout>
             <SizePolicy>me,min</SizePolicy>
             <Children>
-              <Template src="skin:fx_flow_focus_background.xml">
+              <Template src="skin:../Tango/fx/flow_focus_background.xml">
                 <SetVariable name="Size">-1me,8f</SetVariable>
                 <SetVariable name="FxNum">1</SetVariable>
               </Template>
-              <Template src="skin:fx_flow_focus_background.xml">
+              <Template src="skin:../Tango/fx/flow_focus_background.xml">
                 <SetVariable name="Size">-1me,-1me</SetVariable>
                 <SetVariable name="FxNum">1</SetVariable>
               </Template>
 
-              <Template src="skin:fx_flow_focus_separator.xml">
+              <Template src="skin:../Tango/fx/flow_focus_separator.xml">
                 <SetVariable name="widthLeft">71f</SetVariable>
                 <SetVariable name="widthRight">-1me</SetVariable>
                 <SetVariable name="FxTop">1</SetVariable>
                 <SetVariable name="FxBottom">2</SetVariable>
               </Template>
 
-              <Template src="skin:fx_flow_focus_background.xml">
+              <Template src="skin:../Tango/fx/flow_focus_background.xml">
                 <SetVariable name="Size">-1me,-1me</SetVariable>
                 <SetVariable name="FxNum">2</SetVariable>
               </Template>
 
-              <Template src="skin:fx_flow_focus_separator.xml">
+              <Template src="skin:../Tango/fx/flow_focus_separator.xml">
                 <SetVariable name="widthLeft">71f</SetVariable>
                 <SetVariable name="widthRight">-1me</SetVariable>
                 <SetVariable name="FxTop">2</SetVariable>
                 <SetVariable name="FxBottom">3</SetVariable>
               </Template>
 
-              <Template src="skin:fx_flow_focus_background.xml">
+              <Template src="skin:../Tango/fx/flow_focus_background.xml">
                 <SetVariable name="Size">-1me,-1me</SetVariable>
                 <SetVariable name="FxNum">3</SetVariable>
               </Template>
-              <Template src="skin:fx_flow_focus_background.xml">
+              <Template src="skin:../Tango/fx/flow_focus_background.xml">
                 <SetVariable name="Size">-1me,8f</SetVariable>
                 <SetVariable name="FxNum">3</SetVariable>
               </Template>
diff --git a/res/skins/Tango/fx_unit_right_mini.xml b/res/skins/Tango/fx/unit_right_mini.xml
similarity index 84%
rename from res/skins/Tango/fx_unit_right_mini.xml
rename to res/skins/Tango/fx/unit_right_mini.xml
index b81c69ad0d55..edbf6acea67b 100644
--- a/res/skins/Tango/fx_unit_right_mini.xml
+++ b/res/skins/Tango/fx/unit_right_mini.xml
@@ -20,7 +20,7 @@ Variables:
         <Layout>stacked</Layout>
         <Size>30f,30f</Size>
         <Children>
-          <Template src="skin:button_2state_persist.xml">
+          <Template src="skin:../Tango/controls/button_2state_persist.xml">
             <SetVariable name="ObjectName">FxMiniMaxi</SetVariable>
             <SetVariable name="TooltipId">EffectUnit_show_parameters</SetVariable>
             <SetVariable name="Size">30f,30f</SetVariable>
@@ -40,7 +40,7 @@ Variables:
         <SizePolicy>max,min</SizePolicy>
         <Children>
 
-          <Template src="skin:knob_textless.xml">
+          <Template src="skin:../Tango/controls/knob_textless.xml">
             <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
             <SetVariable name="TooltipId">EffectUnit_mix</SetVariable>
             <SetVariable name="Size">30f,30f</SetVariable>
@@ -49,7 +49,7 @@ Variables:
             <SetVariable name="Color">red</SetVariable>
           </Template>
 
-          <Template src="skin:button_2state_persist.xml">
+          <Template src="skin:../Tango/controls/button_2state_persist.xml">
             <SetVariable name="ObjectName">MixModeButton</SetVariable>
             <SetVariable name="TooltipId">EffectUnit_mix_mode</SetVariable>
             <SetVariable name="Size">30f,18f</SetVariable>
@@ -71,7 +71,7 @@ Variables:
             <SizePolicy>max,min</SizePolicy>
             <Layout>vertical</Layout>
             <Children>
-              <Template src="skin:knob_textless.xml">
+              <Template src="skin:../Tango/controls/knob_textless.xml">
                 <SetVariable name="ObjectName">SuperWetDryKnob</SetVariable>
                 <SetVariable name="TooltipId">EffectUnit_super1</SetVariable>
                 <SetVariable name="Size">30f,30f</SetVariable>
@@ -96,8 +96,8 @@ Variables:
                 <Layout>stacked</Layout>
                 <Children>
                   <!-- Greyed out if no headphone device is configured -->
-                  <Template src="skin:pfl_cover.xml"/>
-                  <Template src="skin:button_2state.xml">
+                  <Template src="skin:../Tango/helpers/pfl_cover.xml"/>
+                  <Template src="skin:../Tango/controls/button_2state.xml">
                     <SetVariable name="ObjectName">PflButton</SetVariable>
                     <SetVariable name="TooltipId">EffectUnit_headphones_enabled</SetVariable>
                     <SetVariable name="Size">20f,20f</SetVariable>
@@ -130,9 +130,9 @@ Variables:
                 <SizePolicy>me,me</SizePolicy>
                 <Children>
                   <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">1</SetVariable></Template>
-                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">1</SetVariable></Template>
-                  <Template src="skin:fx_focus_button.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/toggle_selector.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/metaknob.xml"><SetVariable name="FxNum">1</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/focus_button.xml"><SetVariable name="FxNum">1</SetVariable></Template>
                   <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
                 </Children>
               </WidgetGroup>
@@ -143,9 +143,9 @@ Variables:
                 <SizePolicy>me,me</SizePolicy>
                 <Children>
                   <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">2</SetVariable></Template>
-                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">2</SetVariable></Template>
-                  <Template src="skin:fx_focus_button.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/toggle_selector.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/metaknob.xml"><SetVariable name="FxNum">2</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/focus_button.xml"><SetVariable name="FxNum">2</SetVariable></Template>
                   <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
                 </Children>
               </WidgetGroup>
@@ -156,9 +156,9 @@ Variables:
                 <SizePolicy>me,me</SizePolicy>
                 <Children>
                   <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-                  <Template src="skin:fx_toggle_selector.xml"><SetVariable name="FxNum">3</SetVariable></Template>
-                  <Template src="skin:fx_metaknob.xml"><SetVariable name="FxNum">3</SetVariable></Template>
-                  <Template src="skin:fx_focus_button.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/toggle_selector.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/metaknob.xml"><SetVariable name="FxNum">3</SetVariable></Template>
+                  <Template src="skin:../Tango/fx/focus_button.xml"><SetVariable name="FxNum">3</SetVariable></Template>
                   <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
                 </Children>
               </WidgetGroup>
@@ -211,7 +211,7 @@ Variables:
             <SizePolicy>min,min</SizePolicy>
             <Children>
               <!-- EffectSlot 1 -->
-              <Template src="skin:fx_flow_focus_background.xml">
+              <Template src="skin:../Tango/fx/flow_focus_background.xml">
                 <SetVariable name="Size">-1me,-1min</SetVariable>
                 <SetVariable name="FxNum">1</SetVariable>
               </Template>
@@ -226,7 +226,7 @@ Variables:
               </WidgetGroup>
 
               <!-- EffectSlot 2 -->
-              <Template src="skin:fx_flow_focus_background.xml">
+              <Template src="skin:../Tango/fx/flow_focus_background.xml">
                 <SetVariable name="Size">-1me,-1min</SetVariable>
                 <SetVariable name="FxNum">2</SetVariable>
               </Template>
@@ -241,11 +241,11 @@ Variables:
               </WidgetGroup>
 
               <!-- EffectSlot 3 -->
-              <Template src="skin:fx_flow_focus_background.xml">
+              <Template src="skin:../Tango/fx/flow_focus_background.xml">
                 <SetVariable name="Size">-1me,-1min</SetVariable>
                 <SetVariable name="FxNum">3</SetVariable>
               </Template>
-              <Template src="skin:fx_flow_focus_background.xml">
+              <Template src="skin:../Tango/fx/flow_focus_background.xml">
                 <SetVariable name="Size">11f,30f</SetVariable>
                 <SetVariable name="FxNum">3</SetVariable>
               </Template>
diff --git a/res/skins/Tango/fx_units_12.xml b/res/skins/Tango/fx_units_12.xml
index bfda514389ea..f3f6bbc3d0f6 100644
--- a/res/skins/Tango/fx_units_12.xml
+++ b/res/skins/Tango/fx_units_12.xml
@@ -35,7 +35,7 @@ Description:
             <Layout>vertical</Layout>
             <SizePolicy>min,me</SizePolicy>
             <Children>
-              <Template src="skin:fx_unit_left_mini.xml">
+              <Template src="skin:../Tango/fx/unit_left_mini.xml">
                 <SetVariable name="FxUnit">1</SetVariable>
               </Template>
               <WidgetGroup><Size>1min,5me</Size></WidgetGroup>
@@ -47,7 +47,7 @@ Description:
             <Layout>vertical</Layout>
             <SizePolicy>min,max</SizePolicy>
             <Children>
-              <Template src="skin:fx_unit_left.xml">
+              <Template src="skin:../Tango/fx/unit_left.xml">
                 <SetVariable name="FxUnit">1</SetVariable>
               </Template>
               <WidgetGroup><Size>1min,5f</Size></WidgetGroup>
@@ -77,7 +77,7 @@ Description:
             <Layout>vertical</Layout>
             <SizePolicy>min,me</SizePolicy>
             <Children>
-              <Template src="skin:fx_unit_right_mini.xml">
+              <Template src="skin:../Tango/fx/unit_right_mini.xml">
                 <SetVariable name="FxUnit">2</SetVariable>
               </Template>
               <WidgetGroup><Size>1min,5me</Size></WidgetGroup>
@@ -89,7 +89,7 @@ Description:
             <Layout>vertical</Layout>
             <SizePolicy>min,max</SizePolicy>
             <Children>
-              <Template src="skin:fx_unit_right.xml">
+              <Template src="skin:../Tango/fx/unit_right.xml">
                 <SetVariable name="FxUnit">2</SetVariable>
               </Template>
               <WidgetGroup><Size>1min,5f</Size></WidgetGroup>
diff --git a/res/skins/Tango/fx_units_34.xml b/res/skins/Tango/fx_units_34.xml
index 2ceb77dbfdbc..47cbe621a6c7 100644
--- a/res/skins/Tango/fx_units_34.xml
+++ b/res/skins/Tango/fx_units_34.xml
@@ -35,7 +35,7 @@ Description:
             <Layout>vertical</Layout>
             <SizePolicy>min,me</SizePolicy>
             <Children>
-              <Template src="skin:fx_unit_left_mini.xml">
+              <Template src="skin:../Tango/fx/unit_left_mini.xml">
                 <SetVariable name="FxUnit">3</SetVariable>
               </Template>
               <WidgetGroup><Size>1min,5me</Size></WidgetGroup>
@@ -47,7 +47,7 @@ Description:
             <Layout>vertical</Layout>
             <SizePolicy>min,max</SizePolicy>
             <Children>
-              <Template src="skin:fx_unit_left.xml">
+              <Template src="skin:../Tango/fx/unit_left.xml">
                 <SetVariable name="FxUnit">3</SetVariable>
               </Template>
               <WidgetGroup><Size>1min,5f</Size></WidgetGroup>
@@ -77,7 +77,7 @@ Description:
             <Layout>vertical</Layout>
             <SizePolicy>min,me</SizePolicy>
             <Children>
-              <Template src="skin:fx_unit_right_mini.xml">
+              <Template src="skin:../Tango/fx/unit_right_mini.xml">
                 <SetVariable name="FxUnit">4</SetVariable>
               </Template>
               <WidgetGroup><Size>1min,5me</Size></WidgetGroup>
@@ -89,7 +89,7 @@ Description:
             <Layout>vertical</Layout>
             <SizePolicy>min,max</SizePolicy>
             <Children>
-              <Template src="skin:fx_unit_right.xml">
+              <Template src="skin:../Tango/fx/unit_right.xml">
                 <SetVariable name="FxUnit">4</SetVariable>
               </Template>
               <WidgetGroup><Size>1min,5f</Size></WidgetGroup>
diff --git a/res/skins/Tango/pfl_cover.xml b/res/skins/Tango/helpers/pfl_cover.xml
similarity index 100%
rename from res/skins/Tango/pfl_cover.xml
rename to res/skins/Tango/helpers/pfl_cover.xml
diff --git a/res/skins/Tango/size_detector_deck_controls_toggle.xml b/res/skins/Tango/helpers/size_detector_deck_controls_toggle.xml
similarity index 100%
rename from res/skins/Tango/size_detector_deck_controls_toggle.xml
rename to res/skins/Tango/helpers/size_detector_deck_controls_toggle.xml
diff --git a/res/skins/Tango/size_detector_stars.xml b/res/skins/Tango/helpers/size_detector_stars.xml
similarity index 99%
rename from res/skins/Tango/size_detector_stars.xml
rename to res/skins/Tango/helpers/size_detector_stars.xml
index 16fd03dc5df3..51e8a417fc9a 100644
--- a/res/skins/Tango/size_detector_stars.xml
+++ b/res/skins/Tango/helpers/size_detector_stars.xml
@@ -114,7 +114,7 @@ Controls:
 
         </Children>
       </WidgetGroup><!-- /Spacer for mixer, VU meter, pitch fader, Cover Art -->
-      
+
       <WidgetGroup><!-- right deck buttons  -->
         <ObjectName>SizeTest2</ObjectName>
         <Layout>horizontal</Layout>
diff --git a/res/skins/Tango/spacer_center.xml b/res/skins/Tango/helpers/spacer_center.xml
similarity index 100%
rename from res/skins/Tango/spacer_center.xml
rename to res/skins/Tango/helpers/spacer_center.xml
diff --git a/res/skins/Tango/library.xml b/res/skins/Tango/library.xml
index b5510d289277..d9c11faa9a08 100644
--- a/res/skins/Tango/library.xml
+++ b/res/skins/Tango/library.xml
@@ -43,7 +43,7 @@ Description:
                 <!-- minSize so that 8 Preview HotCues fit nicely, 23+1px each -->
                 <Size>159min,74me</Size>
                 <Children>
-                  <Template src="skin:preview_deck.xml"/>
+                  <Template src="skin:../Tango/decks/preview_deck.xml"/>
 
                   <WidgetGroup>
                     <Size>1me,5f</Size>
@@ -79,7 +79,7 @@ Description:
                                 <Layout>horizontal</Layout>
                                 <Size>19f,15min</Size>
                                 <Children>
-                                  <Template src="skin:button_2state_persist.xml">
+                                  <Template src="skin:../Tango/controls/button_2state_persist.xml">
                                     <SetVariable name="ObjectName">LibMiniMaxiButton</SetVariable>
                                     <SetVariable name="Size">19f,15f</SetVariable>
                                     <SetVariable name="ConfigKey">[Master],maximize_library</SetVariable>
diff --git a/res/skins/Tango/mic_aux_rack.xml b/res/skins/Tango/mic_aux_rack.xml
index 480d8b802d9e..4ceebecb1b66 100644
--- a/res/skins/Tango/mic_aux_rack.xml
+++ b/res/skins/Tango/mic_aux_rack.xml
@@ -26,36 +26,36 @@ Description:
 
               <WidgetGroup><Size>5f,0min</Size></WidgetGroup>
 
-              <Template src="skin:mic_unit.xml">
+              <Template src="skin:../Tango/mic_aux_sampler/mic_unit.xml">
                 <SetVariable name="micLabel">1</SetVariable>
               </Template>
-              <Template src="skin:mic_unit_unconfigured.xml">
+              <Template src="skin:../Tango/mic_aux_sampler/mic_unit_unconfigured.xml">
                 <SetVariable name="micLabel">1</SetVariable>
               </Template>
 
-              <Template src="skin:mic_unit.xml">
+              <Template src="skin:../Tango/mic_aux_sampler/mic_unit.xml">
                 <SetVariable name="micLabel">2</SetVariable>
                 <SetVariable name="micNum">2</SetVariable>
               </Template>
-              <Template src="skin:mic_unit_unconfigured.xml">
+              <Template src="skin:../Tango/mic_aux_sampler/mic_unit_unconfigured.xml">
                 <SetVariable name="micLabel">2</SetVariable>
                 <SetVariable name="micNum">2</SetVariable>
               </Template>
 
-              <Template src="skin:mic_unit.xml">
+              <Template src="skin:../Tango/mic_aux_sampler/mic_unit.xml">
                 <SetVariable name="micLabel">3</SetVariable>
                 <SetVariable name="micNum">3</SetVariable>
               </Template>
-              <Template src="skin:mic_unit_unconfigured.xml">
+              <Template src="skin:../Tango/mic_aux_sampler/mic_unit_unconfigured.xml">
                 <SetVariable name="micLabel">3</SetVariable>
                 <SetVariable name="micNum">3</SetVariable>
               </Template>
 
-              <Template src="skin:mic_unit.xml">
+              <Template src="skin:../Tango/mic_aux_sampler/mic_unit.xml">
                 <SetVariable name="micLabel">4</SetVariable>
                 <SetVariable name="micNum">4</SetVariable>
               </Template>
-              <Template src="skin:mic_unit_unconfigured.xml">
+              <Template src="skin:../Tango/mic_aux_sampler/mic_unit_unconfigured.xml">
                 <SetVariable name="micLabel">4</SetVariable>
                 <SetVariable name="micNum">4</SetVariable>
               </Template>
@@ -71,7 +71,7 @@ Description:
                     <Size>22f,33f</Size>
                   </Label>
 
-                  <Template src="skin:button_3state_persist.xml">
+                  <Template src="skin:../Tango/controls/button_3state_persist.xml">
                     <SetVariable name="ObjectName">MicDuckingButton</SetVariable>
                     <SetVariable name="Size">42f,24f</SetVariable>
                     <SetVariable name="TooltipId">talkover_duck_mode</SetVariable>
@@ -83,7 +83,7 @@ Description:
 
                   <WidgetGroup><Size>2f,1min</Size></WidgetGroup>
 
-                  <Template src="skin:knob_textless.xml">
+                  <Template src="skin:../Tango/controls/knob_textless.xml">
                     <SetVariable name="TooltipId">talkover_duck_strength</SetVariable>
                     <SetVariable name="ObjectName">MicAuxKnob</SetVariable>
                     <SetVariable name="Size">30f,30f</SetVariable>
@@ -120,31 +120,31 @@ Description:
                 <Size>5f,0me</Size>
               </WidgetGroup>
 
-              <Template src="skin:aux_unit.xml">
+              <Template src="skin:../Tango/mic_aux_sampler/aux_unit.xml">
                 <SetVariable name="auxNum">1</SetVariable>
               </Template>
-              <Template src="skin:aux_unit_unconfigured.xml">
+              <Template src="skin:../Tango/mic_aux_sampler/aux_unit_unconfigured.xml">
                 <SetVariable name="auxNum">1</SetVariable>
               </Template>
 
-              <Template src="skin:aux_unit.xml">
+              <Template src="skin:../Tango/mic_aux_sampler/aux_unit.xml">
                 <SetVariable name="auxNum">2</SetVariable>
               </Template>
-              <Template src="skin:aux_unit_unconfigured.xml">
+              <Template src="skin:../Tango/mic_aux_sampler/aux_unit_unconfigured.xml">
                 <SetVariable name="auxNum">2</SetVariable>
               </Template>
 
-              <Template src="skin:aux_unit.xml">
+              <Template src="skin:../Tango/mic_aux_sampler/aux_unit.xml">
                 <SetVariable name="auxNum">3</SetVariable>
               </Template>
-              <Template src="skin:aux_unit_unconfigured.xml">
+              <Template src="skin:../Tango/mic_aux_sampler/aux_unit_unconfigured.xml">
                 <SetVariable name="auxNum">3</SetVariable>
               </Template>
 
-              <Template src="skin:aux_unit.xml">
+              <Template src="skin:../Tango/mic_aux_sampler/aux_unit.xml">
                 <SetVariable name="auxNum">4</SetVariable>
               </Template>
-              <Template src="skin:aux_unit_unconfigured.xml">
+              <Template src="skin:../Tango/mic_aux_sampler/aux_unit_unconfigured.xml">
                 <SetVariable name="auxNum">4</SetVariable>
               </Template>
 
diff --git a/res/skins/Tango/aux_unit.xml b/res/skins/Tango/mic_aux_sampler/aux_unit.xml
similarity index 88%
rename from res/skins/Tango/aux_unit.xml
rename to res/skins/Tango/mic_aux_sampler/aux_unit.xml
index a3bff95f6b33..ff149326f8d0 100644
--- a/res/skins/Tango/aux_unit.xml
+++ b/res/skins/Tango/mic_aux_sampler/aux_unit.xml
@@ -34,7 +34,7 @@ Variables:
             <Alignment>right</Alignment>
           </Label>
 
-          <Template src="skin:button_2state.xml">
+          <Template src="skin:../Tango/controls/button_2state.xml">
             <SetVariable name="TooltipId">master_enable</SetVariable>
             <SetVariable name="ObjectName">AuxEnable</SetVariable>
             <SetVariable name="Size">20f,29f</SetVariable>
@@ -43,13 +43,13 @@ Variables:
 
           <WidgetGroup><Size>3f,1min</Size></WidgetGroup>
 
-          <Template src="skin:vumeter_mini.xml">
+          <Template src="skin:../Tango/mixer/vumeter_mini.xml">
             <SetVariable name="Size">5f,29f</SetVariable>
           </Template>
 
           <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
-          <Template src="skin:knob_textless.xml">
+          <Template src="skin:../Tango/controls/knob_textless.xml">
             <SetVariable name="TooltipId">auxiliary_pregain</SetVariable>
             <SetVariable name="ObjectName">MicAuxKnob</SetVariable>
             <SetVariable name="Size">28f,28f</SetVariable>
@@ -70,8 +70,8 @@ Variables:
                 <Layout>stacked</Layout>
                 <Children>
                   <!-- Greyed out if no headphone device is configured -->
-                  <Template src="skin:pfl_cover.xml"/>
-                  <Template src="skin:button_2state.xml">
+                  <Template src="skin:../Tango/helpers/pfl_cover.xml"/>
+                  <Template src="skin:../Tango/controls/button_2state.xml">
                     <SetVariable name="TooltipId">pfl</SetVariable>
                     <SetVariable name="ObjectName">PflButton</SetVariable>
                     <SetVariable name="Size">18f,18f</SetVariable>
@@ -82,7 +82,7 @@ Variables:
                 </Children>
               </WidgetGroup><!-- /Pfl button + cover -->
 
-              <Template src="skin:button_3state_persist.xml">
+              <Template src="skin:../Tango/controls/button_3state_persist.xml">
                 <SetVariable name="TooltipId">orientation</SetVariable>
                 <SetVariable name="ObjectName">AuxXfaderButton</SetVariable>
                 <SetVariable name="Size">18f,15f</SetVariable>
@@ -108,12 +108,12 @@ Variables:
                 <Layout>vertical</Layout>
                 <SizePolicy>min,min</SizePolicy>
                 <Children>
-                  <Template src="skin:fx_assign_button.xml">
+                  <Template src="skin:../Tango/fx/assign_button.xml">
                     <SetVariable name="Size">26f,16f</SetVariable>
                     <SetVariable name="FxUnit">1</SetVariable>
                   </Template>
                     <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
-                  <Template src="skin:fx_assign_button.xml">
+                  <Template src="skin:../Tango/fx/assign_button.xml">
                     <SetVariable name="Size">26f,16f</SetVariable>
                     <SetVariable name="FxUnit">3</SetVariable>
                   </Template>
@@ -126,12 +126,12 @@ Variables:
                 <Layout>vertical</Layout>
                 <SizePolicy>min,min</SizePolicy>
                 <Children>
-                  <Template src="skin:fx_assign_button.xml">
+                  <Template src="skin:../Tango/fx/assign_button.xml">
                     <SetVariable name="Size">26f,16f</SetVariable>
                     <SetVariable name="FxUnit">2</SetVariable>
                   </Template>
                     <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
-                  <Template src="skin:fx_assign_button.xml">
+                  <Template src="skin:../Tango/fx/assign_button.xml">
                     <SetVariable name="Size">26f,16f</SetVariable>
                     <SetVariable name="FxUnit">4</SetVariable>
                   </Template>
diff --git a/res/skins/Tango/aux_unit_unconfigured.xml b/res/skins/Tango/mic_aux_sampler/aux_unit_unconfigured.xml
similarity index 96%
rename from res/skins/Tango/aux_unit_unconfigured.xml
rename to res/skins/Tango/mic_aux_sampler/aux_unit_unconfigured.xml
index 759e25c5739b..604fae09d2f1 100644
--- a/res/skins/Tango/aux_unit_unconfigured.xml
+++ b/res/skins/Tango/mic_aux_sampler/aux_unit_unconfigured.xml
@@ -37,7 +37,7 @@ Variables:
             <Layout>vertical</Layout>
             <Size>20f,28f</Size>
             <Children>
-              <Template src="skin:button_1state.xml">
+              <Template src="skin:../Tango/controls/button_1state.xml">
                 <SetVariable name="TooltipId">configure_input</SetVariable>
                 <SetVariable name="ObjectName">MicAuxAdd</SetVariable>
                 <SetVariable name="Size">20f,20f</SetVariable>
diff --git a/res/skins/Tango/mic_unit.xml b/res/skins/Tango/mic_aux_sampler/mic_unit.xml
similarity index 88%
rename from res/skins/Tango/mic_unit.xml
rename to res/skins/Tango/mic_aux_sampler/mic_unit.xml
index 4a7687b54823..8ac8ae1c76f7 100644
--- a/res/skins/Tango/mic_unit.xml
+++ b/res/skins/Tango/mic_aux_sampler/mic_unit.xml
@@ -37,7 +37,7 @@ Variables:
             <Alignment>right</Alignment>
           </Label>
 
-          <Template src="skin:button_2state.xml">
+          <Template src="skin:../Tango/controls/button_2state.xml">
             <SetVariable name="TooltipId">microphone_talkover</SetVariable>
             <SetVariable name="ObjectName">MicTalkover</SetVariable>
             <SetVariable name="Size">20f,29f</SetVariable>
@@ -46,14 +46,14 @@ Variables:
 
           <WidgetGroup><Size>3f,1min</Size></WidgetGroup>
 
-          <Template src="skin:vumeter_mini.xml">
+          <Template src="skin:../Tango/mixer/vumeter_mini.xml">
             <SetVariable name="TooltipId">microphone_VuMeter</SetVariable>
             <SetVariable name="Size">5f,29f</SetVariable>
           </Template>
 
           <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
-          <Template src="skin:knob_textless.xml">
+          <Template src="skin:../Tango/controls/knob_textless.xml">
             <SetVariable name="TooltipId">microphone_pregain</SetVariable>
             <SetVariable name="ObjectName">MicAuxKnob</SetVariable>
             <SetVariable name="Size">30f,30f</SetVariable>
@@ -69,8 +69,8 @@ Variables:
             <Layout>stacked</Layout>
             <Children>
               <!-- Greyed out if no headphone device is configured -->
-              <Template src="skin:pfl_cover.xml"/>
-              <Template src="skin:button_2state.xml">
+              <Template src="skin:../Tango/helpers/pfl_cover.xml"/>
+              <Template src="skin:../Tango/controls/button_2state.xml">
                 <SetVariable name="TooltipId">pfl</SetVariable>
                 <SetVariable name="ObjectName">PflButton</SetVariable>
                 <SetVariable name="Size">20f,20f</SetVariable>
@@ -95,12 +95,12 @@ Variables:
                 <Layout>vertical</Layout>
                 <SizePolicy>min,min</SizePolicy>
                 <Children>
-                  <Template src="skin:fx_assign_button.xml">
+                  <Template src="skin:../Tango/fx/assign_button.xml">
                     <SetVariable name="Size">26f,16f</SetVariable>
                     <SetVariable name="FxUnit">1</SetVariable>
                   </Template>
                     <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
-                  <Template src="skin:fx_assign_button.xml">
+                  <Template src="skin:../Tango/fx/assign_button.xml">
                     <SetVariable name="Size">26f,16f</SetVariable>
                     <SetVariable name="FxUnit">3</SetVariable>
                   </Template>
@@ -113,12 +113,12 @@ Variables:
                 <Layout>vertical</Layout>
                 <SizePolicy>min,min</SizePolicy>
                 <Children>
-                  <Template src="skin:fx_assign_button.xml">
+                  <Template src="skin:../Tango/fx/assign_button.xml">
                     <SetVariable name="Size">26f,16f</SetVariable>
                     <SetVariable name="FxUnit">2</SetVariable>
                   </Template>
                     <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
-                  <Template src="skin:fx_assign_button.xml">
+                  <Template src="skin:../Tango/fx/assign_button.xml">
                     <SetVariable name="Size">26f,16f</SetVariable>
                     <SetVariable name="FxUnit">4</SetVariable>
                   </Template>
diff --git a/res/skins/Tango/mic_unit_unconfigured.xml b/res/skins/Tango/mic_aux_sampler/mic_unit_unconfigured.xml
similarity index 96%
rename from res/skins/Tango/mic_unit_unconfigured.xml
rename to res/skins/Tango/mic_aux_sampler/mic_unit_unconfigured.xml
index a54b91aa05ce..7d4d39f6817d 100644
--- a/res/skins/Tango/mic_unit_unconfigured.xml
+++ b/res/skins/Tango/mic_aux_sampler/mic_unit_unconfigured.xml
@@ -38,7 +38,7 @@ Variables:
             <Layout>vertical</Layout>
             <Size>20f,28f</Size>
             <Children>
-              <Template src="skin:button_1state.xml">
+              <Template src="skin:../Tango/controls/button_1state.xml">
                 <SetVariable name="TooltipId">configure_input</SetVariable>
                 <SetVariable name="ObjectName">MicAuxAdd</SetVariable>
                 <SetVariable name="Size">20f,20f</SetVariable>
diff --git a/res/skins/Tango/sampler.xml b/res/skins/Tango/mic_aux_sampler/sampler.xml
similarity index 90%
rename from res/skins/Tango/sampler.xml
rename to res/skins/Tango/mic_aux_sampler/sampler.xml
index 3713ac745ab3..315cda6dccf0 100644
--- a/res/skins/Tango/sampler.xml
+++ b/res/skins/Tango/mic_aux_sampler/sampler.xml
@@ -17,7 +17,7 @@ Variables:
       <WidgetGroup>
         <Layout>stacked</Layout>
         <Children>
-          <Template src="skin:button_2state_right_display.xml">
+          <Template src="skin:../Tango/controls/button_2state_right_display.xml">
             <SetVariable name="ObjectName">PlayCue</SetVariable>
             <SetVariable name="TooltipId">cue_gotoandplay_cue_default</SetVariable>
             <SetVariable name="Size">34f,34f</SetVariable>
@@ -28,7 +28,7 @@ Variables:
             <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,play_latched</SetVariable>
           </Template>
           <!-- Preview indicator, indicates previewing from Cue or Hotcue -->
-          <Template src="skin:button_2state.xml">
+          <Template src="skin:../Tango/controls/button_2state.xml">
             <SetVariable name="ObjectName">PreviewIndicator</SetVariable>
             <SetVariable name="Size">34f,34f</SetVariable>
             <SetVariable name="ConfigKey"><Variable name="group"/>,play</SetVariable>
@@ -38,7 +38,7 @@ Variables:
             <ObjectName>SamplerCover</ObjectName>
             <Size>34f,34f</Size>
             <Group><Variable name="group"/></Group>
-            <DefaultCover>graphics/blank_1x1.svg</DefaultCover>
+            <DefaultCover>skin:../Tango/graphics/blank_1x1.svg</DefaultCover>
           </CoverArt>
         </Children>
       </WidgetGroup>
@@ -90,8 +90,8 @@ Variables:
                   <KnobComposed>
                     <TooltipId>pregain</TooltipId>
                     <Size>24f,20f</Size>
-                    <Knob>knobs_sliders/knob_tiny_red.svg</Knob>
-                    <BackPath>knobs_sliders/knob_bg.svg</BackPath>
+                    <Knob>skin:../Tango/knobs_sliders/knob_tiny_red.svg</Knob>
+                    <BackPath>skin:../Tango/knobs_sliders/knob_bg.svg</BackPath>
                     <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
                     <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
                     <KnobCenterYOffset>1.364</KnobCenterYOffset>
@@ -112,7 +112,7 @@ Variables:
                 <Property>durationFormatted</Property>
               </TrackProperty>
 
-              <Template src="skin:button_3state.xml">
+              <Template src="skin:../Tango/controls/button_3state.xml">
                 <SetVariable name="TooltipId">orientation</SetVariable>
                 <SetVariable name="ObjectName">SamplerButton</SetVariable>
                 <SetVariable name="Size">16f,16f</SetVariable>
@@ -124,7 +124,7 @@ Variables:
 
               <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
 
-              <Template src="skin:button_1state_right.xml">
+              <Template src="skin:../Tango/controls/button_1state_right.xml">
                 <SetVariable name="TooltipId">beatsync_beatsync_tempo</SetVariable>
                 <SetVariable name="ObjectName">SamplerSyncButton</SetVariable>
                 <SetVariable name="Size">18f,18f</SetVariable>
@@ -225,7 +225,7 @@ Variables:
 
                   <WidgetGroup><Size>1f,0min</Size></WidgetGroup>
 
-                  <Template src="skin:vumeter_mini.xml">
+                  <Template src="skin:../Tango/mixer/vumeter_mini.xml">
                     <SetVariable name="Size">6f,1me</SetVariable>
                   </Template>
 
@@ -239,8 +239,8 @@ Variables:
             <ObjectName>SamplerPitchSlider</ObjectName>
             <TooltipId>rate</TooltipId>
             <Size>20f,54f</Size>
-            <Handle scalemode="STRETCH_ASPECT">knobs_sliders/pitch_sampler_handle.svg</Handle>
-            <Slider scalemode="STRETCH_ASPECT">knobs_sliders/pitch_sampler_scale.svg</Slider>
+            <Handle scalemode="STRETCH_ASPECT">skin:../Tango/knobs_sliders/pitch_sampler_handle.svg</Handle>
+            <Slider scalemode="STRETCH_ASPECT">skin:../Tango/knobs_sliders/pitch_sampler_scale.svg</Slider>
             <Horizontal>false</Horizontal>
             <Connection>
               <ConfigKey><Variable name="group"/>,rate</ConfigKey>
@@ -266,8 +266,8 @@ Variables:
               <KnobComposed>
                 <TooltipId>pregain</TooltipId>
                 <Size>24f,20f</Size>
-                <Knob>knobs_sliders/knob_tiny_red.svg</Knob>
-                <BackPath>knobs_sliders/knob_bg.svg</BackPath>
+                <Knob>skin:../Tango/knobs_sliders/knob_tiny_red.svg</Knob>
+                <BackPath>skin:../Tango/knobs_sliders/knob_bg.svg</BackPath>
                 <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
                 <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
                 <KnobCenterYOffset>1.364</KnobCenterYOffset>
@@ -283,8 +283,8 @@ Variables:
             <Layout>stacked</Layout>
             <Children>
               <!-- Greyed out if no headphone device is configured -->
-              <Template src="skin:pfl_cover.xml"/>
-              <Template src="skin:button_2state.xml">
+              <Template src="skin:../Tango/helpers/pfl_cover.xml"/>
+              <Template src="skin:../Tango/controls/button_2state.xml">
                 <SetVariable name="TooltipId">pfl</SetVariable>
                 <SetVariable name="ObjectName">PflButton</SetVariable>
                 <SetVariable name="Size">20f,20f</SetVariable>
@@ -297,7 +297,7 @@ Variables:
 
           <WidgetGroup><Size>0min,1min</Size></WidgetGroup>
 
-          <Template src="skin:button_2state.xml">
+          <Template src="skin:../Tango/controls/button_2state.xml">
             <SetVariable name="TooltipId">repeat</SetVariable>
             <SetVariable name="ObjectName">SamplerButton</SetVariable>
             <SetVariable name="Size">16f,16f</SetVariable>
@@ -306,7 +306,7 @@ Variables:
             <SetVariable name="ConfigKey"><Variable name="group"/>,repeat</SetVariable>
           </Template>
 
-          <Template src="skin:button_1state.xml">
+          <Template src="skin:../Tango/controls/button_1state.xml">
             <SetVariable name="TooltipId">eject</SetVariable>
             <SetVariable name="ObjectName">SamplerButton</SetVariable>
             <SetVariable name="Size">14f,16f</SetVariable>
@@ -315,7 +315,7 @@ Variables:
             <SetVariable name="ConfigKey"><Variable name="group"/>,eject</SetVariable>
           </Template>
 
-          <Template src="skin:button_2state.xml">
+          <Template src="skin:../Tango/controls/button_2state.xml">
             <SetVariable name="TooltipId">keylock</SetVariable>
             <SetVariable name="ObjectName">SamplerButton</SetVariable>
             <SetVariable name="Size">14f,16f</SetVariable>
@@ -324,7 +324,7 @@ Variables:
             <SetVariable name="ConfigKey"><Variable name="group"/>,keylock</SetVariable>
           </Template>
 
-          <Template src="skin:button_3state.xml">
+          <Template src="skin:../Tango/controls/button_3state.xml">
             <SetVariable name="TooltipId">orientation</SetVariable>
             <SetVariable name="ObjectName">SamplerButton</SetVariable>
             <SetVariable name="Size">16f,16f</SetVariable>
@@ -336,7 +336,7 @@ Variables:
 
           <WidgetGroup><Size>1min,1min</Size></WidgetGroup>
 
-          <Template src="skin:button_1state_right.xml">
+          <Template src="skin:../Tango/controls/button_1state_right.xml">
             <SetVariable name="TooltipId">beatsync_beatsync_tempo</SetVariable>
             <SetVariable name="ObjectName">SamplerSyncButton</SetVariable>
             <SetVariable name="Size">18f,18f</SetVariable>
@@ -350,7 +350,7 @@ Variables:
         </Children>
       </WidgetGroup><!-- /Sampler Buttons -->
 
-      <Template src="skin:hotcues_sampler_preview.xml"/>
+      <Template src="skin:../Tango/decks/hotcues_sampler_preview.xml"/>
 
     </Children>
     <Connection>
diff --git a/res/skins/Tango/sampler_row.xml b/res/skins/Tango/mic_aux_sampler/sampler_row.xml
similarity index 81%
rename from res/skins/Tango/sampler_row.xml
rename to res/skins/Tango/mic_aux_sampler/sampler_row.xml
index d8b6f84eb7c6..f8cc3fb18069 100644
--- a/res/skins/Tango/sampler_row.xml
+++ b/res/skins/Tango/mic_aux_sampler/sampler_row.xml
@@ -15,19 +15,19 @@ Variables:
         <SizePolicy>me,me</SizePolicy>
         <Children>
             <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-          <Template src="skin:sampler.xml">
+          <Template src="skin:../Tango/mic_aux_sampler/sampler.xml">
             <SetVariable name="samNum"><Variable name="sampler1"/></SetVariable>
           </Template>
             <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
-          <Template src="skin:sampler.xml">
+          <Template src="skin:../Tango/mic_aux_sampler/sampler.xml">
             <SetVariable name="samNum"><Variable name="sampler2"/></SetVariable>
           </Template>
             <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
-          <Template src="skin:sampler.xml">
+          <Template src="skin:../Tango/mic_aux_sampler/sampler.xml">
             <SetVariable name="samNum"><Variable name="sampler3"/></SetVariable>
           </Template>
             <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
-          <Template src="skin:sampler.xml">
+          <Template src="skin:../Tango/mic_aux_sampler/sampler.xml">
             <SetVariable name="samNum"><Variable name="sampler4"/></SetVariable>
           </Template>
         </Children>
@@ -45,7 +45,7 @@ Variables:
             <Layout>vertical</Layout>
             <Children>
               <WidgetGroup><Size>1min,3f</Size></WidgetGroup>
-              <Template src="skin:button_2state_persist.xml">
+              <Template src="skin:../Tango/controls/button_2state_persist.xml">
                 <SetVariable name="ObjectName">SamplersMiniMaxi</SetVariable>
                 <SetVariable name="Size">20f,30me</SetVariable>
                 <SetVariable name="ConfigKey">[Skin],sampler_row_<Variable name="row"/>_expanded</SetVariable>
@@ -63,19 +63,19 @@ Variables:
         <Layout>horizontal</Layout>
         <SizePolicy>me,me</SizePolicy>
         <Children>
-          <Template src="skin:sampler.xml">
+          <Template src="skin:../Tango/mic_aux_sampler/sampler.xml">
             <SetVariable name="samNum"><Variable name="sampler5"/></SetVariable>
           </Template>
             <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
-          <Template src="skin:sampler.xml">
+          <Template src="skin:../Tango/mic_aux_sampler/sampler.xml">
             <SetVariable name="samNum"><Variable name="sampler6"/></SetVariable>
           </Template>
             <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
-          <Template src="skin:sampler.xml">
+          <Template src="skin:../Tango/mic_aux_sampler/sampler.xml">
             <SetVariable name="samNum"><Variable name="sampler7"/></SetVariable>
           </Template>
             <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
-          <Template src="skin:sampler.xml">
+          <Template src="skin:../Tango/mic_aux_sampler/sampler.xml">
             <SetVariable name="samNum"><Variable name="sampler8"/></SetVariable>
           </Template>
         </Children>
diff --git a/res/skins/Tango/eq_knob_left.xml b/res/skins/Tango/mixer/eq_knob_left.xml
similarity index 94%
rename from res/skins/Tango/eq_knob_left.xml
rename to res/skins/Tango/mixer/eq_knob_left.xml
index 43bd43b94fcb..f3f862b2fcdf 100644
--- a/res/skins/Tango/eq_knob_left.xml
+++ b/res/skins/Tango/mixer/eq_knob_left.xml
@@ -27,7 +27,7 @@ Variables:
             <SizePolicy>min,min</SizePolicy>
             <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:fx_button.xml">
+              <Template src="skin:../Tango/fx/button.xml">
                 <SetVariable name="ObjectName">EQKillButton</SetVariable>
                 <SetVariable name="Size">12f,30f</SetVariable>
                 <SetVariable name="FxParameter">button_parameter<Variable name="FxParameter"/></SetVariable>
@@ -46,8 +46,8 @@ Variables:
             <Children>
               <EffectParameterKnobComposed>
                 <Size>30f,26f</Size>
-                <Knob>knobs_sliders/knob_white.svg</Knob>
-                <BackPath>knobs_sliders/knob_bg.svg</BackPath>
+                <Knob>skin:../Tango/knobs_sliders/knob_white.svg</Knob>
+                <BackPath>skin:../Tango/knobs_sliders/knob_bg.svg</BackPath>
                 <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
                 <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
                 <KnobCenterYOffset>2.000</KnobCenterYOffset>
@@ -56,7 +56,7 @@ Variables:
                 </Connection>
               </EffectParameterKnobComposed>
 
-              <Template src="skin:fx_button.xml">
+              <Template src="skin:../Tango/fx/button.xml">
                 <SetVariable name="ObjectName">EQKilledUnderlay</SetVariable>
                 <SetVariable name="Size">30f,26f</SetVariable>
                 <SetVariable name="FxParameter">button_parameter<Variable name="FxParameter"/></SetVariable>
diff --git a/res/skins/Tango/eq_knob_right.xml b/res/skins/Tango/mixer/eq_knob_right.xml
similarity index 94%
rename from res/skins/Tango/eq_knob_right.xml
rename to res/skins/Tango/mixer/eq_knob_right.xml
index 2fe2a27cae85..d64e2376883f 100644
--- a/res/skins/Tango/eq_knob_right.xml
+++ b/res/skins/Tango/mixer/eq_knob_right.xml
@@ -30,8 +30,8 @@ Variables:
               <EffectParameterKnobComposed>
                 <ObjectName>EQKnob</ObjectName>
                 <Size>30f,26f</Size>
-                <Knob>knobs_sliders/knob_white.svg</Knob>
-                <BackPath>knobs_sliders/knob_bg.svg</BackPath>
+                <Knob>skin:../Tango/knobs_sliders/knob_white.svg</Knob>
+                <BackPath>skin:../Tango/knobs_sliders/knob_bg.svg</BackPath>
                 <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
                 <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
                 <KnobCenterYOffset>2.000</KnobCenterYOffset>
@@ -40,7 +40,7 @@ Variables:
                 </Connection>
               </EffectParameterKnobComposed>
 
-              <Template src="skin:fx_button.xml">
+              <Template src="skin:../Tango/fx/button.xml">
                 <SetVariable name="ObjectName">EQKilledUnderlay</SetVariable>
                 <SetVariable name="Size">30f,26f</SetVariable>
                 <SetVariable name="FxParameter">button_parameter<Variable name="FxParameter"/></SetVariable>
@@ -53,7 +53,7 @@ Variables:
             <SizePolicy>min,min</SizePolicy>
             <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:fx_button.xml">
+              <Template src="skin:../Tango/fx/button.xml">
                 <SetVariable name="ObjectName">EQKillButton</SetVariable>
                 <SetVariable name="Size">12f,30f</SetVariable>
                 <SetVariable name="FxParameter">button_parameter<Variable name="FxParameter"/></SetVariable>
diff --git a/res/skins/Tango/mixer_channel_left.xml b/res/skins/Tango/mixer/mixer_channel_left.xml
similarity index 83%
rename from res/skins/Tango/mixer_channel_left.xml
rename to res/skins/Tango/mixer/mixer_channel_left.xml
index 072d792e8e10..ff8bac36bfe6 100644
--- a/res/skins/Tango/mixer_channel_left.xml
+++ b/res/skins/Tango/mixer/mixer_channel_left.xml
@@ -25,16 +25,16 @@ Variables:
         <SizePolicy>max,min</SizePolicy>
         <Children>
           <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
-          <Template src="skin:eq_knob_left.xml"><!-- High EQ -->
+          <Template src="skin:../Tango/mixer/eq_knob_left.xml"><!-- High EQ -->
             <SetVariable name="FxParameter">3</SetVariable>
           </Template>
-          <Template src="skin:eq_knob_left.xml"><!-- Mid EQ -->
+          <Template src="skin:../Tango/mixer/eq_knob_left.xml"><!-- Mid EQ -->
             <SetVariable name="FxParameter">2</SetVariable>
           </Template>
-          <Template src="skin:eq_knob_left.xml"><!-- Low EQ -->
+          <Template src="skin:../Tango/mixer/eq_knob_left.xml"><!-- Low EQ -->
             <SetVariable name="FxParameter">1</SetVariable>
           </Template>
-          <Template src="skin:quick_fx_knob_left.xml"/><!-- Quick Effect -->
+          <Template src="skin:../Tango/mixer/quick_fx_knob_left.xml"/><!-- Quick Effect -->
         </Children>
         <Connection>
           <ConfigKey persist="true">[Skin],show_eq_knobs</ConfigKey>
@@ -69,8 +69,8 @@ Variables:
             <Size>34f,103f</Size>
             <ObjectName>VolumeSlider</ObjectName>
             <TooltipId>channel_volume</TooltipId>
-            <Slider scalemode="STRETCH_ASPECT">knobs_sliders/volume_scale.svg</Slider>
-            <Handle scalemode="STRETCH_ASPECT">knobs_sliders/volume_handle.svg</Handle>
+            <Slider scalemode="STRETCH_ASPECT">skin:../Tango/knobs_sliders/volume_scale.svg</Slider>
+            <Handle scalemode="STRETCH_ASPECT">skin:../Tango/knobs_sliders/volume_handle.svg</Handle>
             <Horizontal>false</Horizontal>
             <Connection>
               <ConfigKey><Variable name="group"/>,volume</ConfigKey>
@@ -80,7 +80,7 @@ Variables:
           <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
 
           <!-- Gain knob, centered below Volume slider -->
-          <Template src="skin:knob_textless.xml">
+          <Template src="skin:../Tango/controls/knob_textless.xml">
             <SetVariable name="ObjectName">GainKnob</SetVariable>
             <SetVariable name="TooltipId">pregain</SetVariable>
             <SetVariable name="Size">34f,30f</SetVariable>
@@ -96,7 +96,7 @@ Variables:
         <ObjectName>AlignCenter</ObjectName>
         <Layout>vertical</Layout>
         <Children>
-          <Template src="skin:vumeter_mixer.xml"/>
+          <Template src="skin:../Tango/mixer/vumeter_mixer.xml"/>
 
           <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
 
@@ -106,8 +106,8 @@ Variables:
             <Layout>stacked</Layout>
             <Children>
               <!-- Greyed out if no headphone device is configured -->
-              <Template src="skin:pfl_cover.xml"/>
-              <Template src="skin:button_2state.xml">
+              <Template src="skin:../Tango/helpers/pfl_cover.xml"/>
+              <Template src="skin:../Tango/controls/button_2state.xml">
                 <SetVariable name="TooltipId">pfl</SetVariable>
                 <SetVariable name="ObjectName">PflButton</SetVariable>
                 <SetVariable name="Size">24f,24f</SetVariable>
diff --git a/res/skins/Tango/mixer_channel_right.xml b/res/skins/Tango/mixer/mixer_channel_right.xml
similarity index 83%
rename from res/skins/Tango/mixer_channel_right.xml
rename to res/skins/Tango/mixer/mixer_channel_right.xml
index 932a7ccd672c..d4191ccb0b1a 100644
--- a/res/skins/Tango/mixer_channel_right.xml
+++ b/res/skins/Tango/mixer/mixer_channel_right.xml
@@ -21,7 +21,7 @@ Variables:
         <ObjectName>AlignCenter</ObjectName>
         <Layout>vertical</Layout>
         <Children>
-          <Template src="skin:vumeter_mixer.xml"/>
+          <Template src="skin:../Tango/mixer/vumeter_mixer.xml"/>
             <WidgetGroup><Size>1min,5f</Size></WidgetGroup>
 
           <WidgetGroup><!-- Pfl button, isolated with a 'gap' -->
@@ -30,8 +30,8 @@ Variables:
             <Layout>stacked</Layout>
             <Children>
               <!-- Greyed out if no headphone device is configured -->
-              <Template src="skin:pfl_cover.xml"/>
-              <Template src="skin:button_2state.xml">
+              <Template src="skin:../Tango/helpers/pfl_cover.xml"/>
+              <Template src="skin:../Tango/controls/button_2state.xml">
                 <SetVariable name="TooltipId">pfl</SetVariable>
                 <SetVariable name="ObjectName">PflButton</SetVariable>
                 <SetVariable name="Size">24f,24f</SetVariable>
@@ -53,8 +53,8 @@ Variables:
             <Size>34f,103f</Size>
             <ObjectName>VolumeSlider</ObjectName>
             <TooltipId>channel_volume</TooltipId>
-            <Slider scalemode="STRETCH_ASPECT">knobs_sliders/volume_scale.svg</Slider>
-            <Handle scalemode="STRETCH_ASPECT">knobs_sliders/volume_handle.svg</Handle>
+            <Slider scalemode="STRETCH_ASPECT">skin:../Tango/knobs_sliders/volume_scale.svg</Slider>
+            <Handle scalemode="STRETCH_ASPECT">skin:../Tango/knobs_sliders/volume_handle.svg</Handle>
             <Horizontal>false</Horizontal>
             <Connection>
               <ConfigKey><Variable name="group"/>,volume</ConfigKey>
@@ -64,7 +64,7 @@ Variables:
           <WidgetGroup><Size>1min,0me</Size></WidgetGroup>
 
           <!-- Gain knob, centered below Volume slider -->
-          <Template src="skin:knob_textless.xml">
+          <Template src="skin:../Tango/controls/knob_textless.xml">
             <SetVariable name="ObjectName">GainKnob</SetVariable>
             <SetVariable name="TooltipId">pregain</SetVariable>
             <SetVariable name="Size">34f,30f</SetVariable>
@@ -99,16 +99,16 @@ Variables:
         <SizePolicy>max,min</SizePolicy>
         <Children>
           <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
-          <Template src="skin:eq_knob_right.xml"><!-- High EQ -->
+          <Template src="skin:../Tango/mixer/eq_knob_right.xml"><!-- High EQ -->
             <SetVariable name="FxParameter">3</SetVariable>
           </Template>
-          <Template src="skin:eq_knob_right.xml"><!-- Mid EQ -->
+          <Template src="skin:../Tango/mixer/eq_knob_right.xml"><!-- Mid EQ -->
             <SetVariable name="FxParameter">2</SetVariable>
           </Template>
-          <Template src="skin:eq_knob_right.xml"><!-- Low EQ -->
+          <Template src="skin:../Tango/mixer/eq_knob_right.xml"><!-- Low EQ -->
             <SetVariable name="FxParameter">1</SetVariable>
           </Template>
-          <Template src="skin:quick_fx_knob_right.xml"/><!-- Quick Effect -->
+          <Template src="skin:../Tango/mixer/quick_fx_knob_right.xml"/><!-- Quick Effect -->
         </Children>
         <Connection>
           <ConfigKey persist="true">[Skin],show_eq_knobs</ConfigKey>
diff --git a/res/skins/Tango/mixer_headphone.xml b/res/skins/Tango/mixer/mixer_headphone.xml
similarity index 88%
rename from res/skins/Tango/mixer_headphone.xml
rename to res/skins/Tango/mixer/mixer_headphone.xml
index 4994313b242c..6efbc241a1c2 100644
--- a/res/skins/Tango/mixer_headphone.xml
+++ b/res/skins/Tango/mixer/mixer_headphone.xml
@@ -54,8 +54,8 @@ Description:
                   <KnobComposed>
                     <TooltipId>headphone_gain</TooltipId>
                     <Size>26f,22f</Size>
-                    <Knob>knobs_sliders/knob_yellow.svg</Knob>
-                    <BackPath>knobs_sliders/knob_bg_head.svg</BackPath>
+                    <Knob>skin:../Tango/knobs_sliders/knob_yellow.svg</Knob>
+                    <BackPath>skin:../Tango/knobs_sliders/knob_bg_head.svg</BackPath>
                     <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
                     <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
                     <KnobCenterYOffset>2.000</KnobCenterYOffset>
@@ -69,15 +69,15 @@ Description:
                 <TooltipId>headMix</TooltipId>
                 <Size>54f,24f</Size>
                 <ObjectName>MixerbarSlider</ObjectName>
-                <Handle scalemode="STRETCH_ASPECT">knobs_sliders/headMix_handle.svg</Handle>
-                <Slider scalemode="STRETCH_ASPECT">knobs_sliders/headMix_scale.svg</Slider>
+                <Handle scalemode="STRETCH_ASPECT">skin:../Tango/knobs_sliders/headMix_handle.svg</Handle>
+                <Slider scalemode="STRETCH_ASPECT">skin:../Tango/knobs_sliders/headMix_scale.svg</Slider>
                 <Horizontal>true</Horizontal>
                 <Connection>
                   <ConfigKey>[Master],headMix</ConfigKey>
                 </Connection>
               </SliderComposed>
                 <WidgetGroup><Size>1f,1min</Size></WidgetGroup>
-              <Template src="skin:button_2state.xml">
+              <Template src="skin:../Tango/controls/button_2state.xml">
                 <SetVariable name="TooltipId">headSplit</SetVariable>
                 <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
                 <SetVariable name="Size">30f,22f</SetVariable>
diff --git a/res/skins/Tango/mixer_master.xml b/res/skins/Tango/mixer/mixer_master.xml
similarity index 81%
rename from res/skins/Tango/mixer_master.xml
rename to res/skins/Tango/mixer/mixer_master.xml
index 36ffea75325f..c14fff83ec34 100644
--- a/res/skins/Tango/mixer_master.xml
+++ b/res/skins/Tango/mixer/mixer_master.xml
@@ -21,8 +21,8 @@ Description:
           <KnobComposed>
             <TooltipId>master_gain</TooltipId>
             <Size>26f,22f</Size>
-            <Knob>knobs_sliders/knob_yellow.svg</Knob>
-            <BackPath>knobs_sliders/knob_bg_master.svg</BackPath>
+            <Knob>skin:../Tango/knobs_sliders/knob_yellow.svg</Knob>
+            <BackPath>skin:../Tango/knobs_sliders/knob_bg_master.svg</BackPath>
             <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
             <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
             <KnobCenterYOffset>2.000</KnobCenterYOffset>
@@ -41,8 +41,8 @@ Description:
           <KnobComposed>
             <TooltipId>booth_gain</TooltipId>
             <Size>26f,22f</Size>
-            <Knob>knobs_sliders/knob_yellow.svg</Knob>
-            <BackPath>knobs_sliders/knob_bg_booth.svg</BackPath>
+            <Knob>skin:../Tango/knobs_sliders/knob_yellow.svg</Knob>
+            <BackPath>skin:../Tango/knobs_sliders/knob_bg_booth.svg</BackPath>
             <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
             <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
             <KnobCenterYOffset>2.000</KnobCenterYOffset>
@@ -61,8 +61,8 @@ Description:
         <TooltipId>balance</TooltipId>
         <ObjectName>MixerbarSlider</ObjectName>
         <Size>48f,24f</Size>
-        <Handle scalemode="STRETCH_ASPECT">knobs_sliders/balance_handle.svg</Handle>
-        <Slider scalemode="STRETCH_ASPECT">knobs_sliders/balance_scale.svg</Slider>
+        <Handle scalemode="STRETCH_ASPECT">skin:../Tango/knobs_sliders/balance_handle.svg</Handle>
+        <Slider scalemode="STRETCH_ASPECT">skin:../Tango/knobs_sliders/balance_scale.svg</Slider>
         <Horizontal>true</Horizontal>
         <Connection>
           <ConfigKey>[Master],balance</ConfigKey>
@@ -82,10 +82,10 @@ Description:
             <Layout>vertical</Layout>
             <SizePolicy>min,min</SizePolicy>
             <Children>
-              <Template src="skin:fx_master_button.xml">
+              <Template src="skin:../Tango/fx/master_button.xml">
                 <SetVariable name="FxUnit">1</SetVariable>
               </Template>
-              <Template src="skin:fx_master_button.xml">
+              <Template src="skin:../Tango/fx/master_button.xml">
                 <SetVariable name="FxUnit">3</SetVariable>
               </Template>
             </Children>
@@ -96,10 +96,10 @@ Description:
             <Layout>vertical</Layout>
             <SizePolicy>min,min</SizePolicy>
             <Children>
-              <Template src="skin:fx_master_button.xml">
+              <Template src="skin:../Tango/fx/master_button.xml">
                 <SetVariable name="FxUnit">2</SetVariable>
               </Template>
-              <Template src="skin:fx_master_button.xml">
+              <Template src="skin:../Tango/fx/master_button.xml">
                 <SetVariable name="FxUnit">4</SetVariable>
               </Template>
             </Children>
diff --git a/res/skins/Tango/quick_fx_knob_left.xml b/res/skins/Tango/mixer/quick_fx_knob_left.xml
similarity index 93%
rename from res/skins/Tango/quick_fx_knob_left.xml
rename to res/skins/Tango/mixer/quick_fx_knob_left.xml
index 98b20a7bb152..9a6fd4be6c86 100644
--- a/res/skins/Tango/quick_fx_knob_left.xml
+++ b/res/skins/Tango/mixer/quick_fx_knob_left.xml
@@ -36,7 +36,7 @@ Variables:
                     <Size>12f,24f</Size>
                     <Layout>vertical</Layout>
                     <Children>
-                      <Template src="skin:button_2state.xml">
+                      <Template src="skin:../Tango/controls/button_2state.xml">
                         <SetVariable name="TooltipId">QuickEffectRack_enabled</SetVariable>
                         <SetVariable name="ObjectName">QuickFXButton</SetVariable>
                         <SetVariable name="Size">12f,24f</SetVariable>
@@ -63,8 +63,8 @@ Variables:
                   <KnobComposed>
                     <TooltipId>QuickEffectRack_super1</TooltipId>
                     <Size>30f,26f</Size>
-                    <Knob>knobs_sliders/knob_blue.svg</Knob>
-                    <BackPath>knobs_sliders/knob_bg.svg</BackPath>
+                    <Knob>skin:../Tango/knobs_sliders/knob_blue.svg</Knob>
+                    <BackPath>skin:../Tango/knobs_sliders/knob_bg.svg</BackPath>
                     <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
                     <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
                     <KnobCenterYOffset>2.000</KnobCenterYOffset>
@@ -73,14 +73,14 @@ Variables:
                     </Connection>
                   </KnobComposed>
 
-                  <Template src="skin:button_2state.xml">
+                  <Template src="skin:../Tango/controls/button_2state.xml">
                     <SetVariable name="ObjectName">QuickFxDisabledUnderlay</SetVariable>
                     <SetVariable name="Size">30f,26f</SetVariable>
                     <SetVariable name="ConfigKey"><Variable name="QuickFx"/>,enabled</SetVariable>
                   </Template>
                 </Children>
               </WidgetGroup>
-              
+
             </Children>
           </WidgetGroup>
 
@@ -95,7 +95,7 @@ Variables:
                 <Size>30f,16f</Size>
                 <Layout>vertical</Layout>
                 <Children>
-                  <Template src="skin:button_2state.xml">
+                  <Template src="skin:../Tango/controls/button_2state.xml">
                     <SetVariable name="TooltipId">QuickEffectRack_enabled</SetVariable>
                     <SetVariable name="ObjectName">QuickFXButton</SetVariable>
                     <SetVariable name="Size">24f,12f</SetVariable>
@@ -122,7 +122,7 @@ Variables:
             <SizePolicy>min,me</SizePolicy>
             <Layout>vertical</Layout>
             <Children>
-              <Template src="skin:button_2state.xml">
+              <Template src="skin:../Tango/controls/button_2state.xml">
                 <SetVariable name="TooltipId">QuickEffectRack_enabled</SetVariable>
                 <SetVariable name="ObjectName">QuickFXButton</SetVariable>
                 <SetVariable name="Size">24f,12f</SetVariable>
diff --git a/res/skins/Tango/quick_fx_knob_right.xml b/res/skins/Tango/mixer/quick_fx_knob_right.xml
similarity index 93%
rename from res/skins/Tango/quick_fx_knob_right.xml
rename to res/skins/Tango/mixer/quick_fx_knob_right.xml
index e0e783e4fda8..cf86ed3eafd9 100644
--- a/res/skins/Tango/quick_fx_knob_right.xml
+++ b/res/skins/Tango/mixer/quick_fx_knob_right.xml
@@ -32,8 +32,8 @@ Variables:
                   <KnobComposed>
                     <TooltipId>QuickEffectRack_super1</TooltipId>
                     <Size>30f,26f</Size>
-                    <Knob>knobs_sliders/knob_blue.svg</Knob>
-                    <BackPath>knobs_sliders/knob_bg.svg</BackPath>
+                    <Knob>skin:../Tango/knobs_sliders/knob_blue.svg</Knob>
+                    <BackPath>skin:../Tango/knobs_sliders/knob_bg.svg</BackPath>
                     <MinAngle><Variable name="PotiMinAngle"/></MinAngle>
                     <MaxAngle><Variable name="PotiMaxAngle"/></MaxAngle>
                     <KnobCenterYOffset>2.000</KnobCenterYOffset>
@@ -42,7 +42,7 @@ Variables:
                     </Connection>
                   </KnobComposed>
 
-                  <Template src="skin:button_2state.xml">
+                  <Template src="skin:../Tango/controls/button_2state.xml">
                     <SetVariable name="ObjectName">QuickFxDisabledUnderlay</SetVariable>
                     <SetVariable name="Size">30f,26f</SetVariable>
                     <SetVariable name="ConfigKey"><Variable name="QuickFx"/>,enabled</SetVariable>
@@ -62,7 +62,7 @@ Variables:
                     <Size>12f,24f</Size>
                     <Layout>vertical</Layout>
                     <Children>
-                      <Template src="skin:button_2state.xml">
+                      <Template src="skin:../Tango/controls/button_2state.xml">
                         <SetVariable name="TooltipId">QuickEffectRack_enabled</SetVariable>
                         <SetVariable name="ObjectName">QuickFXButton</SetVariable>
                         <SetVariable name="Size">12f,24f</SetVariable>
@@ -80,7 +80,7 @@ Variables:
                   <BindProperty>visible</BindProperty>
                 </Connection>
               </WidgetGroup>
-              
+
             </Children>
           </WidgetGroup>
 
@@ -95,7 +95,7 @@ Variables:
                 <Size>30f,16f</Size>
                 <Layout>vertical</Layout>
                 <Children>
-                  <Template src="skin:button_2state.xml">
+                  <Template src="skin:../Tango/controls/button_2state.xml">
                     <SetVariable name="TooltipId">QuickEffectRack_enabled</SetVariable>
                     <SetVariable name="ObjectName">QuickFXButton</SetVariable>
                     <SetVariable name="Size">24f,12f</SetVariable>
@@ -122,7 +122,7 @@ Variables:
             <SizePolicy>min,me</SizePolicy>
             <Layout>vertical</Layout>
             <Children>
-              <Template src="skin:button_2state.xml">
+              <Template src="skin:../Tango/controls/button_2state.xml">
                 <SetVariable name="TooltipId">QuickEffectRack_enabled</SetVariable>
                 <SetVariable name="ObjectName">QuickFXButton</SetVariable>
                 <SetVariable name="Size">24f,12f</SetVariable>
diff --git a/res/skins/Tango/vumeter_floating.xml b/res/skins/Tango/mixer/vumeter_floating.xml
similarity index 100%
rename from res/skins/Tango/vumeter_floating.xml
rename to res/skins/Tango/mixer/vumeter_floating.xml
diff --git a/res/skins/Tango/vumeter_master.xml b/res/skins/Tango/mixer/vumeter_master.xml
similarity index 99%
rename from res/skins/Tango/vumeter_master.xml
rename to res/skins/Tango/mixer/vumeter_master.xml
index 68bbb294fe4f..67ca779a4338 100644
--- a/res/skins/Tango/vumeter_master.xml
+++ b/res/skins/Tango/mixer/vumeter_master.xml
@@ -1,7 +1,7 @@
 <!--
 Description:
   Container for the master level meter, suiting various configurations.
-  
+
 Rendering the meters from SVGs makes the entire GUI very laggy on older Macs.
 Refer to https://bugs.launchpad.net/mixxx/+bug/1759433
 -->
diff --git a/res/skins/Tango/vumeter_mini.xml b/res/skins/Tango/mixer/vumeter_mini.xml
similarity index 71%
rename from res/skins/Tango/vumeter_mini.xml
rename to res/skins/Tango/mixer/vumeter_mini.xml
index 2e27c288addc..f3fa01e310dc 100644
--- a/res/skins/Tango/vumeter_mini.xml
+++ b/res/skins/Tango/mixer/vumeter_mini.xml
@@ -4,7 +4,7 @@ Description:
 Variables:
   group   : [MicrophoneN], [AuxiliaryN], [PerviewDeck]
   chanNum : channel number
-  
+
 Rendering the meters from SVGs makes the entire GUI very laggy on older Macs.
 Refer to https://bugs.launchpad.net/mixxx/+bug/1759433
 -->
@@ -15,15 +15,15 @@ Refer to https://bugs.launchpad.net/mixxx/+bug/1759433
     <Children>
       <StatusLight>
         <TooltipId><Variable name="sourceType"/>_VuMeter</TooltipId>
-        <PathStatusLight scalemode="STRETCH">skin:/graphics/vumeter_mini_clipping_over.png</PathStatusLight>
-        <PathBack scalemode="STRETCH">skin:/graphics/vumeter_mini_clipping.png</PathBack>
+        <PathStatusLight scalemode="STRETCH">skin:../Tango/graphics/vumeter_mini_clipping_over.png</PathStatusLight>
+        <PathBack scalemode="STRETCH">skin:../Tango/graphics/vumeter_mini_clipping.png</PathBack>
         <Connection>
           <ConfigKey><Variable name="group"/>,PeakIndicator</ConfigKey>
         </Connection>
       </StatusLight>
       <VuMeter>
-        <PathVu scalemode="STRETCH">skin:/graphics/vumeter_mini_level_over.png</PathVu>
-        <PathBack scalemode="STRETCH">skin:/graphics/vumeter_mini_level.png</PathBack>
+        <PathVu scalemode="STRETCH">skin:../Tango/graphics/vumeter_mini_level_over.png</PathVu>
+        <PathBack scalemode="STRETCH">skin:../Tango/graphics/vumeter_mini_level.png</PathBack>
         <Horizontal>false</Horizontal>
         <PeakHoldSize>5</PeakHoldSize>
         <PeakHoldTime>500</PeakHoldTime>
diff --git a/res/skins/Tango/vumeter_mixer.xml b/res/skins/Tango/mixer/vumeter_mixer.xml
similarity index 99%
rename from res/skins/Tango/vumeter_mixer.xml
rename to res/skins/Tango/mixer/vumeter_mixer.xml
index 9a2da987cb55..bcee4170ee3a 100644
--- a/res/skins/Tango/vumeter_mixer.xml
+++ b/res/skins/Tango/mixer/vumeter_mixer.xml
@@ -3,7 +3,7 @@ Description:
   VUMeter embedded in channel mixer.
 Variables:
   chanNum : channel number
-  
+
 Rendering the meters from SVGs makes the entire GUI very laggy on older Macs.
 Refer to https://bugs.launchpad.net/mixxx/+bug/1759433
 -->
diff --git a/res/skins/Tango/vumeter_single.xml b/res/skins/Tango/mixer/vumeter_single.xml
similarity index 78%
rename from res/skins/Tango/vumeter_single.xml
rename to res/skins/Tango/mixer/vumeter_single.xml
index 7e0fddf77dd0..2e4fa6f97654 100644
--- a/res/skins/Tango/vumeter_single.xml
+++ b/res/skins/Tango/mixer/vumeter_single.xml
@@ -25,15 +25,15 @@ Refer to https://bugs.launchpad.net/mixxx/+bug/1759433
             <Children>
               <StatusLight>
                 <TooltipId>master_VuMeterL</TooltipId>
-                <PathStatusLight>skin:/graphics/vumeter_clipping_over.png</PathStatusLight>
-                <PathBack>skin:/graphics/vumeter_clipping.png</PathBack>
+                <PathStatusLight>skin:../Tango/graphics/vumeter_clipping_over.png</PathStatusLight>
+                <PathBack>skin:../Tango/graphics/vumeter_clipping.png</PathBack>
                 <Connection>
                   <ConfigKey><Variable name="group"/>,PeakIndicatorL</ConfigKey>
                 </Connection>
               </StatusLight>
               <VuMeter>
-                <PathVu>skin:/graphics/vumeter_level_over.png</PathVu>
-                <PathBack>skin:/graphics/vumeter_level.png</PathBack>
+                <PathVu>skin:../Tango/graphics/vumeter_level_over.png</PathVu>
+                <PathBack>skin:../Tango/graphics/vumeter_level.png</PathBack>
                 <Horizontal>false</Horizontal>
                 <PeakHoldSize>4</PeakHoldSize>
                 <PeakHoldTime>800</PeakHoldTime>
@@ -51,15 +51,15 @@ Refer to https://bugs.launchpad.net/mixxx/+bug/1759433
             <Children>
               <StatusLight>
                 <TooltipId>master_VuMeterR</TooltipId>
-                <PathStatusLight>skin:/graphics/vumeter_clipping_over.png</PathStatusLight>
-                <PathBack>skin:/graphics/vumeter_clipping.png</PathBack>
+                <PathStatusLight>skin:../Tango/graphics/vumeter_clipping_over.png</PathStatusLight>
+                <PathBack>skin:../Tango/graphics/vumeter_clipping.png</PathBack>
                 <Connection>
                   <ConfigKey><Variable name="group"/>,PeakIndicatorR</ConfigKey>
                 </Connection>
               </StatusLight>
               <VuMeter>
-                <PathVu>skin:/graphics/vumeter_level_over.png</PathVu>
-                <PathBack>skin:/graphics/vumeter_level.png</PathBack>
+                <PathVu>skin:../Tango/graphics/vumeter_level_over.png</PathVu>
+                <PathBack>skin:../Tango/graphics/vumeter_level.png</PathBack>
                 <Horizontal>false</Horizontal>
                 <PeakHoldSize>4</PeakHoldSize>
                 <PeakHoldTime>800</PeakHoldTime>
diff --git a/res/skins/Tango/preview_headmixer_cover.xml b/res/skins/Tango/preview_headmixer_cover.xml
deleted file mode 100644
index d7702e2a2e3d..000000000000
--- a/res/skins/Tango/preview_headmixer_cover.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-Description:
-  Covers Pfl buttons in decks, samplers, FX, Mic & Aux units
-  when no headphone device is configured.
-  Intention is to indicate the headphone device is lacking BEFORE
-  starting a live session instead of having to re-configure sound
-  devices DURING a session and producing a playback gap.
--->
-<Template>
-  <WidgetGroup>
-    <ObjectName>GuiCover</ObjectName>
-    <Layout>vertical</Layout>
-    <SizePolicy>min,min</SizePolicy>
-    <Children>
-      <Label>
-        <ObjectName>UnconfiguredHeadphoneText</ObjectName>
-        <SizePolicy>min,min</SizePolicy>
-        <Text>No Headphone</Text>
-      </Label>
-      <Label>
-        <ObjectName>UnconfiguredHeadphoneText</ObjectName>
-        <SizePolicy>min,min</SizePolicy>
-        <Text>device configured!</Text>
-      </Label>
-    </Children>
-    <Connection>
-      <ConfigKey>[Master],headEnabled</ConfigKey>
-      <BindProperty>visible</BindProperty>
-      <Transform><Not/></Transform>
-    </Connection>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/Tango/sampler_rack.xml b/res/skins/Tango/sampler_rack.xml
index b4901fff93f1..3f8849f13ab5 100644
--- a/res/skins/Tango/sampler_rack.xml
+++ b/res/skins/Tango/sampler_rack.xml
@@ -7,7 +7,7 @@
   <SingletonDefinition>
     <ObjectName>SamplerRow1</ObjectName>
     <Children>
-      <Template src="skin:sampler_row.xml">
+      <Template src="skin:../Tango/mic_aux_sampler/sampler_row.xml">
         <SetVariable name="row">1</SetVariable>
         <SetVariable name="sampler1">1</SetVariable>
         <SetVariable name="sampler2">2</SetVariable>
@@ -24,7 +24,7 @@
   <SingletonDefinition>
     <ObjectName>SamplerRow2</ObjectName>
     <Children>
-      <Template src="skin:sampler_row.xml">
+      <Template src="skin:../Tango/mic_aux_sampler/sampler_row.xml">
         <SetVariable name="row">2</SetVariable>
         <SetVariable name="sampler1">9</SetVariable>
         <SetVariable name="sampler2">10</SetVariable>
@@ -87,4 +87,3 @@
     </Connection>
   </WidgetGroup>
 </Template>
-
diff --git a/res/skins/Tango/skin.xml b/res/skins/Tango/skin.xml
index 8ea4e2920ae7..911a58862508 100644
--- a/res/skins/Tango/skin.xml
+++ b/res/skins/Tango/skin.xml
@@ -62,7 +62,7 @@
       <attribute persist="true" config_key="[Tango],symmetric_time">0</attribute>
       <attribute persist="true" config_key="[Tango],trackComment">1</attribute>
       <attribute persist="true" config_key="[Skin],show_loop_beatjump_controls">0</attribute>
-      <attribute persist="true" config_key="[Tango],loop_sizes">0</attribute>
+      <attribute persist="true" config_key="[Tango],decks/loop_sizes">0</attribute>
       <attribute persist="true" config_key="[Tango],deck_controls_expanded">0</attribute>
       <attribute persist="true" config_key="[Tango],always_visible_keylock">1</attribute>
       <attribute persist="true" config_key="[Tango],always_visible_eject">0</attribute>
@@ -137,7 +137,7 @@
         background-color: #0f0f0f;
       }
       QLabel {
-        image: url(skin:../Tango//graphics/logo_160x40.svg);
+        image: url(skin:../Tango/graphics/logo_160x40.svg);
         padding: 0;
         margin: 0px 2px 0px 2px;
         border: none;
@@ -197,7 +197,7 @@
     <SingletonDefinition>
       <ObjectName>DeckOverviewSingleton1</ObjectName>
       <Children>
-        <Template src="skin:../Tango/deck_overview.xml">
+        <Template src="skin:../Tango/decks/overview.xml">
           <SetVariable name="chanNum">1</SetVariable>
           <SetVariable name="SignalBgColor"><Variable name="SignalBgColor_12"/></SetVariable>
           <SetVariable name="SignalColor"><Variable name="SignalColor_12"/></SetVariable>
@@ -208,7 +208,7 @@
     <SingletonDefinition>
       <ObjectName>DeckOverviewSingleton2</ObjectName>
       <Children>
-        <Template src="skin:../Tango/deck_overview.xml">
+        <Template src="skin:../Tango/decks/overview.xml">
           <SetVariable name="chanNum">2</SetVariable>
           <SetVariable name="SignalBgColor"><Variable name="SignalBgColor_12"/></SetVariable>
           <SetVariable name="SignalColor"><Variable name="SignalColor_12"/></SetVariable>
@@ -219,7 +219,7 @@
     <SingletonDefinition>
       <ObjectName>DeckOverviewSingleton3</ObjectName>
       <Children>
-        <Template src="skin:../Tango/deck_overview.xml">
+        <Template src="skin:../Tango/decks/overview.xml">
           <SetVariable name="chanNum">3</SetVariable>
           <SetVariable name="SignalBgColor"><Variable name="SignalBgColor_34"/></SetVariable>
           <SetVariable name="SignalColor"><Variable name="SignalColor_34"/></SetVariable>
@@ -230,7 +230,7 @@
     <SingletonDefinition>
       <ObjectName>DeckOverviewSingleton4</ObjectName>
       <Children>
-        <Template src="skin:../Tango/deck_overview.xml">
+        <Template src="skin:../Tango/decks/overview.xml">
           <SetVariable name="chanNum">4</SetVariable>
           <SetVariable name="SignalBgColor"><Variable name="SignalBgColor_34"/></SetVariable>
           <SetVariable name="SignalColor"><Variable name="SignalColor_34"/></SetVariable>
@@ -241,7 +241,7 @@
     <SingletonDefinition>
       <ObjectName>SpinnyCoverMini_Singleton1</ObjectName>
       <Children>
-        <Template src="skin:../Tango/spinny_cover_mini.xml">
+        <Template src="skin:../Tango/decks/spinny_cover_mini.xml">
           <SetVariable name="chanNum">1</SetVariable>
           <SetVariable name="SpinnyCoverColor"><Variable name="SpinnyCoverColor_12"/></SetVariable>
         </Template>
@@ -251,7 +251,7 @@
     <SingletonDefinition>
       <ObjectName>SpinnyCoverMini_Singleton2</ObjectName>
       <Children>
-        <Template src="skin:../Tango/spinny_cover_mini.xml">
+        <Template src="skin:../Tango/decks/spinny_cover_mini.xml">
           <SetVariable name="chanNum">2</SetVariable>
           <SetVariable name="SpinnyCoverColor"><Variable name="SpinnyCoverColor_12"/></SetVariable>
         </Template>
@@ -261,7 +261,7 @@
     <SingletonDefinition>
       <ObjectName>SpinnyCoverMini_Singleton3</ObjectName>
       <Children>
-        <Template src="skin:../Tango/spinny_cover_mini.xml">
+        <Template src="skin:../Tango/decks/spinny_cover_mini.xml">
           <SetVariable name="chanNum">3</SetVariable>
           <SetVariable name="SpinnyCoverColor"><Variable name="SpinnyCoverColor_34"/></SetVariable>
         </Template>
@@ -271,7 +271,7 @@
     <SingletonDefinition>
       <ObjectName>SpinnyCoverMini_Singleton4</ObjectName>
       <Children>
-        <Template src="skin:../Tango/spinny_cover_mini.xml">
+        <Template src="skin:../Tango/decks/spinny_cover_mini.xml">
           <SetVariable name="chanNum">4</SetVariable>
           <SetVariable name="SpinnyCoverColor"><Variable name="SpinnyCoverColor_34"/></SetVariable>
         </Template>
@@ -281,7 +281,7 @@
     <SingletonDefinition>
       <ObjectName>VUMeterDeck1</ObjectName>
       <Children>
-        <Template src="skin:../Tango/vumeter_single.xml">
+        <Template src="skin:../Tango/mixer/vumeter_single.xml">
           <SetVariable name="group">[Channel1]</SetVariable>
         </Template>
       </Children>
@@ -290,7 +290,7 @@
     <SingletonDefinition>
       <ObjectName>VUMeterDeck2</ObjectName>
       <Children>
-        <Template src="skin:../Tango/vumeter_single.xml">
+        <Template src="skin:../Tango/mixer/vumeter_single.xml">
           <SetVariable name="group">[Channel2]</SetVariable>
         </Template>
       </Children>
@@ -299,7 +299,7 @@
     <SingletonDefinition>
       <ObjectName>VUMeterDeck3</ObjectName>
       <Children>
-        <Template src="skin:../Tango/vumeter_single.xml">
+        <Template src="skin:../Tango/mixer/vumeter_single.xml">
           <SetVariable name="group">[Channel3]</SetVariable>
         </Template>
       </Children>
@@ -308,7 +308,7 @@
     <SingletonDefinition>
       <ObjectName>VUMeterDeck4</ObjectName>
       <Children>
-        <Template src="skin:../Tango/vumeter_single.xml">
+        <Template src="skin:../Tango/mixer/vumeter_single.xml">
           <SetVariable name="group">[Channel4]</SetVariable>
         </Template>
       </Children>
@@ -327,7 +327,7 @@
               <MaximumSize>-1,136</MaximumSize>
               <SizePolicy>min,me</SizePolicy>
               <Children>
-                <Template src="skin:../Tango/vumeter_single.xml">
+                <Template src="skin:../Tango/mixer/vumeter_single.xml">
                   <SetVariable name="group">[Master]</SetVariable>
                 </Template>
                 <WidgetGroup><Size>0f,5f</Size></WidgetGroup>
@@ -484,7 +484,7 @@
                               </Connection>
                             </WidgetGroup>
 
-                            <Template src="skin:/sampler_rack.xml"/>
+                            <Template src="skin:../Tango/sampler_rack.xml"/>
 
                             <Template src="skin:../Tango/mic_aux_rack.xml"/>
 
@@ -512,10 +512,10 @@
                           <Layout>horizontal</Layout>
                           <SizePolicy>me,max</SizePolicy>
                           <Children>
-                            <Template src="skin:../Tango/deck_left_mini.xml">
+                            <Template src="skin:../Tango/decks/deck_left_mini.xml">
                               <SetVariable name="chanNum">1</SetVariable>
                             </Template>
-                            <Template src="skin:../Tango/deck_right_mini.xml">
+                            <Template src="skin:../Tango/decks/deck_right_mini.xml">
                               <SetVariable name="chanNum">2</SetVariable>
                             </Template>
                           </Children>
@@ -525,10 +525,10 @@
                           <Layout>horizontal</Layout>
                           <SizePolicy>me,max</SizePolicy>
                           <Children>
-                            <Template src="skin:../Tango/deck_left_mini.xml">
+                            <Template src="skin:../Tango/decks/deck_left_mini.xml">
                               <SetVariable name="chanNum">3</SetVariable>
                             </Template>
-                            <Template src="skin:../Tango/deck_right_mini.xml">
+                            <Template src="skin:../Tango/decks/deck_right_mini.xml">
                               <SetVariable name="chanNum">4</SetVariable>
                             </Template>
                           </Children>
@@ -552,14 +552,14 @@
               </Children>
             </WidgetGroup><!-- topbar + skin elements -->
 
-            <Template src="skin:skin_settings.xml"/>
+            <Template src="skin:../Tango/skin_settings.xml"/>
 
           </Children>
         </WidgetGroup><!-- visible skin + size settings menu -->
 
         <!-- Detect if Star rating fits into deck buttons row.
             Do this here, so it doesn't interfere with expanded skin menu -->
-        <Template src="skin:../Tango/size_detector_stars.xml"/>
+        <Template src="skin:../Tango/helpers/size_detector_stars.xml"/>
 
       </Children>
     </WidgetGroup>
diff --git a/res/skins/Tango/skin_settings.xml b/res/skins/Tango/skin_settings.xml
index a98e122f8429..7c3d1a6d24a7 100644
--- a/res/skins/Tango/skin_settings.xml
+++ b/res/skins/Tango/skin_settings.xml
@@ -53,17 +53,17 @@ Description:
             </Children>
           </WidgetGroup>
 
-          <Template src="skin:../Tango/skin_settings_button_2state.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
             <SetVariable name="text">4 Decks</SetVariable>
             <SetVariable name="Setting">[Skin],show_4decks</SetVariable>
           </Template>
 
-          <Template src="skin:../Tango/skin_settings_button_2state.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
             <SetVariable name="text">Symmetric Overviews</SetVariable>
             <SetVariable name="Setting">[Tango],symmetric_overviews</SetVariable>
           </Template>
 
-          <Template src="skin:../Tango/skin_settings_button_2state.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
             <SetVariable name="text">Symmetric Time/Duration</SetVariable>
             <SetVariable name="Setting">[Tango],symmetric_time</SetVariable>
           </Template>
@@ -80,7 +80,7 @@ Description:
             <SizePolicy>me,me</SizePolicy>
             <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:../Tango/skin_settings_button_2state.xml">
+              <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
                 <SetVariable name="text">Hotcue buttons</SetVariable>
                 <SetVariable name="width">135</SetVariable>
                 <SetVariable name="Setting">[Tango],hotcues</SetVariable>
@@ -109,13 +109,13 @@ Description:
                     <SizePolicy>me,me</SizePolicy>
                     <Layout>horizontal</Layout>
                     <Children>
-                      <Template src="skin:../Tango/skin_settings_button_multi.xml">
+                      <Template src="skin:../Tango/controls/skin_settings_button_multi.xml">
                         <SetVariable name="state_x_text">  4  </SetVariable>
                         <SetVariable name="width">20</SetVariable>
                         <SetVariable name="stateX">0</SetVariable>
                         <SetVariable name="Setting">[Skin],show_8_hotcues</SetVariable>
                       </Template>
-                      <Template src="skin:../Tango/skin_settings_button_multi.xml">
+                      <Template src="skin:../Tango/controls/skin_settings_button_multi.xml">
                         <SetVariable name="state_x_text">  8  </SetVariable>
                         <SetVariable name="width">20</SetVariable>
                         <SetVariable name="stateX">1</SetVariable>
@@ -129,22 +129,22 @@ Description:
             </Children>
           </WidgetGroup><!-- /HotCue settings -->
 
-          <Template src="skin:../Tango/skin_settings_button_2state.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
             <SetVariable name="text">Hotcue shift buttons</SetVariable>
             <SetVariable name="Setting">[Skin],timing_shift_buttons</SetVariable>
           </Template>
 
-          <Template src="skin:../Tango/skin_settings_button_2state.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
             <SetVariable name="text">Intro &amp; Outro Cues</SetVariable>
             <SetVariable name="Setting">[Skin],show_intro_outro_cues</SetVariable>
           </Template>
 
-          <Template src="skin:../Tango/skin_settings_button_2state.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
             <SetVariable name="text">Loop / Beatjump Buttons</SetVariable>
             <SetVariable name="Setting">[Skin],show_loop_beatjump_controls</SetVariable>
           </Template>
 
-          <Template src="skin:../Tango/skin_settings_button_2state.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
             <SetVariable name="text">Track Comment</SetVariable>
             <SetVariable name="Setting">[Tango],trackComment</SetVariable>
           </Template>
@@ -184,7 +184,7 @@ Description:
                         </Connection>
                       </WidgetGroup>
 
-                      <Template src="skin:../Tango/button_2state_persist.xml">
+                      <Template src="skin:../Tango/controls/button_2state_persist.xml">
                         <SetVariable name="ObjectName">DeckButtonVisibility</SetVariable>
                         <SetVariable name="Size">16f,15f</SetVariable>
                         <SetVariable name="state_0_icon">stars_hidden.svg</SetVariable>
@@ -196,7 +196,7 @@ Description:
 
                   <WidgetGroup><Size>6f,0f</Size></WidgetGroup>
 
-                  <Template src="skin:../Tango/button_2state_persist.xml"><!-- Keylock -->
+                  <Template src="skin:../Tango/controls/button_2state_persist.xml"><!-- Keylock -->
                     <SetVariable name="ObjectName">DeckButtonVisibility</SetVariable>
                     <SetVariable name="Size">16f,15f</SetVariable>
                     <SetVariable name="state_0_icon">keylock_off.svg</SetVariable>
@@ -204,7 +204,7 @@ Description:
                     <SetVariable name="ConfigKey">[Tango],always_visible_keylock</SetVariable>
                   </Template>
 
-                  <Template src="skin:../Tango/button_2state_persist.xml">
+                  <Template src="skin:../Tango/controls/button_2state_persist.xml">
                     <SetVariable name="ObjectName">DeckButtonVisibility</SetVariable>
                     <SetVariable name="Size">16f,15f</SetVariable>
                     <SetVariable name="state_0_icon">eject.svg</SetVariable>
@@ -212,7 +212,7 @@ Description:
                     <SetVariable name="ConfigKey">[Tango],always_visible_eject</SetVariable>
                   </Template>
 
-                  <Template src="skin:../Tango/button_2state_persist.xml">
+                  <Template src="skin:../Tango/controls/button_2state_persist.xml">
                     <SetVariable name="ObjectName">DeckButtonVisibility</SetVariable>
                     <SetVariable name="Size">16f,15f</SetVariable>
                     <SetVariable name="state_0_icon">slipmode_hidden.svg</SetVariable>
@@ -220,7 +220,7 @@ Description:
                     <SetVariable name="ConfigKey">[Tango],always_visible_slip_enabled</SetVariable>
                   </Template>
 
-                  <Template src="skin:../Tango/button_2state_persist.xml">
+                  <Template src="skin:../Tango/controls/button_2state_persist.xml">
                     <SetVariable name="ObjectName">DeckButtonVisibility</SetVariable>
                     <SetVariable name="Size">16f,15f</SetVariable>
                     <SetVariable name="state_0_icon">repeat_hidden.svg</SetVariable>
@@ -228,7 +228,7 @@ Description:
                     <SetVariable name="ConfigKey">[Tango],always_visible_repeat</SetVariable>
                   </Template>
 
-                  <Template src="skin:../Tango/button_2state_persist.xml">
+                  <Template src="skin:../Tango/controls/button_2state_persist.xml">
                     <SetVariable name="ObjectName">DeckButtonVisibility</SetVariable>
                     <SetVariable name="Size">16f,15f</SetVariable>
                     <SetVariable name="state_0_icon">xfader_center.svg</SetVariable>
@@ -236,7 +236,7 @@ Description:
                     <SetVariable name="ConfigKey">[Tango],always_visible_orientation</SetVariable>
                   </Template>
 
-                  <Template src="skin:../Tango/button_2state_persist.xml">
+                  <Template src="skin:../Tango/controls/button_2state_persist.xml">
                     <SetVariable name="ObjectName">DeckButtonVisibility</SetVariable>
                     <SetVariable name="Size">16f,15f</SetVariable>
                     <SetVariable name="state_0_icon">quantize_hidden.svg</SetVariable>
@@ -254,7 +254,7 @@ Description:
             <SizePolicy>me,min</SizePolicy>
           </WidgetGroup>
 
-          <Template src="skin:../Tango/skin_settings_button_2state.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
             <SetVariable name="text">BPM/Sync &amp; Pitch Fader</SetVariable>
             <SetVariable name="Setting">[Skin],show_rate_controls</SetVariable>
           </Template>
@@ -283,13 +283,13 @@ Description:
                 <Layout>vertical</Layout>
                 <Size>182f,0me</Size>
                 <Children>
-                  <Template src="skin:../Tango/skin_settings_button_2state.xml">
+                  <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
                     <SetVariable name="text">Key/Key Match</SetVariable>
                     <SetVariable name="width">182</SetVariable>
                     <SetVariable name="Setting">[Tango],key_display_match</SetVariable>
                   </Template>
 
-                  <Template src="skin:../Tango/skin_settings_button_2state.xml">
+                  <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
                     <SetVariable name="text">Rate/Key Adjustment Buttons</SetVariable>
                     <SetVariable name="width">182</SetVariable>
                     <SetVariable name="Setting">[Tango],rate_key_controls</SetVariable>
@@ -305,12 +305,12 @@ Description:
             <SizePolicy>me,min</SizePolicy>
           </WidgetGroup>
 
-          <Template src="skin:../Tango/skin_settings_button_2state.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
             <SetVariable name="text">Spinny</SetVariable>
             <SetVariable name="Setting">[Skin],show_spinnies</SetVariable>
           </Template>
 
-          <Template src="skin:../Tango/skin_settings_button_2state.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
             <SetVariable name="text">Cover Art</SetVariable>
             <SetVariable name="Setting">[Skin],show_coverart</SetVariable>
           </Template>
@@ -415,13 +415,13 @@ Description:
                     <Text>Size: </Text>
                     <Alignment>center</Alignment>
                   </Label>
-                  <Template src="skin:../Tango/skin_settings_button_multi.xml">
+                  <Template src="skin:../Tango/controls/skin_settings_button_multi.xml">
                     <SetVariable name="state_x_text">  °  </SetVariable>
                     <SetVariable name="width">20</SetVariable>
                     <SetVariable name="stateX">0</SetVariable>
                     <SetVariable name="Setting">[Skin],show_big_spinny_coverart</SetVariable>
                   </Template>
-                  <Template src="skin:../Tango/skin_settings_button_multi.xml">
+                  <Template src="skin:../Tango/controls/skin_settings_button_multi.xml">
                     <SetVariable name="state_x_text">  O  </SetVariable>
                     <SetVariable name="width">20</SetVariable>
                     <SetVariable name="stateX">1</SetVariable>
@@ -447,7 +447,7 @@ Description:
             <Size>182f,21f</Size>
             <Text>Mixer</Text>
           </Label>
-          <Template src="skin:../Tango/skin_settings_button_2state.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
             <SetVariable name="text">Master/Headphone Mixer</SetVariable>
             <SetVariable name="width">105</SetVariable>
             <SetVariable name="Setting">[Tango],master_mixer</SetVariable>
@@ -459,7 +459,7 @@ Description:
             <MaximumSize>182,17</MaximumSize>
             <SizePolicy>me,me</SizePolicy>
             <Children>
-              <Template src="skin:../Tango/skin_settings_button_2state.xml">
+              <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
                 <SetVariable name="text">Channel Mixer</SetVariable>
                 <SetVariable name="width">105</SetVariable>
                 <SetVariable name="Setting">[Master],show_mixer</SetVariable>
@@ -526,7 +526,7 @@ Description:
               <WidgetGroup>
                 <Layout>vertical</Layout>
                 <Children>
-                  <Template src="skin:../Tango/skin_settings_button_2state.xml">
+                  <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
                     <SetVariable name="text">EQ &amp; QuickEffect Knobs</SetVariable>
                     <SetVariable name="Setting">[Skin],show_eq_knobs</SetVariable>
                   </Template>
@@ -550,7 +550,7 @@ Description:
                         </Connection>
                       </WidgetGroup>
 
-                      <Template src="skin:../Tango/skin_settings_button_2state.xml">
+                      <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
                         <SetVariable name="text">EQ Kill Buttons</SetVariable>
                         <SetVariable name="Setting">[Skin],show_eq_kill_buttons</SetVariable>
                       </Template>
@@ -558,7 +558,7 @@ Description:
                     </Children>
                   </WidgetGroup><!-- /EQ Kill buttons -->
 
-                  <Template src="skin:../Tango/skin_settings_button_2state.xml">
+                  <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
                     <SetVariable name="text">Crossfader</SetVariable>
                     <SetVariable name="Setting">[Skin],show_xfader</SetVariable>
                   </Template>
@@ -587,7 +587,7 @@ Description:
                 </Connection>
               </WidgetGroup>
 
-              <Template src="skin:../Tango/skin_settings_button_2state.xml">
+              <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
                 <SetVariable name="text">Always Show Level Meters</SetVariable>
                 <SetVariable name="Setting">[Tango],vumeter</SetVariable>
               </Template>
@@ -612,7 +612,7 @@ Description:
             <ObjectName>AlignLeft</ObjectName>
             <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:../Tango/skin_settings_category_button_2state.xml">
+              <Template src="skin:../Tango/controls/skin_settings_category_button_2state.xml">
                 <SetVariable name="variant">Big</SetVariable>
                 <SetVariable name="text">Effect Units</SetVariable>
                 <SetVariable name="size">120f,18f</SetVariable>
@@ -639,13 +639,13 @@ Description:
                     <Size>40f,20f</Size>
                     <Layout>horizontal</Layout>
                     <Children>
-                      <Template src="skin:../Tango/skin_settings_button_multi.xml">
+                      <Template src="skin:../Tango/controls/skin_settings_button_multi.xml">
                         <SetVariable name="state_x_text">  2  </SetVariable>
                         <SetVariable name="width">20</SetVariable>
                         <SetVariable name="stateX">0</SetVariable>
                         <SetVariable name="Setting">[Skin],show_4effectunits</SetVariable>
                       </Template>
-                      <Template src="skin:../Tango/skin_settings_button_multi.xml">
+                      <Template src="skin:../Tango/controls/skin_settings_button_multi.xml">
                         <SetVariable name="state_x_text">  4  </SetVariable>
                         <SetVariable name="width">20</SetVariable>
                         <SetVariable name="stateX">1</SetVariable>
@@ -676,7 +676,7 @@ Description:
                 </Connection>
               </WidgetGroup>
 
-              <Template src="skin:../Tango/skin_settings_button_2state.xml">
+              <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
                 <SetVariable name="text">Super Knobs</SetVariable>
                 <SetVariable name="Setting">[Skin],show_superknobs</SetVariable>
               </Template>
@@ -695,12 +695,12 @@ Description:
             <Size>182f,3f</Size>
           </Label>
 
-          <Template src="skin:../Tango/skin_settings_button_2state.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
             <SetVariable name="text">Preview Deck</SetVariable>
             <SetVariable name="Setting">[PreviewDeck],show_previewdeck</SetVariable>
           </Template>
 
-          <Template src="skin:../Tango/skin_settings_button_2state.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
             <SetVariable name="text">Cover Art in Library</SetVariable>
             <SetVariable name="Setting">[Library],show_coverart</SetVariable>
           </Template>
@@ -711,7 +711,7 @@ Description:
             <SizePolicy>me,me</SizePolicy>
             <Layout>horizontal</Layout>
             <Children>
-              <Template src="skin:../Tango/skin_settings_button_2state.xml">
+              <Template src="skin:../Tango/controls/skin_settings_button_2state.xml">
                 <SetVariable name="text">Samplers</SetVariable>
                 <SetVariable name="width">71</SetVariable>
                 <SetVariable name="Setting">[Samplers],show_samplers</SetVariable>
@@ -737,7 +737,7 @@ Description:
                     </Connection>
                   </WidgetGroup>
 
-                  <Template src="skin:skin_settings_sampler_rows_16.xml"/>
+                  <Template src="skin:../Tango/skin_settings_sampler_rows_16.xml"/>
 
                 </Children>
               </WidgetGroup><!-- /Sampler row buttons -->
@@ -752,7 +752,7 @@ Description:
             <SizePolicy>me,me</SizePolicy>
             <Children>
               <WidgetGroup><Size>14f,13me</Size></WidgetGroup>
-              <Template src="skin:../Tango/button_1state.xml">
+              <Template src="skin:../Tango/controls/button_1state.xml">
                 <SetVariable name="TooltipId">LoadSamplerBank</SetVariable>
                 <SetVariable name="ObjectName">SkinSettingsButton</SetVariable>
                 <SetVariable name="Size">31f,17f</SetVariable>
@@ -766,7 +766,7 @@ Description:
                 <Text> / </Text>
                 <Alignment>center</Alignment>
               </Label>
-              <Template src="skin:../Tango/button_1state.xml">
+              <Template src="skin:../Tango/controls/button_1state.xml">
                 <SetVariable name="TooltipId">SaveSamplerBank</SetVariable>
                 <SetVariable name="ObjectName">SkinSettingsButton</SetVariable>
                 <SetVariable name="Size">31f,17f</SetVariable>
diff --git a/res/skins/Tango/skin_settings_sampler_rows_16.xml b/res/skins/Tango/skin_settings_sampler_rows_16.xml
index 598b0ef024cf..c1233a9c250e 100644
--- a/res/skins/Tango/skin_settings_sampler_rows_16.xml
+++ b/res/skins/Tango/skin_settings_sampler_rows_16.xml
@@ -12,7 +12,7 @@ Description:
         <ObjectName>AlignLeft</ObjectName>
         <Layout>horizontal</Layout>
         <Children>
-          <Template src="skin:skin_settings_button_sampler_rows.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_sampler_rows.xml">
             <SetVariable name="current">1</SetVariable>
             <SetVariable name="next">2</SetVariable>
             <SetVariable name="prev">2</SetVariable>
@@ -24,7 +24,7 @@ Description:
         <ObjectName>AlignLeft</ObjectName>
         <Layout>horizontal</Layout>
         <Children>
-          <Template src="skin:skin_settings_button_sampler_rows.xml">
+          <Template src="skin:../Tango/controls/skin_settings_button_sampler_rows.xml">
             <SetVariable name="current">2</SetVariable>
             <SetVariable name="next">1</SetVariable>
             <SetVariable name="prev">1</SetVariable>
diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index 2a03b9de9898..8af2ef8e173d 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -1,6 +1,6 @@
 /* Tango style sheet */
 
-#Mixxx {	/*
+#Mixxx {  /*
   AlignRight just for testing, to attach SkinSettings to right edge.
   Not working. See https://bugs.launchpad.net/mixxx/+bug/1623997 */
   qproperty-layoutAlignment: 'AlignRight | AlignVCenter';
@@ -8,7 +8,7 @@
   font-size: 12px/12px;
 }
 
-#SkinContainer {	/*
+#SkinContainer {  /*
   AlignRight just for testing, to attach SkinSettings to right edge.
   Not working. See https://bugs.launchpad.net/mixxx/+bug/1623997 */
   qproperty-layoutAlignment: 'AlignRight | AlignTop';
@@ -115,22 +115,22 @@ WWidgetGroup {
     - waveforms & lower skin part
     - treeview & library table */
 #LibrarySplitter::handle:horizontal {
-  image: url(skin:/graphics/splitterHori_handle.svg);
+  image: url(skin:../Tango/graphics/splitterHori_handle.svg);
   }
   #LibrarySplitter::handle:horizontal:hover,
   #LibrarySplitter::handle:horizontal:pressed {
-    image: url(skin:/graphics/splitterHori_handle_pressed.svg);
+    image: url(skin:../Tango/graphics/splitterHori_handle_pressed.svg);
   }
   /* splitter between coverArt and tree view */
   #LibrarySplitter::handle:vertical,
   #WaveformSplitter::handle:vertical {
-    image: url(skin:/graphics/splitterVert_handle.svg);
+    image: url(skin:../Tango/graphics/splitterVert_handle.svg);
     }
     #LibrarySplitter::handle:vertical:hover,
     #LibrarySplitter::handle:vertical:pressed,
     #WaveformSplitter::handle:vertical:hover,
     #WaveformSplitter::handle:vertical:pressed {
-      image: url(skin:/graphics/splitterVert_handle_pressed.svg);
+      image: url(skin:../Tango/graphics/splitterVert_handle_pressed.svg);
     }
 
 
@@ -279,16 +279,16 @@ WWidgetGroup {
   }
 
 #MasterHeadMixerLabel {
-  image: url(skin:/buttons/btn_master_head_mixer.svg) no-repeat center center;
+  image: url(skin:../Tango/buttons/btn_master_head_mixer.svg) no-repeat center center;
   }
   #MasterMixerLabel {
-    image: url(skin:/buttons/btn_master.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_master.svg) no-repeat center center;
   }
   #HeadphoneMixerLabel {
-    image: url(skin:/buttons/btn_head.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_head.svg) no-repeat center center;
   }
 #BoothMixerLabel {
-  image: url(skin:/buttons/btn_booth.svg) no-repeat center center;
+  image: url(skin:../Tango/buttons/btn_booth.svg) no-repeat center center;
 }
 #MixerbarKnob {
   qproperty-layoutAlignment: 'AlignCenter';
@@ -361,7 +361,7 @@ WWidgetGroup {
     }
   #RecDot {
     background-color: transparent;  /*
-    image: url(skin:/graphics/rec_dot.svg) no-repeat center center; */
+    image: url(skin:../Tango/graphics/rec_dot.svg) no-repeat center center; */
     font-size: 12px/12px;
     margin: 2px 0px 0px 0px;
     }
@@ -398,22 +398,22 @@ WWidgetGroup {
   margin: 0px;
   }
   #BroadcastButton[displayValue="0"] {
-    image: url(skin:/buttons/btn_broadcast_off.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_broadcast_off.svg) no-repeat center center;
     }
     #BroadcastButton[displayValue="0"]:hover {
-      image: url(skin:/buttons/btn_broadcast_off_hover.svg) no-repeat center center;
+      image: url(skin:../Tango/buttons/btn_broadcast_off_hover.svg) no-repeat center center;
       }
   #BroadcastButton[displayValue="1"] {
-    image: url(skin:/buttons/btn_broadcast_connecting.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_broadcast_connecting.svg) no-repeat center center;
     }
   #BroadcastButton[displayValue="2"] {
-    image: url(skin:/buttons/btn_broadcast_connected.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_broadcast_connected.svg) no-repeat center center;
     }
   #BroadcastButton[displayValue="3"] {
-    image: url(skin:/buttons/btn_broadcast_failure.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_broadcast_failure.svg) no-repeat center center;
     }
   #BroadcastButton[displayValue="4"] {
-    image: url(skin:/buttons/btn_broadcast_warning.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_broadcast_warning.svg) no-repeat center center;
     }
     #BroadcastButton:hover {
       background-color: #0f0f0f;
@@ -421,11 +421,11 @@ WWidgetGroup {
 
 #SkinSettingsToggler[displayValue="0"] {
   background-color: transparent;
-  image: url(skin:/buttons/btn_skinsettings_off.svg) no-repeat center center;
+  image: url(skin:../Tango/buttons/btn_skinsettings_off.svg) no-repeat center center;
   }
   #SkinSettingsToggler[displayValue="0"]:hover {
     background-color: #0f0f0f;
-    image: url(skin:/buttons/btn_skinsettings_on.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_skinsettings_on.svg) no-repeat center center;
   }
 
 
@@ -457,23 +457,23 @@ WWidgetGroup {
 /* Note(ronso0):
   this will shift waveforms' center position to the left.
   Useful to 'look ahead' further (who cares about history, ha?)
-  margin-left: -350px;	*/
+  margin-left: -350px;  */
 }
 
 #BeatgridButtonToggler {
   background-color: #333;
   }
   #BeatgridButtonToggler[displayValue="0"] {
-    image: url(skin:/buttons/btn_arrow_left.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_arrow_left.svg) no-repeat center center;
   }
   #BeatgridButtonToggler[displayValue="0"]:hover {
-    image: url(skin:/buttons/btn_arrow_left_hover.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_arrow_left_hover.svg) no-repeat center center;
   }
 #BeatgridButtonToggler[displayValue="1"] {
-  image: url(skin:/buttons/btn_arrow_right.svg) no-repeat center center;
+  image: url(skin:../Tango/buttons/btn_arrow_right.svg) no-repeat center center;
 }
   #BeatgridButtonToggler[displayValue="1"]:hover {
-    image: url(skin:/buttons/btn_arrow_right_hover.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_arrow_right_hover.svg) no-repeat center center;
   }
 
 #BeatgridCurpos,
@@ -495,25 +495,25 @@ WWidgetGroup {
     background-color: #0f0f0f;
   }
   #BeatgridCurpos {
-    image: url(skin:/buttons/btn_beats_curpos.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_beats_curpos.svg) no-repeat center center;
   }
   #BeatgridSlower {
-    image: url(skin:/buttons/btn_beats_slower.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_beats_slower.svg) no-repeat center center;
   }
   #BeatgridFaster {
-    image: url(skin:/buttons/btn_beats_faster.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_beats_faster.svg) no-repeat center center;
   }
   #BeatgridEarlier {
-    image: url(skin:/buttons/btn_beats_earlier.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_beats_earlier.svg) no-repeat center center;
   }
   #BeatgridLater {
-    image: url(skin:/buttons/btn_beats_later.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_beats_later.svg) no-repeat center center;
   }
   #HotcuesEarlier {
-    image: url(skin:/buttons/btn_hotcues_earlier.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_hotcues_earlier.svg) no-repeat center center;
   }
   #HotcuesLater {
-    image: url(skin:/buttons/btn_hotcues_later.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_hotcues_later.svg) no-repeat center center;
   }
 
 /*################################################################
@@ -530,10 +530,10 @@ WWidgetGroup {
   qproperty-layoutAlignment: 'AlignLeft | AlignTop';
   }
   #MicSectionIcon {
-    image: url(skin:/buttons/btn_mic_section.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_mic_section.svg) no-repeat center center;
   }
   #AuxSectionLabel {
-    image: url(skin:/buttons/btn_aux_section.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_aux_section.svg) no-repeat center center;
   }
 
 #MicUnit, #AuxUnit {
@@ -543,10 +543,10 @@ WWidgetGroup {
   padding-left: 2px;
   }
   #MicUnitIcon {
-    image: url(skin:/buttons/btn_mic_unit.svg) no-repeat center left;
+    image: url(skin:../Tango/buttons/btn_mic_unit.svg) no-repeat center left;
   }
   #AuxUnitIcon {
-    image: url(skin:/buttons/btn_aux_unit.svg) no-repeat center left;
+    image: url(skin:../Tango/buttons/btn_aux_unit.svg) no-repeat center left;
   }
   #MicUnitLabel, #AuxUnitLabel {
     padding-bottom: 8px;
@@ -647,42 +647,42 @@ WLabel#TrackComment {
   #VinylTogglerRightPassthrough[displayValue="1"],
   #VinylTogglerRight[displayValue="1"] {
     background-color: transparent;
-    image: url(skin:/buttons/btn_vinyl_left.svg) no-repeat top center;
+    image: url(skin:../Tango/buttons/btn_vinyl_left.svg) no-repeat top center;
     }
     #VinylTogglerLeft[displayValue="0"]:hover,
     #VinylTogglerRightPassthrough[displayValue="1"]:hover,
     #VinylTogglerRight[displayValue="1"]:hover {
       background-color: transparent;
-      image: url(skin:/buttons/btn_vinyl_left_hover.svg) no-repeat top center;
+      image: url(skin:../Tango/buttons/btn_vinyl_left_hover.svg) no-repeat top center;
     }
   #VinylTogglerLeft[displayValue="1"],
   #VinylTogglerLeftPassthrough[displayValue="1"],
   #VinylTogglerRight[displayValue="0"] {
     background-color: transparent;
-    image: url(skin:/buttons/btn_vinyl_right.svg) no-repeat top center;
+    image: url(skin:../Tango/buttons/btn_vinyl_right.svg) no-repeat top center;
     }
     #VinylTogglerLeft[displayValue="1"]:hover,
     #VinylTogglerLeftPassthrough[displayValue="1"]:hover,
     #VinylTogglerRight[displayValue="0"]:hover {
       background-color: transparent;
-      image: url(skin:/buttons/btn_vinyl_right_hover.svg) no-repeat top center;
+      image: url(skin:../Tango/buttons/btn_vinyl_right_hover.svg) no-repeat top center;
     }
   /* When passthrough is active but Vinyl Controls are hidden,
     yellow background indicates passthrough, similar to how
     the FX expand toggle does */
   #VinylTogglerLeftPassthrough[displayValue="0"] {
     background: #00ffff;
-    image: url(skin:/buttons/btn_vinyl_pass_left.svg) no-repeat top center;
+    image: url(skin:../Tango/buttons/btn_vinyl_pass_left.svg) no-repeat top center;
     }
     #VinylTogglerLeftPassthrough[displayValue="0"]:hover {
-      image: url(skin:/buttons/btn_vinyl_pass_left_hover.svg) no-repeat top center;
+      image: url(skin:../Tango/buttons/btn_vinyl_pass_left_hover.svg) no-repeat top center;
     }
   #VinylTogglerRightPassthrough[displayValue="0"] {
     background: #00ffff;
-    image: url(skin:/buttons/btn_vinyl_pass_right.svg) no-repeat top center;
+    image: url(skin:../Tango/buttons/btn_vinyl_pass_right.svg) no-repeat top center;
     }
     #VinylTogglerRightPassthrough[displayValue="0"]:hover {
-      image: url(skin:/buttons/btn_vinyl_pass_right_hover.svg) no-repeat top center;
+      image: url(skin:../Tango/buttons/btn_vinyl_pass_right_hover.svg) no-repeat top center;
     }
 
   #VinylControlButton,
@@ -747,7 +747,7 @@ WLabel#TrackComment {
   }
   WLabel#TrackComment {
     /* Note(ronso0):
-    defining font-size here breaks top alignment	*/
+    defining font-size here breaks top alignment  */
     padding-left: 1px;
     /* Note(ronso0):
     Somehow this is necessary to display multi-line comments correctly.
@@ -800,7 +800,7 @@ WLabel#TrackComment {
     border: 1px solid #fff;
     }
     #LoopIndicator[displayValue="1"] {
-      image: url(skin:/buttons/btn_reloop_on.svg) no-repeat center center;
+      image: url(skin:../Tango/buttons/btn_reloop_on.svg) no-repeat center center;
     }
 
 #DeckRowTransport {
@@ -849,32 +849,32 @@ WLabel#TrackComment {
 
   #DeckControlsToggle_Left[displayValue="0"],
   #MasterHeadMixerToggle[displayValue="0"] {
-    image: url(skin:/buttons/btn_arrow_right.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_arrow_right.svg) no-repeat center center;
     }
     #DeckControlsToggle_Left[displayValue="0"]:hover,
     #MasterHeadMixerToggle[displayValue="0"]:hover {
-      image: url(skin:/buttons/btn_arrow_right_hover.svg) no-repeat center center;
+      image: url(skin:../Tango/buttons/btn_arrow_right_hover.svg) no-repeat center center;
     }
     #DeckControlsToggle_Left[displayValue="1"],
     #MasterHeadMixerToggle[displayValue="1"] {
-      image: url(skin:/buttons/btn_arrow_left.svg) no-repeat center center;
+      image: url(skin:../Tango/buttons/btn_arrow_left.svg) no-repeat center center;
     }
     #DeckControlsToggle_Left[displayValue="1"]:hover,
     #MasterHeadMixerToggle[displayValue="1"]:hover {
-      image: url(skin:/buttons/btn_arrow_left_hover.svg) no-repeat center center;
+      image: url(skin:../Tango/buttons/btn_arrow_left_hover.svg) no-repeat center center;
     }
 
   #DeckControlsToggle_Right[displayValue="0"] {
-    image: url(skin:/buttons/btn_arrow_left.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_arrow_left.svg) no-repeat center center;
     }
     #DeckControlsToggle_Right[displayValue="0"]:hover {
-      image: url(skin:/buttons/btn_arrow_left_hover.svg) no-repeat center center;
+      image: url(skin:../Tango/buttons/btn_arrow_left_hover.svg) no-repeat center center;
     }
     #DeckControlsToggle_Right[displayValue="1"] {
-      image: url(skin:/buttons/btn_arrow_right.svg) no-repeat center center;
+      image: url(skin:../Tango/buttons/btn_arrow_right.svg) no-repeat center center;
     }
     #DeckControlsToggle_Right[displayValue="1"]:hover {
-      image: url(skin:/buttons/btn_arrow_right_hover.svg) no-repeat center center;
+      image: url(skin:../Tango/buttons/btn_arrow_right_hover.svg) no-repeat center center;
     }
 
   #Keylock[displayValue="1"]:hover {
@@ -908,13 +908,13 @@ WLabel#TrackComment {
 
 #PassthroughPlayCover {
   background-color: transparent;
-  image: url(skin:/buttons/btn_mic_aux_mute.svg) no-repeat center center;
+  image: url(skin:../Tango/buttons/btn_mic_aux_mute.svg) no-repeat center center;
 }
 
 #MicTalkover,
 #AuxEnable {
   background-color: transparent;
-  image: url(skin:/buttons/btn_mic_aux_mute.svg) no-repeat center center;
+  image: url(skin:../Tango/buttons/btn_mic_aux_mute.svg) no-repeat center center;
 }
 
 #PlayCue[displayValue="0"]:hover,
@@ -1018,7 +1018,7 @@ WLabel#TrackComment {
 
 #CueButton {
 /* is styled like #HotcueButton, lights up if play position
-  is at main Cue point	*/
+  is at main Cue point  */
   color: #d2d2d2;
   background-color: #333;
 }
@@ -1129,10 +1129,6 @@ WBeatSpinBox,
     background-color: #1e1e1e;
     border: 1px solid #1e1e1e;
     border-width: 1px 0px 1px 0px;
-    /* Note(ronso0):
-    This would do weird things when the skin is scaled...
-    height: 20%;
-    width: 20%; */
     }
     WBeatSpinBox::up-button:hover,
     WBeatSpinBox::down-button:hover,
@@ -1150,22 +1146,22 @@ WBeatSpinBox,
     This would make them overlap so we need to move one of those two
     buttons out of the way: */
     right: -16px;
-    image: url(skin:/buttons/btn_beatbox_up.svg) no-repeat;
+    image: url(skin:../Tango/buttons/btn_beatbox_up.svg) no-repeat;
     }
     WBeatSpinBox::up-button:hover,
     #spinBoxTransition::up-button:hover {
-      image: url(skin:/buttons/btn_beatbox_up_hover.svg) no-repeat;
+      image: url(skin:../Tango/buttons/btn_beatbox_up_hover.svg) no-repeat;
     }
   WBeatSpinBox::down-button,
   #spinBoxTransition::down-button {
     subcontrol-position: center right;
     border-top-left-radius: 3px;
     border-bottom-left-radius: 3px;
-    image: url(skin:/buttons/btn_beatbox_down.svg) no-repeat;
+    image: url(skin:../Tango/buttons/btn_beatbox_down.svg) no-repeat;
     }
     WBeatSpinBox::down-button:hover,
     #spinBoxTransition::down-button:hover {
-      image: url(skin:/buttons/btn_beatbox_down_hover.svg) no-repeat;
+      image: url(skin:../Tango/buttons/btn_beatbox_down_hover.svg) no-repeat;
     }
 
 /*################################################################
@@ -1214,7 +1210,7 @@ WBeatSpinBox,
   }
   #SyncButtonOverlay[displayValue="0"]:hover,
   #SyncButtonOverlayMini[displayValue="0"]:hover {
-    image: url(skin:/buttons/btn_key_match_hover.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_key_match_hover.svg) no-repeat center center;
   }
   #SyncButtonOverlay[displayValue="0"] {
     border: 1px solid #444;
@@ -1249,16 +1245,16 @@ WBeatSpinBox,
       background-color: #333;
     }
   #RateUp {
-    image: url(skin:/buttons/btn_rate_up.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_rate_up.svg) no-repeat center center;
     }
     #RateUp:hover {
-      image: url(skin:/buttons/btn_rate_up_hover.svg) no-repeat center center;
+      image: url(skin:../Tango/buttons/btn_rate_up_hover.svg) no-repeat center center;
     }
   #RateDown {
-    image: url(skin:/buttons/btn_rate_down.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_rate_down.svg) no-repeat center center;
     }
     #RateDown:hover {
-      image: url(skin:/buttons/btn_rate_down_hover.svg) no-repeat center center;
+      image: url(skin:../Tango/buttons/btn_rate_down_hover.svg) no-repeat center center;
     }
 
   #KeyDisplay, #KeyDisplayMini {
@@ -1275,19 +1271,19 @@ WBeatSpinBox,
   }
     #KeyMatch:hover,
     #KeyMatchMini:hover {
-      image: url(skin:/buttons/btn_key_match_hover.svg) no-repeat center center;
+      image: url(skin:../Tango/buttons/btn_key_match_hover.svg) no-repeat center center;
     }
     #KeyUp {
-      image: url(skin:/buttons/btn_key_up.svg) no-repeat center center;
+      image: url(skin:../Tango/buttons/btn_key_up.svg) no-repeat center center;
       }
       #KeyUp:hover {
-        image: url(skin:/buttons/btn_key_up_hover.svg) no-repeat center center;
+        image: url(skin:../Tango/buttons/btn_key_up_hover.svg) no-repeat center center;
       }
     #KeyDown {
-      image: url(skin:/buttons/btn_key_down.svg) no-repeat center center;
+      image: url(skin:../Tango/buttons/btn_key_down.svg) no-repeat center center;
       }
       #KeyDown:hover {
-        image: url(skin:/buttons/btn_key_down_hover.svg) no-repeat center center;
+        image: url(skin:../Tango/buttons/btn_key_down_hover.svg) no-repeat center center;
       }
 
 
@@ -1384,10 +1380,10 @@ WLabel#TrackComment {
 
 /* Kill indicators underneath EQ knobs */
 #EQKilledUnderlay[displayValue="1"] {
-  image: url(skin:/knobs_sliders/knob_eq_killed.svg) no-repeat center center;
+  image: url(skin:../Tango/knobs_sliders/knob_eq_killed.svg) no-repeat center center;
 }
 #QuickFxDisabledUnderlay[displayValue="0"] {
-  image: url(skin:/knobs_sliders/knob_quickFX_disabled.svg) no-repeat center center;
+  image: url(skin:../Tango/knobs_sliders/knob_quickFX_disabled.svg) no-repeat center center;
 }
 
 #QuickFXSide {
@@ -1413,13 +1409,13 @@ WLabel#TrackComment {
 
 /*  This wouldn't scale the image:
 #PflButton[displayValue="0"] {
-  background: transparent url(skin:/buttons/btn_pfl_off.svg) no-repeat center center;
+  background: transparent url(skin:../Tango/buttons/btn_pfl_off.svg) no-repeat center center;
   background-origin: padding;
   }
   This is a workaround to scale and center the image, but image would appear blurred
   if it is scaled up too much (>120). Source:
   https://forum.qt.io/topic/40151/solved-scaled-background-image-using-stylesheet/6
-  border-image: url(skin:/buttons/btn_pfl_off.svg) 0 0 0 0 stretch stretch; */
+  border-image: url(skin:../Tango/buttons/btn_pfl_off.svg) 0 0 0 0 stretch stretch; */
 #PflBoxLeft,
 #PflBoxRight {
   background-color: #0f0f0f;
@@ -1497,19 +1493,19 @@ decks, samplers, mic, aux, fx */
   }
 
 #VUMeterLabelMaster {
-  image: url(skin:/buttons/btn_master_vu_label.svg) no-repeat center center;
+  image: url(skin:../Tango/buttons/btn_master_vu_label.svg) no-repeat center center;
 }
 #VUMeterLabelDeck1 {
-  image: url(skin:/buttons/btn_deck1_vu_label.svg) no-repeat center center;
+  image: url(skin:../Tango/buttons/btn_deck1_vu_label.svg) no-repeat center center;
 }
 #VUMeterLabelDeck2 {
-  image: url(skin:/buttons/btn_deck2_vu_label.svg) no-repeat center center;
+  image: url(skin:../Tango/buttons/btn_deck2_vu_label.svg) no-repeat center center;
 }
 #VUMeterLabelDeck3 {
-  image: url(skin:/buttons/btn_deck3_vu_label.svg) no-repeat center center;
+  image: url(skin:../Tango/buttons/btn_deck3_vu_label.svg) no-repeat center center;
 }
 #VUMeterLabelDeck4 {
-  image: url(skin:/buttons/btn_deck4_vu_label.svg) no-repeat center center;
+  image: url(skin:../Tango/buttons/btn_deck4_vu_label.svg) no-repeat center center;
 }
 
 
@@ -1544,22 +1540,22 @@ decks, samplers, mic, aux, fx */
 #FixedLoopSizesMiniMaxi[displayValue="0"],
 #FxMiniMaxi[displayValue="0"],
 #SamplersMiniMaxi[displayValue="0"] {
-  background-image: url(skin:/buttons/btn_arrow_down.svg)
+  background-image: url(skin:../Tango/buttons/btn_arrow_down.svg)
   }
   #FixedLoopSizesMiniMaxi[displayValue="0"]:hover,
   #FxMiniMaxi[displayValue="0"]:hover,
   #SamplersMiniMaxi[displayValue="0"]:hover {
-    background-image: url(skin:/buttons/btn_arrow_down_hover.svg);
+    background-image: url(skin:../Tango/buttons/btn_arrow_down_hover.svg);
   }
 #FixedLoopSizesMiniMaxi[displayValue="1"],
 #FxMiniMaxi[displayValue="1"],
 #SamplersMiniMaxi[displayValue="1"] {
-  background-image: url(skin:/buttons/btn_arrow_up.svg);
+  background-image: url(skin:../Tango/buttons/btn_arrow_up.svg);
   }
   #FixedLoopSizesMiniMaxi[displayValue="1"]:hover,
   #FxMiniMaxi[displayValue="1"]:hover,
   #SamplersMiniMaxi[displayValue="1"]:hover {
-    background-image: url(skin:/buttons/btn_arrow_up_hover.svg);
+    background-image: url(skin:../Tango/buttons/btn_arrow_up_hover.svg);
   }
 
 #FxUnitControls {
@@ -1598,12 +1594,12 @@ decks, samplers, mic, aux, fx */
 /* no focus */
 #FxFlow_mini_separator {
   background-color: transparent;
-  image: url(skin:/graphics/fxFlow_mini_noFocus_Fx1-2-3.svg) no-repeat center center;
+  image: url(skin:../Tango/graphics/fxFlow_mini_noFocus_Fx1-2-3.svg) no-repeat center center;
 }
 #FxFlow_maxi_separator {
   background-color: transparent;
   border-radius: 0px;
-  image: url(skin:/graphics/fxFlow_maxi_noFocus_Fx1-2-3.svg) no-repeat right center;
+  image: url(skin:../Tango/graphics/fxFlow_maxi_noFocus_Fx1-2-3.svg) no-repeat right center;
 }
 
 #FxFlow_focus_background,
@@ -1622,17 +1618,17 @@ decks, samplers, mic, aux, fx */
 #FxFlow_mini_focus_separator2-3[highlight="0"],
 #FxFlow_mini_focus_separator2-3[highlight="1"] {
   background-color: transparent;
-  image: url(skin:/graphics/fxFlow_mini_noFocus_Fx1-2-3.svg) no-repeat center center;
+  image: url(skin:../Tango/graphics/fxFlow_mini_noFocus_Fx1-2-3.svg) no-repeat center center;
   }
   #FxFlow_mini_focus_separator1-2[highlight="1"],
   #FxFlow_mini_focus_separator2-3[highlight="2"] {
     background-color: transparent;
-    image: url(skin:/graphics/fxFlow_mini_focus_left.svg) no-repeat center center;
+    image: url(skin:../Tango/graphics/fxFlow_mini_focus_left.svg) no-repeat center center;
   }
   #FxFlow_mini_focus_separator1-2[highlight="2"],
   #FxFlow_mini_focus_separator2-3[highlight="3"] {
     background-color: transparent;
-    image: url(skin:/graphics/fxFlow_mini_focus_right.svg) no-repeat center center;
+    image: url(skin:../Tango/graphics/fxFlow_mini_focus_right.svg) no-repeat center center;
   }
 
 /* expanded effect slots, vertical layout */
@@ -1641,17 +1637,17 @@ decks, samplers, mic, aux, fx */
 #FxFlow_maxi_focus_separator2-3[highlight="0"],
 #FxFlow_maxi_focus_separator2-3[highlight="1"] {
   background-color: transparent;
-  image: url(skin:/graphics/fxFlow_maxi_noFocus_Fx1-2-3.svg) no-repeat center center;
+  image: url(skin:../Tango/graphics/fxFlow_maxi_noFocus_Fx1-2-3.svg) no-repeat center center;
   }
   #FxFlow_maxi_focus_separator1-2[highlight="1"],
   #FxFlow_maxi_focus_separator2-3[highlight="2"] {
     background-color: transparent;
-    image: url(skin:/graphics/fxFlow_maxi_focus_top.svg) no-repeat center center;
+    image: url(skin:../Tango/graphics/fxFlow_maxi_focus_top.svg) no-repeat center center;
   }
   #FxFlow_maxi_focus_separator1-2[highlight="2"],
   #FxFlow_maxi_focus_separator2-3[highlight="3"] {
     background-color: transparent;
-    image: url(skin:/graphics/fxFlow_maxi_focus_bottom.svg) no-repeat center center;
+    image: url(skin:../Tango/graphics/fxFlow_maxi_focus_bottom.svg) no-repeat center center;
   }
 /* /effect slot focus indicators */
 
@@ -1659,16 +1655,16 @@ decks, samplers, mic, aux, fx */
   background-color: transparent;
 }
   #FxFocusButton[displayValue="0"] {
-    image: url(skin:/buttons/btn_fx_focus_off.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_fx_focus_off.svg) no-repeat center center;
     }
     #FxFocusButton[displayValue="0"]:hover {
-      image: url(skin:/buttons/btn_fx_focus_off_hover.svg) no-repeat center center;
+      image: url(skin:../Tango/buttons/btn_fx_focus_off_hover.svg) no-repeat center center;
     }
   #FxFocusButton[displayValue="1"] {
-    image: url(skin:/buttons/btn_fx_focus_on.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_fx_focus_on.svg) no-repeat center center;
     }
     #FxFocusButton[displayValue="1"]:hover {
-      image: url(skin:/buttons/btn_fx_focus_on_hover.svg) no-repeat center center;
+      image: url(skin:../Tango/buttons/btn_fx_focus_on_hover.svg) no-repeat center center;
     }
 
 #FxMetaknob {
@@ -1747,11 +1743,11 @@ decks, samplers, mic, aux, fx */
       background-color: #101010;
       width: 11px;
       height: 20px; */
-      image: url(skin:/buttons/btn_fx_selector_list.svg) no-repeat center center;
+      image: url(skin:../Tango/buttons/btn_fx_selector_list.svg) no-repeat center center;
       }
       WEffectSelector::down-arrow:hover,
       #fadeModeCombobox::down-arrow:hover {
-        image: url(skin:/buttons/btn_fx_selector_list_hover.svg) no-repeat center center;
+        image: url(skin:../Tango/buttons/btn_fx_selector_list_hover.svg) no-repeat center center;
       }
 
     WEffectSelector QAbstractScrollArea,
@@ -1771,7 +1767,7 @@ decks, samplers, mic, aux, fx */
       /* not applied
       padding-left: 5px;
       font-weight: bold;
-      background-color: #000;	*/
+      background-color: #000; */
       color: #fff;
       background-color: #555;
     }
@@ -1792,11 +1788,11 @@ decks, samplers, mic, aux, fx */
       above will be applied... it's qt magic
       background: #0081B7; */
       margin: 3px;
-      image: url(skin:/buttons/btn_lib_checkmark_white.svg) no-repeat center center;
+      image: url(skin:../Tango/buttons/btn_lib_checkmark_white.svg) no-repeat center center;
     }
     WEffectSelector::indicator:!checked,
     #fadeModeCombobox::indicator:!checked {
-      image: url(skin:/buttons/btn_.svg) no-repeat center center;
+      image: url(skin:../Tango/buttons/btn_.svg) no-repeat center center;
     }
 
 #FxParametersLeft {
@@ -1885,8 +1881,8 @@ decks, samplers, mic, aux, fx */
   #FxSuperLinkButton[value="1"]:hover {
     background-color: #078dcd;
   }
-#FxSuperLinkButton[value="2"] {	/*
-  a simple way to achieve a partitioning in thirds	*/
+#FxSuperLinkButton[value="2"] { /*
+  a simple way to achieve a partitioning in thirds  */
   background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,
     stop: 0 #006596,
     stop: 0.33 #006596,
@@ -2162,11 +2158,11 @@ WEffectSelector::indicator:unchecked,
   }
   #MainMenu QMenu::indicator:checked,
   #MainMenu QMenu::indicator:checked:selected {
-    image: url(skin:/buttons/btn_mainmenu_checkbox_checked.svg);
+    image: url(skin:../Tango/buttons/btn_mainmenu_checkbox_checked.svg);
   }
   #MainMenu QMenu::indicator:unchecked,
   #MainMenu QMenu::indicator:unchecked:selected {
-    image: url(skin:/buttons/btn_mainmenu_checkbox.svg);
+    image: url(skin:../Tango/buttons/btn_mainmenu_checkbox.svg);
   }
 
 #MainMenu QMenu {
@@ -2346,12 +2342,12 @@ WTrackMenu QMenu::right-arrow {
   #MainMenu QMenu::right-arrow,
   WTrackMenu::right-arrow,
   WTrackMenu QMenu::right-arrow {
-    image: url(skin:/buttons/btn_arrow_right.svg);
+    image: url(skin:../Tango/buttons/btn_arrow_right.svg);
   }
   #MainMenu QMenu::right-arrow:selected,
   WTrackMenu::right-arrow:selected,
   WTrackMenu QMenu::right-arrow:selected {
-    image: url(skin:/buttons/btn_arrow_right_hover.svg);
+    image: url(skin:../Tango/buttons/btn_arrow_right_hover.svg);
   }
 
   WLibrary QHeaderView QMenu::indicator {
@@ -2359,7 +2355,7 @@ WTrackMenu QMenu::right-arrow {
     height: 10px;
     }
     WLibrary QHeaderView QMenu::indicator:checked {
-      image: url(skin:/buttons/btn_lib_checkmark_white.svg);
+      image: url(skin:../Tango/buttons/btn_lib_checkmark_white.svg);
     }
 
 WLibrarySidebar QMenu::indicator,
@@ -2374,11 +2370,11 @@ WTrackMenu QMenu QCheckBox::indicator {
   WLibrarySidebar QMenu::indicator:checked,
   WLibrary QHeaderView QMenu::indicator:checked,
   WTrackMenu QMenu QCheckBox::indicator:checked {
-    image: url(skin:/buttons/btn_lib_checkmark.svg);
+    image: url(skin:../Tango/buttons/btn_lib_checkmark.svg);
     border: 1px solid #111;
   }
   WTrackMenu QMenu QCheckBox::indicator:indeterminate {
-    image: url(skin:/buttons/btn_lib_checkmark_indeterminate.svg);
+    image: url(skin:../Tango/buttons/btn_lib_checkmark_indeterminate.svg);
     background-color: #1e1e1e;
   }
   /* disabled menu checkbox */
@@ -2386,10 +2382,10 @@ WTrackMenu QMenu QCheckBox::indicator {
     background-color: #222;
   }
   WTrackMenu QMenu QCheckBox::indicator:disabled:checked {
-    image: url(skin:/buttons/btn_lib_checkmark_grey.svg);
+    image: url(skin:../Tango/buttons/btn_lib_checkmark_grey.svg);
   }
   WTrackMenu QMenu QCheckBox::indicator:disabled:indeterminate {
-    image: url(skin:/buttons/btn_lib_checkmark_indeterminate_grey.svg);
+    image: url(skin:../Tango/buttons/btn_lib_checkmark_indeterminate_grey.svg);
   }
 
 /* widgets in cue popup menu */
@@ -2402,7 +2398,7 @@ WTrackMenu QMenu QCheckBox::indicator {
   border: 1px solid #666;
   background-color: #333;
   border-radius: 2px;
-  qproperty-icon: url(skin:/buttons/btn_delete.svg);
+  qproperty-icon: url(skin:../Tango/buttons/btn_delete.svg);
   /* make the icon slightly larger than default 16px */
   qproperty-iconSize: 20px;
 }
@@ -2488,16 +2484,16 @@ WTrackMenu QMenu QCheckBox::indicator {
 #LibMiniMaxiButton {
   }
   #LibMiniMaxiButton[displayValue="0"] {
-    image: url(skin:/buttons/btn_lib_maxi.svg) no-repeat center top;
+    image: url(skin:../Tango/buttons/btn_lib_maxi.svg) no-repeat center top;
     }
     #LibMiniMaxiButton[displayValue="0"]:hover {
-      image: url(skin:/buttons/btn_lib_maxi_hover.svg) no-repeat center top;
+      image: url(skin:../Tango/buttons/btn_lib_maxi_hover.svg) no-repeat center top;
     }
   #LibMiniMaxiButton[displayValue="1"] {
-    image: url(skin:/buttons/btn_lib_mini.svg) no-repeat center top;
+    image: url(skin:../Tango/buttons/btn_lib_mini.svg) no-repeat center top;
     }
     #LibMiniMaxiButton[displayValue="1"]:hover {
-      image: url(skin:/buttons/btn_lib_mini_hover.svg) no-repeat center top;
+      image: url(skin:../Tango/buttons/btn_lib_mini_hover.svg) no-repeat center top;
     }
 
 #LibraryContainer QTableView,
@@ -2577,7 +2573,7 @@ WTrackTableView {
 /*  Closed branch icon in tree */
 #LibraryContainer QTreeView::branch:has-children:!has-siblings:closed,
 #LibraryContainer QTreeView::branch:closed:has-children:has-siblings {
-  image: url(skin:/graphics/branch_closed.png);
+  image: url(skin:../Tango/graphics/branch_closed.png);
   }
   #LibraryContainer QTreeView::branch:has-children:!has-siblings:closed:selected,
   #LibraryContainer QTreeView::branch:closed:has-children:has-siblings:selected {
@@ -2587,7 +2583,7 @@ WTrackTableView {
 /*  Open branch icon in tree */
 #LibraryContainer QTreeView::branch:open:has-children:!has-siblings,
 #LibraryContainer QTreeView::branch:open:has-children:has-siblings {
-  image: url(skin:/graphics/branch_open.png);
+  image: url(skin:../Tango/graphics/branch_open.png);
   }
   #LibraryContainer QTreeView::branch:open:has-children:!has-siblings:selected,
   #LibraryContainer QTreeView::branch:open:has-children:has-siblings:selected {
@@ -2623,7 +2619,7 @@ WTrackTableView {
   color: #CFCFCF;
   background-color: #1e1e1e;
   }
-  /*	Library header 'buttons'	*/
+  /*  Library header 'buttons'  */
   #LibraryContainer QHeaderView::section {
     height: 1.0em;
     padding: 0px 2px;
@@ -2650,16 +2646,16 @@ WTrackTableView {
       background-color: rgba(88,88,88,200);
     }
     #LibraryContainer QHeaderView::up-arrow {
-      image: url(skin:/graphics/library_sort_up.svg);
+      image: url(skin:../Tango/graphics/library_sort_up.svg);
       }
       #LibraryContainer QHeaderView::up-arrow:hover {
-        image: url(skin:/graphics/library_sort_down.svg);
+        image: url(skin:../Tango/graphics/library_sort_down.svg);
       }
     #LibraryContainer QHeaderView::down-arrow {
-      image: url(skin:/graphics/library_sort_down.svg);
+      image: url(skin:../Tango/graphics/library_sort_down.svg);
       }
       #LibraryContainer QHeaderView::down-arrow:hover {
-        image: url(skin:/graphics/library_sort_up.svg);
+        image: url(skin:../Tango/graphics/library_sort_up.svg);
       }
 
 QTextBrowser {
@@ -2779,7 +2775,7 @@ Library features and their buttons:
     QLabel#label > "Status: ..."
     QPushButton#pushButtonRecording > un/checked
 
-  	*/
+    */
 #LibraryFeatureControls QPushButton {
   text-align: center;
   font-weight: normal;
@@ -2789,7 +2785,7 @@ Library features and their buttons:
   Setting height/width here will prevent the buttons being scaled properly
   min-height: 22px;
   max-height: 22px;
-  height: 22px;	*/
+  height: 22px; */
   color: #ccc;
   border-radius: 2px;
   border: 1px solid #333;
@@ -2853,7 +2849,7 @@ Library features and their buttons:
     font-weight: bold;
   }
 
-  /* 'Enable AutoDJ' button	*/
+  /* 'Enable AutoDJ' button */
   QPushButton#pushButtonAutoDJ:hover,
   QPushButton#pushButtonAnalyze:hover {
     border: 1px solid #ff6600;
@@ -2869,34 +2865,34 @@ Library features and their buttons:
 
 /* AutoDJ button icons */
 QPushButton#pushButtonAutoDJ:!checked {
-  image: url(skin:/buttons/btn_autodj_enable_off.svg) no-repeat center center;
+  image: url(skin:../Tango/buttons/btn_autodj_enable_off.svg) no-repeat center center;
   }
   QPushButton#pushButtonAutoDJ:checked {
-    image: url(skin:/buttons/btn_autodj_enable_on.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_autodj_enable_on.svg) no-repeat center center;
   }
 QPushButton#pushButtonFadeNow:!enabled {
-  image: url(skin:/buttons/btn_autodj_fade_disabled.svg) no-repeat center center;
+  image: url(skin:../Tango/buttons/btn_autodj_fade_disabled.svg) no-repeat center center;
   }
   QPushButton#pushButtonFadeNow:enabled {
-    image: url(skin:/buttons/btn_autodj_fade.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_autodj_fade.svg) no-repeat center center;
   }
 QPushButton#pushButtonSkipNext:!enabled {
-  image: url(skin:/buttons/btn_autodj_skip_disabled.svg) no-repeat center center;
+  image: url(skin:../Tango/buttons/btn_autodj_skip_disabled.svg) no-repeat center center;
   }
   QPushButton#pushButtonSkipNext:enabled {
-    image: url(skin:/buttons/btn_autodj_skip.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_autodj_skip.svg) no-repeat center center;
   }
 QPushButton#pushButtonShuffle {
-  image: url(skin:/buttons/btn_autodj_shuffle.svg) no-repeat center center;
+  image: url(skin:../Tango/buttons/btn_autodj_shuffle.svg) no-repeat center center;
 }
 QPushButton#pushButtonAddRandom {
-  image: url(skin:/buttons/btn_autodj_addrandom.svg) no-repeat center center;
+  image: url(skin:../Tango/buttons/btn_autodj_addrandom.svg) no-repeat center center;
 }
 QPushButton#pushButtonRepeatPlaylist:!checked {
-  image: url(skin:/buttons/btn_autodj_repeat_playlist_off.svg) no-repeat center center;
+  image: url(skin:../Tango/buttons/btn_autodj_repeat_playlist_off.svg) no-repeat center center;
   }
   QPushButton#pushButtonRepeatPlaylist:checked {
-    image: url(skin:/buttons/btn_autodj_repeat_playlist_on.svg) no-repeat center center;
+    image: url(skin:../Tango/buttons/btn_autodj_repeat_playlist_on.svg) no-repeat center center;
   }
 /* AutoDJ button icons */
 
@@ -2925,10 +2921,10 @@ QPushButton#pushButtonRepeatPlaylist:!checked {
   /* Entire BPM cell */
   /* Lock icon at the left */
   #LibraryBPMButton::indicator:checked {
-    image: url(skin:/buttons/btn_lib_bpm_locked.svg);
+    image: url(skin:../Tango/buttons/btn_lib_bpm_locked.svg);
     }
   #LibraryBPMButton::indicator:unchecked {
-    image: url(skin:/buttons/btn_lib_bpm_unlocked.svg);
+    image: url(skin:../Tango/buttons/btn_lib_bpm_unlocked.svg);
     }
   /* BPM value */
   #LibraryBPMButton::item {
@@ -2945,10 +2941,10 @@ QPushButton#pushButtonRepeatPlaylist:!checked {
     background-color: #0f0f0f;
     }
     #LibraryBPMSpinBox::up-button {
-      image: url(skin:/buttons/btn_lib_spinbox_up_white.svg) no-repeat;
+      image: url(skin:../Tango/buttons/btn_lib_spinbox_up_white.svg) no-repeat;
       }
     #LibraryBPMSpinBox::down-button {
-      image: url(skin:/buttons/btn_lib_spinbox_down_white.svg) no-repeat;
+      image: url(skin:../Tango/buttons/btn_lib_spinbox_down_white.svg) no-repeat;
     }
 
   /* Button in library "Preview" column */
@@ -2959,14 +2955,14 @@ QPushButton#pushButtonRepeatPlaylist:!checked {
     border: 1px solid transparent;
     }
     #LibraryPreviewButton:!checked {
-      image: url(skin:/buttons/btn_lib_preview_play.svg);
+      image: url(skin:../Tango/buttons/btn_lib_preview_play.svg);
       }
       #LibraryPreviewButton:!checked:hover {
         border: 1px solid #888;
         background: #0f0f0f;
       }
     #LibraryPreviewButton:checked {
-      image: url(skin:/buttons/btn_lib_preview_pause.svg);
+      image: url(skin:../Tango/buttons/btn_lib_preview_pause.svg);
       background-color: #000;
       border: 1px solid #555;
       }
@@ -2999,7 +2995,7 @@ QPushButton#pushButtonRepeatPlaylist:!checked {
       border: 1px solid #888;
     }
   #LibraryContainer QTableView::indicator:checked {
-    image: url(skin:/buttons/btn_lib_checkmark.svg);
+    image: url(skin:../Tango/buttons/btn_lib_checkmark.svg);
     }
   #LibraryContainer QTableView::indicator:unchecked {
     background: none;
@@ -3032,10 +3028,10 @@ WSearchLineEdit {
   /* Clear button: see /skins/default.qss */
 
 WLibrary QLabel,
-WLibrary QRadioButton {	/*
+WLibrary QRadioButton { /*
   background: none;
   Extra declaration for QRadioButton otherwise it shows up with
-  wrong colors in Linux with Gnome 	*/
+  wrong colors in Linux with Gnome  */
   color: #cfcfcf;
 }
 
@@ -3050,11 +3046,11 @@ QRadioButton#radioButtonRecentlyAdded {
 }
 
 WLibrary QRadioButton::indicator:checked {
-  image: url(skin:/buttons/btn_lib_radio_button_on.svg) center center;
+  image: url(skin:../Tango/buttons/btn_lib_radio_button_on.svg) center center;
 }
 
 WLibrary QRadioButton::indicator:unchecked {
-  image: url(skin:/buttons/btn_lib_radio_button_off.svg) center center;
+  image: url(skin:../Tango/buttons/btn_lib_radio_button_off.svg) center center;
 }
 
 /* explicitly remove icons from unchecked items otherwise
diff --git a/res/skins/Tango/topbar.xml b/res/skins/Tango/topbar.xml
index 2ca0dfa6a5ed..fb435cd5ebfe 100644
--- a/res/skins/Tango/topbar.xml
+++ b/res/skins/Tango/topbar.xml
@@ -37,13 +37,13 @@ Description:
                 <NumberStates>2</NumberStates>
                 <State>
                   <Number>0</Number>
-                  <Pressed scalemode="STRETCH_ASPECT">graphics/logo_102x24_grey.svg</Pressed>
-                  <Unpressed scalemode="STRETCH_ASPECT">graphics/logo_102x24_grey.svg</Unpressed>
+                  <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/graphics/logo_102x24_grey.svg</Pressed>
+                  <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/graphics/logo_102x24_grey.svg</Unpressed>
                 </State>
                 <State>
                   <Number>1</Number>
-                  <Pressed scalemode="STRETCH_ASPECT">graphics/logo_102x24.svg</Pressed>
-                  <Unpressed scalemode="STRETCH_ASPECT">graphics/logo_102x24.svg</Unpressed>
+                  <Pressed scalemode="STRETCH_ASPECT">skin:../Tango/graphics/logo_102x24.svg</Pressed>
+                  <Unpressed scalemode="STRETCH_ASPECT">skin:../Tango/graphics/logo_102x24.svg</Unpressed>
                 </State>
                 <Connection>
                   <ConfigKey>[Tango],colorLogo</ConfigKey>
@@ -51,7 +51,7 @@ Description:
                 </Connection>
               </PushButton>
 
-              <Template src="skin:button_2state_persist.xml">
+              <Template src="skin:../Tango/controls/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>
@@ -69,14 +69,14 @@ Description:
               </Label>
 
               <!-- Master & Headphone mixer -->
-              <Template src="skin:mixer_master.xml"/>
+              <Template src="skin:../Tango/mixer/mixer_master.xml"/>
 
               <WidgetGroup>
                 <SizePolicy>me,min</SizePolicy>
                 <MaximumSize>30,1</MaximumSize>
               </WidgetGroup>
 
-              <Template src="skin:mixer_headphone.xml"/>
+              <Template src="skin:../Tango/mixer/mixer_headphone.xml"/>
 
               <WidgetGroup><Size>0me,1min</Size></WidgetGroup>
 
@@ -105,8 +105,8 @@ Description:
 		                  <SliderComposed>
 		                    <TooltipId>crossfader</TooltipId>
 		                    <Size>108f,32f</Size>
-		                    <Handle scalemode="STRETCH_ASPECT">knobs_sliders/crossfader_handle.svg</Handle>
-		                    <Slider scalemode="STRETCH_ASPECT">knobs_sliders/crossfader_scale.svg</Slider>
+		                    <Handle scalemode="STRETCH_ASPECT">skin:../Tango/knobs_sliders/crossfader_handle.svg</Handle>
+		                    <Slider scalemode="STRETCH_ASPECT">skin:../Tango/knobs_sliders/crossfader_scale.svg</Slider>
 		                    <Horizontal>true</Horizontal>
 		                    <Connection>
 		                      <ConfigKey>[Master],crossfader</ConfigKey>
@@ -145,9 +145,9 @@ Description:
             <ObjectName>AutoDjStatus</ObjectName>
             <Size>14f,22f</Size>
             <NumberPos>3</NumberPos>
-            <PathStatusLight1>skin:graphics/autodj_status.svg</PathStatusLight1>
-            <PathStatusLight2>skin:graphics/autodj_status.svg</PathStatusLight2>
-            <PathStatusLight3>skin:graphics/autodj_status.svg</PathStatusLight3>
+            <PathStatusLight1>skin:../Tango/graphics/autodj_status.svg</PathStatusLight1>
+            <PathStatusLight2>skin:../Tango/graphics/autodj_status.svg</PathStatusLight2>
+            <PathStatusLight3>skin:../Tango/graphics/autodj_status.svg</PathStatusLight3>
             <Connection>
               <ConfigKey>[AutoDJ],enabled</ConfigKey>
             </Connection>
@@ -165,7 +165,7 @@ Description:
             <SizePolicy>min,min</SizePolicy>
             <Children>
 
-              <Template src="skin:button_2state_persist.xml"><!-- Waveforms -->
+              <Template src="skin:../Tango/controls/button_2state_persist.xml"><!-- Waveforms -->
                 <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
                 <SetVariable name="Size">30f,20f</SetVariable>
                 <SetVariable name="state_0_icon">wave_off.svg</SetVariable>
@@ -175,7 +175,7 @@ Description:
 
               <WidgetGroup><Size>10f,1min</Size></WidgetGroup>
 
-              <Template src="skin:button_2state_persist.xml"><!-- FX -->
+              <Template src="skin:../Tango/controls/button_2state_persist.xml"><!-- FX -->
                 <SetVariable name="TooltipId">show_effects</SetVariable>
                 <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
                 <SetVariable name="Size">30f,20f</SetVariable>
@@ -186,7 +186,7 @@ Description:
 
               <WidgetGroup><Size>3f,1min</Size></WidgetGroup>
 
-              <Template src="skin:button_2state_persist.xml"><!-- Samplers -->
+              <Template src="skin:../Tango/controls/button_2state_persist.xml"><!-- Samplers -->
                 <SetVariable name="TooltipId">show_samplers</SetVariable>
                 <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
                 <SetVariable name="Size">30f,20f</SetVariable>
@@ -197,7 +197,7 @@ Description:
 
               <WidgetGroup><Size>3f,1min</Size></WidgetGroup>
 
-              <Template src="skin:button_2state_persist.xml">
+              <Template src="skin:../Tango/controls/button_2state_persist.xml">
                 <SetVariable name="TooltipId">show_microphone</SetVariable>
                 <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
                 <SetVariable name="Size">30f,20f</SetVariable>
@@ -208,7 +208,7 @@ Description:
 
               <WidgetGroup><Size>10f,1min</Size></WidgetGroup>
 
-              <Template src="skin:button_2state_persist.xml"><!-- Mixer -->
+              <Template src="skin:../Tango/controls/button_2state_persist.xml"><!-- Mixer -->
                 <SetVariable name="TooltipId">show_mixer</SetVariable>
                 <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
                 <SetVariable name="Size">20f,20f</SetVariable>
@@ -219,7 +219,7 @@ Description:
 
               <WidgetGroup><Size>3f,1min</Size></WidgetGroup>
 
-              <Template src="skin:button_2state_persist.xml"><!-- Loop/Beatjump -->
+              <Template src="skin:../Tango/controls/button_2state_persist.xml"><!-- Loop/Beatjump -->
                 <SetVariable name="ObjectName">GuiToggleButton</SetVariable>
                 <SetVariable name="Size">20f,20f</SetVariable>
                 <SetVariable name="state_0_icon">loop_beatjump_off.svg</SetVariable>
@@ -229,7 +229,7 @@ Description:
 
               <WidgetGroup><Size>3f,1min</Size></WidgetGroup>
 
-              <Template src="skin:button_2state_persist.xml"><!-- 4 Decks -->
+              <Template src="skin:../Tango/controls/button_2state_persist.xml"><!-- 4 Decks -->
                 <SetVariable name="ObjectName">GuiToggleButton2</SetVariable>
                 <SetVariable name="Size">20f,20f</SetVariable>
                 <SetVariable name="TooltipId">toggle_4decks</SetVariable>
@@ -253,7 +253,7 @@ Description:
             <Size>70f,20f</Size>
             <Children>
               <!-- invisible Rec button -->
-              <Template src="skin:button_3state_display.xml">
+              <Template src="skin:../Tango/controls/button_3state_display.xml">
                 <SetVariable name="ObjectName">RecButton</SetVariable>
                 <SetVariable name="TooltipId">toggle_recording</SetVariable>
                 <SetVariable name="Size">70f,20f</SetVariable>
@@ -265,7 +265,7 @@ Description:
                 <Layout>horizontal</Layout>
                 <Size>70f,20f</Size>
                 <Children>
-                  <Template src="skin:button_3state_display.xml">
+                  <Template src="skin:../Tango/controls/button_3state_display.xml">
                     <SetVariable name="ObjectName">RecDot</SetVariable>
                     <SetVariable name="TooltipId">toggle_recording</SetVariable>
                     <SetVariable name="Size">15f,16f</SetVariable>
@@ -288,7 +288,7 @@ Description:
 
           <WidgetGroup><Size>7f,1min</Size></WidgetGroup>
 
-          <Template src="skin:button_5state_display.xml">
+          <Template src="skin:../Tango/controls/button_5state_display.xml">
             <SetVariable name="TooltipId">broadcast_enabled</SetVariable>
             <SetVariable name="ObjectName">BroadcastButton</SetVariable>
             <SetVariable name="Size">20f,28f</SetVariable>
@@ -300,10 +300,10 @@ Description:
             <ObjectName>Battery</ObjectName>
             <Size>24,24</Size>
             <SizePolicy>f,f</SizePolicy>
-            <PixmapCharged scalemode="STRETCH_ASPECT">graphics/batt/ic_battery_charged.svg</PixmapCharged>
+            <PixmapCharged scalemode="STRETCH_ASPECT">skin:../Tango/graphics/batt/ic_battery_charged.svg</PixmapCharged>
             <NumberStates>8</NumberStates>
-            <PixmapsCharging scalemode="STRETCH_ASPECT">graphics/batt/ic_battery_charging_%1.svg</PixmapsCharging>
-            <PixmapsDischarging scalemode="STRETCH_ASPECT">graphics/batt/ic_battery_discharging_%1.svg</PixmapsDischarging>
+            <PixmapsCharging scalemode="STRETCH_ASPECT">skin:../Tango/graphics/batt/ic_battery_charging_%1.svg</PixmapsCharging>
+            <PixmapsDischarging scalemode="STRETCH_ASPECT">skin:../Tango/graphics/batt/ic_battery_discharging_%1.svg</PixmapsDischarging>
           </Battery>
 
           <WidgetGroup><!-- Clock + latency display -->
@@ -335,8 +335,8 @@ Description:
                   <VuMeter><!-- latency usage -->
                     <Size>31f,3f</Size>
                     <TooltipId>audio_latency_usage</TooltipId>
-                    <PathVu>graphics/latency_usage_over.svg</PathVu>
-                    <PathBack>graphics/latency_usage.svg</PathBack>
+                    <PathVu>skin:../Tango/graphics/latency_usage_over.svg</PathVu>
+                    <PathBack>skin:../Tango/graphics/latency_usage.svg</PathBack>
                     <Horizontal>true</Horizontal>
                     <PeakHoldSize>5</PeakHoldSize>
                     <PeakHoldTime>1000</PeakHoldTime>
diff --git a/res/skins/Tango/waveform.xml b/res/skins/Tango/waveform.xml
index 50faf610ef41..03418eb8c26c 100644
--- a/res/skins/Tango/waveform.xml
+++ b/res/skins/Tango/waveform.xml
@@ -140,7 +140,7 @@ Variables:
                 <Layout>vertical</Layout>
                 <Size>f,f</Size>
                 <Children>
-                  <Template src="skin:button_1state_right.xml">
+                  <Template src="skin:../Tango/controls/button_1state_right.xml">
                     <SetVariable name="TooltipId">beats_translate_curpos</SetVariable>
                     <SetVariable name="ObjectName">BeatgridCurpos</SetVariable>
                     <SetVariable name="Size">24f,49f</SetVariable>
@@ -156,7 +156,7 @@ Variables:
                 <Layout>vertical</Layout>
                 <SizePolicy>f,f</SizePolicy>
                 <Children>
-                  <Template src="skin:button_1state.xml">
+                  <Template src="skin:../Tango/controls/button_1state.xml">
                     <SetVariable name="TooltipId">beats_translate_earlier</SetVariable>
                     <SetVariable name="ObjectName">BeatgridEarlier</SetVariable>
                     <SetVariable name="Size">28f,24f</SetVariable>
@@ -165,7 +165,7 @@ Variables:
 
                   <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
 
-                  <Template src="skin:button_1state.xml">
+                  <Template src="skin:../Tango/controls/button_1state.xml">
                     <SetVariable name="TooltipId">beats_adjust_faster</SetVariable>
                     <SetVariable name="ObjectName">BeatgridFaster</SetVariable>
                     <SetVariable name="Size">28f,24f</SetVariable>
@@ -180,7 +180,7 @@ Variables:
                 <Layout>vertical</Layout>
                 <SizePolicy>f,f</SizePolicy>
                 <Children>
-                  <Template src="skin:button_1state.xml">
+                  <Template src="skin:../Tango/controls/button_1state.xml">
                     <SetVariable name="TooltipId">beats_translate_later</SetVariable>
                     <SetVariable name="ObjectName">BeatgridLater</SetVariable>
                     <SetVariable name="Size">28f,24f</SetVariable>
@@ -189,7 +189,7 @@ Variables:
 
                   <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
 
-                  <Template src="skin:button_1state.xml">
+                  <Template src="skin:../Tango/controls/button_1state.xml">
                     <SetVariable name="TooltipId">beats_adjust_slower</SetVariable>
                     <SetVariable name="ObjectName">BeatgridSlower</SetVariable>
                     <SetVariable name="Size">28f,24f</SetVariable>
@@ -208,7 +208,7 @@ Variables:
                     <Layout>vertical</Layout>
                     <SizePolicy>f,f</SizePolicy>
                     <Children>
-                      <Template src="skin:button_1state_right.xml">
+                      <Template src="skin:../Tango/controls/button_1state_right.xml">
                         <SetVariable name="TooltipId">shift_cues_earlier</SetVariable>
                         <SetVariable name="ObjectName">HotcuesEarlier</SetVariable>
                         <SetVariable name="Size">24f,24f</SetVariable>
@@ -216,7 +216,7 @@ Variables:
                         <SetVariable name="ConfigKeyRight"><Variable name="group"/>,shift_cues_earlier_small</SetVariable>
                       </Template>
                       <WidgetGroup><Size>1min,1f</Size></WidgetGroup>
-                      <Template src="skin:button_1state_right.xml">
+                      <Template src="skin:../Tango/controls/button_1state_right.xml">
                         <SetVariable name="TooltipId">shift_cues_later</SetVariable>
                         <SetVariable name="ObjectName">HotcuesLater</SetVariable>
                         <SetVariable name="Size">24f,24f</SetVariable>
diff --git a/res/skins/Tango/waveforms_container.xml b/res/skins/Tango/waveforms_container.xml
index 3b86f36c5589..bccca8afa87a 100644
--- a/res/skins/Tango/waveforms_container.xml
+++ b/res/skins/Tango/waveforms_container.xml
@@ -24,13 +24,13 @@ Variables:
             <Layout>vertical</Layout>
             <SizePolicy>me,min</SizePolicy>
             <Children>
-              <Template src="skin:waveform.xml">
+              <Template src="skin:../Tango/waveform.xml">
                 <SetVariable name="chanNum">1</SetVariable>
                 <SetVariable name="SignalBgColor"><Variable name="SignalBgColor_12"/></SetVariable>
                 <SetVariable name="SignalColor"><Variable name="SignalColor_12"/></SetVariable>
               </Template>
 
-              <Template src="skin:waveform.xml">
+              <Template src="skin:../Tango/waveform.xml">
                 <SetVariable name="chanNum">2</SetVariable>
                 <SetVariable name="SignalBgColor"><Variable name="SignalBgColor_12"/></SetVariable>
                 <SetVariable name="SignalColor"><Variable name="SignalColor_12"/></SetVariable>
@@ -42,13 +42,13 @@ Variables:
             <Layout>vertical</Layout>
             <SizePolicy>me,min</SizePolicy>
             <Children>
-              <Template src="skin:waveform.xml">
+              <Template src="skin:../Tango/waveform.xml">
                 <SetVariable name="chanNum">3</SetVariable>
                 <SetVariable name="SignalBgColor"><Variable name="SignalBgColor_34"/></SetVariable>
                 <SetVariable name="SignalColor"><Variable name="SignalColor_34"/></SetVariable>
               </Template>
 
-              <Template src="skin:waveform.xml">
+              <Template src="skin:../Tango/waveform.xml">
                 <SetVariable name="chanNum">4</SetVariable>
                 <SetVariable name="SignalBgColor"><Variable name="SignalBgColor_34"/></SetVariable>
                 <SetVariable name="SignalColor"><Variable name="SignalColor_34"/></SetVariable>
@@ -64,7 +64,7 @@ Variables:
 
       <WidgetGroup><ObjectName>Spacer0f</ObjectName><Size>1f,1me</Size></WidgetGroup>
 
-      <Template src="skin:button_2state_persist.xml">
+      <Template src="skin:../Tango/controls/button_2state_persist.xml">
         <SetVariable name="ObjectName">BeatgridButtonToggler</SetVariable>
         <SetVariable name="Size">14f,22me</SetVariable>
         <SetVariable name="ConfigKey">[Tango],beatgrid_buttons</SetVariable>