diff --git a/res/skins/LateNight/decks/row_5_transportLoopJump.xml b/res/skins/LateNight/decks/row_5_transportLoopJump.xml
index 1045ac6e295..0dec3fa84ed 100644
--- a/res/skins/LateNight/decks/row_5_transportLoopJump.xml
+++ b/res/skins/LateNight/decks/row_5_transportLoopJump.xml
@@ -247,10 +247,11 @@
                     <MinimumSize>46,26</MinimumSize>
                     <MaximumSize>72,26</MaximumSize>
                     <Value><Variable name="Group"/>,beatloop_size</Value>
+                    <!-- disabled until 'highlight' property has been added to WBeatSpinBox / wbasewidget.
                     <Connection>
                       <ConfigKey><Variable name="Group"/>,track_loaded</ConfigKey>
                       <BindProperty>highlight</BindProperty>
-                    </Connection>
+                    </Connection> -->
                   </BeatSpinBox>
                 </Children>
               </WidgetGroup>
@@ -313,10 +314,11 @@
                     <MinimumSize>46,26</MinimumSize>
                     <MaximumSize>72,26</MaximumSize>
                     <Value><Variable name="Group"/>,beatjump_size</Value>
+                    <!-- disabled until 'highlight' property has been added to WBeatSpinBox / wbasewidget.
                     <Connection>
                       <ConfigKey><Variable name="Group"/>,track_loaded</ConfigKey>
                       <BindProperty>highlight</BindProperty>
-                    </Connection>
+                    </Connection> -->
                   </BeatSpinBox>
                 </Children>
               </WidgetGroup>
diff --git a/res/skins/LateNight/decks/row_5_transportLoopJump_compact.xml b/res/skins/LateNight/decks/row_5_transportLoopJump_compact.xml
index 521eab522ee..6c1c57a8820 100644
--- a/res/skins/LateNight/decks/row_5_transportLoopJump_compact.xml
+++ b/res/skins/LateNight/decks/row_5_transportLoopJump_compact.xml
@@ -103,10 +103,11 @@
                 <MinimumSize>46,26</MinimumSize>
                 <MaximumSize>72,26</MaximumSize>
                 <Value><Variable name="Group"/>,beatloop_size</Value>
+                <!-- disabled until 'highlight' property has been added to WBeatSpinBox / wbasewidget.
                 <Connection>
                   <ConfigKey><Variable name="Group"/>,track_loaded</ConfigKey>
                   <BindProperty>highlight</BindProperty>
-                </Connection>
+                </Connection> -->
               </BeatSpinBox>
 
               <WidgetGroup>
@@ -124,10 +125,11 @@
                 <Align>center</Align>
                 <Alignment>center</Alignment>
                 <Value><Variable name="Group"/>,beatjump_size</Value>
+                <!-- disabled until 'highlight' property has been added to WBeatSpinBox / wbasewidget.
                 <Connection>
                   <ConfigKey><Variable name="Group"/>,track_loaded</ConfigKey>
                   <BindProperty>highlight</BindProperty>
-                </Connection>
+                </Connection> -->
               </BeatSpinBox>
             </Children>
             <Connection>
diff --git a/res/skins/LateNight/mixer/vumeters_compact.xml b/res/skins/LateNight/mixer/vumeters_compact.xml
index d1a3fdf2c11..9c10c94f7b7 100644
--- a/res/skins/LateNight/mixer/vumeters_compact.xml
+++ b/res/skins/LateNight/mixer/vumeters_compact.xml
@@ -47,7 +47,7 @@
         </Children>
       </WidgetGroup><!-- 1 / Master / 2 -->
 
-      <WidgetGroup><!-- 3 / (Master) / 4 -->
+      <WidgetGroup><!-- 3 / (Main) / 4 -->
         <Layout>horizontal</Layout>
         <SizePolicy>min,me</SizePolicy>
         <Children>
@@ -69,9 +69,10 @@
             <Children>
               <WidgetGroup>
                 <Layout>stacked</Layout>
-                <Size>15f,96f</Size>
+                <Size>14f,96f</Size>
                 <Children>
                   <WidgetGroup>
+                    <!-- <TooltipId>master_VuMeter</TooltipId> -->
                     <ObjectName>VuMasterCover</ObjectName>
                   </WidgetGroup>
                   <!-- Unfortnately we can load a Singleton only once,
@@ -97,7 +98,7 @@
           <ConfigKey persist="true">[Skin],show_4decks</ConfigKey>
           <BindProperty>visible</BindProperty>
         </Connection>
-      </WidgetGroup><!-- 3 / dimmed Master / 4 -->
+      </WidgetGroup><!-- 3 / (Main) / 4 -->
 
     </Children>
     <Connection>
diff --git a/res/skins/LateNight/style_classic.qss b/res/skins/LateNight/style_classic.qss
index 3858975777d..3d7749c3c09 100644
--- a/res/skins/LateNight/style_classic.qss
+++ b/res/skins/LateNight/style_classic.qss
@@ -1838,7 +1838,8 @@ WPushButton#SamplerExpand[displayValue="0"],
 #RecDot[highlight="0"] {
   image: url(skin:/classic/buttons/btn__rec_dot.svg) no-repeat center center;
   }
