From 7a1e78571509530a1fbce00a4fafb822dab474f7 Mon Sep 17 00:00:00 2001
From: nopeppermint <stifisax@gmx.ch>
Date: Sat, 13 Oct 2018 15:45:01 +0200
Subject: [PATCH 1/5] add 8 sampler to latenight, with option for small
 samplers

first draw of small sampler, remove no longer used files and minor fix

add expand/collapse button, bpm, tooltip and smaller font

4 small or big sampler, or 8 tiny sampler with either the 4 left or 4 right big

remove 4 sampler option, adapt small sampler for two rows

remove no longer used buttons, add new sampler idea

remove spacers and change attribute names

fix tab/whitespace
---
 .../LateNight/buttons/btn_samplerCollapse.svg | 142 ++++++++++++++++
 .../buttons/btn_samplerCollapse_1_4.svg       | 153 +++++++++++++++++
 .../buttons/btn_samplerCollapse_5_8.svg       | 153 +++++++++++++++++
 .../LateNight/buttons/btn_samplerExpand.svg   | 145 ++++++++++++++++
 .../buttons/btn_samplerExpand_1_4.svg         | 156 ++++++++++++++++++
 .../buttons/btn_samplerExpand_5_8.svg         | 156 ++++++++++++++++++
 res/skins/LateNight/samplers_rack.xml         |  76 ++++++---
 res/skins/LateNight/samplers_unit_1-8.xml     |  85 ++++++++++
 res/skins/LateNight/samplers_unit_1-8_big.xml | 104 ++++++++++++
 res/skins/LateNight/samplers_unit_1234.xml    |  38 +++++
 res/skins/LateNight/samplersmall.xml          | 147 +++++++++++++++++
 res/skins/LateNight/skin.xml                  |   3 +
 res/skins/LateNight/skin_settings.xml         |  79 ++++++---
 res/skins/LateNight/style.qss                 |  31 ++++
 14 files changed, 1430 insertions(+), 38 deletions(-)
 create mode 100644 res/skins/LateNight/buttons/btn_samplerCollapse.svg
 create mode 100644 res/skins/LateNight/buttons/btn_samplerCollapse_1_4.svg
 create mode 100644 res/skins/LateNight/buttons/btn_samplerCollapse_5_8.svg
 create mode 100644 res/skins/LateNight/buttons/btn_samplerExpand.svg
 create mode 100644 res/skins/LateNight/buttons/btn_samplerExpand_1_4.svg
 create mode 100644 res/skins/LateNight/buttons/btn_samplerExpand_5_8.svg
 create mode 100644 res/skins/LateNight/samplers_unit_1-8.xml
 create mode 100644 res/skins/LateNight/samplers_unit_1-8_big.xml
 create mode 100644 res/skins/LateNight/samplers_unit_1234.xml
 create mode 100644 res/skins/LateNight/samplersmall.xml

