diff --git a/gtk-3.0/_colors.scss b/gtk-3.0/_colors.scss
index 3d57776..d9b9803 100755
--- a/gtk-3.0/_colors.scss
+++ b/gtk-3.0/_colors.scss
@@ -57,7 +57,7 @@ $suggested_color: if($variant == 'light', $selected_bg_color, darken($selected_b
 
 $osd_fg_color: #fefefe;
 $osd_text_color: white;
-$osd_bg_color:  transparentize(#14171a, 0.2);
+$osd_bg_color:  transparentize(darken($_sidebar_color, 3%), 0.02);
 $osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);
 $osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%);
 $osd_borders_color: transparentize(black, 0.3);
diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css
index d7046a9..cfe3b5a 100755
--- a/gtk-3.0/gtk-dark.css
+++ b/gtk-3.0/gtk-dark.css
@@ -112,7 +112,7 @@ read if you used those and something break with a version upgrade you're on your
 .app-notification.frame {
   padding: 10px;
   border-radius: 0 0 5px 5px;
-  background-color: rgba(20, 23, 26, 0.8);
+  background-color: rgba(25, 26, 31, 0.98);
   background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2), transparent 2px);
   background-clip: padding-box; }
   .app-notification:backdrop,
@@ -238,8 +238,8 @@ assistant .sidebar label.highlight {
 .app-notification,
 .app-notification.frame, .osd .scale-popup, .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.touch-selection, popover.background.magnifier, .csd popover.background.osd, popover.background.osd, .osd {
   color: #fefefe;
-  border: none;
-  background-color: rgba(20, 23, 26, 0.8);
+  border: 1px solid #171e27;
+  background-color: rgba(25, 26, 31, 0.98);
   background-clip: padding-box;
   outline-color: rgba(254, 254, 254, 0.3);
   text-shadow: 0 1px black;
@@ -436,7 +436,7 @@ button.osd {
   outline-color: rgba(254, 254, 254, 0.3);
   color: #fefefe;
   border-color: rgba(0, 0, 0, 0.7);
-  background-color: rgba(20, 23, 26, 0.8);
+  background-color: rgba(25, 26, 31, 0.98);
   background-clip: padding-box;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   text-shadow: 0 1px black;
@@ -451,7 +451,7 @@ button.osd {
   button.osd:hover {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(47, 54, 61, 0.8), rgba(47, 54, 61, 0.8));
+    background-image: linear-gradient(to bottom, rgba(53, 54, 64, 0.98), rgba(53, 54, 64, 0.98));
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
@@ -464,7 +464,7 @@ button.osd {
   button.osd:checked {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(33, 38, 43, 0.8), rgba(33, 38, 43, 0.8));
+    background-image: linear-gradient(to bottom, rgba(39, 40, 47, 0.98), rgba(39, 40, 47, 0.98));
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: none;
@@ -475,9 +475,9 @@ button.osd {
   
   button.osd:disabled:backdrop,
   button.osd:disabled {
-    color: #898b8c;
+    color: #8c8c8e;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(43, 46, 49, 0.5), rgba(43, 46, 49, 0.5));
+    background-image: linear-gradient(to bottom, rgba(48, 49, 53, 0.5), rgba(48, 49, 53, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -487,7 +487,7 @@ button.osd {
   button.osd:backdrop {
     color: #fefefe;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(20, 23, 26, 0.8), rgba(20, 23, 26, 0.8));
+    background-image: linear-gradient(to bottom, rgba(25, 26, 31, 0.98), rgba(25, 26, 31, 0.98));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -500,7 +500,7 @@ button.osd {
 button {
   color: #fefefe;
   border-color: rgba(0, 0, 0, 0.7);
-  background-color: rgba(20, 23, 26, 0.8);
+  background-color: rgba(25, 26, 31, 0.98);
   background-clip: padding-box;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   text-shadow: 0 1px black;
@@ -511,7 +511,7 @@ button {
   button:hover {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(47, 54, 61, 0.8), rgba(47, 54, 61, 0.8));
+    background-image: linear-gradient(to bottom, rgba(53, 54, 64, 0.98), rgba(53, 54, 64, 0.98));
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
@@ -528,7 +528,7 @@ button {
   button:checked {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(33, 38, 43, 0.8), rgba(33, 38, 43, 0.8));
+    background-image: linear-gradient(to bottom, rgba(39, 40, 47, 0.98), rgba(39, 40, 47, 0.98));
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: none;
@@ -539,9 +539,9 @@ button {
   button:disabled:backdrop,
   .osd
   button:disabled {
-    color: #898b8c;
+    color: #8c8c8e;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(43, 46, 49, 0.5), rgba(43, 46, 49, 0.5));
+    background-image: linear-gradient(to bottom, rgba(48, 49, 53, 0.5), rgba(48, 49, 53, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -551,7 +551,7 @@ button {
   button:backdrop {
     color: #fefefe;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(20, 23, 26, 0.8), rgba(20, 23, 26, 0.8));
+    background-image: linear-gradient(to bottom, rgba(25, 26, 31, 0.98), rgba(25, 26, 31, 0.98));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -561,7 +561,7 @@ button {
   button.flat {
     color: #fefefe;
     border-color: rgba(0, 0, 0, 0.7);
-    background-color: rgba(20, 23, 26, 0.8);
+    background-color: rgba(25, 26, 31, 0.98);
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
@@ -575,7 +575,7 @@ button {
     button.flat.image-button {
       color: #fefefe;
       border-color: rgba(0, 0, 0, 0.7);
-      background-color: rgba(20, 23, 26, 0.8);
+      background-color: rgba(25, 26, 31, 0.98);
       background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
@@ -586,7 +586,7 @@ button {
     button.flat:hover {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(47, 54, 61, 0.8), rgba(47, 54, 61, 0.8));
+      background-image: linear-gradient(to bottom, rgba(53, 54, 64, 0.98), rgba(53, 54, 64, 0.98));
       background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
@@ -595,9 +595,9 @@ button {
     .app-notification button.flat:disabled, popover.background.touch-selection button.flat:disabled, popover.background.magnifier button.flat:disabled,
     .osd
     button.flat:disabled {
-      color: #898b8c;
+      color: #8c8c8e;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(43, 46, 49, 0.5), rgba(43, 46, 49, 0.5));
+      background-image: linear-gradient(to bottom, rgba(48, 49, 53, 0.5), rgba(48, 49, 53, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -610,7 +610,7 @@ button {
     button.flat:backdrop {
       color: #fefefe;
       border-color: rgba(0, 0, 0, 0.7);
-      background-color: rgba(20, 23, 26, 0.8);
+      background-color: rgba(25, 26, 31, 0.98);
       background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
@@ -623,7 +623,7 @@ button {
     button.flat:checked {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(33, 38, 43, 0.8), rgba(33, 38, 43, 0.8));
+      background-image: linear-gradient(to bottom, rgba(39, 40, 47, 0.98), rgba(39, 40, 47, 0.98));
       background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: none;
@@ -766,9 +766,9 @@ button.suggested-action {
     .osd
     button.suggested-action:disabled:backdrop, .osd
     button.suggested-action:disabled {
-      color: #898b8c;
+      color: #8c8c8e;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(43, 46, 49, 0.5), rgba(43, 46, 49, 0.5));
+      background-image: linear-gradient(to bottom, rgba(48, 49, 53, 0.5), rgba(48, 49, 53, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -919,9 +919,9 @@ button.destructive-action {
     .osd
     button.destructive-action:disabled:backdrop, .osd
     button.destructive-action:disabled {
-      color: #898b8c;
+      color: #8c8c8e;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(43, 46, 49, 0.5), rgba(43, 46, 49, 0.5));
+      background-image: linear-gradient(to bottom, rgba(48, 49, 53, 0.5), rgba(48, 49, 53, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -1881,9 +1881,9 @@ entry {
       -gtk-icon-shadow: none; }
     .osd spinbutton:disabled:not(.vertical), .osd
     entry:disabled {
-      color: #898b8c;
+      color: #8c8c8e;
       border-color: rgba(0, 0, 0, 0.7);
-      background-color: rgba(43, 46, 49, 0.5);
+      background-color: rgba(48, 49, 53, 0.5);
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -3502,54 +3502,54 @@ scale {
     .osd scale slider {
       color: #fefefe;
       border-color: rgba(0, 0, 0, 0.7);
-      background-color: rgba(20, 23, 26, 0.8);
+      background-color: rgba(25, 26, 31, 0.98);
       background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
       -gtk-icon-shadow: 0 1px black;
       outline-color: rgba(254, 254, 254, 0.3);
       border-color: rgba(0, 0, 0, 0.7);
-      background-color: #14171a; }
+      background-color: #191a1f; }
       .osd scale slider:hover {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(47, 54, 61, 0.8), rgba(47, 54, 61, 0.8));
+        background-image: linear-gradient(to bottom, rgba(53, 54, 64, 0.98), rgba(53, 54, 64, 0.98));
         background-clip: padding-box;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
         text-shadow: 0 1px black;
         -gtk-icon-shadow: 0 1px black;
         outline-color: rgba(254, 254, 254, 0.3);
-        background-color: #14171a; }
+        background-color: #191a1f; }
       .osd scale slider:active {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(33, 38, 43, 0.8), rgba(33, 38, 43, 0.8));
+        background-image: linear-gradient(to bottom, rgba(39, 40, 47, 0.98), rgba(39, 40, 47, 0.98));
         background-clip: padding-box;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
         text-shadow: none;
         -gtk-icon-shadow: none;
         outline-color: rgba(254, 254, 254, 0.3);
-        background-color: #14171a; }
+        background-color: #191a1f; }
       .osd scale slider:disabled {
-        color: #898b8c;
+        color: #8c8c8e;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(43, 46, 49, 0.5), rgba(43, 46, 49, 0.5));
+        background-image: linear-gradient(to bottom, rgba(48, 49, 53, 0.5), rgba(48, 49, 53, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         -gtk-icon-shadow: none;
-        background-color: #14171a; }
+        background-color: #191a1f; }
       .osd scale slider:backdrop {
         color: #fefefe;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(20, 23, 26, 0.8), rgba(20, 23, 26, 0.8));
+        background-image: linear-gradient(to bottom, rgba(25, 26, 31, 0.98), rgba(25, 26, 31, 0.98));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         -gtk-icon-shadow: none;
-        background-color: #14171a; }
+        background-color: #191a1f; }
         .osd scale slider:backdrop:disabled {
-          background-color: #14171a; }
+          background-color: #191a1f; }
   scale value {
     color: alpha(currentColor,0.4); }
   scale marks {
@@ -4248,7 +4248,7 @@ spinbutton:not(.vertical) {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none;
-    color: #898b8c;
+    color: #8c8c8e;
     border-color: rgba(0, 0, 0, 0.5);
     -gtk-icon-shadow: none;
     box-shadow: none; }
@@ -4292,7 +4292,7 @@ spinbutton.vertical button.down {
 .osd spinbutton.vertical button:first-child {
   color: #fefefe;
   border-color: rgba(0, 0, 0, 0.7);
-  background-color: rgba(20, 23, 26, 0.8);
+  background-color: rgba(25, 26, 31, 0.98);
   background-clip: padding-box;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   text-shadow: 0 1px black;
@@ -4301,7 +4301,7 @@ spinbutton.vertical button.down {
   .osd spinbutton.vertical button:first-child:hover {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(47, 54, 61, 0.8), rgba(47, 54, 61, 0.8));
+    background-image: linear-gradient(to bottom, rgba(53, 54, 64, 0.98), rgba(53, 54, 64, 0.98));
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
@@ -4310,16 +4310,16 @@ spinbutton.vertical button.down {
   .osd spinbutton.vertical button:first-child:active {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(33, 38, 43, 0.8), rgba(33, 38, 43, 0.8));
+    background-image: linear-gradient(to bottom, rgba(39, 40, 47, 0.98), rgba(39, 40, 47, 0.98));
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: none;
     -gtk-icon-shadow: none;
     outline-color: rgba(254, 254, 254, 0.3); }
   .osd spinbutton.vertical button:first-child:disabled {
-    color: #898b8c;
+    color: #8c8c8e;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(43, 46, 49, 0.5), rgba(43, 46, 49, 0.5));
+    background-image: linear-gradient(to bottom, rgba(48, 49, 53, 0.5), rgba(48, 49, 53, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -4327,7 +4327,7 @@ spinbutton.vertical button.down {
   .osd spinbutton.vertical button:first-child:backdrop {
     color: #fefefe;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(20, 23, 26, 0.8), rgba(20, 23, 26, 0.8));
+    background-image: linear-gradient(to bottom, rgba(25, 26, 31, 0.98), rgba(25, 26, 31, 0.98));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -4429,7 +4429,7 @@ toolbar {
     padding: 13px;
     border: none;
     border-radius: 5px;
-    background-color: rgba(20, 23, 26, 0.8); }
+    background-color: rgba(25, 26, 31, 0.98); }
     toolbar.osd.left, toolbar.osd.right, toolbar.osd.top, toolbar.osd.bottom {
       border-radius: 0; }
   toolbar.horizontal separator {
@@ -4475,11 +4475,11 @@ searchbar {
 tooltip {
   padding: 4px;
   /* not working */
-  border-radius: 5px;
+  border-radius: 4px;
   box-shadow: none;
   text-shadow: 0 1px black; }
   tooltip.background {
-    background-color: rgba(0, 0, 0, 0.8);
+    background-color: #151519;
     background-clip: padding-box;
     border: 1px solid rgba(255, 255, 255, 0.1); }
   tooltip decoration {
@@ -6221,7 +6221,7 @@ ConversationListView {
 #buttonbox_frame button {
   color: #fefefe;
   border-color: rgba(0, 0, 0, 0.7);
-  background-color: rgba(20, 23, 26, 0.8);
+  background-color: rgba(25, 26, 31, 0.98);
   background-clip: padding-box;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   text-shadow: 0 1px black;
@@ -6230,7 +6230,7 @@ ConversationListView {
   #buttonbox_frame button:hover {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(47, 54, 61, 0.8), rgba(47, 54, 61, 0.8));
+    background-image: linear-gradient(to bottom, rgba(53, 54, 64, 0.98), rgba(53, 54, 64, 0.98));
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
@@ -6239,16 +6239,16 @@ ConversationListView {
   #buttonbox_frame button:active, #buttonbox_frame button:checked {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(33, 38, 43, 0.8), rgba(33, 38, 43, 0.8));
+    background-image: linear-gradient(to bottom, rgba(39, 40, 47, 0.98), rgba(39, 40, 47, 0.98));
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: none;
     -gtk-icon-shadow: none;
     outline-color: rgba(254, 254, 254, 0.3); }
   #buttonbox_frame button:disabled {
-    color: #898b8c;
+    color: #8c8c8e;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(43, 46, 49, 0.5), rgba(43, 46, 49, 0.5));
+    background-image: linear-gradient(to bottom, rgba(48, 49, 53, 0.5), rgba(48, 49, 53, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
index 3c75931..497317b 100755
--- a/gtk-3.0/gtk.css
+++ b/gtk-3.0/gtk.css
@@ -112,7 +112,7 @@ read if you used those and something break with a version upgrade you're on your
 .app-notification.frame {
   padding: 10px;
   border-radius: 0 0 5px 5px;
-  background-color: rgba(20, 23, 26, 0.8);
+  background-color: rgba(18, 19, 22, 0.98);
   background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2), transparent 2px);
   background-clip: padding-box; }
   .app-notification:backdrop,
@@ -238,8 +238,8 @@ assistant .sidebar label.highlight {
 .app-notification,
 .app-notification.frame, .osd .scale-popup, .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.touch-selection, popover.background.magnifier, .csd popover.background.osd, popover.background.osd, .osd {
   color: #fefefe;
-  border: none;
-  background-color: rgba(20, 23, 26, 0.8);
+  border: 1px solid #171e27;
+  background-color: rgba(18, 19, 22, 0.98);
   background-clip: padding-box;
   outline-color: rgba(254, 254, 254, 0.3);
   text-shadow: 0 1px black;
@@ -439,7 +439,7 @@ button.osd {
   outline-color: rgba(254, 254, 254, 0.3);
   color: #fefefe;
   border-color: rgba(0, 0, 0, 0.7);
-  background-color: rgba(20, 23, 26, 0.8);
+  background-color: rgba(18, 19, 22, 0.98);
   background-clip: padding-box;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   text-shadow: 0 1px black;
@@ -454,7 +454,7 @@ button.osd {
   button.osd:hover {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(47, 54, 61, 0.8), rgba(47, 54, 61, 0.8));
+    background-image: linear-gradient(to bottom, rgba(46, 47, 56, 0.98), rgba(46, 47, 56, 0.98));
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
@@ -467,7 +467,7 @@ button.osd {
   button.osd:checked {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(33, 38, 43, 0.8), rgba(33, 38, 43, 0.8));
+    background-image: linear-gradient(to bottom, rgba(32, 33, 39, 0.98), rgba(32, 33, 39, 0.98));
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: none;
@@ -478,9 +478,9 @@ button.osd {
   
   button.osd:disabled:backdrop,
   button.osd:disabled {
-    color: #898b8c;
+    color: #88888a;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(43, 46, 49, 0.5), rgba(43, 46, 49, 0.5));
+    background-image: linear-gradient(to bottom, rgba(42, 42, 45, 0.5), rgba(42, 42, 45, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -490,7 +490,7 @@ button.osd {
   button.osd:backdrop {
     color: #fefefe;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(20, 23, 26, 0.8), rgba(20, 23, 26, 0.8));
+    background-image: linear-gradient(to bottom, rgba(18, 19, 22, 0.98), rgba(18, 19, 22, 0.98));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -503,7 +503,7 @@ button.osd {
 button {
   color: #fefefe;
   border-color: rgba(0, 0, 0, 0.7);
-  background-color: rgba(20, 23, 26, 0.8);
+  background-color: rgba(18, 19, 22, 0.98);
   background-clip: padding-box;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   text-shadow: 0 1px black;
@@ -514,7 +514,7 @@ button {
   button:hover {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(47, 54, 61, 0.8), rgba(47, 54, 61, 0.8));
+    background-image: linear-gradient(to bottom, rgba(46, 47, 56, 0.98), rgba(46, 47, 56, 0.98));
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
@@ -531,7 +531,7 @@ button {
   button:checked {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(33, 38, 43, 0.8), rgba(33, 38, 43, 0.8));
+    background-image: linear-gradient(to bottom, rgba(32, 33, 39, 0.98), rgba(32, 33, 39, 0.98));
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: none;
@@ -542,9 +542,9 @@ button {
   button:disabled:backdrop,
   .osd
   button:disabled {
-    color: #898b8c;
+    color: #88888a;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(43, 46, 49, 0.5), rgba(43, 46, 49, 0.5));
+    background-image: linear-gradient(to bottom, rgba(42, 42, 45, 0.5), rgba(42, 42, 45, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -554,7 +554,7 @@ button {
   button:backdrop {
     color: #fefefe;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(20, 23, 26, 0.8), rgba(20, 23, 26, 0.8));
+    background-image: linear-gradient(to bottom, rgba(18, 19, 22, 0.98), rgba(18, 19, 22, 0.98));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -564,7 +564,7 @@ button {
   button.flat {
     color: #fefefe;
     border-color: rgba(0, 0, 0, 0.7);
-    background-color: rgba(20, 23, 26, 0.8);
+    background-color: rgba(18, 19, 22, 0.98);
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
@@ -578,7 +578,7 @@ button {
     button.flat.image-button {
       color: #fefefe;
       border-color: rgba(0, 0, 0, 0.7);
-      background-color: rgba(20, 23, 26, 0.8);
+      background-color: rgba(18, 19, 22, 0.98);
       background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
@@ -589,7 +589,7 @@ button {
     button.flat:hover {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(47, 54, 61, 0.8), rgba(47, 54, 61, 0.8));
+      background-image: linear-gradient(to bottom, rgba(46, 47, 56, 0.98), rgba(46, 47, 56, 0.98));
       background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
@@ -598,9 +598,9 @@ button {
     .app-notification button.flat:disabled, popover.background.touch-selection button.flat:disabled, popover.background.magnifier button.flat:disabled,
     .osd
     button.flat:disabled {
-      color: #898b8c;
+      color: #88888a;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(43, 46, 49, 0.5), rgba(43, 46, 49, 0.5));
+      background-image: linear-gradient(to bottom, rgba(42, 42, 45, 0.5), rgba(42, 42, 45, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -613,7 +613,7 @@ button {
     button.flat:backdrop {
       color: #fefefe;
       border-color: rgba(0, 0, 0, 0.7);
-      background-color: rgba(20, 23, 26, 0.8);
+      background-color: rgba(18, 19, 22, 0.98);
       background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
@@ -626,7 +626,7 @@ button {
     button.flat:checked {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(33, 38, 43, 0.8), rgba(33, 38, 43, 0.8));
+      background-image: linear-gradient(to bottom, rgba(32, 33, 39, 0.98), rgba(32, 33, 39, 0.98));
       background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: none;
@@ -769,9 +769,9 @@ button.suggested-action {
     .osd
     button.suggested-action:disabled:backdrop, .osd
     button.suggested-action:disabled {
-      color: #898b8c;
+      color: #88888a;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(43, 46, 49, 0.5), rgba(43, 46, 49, 0.5));
+      background-image: linear-gradient(to bottom, rgba(42, 42, 45, 0.5), rgba(42, 42, 45, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -922,9 +922,9 @@ button.destructive-action {
     .osd
     button.destructive-action:disabled:backdrop, .osd
     button.destructive-action:disabled {
-      color: #898b8c;
+      color: #88888a;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(43, 46, 49, 0.5), rgba(43, 46, 49, 0.5));
+      background-image: linear-gradient(to bottom, rgba(42, 42, 45, 0.5), rgba(42, 42, 45, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -1888,9 +1888,9 @@ entry {
       -gtk-icon-shadow: none; }
     .osd spinbutton:disabled:not(.vertical), .osd
     entry:disabled {
-      color: #898b8c;
+      color: #88888a;
       border-color: rgba(0, 0, 0, 0.7);
-      background-color: rgba(43, 46, 49, 0.5);
+      background-color: rgba(42, 42, 45, 0.5);
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -3509,54 +3509,54 @@ scale {
     .osd scale slider {
       color: #fefefe;
       border-color: rgba(0, 0, 0, 0.7);
-      background-color: rgba(20, 23, 26, 0.8);
+      background-color: rgba(18, 19, 22, 0.98);
       background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
       -gtk-icon-shadow: 0 1px black;
       outline-color: rgba(254, 254, 254, 0.3);
       border-color: rgba(0, 0, 0, 0.7);
-      background-color: #14171a; }
+      background-color: #121316; }
       .osd scale slider:hover {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(47, 54, 61, 0.8), rgba(47, 54, 61, 0.8));
+        background-image: linear-gradient(to bottom, rgba(46, 47, 56, 0.98), rgba(46, 47, 56, 0.98));
         background-clip: padding-box;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
         text-shadow: 0 1px black;
         -gtk-icon-shadow: 0 1px black;
         outline-color: rgba(254, 254, 254, 0.3);
-        background-color: #14171a; }
+        background-color: #121316; }
       .osd scale slider:active {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(33, 38, 43, 0.8), rgba(33, 38, 43, 0.8));
+        background-image: linear-gradient(to bottom, rgba(32, 33, 39, 0.98), rgba(32, 33, 39, 0.98));
         background-clip: padding-box;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
         text-shadow: none;
         -gtk-icon-shadow: none;
         outline-color: rgba(254, 254, 254, 0.3);
-        background-color: #14171a; }
+        background-color: #121316; }
       .osd scale slider:disabled {
-        color: #898b8c;
+        color: #88888a;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(43, 46, 49, 0.5), rgba(43, 46, 49, 0.5));
+        background-image: linear-gradient(to bottom, rgba(42, 42, 45, 0.5), rgba(42, 42, 45, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         -gtk-icon-shadow: none;
-        background-color: #14171a; }
+        background-color: #121316; }
       .osd scale slider:backdrop {
         color: #fefefe;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(20, 23, 26, 0.8), rgba(20, 23, 26, 0.8));
+        background-image: linear-gradient(to bottom, rgba(18, 19, 22, 0.98), rgba(18, 19, 22, 0.98));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         -gtk-icon-shadow: none;
-        background-color: #14171a; }
+        background-color: #121316; }
         .osd scale slider:backdrop:disabled {
-          background-color: #14171a; }
+          background-color: #121316; }
   scale value {
     color: alpha(currentColor,0.4); }
   scale marks {
@@ -4255,7 +4255,7 @@ spinbutton:not(.vertical) {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none;
-    color: #898b8c;
+    color: #88888a;
     border-color: rgba(0, 0, 0, 0.5);
     -gtk-icon-shadow: none;
     box-shadow: none; }
@@ -4299,7 +4299,7 @@ spinbutton.vertical button.down {
 .osd spinbutton.vertical button:first-child {
   color: #fefefe;
   border-color: rgba(0, 0, 0, 0.7);
-  background-color: rgba(20, 23, 26, 0.8);
+  background-color: rgba(18, 19, 22, 0.98);
   background-clip: padding-box;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   text-shadow: 0 1px black;
@@ -4308,7 +4308,7 @@ spinbutton.vertical button.down {
   .osd spinbutton.vertical button:first-child:hover {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(47, 54, 61, 0.8), rgba(47, 54, 61, 0.8));
+    background-image: linear-gradient(to bottom, rgba(46, 47, 56, 0.98), rgba(46, 47, 56, 0.98));
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
@@ -4317,16 +4317,16 @@ spinbutton.vertical button.down {
   .osd spinbutton.vertical button:first-child:active {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(33, 38, 43, 0.8), rgba(33, 38, 43, 0.8));
+    background-image: linear-gradient(to bottom, rgba(32, 33, 39, 0.98), rgba(32, 33, 39, 0.98));
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: none;
     -gtk-icon-shadow: none;
     outline-color: rgba(254, 254, 254, 0.3); }
   .osd spinbutton.vertical button:first-child:disabled {
-    color: #898b8c;
+    color: #88888a;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(43, 46, 49, 0.5), rgba(43, 46, 49, 0.5));
+    background-image: linear-gradient(to bottom, rgba(42, 42, 45, 0.5), rgba(42, 42, 45, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -4334,7 +4334,7 @@ spinbutton.vertical button.down {
   .osd spinbutton.vertical button:first-child:backdrop {
     color: #fefefe;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(20, 23, 26, 0.8), rgba(20, 23, 26, 0.8));
+    background-image: linear-gradient(to bottom, rgba(18, 19, 22, 0.98), rgba(18, 19, 22, 0.98));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -4447,7 +4447,7 @@ toolbar {
     padding: 13px;
     border: none;
     border-radius: 5px;
-    background-color: rgba(20, 23, 26, 0.8); }
+    background-color: rgba(18, 19, 22, 0.98); }
     toolbar.osd.left, toolbar.osd.right, toolbar.osd.top, toolbar.osd.bottom {
       border-radius: 0; }
   toolbar.horizontal separator {
@@ -4493,11 +4493,11 @@ searchbar {
 tooltip {
   padding: 4px;
   /* not working */
-  border-radius: 5px;
+  border-radius: 4px;
   box-shadow: none;
   text-shadow: 0 1px black; }
   tooltip.background {
-    background-color: rgba(0, 0, 0, 0.8);
+    background-color: #0e0e11;
     background-clip: padding-box;
     border: 1px solid rgba(255, 255, 255, 0.1); }
   tooltip decoration {
@@ -6237,7 +6237,7 @@ ConversationListView {
   padding-top: 20px;
   padding-bottom: 0px;
   border-style: none;
-  background-color: rgba(20, 23, 26, 0.8);
+  background-color: rgba(18, 19, 22, 0.98);
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border: solid rgba(0, 0, 0, 0.1);
@@ -6246,7 +6246,7 @@ ConversationListView {
 #buttonbox_frame button {
   color: #fefefe;
   border-color: rgba(0, 0, 0, 0.7);
-  background-color: rgba(20, 23, 26, 0.8);
+  background-color: rgba(18, 19, 22, 0.98);
   background-clip: padding-box;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   text-shadow: 0 1px black;
@@ -6255,7 +6255,7 @@ ConversationListView {
   #buttonbox_frame button:hover {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(47, 54, 61, 0.8), rgba(47, 54, 61, 0.8));
+    background-image: linear-gradient(to bottom, rgba(46, 47, 56, 0.98), rgba(46, 47, 56, 0.98));
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
@@ -6264,16 +6264,16 @@ ConversationListView {
   #buttonbox_frame button:active, #buttonbox_frame button:checked {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(33, 38, 43, 0.8), rgba(33, 38, 43, 0.8));
+    background-image: linear-gradient(to bottom, rgba(32, 33, 39, 0.98), rgba(32, 33, 39, 0.98));
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: none;
     -gtk-icon-shadow: none;
     outline-color: rgba(254, 254, 254, 0.3); }
   #buttonbox_frame button:disabled {
-    color: #898b8c;
+    color: #88888a;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(43, 46, 49, 0.5), rgba(43, 46, 49, 0.5));
+    background-image: linear-gradient(to bottom, rgba(42, 42, 45, 0.5), rgba(42, 42, 45, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
diff --git a/gtk-3.0/widgets/_base-states.scss b/gtk-3.0/widgets/_base-states.scss
index 1337c56..d02076d 100644
--- a/gtk-3.0/widgets/_base-states.scss
+++ b/gtk-3.0/widgets/_base-states.scss
@@ -159,7 +159,7 @@ assistant {
 
 %osd, .osd {
   color: $osd_fg_color;
-  border: none;
+  border: 1px solid #171e27;
   background-color: $osd_bg_color;
   background-clip: padding-box;
   outline-color: transparentize($osd_fg_color, 0.7);
diff --git a/gtk-3.0/widgets/_tooltips.scss b/gtk-3.0/widgets/_tooltips.scss
index 00a4554..7d3c1f6 100644
--- a/gtk-3.0/widgets/_tooltips.scss
+++ b/gtk-3.0/widgets/_tooltips.scss
@@ -5,7 +5,7 @@ tooltip {
   &.background {
     // background-color needs to be set this way otherwise it gets drawn twice
     // see https://bugzilla.gnome.org/show_bug.cgi?id=736155 for details.
-    background-color: transparentize(black, 0.2);
+    background-color: darken($_sidebar_color, 5%);
     background-clip: padding-box;
     border: 1px solid $tooltip_borders_color; // this suble border is meant to
                                               // not make the tooltip melt with
@@ -13,7 +13,7 @@ tooltip {
   }
 
   padding: 4px; /* not working */
-  border-radius: 5px;
+  border-radius: 4px;
   box-shadow: none; // otherwise it gets inherited by windowframe.csd
   text-shadow: 0 1px black;