diff --git a/Paper/gtk-3.18/_common.scss b/Paper/gtk-3.18/_common.scss
index a1069b7..ff81fa3 100644
--- a/Paper/gtk-3.18/_common.scss
+++ b/Paper/gtk-3.18/_common.scss
@@ -41,10 +41,10 @@ $button_transition: all 200ms $ease-out-quad;
   // to the adwaita engine: using real CSS properties is faster,
   // and we don't use any outlines for now.
 
-  // outline-color: transparentize($fg_color, 0.7);
-  // outline-style: dashed;
-  // outline-offset: -3px;
-  // outline-width: 1px;
-  // outline-radius: 2px;
+  outline-color: transparentize($fg_color, 0.7);
+  outline-style: dashed;
+  outline-offset: -3px;
+  outline-width: 1px;
+  outline-radius: 2px;
 
 }
\ No newline at end of file
diff --git a/Paper/gtk-3.18/gtk-dark.css b/Paper/gtk-3.18/gtk-dark.css
index 8bff082..7fe73cf 100644
--- a/Paper/gtk-3.18/gtk-dark.css
+++ b/Paper/gtk-3.18/gtk-dark.css
@@ -87,7 +87,12 @@ read if you used those and something break with a version upgrade you're on your
   -GtkWidget-text-handle-height: 24;
   -GtkDialog-button-spacing: 4;
   -GtkDialog-action-area-border: 0;