diff --git a/res/skins/LateNight/buttons/btn_samplerCollapse.svg b/res/skins/LateNight/buttons/btn_samplerCollapse.svg
new file mode 100644
index 00000000000..c74904f19d1
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_samplerCollapse.svg
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg4724"
+   width="20"
+   height="50"
+   version="1.1"
+   sodipodi:docname="btn_samplerCollapse.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata18">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="959"
+     inkscape:window-height="1024"
+     id="namedview16"
+     showgrid="false"
+     fit-margin-top="10"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="17.128205"
+     inkscape:cx="9.2373711"
+     inkscape:cy="12.909651"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4724" />
+  <defs
+     id="defs4726">
+    <linearGradient
+       id="linearGradient5254"
+       x1="13"
+       x2="13"
+       y1="1027.4"
+       y2="1049.4"
+       gradientTransform="matrix(1.4783,0,0,0.82609,1.7609,182.59)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop3803-7"
+         stop-color="#242424"
+         offset="0" />
+      <stop
+         id="stop3805-5"
+         stop-color="#101010"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5772"
+       x1="20"
+       x2="20"
+       y1="1042.4"
+       y2="1035.4"
+       gradientTransform="matrix(1,0,0,-1,0,2080.7)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop5768"
+         stop-color="#c8c8c8"
+         offset="0" />
+      <stop
+         id="stop5770"
+         stop-color="#646464"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <g
+     id="layer1"
+     transform="matrix(0.54054054,0,0,1.9545433,-1.0810811,-2006.9616)">
+    <rect
+       id="rect3029-6"
+       x="4"
+       y="1032.4"
+       width="35"
+       height="20"
+       rx="2"
+       ry="2"
+       style="color:#000000;opacity:0.62085003;fill:#060606" />
+    <rect
+       id="rect3029-6-6"
+       x="3"
+       y="1031.4"
+       width="35"
+       height="20"
+       rx="2"
+       ry="2"
+       style="color:#000000;opacity:0.72000002" />
+    <rect
+       id="rect3029"
+       x="2.5"
+       y="1030.9"
+       width="34"
+       height="19"
+       rx="2"
+       ry="2"
+       style="color:#000000;fill:url(#linearGradient5254)" />
+    <path
+       id="rect3029-96-0-7"
+       d="m 4.5,1030.9 c -1.0994,0 -2,0.9006 -2,2 v 1.5 h 34 v -1.5 c 0,-1.0994 -0.90065,-2 -2,-2 z"
+       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#c8c8c8"
+       inkscape:connector-curvature="0" />
+    <path
+       id="rect3029-96-0"
+       d="m 4,1050.4 c -1.0994,0 -2,-0.9006 -2,-2 v -16 c 0,-1.0994 0.90065,-2 2,-2 h 31 c 1.0994,0 2,0.9006 2,2 v 16 c 0,1.0994 -0.90065,2 -2,2 z m 0.3,-1 h 30.4 c 0.56265,0 1.3,-0.7374 1.3,-1.3 v -15.4 c 0,-0.5626 -0.73735,-1.3 -1.3,-1.3 H 4.3 c -0.56265,0 -1.3,0.7374 -1.3,1.3 v 15.4 c 0,0.5626 0.73735,1.3 1.3,1.3 z"
+       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:url(#linearGradient5772)"
+       inkscape:connector-curvature="0" />
+  </g>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:51.19552612px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#eeeeee;fill-opacity:0.93333333;stroke:none;stroke-width:1.27988815"
+     x="1.59402"
+     y="62.836765"
+     id="text97-3"
+     transform="scale(1.5411876,0.64885028)"><tspan
+       sodipodi:role="line"
+       id="tspan95-6"
+       x="1.59402"
+       y="62.836765"
+       style="font-size:25.59776306px;fill:#eeeeee;fill-opacity:0.93333333;stroke-width:1.27988815">-</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_samplerCollapse_1_4.svg b/res/skins/LateNight/buttons/btn_samplerCollapse_1_4.svg
new file mode 100644
index 00000000000..2b72710c7ff
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_samplerCollapse_1_4.svg
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg4724"
+   width="20"
+   height="50"
+   version="1.1"
+   sodipodi:docname="btn_samplerCollapse_1_4.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata18">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1025"
+     id="namedview16"
+     showgrid="false"
+     fit-margin-top="10"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="17.128205"
+     inkscape:cx="-2.9182832"
+     inkscape:cy="24.843957"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4724" />
+  <defs
+     id="defs4726">
+    <linearGradient
+       id="linearGradient5254"
+       x1="13"
+       x2="13"
+       y1="1027.4"
+       y2="1049.4"
+       gradientTransform="matrix(1.4783,0,0,0.82609,1.7609,182.59)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop3803-7"
+         stop-color="#242424"
+         offset="0" />
+      <stop
+         id="stop3805-5"
+         stop-color="#101010"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5772"
+       x1="20"
+       x2="20"
+       y1="1042.4"
+       y2="1035.4"
+       gradientTransform="matrix(1,0,0,-1,0,2080.7)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop5768"
+         stop-color="#c8c8c8"
+         offset="0" />
+      <stop
+         id="stop5770"
+         stop-color="#646464"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <g
+     id="layer1"
+     transform="matrix(0.54054054,0,0,1.9545433,-1.0810811,-2006.9616)">
+    <rect
+       id="rect3029-6"
+       x="4"
+       y="1032.4"
+       width="35"
+       height="20"
+       rx="2"
+       ry="2"
+       style="color:#000000;opacity:0.62085003;fill:#060606" />
+    <rect
+       id="rect3029-6-6"
+       x="3"
+       y="1031.4"
+       width="35"
+       height="20"
+       rx="2"
+       ry="2"
+       style="color:#000000;opacity:0.72000002" />
+    <rect
+       id="rect3029"
+       x="2.5"
+       y="1030.9"
+       width="34"
+       height="19"
+       rx="2"
+       ry="2"
+       style="color:#000000;fill:url(#linearGradient5254)" />
+    <path
+       id="rect3029-96-0-7"
+       d="m 4.5,1030.9 c -1.0994,0 -2,0.9006 -2,2 v 1.5 h 34 v -1.5 c 0,-1.0994 -0.90065,-2 -2,-2 z"
+       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#c8c8c8"
+       inkscape:connector-curvature="0" />
+    <path
+       id="rect3029-96-0"
+       d="m 4,1050.4 c -1.0994,0 -2,-0.9006 -2,-2 v -16 c 0,-1.0994 0.90065,-2 2,-2 h 31 c 1.0994,0 2,0.9006 2,2 v 16 c 0,1.0994 -0.90065,2 -2,2 z m 0.3,-1 h 30.4 c 0.56265,0 1.3,-0.7374 1.3,-1.3 v -15.4 c 0,-0.5626 -0.73735,-1.3 -1.3,-1.3 H 4.3 c -0.56265,0 -1.3,0.7374 -1.3,1.3 v 15.4 c 0,0.5626 0.73735,1.3 1.3,1.3 z"
+       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:url(#linearGradient5772)"
+       inkscape:connector-curvature="0" />
+  </g>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:51.19552612px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#eeeeee;fill-opacity:0.93333333;stroke:none;stroke-width:1.27988815"
+     x="1.59402"
+     y="62.836765"
+     id="text97-3"
+     transform="scale(1.5411876,0.64885028)"><tspan
+       sodipodi:role="line"
+       id="tspan95-6"
+       x="1.59402"
+       y="62.836765"
+       style="font-size:25.59776306px;fill:#eeeeee;fill-opacity:0.93333333;stroke-width:1.27988815">-</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#eeeeee;fill-opacity:0.93333334;stroke:none;"
+     x="0.64221567"
+     y="28.398203"
+     id="text87"><tspan
+       sodipodi:role="line"
+       id="tspan85"
+       x="0.64221567"
+       y="28.398203"
+       style="font-size:10.66666698px;line-height:0.25;fill:#eeeeee;fill-opacity:0.93333334;">1-4</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_samplerCollapse_5_8.svg b/res/skins/LateNight/buttons/btn_samplerCollapse_5_8.svg
new file mode 100644
index 00000000000..b6fefc14528
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_samplerCollapse_5_8.svg
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg4724"
+   width="20"
+   height="50"
+   version="1.1"
+   sodipodi:docname="btn_samplerCollapse_5-8.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata18">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1025"
+     id="namedview16"
+     showgrid="false"
+     fit-margin-top="10"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="17.128205"
+     inkscape:cx="-2.9182832"
+     inkscape:cy="24.843957"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4724" />
+  <defs
+     id="defs4726">
+    <linearGradient
+       id="linearGradient5254"
+       x1="13"
+       x2="13"
+       y1="1027.4"
+       y2="1049.4"
+       gradientTransform="matrix(1.4783,0,0,0.82609,1.7609,182.59)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop3803-7"
+         stop-color="#242424"
+         offset="0" />
+      <stop
+         id="stop3805-5"
+         stop-color="#101010"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5772"
+       x1="20"
+       x2="20"
+       y1="1042.4"
+       y2="1035.4"
+       gradientTransform="matrix(1,0,0,-1,0,2080.7)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop5768"
+         stop-color="#c8c8c8"
+         offset="0" />
+      <stop
+         id="stop5770"
+         stop-color="#646464"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <g
+     id="layer1"
+     transform="matrix(0.54054054,0,0,1.9545433,-1.0810811,-2006.9616)">
+    <rect
+       id="rect3029-6"
+       x="4"
+       y="1032.4"
+       width="35"
+       height="20"
+       rx="2"
+       ry="2"
+       style="color:#000000;opacity:0.62085003;fill:#060606" />
+    <rect
+       id="rect3029-6-6"
+       x="3"
+       y="1031.4"
+       width="35"
+       height="20"
+       rx="2"
+       ry="2"
+       style="color:#000000;opacity:0.72000002" />
+    <rect
+       id="rect3029"
+       x="2.5"
+       y="1030.9"
+       width="34"
+       height="19"
+       rx="2"
+       ry="2"
+       style="color:#000000;fill:url(#linearGradient5254)" />
+    <path
+       id="rect3029-96-0-7"
+       d="m 4.5,1030.9 c -1.0994,0 -2,0.9006 -2,2 v 1.5 h 34 v -1.5 c 0,-1.0994 -0.90065,-2 -2,-2 z"
+       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#c8c8c8"
+       inkscape:connector-curvature="0" />
+    <path
+       id="rect3029-96-0"
+       d="m 4,1050.4 c -1.0994,0 -2,-0.9006 -2,-2 v -16 c 0,-1.0994 0.90065,-2 2,-2 h 31 c 1.0994,0 2,0.9006 2,2 v 16 c 0,1.0994 -0.90065,2 -2,2 z m 0.3,-1 h 30.4 c 0.56265,0 1.3,-0.7374 1.3,-1.3 v -15.4 c 0,-0.5626 -0.73735,-1.3 -1.3,-1.3 H 4.3 c -0.56265,0 -1.3,0.7374 -1.3,1.3 v 15.4 c 0,0.5626 0.73735,1.3 1.3,1.3 z"
+       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:url(#linearGradient5772)"
+       inkscape:connector-curvature="0" />
+  </g>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:51.19552612px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#eeeeee;fill-opacity:0.93333333;stroke:none;stroke-width:1.27988815"
+     x="1.59402"
+     y="62.836765"
+     id="text97-3"
+     transform="scale(1.5411876,0.64885028)"><tspan
+       sodipodi:role="line"
+       id="tspan95-6"
+       x="1.59402"
+       y="62.836765"
+       style="font-size:25.59776306px;fill:#eeeeee;fill-opacity:0.93333333;stroke-width:1.27988815">-</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#eeeeee;fill-opacity:0.93333333;stroke:none"
+     x="0.64221567"
+     y="28.398203"
+     id="text87"><tspan
+       sodipodi:role="line"
+       id="tspan85"
+       x="0.64221567"
+       y="28.398203"
+       style="font-size:10.66666698px;line-height:0.25;fill:#eeeeee;fill-opacity:0.93333333">5-8</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_samplerExpand.svg b/res/skins/LateNight/buttons/btn_samplerExpand.svg
new file mode 100644
index 00000000000..76136584180
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_samplerExpand.svg
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg4724"
+   width="20"
+   height="50"
+   version="1.1"
+   sodipodi:docname="btn_samplerExpand.svg"
+   viewBox="0 0 20 50"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata36">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="959"
+     inkscape:window-height="1024"
+     id="namedview34"
+     showgrid="false"
+     viewbox-width="38.6"
+     viewbox-x="0"
+     scale-x="1"
+     fit-margin-top="10"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="8.5641025"
+     inkscape:cx="-3.3488604"
+     inkscape:cy="28.917391"
+     inkscape:window-x="960"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4724"
+     units="mm" />
+  <defs
+     id="defs4726">
+    <linearGradient
+       id="linearGradient5254"
+       x1="13"
+       x2="13"
+       y1="1027.4"
+       y2="1049.4"
+       gradientTransform="matrix(1.4783,0,0,0.82609,1.7609,182.59)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop3803-7"
+         stop-color="#242424"
+         offset="0" />
+      <stop
+         id="stop3805-5"
+         stop-color="#101010"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5772"
+       x1="20"
+       x2="20"
+       y1="1042.4"
+       y2="1035.4"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop5768"
+         stop-color="#c8c8c8"
+         offset="0" />
+      <stop
+         id="stop5770"
+         stop-color="#646464"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <g
+     id="layer1"
+     transform="matrix(0.54054054,0,0,1.9545433,-1.0810811,-2007.014)">
+    <rect
+       id="rect3029-6"
+       x="4"
+       y="1032.4"
+       width="35"
+       height="20"
+       rx="2"
+       ry="2"
+       style="color:#000000;opacity:0.62085003;fill:#060606" />
+    <rect
+       id="rect3029-6-6"
+       x="3"
+       y="1031.4"
+       width="35"
+       height="20"
+       rx="2"
+       ry="2"
+       style="color:#000000;opacity:0.72000002" />
+    <rect
+       id="rect3029"
+       x="2.5"
+       y="1030.9"
+       width="34"
+       height="19"
+       rx="2"
+       ry="2"
+       style="color:#000000;fill:url(#linearGradient5254)" />
+    <path
+       id="rect3029-96-0-7"
+       d="m 4.5,1030.9 c -1.0994,0 -2,0.9006 -2,2 v 1.5 h 34 v -1.5 c 0,-1.0994 -0.90065,-2 -2,-2 z"
+       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#666666"
+       inkscape:connector-curvature="0" />
+    <path
+       id="rect3029-96-0"
+       d="m 4,1030.4 c -1.0994,0 -2,0.9006 -2,2 v 16 c 0,1.0994 0.90065,2 2,2 h 31 c 1.0994,0 2,-0.9006 2,-2 v -16 c 0,-1.0994 -0.90065,-2 -2,-2 z m 0.3,1 h 30.4 c 0.56265,0 1.3,0.7374 1.3,1.3 v 15.4 c 0,0.5626 -0.73735,1.3 -1.3,1.3 H 4.3 c -0.56265,0 -1.3,-0.7374 -1.3,-1.3 v -15.4 c 0,-0.5626 0.73735,-1.3 1.3,-1.3 z"
+       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:url(#linearGradient5772)"
+       inkscape:connector-curvature="0" />
+  </g>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:33.14639664px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#eeeeee;fill-opacity:0.93333333;stroke:none;stroke-width:0.82865995"
+     x="2.5643125"
+     y="41.35804"
+     id="text97"><tspan
+       sodipodi:role="line"
+       id="tspan95"
+       x="2.5643125"
+       y="41.35804"
+       style="font-size:16.57319832px;fill:#eeeeee;fill-opacity:0.93333333;stroke-width:0.82865995">+</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_samplerExpand_1_4.svg b/res/skins/LateNight/buttons/btn_samplerExpand_1_4.svg
new file mode 100644
index 00000000000..be6ce022d29
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_samplerExpand_1_4.svg
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg4724"
+   width="20"
+   height="50"
+   version="1.1"
+   sodipodi:docname="btn_samplerExpand_1_4.svg"
+   viewBox="0 0 20 50"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata36">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="959"
+     inkscape:window-height="1024"
+     id="namedview34"
+     showgrid="false"
+     viewbox-width="38.6"
+     viewbox-x="0"
+     scale-x="1"
+     fit-margin-top="10"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="8.5641025"
+     inkscape:cx="-3.3488604"
+     inkscape:cy="28.917391"
+     inkscape:window-x="960"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4724"
+     units="mm" />
+  <defs
+     id="defs4726">
+    <linearGradient
+       id="linearGradient5254"
+       x1="13"
+       x2="13"
+       y1="1027.4"
+       y2="1049.4"
+       gradientTransform="matrix(1.4783,0,0,0.82609,1.7609,182.59)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop3803-7"
+         stop-color="#242424"
+         offset="0" />
+      <stop
+         id="stop3805-5"
+         stop-color="#101010"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5772"
+       x1="20"
+       x2="20"
+       y1="1042.4"
+       y2="1035.4"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop5768"
+         stop-color="#c8c8c8"
+         offset="0" />
+      <stop
+         id="stop5770"
+         stop-color="#646464"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <g
+     id="layer1"
+     transform="matrix(0.54054054,0,0,1.9545433,-1.0810811,-2007.014)">
+    <rect
+       id="rect3029-6"
+       x="4"
+       y="1032.4"
+       width="35"
+       height="20"
+       rx="2"
+       ry="2"
+       style="color:#000000;opacity:0.62085003;fill:#060606" />
+    <rect
+       id="rect3029-6-6"
+       x="3"
+       y="1031.4"
+       width="35"
+       height="20"
+       rx="2"
+       ry="2"
+       style="color:#000000;opacity:0.72000002" />
+    <rect
+       id="rect3029"
+       x="2.5"
+       y="1030.9"
+       width="34"
+       height="19"
+       rx="2"
+       ry="2"
+       style="color:#000000;fill:url(#linearGradient5254)" />
+    <path
+       id="rect3029-96-0-7"
+       d="m 4.5,1030.9 c -1.0994,0 -2,0.9006 -2,2 v 1.5 h 34 v -1.5 c 0,-1.0994 -0.90065,-2 -2,-2 z"
+       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#666666"
+       inkscape:connector-curvature="0" />
+    <path
+       id="rect3029-96-0"
+       d="m 4,1030.4 c -1.0994,0 -2,0.9006 -2,2 v 16 c 0,1.0994 0.90065,2 2,2 h 31 c 1.0994,0 2,-0.9006 2,-2 v -16 c 0,-1.0994 -0.90065,-2 -2,-2 z m 0.3,1 h 30.4 c 0.56265,0 1.3,0.7374 1.3,1.3 v 15.4 c 0,0.5626 -0.73735,1.3 -1.3,1.3 H 4.3 c -0.56265,0 -1.3,-0.7374 -1.3,-1.3 v -15.4 c 0,-0.5626 0.73735,-1.3 1.3,-1.3 z"
+       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:url(#linearGradient5772)"
+       inkscape:connector-curvature="0" />
+  </g>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:33.14639664px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#eeeeee;fill-opacity:0.93333333;stroke:none;stroke-width:0.82865995"
+     x="2.5643125"
+     y="41.35804"
+     id="text97"><tspan
+       sodipodi:role="line"
+       id="tspan95"
+       x="2.5643125"
+       y="41.35804"
+       style="font-size:16.57319832px;fill:#eeeeee;fill-opacity:0.93333333;stroke-width:0.82865995">+</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#eeeeee;fill-opacity:0.93333333;stroke:none"
+     x="0.64212495"
+     y="28.398001"
+     id="text87"><tspan
+       sodipodi:role="line"
+       id="tspan85"
+       x="0.64212495"
+       y="28.398001"
+       style="font-size:10.66666698px;line-height:0.25;fill:#eeeeee;fill-opacity:0.93333333">1-4</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_samplerExpand_5_8.svg b/res/skins/LateNight/buttons/btn_samplerExpand_5_8.svg
new file mode 100644
index 00000000000..a455a282cc6
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_samplerExpand_5_8.svg
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg4724"
+   width="20"
+   height="50"
+   version="1.1"
+   sodipodi:docname="btn_samplerExpand__5_8.svg"
+   viewBox="0 0 20 50"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata36">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="959"
+     inkscape:window-height="1024"
+     id="namedview34"
+     showgrid="false"
+     viewbox-width="38.6"
+     viewbox-x="0"
+     scale-x="1"
+     fit-margin-top="10"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="8.5641025"
+     inkscape:cx="-3.3488604"
+     inkscape:cy="28.917391"
+     inkscape:window-x="960"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg4724"
+     units="mm" />
+  <defs
+     id="defs4726">
+    <linearGradient
+       id="linearGradient5254"
+       x1="13"
+       x2="13"
+       y1="1027.4"
+       y2="1049.4"
+       gradientTransform="matrix(1.4783,0,0,0.82609,1.7609,182.59)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop3803-7"
+         stop-color="#242424"
+         offset="0" />
+      <stop
+         id="stop3805-5"
+         stop-color="#101010"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5772"
+       x1="20"
+       x2="20"
+       y1="1042.4"
+       y2="1035.4"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop5768"
+         stop-color="#c8c8c8"
+         offset="0" />
+      <stop
+         id="stop5770"
+         stop-color="#646464"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <g
+     id="layer1"
+     transform="matrix(0.54054054,0,0,1.9545433,-1.0810811,-2007.014)">
+    <rect
+       id="rect3029-6"
+       x="4"
+       y="1032.4"
+       width="35"
+       height="20"
+       rx="2"
+       ry="2"
+       style="color:#000000;opacity:0.62085003;fill:#060606" />
+    <rect
+       id="rect3029-6-6"
+       x="3"
+       y="1031.4"
+       width="35"
+       height="20"
+       rx="2"
+       ry="2"
+       style="color:#000000;opacity:0.72000002" />
+    <rect
+       id="rect3029"
+       x="2.5"
+       y="1030.9"
+       width="34"
+       height="19"
+       rx="2"
+       ry="2"
+       style="color:#000000;fill:url(#linearGradient5254)" />
+    <path
+       id="rect3029-96-0-7"
+       d="m 4.5,1030.9 c -1.0994,0 -2,0.9006 -2,2 v 1.5 h 34 v -1.5 c 0,-1.0994 -0.90065,-2 -2,-2 z"
+       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#666666"
+       inkscape:connector-curvature="0" />
+    <path
+       id="rect3029-96-0"
+       d="m 4,1030.4 c -1.0994,0 -2,0.9006 -2,2 v 16 c 0,1.0994 0.90065,2 2,2 h 31 c 1.0994,0 2,-0.9006 2,-2 v -16 c 0,-1.0994 -0.90065,-2 -2,-2 z m 0.3,1 h 30.4 c 0.56265,0 1.3,0.7374 1.3,1.3 v 15.4 c 0,0.5626 -0.73735,1.3 -1.3,1.3 H 4.3 c -0.56265,0 -1.3,-0.7374 -1.3,-1.3 v -15.4 c 0,-0.5626 0.73735,-1.3 1.3,-1.3 z"
+       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:url(#linearGradient5772)"
+       inkscape:connector-curvature="0" />
+  </g>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:33.14639664px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#eeeeee;fill-opacity:0.93333333;stroke:none;stroke-width:0.82865995"
+     x="2.5643125"
+     y="41.35804"
+     id="text97"><tspan
+       sodipodi:role="line"
+       id="tspan95"
+       x="2.5643125"
+       y="41.35804"
+       style="font-size:16.57319832px;fill:#eeeeee;fill-opacity:0.93333333;stroke-width:0.82865995">+</tspan></text>
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#eeeeee;fill-opacity:0.93333333;stroke:none"
+     x="0.64212495"
+     y="28.398001"
+     id="text87"><tspan
+       sodipodi:role="line"
+       id="tspan85"
+       x="0.64212495"
+       y="28.398001"
+       style="font-size:10.66666698px;line-height:0.25;fill:#eeeeee;fill-opacity:0.93333333">5-8</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/samplers_rack.xml b/res/skins/LateNight/samplers_rack.xml
index 08ff37e19d5..ddfc4695dae 100644
--- a/res/skins/LateNight/samplers_rack.xml
+++ b/res/skins/LateNight/samplers_rack.xml
@@ -1,30 +1,72 @@
 <Template>
+
   <WidgetGroup>
     <Layout>horizontal</Layout>
     <SizePolicy>me,max</SizePolicy>
+    <Connection>
+      <ConfigKey>[Samplers],show_samplers</ConfigKey>
+      <BindProperty>visible</BindProperty>
+    </Connection>
     <Children>
 
-      <Template src="skin:sampler.xml">
-        <SetVariable name="samplernum">1</SetVariable>
-      </Template>
+      <WidgetGroup>
+      <Layout>horizontal</Layout>
+        <Children>
+
+          <!-- Select between 1-4 big or orthers -->
+          <WidgetStack currentpage="[Skin],8_samplers">
+            <Children>
+
+              <!--only 4 Sampler but big -->
+              <WidgetGroup>
+                <Layout>horizontal</Layout>
+                <Children>
+                  <Template src="skin:samplers_unit_1234.xml"/>
+                </Children>
+              </WidgetGroup>
+              <!--/only 4 Sampler but big -->
 
-      <WidgetGroup><Size>10f,1min</Size></WidgetGroup>
+              <!--8 Sampler -->
+              <WidgetGroup trigger="[Skin],8_samplers" on_hide_select="0">
+                <Layout>horizontal</Layout>
+                <Children>
 
-      <Template src="skin:sampler.xml">
-        <SetVariable name="samplernum">2</SetVariable>
-      </Template>
+                  <!-- Select between big or small samplers -->
+                  <WidgetStack currentpage="[Skin],expand_samplers">
+                    <Children>
 
-      <WidgetGroup><Size>10f,1min</Size></WidgetGroup>
+                      <!--8 big Sampler -->
+                      <WidgetGroup>
+                        <Layout>horizontal</Layout>
+                        <Children>
+                          <Template src="skin:samplers_unit_1-8_big.xml"/>
+                        </Children>
+                      </WidgetGroup>
+                      <!--/8 big Sampler -->
 
-      <Template src="skin:sampler.xml">
-        <SetVariable name="samplernum">3</SetVariable>
-      </Template>
+                      <!--8 small Sampler -->
+                      <WidgetGroup trigger="[Skin],expand_samplers" on_hide_select="0">
+                        <Layout>horizontal</Layout>
+                        <Children>
+                          <Template src="skin:samplers_unit_1-8.xml"/>
+                        </Children>
+                      </WidgetGroup>
+                      <!--/8 Sampler -->
 
-      <WidgetGroup><Size>10f,1min</Size></WidgetGroup>
+                    </Children>
+                  </WidgetStack>
+                  <!-- / Select between big or small samplers -->
 
-      <Template src="skin:sampler.xml">
-        <SetVariable name="samplernum">4</SetVariable>
-      </Template>
+                </Children>
+              </WidgetGroup>
+              <!--/8 Sampler -->
+
+            </Children>
+          </WidgetStack>
+          <!-- /Select between 1-4 big or orthers -->
+
+        </Children>
+      </WidgetGroup>
 
       <WidgetGroup>
         <Size>5f,1min</Size>
@@ -35,9 +77,5 @@
       </WidgetGroup>
 
     </Children>
-    <Connection>
-      <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
-      <BindProperty>visible</BindProperty>
-    </Connection>
   </WidgetGroup>
 </Template>
diff --git a/res/skins/LateNight/samplers_unit_1-8.xml b/res/skins/LateNight/samplers_unit_1-8.xml
new file mode 100644
index 00000000000..cfce6d8864a
--- /dev/null
+++ b/res/skins/LateNight/samplers_unit_1-8.xml
@@ -0,0 +1,85 @@
+<Template>
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,max</SizePolicy>
+    <Children>
+
+      <WidgetGroup>
+		    <Layout>horizontal</Layout>
+		    <Children>
+
+	        <Template src="skin:samplersmall.xml">
+	          <SetVariable name="samplernum">1</SetVariable>
+	        </Template>
+
+	        <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+
+	        <Template src="skin:samplersmall.xml">
+	          <SetVariable name="samplernum">2</SetVariable>
+	        </Template>
+
+	        <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+
+	        <Template src="skin:samplersmall.xml">
+	          <SetVariable name="samplernum">3</SetVariable>
+	        </Template>
+
+	        <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+
+	        <Template src="skin:samplersmall.xml">
+	          <SetVariable name="samplernum">4</SetVariable>
+	        </Template>
+
+          <WidgetGroup><Size>8f,1min</Size></WidgetGroup>
+
+          <PushButton>
+            <TooltipId>show_samplers</TooltipId>
+            <ObjectName>Samplerexpandbutton</ObjectName>
+            <Size>min,min</Size>
+            <NumberStates>2</NumberStates>
+            <State>
+              <Number>0</Number>
+              <Pressed>skin:/buttons/btn_samplerCollapse.svg</Pressed>
+              <Unpressed>skin:/buttons/btn_samplerCollapse.svg</Unpressed>
+            </State>
+            <State>
+              <Number>1</Number>
+              <Pressed>skin:/buttons/btn_samplerExpand.svg</Pressed>
+              <Unpressed>skin:/buttons/btn_samplerExpand.svg</Unpressed>
+            </State>
+            <Connection>
+              <ConfigKey>[Skin],expand_samplers</ConfigKey>
+              <ButtonState>LeftButton</ButtonState>
+            </Connection>
+          </PushButton>
+
+          <WidgetGroup><Size>8f,1min</Size></WidgetGroup>
+
+          <Template src="skin:samplersmall.xml">
+            <SetVariable name="samplernum">5</SetVariable>
+          </Template>
+
+          <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+
+          <Template src="skin:samplersmall.xml">
+            <SetVariable name="samplernum">6</SetVariable>
+          </Template>
+
+          <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+
+          <Template src="skin:samplersmall.xml">
+            <SetVariable name="samplernum">7</SetVariable>
+          </Template>
+
+          <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+
+          <Template src="skin:samplersmall.xml">
+            <SetVariable name="samplernum">8</SetVariable>
+          </Template>
+
+        </Children>
+      </WidgetGroup>
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/samplers_unit_1-8_big.xml b/res/skins/LateNight/samplers_unit_1-8_big.xml
new file mode 100644
index 00000000000..864b5c0d5a2
--- /dev/null
+++ b/res/skins/LateNight/samplers_unit_1-8_big.xml
@@ -0,0 +1,104 @@
+<Template>
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,max</SizePolicy>
+    <Children>
+
+	<WidgetGroup>
+		    <Layout>vertical</Layout>
+		    <SizePolicy>min,min</SizePolicy>
+		    <Children>
+
+		      <!-- First row -->
+		      <WidgetGroup>
+				    <ObjectName>SamplerTextSmall</ObjectName>
+				    <Layout>horizontal</Layout>
+				    <SizePolicy>min,min</SizePolicy>
+				    <Children>
+
+							<Template src="skin:sampler.xml">
+								<SetVariable name="samplernum">1</SetVariable>
+							</Template>
+
+							<WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+
+							<Template src="skin:sampler.xml">
+								<SetVariable name="samplernum">2</SetVariable>
+							</Template>
+
+							<WidgetGroup><Size>8f,1min</Size></WidgetGroup>
+
+							<PushButton>
+								<TooltipId>show_samplers</TooltipId>
+								<ObjectName>Samplerexpandbutton</ObjectName>
+								<Size>min,min</Size>
+								<NumberStates>2</NumberStates>
+								<State>
+								  <Number>0</Number>
+								  <Pressed>skin:/buttons/btn_samplerCollapse.svg</Pressed>
+								  <Unpressed>skin:/buttons/btn_samplerCollapse.svg</Unpressed>
+								</State>
+								<State>
+								  <Number>1</Number>
+								  <Pressed>skin:/buttons/btn_samplerExpand.svg</Pressed>
+								  <Unpressed>skin:/buttons/btn_samplerExpand.svg</Unpressed>
+								</State>
+								<Connection>
+								  <ConfigKey>[Skin],expand_samplers</ConfigKey>
+								  <ButtonState>LeftButton</ButtonState>
+								</Connection>
+							</PushButton>
+
+							<WidgetGroup><Size>8f,1min</Size></WidgetGroup>
+
+							<Template src="skin:sampler.xml">
+								<SetVariable name="samplernum">5</SetVariable>
+							</Template>
+
+							<WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+
+							<Template src="skin:sampler.xml">
+								<SetVariable name="samplernum">6</SetVariable>
+							</Template>
+
+					  </Children>
+					</WidgetGroup>
+					<!-- /First row -->
+
+				  <!-- Second row -->
+				  <WidgetGroup>
+					  <Layout>horizontal</Layout>
+					  <Children>
+
+						  <Template src="skin:sampler.xml">
+						    <SetVariable name="samplernum">3</SetVariable>
+						  </Template>
+
+						  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+
+						  <Template src="skin:sampler.xml">
+						    <SetVariable name="samplernum">4</SetVariable>
+						  </Template>
+
+						  <WidgetGroup><Size>36f,1min</Size></WidgetGroup>
+
+						  <Template src="skin:sampler.xml">
+						    <SetVariable name="samplernum">7</SetVariable>
+						  </Template>
+
+						  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+
+						  <Template src="skin:sampler.xml">
+						    <SetVariable name="samplernum">8</SetVariable>
+						  </Template>
+
+					  </Children>
+				  </WidgetGroup>
+				  <!-- /Second row -->
+
+				</Children>
+			</WidgetGroup>
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/samplers_unit_1234.xml b/res/skins/LateNight/samplers_unit_1234.xml
new file mode 100644
index 00000000000..2fd1f7acbf5
--- /dev/null
+++ b/res/skins/LateNight/samplers_unit_1234.xml
@@ -0,0 +1,38 @@
+<Template>
+	<WidgetGroup>
+		<Layout>horizontal</Layout>
+		<SizePolicy>me,max</SizePolicy>
+		<Children>
+
+			<WidgetGroup>
+				<Layout>horizontal</Layout>
+				<Children>
+
+					<Template src="skin:sampler.xml">
+						<SetVariable name="samplernum">1</SetVariable>
+					</Template>
+
+					<WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+
+					<Template src="skin:sampler.xml">
+						<SetVariable name="samplernum">2</SetVariable>
+					</Template>
+
+					<WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+
+					<Template src="skin:sampler.xml">
+						<SetVariable name="samplernum">3</SetVariable>
+					</Template>
+
+					<WidgetGroup><Size>4f,1min</Size></WidgetGroup>
+
+					<Template src="skin:sampler.xml">
+						<SetVariable name="samplernum">4</SetVariable>
+					</Template>
+
+				</Children>
+			</WidgetGroup>
+
+		</Children>
+	</WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/samplersmall.xml b/res/skins/LateNight/samplersmall.xml
new file mode 100644
index 00000000000..5f040554e55
--- /dev/null
+++ b/res/skins/LateNight/samplersmall.xml
@@ -0,0 +1,147 @@
+<Template>
+  <SetVariable name="group">[Sampler<Variable name="samplernum"/>]</SetVariable>
+  <WidgetGroup>
+    <ObjectName>SamplerDeck</ObjectName>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,min</SizePolicy>
+    <MinimumSize>100,40</MinimumSize>
+    <Children>
+
+      <WidgetGroup>
+        <ObjectName>SamplerPlaySmall</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <PushButton>
+            <TooltipId>cue_gotoandplay_cue_default</TooltipId>
+            <NumberStates>2</NumberStates>
+            <State>
+              <Number>0</Number>
+              <Pressed>buttons/btn_play_sampler_down.svg</Pressed>
+              <Unpressed>buttons/btn_play_sampler.svg</Unpressed>
+            </State>
+            <State>
+              <Number>1</Number>
+              <Pressed>buttons/btn_play_sampler_overdown.svg</Pressed>
+              <Unpressed>buttons/btn_play_sampler_over.svg</Unpressed>
+            </State>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,cue_gotoandplay</ConfigKey>
+              <ButtonState>LeftButton</ButtonState>
+            </Connection>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,cue_default</ConfigKey>
+              <ButtonState>RightButton</ButtonState>
+            </Connection>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,play_indicator</ConfigKey>
+            </Connection>
+          </PushButton>
+        </Children>
+      </WidgetGroup>
+
+      <WidgetGroup>
+      <Layout>vertical</Layout>
+      <SizePolicy>min,min</SizePolicy>
+      <Children>
+
+        <!-- First row -->
+        <WidgetGroup>
+        <ObjectName>SamplerTextSmall</ObjectName>
+        <Layout>horizontal</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <TrackProperty>
+            <TooltipId>track_title</TooltipId>
+            <ObjectName>SamplerTitleSmall</ObjectName>
+            <SizePolicy>me,min</SizePolicy>
+            <Property>title</Property>
+            <Group><Variable name="group"/></Group>
+            <Elide>right</Elide>
+          </TrackProperty>
+        </Children>
+        </WidgetGroup>
+        <!-- /First row -->
+
+        <!-- Second row -->
+        <WidgetGroup>
+        <Layout>horizontal</Layout>
+        <Children>
+
+          <Number>
+          <TooltipId>visual_bpm</TooltipId>
+          <Group>[Sampler<Variable name="samplernum"/>]</Group>
+          <!--CSS alignments not respected see bug lp:605530 , lets call <Alignment>-->
+          <Alignment>left</Alignment>
+          <Connection>
+              <ConfigKey>[Sampler<Variable name="samplernum"/>],visual_bpm</ConfigKey>
+          </Connection>
+          </Number>
+
+          <PushButton>
+            <TooltipId>orientation</TooltipId>
+            <NumberStates>3</NumberStates>
+            <State>
+              <Number>0</Number>
+              <Pressed>buttons/btn_orientation_sampler_left.svg</Pressed>
+              <Unpressed>buttons/btn_orientation_sampler_left.svg</Unpressed>
+            </State>
+            <State>
+              <Number>1</Number>
+              <Pressed>buttons/btn_orientation_sampler_master.svg</Pressed>
+              <Unpressed>buttons/btn_orientation_sampler_master.svg</Unpressed>
+            </State>
+            <State>
+              <Number>2</Number>
+              <Pressed>buttons/btn_orientation_sampler_right.svg</Pressed>
+              <Unpressed>buttons/btn_orientation_sampler_right.svg</Unpressed>
+            </State>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,orientation</ConfigKey>
+              <ButtonState>LeftButton</ButtonState>
+            </Connection>
+          </PushButton>
+
+          <PushButton>
+            <TooltipId>keylock</TooltipId>
+            <NumberStates>2</NumberStates>
+            <State>
+              <Number>0</Number>
+              <Pressed>buttons/btn_keylock.svg</Pressed>
+              <Unpressed>buttons/btn_keylock.svg</Unpressed>
+            </State>
+            <State>
+              <Number>1</Number>
+              <Pressed>buttons/btn_keylock_over.svg</Pressed>
+              <Unpressed>buttons/btn_keylock_over.svg</Unpressed>
+            </State>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,keylock</ConfigKey>
+            </Connection>
+          </PushButton>
+
+          <PushButton>
+            <TooltipId>eject</TooltipId>
+            <NumberStates>1</NumberStates>
+            <State>
+              <Number>0</Number>
+              <Pressed>buttons/btn_eject_over.svg</Pressed>
+              <Unpressed>buttons/btn_eject.svg</Unpressed>
+            </State>
+            <Connection>
+              <ConfigKey><Variable name="group"/>,eject</ConfigKey>
+              <ButtonState>LeftButton</ButtonState>
+            </Connection>
+          </PushButton>
+
+        </Children>
+      </WidgetGroup>
+      <!-- /Second row -->
+
+
+    </Children>
+    </WidgetGroup>
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/skin.xml b/res/skins/LateNight/skin.xml
index 5a7ec368006..5ebf03aaade 100644
--- a/res/skins/LateNight/skin.xml
+++ b/res/skins/LateNight/skin.xml
@@ -39,9 +39,12 @@
     <attributes>
       <!-- Set skin defaults. -->
       <attribute config_key="[Master],num_decks">4</attribute>
+      <attribute config_key="[Master],num_samplers">8</attribute>
       <attribute persist="true" config_key="[Microphone],show_microphone">0</attribute>
       <attribute persist="true" config_key="[EffectRack1],show">0</attribute>
       <attribute persist="true" config_key="[Samplers],show_samplers">0</attribute>
+      <attribute persist="true" config_key="[Skin],8_samplers">1</attribute>
+      <attribute persist="true" config_key="[Skin],expand_samplers">0</attribute>
       <attribute persist="true" config_key="[Vinylcontrol],show_vinylcontrol">0</attribute>
       <attribute persist="true" config_key="[PreviewDeck],show_previewdeck">0</attribute>
       <attribute persist="true" config_key="[Master],show_mixer">1</attribute>
diff --git a/res/skins/LateNight/skin_settings.xml b/res/skins/LateNight/skin_settings.xml
index 8a64ab18677..056539c7886 100644
--- a/res/skins/LateNight/skin_settings.xml
+++ b/res/skins/LateNight/skin_settings.xml
@@ -263,30 +263,41 @@ Description:
             </Children>
           </WidgetGroup><!-- /Effects -->
 
-          <Label>
-            <ObjectName>CategoryLabel</ObjectName>
-            <Text>Miscellaneous</Text>
-            <Size>190f,21f</Size>
-          </Label>
+          <!-- Samplers -->
+          <Template src="skin:skin_settings_labelbutton_2state.xml">
+            <SetVariable name="text">Samplers </SetVariable>
+            <SetVariable name="Setting">[Samplers],show_samplers</SetVariable>
+          </Template>
 
-          <WidgetGroup>
+
+        <WidgetGroup><!-- 4 buttons -->
             <ObjectName>SkinSettingsCategory</ObjectName>
             <SizePolicy>me,min</SizePolicy>
             <Layout>vertical</Layout>
             <Children>
 
-              <!-- Preview Deck -->
-              <Template src="skin:skin_settings_button_2state.xml">
-                <SetVariable name="TooltipId">show_previewdeck</SetVariable>
-                <SetVariable name="text">Preview Deck</SetVariable>
-                <SetVariable name="Setting">[PreviewDeck],show_previewdeck</SetVariable>
-              </Template>
-
-              <!-- Cover Art -->
-              <Template src="skin:skin_settings_button_2state.xml">
-                <SetVariable name="text">Cover Art in Library</SetVariable>
-                <SetVariable name="Setting">[Library],show_coverart</SetVariable>
-              </Template>
+              <WidgetGroup><!-- 8 Samplers -->
+                <Layout>stacked</Layout>
+                <Size>190f,17f</Size>
+                <Children>
+                  <!-- index 0 due to bug -->
+                  <WidgetGroup><Size>0f,0f</Size></WidgetGroup>
+                  <WidgetGroup>
+                    <ObjectName>SubmenuCover</ObjectName>
+                    <Layout>stacked</Layout>
+                    <Size>190f,17f</Size>
+                    <Connection>
+                      <ConfigKey persist="true">[Samplers],show_samplers</ConfigKey>
+                      <Transform><Not/></Transform>
+                      <BindProperty>visible</BindProperty>
+                    </Connection>
+                  </WidgetGroup>
+                  <Template src="skin:skin_settings_button_2state.xml">
+                    <SetVariable name="text">8 Samplers</SetVariable>
+                    <SetVariable name="Setting">[Skin],8_samplers</SetVariable>
+                  </Template>
+                </Children>
+              </WidgetGroup><!-- / 8 Samplers -->
 
               <PushButton>
                 <TooltipId>LoadSamplerBank</TooltipId>
@@ -321,7 +332,37 @@ Description:
               </PushButton>
 
             </Children>
-          </WidgetGroup><!-- /Miscellaneous -->
+          </WidgetGroup><!-- /Samplers -->
+
+          <Label>
+            <ObjectName>CategoryLabel</ObjectName>
+            <Text>Library</Text>
+            <Size>190f,21f</Size>
+          </Label>
+
+          <WidgetGroup>
+            <ObjectName>SkinSettingsCategory</ObjectName>
+            <SizePolicy>me,min</SizePolicy>
+            <Layout>vertical</Layout>
+            <Children>
+
+              <!-- Preview Deck -->
+              <Template src="skin:skin_settings_button_2state.xml">
+                <SetVariable name="TooltipId">show_previewdeck</SetVariable>
+                <SetVariable name="text">Preview Deck</SetVariable>
+                <SetVariable name="Setting">[PreviewDeck],show_previewdeck</SetVariable>
+              </Template>
+
+              <!-- Cover Art -->
+              <Template src="skin:skin_settings_button_2state.xml">
+                <SetVariable name="text">Cover Art in Library</SetVariable>
+                <SetVariable name="Setting">[Library],show_coverart</SetVariable>
+              </Template>
+
+
+
+            </Children>
+          </WidgetGroup><!-- /Library -->
         </Children>
       </WidgetGroup><!-- /SkinSettings -->
     </Children>
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index 43e9958bea6..5319d9a8b12 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -1092,12 +1092,31 @@ border: 0px;
   border-left: 0px;
 }
 
+#SamplerTextSmall {
+  qproperty-layoutAlignment: 'AlignLeft';
+  padding: 1px 1px 1px 1px;
+  border-top: 0px;
+  border-left: 2px;
+}
+
 #SamplerTitle {
   font-size: 16px/19px;
   text-align: left;
   text-transform: none;
 }
 
+#SamplerTitleSmall {
+  font-size: 12px;
+  text-align: left;
+  text-transform: none;
+}
+
+#SamplerTitleTiny {
+  font-size: 10px;
+  text-align: left;
+  text-transform: none;
+}
+
 #SamplerRowTwo {
   border: 1px solid #585858;
   border-top: 0px;
@@ -1117,12 +1136,24 @@ border: 0px;
   border-bottom: 0px;
 }
 
