[gnome-themes-standard] border-image: use border-image to render border gradients



commit be0513f0e3cbeb178c3ac30a8539de55abfe7a9e
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Thu Jun 9 16:10:41 2011 -0400

    border-image: use border-image to render border gradients
    
    This is done slicing SVG 16x16 borders.

 themes/Adwaita/gtk-3.0/assets/Makefile.am          |   20 ++-
 .../gtk-3.0/assets/entry-border-focused-dark.svg   |   74 ++++++++
 .../gtk-3.0/assets/entry-border-focused.svg        |   74 ++++++++
 .../gtk-3.0/assets/entry-border-normal-dark.svg    |  113 ++++++++++++
 .../Adwaita/gtk-3.0/assets/entry-border-normal.svg |  123 +++++++++++++
 .../primary-toolbar-button-active-border.svg       |  119 +++++++++++++
 .../Adwaita/gtk-3.0/assets/progressbar-border.svg  |   97 ++++++++++
 .../gtk-3.0/assets/switch-slider-active-border.svg |  105 +++++++++++
 .../gtk-3.0/assets/switch-slider-border.svg        |  105 +++++++++++
 .../trough-active-border-horizontal-dark.svg       |  141 +++++++++++++++
 .../assets/trough-active-border-horizontal.svg     |  142 +++++++++++++++
 .../assets/trough-active-border-vertical-dark.svg  |  141 +++++++++++++++
 .../assets/trough-active-border-vertical.svg       |  131 ++++++++++++++
 .../assets/trough-border-horizontal-dark.svg       |  177 ++++++++++++++++++
 .../gtk-3.0/assets/trough-border-horizontal.svg    |  187 ++++++++++++++++++++
 .../gtk-3.0/assets/trough-border-vertical-dark.svg |  177 ++++++++++++++++++
 .../gtk-3.0/assets/trough-border-vertical.svg      |  187 ++++++++++++++++++++
 themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css |   47 +++++
 themes/Adwaita/gtk-3.0/gtk-widgets-assets.css      |   48 +++++
 themes/Adwaita/gtk-3.0/gtk-widgets.css             |  137 ++++++---------
 themes/Adwaita/gtk-3.0/gtk.css                     |    2 +-
 21 files changed, 2257 insertions(+), 90 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/assets/Makefile.am b/themes/Adwaita/gtk-3.0/assets/Makefile.am
index ce4d43b..a2c9a02 100644
--- a/themes/Adwaita/gtk-3.0/assets/Makefile.am
+++ b/themes/Adwaita/gtk-3.0/assets/Makefile.am
@@ -10,6 +10,12 @@ assets_DATA = 		\
 	checkbox-unchecked-insensitive-dark.svg \
 	checkbox-mixed.svg \
 	checkbox-mixed-dark.svg \
+	entry-border-focused.svg \
+	entry-border-focused-dark.svg \
+	entry-border-normal.svg \
+	entry-border-normal-dark.svg \
+	primary-toolbar-button-active-border.svg \
+	progressbar-border.svg \
 	radio-selected.svg \
 	radio-selected-dark.svg \
 	radio-selected-insensitive.svg \
@@ -19,6 +25,16 @@ assets_DATA = 		\
 	radio-unselected-insensitive.svg \
 	radio-unselected-insensitive-dark.svg \
 	radio-mixed.svg \
-	radio-mixed-dark.svg
+	radio-mixed-dark.svg \
+	switch-slider-border.svg \
+	switch-slider-active-border.svg \
+	trough-border-horizontal.svg \
+	trough-border-horizontal-dark.svg \
+	trough-border-vertical.svg \
+	trough-border-vertical-dark.svg \
+	trough-active-border-horizontal.svg \
+	trough-active-border-horizontal-dark.svg \
+	trough-active-border-vertical.svg \
+	trough-active-border-vertical-dark.svg
 
