From a85ec5663cfd5ec8044873bf754bbebbd908b35d Mon Sep 17 00:00:00 2001
From: Sam Hewitt <hewittsamuel@gmail.com>
Date: Wed, 22 Apr 2015 22:13:11 -0400
Subject: [PATCH] New switches, bug fixes.

---
 Paper/gtk-3.0/apps/gnome-weather.css          |  32 +++
 Paper/gtk-3.0/apps/nautilus.css               |   6 +
 Paper/gtk-3.0/apps/pantheon.css               |  10 +-
 .../assets/scalable/switch-off-disabled.svg   |  26 ++-
 Paper/gtk-3.0/assets/scalable/switch-off.svg  |  24 ++-
 .../gtk-3.0/assets/scalable/switch-off@2.svg  |  26 ++-
 .../assets/scalable/switch-on-dark.svg        |  43 ++--
 .../assets/scalable/switch-on-dark@2.svg      |  55 ++++--
 .../assets/scalable/switch-on-disabled.svg    |  39 +++-
 .../assets/scalable/switch-on-disabled@2.svg  |  24 ++-
 Paper/gtk-3.0/assets/scalable/switch-on.svg   |  35 +++-
 Paper/gtk-3.0/assets/scalable/switch-on@2.svg |  55 ++++--
 .../assets/scalable/switch-slider-dark.svg    |  16 +-
 .../assets/scalable/switch-slider-dark@2.svg  |  12 +-
 .../assets/scalable/switch-slider-focus.svg   | 183 ------------------
 .../assets/scalable/switch-slider-focus@2.svg | 183 ------------------
 .../switch-slider-insensitive-dark.svg        |  14 +-
 .../switch-slider-insensitive-dark@2.svg      |  12 +-
 .../scalable/switch-slider-insensitive.svg    |  59 ++----
 Paper/gtk-3.0/granite-widgets.css             |   2 +-
 Paper/gtk-3.0/gtk-dark.css                    |   8 +-
 Paper/gtk-3.0/gtk-widgets-assets-dark.css     |   4 +-
 Paper/gtk-3.0/gtk-widgets-assets.css          |   2 +-
 Paper/gtk-3.0/widgets/buttons.css             |   1 -
 .../gtk-3.0/widgets/composited-indicator.css  |   3 -
 Paper/gtk-3.0/widgets/header-bar.css          |   5 +-
 Paper/gtk-3.0/widgets/images.css              |   2 +-
 Paper/gtk-3.0/widgets/menubars.css            |  12 +-
 Paper/gtk-3.0/widgets/popovers.css            |   6 +-
 Paper/gtk-3.0/widgets/titlebar.css            |   5 +-
 Paper/gtk-3.0/widgets/windows.css             |  10 +-
 Paper/plank/dock.theme                        |   2 +-
 32 files changed, 354 insertions(+), 562 deletions(-)
 create mode 100644 Paper/gtk-3.0/apps/gnome-weather.css
 delete mode 100644 Paper/gtk-3.0/assets/scalable/switch-slider-focus.svg
 delete mode 100644 Paper/gtk-3.0/assets/scalable/switch-slider-focus@2.svg

diff --git a/Paper/gtk-3.0/apps/gnome-weather.css b/Paper/gtk-3.0/apps/gnome-weather.css
new file mode 100644
index 0000000..e5a6bd2
--- /dev/null
+++ b/Paper/gtk-3.0/apps/gnome-weather.css
@@ -0,0 +1,32 @@
+/* Copyright 2015 Sam Hewitt.
+*
+* This file is part of the Paper GTK theme.
+*
+* The Paper GTK theme is free software: you can redistribute it
+* and/or modify it under the terms of the GNU General Public License as
+* published by the Free Software Foundation, either version 3 of the
+* License, or (at your option) any later version.
+*
+* The Paper GTK theme is distributed in the hope that it will be
+* useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+* Public License for more details.
+*
+* You should have received a copy of the GNU General Public License along
+* with the Paper GTK theme. If not, see http://www.gnu.org/licenses/.
+*/
+
+#conditions-image {
+	color: #fff;
+}
+
+#temperature-label {
+	color: #fff;
+}
+
+#forcast-viewport {
+	background: alpha(#000,0.7);
+	border: none;
+	border-radius: 4px;
+	color: #fff;
+}
\ No newline at end of file
diff --git a/Paper/gtk-3.0/apps/nautilus.css b/Paper/gtk-3.0/apps/nautilus.css
index a3acfe2..ebbe6ec 100644
--- a/Paper/gtk-3.0/apps/nautilus.css
+++ b/Paper/gtk-3.0/apps/nautilus.css
@@ -27,11 +27,13 @@
 
 NautilusWindow .titlebar,
 NautilusWindow .header-bar {
+    border: none;
     background-color: @nautilus;
 }
 
 NautilusWindow .titlebar:backdrop,
 NautilusWindow .header-bar:backdrop {
+    border: none;
     background-color: shade(@nautilus,0.9);
 }
 