+#SamplerPlaySmall {
+  padding: 3px 1px 1px 3px;
+  border-top: 0px;
+  border-left: 0px;
+  border-bottom: 0px;
+}
+
 #SamplerButtonGrid {
   border: 1px solid #585858;
   border-top: 0px;
   border-bottom: 0px;
 }
 
+#SmallSamplerButtonGrid {
+  border-top: 0px;
+  border-bottom: 0px;
+}
+
 #SamplerHotcues {
   qproperty-layoutAlignment: 'AlignRight | AlignVCenter';
   margin: 2px 0px 0px 2px;

From 68e4104ac5abb81cebb2e75c4a3b2dffcb6a019b Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Tue, 23 Oct 2018 02:44:34 +0200
Subject: [PATCH 2/5] refactor layout, fix expand button, add 4 small samplers

---
 .../LateNight/buttons/btn_samplerCollapse.svg | 143 +-----------
 .../buttons/btn_samplerCollapse_1_4.svg       | 153 -------------
 .../buttons/btn_samplerCollapse_5_8.svg       | 153 -------------
 .../LateNight/buttons/btn_samplerExpand.svg   | 146 +-----------
 .../buttons/btn_samplerExpand_1_4.svg         | 156 -------------
 .../buttons/btn_samplerExpand_5_8.svg         | 156 -------------
 res/skins/LateNight/sampler.xml               |   1 -
 res/skins/LateNight/samplers_4decks.xml       |  95 ++++++++
 res/skins/LateNight/samplers_8decks.xml       | 159 +++++++++++++
 res/skins/LateNight/samplers_rack.xml         | 210 ++++++++++++++----
 res/skins/LateNight/samplers_unit_1-8.xml     |  85 -------
 res/skins/LateNight/samplers_unit_1-8_big.xml | 104 ---------
 res/skins/LateNight/samplers_unit_1234.xml    |  38 ----
 res/skins/LateNight/samplersmall.xml          | 184 +++++++--------
 res/skins/LateNight/style.qss                 |   9 +-
 15 files changed, 523 insertions(+), 1269 deletions(-)
 delete mode 100644 res/skins/LateNight/buttons/btn_samplerCollapse_1_4.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_samplerCollapse_5_8.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_samplerExpand_1_4.svg
 delete mode 100644 res/skins/LateNight/buttons/btn_samplerExpand_5_8.svg
 create mode 100644 res/skins/LateNight/samplers_4decks.xml
 create mode 100644 res/skins/LateNight/samplers_8decks.xml
 delete mode 100644 res/skins/LateNight/samplers_unit_1-8.xml
 delete mode 100644 res/skins/LateNight/samplers_unit_1-8_big.xml
 delete mode 100644 res/skins/LateNight/samplers_unit_1234.xml

