diff --git a/res/skins/LateNight/controls/button_hotcue.xml b/res/skins/LateNight/controls/button_hotcue.xml
index fe8d3163823..fa2a9993bc7 100644
--- a/res/skins/LateNight/controls/button_hotcue.xml
+++ b/res/skins/LateNight/controls/button_hotcue.xml
@@ -16,6 +16,7 @@
         <Group><Variable name="Group"/></Group>
         <Hotcue><Variable name="number"/></Hotcue>
         <NumberStates>2</NumberStates>
+        <DimBrightThreshold><Variable name="DimBrightThresholdHotcueBtn"/></DimBrightThreshold>
         <State>
           <Number>0</Number>
           <Unpressed scalemode="STRETCH">skin:/<Variable name="BtnScheme"/>/buttons/btn_<Variable name="BtnType"/>_square.svg</Unpressed>
diff --git a/res/skins/LateNight/decks/overview.xml b/res/skins/LateNight/decks/overview.xml
index 59da259ee04..d05ea8c46d2 100644
--- a/res/skins/LateNight/decks/overview.xml
+++ b/res/skins/LateNight/decks/overview.xml
@@ -18,6 +18,7 @@
     <PlayPosColor><Variable name="PlayPosColor"/></PlayPosColor>
     <EndOfTrackColor><Variable name="EndOfTrackColor"/></EndOfTrackColor>
     <LabelFontSize><Variable name="OverviewFontSize"/></LabelFontSize>
+    <DimBrightThreshold><Variable name="DimBrightThresholdOverview"/></DimBrightThreshold>
     <!--LabelTextColor>#fff</LabelTextColor>
     <LabelBackgroundColor>rgba(0,0,0,255)</LabelBackgroundColor>
     <LabelBackgroundColor>0,0,0,255</LabelBackgroundColor>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__1_active_dark.svg b/res/skins/LateNight/palemoon/buttons/btn__1_active_dark.svg
index d54073b1168..cbab693feb9 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__1_active_dark.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__1_active_dark.svg
@@ -5,10 +5,10 @@
    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"
-   width="20"
-   height="24"
+   id="svg6"
    version="1.1"
-   id="svg6">
+   height="24"
+   width="20">
   <metadata
      id="metadata12">
     <rdf:RDF>
@@ -22,37 +22,15 @@
     </rdf:RDF>
   </metadata>
   <defs
-     id="defs10">
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter827"
-       x="-0.90496552"
-       width="2.809931"
-       y="-0.44876881"
-       height="1.8975376">
-      <feGaussianBlur
-         stdDeviation="1.9577637"
-         id="feGaussianBlur829" />
-    </filter>
-  </defs>
+     id="defs10" />
   <text
-     id="text836"
-     y="17.235025"
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#e0d9d1;fill-opacity:1;stroke:none;"
      x="5.8255696"
-     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#666666;fill-opacity:1;stroke:#666666;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter827);"
-     xml:space="preserve"><tspan
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#666666;fill-opacity:1;stroke:#666666;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;"
-       y="17.235025"
-       x="5.8255696"
-       id="tspan834">1</tspan></text>
-  <text
-     id="text836-5"
      y="17.235025"
-     x="5.8255696"
-     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;"
-     xml:space="preserve"><tspan
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#000000;fill-opacity:1;"
-       y="17.235025"
+     id="text836-5"><tspan
+       id="tspan834-8"
        x="5.8255696"
-       id="tspan834-8">1</tspan></text>
+       y="17.235025"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#e0d9d1;fill-opacity:1;">1</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__2_active_dark.svg b/res/skins/LateNight/palemoon/buttons/btn__2_active_dark.svg
index ccf0e84e6ad..d8fae4aa48e 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__2_active_dark.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__2_active_dark.svg
@@ -5,10 +5,10 @@
    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"
-   width="20"
-   height="24"
+   id="svg6"
    version="1.1"
-   id="svg6">
+   height="24"
+   width="20">
   <metadata
      id="metadata12">
     <rdf:RDF>
@@ -22,37 +22,15 @@
     </rdf:RDF>
   </metadata>
   <defs
-     id="defs10">
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter819"
-       x="-0.73362573"
-       width="2.4672515"
-       y="-0.50755226"
-       height="2.0151045">
-      <feGaussianBlur
-         stdDeviation="2.2460124"
-         id="feGaussianBlur821" />
-    </filter>
-  </defs>
+     id="defs10" />
   <text
-     id="text836"
-     y="17.235025"
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#e0d9d1;fill-opacity:1;stroke:none;"
      x="5.8255696"
-     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#666666;fill-opacity:1;stroke:#666666;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter819);"
-     xml:space="preserve"><tspan
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#666666;fill-opacity:1;stroke:#666666;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;"
-       y="17.235025"
-       x="5.8255696"
-       id="tspan834">2</tspan></text>
-  <text
-     id="text836-5"
      y="17.235025"
-     x="5.8255696"
-     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;"
-     xml:space="preserve"><tspan
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#000000;fill-opacity:1;"
-       y="17.235025"
+     id="text836-5"><tspan
+       id="tspan834-8"
        x="5.8255696"