@@ -72,6 +74,10 @@ NautilusWindow .pane-separator {
  ************/
 
 /* Active */
+NautilusWindow .notebook .frame {
+    border: none;
+}
+
 NautilusWindow .notebook tab.top:active,
 NautilusWindow .dynamic-notebook tab.top:active {
     box-shadow:inset 0 -3px 0 0 @nautilus;
diff --git a/Paper/gtk-3.0/apps/pantheon.css b/Paper/gtk-3.0/apps/pantheon.css
index 6b91be6..ff10834 100644
--- a/Paper/gtk-3.0/apps/pantheon.css
+++ b/Paper/gtk-3.0/apps/pantheon.css
@@ -52,14 +52,14 @@ BirdieWidgetsTweetList * {
 
 .gala-notification {
     border-width: 0;
-    border-radius: 9px;
+    border-radius: 2px;
     color: white;
-    border: 1px solid @panel;
-    background-color: alpha(@panel, 0.9);
+    border: 1px solid #fff;
+    background-color: #fff;
 }
 
 .gala-notification .title, .gala-notification .label {
-    color: white;
+    color: @text;
 }
 
 .gala-button {
@@ -195,7 +195,7 @@ NoiseWidgetsTileView {
 }
 
 .app:focus {
-    background-color: alpha(#000, 0.20);
+    /*background-color: alpha(#000, 0.20);*/
 }
  
 .search-item {
diff --git a/Paper/gtk-3.0/assets/scalable/switch-off-disabled.svg b/Paper/gtk-3.0/assets/scalable/switch-off-disabled.svg
index f3e3a51..0d9d703 100644
--- a/Paper/gtk-3.0/assets/scalable/switch-off-disabled.svg
+++ b/Paper/gtk-3.0/assets/scalable/switch-off-disabled.svg
@@ -14,7 +14,7 @@
    height="21"
    id="svg2857"
    version="1.1"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.91 r"
    sodipodi:docname="switch-off-disabled.svg">
   <defs
      id="defs2859">
@@ -85,6 +85,16 @@
        y1="783.36218"
        x2="464.64285"
        y2="803.36218" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4151">
+      <path
+         sodipodi:nodetypes="sssssss"
+         inkscape:connector-curvature="0"
+         id="path4153"
+         d="m 455.14258,782.36133 c -5.71322,0 -10.5,4.78678 -10.5,10.5 0,5.71321 4.78678,10.5 10.5,10.5 l 46,0 c 5.71321,0 10.5,-4.78679 10.5,-10.5 0,-5.71322 -4.78679,-10.5 -10.5,-10.5 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.2;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </clipPath>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -94,15 +104,15 @@
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="-169.68553"
-     inkscape:cy="-19.508026"
+     inkscape:cx="66.661634"
+     inkscape:cy="30.748915"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:window-width="1366"
-     inkscape:window-height="699"
+     inkscape:window-height="709"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="32"
      inkscape:window-maximized="1"
      borderlayer="true"
      inkscape:showpageshadow="false"
@@ -130,7 +140,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -140,8 +150,8 @@
      id="layer1"
      transform="translate(-444.64286,-782.36218)">
     <path
-       style="opacity:0.1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:8;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 499.14288,788.36218 -44.00002,0 c -2.493,0 -4.5,2.007 -4.5,4.5 0,2.493 2.007,4.5 4.5,4.5 l 44.00002,0 c 2.493,0 4.5,-2.007 4.5,-4.5 0,-2.493 -2.007,-4.5 -4.5,-4.5 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.15;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 455.14258,782.36133 c -5.71322,0 -10.5,4.78678 -10.5,10.5 0,5.71321 4.78678,10.5 10.5,10.5 l 46,0 c 5.71321,0 10.5,-4.78679 10.5,-10.5 0,-5.71322 -4.78679,-10.5 -10.5,-10.5 z"
        id="rect4157"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="sssssss" />
diff --git a/Paper/gtk-3.0/assets/scalable/switch-off.svg b/Paper/gtk-3.0/assets/scalable/switch-off.svg
index 1e8ec69..525d2c2 100644
--- a/Paper/gtk-3.0/assets/scalable/switch-off.svg
+++ b/Paper/gtk-3.0/assets/scalable/switch-off.svg
@@ -85,6 +85,16 @@
        y1="783.36218"
        x2="464.64285"
        y2="803.36218" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4151">
+      <path
+         sodipodi:nodetypes="sssssss"
+         inkscape:connector-curvature="0"
+         id="path4153"
+         d="m 455.14258,782.36133 c -5.71322,0 -10.5,4.78678 -10.5,10.5 0,5.71321 4.78678,10.5 10.5,10.5 l 46,0 c 5.71321,0 10.5,-4.78679 10.5,-10.5 0,-5.71322 -4.78679,-10.5 -10.5,-10.5 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.2;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </clipPath>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -94,15 +104,15 @@
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="22.712972"
-     inkscape:cy="9.7567071"
+     inkscape:cx="66.661634"
+     inkscape:cy="30.748915"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:window-width="1366"
-     inkscape:window-height="711"
+     inkscape:window-height="709"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="32"
      inkscape:window-maximized="1"
      borderlayer="true"
      inkscape:showpageshadow="false"
@@ -130,7 +140,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -140,8 +150,8 @@
      id="layer1"
      transform="translate(-444.64286,-782.36218)">
     <path
-       style="opacity:0.2;fill:#000000;fill-opacity:1;stroke:none;stroke-width:8;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 499.14288,788.36218 -44.00001,0 c -2.493,0 -4.5,2.007 -4.5,4.5 0,2.493 2.007,4.5 4.5,4.5 l 44.00001,0 c 2.493,0 4.5,-2.007 4.5,-4.5 0,-2.493 -2.007,-4.5 -4.5,-4.5 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.2;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 455.14258,782.36133 c -5.71322,0 -10.5,4.78678 -10.5,10.5 0,5.71321 4.78678,10.5 10.5,10.5 l 46,0 c 5.71321,0 10.5,-4.78679 10.5,-10.5 0,-5.71322 -4.78679,-10.5 -10.5,-10.5 z"
        id="rect4157"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="sssssss" />
diff --git a/Paper/gtk-3.0/assets/scalable/switch-off@2.svg b/Paper/gtk-3.0/assets/scalable/switch-off@2.svg
index 6396277..f0eb323 100644
--- a/Paper/gtk-3.0/assets/scalable/switch-off@2.svg
+++ b/Paper/gtk-3.0/assets/scalable/switch-off@2.svg
@@ -14,7 +14,7 @@
    height="42"
    id="svg2857"
    version="1.1"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.91 r"
    sodipodi:docname="switch-off@2.svg">
   <defs
      id="defs2859">
@@ -85,6 +85,16 @@
        y1="783.36218"
        x2="464.64285"
        y2="803.36218" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4151">
+      <path
+         sodipodi:nodetypes="sssssss"
+         inkscape:connector-curvature="0"
+         id="path4153"
+         d="m 455.14258,782.36133 c -5.71322,0 -10.5,4.78678 -10.5,10.5 0,5.71321 4.78678,10.5 10.5,10.5 l 46,0 c 5.71321,0 10.5,-4.78679 10.5,-10.5 0,-5.71322 -4.78679,-10.5 -10.5,-10.5 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.2;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </clipPath>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -94,15 +104,15 @@
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="41.208577"
-     inkscape:cy="21"
+     inkscape:cx="66.661634"
+     inkscape:cy="30.748915"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:window-width="1366"
-     inkscape:window-height="699"
+     inkscape:window-height="709"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="32"
      inkscape:window-maximized="1"
      borderlayer="true"
      inkscape:showpageshadow="false"
@@ -130,7 +140,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -140,8 +150,8 @@
      id="layer1"
      transform="translate(-444.64286,-761.36218)">
     <path
-       style="opacity:0.2;fill:#000000;fill-opacity:1;stroke:none;stroke-width:8;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 553.64287,773.36218 -88.00002,0 c -4.986,0 -9,4.014 -9,9 0,4.986 4.014,9 9,9 l 88.00002,0 c 4.986,0 9,-4.014 9,-9 0,-4.986 -4.014,-9 -9,-9 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.2;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 465.64258,761.36133 c -11.42644,0 -21,9.57356 -21,21 0,11.42642 9.57356,21 21,21 l 92,0 c 11.42642,0 21,-9.57358 21,-21 0,-11.42644 -9.57358,-21 -21,-21 z"
        id="rect4157"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="sssssss" />
diff --git a/Paper/gtk-3.0/assets/scalable/switch-on-dark.svg b/Paper/gtk-3.0/assets/scalable/switch-on-dark.svg
index 4fa835b..2f886f7 100644
--- a/Paper/gtk-3.0/assets/scalable/switch-on-dark.svg
+++ b/Paper/gtk-3.0/assets/scalable/switch-on-dark.svg
@@ -14,7 +14,7 @@
    height="21"
    id="svg2857"
    version="1.1"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.91 r"
    sodipodi:docname="switch-on-dark.svg">
   <defs
      id="defs2859">
@@ -85,24 +85,34 @@
        y1="783.36218"
        x2="464.64285"
        y2="803.36218" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4169">
+      <path
+         sodipodi:nodetypes="sssssss"
+         inkscape:connector-curvature="0"
+         id="path4171"
+         d="m 455.14258,782.36133 c -5.71322,0 -10.5,4.78678 -10.5,10.5 0,5.71321 4.78678,10.5 10.5,10.5 l 46,0 c 5.71321,0 10.5,-4.78679 10.5,-10.5 0,-5.71322 -4.78679,-10.5 -10.5,-10.5 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#5f7c8a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </clipPath>
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#353535"
+     pagecolor="#efefef"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="-317.77585"
-     inkscape:cy="-4.544942"
+     inkscape:zoom="5.6568542"
+     inkscape:cx="18.49889"
+     inkscape:cy="9.8805324"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:window-width="1366"
-     inkscape:window-height="699"
+     inkscape:window-height="709"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="32"
      inkscape:window-maximized="1"
      borderlayer="true"
      inkscape:showpageshadow="false"
@@ -113,7 +123,12 @@
      inkscape:snap-bbox-edge-midpoints="true"
      showguides="true"
      inkscape:guide-bbox="true"
-     showborder="true">
+     showborder="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true">
     <inkscape:grid
        type="xygrid"
        id="grid3078"
@@ -130,7 +145,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -140,10 +155,16 @@
      id="layer1"
      transform="translate(-444.64286,-782.36218)">
     <path
-       style="opacity:1;fill:#40565f;fill-opacity:1;stroke:none;stroke-width:8;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 499.14288,788.36218 -44.00002,0 c -2.493,0 -4.5,2.007 -4.5,4.5 0,2.493 2.007,4.5 4.5,4.5 l 44.00002,0 c 2.493,0 4.5,-2.007 4.5,-4.5 0,-2.493 -2.007,-4.5 -4.5,-4.5 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#90a4ae;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 455.14258,782.36133 c -5.71322,0 -10.5,4.78678 -10.5,10.5 0,5.71321 4.78678,10.5 10.5,10.5 l 46,0 c 5.71321,0 10.5,-4.78679 10.5,-10.5 0,-5.71322 -4.78679,-10.5 -10.5,-10.5 z"
        id="rect4157"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="sssssss" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#d3d9dc;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:1"
+       d="m 452.64286,793.36218 3,3 6,-8"
+       id="path4163"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
   </g>
 </svg>
diff --git a/Paper/gtk-3.0/assets/scalable/switch-on-dark@2.svg b/Paper/gtk-3.0/assets/scalable/switch-on-dark@2.svg
index cdf6b91..c463bb7 100644
--- a/Paper/gtk-3.0/assets/scalable/switch-on-dark@2.svg
+++ b/Paper/gtk-3.0/assets/scalable/switch-on-dark@2.svg
@@ -14,7 +14,7 @@
    height="42"
    id="svg2857"
    version="1.1"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.91 r"
    sodipodi:docname="switch-on-dark@2.svg">
   <defs
      id="defs2859">
@@ -85,24 +85,34 @@
        y1="783.36218"
        x2="464.64285"
        y2="803.36218" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4169">
+      <path
+         sodipodi:nodetypes="sssssss"
+         inkscape:connector-curvature="0"
+         id="path4171"
+         d="m 455.14258,782.36133 c -5.71322,0 -10.5,4.78678 -10.5,10.5 0,5.71321 4.78678,10.5 10.5,10.5 l 46,0 c 5.71321,0 10.5,-4.78679 10.5,-10.5 0,-5.71322 -4.78679,-10.5 -10.5,-10.5 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#5f7c8a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </clipPath>
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#353535"
+     pagecolor="#efefef"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="27.691387"
-     inkscape:cy="6.2493687"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="25.72139"
+     inkscape:cy="16.392793"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:window-width="1366"
-     inkscape:window-height="699"
+     inkscape:window-height="709"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="32"
      inkscape:window-maximized="1"
      borderlayer="true"
      inkscape:showpageshadow="false"
@@ -113,7 +123,12 @@
      inkscape:snap-bbox-edge-midpoints="true"
      showguides="true"
      inkscape:guide-bbox="true"
-     showborder="true">
+     showborder="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true">
     <inkscape:grid
        type="xygrid"
        id="grid3078"
@@ -130,7 +145,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -139,11 +154,21 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(-444.64286,-761.36218)">
-    <path
-       style="opacity:1;fill:#40565f;fill-opacity:1;stroke:none;stroke-width:8;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 553.64287,773.36218 -88.00002,0 c -4.986,0 -9,4.014 -9,9 0,4.986 4.014,9 9,9 l 88.00002,0 c 4.986,0 9,-4.014 9,-9 0,-4.986 -4.014,-9 -9,-9 z"
-       id="rect4157"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sssssss" />
+    <g
+       id="g4289"
+       transform="matrix(2,0,0,2,-444.64258,-803.36133)">
+      <path
+         sodipodi:nodetypes="sssssss"
+         inkscape:connector-curvature="0"
+         id="rect4157"
+         d="m 455.14258,782.36133 c -5.71322,0 -10.5,4.78678 -10.5,10.5 0,5.71321 4.78678,10.5 10.5,10.5 l 46,0 c 5.71321,0 10.5,-4.78679 10.5,-10.5 0,-5.71322 -4.78679,-10.5 -10.5,-10.5 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#90a4ae;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <path
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path4163"
+         d="m 452.64286,793.36218 3,3 6,-8"
+         style="opacity:1;fill:none;fill-rule:evenodd;stroke:#d3d9dc;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
   </g>
 </svg>
diff --git a/Paper/gtk-3.0/assets/scalable/switch-on-disabled.svg b/Paper/gtk-3.0/assets/scalable/switch-on-disabled.svg
index 2b4ca24..df2e698 100644
--- a/Paper/gtk-3.0/assets/scalable/switch-on-disabled.svg
+++ b/Paper/gtk-3.0/assets/scalable/switch-on-disabled.svg
@@ -14,7 +14,7 @@
    height="21"
    id="svg2857"
    version="1.1"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.91 r"
    sodipodi:docname="switch-on-disabled.svg">
   <defs
      id="defs2859">
@@ -85,24 +85,34 @@
        y1="783.36218"
        x2="464.64285"
        y2="803.36218" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4169">
+      <path
+         sodipodi:nodetypes="sssssss"
+         inkscape:connector-curvature="0"
+         id="path4171"
+         d="m 455.14258,782.36133 c -5.71322,0 -10.5,4.78678 -10.5,10.5 0,5.71321 4.78678,10.5 10.5,10.5 l 46,0 c 5.71321,0 10.5,-4.78679 10.5,-10.5 0,-5.71322 -4.78679,-10.5 -10.5,-10.5 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#5f7c8a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </clipPath>
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#353535"
+     pagecolor="#efefef"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="-142.18553"
-     inkscape:cy="-27.508026"
+     inkscape:cx="34.28861"
+     inkscape:cy="8.0394792"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:window-width="1366"
-     inkscape:window-height="699"
+     inkscape:window-height="709"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="32"
      inkscape:window-maximized="1"
      borderlayer="true"
      inkscape:showpageshadow="false"
@@ -113,7 +123,12 @@
      inkscape:snap-bbox-edge-midpoints="true"
      showguides="true"
      inkscape:guide-bbox="true"
-     showborder="true">
+     showborder="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true">
     <inkscape:grid
        type="xygrid"
        id="grid3078"
@@ -140,10 +155,16 @@
      id="layer1"
      transform="translate(-444.64286,-782.36218)">
     <path
-       style="opacity:0.2;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:8;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 499.14288,788.36218 -37.00001,0 c -2.493,0 -4.5,2.007 -4.5,4.5 0,2.493 2.007,4.5 4.5,4.5 l 37.00001,0 c 2.493,0 4.5,-2.007 4.5,-4.5 0,-2.493 -2.007,-4.5 -4.5,-4.5 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#c0c0c0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 455.14258,782.36133 c -5.71322,0 -10.5,4.78678 -10.5,10.5 0,5.71321 4.78678,10.5 10.5,10.5 l 46,0 c 5.71321,0 10.5,-4.78679 10.5,-10.5 0,-5.71322 -4.78679,-10.5 -10.5,-10.5 z"
        id="rect4157"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="sssssss" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 452.64286,793.36218 3,3 6,-8"
+       id="path4163"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
   </g>
 </svg>
diff --git a/Paper/gtk-3.0/assets/scalable/switch-on-disabled@2.svg b/Paper/gtk-3.0/assets/scalable/switch-on-disabled@2.svg
index 93a6ef1..4ae4a26 100644
--- a/Paper/gtk-3.0/assets/scalable/switch-on-disabled@2.svg
+++ b/Paper/gtk-3.0/assets/scalable/switch-on-disabled@2.svg
@@ -14,7 +14,7 @@
    height="42"
    id="svg2857"
    version="1.1"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.91 r"
    sodipodi:docname="switch-on-disabled@2.svg">
   <defs
      id="defs2859">
@@ -85,6 +85,16 @@
        y1="783.36218"
        x2="464.64285"
        y2="803.36218" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4151">
+      <path
+         sodipodi:nodetypes="sssssss"
+         inkscape:connector-curvature="0"
+         id="path4153"
+         d="m 455.14258,782.36133 c -5.71322,0 -10.5,4.78678 -10.5,10.5 0,5.71321 4.78678,10.5 10.5,10.5 l 46,0 c 5.71321,0 10.5,-4.78679 10.5,-10.5 0,-5.71322 -4.78679,-10.5 -10.5,-10.5 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.2;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </clipPath>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -94,15 +104,15 @@
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="-142.18553"
-     inkscape:cy="-27.508026"
+     inkscape:cx="-93.338366"
+     inkscape:cy="30.748915"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:window-width="1366"
-     inkscape:window-height="699"
+     inkscape:window-height="709"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="32"
      inkscape:window-maximized="1"
      borderlayer="true"
      inkscape:showpageshadow="false"
@@ -140,8 +150,8 @@
      id="layer1"
      transform="translate(-444.64286,-761.36218)">
     <path
-       style="opacity:0.2;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:8;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 553.64287,773.36218 -74.00002,0 c -4.986,0 -9,4.014 -9,9 0,4.986 4.014,9 9,9 l 74.00002,0 c 4.986,0 9,-4.014 9,-9 0,-4.986 -4.014,-9 -9,-9 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.15;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 465.64258,761.36133 c -11.42644,0 -21,9.57356 -21,21 0,11.42642 9.57356,21 21,21 l 92,0 c 11.42642,0 21,-9.57358 21,-21 0,-11.42644 -9.57358,-21 -21,-21 z"
        id="rect4157"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="sssssss" />
diff --git a/Paper/gtk-3.0/assets/scalable/switch-on.svg b/Paper/gtk-3.0/assets/scalable/switch-on.svg
index e94aa87..e0171f7 100644
--- a/Paper/gtk-3.0/assets/scalable/switch-on.svg
+++ b/Paper/gtk-3.0/assets/scalable/switch-on.svg
@@ -85,6 +85,16 @@
        y1="783.36218"
        x2="464.64285"
        y2="803.36218" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4169">
+      <path
+         sodipodi:nodetypes="sssssss"
+         inkscape:connector-curvature="0"
+         id="path4171"
+         d="m 455.14258,782.36133 c -5.71322,0 -10.5,4.78678 -10.5,10.5 0,5.71321 4.78678,10.5 10.5,10.5 l 46,0 c 5.71321,0 10.5,-4.78679 10.5,-10.5 0,-5.71322 -4.78679,-10.5 -10.5,-10.5 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#5f7c8a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </clipPath>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -94,15 +104,15 @@
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="45.995179"
-     inkscape:cy="11.794907"
+     inkscape:cx="-125.71139"
+     inkscape:cy="8.0394792"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:window-width="1366"
-     inkscape:window-height="711"
+     inkscape:window-height="709"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="32"
      inkscape:window-maximized="1"
      borderlayer="true"
      inkscape:showpageshadow="false"
@@ -113,7 +123,12 @@
      inkscape:snap-bbox-edge-midpoints="true"
      showguides="true"
      inkscape:guide-bbox="true"
-     showborder="true">
+     showborder="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true">
     <inkscape:grid
        type="xygrid"
        id="grid3078"
@@ -140,10 +155,16 @@
      id="layer1"
      transform="translate(-444.64286,-782.36218)">
     <path
-       style="opacity:1;fill:#bfcbd0;fill-opacity:1;stroke:none;stroke-width:8;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 499.14288,788.36218 -44.00001,0 c -2.493,0 -4.5,2.007 -4.5,4.5 0,2.493 2.007,4.5 4.5,4.5 l 44.00001,0 c 2.493,0 4.5,-2.007 4.5,-4.5 0,-2.493 -2.007,-4.5 -4.5,-4.5 z"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9fb0b9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 455.14258,782.36133 c -5.71322,0 -10.5,4.78678 -10.5,10.5 0,5.71321 4.78678,10.5 10.5,10.5 l 46,0 c 5.71321,0 10.5,-4.78679 10.5,-10.5 0,-5.71322 -4.78679,-10.5 -10.5,-10.5 z"
        id="rect4157"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="sssssss" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 452.64286,793.36218 3,3 6,-8"
+       id="path4163"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
   </g>
 </svg>
diff --git a/Paper/gtk-3.0/assets/scalable/switch-on@2.svg b/Paper/gtk-3.0/assets/scalable/switch-on@2.svg
index 295de22..a2ad426 100644
--- a/Paper/gtk-3.0/assets/scalable/switch-on@2.svg
+++ b/Paper/gtk-3.0/assets/scalable/switch-on@2.svg
@@ -85,24 +85,34 @@
        y1="783.36218"
        x2="464.64285"
        y2="803.36218" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4169">
+      <path
+         sodipodi:nodetypes="sssssss"
+         inkscape:connector-curvature="0"
+         id="path4171"
+         d="m 455.14258,782.36133 c -5.71322,0 -10.5,4.78678 -10.5,10.5 0,5.71321 4.78678,10.5 10.5,10.5 l 46,0 c 5.71321,0 10.5,-4.78679 10.5,-10.5 0,-5.71322 -4.78679,-10.5 -10.5,-10.5 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#5f7c8a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </clipPath>
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#353535"
+     pagecolor="#efefef"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="-154.90693"
-     inkscape:cy="12.439946"
+     inkscape:cx="-123.71139"
+     inkscape:cy="6.5394792"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1301"
-     inkscape:window-height="744"
-     inkscape:window-x="65"
-     inkscape:window-y="24"
+     inkscape:window-width="1366"
+     inkscape:window-height="709"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
      inkscape:window-maximized="1"
      borderlayer="true"
      inkscape:showpageshadow="false"
@@ -113,7 +123,12 @@
      inkscape:snap-bbox-edge-midpoints="true"
      showguides="true"
      inkscape:guide-bbox="true"
-     showborder="true">
+     showborder="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true">
     <inkscape:grid
        type="xygrid"
        id="grid3078"
@@ -130,7 +145,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -139,11 +154,21 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(-444.64286,-761.36218)">
-    <path
-       style="opacity:1;fill:#bfcbd0;fill-opacity:1;stroke:none;stroke-width:8;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 553.64289,773.36218 -88.00002,0 c -4.986,0 -9,4.014 -9,9 0,4.986 4.014,9 9,9 l 88.00002,0 c 4.986,0 9,-4.014 9,-9 0,-4.986 -4.014,-9 -9,-9 z"
-       id="rect4157"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sssssss" />
+    <g
+       id="g4148"
+       transform="matrix(2,0,0,2,-444.64258,-803.36133)">
+      <path
+         sodipodi:nodetypes="sssssss"
+         inkscape:connector-curvature="0"
+         id="rect4157"
+         d="m 455.14258,782.36133 c -5.71322,0 -10.5,4.78678 -10.5,10.5 0,5.71321 4.78678,10.5 10.5,10.5 l 46,0 c 5.71321,0 10.5,-4.78679 10.5,-10.5 0,-5.71322 -4.78679,-10.5 -10.5,-10.5 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#9fb0b9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <path
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path4163"
+         d="m 452.64286,793.36218 3,3 6,-8"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
   </g>
 </svg>
diff --git a/Paper/gtk-3.0/assets/scalable/switch-slider-dark.svg b/Paper/gtk-3.0/assets/scalable/switch-slider-dark.svg
index 09cc80b..d104e3f 100644
--- a/Paper/gtk-3.0/assets/scalable/switch-slider-dark.svg
+++ b/Paper/gtk-3.0/assets/scalable/switch-slider-dark.svg
@@ -14,7 +14,7 @@
    height="21"
    id="svg2857"
    version="1.1"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.91 r"
    sodipodi:docname="switch-slider-dark.svg">
   <defs
      id="defs2859">
@@ -93,16 +93,16 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="28.126"
-     inkscape:cy="11.504314"
+     inkscape:zoom="2"
+     inkscape:cx="-54.33902"
+     inkscape:cy="7.8232248"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:window-width="1366"
-     inkscape:window-height="699"
+     inkscape:window-height="709"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="32"
      inkscape:window-maximized="1"
      borderlayer="true"
      inkscape:showpageshadow="false"
@@ -130,7 +130,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -177,7 +177,7 @@
          height="16.999981"
          width="17"
          id="rect3872"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#49636d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-opacity:1;marker:none;enable-background:new" />
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#d3d9dc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-opacity:1;marker:none;enable-background:new" />
     </g>
   </g>
 </svg>
diff --git a/Paper/gtk-3.0/assets/scalable/switch-slider-dark@2.svg b/Paper/gtk-3.0/assets/scalable/switch-slider-dark@2.svg
index 8a66313..2cf9177 100644
--- a/Paper/gtk-3.0/assets/scalable/switch-slider-dark@2.svg
+++ b/Paper/gtk-3.0/assets/scalable/switch-slider-dark@2.svg
@@ -14,7 +14,7 @@
    height="42"
    id="svg2857"
    version="1.1"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.91 r"
    sodipodi:docname="switch-slider-dark@2.svg">
   <defs
      id="defs2859">
@@ -94,15 +94,15 @@
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="28.126"
+     inkscape:cx="-131.874"
      inkscape:cy="11.504314"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:window-width="1366"
-     inkscape:window-height="699"
+     inkscape:window-height="709"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="32"
      inkscape:window-maximized="1"
      borderlayer="true"
      inkscape:showpageshadow="false"
@@ -130,7 +130,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -177,7 +177,7 @@
          height="16.999981"
          width="17"
          id="rect3872"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#49636d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-opacity:1;marker:none;enable-background:new" />
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#d3d9dc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-opacity:1;marker:none;enable-background:new" />
     </g>
   </g>
 </svg>
diff --git a/Paper/gtk-3.0/assets/scalable/switch-slider-focus.svg b/Paper/gtk-3.0/assets/scalable/switch-slider-focus.svg
deleted file mode 100644
index b48f6b0..0000000
--- a/Paper/gtk-3.0/assets/scalable/switch-slider-focus.svg
+++ /dev/null
@@ -1,183 +0,0 @@
-<?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="21"
-   height="21"
-   id="svg2857"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="switch-slider-focus.svg">
-  <defs
-     id="defs2859">
-    <linearGradient
-       id="linearGradient3864">
-      <stop
-         style="stop-color:#a248af;stop-opacity:1;"
-         offset="0"
-         id="stop3866" />
-      <stop
-         style="stop-color:#a86ab1;stop-opacity:1;"
-         offset="1"
-         id="stop3868" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2865" />
-    <inkscape:perspective
-       id="perspective2843"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath3860">
-      <rect
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:new"
-         id="rect3862"
-         width="72"
-         height="21"
-         x="0"
-         y="0"
-         ry="10.5" />
-    </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864"
-       id="linearGradient3870"
-       x1="464.64285"
-       y1="783.36218"
-       x2="464.64285"
-       y2="803.36218"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-444.64286,-782.36221)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864"
-       id="linearGradient3789"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-444.64286,-782.36221)"
-       x1="464.64285"
-       y1="783.36218"
-       x2="464.64285"
-       y2="803.36218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864"
-       id="linearGradient3808"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-444.64286,-782.36221)"
-       x1="464.64285"
-       y1="783.36218"
-       x2="464.64285"
-       y2="803.36218" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#353535"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="28.126"
-     inkscape:cy="11.504314"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="699"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     showborder="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3078"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2862">
-    <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
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-444.64286,-782.36218)">
-    <g
-       transform="translate(-13.999993,-2.6e-6)"
-       id="g4155">
-      <rect
-         transform="scale(-1,1)"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.05;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-opacity:1;marker:none;enable-background:new"
-         id="rect4158"
-         width="17"
-         height="16.999981"
-         x="-477.64285"
-         y="785.36218"
-         ry="8.3779802" />
-      <rect
-         transform="scale(-1,1)"
-         ry="8.3779802"
-         y="785.36218"
-         x="-477.64285"
-         height="16.999981"
-         width="17"
-         id="rect4218"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.05;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-opacity:1;marker:none;enable-background:new" />
-      <rect
-         transform="scale(-1,1)"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-opacity:1;marker:none;enable-background:new"
-         id="rect4216"
-         width="17"
-         height="16.999981"
-         x="-477.64285"
-         y="785.36218"
-         ry="8.3779802" />
-      <rect
-         transform="scale(-1,1)"
-         ry="8.3779802"
-         y="784.36218"
-         x="-477.64285"
-         height="16.999981"
-         width="17"
-         id="rect3872"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#9fb0b9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-opacity:1;marker:none;enable-background:new" />
-    </g>
-  </g>
-</svg>
diff --git a/Paper/gtk-3.0/assets/scalable/switch-slider-focus@2.svg b/Paper/gtk-3.0/assets/scalable/switch-slider-focus@2.svg
deleted file mode 100644
index 703e1e0..0000000
--- a/Paper/gtk-3.0/assets/scalable/switch-slider-focus@2.svg
+++ /dev/null
@@ -1,183 +0,0 @@
-<?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="42"
-   height="42"
-   id="svg2857"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="switch-slider-focus@2.svg">
-  <defs
-     id="defs2859">
-    <linearGradient
-       id="linearGradient3864">
-      <stop
-         style="stop-color:#a248af;stop-opacity:1;"
-         offset="0"
-         id="stop3866" />
-      <stop
-         style="stop-color:#a86ab1;stop-opacity:1;"
-         offset="1"
-         id="stop3868" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective2865" />
-    <inkscape:perspective
-       id="perspective2843"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath3860">
-      <rect
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:new"
-         id="rect3862"
-         width="72"
-         height="21"
-         x="0"
-         y="0"
-         ry="10.5" />
-    </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864"
-       id="linearGradient3870"
-       x1="464.64285"
-       y1="783.36218"
-       x2="464.64285"
-       y2="803.36218"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-444.64286,-782.36221)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864"
-       id="linearGradient3789"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-444.64286,-782.36221)"
-       x1="464.64285"
-       y1="783.36218"
-       x2="464.64285"
-       y2="803.36218" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864"
-       id="linearGradient3808"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-444.64286,-782.36221)"
-       x1="464.64285"
-       y1="783.36218"
-       x2="464.64285"
-       y2="803.36218" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#353535"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="28.126"
-     inkscape:cy="11.504314"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="699"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     borderlayer="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-paths="true"
-     inkscape:bbox-nodes="true"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-bbox-edge-midpoints="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     showborder="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3078"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2862">
-    <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
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-444.64286,-761.36218)">
-    <g
-       transform="matrix(2,0,0,2,-472.64285,-804.36217)"
-       id="g4155">
-      <rect
-         transform="scale(-1,1)"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.05;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-opacity:1;marker:none;enable-background:new"
-         id="rect4158"
-         width="17"
-         height="16.999981"
-         x="-477.64285"
-         y="785.36218"
-         ry="8.3779802" />
-      <rect
-         transform="scale(-1,1)"
-         ry="8.3779802"
-         y="785.36218"
-         x="-477.64285"
-         height="16.999981"
-         width="17"
-         id="rect4218"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.05;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-opacity:1;marker:none;enable-background:new" />
-      <rect
-         transform="scale(-1,1)"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-opacity:1;marker:none;enable-background:new"
-         id="rect4216"
-         width="17"
-         height="16.999981"
-         x="-477.64285"
-         y="785.36218"
-         ry="8.3779802" />
-      <rect
-         transform="scale(-1,1)"
-         ry="8.3779802"
-         y="784.36218"
-         x="-477.64285"
-         height="16.999981"
-         width="17"
-         id="rect3872"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#9fb0b9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-opacity:1;marker:none;enable-background:new" />
-    </g>
-  </g>
-</svg>
diff --git a/Paper/gtk-3.0/assets/scalable/switch-slider-insensitive-dark.svg b/Paper/gtk-3.0/assets/scalable/switch-slider-insensitive-dark.svg
index 7f04d7d..9b84b01 100644
--- a/Paper/gtk-3.0/assets/scalable/switch-slider-insensitive-dark.svg
+++ b/Paper/gtk-3.0/assets/scalable/switch-slider-insensitive-dark.svg
@@ -14,7 +14,7 @@
    height="21"
    id="svg2857"
    version="1.1"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.91 r"
    sodipodi:docname="switch-slider-insensitive-dark.svg">
   <defs
      id="defs2859">