diff --git a/res/skins/LateNight/buttons/btn_samplerCollapse.svg b/res/skins/LateNight/buttons/btn_samplerCollapse.svg
index c74904f19d1..fd33f484c27 100644
--- a/res/skins/LateNight/buttons/btn_samplerCollapse.svg
+++ b/res/skins/LateNight/buttons/btn_samplerCollapse.svg
@@ -1,142 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg4724"
-   width="20"
-   height="50"
-   version="1.1"
-   sodipodi:docname="btn_samplerCollapse.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)">
-  <metadata
-     id="metadata18">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="959"
-     inkscape:window-height="1024"
-     id="namedview16"
-     showgrid="false"
-     fit-margin-top="10"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="17.128205"
-     inkscape:cx="9.2373711"
-     inkscape:cy="12.909651"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg4724" />
-  <defs
-     id="defs4726">
-    <linearGradient
-       id="linearGradient5254"
-       x1="13"
-       x2="13"
-       y1="1027.4"
-       y2="1049.4"
-       gradientTransform="matrix(1.4783,0,0,0.82609,1.7609,182.59)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop3803-7"
-         stop-color="#242424"
-         offset="0" />
-      <stop
-         id="stop3805-5"
-         stop-color="#101010"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5772"
-       x1="20"
-       x2="20"
-       y1="1042.4"
-       y2="1035.4"
-       gradientTransform="matrix(1,0,0,-1,0,2080.7)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop5768"
-         stop-color="#c8c8c8"
-         offset="0" />
-      <stop
-         id="stop5770"
-         stop-color="#646464"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <g
-     id="layer1"
-     transform="matrix(0.54054054,0,0,1.9545433,-1.0810811,-2006.9616)">
-    <rect
-       id="rect3029-6"
-       x="4"
-       y="1032.4"
-       width="35"
-       height="20"
-       rx="2"
-       ry="2"
-       style="color:#000000;opacity:0.62085003;fill:#060606" />
-    <rect
-       id="rect3029-6-6"
-       x="3"
-       y="1031.4"
-       width="35"
-       height="20"
-       rx="2"
-       ry="2"
-       style="color:#000000;opacity:0.72000002" />
-    <rect
-       id="rect3029"
-       x="2.5"
-       y="1030.9"
-       width="34"
-       height="19"
-       rx="2"
-       ry="2"
-       style="color:#000000;fill:url(#linearGradient5254)" />
-    <path
-       id="rect3029-96-0-7"
-       d="m 4.5,1030.9 c -1.0994,0 -2,0.9006 -2,2 v 1.5 h 34 v -1.5 c 0,-1.0994 -0.90065,-2 -2,-2 z"
-       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#c8c8c8"
-       inkscape:connector-curvature="0" />
-    <path
-       id="rect3029-96-0"
-       d="m 4,1050.4 c -1.0994,0 -2,-0.9006 -2,-2 v -16 c 0,-1.0994 0.90065,-2 2,-2 h 31 c 1.0994,0 2,0.9006 2,2 v 16 c 0,1.0994 -0.90065,2 -2,2 z m 0.3,-1 h 30.4 c 0.56265,0 1.3,-0.7374 1.3,-1.3 v -15.4 c 0,-0.5626 -0.73735,-1.3 -1.3,-1.3 H 4.3 c -0.56265,0 -1.3,0.7374 -1.3,1.3 v 15.4 c 0,0.5626 0.73735,1.3 1.3,1.3 z"
-       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:url(#linearGradient5772)"
-       inkscape:connector-curvature="0" />
-  </g>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:51.19552612px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#eeeeee;fill-opacity:0.93333333;stroke:none;stroke-width:1.27988815"
-     x="1.59402"
-     y="62.836765"
-     id="text97-3"
-     transform="scale(1.5411876,0.64885028)"><tspan
-       sodipodi:role="line"
-       id="tspan95-6"
-       x="1.59402"
-       y="62.836765"
-       style="font-size:25.59776306px;fill:#eeeeee;fill-opacity:0.93333333;stroke-width:1.27988815">-</tspan></text>
-</svg>
+<svg id="svg4724" width="20" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs id="defs4726"><linearGradient id="linearGradient5772-6" x1="20" x2="20" y1="1042.4" y2="1035.4" gradientTransform="matrix(1,0,0,-1,0,1068.3)" gradientUnits="userSpaceOnUse"><stop id="stop5768-7" stop-color="#c8c8c8" offset="0"/><stop id="stop5770-5" stop-color="#646464" offset="1"/></linearGradient><linearGradient id="linearGradient5254-3" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="matrix(1.4783 0 0 .82609 1.7609 -829.81)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-5" stop-color="#242424" offset="0"/><stop id="stop3805-5-6" stop-color="#101010" offset="1"/></linearGradient></defs><path id="rect3029" d="m2.5 0.50002h15c1.108 0 2 0.892 2 2v35c0 1.108-0.892 2-2 2h-15c-1.108 0-2-0.892-2-2v-35c0-1.108 0.892-2 2-2z" color="#000000" fill="url(#linearGradient5254-3)"/><path id="rect3029-96-0-7" d="m2.5 0.5c-1.0994 0-2 0.9006-2 2v1.5h19v-1.5c0-1.0994-0.90065-2-2-2z" color="#000000" fill="#c8c8c8" style="text-decoration-line:none;text-indent:0;text-transform:none"/><path id="rect3029-96-0" d="m2 40c-1.0994 0-2-0.9006-2-2v-36c0-1.0994 0.90065-2 2-2h16c1.0994 0 2 0.9006 2 2v36c0 1.0994-0.90065 2-2 2zm0.3-1h15.4c0.56265 0 1.3-0.7374 1.3-1.3v-35.4c0-0.5626-0.73735-1.3-1.3-1.3h-15.4c-0.56265 0-1.3 0.7374-1.3 1.3v35.4c0 0.5626 0.73735 1.3 1.3 1.3z" color="#000000" fill="url(#linearGradient5772-6)" style="text-decoration-line:none;text-indent:0;text-transform:none"/><path id="rect3922-2-6-3" d="m15.38 20.126c-0.67323 0.58683-1.7042 0.51613-2.291-0.15711l-5.3929-6.1869c-1.2343 0.2913-2.5858-0.075451-3.4731-1.0934-0.88786-1.0186-1.0672-2.4084-0.60897-3.5917l1.4608 1.6759c0.58684 0.67324 1.6178 0.74394 2.291 0.15711 0.67323-0.58683 0.74287-1.6169 0.15604-2.2901l-1.4608-1.6759c1.2348-0.2924 2.5871 0.07495 3.475 1.0935 0.888 1.0187 1.0671 2.4084 0.60897 3.5917l5.392 6.1859c0.58684 0.67324 0.51615 1.7042-0.15708 2.291z" color="#000000" fill="#d2d2d2" stroke-width=".99996"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_samplerCollapse_1_4.svg b/res/skins/LateNight/buttons/btn_samplerCollapse_1_4.svg
deleted file mode 100644
index 2b72710c7ff..00000000000
--- a/res/skins/LateNight/buttons/btn_samplerCollapse_1_4.svg
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg4724"
-   width="20"
-   height="50"
-   version="1.1"
-   sodipodi:docname="btn_samplerCollapse_1_4.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)">
-  <metadata
-     id="metadata18">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1025"
-     id="namedview16"
-     showgrid="false"
-     fit-margin-top="10"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="17.128205"
-     inkscape:cx="-2.9182832"
-     inkscape:cy="24.843957"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4724" />
-  <defs
-     id="defs4726">
-    <linearGradient
-       id="linearGradient5254"
-       x1="13"
-       x2="13"
-       y1="1027.4"
-       y2="1049.4"
-       gradientTransform="matrix(1.4783,0,0,0.82609,1.7609,182.59)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop3803-7"
-         stop-color="#242424"
-         offset="0" />
-      <stop
-         id="stop3805-5"
-         stop-color="#101010"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5772"
-       x1="20"
-       x2="20"
-       y1="1042.4"
-       y2="1035.4"
-       gradientTransform="matrix(1,0,0,-1,0,2080.7)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop5768"
-         stop-color="#c8c8c8"
-         offset="0" />
-      <stop
-         id="stop5770"
-         stop-color="#646464"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <g
-     id="layer1"
-     transform="matrix(0.54054054,0,0,1.9545433,-1.0810811,-2006.9616)">
-    <rect
-       id="rect3029-6"
-       x="4"
-       y="1032.4"
-       width="35"
-       height="20"
-       rx="2"
-       ry="2"
-       style="color:#000000;opacity:0.62085003;fill:#060606" />
-    <rect
-       id="rect3029-6-6"
-       x="3"
-       y="1031.4"
-       width="35"
-       height="20"
-       rx="2"
-       ry="2"
-       style="color:#000000;opacity:0.72000002" />
-    <rect
-       id="rect3029"
-       x="2.5"
-       y="1030.9"
-       width="34"
-       height="19"
-       rx="2"
-       ry="2"
-       style="color:#000000;fill:url(#linearGradient5254)" />
-    <path
-       id="rect3029-96-0-7"
-       d="m 4.5,1030.9 c -1.0994,0 -2,0.9006 -2,2 v 1.5 h 34 v -1.5 c 0,-1.0994 -0.90065,-2 -2,-2 z"
-       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#c8c8c8"
-       inkscape:connector-curvature="0" />
-    <path
-       id="rect3029-96-0"
-       d="m 4,1050.4 c -1.0994,0 -2,-0.9006 -2,-2 v -16 c 0,-1.0994 0.90065,-2 2,-2 h 31 c 1.0994,0 2,0.9006 2,2 v 16 c 0,1.0994 -0.90065,2 -2,2 z m 0.3,-1 h 30.4 c 0.56265,0 1.3,-0.7374 1.3,-1.3 v -15.4 c 0,-0.5626 -0.73735,-1.3 -1.3,-1.3 H 4.3 c -0.56265,0 -1.3,0.7374 -1.3,1.3 v 15.4 c 0,0.5626 0.73735,1.3 1.3,1.3 z"
-       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:url(#linearGradient5772)"
-       inkscape:connector-curvature="0" />
-  </g>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:51.19552612px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#eeeeee;fill-opacity:0.93333333;stroke:none;stroke-width:1.27988815"
-     x="1.59402"
-     y="62.836765"
-     id="text97-3"
-     transform="scale(1.5411876,0.64885028)"><tspan
-       sodipodi:role="line"
-       id="tspan95-6"
-       x="1.59402"
-       y="62.836765"
-       style="font-size:25.59776306px;fill:#eeeeee;fill-opacity:0.93333333;stroke-width:1.27988815">-</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#eeeeee;fill-opacity:0.93333334;stroke:none;"
-     x="0.64221567"
-     y="28.398203"
-     id="text87"><tspan
-       sodipodi:role="line"
-       id="tspan85"
-       x="0.64221567"
-       y="28.398203"
-       style="font-size:10.66666698px;line-height:0.25;fill:#eeeeee;fill-opacity:0.93333334;">1-4</tspan></text>
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_samplerCollapse_5_8.svg b/res/skins/LateNight/buttons/btn_samplerCollapse_5_8.svg
deleted file mode 100644
index b6fefc14528..00000000000
--- a/res/skins/LateNight/buttons/btn_samplerCollapse_5_8.svg
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg4724"
-   width="20"
-   height="50"
-   version="1.1"
-   sodipodi:docname="btn_samplerCollapse_5-8.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)">
-  <metadata
-     id="metadata18">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1025"
-     id="namedview16"
-     showgrid="false"
-     fit-margin-top="10"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="17.128205"
-     inkscape:cx="-2.9182832"
-     inkscape:cy="24.843957"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4724" />
-  <defs
-     id="defs4726">
-    <linearGradient
-       id="linearGradient5254"
-       x1="13"
-       x2="13"
-       y1="1027.4"
-       y2="1049.4"
-       gradientTransform="matrix(1.4783,0,0,0.82609,1.7609,182.59)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop3803-7"
-         stop-color="#242424"
-         offset="0" />
-      <stop
-         id="stop3805-5"
-         stop-color="#101010"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5772"
-       x1="20"
-       x2="20"
-       y1="1042.4"
-       y2="1035.4"
-       gradientTransform="matrix(1,0,0,-1,0,2080.7)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop5768"
-         stop-color="#c8c8c8"
-         offset="0" />
-      <stop
-         id="stop5770"
-         stop-color="#646464"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <g
-     id="layer1"
-     transform="matrix(0.54054054,0,0,1.9545433,-1.0810811,-2006.9616)">
-    <rect
-       id="rect3029-6"
-       x="4"
-       y="1032.4"
-       width="35"
-       height="20"
-       rx="2"
-       ry="2"
-       style="color:#000000;opacity:0.62085003;fill:#060606" />
-    <rect
-       id="rect3029-6-6"
-       x="3"
-       y="1031.4"
-       width="35"
-       height="20"
-       rx="2"
-       ry="2"
-       style="color:#000000;opacity:0.72000002" />
-    <rect
-       id="rect3029"
-       x="2.5"
-       y="1030.9"
-       width="34"
-       height="19"
-       rx="2"
-       ry="2"
-       style="color:#000000;fill:url(#linearGradient5254)" />
-    <path
-       id="rect3029-96-0-7"
-       d="m 4.5,1030.9 c -1.0994,0 -2,0.9006 -2,2 v 1.5 h 34 v -1.5 c 0,-1.0994 -0.90065,-2 -2,-2 z"
-       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#c8c8c8"
-       inkscape:connector-curvature="0" />
-    <path
-       id="rect3029-96-0"
-       d="m 4,1050.4 c -1.0994,0 -2,-0.9006 -2,-2 v -16 c 0,-1.0994 0.90065,-2 2,-2 h 31 c 1.0994,0 2,0.9006 2,2 v 16 c 0,1.0994 -0.90065,2 -2,2 z m 0.3,-1 h 30.4 c 0.56265,0 1.3,-0.7374 1.3,-1.3 v -15.4 c 0,-0.5626 -0.73735,-1.3 -1.3,-1.3 H 4.3 c -0.56265,0 -1.3,0.7374 -1.3,1.3 v 15.4 c 0,0.5626 0.73735,1.3 1.3,1.3 z"
-       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:url(#linearGradient5772)"
-       inkscape:connector-curvature="0" />
-  </g>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:51.19552612px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#eeeeee;fill-opacity:0.93333333;stroke:none;stroke-width:1.27988815"
-     x="1.59402"
-     y="62.836765"
-     id="text97-3"
-     transform="scale(1.5411876,0.64885028)"><tspan
-       sodipodi:role="line"
-       id="tspan95-6"
-       x="1.59402"
-       y="62.836765"
-       style="font-size:25.59776306px;fill:#eeeeee;fill-opacity:0.93333333;stroke-width:1.27988815">-</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#eeeeee;fill-opacity:0.93333333;stroke:none"
-     x="0.64221567"
-     y="28.398203"
-     id="text87"><tspan
-       sodipodi:role="line"
-       id="tspan85"
-       x="0.64221567"
-       y="28.398203"
-       style="font-size:10.66666698px;line-height:0.25;fill:#eeeeee;fill-opacity:0.93333333">5-8</tspan></text>
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_samplerExpand.svg b/res/skins/LateNight/buttons/btn_samplerExpand.svg
index 76136584180..ac3258e03b8 100644
--- a/res/skins/LateNight/buttons/btn_samplerExpand.svg
+++ b/res/skins/LateNight/buttons/btn_samplerExpand.svg
@@ -1,145 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg4724"
-   width="20"
-   height="50"
-   version="1.1"
-   sodipodi:docname="btn_samplerExpand.svg"
-   viewBox="0 0 20 50"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)">
-  <metadata
-     id="metadata36">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="959"
-     inkscape:window-height="1024"
-     id="namedview34"
-     showgrid="false"
-     viewbox-width="38.6"
-     viewbox-x="0"
-     scale-x="1"
-     fit-margin-top="10"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="8.5641025"
-     inkscape:cx="-3.3488604"
-     inkscape:cy="28.917391"
-     inkscape:window-x="960"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg4724"
-     units="mm" />
-  <defs
-     id="defs4726">
-    <linearGradient
-       id="linearGradient5254"
-       x1="13"
-       x2="13"
-       y1="1027.4"
-       y2="1049.4"
-       gradientTransform="matrix(1.4783,0,0,0.82609,1.7609,182.59)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop3803-7"
-         stop-color="#242424"
-         offset="0" />
-      <stop
-         id="stop3805-5"
-         stop-color="#101010"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5772"
-       x1="20"
-       x2="20"
-       y1="1042.4"
-       y2="1035.4"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop5768"
-         stop-color="#c8c8c8"
-         offset="0" />
-      <stop
-         id="stop5770"
-         stop-color="#646464"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <g
-     id="layer1"
-     transform="matrix(0.54054054,0,0,1.9545433,-1.0810811,-2007.014)">
-    <rect
-       id="rect3029-6"
-       x="4"
-       y="1032.4"
-       width="35"
-       height="20"
-       rx="2"
-       ry="2"
-       style="color:#000000;opacity:0.62085003;fill:#060606" />
-    <rect
-       id="rect3029-6-6"
-       x="3"
-       y="1031.4"
-       width="35"
-       height="20"
-       rx="2"
-       ry="2"
-       style="color:#000000;opacity:0.72000002" />
-    <rect
-       id="rect3029"
-       x="2.5"
-       y="1030.9"
-       width="34"
-       height="19"
-       rx="2"
-       ry="2"
-       style="color:#000000;fill:url(#linearGradient5254)" />
-    <path
-       id="rect3029-96-0-7"
-       d="m 4.5,1030.9 c -1.0994,0 -2,0.9006 -2,2 v 1.5 h 34 v -1.5 c 0,-1.0994 -0.90065,-2 -2,-2 z"
-       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#666666"
-       inkscape:connector-curvature="0" />
-    <path
-       id="rect3029-96-0"
-       d="m 4,1030.4 c -1.0994,0 -2,0.9006 -2,2 v 16 c 0,1.0994 0.90065,2 2,2 h 31 c 1.0994,0 2,-0.9006 2,-2 v -16 c 0,-1.0994 -0.90065,-2 -2,-2 z m 0.3,1 h 30.4 c 0.56265,0 1.3,0.7374 1.3,1.3 v 15.4 c 0,0.5626 -0.73735,1.3 -1.3,1.3 H 4.3 c -0.56265,0 -1.3,-0.7374 -1.3,-1.3 v -15.4 c 0,-0.5626 0.73735,-1.3 1.3,-1.3 z"
-       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:url(#linearGradient5772)"
-       inkscape:connector-curvature="0" />
-  </g>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:33.14639664px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#eeeeee;fill-opacity:0.93333333;stroke:none;stroke-width:0.82865995"
-     x="2.5643125"
-     y="41.35804"
-     id="text97"><tspan
-       sodipodi:role="line"
-       id="tspan95"
-       x="2.5643125"
-       y="41.35804"
-       style="font-size:16.57319832px;fill:#eeeeee;fill-opacity:0.93333333;stroke-width:0.82865995">+</tspan></text>
-</svg>
+<svg id="svg24" width="20" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs12"><linearGradient id="b" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="matrix(1.4783 0 0 .82609 -.2391 -827.81)" gradientUnits="userSpaceOnUse"><stop id="stop2" stop-color="#242424" offset="0"/><stop id="stop4" stop-color="#101010" offset="1"/></linearGradient><linearGradient id="a" x1="20" x2="20" y1="1042.4" y2="1035.4" gradientTransform="translate(-2,-1010.4)" gradientUnits="userSpaceOnUse"><stop id="stop7" stop-color="#c8c8c8" offset="0"/><stop id="stop9" stop-color="#646464" offset="1"/></linearGradient></defs><path id="path14" d="m2.5.50002 15-2.5e-5c1.108-1.85e-6 2 .892 2 2v35c0 1.108-.892 2-2 2l-15 2.5e-5c-1.108 2e-6-2-.892-2-2v-35c0-1.108.892-2 2-2z" color="#000000" fill="url(#b)"/><path id="path16" d="m2.5.5c-1.0994 0-2 .9006-2 2v1.5h19v-1.5c0-1.0994-.90065-2-2-2z" color="#000000" fill="#666" style="text-decoration-line:none;text-indent:0;text-transform:none"/><path id="path18" d="m2 0c-1.0994 0-2 .9006-2 2v36c0 1.0994.90065 2 2 2h16c1.0994 0 2-.9006 2-2v-36c0-1.0994-.90065-2-2-2zm.3 1h15.4c.56265 0 1.3.7374 1.3 1.3v35.4c0 .5626-.73735 1.3-1.3 1.3h-15.4c-.56265 0-1.3-.7374-1.3-1.3v-35.4c0-.5626.73735-1.3 1.3-1.3z" color="#000000" fill="url(#a)" style="text-decoration-line:none;text-indent:0;text-transform:none"/><path id="rect3922-2-6" d="m15.38 20.126c-0.67323 0.58683-1.7042 0.51613-2.291-0.15711l-5.3929-6.1869c-1.2343 0.2913-2.5858-0.075451-3.4731-1.0934-0.88786-1.0186-1.0672-2.4084-0.60897-3.5917l1.4608 1.6759c0.58684 0.67324 1.6178 0.74394 2.291 0.15711 0.67323-0.58683 0.74287-1.6169 0.15604-2.2901l-1.4608-1.6759c1.2348-0.2924 2.5871 0.07495 3.475 1.0935 0.888 1.0187 1.0671 2.4084 0.60897 3.5917l5.392 6.1859c0.58684 0.67324 0.51615 1.7042-0.15708 2.291z" color="#000000" fill="#818181" stroke-width=".99996"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_samplerExpand_1_4.svg b/res/skins/LateNight/buttons/btn_samplerExpand_1_4.svg
deleted file mode 100644
index be6ce022d29..00000000000
--- a/res/skins/LateNight/buttons/btn_samplerExpand_1_4.svg
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg4724"
-   width="20"
-   height="50"
-   version="1.1"
-   sodipodi:docname="btn_samplerExpand_1_4.svg"
-   viewBox="0 0 20 50"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)">
-  <metadata
-     id="metadata36">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="959"
-     inkscape:window-height="1024"
-     id="namedview34"
-     showgrid="false"
-     viewbox-width="38.6"
-     viewbox-x="0"
-     scale-x="1"
-     fit-margin-top="10"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="8.5641025"
-     inkscape:cx="-3.3488604"
-     inkscape:cy="28.917391"
-     inkscape:window-x="960"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg4724"
-     units="mm" />
-  <defs
-     id="defs4726">
-    <linearGradient
-       id="linearGradient5254"
-       x1="13"
-       x2="13"
-       y1="1027.4"
-       y2="1049.4"
-       gradientTransform="matrix(1.4783,0,0,0.82609,1.7609,182.59)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop3803-7"
-         stop-color="#242424"
-         offset="0" />
-      <stop
-         id="stop3805-5"
-         stop-color="#101010"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5772"
-       x1="20"
-       x2="20"
-       y1="1042.4"
-       y2="1035.4"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop5768"
-         stop-color="#c8c8c8"
-         offset="0" />
-      <stop
-         id="stop5770"
-         stop-color="#646464"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <g
-     id="layer1"
-     transform="matrix(0.54054054,0,0,1.9545433,-1.0810811,-2007.014)">
-    <rect
-       id="rect3029-6"
-       x="4"
-       y="1032.4"
-       width="35"
-       height="20"
-       rx="2"
-       ry="2"
-       style="color:#000000;opacity:0.62085003;fill:#060606" />
-    <rect
-       id="rect3029-6-6"
-       x="3"
-       y="1031.4"
-       width="35"
-       height="20"
-       rx="2"
-       ry="2"
-       style="color:#000000;opacity:0.72000002" />
-    <rect
-       id="rect3029"
-       x="2.5"
-       y="1030.9"
-       width="34"
-       height="19"
-       rx="2"
-       ry="2"
-       style="color:#000000;fill:url(#linearGradient5254)" />
-    <path
-       id="rect3029-96-0-7"
-       d="m 4.5,1030.9 c -1.0994,0 -2,0.9006 -2,2 v 1.5 h 34 v -1.5 c 0,-1.0994 -0.90065,-2 -2,-2 z"
-       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#666666"
-       inkscape:connector-curvature="0" />
-    <path
-       id="rect3029-96-0"
-       d="m 4,1030.4 c -1.0994,0 -2,0.9006 -2,2 v 16 c 0,1.0994 0.90065,2 2,2 h 31 c 1.0994,0 2,-0.9006 2,-2 v -16 c 0,-1.0994 -0.90065,-2 -2,-2 z m 0.3,1 h 30.4 c 0.56265,0 1.3,0.7374 1.3,1.3 v 15.4 c 0,0.5626 -0.73735,1.3 -1.3,1.3 H 4.3 c -0.56265,0 -1.3,-0.7374 -1.3,-1.3 v -15.4 c 0,-0.5626 0.73735,-1.3 1.3,-1.3 z"
-       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:url(#linearGradient5772)"
-       inkscape:connector-curvature="0" />
-  </g>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:33.14639664px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#eeeeee;fill-opacity:0.93333333;stroke:none;stroke-width:0.82865995"
-     x="2.5643125"
-     y="41.35804"
-     id="text97"><tspan
-       sodipodi:role="line"
-       id="tspan95"
-       x="2.5643125"
-       y="41.35804"
-       style="font-size:16.57319832px;fill:#eeeeee;fill-opacity:0.93333333;stroke-width:0.82865995">+</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#eeeeee;fill-opacity:0.93333333;stroke:none"
-     x="0.64212495"
-     y="28.398001"
-     id="text87"><tspan
-       sodipodi:role="line"
-       id="tspan85"
-       x="0.64212495"
-       y="28.398001"
-       style="font-size:10.66666698px;line-height:0.25;fill:#eeeeee;fill-opacity:0.93333333">1-4</tspan></text>
-</svg>
diff --git a/res/skins/LateNight/buttons/btn_samplerExpand_5_8.svg b/res/skins/LateNight/buttons/btn_samplerExpand_5_8.svg
deleted file mode 100644
index a455a282cc6..00000000000
--- a/res/skins/LateNight/buttons/btn_samplerExpand_5_8.svg
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg4724"
-   width="20"
-   height="50"
-   version="1.1"
-   sodipodi:docname="btn_samplerExpand__5_8.svg"
-   viewBox="0 0 20 50"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)">
-  <metadata
-     id="metadata36">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="959"
-     inkscape:window-height="1024"
-     id="namedview34"
-     showgrid="false"
-     viewbox-width="38.6"
-     viewbox-x="0"
-     scale-x="1"
-     fit-margin-top="10"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     inkscape:zoom="8.5641025"
-     inkscape:cx="-3.3488604"
-     inkscape:cy="28.917391"
-     inkscape:window-x="960"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg4724"
-     units="mm" />
-  <defs
-     id="defs4726">
-    <linearGradient
-       id="linearGradient5254"
-       x1="13"
-       x2="13"
-       y1="1027.4"
-       y2="1049.4"
-       gradientTransform="matrix(1.4783,0,0,0.82609,1.7609,182.59)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop3803-7"
-         stop-color="#242424"
-         offset="0" />
-      <stop
-         id="stop3805-5"
-         stop-color="#101010"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5772"
-       x1="20"
-       x2="20"
-       y1="1042.4"
-       y2="1035.4"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop5768"
-         stop-color="#c8c8c8"
-         offset="0" />
-      <stop
-         id="stop5770"
-         stop-color="#646464"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <g
-     id="layer1"
-     transform="matrix(0.54054054,0,0,1.9545433,-1.0810811,-2007.014)">
-    <rect
-       id="rect3029-6"
-       x="4"
-       y="1032.4"
-       width="35"
-       height="20"
-       rx="2"
-       ry="2"
-       style="color:#000000;opacity:0.62085003;fill:#060606" />
-    <rect
-       id="rect3029-6-6"
-       x="3"
-       y="1031.4"
-       width="35"
-       height="20"
-       rx="2"
-       ry="2"
-       style="color:#000000;opacity:0.72000002" />
-    <rect
-       id="rect3029"
-       x="2.5"
-       y="1030.9"
-       width="34"
-       height="19"
-       rx="2"
-       ry="2"
-       style="color:#000000;fill:url(#linearGradient5254)" />
-    <path
-       id="rect3029-96-0-7"
-       d="m 4.5,1030.9 c -1.0994,0 -2,0.9006 -2,2 v 1.5 h 34 v -1.5 c 0,-1.0994 -0.90065,-2 -2,-2 z"
-       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:#666666"
-       inkscape:connector-curvature="0" />
-    <path
-       id="rect3029-96-0"
-       d="m 4,1030.4 c -1.0994,0 -2,0.9006 -2,2 v 16 c 0,1.0994 0.90065,2 2,2 h 31 c 1.0994,0 2,-0.9006 2,-2 v -16 c 0,-1.0994 -0.90065,-2 -2,-2 z m 0.3,1 h 30.4 c 0.56265,0 1.3,0.7374 1.3,1.3 v 15.4 c 0,0.5626 -0.73735,1.3 -1.3,1.3 H 4.3 c -0.56265,0 -1.3,-0.7374 -1.3,-1.3 v -15.4 c 0,-0.5626 0.73735,-1.3 1.3,-1.3 z"
-       style="color:#000000;text-indent:0;text-decoration:none;text-decoration-line:none;text-transform:none;fill:url(#linearGradient5772)"
-       inkscape:connector-curvature="0" />
-  </g>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:33.14639664px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#eeeeee;fill-opacity:0.93333333;stroke:none;stroke-width:0.82865995"
-     x="2.5643125"
-     y="41.35804"
-     id="text97"><tspan
-       sodipodi:role="line"
-       id="tspan95"
-       x="2.5643125"
-       y="41.35804"
-       style="font-size:16.57319832px;fill:#eeeeee;fill-opacity:0.93333333;stroke-width:0.82865995">+</tspan></text>
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#eeeeee;fill-opacity:0.93333333;stroke:none"
-     x="0.64212495"
-     y="28.398001"
-     id="text87"><tspan
-       sodipodi:role="line"
-       id="tspan85"
-       x="0.64212495"
-       y="28.398001"
-       style="font-size:10.66666698px;line-height:0.25;fill:#eeeeee;fill-opacity:0.93333333">5-8</tspan></text>
-</svg>
diff --git a/res/skins/LateNight/sampler.xml b/res/skins/LateNight/sampler.xml
index 597acc0ebd8..5770cb44403 100644
--- a/res/skins/LateNight/sampler.xml
+++ b/res/skins/LateNight/sampler.xml
@@ -4,7 +4,6 @@
     <ObjectName>SamplerDeck</ObjectName>
     <Layout>horizontal</Layout>
     <SizePolicy>me,min</SizePolicy>
-    <MinimumSize>280,100</MinimumSize>
     <Children>
       <!-- SamplerMainControls -->
       <WidgetGroup>
diff --git a/res/skins/LateNight/samplers_4decks.xml b/res/skins/LateNight/samplers_4decks.xml
new file mode 100644
index 00000000000..2af0c7fec75
--- /dev/null
+++ b/res/skins/LateNight/samplers_4decks.xml
@@ -0,0 +1,95 @@
+<Template>
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,max</SizePolicy>
+    <Children>
+
+      <!-- Select between big or small samplers -->
+      <WidgetStack currentpage="[Skin],expand_samplers">
+        <Children>
+
+          <!-- 4 small Samplers -->
+          <WidgetGroup>
+            <ObjectName>SamplerRow</ObjectName>
+		        <Layout>horizontal</Layout>
+		        <Children>
+
+              <SingletonContainer>
+                <ObjectName>Sampler1Small_Singleton</ObjectName>
+              </SingletonContainer>
+
+              <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+
+              <SingletonContainer>
+                <ObjectName>Sampler2Small_Singleton</ObjectName>
+              </SingletonContainer>
+
+              <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+
+              <SingletonContainer>
+                <ObjectName>SamplerExpandbutton_Singleton</ObjectName>
+              </SingletonContainer>
+
+              <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+
+              <SingletonContainer>
+                <ObjectName>Sampler3Small_Singleton</ObjectName>
+              </SingletonContainer>
+
+              <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+
+              <SingletonContainer>
+                <ObjectName>Sampler4Small_Singleton</ObjectName>
+              </SingletonContainer>
+
+            </Children>
+          </WidgetGroup>
+          <!-- /4 small Samplers -->
+
+          <!-- 4 big Samplers -->
+          <WidgetGroup trigger="[Skin],expand_samplers" on_hide_select="0">
+            <ObjectName>SamplerRow</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+
+              <SingletonContainer>
+                <ObjectName>Sampler1Big_Singleton</ObjectName>
+              </SingletonContainer>
+
+              <WidgetGroup><Size>8f,1min</Size></WidgetGroup>
+
+              <SingletonContainer>
+                <ObjectName>Sampler2Big_Singleton</ObjectName>
+              </SingletonContainer>
+
+              <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+
+              <SingletonContainer>
+                <ObjectName>SamplerExpandbutton_Singleton</ObjectName>
+              </SingletonContainer>
+
+              <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+
+              <SingletonContainer>
+                <ObjectName>Sampler3Big_Singleton</ObjectName>
+              </SingletonContainer>
+
+              <WidgetGroup><Size>8f,1min</Size></WidgetGroup>
+
+              <SingletonContainer>
+                <ObjectName>Sampler4Big_Singleton</ObjectName>
+              </SingletonContainer>
+
+            </Children>
+          </WidgetGroup>
+          <!-- /4 big Samplers -->
+
+        </Children>
+      </WidgetStack>
+
+      
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/samplers_8decks.xml b/res/skins/LateNight/samplers_8decks.xml
new file mode 100644
index 00000000000..08c865ca7d1
--- /dev/null
+++ b/res/skins/LateNight/samplers_8decks.xml
@@ -0,0 +1,159 @@
+<Template>
+  <WidgetGroup>
+    <Layout>horizontal</Layout>
+    <SizePolicy>me,max</SizePolicy>
+    <Children>
+
+      <!-- Select between big or small samplers -->
+      <WidgetStack currentpage="[Skin],expand_samplers">
+        <Children>
+
+          <!--8 big Samplers -->
+          <WidgetGroup>
+            <ObjectName>SamplerRow</ObjectName>
+		        <Layout>horizontal</Layout>
+		        <Children>
+
+              <SingletonContainer>
+                <ObjectName>Sampler1Small_Singleton</ObjectName>
+              </SingletonContainer>
+
+              <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+
+              <SingletonContainer>
+                <ObjectName>Sampler2Small_Singleton</ObjectName>
+              </SingletonContainer>
+
+              <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+
+              <SingletonContainer>
+                <ObjectName>Sampler3Small_Singleton</ObjectName>
+              </SingletonContainer>
+
+              <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+
+              <SingletonContainer>
+                <ObjectName>Sampler4Small_Singleton</ObjectName>
+              </SingletonContainer>
+
+              <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+
+              <SingletonContainer>
+                <ObjectName>SamplerExpandbutton_Singleton</ObjectName>
+              </SingletonContainer>
+
+              <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+
+              <Template src="skin:samplersmall.xml">
+                <SetVariable name="samplernum">5</SetVariable>
+              </Template>
+
+              <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+
+              <Template src="skin:samplersmall.xml">
+                <SetVariable name="samplernum">6</SetVariable>
+              </Template>
+
+              <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+
+              <Template src="skin:samplersmall.xml">
+                <SetVariable name="samplernum">7</SetVariable>
+              </Template>
+
+              <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+
+              <Template src="skin:samplersmall.xml">
+                <SetVariable name="samplernum">8</SetVariable>
+              </Template>
+
+            </Children>
+          </WidgetGroup>
+
+          <!--8 small Samplers -->
+          <WidgetGroup trigger="[Skin],expand_samplers" on_hide_select="0">
+            <Layout>vertical</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+
+              <!-- First row -->
+              <WidgetGroup>
+                <ObjectName>SamplerRow</ObjectName>
+                <Layout>horizontal</Layout>
+                <SizePolicy>min,min</SizePolicy>
+                <Children>
+
+                  <SingletonContainer>
+                    <ObjectName>Sampler1Big_Singleton</ObjectName>
+                  </SingletonContainer>
+
+                  <WidgetGroup><Size>8f,1min</Size></WidgetGroup>
+
+                  <SingletonContainer>
+                    <ObjectName>Sampler2Big_Singleton</ObjectName>
+                  </SingletonContainer>
+
+                  <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+
+                  <SingletonContainer>
+                    <ObjectName>SamplerExpandbutton_Singleton</ObjectName>
+                  </SingletonContainer>
+
+                  <WidgetGroup><Size>5f,1min</Size></WidgetGroup>
+
+                  <Template src="skin:sampler.xml">
+                    <SetVariable name="samplernum">5</SetVariable>
+                  </Template>
+
+                  <WidgetGroup><Size>8f,1min</Size></WidgetGroup>
+
+                  <Template src="skin:sampler.xml">
+                    <SetVariable name="samplernum">6</SetVariable>
+                  </Template>
+
+                </Children>
+              </WidgetGroup>
+              <!-- /First row -->
+
+              <!-- Second row -->
+              <WidgetGroup>
+                <ObjectName>SamplerRow</ObjectName>
+                <Layout>horizontal</Layout>
+                <Children>
+
+                  <SingletonContainer>
+                    <ObjectName>Sampler3Big_Singleton</ObjectName>
+                  </SingletonContainer>
+
+                  <WidgetGroup><Size>8f,1min</Size></WidgetGroup>
+
+                  <SingletonContainer>
+                    <ObjectName>Sampler4Big_Singleton</ObjectName>
+                  </SingletonContainer>
+
+                  <WidgetGroup><Size>30f,1min</Size></WidgetGroup>
+
+                  <Template src="skin:sampler.xml">
+                    <SetVariable name="samplernum">7</SetVariable>
+                  </Template>
+
+                  <WidgetGroup><Size>8f,1min</Size></WidgetGroup>
+
+                  <Template src="skin:sampler.xml">
+                    <SetVariable name="samplernum">8</SetVariable>
+                  </Template>
+
+                </Children>
+              </WidgetGroup>
+              <!-- /Second row -->
+
+            </Children>
+          </WidgetGroup>
+
+        </Children>
+      </WidgetStack>
+
+      
+
+    </Children>
+  </WidgetGroup>
+</Template>
diff --git a/res/skins/LateNight/samplers_rack.xml b/res/skins/LateNight/samplers_rack.xml
index ddfc4695dae..2ab77778974 100644
--- a/res/skins/LateNight/samplers_rack.xml
+++ b/res/skins/LateNight/samplers_rack.xml
@@ -1,5 +1,168 @@
 <Template>
 
+  <SingletonDefinition>
+    <ObjectName>SamplerExpandbutton_Singleton</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>AlignCenterTop</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <PushButton>
+            <TooltipId>show_samplers</TooltipId>
+            <ObjectName>SamplerExpandbutton</ObjectName>
+            <Size>min,me</Size>
+            <NumberStates>2</NumberStates>
+            <State>
+              <Number>0</Number>
+              <Pressed>skin:/buttons/btn_samplerExpand.svg</Pressed>
+              <Unpressed>skin:/buttons/btn_samplerExpand.svg</Unpressed>
+            </State>
+            <State>
+              <Number>1</Number>
+              <Pressed>skin:/buttons/btn_samplerCollapse.svg</Pressed>
+              <Unpressed>skin:/buttons/btn_samplerCollapse.svg</Unpressed>
+            </State>
+            <Connection>
+              <ConfigKey>[Skin],expand_samplers</ConfigKey>
+              <ButtonState>LeftButton</ButtonState>
+            </Connection>
+          </PushButton>
+
+          <WidgetGroup><Size>0min,0me</Size></WidgetGroup>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>Sampler1Small_Singleton</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>AlignCenterTop</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:samplersmall.xml">
+            <SetVariable name="samplernum">1</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>Sampler2Small_Singleton</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>AlignCenterTop</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:samplersmall.xml">
+            <SetVariable name="samplernum">2</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>Sampler3Small_Singleton</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>AlignCenterTop</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:samplersmall.xml">
+            <SetVariable name="samplernum">3</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>Sampler4Small_Singleton</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>AlignCenterTop</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:samplersmall.xml">
+            <SetVariable name="samplernum">4</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>Sampler1Big_Singleton</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>AlignCenterTop</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:sampler.xml">
+            <SetVariable name="samplernum">1</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>Sampler2Big_Singleton</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>AlignCenterTop</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:sampler.xml">
+            <SetVariable name="samplernum">2</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>Sampler3Big_Singleton</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>AlignCenterTop</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:sampler.xml">
+            <SetVariable name="samplernum">3</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
+  <SingletonDefinition>
+    <ObjectName>Sampler4Big_Singleton</ObjectName>
+    <Children>
+      <WidgetGroup>
+        <ObjectName>AlignCenterTop</ObjectName>
+        <Layout>vertical</Layout>
+        <SizePolicy>min,min</SizePolicy>
+        <Children>
+          <Template src="skin:sampler.xml">
+            <SetVariable name="samplernum">4</SetVariable>
+          </Template>
+        </Children>
+      </WidgetGroup>
+    </Children>
+  </SingletonDefinition>
+
   <WidgetGroup>
     <Layout>horizontal</Layout>
     <SizePolicy>me,max</SizePolicy>
@@ -10,60 +173,19 @@
     <Children>
 
       <WidgetGroup>
-      <Layout>horizontal</Layout>
+        <Layout>horizontal</Layout>
         <Children>
-
-          <!-- Select between 1-4 big or orthers -->
           <WidgetStack currentpage="[Skin],8_samplers">
             <Children>
 
               <!--only 4 Sampler but big -->
-              <WidgetGroup>
-                <Layout>horizontal</Layout>
-                <Children>
-                  <Template src="skin:samplers_unit_1234.xml"/>
-                </Children>
-              </WidgetGroup>
-              <!--/only 4 Sampler but big -->
+              <Template src="skin:samplers_4decks.xml"/>
 
               <!--8 Sampler -->
-              <WidgetGroup trigger="[Skin],8_samplers" on_hide_select="0">
-                <Layout>horizontal</Layout>
-                <Children>
-
-                  <!-- Select between big or small samplers -->
-                  <WidgetStack currentpage="[Skin],expand_samplers">
-                    <Children>
-
-                      <!--8 big Sampler -->
-                      <WidgetGroup>
-                        <Layout>horizontal</Layout>
-                        <Children>
-                          <Template src="skin:samplers_unit_1-8_big.xml"/>
-                        </Children>
-                      </WidgetGroup>
-                      <!--/8 big Sampler -->
-
-                      <!--8 small Sampler -->
-                      <WidgetGroup trigger="[Skin],expand_samplers" on_hide_select="0">
-                        <Layout>horizontal</Layout>
-                        <Children>
-                          <Template src="skin:samplers_unit_1-8.xml"/>
-                        </Children>
-                      </WidgetGroup>
-                      <!--/8 Sampler -->
-
-                    </Children>
-                  </WidgetStack>
-                  <!-- / Select between big or small samplers -->
-
-                </Children>
-              </WidgetGroup>
-              <!--/8 Sampler -->
+              <Template trigger="[Skin],8_samplers" on_hide_select="0" src="skin:samplers_8decks.xml"/>
 
             </Children>
           </WidgetStack>
-          <!-- /Select between 1-4 big or orthers -->
 
         </Children>
       </WidgetGroup>
diff --git a/res/skins/LateNight/samplers_unit_1-8.xml b/res/skins/LateNight/samplers_unit_1-8.xml
deleted file mode 100644
index cfce6d8864a..00000000000
--- a/res/skins/LateNight/samplers_unit_1-8.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<Template>
-  <WidgetGroup>
-    <Layout>horizontal</Layout>
-    <SizePolicy>me,max</SizePolicy>
-    <Children>
-
-      <WidgetGroup>
-		    <Layout>horizontal</Layout>
-		    <Children>
-
-	        <Template src="skin:samplersmall.xml">
-	          <SetVariable name="samplernum">1</SetVariable>
-	        </Template>
-
-	        <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-
-	        <Template src="skin:samplersmall.xml">
-	          <SetVariable name="samplernum">2</SetVariable>
-	        </Template>
-
-	        <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-
-	        <Template src="skin:samplersmall.xml">
-	          <SetVariable name="samplernum">3</SetVariable>
-	        </Template>
-
-	        <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-
-	        <Template src="skin:samplersmall.xml">
-	          <SetVariable name="samplernum">4</SetVariable>
-	        </Template>
-
-          <WidgetGroup><Size>8f,1min</Size></WidgetGroup>
-
-          <PushButton>
-            <TooltipId>show_samplers</TooltipId>
-            <ObjectName>Samplerexpandbutton</ObjectName>
-            <Size>min,min</Size>
-            <NumberStates>2</NumberStates>
-            <State>
-              <Number>0</Number>
-              <Pressed>skin:/buttons/btn_samplerCollapse.svg</Pressed>
-              <Unpressed>skin:/buttons/btn_samplerCollapse.svg</Unpressed>
-            </State>
-            <State>
-              <Number>1</Number>
-              <Pressed>skin:/buttons/btn_samplerExpand.svg</Pressed>
-              <Unpressed>skin:/buttons/btn_samplerExpand.svg</Unpressed>
-            </State>
-            <Connection>
-              <ConfigKey>[Skin],expand_samplers</ConfigKey>
-              <ButtonState>LeftButton</ButtonState>
-            </Connection>
-          </PushButton>
-
-          <WidgetGroup><Size>8f,1min</Size></WidgetGroup>
-
-          <Template src="skin:samplersmall.xml">
-            <SetVariable name="samplernum">5</SetVariable>
-          </Template>
-
-          <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-
-          <Template src="skin:samplersmall.xml">
-            <SetVariable name="samplernum">6</SetVariable>
-          </Template>
-
-          <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-
-          <Template src="skin:samplersmall.xml">
-            <SetVariable name="samplernum">7</SetVariable>
-          </Template>
-
-          <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-
-          <Template src="skin:samplersmall.xml">
-            <SetVariable name="samplernum">8</SetVariable>
-          </Template>
-
-        </Children>
-      </WidgetGroup>
-
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/samplers_unit_1-8_big.xml b/res/skins/LateNight/samplers_unit_1-8_big.xml
deleted file mode 100644
index 864b5c0d5a2..00000000000
--- a/res/skins/LateNight/samplers_unit_1-8_big.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<Template>
-  <WidgetGroup>
-    <Layout>horizontal</Layout>
-    <SizePolicy>me,max</SizePolicy>
-    <Children>
-
-	<WidgetGroup>
-		    <Layout>vertical</Layout>
-		    <SizePolicy>min,min</SizePolicy>
-		    <Children>
-
-		      <!-- First row -->
-		      <WidgetGroup>
-				    <ObjectName>SamplerTextSmall</ObjectName>
-				    <Layout>horizontal</Layout>
-				    <SizePolicy>min,min</SizePolicy>
-				    <Children>
-
-							<Template src="skin:sampler.xml">
-								<SetVariable name="samplernum">1</SetVariable>
-							</Template>
-
-							<WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-
-							<Template src="skin:sampler.xml">
-								<SetVariable name="samplernum">2</SetVariable>
-							</Template>
-
-							<WidgetGroup><Size>8f,1min</Size></WidgetGroup>
-
-							<PushButton>
-								<TooltipId>show_samplers</TooltipId>
-								<ObjectName>Samplerexpandbutton</ObjectName>
-								<Size>min,min</Size>
-								<NumberStates>2</NumberStates>
-								<State>
-								  <Number>0</Number>
-								  <Pressed>skin:/buttons/btn_samplerCollapse.svg</Pressed>
-								  <Unpressed>skin:/buttons/btn_samplerCollapse.svg</Unpressed>
-								</State>
-								<State>
-								  <Number>1</Number>
-								  <Pressed>skin:/buttons/btn_samplerExpand.svg</Pressed>
-								  <Unpressed>skin:/buttons/btn_samplerExpand.svg</Unpressed>
-								</State>
-								<Connection>
-								  <ConfigKey>[Skin],expand_samplers</ConfigKey>
-								  <ButtonState>LeftButton</ButtonState>
-								</Connection>
-							</PushButton>
-
-							<WidgetGroup><Size>8f,1min</Size></WidgetGroup>
-
-							<Template src="skin:sampler.xml">
-								<SetVariable name="samplernum">5</SetVariable>
-							</Template>
-
-							<WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-
-							<Template src="skin:sampler.xml">
-								<SetVariable name="samplernum">6</SetVariable>
-							</Template>
-
-					  </Children>
-					</WidgetGroup>
-					<!-- /First row -->
-
-				  <!-- Second row -->
-				  <WidgetGroup>
-					  <Layout>horizontal</Layout>
-					  <Children>
-
-						  <Template src="skin:sampler.xml">
-						    <SetVariable name="samplernum">3</SetVariable>
-						  </Template>
-
-						  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-
-						  <Template src="skin:sampler.xml">
-						    <SetVariable name="samplernum">4</SetVariable>
-						  </Template>
-
-						  <WidgetGroup><Size>36f,1min</Size></WidgetGroup>
-
-						  <Template src="skin:sampler.xml">
-						    <SetVariable name="samplernum">7</SetVariable>
-						  </Template>
-
-						  <WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-
-						  <Template src="skin:sampler.xml">
-						    <SetVariable name="samplernum">8</SetVariable>
-						  </Template>
-
-					  </Children>
-				  </WidgetGroup>
-				  <!-- /Second row -->
-
-				</Children>
-			</WidgetGroup>
-
-    </Children>
-  </WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/samplers_unit_1234.xml b/res/skins/LateNight/samplers_unit_1234.xml
deleted file mode 100644
index 2fd1f7acbf5..00000000000
--- a/res/skins/LateNight/samplers_unit_1234.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<Template>
-	<WidgetGroup>
-		<Layout>horizontal</Layout>
-		<SizePolicy>me,max</SizePolicy>
-		<Children>
-
-			<WidgetGroup>
-				<Layout>horizontal</Layout>
-				<Children>
-
-					<Template src="skin:sampler.xml">
-						<SetVariable name="samplernum">1</SetVariable>
-					</Template>
-
-					<WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-
-					<Template src="skin:sampler.xml">
-						<SetVariable name="samplernum">2</SetVariable>
-					</Template>
-
-					<WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-
-					<Template src="skin:sampler.xml">
-						<SetVariable name="samplernum">3</SetVariable>
-					</Template>
-
-					<WidgetGroup><Size>4f,1min</Size></WidgetGroup>
-
-					<Template src="skin:sampler.xml">
-						<SetVariable name="samplernum">4</SetVariable>
-					</Template>
-
-				</Children>
-			</WidgetGroup>
-
-		</Children>
-	</WidgetGroup>
-</Template>
diff --git a/res/skins/LateNight/samplersmall.xml b/res/skins/LateNight/samplersmall.xml
index 5f040554e55..382057e58c1 100644
--- a/res/skins/LateNight/samplersmall.xml
+++ b/res/skins/LateNight/samplersmall.xml
@@ -4,7 +4,6 @@
     <ObjectName>SamplerDeck</ObjectName>
     <Layout>horizontal</Layout>
     <SizePolicy>me,min</SizePolicy>
-    <MinimumSize>100,40</MinimumSize>
     <Children>
 
       <WidgetGroup>
@@ -41,106 +40,109 @@
       </WidgetGroup>
 
       <WidgetGroup>
-      <Layout>vertical</Layout>
-      <SizePolicy>min,min</SizePolicy>
-      <Children>
-
-        <!-- First row -->
-        <WidgetGroup>
-        <ObjectName>SamplerTextSmall</ObjectName>
-        <Layout>horizontal</Layout>
+        <Layout>vertical</Layout>
         <SizePolicy>min,min</SizePolicy>
         <Children>
-          <TrackProperty>
-            <TooltipId>track_title</TooltipId>
-            <ObjectName>SamplerTitleSmall</ObjectName>
-            <SizePolicy>me,min</SizePolicy>
-            <Property>title</Property>
-            <Group><Variable name="group"/></Group>
-            <Elide>right</Elide>
-          </TrackProperty>
-        </Children>
-        </WidgetGroup>
-        <!-- /First row -->
 
-        <!-- Second row -->
-        <WidgetGroup>
-        <Layout>horizontal</Layout>
-        <Children>
+          <!-- First row -->
+          <WidgetGroup>
+            <ObjectName>SamplerTextSmall</ObjectName>
+            <Layout>horizontal</Layout>
+            <SizePolicy>min,min</SizePolicy>
+            <Children>
+              <TrackProperty>
+                <TooltipId>track_title</TooltipId>
+                <ObjectName>SamplerTitleSmall</ObjectName>
+                <SizePolicy>me,min</SizePolicy>
+                <Property>title</Property>
+                <Group><Variable name="group"/></Group>
+                <Elide>right</Elide>
+              </TrackProperty>
+            </Children>
+          </WidgetGroup>
+          <!-- /First row -->
 
-          <Number>
-          <TooltipId>visual_bpm</TooltipId>
-          <Group>[Sampler<Variable name="samplernum"/>]</Group>
-          <!--CSS alignments not respected see bug lp:605530 , lets call <Alignment>-->
-          <Alignment>left</Alignment>
-          <Connection>
-              <ConfigKey>[Sampler<Variable name="samplernum"/>],visual_bpm</ConfigKey>
-          </Connection>
-          </Number>
+          <!-- Second row -->
+          <WidgetGroup>
+            <ObjectName>AlignLeft</ObjectName>
+            <Layout>horizontal</Layout>
+            <Children>
 
-          <PushButton>
-            <TooltipId>orientation</TooltipId>
-            <NumberStates>3</NumberStates>
-            <State>
-              <Number>0</Number>
-              <Pressed>buttons/btn_orientation_sampler_left.svg</Pressed>
-              <Unpressed>buttons/btn_orientation_sampler_left.svg</Unpressed>
-            </State>
-            <State>
-              <Number>1</Number>
-              <Pressed>buttons/btn_orientation_sampler_master.svg</Pressed>
-              <Unpressed>buttons/btn_orientation_sampler_master.svg</Unpressed>
-            </State>
-            <State>
-              <Number>2</Number>
-              <Pressed>buttons/btn_orientation_sampler_right.svg</Pressed>
-              <Unpressed>buttons/btn_orientation_sampler_right.svg</Unpressed>
-            </State>
-            <Connection>
-              <ConfigKey><Variable name="group"/>,orientation</ConfigKey>
-              <ButtonState>LeftButton</ButtonState>
-            </Connection>
-          </PushButton>
+              <Number>
+                <TooltipId>visual_bpm</TooltipId>
+                <Group>[Sampler<Variable name="samplernum"/>]</Group>
+                <!--CSS alignments not respected see bug lp:605530 , lets call <Alignment>-->
+                <Alignment>left</Alignment>
+                <Connection>
+                  <ConfigKey>[Sampler<Variable name="samplernum"/>],visual_bpm</ConfigKey>
+                </Connection>
+              </Number>
 
-          <PushButton>
-            <TooltipId>keylock</TooltipId>
-            <NumberStates>2</NumberStates>
-            <State>
-              <Number>0</Number>
-              <Pressed>buttons/btn_keylock.svg</Pressed>
-              <Unpressed>buttons/btn_keylock.svg</Unpressed>
-            </State>
-            <State>
-              <Number>1</Number>
-              <Pressed>buttons/btn_keylock_over.svg</Pressed>
-              <Unpressed>buttons/btn_keylock_over.svg</Unpressed>
-            </State>
-            <Connection>
-              <ConfigKey><Variable name="group"/>,keylock</ConfigKey>
-            </Connection>
-          </PushButton>
+              <PushButton>
+                <TooltipId>orientation</TooltipId>
+                <NumberStates>3</NumberStates>
+                <State>
+                  <Number>0</Number>
+                  <Pressed>buttons/btn_orientation_sampler_left.svg</Pressed>
+                  <Unpressed>buttons/btn_orientation_sampler_left.svg</Unpressed>
+                </State>
+                <State>
+                  <Number>1</Number>
+                  <Pressed>buttons/btn_orientation_sampler_master.svg</Pressed>
+                  <Unpressed>buttons/btn_orientation_sampler_master.svg</Unpressed>
+                </State>
+                <State>
+                  <Number>2</Number>
+                  <Pressed>buttons/btn_orientation_sampler_right.svg</Pressed>
+                  <Unpressed>buttons/btn_orientation_sampler_right.svg</Unpressed>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,orientation</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+              </PushButton>
 
-          <PushButton>
-            <TooltipId>eject</TooltipId>
-            <NumberStates>1</NumberStates>
-            <State>
-              <Number>0</Number>
-              <Pressed>buttons/btn_eject_over.svg</Pressed>
-              <Unpressed>buttons/btn_eject.svg</Unpressed>
-            </State>
-            <Connection>
-              <ConfigKey><Variable name="group"/>,eject</ConfigKey>
-              <ButtonState>LeftButton</ButtonState>
-            </Connection>
-          </PushButton>
+              <PushButton>
+                <TooltipId>keylock</TooltipId>
+                <NumberStates>2</NumberStates>
+                <State>
+                  <Number>0</Number>
+                  <Pressed>buttons/btn_keylock.svg</Pressed>
+                  <Unpressed>buttons/btn_keylock.svg</Unpressed>
+                </State>
+                <State>
+                  <Number>1</Number>
+                  <Pressed>buttons/btn_keylock_over.svg</Pressed>
+                  <Unpressed>buttons/btn_keylock_over.svg</Unpressed>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,keylock</ConfigKey>
+                </Connection>
+              </PushButton>
 
-        </Children>
-      </WidgetGroup>
-      <!-- /Second row -->
+              <PushButton>
+                <TooltipId>eject</TooltipId>
+                <NumberStates>1</NumberStates>
+                <State>
+                  <Number>0</Number>
+                  <Pressed>buttons/btn_eject_over.svg</Pressed>
+                  <Unpressed>buttons/btn_eject.svg</Unpressed>
+                </State>
+                <Connection>
+                  <ConfigKey><Variable name="group"/>,eject</ConfigKey>
+                  <ButtonState>LeftButton</ButtonState>
+                </Connection>
+              </PushButton>
 
+              <WidgetGroup></WidgetGroup>
 
-    </Children>
-    </WidgetGroup>
+            </Children>
+          </WidgetGroup>
+          <!-- /Second row -->
+
+
+        </Children>
+      </WidgetGroup>
 
     </Children>
   </WidgetGroup>
diff --git a/res/skins/LateNight/style.qss b/res/skins/LateNight/style.qss
index 5319d9a8b12..63312d3666c 100644
--- a/res/skins/LateNight/style.qss
+++ b/res/skins/LateNight/style.qss
@@ -1075,12 +1075,19 @@ border: 0px;
   padding-top: 5px;
 }
 
+#SamplerRow {
+  qproperty-layoutAlignment: 'AlignTop';
+  margin: 5px 0px 2px 0px;
+}
+
 #SamplerDeck {
