From 888c91ae07ac3bfb087cd5363a34fe94a212a861 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Wed, 1 Nov 2017 13:56:53 +0100
Subject: [PATCH 1/7] fix button grid in deck overview row

---
 res/skins/Deere/deck_overview_row.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/res/skins/Deere/deck_overview_row.xml b/res/skins/Deere/deck_overview_row.xml
index 7441cf6c1eb..2e18abbb55a 100644
--- a/res/skins/Deere/deck_overview_row.xml
+++ b/res/skins/Deere/deck_overview_row.xml
@@ -14,6 +14,7 @@
     <MaximumSize>-1,80</MaximumSize>
     <Children>
       <WidgetGroup>
+        <ObjectName>ButtonGrid</ObjectName>
         <Layout>vertical</Layout>
         <Children>
           <WidgetGroup>

From 483855eb91cacd0eb42e9360c3c499870d1cd8d4 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Sun, 12 Nov 2017 13:32:31 +0100
Subject: [PATCH 2/7] fix some layout issues in deck controls & deck overview

---
 res/skins/Deere/beatjump.xml          |  1 +
 res/skins/Deere/deck_controls_row.xml | 92 +++++++++++++--------------
 res/skins/Deere/loop.xml              |  3 +-
 res/skins/Deere/style.qss             | 10 +--
 4 files changed, 49 insertions(+), 57 deletions(-)

diff --git a/res/skins/Deere/beatjump.xml b/res/skins/Deere/beatjump.xml
index 6c72a093a68..11bb51b8343 100644
--- a/res/skins/Deere/beatjump.xml
+++ b/res/skins/Deere/beatjump.xml
@@ -8,6 +8,7 @@
 <Template>
   <WidgetGroup>
     <Layout>vertical</Layout>
+    <SizePolicy>f,min</SizePolicy>
     <Children>
 
       <BeatSpinBox>
diff --git a/res/skins/Deere/deck_controls_row.xml b/res/skins/Deere/deck_controls_row.xml
index 67215b73206..f9c3fe7fa08 100644
--- a/res/skins/Deere/deck_controls_row.xml
+++ b/res/skins/Deere/deck_controls_row.xml
@@ -9,62 +9,56 @@
   <WidgetGroup>
     <ObjectName>ControlsRow</ObjectName>
     <Layout>horizontal</Layout>
+    <MinimumSize>-1,47</MinimumSize>
     <SizePolicy>me,min</SizePolicy>
     <Children>
+      <Template src="skin:hotcue.xml"/>
+      <!-- Expanding spacers in between control contexts -->
+      <WidgetGroup><Size>3me,1min</Size><Children/></WidgetGroup>
+      <Template src="skin:loop.xml"/>
+      <WidgetGroup><Size>3me,1min</Size><Children/></WidgetGroup>
+      <Template src="skin:beatjump.xml"/>
+      <WidgetGroup><Size>3me,1min</Size><Children/></WidgetGroup>
+
       <WidgetGroup>
-        <ObjectName>FullControlsRow</ObjectName>
-        <Layout>horizontal</Layout>
-        <SizePolicy>me,min</SizePolicy>
+        <Layout>vertical</Layout>
+        <MinimumSize>40,42</MinimumSize>
+        <MaximumSize>60, -1</MaximumSize>
+        <SizePolicy>me,me</SizePolicy>
         <Children>
-          <Template src="skin:hotcue.xml"/>
-          <!-- Expanding spacers in between control contexts -->
-          <WidgetGroup><Size>-1me,1min</Size><Children/></WidgetGroup>
-          <Template src="skin:loop.xml"/>
-          <WidgetGroup><Size>-1me,1min</Size><Children/></WidgetGroup>
-          <Template src="skin:beatjump.xml"/>
-          <WidgetGroup><Size>-1me,1min</Size><Children/></WidgetGroup>
-
-          <WidgetGroup>
-            <Layout>vertical</Layout>
-            <MinimumSize>40,42</MinimumSize>
-            <MaximumSize>60, -1</MaximumSize>
-            <SizePolicy>me,me</SizePolicy>
-            <Children>
 
-              <Template src="skin:left_right_display_2state_button.xml">
-                <SetVariable name="TooltipId">cue_default_cue_gotoandstop</SetVariable>
-                <SetVariable name="ObjectName">DeckCue</SetVariable>
-                <SetVariable name="MinimumSize"><Variable name="HorizontalStretchButtonMinimumSize"/></SetVariable>
-                <SetVariable name="MaximumSize"><Variable name="HorizontalStretchButtonMaximumSize"/></SetVariable>
-                <SetVariable name="SizePolicy"><Variable name="HorizontalStretchButtonSizePolicy"/></SetVariable>
-                <SetVariable name="LeftClickIsPushButton">true</SetVariable>
-                <SetVariable name="RightClickIsPushButton">true</SetVariable>
-                <SetVariable name="state_0_text">CUE</SetVariable>
-                <SetVariable name="state_1_text">CUE</SetVariable>
-                <SetVariable name="left_connection_control"><Variable name="group"/>,cue_default</SetVariable>
-                <SetVariable name="right_connection_control"><Variable name="group"/>,cue_gotoandstop</SetVariable>
-                <SetVariable name="display_connection_control"><Variable name="group"/>,cue_indicator</SetVariable>
-              </Template>
+          <Template src="skin:left_right_display_2state_button.xml">
+            <SetVariable name="TooltipId">cue_default_cue_gotoandstop</SetVariable>
+            <SetVariable name="ObjectName">DeckCue</SetVariable>
+            <SetVariable name="MinimumSize"><Variable name="HorizontalStretchButtonMinimumSize"/></SetVariable>
+            <SetVariable name="MaximumSize"><Variable name="HorizontalStretchButtonMaximumSize"/></SetVariable>
+            <SetVariable name="SizePolicy"><Variable name="HorizontalStretchButtonSizePolicy"/></SetVariable>
+            <SetVariable name="LeftClickIsPushButton">true</SetVariable>
+            <SetVariable name="RightClickIsPushButton">true</SetVariable>
+            <SetVariable name="state_0_text">CUE</SetVariable>
+            <SetVariable name="state_1_text">CUE</SetVariable>
+            <SetVariable name="left_connection_control"><Variable name="group"/>,cue_default</SetVariable>
+            <SetVariable name="right_connection_control"><Variable name="group"/>,cue_gotoandstop</SetVariable>
+            <SetVariable name="display_connection_control"><Variable name="group"/>,cue_indicator</SetVariable>
+          </Template>
 