@@ -94,15 +94,15 @@
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="-164.08937"
-     inkscape:cy="1.3118863"
+     inkscape:cx="-0.50842229"
+     inkscape:cy="12.271024"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:window-width="1366"
-     inkscape:window-height="699"
+     inkscape:window-height="709"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="32"
      inkscape:window-maximized="1"
      borderlayer="true"
      inkscape:showpageshadow="false"
@@ -130,7 +130,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -140,7 +140,7 @@
      id="layer1"
      transform="translate(-444.64286,-782.36218)">
     <rect
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#1e272b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-opacity:1;marker:none;enable-background:new"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#7d8a90;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-opacity:1;marker:none;enable-background:new"
        id="rect3872"
        width="17"
        height="16.999981"
diff --git a/Paper/gtk-3.0/assets/scalable/switch-slider-insensitive-dark@2.svg b/Paper/gtk-3.0/assets/scalable/switch-slider-insensitive-dark@2.svg
index a61b454..da4fd55 100644
--- a/Paper/gtk-3.0/assets/scalable/switch-slider-insensitive-dark@2.svg
+++ b/Paper/gtk-3.0/assets/scalable/switch-slider-insensitive-dark@2.svg
@@ -14,7 +14,7 @@
    height="42"
    id="svg2857"
    version="1.1"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.91 r"
    sodipodi:docname="switch-slider-insensitive-dark@2.svg">
   <defs
      id="defs2859">
