Merge remote-tracking branch 'upstream/master' into 2.3-string-update

21 files changed, 90 insertions, 189 deletions

diff --git a/res/controllers/Denon-MC3000-scripts.js b/res/controllers/Denon-MC3000-scripts.js
index 25ccfc7400..450f546b34 100644
--- a/res/controllers/Denon-MC3000-scripts.js
+++ b/res/controllers/Denon-MC3000-scripts.js
@@ -3,7 +3,7 @@
  *
  * Written by Bertrand Espern 2012
  *
- * 2012/05/11 V0.995 : first "good" version approuved and tested by me
+ * 2012/05/11 V0.995 : first "good" version approved and tested by me
  *
  * Special Thanks to the Programmers of Mixxx and all the contributors
  *
diff --git a/res/controllers/Denon-MC7000-scripts.js b/res/controllers/Denon-MC7000-scripts.js
index f26d246d94..35467bc175 100644
--- a/res/controllers/Denon-MC7000-scripts.js
+++ b/res/controllers/Denon-MC7000-scripts.js
@@ -78,7 +78,7 @@ MC7000.jogParams = {
 /////////////////////////////////*/
 
 
-/* OTHER VARIABLES - DONT'T TOUCH EXCEPT YOU KNOW WHAT YOU DO */
+/* OTHER VARIABLES - DON'T TOUCH UNLESS YOU KNOW WHAT YOU'RE DOING */
 
 // Resolution of the jog wheel, set so the spinny
 // Jog LED to match exactly the movement of the Jog Wheel
@@ -642,7 +642,7 @@ MC7000.needleSearchStripPosition = function(channel, control, value, status,
     if (MC7000.needleSearchTouched[deckNumber]) {
         var fullValue = (MC7000.needleDropMSB << 7) +
                     value; // move MSB 7 binary gigits to the left and add LSB
-        var position = (fullValue / 0x3FFF); // devide by all possible positions to
+        var position = (fullValue / 0x3FFF); // divide by all possible positions to
         // get relative between 0 - 1
         engine.setParameter(group, "playposition", position);
     }
diff --git a/res/controllers/Denon-MC7000.midi.xml b/res/controllers/Denon-MC7000.midi.xml
index 0aa79f6cd8..3df16760e3 100644
--- a/res/controllers/Denon-MC7000.midi.xml
+++ b/res/controllers/Denon-MC7000.midi.xml
@@ -2125,7 +2125,7 @@
                 </options>
             </control>
 <!-- EFFECTS -->
-    <!-- ASSIGN EFECT RACK TO DECK -->
+    <!-- ASSIGN EFFECT RACK TO DECK -->
             <control>
                 <group>[EffectRack1_EffectUnit1]</group>
                 <key>group_[Channel1]_enable</key>
@@ -3768,7 +3768,7 @@
             </output>
 <!-- PAD LEDs -->
 
-<!-- ASSIGN EFECT RACK TO DECK -->
+<!-- ASSIGN EFFECT RACK TO DECK -->
             <output>
                 <group>[EffectRack1_EffectUnit1]</group>
                 <key>group_[Channel1]_enable</key>
diff --git a/res/controllers/Hercules_DJControl_Inpulse_300.midi.xml b/res/controllers/Hercules_DJControl_Inpulse_300.midi.xml
index d43df23ad9..840582ea61 100644
--- a/res/controllers/Hercules_DJControl_Inpulse_300.midi.xml
+++ b/res/controllers/Hercules_DJControl_Inpulse_300.midi.xml
@@ -1859,7 +1859,7 @@
 				<on>0x07</on>
 				<off>0x05</off>
 			</output>
-			<!-- LED Assitant button-->
+			<!-- LED Assistant button-->
 			<output>
 				<group>[AutoDJ]</group>
 				<key>enabled</key>
diff --git a/res/controllers/Novation-Launchpad-Mini-scripts.js b/res/controllers/Novation-Launchpad-Mini-scripts.js
index d9f10bffae..cb4588367e 100644
--- a/res/controllers/Novation-Launchpad-Mini-scripts.js
+++ b/res/controllers/Novation-Launchpad-Mini-scripts.js
@@ -405,7 +405,7 @@ NLM.init = function()
 
         //Init hw
         midi.sendShortMsg(0xb0, 0x0, 0x0);
-        //midi.sendShortMsg(0xb0, 0x0, 0x28); //Enable buffer cycling <-- Figure out whats wrong with this
+        //midi.sendShortMsg(0xb0, 0x0, 0x28); //Enable buffer cycling <-- Figure out what's wrong with this
 
         // select buffer 0
         midi.sendShortMsg(0xb0, 0x68, 3);
diff --git a/res/controllers/Pioneer-DDJ-SB2.midi.xml b/res/controllers/Pioneer-DDJ-SB2.midi.xml
index c528dbff96..8778aecfe4 100644
--- a/res/controllers/Pioneer-DDJ-SB2.midi.xml
+++ b/res/controllers/Pioneer-DDJ-SB2.midi.xml
@@ -2419,7 +2419,7 @@
             <control>
                 <group>[EffectRack1_EffectUnit1]</group>
                 <key>prev_chain</key>
-                <description>Preview Effekt 1, Button: SHIFT &amp; PAD1 (in CUE LOOP-Mode, Deck 1 active)</description>
+                <description>Preview Effect 1, Button: SHIFT &amp; PAD1 (in CUE LOOP-Mode, Deck 1 active)</description>
                 <status>0x97</status>
                 <midino>0x68</midino>
                 <options>
@@ -2429,7 +2429,7 @@
             <control>
                 <group>[EffectRack1_EffectUnit2]</group>
                 <key>prev_chain</key>
-                <description>Preview Effekt 1, Button: SHIFT &amp; PAD1 (in CUE LOOP-Mode, Deck 2 active)</description>
+                <description>Preview Effect 1, Button: SHIFT &amp; PAD1 (in CUE LOOP-Mode, Deck 2 active)</description>
                 <status>0x98</status>
                 <midino>0x68</midino>
                 <options>
@@ -2439,7 +2439,7 @@
             <control>
                 <group>[EffectRack1_EffectUnit2]</group>
                 <key>prev_chain</key>
-                <description>Preview Effekt 1, Button: SHIFT &amp; PAD1 (in CUE LOOP-Mode, Deck 3 active)</description>
+                <description>Preview Effect 1, Button: SHIFT &amp; PAD1 (in CUE LOOP-Mode, Deck 3 active)</description>
                 <status>0x99</status>
                 <midino>0x68</midino>
                 <options>
@@ -2449,7 +2449,7 @@
             <control>
                 <group>[EffectRack1_EffectUnit2]</group>
                 <key>prev_chain</key>
-                <description>Preview Effekt 1, Button: SHIFT &amp; PAD1 (in CUE LOOP-Mode, Deck 4 active)</description>
+                <description>Preview Effect 1, Button: SHIFT &amp; PAD1 (in CUE LOOP-Mode, Deck 4 active)</description>
                 <status>0x9A</status>
                 <midino>0x68</midino>
                 <options>
@@ -3059,7 +3059,7 @@
             <control>
                 <group>[EffectRack1_EffectUnit1]</group>
                 <key>next_chain</key>
-                <description>Next Effekt 1, Button: SHIFT &amp; PAD2 (in CUE LOOP-Mode, Deck 1 active)</description>
+                <description>Next Effect 1, Button: SHIFT &amp; PAD2 (in CUE LOOP-Mode, Deck 1 active)</description>
                 <status>0x97</status>
                 <midino>0x69</midino>
                 <options>
@@ -3069,7 +3069,7 @@
             <control>
                 <group>[EffectRack1_EffectUnit2]</group>
                 <key>next_chain</key>
-                <description>Next Effekt 1, Button: SHIFT &amp; PAD2 (in CUE LOOP-Mode, Deck 2 active)</description>
+                <description>Next Effect 1, Button: SHIFT &amp; PAD2 (in CUE LOOP-Mode, Deck 2 active)</description>
                 <status>0x98</status>
                 <midino>0x69</midino>
                 <options>
@@ -3079,7 +3079,7 @@
             <control>
                 <group>[EffectRack1_EffectUnit2]</group>
                 <key>next_chain</key>
-                <description>Next Effekt 1, Button: SHIFT &amp; PAD2 (in CUE LOOP-Mode, Deck 3 active)</description>
+                <description>Next Effect 1, Button: SHIFT &amp; PAD2 (in CUE LOOP-Mode, Deck 3 active)</description>
                 <status>0x99</status>
                 <midino>0x69</midino>
                 <options>
@@ -3089,7 +3089,7 @@
             <control>
                 <group>[EffectRack1_EffectUnit2]</group>
                 <key>next_chain</key>
-                <description>Next Effekt 1, Button: SHIFT &amp; PAD2 (in CUE LOOP-Mode, Deck 4 active)</description>
+                <description>Next Effect 1, Button: SHIFT &amp; PAD2 (in CUE LOOP-Mode, Deck 4 active)</description>
                 <status>0x9A</status>
                 <midino>0x69</midino>
                 <options>
diff --git a/res/controllers/Roland_DJ-505-scripts.js b/res/controllers/Roland_DJ-505-scripts.js
index 926491d922..0bf074caf0 100644
--- a/res/controllers/Roland_DJ-505-scripts.js
+++ b/res/controllers/Roland_DJ-505-scripts.js
@@ -602,7 +602,7 @@ DJ505.Deck = function(deckNumbers, offset) {
         outKey: "sync_mode",
         flickerState: false,
         output: function(value, _group, _control) {
-            if (value === 2) {
+            if (value === 3) {
                 value = this.flickerState;
             }
             midi.sendShortMsg(this.midi[0], value ? 0x02 : 0x03, this.on);
diff --git a/res/controllers/common-controller-scripts.js b/res/controllers/common-controller-scripts.js
index af8e6ae620..7de34d5d70 100644
--- a/res/controllers/common-controller-scripts.js
+++ b/res/controllers/common-controller-scripts.js
@@ -481,7 +481,7 @@ bpm.tapButton = function(deck) {
         bpm.tap = [];
         return;
     }
-    // reject occurences of accidental double or missed taps
+    // reject occurrences of accidental double or missed taps
     // a tap is considered missed when the delta of this press is 80% longer than the previous one
     // and a tap is considered double when the delta is shorter than 40% of the previous one.
     // these numbers are just guesses that produced good results in practice
diff --git a/res/skins/LateNight/skin.xml b/res/skins/LateNight/skin.xml
index 631f0888ac..b393222fc7 100644
--- a/res/skins/LateNight/skin.xml
+++ b/res/skins/LateNight/skin.xml
@@ -105,7 +105,7 @@
             style_scheme  icons & backgrounds for library, splitters, spinnies,
                           covers, vinyl control, toolbar
             bg_tile       allows to experiment with the background tile of recessed
-                          areas without having to creat a new style_scheme folder
+                          areas without having to create a new style_scheme folder
             Note:   button borders and icons are set in style_[SCHEME].qss, too
                     so do a mass-find-and-replace there, as well. -->
       <SetVariable name="btn_scheme">classic</SetVariable>
@@ -352,7 +352,7 @@
       <Layout>vertical</Layout>
       <SizePolicy>me,me</SizePolicy>
       <Children>
-        <!-- regular/maximized libary + skin settings menu -->
+        <!-- regular/maximized library + skin settings menu -->
         <WidgetGroup>
           <Layout>horizontal</Layout>
           <SizePolicy>me,me</SizePolicy>
@@ -426,7 +426,7 @@
             <Template src="skin:skin_settings.xml"/>
 
           </Children>
-        </WidgetGroup><!-- regular/maximized libary + skin settings menu -->
+        </WidgetGroup><!-- regular/maximized library + skin settings menu -->
 
         <Template src="skin:toolbar.xml"/>
         <Template src="skin:screen_h-size_detection.xml"/>
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index db26390830..11638cc063 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -2192,7 +2192,7 @@ WCueMenuPopup QPushButton:focus {
     padding-right: 3px;
     border-right: 1px solid #000;
     /* gradient colors should match those of QHeaderView gradient,
-      with a litte transparency added to not cut off the header label */
+      with a little transparency added to not cut off the header label */
     background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
       stop:0 rgba(34,34,34,190),
       stop:1 rgba(17,17,17,190));
diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss
index bcdab58c1a..a483ea390f 100644
--- a/res/skins/Shade/style.qss
+++ b/res/skins/Shade/style.qss
@@ -613,9 +613,9 @@ WEffectSelector QAbstractScrollArea QScrollBar:vertical,
 }
 #LibraryContainer QHeaderView {
   /* Note(ronso0)
-  This previously interferred with skin scaling:
+  This previously interfered with skin scaling:
   font-size: 13px/13px;
-  This doesnt't scale when usinf QT_SCALE_FACTOR manually:
+  This doesn't scale when using QT_SCALE_FACTOR manually:
   font-size: 10pt;	*/
   font-size: 13px/13px;
   font-weight: bold;
diff --git a/res/skins/Tango (64 Samplers)/skin.xml b/res/skins/Tango (64 Samplers)/skin.xml
index e7f7b0b23f..1199afe420 100644
--- a/res/skins/Tango (64 Samplers)/skin.xml
+++ b/res/skins/Tango (64 Samplers)/skin.xml
@@ -123,68 +123,6 @@
       <attribute persist="false" config_key="[EffectRack1_EffectUnit4],group_[BusTalkover]_enable">0</attribute>
     </attributes>
   </manifest>
-<!--  ################################################################
-       Skin Colour Schemes ##########################################
-     ###############################################################
--->
-  <Schemes>
-    <Scheme>
-      <Name>Classic</Name>
-      <Filters/>
-      <!-- Colors for waveform & overview -->
-      <SetVariable name="SignalColor_12">#5EBAFF</SetVariable>
-      <SetVariable name="SignalBgColor_12">#001D33</SetVariable>
-      <SetVariable name="SignalColor_34">#DF4DF0</SetVariable>
-      <SetVariable name="SignalBgColor_34">#3A0440</SetVariable>
-      <!-- small Spinny mask and default mini cover should match -->
-      <SetVariable name="SpinnyCoverColor_12">blue</SetVariable>
-      <SetVariable name="SpinnyCoverColor_34">purple</SetVariable>
-      <SetVariable name="EndOfTrackColor">#EA0085</SetVariable>
-      <Style>
-        <!-- All text labels in decks (artist, title, time, BPM, key, ...) -->
-        #Deck1 WLabel, #DeckMini1 WLabel, #RateContainer1 WLabel, #RateContainer1 WPushButton,
-        #Deck2 WLabel, #DeckMini2 WLabel, #RateContainer2 WLabel, #RateContainer2 WPushButton {
-          color: #33a8ff;}
-        #Deck3 WLabel, #DeckMini3 WLabel, #RateContainer3 WLabel, #RateContainer3 WPushButton,
-        #Deck4 WLabel, #DeckMini4 WLabel, #RateContainer4 WLabel, #RateContainer4 WPushButton {
-          color: #d910f0;}
-        WLabel#TrackBy, WLabel#TrackByMini, WLabel#TrackComment { color: #888;}
-        <!-- Vinyl Controls toggle is transparent. This sets bg color so it matches those above -->
-        #DeckOverviewRow1, #DeckOverviewRow2 { background-color: #001D33;}
-        #DeckOverviewRow3, #DeckOverviewRow4 { background-color: #3A0440;}
-      </Style>
-    </Scheme>
-    <Scheme>
-      <Name>ClubTwist</Name>
-      <SetVariable name="SignalColor_12">#DF4DF0</SetVariable>
-      <SetVariable name="SignalBgColor_12">#3A0440</SetVariable>
-      <SetVariable name="SignalColor_34">#5EBAFF</SetVariable>
-      <SetVariable name="SignalBgColor_34">#001D33</SetVariable>
-      <SetVariable name="SpinnyCoverColor_12">purple</SetVariable>
-      <SetVariable name="SpinnyCoverColor_34">blue</SetVariable>
-      <!-- Cyan end-of-track warning -->
-      <SetVariable name="EndOfTrackColor">#00ffff</SetVariable>
-      <Style>
-        #Deck1 WLabel, #DeckMini1 WLabel, #RateContainer1 WLabel, #RateContainer1 WPushButton,
-        #Deck2 WLabel, #DeckMini2 WLabel, #RateContainer2 WLabel, #RateContainer2 WPushButton {
-          color: #e145f3;}
-        #Deck3 WLabel, #DeckMini3 WLabel, #RateContainer3 WLabel, #RateContainer3 WPushButton,
-        #Deck4 WLabel, #DeckMini4 WLabel, #RateContainer4 WLabel, #RateContainer4 WPushButton {
-          color: #3693d9;}
-        WLabel#TrackBy, WLabel#TrackByMini, WLabel#TrackComment { color: #888;}
-        #DeckOverviewRow1, #DeckOverviewRow2 { background-color: #3A0440;}
-        #DeckOverviewRow3, #DeckOverviewRow4 { background-color: #001D33;}
-        <!-- brighter, broader library focus borders -->
-        #LibraryContainer QTreeView,
-        #LibraryContainer QTableView {
-          border-width: 2px;}
-        #LibraryContainer QTreeView:focus,
-        #LibraryContainer QTableView:focus,
-        #LibraryContainer WSearchLineEdit:focus {
-          border-color: #ff8800;}
-      </Style>
-    </Scheme>
-  </Schemes>
 
   <ObjectName>Mixxx</ObjectName>
   <Style src="skin:../Tango/style.qss" src-mac="skin:../Tango/style-mac.qss"/>
@@ -238,6 +176,14 @@
     <SetVariable name="SignalRGBMidColor">#33f600</SetVariable>
     <SetVariable name="SignalRGBHighColor">#332acc</SetVariable>
     <SetVariable name="PlayedOverlayColor">#99000000</SetVariable>
+    <!-- Cyan end-of-track warning -->
+    <SetVariable name="EndOfTrackColor">#00ffff</SetVariable>
+    <SetVariable name="SignalColor_12">#DF4DF0</SetVariable>
+    <SetVariable name="SignalBgColor_12">#3A0440</SetVariable>
+    <SetVariable name="SignalColor_34">#5EBAFF</SetVariable>
+    <SetVariable name="SignalBgColor_34">#001D33</SetVariable>
+    <SetVariable name="SpinnyCoverColor_12">purple</SetVariable>
+    <SetVariable name="SpinnyCoverColor_34">blue</SetVariable>
 
 <!--################################################################
      Singleton definitions  #######################################
@@ -416,10 +362,10 @@
       </Children>
     </SingletonDefinition>
 
-<!--  ################################################################
-       SkinContainer  ###############################################
-      skin incl. invisble size detector for deck Stars #############
-     ############################################################## -->
+<!--  ##############################################################
+      SkinContainer  ###############################################
+      skin incl. invisible size detector for deck Stars ############
+      ############################################################## -->
     <WidgetGroup>
       <ObjectName>SkinContainer</ObjectName>
       <Layout>vertical</Layout>
@@ -622,6 +568,6 @@
       </Children>
     </WidgetGroup>
     <!-- SkinContainer -->
-    <!-- /skin incl. invisble size detector for deck Stars -->
+    <!-- /skin incl. invisible size detector for deck Stars -->
   </Children>
 </skin>
diff --git a/res/skins/Tango (64 Samplers)/skin_settings.xml b/res/skins/Tango (64 Samplers)/skin_settings.xml
index 8d4a80e19e..d60a825bd7 100644
--- a/res/skins/Tango (64 Samplers)/skin_settings.xml
+++ b/res/skins/Tango (64 Samplers)/skin_settings.xml
@@ -95,7 +95,7 @@ Description:
                   <!-- index 0 due to bug -->
                   <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
 
-                  <WidgetGroup><!-- translucent cover when Hot Cues are invisble -->
+                  <WidgetGroup><!-- translucent cover when Hot Cues are invisible -->
                     <ObjectName>SubmenuCover</ObjectName>
                     <Layout>vertical</Layout>
                     <Size>182f,13me</Size>
@@ -704,7 +704,7 @@ Description:
               <!-- index 0 due to bug -->
               <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
 
-              <!-- translucent cover when Effects are invisble -->
+              <!-- translucent cover when Effects are invisible -->
               <WidgetGroup>
                 <ObjectName>SubmenuCover</ObjectName>
                 <Layout>vertical</Layout>
diff --git a/res/skins/Tango/graphics/cover_default_mini_blue.svg b/res/skins/Tango/graphics/cover_default_mini_green.svg
index f42ccd0ef9..7d73967af4 100644
--- a/res/skins/Tango/graphics/cover_default_mini_blue.svg
+++ b/res/skins/Tango/graphics/cover_default_mini_green.svg
@@ -1,2 +1,2 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg id="svg3969" width="200" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4571" width="200" height="200" color="#000000" fill="#001d33"/><path id="path8" d="m100 9.2232c-50.148 0-90.777 40.695-90.777 90.808 0 50.113 40.629 90.746 90.777 90.746 50.148 0 90.777-40.632 90.777-90.746 0-50.113-40.629-90.808-90.777-90.808z" color="#000000" fill="#080808" stroke="#000" stroke-width="4" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path10" d="m100 57.314c-23.575 0-42.686 19.111-42.686 42.686 0 23.575 19.111 42.686 42.686 42.686 23.575 0 42.686-19.111 42.686-42.686 0-23.575-19.111-42.686-42.686-42.686z" fill="#414141"/><path id="path12" d="m102.5 100c0 1.3828-1.121 2.504-2.5039 2.504-1.3829 0-2.5039-1.1211-2.5039-2.504 0-1.3829 1.121-2.504 2.5039-2.504 1.3829 0 2.5039 1.121 2.5039 2.504z" fill="#1a1a1a"/></svg>
+<svg id="svg3969" width="200" height="200" version="1.1" xmlns="http://www.w3.org/2000/svg"><rect id="rect4571" width="200" height="200" color="#000000" fill="#19260B"/><path id="path8" d="m100 9.2232c-50.148 0-90.777 40.695-90.777 90.808 0 50.113 40.629 90.746 90.777 90.746 50.148 0 90.777-40.632 90.777-90.746 0-50.113-40.629-90.808-90.777-90.808z" color="#000000" fill="#080808" stroke="#000" stroke-width="4" style="block-progression:tb;text-indent:0;text-transform:none"/><path id="path10" d="m100 57.314c-23.575 0-42.686 19.111-42.686 42.686 0 23.575 19.111 42.686 42.686 42.686 23.575 0 42.686-19.111 42.686-42.686 0-23.575-19.111-42.686-42.686-42.686z" fill="#414141"/><path id="path12" d="m102.5 100c0 1.3828-1.121 2.504-2.5039 2.504-1.3829 0-2.5039-1.1211-2.5039-2.504 0-1.3829 1.121-2.504 2.5039-2.504 1.3829 0 2.5039 1.121 2.5039 2.504z" fill="#1a1a1a"/></svg>
diff --git a/res/skins/Tango/graphics/spinny_mini_mask_blue.svg b/res/skins/Tango/graphics/spinny_mini_mask_green.svg
index 32af44507e..03e9fe29f9 100644
--- a/res/skins/Tango/graphics/spinny_mini_mask_blue.svg
+++ b/res/skins/Tango/graphics/spinny_mini_mask_green.svg
@@ -1 +1 @@
-<svg id="svg3826" width="50" height="50" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path3828" d="m0 0v50h50v-50h-50zm25 1.0417c13.232 0 23.958 10.727 23.958 23.958 0 13.232-10.727 23.958-23.958 23.958-13.232 0-23.958-10.727-23.958-23.958 0-13.232 10.727-23.958 23.958-23.958z" fill="#001d33"/><path id="path3830" d="m48.958 25a23.958 23.958 0 0 1-47.917 0 23.958 23.958 0 1 1 47.917 0z" fill="none" stroke="#585858" stroke-width=".52083"/></svg>
+<svg id="svg3826" width="50" height="50" version="1.1" xmlns="http://www.w3.org/2000/svg"><path id="path3828" d="m0 0v50h50v-50h-50zm25 1.0417c13.232 0 23.958 10.727 23.958 23.958 0 13.232-10.727 23.958-23.958 23.958-13.232 0-23.958-10.727-23.958-23.958 0-13.232 10.727-23.958 23.958-23.958z" fill="#19260B"/><path id="path3830" d="m48.958 25a23.958 23.958 0 0 1-47.917 0 23.958 23.958 0 1 1 47.917 0z" fill="none" stroke="#585858" stroke-width=".52083"/></svg>
diff --git a/res/skins/Tango/size_detector_deck_controls_toggle.xml b/res/skins/Tango/size_detector_deck_controls_toggle.xml
index d4ccf65ef3..f6a8734b2c 100644
--- a/res/skins/Tango/size_detector_deck_controls_toggle.xml
+++ b/res/skins/Tango/size_detector_deck_controls_toggle.xml
@@ -2,7 +2,7 @@
 Description:
   Size-aware container that hides the toggle for deck controls if it is not
   necessary (when all deck controls are permanently visible).
-  Overall width of all controls is XYpx, the SizeAwareStack fills remainig space.
+  Overall width of all controls is XYpx, the SizeAwareStack fills remaining space.
   If it can grow broader than 1px the toggle should be visible.
 
 -->
diff --git a/res/skins/Tango/skin.xml b/res/skins/Tango/skin.xml
index d5ec2587f5..ce1b3fece2 100644
--- a/res/skins/Tango/skin.xml
+++ b/res/skins/Tango/skin.xml
@@ -84,15 +84,9 @@
       <!-- Samplers -->
       <attribute persist="true" config_key="[Samplers],show_samplers">0</attribute>
       <!-- item index in skin_settings_sampler_rows.xml, '1' enables 2 sampler rows -->
-      <attribute persist="true" config_key="[Skin],sampler_rows">4</attribute>
+      <attribute persist="true" config_key="[Skin],sampler_rows">1</attribute>
       <attribute persist="true" config_key="[Skin],sampler_row_1_expanded">0</attribute>
       <attribute persist="true" config_key="[Skin],sampler_row_2_expanded">0</attribute>
-      <attribute persist="true" config_key="[Skin],sampler_row_3_expanded">0</attribute>
-      <attribute persist="true" config_key="[Skin],sampler_row_4_expanded">0</attribute>
-      <attribute persist="true" config_key="[Skin],sampler_row_5_expanded">0</attribute>
-      <attribute persist="true" config_key="[Skin],sampler_row_6_expanded">0</attribute>
-      <attribute persist="true" config_key="[Skin],sampler_row_7_expanded">0</attribute>
-      <attribute persist="true" config_key="[Skin],sampler_row_8_expanded">0</attribute>
 
       <attribute persist="true" config_key="[Microphone],show_microphone">0</attribute>
 
@@ -123,72 +117,6 @@
       <attribute persist="false" config_key="[EffectRack1_EffectUnit4],group_[BusTalkover]_enable">0</attribute>
     </attributes>
   </manifest>
-<!--  ################################################################
-       Skin Colour Schemes ##########################################
-     ###############################################################
--->
-  <Schemes>
-    <Scheme>
-      <Name>Classic</Name>
-      <Filters/>
-      <!-- Colors for waveform & overview -->
-      <SetVariable name="SignalColor_12">#5EBAFF</SetVariable>
-      <SetVariable name="SignalBgColor_12">#001D33</SetVariable>
-      <SetVariable name="SignalColor_34">#DF4DF0</SetVariable>
-      <SetVariable name="SignalBgColor_34">#3A0440</SetVariable>
-      <!-- small Spinny mask and default mini cover should match -->
-      <SetVariable name="SpinnyCoverColor_12">blue</SetVariable>
-      <SetVariable name="SpinnyCoverColor_34">purple</SetVariable>
-      <SetVariable name="EndOfTrackColor">#EA0085</SetVariable>
-      <Style>
-        <!-- All text labels in decks (artist, title, time, BPM, key, ...) -->
-        #Deck1 WLabel, #DeckMini1 WLabel, #RateContainer1 WLabel, #RateContainer1 WPushButton,
-        #Deck2 WLabel, #DeckMini2 WLabel, #RateContainer2 WLabel, #RateContainer2 WPushButton {
-          color: #33a8ff;}
-        #Deck3 WLabel, #DeckMini3 WLabel, #RateContainer3 WLabel, #RateContainer3 WPushButton,
-        #Deck4 WLabel, #DeckMini4 WLabel, #RateContainer4 WLabel, #RateContainer4 WPushButton {
-          color: #d910f0;}
-        WLabel#TrackBy, WLabel#TrackByMini, WLabel#TrackComment { color: #888;}
-        <!-- Vinyl Controls toggle is transparent. This sets bg color so it matches those above -->
-        #DeckOverviewRow1, #DeckOverviewRow2 { background-color: #001D33;}
-        #DeckOverviewRow3, #DeckOverviewRow4 { background-color: #3A0440;}
-      </Style>
-    </Scheme>
-    <Scheme>
-      <Name>ClubTwist</Name>
-      <SetVariable name="SignalColor_12">#DF4DF0</SetVariable>
-      <SetVariable name="SignalBgColor_12">#3A0440</SetVariable>
-      <SetVariable name="SignalColor_34">#5EBAFF</SetVariable>
-      <SetVariable name="SignalBgColor_34">#001D33</SetVariable>
-      <SetVariable name="SpinnyCoverColor_12">purple</SetVariable>
-      <SetVariable name="SpinnyCoverColor_34">blue</SetVariable>
-      <!-- Cyan end-of-track warning -->
-      <SetVariable name="EndOfTrackColor">#00ffff</SetVariable>
-      <Style>
-        #Deck1 WLabel, #DeckMini1 WLabel, #RateContainer1 WLabel, #RateContainer1 WPushButton,
-        #Deck2 WLabel, #DeckMini2 WLabel, #RateContainer2 WLabel, #RateContainer2 WPushButton {
-          color: #e145f3;}
-        #Deck3 WLabel, #DeckMini3 WLabel, #RateContainer3 WLabel, #RateContainer3 WPushButton,
-        #Deck4 WLabel, #DeckMini4 WLabel, #RateContainer4 WLabel, #RateContainer4 WPushButton {
-          color: #3693d9;}
-        WLabel#TrackBy, WLabel#TrackByMini, WLabel#TrackComment { color: #888;}
-        #DeckOverviewRow1, #DeckOverviewRow2 { background-color: #3A0440;}
-        #DeckOverviewRow3, #DeckOverviewRow4 { background-color: #001D33;}
-        <!-- brighter, broader library focus borders -->
-        #LibraryContainer QTreeView,
-        #LibraryContainer QTableView {
-          border-width: 2px;}
-        #LibraryContainer QTreeView:focus,
-        #LibraryContainer QTableView:focus,
-        #LibraryContainer WSearchLineEdit:focus,
-        WBeatSpinBox:focus,
-        QSpinBox#spinBoxTransition:focus,
-        WLibrary QLineEdit,
-        #LibraryBPMSpinBox {
-          border-color: #ff8800;}
-      </Style>
-    </Scheme>
-  </Schemes>
 
   <ObjectName>Mixxx</ObjectName>
   <Style src="skin:../Tango/style.qss" src-mac="skin:../Tango/style-mac.qss"/>
@@ -242,6 +170,14 @@
     <SetVariable name="SignalRGBMidColor">#33f600</SetVariable>
     <SetVariable name="SignalRGBHighColor">#332acc</SetVariable>
     <SetVariable name="PlayedOverlayColor">#99000000</SetVariable>
+    <!-- Cyan end-of-track warning -->
+    <SetVariable name="EndOfTrackColor">#00ffff</SetVariable>
+    <SetVariable name="SignalColor_12">#DF4DF0</SetVariable>
+    <SetVariable name="SignalBgColor_12">#3A0440</SetVariable>
+    <SetVariable name="SignalColor_34">#5EBAFF</SetVariable>
+    <SetVariable name="SignalBgColor_34">#19260B</SetVariable>
+    <SetVariable name="SpinnyCoverColor_12">purple</SetVariable>
+    <SetVariable name="SpinnyCoverColor_34">green</SetVariable>
 
 <!--################################################################
      Singleton definitions  #######################################
@@ -420,10 +356,10 @@
       </Children>
     </SingletonDefinition>
 
-<!--  ################################################################
-       SkinContainer  ###############################################
-      skin incl. invisble size detector for deck Stars #############
-     ############################################################## -->
+<!--  ##############################################################
+      SkinContainer ################################################
+      skin incl. invisible size detector for deck Stars ############
+      ############################################################## -->
     <WidgetGroup>
       <ObjectName>SkinContainer</ObjectName>
       <Layout>vertical</Layout>
@@ -624,6 +560,6 @@
       </Children>
     </WidgetGroup>
     <!-- SkinContainer -->
-    <!-- /skin incl. invisble size detector for deck Stars -->
+    <!-- /skin incl. invisible size detector for deck Stars -->
   </Children>
 </skin>
diff --git a/res/skins/Tango/skin_preview_ClubTwist.png b/res/skins/Tango/skin_preview.png
index 7fcba2f060..7fcba2f060 100644
--- a/res/skins/Tango/skin_preview_ClubTwist.png
+++ b/res/skins/Tango/skin_preview.png
diff --git a/res/skins/Tango/skin_preview_Classic.png b/res/skins/Tango/skin_preview_Classic.png
deleted file mode 100644
index a68a9f12af..0000000000
--- a/res/skins/Tango/skin_preview_Classic.png
+++ /dev/null
diff --git a/res/skins/Tango/skin_settings.xml b/res/skins/Tango/skin_settings.xml
index 93f0b1237b..c43b4c97fd 100644
--- a/res/skins/Tango/skin_settings.xml
+++ b/res/skins/Tango/skin_settings.xml
@@ -95,7 +95,7 @@ Description:
                   <!-- index 0 due to bug -->
                   <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
 
-                  <!-- translucent cover when Hot Cues are invisble -->
+                  <!-- translucent cover when Hot Cues are invisible -->
                   <WidgetGroup>
                     <ObjectName>SubmenuCover</ObjectName>