-  margin-top: 5px;
   border: 1px solid #585858;
   background-color: #1e1e1e;
 }
 
+#SamplerExpandbutton {
+}
+
 #SamplerMainControls {
 }
 

From 560fec73ba405f54dbd4af8c4ef53f5b139f4af1 Mon Sep 17 00:00:00 2001
From: nopeppermint <stifisax@gmx.ch>
Date: Tue, 23 Oct 2018 19:47:03 +0200
Subject: [PATCH 3/5] change samplerexpand button logo, add bpm to big sampler

---
 .../LateNight/buttons/btn_samplerCollapse.svg | 114 +++++++++++++++++-
 .../LateNight/buttons/btn_samplerExpand.svg   | 114 +++++++++++++++++-
 res/skins/LateNight/sampler.xml               |  11 ++
 3 files changed, 237 insertions(+), 2 deletions(-)

diff --git a/res/skins/LateNight/buttons/btn_samplerCollapse.svg b/res/skins/LateNight/buttons/btn_samplerCollapse.svg
index fd33f484c27..60719fa582b 100644
--- a/res/skins/LateNight/buttons/btn_samplerCollapse.svg
+++ b/res/skins/LateNight/buttons/btn_samplerCollapse.svg
@@ -1 +1,113 @@
-<svg id="svg4724" width="20" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs id="defs4726"><linearGradient id="linearGradient5772-6" x1="20" x2="20" y1="1042.4" y2="1035.4" gradientTransform="matrix(1,0,0,-1,0,1068.3)" gradientUnits="userSpaceOnUse"><stop id="stop5768-7" stop-color="#c8c8c8" offset="0"/><stop id="stop5770-5" stop-color="#646464" offset="1"/></linearGradient><linearGradient id="linearGradient5254-3" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="matrix(1.4783 0 0 .82609 1.7609 -829.81)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-5" stop-color="#242424" offset="0"/><stop id="stop3805-5-6" stop-color="#101010" offset="1"/></linearGradient></defs><path id="rect3029" d="m2.5 0.50002h15c1.108 0 2 0.892 2 2v35c0 1.108-0.892 2-2 2h-15c-1.108 0-2-0.892-2-2v-35c0-1.108 0.892-2 2-2z" color="#000000" fill="url(#linearGradient5254-3)"/><path id="rect3029-96-0-7" d="m2.5 0.5c-1.0994 0-2 0.9006-2 2v1.5h19v-1.5c0-1.0994-0.90065-2-2-2z" color="#000000" fill="#c8c8c8" style="text-decoration-line:none;text-indent:0;text-transform:none"/><path id="rect3029-96-0" d="m2 40c-1.0994 0-2-0.9006-2-2v-36c0-1.0994 0.90065-2 2-2h16c1.0994 0 2 0.9006 2 2v36c0 1.0994-0.90065 2-2 2zm0.3-1h15.4c0.56265 0 1.3-0.7374 1.3-1.3v-35.4c0-0.5626-0.73735-1.3-1.3-1.3h-15.4c-0.56265 0-1.3 0.7374-1.3 1.3v35.4c0 0.5626 0.73735 1.3 1.3 1.3z" color="#000000" fill="url(#linearGradient5772-6)" style="text-decoration-line:none;text-indent:0;text-transform:none"/><path id="rect3922-2-6-3" d="m15.38 20.126c-0.67323 0.58683-1.7042 0.51613-2.291-0.15711l-5.3929-6.1869c-1.2343 0.2913-2.5858-0.075451-3.4731-1.0934-0.88786-1.0186-1.0672-2.4084-0.60897-3.5917l1.4608 1.6759c0.58684 0.67324 1.6178 0.74394 2.291 0.15711 0.67323-0.58683 0.74287-1.6169 0.15604-2.2901l-1.4608-1.6759c1.2348-0.2924 2.5871 0.07495 3.475 1.0935 0.888 1.0187 1.0671 2.4084 0.60897 3.5917l5.392 6.1859c0.58684 0.67324 0.51615 1.7042-0.15708 2.291z" color="#000000" fill="#d2d2d2" stroke-width=".99996"/></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg4724"
+   width="20"
+   height="40"
+   version="1.1"
+   sodipodi:docname="btn_samplerCollapse.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata16">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1025"
+     id="namedview14"
+     showgrid="false"
+     inkscape:zoom="11.8"
+     inkscape:cx="6.5705596"
+     inkscape:cy="19.679147"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4724" />
+  <defs
+     id="defs4726">
+    <linearGradient
+       id="linearGradient5772-6"
+       x1="20"
+       x2="20"
+       y1="1042.4"
+       y2="1035.4"
+       gradientTransform="matrix(1,0,0,-1,0,1068.3)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop5768-7"
+         stop-color="#c8c8c8"
+         offset="0" />
+      <stop
+         id="stop5770-5"
+         stop-color="#646464"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5254-3"
+       x1="13"
+       x2="13"
+       y1="1027.4"
+       y2="1049.4"
+       gradientTransform="matrix(1.4783 0 0 .82609 1.7609 -829.81)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop3803-7-5"
+         stop-color="#242424"
+         offset="0" />
+      <stop
+         id="stop3805-5-6"
+         stop-color="#101010"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <path
+     id="rect3029"
+     d="m2.5 0.50002h15c1.108 0 2 0.892 2 2v35c0 1.108-0.892 2-2 2h-15c-1.108 0-2-0.892-2-2v-35c0-1.108 0.892-2 2-2z"
+     fill="url(#linearGradient5254-3)"
+     color="#000000" />
+  <path
+     id="rect3029-96-0-7"
+     d="m2.5 0.5c-1.0994 0-2 0.9006-2 2v1.5h19v-1.5c0-1.0994-0.90065-2-2-2z"
+     color="#000000"
+     fill="#c8c8c8"
+     style="text-decoration-line:none;text-indent:0;text-transform:none" />
+  <path
+     id="rect3029-96-0"
+     d="m2 40c-1.0994 0-2-0.9006-2-2v-36c0-1.0994 0.90065-2 2-2h16c1.0994 0 2 0.9006 2 2v36c0 1.0994-0.90065 2-2 2zm0.3-1h15.4c0.56265 0 1.3-0.7374 1.3-1.3v-35.4c0-0.5626-0.73735-1.3-1.3-1.3h-15.4c-0.56265 0-1.3 0.7374-1.3 1.3v35.4c0 0.5626 0.73735 1.3 1.3 1.3z"
+     color="#000000"
+     fill="url(#linearGradient5772-6)"
+     style="text-decoration-line:none;text-indent:0;text-transform:none" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:45.039814px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#d2d2d2;fill-opacity:1;stroke:none;stroke-width:1.1259954"
+     x="-47.820656"
+     y="12.34721"
+     id="text1512"
+     transform="matrix(0,-0.76954602,1.2994674,0,0,0)"><tspan
+       sodipodi:role="line"
+       id="tspan1510"
+       x="-47.820656"
+       y="12.34721"
+       style="font-size:15.01327038px;fill:#d2d2d2;fill-opacity:1;stroke-width:1.1259954">-&gt; &lt;-</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/buttons/btn_samplerExpand.svg b/res/skins/LateNight/buttons/btn_samplerExpand.svg
index ac3258e03b8..8357b572e48 100644
--- a/res/skins/LateNight/buttons/btn_samplerExpand.svg
+++ b/res/skins/LateNight/buttons/btn_samplerExpand.svg
@@ -1 +1,113 @@
-<svg id="svg24" width="20" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs12"><linearGradient id="b" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="matrix(1.4783 0 0 .82609 -.2391 -827.81)" gradientUnits="userSpaceOnUse"><stop id="stop2" stop-color="#242424" offset="0"/><stop id="stop4" stop-color="#101010" offset="1"/></linearGradient><linearGradient id="a" x1="20" x2="20" y1="1042.4" y2="1035.4" gradientTransform="translate(-2,-1010.4)" gradientUnits="userSpaceOnUse"><stop id="stop7" stop-color="#c8c8c8" offset="0"/><stop id="stop9" stop-color="#646464" offset="1"/></linearGradient></defs><path id="path14" d="m2.5.50002 15-2.5e-5c1.108-1.85e-6 2 .892 2 2v35c0 1.108-.892 2-2 2l-15 2.5e-5c-1.108 2e-6-2-.892-2-2v-35c0-1.108.892-2 2-2z" color="#000000" fill="url(#b)"/><path id="path16" d="m2.5.5c-1.0994 0-2 .9006-2 2v1.5h19v-1.5c0-1.0994-.90065-2-2-2z" color="#000000" fill="#666" style="text-decoration-line:none;text-indent:0;text-transform:none"/><path id="path18" d="m2 0c-1.0994 0-2 .9006-2 2v36c0 1.0994.90065 2 2 2h16c1.0994 0 2-.9006 2-2v-36c0-1.0994-.90065-2-2-2zm.3 1h15.4c.56265 0 1.3.7374 1.3 1.3v35.4c0 .5626-.73735 1.3-1.3 1.3h-15.4c-.56265 0-1.3-.7374-1.3-1.3v-35.4c0-.5626.73735-1.3 1.3-1.3z" color="#000000" fill="url(#a)" style="text-decoration-line:none;text-indent:0;text-transform:none"/><path id="rect3922-2-6" d="m15.38 20.126c-0.67323 0.58683-1.7042 0.51613-2.291-0.15711l-5.3929-6.1869c-1.2343 0.2913-2.5858-0.075451-3.4731-1.0934-0.88786-1.0186-1.0672-2.4084-0.60897-3.5917l1.4608 1.6759c0.58684 0.67324 1.6178 0.74394 2.291 0.15711 0.67323-0.58683 0.74287-1.6169 0.15604-2.2901l-1.4608-1.6759c1.2348-0.2924 2.5871 0.07495 3.475 1.0935 0.888 1.0187 1.0671 2.4084 0.60897 3.5917l5.392 6.1859c0.58684 0.67324 0.51615 1.7042-0.15708 2.291z" color="#000000" fill="#818181" stroke-width=".99996"/></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg24"
+   width="20"
+   height="40"
+   version="1.1"
+   sodipodi:docname="btn_samplerExpand.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata32">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="959"
+     inkscape:window-height="1024"
+     id="namedview30"
+     showgrid="false"
+     inkscape:zoom="11.8"
+     inkscape:cx="9.3964464"
+     inkscape:cy="17.441803"
+     inkscape:window-x="961"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg24" />
+  <defs
+     id="defs12">
+    <linearGradient
+       id="b"
+       x1="13"
+       x2="13"
+       y1="1027.4"
+       y2="1049.4"
+       gradientTransform="matrix(1.4783 0 0 .82609 -.2391 -827.81)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop2"
+         stop-color="#242424"
+         offset="0" />
+      <stop
+         id="stop4"
+         stop-color="#101010"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="a"
+       x1="20"
+       x2="20"
+       y1="1042.4"
+       y2="1035.4"
+       gradientTransform="translate(-2,-1010.4)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop7"
+         stop-color="#c8c8c8"
+         offset="0" />
+      <stop
+         id="stop9"
+         stop-color="#646464"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <path
+     id="path14"
+     d="m2.5.50002 15-2.5e-5c1.108-1.85e-6 2 .892 2 2v35c0 1.108-.892 2-2 2l-15 2.5e-5c-1.108 2e-6-2-.892-2-2v-35c0-1.108.892-2 2-2z"
+     color="#000000"
+     fill="url(#b)" />
+  <path
+     id="path16"
+     d="m2.5.5c-1.0994 0-2 .9006-2 2v1.5h19v-1.5c0-1.0994-.90065-2-2-2z"
+     color="#000000"
+     fill="#666"
+     style="text-decoration-line:none;text-indent:0;text-transform:none" />
+  <path
+     id="path18"
+     d="m2 0c-1.0994 0-2 .9006-2 2v36c0 1.0994.90065 2 2 2h16c1.0994 0 2-.9006 2-2v-36c0-1.0994-.90065-2-2-2zm.3 1h15.4c.56265 0 1.3.7374 1.3 1.3v35.4c0 .5626-.73735 1.3-1.3 1.3h-15.4c-.56265 0-1.3-.7374-1.3-1.3v-35.4c0-.5626.73735-1.3 1.3-1.3z"
+     color="#000000"
+     fill="url(#a)"
+     style="text-decoration-line:none;text-indent:0;text-transform:none" />
+  <text
+     xml:space="preserve"
+     style="font-style:normal;font-weight:normal;font-size:48.38502884px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#818181;fill-opacity:1;stroke:none;stroke-width:1.20962572"
+     x="-44.619175"
+     y="13.264388"
+     id="text1512"
+     transform="matrix(0,-0.82670201,1.2096257,0,0,0)"><tspan
+       sodipodi:role="line"
+       id="tspan1510"
+       x="-44.619175"
+       y="13.264388"
+       style="font-size:16.12834167px;fill:#818181;fill-opacity:1;stroke-width:1.20962572">&lt;--&gt;</tspan></text>
+</svg>
diff --git a/res/skins/LateNight/sampler.xml b/res/skins/LateNight/sampler.xml
index 5770cb44403..1378529d80f 100644
--- a/res/skins/LateNight/sampler.xml
+++ b/res/skins/LateNight/sampler.xml
@@ -24,6 +24,17 @@
                 <Group><Variable name="group"/></Group>
                 <Elide>right</Elide>
               </TrackProperty>
