diff --git a/share/themes/Kali-Dark/gtk-3.0/gtk.css b/share/themes/Kali-Dark/gtk-3.0/gtk.css
index 9c9453b0..33234849 100644
--- a/share/themes/Kali-Dark/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Dark/gtk-3.0/gtk.css
@@ -492,10 +492,10 @@ button {
   outline-color: rgba(238, 238, 236, 0.3);
   border-color: #0d0e11;
   border-bottom-color: black;
-  background-image: linear-gradient(to top, #20232b 2px, #23252e);
+  background-image: linear-gradient(to top, #292c37 2px, #2e313d);
   text-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
   -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
   button.titlebutton, button.sidebar-button, notebook > header > tabs > arrow, notebook > header > tabs > arrow.flat,
   button.flat {
     border-color: transparent;
@@ -520,7 +520,7 @@ button {
     border-bottom-color: black;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
     background-image: linear-gradient(to top, #20232b, #252831 1px);
     -gtk-icon-effect: highlight; }
   notebook > header > tabs > arrow:active, notebook > header > tabs > arrow:checked,
@@ -802,7 +802,7 @@ button.suggested-action {
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #005af3;
   border-bottom-color: #0047c0;
-  background-image: linear-gradient(to top, #2274ff 2px, #2777ff);
+  background-image: linear-gradient(to top, #2777ff 2px, #4187ff);
   text-shadow: 0 -1px rgba(0, 0, 0, 0.538824);
   -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.538824);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(0, 90, 243, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
@@ -952,10 +952,10 @@ button.destructive-action {
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #790e0e;
   border-bottom-color: #4b0909;
-  background-image: linear-gradient(to top, #a21313 2px, #a61414);
+  background-image: linear-gradient(to top, #a61414 2px, #bd1616);
   text-shadow: 0 -1px rgba(0, 0, 0, 0.708235);
   -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.708235);
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(121, 14, 14, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(121, 14, 14, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
   
   button.destructive-action.flat {
     border-color: transparent;
@@ -973,7 +973,7 @@ button.destructive-action {
     border-bottom-color: #4b0909;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.660235);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.660235);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(121, 14, 14, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(121, 14, 14, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
     background-image: linear-gradient(to top, #a21313, #ab1414 1px); }
   
   button.destructive-action:active,
@@ -1147,11 +1147,11 @@ button.circular {
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #0d0e11;
     border-bottom-color: black;
-    background-image: linear-gradient(to top, #20232b 2px, #23252e);
+    background-image: linear-gradient(to top, #292c37 2px, #2e313d);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-    background-image: linear-gradient(to top, #20232b 2px, #23252e), linear-gradient(to top, black 25%, #0d0e11 50%);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+    background-image: linear-gradient(to top, #292c37 2px, #2e313d), linear-gradient(to top, black 25%, #0d0e11 50%);
     border-color: transparent; }
   
   button.circular:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) {
@@ -1161,7 +1161,7 @@ button.circular {
     border-bottom-color: black;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
     background-image: linear-gradient(to top, #20232b, #252831 1px);
     background-image: linear-gradient(to top, #20232b, #252831 1px), linear-gradient(to top, black 25%, #0d0e11 50%);
     border-color: transparent; }
@@ -1185,10 +1185,10 @@ stacksidebar row.needs-attention > label, .stack-switcher > button.needs-attenti
   outline-color: rgba(238, 238, 236, 0.3);
   border-color: #0d0e11;
   border-bottom-color: black;
-  background-image: linear-gradient(to top, #20232b 2px, #23252e);
+  background-image: linear-gradient(to top, #292c37 2px, #2e313d);
   text-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
   -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
   .inline-toolbar toolbutton > button:hover {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
@@ -1196,7 +1196,7 @@ stacksidebar row.needs-attention > label, .stack-switcher > button.needs-attenti
     border-bottom-color: black;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
     background-image: linear-gradient(to top, #20232b, #252831 1px); }
   .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
     color: #eeeeec;
@@ -1339,7 +1339,7 @@ list row button.image-button:not(.flat) {
     border-bottom-color: black;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
     background-image: linear-gradient(to top, #20232b, #252831 1px); }
   list row button.image-button:not(.flat):active, list row button.image-button:not(.flat):checked {
     color: #eeeeec;
@@ -1739,7 +1739,7 @@ headerbar {
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #005af3;
       border-bottom-color: #0047c0;
-      background-image: linear-gradient(to top, #2274ff 2px, #2777ff);
+      background-image: linear-gradient(to top, #2777ff 2px, #4187ff);
       text-shadow: 0 -1px rgba(0, 0, 0, 0.538824);
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.538824);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(0, 90, 243, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
@@ -1843,10 +1843,10 @@ headerbar {
         outline-color: rgba(238, 238, 236, 0.3);
         border-color: #0d0e11;
         border-bottom-color: black;
-        background-image: linear-gradient(to top, #20232b 2px, #23252e);
+        background-image: linear-gradient(to top, #292c37 2px, #2e313d);
         text-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
         -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
         border-color: #00348d; }
         .selection-mode .titlebar:not(headerbar) button.suggested-action:hover, .selection-mode.titlebar:not(headerbar) button.suggested-action:hover, .selection-mode headerbar button.suggested-action:hover,
         headerbar.selection-mode button.suggested-action:hover {
@@ -1856,7 +1856,7 @@ headerbar {
           border-bottom-color: black;
           text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
           -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
           background-image: linear-gradient(to top, #20232b, #252831 1px);
           border-color: #00348d; }
         .selection-mode .titlebar:not(headerbar) button.suggested-action:active, .selection-mode.titlebar:not(headerbar) button.suggested-action:active, .selection-mode headerbar button.suggested-action:active,
@@ -2721,14 +2721,14 @@ switch {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
     background-image: linear-gradient(to bottom, #292c37 20%, #23252e 90%);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.3), inset 0 -1px 0 rgba(26, 28, 35, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(0, 0, 0, 0.3), inset 0 -1px 0 rgba(26, 28, 35, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
   switch image {
     color: transparent; }
   switch:hover slider {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #040405;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.3), inset 0 -1px 0 rgba(26, 28, 35, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(0, 0, 0, 0.3), inset 0 -1px 0 rgba(26, 28, 35, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
     background-image: linear-gradient(to bottom, #303340 20%, #272a34 90%); }
   switch:checked > slider {
     border: 1px solid #00215a; }
@@ -3179,7 +3179,7 @@ scale {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
     background-image: linear-gradient(to bottom, #1c1e25 20%, #16171d 90%);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.3), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(0, 0, 0, 0.3), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
     border: 1px solid black;
     border-radius: 100%;
     transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
@@ -3188,7 +3188,7 @@ scale {
       color: #eeeeec;
       outline-color: rgba(238, 238, 236, 0.3);
       border-color: black;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.3), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(0, 0, 0, 0.3), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
       background-image: linear-gradient(to bottom, #23252e 20%, #1a1c23 90%); }
     scale slider:active {
       border-color: #00348d; }
@@ -4286,10 +4286,10 @@ infobar {
       outline-color: rgba(238, 238, 236, 0.3);
       border-color: #0d0e11;
       border-bottom-color: black;
-      background-image: linear-gradient(to top, #20232b 2px, #23252e);
+      background-image: linear-gradient(to top, #292c37 2px, #2e313d);
       text-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
       infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error button:hover {
         color: #eeeeec;
         outline-color: rgba(238, 238, 236, 0.3);
@@ -4297,7 +4297,7 @@ infobar {
         border-bottom-color: black;
         text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
         -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
         background-image: linear-gradient(to top, #20232b, #252831 1px); }
       infobar.info button:active, infobar.info button:checked, infobar.question button:active, infobar.question button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.error button:active, infobar.error button:checked {
         color: #eeeeec;
@@ -4435,10 +4435,10 @@ colorswatch#add-color-button {
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #0d0e11;
     border-bottom-color: black;
-    background-image: linear-gradient(to top, #20232b 2px, #23252e);
+    background-image: linear-gradient(to top, #292c37 2px, #2e313d);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
     colorswatch#add-color-button overlay:hover {
       color: #eeeeec;
       outline-color: rgba(238, 238, 236, 0.3);
@@ -4446,7 +4446,7 @@ colorswatch#add-color-button {
       border-bottom-color: black;
       text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
       background-image: linear-gradient(to top, #20232b, #252831 1px); }
     colorswatch#add-color-button overlay:backdrop {
       color: #888a8d;
@@ -5136,7 +5136,7 @@ switch {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
     background-image: linear-gradient(to bottom, #1c1e25 20%, #16171d 90%);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.3), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(0, 0, 0, 0.3), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
     border: 1px solid black;
     border-radius: 50%;
     transition-property: background, border, box-shadow; }
@@ -5272,7 +5272,7 @@ notebook > header {
         border-bottom-color: black;
         text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
         -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
         background-image: linear-gradient(to top, #20232b, #252831 1px); }
       notebook > header.top > tabs > tab:checked,
       notebook > header.top > tabs > tab.reorderable-page:checked, notebook > header.bottom > tabs > tab:checked,
@@ -5283,10 +5283,10 @@ notebook > header {
         outline-color: rgba(238, 238, 236, 0.3);
         border-color: #0d0e11;
         border-bottom-color: black;
-        background-image: linear-gradient(to top, #20232b 2px, #23252e);
+        background-image: linear-gradient(to top, #292c37 2px, #2e313d);
         text-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
         -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
         background: #272a34; }
         notebook > header.top > tabs > tab:checked:backdrop,
         notebook > header.top > tabs > tab.reorderable-page:checked:backdrop, notebook > header.bottom > tabs > tab:checked:backdrop,
@@ -5338,7 +5338,7 @@ infobar.info button, infobar.info.action:hover button {
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #005af3;
   border-bottom-color: #0047c0;
-  background-image: linear-gradient(to top, #2274ff 2px, #2777ff);
+  background-image: linear-gradient(to top, #2777ff 2px, #4187ff);
   text-shadow: 0 -1px rgba(0, 0, 0, 0.538824);
   -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.538824);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(0, 90, 243, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
@@ -5393,7 +5393,7 @@ infobar.question button, infobar.warning button, infobar.question.action:hover b
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #ca6400;
   border-bottom-color: #974b00;
-  background-image: linear-gradient(to top, #f87a00 2px, #fd7d00);
+  background-image: linear-gradient(to top, #fd7d00 2px, #ff8a18);
   text-shadow: 0 -1px rgba(0, 0, 0, 0.603137);
   -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.603137);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), inset 0 -1px 0 rgba(202, 100, 0, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
@@ -5447,7 +5447,7 @@ infobar.error:backdrop > revealer > box, infobar.error > revealer > box, infobar
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #911212;
     border-bottom-color: #640c0c;
-    background-image: linear-gradient(to top, #ba1616 2px, #bf1717);
+    background-image: linear-gradient(to top, #bf1717 2px, #d61a1a);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.664314);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.664314);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), inset 0 -1px 0 rgba(145, 18, 18, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
@@ -5458,7 +5458,7 @@ infobar.error:backdrop > revealer > box, infobar.error > revealer > box, infobar
       border-bottom-color: #640c0c;
       text-shadow: 0 -1px rgba(0, 0, 0, 0.616314);
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.616314);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(145, 18, 18, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(145, 18, 18, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
       background-image: linear-gradient(to top, #ba1616, #c41818 1px); }
     infobar.error:backdrop > revealer > box button:active, infobar.error:backdrop > revealer > box button:checked, infobar.error > revealer > box button:active, infobar.error > revealer > box button:checked, infobar.error.action:hover:backdrop > revealer > box button:active, infobar.error.action:hover:backdrop > revealer > box button:checked, infobar.error.action:hover > revealer > box button:active, infobar.error.action:hover > revealer > box button:checked {
       color: #ffffff;
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 9c9453b0..33234849 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
@@ -492,10 +492,10 @@ button {
   outline-color: rgba(238, 238, 236, 0.3);
   border-color: #0d0e11;
   border-bottom-color: black;
-  background-image: linear-gradient(to top, #20232b 2px, #23252e);
+  background-image: linear-gradient(to top, #292c37 2px, #2e313d);
   text-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
   -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
   button.titlebutton, button.sidebar-button, notebook > header > tabs > arrow, notebook > header > tabs > arrow.flat,
   button.flat {
     border-color: transparent;
@@ -520,7 +520,7 @@ button {
     border-bottom-color: black;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
     background-image: linear-gradient(to top, #20232b, #252831 1px);
     -gtk-icon-effect: highlight; }
   notebook > header > tabs > arrow:active, notebook > header > tabs > arrow:checked,
@@ -802,7 +802,7 @@ button.suggested-action {
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #005af3;
   border-bottom-color: #0047c0;
-  background-image: linear-gradient(to top, #2274ff 2px, #2777ff);
+  background-image: linear-gradient(to top, #2777ff 2px, #4187ff);
   text-shadow: 0 -1px rgba(0, 0, 0, 0.538824);
   -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.538824);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(0, 90, 243, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
@@ -952,10 +952,10 @@ button.destructive-action {
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #790e0e;
   border-bottom-color: #4b0909;
-  background-image: linear-gradient(to top, #a21313 2px, #a61414);
+  background-image: linear-gradient(to top, #a61414 2px, #bd1616);
   text-shadow: 0 -1px rgba(0, 0, 0, 0.708235);
   -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.708235);
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(121, 14, 14, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(121, 14, 14, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
   
   button.destructive-action.flat {
     border-color: transparent;
@@ -973,7 +973,7 @@ button.destructive-action {
     border-bottom-color: #4b0909;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.660235);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.660235);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(121, 14, 14, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(121, 14, 14, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
     background-image: linear-gradient(to top, #a21313, #ab1414 1px); }
   
   button.destructive-action:active,
@@ -1147,11 +1147,11 @@ button.circular {
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #0d0e11;
     border-bottom-color: black;
-    background-image: linear-gradient(to top, #20232b 2px, #23252e);
+    background-image: linear-gradient(to top, #292c37 2px, #2e313d);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
-    background-image: linear-gradient(to top, #20232b 2px, #23252e), linear-gradient(to top, black 25%, #0d0e11 50%);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+    background-image: linear-gradient(to top, #292c37 2px, #2e313d), linear-gradient(to top, black 25%, #0d0e11 50%);
     border-color: transparent; }
   
   button.circular:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) {
@@ -1161,7 +1161,7 @@ button.circular {
     border-bottom-color: black;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
     background-image: linear-gradient(to top, #20232b, #252831 1px);
     background-image: linear-gradient(to top, #20232b, #252831 1px), linear-gradient(to top, black 25%, #0d0e11 50%);
     border-color: transparent; }
@@ -1185,10 +1185,10 @@ stacksidebar row.needs-attention > label, .stack-switcher > button.needs-attenti
   outline-color: rgba(238, 238, 236, 0.3);
   border-color: #0d0e11;
   border-bottom-color: black;
-  background-image: linear-gradient(to top, #20232b 2px, #23252e);
+  background-image: linear-gradient(to top, #292c37 2px, #2e313d);
   text-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
   -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
-  box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
   .inline-toolbar toolbutton > button:hover {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
@@ -1196,7 +1196,7 @@ stacksidebar row.needs-attention > label, .stack-switcher > button.needs-attenti
     border-bottom-color: black;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
     background-image: linear-gradient(to top, #20232b, #252831 1px); }
   .inline-toolbar toolbutton > button:active, .inline-toolbar toolbutton > button:checked {
     color: #eeeeec;
@@ -1339,7 +1339,7 @@ list row button.image-button:not(.flat) {
     border-bottom-color: black;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
     background-image: linear-gradient(to top, #20232b, #252831 1px); }
   list row button.image-button:not(.flat):active, list row button.image-button:not(.flat):checked {
     color: #eeeeec;
@@ -1739,7 +1739,7 @@ headerbar {
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #005af3;
       border-bottom-color: #0047c0;
-      background-image: linear-gradient(to top, #2274ff 2px, #2777ff);
+      background-image: linear-gradient(to top, #2777ff 2px, #4187ff);
       text-shadow: 0 -1px rgba(0, 0, 0, 0.538824);
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.538824);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(0, 90, 243, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
@@ -1843,10 +1843,10 @@ headerbar {
         outline-color: rgba(238, 238, 236, 0.3);
         border-color: #0d0e11;
         border-bottom-color: black;
-        background-image: linear-gradient(to top, #20232b 2px, #23252e);
+        background-image: linear-gradient(to top, #292c37 2px, #2e313d);
         text-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
         -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
         border-color: #00348d; }
         .selection-mode .titlebar:not(headerbar) button.suggested-action:hover, .selection-mode.titlebar:not(headerbar) button.suggested-action:hover, .selection-mode headerbar button.suggested-action:hover,
         headerbar.selection-mode button.suggested-action:hover {
@@ -1856,7 +1856,7 @@ headerbar {
           border-bottom-color: black;
           text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
           -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
-          box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
           background-image: linear-gradient(to top, #20232b, #252831 1px);
           border-color: #00348d; }
         .selection-mode .titlebar:not(headerbar) button.suggested-action:active, .selection-mode.titlebar:not(headerbar) button.suggested-action:active, .selection-mode headerbar button.suggested-action:active,
@@ -2721,14 +2721,14 @@ switch {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
     background-image: linear-gradient(to bottom, #292c37 20%, #23252e 90%);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.3), inset 0 -1px 0 rgba(26, 28, 35, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(0, 0, 0, 0.3), inset 0 -1px 0 rgba(26, 28, 35, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
   switch image {
     color: transparent; }
   switch:hover slider {
     color: #eeeeec;
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #040405;
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.3), inset 0 -1px 0 rgba(26, 28, 35, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(0, 0, 0, 0.3), inset 0 -1px 0 rgba(26, 28, 35, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
     background-image: linear-gradient(to bottom, #303340 20%, #272a34 90%); }
   switch:checked > slider {
     border: 1px solid #00215a; }
@@ -3179,7 +3179,7 @@ scale {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
     background-image: linear-gradient(to bottom, #1c1e25 20%, #16171d 90%);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.3), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(0, 0, 0, 0.3), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
     border: 1px solid black;
     border-radius: 100%;
     transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
@@ -3188,7 +3188,7 @@ scale {
       color: #eeeeec;
       outline-color: rgba(238, 238, 236, 0.3);
       border-color: black;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.3), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(0, 0, 0, 0.3), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
       background-image: linear-gradient(to bottom, #23252e 20%, #1a1c23 90%); }
     scale slider:active {
       border-color: #00348d; }
@@ -4286,10 +4286,10 @@ infobar {
       outline-color: rgba(238, 238, 236, 0.3);
       border-color: #0d0e11;
       border-bottom-color: black;
-      background-image: linear-gradient(to top, #20232b 2px, #23252e);
+      background-image: linear-gradient(to top, #292c37 2px, #2e313d);
       text-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
       infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error button:hover {
         color: #eeeeec;
         outline-color: rgba(238, 238, 236, 0.3);
@@ -4297,7 +4297,7 @@ infobar {
         border-bottom-color: black;
         text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
         -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
         background-image: linear-gradient(to top, #20232b, #252831 1px); }
       infobar.info button:active, infobar.info button:checked, infobar.question button:active, infobar.question button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.error button:active, infobar.error button:checked {
         color: #eeeeec;
@@ -4435,10 +4435,10 @@ colorswatch#add-color-button {
     outline-color: rgba(238, 238, 236, 0.3);
     border-color: #0d0e11;
     border-bottom-color: black;
-    background-image: linear-gradient(to top, #20232b 2px, #23252e);
+    background-image: linear-gradient(to top, #292c37 2px, #2e313d);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
     colorswatch#add-color-button overlay:hover {
       color: #eeeeec;
       outline-color: rgba(238, 238, 236, 0.3);
@@ -4446,7 +4446,7 @@ colorswatch#add-color-button {
       border-bottom-color: black;
       text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
       background-image: linear-gradient(to top, #20232b, #252831 1px); }
     colorswatch#add-color-button overlay:backdrop {
       color: #888a8d;
@@ -5136,7 +5136,7 @@ switch {
     text-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
     background-image: linear-gradient(to bottom, #1c1e25 20%, #16171d 90%);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px rgba(0, 0, 0, 0.3), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(0, 0, 0, 0.3), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
     border: 1px solid black;
     border-radius: 50%;
     transition-property: background, border, box-shadow; }
@@ -5272,7 +5272,7 @@ notebook > header {
         border-bottom-color: black;
         text-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
         -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.825255);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
         background-image: linear-gradient(to top, #20232b, #252831 1px); }
       notebook > header.top > tabs > tab:checked,
       notebook > header.top > tabs > tab.reorderable-page:checked, notebook > header.bottom > tabs > tab:checked,
@@ -5283,10 +5283,10 @@ notebook > header {
         outline-color: rgba(238, 238, 236, 0.3);
         border-color: #0d0e11;
         border-bottom-color: black;
-        background-image: linear-gradient(to top, #20232b 2px, #23252e);
+        background-image: linear-gradient(to top, #292c37 2px, #2e313d);
         text-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
         -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.873255);
-        box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(13, 14, 17, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
         background: #272a34; }
         notebook > header.top > tabs > tab:checked:backdrop,
         notebook > header.top > tabs > tab.reorderable-page:checked:backdrop, notebook > header.bottom > tabs > tab:checked:backdrop,
@@ -5338,7 +5338,7 @@ infobar.info button, infobar.info.action:hover button {
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #005af3;
   border-bottom-color: #0047c0;
-  background-image: linear-gradient(to top, #2274ff 2px, #2777ff);
+  background-image: linear-gradient(to top, #2777ff 2px, #4187ff);
   text-shadow: 0 -1px rgba(0, 0, 0, 0.538824);
   -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.538824);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(0, 90, 243, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
@@ -5393,7 +5393,7 @@ infobar.question button, infobar.warning button, infobar.question.action:hover b
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #ca6400;
   border-bottom-color: #974b00;
-  background-image: linear-gradient(to top, #f87a00 2px, #fd7d00);
+  background-image: linear-gradient(to top, #fd7d00 2px, #ff8a18);
   text-shadow: 0 -1px rgba(0, 0, 0, 0.603137);
   -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.603137);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), inset 0 -1px 0 rgba(202, 100, 0, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
@@ -5447,7 +5447,7 @@ infobar.error:backdrop > revealer > box, infobar.error > revealer > box, infobar
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #911212;
     border-bottom-color: #640c0c;
-    background-image: linear-gradient(to top, #ba1616 2px, #bf1717);
+    background-image: linear-gradient(to top, #bf1717 2px, #d61a1a);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.664314);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.664314);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), inset 0 -1px 0 rgba(145, 18, 18, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27); }
@@ -5458,7 +5458,7 @@ infobar.error:backdrop > revealer > box, infobar.error > revealer > box, infobar
       border-bottom-color: #640c0c;
       text-shadow: 0 -1px rgba(0, 0, 0, 0.616314);
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.616314);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), inset 0 -1px 0 rgba(145, 18, 18, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -1px 0 rgba(145, 18, 18, 0.75), 0 1px 2px rgba(0, 0, 0, 0.27);
       background-image: linear-gradient(to top, #ba1616, #c41818 1px); }
     infobar.error:backdrop > revealer > box button:active, infobar.error:backdrop > revealer > box button:checked, infobar.error > revealer > box button:active, infobar.error > revealer > box button:checked, infobar.error.action:hover:backdrop > revealer > box button:active, infobar.error.action:hover:backdrop > revealer > box button:checked, infobar.error.action:hover > revealer > box button:active, infobar.error.action:hover > revealer > box button:checked {
       color: #ffffff;
diff --git a/share/themes/Kali-Light/gtk-3.0/gtk.css b/share/themes/Kali-Light/gtk-3.0/gtk.css
index b021c4ec..cc9c9e69 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk.css
@@ -492,7 +492,7 @@ button {
   outline-color: rgba(92, 97, 108, 0.3);
   border-color: #d9d9d9;
   border-bottom-color: #c2c2c2;
-  background-image: linear-gradient(to top, whitesmoke 2px, #ffffff);
+  background-image: linear-gradient(to top, white 2px, white);
   text-shadow: 0 1px rgba(255, 255, 255, 0.769231);
   -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231);
   box-shadow: inset 0 1px white, inset 0 -1px 0 rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
@@ -805,7 +805,7 @@ button.suggested-action {
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #005af3;
   border-bottom-color: #0047c0;
-  background-image: linear-gradient(to top, #136aff 2px, #2777ff);
+  background-image: linear-gradient(to top, #2777ff 2px, #4187ff);
   text-shadow: 0 -1px rgba(0, 0, 0, 0.538824);
   -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.538824);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(0, 90, 243, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
@@ -955,7 +955,7 @@ button.destructive-action {
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #a61414;
   border-bottom-color: #790e0e;
-  background-image: linear-gradient(to top, #c21717 2px, #d41919);
+  background-image: linear-gradient(to top, #d41919 2px, #e52222);
   text-shadow: 0 -1px rgba(0, 0, 0, 0.628235);
   -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.628235);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), inset 0 -1px 0 rgba(166, 20, 20, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
@@ -1150,11 +1150,11 @@ button.circular {
     outline-color: rgba(92, 97, 108, 0.3);
     border-color: #d9d9d9;
     border-bottom-color: #c2c2c2;
-    background-image: linear-gradient(to top, whitesmoke 2px, #ffffff);
+    background-image: linear-gradient(to top, white 2px, white);
     text-shadow: 0 1px rgba(255, 255, 255, 0.769231);
     -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231);
     box-shadow: inset 0 1px white, inset 0 -1px 0 rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07);
-    background-image: linear-gradient(to top, whitesmoke 2px, #ffffff), linear-gradient(to top, #c2c2c2 25%, #d9d9d9 50%);
+    background-image: linear-gradient(to top, white 2px, white), linear-gradient(to top, #c2c2c2 25%, #d9d9d9 50%);
     border-color: transparent; }
   
   button.circular:hover:not(.osd):not(:checked):not(:active):not(:disabled):not(:backdrop) {
@@ -1188,7 +1188,7 @@ stacksidebar row.needs-attention > label, .stack-switcher > button.needs-attenti
   outline-color: rgba(92, 97, 108, 0.3);
   border-color: #d9d9d9;
   border-bottom-color: #c2c2c2;
-  background-image: linear-gradient(to top, whitesmoke 2px, #ffffff);
+  background-image: linear-gradient(to top, white 2px, white);
   text-shadow: 0 1px rgba(255, 255, 255, 0.769231);
   -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231);
   box-shadow: inset 0 1px white, inset 0 -1px 0 rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
@@ -1748,7 +1748,7 @@ headerbar {
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #005af3;
       border-bottom-color: #0047c0;
-      background-image: linear-gradient(to top, #136aff 2px, #2777ff);
+      background-image: linear-gradient(to top, #2777ff 2px, #4187ff);
       text-shadow: 0 -1px rgba(0, 0, 0, 0.538824);
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.538824);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(0, 90, 243, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
@@ -1852,7 +1852,7 @@ headerbar {
         outline-color: rgba(92, 97, 108, 0.3);
         border-color: #d9d9d9;
         border-bottom-color: #c2c2c2;
-        background-image: linear-gradient(to top, whitesmoke 2px, #ffffff);
+        background-image: linear-gradient(to top, white 2px, white);
         text-shadow: 0 1px rgba(255, 255, 255, 0.769231);
         -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231);
         box-shadow: inset 0 1px white, inset 0 -1px 0 rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07);
@@ -4308,7 +4308,7 @@ infobar {
       outline-color: rgba(92, 97, 108, 0.3);
       border-color: #d9d9d9;
       border-bottom-color: #c2c2c2;
-      background-image: linear-gradient(to top, whitesmoke 2px, #ffffff);
+      background-image: linear-gradient(to top, white 2px, white);
       text-shadow: 0 1px rgba(255, 255, 255, 0.769231);
       -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231);
       box-shadow: inset 0 1px white, inset 0 -1px 0 rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
@@ -4457,7 +4457,7 @@ colorswatch#add-color-button {
     outline-color: rgba(92, 97, 108, 0.3);
     border-color: #d9d9d9;
     border-bottom-color: #c2c2c2;
-    background-image: linear-gradient(to top, whitesmoke 2px, #ffffff);
+    background-image: linear-gradient(to top, white 2px, white);
     text-shadow: 0 1px rgba(255, 255, 255, 0.769231);
     -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231);
     box-shadow: inset 0 1px white, inset 0 -1px 0 rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
@@ -5304,7 +5304,7 @@ notebook > header {
         outline-color: rgba(92, 97, 108, 0.3);
         border-color: #d9d9d9;
         border-bottom-color: #c2c2c2;
-        background-image: linear-gradient(to top, whitesmoke 2px, #ffffff);
+        background-image: linear-gradient(to top, white 2px, white);
         text-shadow: 0 1px rgba(255, 255, 255, 0.769231);
         -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231);
         box-shadow: inset 0 1px white, inset 0 -1px 0 rgba(217, 217, 217, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07);
@@ -5359,7 +5359,7 @@ infobar.info button, infobar.info.action:hover button {
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #005af3;
   border-bottom-color: #0047c0;
-  background-image: linear-gradient(to top, #136aff 2px, #2777ff);
+  background-image: linear-gradient(to top, #2777ff 2px, #4187ff);
   text-shadow: 0 -1px rgba(0, 0, 0, 0.538824);
   -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.538824);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), inset 0 -1px 0 rgba(0, 90, 243, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
@@ -5414,7 +5414,7 @@ infobar.question button, infobar.warning button, infobar.question.action:hover b
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #ca6400;
   border-bottom-color: #974b00;
-  background-image: linear-gradient(to top, #e97300 2px, #fd7d00);
+  background-image: linear-gradient(to top, #fd7d00 2px, #ff8a18);
   text-shadow: 0 -1px rgba(0, 0, 0, 0.603137);
   -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.603137);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), inset 0 -1px 0 rgba(202, 100, 0, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
@@ -5468,7 +5468,7 @@ infobar.error:backdrop > revealer > box, infobar.error > revealer > box, infobar
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #911212;
     border-bottom-color: #640c0c;
-    background-image: linear-gradient(to top, #ad1515 2px, #bf1717);
+    background-image: linear-gradient(to top, #bf1717 2px, #d61a1a);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.664314);
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.664314);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), inset 0 -1px 0 rgba(145, 18, 18, 0.75), 0 1px 2px rgba(0, 0, 0, 0.07); }
diff --git a/src/themes/Kali/sass/gtk-sass/upstream/_drawing.scss b/src/themes/Kali/sass/gtk-sass/upstream/_drawing.scss
index 688da61c..05e5bf4d 100644
--- a/src/themes/Kali/sass/gtk-sass/upstream/_drawing.scss
+++ b/src/themes/Kali/sass/gtk-sass/upstream/_drawing.scss
@@ -142,7 +142,7 @@
   @else if lightness($c)>80% { @return transparentize(white, 0.5); }
   @else if lightness($c)>50% { @return transparentize(white, 0.8); }
   @else if lightness($c)>40% { @return transparentize(white, 0.9); }
-  @else { @return transparentize(white, 0.98); }
+  @else { @return transparentize(white, 0.95); }
 }
 
 @mixin _button_text_shadow ($tc:$fg_color, $bg:$bg_color) {
@@ -196,8 +196,7 @@
     outline-color: transparentize($tc, 0.7);
     border-color: if($c != $bg_color, _border_color($c), $borders_color);
     border-bottom-color: if($c != $bg_color, _border_color($c, true), $alt_borders_color);
-    $button_fill: if($variant == 'light', linear-gradient(to top, darken($c, 4%) 2px, $c),
-                                          linear-gradient(to top, darken($c,1%) 2px, $c)) !global;
+    $button_fill: linear-gradient(to top, if($c != $bg_color, $c, lighten($c, 3%)) 2px, lighten($c, 5%)) !global;
     background-image: $button_fill;
     @include _button_text_shadow($tc, $c);
     @include _shadows(inset 0 1px $_hilight_color, $_button_edge, $_button_shadow);
diff --git a/src/themes/Kali/sass/gtk-sass/upstream/_drawing.scss.patch b/src/themes/Kali/sass/gtk-sass/upstream/_drawing.scss.patch
index 74536b59..75bda0b9 100644
--- a/src/themes/Kali/sass/gtk-sass/upstream/_drawing.scss.patch
+++ b/src/themes/Kali/sass/gtk-sass/upstream/_drawing.scss.patch
@@ -1,4 +1,13 @@
+145c145
+<   @else { @return transparentize(white, 0.98); }
+---
+>   @else { @return transparentize(white, 0.95); }
 189c189
 <   $_button_shadow: 0 1px 2px transparentize($shadow_color, 0.03);
 ---
 >   $_button_shadow: inset 0 -1px 0 transparentize(if($c != $bg_color, _border_color($c), $borders_color), .25), 0 1px 2px transparentize($shadow_color, 0.03);
+199,200c199
+<     $button_fill: if($variant == 'light', linear-gradient(to top, darken($c, 4%) 2px, $c),
+<                                           linear-gradient(to top, darken($c,1%) 2px, $c)) !global;
+---
+>     $button_fill: linear-gradient(to top, if($c != $bg_color, $c, lighten($c, 3%)) 2px, lighten($c, 5%)) !global;