-              <!-- Workaround for layout spacing -->
-              <Template src="skin:spacer_vx.xml">
-                <SetVariable name="height">2</SetVariable>
-              </Template>
+          <!-- Workaround for layout spacing -->
+          <Template src="skin:spacer_vx.xml">
+            <SetVariable name="height">2</SetVariable>
+          </Template>
 
-              <Template src="skin:left_right_display_2state_button.xml">
-                <SetVariable name="TooltipId">play_cue_set</SetVariable>
-                <SetVariable name="ObjectName">PlayToggle</SetVariable>
-                <SetVariable name="MinimumSize"><Variable name="HorizontalStretchButtonMinimumSize"/></SetVariable>
-                <SetVariable name="MaximumSize"><Variable name="HorizontalStretchButtonMaximumSize"/></SetVariable>
-                <SetVariable name="SizePolicy"><Variable name="HorizontalStretchButtonSizePolicy"/></SetVariable>
-                <SetVariable name="LeftClickIsPushButton">false</SetVariable>
-                <SetVariable name="RightClickIsPushButton">false</SetVariable>
-                <SetVariable name="left_connection_control"><Variable name="group"/>,play</SetVariable>
-                <SetVariable name="right_connection_control"><Variable name="group"/>,cue_set</SetVariable>
-                <SetVariable name="display_connection_control"><Variable name="group"/>,play_indicator</SetVariable>
-              </Template>
-            </Children>
-          </WidgetGroup>
+          <Template src="skin:left_right_display_2state_button.xml">
+            <SetVariable name="TooltipId">play_cue_set</SetVariable>
+            <SetVariable name="ObjectName">PlayToggle</SetVariable>
+            <SetVariable name="MinimumSize"><Variable name="HorizontalStretchButtonMinimumSize"/></SetVariable>
+            <SetVariable name="MaximumSize"><Variable name="HorizontalStretchButtonMaximumSize"/></SetVariable>
+            <SetVariable name="SizePolicy"><Variable name="HorizontalStretchButtonSizePolicy"/></SetVariable>
+            <SetVariable name="LeftClickIsPushButton">false</SetVariable>
+            <SetVariable name="RightClickIsPushButton">false</SetVariable>
+            <SetVariable name="left_connection_control"><Variable name="group"/>,play</SetVariable>
+            <SetVariable name="right_connection_control"><Variable name="group"/>,cue_set</SetVariable>
+            <SetVariable name="display_connection_control"><Variable name="group"/>,play_indicator</SetVariable>
+          </Template>
         </Children>
       </WidgetGroup>
     </Children>
diff --git a/res/skins/Deere/loop.xml b/res/skins/Deere/loop.xml
index 7a6164fe16a..98071ace2a1 100644
--- a/res/skins/Deere/loop.xml
+++ b/res/skins/Deere/loop.xml
@@ -9,6 +9,7 @@
   <WidgetGroup>
     <ObjectName>LoopContainer</ObjectName>
     <Layout>vertical</Layout>
+    <SizePolicy>f,min</SizePolicy>
     <Children>
 
       <WidgetGroup><!-- SpinBox + loop_activate -->
@@ -92,7 +93,7 @@
 
           <!-- Workaround for layout spacing -->
           <Template src="skin:spacer_hx.xml">
-            <SetVariable name="width">9f,</SetVariable>
+            <SetVariable name="width">8f,</SetVariable>
           </Template>
 
           <Template src="skin:left_right_display_2state_button.xml">
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index 5009f22dccb..1d55cec0312 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -66,12 +66,13 @@
   border-top: 1px solid #222;
   background-color: transparent;
   margin: 0;
-  padding: 0 4px 0 0;
+  padding: 0 3px 0 0;
 }
 
 #ControlsRow {
   border-top: 1px solid #222;
-  padding: 4px;
+  padding: 3px;
+  qproperty-layoutAlignment: 'AlignBottom';
 }
 
 #MixerBorder {
@@ -682,11 +683,6 @@ WWidget, QLabel {
 
 /* Start spacing for Deck controls row (transport, beatgrid, looping, hotcue, vinylcontrol) */
 
-#FullControlsRow {
-  qproperty-layoutSpacing: 3;
-  qproperty-layoutAlignment: 'AlignBottom';
-}
-
 #HotcueGrid, #HotcueGridExtended,
 #VinylControlsContainer {
   background-color: #333333;

From aab96cd340da846c7b55b5c8d11c2402fc06aa02 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Sun, 12 Nov 2017 13:41:06 +0100
Subject: [PATCH 3/7] fix minimum skin size