@@ -94,15 +94,15 @@
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="-150.50001"
+     inkscape:cx="-310.50001"
      inkscape:cy="14.000016"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:window-width="1366"
-     inkscape:window-height="699"
+     inkscape:window-height="709"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="32"
      inkscape:window-maximized="1"
      borderlayer="true"
      inkscape:showpageshadow="false"
@@ -130,7 +130,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -140,7 +140,7 @@
      id="layer1"
      transform="translate(-444.64286,-761.36218)">
     <rect
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#1e272b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-opacity:1;marker:none;enable-background:new"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#7d8a90;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-opacity:1;marker:none;enable-background:new"
        id="rect3872"
        width="34"
        height="33.999962"
diff --git a/Paper/gtk-3.0/assets/scalable/switch-slider-insensitive.svg b/Paper/gtk-3.0/assets/scalable/switch-slider-insensitive.svg
index 9cb98b2..7371825 100644
--- a/Paper/gtk-3.0/assets/scalable/switch-slider-insensitive.svg
+++ b/Paper/gtk-3.0/assets/scalable/switch-slider-insensitive.svg
@@ -14,7 +14,7 @@
    height="21"
    id="svg2857"
    version="1.1"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.91 r"
    sodipodi:docname="switch-slider-insensitive.svg">
   <defs
      id="defs2859">