-EXTRA_DIST = $(assets_DATA)
\ No newline at end of file
+EXTRA_DIST = $(assets_DATA)
diff --git a/themes/Adwaita/gtk-3.0/assets/entry-border-focused-dark.svg b/themes/Adwaita/gtk-3.0/assets/entry-border-focused-dark.svg
new file mode 100644
index 0000000..b043d52
--- /dev/null
+++ b/themes/Adwaita/gtk-3.0/assets/entry-border-focused-dark.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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";
+   width="16px"
+   height="16px"
+   id="svg12251"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="entry-border-focused-dark.svg">
+  <defs
+     id="defs12253" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="1.808499"
+     inkscape:cy="8"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1216"
+     inkscape:window-height="800"
+     inkscape:window-x="5"
+     inkscape:window-y="66"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata12256">
+    <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>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="fill:#ffffff;fill-opacity:0;stroke:#f57900;stroke-width:0.99999994000000003;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;enable-background:new"
+       id="rect5836"
+       width="15.000001"
+       height="15"
+       x="0.49999997"
+       y="-15.5"
+       rx="2.2980974"
+       ry="2.2980971"
+       transform="scale(1,-1)" />
+    <rect
+       transform="matrix(0,1,-1,0,0,0)"
+       style="opacity:1;fill:#fcaf3e;fill-opacity:0.27450982;stroke:none;display:inline;enable-background:new"
+       id="rect6042"
+       width="1"
+       height="12"
+       x="1"
+       y="-14" />
+  </g>
+</svg>
diff --git a/themes/Adwaita/gtk-3.0/assets/entry-border-focused.svg b/themes/Adwaita/gtk-3.0/assets/entry-border-focused.svg
new file mode 100644
index 0000000..63e23e3
--- /dev/null
+++ b/themes/Adwaita/gtk-3.0/assets/entry-border-focused.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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";
+   width="16px"
+   height="16px"
+   id="svg12251"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="New document 39">
+  <defs
+     id="defs12253" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="-0.15396047"
+     inkscape:cy="8"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1216"
+     inkscape:window-height="800"
+     inkscape:window-x="5"
+     inkscape:window-y="66"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata12256">
+    <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>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="fill:#ffffff;fill-opacity:0;stroke:#579eea;stroke-width:0.99999994000000003;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;enable-background:new"
+       id="rect5836"
+       width="15.000001"
+       height="15"
+       x="0.49999997"
+       y="-15.5"
+       rx="2.2980974"
+       ry="2.2980971"
+       transform="scale(1,-1)" />
+    <rect
+       transform="matrix(0,1,-1,0,0,0)"
+       style="opacity:1;fill:#d7e4f1;fill-opacity:0.50196081;stroke:none;display:inline;enable-background:new"
+       id="rect6042"
+       width="1"
+       height="12"
+       x="1"
+       y="-14" />
+  </g>
+</svg>
diff --git a/themes/Adwaita/gtk-3.0/assets/entry-border-normal-dark.svg b/themes/Adwaita/gtk-3.0/assets/entry-border-normal-dark.svg
new file mode 100644
index 0000000..1771fad
--- /dev/null
+++ b/themes/Adwaita/gtk-3.0/assets/entry-border-normal-dark.svg
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   width="16px"
+   height="16px"
+   id="svg11633"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="entry-border-normal-dark.svg">
+  <defs
+     id="defs11635">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7879-7-3"
+       id="linearGradient6823"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.63117873,0,0,1.040154,-59.8156,-1080.0246)"
+       x1="404.67053"
+       y1="262.40231"
+       x2="404.67053"
+       y2="280.36218" />
+    <linearGradient
+       id="linearGradient7879-7-3">
+      <stop
+         id="stop7881-0-8"
+         offset="0"
+         style="stop-color:#babdb6;stop-opacity:1;" />
+      <stop
+         id="stop7883-8-6"
+         offset="1"
+         style="stop-color:#9a9d93;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="280.36218"
+       x2="404.67053"
+       y1="262.40231"
+       x1="404.67053"
+       gradientTransform="matrix(0.63117873,0,0,1.040154,-165.8156,-291.5998)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient12171"
+       xlink:href="#linearGradient7879-7-3"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="26.24"
+     inkscape:cx="2.8050622"
+     inkscape:cy="7.542469"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1280"
+     inkscape:window-height="967"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata11638">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       transform="scale(1,-1)"
+       ry="2.2980974"
+       rx="2.2980974"
+       y="-15.5"
+       x="0.49999997"
+       height="15"
+       width="15.000001"
+       id="rect5760"
+       style="fill:#ffffff;fill-opacity:0;stroke:#131516;stroke-width:0.99999987999999995;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;enable-background:new"
+       inkscape:export-filename="/home/cosimoc/Sources/Checkouts/gnome-themes-standard/themes/Adwaita/gtk-3.0/assets/entry-normal-border.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       y="-14"
+       x="1"
+       height="12"
+       width="1"
+       id="rect6040"
+       style="opacity:1;fill:#282828;fill-opacity:0.50196081;stroke:none;display:inline;enable-background:new"
+       transform="matrix(0,1,-1,0,0,0)"
+       inkscape:export-filename="/home/cosimoc/Sources/Checkouts/gnome-themes-standard/themes/Adwaita/gtk-3.0/assets/entry-normal-border.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+  </g>
+</svg>
diff --git a/themes/Adwaita/gtk-3.0/assets/entry-border-normal.svg b/themes/Adwaita/gtk-3.0/assets/entry-border-normal.svg
new file mode 100644
index 0000000..61feb43
--- /dev/null
+++ b/themes/Adwaita/gtk-3.0/assets/entry-border-normal.svg
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   width="16px"
+   height="16px"
+   id="svg11633"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="entry-border-normal.svg">
+  <defs
+     id="defs11635">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7879-7-3"
+       id="linearGradient6823"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.63117873,0,0,1.040154,-59.8156,-1080.0246)"
+       x1="404.67053"
+       y1="262.40231"
+       x2="404.67053"
+       y2="280.36218" />
+    <linearGradient
+       id="linearGradient7879-7-3">
+      <stop
+         id="stop7881-0-8"
+         offset="0"
+         style="stop-color:#babdb6;stop-opacity:1;" />
+      <stop
+         id="stop7883-8-6"
+         offset="1"
+         style="stop-color:#9a9d93;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="280.36218"
+       x2="404.67053"
+       y1="262.40231"
+       x1="404.67053"
+       gradientTransform="matrix(0.63117873,0,0,1.040154,-165.8156,-291.5998)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient12171"
+       xlink:href="#linearGradient7879-7-3"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7879-7-3"
+       id="linearGradient12211"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.05703423,0,0,0.60000002,-14.528518,-168.41733)"
+       x1="404.67053"
+       y1="262.40231"
+       x2="404.67053"
+       y2="280.36218" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="26.24"
+     inkscape:cx="9.7029281"
+     inkscape:cy="7.542469"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1280"
+     inkscape:window-height="967"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata11638">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       transform="scale(1,-1)"
+       ry="2.2980974"
+       rx="2.2980974"
+       y="-15.5"
+       x="0.49999997"
+       height="15"
+       width="15.000001"
+       id="rect5760"
+       style="fill:#ffffff;fill-opacity:0;stroke:url(#linearGradient12211);stroke-width:0.99999987999999995;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;enable-background:new"
+       inkscape:export-filename="/home/cosimoc/Sources/Checkouts/gnome-themes-standard/themes/Adwaita/gtk-3.0/assets/entry-normal-border.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       y="-14"
+       x="1"
+       height="12"
+       width="1"
+       id="rect6040"
+       style="opacity:1;fill:#eeeeec;fill-opacity:0.50196081000000004;stroke:none;display:inline;enable-background:new"
+       transform="matrix(0,1,-1,0,0,0)"
+       inkscape:export-filename="/home/cosimoc/Sources/Checkouts/gnome-themes-standard/themes/Adwaita/gtk-3.0/assets/entry-normal-border.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+  </g>
+</svg>
diff --git a/themes/Adwaita/gtk-3.0/assets/primary-toolbar-button-active-border.svg b/themes/Adwaita/gtk-3.0/assets/primary-toolbar-button-active-border.svg
new file mode 100644
index 0000000..553a40f
--- /dev/null
+++ b/themes/Adwaita/gtk-3.0/assets/primary-toolbar-button-active-border.svg
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   width="16px"
+   height="16px"
+   id="svg7586"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="primary-toolbar-button-active-border.svg">
+  <defs
+     id="defs7588">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4733"
+       id="linearGradient4739"
+       x1="-140"
+       y1="20.862183"
+       x2="-140"
+       y2="62.867561"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.92103344,0,0,0.92105267,-11.015834,3.8706971)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4733">
+      <stop
+         style="stop-color:#909081;stop-opacity:1;"
+         offset="0"
+         id="stop4735" />
+      <stop
+         style="stop-color:#909081;stop-opacity:0;"
+         offset="1"
+         id="stop4737" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4741"
+       id="linearGradient4747"
+       x1="-135"
+       y1="25.362181"
+       x2="-135"
+       y2="54.362179"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4741">
+      <stop
+         style="stop-color:#888888;stop-opacity:1;"
+         offset="0"
+         id="stop4743" />
+      <stop
+         style="stop-color:#eeeeee;stop-opacity:1;"
+         offset="1"
+         id="stop4745" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.44016358,0,0,0.42857143,69.402815,-8.0123633)"
+       y2="54.362179"
+       x2="-135"
+       y1="25.362181"
+       x1="-135"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7584"
+       xlink:href="#linearGradient4741"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="-0.15396047"
+     inkscape:cy="8"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1195"
+     inkscape:window-height="740"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7591">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="color:#000000;fill:none;stroke:url(#linearGradient7584);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4713"
+       width="15"
+       height="15"
+       x="0.5"
+       y="0.5"
+       rx="3.7836635"
+       ry="3.7836635" />
+  </g>
+</svg>
diff --git a/themes/Adwaita/gtk-3.0/assets/progressbar-border.svg b/themes/Adwaita/gtk-3.0/assets/progressbar-border.svg
new file mode 100644
index 0000000..80d8490
--- /dev/null
+++ b/themes/Adwaita/gtk-3.0/assets/progressbar-border.svg
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   width="16px"
+   height="16px"
+   id="svg4031"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="progressbar-border.svg">
+  <defs
+     id="defs4033">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6844-9-1"
+       id="linearGradient9039"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.45247148,0,0,0.84615346,71.4334,513.19537)"
+       x1="204.98633"
+       y1="175.93756"
+       x2="204.98633"
+       y2="196.36371" />
+    <linearGradient
+       id="linearGradient6844-9-1"
+       inkscape:collect="always">
+      <stop
+         id="stop6846-7-5"
+         offset="0"
+         style="stop-color:#76b0ec;stop-opacity:1" />
+      <stop
+         id="stop6848-7-9"
+         offset="1"
+         style="stop-color:#1f72c6;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="26.170022"
+     inkscape:cx="7.4129968"
+     inkscape:cy="10.16505"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1280"
+     inkscape:window-height="743"
+     inkscape:window-x="0"
+     inkscape:window-y="26"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4036">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       ry="3.0069616"
+       rx="3.0069616"
+       y="0.49999994"
+       x="0.5"
+       height="15"
+       width="15"
+       id="rect6002"
+       style="fill:none;stroke:#3277bf;stroke-width:0.99999994;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;enable-background:new" />
+    <rect
+       transform="matrix(0,1,-1,0,0,0)"
+       style="fill:#ffffff;fill-opacity:0.3137255;stroke:none;display:inline;enable-background:new"
+       id="rect6074"
+       width="1"
+       height="10"
+       x="1"
+       y="-13" />
+  </g>
+</svg>
diff --git a/themes/Adwaita/gtk-3.0/assets/switch-slider-active-border.svg b/themes/Adwaita/gtk-3.0/assets/switch-slider-active-border.svg
new file mode 100644
index 0000000..a4756e9
--- /dev/null
+++ b/themes/Adwaita/gtk-3.0/assets/switch-slider-active-border.svg
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   width="16px"
+   height="16px"
+   id="svg7834"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="New document 18">
+  <defs
+     id="defs7836">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5397"
+       id="linearGradient6657"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0933306,0,0,1.3988545,1085.3202,428.88784)"
+       x1="56.500893"
+       y1="-152.79372"
+       x2="56.500893"
+       y2="-160.74957" />
+    <linearGradient
+       id="linearGradient5397"
+       inkscape:collect="always">
+      <stop
+         id="stop5399"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop5401"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="8"
+     inkscape:cy="8"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1089"
+     inkscape:window-height="662"
+     inkscape:window-x="2"
+     inkscape:window-y="90"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7839">
+    <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>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       ry="0.549788"
+       rx="0.549788"
+       y="0.49999997"
+       x="0.5"
+       height="15"
+       width="15"
+       id="rect6048"
+       style="fill:none;stroke:#2a79cb;stroke-width:0.99999994;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;enable-background:new" />
+    <rect
+       y="-14"
+       x="1"
+       height="12"
+       width="1"
+       id="rect6052"
+       style="fill:#eeeeec;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+       transform="matrix(0,1,-1,0,0,0)" />
+    <rect
+       transform="matrix(0,1,-1,0,0,0)"
+       style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+       id="rect6082"
+       width="1"
+       height="12"
+       x="14"
+       y="-14" />
+  </g>
+</svg>
diff --git a/themes/Adwaita/gtk-3.0/assets/switch-slider-border.svg b/themes/Adwaita/gtk-3.0/assets/switch-slider-border.svg
new file mode 100644
index 0000000..86117f7
--- /dev/null
+++ b/themes/Adwaita/gtk-3.0/assets/switch-slider-border.svg
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   width="16px"
+   height="16px"
+   id="svg7243"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="switch-slider-border.svg">
+  <defs
+     id="defs7245">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5397"
+       id="linearGradient6641"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0933306,0,0,1.3988546,1049.3201,458.88784)"
+       x1="56.500893"
+       y1="-152.79372"
+       x2="56.500893"
+       y2="-160.74957" />
+    <linearGradient
+       id="linearGradient5397"
+       inkscape:collect="always">
+      <stop
+         id="stop5399"
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1;" />
+      <stop
+         id="stop5401"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="-0.15396047"
+     inkscape:cy="8"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1084"
+     inkscape:window-height="708"
+     inkscape:window-x="1"
+     inkscape:window-y="58"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7248">
+    <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>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="fill:none;fill-opacity:1;stroke:#b5bcae;stroke-width:1;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline;enable-background:new"
+       id="rect6072"
+       width="15"
+       height="15"
+       x="0.5"
+       y="0.5"
+       rx="0.8149516"
+       ry="0.81495154" />
+    <rect
+       transform="matrix(0,1,-1,0,0,0)"
+       style="fill:#eeeeec;fill-opacity:1;stroke:none;display:inline;enable-background:new"
+       id="rect6074"
+       width="1"
+       height="12"
+       x="1"
+       y="-14" />
+    <rect
+       y="-14"
+       x="14"
+       height="12"
+       width="1"
+       id="rect6084"
+       style="opacity:1;fill:#ffffff;fill-opacity:0.50196081000000004;stroke:none;display:inline;enable-background:new"
+       transform="matrix(0,1,-1,0,0,0)" />
+  </g>
+</svg>
diff --git a/themes/Adwaita/gtk-3.0/assets/trough-active-border-horizontal-dark.svg b/themes/Adwaita/gtk-3.0/assets/trough-active-border-horizontal-dark.svg
new file mode 100644
index 0000000..eea27c3
--- /dev/null
+++ b/themes/Adwaita/gtk-3.0/assets/trough-active-border-horizontal-dark.svg
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   width="16px"
+   height="16px"
+   id="svg19404"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="scale-trough-border-progress-horizontal.svg">
+  <defs
+     id="defs19406">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4742"
+       id="linearGradient6695"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.5001177,0,-114.95813)"
+       x1="-48.432011"
+       y1="231.36209"
+       x2="-36.380333"
+       y2="234.59567" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4742">
+      <stop
+         style="stop-color:#2c85e2;stop-opacity:1"
+         offset="0"
+         id="stop4744" />
+      <stop
+         style="stop-color:#84b8ee;stop-opacity:1"
+         offset="1"
+         id="stop4746" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4759"
+       id="linearGradient6697"
+       gradientUnits="userSpaceOnUse"
+       x1="-18.164774"
+       y1="230.23718"
+       x2="-18.164774"
+       y2="235.67775" />
+    <linearGradient
+       id="linearGradient4759">
+      <stop
+         style="stop-color:#914100;stop-opacity:1;"
+         offset="0"
+         id="stop4761" />
+      <stop
+         style="stop-color:#ce5c00;stop-opacity:1;"
+         offset="1"
+         id="stop4763" />
+    </linearGradient>
+    <linearGradient
+       y2="234.59567"
+       x2="-36.380333"
+       y1="231.36209"
+       x1="-48.432011"
+       gradientTransform="matrix(0.16730591,0,0,5.0002413,-6.2354097,-1148.8664)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient19482"
+       xlink:href="#linearGradient4742"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.16730591,0,0,3.3332328,-6.2354097,-765.68415)"
+       y2="235.67775"
+       x2="-18.164774"
+       y1="230.23718"
+       x1="-18.164774"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient19484"
+       xlink:href="#linearGradient4759"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="4.7438555"
+     inkscape:cy="4.3960396"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1124"
+     inkscape:window-height="797"
+     inkscape:window-x="84"
+     inkscape:window-y="193"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata19409">
+    <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>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/hbons/layer4.png"
+       style="fill:none;stroke:url(#linearGradient19484);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new"
+       id="rect6683"
+       width="15"
+       height="15"
+       x="-15.5"
+       y="0.50000101"
+       rx="1.7657628"
+       ry="1.7657628"
+       transform="scale(-1,1)" />
+    <rect
+       y="-14"
+       x="14"
+       height="12"
+       width="1"
+       id="rect6687"
+       style="opacity:1;fill:#dddddd;fill-opacity:0.50196081;stroke:none;display:inline;enable-background:new"
+       transform="matrix(0,1,-1,0,0,0)" />
+  </g>
+</svg>
diff --git a/themes/Adwaita/gtk-3.0/assets/trough-active-border-horizontal.svg b/themes/Adwaita/gtk-3.0/assets/trough-active-border-horizontal.svg
new file mode 100644
index 0000000..725de34
--- /dev/null
+++ b/themes/Adwaita/gtk-3.0/assets/trough-active-border-horizontal.svg
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   width="16px"
+   height="16px"
+   id="svg19404"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="scale-trough-border-progress-horizontal.svg">
+  <defs
+     id="defs19406">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4742"
+       id="linearGradient6695"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.5001177,0,-114.95813)"
+       x1="-48.432011"
+       y1="231.36209"
+       x2="-36.380333"
+       y2="234.59567" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4742">
+      <stop
+         style="stop-color:#2c85e2;stop-opacity:1"
+         offset="0"
+         id="stop4744" />
+      <stop
+         style="stop-color:#84b8ee;stop-opacity:1"
+         offset="1"
+         id="stop4746" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4759"
+       id="linearGradient6697"
+       gradientUnits="userSpaceOnUse"
+       x1="-18.164774"
+       y1="230.23718"
+       x2="-18.164774"
+       y2="235.67775" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4759">
+      <stop
+         style="stop-color:#1864b2;stop-opacity:1;"
+         offset="0"
+         id="stop4761" />
+      <stop
+         style="stop-color:#3e90e5;stop-opacity:1"
+         offset="1"
+         id="stop4763" />
+    </linearGradient>
+    <linearGradient
+       y2="234.59567"
+       x2="-36.380333"
+       y1="231.36209"
+       x1="-48.432011"
+       gradientTransform="matrix(0.16730591,0,0,5.0002413,-6.2354097,-1148.8664)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient19482"
+       xlink:href="#linearGradient4742"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.16730591,0,0,3.3332328,-6.2354097,-765.68415)"
+       y2="235.67775"
+       x2="-18.164774"
+       y1="230.23718"
+       x1="-18.164774"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient19484"
+       xlink:href="#linearGradient4759"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="4.9027225"
+     inkscape:cy="4.3960396"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1124"
+     inkscape:window-height="797"
+     inkscape:window-x="84"
+     inkscape:window-y="193"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata19409">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/hbons/layer4.png"
+       style="fill:none;stroke:url(#linearGradient19484);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new"
+       id="rect6683"
+       width="15"
+       height="15"
+       x="-15.5"
+       y="0.50000101"
+       rx="1.7657628"
+       ry="1.7657628"
+       transform="scale(-1,1)" />
+    <rect
+       y="-14"
+       x="14"
+       height="12"
+       width="1"
+       id="rect6687"
+       style="opacity:1;fill:#ffffff;fill-opacity:0.50196081000000004;stroke:none;display:inline;enable-background:new"
+       transform="matrix(0,1,-1,0,0,0)" />
+  </g>
+</svg>
diff --git a/themes/Adwaita/gtk-3.0/assets/trough-active-border-vertical-dark.svg b/themes/Adwaita/gtk-3.0/assets/trough-active-border-vertical-dark.svg
new file mode 100644
index 0000000..9410aca
--- /dev/null
+++ b/themes/Adwaita/gtk-3.0/assets/trough-active-border-vertical-dark.svg
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   width="16px"
+   height="16px"
+   id="svg19404"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="scale-trough-border-progress-horizontal-dark.svg">
+  <defs
+     id="defs19406">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4742"
+       id="linearGradient6695"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.5001177,0,-114.95813)"
+       x1="-48.432011"
+       y1="231.36209"
+       x2="-36.380333"
+       y2="234.59567" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4742">
+      <stop
+         style="stop-color:#2c85e2;stop-opacity:1"
+         offset="0"
+         id="stop4744" />
+      <stop
+         style="stop-color:#84b8ee;stop-opacity:1"
+         offset="1"
+         id="stop4746" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4759"
+       id="linearGradient6697"
+       gradientUnits="userSpaceOnUse"
+       x1="-18.164774"
+       y1="230.23718"
+       x2="-18.164774"
+       y2="235.67775" />
+    <linearGradient
+       id="linearGradient4759">
+      <stop
+         style="stop-color:#914100;stop-opacity:1;"
+         offset="0"
+         id="stop4761" />
+      <stop
+         style="stop-color:#ce5c00;stop-opacity:1;"
+         offset="1"
+         id="stop4763" />
+    </linearGradient>
+    <linearGradient
+       y2="234.59567"
+       x2="-36.380333"
+       y1="231.36209"
+       x1="-48.432011"
+       gradientTransform="matrix(0.16730591,0,0,5.0002413,-6.2354097,-1148.8664)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient19482"
+       xlink:href="#linearGradient4742"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.16730591,0,0,3.3332328,-6.2354097,-765.68415)"
+       y2="235.67775"
+       x2="-18.164774"
+       y1="230.23718"
+       x1="-18.164774"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient19484"
+       xlink:href="#linearGradient4759"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="4.7438555"
+     inkscape:cy="4.3960396"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1124"
+     inkscape:window-height="797"
+     inkscape:window-x="84"
+     inkscape:window-y="193"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata19409">
+    <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>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/hbons/layer4.png"
+       style="fill:none;stroke:url(#linearGradient19484);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new"
+       id="rect6683"
+       width="15"
+       height="15"
+       x="-15.5"
+       y="0.50000101"
+       rx="1.7657628"
+       ry="1.7657628"
+       transform="scale(-1,1)" />
+    <rect
+       y="-2"
+       x="2"
+       height="1"
+       width="12"
+       id="rect6687"
+       style="fill:#dddddd;fill-opacity:0.50196078;stroke:none;display:inline;enable-background:new"
+       transform="matrix(0,1,-1,0,0,0)" />
+  </g>
+</svg>
diff --git a/themes/Adwaita/gtk-3.0/assets/trough-active-border-vertical.svg b/themes/Adwaita/gtk-3.0/assets/trough-active-border-vertical.svg
new file mode 100644
index 0000000..f6a4336
--- /dev/null
+++ b/themes/Adwaita/gtk-3.0/assets/trough-active-border-vertical.svg
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   width="16px"
+   height="16px"
+   id="svg19404"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="scale-trough-border-progress-vertical.svg">
+  <defs
+     id="defs19406">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4742"
+       id="linearGradient6695"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.5001177,0,-114.95813)"
+       x1="-48.432011"
+       y1="231.36209"
+       x2="-36.380333"
+       y2="234.59567" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4742">
+      <stop
+         style="stop-color:#2c85e2;stop-opacity:1"
+         offset="0"
+         id="stop4744" />
+      <stop
+         style="stop-color:#84b8ee;stop-opacity:1"
+         offset="1"
+         id="stop4746" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4759"
+       id="linearGradient6697"
+       gradientUnits="userSpaceOnUse"
+       x1="-18.164774"
+       y1="230.23718"
+       x2="-18.164774"
+       y2="235.67775" />
+    <linearGradient
+       id="linearGradient4759">
+      <stop
+         style="stop-color:#1864b2;stop-opacity:1;"
+         offset="0"
+         id="stop4761" />
+      <stop
+         style="stop-color:#3e90e5;stop-opacity:1"
+         offset="1"
+         id="stop4763" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.16730591,0,0,3.3332328,-6.2354097,-765.68415)"
+       y2="235.67775"
+       x2="-18.164774"
+       y1="230.23718"
+       x1="-18.164774"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient19484"
+       xlink:href="#linearGradient4759"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="5.8649168"
+     inkscape:cy="4.3960396"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1124"
+     inkscape:window-height="797"
+     inkscape:window-x="84"
+     inkscape:window-y="193"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata19409">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/hbons/layer4.png"
+       style="fill:none;stroke:url(#linearGradient19484);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new"
+       id="rect6683"
+       width="15"
+       height="15"
+       x="-15.5"
+       y="0.50000101"
+       rx="1.8108122"
+       ry="1.8108122"
+       transform="scale(-1,1)" />
+    <rect
+       y="-2"
+       x="2"
+       height="1"
+       width="12"
+       id="rect6687"
+       style="fill:#ffffff;fill-opacity:0.50196078;stroke:none;display:inline;enable-background:new"
+       transform="matrix(0,1,-1,0,0,0)" />
+  </g>
+</svg>
diff --git a/themes/Adwaita/gtk-3.0/assets/trough-border-horizontal-dark.svg b/themes/Adwaita/gtk-3.0/assets/trough-border-horizontal-dark.svg
new file mode 100644
index 0000000..bf2d939
--- /dev/null
+++ b/themes/Adwaita/gtk-3.0/assets/trough-border-horizontal-dark.svg
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   width="16px"
+   height="16px"
+   id="svg18840"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="scale-trough-border-normal-horizontal-dark.svg">
+  <defs
+     id="defs18842">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4733"
+       id="linearGradient5300"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.5462107,0,0,1.5001167,1041.3074,-282.54241)"
+       x1="-75.006981"
+       y1="230.86218"
+       x2="-75.006981"
+       y2="232.86203" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4733">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1;"
+         offset="0"
+         id="stop4735" />
+      <stop
+         style="stop-color:#979894;stop-opacity:1"
+         offset="1"
+         id="stop4737" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4751"
+       id="linearGradient5302"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.5462107,0,0,1,1041.3074,-167.08437)"
+       x1="-102.94672"
+       y1="234.3622"
+       x2="-102.94672"
+       y2="230.3622" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4751">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop4753" />
+      <stop
+         style="stop-color:#aaaba8;stop-opacity:1"
+         offset="1"
+         id="stop4755" />
+    </linearGradient>
+    <linearGradient
+       y2="230.3622"
+       x2="-102.94672"
+       y1="234.3622"
+       x1="-102.94672"
+       gradientTransform="matrix(0.16689818,0,0,5.0000044,24.762844,-1169.812)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient18838"
+       xlink:href="#linearGradient4751"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4733-1"
+       id="linearGradient6691"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.5001167,-924,-82.45804)"
+       x1="-78.217659"
+       y1="231.86211"
+       x2="-63.844746"
+       y2="231.86211" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4733-1">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1;"
+         offset="0"
+         id="stop4735-5" />
+      <stop
+         style="stop-color:#979894;stop-opacity:1"
+         offset="1"
+         id="stop4737-4" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4751-5"
+       id="linearGradient6693"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-924,33)"
+       x1="-101.06711"
+       y1="230.89633"
+       x2="-101.06711"
+       y2="234.74361" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4751-5">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop4753-8" />
+      <stop
+         style="stop-color:#aaaba8;stop-opacity:1"
+         offset="1"
+         id="stop4755-7" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.837729"
+     inkscape:cx="-8.3992309"
+     inkscape:cy="8.000964"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1147"
+     inkscape:window-height="877"
+     inkscape:window-x="5"
+     inkscape:window-y="66"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata18845">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/hbons/layer4.png"
+       style="fill:none;fill-opacity:1;stroke:#0d0f10;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new"
+       id="rect6679"
+       width="15"
+       height="15"
+       x="-15.5"
+       y="0.5000003"
+       rx="1.4273891"
+       ry="1.6451885"
+       transform="scale(-1,1)" />
+    <rect
+       transform="matrix(0,1,-1,0,0,0)"
+       style="opacity:1;fill:#282828;fill-opacity:0.50196081;stroke:none;display:inline;enable-background:new"
+       id="rect6689"
+       width="1"
+       height="12"
+       x="14"
+       y="-14" />
+  </g>
+</svg>
diff --git a/themes/Adwaita/gtk-3.0/assets/trough-border-horizontal.svg b/themes/Adwaita/gtk-3.0/assets/trough-border-horizontal.svg
new file mode 100644
index 0000000..d295d1c
--- /dev/null
+++ b/themes/Adwaita/gtk-3.0/assets/trough-border-horizontal.svg
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   width="16px"
+   height="16px"
+   id="svg18840"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="scale-trough-border-normal-horizontal.svg">
+  <defs
+     id="defs18842">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4733"
+       id="linearGradient5300"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.5462107,0,0,1.5001167,1041.3074,-282.54241)"
+       x1="-75.006981"
+       y1="230.86218"
+       x2="-75.006981"
+       y2="232.86203" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4733">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1;"
+         offset="0"
+         id="stop4735" />
+      <stop
+         style="stop-color:#979894;stop-opacity:1"
+         offset="1"
+         id="stop4737" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4751"
+       id="linearGradient5302"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.5462107,0,0,1,1041.3074,-167.08437)"
+       x1="-102.94672"
+       y1="234.3622"
+       x2="-102.94672"
+       y2="230.3622" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4751">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop4753" />
+      <stop
+         style="stop-color:#aaaba8;stop-opacity:1"
+         offset="1"
+         id="stop4755" />
+    </linearGradient>
+    <linearGradient
+       y2="230.3622"
+       x2="-102.94672"
+       y1="234.3622"
+       x1="-102.94672"
+       gradientTransform="matrix(0.16689818,0,0,5.0000044,24.762844,-1169.812)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient18838"
+       xlink:href="#linearGradient4751"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4733-1"
+       id="linearGradient6691"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.5001167,-924,-82.45804)"
+       x1="-78.217659"
+       y1="231.86211"
+       x2="-63.844746"
+       y2="231.86211" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4733-1">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1;"
+         offset="0"
+         id="stop4735-5" />
+      <stop
+         style="stop-color:#979894;stop-opacity:1"
+         offset="1"
+         id="stop4737-4" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4751-5"
+       id="linearGradient6693"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-924,33)"
+       x1="-101.06711"
+       y1="230.89633"
+       x2="-101.06711"
+       y2="234.74361" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4751-5">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop4753-8" />
+      <stop
+         style="stop-color:#aaaba8;stop-opacity:1"
+         offset="1"
+         id="stop4755-7" />
+    </linearGradient>
+    <linearGradient
+       y2="234.74361"
+       x2="-101.06711"
+       y1="230.89633"
+       x1="-101.06711"
+       gradientTransform="matrix(0.16689819,0,0,5.0000044,8.7628444,-1153.8119)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient21386"
+       xlink:href="#linearGradient4751-5"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.837729"
+     inkscape:cx="-0.47374936"
+     inkscape:cy="8.000964"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1147"
+     inkscape:window-height="877"
+     inkscape:window-x="5"
+     inkscape:window-y="66"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata18845">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/hbons/layer4.png"
+       style="fill:none;fill-opacity:1;stroke:url(#linearGradient21386);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new"
+       id="rect6679"
+       width="15"
+       height="15"
+       x="-15.5"
+       y="0.5000003"
+       rx="1.4273891"
+       ry="1.6451885"
+       transform="scale(-1,1)" />
+    <rect
+       transform="matrix(0,1,-1,0,0,0)"
+       style="opacity:1;fill:#ffffff;fill-opacity:0.50196081;stroke:none;display:inline;enable-background:new"
+       id="rect6689"
+       width="1"
+       height="12"
+       x="14"
+       y="-14" />
+  </g>
+</svg>
diff --git a/themes/Adwaita/gtk-3.0/assets/trough-border-vertical-dark.svg b/themes/Adwaita/gtk-3.0/assets/trough-border-vertical-dark.svg
new file mode 100644
index 0000000..3fc71f9
--- /dev/null
+++ b/themes/Adwaita/gtk-3.0/assets/trough-border-vertical-dark.svg
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   width="16px"
+   height="16px"
+   id="svg18840"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="scale-trough-border-normal-vertical-dark.svg">
+  <defs
+     id="defs18842">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4733"
+       id="linearGradient5300"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.5462107,0,0,1.5001167,1041.3074,-282.54241)"
+       x1="-75.006981"
+       y1="230.86218"
+       x2="-75.006981"
+       y2="232.86203" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4733">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1;"
+         offset="0"
+         id="stop4735" />
+      <stop
+         style="stop-color:#979894;stop-opacity:1"
+         offset="1"
+         id="stop4737" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4751"
+       id="linearGradient5302"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.5462107,0,0,1,1041.3074,-167.08437)"
+       x1="-102.94672"
+       y1="234.3622"
+       x2="-102.94672"
+       y2="230.3622" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4751">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop4753" />
+      <stop
+         style="stop-color:#aaaba8;stop-opacity:1"
+         offset="1"
+         id="stop4755" />
+    </linearGradient>
+    <linearGradient
+       y2="230.3622"
+       x2="-102.94672"
+       y1="234.3622"
+       x1="-102.94672"
+       gradientTransform="matrix(0.16689818,0,0,5.0000044,24.762844,-1169.812)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient18838"
+       xlink:href="#linearGradient4751"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4733-1"
+       id="linearGradient6691"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.5001167,-924,-82.45804)"
+       x1="-78.217659"
+       y1="231.86211"
+       x2="-63.844746"
+       y2="231.86211" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4733-1">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1;"
+         offset="0"
+         id="stop4735-5" />
+      <stop
+         style="stop-color:#979894;stop-opacity:1"
+         offset="1"
+         id="stop4737-4" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4751-5"
+       id="linearGradient6693"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-924,33)"
+       x1="-101.06711"
+       y1="230.89633"
+       x2="-101.06711"
+       y2="234.74361" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4751-5">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop4753-8" />
+      <stop
+         style="stop-color:#aaaba8;stop-opacity:1"
+         offset="1"
+         id="stop4755-7" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.837729"
+     inkscape:cx="-2.0947225"
+     inkscape:cy="8.000964"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1147"
+     inkscape:window-height="877"
+     inkscape:window-x="5"
+     inkscape:window-y="66"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata18845">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/hbons/layer4.png"
+       style="fill:none;fill-opacity:1;stroke:#0d0f10;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new"
+       id="rect6679"
+       width="15"
+       height="15"
+       x="-15.5"
+       y="0.5000003"
+       rx="1.4273891"
+       ry="1.6451885"
+       transform="scale(-1,1)" />
+    <rect
+       transform="matrix(0,1,-1,0,0,0)"
+       style="opacity:1;fill:#282828;fill-opacity:0.50196081;stroke:none;display:inline;enable-background:new"
+       id="rect6689"
+       width="12"
+       height="1"
+       x="2"
+       y="-2" />
+  </g>
+</svg>
diff --git a/themes/Adwaita/gtk-3.0/assets/trough-border-vertical.svg b/themes/Adwaita/gtk-3.0/assets/trough-border-vertical.svg
new file mode 100644
index 0000000..5acdf5d
--- /dev/null
+++ b/themes/Adwaita/gtk-3.0/assets/trough-border-vertical.svg
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   width="16px"
+   height="16px"
+   id="svg18840"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="scale-trough-border-normal-vertical.svg">
+  <defs
+     id="defs18842">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4733"
+       id="linearGradient5300"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.5462107,0,0,1.5001167,1041.3074,-282.54241)"
+       x1="-75.006981"
+       y1="230.86218"
+       x2="-75.006981"
+       y2="232.86203" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4733">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1;"
+         offset="0"
+         id="stop4735" />
+      <stop
+         style="stop-color:#979894;stop-opacity:1"
+         offset="1"
+         id="stop4737" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4751"
+       id="linearGradient5302"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.5462107,0,0,1,1041.3074,-167.08437)"
+       x1="-102.94672"
+       y1="234.3622"
+       x2="-102.94672"
+       y2="230.3622" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4751">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop4753" />
+      <stop
+         style="stop-color:#aaaba8;stop-opacity:1"
+         offset="1"
+         id="stop4755" />
+    </linearGradient>
+    <linearGradient
+       y2="230.3622"
+       x2="-102.94672"
+       y1="234.3622"
+       x1="-102.94672"
+       gradientTransform="matrix(0.16689818,0,0,5.0000044,24.762844,-1169.812)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient18838"
+       xlink:href="#linearGradient4751"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4733-1"
+       id="linearGradient6691"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.5001167,-924,-82.45804)"
+       x1="-78.217659"
+       y1="231.86211"
+       x2="-63.844746"
+       y2="231.86211" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4733-1">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1;"
+         offset="0"
+         id="stop4735-5" />
+      <stop
+         style="stop-color:#979894;stop-opacity:1"
+         offset="1"
+         id="stop4737-4" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4751-5"
+       id="linearGradient6693"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-924,33)"
+       x1="-101.06711"
+       y1="230.89633"
+       x2="-101.06711"
+       y2="234.74361" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4751-5">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop4753-8" />
+      <stop
+         style="stop-color:#aaaba8;stop-opacity:1"
+         offset="1"
+         id="stop4755-7" />
+    </linearGradient>
+    <linearGradient
+       y2="234.74361"
+       x2="-101.06711"
+       y1="230.89633"
+       x1="-101.06711"
+       gradientTransform="matrix(0.16689819,0,0,5.0000044,8.7628444,-1153.8119)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient21386"
+       xlink:href="#linearGradient4751-5"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.837729"
+     inkscape:cx="-0.47374936"
+     inkscape:cy="8.000964"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1147"
+     inkscape:window-height="877"
+     inkscape:window-x="5"
+     inkscape:window-y="66"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata18845">
+    <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>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/home/hbons/layer4.png"
+       style="fill:none;fill-opacity:1;stroke:url(#linearGradient21386);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline;enable-background:new"
+       id="rect6679"
+       width="15"
+       height="15"
+       x="-15.5"
+       y="0.5000003"
+       rx="1.4273891"
+       ry="1.6451885"
+       transform="scale(-1,1)" />
+    <rect
+       transform="matrix(0,1,-1,0,0,0)"
+       style="opacity:1;fill:#ffffff;fill-opacity:0.50196081;stroke:none;display:inline;enable-background:new"
+       id="rect6689"
+       width="12"
+       height="1"
+       x="2"
+       y="-2" />
+  </g>
+</svg>
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css b/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css
index 4257208..eaf2587 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css
@@ -64,3 +64,50 @@
     background-image: url("assets/radio-mixed-dark.svg");
 }
 
