From 929a929ac2c03e1dea78f98b21c9ff479340c2e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ruiz=20de=20Alegr=C3=ADa?= <daniel@drasite.com>
Date: Mon, 1 Jun 2020 11:16:54 +0200
Subject: [PATCH] GTK3: Improve OSD visibility

---
 .../Kali-Dark/gnome-shell/gnome-shell.css     | 54 +++++------
 share/themes/Kali-Dark/gtk-3.0/gtk.css        | 93 ++++++++++---------
 share/themes/Kali-Light/gtk-3.0/gtk-dark.css  | 93 ++++++++++---------
 share/themes/Kali-Light/gtk-3.0/gtk.css       |  3 +-
 src/themes/Kali/sass/gtk-sass/_colors.scss    |  7 +-
 .../Kali/sass/gtk-sass/_common-tweaks.scss    |  3 +-
 6 files changed, 129 insertions(+), 124 deletions(-)

diff --git a/share/themes/Kali-Dark/gnome-shell/gnome-shell.css b/share/themes/Kali-Dark/gnome-shell/gnome-shell.css
index 1264fe7d..6c35800c 100644
--- a/share/themes/Kali-Dark/gnome-shell/gnome-shell.css
+++ b/share/themes/Kali-Dark/gnome-shell/gnome-shell.css
@@ -30,14 +30,14 @@ stage {
 
 .workspace-switcher-container, .switcher-list, .resize-popup, .osd-window {
   color: white;
-  background-color: #111217;
+  background-color: #272a34;
   border: 1px solid rgba(255, 255, 255, 0.1);
   border-radius: 14px;
   padding: 12px; }
 
 .workspace-thumbnails, #dash {
   color: white;
-  background-color: rgba(17, 18, 23, 0.8);
+  background-color: rgba(39, 42, 52, 0.8);
   border: 1px solid rgba(255, 255, 255, 0.1); }
 
 .show-apps .overview-icon, .app-well-app .overview-icon,