-       id="tspan834-8">2</tspan></text>
+       y="17.235025"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#e0d9d1;fill-opacity:1;">2</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__3_active_dark.svg b/res/skins/LateNight/palemoon/buttons/btn__3_active_dark.svg
index 77efb03972d..cd1e40e1f10 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__3_active_dark.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__3_active_dark.svg
@@ -5,10 +5,10 @@
    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"
-   width="20"
-   height="24"
+   id="svg6"
    version="1.1"
-   id="svg6">
+   height="24"
+   width="20">
   <metadata
      id="metadata12">
     <rdf:RDF>
@@ -22,37 +22,15 @@
     </rdf:RDF>
   </metadata>
   <defs
-     id="defs10">
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter819"
-       x="-0.74555336"
-       width="2.4911067"
-       y="-0.50199601"
-       height="2.003992">
-      <feGaussianBlur
-         stdDeviation="2.2513835"
-         id="feGaussianBlur821" />
-    </filter>
-  </defs>
+     id="defs10" />
   <text
-     id="text836"
-     y="17.235025"
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#e0d9d1;fill-opacity:1;stroke:none;"
      x="5.8255696"
-     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#666666;fill-opacity:1;stroke:#666666;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter819);"
-     xml:space="preserve"><tspan
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#666666;fill-opacity:1;stroke:#666666;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;"
-       y="17.235025"
-       x="5.8255696"
-       id="tspan834">3</tspan></text>
-  <text
-     id="text836-5"
      y="17.235025"
-     x="5.8255696"
-     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;"
-     xml:space="preserve"><tspan
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#000000;fill-opacity:1;"
-       y="17.235025"
+     id="text836-5"><tspan
+       id="tspan834-8"
        x="5.8255696"
-       id="tspan834-8">3</tspan></text>
+       y="17.235025"
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#e0d9d1;fill-opacity:1;">3</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__4_active_dark.svg b/res/skins/LateNight/palemoon/buttons/btn__4_active_dark.svg
index 9441b48c067..5a2ba603e56 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__4_active_dark.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__4_active_dark.svg
@@ -22,37 +22,15 @@
     </rdf:RDF>
   </metadata>
   <defs
-     id="defs10">
-    <filter
-       height="2.0522572"
-       y="-0.52612859"
-       width="2.3960073"
-       x="-0.69800363"
-       id="filter823"
-       style="color-interpolation-filters:sRGB">
-      <feGaussianBlur
-         id="feGaussianBlur825"
-         stdDeviation="2.2952474" />
-    </filter>
-  </defs>
+     id="defs10" />
   <text
      xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#666666;fill-opacity:1;stroke:#666666;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter823)"
-     x="5.8255696"
-     y="17.235025"
-     id="text836"><tspan
-       id="tspan834"
-       x="5.8255696"
-       y="17.235025"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#666666;fill-opacity:1;stroke:#666666;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">4</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#e0d9d1;fill-opacity:1;stroke:none;"
      x="5.8255696"
      y="17.235025"
      id="text836-5"><tspan
        id="tspan834-8"
        x="5.8255696"
        y="17.235025"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#000000;fill-opacity:1;">4</tspan></text>
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#e0d9d1;fill-opacity:1;">4</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__5_active_dark.svg b/res/skins/LateNight/palemoon/buttons/btn__5_active_dark.svg
index c954a2601fa..2a02f01e892 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__5_active_dark.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__5_active_dark.svg
@@ -22,37 +22,15 @@
     </rdf:RDF>
   </metadata>
   <defs
-     id="defs10">
-    <filter
-       height="1.9955466"
-       y="-0.49777328"
-       width="2.5101331"
-       x="-0.75506653"
-       id="filter819"
-       style="color-interpolation-filters:sRGB">
-      <feGaussianBlur
-         id="feGaussianBlur821"
-         stdDeviation="2.2012533" />
-    </filter>
-  </defs>
+     id="defs10" />
   <text
      xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#666666;fill-opacity:1;stroke:#666666;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter819)"
-     x="5.8255696"
-     y="17.235025"
-     id="text836"><tspan
-       id="tspan834"
-       x="5.8255696"
-       y="17.235025"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#666666;fill-opacity:1;stroke:#666666;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">5</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#e0d9d1;fill-opacity:1;stroke:none;"
      x="5.8255696"
      y="17.235025"
      id="text836-5"><tspan
        id="tspan834-8"
        x="5.8255696"
        y="17.235025"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#000000;fill-opacity:1;">5</tspan></text>
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#e0d9d1;fill-opacity:1;">5</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__6_active_dark.svg b/res/skins/LateNight/palemoon/buttons/btn__6_active_dark.svg
index da9215524e5..a0ed4cdf06f 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__6_active_dark.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__6_active_dark.svg
@@ -22,37 +22,15 @@
     </rdf:RDF>
   </metadata>
   <defs
-     id="defs10">
-    <filter
-       height="2.0130754"
-       y="-0.50653769"
-       width="2.4715116"
-       x="-0.73575581"
-       id="filter823"
-       style="color-interpolation-filters:sRGB">
-      <feGaussianBlur
-         id="feGaussianBlur825"
-         stdDeviation="2.2657064" />
-    </filter>
-  </defs>
+     id="defs10" />
   <text
      xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#666666;fill-opacity:1;stroke:#666666;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter823)"