+.entry {
+    border-image: url("assets/entry-border-normal-dark.svg") 2 / 2 stretch;
+}
+
+.entry:focused {
+    border-image: url("assets/entry-border-focused-dark.svg") 2 / 2 stretch;
+}
+
+GtkSwitch.trough,
+GtkScale.trough.horizontal {
+    border-image: url("assets/trough-border-horizontal-dark.svg") 2 / 2 stretch;
+}
+
+GtkScale.trough.vertical {
+    border-image: url("assets/trough-border-vertical-dark.svg") 2 / 2 stretch;
+}
+
+GtkSwitch.trough:active,
+GtkScale.progressbar.horizontal {
+    border-image: url("assets/trough-active-border-horizontal-dark.svg") 2 / 2 stretch;
+}
+
+GtkScale.progressbar.vertical {
+    border-image: url("assets/trough-active-border-vertical-dark.svg") 2 / 2 stretch;
+}
+
+/* TODO: need dark versions */
+.primary-toolbar .toolbar .button:active,
+.primary-toolbar.toolbar .button:active {
+    border-image: url("assets/primary-toolbar-button-active-border.svg") 4 / 4 stretch;
+}
+
+GtkSwitch.slider {
+    border-image: url("assets/switch-slider-border.svg") 2 / 2 stretch;
+}
+
+GtkSwitch.slider:active {
+    border-image: url("assets/switch-slider-active-border.svg") 2 / 2 stretch;
+}
+
+.progressbar,
+.progressbar row,
+.progressbar row:hover,
+.progressbar row:selected,
+.progressbar row:selected:focused {
+    border-image: url("assets/progressbar-border.svg") 2 / 2 stretch;
+}
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css b/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css
index c5bfb9e..59d52cf 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css
@@ -63,3 +63,51 @@
 .radio row:selected:focused:inconsistent {
     background-image: url("assets/radio-mixed.svg");
 }