@@ -1240,7 +1240,7 @@ StScrollBar {
 
 .window-caption {
   color: white;
-  background-color: #111217;
+  background-color: #272a34;
   border: 1px solid rgba(255, 255, 255, 0.1);
   border-radius: 6px;
   padding: 6px 12px;
@@ -1301,7 +1301,7 @@ StScrollBar {
     background-color: transparent; }
 
 .search-section-content {
-  background-color: rgba(28, 30, 37, 0.8);
+  background-color: rgba(50, 54, 67, 0.8);
   border-radius: 13px;
   border: 1px solid rgba(255, 255, 255, 0.1);
   box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.3);
@@ -1315,7 +1315,7 @@ StScrollBar {
   transition-duration: 200ms; }
 
 .list-search-result:active, .search-provider-icon:active, .list-search-result:checked, .search-provider-icon:checked {
-  background-color: rgba(0, 0, 0, 0.9); }
+  background-color: rgba(17, 18, 23, 0.9); }
 
 .search-provider-icon .list-search-provider-content {
   spacing: 12px; }
@@ -1365,7 +1365,7 @@ StScrollBar {
 .app-well-app:active .overview-icon, .app-well-app:checked .overview-icon,
 .grid-search-result:active .overview-icon,
 .grid-search-result:checked .overview-icon {
-  background-color: rgba(0, 0, 0, 0.5); }
+  background-color: rgba(17, 18, 23, 0.5); }
 
 .app-well-app .overview-icon.overview-icon-with-label,
 .grid-search-result .overview-icon.overview-icon-with-label {
@@ -1376,14 +1376,14 @@ StScrollBar {
 
 /* App Folders */
 .app-well-app.app-folder {
-  background-color: rgba(17, 18, 23, 0.2);
+  background-color: rgba(39, 42, 52, 0.2);
   border-radius: 9px; }
 
 .app-folder-dialog {
   border-radius: 15px;
   border: 1px solid rgba(255, 255, 255, 0.1);
   spacing: 12px;
-  background-color: rgba(0, 0, 0, 0.95); }
+  background-color: rgba(17, 18, 23, 0.95); }
   .app-folder-dialog .folder-name-container {
     padding: 24px 36px 0;
     spacing: 12px;
@@ -1498,7 +1498,7 @@ StScrollBar {
   padding: 5px 10px; }
 
 .dash-label {
-  background-color: rgba(17, 18, 23, 0.95);
+  background-color: rgba(39, 42, 52, 0.95);
   border-radius: 7px;
   border: none;
   box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.1);
@@ -1520,10 +1520,10 @@ StScrollBar {
   background-color: rgba(39, 119, 255, 0.85); }
 
 .show-apps:active .overview-icon, .show-apps:checked .overview-icon {
-  background-color: rgba(0, 0, 0, 0.5); }
+  background-color: rgba(17, 18, 23, 0.5); }
 
 .show-apps:focus .overview-icon, .show-apps:checked .overview-icon {
-  background-color: black;
+  background-color: #111217;
   color: #eeeeec; }
 
 /* Workspace pager */
@@ -1676,22 +1676,22 @@ StScrollBar {
     border-color: black; }
   .keyboard-key.default-key {
     color: #eeeeec;
-    background-color: #1c1e25;
-    border-color: #0d0e11;
+    background-color: #323643;
+    border-color: #23252e;
     box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.3);
     text-shadow: 0 1px rgba(0, 0, 0, 0.2);
     icon-shadow: 0 1px rgba(0, 0, 0, 0.2); }
     .keyboard-key.default-key:hover, .keyboard-key.default-key:checked {
       color: #eeeeec;
-      background-color: #20232b;
-      border-color: #0d0e11;
+      background-color: #363a48;
+      border-color: #23252e;
       box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.3);
       text-shadow: 0 1px rgba(0, 0, 0, 0.2);
       icon-shadow: 0 1px rgba(0, 0, 0, 0.2); }
     .keyboard-key.default-key:active {
       color: #eeeeec;
-      background-color: #0f1014;
-      border-color: black;
+      background-color: #252831;
+      border-color: #13151a;
       text-shadow: none;
       icon-shadow: none;
       box-shadow: none; }
@@ -1724,9 +1724,9 @@ StScrollBar {
 .keyboard-subkeys {
   color: white;
   -arrow-border-radius: 10px;
-  -arrow-background-color: #111217;
+  -arrow-background-color: #272a34;
   -arrow-border-width: 1px;
-  -arrow-border-color: #252831;
+  -arrow-border-color: #3b3f4e;
   -arrow-base: 20px;
   -arrow-rise: 10px;
   -boxpointer-gap: 6px; }
@@ -1774,7 +1774,7 @@ StScrollBar {
 
 /* Looking Glass */
 #LookingGlassDialog {
-  background-color: #111217;
+  background-color: #272a34;
   spacing: 6px;
   padding: 4px;
   border: 1px solid rgba(255, 255, 255, 0.2);
@@ -1783,7 +1783,7 @@ StScrollBar {
   #LookingGlassDialog > #Toolbar {
     border: none;
     border-radius: 5px;
-    background-color: #111217; }
+    background-color: #272a34; }
   #LookingGlassDialog .labels {
     spacing: 6px; }
   #LookingGlassDialog .notebook-tab {
@@ -1808,7 +1808,7 @@ StScrollBar {
     spacing: 6px; }
 
 .lg-dialog StEntry {
-  background-color: rgba(28, 30, 37, 0.6);
+  background-color: rgba(50, 54, 67, 0.6);
   color: white;
   border-color: rgba(255, 255, 255, 0.2);
   min-height: 22px;
@@ -1845,7 +1845,7 @@ StScrollBar {
 
 .lg-extension {
   border: 1px solid #0d0d0d;
-  background-color: #1c1e25;
+  background-color: #323643;
   border-radius: 5px;
   padding: 4px; }
 
@@ -1856,7 +1856,7 @@ StScrollBar {
   spacing: 6px; }
 
 #LookingGlassPropertyInspector {
-  background: #111217;
+  background: #272a34;
   border: 1px solid black;
   border-radius: 5px;
   padding: 6px; }
@@ -2074,12 +2074,12 @@ StScrollBar {
   .unlock-dialog-notifications-container .unlock-dialog-notification-source {
     padding: 12px 6px;
     border: none;
-    background-color: rgba(17, 18, 23, 0.3);
+    background-color: rgba(39, 42, 52, 0.3);
     color: white;
     border-radius: 10px; }
     .unlock-dialog-notifications-container .notification.critical,
     .unlock-dialog-notifications-container .unlock-dialog-notification-source.critical {
-      background-color: rgba(17, 18, 23, 0.9); }
+      background-color: rgba(39, 42, 52, 0.9); }
 
 .unlock-dialog-notification-label {
   padding: 0px 0px 0px 12px; }
@@ -2087,7 +2087,7 @@ StScrollBar {
 .unlock-dialog-notification-count-text {
   weight: bold;
   padding: 0 6px;
-  color: #111217;
+  color: #272a34;
   background-color: rgba(255, 255, 255, 0.3);
   border-radius: 99px;
   margin-right: 12px; }
diff --git a/share/themes/Kali-Dark/gtk-3.0/gtk.css b/share/themes/Kali-Dark/gtk-3.0/gtk.css
index 25643d62..f05f9822 100644
--- a/share/themes/Kali-Dark/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Dark/gtk-3.0/gtk.css
@@ -158,7 +158,7 @@ assistant .sidebar label.highlight {
 .osd {
   color: white;
   border: none;
-  background-color: #111217;
+  background-color: #272a34;
   background-clip: padding-box;
   text-shadow: 0 1px black;
   -gtk-icon-shadow: 0 1px black; }
@@ -344,9 +344,9 @@ entry {
       text-shadow: none;
       -gtk-icon-shadow: none; }
     .osd spinbutton:disabled:not(.vertical), .osd entry:disabled {
-      color: #88898b;
+      color: #93959a;
       border-color: black;
-      background-color: rgba(41, 42, 46, 0.5);
+      background-color: rgba(61, 63, 72, 0.5);
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -628,7 +628,7 @@ button.osd {
   color: white;
   border-color: black;
   background-color: transparent;
-  background-image: image(#111217);
+  background-image: image(#272a34);
   background-clip: padding-box;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   text-shadow: 0 1px black;
@@ -644,7 +644,7 @@ button.osd {
     color: white;
     border-color: black;
     background-color: transparent;
-    background-image: image(#2b2f3a);
+    background-image: image(#414657);
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
@@ -669,10 +669,10 @@ button.osd {
   
   button.osd:disabled:backdrop,
   button.osd:disabled {
-    color: #88898b;
+    color: #93959a;
     border-color: black;
     background-color: transparent;
-    background-image: image(rgba(41, 42, 46, 0.5));
+    background-image: image(rgba(61, 63, 72, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -683,7 +683,7 @@ button.osd {
     color: white;
     border-color: black;
     background-color: transparent;
-    background-image: image(#111217);
+    background-image: image(#272a34);
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -695,7 +695,7 @@ button.osd {
   color: white;
   border-color: black;
   background-color: transparent;
-  background-image: image(#111217);
+  background-image: image(#272a34);
   background-clip: padding-box;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   text-shadow: 0 1px black;
@@ -705,7 +705,7 @@ button.osd {
     color: white;
     border-color: black;
     background-color: transparent;
-    background-image: image(#2b2f3a);
+    background-image: image(#414657);
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
@@ -722,10 +722,10 @@ button.osd {
     -gtk-icon-shadow: none;
     outline-color: rgba(255, 255, 255, 0.3); }
   .app-notification button:disabled, popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled, .osd button:disabled:backdrop, .osd button:disabled {
-    color: #88898b;
+    color: #93959a;
     border-color: black;
     background-color: transparent;
-    background-image: image(rgba(41, 42, 46, 0.5));
+    background-image: image(rgba(61, 63, 72, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -734,7 +734,7 @@ button.osd {
     color: white;
     border-color: black;
     background-color: transparent;
-    background-image: image(#111217);
+    background-image: image(#272a34);
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -753,17 +753,17 @@ button.osd {
       color: white;
       border-color: black;
       background-color: transparent;
-      background-image: image(#2b2f3a);
+      background-image: image(#414657);
       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(255, 255, 255, 0.3); }
     .app-notification button.flat:disabled, popover.background.touch-selection button.flat:disabled, popover.background.magnifier button.flat:disabled, .osd button.flat:disabled {
-      color: #88898b;
+      color: #93959a;
       border-color: black;
       background-color: transparent;
-      background-image: image(rgba(41, 42, 46, 0.5));
+      background-image: image(rgba(61, 63, 72, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -921,10 +921,10 @@ button.suggested-action {
       -gtk-icon-shadow: none;
       outline-color: rgba(255, 255, 255, 0.3); }
     .osd button.suggested-action:disabled:backdrop, .osd button.suggested-action:disabled {
-      color: #88898b;
+      color: #93959a;
       border-color: black;
       background-color: transparent;
-      background-image: image(rgba(41, 42, 46, 0.5));
+      background-image: image(rgba(61, 63, 72, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -1071,10 +1071,10 @@ button.destructive-action {
       -gtk-icon-shadow: none;
       outline-color: rgba(255, 255, 255, 0.3); }
     .osd button.destructive-action:disabled:backdrop, .osd button.destructive-action:disabled {
-      color: #88898b;
+      color: #93959a;
       border-color: black;
       background-color: transparent;
-      background-image: image(rgba(41, 42, 46, 0.5));
+      background-image: image(rgba(61, 63, 72, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -1520,7 +1520,7 @@ spinbutton {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       text-shadow: none;
       -gtk-icon-shadow: none;
-      color: #88898b;
+      color: #93959a;
       border-color: rgba(0, 0, 0, 0.5);
       -gtk-icon-shadow: none;
       box-shadow: none; }
@@ -1554,7 +1554,7 @@ spinbutton {
     color: white;
     border-color: black;
     background-color: transparent;
-    background-image: image(#111217);
+    background-image: image(#272a34);
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
@@ -1564,7 +1564,7 @@ spinbutton {
       color: white;
       border-color: black;
       background-color: transparent;
-      background-image: image(#2b2f3a);
+      background-image: image(#414657);
       background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
@@ -1581,10 +1581,10 @@ spinbutton {
       -gtk-icon-shadow: none;
       outline-color: rgba(255, 255, 255, 0.3); }
     .osd spinbutton.vertical button:first-child:disabled {
-      color: #88898b;
+      color: #93959a;
       border-color: black;
       background-color: transparent;
-      background-image: image(rgba(41, 42, 46, 0.5));
+      background-image: image(rgba(61, 63, 72, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -1593,7 +1593,7 @@ spinbutton {
       color: white;
       border-color: black;
       background-color: transparent;
-      background-image: image(#111217);
+      background-image: image(#272a34);
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -1634,7 +1634,7 @@ toolbar {
     padding: 13px;
     border: none;
     border-radius: 5px;
-    background-color: #111217; }
+    background-color: #272a34; }
     toolbar.osd.left, toolbar.osd.right, toolbar.osd.top, toolbar.osd.bottom {
       border-radius: 0; }
   toolbar.horizontal separator {
@@ -2989,7 +2989,7 @@ radio {
     color: white;
     border-color: black;
     background-color: transparent;
-    background-image: image(#111217);
+    background-image: image(#272a34);
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
@@ -2999,7 +2999,7 @@ radio {
       color: white;
       border-color: black;
       background-color: transparent;
-      background-image: image(#111217);
+      background-image: image(#272a34);
       background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
@@ -3019,16 +3019,16 @@ radio {
       color: white;
       border-color: black;
       background-color: transparent;
-      background-image: image(#111217);
+      background-image: image(#272a34);
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
     .osd check:disabled, .osd radio:disabled {
-      color: #88898b;
+      color: #93959a;
       border-color: black;
       background-color: transparent;
-      background-image: image(rgba(41, 42, 46, 0.5));
+      background-image: image(rgba(61, 63, 72, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -3112,7 +3112,7 @@ progressbar trough, scale fill, scale trough {
     border-color: black;
     background-color: rgba(0, 0, 0, 0.8); }
     .osd progressbar trough:disabled, progressbar .osd trough:disabled, .osd scale fill:disabled, scale .osd fill:disabled, .osd scale trough:disabled, scale .osd trough:disabled {
-      background-color: rgba(41, 42, 46, 0.5); }
+      background-color: rgba(61, 63, 72, 0.5); }
 
 progressbar progress, scale highlight {
   border: 1px solid #00348d;
@@ -3220,25 +3220,25 @@ scale {
       color: white;
       border-color: black;
       background-color: transparent;
-      background-image: image(#111217);
+      background-image: image(#272a34);
       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(255, 255, 255, 0.3);
       border-color: black;
-      background-color: #111217; }
+      background-color: #272a34; }
       .osd scale slider:hover {
         color: white;
         border-color: black;
         background-color: transparent;
-        background-image: image(#2b2f3a);
+        background-image: image(#414657);
         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(255, 255, 255, 0.3);
-        background-color: #111217; }
+        background-color: #272a34; }
       .osd scale slider:active {
         color: white;
         border-color: black;
@@ -3249,29 +3249,29 @@ scale {
         text-shadow: none;
         -gtk-icon-shadow: none;
         outline-color: rgba(255, 255, 255, 0.3);
-        background-color: #111217; }
+        background-color: #272a34; }
       .osd scale slider:disabled {
-        color: #88898b;
+        color: #93959a;
         border-color: black;
         background-color: transparent;
-        background-image: image(rgba(41, 42, 46, 0.5));
+        background-image: image(rgba(61, 63, 72, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         -gtk-icon-shadow: none;
-        background-color: #111217; }
+        background-color: #272a34; }
       .osd scale slider:backdrop {
         color: white;
         border-color: black;
         background-color: transparent;
-        background-image: image(#111217);
+        background-image: image(#272a34);
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         -gtk-icon-shadow: none;
-        background-color: #111217; }
+        background-color: #272a34; }
         .osd scale slider:backdrop:disabled {
-          background-color: #111217; }
+          background-color: #272a34; }
   scale marks,
   scale value {
     color: alpha(currentColor,0.55);
@@ -4003,7 +4003,7 @@ row {
 .app-notification.frame {
   padding: 10px;
   border-radius: 0 0 5px 5px;
-  background-color: #111217;
+  background-color: #272a34;
   background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2), transparent 2px);
   background-clip: padding-box; }
   .app-notification:backdrop,
@@ -5077,7 +5077,8 @@ infobar.error:backdrop > revealer > box, infobar.error > revealer > box, infobar
   padding: 5px 10px;
   margin: 20px;
   border-radius: 5px;
-  box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.4);
+  border: 1px solid rgba(13, 14, 17, 0.65);
+  box-shadow: 0 1px 6px rgba(0, 0, 0, 0.5);
   background-image: none; }
   .app-notification:backdrop,
   .app-notification.frame:backdrop {
diff --git a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
index 25643d62..f05f9822 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
@@ -158,7 +158,7 @@ assistant .sidebar label.highlight {
 .osd {
   color: white;
   border: none;
-  background-color: #111217;
+  background-color: #272a34;
   background-clip: padding-box;
   text-shadow: 0 1px black;
   -gtk-icon-shadow: 0 1px black; }
@@ -344,9 +344,9 @@ entry {
       text-shadow: none;
       -gtk-icon-shadow: none; }
     .osd spinbutton:disabled:not(.vertical), .osd entry:disabled {
-      color: #88898b;
+      color: #93959a;
       border-color: black;
-      background-color: rgba(41, 42, 46, 0.5);
+      background-color: rgba(61, 63, 72, 0.5);
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -628,7 +628,7 @@ button.osd {
   color: white;
   border-color: black;
   background-color: transparent;
-  background-image: image(#111217);
+  background-image: image(#272a34);
   background-clip: padding-box;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   text-shadow: 0 1px black;
@@ -644,7 +644,7 @@ button.osd {
     color: white;
     border-color: black;
     background-color: transparent;
-    background-image: image(#2b2f3a);
+    background-image: image(#414657);
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
@@ -669,10 +669,10 @@ button.osd {
   
   button.osd:disabled:backdrop,
   button.osd:disabled {
-    color: #88898b;
+    color: #93959a;
     border-color: black;
     background-color: transparent;
-    background-image: image(rgba(41, 42, 46, 0.5));
+    background-image: image(rgba(61, 63, 72, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -683,7 +683,7 @@ button.osd {
     color: white;
     border-color: black;
     background-color: transparent;
-    background-image: image(#111217);
+    background-image: image(#272a34);
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -695,7 +695,7 @@ button.osd {
   color: white;
   border-color: black;
   background-color: transparent;
-  background-image: image(#111217);
+  background-image: image(#272a34);
   background-clip: padding-box;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   text-shadow: 0 1px black;
@@ -705,7 +705,7 @@ button.osd {
     color: white;
     border-color: black;
     background-color: transparent;
-    background-image: image(#2b2f3a);
+    background-image: image(#414657);
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
@@ -722,10 +722,10 @@ button.osd {
     -gtk-icon-shadow: none;
     outline-color: rgba(255, 255, 255, 0.3); }
   .app-notification button:disabled, popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled, .osd button:disabled:backdrop, .osd button:disabled {
-    color: #88898b;
+    color: #93959a;
     border-color: black;
     background-color: transparent;
-    background-image: image(rgba(41, 42, 46, 0.5));
+    background-image: image(rgba(61, 63, 72, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -734,7 +734,7 @@ button.osd {
     color: white;
     border-color: black;
     background-color: transparent;
-    background-image: image(#111217);
+    background-image: image(#272a34);
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
@@ -753,17 +753,17 @@ button.osd {
       color: white;
       border-color: black;
       background-color: transparent;
-      background-image: image(#2b2f3a);
+      background-image: image(#414657);
       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(255, 255, 255, 0.3); }
     .app-notification button.flat:disabled, popover.background.touch-selection button.flat:disabled, popover.background.magnifier button.flat:disabled, .osd button.flat:disabled {
-      color: #88898b;
+      color: #93959a;
       border-color: black;
       background-color: transparent;
-      background-image: image(rgba(41, 42, 46, 0.5));
+      background-image: image(rgba(61, 63, 72, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -921,10 +921,10 @@ button.suggested-action {
       -gtk-icon-shadow: none;
       outline-color: rgba(255, 255, 255, 0.3); }
     .osd button.suggested-action:disabled:backdrop, .osd button.suggested-action:disabled {
-      color: #88898b;
+      color: #93959a;
       border-color: black;
       background-color: transparent;
-      background-image: image(rgba(41, 42, 46, 0.5));
+      background-image: image(rgba(61, 63, 72, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -1071,10 +1071,10 @@ button.destructive-action {
       -gtk-icon-shadow: none;
       outline-color: rgba(255, 255, 255, 0.3); }
     .osd button.destructive-action:disabled:backdrop, .osd button.destructive-action:disabled {
-      color: #88898b;
+      color: #93959a;
       border-color: black;
       background-color: transparent;
-      background-image: image(rgba(41, 42, 46, 0.5));
+      background-image: image(rgba(61, 63, 72, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -1520,7 +1520,7 @@ spinbutton {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       text-shadow: none;
       -gtk-icon-shadow: none;
-      color: #88898b;
+      color: #93959a;
       border-color: rgba(0, 0, 0, 0.5);
       -gtk-icon-shadow: none;
       box-shadow: none; }
@@ -1554,7 +1554,7 @@ spinbutton {
     color: white;
     border-color: black;
     background-color: transparent;
-    background-image: image(#111217);
+    background-image: image(#272a34);
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
@@ -1564,7 +1564,7 @@ spinbutton {
       color: white;
       border-color: black;
       background-color: transparent;
-      background-image: image(#2b2f3a);
+      background-image: image(#414657);
       background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
@@ -1581,10 +1581,10 @@ spinbutton {
       -gtk-icon-shadow: none;
       outline-color: rgba(255, 255, 255, 0.3); }
     .osd spinbutton.vertical button:first-child:disabled {
-      color: #88898b;
+      color: #93959a;
       border-color: black;
       background-color: transparent;
-      background-image: image(rgba(41, 42, 46, 0.5));
+      background-image: image(rgba(61, 63, 72, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -1593,7 +1593,7 @@ spinbutton {
       color: white;
       border-color: black;
       background-color: transparent;
-      background-image: image(#111217);
+      background-image: image(#272a34);
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -1634,7 +1634,7 @@ toolbar {
     padding: 13px;
     border: none;
     border-radius: 5px;
-    background-color: #111217; }
+    background-color: #272a34; }
     toolbar.osd.left, toolbar.osd.right, toolbar.osd.top, toolbar.osd.bottom {
       border-radius: 0; }
   toolbar.horizontal separator {
@@ -2989,7 +2989,7 @@ radio {
     color: white;
     border-color: black;
     background-color: transparent;
-    background-image: image(#111217);
+    background-image: image(#272a34);
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
@@ -2999,7 +2999,7 @@ radio {
       color: white;
       border-color: black;
       background-color: transparent;
-      background-image: image(#111217);
+      background-image: image(#272a34);
       background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
@@ -3019,16 +3019,16 @@ radio {
       color: white;
       border-color: black;
       background-color: transparent;
-      background-image: image(#111217);
+      background-image: image(#272a34);
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
     .osd check:disabled, .osd radio:disabled {
-      color: #88898b;
+      color: #93959a;
       border-color: black;
       background-color: transparent;
-      background-image: image(rgba(41, 42, 46, 0.5));
+      background-image: image(rgba(61, 63, 72, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -3112,7 +3112,7 @@ progressbar trough, scale fill, scale trough {
     border-color: black;
     background-color: rgba(0, 0, 0, 0.8); }
     .osd progressbar trough:disabled, progressbar .osd trough:disabled, .osd scale fill:disabled, scale .osd fill:disabled, .osd scale trough:disabled, scale .osd trough:disabled {
-      background-color: rgba(41, 42, 46, 0.5); }
+      background-color: rgba(61, 63, 72, 0.5); }
 
 progressbar progress, scale highlight {
   border: 1px solid #00348d;
@@ -3220,25 +3220,25 @@ scale {
       color: white;
       border-color: black;
       background-color: transparent;
-      background-image: image(#111217);
+      background-image: image(#272a34);
       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(255, 255, 255, 0.3);
       border-color: black;
-      background-color: #111217; }
+      background-color: #272a34; }
       .osd scale slider:hover {
         color: white;
         border-color: black;
         background-color: transparent;
-        background-image: image(#2b2f3a);
+        background-image: image(#414657);
         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(255, 255, 255, 0.3);
-        background-color: #111217; }
+        background-color: #272a34; }
       .osd scale slider:active {
         color: white;
         border-color: black;
@@ -3249,29 +3249,29 @@ scale {
         text-shadow: none;
         -gtk-icon-shadow: none;
         outline-color: rgba(255, 255, 255, 0.3);
-        background-color: #111217; }
+        background-color: #272a34; }
       .osd scale slider:disabled {
-        color: #88898b;
+        color: #93959a;
         border-color: black;
         background-color: transparent;
-        background-image: image(rgba(41, 42, 46, 0.5));
+        background-image: image(rgba(61, 63, 72, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         -gtk-icon-shadow: none;
-        background-color: #111217; }
+        background-color: #272a34; }
       .osd scale slider:backdrop {
         color: white;
         border-color: black;
         background-color: transparent;
-        background-image: image(#111217);
+        background-image: image(#272a34);
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         -gtk-icon-shadow: none;
-        background-color: #111217; }
+        background-color: #272a34; }
         .osd scale slider:backdrop:disabled {
-          background-color: #111217; }
+          background-color: #272a34; }
   scale marks,
   scale value {
     color: alpha(currentColor,0.55);
@@ -4003,7 +4003,7 @@ row {
 .app-notification.frame {
   padding: 10px;
   border-radius: 0 0 5px 5px;
-  background-color: #111217;
+  background-color: #272a34;
   background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2), transparent 2px);
   background-clip: padding-box; }
   .app-notification:backdrop,
@@ -5077,7 +5077,8 @@ infobar.error:backdrop > revealer > box, infobar.error > revealer > box, infobar
   padding: 5px 10px;
   margin: 20px;
   border-radius: 5px;
-  box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.4);
+  border: 1px solid rgba(13, 14, 17, 0.65);
+  box-shadow: 0 1px 6px rgba(0, 0, 0, 0.5);
   background-image: none; }
   .app-notification:backdrop,
   .app-notification.frame:backdrop {
diff --git a/share/themes/Kali-Light/gtk-3.0/gtk.css b/share/themes/Kali-Light/gtk-3.0/gtk.css
index 3cdf8720..84932efb 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk.css
@@ -5099,7 +5099,8 @@ infobar.error:backdrop > revealer > box, infobar.error > revealer > box, infobar
   padding: 5px 10px;
   margin: 20px;
   border-radius: 5px;
-  box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.4);
+  border: 1px solid rgba(0, 0, 0, 0);
+  box-shadow: 0 1px 6px rgba(0, 0, 0, 0.15);
   background-image: none; }
   .app-notification:backdrop,
   .app-notification.frame:backdrop {
diff --git a/src/themes/Kali/sass/gtk-sass/_colors.scss b/src/themes/Kali/sass/gtk-sass/_colors.scss
index 3d3bf418..de5f67c3 100644
--- a/src/themes/Kali/sass/gtk-sass/_colors.scss
+++ b/src/themes/Kali/sass/gtk-sass/_colors.scss
@@ -1,10 +1,11 @@
 // When color definition differs for dark and light variant
 // it gets @if ed depending on $variant
 
+$_dark_base_color: #272a34;
 
-$base_color: if($variant == 'light', darken(#ffffff, 2%), #272a34);
+$base_color: if($variant == 'light', darken(#ffffff, 2%), $_dark_base_color);
 $text_color: if($variant == 'light', black, white);
-$bg_color: if($variant == 'light', #ffffff, darken(#272a34, 2%));
+$bg_color: if($variant == 'light', #ffffff, darken($_dark_base_color, 2%));
 $fg_color: if($variant == 'light', #5c616c, #eeeeec);
 
 $selected_fg_color: #ffffff;
@@ -34,7 +35,7 @@ $destructive_color: if($variant == 'light', #d41919, darken(#d41919, 10%));
 
 $osd_fg_color: white;
 $osd_text_color: white;
-$osd_bg_color: if($variant == 'light', #272a34, darken(#272a34, 10%));
+$osd_bg_color: $_dark_base_color;
 $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: black;
diff --git a/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss b/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
index 7e557b18..d1cc441c 100644
--- a/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
+++ b/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
@@ -247,7 +247,8 @@ infobar {
   padding: 5px 10px;
   margin: 20px;
   border-radius: $button_radius;
-  box-shadow: 0 2px 8px 0 transparentize(black, .6);
+  border: 1px solid transparentize($_wm_border, 0.1);
+  box-shadow: $_menu_shadow;
   background-image: none;
 
   &:backdrop { box-shadow: none; }