-  #RecDot[highlight="1"], #RecDot[highlight="2"] {
+  #RecDot[highlight="1"],
+  #RecDot[highlight="2"] {
     image: url(skin:/classic/buttons/btn__rec_dot_active.svg) no-repeat center center;
   }
 
@@ -1945,16 +1946,6 @@ QPushButton#pushButtonRepeatPlaylist:!checked {
 /************** Library *******************************************************/
 
 #LibraryContainer {
-  /* ToDo (ronso0)
-  Check, may be obsolete since tollbar is at the top now.
-
-  make a smooth transition from toolbar at the bottom to
-  darker skin background at the top.
-  Splitter handles should be translucent for this to work.
-
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
-    stop:0 #080808,
-    stop:1 #1e1e1e); */
 }
 
 WLibrary,
diff --git a/res/skins/LateNight/style_palemoon.qss b/res/skins/LateNight/style_palemoon.qss
index 46bb6f3dbd8..dc69f841547 100644
--- a/res/skins/LateNight/style_palemoon.qss
+++ b/res/skins/LateNight/style_palemoon.qss
@@ -150,6 +150,7 @@ QAbstractScrollArea::corner {
 #WaveformsFrame,
 #OverviewBox,
 #OverviewBoxMini,
+#KeyText,
 WSearchLineEdit,
 WCueMenuPopup #CueLabelEdit {
   border-top: 1px solid #0d0d0d;
@@ -182,12 +183,10 @@ WSearchLineEdit {
   #OverviewBoxMini[highlight="1"] {
     background-color: #151515;
   }
-  WBeatSpinBox[highlight="0"] {
-    background-color: #171719;
-    }
-    WBeatSpinBox[highlight="1"] {
-      background-color: #121213;
-    }
+  #KeyText {
+    border-width: 1px 0px 1px 0px;
+  }
+
   #KeyText,
   #DeckSettingsContainer,
   #DeckSettingsContainerCompact,
@@ -196,8 +195,7 @@ WSearchLineEdit {
   /* Prevent cut-off or shifted stars on macOS */
   WStarRating {
     background-color: #19191a;
-    }
-    #KeyText,
+  }
     #DeckSettingsContainer,
     #DeckSettingsContainerCompact,
     #SamplerSettingsContainer {
@@ -1252,7 +1250,8 @@ WEffectSelector,
     color: #766b65;
   }
 
-  WBeatSpinBox, #spinBoxTransition {
+  WBeatSpinBox,
+  #spinBoxTransition {
     color: #a7998b;
   }
 
@@ -1566,7 +1565,7 @@ WPushButton#QuickEffectButton[displayValue="0"],
 WPushButton#PlaySampler[displayValue="0"],
 #MicAuxUnit WPushButton[displayValue="0"],
 #MicDuckingContainer WPushButton[displayValue="0"],
-/* Beatsize up/down buttons */
+WBeatSpinBox,
 WBeatSpinBox::up-button,
 WBeatSpinBox::down-button {
   background-color: #121213;
@@ -2435,12 +2434,6 @@ WColorPicker QPushButton[checked="true"] {
 }
 
 #LibraryContainer {
-  /* make a smooth transition from toolbar at the bottom to
-    darker skin background at the top.
-    Splitter handles should be translucent for this to work.
-  background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1,
-    stop:0 #080808,
-    stop:1 #1e1e1e); */
 }
 
 #LibraryContainer QTableView,
@@ -2654,7 +2647,6 @@ WSearchLineEdit {
     background-color: #161617;
     color: #161617;
   }
-  /* Clear button: see /skins/default.qss */
 
 /************ splitters ***********************/
 /* HorizontalSplitter (the splitter itself is horizontal)
diff --git a/res/skins/Tango (64 Samplers)/skin_preview_Classic.png b/res/skins/Tango (64 Samplers)/skin_preview.png
similarity index 100%
rename from res/skins/Tango (64 Samplers)/skin_preview_Classic.png
rename to res/skins/Tango (64 Samplers)/skin_preview.png
diff --git a/res/skins/Tango (64 Samplers)/skin_preview_ClubTwist.png b/res/skins/Tango (64 Samplers)/skin_preview_ClubTwist.png
deleted file mode 100644
index dc4c0646459..00000000000
Binary files a/res/skins/Tango (64 Samplers)/skin_preview_ClubTwist.png and /dev/null differ
diff --git a/res/skins/Tango/skin.xml b/res/skins/Tango/skin.xml
index 4aac982e2a2..6d6eba0b6ad 100644
--- a/res/skins/Tango/skin.xml
+++ b/res/skins/Tango/skin.xml
@@ -27,7 +27,7 @@
     <title>Tango</title>
     <author>ronso0@mixxx.org</author>
     <version>2.3.0.01</version>
-    <description>A flexible nighttime skin with stacked waveforms, 4 decks and 8 samplers that can be minimized to the bare essentials.</description>
+    <description>A flexible nighttime skin with stacked waveforms, 4 decks and 16 samplers that can be minimized to the bare essentials.</description>
     <language>en</language>
     <license>Creative Commons Attribution, Share-Alike 3.0 Unported</license>