+
+.entry {
+    border-image: url("assets/entry-border-normal.svg") 2 / 2 stretch;
+}
+
+.entry:focused {
+    border-image: url("assets/entry-border-focused.svg") 2 / 2 stretch;
+}
+
+GtkSwitch.trough,
+GtkScale.trough.horizontal {
+    border-image: url("assets/trough-border-horizontal.svg") 2 / 2 stretch;
+}
+
+GtkScale.trough.vertical {
+    border-image: url("assets/trough-border-vertical.svg") 2 / 2 stretch;
+}
+
+GtkSwitch.trough:active,
+GtkScale.progressbar.horizontal {
+    border-image: url("assets/trough-active-border-horizontal.svg") 2 / 2 stretch;
+}
+
+GtkScale.progressbar.vertical {
+    border-image: url("assets/trough-active-border-vertical.svg") 2 / 2 stretch;
+}
+
+.primary-toolbar .toolbar .button:active,
+.primary-toolbar.toolbar .button:active {
+    border-image: url("assets/primary-toolbar-button-active-border.svg") 4 / 4 stretch;
+}
+
+GtkSwitch.slider {
+    border-image: url("assets/switch-slider-border.svg") 2 / 2 stretch;
+}
+
+GtkSwitch.slider:active {
+    border-image: url("assets/switch-slider-active-border.svg") 2 / 2 stretch;
+}
+
+.progressbar,
+.entry.progressbar,
+.progressbar row,
+.progressbar row:hover,
+.progressbar row:selected,
+.progressbar row:selected:focused {
+    border-image: url("assets/progressbar-border.svg") 3 / 3 stretch;
+}
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 9b5aca8..97d5f89 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -46,11 +46,6 @@
     -adwaita-focus-fill-color: none;
     -adwaita-focus-border-gradient: none;
     -adwaita-focus-border-dashes: 1;