@@ -94,15 +94,15 @@
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="-144.374"
-     inkscape:cy="3.504314"
+     inkscape:cx="-37.40421"
+     inkscape:cy="11.749423"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:window-width="1366"
-     inkscape:window-height="699"
+     inkscape:window-height="709"
      inkscape:window-x="0"
-     inkscape:window-y="27"
+     inkscape:window-y="32"
      inkscape:window-maximized="1"
      borderlayer="true"
      inkscape:showpageshadow="false"
@@ -139,45 +139,14 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(-444.64286,-782.36218)">
-    <g
-       transform="translate(-13.999993,1.6456299e-5)"
-       id="g4155">
-      <rect
-         transform="scale(-1,1)"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.05;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-opacity:1;marker:none;enable-background:new"
-         id="rect4158"
-         width="17"
-         height="16.999981"
-         x="-477.64285"
-         y="785.36218"
-         ry="8.3779802" />
-      <rect
-         transform="scale(-1,1)"
-         ry="8.3779802"
-         y="785.36218"
-         x="-477.64285"
-         height="16.999981"
-         width="17"
-         id="rect4218"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.05;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-opacity:1;marker:none;enable-background:new" />
-      <rect
-         transform="scale(-1,1)"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-opacity:1;marker:none;enable-background:new"
-         id="rect4216"
-         width="17"
-         height="16.999981"
-         x="-477.64285"
-         y="785.36218"
-         ry="8.3779802" />
-      <rect
-         transform="scale(-1,1)"
-         ry="8.3779802"
-         y="784.36218"
-         x="-477.64285"
-         height="16.999981"
-         width="17"
-         id="rect3872"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#f7f7f7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-opacity:1;marker:none;enable-background:new" />
-    </g>
+    <rect
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#f7f7f7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-opacity:1;marker:none;enable-background:new"
+       id="rect3872"
+       width="17"
+       height="16.999981"
+       x="-463.64285"
+       y="784.36218"
+       ry="8.3779802"
+       transform="scale(-1,1)" />
   </g>
 </svg>