-     x="5.8255696"
-     y="17.235025"
-     id="text836"><tspan
-       id="tspan834"
-       x="5.8255696"
-       y="17.235025"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#666666;fill-opacity:1;stroke:#666666;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">6</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#e0d9d1;fill-opacity:1;stroke:none;"
      x="5.8255696"
      y="17.235025"
      id="text836-5"><tspan
        id="tspan834-8"
        x="5.8255696"
        y="17.235025"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#000000;fill-opacity:1;">6</tspan></text>
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#e0d9d1;fill-opacity:1;">6</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__7_active_dark.svg b/res/skins/LateNight/palemoon/buttons/btn__7_active_dark.svg
index d42f54e544e..0d0d0acff71 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__7_active_dark.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__7_active_dark.svg
@@ -22,37 +22,15 @@
     </rdf:RDF>
   </metadata>
   <defs
-     id="defs10">
-    <filter
-       height="2.0310959"
-       y="-0.51554795"
-       width="2.435081"
-       x="-0.71754051"
-       id="filter855"
-       style="color-interpolation-filters:sRGB">
-      <feGaussianBlur
-         id="feGaussianBlur857"
-         stdDeviation="2.2460124" />
-    </filter>
-  </defs>
+     id="defs10" />
   <text
      xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#666666;fill-opacity:1;stroke:#666666;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter855)"
-     x="5.8255696"
-     y="17.235025"
-     id="text836"><tspan
-       id="tspan834"
-       x="5.8255696"
-       y="17.235025"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#666666;fill-opacity:1;stroke:#666666;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">7</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#e0d9d1;fill-opacity:1;stroke:none;"
      x="5.8255696"
      y="17.235025"
      id="text836-5"><tspan
        id="tspan834-8"
        x="5.8255696"
        y="17.235025"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#000000;fill-opacity:1;">7</tspan></text>
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#e0d9d1;fill-opacity:1;">7</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/palemoon/buttons/btn__8_active_dark.svg b/res/skins/LateNight/palemoon/buttons/btn__8_active_dark.svg
index 7cc83091b54..858eae7290a 100644
--- a/res/skins/LateNight/palemoon/buttons/btn__8_active_dark.svg
+++ b/res/skins/LateNight/palemoon/buttons/btn__8_active_dark.svg
@@ -5,10 +5,10 @@
    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"
-   id="svg6"
-   version="1.1"
+   width="20"
    height="24"
-   width="20">
+   version="1.1"
+   id="svg6">
   <metadata
      id="metadata12">
     <rdf:RDF>
@@ -22,37 +22,15 @@
     </rdf:RDF>
   </metadata>
   <defs
-     id="defs10">
-    <filter
-       style="color-interpolation-filters:sRGB"
-       id="filter1125"
-       x="-0.73888889"
-       width="2.4777778"
-       y="-0.50506329"
-       height="2.0101266">
-      <feGaussianBlur
-         stdDeviation="2.2621257"
-         id="feGaussianBlur1127" />
-    </filter>
-  </defs>
+     id="defs10" />
   <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#666666;fill-opacity:1;stroke:#666666;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter1125);"
-     x="5.8255696"
+     id="text836-5"
      y="17.235025"
-     id="text836"><tspan
-       id="tspan834"
-       x="5.8255696"
-       y="17.235025"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#666666;fill-opacity:1;stroke:#666666;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;">8</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;"
      x="5.8255696"
-     y="17.235025"
-     id="text836-5"><tspan
-       id="tspan834-8"
-       x="5.8255696"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#e0d9d1;fill-opacity:1;stroke:none;"
+     xml:space="preserve"><tspan
+       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#e0d9d1;fill-opacity:1;"
        y="17.235025"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.66666698px;font-family:'Open Sans';-inkscape-font-specification:'Open Sans Bold';fill:#000000;fill-opacity:1;">8</tspan></text>
+       x="5.8255696"
+       id="tspan834-8">8</tspan></text>
 </svg>
diff --git a/res/skins/LateNight/skin.xml b/res/skins/LateNight/skin.xml
index b10da58e661..cc4134400e1 100644
--- a/res/skins/LateNight/skin.xml
+++ b/res/skins/LateNight/skin.xml
@@ -158,6 +158,10 @@
       <SetVariable name="SignalMidColor">darkgreen</SetVariable><!-- #006400 -->
       <SetVariable name="SignalLowColor">orangered</SetVariable><!-- #ff4500 -->
 
+      <SetVariable name="DimBrightThresholdOverview">127</SetVariable>
+      <SetVariable name="DimBrightThresholdWaveform">105</SetVariable>
+      <SetVariable name="DimBrightThresholdHotcueBtn">105</SetVariable>
+
       <SetVariable name="AxesColor">#999</SetVariable>
       <SetVariable name="BeatColor">#999</SetVariable>
       <SetVariable name="PlayPosColor">#00c6ff</SetVariable>
diff --git a/res/skins/LateNight/waveform.xml b/res/skins/LateNight/waveform.xml
index fadef75e58d..699ef215fb5 100644
--- a/res/skins/LateNight/waveform.xml
+++ b/res/skins/LateNight/waveform.xml
@@ -29,6 +29,7 @@
             <BeatHighlightColor></BeatHighlightColor>
             <PlayPosColor><Variable name="PlayPosColor"/></PlayPosColor>
             <EndOfTrackColor><Variable name="EndOfTrackColor"/></EndOfTrackColor>