+
+              <Number>
+                <TooltipId>visual_bpm</TooltipId>
+                <Group>[Sampler<Variable name="samplernum"/>]</Group>
+                <!--CSS alignments not respected see bug lp:605530 , lets call <Alignment>-->
+                <Alignment>left</Alignment>
+                <Connection>
+                  <ConfigKey>[Sampler<Variable name="samplernum"/>],visual_bpm</ConfigKey>
+                </Connection>
+              </Number>
+
             </Children>
           </WidgetGroup>
 

From 2c1e59d29f1ef6d391f56be248811cf9f228aa55 Mon Sep 17 00:00:00 2001
From: ronso0 <ronso0@mixxx.org>
Date: Wed, 24 Oct 2018 19:22:34 +0200
Subject: [PATCH 4/5] tune expand/collapse icons

LateNight: optimize SVGs, decrease Eject & Keylock icons
---
 .../LateNight/buttons/btn_eject_sampler.svg   |   1 +
 .../buttons/btn_eject_sampler_over.svg        |   1 +
 .../LateNight/buttons/btn_keylock_sampler.svg |   1 +
 .../buttons/btn_keylock_sampler_over.svg      |   1 +
 .../LateNight/buttons/btn_samplerCollapse.svg | 114 +-----------------
 .../LateNight/buttons/btn_samplerExpand.svg   | 114 +-----------------
 res/skins/LateNight/sampler.xml               |  12 +-
 res/skins/LateNight/samplersmall.xml          |  16 +--
 8 files changed, 21 insertions(+), 239 deletions(-)
 create mode 100644 res/skins/LateNight/buttons/btn_eject_sampler.svg
 create mode 100644 res/skins/LateNight/buttons/btn_eject_sampler_over.svg
 create mode 100644 res/skins/LateNight/buttons/btn_keylock_sampler.svg
 create mode 100644 res/skins/LateNight/buttons/btn_keylock_sampler_over.svg