diff --git a/Paper/gtk-3.0/granite-widgets.css b/Paper/gtk-3.0/granite-widgets.css
index d9070f0..99e03cd 100644
--- a/Paper/gtk-3.0/granite-widgets.css
+++ b/Paper/gtk-3.0/granite-widgets.css
@@ -96,7 +96,7 @@ GraniteWidgetsWelcome .h3 {
 
 .panel {
     background: @panel;
-    color: #fff;
+    color: @panel_text;
     font-weight: bold;
 }
 
diff --git a/Paper/gtk-3.0/gtk-dark.css b/Paper/gtk-3.0/gtk-dark.css
index ec46e39..9c22372 100644
--- a/Paper/gtk-3.0/gtk-dark.css
+++ b/Paper/gtk-3.0/gtk-dark.css
@@ -24,8 +24,8 @@
 /* Base colors */
 @define-color base #7b888e;/* Base color */
 @define-color background #6f7b81;/* Background color */
-@define-color foreground #A8B5BA;/* Foreground color */
-@define-color border alpha(#000, 0.3);/* Borders color */
+@define-color foreground #d3d9dc;/* Foreground color */
+@define-color border shade(@background, 0.8);/* Borders color */
 @define-color separator alpha(#000, 0.2);/* Separator color */
 @define-color text @foreground;/* Text color */
 @define-color panel #454D50;/* Panel color */
@@ -34,11 +34,11 @@
 @define-color header_text alpha(#fff, 0.7);/* Header text color */
 @define-color header_text_dark alpha(#000, 0.3);/* Header text color */
 @define-color menu #636E73;/* Menu color */
-@define-color menu_text #A8B5BA;/* Menu color */
+@define-color menu_text #d3d9dc;/* Menu color */
 @define-color selection #90a4ae;/* Selection color */
 @define-color view_background @base;/* View background */
 @define-color inactive_frame @border;/* Inactive frame color */
-@define-color panel_text #A8B5BA;/* Panel text color */
+@define-color panel_text #d3d9dc;/* Panel text color */
 @define-color panel_text_shadow alpha(#000, 0.2);/* Panel text color */
 @define-color text_shadow alpha(white, 0.4);/* Text shadow */
 @define-color icon_shadow @text_shadow;/* Icon shadow */
diff --git a/Paper/gtk-3.0/gtk-widgets-assets-dark.css b/Paper/gtk-3.0/gtk-widgets-assets-dark.css
index 6ed6682..4091859 100644
--- a/Paper/gtk-3.0/gtk-widgets-assets-dark.css
+++ b/Paper/gtk-3.0/gtk-widgets-assets-dark.css
@@ -286,7 +286,7 @@ GtkSwitch.trough {
 }
 
 GtkSwitch.trough:active {
-    background: -gtk-scaled(url("assets/scalable/switch-on-dark.svg"),url("assets/scalable/switch-on-dark@2.svg"));
+    background: -gtk-scaled(url("assets/scalable/switch-on-dark.svg"),url("assets/scalable/switch-on@2.svg"));
     background-repeat: no-repeat;
     background-position: 0 center;
 }
@@ -310,7 +310,7 @@ GtkSwitch.slider {
 }
 
 GtkSwitch.slider:focus {
-    background: -gtk-scaled(url("assets/scalable/switch-slider-focus.svg"),url("assets/scalable/switch-slider-focus@2.svg"));
+    background: -gtk-scaled(url("assets/scalable/switch-slider.svg"),url("assets/scalable/switch-slider@2.svg"));
     background-repeat: no-repeat;
     background-position: 0 center;
 }
diff --git a/Paper/gtk-3.0/gtk-widgets-assets.css b/Paper/gtk-3.0/gtk-widgets-assets.css
index de3fcd2..1ff3d44 100644
--- a/Paper/gtk-3.0/gtk-widgets-assets.css
+++ b/Paper/gtk-3.0/gtk-widgets-assets.css
@@ -309,7 +309,7 @@ GtkSwitch.slider {
 }
 
 GtkSwitch.slider:focus {
-    background: -gtk-scaled(url("assets/scalable/switch-slider-focus.svg"),url("assets/scalable/switch-slider-focus@2.svg"));
+    background: -gtk-scaled(url("assets/scalable/switch-slider.svg"),url("assets/scalable/switch-slider@2.svg"));
     background-repeat: no-repeat;
     background-position: 0 center;
 }
diff --git a/Paper/gtk-3.0/widgets/buttons.css b/Paper/gtk-3.0/widgets/buttons.css
index bb48900..dadef9e 100644
--- a/Paper/gtk-3.0/widgets/buttons.css
+++ b/Paper/gtk-3.0/widgets/buttons.css
@@ -182,7 +182,6 @@ GtkCalendar.button:backdrop:hover,
 .button:backdrop:hover GtkImage,
 .button:active:backdrop GtkImage {
     color: @backdrop_text;
-    -gtk-image-effect: dim;
 }
 
 .button:insensitive GtkImage {
diff --git a/Paper/gtk-3.0/widgets/composited-indicator.css b/Paper/gtk-3.0/widgets/composited-indicator.css
index c0544cf..348d70e 100644
--- a/Paper/gtk-3.0/widgets/composited-indicator.css
+++ b/Paper/gtk-3.0/widgets/composited-indicator.css
@@ -60,17 +60,14 @@
 .composited-indicator.menuitem:backdrop:hover GtkImage,
 .composited-indicator.menuitem:active:backdrop GtkImage {
     color: @backdrop_text;
-    -gtk-image-effect: dim;
 }
 
 .composited-indicator.menuitem:insensitive GtkImage {
     color: @insensitive_text;
-    -gtk-image-effect: dim;
 }
 
 .composited-indicator.menuitem:insensitive:backdrop GtkImage {
     color: mix(@backdrop_text, @insensitive_text, 0.5);
-    -gtk-image-effect: dim;
 }
 
 /* Labels */
diff --git a/Paper/gtk-3.0/widgets/header-bar.css b/Paper/gtk-3.0/widgets/header-bar.css
index a67d6e4..f20ee31 100644
--- a/Paper/gtk-3.0/widgets/header-bar.css
+++ b/Paper/gtk-3.0/widgets/header-bar.css
@@ -24,7 +24,7 @@
 .header-bar {
     padding:0;
     border: none;
-    border-radius: 3px 3px 0 0;
+    border-radius: 4px 4px 0 0;
     background-color: @header;
     color: @header_text;
     box-shadow: inset 0 1px 0 0 rgba(255,255,255,0.1),
@@ -35,7 +35,8 @@
 
 .maximized .header-bar {
     border-radius: 0px;
-    box-shadow: inset 0 1px 0 0 rgba(255,255,255,0.1);
+    /*box-shadow: inset 0 1px 0 0 rgba(255,255,255,0.1);*/
+    box-shadow: none;
 }
 
 .header-bar:backdrop {
diff --git a/Paper/gtk-3.0/widgets/images.css b/Paper/gtk-3.0/widgets/images.css
index 6889f5e..1872989 100644
--- a/Paper/gtk-3.0/widgets/images.css
+++ b/Paper/gtk-3.0/widgets/images.css
@@ -30,7 +30,7 @@
 *:backdrop:hover GtkImage,
 *:active:backdrop GtkImage {
     color: @backdrop_text;
-    -gtk-image-effect: dim;
+    /*-gtk-image-effect: dim;*/
 }
 
 *:insensitive GtkImage {
diff --git a/Paper/gtk-3.0/widgets/menubars.css b/Paper/gtk-3.0/widgets/menubars.css
index 2c39208..f4a2393 100644
--- a/Paper/gtk-3.0/widgets/menubars.css
+++ b/Paper/gtk-3.0/widgets/menubars.css
@@ -76,17 +76,17 @@
 .menubar .menuitem:backdrop:hover GtkImage,
 .menubar .menuitem:active:backdrop GtkImage {
     color: @backdrop_header_text;
-    -gtk-image-effect: dim;
+    /*-gtk-image-effect: dim;*/
 }
 
 .menubar .menuitem:insensitive GtkImage {
     color: @insensitive_header_text;
-    -gtk-image-effect: dim;
+    /*-gtk-image-effect: dim;*/
 }
 
 .menubar .menuitem:insensitive:backdrop GtkImage {
     color: mix(@backdrop_header_text, @insensitive_header_text, 0.5);
-    -gtk-image-effect: dim;
+    /*-gtk-image-effect: dim;*/
 }
 
 /* Labels */
@@ -134,17 +134,17 @@
 .menubar .menu .menuitem:backdrop:hover GtkImage,
 .menubar .menu .menuitem:active:backdrop GtkImage {
     color: @backdrop_text;
-    -gtk-image-effect: dim;
+    /*-gtk-image-effect: dim;*/
 }
 
 .menubar .menu .menuitem:insensitive GtkImage {
     color: @insensitive_text;
-    -gtk-image-effect: dim;
+    /*-gtk-image-effect: dim;*/
 }
 
 .menubar .menu .menuitem:insensitive:backdrop GtkImage {
     color: mix(@backdrop_text, @insensitive_text, 0.5);
-    -gtk-image-effect: dim;
+    /*-gtk-image-effect: dim;*/
 }
 
 /* Labels */
diff --git a/Paper/gtk-3.0/widgets/popovers.css b/Paper/gtk-3.0/widgets/popovers.css
index 500854c..1b1a572 100644
--- a/Paper/gtk-3.0/widgets/popovers.css
+++ b/Paper/gtk-3.0/widgets/popovers.css
@@ -165,17 +165,17 @@ GtkPopover .button:backdrop GtkImage,
 GtkPopover .button:backdrop:hover GtkImage,
 GtkPopover .button:active:backdrop GtkImage {
     color: @backdrop_text;
-    -gtk-image-effect: dim;
+    /*-gtk-image-effect: dim;*/
 }
 
 GtkPopover .button:insensitive GtkImage {
     color: @insensitive_text;
-    -gtk-image-effect: dim;
+    /*-gtk-image-effect: dim;*/
 }
 
 GtkPopover .button:insensitive:backdrop GtkImage {
     color: mix(@backdrop_text, @insensitive_text, 0.5);
-    -gtk-image-effect: dim;
+    /*-gtk-image-effect: dim;*/
 }
 
 /* Labels */
diff --git a/Paper/gtk-3.0/widgets/titlebar.css b/Paper/gtk-3.0/widgets/titlebar.css
index 75b164f..ac55f61 100644
--- a/Paper/gtk-3.0/widgets/titlebar.css
+++ b/Paper/gtk-3.0/widgets/titlebar.css
@@ -23,7 +23,7 @@
 .titlebar {
     padding:0;
     border: none;
-    border-radius: 3px 3px 0 0;
+    border-radius: 4px 4px 0 0;
     background-color: @header;
     color: @header_text;
     box-shadow: inset 0 1px 0 0 rgba(255,255,255,0.1),
@@ -33,7 +33,8 @@
 
 .maximized .titlebar {
     border-radius: 0px;
-    box-shadow: inset 0 1px 0 0 rgba(255,255,255,0.1);
+    /*box-shadow: inset 0 1px 0 0 rgba(255,255,255,0.1);*/
+    box-shadow: none;
 }
 
 .titlebar:backdrop {
diff --git a/Paper/gtk-3.0/widgets/windows.css b/Paper/gtk-3.0/widgets/windows.css
index e105dc6..59ad642 100644
--- a/Paper/gtk-3.0/widgets/windows.css
+++ b/Paper/gtk-3.0/widgets/windows.css
@@ -25,19 +25,19 @@
 
 .window-frame {
 	border:none;
-    border-radius: 2px;
+    border-radius: 4px;
     box-shadow: 0 2px 5px 1px @window_shadow;
     margin: 10px; /* this is used for the resize cursor area */
 }
 
 .window-frame:backdrop {
-    border-radius: 2px;
+    border-radius: 4px;
     box-shadow: 0 2px 3px 0 @backdrop_window_shadow;
 }
 
 .window-frame.menu.csd,
 .window-frame.popup.csd {
-    border-radius: 2px;
+    border-radius: 4px;
     box-shadow: 0 3px 6px alpha (#000, 0.16),
                 0 3px 6px alpha (#000, 0.23);
     margin: 0;
@@ -50,7 +50,7 @@
 }
 
 .window-frame.tooltip.csd {
-    border-radius: 2px;
+    border-radius: 4px;
     box-shadow: none;
     margin: 0;
 }
@@ -64,7 +64,7 @@ GtkDialog.window-frame,
 GtkDialog.window-frame:backdrop,
 .window-frame.dialog,
 .window-frame.dialog:backdrop {
-    border-radius: 2px;
+    border-radius: 4px;
     box-shadow: 0 10px 20px alpha (#000, 0.19),
                 0 6px 6px alpha (#000, 0.23);
 }
\ No newline at end of file
diff --git a/Paper/plank/dock.theme b/Paper/plank/dock.theme
index 0a4d332..00170b1 100644
--- a/Paper/plank/dock.theme
+++ b/Paper/plank/dock.theme
@@ -23,7 +23,7 @@
 
 [PlankDrawingTheme]
 #The roundness of the top corners.
-TopRoundness=8
+TopRoundness=4
 #The roundness of the bottom corners.
 BottomRoundness=0
 #The thickness (in pixels) of lines drawn.