diff --git a/build/depends.py b/build/depends.py
index 3cb0980d8ba..273deb01d25 100644
--- a/build/depends.py
+++ b/build/depends.py
@@ -901,7 +901,9 @@ def sources(self, build):
                    "src/sources/soundsourceproviderregistry.cpp",
                    "src/sources/soundsourceproxy.cpp",
 
+                   "src/widget/colormenu.cpp",
                    "src/widget/controlwidgetconnection.cpp",
+                   "src/widget/cuemenu.cpp",
                    "src/widget/wbasewidget.cpp",
                    "src/widget/wwidget.cpp",
                    "src/widget/wwidgetgroup.cpp",
@@ -1107,7 +1109,6 @@ def sources(self, build):
 
                    "src/waveform/renderers/waveformrenderersignalbase.cpp",
                    "src/waveform/renderers/waveformmark.cpp",
-                   "src/waveform/renderers/waveformmarkproperties.cpp",
                    "src/waveform/renderers/waveformmarkset.cpp",
                    "src/waveform/renderers/waveformmarkrange.cpp",
                    "src/waveform/renderers/glwaveformrenderersimplesignal.cpp",
@@ -1116,6 +1117,7 @@ def sources(self, build):
                    "src/waveform/renderers/glslwaveformrenderersignal.cpp",
                    "src/waveform/renderers/glvsynctestrenderer.cpp",
 
+                   "src/waveform/waveformmarklabel.cpp",
                    "src/waveform/widgets/waveformwidgetabstract.cpp",
                    "src/waveform/widgets/emptywaveformwidget.cpp",
                    "src/waveform/widgets/softwarewaveformwidget.cpp",
diff --git a/res/skins/Deere/deck_small.xml b/res/skins/Deere/deck_small.xml
index f4e52ffa679..cc7fa973879 100644
--- a/res/skins/Deere/deck_small.xml
+++ b/res/skins/Deere/deck_small.xml
@@ -18,7 +18,7 @@
 
               <WidgetGroup>
                 <Layout>horizontal</Layout>
-                <Size>40f,40f</Size>
+                <Size>40f,46f</Size>
                 <Children>
                   <SingletonContainer>
                     <ObjectName>DeckCoverArt<Variable name="i"/></ObjectName>
@@ -33,7 +33,7 @@
               <WidgetGroup>
                 <ObjectName>OverviewGutterSmall</ObjectName>
                 <Layout>horizontal</Layout>
-                <Size>200me,40f</Size>
+                <Size>200me,46f</Size>
                 <Children>
                   <SingletonContainer>
                     <ObjectName>DeckOverview<Variable name="i"/></ObjectName>
@@ -44,25 +44,25 @@
               <WidgetGroup>
                 <ObjectName>DeckTextRowSmall</ObjectName>
                 <Layout>vertical</Layout>
-                <Size>200min,40f</Size>
+                <Size>200min,46f</Size>
                 <Children>
 
                   <WidgetGroup><!-- Title/*** / PlayPos -->
                     <Layout>horizontal</Layout>
-                    <Size>200min,21f</Size>
+                    <Size>200min,24f</Size>
                     <Children>
 
                       <WidgetGroup>
                         <ObjectName>TitleGutterSmall</ObjectName>
                         <Layout>horizontal</Layout>
-                        <Size>100me,20f</Size>
+                        <Size>100me,23f</Size>
                         <Children>
                           <!-- We allow to hide track/artist info (aka AM-Mode) in the skin settings,
                               display just a label with asterixes instead. -->
                           <TrackProperty>
                             <TooltipId>track_title</TooltipId>
                             <ObjectName>TitleTextSmall</ObjectName>
-                            <Size>100me,20f</Size>
+                            <Size>100me,23f</Size>
                             <Property>title</Property>
                             <Group><Variable name="group"/></Group>
                             <Alignment>left</Alignment>
@@ -93,7 +93,7 @@
                       <NumberPos>
                         <TooltipId>track_time</TooltipId>
                         <ObjectName>PlayPositionTextSmall</ObjectName>
-                        <Size>55min,20f</Size>
+                        <Size>55min,23f</Size>
                         <Alignment>center</Alignment>
                         <Channel><Variable name="i"/></Channel>
                         <Connection>
@@ -106,7 +106,7 @@
                   <WidgetGroup><!-- Artist / Key / BPM -->
                     <ObjectName>ArtistKeyBpmGutterSmall</ObjectName>
                     <Layout>horizontal</Layout>
-                    <Size>200min,19f</Size>
+                    <Size>200min,22f</Size>
                     <Children>
                       <!-- We allow to hide track/artist info (aka AM-Mode) in the skin settings,
                           display just a label with asterixes instead. -->
@@ -141,7 +141,7 @@
                         <TooltipId>visual_key</TooltipId>
                         <ObjectName>BpmKeyTextSmall</ObjectName>
                         <Alignment>center</Alignment>
-                        <Size>30min,19f</Size>
+                        <Size>30min,22f</Size>
                         <Alignment>center</Alignment>
                         <Elide>right</Elide>
                         <Connection>
@@ -152,7 +152,7 @@
                       <NumberBpm>
                         <TooltipId>visual_bpm</TooltipId>
                         <ObjectName>BpmKeyTextSmall</ObjectName>
-                        <Size>55min,19f</Size>
+                        <Size>55min,22f</Size>
                         <Alignment>right</Alignment>
                         <NumberOfDigits>2</NumberOfDigits>
                         <Group><Variable name="group"/></Group>
diff --git a/res/skins/Deere/decks_small.xml b/res/skins/Deere/decks_small.xml
index dc20b2b5f0c..40701529f18 100644
--- a/res/skins/Deere/decks_small.xml
+++ b/res/skins/Deere/decks_small.xml
@@ -6,7 +6,7 @@
     <Children>
       <WidgetGroup>
         <Layout>horizontal</Layout>
-        <Size>0me,45f</Size>
+        <Size>0me,51f</Size>
         <Children>
           <Template src="skin:deck_small.xml">
             <SetVariable name="i">1</SetVariable>
@@ -20,7 +20,7 @@
 
       <WidgetGroup>
         <Layout>horizontal</Layout>
-        <Size>0me,45f</Size>
+        <Size>0me,51f</Size>
         <Children>
           <Template src="skin:deck_small.xml">
             <SetVariable name="i">3</SetVariable>
diff --git a/res/skins/Deere/preview_deck.xml b/res/skins/Deere/preview_deck.xml
index e13cb90fa49..03ba05a550a 100644
--- a/res/skins/Deere/preview_deck.xml
+++ b/res/skins/Deere/preview_deck.xml
@@ -101,6 +101,7 @@
                     <SignalRGBLowColor></SignalRGBLowColor>
                     <SignalColor>#FF8000</SignalColor>
                     <PlayPosColor>#00FF00</PlayPosColor>
+                    <ShowCueTimes>false</ShowCueTimes>
                     <DefaultMark>
                       <Align>bottom</Align>
                       <Color>#FFFFFF</Color>
diff --git a/res/skins/Deere/sampler_controls_row.xml b/res/skins/Deere/sampler_controls_row.xml
index 8341c5265bd..a56c178839a 100644
--- a/res/skins/Deere/sampler_controls_row.xml
+++ b/res/skins/Deere/sampler_controls_row.xml
@@ -44,6 +44,7 @@
             <SignalRGBLowColor></SignalRGBLowColor>
             <SignalColor>#FF8000</SignalColor>
             <PlayPosColor>#00FF00</PlayPosColor>
+            <ShowCueTimes>false</ShowCueTimes>
             <DefaultMark>
               <Align>bottom</Align>
               <Color>#006596</Color>
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index 7add452fe8e..0613c145a46 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -750,10 +750,17 @@ QAbstractScrollArea::corner {
 
 WWidget, QLabel {
   font-family: "Open Sans";
-  font-size: 8px;
+  font-size: 12px;
   text-transform: uppercase;
 }
 
+/* This affects the labels for cue points. */
+WOverview,
+/* This is for the label in the edit dialog */
+WOverview QLabel {
+  text-transform: none;
+}
+
 /* Start spacing for Deck overview row (small waveform, option grid) */
 #OptionGrid, #ButtonGrid {
   background-color: #333333;
diff --git a/res/skins/LateNight/deck_small.xml b/res/skins/LateNight/deck_small.xml
index b0f98f9c634..42b93cd8093 100644
--- a/res/skins/LateNight/deck_small.xml
+++ b/res/skins/LateNight/deck_small.xml
@@ -12,7 +12,7 @@
         <Children>
 
           <WidgetGroup>
-            <Size>40f,40f</Size>
+            <Size>42f,42f</Size>
             <Layout>horizontal</Layout>
             <!-- hack/trick: remove the css border (top & left) from SpinnyContainer
                 so we can use the Spinny singleton from regular decks :) -->
@@ -24,11 +24,13 @@
             </Children>
           </WidgetGroup>
 
+          <WidgetGroup><Size>2f,0min</Size></WidgetGroup>
+
           <WidgetGroup>
             <ObjectName>OverviewBox</ObjectName>
             <SizePolicy>me,min</SizePolicy>
-            <MinimumSize>200,40</MinimumSize>
-            <MaximumSize>250,40</MaximumSize>
+            <MinimumSize>200,46</MinimumSize>
+            <MaximumSize>250,46</MaximumSize>
             <Layout>horizontal</Layout>
             <Children>
               <SingletonContainer>
@@ -39,17 +41,17 @@
 
           <WidgetGroup><!-- DeckSmall_TitlePlayPosKeyBPM -->
             <Layout>vertical</Layout>
-            <Size>200min,41f</Size>
+            <Size>200min,46f</Size>
             <Children>
 
               <WidgetGroup>
                 <Layout>horizontal</Layout>
-                <Size>200min,20f</Size>
+                <Size>200min,23f</Size>
                 <Children>
                   <TrackProperty>
                     <TooltipId>track_title</TooltipId>
                     <ObjectName>TitleTextSmall</ObjectName>
-                    <Size>100me,20f</Size>
+                    <Size>100me,23f</Size>
                     <Property>title</Property>
                     <Alignment>left</Alignment>
                     <Elide>right</Elide>
@@ -60,7 +62,7 @@
                     <TooltipId>track_time</TooltipId>
                     <ObjectName>PlayPositionTextSmall</ObjectName>
                     <SizePolicy>min,f</SizePolicy>
-                    <MinimumSize>,21</MinimumSize>
+                    <MinimumSize>,23</MinimumSize>
                     <Alignment>center</Alignment>
                     <Channel><Variable name="channum"/></Channel>
                     <Connection>
@@ -72,12 +74,12 @@
 
               <WidgetGroup><!-- Artist / Key / BPM -->
                 <Layout>horizontal</Layout>
-                <Size>200min,20f</Size>
+                <Size>200min,22f</Size>
                 <Children>
                   <TrackProperty>
                     <TooltipId>track_title</TooltipId>
                     <ObjectName>ArtistTextSmall</ObjectName>
-                    <Size>96me,20f</Size>
+                    <Size>96me,22f</Size>
                     <Property>artist</Property>
                     <Alignment>left</Alignment>
                     <Elide>right</Elide>
@@ -88,7 +90,7 @@
                     <TooltipId>visual_key</TooltipId>
                     <ObjectName>KeyTextSmall</ObjectName>
                     <Channel><Variable name="channum"/></Channel>
-                    <Size>44min,20f</Size>
+                    <Size>44min,22f</Size>
                     <Alignment>center</Alignment>
                     <Elide>right</Elide>
                     <Connection>
@@ -99,7 +101,7 @@
                   <NumberBpm>
                     <ObjectName>BpmTextSmall</ObjectName>
                     <TooltipId>visual_bpm</TooltipId>
-                    <Size>60f,20f</Size>
+                    <Size>60f,22f</Size>
                     <Alignment>center</Alignment>
                     <Channel><Variable name="channum" /></Channel>
                     <NumberOfDigits>2</NumberOfDigits>
@@ -109,7 +111,7 @@
                   </NumberBpm>
 
                 </Children>
-              </WidgetGroup><!-- Key / BPM / PlayPos -->
+              </WidgetGroup><!-- Artist / Key / BPM -->
 
             </Children>
           </WidgetGroup><!-- DeckSmall_TitlePlayPosKeyBPM -->
diff --git a/res/skins/LateNight/preview_deck.xml b/res/skins/LateNight/preview_deck.xml
index c2f513f46f9..1b7b082814e 100644
--- a/res/skins/LateNight/preview_deck.xml
+++ b/res/skins/LateNight/preview_deck.xml
@@ -136,13 +136,13 @@
                         <SizePolicy>me,me</SizePolicy>
                         <Group><Variable name="group"/></Group>
                         <BgColor>#0f0f0f</BgColor>
-                        <BgColor>#FFFFFF</BgColor>
                         <SignalColor>#FF8000</SignalColor>
                         <SignalHighColor>#F0EBD1</SignalHighColor>
                         <SignalMidColor>#EECE33</SignalMidColor>
                         <SignalLowColor>#E4C739</SignalLowColor>
                         <PlayPosColor>#00FF00</PlayPosColor>
                         <PlayedOverlayColor><Variable name="PlayedOverlayColor"/></PlayedOverlayColor>
+                        <ShowCueTimes>false</ShowCueTimes>
                         <DefaultMark>
                           <Align>bottom|right</Align>
                           <Color>#FF0000</Color>
diff --git a/res/skins/LateNight/sampler.xml b/res/skins/LateNight/sampler.xml
index 6e0ed107cfe..289e235f100 100644
--- a/res/skins/LateNight/sampler.xml
+++ b/res/skins/LateNight/sampler.xml
@@ -79,6 +79,7 @@
                 <SignalLowColor></SignalLowColor>
                 <PlayedOverlayColor><Variable name="PlayedOverlayColor"/></PlayedOverlayColor>
                 <SignalColor>#EECE33</SignalColor>
+                <ShowCueTimes>false</ShowCueTimes>
                 <MarkerColor>#00FF00</MarkerColor>
                 <DefaultMark>
                   <Align>bottom|right</Align>
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index 6c5a9e08f6c..dc25bc2aac4 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -15,6 +15,28 @@ QSpinBox {
   font-weight: bold;
 }
 
+#KeyText,
+#PlayPositionText,
+#PlayPositionTextSmall,
+#DurationText,
+#BpmText,
+#BpmTextSmall,
+#RateText,
+WBeatSpinBox,
+QSpinBox,
+/* Hotcue labels in the overview */
+WOverview,
+/* Edit label and pushbuttons in the hotcue label edit dialog */
+WOverview QLabel,
+WOverview QPushButton {
+  font-family: "Open Sans";
+  text-transform: none;
+}
+WOverview QLabel,
+WOverview QPushButton {
+  font-weight: normal;
+}
+
 QToolTip {
   font-family: Ubuntu;
   text-transform: none;
@@ -95,6 +117,10 @@ WSearchLineEdit,
 #Deck3, #Deck4 {
   padding: 2px 3px 3px 2px;
 }
+#DeckSmall1, #DeckSmall2,
+#DeckSmall3, #DeckSmall4 {
+  padding: 0px 0px 0px 2px;
+}
 #DeckSmall1, #DeckSmall2 {
   margin-top: 5px;
 }
@@ -1355,6 +1381,10 @@ WBeatSpinBox,
   qproperty-layoutAlignment: 'AlignHCenter | AlignVCenter';
 }
 
+#TitleGutter WLabel {
+  font-size: 16px/19px;
+  text-align: left;
+}
 
 
 /********************** Effects **********************/
@@ -1926,7 +1956,7 @@ WSearchLineEdit {
 }
 
 /* Extra declaration for QRadioButton otherwise it shows up with wrong colors in Linux with Gnome */