diff --git a/res/skins/LateNight/buttons/btn_eject_sampler.svg b/res/skins/LateNight/buttons/btn_eject_sampler.svg
new file mode 100644
index 00000000000..33b5e06318d
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_eject_sampler.svg
@@ -0,0 +1 @@
+<svg id="svg2" width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg"><path id="path3936-0-8-9-7-1" d="m4.1778 11 6.3222-7 6.3221 7h-12.644" fill="#585858"/><rect id="rect4195" x="4" y="12" width="13" height="3" color="#000000" fill="#585858"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_eject_sampler_over.svg b/res/skins/LateNight/buttons/btn_eject_sampler_over.svg
new file mode 100644
index 00000000000..3f0f3fa25b2
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_eject_sampler_over.svg
@@ -0,0 +1 @@
+<svg id="svg2" width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg"><path id="path3936-0-8-9-7-1" d="m4.1778 10 6.3222-7 6.3221 7h-12.644" fill="#55f864"/><rect id="rect4195" x="4" y="12" width="13" height="3" color="#000000" fill="#55f864"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_keylock_sampler.svg b/res/skins/LateNight/buttons/btn_keylock_sampler.svg
new file mode 100644
index 00000000000..f0f0d577a52
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_keylock_sampler.svg
@@ -0,0 +1 @@
+<svg id="svg2" width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg"><path id="rect4195" d="m10.5 3c-1.933 0-3.5 1.567-3.5 3.5v1.5h-2v7h11v-7h-2v-1.5c0-1.933-1.567-3.5-3.5-3.5zm0 2c0.82843 0 1.5 0.67157 1.5 1.5v1.5h-3v-1.5c0-0.82843 0.67157-1.5 1.5-1.5zm-0.5 5h1v3h-1z" color="#000000" fill="#585858"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_keylock_sampler_over.svg b/res/skins/LateNight/buttons/btn_keylock_sampler_over.svg
new file mode 100644
index 00000000000..e1c8bfe50cf
--- /dev/null
+++ b/res/skins/LateNight/buttons/btn_keylock_sampler_over.svg
@@ -0,0 +1 @@
+<svg id="svg2" width="21" height="18" version="1.1" viewBox="0 0 21 18" xmlns="http://www.w3.org/2000/svg"><path id="rect4195" d="m10.5 3c-1.933 0-3.5 1.567-3.5 3.5v1.5h-2v7h11v-7h-2v-1.5c0-1.933-1.567-3.5-3.5-3.5zm0 2c0.82843 0 1.5 0.67157 1.5 1.5v1.5h-3v-1.5c0-0.82843 0.67157-1.5 1.5-1.5zm-0.5 5h1v3h-1z" color="#000000" fill="#55f864"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_samplerCollapse.svg b/res/skins/LateNight/buttons/btn_samplerCollapse.svg
index 60719fa582b..be58a22cc5c 100644
--- a/res/skins/LateNight/buttons/btn_samplerCollapse.svg
+++ b/res/skins/LateNight/buttons/btn_samplerCollapse.svg
@@ -1,113 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg4724"
-   width="20"
-   height="40"
-   version="1.1"
-   sodipodi:docname="btn_samplerCollapse.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)">
-  <metadata
-     id="metadata16">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1025"
-     id="namedview14"
-     showgrid="false"
-     inkscape:zoom="11.8"
-     inkscape:cx="6.5705596"
-     inkscape:cy="19.679147"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4724" />
-  <defs
-     id="defs4726">
-    <linearGradient
-       id="linearGradient5772-6"
-       x1="20"
-       x2="20"
-       y1="1042.4"
-       y2="1035.4"
-       gradientTransform="matrix(1,0,0,-1,0,1068.3)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop5768-7"
-         stop-color="#c8c8c8"
-         offset="0" />
-      <stop
-         id="stop5770-5"
-         stop-color="#646464"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5254-3"
-       x1="13"
-       x2="13"
-       y1="1027.4"
-       y2="1049.4"
-       gradientTransform="matrix(1.4783 0 0 .82609 1.7609 -829.81)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop3803-7-5"
-         stop-color="#242424"
-         offset="0" />
-      <stop
-         id="stop3805-5-6"
-         stop-color="#101010"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <path
-     id="rect3029"
-     d="m2.5 0.50002h15c1.108 0 2 0.892 2 2v35c0 1.108-0.892 2-2 2h-15c-1.108 0-2-0.892-2-2v-35c0-1.108 0.892-2 2-2z"
-     fill="url(#linearGradient5254-3)"
-     color="#000000" />
-  <path
-     id="rect3029-96-0-7"
-     d="m2.5 0.5c-1.0994 0-2 0.9006-2 2v1.5h19v-1.5c0-1.0994-0.90065-2-2-2z"
-     color="#000000"
-     fill="#c8c8c8"
-     style="text-decoration-line:none;text-indent:0;text-transform:none" />
-  <path
-     id="rect3029-96-0"
-     d="m2 40c-1.0994 0-2-0.9006-2-2v-36c0-1.0994 0.90065-2 2-2h16c1.0994 0 2 0.9006 2 2v36c0 1.0994-0.90065 2-2 2zm0.3-1h15.4c0.56265 0 1.3-0.7374 1.3-1.3v-35.4c0-0.5626-0.73735-1.3-1.3-1.3h-15.4c-0.56265 0-1.3 0.7374-1.3 1.3v35.4c0 0.5626 0.73735 1.3 1.3 1.3z"
-     color="#000000"
-     fill="url(#linearGradient5772-6)"
-     style="text-decoration-line:none;text-indent:0;text-transform:none" />
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:45.039814px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#d2d2d2;fill-opacity:1;stroke:none;stroke-width:1.1259954"
-     x="-47.820656"
-     y="12.34721"
-     id="text1512"
-     transform="matrix(0,-0.76954602,1.2994674,0,0,0)"><tspan
-       sodipodi:role="line"
-       id="tspan1510"
-       x="-47.820656"
-       y="12.34721"
-       style="font-size:15.01327038px;fill:#d2d2d2;fill-opacity:1;stroke-width:1.1259954">-&gt; &lt;-</tspan></text>
-</svg>
+<svg id="svg4724" width="20" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs4726"><linearGradient id="linearGradient5772-6" x1="20" x2="20" y1="1042.4" y2="1035.4" gradientTransform="matrix(1,0,0,-1,0,1068.3)" gradientUnits="userSpaceOnUse"><stop id="stop5768-7" stop-color="#c8c8c8" offset="0"/><stop id="stop5770-5" stop-color="#646464" offset="1"/></linearGradient><linearGradient id="linearGradient5254-3" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="matrix(1.4783 0 0 .82609 1.7609 -829.81)" gradientUnits="userSpaceOnUse"><stop id="stop3803-7-5" stop-color="#242424" offset="0"/><stop id="stop3805-5-6" stop-color="#101010" offset="1"/></linearGradient></defs><path id="rect3029" d="m2.5 0.50002h15c1.108 0 2 0.892 2 2v35c0 1.108-0.892 2-2 2h-15c-1.108 0-2-0.892-2-2v-35c0-1.108 0.892-2 2-2z" color="#000000" fill="url(#linearGradient5254-3)"/><path id="rect3029-96-0-7" d="m2.5 0.5c-1.0994 0-2 0.9006-2 2v1.5h19v-1.5c0-1.0994-0.90065-2-2-2z" color="#000000" fill="#c8c8c8" style="text-decoration-line:none;text-indent:0;text-transform:none"/><path id="rect3029-96-0" d="m2 40c-1.0994 0-2-0.9006-2-2v-36c0-1.0994 0.90065-2 2-2h16c1.0994 0 2 0.9006 2 2v36c0 1.0994-0.90065 2-2 2zm0.3-1h15.4c0.56265 0 1.3-0.7374 1.3-1.3v-35.4c0-0.5626-0.73735-1.3-1.3-1.3h-15.4c-0.56265 0-1.3 0.7374-1.3 1.3v35.4c0 0.5626 0.73735 1.3 1.3 1.3z" color="#000000" fill="url(#linearGradient5772-6)" style="text-decoration-line:none;text-indent:0;text-transform:none"/><path id="path2" d="m14.708 30-4.708-4.7081-4.708 4.7081-1.177-1.1771 5.885-5.8851 5.885 5.8851-1.177 1.1771z" fill="#888"/><path id="path2-3" d="m14.708 12-4.7081 4.7081-4.7081-4.7081-1.1771 1.1771 5.8851 5.8851 5.8851-5.8851-1.1771-1.1771z" fill="#888"/></svg>
diff --git a/res/skins/LateNight/buttons/btn_samplerExpand.svg b/res/skins/LateNight/buttons/btn_samplerExpand.svg
index 8357b572e48..b595577cd93 100644
--- a/res/skins/LateNight/buttons/btn_samplerExpand.svg
+++ b/res/skins/LateNight/buttons/btn_samplerExpand.svg
@@ -1,113 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg24"
-   width="20"
-   height="40"
-   version="1.1"
-   sodipodi:docname="btn_samplerExpand.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)">
-  <metadata
-     id="metadata32">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="959"
-     inkscape:window-height="1024"
-     id="namedview30"
-     showgrid="false"
-     inkscape:zoom="11.8"
-     inkscape:cx="9.3964464"
-     inkscape:cy="17.441803"
-     inkscape:window-x="961"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg24" />
-  <defs
-     id="defs12">
-    <linearGradient
-       id="b"
-       x1="13"
-       x2="13"
-       y1="1027.4"
-       y2="1049.4"
-       gradientTransform="matrix(1.4783 0 0 .82609 -.2391 -827.81)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop2"
-         stop-color="#242424"
-         offset="0" />
-      <stop
-         id="stop4"
-         stop-color="#101010"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="a"
-       x1="20"
-       x2="20"
-       y1="1042.4"
-       y2="1035.4"
-       gradientTransform="translate(-2,-1010.4)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop7"
-         stop-color="#c8c8c8"
-         offset="0" />
-      <stop
-         id="stop9"
-         stop-color="#646464"
-         offset="1" />
-    </linearGradient>
-  </defs>
-  <path
-     id="path14"
-     d="m2.5.50002 15-2.5e-5c1.108-1.85e-6 2 .892 2 2v35c0 1.108-.892 2-2 2l-15 2.5e-5c-1.108 2e-6-2-.892-2-2v-35c0-1.108.892-2 2-2z"
-     color="#000000"
-     fill="url(#b)" />
-  <path
-     id="path16"
-     d="m2.5.5c-1.0994 0-2 .9006-2 2v1.5h19v-1.5c0-1.0994-.90065-2-2-2z"
-     color="#000000"
-     fill="#666"
-     style="text-decoration-line:none;text-indent:0;text-transform:none" />
-  <path
-     id="path18"
-     d="m2 0c-1.0994 0-2 .9006-2 2v36c0 1.0994.90065 2 2 2h16c1.0994 0 2-.9006 2-2v-36c0-1.0994-.90065-2-2-2zm.3 1h15.4c.56265 0 1.3.7374 1.3 1.3v35.4c0 .5626-.73735 1.3-1.3 1.3h-15.4c-.56265 0-1.3-.7374-1.3-1.3v-35.4c0-.5626.73735-1.3 1.3-1.3z"
-     color="#000000"
-     fill="url(#a)"
-     style="text-decoration-line:none;text-indent:0;text-transform:none" />
-  <text
-     xml:space="preserve"
-     style="font-style:normal;font-weight:normal;font-size:48.38502884px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#818181;fill-opacity:1;stroke:none;stroke-width:1.20962572"
-     x="-44.619175"
-     y="13.264388"
-     id="text1512"
-     transform="matrix(0,-0.82670201,1.2096257,0,0,0)"><tspan
-       sodipodi:role="line"
-       id="tspan1510"
-       x="-44.619175"
-       y="13.264388"
-       style="font-size:16.12834167px;fill:#818181;fill-opacity:1;stroke-width:1.20962572">&lt;--&gt;</tspan></text>
-</svg>
+<svg id="svg24" width="20" height="40" version="1.1" xmlns="http://www.w3.org/2000/svg"><defs id="defs12"><linearGradient id="b" x1="13" x2="13" y1="1027.4" y2="1049.4" gradientTransform="matrix(1.4783 0 0 .82609 -.2391 -827.81)" gradientUnits="userSpaceOnUse"><stop id="stop2" stop-color="#242424" offset="0"/><stop id="stop4" stop-color="#101010" offset="1"/></linearGradient><linearGradient id="a" x1="20" x2="20" y1="1042.4" y2="1035.4" gradientTransform="translate(-2,-1010.4)" gradientUnits="userSpaceOnUse"><stop id="stop7" stop-color="#c8c8c8" offset="0"/><stop id="stop9" stop-color="#646464" offset="1"/></linearGradient></defs><path id="path14" d="m2.5.50002 15-2.5e-5c1.108-1.85e-6 2 .892 2 2v35c0 1.108-.892 2-2 2l-15 2.5e-5c-1.108 2e-6-2-.892-2-2v-35c0-1.108.892-2 2-2z" color="#000000" fill="url(#b)"/><path id="path16" d="m2.5.5c-1.0994 0-2 .9006-2 2v1.5h19v-1.5c0-1.0994-.90065-2-2-2z" color="#000000" fill="#666" style="text-decoration-line:none;text-indent:0;text-transform:none"/><path id="path18" d="m2 0c-1.0994 0-2 .9006-2 2v36c0 1.0994.90065 2 2 2h16c1.0994 0 2-.9006 2-2v-36c0-1.0994-.90065-2-2-2zm.3 1h15.4c.56265 0 1.3.7374 1.3 1.3v35.4c0 .5626-.73735 1.3-1.3 1.3h-15.4c-.56265 0-1.3-.7374-1.3-1.3v-35.4c0-.5626.73735-1.3 1.3-1.3z" color="#000000" fill="url(#a)" style="text-decoration-line:none;text-indent:0;text-transform:none"/><path id="path2" d="m14.708 26.938-4.708 4.7081-4.708-4.7081-1.177 1.1771 5.885 5.8851 5.885-5.8851-1.177-1.1771z" fill="#888"/><path id="path2-3" d="m14.708 15.062-4.7081-4.7081-4.7081 4.7081-1.1771-1.1771 5.8851-5.8851 5.8851 5.8851-1.1771 1.1771z" fill="#888"/></svg>
diff --git a/res/skins/LateNight/sampler.xml b/res/skins/LateNight/sampler.xml
index 1378529d80f..257ab102c5b 100644
--- a/res/skins/LateNight/sampler.xml
+++ b/res/skins/LateNight/sampler.xml
@@ -138,8 +138,8 @@
                         <NumberStates>1</NumberStates>
                         <State>
                           <Number>0</Number>
-                          <Pressed>buttons/btn_eject_over.svg</Pressed>
-                          <Unpressed>buttons/btn_eject.svg</Unpressed>
+                          <Pressed>buttons/btn_eject_sampler_over.svg</Pressed>
+                          <Unpressed>buttons/btn_eject_sampler.svg</Unpressed>
                         </State>
                         <Connection>
                           <ConfigKey><Variable name="group"/>,eject</ConfigKey>
@@ -181,13 +181,13 @@
                         <NumberStates>2</NumberStates>
                         <State>
                           <Number>0</Number>
-                          <Pressed>buttons/btn_keylock.svg</Pressed>
-                          <Unpressed>buttons/btn_keylock.svg</Unpressed>
+                          <Pressed>buttons/btn_keylock_sampler.svg</Pressed>
+                          <Unpressed>buttons/btn_keylock_sampler.svg</Unpressed>
                         </State>
                         <State>
                           <Number>1</Number>
-                          <Pressed>buttons/btn_keylock_over.svg</Pressed>
-                          <Unpressed>buttons/btn_keylock_over.svg</Unpressed>
+                          <Pressed>buttons/btn_keylock_sampler_over.svg</Pressed>
+                          <Unpressed>buttons/btn_keylock_sampler_over.svg</Unpressed>
                         </State>
                         <Connection>
                           <ConfigKey><Variable name="group"/>,keylock</ConfigKey>
diff --git a/res/skins/LateNight/samplersmall.xml b/res/skins/LateNight/samplersmall.xml
index 382057e58c1..6b6708430a5 100644
--- a/res/skins/LateNight/samplersmall.xml
+++ b/res/skins/LateNight/samplersmall.xml
@@ -68,6 +68,8 @@
             <Layout>horizontal</Layout>
             <Children>
 
+              <WidgetGroup><Size>2f,0min</Size></WidgetGroup>
+
               <Number>
                 <TooltipId>visual_bpm</TooltipId>
                 <Group>[Sampler<Variable name="samplernum"/>]</Group>
@@ -107,13 +109,13 @@
                 <NumberStates>2</NumberStates>
                 <State>
                   <Number>0</Number>
-                  <Pressed>buttons/btn_keylock.svg</Pressed>
-                  <Unpressed>buttons/btn_keylock.svg</Unpressed>
+                  <Pressed>buttons/btn_keylock_sampler.svg</Pressed>
+                  <Unpressed>buttons/btn_keylock_sampler.svg</Unpressed>
                 </State>
                 <State>
                   <Number>1</Number>
-                  <Pressed>buttons/btn_keylock_over.svg</Pressed>
-                  <Unpressed>buttons/btn_keylock_over.svg</Unpressed>
+                  <Pressed>buttons/btn_keylock_sampler_over.svg</Pressed>
+                  <Unpressed>buttons/btn_keylock_sampler_over.svg</Unpressed>
                 </State>
                 <Connection>
                   <ConfigKey><Variable name="group"/>,keylock</ConfigKey>
@@ -125,8 +127,8 @@
                 <NumberStates>1</NumberStates>
                 <State>
                   <Number>0</Number>
-                  <Pressed>buttons/btn_eject_over.svg</Pressed>
-                  <Unpressed>buttons/btn_eject.svg</Unpressed>
+                  <Pressed>buttons/btn_eject_sampler_over.svg</Pressed>
+                  <Unpressed>buttons/btn_eject_sampler.svg</Unpressed>
                 </State>
                 <Connection>
                   <ConfigKey><Variable name="group"/>,eject</ConfigKey>
@@ -134,7 +136,7 @@
                 </Connection>
               </PushButton>
 
-              <WidgetGroup></WidgetGroup>
+              <WidgetGroup><SizePolicy>me,min</SizePolicy></WidgetGroup>
 
             </Children>
           </WidgetGroup>

From eca5a5e33a8e2e0b40e66b825285d5f19e260aa9 Mon Sep 17 00:00:00 2001
From: Be <be@mixxx.org>
Date: Thu, 25 Oct 2018 17:20:04 -0500
Subject: [PATCH 5/5] LateNight: use button templates in samplers

fixes scaling with high pixel density screens (the templates use
scalemode="STRETCH_ASPECT"). I do not know why setting
scalemode="STRETCH_ASPECT" for the crossfader assignment and
sampler expansion <Unpressed> elements does not work.
---
 res/skins/LateNight/sampler.xml       | 395 +++++---------------------
 res/skins/LateNight/samplers_rack.xml |   4 +-
 res/skins/LateNight/samplersmall.xml  |  78 ++---
 3 files changed, 94 insertions(+), 383 deletions(-)

diff --git a/res/skins/LateNight/sampler.xml b/res/skins/LateNight/sampler.xml
index 257ab102c5b..3cafbc95e6e 100644
--- a/res/skins/LateNight/sampler.xml
+++ b/res/skins/LateNight/sampler.xml
@@ -49,31 +49,17 @@
                 <Layout>horizontal</Layout>
                 <SizePolicy>min,min</SizePolicy>
                 <Children>
-                  <PushButton>
-                    <TooltipId>cue_gotoandplay_cue_default</TooltipId>
-                    <NumberStates>2</NumberStates>
-                    <State>
-                      <Number>0</Number>
-                      <Pressed>buttons/btn_play_sampler_down.svg</Pressed>
-                      <Unpressed>buttons/btn_play_sampler.svg</Unpressed>
-                    </State>
-                    <State>
-                      <Number>1</Number>
-                      <Pressed>buttons/btn_play_sampler_overdown.svg</Pressed>
-                      <Unpressed>buttons/btn_play_sampler_over.svg</Unpressed>
-                    </State>
-                    <Connection>
-                      <ConfigKey><Variable name="group"/>,cue_gotoandplay</ConfigKey>
-                      <ButtonState>LeftButton</ButtonState>
-                    </Connection>
-                    <Connection>
-                      <ConfigKey><Variable name="group"/>,cue_default</ConfigKey>
-                      <ButtonState>RightButton</ButtonState>
-                    </Connection>
-                    <Connection>
-                      <ConfigKey><Variable name="group"/>,play_indicator</ConfigKey>
-                    </Connection>
-                  </PushButton>
+                  <Template src="skin:button_2state_right_display.xml">
+                    <SetVariable name="TooltipId">cue_gotoandplay_cue_default</SetVariable>
+                    <SetVariable name="Size">34f,34f</SetVariable>
+                    <SetVariable name="state_0_pressed">play_sampler_down.svg</SetVariable>
+                    <SetVariable name="state_0_unpressed">play_sampler.svg</SetVariable>
+                    <SetVariable name="state_1_pressed">play_sampler_overdown.svg</SetVariable>
+                    <SetVariable name="state_1_unpressed">play_sampler_over.svg</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="group"/>,cue_gotoandplay</SetVariable>
+                    <SetVariable name="ConfigKeyRight"><Variable name="group"/>,cue_default</SetVariable>
+                    <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,play_indicator</SetVariable>
+                  </Template>
                 </Children>
               </WidgetGroup>
 
@@ -116,36 +102,18 @@
                     <Layout>horizontal</Layout>
                     <SizePolicy>min,min</SizePolicy>
                     <Children>
-                      <PushButton>
-                        <TooltipId>repeat</TooltipId>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Pressed>buttons/btn_repeat.svg</Pressed>
-                          <Unpressed>buttons/btn_repeat.svg</Unpressed>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Pressed>buttons/btn_repeat_over.svg</Pressed>
-                          <Unpressed>buttons/btn_repeat_over.svg</Unpressed>
-                        </State>
-                        <Connection>
-                          <ConfigKey><Variable name="group"/>,repeat</ConfigKey>
-                        </Connection>
-                      </PushButton>
-                      <PushButton>
-                        <TooltipId>eject</TooltipId>
-                        <NumberStates>1</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Pressed>buttons/btn_eject_sampler_over.svg</Pressed>
-                          <Unpressed>buttons/btn_eject_sampler.svg</Unpressed>
-                        </State>
-                        <Connection>
-                          <ConfigKey><Variable name="group"/>,eject</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                      </PushButton>
+                      <Template src="skin:button_2state_nohover.xml">
+                        <SetVariable name="TooltipId">repeat</SetVariable>
+                        <SetVariable name="icon">repeat</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="group"/>,repeat</SetVariable>
+                        <SetVariable name="Size">25,18</SetVariable>
+                      </Template>
+                      <Template src="skin:button_2state_nohover.xml">
+                        <SetVariable name="TooltipId">eject</SetVariable>
+                        <SetVariable name="icon">eject</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="group"/>,eject</SetVariable>
+                        <SetVariable name="Size">25,18</SetVariable>
+                      </Template>
                     </Children>
                   </WidgetGroup>
 
@@ -158,17 +126,17 @@
                         <NumberStates>3</NumberStates>
                         <State>
                           <Number>0</Number>