-  -GtkPaned-handle-size: 1; }
+  -GtkPaned-handle-size: 1;
+  outline-color: rgba(207, 216, 220, 0.3);
+  outline-style: dashed;
+  outline-offset: -3px;
+  outline-width: 1px;
+  outline-radius: 2px; }
 
 /***********
  * Widgets *
@@ -2022,12 +2027,6 @@ GtkFileChooserDialog {
     box-shadow: none;
     transition: 200ms ease-out; }
   .spinbutton:backdrop:insensitive:not(.vertical), GeditWindow > .entry:backdrop:insensitive,
-  .entry:backdrop:insensitive {
-    color: #56707c;
-    border-color: #242f34;
-    background-image: linear-gradient(to bottom, #3d4f57);
-    box-shadow: none; }
-  .spinbutton:backdrop:insensitive:not(.vertical), GeditWindow > .entry:backdrop:insensitive,
   .entry:backdrop:insensitive {
     color: #56707c;
     border-color: #242f34;
@@ -4116,6 +4115,7 @@ GtkSwitch {
   GtkSwitch .slider {
     border: none;
     padding: 2px;
+    outline-radius: 12px;
     border-radius: 12px;
     transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
     background-color: #455a64;
diff --git a/Paper/gtk-3.18/gtk.css b/Paper/gtk-3.18/gtk.css
index ee9cac2..ed6a2e4 100644
--- a/Paper/gtk-3.18/gtk.css
+++ b/Paper/gtk-3.18/gtk.css
@@ -87,7 +87,12 @@ read if you used those and something break with a version upgrade you're on your
   -GtkWidget-text-handle-height: 24;
   -GtkDialog-button-spacing: 4;
   -GtkDialog-action-area-border: 0;
-  -GtkPaned-handle-size: 1; }
+  -GtkPaned-handle-size: 1;
+  outline-color: rgba(68, 68, 68, 0.3);
+  outline-style: dashed;
+  outline-offset: -3px;
+  outline-width: 1px;
+  outline-radius: 2px; }
 
 /***********
  * Widgets *
@@ -2031,12 +2036,6 @@ GtkFileChooserDialog {
     box-shadow: none;
     transition: 200ms ease-out; }
   .spinbutton:backdrop:insensitive:not(.vertical), GeditWindow > .entry:backdrop:insensitive,
-  .entry:backdrop:insensitive {
-    color: #d1d1d1;
-    border-color: #c9c9c9;
-    background-image: linear-gradient(to bottom, #fafafa);
-    box-shadow: none; }
-  .spinbutton:backdrop:insensitive:not(.vertical), GeditWindow > .entry:backdrop:insensitive,
   .entry:backdrop:insensitive {
     color: #d1d1d1;
     border-color: #c9c9c9;
@@ -4125,6 +4124,7 @@ GtkSwitch {
   GtkSwitch .slider {
     border: none;
     padding: 2px;
+    outline-radius: 12px;
     border-radius: 12px;
     transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
     background-color: #ffffff;
diff --git a/Paper/gtk-3.18/widgets/_entries.scss b/Paper/gtk-3.18/widgets/_entries.scss
index 7c7f34e..fae321a 100644
--- a/Paper/gtk-3.18/widgets/_entries.scss
+++ b/Paper/gtk-3.18/widgets/_entries.scss
@@ -127,8 +127,9 @@
   }
 }
 
+
 GtkTreeView .acceleditor > GtkLabel {
-    background-color: $selected_bg_color;
+  background-color: $selected_bg_color;
 }
 
 GtkTreeView .entry {
diff --git a/Paper/gtk-3.18/widgets/_switches.scss b/Paper/gtk-3.18/widgets/_switches.scss
index d761d3a..7b86bcb 100644
--- a/Paper/gtk-3.18/widgets/_switches.scss
+++ b/Paper/gtk-3.18/widgets/_switches.scss
@@ -36,6 +36,7 @@ GtkSwitch {
   .slider {
     border:none;
     padding:2px;
+    outline-radius: 12px;
     border-radius: 12px;
     transition: $button_transition;
     background-color: $base_color;
diff --git a/Paper/gtk-3.20/_common.scss b/Paper/gtk-3.20/_common.scss
index b6468d1..07e0fd4 100644
--- a/Paper/gtk-3.20/_common.scss
+++ b/Paper/gtk-3.20/_common.scss
@@ -41,11 +41,11 @@ $button_transition: all 200ms $ease-out-quad;
   // to the adwaita engine: using real CSS properties is faster,
   // and we don't use any outlines for now.
 
-  // outline-color: transparentize($fg_color, 0.7);
-  // outline-style: dashed;
-  // outline-offset: -3px;
-  // outline-width: 1px;
-  // -gtk-outline-radius: 2px;
+  outline-color: transparentize($fg_color, 0.7);
+  outline-style: dashed;
+  outline-offset: -3px;
+  outline-width: 1px;
+  -gtk-outline-radius: 2px;
 
   -gtk-secondary-caret-color: $selected_bg_color
 }
\ No newline at end of file
diff --git a/Paper/gtk-3.20/gtk-dark.css b/Paper/gtk-3.20/gtk-dark.css
index 62c7008..f855da4 100644
--- a/Paper/gtk-3.20/gtk-dark.css
+++ b/Paper/gtk-3.20/gtk-dark.css
@@ -88,6 +88,11 @@ read if you used those and something break with a version upgrade you're on your
   -GtkDialog-button-spacing: 4;
   -GtkDialog-action-area-border: 0;
   -GtkPaned-handle-size: 1;
+  outline-color: rgba(207, 216, 220, 0.3);
+  outline-style: dashed;
+  outline-offset: -3px;
+  outline-width: 1px;
+  -gtk-outline-radius: 2px;
   -gtk-secondary-caret-color: #449ac2; }
 
 /***********
diff --git a/Paper/gtk-3.20/gtk.css b/Paper/gtk-3.20/gtk.css
index f7e1047..602a044 100644
--- a/Paper/gtk-3.20/gtk.css
+++ b/Paper/gtk-3.20/gtk.css
@@ -88,6 +88,11 @@ read if you used those and something break with a version upgrade you're on your
   -GtkDialog-button-spacing: 4;
   -GtkDialog-action-area-border: 0;
   -GtkPaned-handle-size: 1;
+  outline-color: rgba(68, 68, 68, 0.3);
+  outline-style: dashed;
+  outline-offset: -3px;
+  outline-width: 1px;
+  -gtk-outline-radius: 2px;
   -gtk-secondary-caret-color: #347D9F; }
 
 /***********
diff --git a/paper-gtk-theme.spec b/paper-gtk-theme.spec
index c549d51..9a05947 100644
--- a/paper-gtk-theme.spec
+++ b/paper-gtk-theme.spec
@@ -15,7 +15,7 @@
 
 Name:           paper-gtk-theme
 Version:        2.0
-Release:        2
+Release:        3
 License:        GPL-3.0+
 Summary:        Paper GTK theme
 Url:            https://snwh.org/paper