-QLabel, QRadioButton {
+WLibrary QLabel, WLibrary QRadioButton {
   background: transparent;
 }
 
diff --git a/res/skins/Shade/auxiliary.xml b/res/skins/Shade/auxiliary.xml
index 443a9d983c8..7cd426db9d6 100644
--- a/res/skins/Shade/auxiliary.xml
+++ b/res/skins/Shade/auxiliary.xml
@@ -2,7 +2,6 @@
   <WidgetGroup>
     <Size>108f,54f</Size>
     <BackPath>style/style_bg_auxiliary_<Variable name="auxnum"/>.png</BackPath>
-    <Style>QGroupBox { border: 0px solid yellow; } QWidget { margin: 0; padding: 0; }</Style>
     <!--<Layout>horizontal</Layout>-->
     <Children>
       <!--
@@ -12,7 +11,6 @@
       -->
       <StatusLight>
         <TooltipId>channel_PeakIndicator</TooltipId>
-        <Style></Style>
         <PathStatusLight>skin:/style/volume_clipping_microphone_over.png</PathStatusLight>
         <PathBack>skin:/style/volume_clipping_microphone.png</PathBack>
         <Pos>99,6</Pos>
@@ -28,7 +26,6 @@
       -->
       <VuMeter>
         <TooltipId>channel_VuMeter</TooltipId>
-        <Style></Style>
         <PathVu>skin:/style/volume_display_microphone_over.png</PathVu>
         <PathBack>skin:/style/volume_display_microphone.png</PathBack>
         <Pos>99,14</Pos>
@@ -43,7 +40,6 @@
 
       <Knob>
         <TooltipId>pregain</TooltipId>
-        <Style></Style>
         <NumberStates>64</NumberStates>
         <Path>knobs/knob_rotary_s%1.png</Path>
         <Pos>66,22</Pos>
@@ -54,7 +50,6 @@
 
       <PushButton>
         <TooltipId>orientation</TooltipId>
-        <Style></Style>
         <NumberStates>3</NumberStates>
         <State>
           <Number>0</Number>
@@ -81,7 +76,6 @@
 
       <PushButton>
         <TooltipId></TooltipId>
-        <Style></Style>
         <NumberStates>2</NumberStates>
         <State>
           <Number>0</Number>
diff --git a/res/skins/Shade/deck.xml b/res/skins/Shade/deck.xml
index 440c17f973e..84957defe72 100644
--- a/res/skins/Shade/deck.xml
+++ b/res/skins/Shade/deck.xml
@@ -2,7 +2,6 @@
   <WidgetGroup>
     <Size>0e,0min</Size>
     <Layout>horizontal</Layout>
-    <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
     <Children>
       <WidgetGroup>
         <ObjectName>DeckLeftBorder</ObjectName>
@@ -13,31 +12,26 @@
         <ObjectName>DeckLeft</ObjectName>
         <Size>0e,100min</Size>
         <Layout>vertical</Layout>
-        <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
         <Children>
           <WidgetGroup><!-- Cover/Artist/title/time / waveform/spinny / overview/controls -->
             <ObjectName>DeckLeft</ObjectName>
             <Size>0e,165f</Size>
             <Layout>horizontal</Layout>
-            <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
             <Children>
               <WidgetGroup><!-- Cover/Artist/title/time / waveform/spinny / overview/controls -->
                 <ObjectName>DeckLeft</ObjectName>
                 <Size>0e,165f</Size>
                 <Layout>vertical</Layout>
-                <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
                 <Children>
                   <WidgetGroup><!-- Cover art / Artist/title / Playposition -->
                     <ObjectName>DeckTopLeftMidPart</ObjectName>
                     <Size>0e,45f</Size>
                     <Layout>horizontal</Layout>
-                    <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
                     <Children>
                       <WidgetGroup>
                         <ObjectName>DeckTopLeftPart</ObjectName>
                         <Size>40f,45f</Size>
                         <BackPath>style/style_bg_deck_top_left.png</BackPath>
-                        <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
                         <Children>
                           <CoverArt>
                             <Pos>2,7</Pos>
@@ -53,7 +47,6 @@
                         <Size>i,45f</Size>
                         <Layout>vertical</Layout>
                         <BackPath>style/style_bg_deck_top_mid.png</BackPath>
-                        <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
                         <Children>
                           <TrackProperty>
                             <TooltipId>track_title</TooltipId>
@@ -120,21 +113,18 @@
                     <ObjectName>DeckUpperLeftMidPart</ObjectName>
                     <Size>0e,81f</Size>
                     <Layout>horizontal</Layout>
-                    <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
                     <Children>
                       <WidgetGroup>
                         <ObjectName>DeckUpperMidPart</ObjectName>
                         <Size>0e,81f</Size>
                         <BackPath>style/style_bg_deck_pane.png</BackPath>
                         <Layout>horizontal</Layout>
-                        <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
                         <Children>
                           <!-- Collapsing Waveform, VinylControl & spinning Vinyl widget-->
                           <WidgetGroup>
                             <ObjectName>DeckWaveformVinylControlSpinny</ObjectName>
                             <Size>0e,81f</Size>
                             <Layout>horizontal</Layout>
-                            <Style>QGroupBox { border: 0px solid yellow; } QWidget { margin: 0; padding: 0; }</Style>
                             <Children>
                               <!--If you want the waveforms center to adjust when resizing in a collapsing widget
                               (e.g. to display spinning vinyl widget like in this skin) don't put the Waveform in a widget group,
@@ -200,14 +190,12 @@
                     <ObjectName>DeckLowerLeftMidPart</ObjectName>
                     <Size>0e,39f</Size>
                     <Layout>horizontal</Layout>
-                    <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
                     <Children>
                       <WidgetGroup>
                         <ObjectName>DeckLowerMidPart</ObjectName>
                         <Size>0e,39f</Size>
                         <Layout>horizontal</Layout>
                         <BackPath>style/style_bg_deck_woverview.png</BackPath>
-                        <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
                         <Children>
                           <SingletonContainer>
                             <ObjectName>Overview<Variable name="channum"/></ObjectName>
@@ -218,11 +206,9 @@
                         <ObjectName>DeckLowerLeftPart</ObjectName>
                         <Size>63f,39f</Size>
                         <BackPath>style/style_bg_deck_woverview_buttons.png</BackPath>
-                        <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
                         <Children>
                           <PushButton>
                             <TooltipId>show_spinny</TooltipId>
-                            <Style></Style>
                             <NumberStates>2</NumberStates>
                             <State>
                               <Number>0</Number>
@@ -243,7 +229,6 @@
                           </PushButton>
                           <PushButton>
                             <TooltipId>repeat</TooltipId>
-                            <Style></Style>
                             <NumberStates>2</NumberStates>
                             <State>
                               <Number>0</Number>
@@ -262,7 +247,6 @@
                           </PushButton>
                           <PushButton>
                             <TooltipId>eject</TooltipId>
-                            <Style></Style>
                             <NumberStates>1</NumberStates>
                             <State>
                               <Number>0</Number>
@@ -279,7 +263,6 @@
                           </PushButton>
                           <PushButton>
                             <TooltipId>beats_translate_curpos</TooltipId>
-                            <Style></Style>
                             <NumberStates>1</NumberStates>
                             <State>
                               <Number>0</Number>
@@ -301,7 +284,6 @@
 
                           <PushButton>
                             <TooltipId>quantize</TooltipId>
-                            <Style></Style>
                             <NumberStates>2</NumberStates>
                             <State>
                               <Number>0</Number>
@@ -322,7 +304,6 @@
                           </PushButton>
                           <PushButton>
                             <TooltipId>keylock</TooltipId>
-                            <Style></Style>
                             <NumberStates>2</NumberStates>
                             <State>
                               <Number>0</Number>
@@ -350,11 +331,9 @@
                 <ObjectName>DeckRightPart</ObjectName>
                 <Size>52f,165f</Size>
                 <BackPath>style/style_bg_deck_right.png</BackPath>
-                <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
                 <Children>
                   <PushButton>
                     <TooltipId>sync_enabled</TooltipId>
-                    <Style></Style>
                     <NumberStates>2</NumberStates>
                     <State>
                       <Number>0</Number>
@@ -379,7 +358,6 @@
 
                   <PushButton>
                     <TooltipId>sync_reset_key</TooltipId>
-                    <Style></Style>
                     <NumberStates>2</NumberStates>
                     <State>
                       <Number>0</Number>
@@ -406,8 +384,7 @@
                   <WidgetGroup>
                     <Pos>3,30</Pos>
                     <Size>47f,26f</Size>
-                    <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }
-                      QLabel {
+                    <Style>QLabel {
                         font: bold 9px sans-serif;
                         font-family: "Open Sans";
                         background-color: transparent;
@@ -439,7 +416,6 @@
                     </Children>
                   </WidgetGroup>
                   <SliderComposed>
-                    <Style></Style>
                     <Handle>knob_visual_key.png</Handle>
                     <Slider>slider_visual_key.png</Slider>
                     <Pos>18,55</Pos>
@@ -453,7 +429,6 @@
                   <PushButton>
                     <TooltipId>pitch_down</TooltipId>
                     <Size>10f,10f</Size>
-                    <Style></Style>
                     <NumberStates>1</NumberStates>
                     <State>
                       <Number>0</Number>
@@ -473,7 +448,6 @@
                   <PushButton>
                     <TooltipId>pitch_up</TooltipId>
                     <Size>10f,10f</Size>
-                    <Style></Style>
                     <NumberStates>1</NumberStates>
                     <State>
                       <Number>0</Number>
@@ -492,7 +466,6 @@
 
                   <SliderComposed>
                     <TooltipId>pitch</TooltipId>
-                    <Style></Style>
                     <Handle>knob_visual_key.png</Handle>
                     <Slider>slider_visual_key.png</Slider>
                     <Pos>18,58</Pos>
@@ -505,7 +478,6 @@
 
                   <SliderComposed>
                     <TooltipId>rate</TooltipId>
-                    <Style></Style>
                     <Handle>knob_pitch.png</Handle>
                     <Slider>slider_pitch.png</Slider>
                     <Pos>20,62</Pos>
diff --git a/res/skins/Shade/deck_cues.xml b/res/skins/Shade/deck_cues.xml
index 1d130adbe48..812f1afb640 100644
--- a/res/skins/Shade/deck_cues.xml
+++ b/res/skins/Shade/deck_cues.xml
@@ -1,6 +1,5 @@
 <Template>
   <WidgetGroup>
-    <Style>QGroupBox { border: 0px solid red;} QWidget { margin: 0; padding: 0; }</Style>
     <BackPath>style/style_bg_deck_pane.png</BackPath>
     <Layout>vertical</Layout>
     <Children>
diff --git a/res/skins/Shade/deck_effect.xml b/res/skins/Shade/deck_effect.xml
index 66cd861f650..a0b7d8e132d 100644
--- a/res/skins/Shade/deck_effect.xml
+++ b/res/skins/Shade/deck_effect.xml
@@ -1,7 +1,6 @@
 <Template>
   <WidgetGroup>
     <Size>105f,59f</Size>
-    <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
     <Children>
         <!--
       **********************************************
@@ -10,7 +9,6 @@
       -->
       <PushButton>
         <TooltipId>show_effects</TooltipId>
-        <Style></Style>
         <NumberStates>2</NumberStates>
         <State>
           <Number>0</Number>
@@ -30,7 +28,6 @@
 
       <PushButton>
         <TooltipId>EffectUnit_deck_enabled</TooltipId>
-        <Style></Style>
         <NumberStates>2</NumberStates>
         <State>
           <Number>0</Number>
@@ -51,7 +48,6 @@
 
       <PushButton>
         <TooltipId>EffectUnit_headphones_enabled</TooltipId>
-        <Style></Style>
         <NumberStates>2</NumberStates>
         <State>
           <Number>0</Number>
@@ -72,7 +68,6 @@
 
       <PushButton>
         <TooltipId>EffectUnit_<Variable name="effectgroup"/>_enabled</TooltipId>
-        <Style></Style>
         <NumberStates>2</NumberStates>
         <State>
           <Number>0</Number>
@@ -95,12 +90,10 @@
         <Size>17f,5f</Size>
         <Pos>53,14</Pos>
         <BackPath>skin:/btn/btn_mix.png</BackPath>
-        <Style>QGroupBox { border: 0px solid red; } QWidget { border: 0px solid red; margin: 0; padding: 0; }</Style>
       </WidgetGroup>
 
       <Knob>
         <TooltipId>EffectUnit_mix</TooltipId>
-        <Style></Style>
         <NumberStates>63</NumberStates>
         <Path>knobs/knob_rotary_s%1.png</Path>
         <Pos>49,21</Pos>
@@ -111,7 +104,6 @@
 
       <PushButton>
         <TooltipId>EffectUnit_mix_mode</TooltipId>
-        <Style></Style>
         <NumberStates>2</NumberStates>
         <State>
           <Number>0</Number>
@@ -134,12 +126,10 @@
         <Size>29f,5f</Size>
         <Pos>76,14</Pos>
         <BackPath>skin:/btn/btn_super.png</BackPath>
-        <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
       </WidgetGroup>
 
       <Knob>
         <TooltipId>EffectUnit_super1</TooltipId>
-        <Style></Style>
         <NumberStates>63</NumberStates>
         <Path>knobs/knob_rotary_s%1.png</Path>
         <Pos>77,21</Pos>
diff --git a/res/skins/Shade/deck_overview.xml b/res/skins/Shade/deck_overview.xml
index 875b722b36f..4576573421f 100644
--- a/res/skins/Shade/deck_overview.xml
+++ b/res/skins/Shade/deck_overview.xml
@@ -1,11 +1,10 @@
 <Template>
   <Overview>
     <TooltipId>waveform_overview</TooltipId>
-    <Style></Style>
     <Channel><Variable name="channum"/></Channel>
     <Size>220e,30me</Size>
     <!-- transparent background if no <BgColor> & <BgPixmap> is present -->
-    <BgColor></BgColor>
+    <BgColor>#008d98a3</BgColor>
     <BgPixmap></BgPixmap>
     <SignalHighColor></SignalHighColor>
     <SignalMidColor></SignalMidColor>
diff --git a/res/skins/Shade/deck_small.xml b/res/skins/Shade/deck_small.xml
index 7d7606288a7..4c63f9150bb 100644
--- a/res/skins/Shade/deck_small.xml
+++ b/res/skins/Shade/deck_small.xml
@@ -1,22 +1,22 @@
 <Template>
   <SetVariable name="group">[Channel<Variable name="channum"/>]</SetVariable>
   <WidgetGroup>
-    <Size>0e,40f</Size>
+    <Size>0e,48f</Size>
     <Layout>horizontal</Layout>
     <Children>
       <WidgetGroup>
-        <Size>5f,40f</Size>
+        <Size>5f,48f</Size>
         <BackPath>style/style_bg_deck_border.png</BackPath>
       </WidgetGroup>
 
       <WidgetGroup>
         <ObjectName>DeckSmall</ObjectName>
-        <Size>i,40f</Size>
-        <BackPath>style/style_bg_looping.png</BackPath>
+        <Size>i,48f</Size>
+        <BackPath>style/style_bg_deck_small.png</BackPath>
         <Layout>horizontal</Layout>
         <Children>
           <WidgetGroup>
-            <Size>488min,30f</Size>
+            <Size>488min,38f</Size>
             <Layout>horizontal</Layout>
             <Children>
               <SingletonContainer>
@@ -24,18 +24,18 @@
               </SingletonContainer>
 
               <WidgetGroup>
-                <Size>1f,30f</Size>
+                <Size>1f,38f</Size>
                 <BackPath>style/style_component_border.png</BackPath>
               </WidgetGroup>
 
               <WidgetGroup>
                 <ObjectName>DeckSmall_TitleTimeKeyBPM</ObjectName>
-                <Size>220me,30f</Size>
+                <Size>220me,38f</Size>
                 <Layout>vertical</Layout>
                 <Children>
                   <WidgetGroup>
                     <ObjectName>DeckSmall_TitleTime</ObjectName>
-                    <Size>10me,15f</Size>
+                    <Size>10me,19f</Size>
                     <Layout>horizontal</Layout>
                     <Style>
                       QLabel {
@@ -61,25 +61,25 @@
                         <Property>title</Property>
                         <Channel><Variable name="channum"/></Channel>
                         <SizePolicy>me,f</SizePolicy>
-                        <MinimumSize>50,15</MinimumSize>
+                        <MinimumSize>50,19</MinimumSize>
                         <Alignment>left</Alignment>
                         <Elide>right</Elide>
                       </TrackProperty>
 
                       <WidgetGroup>
-                        <Size>1f,15f</Size>
+                        <Size>1f,19f</Size>
                         <BackPath>style/style_component_border.png</BackPath>
                       </WidgetGroup>
 
                       <NumberPos>
                         <TooltipId>track_time</TooltipId>
-                        <Size>55min,15f</Size>
+                        <Size>55min,19f</Size>
                         <Style>QLabel {
                           font: bold 13px sans-serif;
                           font-family: Open Sans;
                           color: #191F24;
                           text-align: right;
-                          padding: 1px 0px 0px 0px;
+                          padding: 3px 0px 2px 0px;
                           margin: 0px 0px 0px 10px;
                         }
                         </Style>
@@ -96,10 +96,9 @@
 
                   <!-- Artist / Key /BPM -->
                   <WidgetGroup>
-                    <Size>100me,14f</Size>
+                    <Size>100me,18f</Size>
                     <Layout>horizontal</Layout>
                     <Style>
-                      QWidget { margin: 0px; padding: 0; }
                       QLabel {
                         font: bold 9px sans-serif;
                         font-family: "Open Sans";
@@ -118,29 +117,29 @@
                           background-color: transparent;
                           color: #191F24;
                           text-align: left;
-                          padding: 0px 2px;
+                          padding: 2px 2px;
                         }
                         </Style>
                         <Property>artist</Property>
                         <Channel><Variable name="channum"/></Channel>
                         <SizePolicy>me,f</SizePolicy>
-                        <MinimumSize>50,14</MinimumSize>
-                        <MaximumSize>,14</MaximumSize>
+                        <MinimumSize>50,18</MinimumSize>
+                        <MaximumSize>,18</MaximumSize>
                         <Alignment>left</Alignment>
                         <Elide>right</Elide>
                       </TrackProperty>
 
                       <WidgetGroup>
-                        <Size>1f,14f</Size>
+                        <Size>1f,18f</Size>
                         <BackPath>style/style_component_border.png</BackPath>
                       </WidgetGroup>
 
                       <Key>
                         <TooltipId>visual_key</TooltipId>
-                        <Size>30min,14f</Size>
+                        <Size>30min,18f</Size>
                         <Style>QLabel {
                           text-align: left;
-                          padding: 2px 1px 0px 0px;
+                          padding: 3px 1px 0px 0px;
                         }
                         </Style>
                         <Channel><Variable name="channum"/></Channel>
@@ -153,15 +152,15 @@
                       </Key>
 
                       <WidgetGroup>
-                        <Size>1f,14f</Size>
+                        <Size>1f,18f</Size>
                         <BackPath>style/style_component_border.png</BackPath>
                       </WidgetGroup>
 
                       <NumberBpm>
                         <TooltipId>visual_bpm</TooltipId>
-                        <Size>36f,14f</Size>
+                        <Size>38f,18f</Size>
                         <Style>QLabel {
-                          padding: 2px 1px 0px 0px;
+                          padding: 3px 1px 0px 0px;
                         }
                         </Style>
                         <Channel><Variable name="channum"/></Channel>
@@ -178,18 +177,17 @@
               </WidgetGroup><!-- Title / Time // Artist / Key /BPM -->
 
               <WidgetGroup>
-                <Size>1f,30f</Size>
+                <Size>1f,38f</Size>
                 <BackPath>style/style_component_border.png</BackPath>
               </WidgetGroup>
               
               <!-- Play -->
               <WidgetGroup>
-                <Size>41f,30f</Size>
+                <Size>41f,38f</Size>
                 <Children>
                   <PushButton>
                     <TooltipId>play_cue_set</TooltipId>
-                    <Pos>5,5</Pos>
-                    <Style></Style>
+                    <Pos>5,8</Pos>
                     <NumberStates>2</NumberStates>
                     <State>
                       <Number>0</Number>
@@ -223,7 +221,7 @@
 
       <WidgetGroup>
         <ObjectName>EffectRightBorder</ObjectName>
-        <Size>5f,40f</Size>
+        <Size>5f,48f</Size>
         <BackPath>style/style_bg_deck_border.png</BackPath>
       </WidgetGroup>
 
diff --git a/res/skins/Shade/deck_transport.xml b/res/skins/Shade/deck_transport.xml
index c0a36728d19..a84e95144fc 100644
--- a/res/skins/Shade/deck_transport.xml
+++ b/res/skins/Shade/deck_transport.xml
@@ -1,7 +1,6 @@
 <Template>
   <WidgetGroup>
     <Size>243f,59f</Size>
-    <Style>QGroupBox { border: 0px solid red;} QWidget { margin: 0; padding: 0; }</Style>
     <Children>
         <!--
       **********************************************
@@ -10,7 +9,6 @@
       -->
       <PushButton>
         <TooltipId></TooltipId>
-        <Style></Style>
         <NumberStates>2</NumberStates>
         <State>
           <Number>0</Number>
@@ -30,7 +28,6 @@
 
       <PushButton>
         <TooltipId>microphone_talkover</TooltipId>
-        <Style></Style>
         <NumberStates>2</NumberStates>
         <State>
           <Number>0</Number>
@@ -52,7 +49,6 @@
 
       <PushButton>
         <TooltipId>mute</TooltipId>
-        <Style></Style>
         <NumberStates>2</NumberStates>
         <State>
           <Number>0</Number>
@@ -78,7 +74,6 @@
       -->
       <PushButton>
         <TooltipId>show_samplers</TooltipId>
-        <Style></Style>
         <NumberStates>2</NumberStates>
         <State>
           <Number>0</Number>
@@ -98,7 +93,6 @@
 
       <PushButton>
         <TooltipId>play_start</TooltipId>
-        <Style></Style>
         <NumberStates>2</NumberStates>
         <State>
           <Number>0</Number>
@@ -126,7 +120,6 @@
 
       <PushButton>
         <TooltipId>play_start</TooltipId>
-        <Style></Style>
         <NumberStates>2</NumberStates>
         <State>
           <Number>0</Number>
@@ -154,7 +147,6 @@
 
       <PushButton>
         <TooltipId>play_start</TooltipId>
-        <Style></Style>
         <NumberStates>2</NumberStates>
         <State>
           <Number>0</Number>
@@ -182,7 +174,6 @@
 
       <PushButton>
         <TooltipId>play_start</TooltipId>
-        <Style></Style>
         <NumberStates>2</NumberStates>
         <State>
           <Number>0</Number>
@@ -234,7 +225,6 @@
 
       <PushButton>
         <TooltipId>beatjump_forward</TooltipId>
-        <Style></Style>
         <NumberStates>1</NumberStates>
         <State>
           <Number>0</Number>
@@ -253,7 +243,6 @@
       </PushButton>
       <PushButton>
         <TooltipId>beatjump_backward</TooltipId>
-        <Style></Style>
         <NumberStates>1</NumberStates>
         <State>
           <Number>0</Number>
@@ -278,7 +267,6 @@
       -->
       <PushButton>
         <TooltipId>reverse</TooltipId>
-        <Style></Style>
         <NumberStates>2</NumberStates>
         <LeftClickIsPushButton>true</LeftClickIsPushButton>
         <State>
@@ -311,7 +299,6 @@
       -->
 
       <PushButton>
-        <Style></Style>
         <NumberStates>2</NumberStates>
         <State>
           <Number>0</Number>
@@ -336,7 +323,6 @@
       -->
       <PushButton>
         <TooltipId>beatloop_activate</TooltipId>
-        <Style></Style>
         <NumberStates>2</NumberStates>
         <LeftClickIsPushButton>true</LeftClickIsPushButton>
         <RightClickIsPushButton>true</RightClickIsPushButton>
@@ -368,7 +354,6 @@
       </PushButton>
       <PushButton>
         <TooltipId>reloop_toggle</TooltipId>
-        <Style></Style>
         <Pos>170,14</Pos>
         <NumberStates>2</NumberStates>
         <LeftClickIsPushButton>true</LeftClickIsPushButton>
@@ -402,7 +387,6 @@
 
       <PushButton>
         <TooltipId>loop_halve</TooltipId>
-        <Style></Style>
         <NumberStates>1</NumberStates>
         <State>
           <Number>0</Number>
@@ -418,7 +402,6 @@
       </PushButton>
       <PushButton>
         <TooltipId>loop_double</TooltipId>
-        <Style></Style>
         <NumberStates>1</NumberStates>
         <State>
           <Number>0</Number>
@@ -492,7 +475,6 @@
           <PushButton>
             <TooltipId>intro_start</TooltipId>
             <Pos>0,0</Pos>
-            <Style></Style>
             <NumberStates>2</NumberStates>
             <LeftClickIsPushButton>true</LeftClickIsPushButton>
             <RightClickIsPushButton>true</RightClickIsPushButton>
@@ -526,7 +508,6 @@
           <PushButton>
             <TooltipId>intro_end</TooltipId>
             <Pos>21,0</Pos>
-            <Style></Style>
             <NumberStates>2</NumberStates>
             <LeftClickIsPushButton>true</LeftClickIsPushButton>
             <RightClickIsPushButton>true</RightClickIsPushButton>
@@ -560,7 +541,6 @@
           <PushButton>
             <TooltipId>outro_start</TooltipId>
             <Pos>0,21</Pos>
-            <Style></Style>
             <NumberStates>2</NumberStates>
             <LeftClickIsPushButton>true</LeftClickIsPushButton>
             <RightClickIsPushButton>true</RightClickIsPushButton>
@@ -594,7 +574,6 @@
           <PushButton>
             <TooltipId>outro_end</TooltipId>
             <Pos>21,21</Pos>
-            <Style></Style>
             <NumberStates>2</NumberStates>
             <LeftClickIsPushButton>true</LeftClickIsPushButton>
             <RightClickIsPushButton>true</RightClickIsPushButton>
diff --git a/res/skins/Shade/ducking.xml b/res/skins/Shade/ducking.xml
index a9456d05e9e..a6c406be34c 100644
--- a/res/skins/Shade/ducking.xml
+++ b/res/skins/Shade/ducking.xml
@@ -2,11 +2,9 @@
   <WidgetGroup>
     <Size>74f,54f</Size>
     <BackPath>style/style_bg_ducking.png</BackPath>
-    <Style>QGroupBox { border: 0px solid yellow; } QWidget { margin: 0; padding: 0; }</Style>
     <Children>
       <PushButton>
         <TooltipId></TooltipId>
-        <Style></Style>
         <NumberStates>3</NumberStates>
         <State>
           <Number>0</Number>
@@ -33,7 +31,6 @@
 
       <Knob>
         <TooltipId></TooltipId>
-        <Style></Style>
         <NumberStates>64</NumberStates>
         <Path>knobs/knob_rotary_s%1.png</Path>
         <Pos>27,22</Pos>
diff --git a/res/skins/Shade/effect_parameters.xml b/res/skins/Shade/effect_parameters.xml
index 05db0eaac6c..8992f4f5693 100644
--- a/res/skins/Shade/effect_parameters.xml
+++ b/res/skins/Shade/effect_parameters.xml
@@ -1,70 +1,70 @@
 
 <Template>
-	<WidgetGroup>
-		<Size>e,53f</Size>
-		<Layout>horizontal</Layout>
-		<Style> WEffect, WPushButton { 
-			font: bold 12px/10px sans-serif;
-			font-family: "Open Sans";
-			background-color: transparent; 
-			color: #191F24; 
-			padding-left: 1px; 
-		}
-		</Style>
-		<Children>
-			<Template src="skin:effect_parameter_knob.xml">
-				<SetVariable name="effectparameternum">1</SetVariable>
-			</Template>	
-			<Template src="skin:effect_parameter_button.xml">
-				<SetVariable name="effectparameternum">1</SetVariable>
-			</Template>	
-			<Template src="skin:effect_parameter_knob.xml">
-				<SetVariable name="effectparameternum">2</SetVariable>
-			</Template>	
-			<Template src="skin:effect_parameter_button.xml">
-				<SetVariable name="effectparameternum">2</SetVariable>
-			</Template>	
-			<Template src="skin:effect_parameter_knob.xml">
-				<SetVariable name="effectparameternum">3</SetVariable>
-			</Template>	
-			<Template src="skin:effect_parameter_button.xml">
-				<SetVariable name="effectparameternum">3</SetVariable>
-			</Template>	
-			<Template src="skin:effect_parameter_knob.xml">
-				<SetVariable name="effectparameternum">4</SetVariable>
-			</Template>	
-			<Template src="skin:effect_parameter_button.xml">
-				<SetVariable name="effectparameternum">4</SetVariable>
-			</Template>			
-			<Template src="skin:effect_parameter_knob.xml">
-				<SetVariable name="effectparameternum">5</SetVariable>
-			</Template>	
-			<Template src="skin:effect_parameter_button.xml">
-				<SetVariable name="effectparameternum">5</SetVariable>
-			</Template>	
-			<Template src="skin:effect_parameter_knob.xml">
-				<SetVariable name="effectparameternum">6</SetVariable>
-			</Template>	
-			<Template src="skin:effect_parameter_button.xml">
-				<SetVariable name="effectparameternum">6</SetVariable>
-			</Template>	
-			<Template src="skin:effect_parameter_knob.xml">
-				<SetVariable name="effectparameternum">7</SetVariable>
-			</Template>	
-			<Template src="skin:effect_parameter_button.xml">
-				<SetVariable name="effectparameternum">7</SetVariable>
-			</Template>	
-			<Template src="skin:effect_parameter_knob.xml">
-				<SetVariable name="effectparameternum">8</SetVariable>
-			</Template>
-			<Template src="skin:effect_parameter_button.xml">
-				<SetVariable name="effectparameternum">8</SetVariable>
-			</Template>
-		</Children>
-        <Connection>
-          <ConfigKey>[EffectRack1_EffectUnit<Variable name="effectunitnum"/>],focused_effect</ConfigKey>
-          <Transform><IsEqual><Variable name="effectnum"/></IsEqual></Transform>
-          <BindProperty>visible</BindProperty>
-        </Connection>
-	</WidgetGroup>
+  <WidgetGroup>
+    <Size>e,53f</Size>
+    <Layout>horizontal</Layout>
+    <Style> WEffect, WPushButton {
+      font: bold 12px/10px sans-serif;
+      font-family: "Open Sans";
+      background-color: transparent;
+      color: #191F24;
+      padding-left: 1px;
+    }
+    </Style>
+    <Children>
+      <Template src="skin:effect_parameter_knob.xml">
+        <SetVariable name="effectparameternum">1</SetVariable>
+      </Template>
+      <Template src="skin:effect_parameter_button.xml">
+        <SetVariable name="effectparameternum">1</SetVariable>
+      </Template>
+      <Template src="skin:effect_parameter_knob.xml">
+        <SetVariable name="effectparameternum">2</SetVariable>
+      </Template>
+      <Template src="skin:effect_parameter_button.xml">
+        <SetVariable name="effectparameternum">2</SetVariable>
+      </Template>
+      <Template src="skin:effect_parameter_knob.xml">
+        <SetVariable name="effectparameternum">3</SetVariable>
+      </Template>
+      <Template src="skin:effect_parameter_button.xml">
+        <SetVariable name="effectparameternum">3</SetVariable>
+      </Template>
+      <Template src="skin:effect_parameter_knob.xml">
+        <SetVariable name="effectparameternum">4</SetVariable>
+      </Template>
+      <Template src="skin:effect_parameter_button.xml">
+        <SetVariable name="effectparameternum">4</SetVariable>
+      </Template>
+      <Template src="skin:effect_parameter_knob.xml">
+        <SetVariable name="effectparameternum">5</SetVariable>
+      </Template>
+      <Template src="skin:effect_parameter_button.xml">
+        <SetVariable name="effectparameternum">5</SetVariable>
+      </Template>
+      <Template src="skin:effect_parameter_knob.xml">
+        <SetVariable name="effectparameternum">6</SetVariable>
+      </Template>
+      <Template src="skin:effect_parameter_button.xml">
+        <SetVariable name="effectparameternum">6</SetVariable>
+      </Template>
+      <Template src="skin:effect_parameter_knob.xml">
+        <SetVariable name="effectparameternum">7</SetVariable>
+      </Template>
+      <Template src="skin:effect_parameter_button.xml">
+        <SetVariable name="effectparameternum">7</SetVariable>
+      </Template>
+      <Template src="skin:effect_parameter_knob.xml">
+        <SetVariable name="effectparameternum">8</SetVariable>
+      </Template>
+      <Template src="skin:effect_parameter_button.xml">
+        <SetVariable name="effectparameternum">8</SetVariable>
+      </Template>
+    </Children>
+    <Connection>
+      <ConfigKey>[EffectRack1_EffectUnit<Variable name="effectunitnum"/>],focused_effect</ConfigKey>
+      <Transform><IsEqual><Variable name="effectnum"/></IsEqual></Transform>
+      <BindProperty>visible</BindProperty>
+    </Connection>
+  </WidgetGroup>
 </Template>
diff --git a/res/skins/Shade/effectrow.xml b/res/skins/Shade/effectrow.xml
index ea88d2b0e33..33bc9f17209 100644
--- a/res/skins/Shade/effectrow.xml
+++ b/res/skins/Shade/effectrow.xml
@@ -15,7 +15,6 @@
               <WidgetGroup>
                 <ObjectName>SamplerLeftBorder</ObjectName>
                 <Size>3f,0e</Size>
-                <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
               </WidgetGroup>
               <WidgetGroup>
                 <ObjectName>EffectUnit</ObjectName>
diff --git a/res/skins/Shade/effectunit_border.xml b/res/skins/Shade/effectunit_border.xml
index d2f38930f9f..a3eceee1d3f 100644
--- a/res/skins/Shade/effectunit_border.xml
+++ b/res/skins/Shade/effectunit_border.xml
@@ -1,28 +1,22 @@
 <Template>
-	<WidgetGroup>
-		<Size>0e,5f</Size>
-		<Layout>horizontal</Layout>
-		<Children>
-			<WidgetGroup>
-				<Size>0e,5f</Size>
-				<Style>QGroupBox { 
-					border: 0px solid green;  
-					margin: 0px 0px 0px 0px;
-				} 
-				</Style>
-				<BackPath>style/style_bg_looping.png</BackPath>
-        	</WidgetGroup>
-			<WidgetGroup>
-				<ObjectName>EffectRightBorder</ObjectName>
-				<Size>3f,5f</Size>
-				<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
-			</WidgetGroup>	
-		</Children>	
-        <Connection>
-          <ConfigKey>[EffectRack1_EffectUnit<Variable name="effectunitnum"/>],focused_effect</ConfigKey>
-          <Transform><IsEqual>0</IsEqual></Transform>
-          <BindProperty>visible</BindProperty>
-        </Connection>	
-	</WidgetGroup>	
+  <WidgetGroup>
+    <Size>0e,5f</Size>
+    <Layout>horizontal</Layout>
+    <Children>
+      <WidgetGroup>
+        <Size>0e,5f</Size>
+        <BackPath>style/style_bg_looping.png</BackPath>
+      </WidgetGroup>
+      <WidgetGroup>
+        <ObjectName>EffectRightBorder</ObjectName>
+        <Size>3f,5f</Size>
+      </WidgetGroup>	
+    </Children>	
+    <Connection>
+      <ConfigKey>[EffectRack1_EffectUnit<Variable name="effectunitnum"/>],focused_effect</ConfigKey>
+      <Transform><IsEqual>0</IsEqual></Transform>
+      <BindProperty>visible</BindProperty>
+    </Connection>	
+  </WidgetGroup>	
 </Template>
 
diff --git a/res/skins/Shade/effectunit_parameters.xml b/res/skins/Shade/effectunit_parameters.xml
index d5ae2ea8c62..5b92fcc11ad 100644
--- a/res/skins/Shade/effectunit_parameters.xml
+++ b/res/skins/Shade/effectunit_parameters.xml
@@ -1,55 +1,47 @@
 <Template>
-	<WidgetGroup>
-		<Size>0e,50f</Size>
-		<Layout>horizontal</Layout>
-		<Children>
-			<WidgetGroup>
+  <WidgetGroup>
+    <Size>0e,50f</Size>
+    <Layout>horizontal</Layout>
+    <Children>
+      <WidgetGroup>
         <ObjectName>EffectLeftBorder</ObjectName>
-				<Size>5f,50f</Size>
-				<BackPath>style/style_bg_deck_border.png</BackPath>
-				<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
-			</WidgetGroup>
-			<WidgetGroup>
-				<Size>0e,50f</Size>
-				<Style>QGroupBox {
-					border: 0px solid green;
-					margin: 0px 0px 0px 0px;
-				}
-				</Style>
-				<BackPath>style/style_bg_deck_pane.png</BackPath>
+        <Size>5f,50f</Size>
+        <BackPath>style/style_bg_deck_border.png</BackPath>
+      </WidgetGroup>
+      <WidgetGroup>
+        <Size>0e,50f</Size>
+        <BackPath>style/style_bg_deck_pane.png</BackPath>
         <Layout>horizontal</Layout>
-				<Children>
-					<Template src="skin:effect_parameters.xml">
+        <Children>
+          <Template src="skin:effect_parameters.xml">
             <SetVariable name="effectunitnum"><Variable name="effectunitnum"/></SetVariable>
             <SetVariable name="effectnum">1</SetVariable>
-					</Template>
-					<Template src="skin:effect_parameters.xml">
-					 	<SetVariable name="effectunitnum"><Variable name="effectunitnum"/></SetVariable>
+          </Template>
+          <Template src="skin:effect_parameters.xml">
+            <SetVariable name="effectunitnum"><Variable name="effectunitnum"/></SetVariable>
             <SetVariable name="effectnum">2</SetVariable>
-					</Template>
-					<Template src="skin:effect_parameters.xml">
-						<SetVariable name="effectunitnum"><Variable name="effectunitnum"/></SetVariable>
-						<SetVariable name="effectnum">3</SetVariable>
-					</Template>
+          </Template>
+          <Template src="skin:effect_parameters.xml">
+            <SetVariable name="effectunitnum"><Variable name="effectunitnum"/></SetVariable>
+            <SetVariable name="effectnum">3</SetVariable>
+          </Template>
         </Children>
-			</WidgetGroup>
-			<WidgetGroup>
+      </WidgetGroup>
+      <WidgetGroup>
+        <ObjectName>EffectRightBorder</ObjectName>
+        <Size>5f,50f</Size>
+        <BackPath>style/style_bg_deck_border.png</BackPath>
+      </WidgetGroup>
+      <WidgetGroup>
         <ObjectName>EffectRightBorder</ObjectName>
-				<Size>5f,50f</Size>
-				<BackPath>style/style_bg_deck_border.png</BackPath>
-				<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
-			</WidgetGroup>
-			<WidgetGroup>
-				<ObjectName>EffectRightBorder</ObjectName>
-				<Size>3f,50f</Size>
-				<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
-			</WidgetGroup>
-		</Children>
+        <Size>3f,50f</Size>
+      </WidgetGroup>
+    </Children>
       <Connection>
         <ConfigKey>[EffectRack1_EffectUnit<Variable name="effectunitnum"/>],focused_effect</ConfigKey>
         <Transform><IsEqual>0</IsEqual><Not/></Transform>
         <BindProperty>visible</BindProperty>
       </Connection>
-	</WidgetGroup>
+  </WidgetGroup>
 </Template>
 
diff --git a/res/skins/Shade/effectunitsmall.xml b/res/skins/Shade/effectunitsmall.xml
index dc78400a009..f600600a21c 100644
--- a/res/skins/Shade/effectunitsmall.xml
+++ b/res/skins/Shade/effectunitsmall.xml
@@ -8,7 +8,6 @@
         <ObjectName>EffectLeftBorder</ObjectName>
         <Size>5f,36f</Size>
         <BackPath>style/style_bg_deck_border.png</BackPath>
-        <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
       </WidgetGroup>
 
       <WidgetGroup>
@@ -31,20 +30,18 @@
           <WidgetGroup>
             <Size>0e,28f</Size>
           </WidgetGroup>
-          </Children>
+        </Children>
       </WidgetGroup>
 
       <WidgetGroup>
         <ObjectName>EffectRightBorder</ObjectName>
         <Size>5f,36f</Size>
         <BackPath>style/style_bg_deck_border.png</BackPath>
-        <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
       </WidgetGroup>
 
       <WidgetGroup>
         <ObjectName>EffectRightBorder</ObjectName>
         <Size>3f,36f</Size>
-        <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
       </WidgetGroup>
 
     </Children>
diff --git a/res/skins/Shade/looping.xml b/res/skins/Shade/looping.xml
index bdbfeef7063..ed1f5c61d4c 100644
--- a/res/skins/Shade/looping.xml
+++ b/res/skins/Shade/looping.xml
@@ -8,21 +8,14 @@
         <ObjectName>EffectLeftBorder</ObjectName>
         <Size>5f,40f</Size>
         <BackPath>style/style_bg_deck_border.png</BackPath>
-        <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
       </WidgetGroup>
 
       <WidgetGroup><!-- beatjump controls -->
         <Size>149f,40f</Size>
-        <Style>QGroupBox {
-          border: 0px solid green;
-          margin: 0px;
-        }
-        </Style>
         <BackPath>style/style_bg_looping.png</BackPath>
         <Children>
           <PushButton>
             <TooltipId>beatjump_backward</TooltipId>
-            <Style></Style>
             <NumberStates>1</NumberStates>
             <State>
               <Number>0</Number>
@@ -44,7 +37,6 @@
           <WidgetGroup>
             <Size>50f,20f</Size>
             <Pos>26,10</Pos>
-            <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
             <Layout>horizontal</Layout>
             <Children>
               <BeatSpinBox>
@@ -58,7 +50,6 @@
 
           <PushButton>
             <TooltipId>beatjump_forward</TooltipId>
-            <Style></Style>
             <NumberStates>1</NumberStates>
             <State>
               <Number>0</Number>
@@ -78,7 +69,6 @@
 
           <PushButton>
             <TooltipId>back_start</TooltipId>
-            <Style></Style>
             <NumberStates>1</NumberStates>
             <State>
               <Number>0</Number>
@@ -100,7 +90,6 @@
 
           <PushButton>
             <TooltipId>fwd_end</TooltipId>
-            <Style></Style>
             <NumberStates>1</NumberStates>
             <State>
               <Number>0</Number>
@@ -127,7 +116,6 @@
         <ObjectName>EffectLeftBorder</ObjectName>
         <Size>1f,40f</Size>
         <BackPath>style/style_bg_deck_border.png</BackPath>
-        <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
       </WidgetGroup>
 
       <WidgetGroup>
@@ -139,22 +127,15 @@
         <ObjectName>EffectLeftBorder</ObjectName>
         <Size>1f,40f</Size>
         <BackPath>style/style_bg_deck_border.png</BackPath>
-        <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
       </WidgetGroup>
 
       <WidgetGroup><!-- loop controls -->
         <Size>332f,40f</Size>
-        <Style>QGroupBox {
-          border: 0px solid green;
-          margin: 0px 0px 0px 0px;
-        }
-        </Style>
         <BackPath>style/style_bg_looping.png</BackPath>
         <Children>
           <PushButton>
             <Pos>5,10</Pos>
             <TooltipId>reloop_toggle</TooltipId>
-            <Style></Style>
             <NumberStates>2</NumberStates>
             <LeftClickIsPushButton>true</LeftClickIsPushButton>
             <State>
@@ -188,7 +169,6 @@
           <PushButton>
             <Pos>32,10</Pos>
             <TooltipId>loop_in</TooltipId>
-            <Style></Style>
             <NumberStates>1</NumberStates>
             <State>
               <Number>0</Number>
@@ -205,7 +185,6 @@
           <PushButton>
             <Pos>53,10</Pos>
             <TooltipId>loop_out</TooltipId>
-            <Style></Style>
             <NumberStates>1</NumberStates>
             <State>
               <Number>0</Number>
@@ -222,7 +201,6 @@
           <PushButton>
             <Pos>80,10</Pos>
             <TooltipId>beatloop_activate</TooltipId>
-            <Style></Style>
             <NumberStates>1</NumberStates>
             <State>
               <Number>0</Number>
@@ -242,7 +220,6 @@
           <WidgetGroup>
             <Pos>101,10</Pos>
             <Size>50f,20f</Size>
-            <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
             <Layout>horizontal</Layout>
             <Children>
               <BeatSpinBox>
@@ -264,7 +241,6 @@
           <PushButton>
             <Pos>160,10</Pos>
             <TooltipId>beatloop_activate</TooltipId>
-            <Style></Style>
             <NumberStates>2</NumberStates>
             <LeftClickIsPushButton>true</LeftClickIsPushButton>
             <RightClickIsPushButton>true</RightClickIsPushButton>
@@ -297,7 +273,6 @@
           <PushButton>
             <Pos>181,10</Pos>
             <TooltipId>beatloop_activate</TooltipId>
-            <Style></Style>
             <NumberStates>2</NumberStates>
             <LeftClickIsPushButton>true</LeftClickIsPushButton>
             <RightClickIsPushButton>true</RightClickIsPushButton>
@@ -330,7 +305,6 @@
           <PushButton>
             <Pos>202,10</Pos>
             <TooltipId>beatloop_activate</TooltipId>
-            <Style></Style>
             <NumberStates>2</NumberStates>
             <LeftClickIsPushButton>true</LeftClickIsPushButton>
             <RightClickIsPushButton>true</RightClickIsPushButton>
@@ -361,7 +335,6 @@
           </PushButton>
           <PushButton>
             <TooltipId>beatloop_activate</TooltipId>
-            <Style></Style>
             <NumberStates>2</NumberStates>
             <LeftClickIsPushButton>true</LeftClickIsPushButton>
             <RightClickIsPushButton>true</RightClickIsPushButton>
@@ -393,7 +366,6 @@
           </PushButton>
           <PushButton>
             <TooltipId>beatloop_activate</TooltipId>
-            <Style></Style>
             <NumberStates>2</NumberStates>
             <LeftClickIsPushButton>true</LeftClickIsPushButton>
             <RightClickIsPushButton>true</RightClickIsPushButton>
@@ -425,7 +397,6 @@
           </PushButton>
           <PushButton>
             <TooltipId>beatloop_activate</TooltipId>
-            <Style></Style>
             <NumberStates>2</NumberStates>
             <LeftClickIsPushButton>true</LeftClickIsPushButton>
             <RightClickIsPushButton>true</RightClickIsPushButton>
@@ -457,7 +428,6 @@
           </PushButton>
           <PushButton>
             <TooltipId>beatloop_activate</TooltipId>
-            <Style></Style>
             <NumberStates>2</NumberStates>
             <LeftClickIsPushButton>true</LeftClickIsPushButton>
             <RightClickIsPushButton>true</RightClickIsPushButton>
@@ -489,7 +459,6 @@
           </PushButton>
           <PushButton>
             <TooltipId>beatloop_activate</TooltipId>
-            <Style></Style>
             <NumberStates>2</NumberStates>
             <LeftClickIsPushButton>true</LeftClickIsPushButton>
             <RightClickIsPushButton>true</RightClickIsPushButton>
@@ -526,12 +495,10 @@
         <ObjectName>EffectRightBorder</ObjectName>
         <Size>5f,40f</Size>
         <BackPath>style/style_bg_deck_border.png</BackPath>
-        <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
       </WidgetGroup>
 
       <WidgetGroup>
         <Size>3f,40f</Size>
-        <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
       </WidgetGroup>
 
     </Children>
diff --git a/res/skins/Shade/microphone.xml b/res/skins/Shade/microphone.xml
index 4914fbf1d2b..5c1606433fc 100644
--- a/res/skins/Shade/microphone.xml
+++ b/res/skins/Shade/microphone.xml
@@ -1,62 +1,58 @@
 <Template>
-    <WidgetGroup>
-      <Pos>0,0</Pos>
-      <Size>93f,54f</Size>
-      <BackPath>style/style_bg_microphone_<Variable name="miclabel"/>.png</BackPath>
-      <Style>QGroupBox { border: 0px solid yellow; } QWidget { margin: 0; padding: 0; }</Style>
-      <!--<Layout>horizontal</Layout>-->
-      <Children>
-        <!--
-        **********************************************
-        Visual- Volume peak indicator
-        **********************************************
-        -->
-        <StatusLight>
-          <TooltipId>microphone_PeakIndicator</TooltipId>
-          <Style></Style>
-          <PathStatusLight>skin:/style/volume_clipping_microphone_over.png</PathStatusLight>
-          <PathBack>skin:/style/volume_clipping_microphone.png</PathBack>
-          <Pos>82,6</Pos>
-          <Connection>
-            <ConfigKey>[Microphone<Variable name="micnum"/>],PeakIndicator</ConfigKey>
-          </Connection>
-        </StatusLight>
+  <WidgetGroup>
+    <Pos>0,0</Pos>
+    <Size>93f,54f</Size>
+    <BackPath>style/style_bg_microphone_<Variable name="miclabel"/>.png</BackPath>
+    <!--<Layout>horizontal</Layout>-->
+    <Children>
+      <!--
+      **********************************************
+      Visual- Volume peak indicator
+      **********************************************
+      -->
+      <StatusLight>
+        <TooltipId>microphone_PeakIndicator</TooltipId>
+        <PathStatusLight>skin:/style/volume_clipping_microphone_over.png</PathStatusLight>
+        <PathBack>skin:/style/volume_clipping_microphone.png</PathBack>
+        <Pos>82,6</Pos>
+        <Connection>
+          <ConfigKey>[Microphone<Variable name="micnum"/>],PeakIndicator</ConfigKey>
+        </Connection>
+      </StatusLight>
 
-        <!--
-        **********************************************
-        Visual - Volume level display
-        **********************************************
-        -->
-        <VuMeter>
-          <TooltipId>microphone_VuMeter</TooltipId>
-          <Style></Style>
-          <PathVu>skin:/style/volume_display_microphone_over.png</PathVu>
-          <PathBack>skin:/style/volume_display_microphone.png</PathBack>
-          <Pos>82,14</Pos>
-          <PeakHoldSize>5</PeakHoldSize>
-          <PeakHoldTime>500</PeakHoldTime>
-          <PeakFallTime>50</PeakFallTime>
-          <PeakFallStep>2</PeakFallStep>
-          <Connection>
-            <ConfigKey>[Microphone<Variable name="micnum"/>],VuMeter</ConfigKey>
-          </Connection>
-        </VuMeter>
+      <!--
+      **********************************************
+      Visual - Volume level display
+      **********************************************
+      -->
+      <VuMeter>
+        <TooltipId>microphone_VuMeter</TooltipId>
+        <PathVu>skin:/style/volume_display_microphone_over.png</PathVu>
+        <PathBack>skin:/style/volume_display_microphone.png</PathBack>
+        <Pos>82,14</Pos>
+        <PeakHoldSize>5</PeakHoldSize>
+        <PeakHoldTime>500</PeakHoldTime>
+        <PeakFallTime>50</PeakFallTime>
+        <PeakFallStep>2</PeakFallStep>
+        <Connection>
+          <ConfigKey>[Microphone<Variable name="micnum"/>],VuMeter</ConfigKey>
+        </Connection>
+      </VuMeter>
 
-        <!--
-        **********************************************
-        Knob- Channel Volume
-        **********************************************
-        -->
-        <Knob>
-          <TooltipId>microphone_pregain</TooltipId>
-          <Style></Style>
-          <NumberStates>64</NumberStates>
-          <Path>knobs/knob_rotary_s%1.png</Path>
-          <Pos>49,22</Pos>
-          <Connection>
-            <ConfigKey>[Microphone<Variable name="micnum"/>],pregain</ConfigKey>
-          </Connection>
-        </Knob>
-      </Children>
-    </WidgetGroup>
+      <!--
+      **********************************************
+      Knob- Channel Volume
+      **********************************************
+      -->
+      <Knob>
+        <TooltipId>microphone_pregain</TooltipId>
+        <NumberStates>64</NumberStates>
+        <Path>knobs/knob_rotary_s%1.png</Path>
+        <Pos>49,22</Pos>
+        <Connection>
+          <ConfigKey>[Microphone<Variable name="micnum"/>],pregain</ConfigKey>
+        </Connection>
+      </Knob>
+    </Children>
+  </WidgetGroup>
 </Template>
diff --git a/res/skins/Shade/mixer_panel.xml b/res/skins/Shade/mixer_panel.xml
index 773d0cdf592..ee1a073e47e 100644
--- a/res/skins/Shade/mixer_panel.xml
+++ b/res/skins/Shade/mixer_panel.xml
@@ -2,7 +2,6 @@
     <WidgetGroup>
       <Pos>3,0</Pos>
       <Size>255,229e</Size>
-      <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
       <BackPath>style/style_bg_mixer_panel.png</BackPath>
       <Children>
         <!-- if we don't put all this in an extra child widget, the <NumberRate> will somehow
@@ -11,7 +10,6 @@
         <WidgetGroup>
           <Pos>0,0</Pos>
           <Size>250,224</Size>
-          <Style>QGroupBox { border: 0px solid yellow; } QWidget { margin: 0; padding: 0; } </Style>
           <Children>
             <!--
             **********************************************
@@ -20,7 +18,6 @@
             -->
             <SliderComposed>
               <TooltipId>channel_volume</TooltipId>
-              <Style></Style>
               <Handle>knob_volume.png</Handle>
               <Slider>slider_volume.png</Slider>
               <Pos>72,55</Pos>
@@ -32,7 +29,6 @@
             </SliderComposed>
             <SliderComposed>
               <TooltipId>channel_volume</TooltipId>
-              <Style></Style>
               <Handle>knob_volume.png</Handle>
               <Slider>slider_volume.png</Slider>
               <Pos>168,55</Pos>
@@ -50,7 +46,6 @@
             -->
             <SliderComposed>
               <TooltipId>crossfader</TooltipId>
-              <Style></Style>
               <Handle>knob_crossfader.png</Handle>
               <Slider>slider_crossfader.png</Slider>
               <Pos>72,200</Pos>
@@ -68,7 +63,6 @@
             -->
             <PushButton>
               <TooltipId>play_cue_set</TooltipId>
-              <Style></Style>
               <NumberStates>2</NumberStates>
               <State>
                 <Number>0</Number>
@@ -95,7 +89,6 @@
             </PushButton>
             <PushButton>
               <TooltipId>play_cue_set</TooltipId>
-              <Style></Style>
               <NumberStates>2</NumberStates>
               <State>
                 <Number>0</Number>
@@ -128,7 +121,6 @@
             -->
             <PushButton>
               <TooltipId>cue_default_cue_gotoandstop</TooltipId>
-              <Style></Style>
               <NumberStates>2</NumberStates>
               <State>
                 <Number>0</Number>
@@ -157,7 +149,6 @@
             </PushButton>
             <PushButton>
               <TooltipId>cue_default_cue_gotoandstop</TooltipId>
-              <Style></Style>
               <NumberStates>2</NumberStates>
               <State>
                 <Number>0</Number>
@@ -192,7 +183,6 @@
             -->
             <PushButton>
               <TooltipId>pfl</TooltipId>
-              <Style></Style>
               <NumberStates>2</NumberStates>
               <State>
                 <Number>0</Number>
@@ -211,7 +201,6 @@
             </PushButton>
             <PushButton>
               <TooltipId>pfl</TooltipId>
-              <Style></Style>
               <NumberStates>2</NumberStates>
               <State>
                 <Number>0</Number>
@@ -398,8 +387,6 @@
             <StatusLight>
               <Pos>113,27</Pos>
               <TooltipId>audio_latency_usage</TooltipId>
-              <Style>
-              </Style>
               <PathStatusLight>audio_latency/audio_latency_overload.png</PathStatusLight>
               <PathBack>audio_latency/audio_latency_overload_back.png</PathBack>
               <Connection>
@@ -425,7 +412,6 @@
             </VuMeter>
 
             <PushButton>
-              <Style></Style>
               <NumberStates>5</NumberStates>
               <State>
                 <Number>0</Number>
@@ -469,7 +455,6 @@
             -->
             <Knob>
               <TooltipId>master_gain</TooltipId>
-              <Style></Style>
               <NumberStates>64</NumberStates>
               <Path>knobs/knob_rotary_s%1.png</Path>
               <Pos>217,15</Pos>
@@ -479,7 +464,6 @@
             </Knob>
             <Knob>
               <TooltipId>balance</TooltipId>
-              <Style></Style>
               <NumberStates>63</NumberStates>
               <Path>knobs/knob_rotary_s%1.png</Path>
               <Pos>151,15</Pos>
@@ -495,7 +479,6 @@
             -->
             <Knob>
               <TooltipId>headphone_gain</TooltipId>
-              <Style></Style>
               <NumberStates>64</NumberStates>
               <Path>knobs_no_center/knob_rotary_s%1.png</Path>
               <Pos>11,15</Pos>
@@ -505,7 +488,6 @@
             </Knob>
             <Knob>
               <TooltipId>headMix</TooltipId>
-              <Style></Style>
               <NumberStates>64</NumberStates>
               <Path>knobs/knob_rotary_s%1.png</Path>
               <Pos>76,15</Pos>
@@ -520,8 +502,7 @@
             **********************************************
             -->
             <PushButton>
-              <TooltipId>headSplitpfl</TooltipId>
-              <Style></Style>
+              <TooltipId>headSplit</TooltipId>
               <NumberStates>2</NumberStates>
               <State>
                 <Number>0</Number>
@@ -546,7 +527,6 @@
             -->
             <Knob>
               <TooltipId>pregain</TooltipId>
-              <Style></Style>
               <NumberStates>64</NumberStates>
               <Path>knobs/knob_rotary_s%1.png</Path>
               <Pos>32,47</Pos>
@@ -593,7 +573,6 @@
 
             <Knob>
               <TooltipId>pregain</TooltipId>
-              <Style></Style>
               <NumberStates>64</NumberStates>
               <Path>knobs/knob_rotary_s%1.png</Path>
               <Pos>196,47</Pos>
@@ -615,7 +594,6 @@
             </EffectParameterKnob>
             <EffectParameterKnob>
               <TooltipId>filterMid</TooltipId>
-              <Style></Style>
               <NumberStates>64</NumberStates>
               <Path>knobs/knob_rotary_s%1.png</Path>
               <Pos>196,105</Pos>
@@ -629,7 +607,6 @@
             </EffectParameterKnob>
             <EffectParameterKnob>
               <TooltipId>filterLow</TooltipId>
-              <Style></Style>
               <NumberStates>64</NumberStates>
               <Path>knobs/knob_rotary_s%1.png</Path>
               <Pos>196,134</Pos>
@@ -649,7 +626,6 @@
             -->
             <VuMeter>
               <TooltipId>channel_VuMeter</TooltipId>
-              <Style></Style>
               <PathVu>skin:/style/volume_display_over.png</PathVu>
               <PathBack>skin:/style/volume_display.png</PathBack>
               <Pos>107,76</Pos>
@@ -664,7 +640,6 @@
             </VuMeter>
             <VuMeter>
               <TooltipId>channel_VuMeter</TooltipId>
-              <Style></Style>
               <PathVu>skin:/style/volume_display_over.png</PathVu>
               <PathBack>skin:/style/volume_display.png</PathBack>
               <Pos>143,76</Pos>
@@ -680,7 +655,6 @@
 
             <VuMeter>
               <TooltipId>master_VuMeterL</TooltipId>
-              <Style></Style>
               <PathVu>skin:/style/volume_display_master_over.png</PathVu>
               <PathBack>skin:/style/volume_display_master.png</PathBack>
               <Pos>122,76</Pos>
@@ -694,7 +668,6 @@
             </VuMeter>
             <VuMeter>
               <TooltipId>master_VuMeterR</TooltipId>
-              <Style></Style>
               <PathVu>skin:/style/volume_display_master_over.png</PathVu>
               <PathBack>skin:/style/volume_display_master.png</PathBack>
               <Pos>128,76</Pos>
@@ -714,7 +687,6 @@
             -->
             <StatusLight>
               <TooltipId>channel_PeakIndicator</TooltipId>
-              <Style></Style>
               <PathStatusLight>skin:/style/volume_clipping_over.png</PathStatusLight>
               <PathBack>skin:/style/volume_clipping.png</PathBack>
               <Pos>107,57</Pos>
@@ -724,7 +696,6 @@
             </StatusLight>
             <StatusLight>
               <TooltipId>channel_PeakIndicator</TooltipId>
-              <Style></Style>
               <PathStatusLight>skin:/style/volume_clipping_over.png</PathStatusLight>
               <PathBack>skin:/style/volume_clipping.png</PathBack>
               <Pos>143,57</Pos>
@@ -734,7 +705,6 @@
             </StatusLight>
             <StatusLight>
               <TooltipId>master_PeakIndicatorL</TooltipId>
-              <Style></Style>
               <PathStatusLight>skin:/style/volume_clipping_master_over.png</PathStatusLight>
               <PathBack>skin:/style/volume_clipping_master.png</PathBack>
               <Pos>122,57</Pos>
@@ -744,7 +714,6 @@
             </StatusLight>
             <StatusLight>
               <TooltipId>master_PeakIndicatorR</TooltipId>
-              <Style></Style>
               <PathStatusLight>skin:/style/volume_clipping_master_over.png</PathStatusLight>
               <PathBack>skin:/style/volume_clipping_master.png</PathBack>
               <Pos>128,57</Pos>
diff --git a/res/skins/Shade/preview_deck.xml b/res/skins/Shade/preview_deck.xml
index abc0cad2955..8cfe5f4fc93 100644
--- a/res/skins/Shade/preview_deck.xml
+++ b/res/skins/Shade/preview_deck.xml
@@ -7,10 +7,6 @@
 				<ObjectName>SamplerTopBorder</ObjectName>
 				<Size>0e,5f</Size>
 				<BackPath>style/style_bg_deck_border.png</BackPath>
-				<Style>
-					QGroupBox { border: 0px solid red; } 
-					QWidget { margin: 0px; padding: 0; }
-				</Style>
 			</WidgetGroup>
 
 			<!-- Middle part: left border, text/overview, VU, volume, right border -->
@@ -18,7 +14,6 @@
 				<Size>0e,54f</Size>
 				<Layout>horizontal</Layout>
 				<Style>
-					QGroupBox { border: 0px solid red;} 
 					QWidget { margin: 0; padding: 0; }
 				</Style>
 				<Children>
@@ -29,27 +24,15 @@
 					</WidgetGroup>
 
 					<WidgetGroup>
-						<Style>
-							QGroupBox { border: 0px solid red; } 
-							QWidget { margin: 0; padding: 0; }
-						</Style>
 						<BackPath>style/style_bg_sampler_mid.png</BackPath>
 						<Layout>vertical</Layout>
 						<Children>
 
 							<WidgetGroup>
-								<Style>
-									QGroupBox { border: 0px solid red; } 
-									QWidget { margin: 0; padding: 0; }
-								</Style>
 								<Layout>horizontal</Layout>
 								<Children>
 									<WidgetGroup>
 										<Size>0e,18f</Size>
-										<Style>
-											QGroupBox {border: 0px solid red; } 
-											QWidget { margin: 0; padding: 0; }
-										</Style>
 										<Layout>horizontal</Layout>
 										<Children>
 											<Text>
@@ -70,10 +53,6 @@
 									</WidgetGroup>
 									<WidgetGroup>
 										<Size>35f,18f</Size>
-										<Style>
-											QGroupBox {border: 0px solid red; } 
-											QWidget { margin: 0; padding: 0; }
-										</Style>
 										<Children>
 											<Number>
 												<TooltipId>visual_bpm</TooltipId>
@@ -103,14 +82,9 @@
 
 									<WidgetGroup>
 										<Size>20f,18f</Size>
-										<Style>
-											QGroupBox {border: 0px solid red; } 
-											QWidget { margin: 0; padding: 0; }
-										</Style>
 										<Children>
 											<PushButton>
 												<TooltipId>eject</TooltipId>
-												<Style></Style>
 												<NumberStates>1</NumberStates>
 												<State>
 													<Number>0</Number>
@@ -137,24 +111,15 @@
 							<WidgetGroup>
 								<ObjectName>SamplerMid</ObjectName>
 								<Size>0e,35f</Size>
-								<Style>
-									QGroupBox { border: 0px solid red; } 
-									QWidget { margin: 0px; padding: 0; }
-								</Style>
 								<Layout>horizontal</Layout>
 								<Children>
 									<WidgetGroup>
 										<ObjectName>SamplerMid</ObjectName>
 										<Size>27f,35f</Size>
 										<BackPath>style/style_bg_sampler_mid.png</BackPath>
-										<Style>
-											QGroupBox { border: 0px solid red; } 
-											QWidget { margin: 0px; padding: 0; }
-										</Style>
 										<Children>
 											<PushButton>
 												<TooltipId>play_start</TooltipId>
-												<Style></Style>
 												<NumberStates>2</NumberStates>
 												<State>
 													<Number>0</Number>
@@ -185,15 +150,10 @@
 										<ObjectName>SamplerMid</ObjectName>
 										<Size>0e,35f</Size>
 										<BackPath>style/style_bg_sampler_mid.png</BackPath>
-										<Style>
-											QGroupBox { border: 0px solid red; } 
-											QWidget { margin: 0px; padding: 0; }
-										</Style>
 										<Layout>horizontal</Layout>
 										<Children>
 											<Overview>
 												<TooltipId>waveform_overview</TooltipId>
-												<Style></Style>
 												<Group>[PreviewDeck1]</Group>
 												<Pos>0,0</Pos>
 												<Size>0e,35f</Size>
@@ -204,6 +164,7 @@
 												<SignalLowColor></SignalLowColor>
 												<SignalColor>#191F24</SignalColor>
 												<PlayPosColor>#00FF00</PlayPosColor>
+												<ShowCueTimes>false</ShowCueTimes>
 												<DefaultMark>
 													<Align>top</Align>
 													<Color>#FD0564</Color>
@@ -233,13 +194,11 @@
 						<BackPath>style/style_bg_deck_pane.png</BackPath>
 						<Size>9f,54f</Size>
 						<Style>
-							QGroupBox { border: 0px solid red; } 
 							QWidget { margin: 0px; padding: 2px; }
 						</Style>
 						<Children>
 							<StatusLight>
 								<TooltipId>sampler_PeakIndicator</TooltipId>
-								<Style></Style>
 								<PathStatusLight>skin:/style/volume_clipping_previewdeck_over.png</PathStatusLight>
 								<PathBack>skin:/style/volume_clipping_previewdeck.png</PathBack>
 								<Pos>2,2</Pos>
@@ -250,7 +209,6 @@
 							</StatusLight>
 							<VuMeter>
 								<TooltipId>sampler_VuMeter</TooltipId>
-								<Style></Style>
 								<PathVu>skin:/style/volume_display_previewdeck_over.png</PathVu>
 								<PathBack>skin:/style/volume_display_previewdeck.png</PathBack>
 								<Pos>2,11</Pos>
@@ -270,14 +228,9 @@
 					<WidgetGroup>
 						<BackPath>style/style_bg_deck_pane.png</BackPath>
 						<Size>10f,54f</Size>
-						<Style>
-							QGroupBox { border: 0px solid red; } 
-							QWidget { margin: 0px; }
-						</Style>
 						<Children>
 							<SliderComposed>
 								<TooltipId>pregain</TooltipId>
-								<Style></Style>
 								<Pos>0,1</Pos>
 								<Size>8f,52f</Size>
 								<Handle>knob_volume_previewdeck.png</Handle>
@@ -303,10 +256,6 @@
 				<ObjectName>SamplerBottomBorder</ObjectName>
 				<Size>0e,5f</Size>
 				<BackPath>style/style_bg_deck_border.png</BackPath>
-				<Style>
-					QGroupBox { border: 0px solid red; } 
-					QWidget { margin: 0px; padding: 0; }
-				</Style>
 			</WidgetGroup>
 		</Children>
 	</WidgetGroup>
diff --git a/res/skins/Shade/sampler.xml b/res/skins/Shade/sampler.xml
index fe8613fae5e..6d44e683ef7 100644
--- a/res/skins/Shade/sampler.xml
+++ b/res/skins/Shade/sampler.xml
@@ -1,557 +1,525 @@
 <Template>
-	<WidgetGroup>
-		<ObjectName>Sampler</ObjectName>
-		<Size>i,103f</Size>
-		<Layout>horizontal</Layout>
-		<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0px; } </Style>
-		<Children>
-			<WidgetGroup>
-				<ObjectName>SamplerLeftBorder</ObjectName>
-				<Size>5f,100f</Size>
-				<BackPath>style/style_bg_deck_border.png</BackPath>
-				<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
-			</WidgetGroup>
-			<WidgetGroup>
-				<Size>0e,103f</Size>
-				<Layout>vertical</Layout>
-				<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
-				<Children>
-					<WidgetGroup>
-						<ObjectName>SamplerTop</ObjectName>
-						<Size>0e,24f</Size>
-						<BackPath>style/style_bg_sampler_top.png</BackPath>
-						<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
-						<Layout>horizontal</Layout>
-						<Children>
-							<Text>
-								<TooltipId>text</TooltipId>
-								<Style>QLabel { font: bold 12px/14px sans-serif;
-										font-family: "Open Sans";
-										background-color: transparent;
-										color: #191F24;
-										text-align: left;
-										padding-left: 1px; 
-										padding-top: 6px;}
-								</Style>
-								<Group>[Sampler<Variable name="samplernum"/>]</Group>
-								<SizePolicy>me,max</SizePolicy>
-								<Elide>right</Elide>
-							</Text>
-							<!-- Alternative "TITLE ONLY" display
-							<TrackProperty>
-								<TooltipId>track_title</TooltipId>
-								<Style>QLabel { font: bold 14px/16px sans-serif;
-										font-family: "Open Sans";
-										background-color: transparent;
-										color: #191F24;
-										text-align: left;
-										padding-left: 1px; }
-								</Style>
-								<Property>title</Property>
-								<Group>[Sampler<Variable name="samplernum"/>]</Group>
-								<SizePolicy>me,max</SizePolicy>
-								<Elide>right</Elide>
-							</TrackProperty>
-							-->
-							<WidgetGroup>
-							 	<Size>35f,24f</Size>
-								<Style>QGroupBox {border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
-								<Children>
-									<Number>
-										<TooltipId>visual_bpm</TooltipId>
-										<Style>QLabel { font: bold 9px sans-serif;
-												font-family: "Open Sans";
-												background-color: transparent;
-												color: #191F24;
-												padding-right: 0;
-												padding-top: 2px;}
-										</Style>
-										<Size>35f,24f</Size>
-										<Pos>0,2</Pos>
-										<Group>[Sampler<Variable name="samplernum"/>]</Group>
-										<!--CSS alignments not respected see bug lp:605530 , lets call <Alignment>-->
-										<Alignment>right</Alignment>
-										<Connection>
-											<ConfigKey>[Sampler<Variable name="samplernum"/>],visual_bpm</ConfigKey>
-										</Connection>
-									</Number>
-									<!-- Little trickery here:
-										 BPM tap is transparent png directly over BPM display, so it became BPM and TAP at once,
-										 changed tooltip accordingly
-									-->
-									<PushButton>
-									<!-- Original:
-										<TooltipId>bpm_tap</TooltipId>
-									-->
-										<TooltipId>bpm_tap_visual_bpm</TooltipId>
-										<Pos>0,5</Pos>
-										<Style></Style>
-										<NumberStates>1</NumberStates>
-										<State>
-											<Number>0</Number>
-											<Pressed>skin:/btn/btn_tap_sampler_over.png</Pressed>
-											<Unpressed>skin:/btn/btn_tap_sampler.png</Unpressed>
-										</State>
-										<Connection>
-											<ConfigKey>[Sampler<Variable name="samplernum"/>],bpm_tap</ConfigKey>
-											<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-										</Connection>
-									</PushButton>
-								</Children>
-							</WidgetGroup>
-						</Children>
-					</WidgetGroup>
-					<WidgetGroup>
-						<ObjectName>SamplerMid</ObjectName>
-						<Size>0e,36f</Size>
-						<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
-						<Layout>horizontal</Layout>
-						<Children>	
+  <WidgetGroup>
+    <ObjectName>Sampler</ObjectName>
+    <Size>i,103f</Size>
+    <Layout>horizontal</Layout>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>SamplerLeftBorder</ObjectName>
+        <Size>5f,100f</Size>
+        <BackPath>style/style_bg_deck_border.png</BackPath>
+      </WidgetGroup>
+      <WidgetGroup>
+        <Size>0e,103f</Size>
+        <Layout>vertical</Layout>
+        <Children>
+          <WidgetGroup>
+            <ObjectName>SamplerTop</ObjectName>
+            <Size>0e,24f</Size>
+            <BackPath>style/style_bg_sampler_top.png</BackPath>
+            <Layout>horizontal</Layout>
+            <Children>
+              <Text>
+                <TooltipId>text</TooltipId>
+                <Style>QLabel { font: bold 12px/14px sans-serif;
+                    font-family: "Open Sans";
+                    background-color: transparent;
+                    color: #191F24;
+                    text-align: left;
+                    padding-left: 1px;
+                    padding-top: 6px;}
+                </Style>
+                <Group>[Sampler<Variable name="samplernum"/>]</Group>
+                <SizePolicy>me,max</SizePolicy>
+                <Elide>right</Elide>
+              </Text>
+              <!-- Alternative "TITLE ONLY" display
+              <TrackProperty>
+                <TooltipId>track_title</TooltipId>
+                <Style>QLabel { font: bold 14px/16px sans-serif;
+                    font-family: "Open Sans";
+                    background-color: transparent;
+                    color: #191F24;
+                    text-align: left;
+                    padding-left: 1px; }
+                </Style>
+                <Property>title</Property>
+                <Group>[Sampler<Variable name="samplernum"/>]</Group>
+                <SizePolicy>me,max</SizePolicy>
+                <Elide>right</Elide>
+              </TrackProperty>
+              -->
+              <WidgetGroup>
+                <Size>35f,24f</Size>
+                <Children>
+                  <Number>
+                    <TooltipId>visual_bpm</TooltipId>
+                    <Style>QLabel { font: bold 9px sans-serif;
+                        font-family: "Open Sans";
+                        background-color: transparent;
+                        color: #191F24;
+                        padding-right: 0;
+                        padding-top: 2px;}
+                    </Style>
+                    <Size>35f,24f</Size>
+                    <Pos>0,2</Pos>
+                    <Group>[Sampler<Variable name="samplernum"/>]</Group>
+                    <!--CSS alignments not respected see bug lp:605530 , lets call <Alignment>-->
+                    <Alignment>right</Alignment>
+                    <Connection>
+                      <ConfigKey>[Sampler<Variable name="samplernum"/>],visual_bpm</ConfigKey>
+                    </Connection>
+                  </Number>
+                  <!-- Little trickery here:
+                    BPM tap is transparent png directly over BPM display, so it became BPM and TAP at once,
+                    changed tooltip accordingly
+                  -->
+                  <PushButton>
+                  <!-- Original:
+                    <TooltipId>bpm_tap</TooltipId>
+                  -->
+                    <TooltipId>bpm_tap_visual_bpm</TooltipId>
+                    <Pos>0,5</Pos>
+                    <NumberStates>1</NumberStates>
+                    <State>
+                      <Number>0</Number>
+                      <Pressed>skin:/btn/btn_tap_sampler_over.png</Pressed>
+                      <Unpressed>skin:/btn/btn_tap_sampler.png</Unpressed>
+                    </State>
+                    <Connection>
+                      <ConfigKey>[Sampler<Variable name="samplernum"/>],bpm_tap</ConfigKey>
+                      <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+                    </Connection>
+                  </PushButton>
+                </Children>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup>
+          <WidgetGroup>
+            <ObjectName>SamplerMid</ObjectName>
+            <Size>0e,36f</Size>
+            <Layout>horizontal</Layout>
+            <Children>
 
-						<WidgetGroup>
-							<ObjectName>SamplerMid</ObjectName>
-							<Size>27f,36f</Size>
-							<BackPath>style/style_bg_sampler_mid.png</BackPath>
-							<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
-							<Children>	
-								<PushButton>
-									<TooltipId>cue_gotoandplay_cue_default</TooltipId>
-									<Style></Style>
-									<NumberStates>2</NumberStates>
-									<RightClickIsPushButton>true</RightClickIsPushButton>
-									<State>
-										<Number>0</Number>
-										<Pressed>skin:/btn/btn_play_sampler_down.png</Pressed>
-										<Unpressed>skin:/btn/btn_play_sampler.png</Unpressed>
-									</State>
-									<State>
-										<Number>1</Number>
-										<Pressed>skin:/btn/btn_play_sampler_overdown.png</Pressed>
-										<Unpressed>skin:/btn/btn_play_sampler_over.png</Unpressed>
-									</State>
-									<Pos>3,7</Pos>
-									<Connection>
-						                <ConfigKey>[Sampler<Variable name="samplernum"/>],cue_gotoandplay</ConfigKey>
-						                <ButtonState>LeftButton</ButtonState>
-						            </Connection>
-						            <Connection>
-						                <ConfigKey>[Sampler<Variable name="samplernum"/>],cue_default</ConfigKey>
-						                <ButtonState>RightButton</ButtonState>
-						            </Connection>
-						            <Connection>
-						                <ConfigKey>[Sampler<Variable name="samplernum"/>],play_indicator</ConfigKey>
-						            </Connection>
-								</PushButton>				
-							</Children>
-						</WidgetGroup>
+              <WidgetGroup>
+                <ObjectName>SamplerMid</ObjectName>
+                <Size>27f,36f</Size>
+                <BackPath>style/style_bg_sampler_mid.png</BackPath>
+                <Children>
+                  <PushButton>
+                    <TooltipId>cue_gotoandplay_cue_default</TooltipId>
+                    <NumberStates>2</NumberStates>
+                    <RightClickIsPushButton>true</RightClickIsPushButton>
+                    <State>
+                      <Number>0</Number>
+                      <Pressed>skin:/btn/btn_play_sampler_down.png</Pressed>
+                      <Unpressed>skin:/btn/btn_play_sampler.png</Unpressed>
+                    </State>
+                    <State>
+                      <Number>1</Number>
+                      <Pressed>skin:/btn/btn_play_sampler_overdown.png</Pressed>
+                      <Unpressed>skin:/btn/btn_play_sampler_over.png</Unpressed>
+                    </State>
+                    <Pos>3,7</Pos>
+                    <Connection>
+                      <ConfigKey>[Sampler<Variable name="samplernum"/>],cue_gotoandplay</ConfigKey>
+                      <ButtonState>LeftButton</ButtonState>
+                    </Connection>
+                    <Connection>
+                      <ConfigKey>[Sampler<Variable name="samplernum"/>],cue_default</ConfigKey>
+                      <ButtonState>RightButton</ButtonState>
+                    </Connection>
+                    <Connection>
+                      <ConfigKey>[Sampler<Variable name="samplernum"/>],play_indicator</ConfigKey>
+                    </Connection>
+                  </PushButton>
+                </Children>
+              </WidgetGroup>
 
-						<WidgetGroup>
-							<ObjectName>SamplerMid</ObjectName>
-							<Size>0e,36f</Size>
-							<BackPath>style/style_bg_sampler_mid.png</BackPath>
-							<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
-							<Layout>horizontal</Layout>
-							<Children>					
-								<Overview>
-									<TooltipId>waveform_overview</TooltipId>
-									<Style></Style>
-									<Group>[Sampler<Variable name="samplernum"/>]</Group>
-									<Pos>0,0</Pos>
-									<Size>0e,35f</Size>
-									<BgColor>#8D98A3</BgColor>
-									<PlayedOverlayColor>#60000000</PlayedOverlayColor>
-									<SignalHighColor></SignalHighColor>
-									<SignalMidColor></SignalMidColor>
-									<SignalLowColor></SignalLowColor>
-									<SignalColor>#191F24</SignalColor>
-									<PlayPosColor>#00FF00</PlayPosColor>
-									<DefaultMark>
-										<Align>bottom|right</Align>
-										<Color>#FD0564</Color>
-										<TextColor>#000000</TextColor>
-										<Text> %1 </Text>
-									</DefaultMark>
-                  <Mark>
-                    <Control>cue_point</Control>
-                    <Text>C</Text>
-                    <Align>top|right</Align>
-                    <Color>#FF001C</Color>
-                    <TextColor>#000000</TextColor>
-                  </Mark>
-									<Connection>
-										<ConfigKey>[Sampler<Variable name="samplernum"/>],playposition</ConfigKey>
-										<EmitOnDownPress>false</EmitOnDownPress>
-									</Connection>
-								</Overview>
-							</Children>
-						</WidgetGroup>
+              <WidgetGroup>
+                <ObjectName>SamplerMid</ObjectName>
+                <Size>0e,36f</Size>
+                <BackPath>style/style_bg_sampler_mid.png</BackPath>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Overview>
+                    <TooltipId>waveform_overview</TooltipId>
+                    <Group>[Sampler<Variable name="samplernum"/>]</Group>
+                    <Pos>0,0</Pos>
+                    <Size>0e,35f</Size>
+                    <BgColor>#8D98A3</BgColor>
+                    <PlayedOverlayColor>#60000000</PlayedOverlayColor>
+                    <SignalHighColor></SignalHighColor>
+                    <SignalMidColor></SignalMidColor>
+                    <SignalLowColor></SignalLowColor>
+                    <SignalColor>#191F24</SignalColor>
+                    <PlayPosColor>#00FF00</PlayPosColor>
+                    <ShowCueTimes>false</ShowCueTimes>
+                    <DefaultMark>
+                      <Align>bottom|right</Align>
+                      <Color>#FD0564</Color>
+                      <TextColor>#000000</TextColor>
+                      <Text> %1 </Text>
+                    </DefaultMark>
+                    <Mark>
+                      <Control>cue_point</Control>
+                      <Text>C</Text>
+                      <Align>top|right</Align>
+                      <Color>#FF001C</Color>
+                      <TextColor>#000000</TextColor>
+                    </Mark>
+                    <Connection>
+                      <ConfigKey>[Sampler<Variable name="samplernum"/>],playposition</ConfigKey>
+                      <EmitOnDownPress>false</EmitOnDownPress>
+                    </Connection>
+                  </Overview>
+                </Children>
+              </WidgetGroup>
 
-						<WidgetGroup>
-							<ObjectName>SamplerButtonGrid</ObjectName>
-							<Size>42f,36f</Size>
-							<BackPath>style/style_bg_sampler_woverview_buttons.png</BackPath>
-							<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
-							<Children>	
-								<PushButton>
-									<TooltipId>repeat</TooltipId>
-									<Style></Style>
-									<NumberStates>2</NumberStates>
-									<State>
-										<Number>0</Number>
-										<Pressed>skin:/btn/btn_repeat_sampler.png</Pressed>
-										<Unpressed>skin:/btn/btn_repeat_sampler.png</Unpressed>
-									</State>
-									<State>
-										<Number>1</Number>
-										<Pressed>skin:/btn/btn_repeat_sampler_over.png</Pressed>
-										<Unpressed>skin:/btn/btn_repeat_sampler_over.png</Unpressed>
-									</State>
-									<Pos>1,0</Pos>
-									<Connection>
-										<ConfigKey>[Sampler<Variable name="samplernum"/>],repeat</ConfigKey>
-									</Connection>
-								</PushButton>
-								<PushButton>
-									<TooltipId>eject</TooltipId>
-									<Style></Style>
-									<NumberStates>1</NumberStates>
-									<State>
-										<Number>0</Number>
-										<Pressed>skin:/btn/btn_eject_sampler_over.png</Pressed>
-										<Unpressed>skin:/btn/btn_eject_sampler.png</Unpressed>
-									</State>
-									<Pos>22,0</Pos>
-									<Connection>
-										<ConfigKey>[Sampler<Variable name="samplernum"/>],eject</ConfigKey>
-										<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-										<ButtonState>LeftButton</ButtonState>
-										<ConnectValueToWidget>false</ConnectValueToWidget>
-									</Connection>
-								</PushButton>
-								<PushButton>
-									<TooltipId>orientation</TooltipId>
-									<Style></Style>
-									<NumberStates>3</NumberStates>
-									<State>
-										<Number>0</Number>
-										<Pressed>skin:/btn/btn_orientation_sampler_left_over.png</Pressed>
-										<Unpressed>skin:/btn/btn_orientation_sampler_left_over.png</Unpressed>
-									</State>
-									<State>
-										<Number>1</Number>
-										<Pressed>skin:/btn/btn_orientation_sampler_master.png</Pressed>
-										<Unpressed>skin:/btn/btn_orientation_sampler_master.png</Unpressed>
-									</State>
-									<State>
-										<Number>2</Number>
-										<Pressed>skin:/btn/btn_orientation_sampler_right_over.png</Pressed>
-										<Unpressed>skin:/btn/btn_orientation_sampler_right_over.png</Unpressed>
-									</State>
-									<Pos>1,17</Pos>
-									<Connection>
-										<ConfigKey>[Sampler<Variable name="samplernum"/>],orientation</ConfigKey>
-										<EmitOnDownPress>true</EmitOnDownPress>
-										<ButtonState>LeftButton</ButtonState>
-									</Connection>
-								</PushButton>
-								<PushButton>
-									<TooltipId>keylock</TooltipId>
-									<Style></Style>
-									<NumberStates>2</NumberStates>
-									<State>
-										<Number>0</Number>
-										<Pressed>skin:/btn/btn_keylock_sampler.png</Pressed>
-										<Unpressed>skin:/btn/btn_keylock_sampler.png</Unpressed>
-									</State>
-									<State>
-										<Number>1</Number>
-										<Pressed>skin:/btn/btn_keylock_sampler_over.png</Pressed>
-										<Unpressed>skin:/btn/btn_keylock_sampler_over.png</Unpressed>
-									</State>
-									<Pos>21,17</Pos>
-									<Connection>
-										<ConfigKey>[Sampler<Variable name="samplernum"/>],keylock</ConfigKey>
-									</Connection>
-								</PushButton>				
-							</Children>
-						</WidgetGroup>				
-						</Children>
-					</WidgetGroup>
-					<WidgetGroup>
-						<ObjectName>SamplerBottom</ObjectName>
-						<Size>0e,40f</Size>
-						<BackPath>style/style_bg_sampler_bottom.png</BackPath>
-						<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
-						<Layout>horizontal</Layout>
-						<Children>
-							<WidgetGroup>
-								<ObjectName>SamplerBottom</ObjectName>
-								<Size>0e,40f</Size>
-								<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
-							</WidgetGroup>
-							<WidgetGroup>
-								<ObjectName>SamplerBottom</ObjectName>
-								<Size>204f,40f</Size>
-								<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
-								<Children>
-									<PushButton>
-										<TooltipId>beatsync_beatsync_tempo</TooltipId>
-										<Style></Style>
-										<NumberStates>1</NumberStates>
-										<State>
-											<Number>0</Number>
-											<Pressed>skin:/btn/btn_sync_sampler_overdown.png</Pressed>
-											<Unpressed>skin:/btn/btn_sync_sampler.png</Unpressed>
-										</State>
-										<Pos>3,8</Pos>
-										<Connection>
-											<ConfigKey>[Sampler<Variable name="samplernum"/>],beatsync</ConfigKey>
-											<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-											<ButtonState>LeftButton</ButtonState>
-										</Connection>
-										<Connection>
-											<ConfigKey>[Sampler<Variable name="samplernum"/>],beatsync_tempo</ConfigKey>
-											<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-											<ButtonState>RightButton</ButtonState>
-										</Connection>
-									</PushButton>
+              <WidgetGroup>
+                <ObjectName>SamplerButtonGrid</ObjectName>
+                <Size>42f,36f</Size>
+                <BackPath>style/style_bg_sampler_woverview_buttons.png</BackPath>
+                <Children>
+                  <PushButton>
+                    <TooltipId>repeat</TooltipId>
+                    <NumberStates>2</NumberStates>
+                    <State>
+                      <Number>0</Number>
+                      <Pressed>skin:/btn/btn_repeat_sampler.png</Pressed>
+                      <Unpressed>skin:/btn/btn_repeat_sampler.png</Unpressed>
+                    </State>
+                    <State>
+                      <Number>1</Number>
+                      <Pressed>skin:/btn/btn_repeat_sampler_over.png</Pressed>
+                      <Unpressed>skin:/btn/btn_repeat_sampler_over.png</Unpressed>
+                    </State>
+                    <Pos>1,0</Pos>
+                    <Connection>
+                      <ConfigKey>[Sampler<Variable name="samplernum"/>],repeat</ConfigKey>
+                    </Connection>
+                  </PushButton>
+                  <PushButton>
+                    <TooltipId>eject</TooltipId>
+                    <NumberStates>1</NumberStates>
+                    <State>
+                      <Number>0</Number>
+                      <Pressed>skin:/btn/btn_eject_sampler_over.png</Pressed>
+                      <Unpressed>skin:/btn/btn_eject_sampler.png</Unpressed>
+                    </State>
+                    <Pos>22,0</Pos>
+                    <Connection>
+                      <ConfigKey>[Sampler<Variable name="samplernum"/>],eject</ConfigKey>
+                      <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+                      <ButtonState>LeftButton</ButtonState>
+                      <ConnectValueToWidget>false</ConnectValueToWidget>
+                    </Connection>
+                  </PushButton>
+                  <PushButton>
+                    <TooltipId>orientation</TooltipId>
+                    <NumberStates>3</NumberStates>
+                    <State>
+                      <Number>0</Number>
+                      <Pressed>skin:/btn/btn_orientation_sampler_left_over.png</Pressed>
+                      <Unpressed>skin:/btn/btn_orientation_sampler_left_over.png</Unpressed>
+                    </State>
+                    <State>
+                      <Number>1</Number>
+                      <Pressed>skin:/btn/btn_orientation_sampler_master.png</Pressed>
+                      <Unpressed>skin:/btn/btn_orientation_sampler_master.png</Unpressed>
+                    </State>
+                    <State>
+                      <Number>2</Number>
+                      <Pressed>skin:/btn/btn_orientation_sampler_right_over.png</Pressed>
+                      <Unpressed>skin:/btn/btn_orientation_sampler_right_over.png</Unpressed>
+                    </State>
+                    <Pos>1,17</Pos>
+                    <Connection>
+                      <ConfigKey>[Sampler<Variable name="samplernum"/>],orientation</ConfigKey>
+                      <EmitOnDownPress>true</EmitOnDownPress>
+                      <ButtonState>LeftButton</ButtonState>
+                    </Connection>
+                  </PushButton>
+                  <PushButton>
+                    <TooltipId>keylock</TooltipId>
+                    <NumberStates>2</NumberStates>
+                    <State>
+                      <Number>0</Number>
+                      <Pressed>skin:/btn/btn_keylock_sampler.png</Pressed>
+                      <Unpressed>skin:/btn/btn_keylock_sampler.png</Unpressed>
+                    </State>
+                    <State>
+                      <Number>1</Number>
+                      <Pressed>skin:/btn/btn_keylock_sampler_over.png</Pressed>
+                      <Unpressed>skin:/btn/btn_keylock_sampler_over.png</Unpressed>
+                    </State>
+                    <Pos>21,17</Pos>
+                    <Connection>
+                      <ConfigKey>[Sampler<Variable name="samplernum"/>],keylock</ConfigKey>
+                    </Connection>
+                  </PushButton>
+                </Children>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup>
+          <WidgetGroup>
+            <ObjectName>SamplerBottom</ObjectName>
+            <Size>0e,40f</Size>
+            <BackPath>style/style_bg_sampler_bottom.png</BackPath>
+            <Layout>horizontal</Layout>
+            <Children>
+              <WidgetGroup>
+                <ObjectName>SamplerBottom</ObjectName>
+                <Size>0e,40f</Size>
+              </WidgetGroup>
+              <WidgetGroup>
+                <ObjectName>SamplerBottom</ObjectName>
+                <Size>204f,40f</Size>
+                <Children>
+                  <PushButton>
+                    <TooltipId>beatsync_beatsync_tempo</TooltipId>
+                    <NumberStates>1</NumberStates>
+                    <State>
+                      <Number>0</Number>
+                      <Pressed>skin:/btn/btn_sync_sampler_overdown.png</Pressed>
+                      <Unpressed>skin:/btn/btn_sync_sampler.png</Unpressed>
+                    </State>
+                    <Pos>3,8</Pos>
+                    <Connection>
+                      <ConfigKey>[Sampler<Variable name="samplernum"/>],beatsync</ConfigKey>
+                      <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+                      <ButtonState>LeftButton</ButtonState>
+                    </Connection>
+                    <Connection>
+                      <ConfigKey>[Sampler<Variable name="samplernum"/>],beatsync_tempo</ConfigKey>
+                      <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+                      <ButtonState>RightButton</ButtonState>
+                    </Connection>
+                  </PushButton>
 
-									<PushButton>
-										<TooltipId>hotcue</TooltipId>
-										<Style></Style>
-										<NumberStates>2</NumberStates>
-										<LeftClickIsPushButton>true</LeftClickIsPushButton>
-										<RightClickIsPushButton>true</RightClickIsPushButton>
-										<State>
-											<Number>0</Number>
-											<Pressed>skin:/btn/btn_hotcue_1_down.png</Pressed>
-											<Unpressed>skin:/btn/btn_hotcue_1.png</Unpressed>
-										</State>
-										<State>
-											<Number>1</Number>
-											<Pressed>skin:/btn/btn_hotcue_1_overdown.png</Pressed>
-											<Unpressed>skin:/btn/btn_hotcue_1_over.png</Unpressed>
-										</State>
-										<Pos>47,8</Pos>
-										<Connection>
-											<ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_1_activate</ConfigKey>
-											<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-											<ButtonState>LeftButton</ButtonState>
-											<ConnectValueToWidget>false</ConnectValueToWidget>
-										</Connection>
-										<Connection>
-											<ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_1_clear</ConfigKey>
-											<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-											<ButtonState>RightButton</ButtonState>
-											<ConnectValueToWidget>false</ConnectValueToWidget>
-										</Connection>
-										<Connection>
-											<ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_1_enabled</ConfigKey>
-											<ConnectValueFromWidget>false</ConnectValueFromWidget>
-										</Connection>
-									</PushButton>
-									<PushButton>
-										<TooltipId>hotcue</TooltipId>
-										<Style></Style>
-										<NumberStates>2</NumberStates>
-										<LeftClickIsPushButton>true</LeftClickIsPushButton>
-										<RightClickIsPushButton>true</RightClickIsPushButton>
-										<State>
-											<Number>0</Number>
-											<Pressed>skin:/btn/btn_hotcue_2_down.png</Pressed>
-											<Unpressed>skin:/btn/btn_hotcue_2.png</Unpressed>
-										</State>
-										<State>
-											<Number>1</Number>
-											<Pressed>skin:/btn/btn_hotcue_2_overdown.png</Pressed>
-											<Unpressed>skin:/btn/btn_hotcue_2_over.png</Unpressed>
-										</State>
-										<Pos>68,8</Pos>
-										<Connection>
-											<ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_2_activate</ConfigKey>
-											<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-											<ButtonState>LeftButton</ButtonState>
-											<ConnectValueToWidget>false</ConnectValueToWidget>
-										</Connection>
-										<Connection>
-											<ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_2_clear</ConfigKey>
-											<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-											<ButtonState>RightButton</ButtonState>
-											<ConnectValueToWidget>false</ConnectValueToWidget>
-										</Connection>
-										<Connection>
-											<ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_2_enabled</ConfigKey>
-											<ConnectValueFromWidget>false</ConnectValueFromWidget>
-										</Connection>
-									</PushButton>
-									<PushButton>
-										<TooltipId>hotcue</TooltipId>
-										<Style></Style>
-										<NumberStates>2</NumberStates>
-										<LeftClickIsPushButton>true</LeftClickIsPushButton>
-										<RightClickIsPushButton>true</RightClickIsPushButton>
-										<State>
-											<Number>0</Number>
-											<Pressed>skin:/btn/btn_hotcue_3_down.png</Pressed>
-											<Unpressed>skin:/btn/btn_hotcue_3.png</Unpressed>
-										</State>
-										<State>
-											<Number>1</Number>
-											<Pressed>skin:/btn/btn_hotcue_3_overdown.png</Pressed>
-											<Unpressed>skin:/btn/btn_hotcue_3_over.png</Unpressed>
-										</State>
-										<Pos>89,8</Pos>
-										<Connection>
-											<ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_3_activate</ConfigKey>
-											<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-											<ButtonState>LeftButton</ButtonState>
-											<ConnectValueToWidget>false</ConnectValueToWidget>
-										</Connection>
-										<Connection>
-											<ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_3_clear</ConfigKey>
-											<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-											<ButtonState>RightButton</ButtonState>
-											<ConnectValueToWidget>false</ConnectValueToWidget>
-										</Connection>
-										<Connection>
-											<ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_3_enabled</ConfigKey>
-											<ConnectValueFromWidget>false</ConnectValueFromWidget>
-										</Connection>
-									</PushButton>
-									<PushButton>
-										<TooltipId>hotcue</TooltipId>
-										<Style></Style>
-										<NumberStates>2</NumberStates>
-										<LeftClickIsPushButton>true</LeftClickIsPushButton>
-										<RightClickIsPushButton>true</RightClickIsPushButton>
-										<State>
-											<Number>0</Number>
-											<Pressed>skin:/btn/btn_hotcue_4_down.png</Pressed>
-											<Unpressed>skin:/btn/btn_hotcue_4.png</Unpressed>
-										</State>
-										<State>
-											<Number>1</Number>
-											<Pressed>skin:/btn/btn_hotcue_4_overdown.png</Pressed>
-											<Unpressed>skin:/btn/btn_hotcue_4_over.png</Unpressed>
-										</State>
-										<Pos>110,8</Pos>
-										<Connection>
-											<ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_4_activate</ConfigKey>
-											<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-											<ButtonState>LeftButton</ButtonState>
-											<ConnectValueToWidget>false</ConnectValueToWidget>
-										</Connection>
-										<Connection>
-											<ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_4_clear</ConfigKey>
-											<EmitOnPressAndRelease>true</EmitOnPressAndRelease>
-											<ButtonState>RightButton</ButtonState>
-											<ConnectValueToWidget>false</ConnectValueToWidget>
-										</Connection>
-										<Connection>
-											<ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_4_enabled</ConfigKey>
-											<ConnectValueFromWidget>false</ConnectValueFromWidget>
-										</Connection>
-									</PushButton>
-									<PushButton>
-										<TooltipId>pfl</TooltipId>
-										<Style></Style>
-										<NumberStates>2</NumberStates>
-										<State>
-											<Number>0</Number>
-											<Pressed>skin:/btn/btn_pfl_sampler_down.png</Pressed>
-											<Unpressed>skin:/btn/btn_pfl_sampler.png</Unpressed>
-										</State>
-										<State>
-											<Number>1</Number>
-											<Pressed>skin:/btn/btn_pfl_sampler_overdown.png</Pressed>
-											<Unpressed>skin:/btn/btn_pfl_sampler_over.png</Unpressed>
-										</State>
-										<Pos>134,8</Pos>
-										<Connection>
-											<ConfigKey>[Sampler<Variable name="samplernum"/>],pfl</ConfigKey>
-										</Connection>
-									</PushButton>
-									<Knob>
-										<TooltipId>pregain</TooltipId>
-										<Style></Style>
-										<NumberStates>64</NumberStates>
-										<Path>knobs/knob_rotary_s%1.png</Path>
-										<Pos>168,6</Pos>
-										<Connection>
-											<ConfigKey>[Sampler<Variable name="samplernum"/>],pregain</ConfigKey>
-										</Connection>
-									</Knob>
-								</Children>
-							</WidgetGroup>
-						</Children>
-					</WidgetGroup>
-				</Children>
-			</WidgetGroup>
-			<WidgetGroup>
-				<ObjectName>SamplerVUMeter</ObjectName>
-				<Size>8f,100f</Size>
-				<BackPath>style/style_bg_sampler_vu.png</BackPath>
-				<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
-				<Children>
-					<StatusLight>
-						<TooltipId>sampler_PeakIndicator</TooltipId>
-						<Style></Style>
-						<PathStatusLight>skin:/style/volume_clipping_sampler_over.png</PathStatusLight>
-						<PathBack>skin:/style/volume_clipping_sampler.png</PathBack>
-						<Pos>3,7</Pos>
-						<Connection>
-							<ConfigKey>[Sampler<Variable name="samplernum"/>],PeakIndicator</ConfigKey>
-						</Connection>
-					</StatusLight>
-					<VuMeter>
-						<TooltipId>sampler_VuMeter</TooltipId>
-						<Style></Style>
-						<PathVu>skin:/style/volume_display_sampler_over.png</PathVu>
-						<PathBack>skin:/style/volume_display_sampler.png</PathBack>
-						<Pos>3,24</Pos>
-						<Horizontal>false</Horizontal>
-						<PeakHoldSize>5</PeakHoldSize>
-						<PeakHoldTime>500</PeakHoldTime>
-						<PeakFallTime>50</PeakFallTime>
-						<PeakFallStep>2</PeakFallStep>
-						<Connection>
-							<ConfigKey>[Sampler<Variable name="samplernum"/>],VuMeter</ConfigKey>
-						</Connection>
-					</VuMeter>
-				</Children>
-			</WidgetGroup>
-			<WidgetGroup>
-				<ObjectName>SamplerPitch</ObjectName>
-				<Size>21f,100f</Size>
-				<BackPath>style/style_bg_sampler_right.png</BackPath>
-				<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
-				<Children>
-					<SliderComposed>
-						<TooltipId>rate</TooltipId>
-						<Style></Style>
-						<Handle>knob_pitch_sampler.png</Handle>
-						<Slider>slider_pitch_sampler.png</Slider>
-						<Pos>3,8</Pos>
-						<Horizontal>false</Horizontal>
-						<Connection>
-							<ConfigKey>[Sampler<Variable name="samplernum"/>],rate</ConfigKey>
-							<EmitOnDownPress>false</EmitOnDownPress>
-						</Connection>
-					</SliderComposed>
-				</Children>
-			</WidgetGroup>
-			<WidgetGroup>
-				<ObjectName>SamplerRightBorder</ObjectName>
-				<Size>5f,100f</Size>
-				<BackPath>style/style_bg_deck_border.png</BackPath>
-				<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
-			</WidgetGroup>
-			<WidgetGroup>
-				<ObjectName>SamplerRightBorder</ObjectName>
-				<Size>3f,100f</Size>
-				<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
-			</WidgetGroup>
-		</Children>
-	</WidgetGroup>
+                  <PushButton>
+                    <TooltipId>hotcue</TooltipId>
+                    <NumberStates>2</NumberStates>
+                    <LeftClickIsPushButton>true</LeftClickIsPushButton>
+                    <RightClickIsPushButton>true</RightClickIsPushButton>
+                    <State>
+                      <Number>0</Number>
+                      <Pressed>skin:/btn/btn_hotcue_1_down.png</Pressed>
+                      <Unpressed>skin:/btn/btn_hotcue_1.png</Unpressed>
+                    </State>
+                    <State>
+                      <Number>1</Number>
+                      <Pressed>skin:/btn/btn_hotcue_1_overdown.png</Pressed>
+                      <Unpressed>skin:/btn/btn_hotcue_1_over.png</Unpressed>
+                    </State>
+                    <Pos>47,8</Pos>
+                    <Connection>
+                      <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_1_activate</ConfigKey>
+                      <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+                      <ButtonState>LeftButton</ButtonState>
+                      <ConnectValueToWidget>false</ConnectValueToWidget>
+                    </Connection>
+                    <Connection>
+                      <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_1_clear</ConfigKey>
+                      <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+                      <ButtonState>RightButton</ButtonState>
+                      <ConnectValueToWidget>false</ConnectValueToWidget>
+                    </Connection>
+                    <Connection>
+                      <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_1_enabled</ConfigKey>
+                      <ConnectValueFromWidget>false</ConnectValueFromWidget>
+                    </Connection>
+                  </PushButton>
+                  <PushButton>
+                    <TooltipId>hotcue</TooltipId>
+                    <NumberStates>2</NumberStates>
+                    <LeftClickIsPushButton>true</LeftClickIsPushButton>
+                    <RightClickIsPushButton>true</RightClickIsPushButton>
+                    <State>
+                      <Number>0</Number>
+                      <Pressed>skin:/btn/btn_hotcue_2_down.png</Pressed>
+                      <Unpressed>skin:/btn/btn_hotcue_2.png</Unpressed>
+                    </State>
+                    <State>
+                      <Number>1</Number>
+                      <Pressed>skin:/btn/btn_hotcue_2_overdown.png</Pressed>
+                      <Unpressed>skin:/btn/btn_hotcue_2_over.png</Unpressed>
+                    </State>
+                    <Pos>68,8</Pos>
+                    <Connection>
+                      <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_2_activate</ConfigKey>
+                      <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+                      <ButtonState>LeftButton</ButtonState>
+                      <ConnectValueToWidget>false</ConnectValueToWidget>
+                    </Connection>
+                    <Connection>
+                      <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_2_clear</ConfigKey>
+                      <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+                      <ButtonState>RightButton</ButtonState>
+                      <ConnectValueToWidget>false</ConnectValueToWidget>
+                    </Connection>
+                    <Connection>
+                      <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_2_enabled</ConfigKey>
+                      <ConnectValueFromWidget>false</ConnectValueFromWidget>
+                    </Connection>
+                  </PushButton>
+                  <PushButton>
+                    <TooltipId>hotcue</TooltipId>
+                    <NumberStates>2</NumberStates>
+                    <LeftClickIsPushButton>true</LeftClickIsPushButton>
+                    <RightClickIsPushButton>true</RightClickIsPushButton>
+                    <State>
+                      <Number>0</Number>
+                      <Pressed>skin:/btn/btn_hotcue_3_down.png</Pressed>
+                      <Unpressed>skin:/btn/btn_hotcue_3.png</Unpressed>
+                    </State>
+                    <State>
+                      <Number>1</Number>
+                      <Pressed>skin:/btn/btn_hotcue_3_overdown.png</Pressed>
+                      <Unpressed>skin:/btn/btn_hotcue_3_over.png</Unpressed>
+                    </State>
+                    <Pos>89,8</Pos>
+                    <Connection>
+                      <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_3_activate</ConfigKey>
+                      <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+                      <ButtonState>LeftButton</ButtonState>
+                      <ConnectValueToWidget>false</ConnectValueToWidget>
+                    </Connection>
+                    <Connection>
+                      <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_3_clear</ConfigKey>
+                      <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+                      <ButtonState>RightButton</ButtonState>
+                      <ConnectValueToWidget>false</ConnectValueToWidget>
+                    </Connection>
+                    <Connection>
+                      <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_3_enabled</ConfigKey>
+                      <ConnectValueFromWidget>false</ConnectValueFromWidget>
+                    </Connection>
+                  </PushButton>
+                  <PushButton>
+                    <TooltipId>hotcue</TooltipId>
+                    <NumberStates>2</NumberStates>
+                    <LeftClickIsPushButton>true</LeftClickIsPushButton>
+                    <RightClickIsPushButton>true</RightClickIsPushButton>
+                    <State>
+                      <Number>0</Number>
+                      <Pressed>skin:/btn/btn_hotcue_4_down.png</Pressed>
+                      <Unpressed>skin:/btn/btn_hotcue_4.png</Unpressed>
+                    </State>
+                    <State>
+                      <Number>1</Number>
+                      <Pressed>skin:/btn/btn_hotcue_4_overdown.png</Pressed>
+                      <Unpressed>skin:/btn/btn_hotcue_4_over.png</Unpressed>
+                    </State>
+                    <Pos>110,8</Pos>
+                    <Connection>
+                      <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_4_activate</ConfigKey>
+                      <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+                      <ButtonState>LeftButton</ButtonState>
+                      <ConnectValueToWidget>false</ConnectValueToWidget>
+                    </Connection>
+                    <Connection>
+                      <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_4_clear</ConfigKey>
+                      <EmitOnPressAndRelease>true</EmitOnPressAndRelease>
+                      <ButtonState>RightButton</ButtonState>
+                      <ConnectValueToWidget>false</ConnectValueToWidget>
+                    </Connection>
+                    <Connection>
+                      <ConfigKey>[Sampler<Variable name="samplernum"/>],hotcue_4_enabled</ConfigKey>
+                      <ConnectValueFromWidget>false</ConnectValueFromWidget>
+                    </Connection>
+                  </PushButton>
+                  <PushButton>
+                    <TooltipId>pfl</TooltipId>
+                    <NumberStates>2</NumberStates>
+                    <State>
+                      <Number>0</Number>
+                      <Pressed>skin:/btn/btn_pfl_sampler_down.png</Pressed>
+                      <Unpressed>skin:/btn/btn_pfl_sampler.png</Unpressed>
+                    </State>
+                    <State>
+                      <Number>1</Number>
+                      <Pressed>skin:/btn/btn_pfl_sampler_overdown.png</Pressed>
+                      <Unpressed>skin:/btn/btn_pfl_sampler_over.png</Unpressed>
+                    </State>
+                    <Pos>134,8</Pos>
+                    <Connection>
+                      <ConfigKey>[Sampler<Variable name="samplernum"/>],pfl</ConfigKey>
+                    </Connection>
+                  </PushButton>
+                  <Knob>
+                    <TooltipId>pregain</TooltipId>
+                    <NumberStates>64</NumberStates>
+                    <Path>knobs/knob_rotary_s%1.png</Path>
+                    <Pos>168,6</Pos>
+                    <Connection>
+                      <ConfigKey>[Sampler<Variable name="samplernum"/>],pregain</ConfigKey>
+                    </Connection>
+                  </Knob>
+                </Children>
+              </WidgetGroup>
+            </Children>
+          </WidgetGroup>
+        </Children>
+      </WidgetGroup>
+      <WidgetGroup>
+        <ObjectName>SamplerVUMeter</ObjectName>
+        <Size>8f,100f</Size>
+        <BackPath>style/style_bg_sampler_vu.png</BackPath>
+        <Children>
+          <StatusLight>
+            <TooltipId>sampler_PeakIndicator</TooltipId>
+            <PathStatusLight>skin:/style/volume_clipping_sampler_over.png</PathStatusLight>
+            <PathBack>skin:/style/volume_clipping_sampler.png</PathBack>
+            <Pos>3,7</Pos>
+            <Connection>
+              <ConfigKey>[Sampler<Variable name="samplernum"/>],PeakIndicator</ConfigKey>
+            </Connection>
+          </StatusLight>
+          <VuMeter>
+            <TooltipId>sampler_VuMeter</TooltipId>
+            <PathVu>skin:/style/volume_display_sampler_over.png</PathVu>
+            <PathBack>skin:/style/volume_display_sampler.png</PathBack>
+            <Pos>3,24</Pos>
+            <Horizontal>false</Horizontal>
+            <PeakHoldSize>5</PeakHoldSize>
+            <PeakHoldTime>500</PeakHoldTime>
+            <PeakFallTime>50</PeakFallTime>
+            <PeakFallStep>2</PeakFallStep>
+            <Connection>
+              <ConfigKey>[Sampler<Variable name="samplernum"/>],VuMeter</ConfigKey>
+            </Connection>
+          </VuMeter>
+        </Children>
+      </WidgetGroup>
+      <WidgetGroup>
+        <ObjectName>SamplerPitch</ObjectName>
+        <Size>21f,100f</Size>
+        <BackPath>style/style_bg_sampler_right.png</BackPath>
+        <Children>
+          <SliderComposed>
+            <TooltipId>rate</TooltipId>
+            <Handle>knob_pitch_sampler.png</Handle>
+            <Slider>slider_pitch_sampler.png</Slider>
+            <Pos>3,8</Pos>
+            <Horizontal>false</Horizontal>
+            <Connection>
+              <ConfigKey>[Sampler<Variable name="samplernum"/>],rate</ConfigKey>
+              <EmitOnDownPress>false</EmitOnDownPress>
+            </Connection>
+          </SliderComposed>
+        </Children>
+      </WidgetGroup>
+      <WidgetGroup>
+        <ObjectName>SamplerRightBorder</ObjectName>
+        <Size>5f,100f</Size>
+        <BackPath>style/style_bg_deck_border.png</BackPath>
+      </WidgetGroup>
+      <WidgetGroup>
+        <ObjectName>SamplerRightBorder</ObjectName>
+        <Size>3f,100f</Size>
+      </WidgetGroup>
+    </Children>
+  </WidgetGroup>
 </Template>
 
diff --git a/res/skins/Shade/samplerrow.xml b/res/skins/Shade/samplerrow.xml
index 46aa9a6f6ae..7ac67c531f4 100644
--- a/res/skins/Shade/samplerrow.xml
+++ b/res/skins/Shade/samplerrow.xml
@@ -8,16 +8,13 @@
 	  <Children>
 		<WidgetGroup>
 		  <Layout>horizontal</Layout>
-		  <Style>QGroupBox { border: 0px solid yellow; margin: 0px;} </Style>
 		  <Children>
 		<WidgetGroup>
 		  <Layout>horizontal</Layout>
-		  <Style>QGroupBox { border: 0px solid yellow; margin: 0px;} </Style>
 		  <Children>
 			<WidgetGroup>
 				<ObjectName>SamplerLeftBorder</ObjectName>
 				<Size>3f,0e</Size>
-				<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
 			</WidgetGroup>
 			<WidgetGroup>
 				<Size>26f,43f</Size>
@@ -27,21 +24,14 @@
 						<ObjectName>EffectLeftBorder</ObjectName>
 						<Size>5f,40f</Size>
 						<BackPath>style/style_bg_deck_border.png</BackPath>
-						<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
 					</WidgetGroup>	
 					<WidgetGroup>
 						<Size>0e,40f</Size>
-						<Style>QGroupBox { 
-							border: 0px solid green;  
-							margin: 0px 0px 0px 0px;
-						} 
-						</Style>
 						<BackPath>style/style_bg_looping.png</BackPath>
 						<Layout>horizontal</Layout>
 						<Children>
 							<PushButton>
 								<TooltipId>show_samplers</TooltipId>
-								<Style></Style>
 								<NumberStates>2</NumberStates>
 								<State>
 									<Number>0</Number>
@@ -64,12 +54,10 @@
 						<ObjectName>EffectRightBorder</ObjectName>
 						<Size>5f,40f</Size>
 						<BackPath>style/style_bg_deck_border.png</BackPath>
-						<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
 					</WidgetGroup>	
 					<WidgetGroup>
 						<ObjectName>EffectRightBorder</ObjectName>
 						<Size>3f,40f</Size>
-						<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
 					</WidgetGroup>	
 				</Children>		
 			</WidgetGroup>	
@@ -93,20 +81,13 @@
 						<ObjectName>EffectLeftBorder</ObjectName>
 						<Size>5f,40f</Size>
 						<BackPath>style/style_bg_deck_border.png</BackPath>
-						<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
 					</WidgetGroup>	
 					<WidgetGroup>
 						<Size>0e,40f</Size>
-						<Style>QGroupBox { 
-							border: 0px solid green;  
-							margin: 0px 0px 0px 0px;
-						} 
-						</Style>
 						<BackPath>style/style_bg_looping.png</BackPath>
 						<Children>
 							<PushButton>
 								<TooltipId>LoadSamplerBank</TooltipId>
-								<Style></Style>
 								<NumberStates>1</NumberStates>
 								<State>
 									<Number>0</Number>
@@ -120,7 +101,6 @@
 							</PushButton>
 							<PushButton>
 								<TooltipId>SaveSamplerBank</TooltipId>
-								<Style></Style>
 								<NumberStates>1</NumberStates>
 								<State>
 									<Number>0</Number>
@@ -138,12 +118,10 @@
 						<ObjectName>EffectRightBorder</ObjectName>
 						<Size>5f,40f</Size>
 						<BackPath>style/style_bg_deck_border.png</BackPath>
-						<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
 					</WidgetGroup>	
 					<WidgetGroup>
 						<ObjectName>EffectRightBorder</ObjectName>
 						<Size>3f,40f</Size>
-						<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
 					</WidgetGroup>	
 				</Children>		
 			</WidgetGroup>	
@@ -159,12 +137,10 @@
 
 		<WidgetGroup>
 		  <Layout>horizontal</Layout>
-		  <Style>QGroupBox { border: 0px solid yellow; margin: 0px;} </Style>
 		  <Children>
 			<WidgetGroup>
 				<ObjectName>SamplerLeftBorder</ObjectName>
 				<Size>3f,0e</Size>
-				<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
 			</WidgetGroup>
 			<WidgetGroup>
 				<Size>26f,103f</Size>
@@ -175,21 +151,14 @@
 						<ObjectName>SamplerLeftBorder</ObjectName>
 						<Size>5f,100f</Size>
 						<BackPath>style/style_bg_deck_border.png</BackPath>
-						<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
 					</WidgetGroup>
 
 					<WidgetGroup>
 						<Size>0e,100f</Size>
-						<Style>QGroupBox { 
-							border: 0px solid green;  
-							margin: 0px 0px 0px 0px;
-						} 
-						</Style>
 						<BackPath>style/style_bg_sampler_right.png</BackPath>
 						<Children>
 							<PushButton>
 								<TooltipId>show_samplers</TooltipId>
-								<Style></Style>
 								<NumberStates>2</NumberStates>
 								<State>
 									<Number>0</Number>
@@ -212,12 +181,10 @@
 						<ObjectName>EffectRightBorder</ObjectName>
 						<Size>5f,100f</Size>
 						<BackPath>style/style_bg_deck_border.png</BackPath>
-						<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
 					</WidgetGroup>	
 					<WidgetGroup>
 						<ObjectName>EffectRightBorder</ObjectName>
 						<Size>3f,40f</Size>
-						<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
 					</WidgetGroup>	
 				</Children>		
 			</WidgetGroup>	
@@ -242,21 +209,14 @@
 						<ObjectName>SamplerLeftBorder</ObjectName>
 						<Size>5f,100f</Size>
 						<BackPath>style/style_bg_deck_border.png</BackPath>
-						<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
 					</WidgetGroup>
 
 					<WidgetGroup>
 						<Size>0e,100f</Size>
-						<Style>QGroupBox { 
-							border: 0px solid green;  
-							margin: 0px 0px 0px 0px;
-						} 
-						</Style>
 						<BackPath>style/style_bg_sampler_right.png</BackPath>
 						<Children>
 							<PushButton>
 								<TooltipId>LoadSamplerBank</TooltipId>
-								<Style></Style>
 								<NumberStates>1</NumberStates>
 								<State>
 									<Number>0</Number>
@@ -270,7 +230,6 @@
 							</PushButton>
 							<PushButton>
 								<TooltipId>SaveSamplerBank</TooltipId>
-								<Style></Style>
 								<NumberStates>1</NumberStates>
 								<State>
 									<Number>0</Number>
@@ -288,12 +247,10 @@
 						<ObjectName>EffectRightBorder</ObjectName>
 						<Size>5f,100f</Size>
 						<BackPath>style/style_bg_deck_border.png</BackPath>
-						<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
 					</WidgetGroup>	
 					<WidgetGroup>
 						<ObjectName>EffectRightBorder</ObjectName>
 						<Size>3f,40f</Size>
-						<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
 					</WidgetGroup>	
 				</Children>		
 			</WidgetGroup>	
diff --git a/res/skins/Shade/samplersmall.xml b/res/skins/Shade/samplersmall.xml
index b7befbfaa65..448fea07fc8 100644
--- a/res/skins/Shade/samplersmall.xml
+++ b/res/skins/Shade/samplersmall.xml
@@ -4,27 +4,20 @@
 		<Layout>horizontal</Layout>
 		<Children>
 			<WidgetGroup>
-		        <ObjectName>EffectLeftBorder</ObjectName>
+        <ObjectName>EffectLeftBorder</ObjectName>
 				<Size>5f,40f</Size>
 				<BackPath>style/style_bg_deck_border.png</BackPath>
-				<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
 			</WidgetGroup>	
 			<WidgetGroup>
 				<Size>0e,40f</Size>
-				<Style>QGroupBox { 
-					border: 0px solid green;  
-					margin: 0px 0px 0px 0px;
-				} 
-				</Style>
 				<BackPath>style/style_bg_looping.png</BackPath>
-                <Layout>horizontal</Layout>
+        <Layout>horizontal</Layout>
 				<Children>
 					<WidgetGroup>
 						<Size>4f,28f</Size>
 					</WidgetGroup>
 					<PushButton>
 						<TooltipId>cue_gotoandplay_cue_default</TooltipId>
-						<Style></Style>
 						<NumberStates>2</NumberStates>
 						<State>
 							<Number>0</Number>
@@ -37,36 +30,33 @@
 							<Unpressed>skin:/btn/btn_play_sampler_over.png</Unpressed>
 						</State>
 						<Connection>
-			                <ConfigKey>[Sampler<Variable name="samplernum"/>],cue_gotoandplay</ConfigKey>
-			                <ButtonState>LeftButton</ButtonState>
-			            </Connection>
-			            <Connection>
-			                <ConfigKey>[Sampler<Variable name="samplernum"/>],cue_default</ConfigKey>
-			                <ButtonState>RightButton</ButtonState>
-			            </Connection>
-			            <Connection>
-			                <ConfigKey>[Sampler<Variable name="samplernum"/>],play_indicator</ConfigKey>
-			            </Connection>
+              <ConfigKey>[Sampler<Variable name="samplernum"/>],cue_gotoandplay</ConfigKey>
+              <ButtonState>LeftButton</ButtonState>
+            </Connection>
+            <Connection>
+              <ConfigKey>[Sampler<Variable name="samplernum"/>],cue_default</ConfigKey>
+              <ButtonState>RightButton</ButtonState>
+            </Connection>
+            <Connection>
+              <ConfigKey>[Sampler<Variable name="samplernum"/>],play_indicator</ConfigKey>
+            </Connection>
 					</PushButton>
 
-
 					<WidgetGroup>
 						<Size>0e,40f</Size>
 						<SizePolicy>me,max</SizePolicy>
-						<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
 						<Layout>horizontal</Layout>
 						<Children>
 							<WidgetGroup>
 							 	<Size>0e,40f</Size>
 								<Pos>0,2</Pos>
-								<Style>QGroupBox {border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
 								<Layout>vertical</Layout>						
 								<Children>
 								<Text>
 									<Size>0e,40f</Size>
 									<TooltipId>text</TooltipId>
 									<Style>QLabel { 
-                                            font: bold 13px sans-serif;
+                      font: bold 13px sans-serif;
 											font-family: "Open Sans";
 											background-color: transparent;
 											color: #191F24;
@@ -75,7 +65,7 @@
 											padding-top: 2px;}
 									</Style>
 									<Group>[Sampler<Variable name="samplernum"/>]</Group>
-																<Elide>right</Elide>
+                  <Elide>right</Elide>
 								</Text>
 								<!-- Alternative "TITLE ONLY" display
 								<TrackProperty>
@@ -97,7 +87,6 @@
 							</WidgetGroup>
 							<WidgetGroup>
 							 	<Size>35f,40f</Size>
-								<Style>QGroupBox {border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
 								<Layout>vertical</Layout>									
 								<Children>
 									<Number>
@@ -122,11 +111,10 @@
 							<WidgetGroup>
 								<ObjectName>SamplerButtonGrid</ObjectName>
 								<Size>20f,30f</Size>
-								<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
+								
 								<Children>	
 									<PushButton>
 										<TooltipId>eject</TooltipId>
-										<Style></Style>
 										<NumberStates>1</NumberStates>
 										<State>
 											<Number>0</Number>
@@ -143,7 +131,6 @@
 									</PushButton>
 									<PushButton>
 										<TooltipId>orientation</TooltipId>
-										<Style></Style>
 										<NumberStates>3</NumberStates>
 										<State>
 											<Number>0</Number>
@@ -174,15 +161,13 @@
 			    </Children>
 			</WidgetGroup>
 			<WidgetGroup>
-		        <ObjectName>EffectRightBorder</ObjectName>
+        <ObjectName>EffectRightBorder</ObjectName>
 				<Size>5f,40f</Size>
 				<BackPath>style/style_bg_deck_border.png</BackPath>
-				<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
 			</WidgetGroup>	
 			<WidgetGroup>
 				<ObjectName>EffectRightBorder</ObjectName>
 				<Size>3f,40f</Size>
-				<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
 			</WidgetGroup>	
 		</Children>		
 	</WidgetGroup>	
diff --git a/res/skins/Shade/skin.xml b/res/skins/Shade/skin.xml
index eb4f3a1196a..b037f8d97ac 100644
--- a/res/skins/Shade/skin.xml
+++ b/res/skins/Shade/skin.xml
@@ -375,12 +375,10 @@
             <WidgetGroup>
               <SizePolicy>me,min</SizePolicy>
               <Layout>horizontal</Layout>
-              <Style>QGroupBox { border: 0px solid yellow; margin: 0px;}</Style>
               <Children>
                 <WidgetGroup>
                   <ObjectName>EffectLeftBorder</ObjectName>
                   <Size>3f,43f</Size>
-                  <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0px; padding: 0; }</Style>
                 </WidgetGroup>
                 <Template src="skin:looping.xml">
                   <SetVariable name="channum">1</SetVariable>
@@ -432,7 +430,6 @@
           <SizePolicy>me,me</SizePolicy>
           <Layout>horizontal</Layout>
           <Style>
-          QGroupBox { border: 0px solid #565E6B; margin: 0px 0px 0px 0px;}
           <!--
           <BgColor>#101010</BgColor>
           <FgColor>#C1C1C1</FgColor>
@@ -448,15 +445,12 @@
               <SplitSizesConfigKey>[Skin],librarySidebar_splitsize</SplitSizesConfigKey>
               <Children>
                 <WidgetGroup>
-                  <Style>QGroupBox {}</Style>
                   <Layout>vertical</Layout>
                   <Children>
                     <WidgetGroup>
                       <Style>
                         QGroupBox {
                           margin: 2px 0px 4px 3px;
-                          padding: 0px;
-                          background: transparent;
                         }
                       </Style>
                       <Layout>horizontal</Layout>
@@ -473,7 +467,6 @@
                     <!--Library Tree View-->
                     <Splitter>
                       <Size>e,me</Size>
-                      <Style></Style>
                       <SplitSizes>1,e</SplitSizes>
                       <Collapsible>0,0</Collapsible>
                       <Children>
@@ -493,7 +486,6 @@
                 </WidgetGroup>
                 <WidgetGroup>
                   <!-- Library Table-->
-                  <Style>QGroupBox {}</Style>
                   <Layout>vertical</Layout>
                   <SizePolicy>me,me</SizePolicy>
                   <Children>
diff --git a/res/skins/Shade/srcfx.xml b/res/skins/Shade/srcfx.xml
index 9dcf034c1f2..48de60ce86f 100644
--- a/res/skins/Shade/srcfx.xml
+++ b/res/skins/Shade/srcfx.xml
@@ -7,26 +7,18 @@
         <ObjectName>EffectLeftBorder</ObjectName>
         <Size>5f,60f</Size>
         <BackPath>style/style_bg_deck_border.png</BackPath>
-        <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
       </WidgetGroup>
       <WidgetGroup>
         <Size>100e,60f</Size>
-        <Style>QGroupBox {
-          border: 0px solid green;
-          margin: 0px 0px 0px 0px;
-        }
-        </Style>
         <Layout>horizontal</Layout>
         <BackPath>style/style_bg_src.png</BackPath>
         <Children>
           <WidgetGroup>
             <Size>0e,54f</Size>
-            <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
           </WidgetGroup>
           <Template src="skin:ducking.xml"/>
           <WidgetGroup>
             <Size>0e,54f</Size>
-            <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
           </WidgetGroup>
         </Children>
       </WidgetGroup>
@@ -34,12 +26,10 @@
         <ObjectName>EffectRightBorder</ObjectName>
         <Size>5f,60f</Size>
         <BackPath>style/style_bg_deck_border.png</BackPath>
-        <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
       </WidgetGroup>
       <WidgetGroup>
         <ObjectName>EffectRightBorder</ObjectName>
         <Size>3f,60f</Size>
-        <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
       </WidgetGroup>
     </Children>
   </WidgetGroup>
diff --git a/res/skins/Shade/srcmicrophoneaux.xml b/res/skins/Shade/srcmicrophoneaux.xml
index bb1524a7ff8..18540f171c9 100644
--- a/res/skins/Shade/srcmicrophoneaux.xml
+++ b/res/skins/Shade/srcmicrophoneaux.xml
@@ -7,15 +7,9 @@
         <ObjectName>EffectLeftBorder</ObjectName>
         <Size>5f,60f</Size>
         <BackPath>style/style_bg_deck_border.png</BackPath>
-        <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
       </WidgetGroup>
       <WidgetGroup>
         <Size>100e,60f</Size>
-        <Style>QGroupBox {
-          border: 0px solid green;
-          margin: 0px 0px 0px 0px;
-        }
-        </Style>
         <Layout>horizontal</Layout>
         <BackPath>style/style_bg_src.png</BackPath>
         <Children>
@@ -32,7 +26,6 @@
           </WidgetGroup>
           <WidgetGroup>
             <Size>0e,54f</Size>
-            <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 0; padding: 0; }</Style>
           </WidgetGroup>
           <WidgetGroup>
             <Size>108f,54f</Size>
@@ -52,12 +45,10 @@
         <ObjectName>EffectRightBorder</ObjectName>
         <Size>5f,60f</Size>
         <BackPath>style/style_bg_deck_border.png</BackPath>
-        <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
       </WidgetGroup>
       <WidgetGroup>
         <ObjectName>EffectRightBorder</ObjectName>
         <Size>3f,60f</Size>
-        <Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
       </WidgetGroup>
     </Children>
   </WidgetGroup>
diff --git a/res/skins/Shade/srcrow.xml b/res/skins/Shade/srcrow.xml
index f9b8410f6ee..982aafd3bca 100644
--- a/res/skins/Shade/srcrow.xml
+++ b/res/skins/Shade/srcrow.xml
@@ -15,7 +15,6 @@
 				<WidgetGroup>
 					<ObjectName>SamplerLeftBorder</ObjectName>
 					<Size>3f,0e</Size>
-					<Style>QGroupBox { border: 0px solid red; } QWidget { margin: 10px; padding: 0; }</Style>
 				</WidgetGroup>
 				<WidgetGroup>
           <Layout>vertical</Layout>
diff --git a/res/skins/Shade/style.qss b/res/skins/Shade/style.qss
index c38d0984bcb..bdaf96af44c 100644
--- a/res/skins/Shade/style.qss
+++ b/res/skins/Shade/style.qss
@@ -19,7 +19,9 @@
   padding: 5px 0px;
 }
 
-
+WOverview {
+	font-family: "Ubuntu";
+}
 
 WBeatSpinBox,
 /* For some mysterious reason #DlgAutoDJ QSpinBox
diff --git a/res/skins/Shade/style/style_bg_deck_small.png b/res/skins/Shade/style/style_bg_deck_small.png
new file mode 100644
index 00000000000..79f1d1b31d6
Binary files /dev/null and b/res/skins/Shade/style/style_bg_deck_small.png differ
diff --git a/res/skins/Shade/vinylcontrol.xml b/res/skins/Shade/vinylcontrol.xml
index 6206e57746d..6d0dcc2fa2c 100644
--- a/res/skins/Shade/vinylcontrol.xml
+++ b/res/skins/Shade/vinylcontrol.xml
@@ -1,12 +1,11 @@
 <Template>
 	<!-- VinylControl sub-widget -->
 	<WidgetGroup>
-        <BackPath>style/style_bg_vinylcontrol.png</BackPath>
+    <BackPath>style/style_bg_vinylcontrol.png</BackPath>
 		<Size>21,82</Size>
 		<Children>
 			<PushButton>
 				<TooltipId>vinylcontrol_status</TooltipId>
-				<Style></Style>
 				<NumberStates>2</NumberStates>
 				<State>
 					<Number>0</Number>
@@ -26,7 +25,6 @@
 
 			<PushButton>
 				<TooltipId>vinylcontrol_status</TooltipId>
-				<Style></Style>
 				<NumberStates>2</NumberStates>
 				<State>
 					<Number>0</Number>
@@ -57,7 +55,6 @@
 
 			<PushButton>
 				<TooltipId>vinylcontrol_mode</TooltipId>
-				<Style></Style>
 				<NumberStates>3</NumberStates>
 				<State>
 					<Number>0</Number>
@@ -88,7 +85,6 @@
 
 			<PushButton>
 				<TooltipId>vinylcontrol_cueing</TooltipId>
-				<Style></Style>
 				<NumberStates>3</NumberStates>
 				<State>
 					<Number>0</Number>
diff --git a/res/skins/Shade/waveform.xml b/res/skins/Shade/waveform.xml
index 6364afbc833..aa883ec8b7e 100644
--- a/res/skins/Shade/waveform.xml
+++ b/res/skins/Shade/waveform.xml
@@ -1,7 +1,6 @@
 <Template>
   <Visual>
     <TooltipId>waveform_display</TooltipId>
-    <Style></Style>
     <Channel><Variable name="channum"/></Channel>
     <Size>0e,81f</Size>
     <BgColor>#8D98A3</BgColor>
diff --git a/res/skins/Tango/deck_overview.xml b/res/skins/Tango/deck_overview.xml
index 8da395a8e9d..2cdc656f9e9 100644
--- a/res/skins/Tango/deck_overview.xml
+++ b/res/skins/Tango/deck_overview.xml
@@ -26,6 +26,8 @@ Variables:
     <PlayPosColor>#FF4300</PlayPosColor>
     <PlayedOverlayColor><Variable name="PlayedOverlayColor"/></PlayedOverlayColor>
     <EndOfTrackColor><Variable name="EndOfTrackColor"/></EndOfTrackColor>
+    <LabelTextColor>#ffffff</LabelTextColor>
+    <LabelBackgroundColor>#85000000</LabelBackgroundColor>
     <DefaultMark>
       <Align>bottom|right</Align>
       <Color>#666666</Color>
diff --git a/res/skins/Tango/preview_deck.xml b/res/skins/Tango/preview_deck.xml
index f59963fb5c9..8be1dbf35cd 100644
--- a/res/skins/Tango/preview_deck.xml
+++ b/res/skins/Tango/preview_deck.xml
@@ -121,6 +121,9 @@ Variables:
                 <PlayPosColor>#FF4300</PlayPosColor>
                 <PlayedOverlayColor><Variable name="PlayedOverlayColor"/></PlayedOverlayColor>
                 <MarkerColor>#00FF00</MarkerColor>
+                <LabelTextColor>#ffffff</LabelTextColor>
+                <LabelBackgroundColor>#85000000</LabelBackgroundColor>
+                <ShowCueTimes>false</ShowCueTimes>
                 <DefaultMark>
                   <Align>bottom|right</Align>
                   <Color>#666666</Color>
diff --git a/res/skins/Tango/sampler.xml b/res/skins/Tango/sampler.xml
index 98920fd3158..9d63db869c5 100644
--- a/res/skins/Tango/sampler.xml
+++ b/res/skins/Tango/sampler.xml
@@ -204,6 +204,7 @@ Variables:
                     <SignalColor>#bababa</SignalColor>
                     <PlayPosColor>#FF4300</PlayPosColor>
                     <PlayedOverlayColor><Variable name="PlayedOverlayColor"/></PlayedOverlayColor>
+                    <ShowCueTimes>false</ShowCueTimes>
                     <MarkerColor>#00FF00</MarkerColor>
                     <DefaultMark>
                       <Align>bottom|right</Align>
diff --git a/res/skins/Tango/style.qss b/res/skins/Tango/style.qss
index e1c9244fc16..02b1f9efa3b 100644
--- a/res/skins/Tango/style.qss
+++ b/res/skins/Tango/style.qss
@@ -607,7 +607,7 @@ WLabel#TrackComment {
 }
 
 #DeckOverview {
-    background-color: #0f0f0f;
+  background-color: #0f0f0f;
   }
   #VinylTogglerLeft[displayValue="0"],
   #VinylTogglerRightPassthrough[displayValue="1"],
diff --git a/src/skin/tooltips.cpp b/src/skin/tooltips.cpp
index 1314c0f1195..538ae438384 100644
--- a/src/skin/tooltips.cpp
+++ b/src/skin/tooltips.cpp
@@ -36,8 +36,10 @@ void Tooltips::addStandardTooltips() {
 
     add("waveform_overview")
             << tr("Waveform Overview")
-            << tr("Shows information about the track currently loaded in this channel.")
-            << tr("Jump around in the track by clicking anywhere on the waveform.")
+            << tr("Shows information about the track currently loaded in this deck.") << "\n"
+            << tr("Left click to jump around in the track.")
+            << tr("Right click hotcues to edit their labels and colors.")
+            << tr("Right click anywhere else to show the time at that point.")
             << dropTracksHere;
 
     QString scratchMouse = tr("Use the mouse to scratch, spin-back or throw tracks.");
@@ -538,7 +540,8 @@ void Tooltips::addStandardTooltips() {
             << QString("%1: %2").arg(leftClick, tr("If hotcue is set, jumps to the hotcue."))
             << tr("If hotcue is not set, sets the hotcue to the current play position.")
             << quantizeSnap
-            << QString("%1: %2").arg(rightClick, tr("If hotcue is set, clears the hotcue."));
+            << QString("%1: %2").arg(rightClick, tr("If hotcue is set, clears the hotcue."))
+            << tr("Right click hotcues on the overview waveform to edit their labels and colors.");
 
     // Status displays and toggle buttons
     add("toggle_recording")
diff --git a/src/track/cue.h b/src/track/cue.h
index 6843dab1974..d4b3c343a47 100644
--- a/src/track/cue.h
+++ b/src/track/cue.h
@@ -34,6 +34,8 @@ class Cue : public QObject {
         OUTRO   = 7,
     };
 
+    static constexpr double kPositionNotDefined = -1.0;
+
     ~Cue() override = default;
 
     bool isDirty() const;
diff --git a/src/waveform/renderers/waveformmark.cpp b/src/waveform/renderers/waveformmark.cpp
index d1b98a03fe5..0f2db81adad 100644
--- a/src/waveform/renderers/waveformmark.cpp
+++ b/src/waveform/renderers/waveformmark.cpp
@@ -1,29 +1,49 @@
 #include <QtDebug>
 
 #include "skin/skincontext.h"
-#include "waveform/renderers/waveformmarkproperties.h"
+#include "waveform/renderers/waveformsignalcolors.h"
+#include "widget/wskincolor.h"
 
 #include "waveformmark.h"
 
-WaveformMark::WaveformMark(const QString& group,
-                           const QDomNode& node,
-                           const SkinContext& context,
-                           const WaveformSignalColors& signalColors)
-        : m_iHotCue(kNoHotCue) {
-    QString item = context.selectString(node, "Control");
-    if (!item.isEmpty()) {
-        m_pPointCos = std::make_unique<ControlProxy>(group, item);
-        if (item.startsWith("hotcue_") && item.endsWith("_position")) {
-            m_iHotCue = item.midRef(7, item.count() - 16).toInt() - 1;
+namespace {
+Qt::Alignment decodeAlignmentFlags(QString alignString, Qt::Alignment defaultFlags) {
+    QStringList stringFlags = alignString.toLower()
+            .split("|", QString::SkipEmptyParts);
+
+    Qt::Alignment hflags = 0L;
+    Qt::Alignment vflags = 0L;
+
+    for (auto stringFlag : stringFlags) {
+        if (stringFlag == "center") {
+            hflags |= Qt::AlignHCenter;
+            vflags |= Qt::AlignVCenter;
+        } else if (stringFlag == "left") {
+            hflags |= Qt::AlignLeft;
+        } else if (stringFlag == "hcenter") {
+            hflags |= Qt::AlignHCenter;
+        } else if (stringFlag == "right") {
+            hflags |= Qt::AlignRight;
+        } else if (stringFlag == "top") {
+            vflags |= Qt::AlignTop;
+        } else if (stringFlag == "vcenter") {
+            vflags |= Qt::AlignVCenter;
+        } else if (stringFlag == "bottom") {
+            vflags |= Qt::AlignBottom;
         }
     }
-    QString visibilityControl = context.selectString(node, "VisibilityControl");
-    if (!visibilityControl.isEmpty()) {
-        ConfigKey key = ConfigKey::parseCommaSeparated(visibilityControl);
-        m_pVisibleCos = std::make_unique<ControlProxy>(key);
+
+    if (hflags != Qt::AlignLeft && hflags != Qt::AlignHCenter && hflags != Qt::AlignRight) {
+        hflags = defaultFlags & Qt::AlignHorizontal_Mask;
+    }
+
+    if (vflags != Qt::AlignTop && vflags != Qt::AlignVCenter && vflags != Qt::AlignBottom) {
+        vflags = defaultFlags & Qt::AlignVertical_Mask;
     }
-    m_properties = WaveformMarkProperties(node, context, signalColors, m_iHotCue);
+
+    return hflags | vflags;
 }
+} // anonymous namespace
 
 WaveformMark::WaveformMark(const QString& group,
                            const QDomNode& node,
@@ -31,9 +51,55 @@ WaveformMark::WaveformMark(const QString& group,
                            const WaveformSignalColors& signalColors,
                            int hotCue)
         : m_iHotCue(hotCue) {
-    if (hotCue >= 0) {
-        QString item = "hotcue_" + QString::number(hotCue + 1) + "_position";
-        m_pPointCos = std::make_unique<ControlProxy>(group, item);
+    QString control;
+    if (hotCue != kNoHotCue) {
+        control = "hotcue_" + QString::number(hotCue + 1) + "_position";
+    } else {
+        control = context.selectString(node, "Control");
+    }
+    if (!control.isEmpty()) {
+        m_pPointCos = std::make_unique<ControlProxy>(group, control);
+    }
+
+    QString visibilityControl = context.selectString(node, "VisibilityControl");
+    if (!visibilityControl.isEmpty()) {
+        ConfigKey key = ConfigKey::parseCommaSeparated(visibilityControl);
+        m_pVisibleCos = std::make_unique<ControlProxy>(key);
+    }
+
+    QColor color(context.selectString(node, "Color"));
+    if (!color.isValid()) {
+        // As a fallback, grab the color from the parent's AxesColor
+        color = signalColors.getAxesColor();
+        qDebug() << "Didn't get mark <Color>, using parent's <AxesColor>:" << color;
+    } else {
+        color = WSkinColor::getCorrectColor(color);
+    }
+    setBaseColor(color);
+
+    m_textColor = context.selectString(node, "TextColor");
+    if (!m_textColor.isValid()) {
+        // Read the text color, otherwise use the parent's BgColor.
+        m_textColor = signalColors.getBgColor();
+        qDebug() << "Didn't get mark <TextColor>, using parent's <BgColor>:" << m_textColor;
+    }
+
+    QString markAlign = context.selectString(node, "Align");
+    m_align = decodeAlignmentFlags(markAlign, Qt::AlignBottom | Qt::AlignHCenter);
+
+    // Hotcue text is set by the cue's label in the database, not by the skin.
+    if (hotCue == WaveformMark::kNoHotCue) {
+        m_text = context.selectString(node, "Text");
+    }
+
+    m_pixmapPath = context.selectString(node, "Pixmap");
+    if (!m_pixmapPath.isEmpty()) {
+        m_pixmapPath = context.makeSkinPath(m_pixmapPath);
     }
-    m_properties = WaveformMarkProperties(node, context, signalColors, hotCue);
 }
+
+void WaveformMark::setBaseColor(QColor baseColor) {
+    m_fillColor = baseColor;
+    m_borderColor = Color::chooseContrastColor(baseColor);
+    m_labelColor = Color::chooseColorByBrightness(baseColor, QColor(255,255,255,255), QColor(0,0,0,255));
+};
diff --git a/src/waveform/renderers/waveformmark.h b/src/waveform/renderers/waveformmark.h
index c3075ec076f..ab11862df18 100644
--- a/src/waveform/renderers/waveformmark.h
+++ b/src/waveform/renderers/waveformmark.h
@@ -4,10 +4,10 @@
 #include <QDomNode>
 #include <QImage>
 
+#include "waveform/waveformmarklabel.h"
 #include "control/controlproxy.h"
 #include "util/memory.h"
 
-#include "waveform/renderers/waveformmarkproperties.h"
 #include "control/controlobject.h"
 
 class SkinContext;
@@ -18,31 +18,17 @@ class WOverview;
 class WaveformMark {
   public:
     static const int kNoHotCue = -1;
-    WaveformMark(
-            const QString& group,
-            const QDomNode& node,
-            const SkinContext& context,
-            const WaveformSignalColors& signalColors);
-
     WaveformMark(
             const QString& group,
             const QDomNode& node,
             const SkinContext& context,
             const WaveformSignalColors& signalColors,
-            int hotCue);
-
+            int hotCue = kNoHotCue);
 
     // Disable copying
     WaveformMark(const WaveformMark&) = delete;
     WaveformMark& operator=(const WaveformMark&) = delete;
 
-    const WaveformMarkProperties& getProperties() const {
-        return m_properties;
-    };
-    void setProperties(const WaveformMarkProperties& properties) {
-        m_properties = properties;
-    };
-
     int getHotCue() const { return m_iHotCue; };
 
     //The m_pPointCos related function
@@ -57,23 +43,71 @@ class WaveformMark {
 
     // The m_pVisibleCos related function
     bool hasVisible() const { return m_pVisibleCos && m_pVisibleCos->valid(); }
-    bool isVisible() const { return m_pVisibleCos->get(); }
+    bool isVisible() const {
+        if (!hasVisible()) {
+            return true;
+        }
+        return m_pVisibleCos->get();
+    }
 
     template <typename Receiver, typename Slot>
     void connectVisibleChanged(Receiver receiver, Slot slot) const {
         m_pVisibleCos->connectValueChanged(receiver, slot, Qt::AutoConnection);
     }
 
+    // Sets the appropriate mark colors based on the base color
+    void setBaseColor(QColor baseColor);
+    QColor fillColor() const {
+        return m_fillColor;
+    }
+    QColor borderColor() const {
+        return m_borderColor;
+    }
+    QColor labelColor() const {
+        return m_labelColor;
+    }
+
+    QColor m_textColor;
+    QString m_text;
+    Qt::Alignment m_align;
+    QString m_pixmapPath;
+
+    float m_linePosition;
+
+    WaveformMarkLabel m_label;
+
   private:
     std::unique_ptr<ControlProxy> m_pPointCos;
     std::unique_ptr<ControlProxy> m_pVisibleCos;
-    WaveformMarkProperties m_properties;
     int m_iHotCue;
     QImage m_image;
 
+    QColor m_fillColor;
+    QColor m_borderColor;
+    QColor m_labelColor;
+
     friend class WaveformRenderMark;
 };
 
 typedef QSharedPointer<WaveformMark> WaveformMarkPointer;
 
+inline bool operator<(const WaveformMarkPointer& lhs, const WaveformMarkPointer& rhs) {
+    double leftPosition = lhs->getSamplePosition();
+    int leftHotcue = lhs->getHotCue();
+    double rightPosition = rhs->getSamplePosition();
+    int rightHotcue = rhs->getHotCue();
+    if (leftPosition == rightPosition) {
+        // Sort WaveformMarks without hotcues before those with hotcues;
+        // if both have hotcues, sort numerically by hotcue number.
+        if (leftHotcue == WaveformMark::kNoHotCue && rightHotcue != WaveformMark::kNoHotCue) {
+            return true;
+        } else if (leftHotcue != WaveformMark::kNoHotCue && rightHotcue == WaveformMark::kNoHotCue) {
+            return false;
+        } else {
+            return leftHotcue < rightHotcue;
+        }
+    }
+    return leftPosition < rightPosition;
+}
+
 #endif // WAVEFORMMARK_H
diff --git a/src/waveform/renderers/waveformmarkproperties.cpp b/src/waveform/renderers/waveformmarkproperties.cpp
deleted file mode 100644
index 18ee9195e49..00000000000
--- a/src/waveform/renderers/waveformmarkproperties.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-#include "skin/skincontext.h"
-#include "waveform/renderers/waveformsignalcolors.h"
-#include "widget/wskincolor.h"
-
-#include "waveform/renderers/waveformmarkproperties.h"
-#include "waveform/renderers/waveformmark.h"
-
-Qt::Alignment decodeAlignmentFlags(QString alignString, Qt::Alignment defaultFlags) {
-    QStringList stringFlags = alignString.toLower()
-            .split("|", QString::SkipEmptyParts);
-
-    Qt::Alignment hflags = 0L;
-    Qt::Alignment vflags = 0L;
-
-    for (auto stringFlag : stringFlags) {
-        if (stringFlag == "center") {
-            hflags |= Qt::AlignHCenter;
-            vflags |= Qt::AlignVCenter;
-        } else if (stringFlag == "left") {
-            hflags |= Qt::AlignLeft;
-        } else if (stringFlag == "hcenter") {
-            hflags |= Qt::AlignHCenter;
-        } else if (stringFlag == "right") {
-            hflags |= Qt::AlignRight;
-        } else if (stringFlag == "top") {
-            vflags |= Qt::AlignTop;
-        } else if (stringFlag == "vcenter") {
-            vflags |= Qt::AlignVCenter;
-        } else if (stringFlag == "bottom") {
-            vflags |= Qt::AlignBottom;
-        }
-    }
-
-    if (hflags != Qt::AlignLeft && hflags != Qt::AlignHCenter && hflags != Qt::AlignRight) {
-        hflags = defaultFlags & Qt::AlignHorizontal_Mask;
-    }
-
-    if (vflags != Qt::AlignTop && vflags != Qt::AlignVCenter && vflags != Qt::AlignBottom) {
-        vflags = defaultFlags & Qt::AlignVertical_Mask;
-    }
-
-    return hflags | vflags;
-}
-
-WaveformMarkProperties::WaveformMarkProperties(const QDomNode& node,
-                                               const SkinContext& context,
-                                               const WaveformSignalColors& signalColors,
-                                               int hotCue) {
-    QColor color(context.selectString(node, "Color"));
-    if (!color.isValid()) {
-        // As a fallback, grab the color from the parent's AxesColor
-        color = signalColors.getAxesColor();
-        qDebug() << "Didn't get mark <Color>, using parent's <AxesColor>:" << color;
-    } else {
-        color = WSkinColor::getCorrectColor(color);
-    }
-    setBaseColor(color);
-
-    m_textColor = context.selectString(node, "TextColor");
-    if (!m_textColor.isValid()) {
-        // Read the text color, otherwise use the parent's BgColor.
-        m_textColor = signalColors.getBgColor();
-        qDebug() << "Didn't get mark <TextColor>, using parent's <BgColor>:" << m_textColor;
-    }
-
-    QString markAlign = context.selectString(node, "Align");
-    m_align = decodeAlignmentFlags(markAlign, Qt::AlignBottom | Qt::AlignHCenter);
-
-    if (WaveformMark::kNoHotCue != hotCue) {
-        m_text = context.selectString(node, "Text").arg(hotCue + 1);
-    } else {
-        m_text = context.selectString(node, "Text");
-    }
-    m_pixmapPath = context.selectString(node, "Pixmap");
-    if (!m_pixmapPath.isEmpty()) {
-        m_pixmapPath = context.makeSkinPath(m_pixmapPath);
-    }
-}
-
-void WaveformMarkProperties::setBaseColor(QColor baseColor) {
-    m_fillColor = baseColor;
-    m_borderColor = Color::chooseContrastColor(baseColor);
-    m_labelColor = Color::chooseColorByBrightness(baseColor, QColor(255,255,255,255), QColor(0,0,0,255));
-}
-
-QColor WaveformMarkProperties::fillColor() const {
-    return m_fillColor;
-}
-
-QColor WaveformMarkProperties::borderColor() const {
-    return m_borderColor;
-}
-QColor WaveformMarkProperties::labelColor() const {
-    return m_labelColor;
-}
diff --git a/src/waveform/renderers/waveformmarkproperties.h b/src/waveform/renderers/waveformmarkproperties.h
deleted file mode 100644
index 6f3cf0ea4c2..00000000000
--- a/src/waveform/renderers/waveformmarkproperties.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef WAVEFORMMARKPROPERTIES_H
-#define WAVEFORMMARKPROPERTIES_H
-
-#include <QColor>
-#include <QDomNode>
-
-class SkinContext;
-class WaveformSignalColors;
-
-class WaveformMarkProperties final {
-  public:
-    WaveformMarkProperties() = default;
-    WaveformMarkProperties(const QDomNode& node,
-                           const SkinContext& context,
-                           const WaveformSignalColors& signalColors,
-                           int hotCue);
-
-    // Sets the appropriate mark colors based on the base color
-    void setBaseColor(QColor baseColor);
-    QColor fillColor() const;
-    QColor borderColor() const;
-    QColor labelColor() const;
-
-    QColor m_textColor;
-    QString m_text;
-    Qt::Alignment m_align;
-    QString m_pixmapPath;
-
-  private:
-    QColor m_fillColor;
-    QColor m_borderColor;
-    QColor m_labelColor;
-};
-
-#endif // WAVEFORMMARKPROPERTIES_H
diff --git a/src/waveform/renderers/waveformmarkrange.h b/src/waveform/renderers/waveformmarkrange.h
index 0b2201c4a72..deb3f09251a 100644
--- a/src/waveform/renderers/waveformmarkrange.h
+++ b/src/waveform/renderers/waveformmarkrange.h
@@ -6,6 +6,7 @@
 
 #include "control/controlproxy.h"
 #include "util/memory.h"
+#include "waveform/waveformmarklabel.h"
 
 class QDomNode;
 class SkinContext;
@@ -47,6 +48,8 @@ class WaveformMarkRange {
         return m_durationTextLocation;
     }
 
+    WaveformMarkLabel m_durationLabel;
+
   private:
     void generateImage(int weidth, int height);
 
diff --git a/src/waveform/renderers/waveformmarkset.h b/src/waveform/renderers/waveformmarkset.h
index 198d6876620..9997eeffc7e 100644
--- a/src/waveform/renderers/waveformmarkset.h
+++ b/src/waveform/renderers/waveformmarkset.h
@@ -9,6 +9,8 @@
 
 class WaveformWidgetRenderer;
 
+// This class helps share code between the WaveformRenderMark and WOverview
+// constructors.
 class WaveformMarkSet {
   public:
     WaveformMarkSet();
diff --git a/src/waveform/renderers/waveformrendermark.cpp b/src/waveform/renderers/waveformrendermark.cpp
index 896c85583e2..8c4a05e3490 100644
--- a/src/waveform/renderers/waveformrendermark.cpp
+++ b/src/waveform/renderers/waveformrendermark.cpp
@@ -5,6 +5,7 @@
 #include "waveform/renderers/waveformrendermark.h"
 
 #include "control/controlproxy.h"
+#include "engine/controls/cuecontrol.h"
 #include "track/track.h"
 #include "util/color/color.h"
 #include "waveform/renderers/waveformwidgetrenderer.h"
@@ -28,7 +29,7 @@ void WaveformRenderMark::setup(const QDomNode& node, const SkinContext& context)
     m_marks.setup(m_waveformRenderer->getGroup(), node, context, signalColors);
     WaveformMarkPointer defaultMark(m_marks.getDefaultMark());
     QColor defaultColor = defaultMark
-            ? defaultMark->getProperties().fillColor()
+            ? defaultMark->fillColor()
             : signalColors.getAxesColor();
     m_predefinedColorsRepresentation = context.getCueColorRepresentation(node, defaultColor);
 }
@@ -46,7 +47,7 @@ void WaveformRenderMark::draw(QPainter* painter, QPaintEvent* /*event*/) {
 
     painter->setWorldMatrixEnabled(false);
 
-    for (const auto& pMark: m_marks) {
+    for (auto& pMark: m_marks) {
         if (!pMark->isValid())
             continue;
 
@@ -57,7 +58,7 @@ void WaveformRenderMark::draw(QPainter* painter, QPaintEvent* /*event*/) {
         // Generate image on first paint can't be done in setup since we need
         // render widget to be resized yet ...
         if (pMark->m_image.isNull()) {
-            generateMarkImage(pMark.data());
+            generateMarkImage(pMark);
         }
 
         double samplePosition = pMark->getSamplePosition();
@@ -114,7 +115,7 @@ void WaveformRenderMark::slotCuesUpdated() {
     QList<CuePointer> loadedCues = trackInfo->getCuePoints();
     for (const CuePointer pCue: loadedCues) {
         int hotCue = pCue->getHotCue();
-        if (hotCue < 0) {
+        if (hotCue == WaveformMark::kNoHotCue) {
             continue;
         }
 
@@ -122,28 +123,24 @@ void WaveformRenderMark::slotCuesUpdated() {
         // because WaveformMarkSet stores one mark for each hotcue.
         WaveformMarkPointer pMark = m_marks.getHotCueMark(hotCue);
         if (pMark.isNull()) {
-        	continue;
+            continue;
         }
 
-        WaveformMarkProperties markProperties = pMark->getProperties();
         QString newLabel = pCue->getLabel();
         QColor newColor = m_predefinedColorsRepresentation.representationFor(pCue->getColor());
-        if (markProperties.m_text.isNull() || newLabel != markProperties.m_text ||
-                !markProperties.fillColor().isValid() || newColor != markProperties.fillColor()) {
-            markProperties.m_text = newLabel;
-            markProperties.setBaseColor(newColor);
-            pMark->setProperties(markProperties);
-            generateMarkImage(pMark.data());
+        if (pMark->m_text.isNull() || newLabel != pMark->m_text ||
+                !pMark->fillColor().isValid() || newColor != pMark->fillColor()) {
+            pMark->m_text = newLabel;
+            pMark->setBaseColor(newColor);
+            generateMarkImage(pMark);
         }
     }
 }
 
-void WaveformRenderMark::generateMarkImage(WaveformMark* pMark) {
-    const WaveformMarkProperties& markProperties = pMark->getProperties();
-
+void WaveformRenderMark::generateMarkImage(WaveformMarkPointer pMark) {
     // Load the pixmap from file -- takes precedence over text.
-    if (!markProperties.m_pixmapPath.isEmpty()) {
-        QString path = markProperties.m_pixmapPath;
+    if (!pMark->m_pixmapPath.isEmpty()) {
+        QString path = pMark->m_pixmapPath;
         QImage image = *WImageStore::getImage(path, scaleFactor());
         //QImage image = QImage(path);
         // If loading the image didn't fail, then we're done. Otherwise fall
@@ -158,9 +155,9 @@ void WaveformRenderMark::generateMarkImage(WaveformMark* pMark) {
     QPainter painter;
 
     // If no text is provided, leave m_markImage as a null image
-    if (!markProperties.m_text.isNull()) {
+    if (!pMark->m_text.isNull()) {
         // Determine mark text.
-        QString label = markProperties.m_text;
+        QString label = pMark->m_text;
         if (pMark->getHotCue() >= 0) {
             if (!label.isEmpty()) {
                 label.prepend(": ");
@@ -209,8 +206,8 @@ void WaveformRenderMark::generateMarkImage(WaveformMark* pMark) {
 
         pMark->m_image = QImage(width, height, QImage::Format_ARGB32_Premultiplied);
 
-        Qt::Alignment markAlignH = markProperties.m_align & Qt::AlignHorizontal_Mask;
-        Qt::Alignment markAlignV = markProperties.m_align & Qt::AlignVertical_Mask;
+        Qt::Alignment markAlignH = pMark->m_align & Qt::AlignHorizontal_Mask;
+        Qt::Alignment markAlignV = pMark->m_align & Qt::AlignVertical_Mask;
 
         if (markAlignH == Qt::AlignHCenter) {
             labelRect.moveLeft((width - labelRectWidth) / 2);
@@ -237,27 +234,27 @@ void WaveformRenderMark::generateMarkImage(WaveformMark* pMark) {
             int middle = width / 2;
             if (markAlignH == Qt::AlignHCenter) {
                 if (labelRect.top() > 0) {
-                    painter.setPen(markProperties.fillColor());
+                    painter.setPen(pMark->fillColor());
                     painter.drawLine(middle, 0, middle, labelRect.top());
 
-                    painter.setPen(markProperties.borderColor());
+                    painter.setPen(pMark->borderColor());
                     painter.drawLine(middle - 1, 0, middle - 1, labelRect.top());
                     painter.drawLine(middle + 1, 0, middle + 1, labelRect.top());
                 }
 
                 if (labelRect.bottom() < height) {
-                    painter.setPen(markProperties.fillColor());
+                    painter.setPen(pMark->fillColor());
                     painter.drawLine(middle, labelRect.bottom(), middle, height);
 
-                    painter.setPen(markProperties.borderColor());
+                    painter.setPen(pMark->borderColor());
                     painter.drawLine(middle - 1, labelRect.bottom(), middle - 1, height);
                     painter.drawLine(middle + 1, labelRect.bottom(), middle + 1, height);
                 }
             } else {  // AlignLeft || AlignRight
-                painter.setPen(markProperties.fillColor());
+                painter.setPen(pMark->fillColor());
                 painter.drawLine(middle, 0, middle, height);
 
-                painter.setPen(markProperties.borderColor());
+                painter.setPen(pMark->borderColor());
                 painter.drawLine(middle - 1, 0, middle - 1, height);
                 painter.drawLine(middle + 1, 0, middle + 1, height);
             }
@@ -265,41 +262,41 @@ void WaveformRenderMark::generateMarkImage(WaveformMark* pMark) {
             int middle = height / 2;
             if (markAlignV == Qt::AlignVCenter) {
                 if (labelRect.left() > 0) {
-                    painter.setPen(markProperties.fillColor());
+                    painter.setPen(pMark->fillColor());
                     painter.drawLine(0, middle, labelRect.left(), middle);
 
-                    painter.setPen(markProperties.borderColor());
+                    painter.setPen(pMark->borderColor());
                     painter.drawLine(0, middle - 1, labelRect.left(), middle - 1);
                     painter.drawLine(0, middle + 1, labelRect.left(), middle + 1);
                 }
 
                 if (labelRect.right() < width) {
-                    painter.setPen(markProperties.fillColor());
+                    painter.setPen(pMark->fillColor());
                     painter.drawLine(labelRect.right(), middle, width, middle);
 
-                    painter.setPen(markProperties.borderColor());
+                    painter.setPen(pMark->borderColor());
                     painter.drawLine(labelRect.right(), middle - 1, width, middle - 1);
                     painter.drawLine(labelRect.right(), middle + 1, width, middle + 1);
                 }
             } else {  // AlignTop || AlignBottom
-                painter.setPen(markProperties.fillColor());
+                painter.setPen(pMark->fillColor());
                 painter.drawLine(0, middle, width, middle);
 
-                painter.setPen(markProperties.borderColor());
+                painter.setPen(pMark->borderColor());
                 painter.drawLine(0, middle - 1, width, middle - 1);
                 painter.drawLine(0, middle + 1, width, middle + 1);
             }
         }
 
         // Draw the label rect
-        painter.setPen(markProperties.borderColor());
-        painter.setBrush(QBrush(markProperties.fillColor()));
+        painter.setPen(pMark->borderColor());
+        painter.setBrush(QBrush(pMark->fillColor()));
         painter.drawRoundedRect(labelRect, 2.0, 2.0);
 
         // Draw text
         painter.setBrush(QBrush(QColor(0,0,0,0)));
         painter.setFont(font);
-        painter.setPen(markProperties.labelColor());
+        painter.setPen(pMark->labelColor());
         painter.drawText(labelRect, Qt::AlignCenter, label);
     }
     else //no text draw triangle
@@ -331,7 +328,7 @@ void WaveformRenderMark::generateMarkImage(WaveformMark* pMark) {
             painter.setTransform(QTransform(0, 1, 1, 0, 0, 0));
         }
 
-        QColor triangleColor = markProperties.fillColor();
+        QColor triangleColor = pMark->fillColor();
         painter.setPen(QColor(0,0,0,0));
         painter.setBrush(QBrush(triangleColor));
 
@@ -354,7 +351,7 @@ void WaveformRenderMark::generateMarkImage(WaveformMark* pMark) {
 
         //TODO vRince duplicated code make a method
         //draw line
-        QColor lineColor = markProperties.fillColor();
+        QColor lineColor = pMark->fillColor();
         painter.setPen(lineColor);
 
         float middle = markLength / 2.0;
diff --git a/src/waveform/renderers/waveformrendermark.h b/src/waveform/renderers/waveformrendermark.h
index 265da9d1af3..01c975fe3c1 100644
--- a/src/waveform/renderers/waveformrendermark.h
+++ b/src/waveform/renderers/waveformrendermark.h
@@ -33,7 +33,7 @@ class WaveformRenderMark : public QObject, public WaveformRendererAbstract {
     void slotCuesUpdated();
 
   private:
-    void generateMarkImage(WaveformMark* pMark);
+    void generateMarkImage(WaveformMarkPointer pMark);
 
     PredefinedColorsRepresentation m_predefinedColorsRepresentation;
 
diff --git a/src/waveform/waveformmarklabel.cpp b/src/waveform/waveformmarklabel.cpp
new file mode 100644
index 00000000000..47928dfdc84
--- /dev/null
+++ b/src/waveform/waveformmarklabel.cpp
@@ -0,0 +1,72 @@
+#include "waveform/waveformmarklabel.h"
+#include "util/math.h"
+
+void WaveformMarkLabel::prerender(QPointF bottomLeft, QPixmap icon, QString text,
+            QFont font, QColor textColor, QColor backgroundColor,
+            float widgetWidth, double scaleFactor) {
+    if (text.isEmpty() && icon.isNull()) {
+        clear();
+        return;
+    }
+
+    m_text = text;
+    QFontMetrics fontMetrics(font);
+    const int padding = 2;
+
+    QRectF pixmapRect;
+    pixmapRect = fontMetrics.boundingRect(text);
+    int availableWidthForText;
+    if (icon.isNull()) {
+        pixmapRect.setWidth(padding + pixmapRect.width() + padding);
+        availableWidthForText = widgetWidth - padding * 2;
+    } else {
+        pixmapRect.setWidth(padding + icon.width() + padding + pixmapRect.width() + padding);
+        availableWidthForText = widgetWidth - padding * 3;
+    }
+    // Elide extremely long labels
+    if (pixmapRect.width() > widgetWidth) {
+        text = fontMetrics.elidedText(text, Qt::ElideRight, availableWidthForText);
+        pixmapRect.setWidth(widgetWidth);
+    }
+    pixmapRect.setHeight(math_max(fontMetrics.height(), icon.height()));
+
+    // pixmapRect has a top left of (0,0) for rendering to m_pixmap.
+    // m_areaRect is the same size but shifted to the coordinates of the widget.
+    m_areaRect = pixmapRect;
+    QPointF topLeft = QPointF(bottomLeft.x(),
+            bottomLeft.y() - pixmapRect.height());
+    m_areaRect.moveTo(topLeft);
+
+    if (m_areaRect.right() > widgetWidth) {
+        m_areaRect.setLeft(widgetWidth - m_areaRect.width());
+    }
+
+    m_pixmap = QPixmap(pixmapRect.width() * scaleFactor, pixmapRect.height() * scaleFactor);
+    m_pixmap.setDevicePixelRatio(scaleFactor);
+    m_pixmap.fill(Qt::transparent);
+
+    QPainter painter(&m_pixmap);
+
+    painter.setPen(QColor(Qt::transparent));
+    painter.setBrush(QBrush(backgroundColor));
+    painter.drawRoundedRect(0, 0, pixmapRect.width(), pixmapRect.height(), 2.0, 2.0);
+
+    if (!icon.isNull()) {
+        QPointF iconTopLeft = pixmapRect.topLeft();
+        iconTopLeft.setX(iconTopLeft.x() + padding);
+        painter.drawPixmap(iconTopLeft, icon);
+    }
+
+    if (!text.isEmpty()) {
+        QPointF textBottomLeft;
+        textBottomLeft.setX(icon.width() + padding);
+        textBottomLeft.setY(fontMetrics.ascent());
+        painter.setFont(font);
+        painter.setPen(textColor);
+        painter.drawText(textBottomLeft, text);
+    }
+};
+
+void WaveformMarkLabel::draw(QPainter* pPainter) {
+    pPainter->drawPixmap(m_areaRect.topLeft(), m_pixmap);
+}
diff --git a/src/waveform/waveformmarklabel.h b/src/waveform/waveformmarklabel.h
new file mode 100644
index 00000000000..02ff40ca797
--- /dev/null
+++ b/src/waveform/waveformmarklabel.h
@@ -0,0 +1,53 @@
+#pragma once
+
+#include <QColor>
+#include <QFont>
+#include <QFontMetrics>
+#include <QPainter>
+#include <QPixmap>
+#include <QString>
+#include <QRectF>
+
+// WaveformMarkLabel renders the label for a WaveformMark to an offscreen buffer
+// and calculates its area. This allows the areas of all WaveformMarkLabels
+// to be compared so overlapping labels are not drawn.
+class WaveformMarkLabel {
+  public:
+    WaveformMarkLabel() {};
+
+    // Render the label to an internal QPixmap buffer
+    void prerender(QPointF bottomLeft, QPixmap icon, QString text,
+            QFont font, QColor textColor, QColor backgroundColor,
+            float widgetWidth, double scaleFactor);
+
+    // Draw the prerendered pixmap
+    void draw(QPainter* pPainter);
+
+    QRectF area() const {
+        return m_areaRect;
+    };
+
+    bool intersects(const QRectF& other) const {
+        return m_areaRect.intersects(other);
+    }
+
+    bool intersects(const WaveformMarkLabel& other) const {
+        return intersects(other.area());
+    }
+
+    void clear() {
+        m_text = QString();
+        m_pixmap = QPixmap();
+        m_areaRect = QRectF();
+    }
+
+  private:
+    QPixmap m_icon;
+    QString m_text;
+    QFont m_font;
+    QColor m_textColor;
+    QColor m_backgroundColor;
+
+    QPixmap m_pixmap;
+    QRectF m_areaRect;
+};
diff --git a/src/widget/colormenu.cpp b/src/widget/colormenu.cpp
new file mode 100644
index 00000000000..543b2710842
--- /dev/null
+++ b/src/widget/colormenu.cpp
@@ -0,0 +1,39 @@
+#include "widget/colormenu.h"
+#include "util/color/color.h"
+
+ColorMenu::ColorMenu(QWidget *parent)
+        : QMenu(parent) {
+    // If another title would be more appropriate in some context, setTitle
+    // can be called again after construction.
+    setTitle(tr("Set color"));
+    for (const auto& pColor : Color::kPredefinedColorsSet.allColors) {
+        if (*pColor == *Color::kPredefinedColorsSet.noColor) {
+            continue;
+        }
+
+        QAction* pColorAction = new QAction(pColor->m_sDisplayName, this);
+        QPixmap pixmap(80, 80);
+        pixmap.fill(pColor->m_defaultRgba);
+        pColorAction->setIcon(QIcon(pixmap));
+
+        m_pColorActions.insert(pColor, pColorAction);
+        addAction(pColorAction);
+        connect(pColorAction, &QAction::triggered, this, [pColor, this]() {
+            emit(colorPicked(pColor));
+        });
+    }
+}
+
+void ColorMenu::useColorSet(PredefinedColorsRepresentation* pColorRepresentation) {
+    QMapIterator<PredefinedColorPointer, QAction*> i(m_pColorActions);
+    while (i.hasNext()) {
+        i.next();
+        QPixmap pixmap(80, 80);
+        if (pColorRepresentation == nullptr) {
+            pixmap.fill(i.key()->m_defaultRgba);
+        } else {
+            pixmap.fill(pColorRepresentation->representationFor(i.key()));
+        }
+        i.value()->setIcon(QIcon(pixmap));
+    }
+}
diff --git a/src/widget/colormenu.h b/src/widget/colormenu.h
new file mode 100644
index 00000000000..4c82943cbb8
--- /dev/null
+++ b/src/widget/colormenu.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include <QMenu>
+
+#include "util/color/color.h"
+
+class ColorMenu : public QMenu {
+    Q_OBJECT
+  public:
+    ColorMenu(QWidget *parent = nullptr);
+
+    void useColorSet(PredefinedColorsRepresentation* pColorRepresentation);
+
+  signals:
+    void colorPicked(PredefinedColorPointer pColor);
+
+  private:
+    QMap<PredefinedColorPointer, QAction*> m_pColorActions;
+};
diff --git a/src/widget/cuemenu.cpp b/src/widget/cuemenu.cpp
new file mode 100644
index 00000000000..b9d62a30911
--- /dev/null
+++ b/src/widget/cuemenu.cpp
@@ -0,0 +1,58 @@
+#include <QInputDialog>
+
+#include "widget/cuemenu.h"
+#include "util/color/color.h"
+
+CueMenu::CueMenu(QWidget *parent)
+        : QMenu(parent) {
+    m_pEditLabel = new QAction(tr("Edit label"), this);
+    addAction(m_pEditLabel);
+    connect(m_pEditLabel, &QAction::triggered, this, &CueMenu::slotEditLabel);
+
+    m_pColorMenu = new ColorMenu(this);
+    connect(m_pColorMenu, &ColorMenu::colorPicked, this, &CueMenu::slotChangeCueColor);
+    addMenu(m_pColorMenu);
+
+    m_pRemoveCue = new QAction(tr("Remove"), this);
+    addAction(m_pRemoveCue);
+    connect(m_pRemoveCue, &QAction::triggered, this, &CueMenu::slotRemoveCue);
+}
+
+CueMenu::~CueMenu() {
+    delete m_pEditLabel;
+    delete m_pColorMenu;
+    delete m_pRemoveCue;
+}
+
+void CueMenu::slotEditLabel() {
+    VERIFY_OR_DEBUG_ASSERT(m_pCue != nullptr) {
+        return;
+    }
+    bool okay = false;
+    QString newLabel = QInputDialog::getText(this, tr("Edit cue label"),
+                                             tr("New cue label"), QLineEdit::Normal,
+                                             m_pCue->getLabel(), &okay);
+    if (okay) {
+        m_pCue->setLabel(newLabel);
+    }
+}
+
+void CueMenu::slotChangeCueColor(PredefinedColorPointer pColor) {
+    VERIFY_OR_DEBUG_ASSERT(m_pCue != nullptr) {
+        return;
+    }
+    VERIFY_OR_DEBUG_ASSERT(pColor != nullptr) {
+        return;
+    }
+    m_pCue->setColor(pColor);
+}
+
+void CueMenu::slotRemoveCue() {
+    VERIFY_OR_DEBUG_ASSERT(m_pCue != nullptr) {
+        return;
+    }
+    VERIFY_OR_DEBUG_ASSERT(m_pTrack != nullptr) {
+        return;
+    }
+    m_pTrack->removeCue(m_pCue);
+}
diff --git a/src/widget/cuemenu.h b/src/widget/cuemenu.h
new file mode 100644
index 00000000000..3802292e44a
--- /dev/null
+++ b/src/widget/cuemenu.h
@@ -0,0 +1,41 @@
+#pragma once
+
+#include <QMenu>
+
+#include "track/track.h"
+#include "track/cue.h"
+#include "widget/colormenu.h"
+
+class CueMenu : public QMenu {
+    Q_OBJECT
+  public:
+    CueMenu(QWidget *parent = nullptr);
+    ~CueMenu() override;
+
+    void setCue(CuePointer pCue) {
+        m_pCue = pCue;
+    }
+
+    void setTrack(TrackPointer pTrack) {
+        m_pTrack = pTrack;
+    }
+
+    void useColorSet(PredefinedColorsRepresentation* pColorRepresentation) {
+        if (m_pColorMenu != nullptr) {
+            m_pColorMenu->useColorSet(pColorRepresentation);
+        }
+    }
+
+  private slots:
+    void slotEditLabel();
+    void slotRemoveCue();
+    void slotChangeCueColor(PredefinedColorPointer pColor);
+
+  private:
+    CuePointer m_pCue;
+    TrackPointer m_pTrack;
+
+    QAction* m_pEditLabel;
+    ColorMenu* m_pColorMenu;
+    QAction* m_pRemoveCue;
+};
diff --git a/src/widget/woverview.cpp b/src/widget/woverview.cpp
index fcd9e4c47cd..fdf6030e65b 100644
--- a/src/widget/woverview.cpp
+++ b/src/widget/woverview.cpp
@@ -54,8 +54,13 @@ WOverview::WOverview(
         m_group(group),
         m_pConfig(pConfig),
         m_endOfTrack(false),
-        m_bDrag(false),
+        m_pCueMenu(std::make_unique<CueMenu>(this)),
+        m_bShowCueTimes(true),
+        m_iPosSeconds(0),
         m_iPos(0),
+        m_pHoveredMark(nullptr),
+        m_bHotcueMenuShowing(false),
+        m_bTimeRulerActive(false),
         m_orientation(Qt::Horizontal),
         m_a(1.0),
         m_b(0.0),
@@ -74,10 +79,16 @@ WOverview::WOverview(
     m_trackSampleRateControl = new ControlProxy(m_group, "track_samplerate", this);
     m_trackSamplesControl =
             new ControlProxy(m_group, "track_samples", this);
+    m_playpositionControl = new ControlProxy(m_group, "playposition", this);
     setAcceptDrops(true);
 
+    setMouseTracking(true);
+
     connect(pPlayerManager, &PlayerManager::trackAnalyzerProgress,
             this, &WOverview::onTrackAnalyzerProgress);
+
+    connect(m_pCueMenu.get(), &QMenu::aboutToHide,
+            this, &WOverview::slotCueMenuAboutToHide);
 }
 
 void WOverview::setup(const QDomNode& node, const SkinContext& context) {
@@ -86,6 +97,23 @@ void WOverview::setup(const QDomNode& node, const SkinContext& context) {
 
     m_qColorBackground = m_signalColors.getBgColor();
 
+    m_labelBackgroundColor = context.selectColor(node, "LabelBackgroundColor");
+    if (!m_labelBackgroundColor.isValid()) {
+        m_labelBackgroundColor = m_qColorBackground;
+        m_labelBackgroundColor.setAlpha(255 / 2); // 0 == fully transparent
+    }
+
+    m_labelTextColor = context.selectColor(node, "LabelTextColor");
+    if (!m_labelTextColor.isValid()) {
+        m_labelTextColor = Qt::white;
+    }
+
+    bool okay = false;
+    m_iLabelFontSize = context.selectInt(node, "LabelFontSize", &okay);
+    if (!okay) {
+        m_iLabelFontSize = 10;
+    }
+
     // Clear the background pixmap, if it exists.
     m_backgroundPixmap = QPixmap();
     m_backgroundPixmapPath = context.selectString(node, "BgPixmap");
@@ -106,9 +134,10 @@ void WOverview::setup(const QDomNode& node, const SkinContext& context) {
     m_marks.setup(m_group, node, context, m_signalColors);
     WaveformMarkPointer defaultMark(m_marks.getDefaultMark());
     QColor defaultColor = defaultMark
-            ? defaultMark->getProperties().fillColor()
+            ? defaultMark->fillColor()
             : m_signalColors.getAxesColor();
     m_predefinedColorsRepresentation = context.getCueColorRepresentation(node, defaultColor);
+    m_pCueMenu->useColorSet(&m_predefinedColorsRepresentation);
 
     for (const auto& pMark: m_marks) {
         if (pMark->isValid()) {
@@ -154,6 +183,8 @@ void WOverview::setup(const QDomNode& node, const SkinContext& context) {
         m_orientation = Qt::Horizontal;
     }
 
+    m_bShowCueTimes = context.selectBool(node, "ShowCueTimes", true);
+
     //qDebug() << "WOverview : m_marks" << m_marks.size();
     //qDebug() << "WOverview : m_markRanges" << m_markRanges.size();
     if (!m_connections.isEmpty()) {
@@ -171,17 +202,30 @@ void WOverview::setup(const QDomNode& node, const SkinContext& context) {
 
 void WOverview::onConnectedControlChanged(double dParameter, double dValue) {
     Q_UNUSED(dValue);
-    if (!m_bDrag) {
-        // Calculate handle position. Clamp the value within 0-1 because that's
-        // all we represent with this widget.
-        dParameter = math_clamp(dParameter, 0.0, 1.0);
+    // Calculate handle position. Clamp the value within 0-1 because that's
+    // all we represent with this widget.
+    dParameter = math_clamp(dParameter, 0.0, 1.0);
+
+    bool redraw = false;
+    int oldPos = m_iPos;
+    m_iPos = valueToPosition(dParameter);
+    if (oldPos != m_iPos) {
+        redraw = true;
+    }
 
-        int iPos = valueToPosition(dParameter);
-        if (iPos != m_iPos) {
-            m_iPos = iPos;
-            //qDebug() << "WOverview::onConnectedControlChanged" << dParameter << ">>" << m_iPos;
-            update();
-        }
+    // In case the user is hovering a cue point or holding right click, the
+    // calculated time between the playhead and cue/cursor should be updated at
+    // least once per second, regardless of m_iPos which depends on the length
+    // of the widget.
+    int oldPositionSeconds = m_iPosSeconds;
+    m_iPosSeconds = static_cast<int>(dParameter * m_trackSamplesControl->get());
+    if ((m_bTimeRulerActive || m_pHoveredMark != nullptr)
+            && oldPositionSeconds != m_iPosSeconds) {
+        redraw = true;
+    }
+
+    if (redraw) {
+        update();
     }
 }
 
@@ -290,20 +334,47 @@ void WOverview::onRateSliderChange(double /*v*/) {
     update();
 }
 
-// currently only updates the mark color but it could be easily extended.
 void WOverview::updateCues(const QList<CuePointer> &loadedCues) {
+    m_marksToRender.clear();
     for (CuePointer currentCue: loadedCues) {
-        const WaveformMarkPointer currentMark = m_marks.getHotCueMark(currentCue->getHotCue());
+        const WaveformMarkPointer pMark = m_marks.getHotCueMark(currentCue->getHotCue());
 
-        if (currentMark && currentMark->isValid()) {
-            WaveformMarkProperties markProperties = currentMark->getProperties();
+        if (pMark != nullptr && pMark->isValid() && pMark->isVisible()
+            && pMark->getSamplePosition() != Cue::kPositionNotDefined) {
             QColor newColor = m_predefinedColorsRepresentation.representationFor(currentCue->getColor());
-            if (newColor != markProperties.fillColor() || newColor != markProperties.m_textColor) {
-                markProperties.setBaseColor(newColor);
-                currentMark->setProperties(markProperties);
+            if (newColor != pMark->fillColor() || newColor != pMark->m_textColor) {
+                pMark->setBaseColor(newColor);
+            }
+
+            int hotcueNumber = currentCue->getHotCue();
+            if (currentCue->getType() == Cue::CUE && hotcueNumber != WaveformMark::kNoHotCue) {
+                // Prepend the hotcue number to hotcues' labels
+                QString newLabel = currentCue->getLabel();
+                if (newLabel.isEmpty()) {
+                    newLabel = QString::number(hotcueNumber + 1);
+                } else {
+                    newLabel = QString("%1: %2").arg(hotcueNumber + 1).arg(newLabel);
+                }
+
+                if (pMark->m_text != newLabel) {
+                    pMark->m_text = newLabel;
+                }
             }
+
+            m_marksToRender.append(pMark);
         }
     }
+
+    // The loop above only adds WaveformMarks for hotcues to m_marksToRender.
+    for (const auto& pMark : m_marks) {
+        if (!m_marksToRender.contains(pMark)
+            && pMark->isValid()
+            && pMark->getSamplePosition() != Cue::kPositionNotDefined
+            && pMark->isVisible()) {
+            m_marksToRender.append(pMark);
+        }
+    }
+    std::sort(m_marksToRender.begin(), m_marksToRender.end());
 }
 
 // connecting the tracks cuesUpdated and onMarkChanged is not possible
@@ -313,28 +384,119 @@ void WOverview::receiveCuesUpdated() {
 }
 
 void WOverview::mouseMoveEvent(QMouseEvent* e) {
-    if (m_orientation == Qt::Horizontal) {
-        m_iPos = math_clamp(e->x(), 0, width() - 1);
-    } else {
-        m_iPos = math_clamp(e->y(), 0, height() - 1);
+    // Do not activate cue hovering while right click is held down and the
+    // button down event was not on a cue.
+    if (m_bTimeRulerActive) {
+        // Prevent showing times beyond the boundaries of the track when the
+        // cursor is dragged outside this widget before releasing right click.
+        m_timeRulerPos.setX(math_clamp(e->pos().x(), 0, width()));
+        m_timeRulerPos.setY(math_clamp(e->pos().y(), 0, height()));
+        update();
+        return;
     }
+
+    m_pHoveredMark.clear();
+    // Without some padding, the user would only have a single pixel width that
+    // would count as hovering over the WaveformMark.
+    float lineHoverPadding = 5.0;
+    // Non-hotcue marks (intro/outro cues, main cue, loop in/out) are sorted
+    // before hotcues in m_marksToRender so if there is a hotcue in the same
+    // location, the hotcue gets rendered on top. When right clicking, the
+    // the hotcue rendered on top must be assigned to m_pHoveredMark to show
+    // the CueMenu. To accomplish this, m_marksToRender is iterated in reverse
+    // and the loop breaks as soon as m_pHoveredMark is set.
+    for (int i = m_marksToRender.size() - 1; i >= 0 ; --i) {
+        WaveformMarkPointer pMark = m_marksToRender.at(i);
+        int hoveredPosition;
+        if (m_orientation == Qt::Horizontal) {
+            hoveredPosition = e->x();
+        } else {
+            hoveredPosition = e->y();
+        }
+        bool lineHovered =
+            pMark->m_linePosition >= hoveredPosition - lineHoverPadding
+            && pMark->m_linePosition <= hoveredPosition + lineHoverPadding;
+
+        if (pMark->m_label.area().contains(e->pos()) || lineHovered) {
+            m_pHoveredMark = pMark;
+            break;
+        }
+    }
+
     //qDebug() << "WOverview::mouseMoveEvent" << e->pos() << m_iPos;
     update();
 }
 
 void WOverview::mouseReleaseEvent(QMouseEvent* e) {
     mouseMoveEvent(e);
-    double dValue = positionToValue(m_iPos);
     //qDebug() << "WOverview::mouseReleaseEvent" << e->pos() << m_iPos << ">>" << dValue;
 
-    setControlParameterUp(dValue);
-    m_bDrag = false;
+    if (e->button() == Qt::RightButton) {
+        m_bTimeRulerActive = false;
+    }
 }
 
 void WOverview::mousePressEvent(QMouseEvent* e) {
     //qDebug() << "WOverview::mousePressEvent" << e->pos();
     mouseMoveEvent(e);
-    m_bDrag = true;
+    if (m_pCurrentTrack == nullptr) {
+        return;
+    }
+
+    if (e->button() == Qt::LeftButton) {
+        if (m_orientation == Qt::Horizontal) {
+            m_iPos = math_clamp(e->x(), 0, width() - 1);
+        } else {
+            m_iPos = math_clamp(e->y(), 0, height() - 1);
+        }
+
+        double dValue = positionToValue(m_iPos);
+        if (m_pHoveredMark != nullptr) {
+            dValue = m_pHoveredMark->getSamplePosition() / m_trackSamplesControl->get();
+            m_iPos = valueToPosition(dValue);
+        }
+        setControlParameterUp(dValue);
+    } else if (e->button() == Qt::RightButton) {
+        if (m_pHoveredMark == nullptr) {
+            m_bTimeRulerActive = true;
+            m_timeRulerPos = e->pos();
+        } else if (m_pHoveredMark->getHotCue() != WaveformMark::kNoHotCue) {
+            // Currently the only way WaveformMarks can be associated
+            // with their respective Cue objects is by using the hotcue
+            // number. If cues without assigned hotcue are drawn on
+            // WOverview in the future, another way to associate
+            // WaveformMarks with Cues will need to be implemented.
+            CuePointer pHoveredCue;
+            QList<CuePointer> cueList = m_pCurrentTrack->getCuePoints();
+            for (const auto& pCue : cueList) {
+                if (pCue->getHotCue() == m_pHoveredMark->getHotCue()) {
+                    pHoveredCue = pCue;
+                    break;
+                }
+            }
+            if (pHoveredCue != nullptr) {
+                m_pCueMenu->setCue(pHoveredCue);
+                m_pCueMenu->setTrack(m_pCurrentTrack);
+                m_pCueMenu->popup(e->globalPos());
+                m_bHotcueMenuShowing = true;
+            }
+        }
+    }
+}
+
+void WOverview::slotCueMenuAboutToHide() {
+    m_bHotcueMenuShowing = false;
+    m_pHoveredMark.clear();
+    update();
+}
+
+void WOverview::leaveEvent(QEvent* e) {
+    Q_UNUSED(e);
+    if (!m_bHotcueMenuShowing) {
+        m_pHoveredMark.clear();
+    }
+    m_bTimeRulerActive = false;
+    update();
 }
 
 void WOverview::paintEvent(QPaintEvent * /*unused*/) {
@@ -364,6 +526,8 @@ void WOverview::paintEvent(QPaintEvent * /*unused*/) {
             drawRangeMarks(&painter, offset, gain);
             drawMarks(&painter, offset, gain);
             drawCurrentPosition(&painter);
+            drawTimeRuler(&painter);
+            drawMarkLabels(&painter, offset, gain);
         }
     }
 }
@@ -486,11 +650,11 @@ void WOverview::drawRangeMarks(QPainter* pPainter, const float& offset, const fl
 
         // Active mark ranges by definition have starts/ends that are not
         // disabled.
-        const double startValue = markRange.start();
-        const double endValue = markRange.end();
+        const qreal startValue = markRange.start();
+        const qreal endValue = markRange.end();
 
-        const float startPosition = offset + startValue * gain;
-        const float endPosition = offset + endValue * gain;
+        const qreal startPosition = offset + startValue * gain;
+        const qreal endPosition = offset + endValue * gain;
 
         if (startPosition < 0.0 && endPosition < 0.0) {
             continue;
@@ -516,124 +680,178 @@ void WOverview::drawRangeMarks(QPainter* pPainter, const float& offset, const fl
             pPainter->drawRect(QRectF(QPointF(-2.0, startPosition),
                     QPointF(width() + 1.0, endPosition)));
         }
-
-        // draw duration of range
-        if (markRange.showDuration()) {
-            // TODO: replace with rate_ratio in PR #1765
-            double rateRatio = 1.0 + m_pRateDirControl->get() * m_pRateRangeControl->get() * m_pRateSliderControl->get();
-            QString duration = mixxx::Duration::formatTime((endValue - startValue) / m_trackSampleRateControl->get() / mixxx::kEngineChannelCount / rateRatio);
-
-            QFontMetrics fm(pPainter->font());
-            int textWidth = fm.width(duration);
-            float padding = 3.0;
-            float x;
-
-            WaveformMarkRange::DurationTextLocation textLocation = markRange.durationTextLocation();
-            if (textLocation == WaveformMarkRange::DurationTextLocation::Before) {
-                x = startPosition - textWidth - padding;
-            } else {
-                x = endPosition + padding;
-            }
-
-            // Ensure the right end of the text does not get cut off by
-            // the end of the track
-            if (x + textWidth > width()) {
-                x = width() - textWidth;
-            }
-
-            pPainter->setOpacity(1.0);
-            pPainter->setPen(markRange.m_durationTextColor);
-            pPainter->drawText(QPointF(x, fm.ascent()), duration);
-        }
     }
 }
 
 void WOverview::drawMarks(QPainter* pPainter, const float offset, const float gain) {
     QFont markerFont = pPainter->font();
-    markerFont.setPixelSize(10 * m_scaleFactor);
+    markerFont.setPixelSize(m_iLabelFontSize * m_scaleFactor);
+    QFontMetricsF fontMetrics(markerFont);
+
+    // Text labels are rendered so they do not overlap with other WaveformMarks'
+    // labels. If the text would be too wide, it is elided. However, the user
+    // can hover the mouse cursor over a label to show the whole label text,
+    // temporarily hiding any following labels that would be drawn over it.
+    // This requires looping over the WaveformMarks twice and the marks must be
+    // sorted in the order they appear on the waveform.
+    // In the first loop, the lines are drawn and the text to render plus its
+    // location are calculated then stored in a WaveformMarkLabel. The text must
+    // be drawn in the second loop to prevent the lines of following
+    // WaveformMarks getting drawn over it. The second loop is in the separate
+    // drawMarkLabels function so it can be called after drawCurrentPosition so
+    // the view of labels is not obscured by the playhead.
+
+    bool markHovered = false;
+    for (int i = 0; i < m_marksToRender.size(); ++i) {
+        WaveformMarkPointer pMark = m_marksToRender.at(i);
+        PainterScope painterScope(pPainter);
 
-    QFont shadowFont = pPainter->font();
-    shadowFont.setWeight(99);
-    shadowFont.setPixelSize(10 * m_scaleFactor);
+        const qreal markPosition = math_clamp(
+                offset + m_marksToRender.at(i)->getSamplePosition() * gain,
+                0.0, static_cast<qreal>(width()));
+        pMark->m_linePosition = markPosition;
 
-    for (const auto& currentMark : m_marks) {
-        const WaveformMarkProperties& markProperties = currentMark->getProperties();
-        if (currentMark->isValid() && currentMark->getSamplePosition() >= 0.0) {
-            // Marks are visible by default.
-            if (currentMark->hasVisible() && !currentMark->isVisible()) {
-                continue;
+        QPen shadowPen(QBrush(pMark->borderColor()), 2.5 * m_scaleFactor);
+
+        QLineF line;
+        if (m_orientation == Qt::Horizontal) {
+            line.setLine(markPosition, 0.0, markPosition, height());
+        } else {
+            line.setLine(0.0, markPosition, width(), markPosition);
+        }
+        pPainter->setPen(shadowPen);
+        pPainter->drawLine(line);
+
+        pPainter->setPen(pMark->fillColor());
+        pPainter->drawLine(line);
+
+        if (!pMark->m_text.isEmpty()) {
+            Qt::Alignment halign = pMark->m_align & Qt::AlignHorizontal_Mask;
+            Qt::Alignment valign = pMark->m_align & Qt::AlignVertical_Mask;
+
+            QString text = pMark->m_text;
+
+            // Only allow the text to overlap the following mark if the mouse is
+            // hovering over it. Elide it if it would render over the next
+            // label, but do not elide it if the next mark's label is not at the
+            // same vertical position.
+            if (pMark != m_pHoveredMark && i < m_marksToRender.size()-1) {
+                float nextMarkPosition = -1.0;
+                for (int m = i + 1; m < m_marksToRender.size() - 1; ++m) {
+                    WaveformMarkPointer otherMark = m_marksToRender.at(m);
+                    bool otherAtSameHeight = valign == (otherMark->m_align & Qt::AlignVertical_Mask);
+                    // Hotcues always show at least their number.
+                    bool otherHasLabel = !otherMark->m_text.isEmpty()
+                            || otherMark->getHotCue() != WaveformMark::kNoHotCue;
+                    if (otherAtSameHeight && otherHasLabel) {
+                        nextMarkPosition = offset + otherMark->getSamplePosition() * gain;
+                        break;
+                    }
+                }
+                if (nextMarkPosition != -1.0) {
+                    text = fontMetrics.elidedText(text, Qt::ElideRight, nextMarkPosition - markPosition - 5);
+                }
+            }
+            // Sometimes QFontMetrics::elidedText turns the QString into just an
+            // elipsis character, so always show at least the hotcue number if
+            // the label does not fit.
+            if ((text.isEmpty() || text == "…")
+                && pMark->getHotCue() != WaveformMark::kNoHotCue) {
+                text = QString::number(pMark->getHotCue()+1);
             }
 
-            PainterScope painterScope(pPainter);
+            QRectF textRect = fontMetrics.boundingRect(text);
+            QPointF textPoint;
+            if (m_orientation == Qt::Horizontal) {
+                if (halign == Qt::AlignLeft) {
+                    textPoint.setX(markPosition - textRect.width() - 5.5);
+                } else if (halign == Qt::AlignHCenter) {
+                    textPoint.setX(markPosition - textRect.width() / 2);
+                } else { // AlignRight
+                    textPoint.setX(markPosition + 1.5);
+                }
 
-            //const float markPosition = 1.0 +
-            //        (currentMark.m_pointControl->get() / (float)m_trackSamplesControl->get()) * (float)(width()-2);
-            const float markPosition = offset + currentMark->getSamplePosition() * gain;
+                if (valign == Qt::AlignTop) {
+                    textPoint.setY(fontMetrics.height());
+                } else if (valign == Qt::AlignVCenter) {
+                    textPoint.setY((textRect.height() + height()) / 2);
+                } else { // AlignBottom
+                    textPoint.setY(float(height()) - 0.5f);
+                }
+            } else { // Vertical
+                if (halign == Qt::AlignLeft) {
+                    textPoint.setX(1.0f);
+                } else if (halign == Qt::AlignHCenter) {
+                    textPoint.setX((width() - textRect.width()) / 2);
+                } else { // AlignRight
+                    textPoint.setX(width() - textRect.width());
+                }
 
-            QPen shadowPen(QBrush(markProperties.borderColor()), 2.5 * m_scaleFactor);
+                if (valign == Qt::AlignTop) {
+                    textPoint.setY(markPosition - 1.0f);
+                } else if (valign == Qt::AlignVCenter) {
+                    textPoint.setY(markPosition + textRect.height() / 2);
+                } else { // AlignBottom
+                    textPoint.setY(markPosition + fontMetrics.ascent());
+                }
+            }
 
-            QLineF line;
-            if (m_orientation == Qt::Horizontal) {
-                line.setLine(markPosition, 0.0, markPosition, static_cast<float>(height()));
+            pMark->m_label.prerender(textPoint, QPixmap(), text,
+                    markerFont, m_labelTextColor, m_labelBackgroundColor,
+                    width(), getDevicePixelRatioF(this));
+        }
+
+        // Show cue position when hovered
+        // The area it will be drawn in needs to be calculated here
+        // before drawMarkLabels so drawMarkLabels can avoid drawing
+        // labels over the cue position.
+        // This can happen for example if the user shows the cue position
+        // of a hotcue which is near the intro end position because the
+        // intro_end_position WaveformMark label is drawn at the top.
+        // However, the drawing of this text needs to happen in
+        // drawMarkLabels so none of the WaveformMark lines are drawn
+        // on top of the position text.
+
+        // WaveformMark::m_align refers to the alignment of the label,
+        // so if the label is on bottom draw the position text on top and
+        // vice versa.
+        if (pMark == m_pHoveredMark) {
+            Qt::Alignment valign = pMark->m_align & Qt::AlignVertical_Mask;
+            QPointF positionTextPoint(markPosition + 1.5, 0);
+            if (valign == Qt::AlignTop) {
+                positionTextPoint.setY(float(height()) - 0.5f);
             } else {
-                line.setLine(0.0, markPosition, static_cast<float>(width()), markPosition);
+                positionTextPoint.setY(fontMetrics.height());
             }
-            pPainter->setPen(shadowPen);
-            pPainter->drawLine(line);
-
-            pPainter->setPen(markProperties.fillColor());
-            pPainter->drawLine(line);
-
-            if (!markProperties.m_text.isEmpty()) {
-                Qt::Alignment halign = markProperties.m_align & Qt::AlignHorizontal_Mask;
-                Qt::Alignment valign = markProperties.m_align & Qt::AlignVertical_Mask;
-                QFontMetricsF metric(markerFont);
-                QRectF textRect = metric.tightBoundingRect(markProperties.m_text);
-                QPointF textPoint;
-                if (m_orientation == Qt::Horizontal) {
-                    if (halign == Qt::AlignLeft) {
-                        textPoint.setX(markPosition - textRect.width());
-                    } else if (halign == Qt::AlignHCenter) {
-                        textPoint.setX(markPosition - textRect.width() / 2);
-                    } else { // AlignRight
-                        textPoint.setX(markPosition + 0.5f);
-                    }
 
-                    if (valign == Qt::AlignTop) {
-                        textPoint.setY(textRect.height() + 0.5f);
-                    } else if (valign == Qt::AlignVCenter) {
-                        textPoint.setY((textRect.height() + height()) / 2);
-                    } else { // AlignBottom
-                        textPoint.setY(float(height()) - 0.5f);
-                    }
-                } else { // Vertical
-                    if (halign == Qt::AlignLeft) {
-                        textPoint.setX(1.0f);
-                    } else if (halign == Qt::AlignHCenter) {
-                        textPoint.setX((width() - textRect.width()) / 2);
-                    } else { // AlignRight
-                        textPoint.setX(width() - textRect.width());
-                    }
-
-                    if (valign == Qt::AlignTop) {
-                        textPoint.setY(markPosition - 1.0f);
-                    } else if (valign == Qt::AlignVCenter) {
-                        textPoint.setY(markPosition + textRect.height() / 2);
-                    } else { // AlignBottom
-                        textPoint.setY(markPosition + metric.ascent());
-                    }
-                }
+            double markSamples = pMark->getSamplePosition();
+            double trackSamples = m_trackSamplesControl->get();
+            double currentPositionSamples = m_playpositionControl->get() * trackSamples;
+            double markTime = samplePositionToSeconds(markSamples);
+            double markTimeRemaining = samplePositionToSeconds(trackSamples - markSamples);
+            double markTimeDistance = samplePositionToSeconds(markSamples - currentPositionSamples);
+            QString cuePositionText = mixxx::Duration::formatTime(markTime) + " -" +
+                    mixxx::Duration::formatTime(markTimeRemaining);
+            QString cueTimeDistanceText = mixxx::Duration::formatTime(fabs(markTimeDistance));
+            // Cast to int to avoid confusingly switching from -0:00 to 0:00 as
+            // the playhead passes the cue
+            if (static_cast<int>(markTimeDistance) < 0) {
+                cueTimeDistanceText = "-" + cueTimeDistanceText;
+            }
 
-                pPainter->setPen(shadowPen);
-                pPainter->setFont(shadowFont);
-                pPainter->drawText(textPoint, markProperties.m_text);
+            m_cuePositionLabel.prerender(positionTextPoint, QPixmap(), cuePositionText,
+                    markerFont, m_labelTextColor, m_labelBackgroundColor, width(), getDevicePixelRatioF(this));
 
-                pPainter->setPen(markProperties.m_textColor);
-                pPainter->setFont(markerFont);
-                pPainter->drawText(textPoint, markProperties.m_text);
-            }
+            QPointF timeDistancePoint(positionTextPoint.x(), (fontMetrics.height() + height()) / 2);
+            m_cueTimeDistanceLabel.prerender(timeDistancePoint, QPixmap(), cueTimeDistanceText,
+                    markerFont, m_labelTextColor, m_labelBackgroundColor, width(), getDevicePixelRatioF(this));
+            markHovered = true;
         }
     }
+    if (!markHovered) {
+        m_cuePositionLabel.clear();
+        m_cueTimeDistanceLabel.clear();
+    }
 }
 
 void WOverview::drawCurrentPosition(QPainter* pPainter) {
@@ -661,6 +879,146 @@ void WOverview::drawCurrentPosition(QPainter* pPainter) {
     pPainter->drawLine(m_iPos - 2, breadth() - 1, m_iPos + 2, breadth() - 1);
 }
 
+void WOverview::drawTimeRuler(QPainter* pPainter) {
+    QFont markerFont = pPainter->font();
+    markerFont.setPixelSize(m_iLabelFontSize * m_scaleFactor);
+    QFontMetricsF fontMetrics(markerFont);
+
+    QFont shadowFont = pPainter->font();
+    shadowFont.setWeight(99);
+    shadowFont.setPixelSize(m_iLabelFontSize * m_scaleFactor);
+    QPen shadowPen(Qt::black, 2.5 * m_scaleFactor);
+
+    if (m_bTimeRulerActive) {
+        QLineF line;
+        if (m_orientation == Qt::Horizontal) {
+            line.setLine(m_timeRulerPos.x(), 0.0, m_timeRulerPos.x(), height());
+        } else {
+            line.setLine(0.0, m_timeRulerPos.x(), width(), m_timeRulerPos.x());
+        }
+        pPainter->setPen(shadowPen);
+        pPainter->drawLine(line);
+
+        pPainter->setPen(Qt::green);
+        pPainter->drawLine(line);
+
+        QPointF textPoint = m_timeRulerPos;
+        QPointF textPointDistance = m_timeRulerPos;
+        qreal widgetPositionFraction;
+        qreal padding = 1.0; // spacing between line and text
+        if (m_orientation == Qt::Horizontal) {
+            textPoint = QPointF(textPoint.x() + padding, fontMetrics.height());
+            textPointDistance = QPointF(textPointDistance.x() + padding,
+                    (fontMetrics.height() + height()) / 2);
+            widgetPositionFraction = m_timeRulerPos.x() / width();
+        } else {
+            textPoint.setX(0);
+            textPointDistance.setX(0);
+            widgetPositionFraction = m_timeRulerPos.y() / height();
+        }
+        qreal trackSamples = m_trackSamplesControl->get();
+        qreal timePosition = samplePositionToSeconds(
+                widgetPositionFraction * trackSamples);
+        qreal timePositionTillEnd = samplePositionToSeconds(
+                (1 - widgetPositionFraction) * trackSamples);
+        qreal timeDistance = samplePositionToSeconds(
+                (widgetPositionFraction - m_playpositionControl->get()) * trackSamples);
+
+        QString timeText = mixxx::Duration::formatTime(timePosition)
+                + " -" + mixxx::Duration::formatTime(timePositionTillEnd);
+
+        m_timeRulerPositionLabel.prerender(textPoint, QPixmap(), timeText,
+                markerFont, m_labelTextColor, m_labelBackgroundColor, width(), getDevicePixelRatioF(this));
+        m_timeRulerPositionLabel.draw(pPainter);
+
+        QString timeDistanceText = mixxx::Duration::formatTime(fabs(timeDistance));
+        // Cast to int to avoid confusingly switching from -0:00 to 0:00 as
+        // the playhead passes the point
+        if (static_cast<int>(timeDistance) < 0) {
+            timeDistanceText = "-" + timeDistanceText;
+        }
+        m_timeRulerDistanceLabel.prerender(textPointDistance, QPixmap(), timeDistanceText,
+                markerFont, m_labelTextColor, m_labelBackgroundColor, width(), getDevicePixelRatioF(this));
+        m_timeRulerDistanceLabel.draw(pPainter);
+    } else {
+        m_timeRulerPositionLabel.clear();
+        m_timeRulerDistanceLabel.clear();
+    }
+}
+
+void WOverview::drawMarkLabels(QPainter* pPainter, const float offset, const float gain) {
+    QFont markerFont = pPainter->font();
+    markerFont.setPixelSize(m_iLabelFontSize * m_scaleFactor);
+    QFontMetricsF fontMetrics(markerFont);
+
+    // Draw WaveformMark labels
+    for (const auto& pMark : m_marksToRender) {
+        if (m_pHoveredMark != nullptr && pMark != m_pHoveredMark) {
+            if (pMark->m_label.intersects(m_pHoveredMark->m_label)) {
+                continue;
+            }
+        }
+        if (m_bShowCueTimes &&
+                (pMark->m_label.intersects(m_cuePositionLabel)
+                || pMark->m_label.intersects(m_cueTimeDistanceLabel))) {
+            continue;
+        }
+        if (pMark->m_label.intersects(m_timeRulerPositionLabel)
+                || pMark->m_label.intersects(m_timeRulerDistanceLabel)) {
+            continue;
+        }
+
+        pMark->m_label.draw(pPainter);
+    }
+
+    if (m_bShowCueTimes) {
+        m_cuePositionLabel.draw(pPainter);
+        m_cueTimeDistanceLabel.draw(pPainter);
+    }
+
+    // draw duration of WaveformMarkRanges
+    for (auto&& markRange : m_markRanges) {
+        if (markRange.showDuration() && markRange.active() && markRange.visible()) {
+            // Active mark ranges by definition have starts/ends that are not
+            // disabled.
+            const qreal startValue = markRange.start();
+            const qreal endValue = markRange.end();
+
+            const qreal startPosition = offset + startValue * gain;
+            const qreal endPosition = offset + endValue * gain;
+
+            if (startPosition < 0.0 && endPosition < 0.0) {
+                continue;
+            }
+            QString duration = mixxx::Duration::formatTime(
+                    samplePositionToSeconds(endValue - startValue));
+
+            QRectF durationRect = fontMetrics.boundingRect(duration);
+            qreal x;
+
+            WaveformMarkRange::DurationTextLocation textLocation = markRange.durationTextLocation();
+            if (textLocation == WaveformMarkRange::DurationTextLocation::Before) {
+                x = startPosition - durationRect.width() - 5.5;
+            } else {
+                x = endPosition + 1.5;
+            }
+
+            QPointF durationBottomLeft(x, fontMetrics.height());
+
+            markRange.m_durationLabel.prerender(durationBottomLeft, QPixmap(),
+                    duration, markerFont, m_labelTextColor,
+                    m_labelBackgroundColor, width(), getDevicePixelRatioF(this));
+
+            if (!(markRange.m_durationLabel.intersects(m_cuePositionLabel)
+                      || markRange.m_durationLabel.intersects(m_cueTimeDistanceLabel)
+                      || markRange.m_durationLabel.intersects(m_timeRulerPositionLabel)
+                      || markRange.m_durationLabel.intersects(m_timeRulerDistanceLabel))) {
+                markRange.m_durationLabel.draw(pPainter);
+            }
+        }
+    }
+}
+
 void WOverview::paintText(const QString& text, QPainter* pPainter) {
     PainterScope painterScope(pPainter);
     QColor lowColor = m_signalColors.getLowColor();
@@ -688,6 +1046,14 @@ void WOverview::paintText(const QString& text, QPainter* pPainter) {
     pPainter->resetTransform();
 }
 
+double WOverview::samplePositionToSeconds(double sample) {
+    // TODO: replace with rate_ratio in PR #1765
+    double rateRatio = 1.0 + m_pRateDirControl->get()
+            * m_pRateRangeControl->get() * m_pRateSliderControl->get();
+    return sample / m_trackSampleRateControl->get()
+            / mixxx::kEngineChannelCount / rateRatio;
+}
+
 void WOverview::resizeEvent(QResizeEvent * /*unused*/) {
     // Play-position potmeters range from 0 to 1 but they allow out-of-range
     // sets. This is to give VC access to the pre-roll area.
diff --git a/src/widget/woverview.h b/src/widget/woverview.h
index bae516ed550..9df3e48829b 100644
--- a/src/widget/woverview.h
+++ b/src/widget/woverview.h
@@ -19,6 +19,7 @@
 #include <QList>
 
 #include "track/track.h"
+#include "widget/cuemenu.h"
 #include "widget/trackdroptarget.h"
 #include "widget/wwidget.h"
 #include "analyzer/analyzerprogress.h"
@@ -59,6 +60,7 @@ class WOverview : public WWidget, public TrackDropTarget {
     void mouseMoveEvent(QMouseEvent *e) override;
     void mouseReleaseEvent(QMouseEvent *e) override;
     void mousePressEvent(QMouseEvent *e) override;
+    void leaveEvent(QEvent* event) override;
     void paintEvent(QPaintEvent * /*unused*/) override;
     void resizeEvent(QResizeEvent * /*unused*/) override;
     void dragEnterEvent(QDragEnterEvent* event) override;
@@ -99,6 +101,8 @@ class WOverview : public WWidget, public TrackDropTarget {
     void receiveCuesUpdated();
 
     void slotWaveformSummaryUpdated();
+    void slotCueMenuAboutToHide();
+
 
   private:
     // Append the waveform overview pixmap according to available data
@@ -112,7 +116,10 @@ class WOverview : public WWidget, public TrackDropTarget {
     void drawRangeMarks(QPainter* pPainter, const float& offset, const float& gain);
     void drawMarks(QPainter* pPainter, const float offset, const float gain);
     void drawCurrentPosition(QPainter* pPainter);
+    void drawTimeRuler(QPainter* pPainter);
+    void drawMarkLabels(QPainter* pPainter, const float offset, const float gain);
     void paintText(const QString& text, QPainter* pPainter);
+    double samplePositionToSeconds(double sample);
     inline int valueToPosition(double value) const {
         return static_cast<int>(m_a * value - m_b);
     }
@@ -131,26 +138,44 @@ class WOverview : public WWidget, public TrackDropTarget {
     ControlProxy* m_pRateSliderControl;
     ControlProxy* m_trackSampleRateControl;
     ControlProxy* m_trackSamplesControl;
+    ControlProxy* m_playpositionControl;
 
     // Current active track
     TrackPointer m_pCurrentTrack;
     ConstWaveformPointer m_pWaveform;
 
-    // True if slider is dragged. Only used when m_bEventWhileDrag is false
-    bool m_bDrag;
+    std::unique_ptr<CueMenu> m_pCueMenu;
+    bool m_bShowCueTimes;
+
+    int m_iPosSeconds;
     // Internal storage of slider position in pixels
     int m_iPos;
 
+    WaveformMarkPointer m_pHoveredMark;
+    bool m_bHotcueMenuShowing;
+    bool m_bTimeRulerActive;
+    QPointF m_timeRulerPos;
+    WaveformMarkLabel m_timeRulerPositionLabel;
+    WaveformMarkLabel m_timeRulerDistanceLabel;
+
     Qt::Orientation m_orientation;
 
     QPixmap m_backgroundPixmap;
     QString m_backgroundPixmapPath;
     QColor m_qColorBackground;
+    int m_iLabelFontSize;
+    QColor m_labelTextColor;
+    QColor m_labelBackgroundColor;
     QColor m_endOfTrackColor;
 
     PredefinedColorsRepresentation m_predefinedColorsRepresentation;
+    // All WaveformMarks
     WaveformMarkSet m_marks;
+    // List of visible WaveformMarks sorted by the order they appear in the track
+    QList<WaveformMarkPointer> m_marksToRender;
     std::vector<WaveformMarkRange> m_markRanges;
+    WaveformMarkLabel m_cuePositionLabel;
+    WaveformMarkLabel m_cueTimeDistanceLabel;
 
     // Coefficient value-position linear transposition
     double m_a;