-                          <Pressed>buttons/btn_orientation_sampler_left.svg</Pressed>
+                          <Pressed scalemode="STRETCH_ASPECT">buttons/btn_orientation_sampler_left.svg</Pressed>
                           <Unpressed>buttons/btn_orientation_sampler_left.svg</Unpressed>
                         </State>
                         <State>
                           <Number>1</Number>
-                          <Pressed>buttons/btn_orientation_sampler_master.svg</Pressed>
+                          <Pressed scalemode="STRETCH_ASPECT">buttons/btn_orientation_sampler_master.svg</Pressed>
                           <Unpressed>buttons/btn_orientation_sampler_master.svg</Unpressed>
                         </State>
                         <State>
                           <Number>2</Number>
-                          <Pressed>buttons/btn_orientation_sampler_right.svg</Pressed>
+                          <Pressed scalemode="STRETCH_ASPECT">buttons/btn_orientation_sampler_right.svg</Pressed>
                           <Unpressed>buttons/btn_orientation_sampler_right.svg</Unpressed>
                         </State>
                         <Connection>
@@ -176,23 +144,12 @@
                           <ButtonState>LeftButton</ButtonState>
                         </Connection>
                       </PushButton>
-                      <PushButton>
-                        <TooltipId>keylock</TooltipId>
-                        <NumberStates>2</NumberStates>
-                        <State>
-                          <Number>0</Number>
-                          <Pressed>buttons/btn_keylock_sampler.svg</Pressed>
-                          <Unpressed>buttons/btn_keylock_sampler.svg</Unpressed>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Pressed>buttons/btn_keylock_sampler_over.svg</Pressed>
-                          <Unpressed>buttons/btn_keylock_sampler_over.svg</Unpressed>
-                        </State>
-                        <Connection>
-                          <ConfigKey><Variable name="group"/>,keylock</ConfigKey>
-                        </Connection>
-                      </PushButton>
+                      <Template src="skin:button_2state_nohover.xml">
+                        <SetVariable name="TooltipId">keylock</SetVariable>
+                        <SetVariable name="icon">keylock</SetVariable>
+                        <SetVariable name="ConfigKey"><Variable name="group"/>,keylock</SetVariable>
+                        <SetVariable name="Size">25,18</SetVariable>
+                      </Template>
                     </Children>
                   </WidgetGroup>
                 </Children>
@@ -228,234 +185,41 @@
                 <Layout>horizontal</Layout>
                 <SizePolicy>min,min</SizePolicy>
                 <Children>
-                  <PushButton>
-                    <TooltipId>hotcue</TooltipId>
-                    <NumberStates>2</NumberStates>
-                    <LeftClickIsPushButton>true</LeftClickIsPushButton>
-                    <RightClickIsPushButton>true</RightClickIsPushButton>
-                    <State>
-                      <Number>0</Number>
-                      <Pressed>buttons/btn_hotcue_1_down.svg</Pressed>
-                      <Unpressed>buttons/btn_hotcue_1.svg</Unpressed>
-                    </State>
-                    <State>
-                      <Number>1</Number>
-                      <Pressed>buttons/btn_hotcue_1_overdown.svg</Pressed>
-                      <Unpressed>buttons/btn_hotcue_1_over.svg</Unpressed>
-                    </State>
-                    <Connection>
-                      <ConfigKey><Variable name="group"/>,hotcue_1_activate</ConfigKey>
-                      <ButtonState>LeftButton</ButtonState>
-                    </Connection>
-                    <Connection>
-                      <ConfigKey><Variable name="group"/>,hotcue_1_clear</ConfigKey>
-                      <ButtonState>RightButton</ButtonState>
-                    </Connection>
-                    <Connection>
-                      <ConfigKey><Variable name="group"/>,hotcue_1_enabled</ConfigKey>
-                    </Connection>
-                  </PushButton>
+                  <Template src="skin:button_hotcue.xml">
+                    <SetVariable name="number">1</SetVariable>
+                  </Template>
 
-                  <PushButton>
-                    <TooltipId>hotcue</TooltipId>
-                    <NumberStates>2</NumberStates>
-                    <LeftClickIsPushButton>true</LeftClickIsPushButton>
-                    <RightClickIsPushButton>true</RightClickIsPushButton>
-                    <State>
-                      <Number>0</Number>
-                      <Pressed>buttons/btn_hotcue_2_down.svg</Pressed>
-                      <Unpressed>buttons/btn_hotcue_2.svg</Unpressed>
-                    </State>
-                    <State>
-                      <Number>1</Number>
-                      <Pressed>buttons/btn_hotcue_2_overdown.svg</Pressed>
-                      <Unpressed>buttons/btn_hotcue_2_over.svg</Unpressed>
-                    </State>
-                    <Connection>
-                      <ConfigKey><Variable name="group"/>,hotcue_2_activate</ConfigKey>
-                      <ButtonState>LeftButton</ButtonState>
-                    </Connection>
-                    <Connection>
-                      <ConfigKey><Variable name="group"/>,hotcue_2_clear</ConfigKey>
-                      <ButtonState>RightButton</ButtonState>
-                    </Connection>
-                    <Connection>
-                      <ConfigKey><Variable name="group"/>,hotcue_2_enabled</ConfigKey>
-                    </Connection>
-                  </PushButton>
+                  <Template src="skin:button_hotcue.xml">
+                    <SetVariable name="number">2</SetVariable>
+                  </Template>
 
-                  <PushButton>
-                    <TooltipId>hotcue</TooltipId>
-                    <NumberStates>2</NumberStates>
-                    <LeftClickIsPushButton>true</LeftClickIsPushButton>
-                    <RightClickIsPushButton>true</RightClickIsPushButton>
-                    <State>
-                      <Number>0</Number>
-                      <Pressed>buttons/btn_hotcue_3_down.svg</Pressed>
-                      <Unpressed>buttons/btn_hotcue_3.svg</Unpressed>
-                    </State>
-                    <State>
-                      <Number>1</Number>
-                      <Pressed>buttons/btn_hotcue_3_overdown.svg</Pressed>
-                      <Unpressed>buttons/btn_hotcue_3_over.svg</Unpressed>
-                    </State>
-                    <Connection>
-                      <ConfigKey><Variable name="group"/>,hotcue_3_activate</ConfigKey>
-                      <ButtonState>LeftButton</ButtonState>
-                    </Connection>
-                    <Connection>
-                      <ConfigKey><Variable name="group"/>,hotcue_3_clear</ConfigKey>
-                      <ButtonState>RightButton</ButtonState>
-                    </Connection>
-                    <Connection>
-                      <ConfigKey><Variable name="group"/>,hotcue_3_enabled</ConfigKey>
-                    </Connection>
-                  </PushButton>
+                  <Template src="skin:button_hotcue.xml">
+                    <SetVariable name="number">3</SetVariable>
+                  </Template>
 
-                  <PushButton>
-                    <TooltipId>hotcue</TooltipId>
-                    <NumberStates>2</NumberStates>
-                    <LeftClickIsPushButton>true</LeftClickIsPushButton>
-                    <RightClickIsPushButton>true</RightClickIsPushButton>
-                    <State>
-                      <Number>0</Number>
-                      <Pressed>buttons/btn_hotcue_4_down.svg</Pressed>
-                      <Unpressed>buttons/btn_hotcue_4.svg</Unpressed>
-                    </State>
-                    <State>
-                      <Number>1</Number>
-                      <Pressed>buttons/btn_hotcue_4_overdown.svg</Pressed>
-                      <Unpressed>buttons/btn_hotcue_4_over.svg</Unpressed>
-                    </State>
-                    <Connection>
-                      <ConfigKey><Variable name="group"/>,hotcue_4_activate</ConfigKey>
-                      <ButtonState>LeftButton</ButtonState>
-                    </Connection>
-                    <Connection>
-                      <ConfigKey><Variable name="group"/>,hotcue_4_clear</ConfigKey>
-                      <ButtonState>RightButton</ButtonState>
-                    </Connection>
-                    <Connection>
-                      <ConfigKey><Variable name="group"/>,hotcue_4_enabled</ConfigKey>
-                    </Connection>
-                  </PushButton>
+                  <Template src="skin:button_hotcue.xml">
+                    <SetVariable name="number">4</SetVariable>
+                  </Template>
 
                   <WidgetGroup><!-- /Hotcues 5-8 -->
                     <Layout>horizontal</Layout>
                     <SizePolicy>min,min</SizePolicy>
                     <Children>
+                      <Template src="skin:button_hotcue.xml">
+                        <SetVariable name="number">5</SetVariable>
+                      </Template>
 
-                      <PushButton>
-                        <TooltipId>hotcue</TooltipId>
-                        <NumberStates>2</NumberStates>
-                        <LeftClickIsPushButton>true</LeftClickIsPushButton>
-                        <RightClickIsPushButton>true</RightClickIsPushButton>
-                        <State>
-                          <Number>0</Number>
-                          <Pressed>buttons/btn_hotcue_5_down.svg</Pressed>
-                          <Unpressed>buttons/btn_hotcue_5.svg</Unpressed>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Pressed>buttons/btn_hotcue_5_overdown.svg</Pressed>
-                          <Unpressed>buttons/btn_hotcue_5_over.svg</Unpressed>
-                        </State>
-                        <Connection>
-                          <ConfigKey><Variable name="group"/>,hotcue_5_activate</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey><Variable name="group"/>,hotcue_5_clear</ConfigKey>
-                          <ButtonState>RightButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey><Variable name="group"/>,hotcue_5_enabled</ConfigKey>
-                        </Connection>
-                      </PushButton>
+                      <Template src="skin:button_hotcue.xml">
+                        <SetVariable name="number">6</SetVariable>
+                      </Template>
 
-                      <PushButton>
-                        <TooltipId>hotcue</TooltipId>
-                        <NumberStates>2</NumberStates>
-                        <LeftClickIsPushButton>true</LeftClickIsPushButton>
-                        <RightClickIsPushButton>true</RightClickIsPushButton>
-                        <State>
-                          <Number>0</Number>
-                          <Pressed>buttons/btn_hotcue_6_down.svg</Pressed>
-                          <Unpressed>buttons/btn_hotcue_6.svg</Unpressed>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Pressed>buttons/btn_hotcue_6_overdown.svg</Pressed>
-                          <Unpressed>buttons/btn_hotcue_6_over.svg</Unpressed>
-                        </State>
-                        <Connection>
-                          <ConfigKey><Variable name="group"/>,hotcue_6_activate</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey><Variable name="group"/>,hotcue_6_clear</ConfigKey>
-                          <ButtonState>RightButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey><Variable name="group"/>,hotcue_6_enabled</ConfigKey>
-                        </Connection>
-                      </PushButton>
+                      <Template src="skin:button_hotcue.xml">
+                        <SetVariable name="number">7</SetVariable>
+                      </Template>
 
-                      <PushButton>
-                        <TooltipId>hotcue</TooltipId>
-                        <NumberStates>2</NumberStates>
-                        <LeftClickIsPushButton>true</LeftClickIsPushButton>
-                        <RightClickIsPushButton>true</RightClickIsPushButton>
-                        <State>
-                          <Number>0</Number>
-                          <Pressed>buttons/btn_hotcue_7_down.svg</Pressed>
-                          <Unpressed>buttons/btn_hotcue_7.svg</Unpressed>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Pressed>buttons/btn_hotcue_7_overdown.svg</Pressed>
-                          <Unpressed>buttons/btn_hotcue_7_over.svg</Unpressed>
-                        </State>
-                        <Connection>
-                          <ConfigKey><Variable name="group"/>,hotcue_7_activate</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey><Variable name="group"/>,hotcue_7_clear</ConfigKey>
-                          <ButtonState>RightButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey><Variable name="group"/>,hotcue_7_enabled</ConfigKey>
-                        </Connection>
-                      </PushButton>
-
-                      <PushButton>
-                        <TooltipId>hotcue</TooltipId>
-                        <NumberStates>2</NumberStates>
-                        <LeftClickIsPushButton>true</LeftClickIsPushButton>
-                        <RightClickIsPushButton>true</RightClickIsPushButton>
-                        <State>
-                          <Number>0</Number>
-                          <Pressed>buttons/btn_hotcue_8_down.svg</Pressed>
-                          <Unpressed>buttons/btn_hotcue_8.svg</Unpressed>
-                        </State>
-                        <State>
-                          <Number>1</Number>
-                          <Pressed>buttons/btn_hotcue_8_overdown.svg</Pressed>
-                          <Unpressed>buttons/btn_hotcue_8_over.svg</Unpressed>
-                        </State>
-                        <Connection>
-                          <ConfigKey><Variable name="group"/>,hotcue_8_activate</ConfigKey>
-                          <ButtonState>LeftButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey><Variable name="group"/>,hotcue_8_clear</ConfigKey>
-                          <ButtonState>RightButton</ButtonState>
-                        </Connection>
-                        <Connection>
-                          <ConfigKey><Variable name="group"/>,hotcue_8_enabled</ConfigKey>
-                        </Connection>
-                      </PushButton>
+                      <Template src="skin:button_hotcue.xml">
+                        <SetVariable name="number">8</SetVariable>
+                      </Template>
                     </Children>
                     <Connection>
                       <ConfigKey persist="true">[Skin],8_hotcues</ConfigKey>
@@ -474,23 +238,12 @@
                 <Layout>horizontal</Layout>
                 <SizePolicy>min,min</SizePolicy>
                 <Children>
-                  <PushButton>
-                    <TooltipId>pfl</TooltipId>
-                    <NumberStates>2</NumberStates>
-                    <State>
-                      <Number>0</Number>
-                      <Pressed>buttons/btn_pfl_down.svg</Pressed>
-                      <Unpressed>buttons/btn_pfl.svg</Unpressed>
-                    </State>
-                    <State>
-                      <Number>1</Number>
-                      <Pressed>buttons/btn_pfl_overdown.svg</Pressed>
-                      <Unpressed>buttons/btn_pfl_over.svg</Unpressed>
-                    </State>
-                    <Connection>
-                      <ConfigKey><Variable name="group"/>,pfl</ConfigKey>
-                    </Connection>
-                  </PushButton>
+                  <Template src="skin:button_2state.xml">
+                    <SetVariable name="TooltipId">pfl</SetVariable>
+                    <SetVariable name="icon">pfl</SetVariable>
+                    <SetVariable name="ConfigKey"><Variable name="group"/>,pfl</SetVariable>
+                    <SetVariable name="Size">26,26</SetVariable>
+                  </Template>
                 </Children>
               </WidgetGroup><!-- /SamplerPfl -->
 
@@ -563,23 +316,13 @@
             <Layout>horizontal</Layout>
             <SizePolicy>min,min</SizePolicy>
             <Children>
-              <PushButton>
-                <TooltipId>beatsync_beatsync_tempo</TooltipId>
-                <NumberStates>1</NumberStates>
-                <State>
-                  <Number>0</Number>
-                  <Pressed>buttons/btn_sync_sampler_overdown.svg</Pressed>
-                  <Unpressed>buttons/btn_sync_sampler.svg</Unpressed>
-                </State>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,beatsync</ConfigKey>
-                  <ButtonState>LeftButton</ButtonState>
-                </Connection>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,beatsync_tempo</ConfigKey>
-                  <ButtonState>RightButton</ButtonState>
-                </Connection>
-              </PushButton>
+              <Template src="skin:button_1state_right.xml">
+                <SetVariable name="TooltipId">beatsync_beatsync_tempo</SetVariable>
+                <SetVariable name="state_0_pressed">sync_sampler_overdown.svg</SetVariable>
+                <SetVariable name="state_0_unpressed">sync_sampler.svg</SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="group"/>,beatsync</SetVariable>
+                <SetVariable name="ConfigKeyRight"><Variable name="group"/>,beatsync_tempo</SetVariable>
+              </Template>
             </Children>
           </WidgetGroup>
         </Children>
diff --git a/res/skins/LateNight/samplers_rack.xml b/res/skins/LateNight/samplers_rack.xml
index 2ab77778974..6da0fa74450 100644
--- a/res/skins/LateNight/samplers_rack.xml
+++ b/res/skins/LateNight/samplers_rack.xml
@@ -15,12 +15,12 @@
             <NumberStates>2</NumberStates>
             <State>
               <Number>0</Number>
-              <Pressed>skin:/buttons/btn_samplerExpand.svg</Pressed>
+              <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_samplerExpand.svg</Pressed>
               <Unpressed>skin:/buttons/btn_samplerExpand.svg</Unpressed>
             </State>
             <State>
               <Number>1</Number>
-              <Pressed>skin:/buttons/btn_samplerCollapse.svg</Pressed>
+              <Pressed scalemode="STRETCH_ASPECT">skin:/buttons/btn_samplerCollapse.svg</Pressed>
               <Unpressed>skin:/buttons/btn_samplerCollapse.svg</Unpressed>
             </State>
             <Connection>
diff --git a/res/skins/LateNight/samplersmall.xml b/res/skins/LateNight/samplersmall.xml
index 6b6708430a5..8624a373846 100644
--- a/res/skins/LateNight/samplersmall.xml
+++ b/res/skins/LateNight/samplersmall.xml
@@ -11,31 +11,17 @@
         <Layout>horizontal</Layout>
         <SizePolicy>min,min</SizePolicy>
         <Children>
-          <PushButton>
-            <TooltipId>cue_gotoandplay_cue_default</TooltipId>
-            <NumberStates>2</NumberStates>
-            <State>
-              <Number>0</Number>
-              <Pressed>buttons/btn_play_sampler_down.svg</Pressed>
-              <Unpressed>buttons/btn_play_sampler.svg</Unpressed>
-            </State>
-            <State>
-              <Number>1</Number>
-              <Pressed>buttons/btn_play_sampler_overdown.svg</Pressed>
-              <Unpressed>buttons/btn_play_sampler_over.svg</Unpressed>
-            </State>
-            <Connection>
-              <ConfigKey><Variable name="group"/>,cue_gotoandplay</ConfigKey>
-              <ButtonState>LeftButton</ButtonState>
-            </Connection>
-            <Connection>
-              <ConfigKey><Variable name="group"/>,cue_default</ConfigKey>
-              <ButtonState>RightButton</ButtonState>
-            </Connection>
-            <Connection>
-              <ConfigKey><Variable name="group"/>,play_indicator</ConfigKey>
-            </Connection>
-          </PushButton>
+          <Template src="skin:button_2state_right_display.xml">
+            <SetVariable name="TooltipId">cue_gotoandplay_cue_default</SetVariable>
+            <SetVariable name="Size">34f,34f</SetVariable>
+            <SetVariable name="state_0_pressed">play_sampler_down.svg</SetVariable>
+            <SetVariable name="state_0_unpressed">play_sampler.svg</SetVariable>
+            <SetVariable name="state_1_pressed">play_sampler_overdown.svg</SetVariable>
+            <SetVariable name="state_1_unpressed">play_sampler_over.svg</SetVariable>
+            <SetVariable name="ConfigKey"><Variable name="group"/>,cue_gotoandplay</SetVariable>
+            <SetVariable name="ConfigKeyRight"><Variable name="group"/>,cue_default</SetVariable>
+            <SetVariable name="ConfigKeyDisp"><Variable name="group"/>,play_indicator</SetVariable>
+          </Template>
         </Children>
       </WidgetGroup>
 
@@ -104,37 +90,19 @@
                 </Connection>
               </PushButton>
 
-              <PushButton>
-                <TooltipId>keylock</TooltipId>
-                <NumberStates>2</NumberStates>
-                <State>
-                  <Number>0</Number>
-                  <Pressed>buttons/btn_keylock_sampler.svg</Pressed>
-                  <Unpressed>buttons/btn_keylock_sampler.svg</Unpressed>
-                </State>
-                <State>
-                  <Number>1</Number>
-                  <Pressed>buttons/btn_keylock_sampler_over.svg</Pressed>
-                  <Unpressed>buttons/btn_keylock_sampler_over.svg</Unpressed>
-                </State>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,keylock</ConfigKey>
-                </Connection>
-              </PushButton>
+              <Template src="skin:button_2state_nohover.xml">
+                <SetVariable name="TooltipId">keylock</SetVariable>
+                <SetVariable name="icon">keylock</SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="group"/>,keylock</SetVariable>
+                <SetVariable name="Size">21,18</SetVariable>
+              </Template>
 
-              <PushButton>
-                <TooltipId>eject</TooltipId>
-                <NumberStates>1</NumberStates>
-                <State>
-                  <Number>0</Number>
-                  <Pressed>buttons/btn_eject_sampler_over.svg</Pressed>
-                  <Unpressed>buttons/btn_eject_sampler.svg</Unpressed>
-                </State>
-                <Connection>
-                  <ConfigKey><Variable name="group"/>,eject</ConfigKey>
-                  <ButtonState>LeftButton</ButtonState>
-                </Connection>
-              </PushButton>
+              <Template src="skin:button_2state_nohover.xml">
+                <SetVariable name="TooltipId">eject</SetVariable>
+                <SetVariable name="icon">eject</SetVariable>
+                <SetVariable name="ConfigKey"><Variable name="group"/>,eject</SetVariable>
+                <SetVariable name="Size">21,18</SetVariable>
+              </Template>
 
               <WidgetGroup><SizePolicy>me,min</SizePolicy></WidgetGroup>