---
 res/skins/Deere/skin.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/skins/Deere/skin.xml b/res/skins/Deere/skin.xml
index a4209ab3db6..37ea6fb1d4d 100644
--- a/res/skins/Deere/skin.xml
+++ b/res/skins/Deere/skin.xml
@@ -45,7 +45,7 @@
   <ObjectName>Mixxx</ObjectName>
   <Style src="skin:style.qss"/>
 
-  <Size>1024me,550me</Size>
+  <MinimumSize>1008,550</MinimumSize>
   <Layout>horizontal</Layout>
 
   <Children>

From 3ae6a97a32cc43a7d8b219ba6415c8a6b23b74fc Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Sun, 12 Nov 2017 13:48:36 +0100
Subject: [PATCH 4/7] simplify container bg colors

---
 res/skins/Deere/style.qss | 53 +++++++++------------------------------
 1 file changed, 12 insertions(+), 41 deletions(-)

diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index 1d55cec0312..708ac2528d5 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -424,9 +424,7 @@ WLibrary QRadioButton::indicator:unchecked {
   margin: 9px 3px 6px 3px;
   padding: 4px;
   color: #D2D2D2;
-  background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0,
-                                    stop: 0 #4B4B4B,
-                                    stop: 1 #4B4B4B);
+  background-color: #4B4B4B;
   border: 1px solid #4B4B4B;
   border-radius: 2px;
   outline: none;
@@ -441,10 +439,7 @@ WLibrary QRadioButton::indicator:unchecked {
   margin: 9px 3px 6px 3px;
   padding: 4px;
   color: #808080; /* Default #A3A3A3 -90L HSL*/
-  background-color: qlineargradient(spread:pad,
-                                    x1:0, y1:0, x2:1, y2:0,
-                                    stop:0 rgba(95, 95, 95, 127),
-                                    stop:1 rgba(95, 95, 95, 127));
+  background-color: rgba(95, 95, 95, 127);
                                     /* 50% #5F5F5F = RGBA#5F5F5F7F */
   border: 0px solid #5F5F5F;
   border-radius: 2px;
@@ -459,9 +454,7 @@ WLibrary QRadioButton::indicator:unchecked {
   margin: 9px 3px 6px 3px;
   padding: 4px;
   color: #D2D2D2;
-  background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0,
-                                    stop: 0 #5F5F5F,
-                                    stop: 1 #5F5F5F);
+  background-color: #5F5F5F;
   border: 0px solid #5F5F5F;
   border-radius: 2px;
   outline: none;
@@ -474,9 +467,7 @@ WLibrary QRadioButton::indicator:unchecked {
   margin: 9px 3px 6px 3px;
   padding: 4px;
   color: #FDFDFD;
-  background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0,
-                                    stop: 0 #006596,
-                                    stop: 1 #006596);
+  background-color: #006596;
   border: 0px solid #006596;
   border-radius: 2px;
   outline: none;
@@ -489,9 +480,7 @@ WLibrary QRadioButton::indicator:unchecked {
   margin: 9px 3px 6px 3px;
   padding: 4px;
   color: #FDFDFD;
-  background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0,
-                                    stop: 0 #0080BE,
-                                    stop: 1 #0080BE);
+  background-color: #0080BE;
   border: 0px solid #0080BE;
   border-radius: 2px;
   outline: none;
@@ -505,9 +494,7 @@ WLibrary QRadioButton::indicator:unchecked {
   margin: 9px 3px 6px 3px;
   padding: 4px;
   color: #FDFDFD;
-  background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0,
-                                    stop: 0 #006596,
-                                    stop: 1 #006596);
+  background-color: #006596;
   border: 0px solid #006596;
   border-radius: 2px;
   outline: none;
@@ -1041,27 +1028,15 @@ WEffectSelector {
 }
 
 #MainDecks, #MainDeckContainer {
-  background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-                                    stop: 0 #333333,
-                                    stop: 1.0 #333333);
+  background-color: #333333;
 }
 
 #LeftGutter, #RightGutter {
-  background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-                                    stop: 0 #222222,
-                                    stop: 1.0 #222222);
-}
-
-#Deck1, #Deck2 {
-  background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-                                    stop: 0 #333333,
-                                    stop: 1.0 #333333);
+  background-color: #222222;
 }
 
-#Deck3, #Deck4 {
-  background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
-                                    stop: 0 #333333,
-                                    stop: 1.0 #333333);
+#Deck1, #Deck2, #Deck3, #Deck4 {
+  background-color: #333333;
 }
 
 WWidget, WLabel {
@@ -1634,9 +1609,7 @@ WRecordingDuration {
 
 #SampleDeckToggle[value="1"], #LibraryToggle[value="1"], #EffectRackToggle[value="1"] {
     color: #D2D2D2;
-    background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0,
-                                      stop: 0 #4B4B4B,
-                                      stop: 1 #4B4B4B);
+    background-color: #4B4B4B;
     border: 1px solid #4B4B4B;
     border-radius: 2px;
     outline: none;
@@ -1644,9 +1617,7 @@ WRecordingDuration {
 
 #SampleDeckToggle[value="1"]:hover, #LibraryToggle[value="1"]:hover, #EffectRackToggle[value="1"]:hover {
     color: #D2D2D2;
-    background-color: qlineargradient(x1: 0, y1: 1, x2: 0, y2: 0,
-                                      stop: 0 #5F5F5F,
-                                      stop: 1 #5F5F5F);
+    background-color: #5F5F5F;
     border: 0px solid #5F5F5F;
 }
 

From 1aa3f214c0c1c361bc268f6d7649369ad7abdbc0 Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Sun, 12 Nov 2017 15:13:55 +0100
Subject: [PATCH 5/7] fix colors for selected library row

---
 res/skins/Deere/style.qss | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index 708ac2528d5..5bf7992aadf 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -177,6 +177,14 @@ QTableView {
   gridline-color: red;
 }
 
+/* Colors aren't applied to selected items, define them manually */
+QTableView::item:selected,
+QTreeView::item:selected,
+#LibraryBPMButton::item:selected {
+  color: #D6D6D6;
+  background-color: #006596;
+}
+
 /* checkbox in library "Played" column */
 QTableView::indicator {
   width: 12px;

From 13d315c4003ba8734372abbfedb7266cd5c0f26d Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Sun, 12 Nov 2017 21:58:07 +0100
Subject: [PATCH 6/7] define colors for library Preview button

---
 res/skins/Deere/style.qss | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index 5bf7992aadf..b7bbefc60c2 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -180,7 +180,10 @@ QTableView {
 /* Colors aren't applied to selected items, define them manually */
 QTableView::item:selected,
 QTreeView::item:selected,
-#LibraryBPMButton::item:selected {
+#LibraryBPMButton::item:selected,
+QTreeView::branch:selected,
+/* This won't style the Preview button */
+#LibraryPreviewButton::item:selected {
   color: #D6D6D6;
   background-color: #006596;
 }
@@ -212,16 +215,17 @@ QTableView::indicator:unchecked {
 QPushButton#LibraryPreviewButton {
   width: 23px;
   height: 12px;
-  background: transparent;
   border: none;
 }
 
 QPushButton#LibraryPreviewButton:!checked {
   image: url(skin:/image/style_library_preview_play.png);
+  background-color: #1A1A1A;
 }
 
 QPushButton#LibraryPreviewButton:checked {
   image: url(skin:/image/style_library_preview_pause.png);
+  background-color: #006596;
 }
 
 /* library header row */

From 7fb87ecc135e883a1c4e39fe29c26bb30848fc3f Mon Sep 17 00:00:00 2001
From: ronso0 <medontknow@web.de>
Date: Mon, 13 Nov 2017 18:34:07 +0100
Subject: [PATCH 7/7] simplify skin.xml to minimize flickering when togling
 stacked waveforms

---
 res/skins/Deere/library.xml    | 304 ++++++++++++++++-----------------
 res/skins/Deere/main_decks.xml |   2 +-
 res/skins/Deere/skin.xml       | 146 +++++++---------
 res/skins/Deere/style.qss      |   7 +-
 4 files changed, 213 insertions(+), 246 deletions(-)

diff --git a/res/skins/Deere/library.xml b/res/skins/Deere/library.xml
index b06a7659e8b..ec9e5b96276 100644
--- a/res/skins/Deere/library.xml
+++ b/res/skins/Deere/library.xml
@@ -1,191 +1,185 @@
 <!DOCTYPE template>
 <!--
   Description:
-    Library widget (both collapsed and expanded).
+    Library widget.
 -->
 <Template>
-  <WidgetStack>
+  <WidgetGroup>
     <ObjectName>LibraryContainer</ObjectName>
-    <!-- Fixed is interesting here. Ignore is the only thing that lets it shrink
-         to nothing. -->
+    <Layout>vertical</Layout>
+    <!-- 'Ignore' is the only thing that lets it
+          shrink to nothing. -->
     <SizePolicy>me,i</SizePolicy>
-    <MinimumSize>0,0</MinimumSize>
     <Children>
-      <!-- Main Library -->
-      <WidgetGroup trigger="[Library],show_library">
-        <ObjectName>LibraryExpanded</ObjectName>
-        <Layout>vertical</Layout>
-        <!-- Fixed is interesting here. Ignore is the only thing that lets it
-             shrink to nothing. -->
-        <SizePolicy>me,f</SizePolicy>
-        <MinimumSize>0,0</MinimumSize>
+      <!-- QSplitter between LibrarySidebar and Library -->
+      <Splitter>
+        <ObjectName>LibrarySplitter</ObjectName>
+        <Orientation>horizontal</Orientation>
+        <SizePolicy>me,me</SizePolicy>
+        <SplitSizesConfigKey>[Deere],LibrarySidebarSplitSize</SplitSizesConfigKey>
+        <SplitSizes>2,8</SplitSizes>
         <Children>
-          <!-- QSplitter between LibrarySidebar and Library -->
-          <Splitter>
-            <ObjectName>LibrarySplitter</ObjectName>
-            <Orientation>horizontal</Orientation>
-            <SizePolicy>me,me</SizePolicy>
-            <SplitSizesConfigKey>[Deere],LibrarySidebarSplitSize</SplitSizesConfigKey>
-            <SplitSizes>2,8</SplitSizes>
+          <WidgetGroup>
+            <Layout>vertical</Layout>
             <Children>
               <WidgetGroup>
+                <ObjectName>PreviewDeckContainer</ObjectName>
                 <Layout>vertical</Layout>
+                <!-- When TextRow is laid out, we need to ignore our children.
+                      Otherwise decks might end up with different widths based
+                      on the size of the labels in this row -->
+                <SizePolicy>i,max</SizePolicy>
                 <Children>
+                  <Template src="skin:vumeter.xml">
+                    <SetVariable name="TooltipId">channel_VuMeter</SetVariable>>
+                    <SetVariable name="group">[PreviewDeck1]</SetVariable>
+                    <SetVariable name="control">VuMeter</SetVariable>
+                  </Template>
+
                   <WidgetGroup>
-                    <ObjectName>PreviewDeckContainer</ObjectName>
-                    <Layout>vertical</Layout>
-                    <!-- When TextRow is laid out, we need to ignore our children.
-                         Otherwise decks might end up with different widths based
-                         on the size of the labels in this row -->
-                    <SizePolicy>i,max</SizePolicy>
+                    <ObjectName>PreviewDeckTextRow</ObjectName>
+                    <Layout>horizontal</Layout>
                     <Children>
-                      <Template src="skin:vumeter.xml">
-                        <SetVariable name="TooltipId">channel_VuMeter</SetVariable>>
-                        <SetVariable name="group">[PreviewDeck1]</SetVariable>
-                        <SetVariable name="control">VuMeter</SetVariable>
-                      </Template>
-
-                      <WidgetGroup>
-                        <ObjectName>PreviewDeckTextRow</ObjectName>
-                        <Layout>horizontal</Layout>
-                        <Children>
-                          <Text>
-                          <TooltipId>text</TooltipId>
-                            <SizePolicy>me,min</SizePolicy>
-                            <Group>[PreviewDeck1]</Group>
-                            <Elide>right</Elide>
-                          </Text>
+                      <Text>
+                      <TooltipId>text</TooltipId>
+                        <SizePolicy>me,min</SizePolicy>
+                        <Group>[PreviewDeck1]</Group>
+                        <Elide>right</Elide>
+                      </Text>
 
-                          <Template src="skin:left_1state_button.xml">
-                           <SetVariable name="TooltipId">eject</SetVariable>
-                            <SetVariable name="ObjectName">PreviewDeckEjectButton</SetVariable>
-                            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-                            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-                            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-                            <SetVariable name="state_0_text"></SetVariable>
-                            <SetVariable name="state_0_pressed">icon/ic_eject_48px.svg</SetVariable>
-                            <SetVariable name="state_0_unpressed">icon/ic_eject_48px.svg</SetVariable>
-                            <SetVariable name="left_connection_control">[PreviewDeck1],eject</SetVariable>
-                          </Template>
-                        </Children>
-                      </WidgetGroup>
-
-                      <WidgetGroup>
-                        <ObjectName>PreviewDeckVisualRow</ObjectName>
-                        <Layout>horizontal</Layout>
-                        <Children>
-                          <Template src="skin:left_right_2state_button.xml">
-                            <SetVariable name="TooltipId">play_start</SetVariable>
-                            <SetVariable name="ObjectName">PreviewDeckPlayButton</SetVariable>
-                            <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
-                            <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
-                            <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
-                            <SetVariable name="state_0_text"></SetVariable>
-                            <SetVariable name="state_0_pressed">icon/ic_play_48px.svg</SetVariable>
-                            <SetVariable name="state_0_unpressed">icon/ic_play_48px.svg</SetVariable>
-                            <SetVariable name="state_1_text"></SetVariable>
-                            <SetVariable name="state_1_pressed">icon/ic_pause_48px.svg</SetVariable>
-                            <SetVariable name="state_1_unpressed">icon/ic_pause_48px.svg</SetVariable>
-                            <SetVariable name="left_connection_control">[PreviewDeck1],play</SetVariable>
-                            <SetVariable name="right_connection_control">[PreviewDeck1],start</SetVariable>
-                          </Template>
-
-                          <Overview>
-                            <TooltipId>waveform_overview</TooltipId>
-                            <Style></Style>
-                            <Group>[PreviewDeck1]</Group>
-                            <Size>me,30f</Size>
-                            <BgColor></BgColor>
-                            <SignalHighColor>#FFE300</SignalHighColor>
-                            <SignalMidColor>#0099FF</SignalMidColor>
-                            <SignalLowColor>#FF0035</SignalLowColor>
-                            <SignalRGBHighColor></SignalRGBHighColor>
-                            <SignalRGBMidColor></SignalRGBMidColor>
-                            <SignalRGBLowColor></SignalRGBLowColor>
-                            <SignalColor>#FF8000</SignalColor>
-                            <PlayPosColor>#00FF00</PlayPosColor>
-                            <DefaultMark>
-                              <Align>bottom</Align>
-                              <Color>#FFFFFF</Color>
-                              <TextColor>#00FF00</TextColor>
-                              <Text> %1 </Text>
-                            </DefaultMark>
-                            <Mark>
-                              <Control>cue_point</Control>
-                              <Text> C </Text>
-                              <Align>top</Align>
-                              <Color>#FF001C</Color>
-                              <TextColor>#00FF00</TextColor>
-                            </Mark>
-                            <Connection>
-                              <ConfigKey>[PreviewDeck1],playposition</ConfigKey>
-                              <EmitOnDownPress>false</EmitOnDownPress>
-                            </Connection>
-                          </Overview>
-                        </Children>
-                      </WidgetGroup>
+                      <Template src="skin:left_1state_button.xml">
+                        <SetVariable name="TooltipId">eject</SetVariable>
+                        <SetVariable name="ObjectName">PreviewDeckEjectButton</SetVariable>
+                        <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                        <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                        <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                        <SetVariable name="state_0_text"></SetVariable>
+                        <SetVariable name="state_0_pressed">icon/ic_eject_48px.svg</SetVariable>
+                        <SetVariable name="state_0_unpressed">icon/ic_eject_48px.svg</SetVariable>
+                        <SetVariable name="left_connection_control">[PreviewDeck1],eject</SetVariable>
+                      </Template>
                     </Children>
-                    <Connection>
-                      <ConfigKey>[PreviewDeck],show_previewdeck</ConfigKey>
-                      <BindProperty>visible</BindProperty>
-                    </Connection>
                   </WidgetGroup>
+
                   <WidgetGroup>
+                    <ObjectName>PreviewDeckVisualRow</ObjectName>
                     <Layout>horizontal</Layout>
                     <Children>
-                      <Template src="skin:hide_show_button.xml">
-                        <SetVariable name="TooltipId">maximize_library</SetVariable>
-                        <SetVariable name="object_name">LibraryToggle</SetVariable>
-                        <SetVariable name="control">[Master],maximize_library</SetVariable>
+                      <Template src="skin:left_right_2state_button.xml">
+                        <SetVariable name="TooltipId">play_start</SetVariable>
+                        <SetVariable name="ObjectName">PreviewDeckPlayButton</SetVariable>
+                        <SetVariable name="MinimumSize"><Variable name="SquareButtonMinimumSize"/></SetVariable>
+                        <SetVariable name="MaximumSize"><Variable name="SquareButtonMaximumSize"/></SetVariable>
+                        <SetVariable name="SizePolicy"><Variable name="SquareButtonSizePolicy"/></SetVariable>
+                        <SetVariable name="state_0_text"></SetVariable>
+                        <SetVariable name="state_0_pressed">icon/ic_play_48px.svg</SetVariable>
+                        <SetVariable name="state_0_unpressed">icon/ic_play_48px.svg</SetVariable>
+                        <SetVariable name="state_1_text"></SetVariable>
+                        <SetVariable name="state_1_pressed">icon/ic_pause_48px.svg</SetVariable>
+                        <SetVariable name="state_1_unpressed">icon/ic_pause_48px.svg</SetVariable>
+                        <SetVariable name="left_connection_control">[PreviewDeck1],play</SetVariable>
+                        <SetVariable name="right_connection_control">[PreviewDeck1],start</SetVariable>
                       </Template>
-                      <SearchBox>
-                      </SearchBox>
-                    </Children>
-                  </WidgetGroup>
-                  <!-- QSplitter between LibrarySidebar and CoverArt -->
-                  <Splitter>
-                    <ObjectName>LibraryCoverArtSplitter</ObjectName>
-                    <Orientation>vertical</Orientation>
-                    <SizePolicy>me,me</SizePolicy>
-                    <MinimumSize>30,30</MinimumSize>
-                    <SplitSizesConfigKey>[Deere],LibraryCoverartSplitSize</SplitSizesConfigKey>
-                    <SplitSizes>2,8</SplitSizes>
-                    <Collapsible>0,0</Collapsible>
-                    <Children>
-                      <LibrarySidebar>
-                      </LibrarySidebar>
 
-                      <CoverArt>
-                        <ObjectName>LibraryCoverArt</ObjectName>
-                        <TooltipId>coverart</TooltipId>
-                        <SizePolicy>me,me</SizePolicy>
-                        <MinimumSize>30,30</MinimumSize>
+                      <Overview>
+                        <TooltipId>waveform_overview</TooltipId>
+                        <Style></Style>
+                        <Group>[PreviewDeck1]</Group>
+                        <Size>me,30f</Size>
+                        <BgColor></BgColor>
+                        <SignalHighColor>#FFE300</SignalHighColor>
+                        <SignalMidColor>#0099FF</SignalMidColor>
+                        <SignalLowColor>#FF0035</SignalLowColor>
+                        <SignalRGBHighColor></SignalRGBHighColor>
+                        <SignalRGBMidColor></SignalRGBMidColor>
+                        <SignalRGBLowColor></SignalRGBLowColor>
+                        <SignalColor>#FF8000</SignalColor>
+                        <PlayPosColor>#00FF00</PlayPosColor>
+                        <DefaultMark>
+                          <Align>bottom</Align>
+                          <Color>#FFFFFF</Color>
+                          <TextColor>#00FF00</TextColor>
+                          <Text> %1 </Text>
+                        </DefaultMark>
+                        <Mark>
+                          <Control>cue_point</Control>
+                          <Text> C </Text>
+                          <Align>top</Align>
+                          <Color>#FF001C</Color>
+                          <TextColor>#00FF00</TextColor>
+                        </Mark>
                         <Connection>
-                          <ConfigKey>[Library],show_coverart</ConfigKey>
-                          <BindProperty>visible</BindProperty>
+                          <ConfigKey>[PreviewDeck1],playposition</ConfigKey>
+                          <EmitOnDownPress>false</EmitOnDownPress>
                         </Connection>
-                      </CoverArt>
+                      </Overview>
                     </Children>
-                  </Splitter>
+                  </WidgetGroup>
+                </Children>
+                <Connection>
+                  <ConfigKey>[PreviewDeck],show_previewdeck</ConfigKey>
+                  <BindProperty>visible</BindProperty>
+                </Connection>
+              </WidgetGroup>
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:hide_show_button.xml">
+                    <SetVariable name="TooltipId">maximize_library</SetVariable>
+                    <SetVariable name="object_name">LibraryToggle</SetVariable>
+                    <SetVariable name="control">[Master],maximize_library</SetVariable>
+                  </Template>
+                  <SearchBox>
+                  </SearchBox>
                 </Children>
               </WidgetGroup>
-              <Library>
-              </Library>
+              <!-- QSplitter between LibrarySidebar and CoverArt -->
+              <Splitter>
+                <ObjectName>LibraryCoverArtSplitter</ObjectName>
+                <Orientation>vertical</Orientation>
+                <SizePolicy>me,me</SizePolicy>
+                <MinimumSize>30,30</MinimumSize>
+                <SplitSizesConfigKey>[Deere],LibraryCoverartSplitSize</SplitSizesConfigKey>
+                <SplitSizes>2,8</SplitSizes>
+                <Collapsible>0,0</Collapsible>
+                <Children>
+                  <LibrarySidebar>
+                  </LibrarySidebar>
+
+                  <CoverArt>
+                    <ObjectName>LibraryCoverArt</ObjectName>
+                    <TooltipId>coverart</TooltipId>
+                    <SizePolicy>me,me</SizePolicy>
+                    <MinimumSize>30,30</MinimumSize>
+                    <Connection>
+                      <ConfigKey>[Library],show_coverart</ConfigKey>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </CoverArt>
+                </Children>
+              </Splitter>
             </Children>
-          </Splitter>
+          </WidgetGroup>
+          <Library>
+          </Library>
         </Children>
-      </WidgetGroup>
+        <Connection>
+          <ConfigKey>[Library],show_library</ConfigKey>
+          <BindProperty>visible</BindProperty>
+        </Connection>
+      </Splitter>
 
-      <!-- Hidden Library -->
       <WidgetGroup>
-        <ObjectName>LibraryCollapsed</ObjectName>
-        <Layout>vertical</Layout>
-        <MinimumSize>-1,20</MinimumSize>
-        <MaximumSize>-1,20</MaximumSize>
-        <SizePolicy>me,min</SizePolicy>
+        <ObjectName>Spacer22</ObjectName>
+        <SizePolicy>me,me</SizePolicy>
+        <Children/>
+        <Connection>
+          <ConfigKey>[Library],show_library</ConfigKey>
+          <Transform><Not/></Transform>
+          <BindProperty>visible</BindProperty>
+        </Connection>
       </WidgetGroup>
 
     </Children>
-  </WidgetStack>
-
+  </WidgetGroup>
 </Template>
diff --git a/res/skins/Deere/main_decks.xml b/res/skins/Deere/main_decks.xml
index 650ba6895bb..42c6e8be632 100644
--- a/res/skins/Deere/main_decks.xml
+++ b/res/skins/Deere/main_decks.xml
@@ -6,7 +6,7 @@
 <Template>
   <WidgetGroup>
     <Layout>horizontal</Layout>
-    <SizePolicy>me,min</SizePolicy>
+    <SizePolicy>me,max</SizePolicy>
     <Children>
       <Template src="skin:left_gutter.xml"/>
       <Template src="skin:mixer.xml"/>
diff --git a/res/skins/Deere/skin.xml b/res/skins/Deere/skin.xml
index 37ea6fb1d4d..705d34cc823 100644
--- a/res/skins/Deere/skin.xml
+++ b/res/skins/Deere/skin.xml
@@ -45,7 +45,7 @@
   <ObjectName>Mixxx</ObjectName>
   <Style src="skin:style.qss"/>
 
-  <MinimumSize>1008,550</MinimumSize>
+  <Size>1024me,550me</Size>
   <Layout>horizontal</Layout>
 
   <Children>
@@ -143,7 +143,7 @@
       </Children>
     </SingletonDefinition>
 
-  <SingletonDefinition>
+    <SingletonDefinition>
       <ObjectName>DeckVisualRow4</ObjectName>
       <Children>
         <Template src="skin:deck_visual_row.xml">
@@ -158,33 +158,9 @@
     </SingletonDefinition>
 
     <SingletonDefinition>
-      <ObjectName>MainSection</ObjectName>
+      <ObjectName>Library</ObjectName>
       <Children>
-        <WidgetGroup>
-          <Layout>vertical</Layout>
-          <Size>-1me,-1me</Size>
-          <Children>
-            <WidgetGroup>
-              <Layout>vertical</Layout>
-              <SizePolicy>min,max</SizePolicy>
-              <Children>
-
-                <Template src="skin:main_decks.xml"/>
-                <Template src="skin:effect_rack.xml"/>
-                <Template src="skin:sample_decks.xml"/>
-                <Template src="skin:microphone_rack.xml"/>
-
-              </Children>
-              <Connection>
-                <ConfigKey>[Master],maximize_library</ConfigKey>
-                <BindProperty>visible</BindProperty>
-                <Transform><Not/></Transform>
-              </Connection>
-            </WidgetGroup>
-
-            <Template src="skin:library.xml"/>
-          </Children>
-        </WidgetGroup>
+        <Template src="skin:library.xml"/>
       </Children>
     </SingletonDefinition>
 
@@ -194,98 +170,94 @@
       <Children>
         <Template src="skin:tool_bar.xml"/>
 
-        <WidgetGroup>
-          <ObjectName>StackedWaveforms</ObjectName>
+        <Splitter><!-- Visible when Library is not maximized -->
+          <ObjectName>WaveformSplitter</ObjectName>
+          <Orientation>vertical</Orientation>
+          <SplitSizesConfigKey>[Deere],StackedWaveformSplitter</SplitSizesConfigKey>
+          <Size>-1me,-1me</Size>
           <Connection>
-            <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
+            <ConfigKey>[Master],maximize_library</ConfigKey>
             <BindProperty>visible</BindProperty>
+            <Transform><Not/></Transform>
           </Connection>
-          <Layout>vertical</Layout>
           <Children>
 
-            <Splitter>
-              <ObjectName>WaveformSplitter</ObjectName>
-              <Orientation>vertical</Orientation>
-              <SplitSizesConfigKey>[Deere],StackedWaveformSplitter</SplitSizesConfigKey>
-              <Size>-1me,-1me</Size>
+            <WidgetGroup><!-- Parallel Waveforms -->
+              <ObjectName>Waveforms</ObjectName>
+              <Layout>vertical</Layout>
+              <Connection>
+                <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
+                <BindProperty>visible</BindProperty>
+              </Connection>
               <Children>
 
                 <WidgetGroup>
-                  <ObjectName>Waveforms</ObjectName>
-                  <Layout>vertical</Layout>
                   <Connection>
-                    <ConfigKey>[Master],maximize_library</ConfigKey>
+                    <ConfigKey>[Master],show_4decks</ConfigKey>
                     <BindProperty>visible</BindProperty>
-                    <Transform><Not/></Transform>
                   </Connection>
+                  <Layout>vertical</Layout>
                   <Children>
-
-                    <WidgetGroup>
-                      <Connection>
-                        <ConfigKey>[Master],show_4decks</ConfigKey>
-                        <BindProperty>visible</BindProperty>
-                      </Connection>
-                      <Layout>vertical</Layout>
-                      <Children>
-                        <SingletonContainer>
-                          <ObjectName>DeckVisualRow3</ObjectName>
-                        </SingletonContainer>
-                      </Children>
-                    </WidgetGroup>
-
-                    <SingletonContainer>
-                      <ObjectName>DeckVisualRow1</ObjectName>
-                    </SingletonContainer>
                     <SingletonContainer>
-                      <ObjectName>DeckVisualRow2</ObjectName>
+                      <ObjectName>DeckVisualRow3</ObjectName>
                     </SingletonContainer>
-
-                    <WidgetGroup>
-                      <Connection>
-                        <ConfigKey>[Master],show_4decks</ConfigKey>
-                        <BindProperty>visible</BindProperty>
-                      </Connection>
-                      <Layout>vertical</Layout>
-                      <Children>
-                        <SingletonContainer>
-                          <ObjectName>DeckVisualRow4</ObjectName>
-                        </SingletonContainer>
-                      </Children>
-                    </WidgetGroup>
-
                   </Children>
                 </WidgetGroup>
 
+                <SingletonContainer>
+                  <ObjectName>DeckVisualRow1</ObjectName>
+                </SingletonContainer>
+
+                <SingletonContainer>
+                  <ObjectName>DeckVisualRow2</ObjectName>
+                </SingletonContainer>
+
                 <WidgetGroup>
+                  <Connection>
+                    <ConfigKey>[Master],show_4decks</ConfigKey>
+                    <BindProperty>visible</BindProperty>
+                  </Connection>
                   <Layout>vertical</Layout>
                   <Children>
                     <SingletonContainer>
-                      <ObjectName>MainSection</ObjectName>
+                      <ObjectName>DeckVisualRow4</ObjectName>
                     </SingletonContainer>
-
                   </Children>
                 </WidgetGroup>
 
               </Children>
-            </Splitter>
+            </WidgetGroup><!-- /Parallel Waveforms -->
+
+            <WidgetGroup><!-- Main section -->
+              <Layout>vertical</Layout>
+              <SizePolicy>min,max</SizePolicy>
+              <Children>
+                <Template src="skin:main_decks.xml"/>
+                <Template src="skin:effect_rack.xml"/>
+                <Template src="skin:sample_decks.xml"/>
+                <Template src="skin:microphone_rack.xml"/>
+                <SingletonContainer>
+                  <ObjectName>Library</ObjectName>
+                </SingletonContainer>
+              </Children>
+            </WidgetGroup><!-- /Main section -->
 
           </Children>
-        </WidgetGroup>
+        </Splitter><!-- /Visible when Library is not maximized -->
 
-        <WidgetGroup>
-          <ObjectName>SplitWaveforms</ObjectName>
-          <Connection>
-            <ConfigKey>[Deere],show_parallel_waveforms</ConfigKey>
-            <BindProperty>visible</BindProperty>
-            <Transform><Not/></Transform>
-          </Connection>
-          <Layout>vertical</Layout>
+        <WidgetGroup><!-- Maximized Library -->
+          <Layout>horizontal</Layout>
+          <SizePolicy>me,me</SizePolicy>
           <Children>
             <SingletonContainer>
-              <ObjectName>MainSection</ObjectName>
+              <ObjectName>Library</ObjectName>
             </SingletonContainer>
           </Children>
-        </WidgetGroup>
+          <Connection>
+            <ConfigKey>[Master],maximize_library</ConfigKey>
+            <BindProperty>visible</BindProperty>
+          </Connection>
+        </WidgetGroup><!-- /Maximized Library -->
 
       </Children>
     </WidgetGroup>
diff --git a/res/skins/Deere/style.qss b/res/skins/Deere/style.qss
index b7bbefc60c2..92c7f472013 100644
--- a/res/skins/Deere/style.qss
+++ b/res/skins/Deere/style.qss
@@ -1251,12 +1251,13 @@ WStarRating {
 }
 
 #LibraryContainer {
-  background-color: #222;
+  qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
+  background-color: #222222;
   padding-top: 2px;
 }
 
-#LibraryExpanded, #LibraryCollapsed {
-  qproperty-layoutAlignment: 'AlignLeft | AlignVCenter';
+#LibrarySplitter {
+  background-color: #222222;
 }
 
 #EffectRackContainer {