+            <DimBrightThreshold><Variable name="DimBrightThresholdWaveform"/></DimBrightThreshold>
             <!--
             The hotcues not represented by a button in the current skin show only in the waveform under two circumstances:
               - if a MIDI device which supports more hotcues than buttons are in the current skin has them activated
diff --git a/src/dialog/dlgreplacecuecolor.cpp b/src/dialog/dlgreplacecuecolor.cpp
index 53c1c768673..caf6ac2f814 100644
--- a/src/dialog/dlgreplacecuecolor.cpp
+++ b/src/dialog/dlgreplacecuecolor.cpp
@@ -24,7 +24,7 @@ const QString kColorButtonStyleSheetDark = QStringLiteral(
 void setButtonColor(QPushButton* button, const QColor& color) {
     button->setText(color.name());
     button->setStyleSheet(
-            (Color::isDimmColor(color)
+            (Color::isDimColor(color)
                             ? kColorButtonStyleSheetDark
                             : kColorButtonStyleSheetLight)
                     .arg(color.name()));
diff --git a/src/util/color/color.cpp b/src/util/color/color.cpp
index 6f46dbf9592..182eeaf1f42 100644
--- a/src/util/color/color.cpp
+++ b/src/util/color/color.cpp
@@ -17,7 +17,7 @@ int brightness(int red, int green, int blue) {
 
 // If the baseColor is darker than the global threshold,
 // returns a lighter color, otherwise returns a darker color.
-QColor chooseContrastColor(QColor baseColor) {
+QColor chooseContrastColor(QColor baseColor, int dimBrightThreshold) {
     // Will produce a color that is 60% brighter.
     static const int iLighterFactor = 160;
     // We consider a hsv color dark if its value is <= 20% of max value
@@ -44,7 +44,10 @@ QColor chooseContrastColor(QColor baseColor) {
     // not a good indicator of a color brightness (saturation comes into play too).
     // That's why we call chooseColorByBrightness so the proper brightness of the color is used
     // to choose between the light and the dark colors.
-    QColor contrastColor = chooseColorByBrightness(baseColor, lightColor.toRgb(), darkColor.toRgb());
+    QColor contrastColor = chooseColorByBrightness(baseColor,
+            lightColor.toRgb(),
+            darkColor.toRgb(),
+            dimBrightThreshold);
     return contrastColor;
 }
 
diff --git a/src/util/color/color.h b/src/util/color/color.h
index 7361d5acb87..912e642cef0 100644
--- a/src/util/color/color.h
+++ b/src/util/color/color.h
@@ -10,18 +10,30 @@ inline int brightness(const QColor& color) {
     return brightness(color.red(), color.green(), color.blue());
 }
 
-inline bool isDimmColor(const QColor& color) {
+inline bool isDimColor(const QColor& color) {
     return brightness(color) <= 127;
 }
 
+inline bool isDimColorCustom(const QColor& color, int threshold) {
+    if (threshold < 0 || threshold > 255) {
+        return isDimColor(color);
+    }
+    return brightness(color) <= threshold;
+}
+
 // If the colorToChooseBy is darker than the global threshold,
 // dimmColor will be returned. Otherwise brightColor will be returned.
-inline QColor chooseColorByBrightness(QColor colorToChooseBy, QColor dimmColor, QColor brightColor) {
-    return isDimmColor(colorToChooseBy) ? dimmColor : brightColor;
+inline QColor chooseColorByBrightness(QColor colorToChooseBy,
+        QColor dimColor,
+        QColor brightColor,
+        int dimBrightThreshold) {
+    return isDimColorCustom(colorToChooseBy, dimBrightThreshold)
+            ? dimColor
+            : brightColor;
 }
 
 // If the baseColor is darker than the global threshold,
 // returns a lighter color, otherwise returns a darker color.
-QColor chooseContrastColor(QColor baseColor);
+QColor chooseContrastColor(QColor baseColor, int dimBrightThreshold);
 
 } // namespace Color
diff --git a/src/waveform/renderers/waveformmark.cpp b/src/waveform/renderers/waveformmark.cpp
index 46d75d921a4..12fe909e62a 100644
--- a/src/waveform/renderers/waveformmark.cpp
+++ b/src/waveform/renderers/waveformmark.cpp
@@ -80,7 +80,8 @@ WaveformMark::WaveformMark(const QString& group,
     } else {
         color = WSkinColor::getCorrectColor(color);
     }
-    setBaseColor(color);
+    int dimBrightThreshold = signalColors.getDimBrightThreshold();
+    setBaseColor(color, dimBrightThreshold);
 
     m_textColor = context.selectString(node, "TextColor");
     if (!m_textColor.isValid()) {
@@ -103,11 +104,14 @@ WaveformMark::WaveformMark(const QString& group,
     }
 }
 
-void WaveformMark::setBaseColor(QColor baseColor) {
+void WaveformMark::setBaseColor(QColor baseColor, int dimBrightThreshold) {
     m_image = QImage();
     m_fillColor = baseColor;
-    m_borderColor = Color::chooseContrastColor(baseColor);
-    m_labelColor = Color::chooseColorByBrightness(baseColor, QColor(255,255,255,255), QColor(0,0,0,255));
+    m_borderColor = Color::chooseContrastColor(baseColor, dimBrightThreshold);
+    m_labelColor = Color::chooseColorByBrightness(baseColor,
+            QColor(255, 255, 255, 255),
+            QColor(0, 0, 0, 255),
+            dimBrightThreshold);
 };
 
 bool WaveformMark::contains(QPoint point, Qt::Orientation orientation) const {
diff --git a/src/waveform/renderers/waveformmark.h b/src/waveform/renderers/waveformmark.h
index abb0da82868..875584b27ef 100644
--- a/src/waveform/renderers/waveformmark.h
+++ b/src/waveform/renderers/waveformmark.h
@@ -55,7 +55,7 @@ class WaveformMark {
     }
 
     // Sets the appropriate mark colors based on the base color
-    void setBaseColor(QColor baseColor);
+    void setBaseColor(QColor baseColor, int dimBrightThreshold);
     QColor fillColor() const {
         return m_fillColor;
     }
diff --git a/src/waveform/renderers/waveformrendermark.cpp b/src/waveform/renderers/waveformrendermark.cpp
index 6c3209205fa..ba974cd5e79 100644
--- a/src/waveform/renderers/waveformrendermark.cpp
+++ b/src/waveform/renderers/waveformrendermark.cpp
@@ -135,7 +135,8 @@ void WaveformRenderMark::slotCuesUpdated() {
                 !pMark->fillColor().isValid() ||
                 newColor != pMark->fillColor()) {
             pMark->m_text = newLabel;
-            pMark->setBaseColor(newColor);
+            int dimBrightThreshold = m_waveformRenderer->getDimBrightThreshold();
+            pMark->setBaseColor(newColor, dimBrightThreshold);
             generateMarkImage(pMark);
         }
     }
diff --git a/src/waveform/renderers/waveformsignalcolors.cpp b/src/waveform/renderers/waveformsignalcolors.cpp
index 66286070cc2..198a5421ef0 100644
--- a/src/waveform/renderers/waveformsignalcolors.cpp
+++ b/src/waveform/renderers/waveformsignalcolors.cpp
@@ -5,7 +5,12 @@
 #include "widget/wskincolor.h"
 #include "widget/wwidget.h"
 
-WaveformSignalColors::WaveformSignalColors() {
+namespace {
+constexpr int kDefaultDimBrightThreshold = 127;
+}
+
+WaveformSignalColors::WaveformSignalColors()
+        : m_dimBrightThreshold(kDefaultDimBrightThreshold) {
 }
 
 bool WaveformSignalColors::setup(const QDomNode &node, const SkinContext& context) {
@@ -76,6 +81,12 @@ bool WaveformSignalColors::setup(const QDomNode &node, const SkinContext& contex
     }
     m_bgColor = WSkinColor::getCorrectColor(m_bgColor).toRgb();
 
+    bool okay;
+    m_dimBrightThreshold = context.selectInt(node, QStringLiteral("DimBrightThreshold"), &okay);
+    if (!okay) {
+        m_dimBrightThreshold = kDefaultDimBrightThreshold;
+    }
+
     bool filteredColorValid = m_lowColor.isValid() && m_midColor.isValid() && m_highColor.isValid();
 
     if (m_signalColor.isValid() && filteredColorValid) {
diff --git a/src/waveform/renderers/waveformsignalcolors.h b/src/waveform/renderers/waveformsignalcolors.h
index 14850fd1a8e..ae554b0cec3 100644
--- a/src/waveform/renderers/waveformsignalcolors.h
+++ b/src/waveform/renderers/waveformsignalcolors.h
@@ -13,18 +13,45 @@ class WaveformSignalColors {
 
     bool setup(const QDomNode &node, const SkinContext& context);
 
-    inline const QColor& getSignalColor() const { return m_signalColor; }
-    inline const QColor& getLowColor() const { return m_lowColor; }
-    inline const QColor& getMidColor() const { return m_midColor; }
-    inline const QColor& getHighColor() const { return m_highColor; }
-    inline const QColor& getRgbLowColor() const { return m_rgbLowColor; }
-    inline const QColor& getRgbMidColor() const { return m_rgbMidColor; }
-    inline const QColor& getRgbHighColor() const { return m_rgbHighColor; }
-    inline const QColor& getAxesColor() const { return m_axesColor; }
-    inline const QColor& getPlayPosColor() const { return m_playPosColor; }
-    inline const QColor& getPlayedOverlayColor() const { return m_playedOverlayColor; }
-    inline const QColor& getPassthroughOverlayColor() const { return m_passthroughOverlayColor; }
-    inline const QColor& getBgColor() const { return m_bgColor; }
+    inline const QColor& getSignalColor() const {
+        return m_signalColor;
+    }
+    inline const QColor& getLowColor() const {
+        return m_lowColor;
+    }
+    inline const QColor& getMidColor() const {
+        return m_midColor;
+    }
+    inline const QColor& getHighColor() const {
+        return m_highColor;
+    }
+    inline const QColor& getRgbLowColor() const {
+        return m_rgbLowColor;
+    }
+    inline const QColor& getRgbMidColor() const {
+        return m_rgbMidColor;
+    }
+    inline const QColor& getRgbHighColor() const {
+        return m_rgbHighColor;
+    }
+    inline const QColor& getAxesColor() const {
+        return m_axesColor;
+    }
+    inline const QColor& getPlayPosColor() const {
+        return m_playPosColor;
+    }
+    inline const QColor& getPlayedOverlayColor() const {
+        return m_playedOverlayColor;
+    }
+    inline const QColor& getPassthroughOverlayColor() const {
+        return m_passthroughOverlayColor;
+    }
+    inline const QColor& getBgColor() const {
+        return m_bgColor;
+    }
+    inline int getDimBrightThreshold() const {
+        return m_dimBrightThreshold;
+    }
 
   protected:
     void fallBackFromSignalColor();
@@ -45,6 +72,7 @@ class WaveformSignalColors {
     QColor m_playedOverlayColor;
     QColor m_passthroughOverlayColor;
     QColor m_bgColor;
+    int m_dimBrightThreshold;
 };
 
 #endif // WAVEFORMSIGNALCOLORS_H
diff --git a/src/waveform/renderers/waveformwidgetrenderer.cpp b/src/waveform/renderers/waveformwidgetrenderer.cpp
index fb21f953f7d..83978ee3683 100644
--- a/src/waveform/renderers/waveformwidgetrenderer.cpp
+++ b/src/waveform/renderers/waveformwidgetrenderer.cpp
@@ -17,9 +17,14 @@ const double WaveformWidgetRenderer::s_waveformMaxZoom = 10.0;
 const double WaveformWidgetRenderer::s_waveformDefaultZoom = 3.0;
 const double WaveformWidgetRenderer::s_defaultPlayMarkerPosition = 0.5;
 
+namespace {
+constexpr int kDefaultDimBrightThreshold = 127;
+}
+
 WaveformWidgetRenderer::WaveformWidgetRenderer(const QString& group)
         : m_group(group),
           m_orientation(Qt::Horizontal),
+          m_dimBrightThreshold(kDefaultDimBrightThreshold),
           m_height(-1),
           m_width(-1),
           m_devicePixelRatio(1.0f),
@@ -318,6 +323,12 @@ void WaveformWidgetRenderer::setup(
         m_orientation = Qt::Horizontal;
     }
 
+    bool okay;
+    m_dimBrightThreshold = context.selectInt(node, QStringLiteral("DimBrightThreshold"), &okay);
+    if (!okay) {
+        m_dimBrightThreshold = kDefaultDimBrightThreshold;
+    }
+
     m_colors.setup(node, context);
     for (int i = 0; i < m_rendererStack.size(); ++i) {
         m_rendererStack[i]->setScaleFactor(m_scaleFactor);
diff --git a/src/waveform/renderers/waveformwidgetrenderer.h b/src/waveform/renderers/waveformwidgetrenderer.h
index 8e111fddf37..9a4a761ac08 100644
--- a/src/waveform/renderers/waveformwidgetrenderer.h
+++ b/src/waveform/renderers/waveformwidgetrenderer.h
@@ -46,16 +46,24 @@ class WaveformWidgetRenderer {
     /// Get cue mark at a point on the waveform widget.
     WaveformMarkPointer getCueMarkAtPoint(QPoint point) const;
 
-    double getFirstDisplayedPosition() const { return m_firstDisplayedPosition;}
-    double getLastDisplayedPosition() const { return m_lastDisplayedPosition;}
+    double getFirstDisplayedPosition() const {
+        return m_firstDisplayedPosition;
+    }
+    double getLastDisplayedPosition() const {
+        return m_lastDisplayedPosition;
+    }
 
     void setZoom(double zoom);
 
     void setDisplayBeatGrid(bool set);
     void setDisplayBeatGridAlpha(int alpha);
 
-    double getVisualSamplePerPixel() const { return m_visualSamplePerPixel;};
-    double getAudioSamplePerPixel() const { return m_audioSamplePerPixel;};
+    double getVisualSamplePerPixel() const {
+        return m_visualSamplePerPixel;
+    }
+    double getAudioSamplePerPixel() const {
+        return m_audioSamplePerPixel;
+    }
 
     // those function replace at its best sample position to an admissible
     // sample position according to the current visual resampling
@@ -74,27 +82,54 @@ class WaveformWidgetRenderer {
         return m_trackPixelCount * (position - m_firstDisplayedPosition);
     }
 
-    double getPlayPos() const { return m_playPos;}
+    double getPlayPos() const {
+        return m_playPos;
+    }
     int getPlayPosVSample() const {
         return m_playPosVSample;
     }
     int getTotalVSample() const {
         return m_totalVSamples;
     }
-    double getZoomFactor() const { return m_zoomFactor;}
-    double getGain() const { return m_gain;}
-    int getTrackSamples() const { return m_trackSamples;}
+    double getZoomFactor() const {
+        return m_zoomFactor;
+    }
+    double getGain() const {
+        return m_gain;
+    }
+    int getTrackSamples() const {
+        return m_trackSamples;
+    }
 
-    int getBeatGridAlpha() const { return m_alphaBeatGrid; }
+    int getBeatGridAlpha() const {
+        return m_alphaBeatGrid;
+    }
 
     void resize(int width, int height, float devicePixelRatio);
-    int getHeight() const { return m_height;}
-    int getWidth() const { return m_width;}
-    float getDevicePixelRatio() const { return m_devicePixelRatio; }
-    int getLength() const { return m_orientation == Qt::Horizontal ? m_width : m_height;}
-    int getBreadth() const { return m_orientation == Qt::Horizontal ? m_height : m_width;}
-    Qt::Orientation getOrientation() const { return m_orientation;}
-    const WaveformSignalColors* getWaveformSignalColors() const { return &m_colors; };
+    int getHeight() const {
+        return m_height;
+    }
+    int getWidth() const {
+        return m_width;
+    }
+    float getDevicePixelRatio() const {
+        return m_devicePixelRatio;
+    }
+    int getLength() const {
+        return m_orientation == Qt::Horizontal ? m_width : m_height;
+    }
+    int getBreadth() const {
+        return m_orientation == Qt::Horizontal ? m_height : m_width;
+    }
+    Qt::Orientation getOrientation() const {
+        return m_orientation;
+    }
+    const WaveformSignalColors* getWaveformSignalColors() const {
+        return &m_colors;
+    }
+    int getDimBrightThreshold() {
+        return m_dimBrightThreshold;
+    }
 
     template< class T_Renderer>
     inline T_Renderer* addRenderer() {
@@ -124,6 +159,7 @@ class WaveformWidgetRenderer {
     TrackPointer m_pTrack;
     QList<WaveformRendererAbstract*> m_rendererStack;
     Qt::Orientation m_orientation;
+    int m_dimBrightThreshold;
     int m_height;
     int m_width;
     float m_devicePixelRatio;
diff --git a/src/widget/whotcuebutton.cpp b/src/widget/whotcuebutton.cpp
index 16ac43b77ee..4b383226d7b 100644
--- a/src/widget/whotcuebutton.cpp
+++ b/src/widget/whotcuebutton.cpp
@@ -7,15 +7,20 @@
 #include "mixer/playerinfo.h"
 #include "track/track.h"
 
+namespace {
+constexpr int kDefaultDimBrightThreshold = 127;
+}
+
 WHotcueButton::WHotcueButton(const QString& group, QWidget* pParent)
         : WPushButton(pParent),
           m_group(group),
           m_hotcue(Cue::kNoHotCue),
           m_hoverCueColor(false),
           m_pCoColor(nullptr),
-          m_cueColorDimmed(false),
-          m_isCueColorLight(false),
-          m_isCueColorDark(false) {
+          m_cueColorDimThreshold(kDefaultDimBrightThreshold),
+          m_bCueColorDimmed(false),
+          m_bCueColorIsLight(false),
+          m_bCueColorIsDark(false) {
 }
 
 void WHotcueButton::setup(const QDomNode& node, const SkinContext& context) {
@@ -29,6 +34,13 @@ void WHotcueButton::setup(const QDomNode& node, const SkinContext& context) {
     } else {
         SKIN_WARNING(node, context) << "Hotcue value invalid";
     }
+
+    bool okay;
+    m_cueColorDimThreshold = context.selectInt(node, QStringLiteral("DimBrightThreshold"), &okay);
+    if (!okay) {
+        m_cueColorDimThreshold = kDefaultDimBrightThreshold;
+    }
+
     m_hoverCueColor = context.selectBool(node, QStringLiteral("Hover"), false);
 
     m_pCueMenuPopup = make_parented<WCueMenuPopup>(context.getConfig(), this);
@@ -112,7 +124,7 @@ void WHotcueButton::slotColorChanged(double color) {
         return;
     }
     QColor cueColor = QColor::fromRgb(static_cast<QRgb>(color));
-    m_cueColorDimmed = Color::isDimmColor(cueColor);
+    m_bCueColorDimmed = Color::isDimColorCustom(cueColor, m_cueColorDimThreshold);
 
     QString style =
             QStringLiteral("WWidget[displayValue=\"1\"] { background-color: ") +
@@ -122,7 +134,7 @@ void WHotcueButton::slotColorChanged(double color) {
     if (m_hoverCueColor) {
         style +=
                 QStringLiteral("WWidget[displayValue=\"1\"]:hover { background-color: ") +
-                cueColor.lighter(m_cueColorDimmed ? 120 : 80).name() +
+                cueColor.lighter(m_bCueColorDimmed ? 120 : 80).name() +
                 QStringLiteral("; }");
     }
 
@@ -133,13 +145,13 @@ void WHotcueButton::slotColorChanged(double color) {
 void WHotcueButton::restyleAndRepaint() {
     if (readDisplayValue()) {
         // Adjust properties for Qss file
-        m_isCueColorLight = !m_cueColorDimmed;
-        m_isCueColorDark = m_cueColorDimmed;
+        m_bCueColorIsLight = !m_bCueColorDimmed;
+        m_bCueColorIsDark = m_bCueColorDimmed;
     } else {
         // We are now at the background set by qss.
         // Since we don't know the color reset both
-        m_isCueColorLight = false;
-        m_isCueColorDark = false;
+        m_bCueColorIsLight = false;
+        m_bCueColorIsDark = false;
     }
     WPushButton::restyleAndRepaint();
 }
diff --git a/src/widget/whotcuebutton.h b/src/widget/whotcuebutton.h
index 0229958f802..d7a3d218d48 100644
--- a/src/widget/whotcuebutton.h
+++ b/src/widget/whotcuebutton.h
@@ -16,8 +16,8 @@ class WHotcueButton : public WPushButton {
 
     void setup(const QDomNode& node, const SkinContext& context) override;
 
-    Q_PROPERTY(bool light MEMBER m_isCueColorLight);
-    Q_PROPERTY(bool dark MEMBER m_isCueColorDark);
+    Q_PROPERTY(bool light MEMBER m_bCueColorIsLight);
+    Q_PROPERTY(bool dark MEMBER m_bCueColorIsDark);
 
   protected:
     void mousePressEvent(QMouseEvent* e) override;
@@ -35,7 +35,8 @@ class WHotcueButton : public WPushButton {
     bool m_hoverCueColor;
     parented_ptr<ControlProxy> m_pCoColor;
     parented_ptr<WCueMenuPopup> m_pCueMenuPopup;
-    bool m_cueColorDimmed;
-    bool m_isCueColorLight;
-    bool m_isCueColorDark;
+    int m_cueColorDimThreshold;
+    bool m_bCueColorDimmed;
+    bool m_bCueColorIsLight;
+    bool m_bCueColorIsDark;
 };
diff --git a/src/widget/woverview.cpp b/src/widget/woverview.cpp
index 26b741591b9..dfe101990cb 100644
--- a/src/widget/woverview.cpp
+++ b/src/widget/woverview.cpp
@@ -119,6 +119,7 @@ void WOverview::setup(const QDomNode& node, const SkinContext& context) {
     m_passthroughOverlayColor = m_signalColors.getPassthroughOverlayColor();
     m_playedOverlayColor = m_signalColors.getPlayedOverlayColor();
     m_lowColor = m_signalColors.getLowColor();
+    m_dimBrightThreshold = m_signalColors.getDimBrightThreshold();
 
     m_labelBackgroundColor = context.selectColor(node, "LabelBackgroundColor");
     if (!m_labelBackgroundColor.isValid()) {
@@ -390,7 +391,7 @@ void WOverview::updateCues(const QList<CuePointer> &loadedCues) {
             && pMark->getSamplePosition() != Cue::kNoPosition) {
             QColor newColor = mixxx::RgbColor::toQColor(currentCue->getColor());
             if (newColor != pMark->fillColor() || newColor != pMark->m_textColor) {
-                pMark->setBaseColor(newColor);
+                pMark->setBaseColor(newColor, m_dimBrightThreshold);
             }
 
             int hotcueNumber = currentCue->getHotCue();
diff --git a/src/widget/woverview.h b/src/widget/woverview.h
index e2ed5948fd1..03be183855a 100644
--- a/src/widget/woverview.h
+++ b/src/widget/woverview.h
@@ -178,6 +178,7 @@ class WOverview : public WWidget, public TrackDropTarget {
     QColor m_passthroughOverlayColor;
     QColor m_playedOverlayColor;
     QColor m_lowColor;
+    int m_dimBrightThreshold;
     QLabel* m_pPassthroughLabel;
 
     // All WaveformMarks
diff --git a/src/widget/wwaveformviewer.cpp b/src/widget/wwaveformviewer.cpp
index 45a0e63a849..793ab1877b5 100644
--- a/src/widget/wwaveformviewer.cpp
+++ b/src/widget/wwaveformviewer.cpp
@@ -52,6 +52,7 @@ void WWaveformViewer::setup(const QDomNode& node, const SkinContext& context) {
     if (m_waveformWidget) {
         m_waveformWidget->setup(node, context);
     }
+    m_dimBrightThreshold = m_waveformWidget->getDimBrightThreshold();
 }
 
 void WWaveformViewer::resizeEvent(QResizeEvent* /*event*/) {
@@ -272,13 +273,14 @@ CuePointer WWaveformViewer::getCuePointerFromCueMark(WaveformMarkPointer pMark)
 }
 
 void WWaveformViewer::highlightMark(WaveformMarkPointer pMark) {
-    QColor highlightColor = Color::chooseContrastColor(pMark->fillColor());
-    pMark->setBaseColor(highlightColor);
+    QColor highlightColor = Color::chooseContrastColor(pMark->fillColor(),
+            m_dimBrightThreshold);
+    pMark->setBaseColor(highlightColor, m_dimBrightThreshold);
 }
 
 void WWaveformViewer::unhighlightMark(WaveformMarkPointer pMark) {
     QColor originalColor = mixxx::RgbColor::toQColor(getCuePointerFromCueMark(pMark)->getColor());
-    pMark->setBaseColor(originalColor);
+    pMark->setBaseColor(originalColor, m_dimBrightThreshold);
 }
 
 bool WWaveformViewer::isPlaying() const {
diff --git a/src/widget/wwaveformviewer.h b/src/widget/wwaveformviewer.h
index ec19d5d2ca8..08dc0afa98e 100644
--- a/src/widget/wwaveformviewer.h
+++ b/src/widget/wwaveformviewer.h
@@ -87,6 +87,8 @@ class WWaveformViewer : public WWidget, public TrackDropTarget {
 
     WaveformWidgetAbstract* m_waveformWidget;
 
+    int m_dimBrightThreshold;
+
     friend class WaveformWidgetFactory;
 
     CuePointer getCuePointerFromCueMark(WaveformMarkPointer pMark) const;