-
-    -adwaita-inset-left: none;
-    -adwaita-inset-right: none;
-    -adwaita-inset-top: none;
-    -adwaita-inset-bottom: none;
 }
 
 /***************
@@ -132,29 +127,18 @@ GtkStatusbar {
 
     padding: 3;
 
-    border-radius: 2;
+    border-style: none;
     border-width: 1;
-    border-style: solid;
-    -adwaita-border-gradient: -gtk-gradient (linear,
-                                             left top, left bottom,
-                                             from (shade (@internal_element_color, 1.14)),
-                                             to (shade (@internal_element_color, 1.37)));
-
-    -adwaita-inset-top: alpha (@switch_slider_color, 0.50);
-}
-
-.entry:focused {
-    border-color: @focused_entry_border;
-    -adwaita-border-gradient: none;
+    border-radius: 2;
 
-    -adwaita-inset-top: @focused_entry_inset;
+    /* border-image defined in the -assets variants */
 }
 
 .entry:insensitive {
     background-color: @insensitive_bg_color;
-    -adwaita-border-gradient: none;
 
-    -adwaita-inset-top: none;
+    border-image: none;
+    border-style: solid;
 }
 
 .entry.progressbar {
@@ -162,8 +146,8 @@ GtkStatusbar {
     color: @theme_selected_fg_color;
 
     border-width: 1;
-    border-radius: 1;
-    border-color: @progressbar_border;
+    border-radius: 2;
+    /* border-image defined in -assets variant */
 
     -adwaita-progressbar-pattern: none;
 }
@@ -173,23 +157,24 @@ GtkStatusbar {
  *****************/
 .spinbutton {
     padding: 3 2;
-
-    -adwaita-inset-top: none;
-}
-
-.spinbutton:focused {
-    -adwaita-inset-top: none;
 }
 
 .spinbutton.button,
 .spinbutton.button:prelight,
-.spinbutton.button:active {
+.spinbutton.button:active,
+.spinbutton.button:focused,
+.spinbutton.button:insensitive {
     color: @internal_element_color;
 
     background-image: none;
-    background-color: @theme_base_color;
+    background-color: alpha(@theme_base_color, 0.0);
 
     border-style: none;
+    border-image: none;
+}
+
+.spinbutton.button:insensitive {
+    color: @insensitive_border_color;
 }
 
 /****************
@@ -208,11 +193,10 @@ GtkStatusbar {
                                      to (@progressbar_background_b));
 
     border-radius: 3;
-    border-style: solid;
     border-width: 1;
-    border-color: @progressbar_border;
+    border-style: none;
+    /* border-image defined in the -assets variant */
 
-    -adwaita-inset-top: alpha (@theme_base_color, 0.20);
     -adwaita-progressbar-pattern: -gtk-gradient (linear,
                                                  left top, right bottom,
                                                  from (alpha (@progressbar_pattern, 0.00)),
@@ -309,42 +293,29 @@ GtkScale.scale-has-marks-above.slider.vertical {
 GtkScale.trough {
     border-width: 1;
     border-radius: 2;
-    border-style: solid;
+    border-style: none;
 
-    -adwaita-border-gradient: -gtk-gradient (linear,
-                                             left top, left bottom,
-                                             from (@scale_border_a),
-                                             to (@scale_border_b));
     background-color: @scale_fill;
-}
 
-GtkScale.trough.horizontal {
-    -adwaita-inset-bottom: alpha (@theme_base_color, 0.50);
-}
-
-GtkScale.trough.vertical {
-    -adwaita-inset-right: alpha (@theme_base_color, 0.50);
+    /* border-image defined in the -assets variants */
 }
 
 GtkScale.trough:insensitive {
     background-color: @insensitive_bg_color;
     background-image: none;
 
-    -adwaita-border-gradient: none;
-    -adwaita-inset-bottom: none;
+    border-image: none;
+    border-style: solid;
 }
 
 GtkScale.progressbar {
     background-color: @scale_progress_fill;
 
     border-width: 1;
-    border-radius: 3;
-    border-style: solid;
+    border-radius: 2;
+    border-style: none;
+    /* border-image defined in the -assets variants */
 
-    -adwaita-border-gradient: -gtk-gradient (linear,
-                                             left top, left bottom,
-                                             from (@scale_progress_border_a),
-                                             to (@scale_progress_border_b));
     -adwaita-progressbar-pattern: none;
 }
 
@@ -748,11 +719,11 @@ GtkTreeMenu .menuitem * {
 
     border-width: 1 0 1 0;
     border-radius: 0;
-    border-style: solid;
-    -adwaita-border-gradient: -gtk-gradient (linear,
-                                             left top, left bottom,
-                                             from (shade (@theme_bg_color, 0.56)),
-                                             to (shade (@theme_bg_color, 0.83)));
+    border-style: none;
+    border-image: -gtk-gradient (linear,
+                                 left top, left bottom,
+                                 from (shade (@theme_bg_color, 0.56)),
+                                 to (shade (@theme_bg_color, 0.83))) 1 stretch;
 
     -GtkWidget-window-dragging: true;
     -GtkToolbar-button-relief: normal;
@@ -763,7 +734,8 @@ GtkTreeMenu .menuitem * {
     background-image: none;
     background-color: shade (@theme_bg_color, 0.97);
 
-    -adwaita-border-gradient: none;
+    border-image: none;
+    border-style: solid;
     border-color: shade (@theme_bg_color, 0.91);
 }
 
@@ -809,11 +781,9 @@ GtkTreeMenu .menuitem * {
 
 .primary-toolbar .toolbar .button:active,
 .primary-toolbar.toolbar .button:active {
-    border-style: solid;
-    -adwaita-border-gradient: -gtk-gradient (linear,
-                                             left top, left bottom,
-                                             from (shade (@toolbar_active_button_color, 0.8)),
-                                             to (shade (@toolbar_active_button_color, 1.4)));
+    border-style: none;
+    border-width: 1;
+    /* border-image defined in the -assets variant */
 
     background-image: -gtk-gradient (linear,
 				     left top, left bottom,
@@ -842,7 +812,9 @@ GtkTreeMenu .menuitem * {
 .primary-toolbar .toolbar .button:active:insensitive,
 .primary-toolbar.toolbar .button:active:insensitive {
     border-color: @insensitive_border_color;
-    -adwaita-border-gradient: none;
+
+    border-image: none;
+    border-style: solid;
 
     background-image: none;
 }
@@ -855,7 +827,6 @@ GtkTreeMenu .menuitem * {
     border-style: solid;
     border-width: 1;
     border-color: shade (@theme_bg_color, 0.56);
-    -adwaita-border-gradient: none;
 }
 
 /* primary toolbar raised buttons */
@@ -1018,16 +989,16 @@ GtkSwitch {
 
 GtkSwitch.trough {
     color: shade (@internal_element_color, 0.60);
+
     border-radius: 1;
     border-width: 1;
-    border-style: solid;
-    border-color: shade (@frame_color, 1.22);
+    border-style: none;
+    /* border-image defined in the -assets variant */
+
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (@trough_bg_color_a),
                                      to (@trough_bg_color_b));
-
-    -adwaita-inset-bottom: alpha (@theme_base_color, 0.24);
 }
 
 GtkSwitch.trough:active {
@@ -1036,36 +1007,30 @@ GtkSwitch.trough:active {
                                      left top, left bottom,
                                      from (@active_switch_bg_color_a),
                                      to (@active_switch_bg_color_b));
-
-    -adwaita-border-gradient: -gtk-gradient (linear,
-                                             left top, left bottom,
-                                             from (shade (@theme_selected_bg_color, 0.70)),
-                                             to (shade (@theme_selected_bg_color, 0.94)));
 }
 
 GtkSwitch.trough:insensitive {
     background-image: none;
     background-color: shade (@theme_bg_color, 0.9);
-    -adwaita-border-gradient: none;
 
-    -adwaita-inset-bottom: none;
+    border-image: none;
+    border-style: solid;
 }
 
 GtkSwitch.slider {
     border-width: 1;
     border-radius: 1;
-    border-color: shade (@frame_color, 1.31);
-    border-style: solid;
+    border-style: none;
+    /* border-image defined in -assets variant */
+
     padding: 2;
+
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (@theme_base_color),
                                      to (@switch_slider_color));
 
     -adwaita-switch-grip-color: shade (@switch_slider_color, 0.97);
-
-    -adwaita-inset-top: @switch_slider_color;
-    -adwaita-inset-bottom: alpha (@theme_base_color, 0.50);
 }
 
 GtkSwitch.slider:active {
@@ -1073,12 +1038,10 @@ GtkSwitch.slider:active {
 }
 
 GtkSwitch.slider:insensitive {
-    border-style: none;
+    border-image: none;
+
     background-image: none;
     background-color: @insensitive_bg_color;
-
-    -adwaita-inset-top: none;
-    -adwaita-inset-bottom: none;
 }
 
 GtkViewport,
diff --git a/themes/Adwaita/gtk-3.0/gtk.css b/themes/Adwaita/gtk-3.0/gtk.css
index b1273f0..a9bd740 100644
--- a/themes/Adwaita/gtk-3.0/gtk.css
+++ b/themes/Adwaita/gtk-3.0/gtk.css
@@ -108,5 +108,5 @@
 
 @define-color expander_row_selected_color #acccee;
 
- import url("gtk-widgets-assets.css");
 @import url("gtk-widgets.css");
+ import url("gtk-widgets-assets.css");



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]