diff --git a/share/themes/Kali-Dark/gtk-3.0/gtk.css b/share/themes/Kali-Dark/gtk-3.0/gtk.css
index 404d4c52..298491cb 100644
--- a/share/themes/Kali-Dark/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Dark/gtk-3.0/gtk.css
@@ -120,19 +120,17 @@ flowbox flowboxchild {
 
 label {
   caret-color: currentColor; }
-  label.separator {
-    color: #eeeeec; }
-    label.separator:backdrop {
-      color: #888a8d; }
   label selection {
     background-color: #2777ff;
     color: #ffffff; }
   label:disabled {
     color: #888a8d; }
+    button label:disabled {
+      color: inherit; }
     label:disabled:backdrop {
       color: #43495a; }
-  label:backdrop {
-    color: #888a8d; }
+      button label:disabled:backdrop {
+        color: inherit; }
 
 .dim-label, label.separator, .titlebar:not(headerbar) .subtitle,
 headerbar .subtitle {
@@ -188,6 +186,46 @@ spinner {
     spinner:checked:disabled {
       opacity: 0.5; }
 
+/**********************
+ * General Typography *
+ **********************/
+.large-title {
+  font-weight: 300;
+  font-size: 24pt;
+  letter-spacing: 0.2rem; }
+
+.title-1 {
+  font-weight: 800;
+  font-size: 20pt; }
+
+.title-2 {
+  font-weight: 800;
+  font-size: 15pt; }
+
+.title-3 {
+  font-weight: 700;
+  font-size: 15pt; }
+
+.title-4 {
+  font-weight: 700;
+  font-size: 13pt; }
+
+.heading {
+  font-weight: 700;
+  font-size: 11pt; }
+
+.body {
+  font-weight: 400;
+  font-size: 11pt; }
+
+.caption-heading {
+  font-weight: 700;
+  font-size: 9pt; }
+
+.caption {
+  font-weight: 400;
+  font-size: 9pt; }
+
 /****************
  * Text Entries *
  ****************/
@@ -542,6 +580,7 @@ button {
   notebook > header > tabs > arrow:backdrop.flat, button:backdrop.flat.titlebutton, notebook > header > tabs > arrow:backdrop, button.titlebutton:backdrop,
   button:backdrop.flat,
   button:backdrop {
+    color: #888a8d;
     border-color: #111217;
     background-image: image(#23252e);
     text-shadow: none;
@@ -549,59 +588,34 @@ button {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     transition: 200ms ease-out;
     -gtk-icon-effect: none; }
-    notebook > header > tabs > arrow:backdrop.flat label, button:backdrop.flat.titlebutton label, notebook > header > tabs > arrow:backdrop.flat, button:backdrop.flat.titlebutton, notebook > header > tabs > arrow:backdrop label, button.titlebutton:backdrop label, notebook > header > tabs > arrow:backdrop, button.titlebutton:backdrop,
-    button:backdrop.flat label,
-    button:backdrop.flat,
-    button:backdrop label,
-    button:backdrop {
-      color: #888a8d; }
     notebook > header > tabs > arrow:backdrop.flat:active, button:backdrop.flat.titlebutton:active, notebook > header > tabs > arrow:backdrop.flat:checked, button:backdrop.flat.titlebutton:checked, notebook > header > tabs > arrow:backdrop:active, button.titlebutton:backdrop:active, notebook > header > tabs > arrow:backdrop:checked, button.titlebutton:backdrop:checked,
     button:backdrop.flat:active,
     button:backdrop.flat:checked,
     button:backdrop:active,
     button:backdrop:checked {
+      color: #888a8d;
       border-color: #111217;
       background-image: image(#1a1d23);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      notebook > header > tabs > arrow:backdrop.flat:active label, button:backdrop.flat.titlebutton:active label, notebook > header > tabs > arrow:backdrop.flat:active, button:backdrop.flat.titlebutton:active, notebook > header > tabs > arrow:backdrop.flat:checked label, button:backdrop.flat.titlebutton:checked label, notebook > header > tabs > arrow:backdrop.flat:checked, button:backdrop.flat.titlebutton:checked, notebook > header > tabs > arrow:backdrop:active label, button.titlebutton:backdrop:active label, notebook > header > tabs > arrow:backdrop:active, button.titlebutton:backdrop:active, notebook > header > tabs > arrow:backdrop:checked label, button.titlebutton:backdrop:checked label, notebook > header > tabs > arrow:backdrop:checked, button.titlebutton:backdrop:checked,
-      button:backdrop.flat:active label,
-      button:backdrop.flat:active,
-      button:backdrop.flat:checked label,
-      button:backdrop.flat:checked,
-      button:backdrop:active label,
-      button:backdrop:active,
-      button:backdrop:checked label,
-      button:backdrop:checked {
-        color: #888a8d; }
     notebook > header > tabs > arrow:backdrop.flat:disabled, button:backdrop.flat.titlebutton:disabled, notebook > header > tabs > arrow:backdrop:disabled, button.titlebutton:backdrop:disabled,
     button:backdrop.flat:disabled,
     button:backdrop:disabled {
+      color: #43495a;
       border-color: #111217;
       background-image: image(#242731);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      notebook > header > tabs > arrow:backdrop.flat:disabled label, button:backdrop.flat.titlebutton:disabled label, notebook > header > tabs > arrow:backdrop.flat:disabled, button:backdrop.flat.titlebutton:disabled, notebook > header > tabs > arrow:backdrop:disabled label, button.titlebutton:backdrop:disabled label, notebook > header > tabs > arrow:backdrop:disabled, button.titlebutton:backdrop:disabled,
-      button:backdrop.flat:disabled label,
-      button:backdrop.flat:disabled,
-      button:backdrop:disabled label,
-      button:backdrop:disabled {
-        color: #43495a; }
       notebook > header > tabs > arrow:backdrop.flat:disabled:active, button:backdrop.flat.titlebutton:disabled:active, notebook > header > tabs > arrow:backdrop.flat:disabled:checked, button:backdrop.flat.titlebutton:disabled:checked, notebook > header > tabs > arrow:backdrop:disabled:active, button.titlebutton:backdrop:disabled:active, notebook > header > tabs > arrow:backdrop:disabled:checked, button.titlebutton:backdrop:disabled:checked,
       button:backdrop.flat:disabled:active,
       button:backdrop.flat:disabled:checked,
       button:backdrop:disabled:active,
       button:backdrop:disabled:checked {
+        color: #43495a;
         border-color: #111217;
         background-image: image(#1a1d23);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        notebook > header > tabs > arrow:backdrop.flat:disabled:active label, button:backdrop.flat.titlebutton:disabled:active label, notebook > header > tabs > arrow:backdrop.flat:disabled:checked label, button:backdrop.flat.titlebutton:disabled:checked label, notebook > header > tabs > arrow:backdrop:disabled:active label, button.titlebutton:backdrop:disabled:active label, notebook > header > tabs > arrow:backdrop:disabled:checked label, button.titlebutton:backdrop:disabled:checked label,
-        button:backdrop.flat:disabled:active label,
-        button:backdrop.flat:disabled:checked label,
-        button:backdrop:disabled:active label,
-        button:backdrop:disabled:checked label {
-          color: #43495a; }
-  notebook > header > tabs > arrow.flat:backdrop, button.flat.titlebutton:backdrop, notebook > header > tabs > arrow.flat:disabled, button.flat.titlebutton:disabled, notebook > header > tabs > arrow.flat:backdrop:disabled, button.flat.titlebutton:backdrop:disabled,
+  notebook > header > tabs > arrow:backdrop, button.sidebar-button:backdrop, button.titlebutton:backdrop, notebook > header > tabs > arrow:disabled, button.sidebar-button:disabled, button.titlebutton:disabled, notebook > header > tabs > arrow:backdrop:disabled, button.sidebar-button:backdrop:disabled, button.titlebutton:backdrop:disabled, notebook > header > tabs > arrow.flat:backdrop, button.flat.titlebutton:backdrop, notebook > header > tabs > arrow.flat:disabled, button.flat.titlebutton:disabled, notebook > header > tabs > arrow.flat:backdrop:disabled, button.flat.titlebutton:backdrop:disabled,
   button.flat:backdrop,
   button.flat:disabled,
   button.flat:backdrop:disabled {
@@ -613,27 +627,19 @@ button {
     -gtk-icon-shadow: none; }
   notebook > header > tabs > arrow:disabled, button.titlebutton:disabled,
   button:disabled {
+    color: #888a8d;
     border-color: #0d0e11;
     background-image: image(#242731);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    notebook > header > tabs > arrow:disabled label, button.titlebutton:disabled label, notebook > header > tabs > arrow:disabled, button.titlebutton:disabled,
-    button:disabled label,
-    button:disabled {
-      color: #888a8d; }
     notebook > header > tabs > arrow:disabled:active, button.titlebutton:disabled:active, notebook > header > tabs > arrow:disabled:checked, button.titlebutton:disabled:checked,
     button:disabled:active,
     button:disabled:checked {
+      color: #888a8d;
       border-color: #0d0e11;
       background-image: image(#16181d);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      notebook > header > tabs > arrow:disabled:active label, button.titlebutton:disabled:active label, notebook > header > tabs > arrow:disabled:active, button.titlebutton:disabled:active, notebook > header > tabs > arrow:disabled:checked label, button.titlebutton:disabled:checked label, notebook > header > tabs > arrow:disabled:checked, button.titlebutton:disabled:checked,
-      button:disabled:active label,
-      button:disabled:active,
-      button:disabled:checked label,
-      button:disabled:checked {
-        color: #888a8d; }
   notebook > header > tabs > arrow.image-button, button.image-button.titlebutton,
   button.image-button {
     min-width: 24px;
@@ -875,7 +881,7 @@ button.suggested-action {
   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), 0 1px 2px rgba(0, 0, 0, 0.27); }
-  .selection-mode button.titlebutton,
+  
   button.suggested-action.flat {
     border-color: transparent;
     background-color: transparent;
@@ -904,67 +910,43 @@ button.suggested-action {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none; }
-  .selection-mode button.titlebutton:backdrop,
+  
   button.suggested-action:backdrop,
   button.suggested-action.flat:backdrop {
+    color: #d4e4ff;
     border-color: #005af3;
     background-image: image(#2777ff);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    .selection-mode button.titlebutton:backdrop label, .selection-mode button.titlebutton:backdrop,
-    button.suggested-action:backdrop label,
-    button.suggested-action:backdrop,
-    button.suggested-action.flat:backdrop label,
-    button.suggested-action.flat:backdrop {
-      color: #d4e4ff; }
-    .selection-mode button.titlebutton:backdrop:active, .selection-mode button.titlebutton:backdrop:checked,
+    
     button.suggested-action:backdrop:active,
     button.suggested-action:backdrop:checked,
     button.suggested-action.flat:backdrop:active,
     button.suggested-action.flat:backdrop:checked {
+      color: #d2e0f7;
       border-color: #005af3;
       background-image: image(#1e62d6);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .selection-mode button.titlebutton:backdrop:active label, .selection-mode button.titlebutton:backdrop:active, .selection-mode button.titlebutton:backdrop:checked label, .selection-mode button.titlebutton:backdrop:checked,
-      button.suggested-action:backdrop:active label,
-      button.suggested-action:backdrop:active,
-      button.suggested-action:backdrop:checked label,
-      button.suggested-action:backdrop:checked,
-      button.suggested-action.flat:backdrop:active label,
-      button.suggested-action.flat:backdrop:active,
-      button.suggested-action.flat:backdrop:checked label,
-      button.suggested-action.flat:backdrop:checked {
-        color: #d2e0f7; }
-    .selection-mode button.titlebutton:backdrop:disabled,
+    
     button.suggested-action:backdrop:disabled,
     button.suggested-action.flat:backdrop:disabled {
+      color: #43495a;
       border-color: #111217;
       background-image: image(#242731);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .selection-mode button.titlebutton:backdrop:disabled label, .selection-mode button.titlebutton:backdrop:disabled,
-      button.suggested-action:backdrop:disabled label,
-      button.suggested-action:backdrop:disabled,
-      button.suggested-action.flat:backdrop:disabled label,
-      button.suggested-action.flat:backdrop:disabled {
-        color: #43495a; }
-      .selection-mode button.titlebutton:backdrop:disabled:active, .selection-mode button.titlebutton:backdrop:disabled:checked,
+      
       button.suggested-action:backdrop:disabled:active,
       button.suggested-action:backdrop:disabled:checked,
       button.suggested-action.flat:backdrop:disabled:active,
       button.suggested-action.flat:backdrop:disabled:checked {
+        color: #6d99e4;
         border-color: #005af3;
         background-image: image(#1e62d6);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        .selection-mode button.titlebutton:backdrop:disabled:active label, .selection-mode button.titlebutton:backdrop:disabled:checked label,
-        button.suggested-action:backdrop:disabled:active label,
-        button.suggested-action:backdrop:disabled:checked label,
-        button.suggested-action.flat:backdrop:disabled:active label,
-        button.suggested-action.flat:backdrop:disabled:checked label {
-          color: #6d99e4; }
-  .selection-mode button.titlebutton:backdrop, .selection-mode button.titlebutton:disabled, .selection-mode button.titlebutton:backdrop:disabled,
+  
   button.suggested-action.flat:backdrop,
   button.suggested-action.flat:disabled,
   button.suggested-action.flat:backdrop:disabled {
@@ -977,27 +959,19 @@ button.suggested-action {
     color: rgba(39, 119, 255, 0.8); }
   
   button.suggested-action:disabled {
+    color: #888a8d;
     border-color: #0d0e11;
     background-image: image(#242731);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     
-    button.suggested-action:disabled label,
-    button.suggested-action:disabled {
-      color: #888a8d; }
-    
     button.suggested-action:disabled:active,
     button.suggested-action:disabled:checked {
+      color: #a4bfeb;
       border-color: #005af3;
       background-image: image(#1c5ecd);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      
-      button.suggested-action:disabled:active label,
-      button.suggested-action:disabled:active,
-      button.suggested-action:disabled:checked label,
-      button.suggested-action:disabled:checked {
-        color: #a4bfeb; }
   .osd
   button.suggested-action {
     color: #eeeeec;
@@ -1098,63 +1072,39 @@ button.destructive-action {
   
   button.destructive-action:backdrop,
   button.destructive-action.flat:backdrop {
+    color: #edd0d0;
     border-color: #790e0e;
     background-image: image(#a61414);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     
-    button.destructive-action:backdrop label,
-    button.destructive-action:backdrop,
-    button.destructive-action.flat:backdrop label,
-    button.destructive-action.flat:backdrop {
-      color: #edd0d0; }
-    
     button.destructive-action:backdrop:active,
     button.destructive-action:backdrop:checked,
     button.destructive-action.flat:backdrop:active,
     button.destructive-action.flat:backdrop:checked {
+      color: #e6d0d0;
       border-color: #790e0e;
       background-image: image(#811415);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      
-      button.destructive-action:backdrop:active label,
-      button.destructive-action:backdrop:active,
-      button.destructive-action:backdrop:checked label,
-      button.destructive-action:backdrop:checked,
-      button.destructive-action.flat:backdrop:active label,
-      button.destructive-action.flat:backdrop:active,
-      button.destructive-action.flat:backdrop:checked label,
-      button.destructive-action.flat:backdrop:checked {
-        color: #e6d0d0; }
     
     button.destructive-action:backdrop:disabled,
     button.destructive-action.flat:backdrop:disabled {
+      color: #43495a;
       border-color: #111217;
       background-image: image(#242731);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       
-      button.destructive-action:backdrop:disabled label,
-      button.destructive-action:backdrop:disabled,
-      button.destructive-action.flat:backdrop:disabled label,
-      button.destructive-action.flat:backdrop:disabled {
-        color: #43495a; }
-      
       button.destructive-action:backdrop:disabled:active,
       button.destructive-action:backdrop:disabled:checked,
       button.destructive-action.flat:backdrop:disabled:active,
       button.destructive-action.flat:backdrop:disabled:checked {
+        color: #ad6667;
         border-color: #790e0e;
         background-image: image(#811415);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        
-        button.destructive-action:backdrop:disabled:active label,
-        button.destructive-action:backdrop:disabled:checked label,
-        button.destructive-action.flat:backdrop:disabled:active label,
-        button.destructive-action.flat:backdrop:disabled:checked label {
-          color: #ad6667; }
   
   button.destructive-action.flat:backdrop,
   button.destructive-action.flat:disabled,
@@ -1168,27 +1118,19 @@ button.destructive-action {
     color: rgba(166, 20, 20, 0.8); }
   
   button.destructive-action:disabled {
+    color: #888a8d;
     border-color: #0d0e11;
     background-image: image(#242731);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     
-    button.destructive-action:disabled label,
-    button.destructive-action:disabled {
-      color: #888a8d; }
-    
     button.destructive-action:disabled:active,
     button.destructive-action:disabled:checked {
+      color: #c9a1a1;
       border-color: #790e0e;
       background-image: image(#791314);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      
-      button.destructive-action:disabled:active label,
-      button.destructive-action:disabled:active,
-      button.destructive-action:disabled:checked label,
-      button.destructive-action:disabled:checked {
-        color: #c9a1a1; }
   .osd
   button.destructive-action {
     color: #eeeeec;
@@ -1374,47 +1316,41 @@ button.circular {
     text-shadow: none;
     -gtk-icon-shadow: none; }
   .inline-toolbar toolbutton > button:disabled {
+    color: #888a8d;
     border-color: #0d0e11;
     background-image: image(#242731);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
-      color: #888a8d; }
     .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked {
+      color: #888a8d;
       border-color: #0d0e11;
       background-image: image(#16181d);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .inline-toolbar toolbutton > button:disabled:active label, .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked label, .inline-toolbar toolbutton > button:disabled:checked {
-        color: #888a8d; }
   .inline-toolbar toolbutton > button:backdrop {
+    color: #888a8d;
     border-color: #111217;
     background-image: image(#23252e);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    .inline-toolbar toolbutton > button:backdrop label, .inline-toolbar toolbutton > button:backdrop {
-      color: #888a8d; }
     .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked {
+      color: #888a8d;
       border-color: #111217;
       background-image: image(#1a1d23);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .inline-toolbar toolbutton > button:backdrop:active label, .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked label, .inline-toolbar toolbutton > button:backdrop:checked {
-        color: #888a8d; }
     .inline-toolbar toolbutton > button:backdrop:disabled {
+      color: #43495a;
       border-color: #111217;
       background-image: image(#242731);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .inline-toolbar toolbutton > button:backdrop:disabled label, .inline-toolbar toolbutton > button:backdrop:disabled {
-        color: #43495a; }
       .inline-toolbar toolbutton > button:backdrop:disabled:active, .inline-toolbar toolbutton > button:backdrop:disabled:checked {
+        color: #43495a;
         border-color: #111217;
         background-image: image(#1a1d23);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        .inline-toolbar toolbutton > button:backdrop:disabled:active label, .inline-toolbar toolbutton > button:backdrop:disabled:checked label {
-          color: #43495a; }
 
 toolbar.inline-toolbar toolbutton > button.flat,
 toolbar.inline-toolbar toolbutton:backdrop > button.flat, .linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, .inline-toolbar button, .inline-toolbar button:backdrop, .linked > button,
@@ -1423,7 +1359,8 @@ toolbar.inline-toolbar toolbutton:backdrop > button.flat, .linked:not(.vertical)
 .linked > button:checked,
 .linked > button:backdrop, filechooser .path-bar.linked > button, .linked > combobox > box > button.combo:dir(ltr), .linked > combobox > box > button.combo:dir(rtl) {
   border-radius: 0;
-  border-right-style: none; }
+  border-right-style: none;
+  -gtk-outline-radius: 0; }
 
 toolbar.inline-toolbar toolbutton:first-child > button.flat,
 toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat, .linked:not(.vertical) > spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked > button:first-child, filechooser .path-bar.linked > button:first-child:dir(ltr), filechooser .path-bar.linked > button:last-child:dir(rtl), combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > button.combo {
@@ -1431,7 +1368,11 @@ toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat, .linked:no
   border-bottom-left-radius: 5px;
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
-  border-right-style: none; }
+  border-right-style: none;
+  -gtk-outline-bottom-left-radius: 5px;
+  -gtk-outline-top-left-radius: 5px;
+  -gtk-outline-top-right-radius: 0;
+  -gtk-outline-bottom-right-radius: 0; }
 
 toolbar.inline-toolbar toolbutton:last-child > button.flat,
 toolbar.inline-toolbar toolbutton:backdrop:last-child > button.flat, .linked:not(.vertical) > spinbutton:last-child:not(.vertical), .linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked > button:last-child, filechooser .path-bar.linked > button:last-child:dir(ltr), filechooser .path-bar.linked > button:first-child:dir(rtl), combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > box > button.combo {
@@ -1439,12 +1380,17 @@ toolbar.inline-toolbar toolbutton:backdrop:last-child > button.flat, .linked:not
   border-bottom-left-radius: 0;
   border-top-right-radius: 5px;
   border-bottom-right-radius: 5px;
-  border-right-style: solid; }
+  border-right-style: solid;
+  -gtk-outline-bottom-right-radius: 5px;
+  -gtk-outline-top-right-radius: 5px;
+  -gtk-outline-bottom-left-radius: 0;
+  -gtk-outline-top-left-radius: 0; }
 
 toolbar.inline-toolbar toolbutton:only-child > button.flat,
 toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat, .linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .linked > button:only-child, filechooser .path-bar.linked > button:only-child, .linked:not(.vertical) > combobox:only-child > box > button.combo {
   border-radius: 5px;
-  border-style: solid; }
+  border-style: solid;
+  -gtk-outline-radius: 5px; }
 
 .linked.vertical > spinbutton:not(.vertical), .linked.vertical > entry, .linked.vertical > button,
 .linked.vertical > button:hover,
@@ -1547,7 +1493,7 @@ button:visited > label,
     *:selected button:visited, *:selected button:link > label:visited,
     *:selected button:visited > label:visited, *:selected
     *:link:visited {
-      color: #a9c9ff; }
+      color: #bdd5ff; }
   button:hover:link,
   button:hover:visited, button:link > label:hover,
   button:visited > label:hover,
@@ -1557,7 +1503,7 @@ button:visited > label,
     *:selected button:hover:visited, *:selected button:link > label:hover,
     *:selected button:visited > label:hover, *:selected
     *:link:hover {
-      color: #e9f1ff; }
+      color: #f9fbff; }
   button:active:link,
   button:active:visited, button:link > label:active,
   button:visited > label:active,
@@ -1567,7 +1513,7 @@ button:visited > label,
     *:selected button:active:visited, *:selected button:link > label:active,
     *:selected button:visited > label:active, *:selected
     *:link:active {
-      color: #d4e4ff; }
+      color: #e8f1ff; }
   button:disabled:link,
   button:disabled:visited, button:link > label:disabled,
   button:visited > label:disabled, button:disabled:backdrop:link,
@@ -1586,7 +1532,7 @@ button:visited > label,
   *:link:backdrop:backdrop:hover,
   *:link:backdrop:backdrop:hover:selected,
   *:link:backdrop {
-    color: #2777ff; }
+    color: rgba(141, 183, 255, 0.9); }
   .selection-mode .titlebar:not(headerbar) .subtitle:link, .selection-mode.titlebar:not(headerbar) .subtitle:link, .selection-mode headerbar .subtitle:link,
   headerbar.selection-mode .subtitle:link, button:selected:link,
   button:selected:visited, button:link > label:selected,
@@ -1598,7 +1544,7 @@ button:visited > label,
   *:link:selected,
   *:selected
   *:link {
-    color: #d4e4ff; }
+    color: #e8f1ff; }
 
 button:link,
 button:visited {
@@ -1914,17 +1860,10 @@ headerbar {
     .titlebar:not(headerbar) button.toggle:checked:backdrop,
     headerbar stackswitcher button:checked:backdrop,
     headerbar button.toggle:checked:backdrop {
+      color: #888a8d;
       border-color: #111217;
       background-image: image(#1a1d23);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .titlebar:not(headerbar) stackswitcher button:checked:backdrop label, .titlebar:not(headerbar) stackswitcher button:checked:backdrop,
-      .titlebar:not(headerbar) button.toggle:checked:backdrop label,
-      .titlebar:not(headerbar) button.toggle:checked:backdrop,
-      headerbar stackswitcher button:checked:backdrop label,
-      headerbar stackswitcher button:checked:backdrop,
-      headerbar button.toggle:checked:backdrop label,
-      headerbar button.toggle:checked:backdrop {
-        color: #888a8d; }
   .selection-mode .titlebar:not(headerbar), .selection-mode.titlebar:not(headerbar), .selection-mode
   headerbar,
   headerbar.selection-mode {
@@ -1955,7 +1894,7 @@ headerbar {
       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), 0 1px 2px rgba(0, 0, 0, 0.27); }
-      .selection-mode .titlebar:not(headerbar) button.flat, .selection-mode.titlebar:not(headerbar) button.flat, .selection-mode
+      .selection-mode button.titlebutton, .selection-mode .titlebar:not(headerbar) button.flat, .selection-mode.titlebar:not(headerbar) button.flat, .selection-mode
       headerbar button.flat,
       headerbar.selection-mode button.flat {
         border-color: transparent;
@@ -1996,6 +1935,7 @@ headerbar {
       headerbar button:backdrop,
       headerbar.selection-mode button:backdrop.flat,
       headerbar.selection-mode button:backdrop {
+        color: #d4e4ff;
         border-color: #005af3;
         background-image: image(#2777ff);
         text-shadow: none;
@@ -2003,16 +1943,6 @@ headerbar {
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         -gtk-icon-effect: none;
         border-color: #00348d; }
-        .selection-mode .titlebar:not(headerbar) button:backdrop.flat label, .selection-mode .titlebar:not(headerbar) button:backdrop.flat, .selection-mode .titlebar:not(headerbar) button:backdrop label, .selection-mode .titlebar:not(headerbar) button:backdrop, .selection-mode.titlebar:not(headerbar) button:backdrop.flat label, .selection-mode.titlebar:not(headerbar) button:backdrop.flat, .selection-mode.titlebar:not(headerbar) button:backdrop label, .selection-mode.titlebar:not(headerbar) button:backdrop, .selection-mode
-        headerbar button:backdrop.flat label, .selection-mode
-        headerbar button:backdrop.flat, .selection-mode
-        headerbar button:backdrop label, .selection-mode
-        headerbar button:backdrop,
-        headerbar.selection-mode button:backdrop.flat label,
-        headerbar.selection-mode button:backdrop.flat,
-        headerbar.selection-mode button:backdrop label,
-        headerbar.selection-mode button:backdrop {
-          color: #d4e4ff; }
         .selection-mode .titlebar:not(headerbar) button:backdrop.flat:active, .selection-mode .titlebar:not(headerbar) button:backdrop.flat:checked, .selection-mode .titlebar:not(headerbar) button:backdrop:active, .selection-mode .titlebar:not(headerbar) button:backdrop:checked, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:active, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:active, .selection-mode.titlebar:not(headerbar) button:backdrop:checked, .selection-mode
         headerbar button:backdrop.flat:active, .selection-mode
         headerbar button:backdrop.flat:checked, .selection-mode
@@ -2022,49 +1952,23 @@ headerbar {
         headerbar.selection-mode button:backdrop.flat:checked,
         headerbar.selection-mode button:backdrop:active,
         headerbar.selection-mode button:backdrop:checked {
+          color: #d2e0f7;
           border-color: #005af3;
           background-image: image(#1e62d6);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #00348d; }
-          .selection-mode .titlebar:not(headerbar) button:backdrop.flat:active label, .selection-mode .titlebar:not(headerbar) button:backdrop.flat:active, .selection-mode .titlebar:not(headerbar) button:backdrop.flat:checked label, .selection-mode .titlebar:not(headerbar) button:backdrop.flat:checked, .selection-mode .titlebar:not(headerbar) button:backdrop:active label, .selection-mode .titlebar:not(headerbar) button:backdrop:active, .selection-mode .titlebar:not(headerbar) button:backdrop:checked label, .selection-mode .titlebar:not(headerbar) button:backdrop:checked, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:active label, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:active, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:checked label, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:active label, .selection-mode.titlebar:not(headerbar) button:backdrop:active, .selection-mode.titlebar:not(headerbar) button:backdrop:checked label, .selection-mode.titlebar:not(headerbar) button:backdrop:checked, .selection-mode
-          headerbar button:backdrop.flat:active label, .selection-mode
-          headerbar button:backdrop.flat:active, .selection-mode
-          headerbar button:backdrop.flat:checked label, .selection-mode
-          headerbar button:backdrop.flat:checked, .selection-mode
-          headerbar button:backdrop:active label, .selection-mode
-          headerbar button:backdrop:active, .selection-mode
-          headerbar button:backdrop:checked label, .selection-mode
-          headerbar button:backdrop:checked,
-          headerbar.selection-mode button:backdrop.flat:active label,
-          headerbar.selection-mode button:backdrop.flat:active,
-          headerbar.selection-mode button:backdrop.flat:checked label,
-          headerbar.selection-mode button:backdrop.flat:checked,
-          headerbar.selection-mode button:backdrop:active label,
-          headerbar.selection-mode button:backdrop:active,
-          headerbar.selection-mode button:backdrop:checked label,
-          headerbar.selection-mode button:backdrop:checked {
-            color: #d2e0f7; }
         .selection-mode .titlebar:not(headerbar) button:backdrop.flat:disabled, .selection-mode .titlebar:not(headerbar) button:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled, .selection-mode
         headerbar button:backdrop.flat:disabled, .selection-mode
         headerbar button:backdrop:disabled,
         headerbar.selection-mode button:backdrop.flat:disabled,
         headerbar.selection-mode button:backdrop:disabled {
+          color: #739fec;
           border-color: #005af3;
           background-image: image(#276ce1);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #00348d; }
-          .selection-mode .titlebar:not(headerbar) button:backdrop.flat:disabled label, .selection-mode .titlebar:not(headerbar) button:backdrop.flat:disabled, .selection-mode .titlebar:not(headerbar) button:backdrop:disabled label, .selection-mode .titlebar:not(headerbar) button:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled label, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled label, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled, .selection-mode
-          headerbar button:backdrop.flat:disabled label, .selection-mode
-          headerbar button:backdrop.flat:disabled, .selection-mode
-          headerbar button:backdrop:disabled label, .selection-mode
-          headerbar button:backdrop:disabled,
-          headerbar.selection-mode button:backdrop.flat:disabled label,
-          headerbar.selection-mode button:backdrop.flat:disabled,
-          headerbar.selection-mode button:backdrop:disabled label,
-          headerbar.selection-mode button:backdrop:disabled {
-            color: #739fec; }
           .selection-mode .titlebar:not(headerbar) button:backdrop.flat:disabled:active, .selection-mode .titlebar:not(headerbar) button:backdrop.flat:disabled:checked, .selection-mode .titlebar:not(headerbar) button:backdrop:disabled:active, .selection-mode .titlebar:not(headerbar) button:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled:active, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:checked, .selection-mode
           headerbar button:backdrop.flat:disabled:active, .selection-mode
           headerbar button:backdrop.flat:disabled:checked, .selection-mode
@@ -2074,21 +1978,12 @@ headerbar {
           headerbar.selection-mode button:backdrop.flat:disabled:checked,
           headerbar.selection-mode button:backdrop:disabled:active,
           headerbar.selection-mode button:backdrop:disabled:checked {
+            color: #6d99e4;
             border-color: #005af3;
             background-image: image(#1e62d6);
             box-shadow: inset 0 1px rgba(255, 255, 255, 0);
             border-color: #00348d; }
-            .selection-mode .titlebar:not(headerbar) button:backdrop.flat:disabled:active label, .selection-mode .titlebar:not(headerbar) button:backdrop.flat:disabled:checked label, .selection-mode .titlebar:not(headerbar) button:backdrop:disabled:active label, .selection-mode .titlebar:not(headerbar) button:backdrop:disabled:checked label, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled:active label, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled:checked label, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:active label, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:checked label, .selection-mode
-            headerbar button:backdrop.flat:disabled:active label, .selection-mode
-            headerbar button:backdrop.flat:disabled:checked label, .selection-mode
-            headerbar button:backdrop:disabled:active label, .selection-mode
-            headerbar button:backdrop:disabled:checked label,
-            headerbar.selection-mode button:backdrop.flat:disabled:active label,
-            headerbar.selection-mode button:backdrop.flat:disabled:checked label,
-            headerbar.selection-mode button:backdrop:disabled:active label,
-            headerbar.selection-mode button:backdrop:disabled:checked label {
-              color: #6d99e4; }
-      .selection-mode .titlebar:not(headerbar) button.flat:backdrop, .selection-mode .titlebar:not(headerbar) button.flat:disabled, .selection-mode .titlebar:not(headerbar) button.flat:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button.flat:backdrop, .selection-mode.titlebar:not(headerbar) button.flat:disabled, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled, .selection-mode
+      .selection-mode button.titlebutton:backdrop, .selection-mode button.titlebutton:disabled, .selection-mode button.titlebutton:backdrop:disabled, .selection-mode .titlebar:not(headerbar) button.flat:backdrop, .selection-mode .titlebar:not(headerbar) button.flat:disabled, .selection-mode .titlebar:not(headerbar) button.flat:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button.flat:backdrop, .selection-mode.titlebar:not(headerbar) button.flat:disabled, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled, .selection-mode
       headerbar button.flat:backdrop, .selection-mode
       headerbar button.flat:disabled, .selection-mode
       headerbar button.flat:backdrop:disabled,
@@ -2104,35 +1999,21 @@ headerbar {
       .selection-mode .titlebar:not(headerbar) button:disabled, .selection-mode.titlebar:not(headerbar) button:disabled, .selection-mode
       headerbar button:disabled,
       headerbar.selection-mode button:disabled {
+        color: #93b6f0;
         border-color: #005af3;
         background-image: image(#276ce1);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        .selection-mode .titlebar:not(headerbar) button:disabled label, .selection-mode .titlebar:not(headerbar) button:disabled, .selection-mode.titlebar:not(headerbar) button:disabled label, .selection-mode.titlebar:not(headerbar) button:disabled, .selection-mode
-        headerbar button:disabled label, .selection-mode
-        headerbar button:disabled,
-        headerbar.selection-mode button:disabled label,
-        headerbar.selection-mode button:disabled {
-          color: #93b6f0; }
         .selection-mode .titlebar:not(headerbar) button:disabled:active, .selection-mode .titlebar:not(headerbar) button:disabled:checked, .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked, .selection-mode
         headerbar button:disabled:active, .selection-mode
         headerbar button:disabled:checked,
         headerbar.selection-mode button:disabled:active,
         headerbar.selection-mode button:disabled:checked {
+          color: #a4bfeb;
           border-color: #005af3;
           background-image: image(#1c5ecd);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-          .selection-mode .titlebar:not(headerbar) button:disabled:active label, .selection-mode .titlebar:not(headerbar) button:disabled:active, .selection-mode .titlebar:not(headerbar) button:disabled:checked label, .selection-mode .titlebar:not(headerbar) button:disabled:checked, .selection-mode.titlebar:not(headerbar) button:disabled:active label, .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked label, .selection-mode.titlebar:not(headerbar) button:disabled:checked, .selection-mode
-          headerbar button:disabled:active label, .selection-mode
-          headerbar button:disabled:active, .selection-mode
-          headerbar button:disabled:checked label, .selection-mode
-          headerbar button:disabled:checked,
-          headerbar.selection-mode button:disabled:active label,
-          headerbar.selection-mode button:disabled:active,
-          headerbar.selection-mode button:disabled:checked label,
-          headerbar.selection-mode button:disabled:checked {
-            color: #a4bfeb; }
       .selection-mode .titlebar:not(headerbar) button.suggested-action, .selection-mode.titlebar:not(headerbar) button.suggested-action, .selection-mode
       headerbar button.suggested-action,
       headerbar.selection-mode button.suggested-action {
@@ -2171,48 +2052,33 @@ headerbar {
         .selection-mode .titlebar:not(headerbar) button.suggested-action:disabled, .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled, .selection-mode
         headerbar button.suggested-action:disabled,
         headerbar.selection-mode button.suggested-action:disabled {
+          color: #888a8d;
           border-color: #0d0e11;
           background-image: image(#242731);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #00348d; }
-          .selection-mode .titlebar:not(headerbar) button.suggested-action:disabled label, .selection-mode .titlebar:not(headerbar) button.suggested-action:disabled, .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled label, .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled, .selection-mode
-          headerbar button.suggested-action:disabled label, .selection-mode
-          headerbar button.suggested-action:disabled,
-          headerbar.selection-mode button.suggested-action:disabled label,
-          headerbar.selection-mode button.suggested-action:disabled {
-            color: #888a8d; }
         .selection-mode .titlebar:not(headerbar) button.suggested-action:backdrop, .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop, .selection-mode
         headerbar button.suggested-action:backdrop,
         headerbar.selection-mode button.suggested-action:backdrop {
+          color: #888a8d;
           border-color: #111217;
           background-image: image(#23252e);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #00348d; }
-          .selection-mode .titlebar:not(headerbar) button.suggested-action:backdrop label, .selection-mode .titlebar:not(headerbar) button.suggested-action:backdrop, .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop label, .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop, .selection-mode
-          headerbar button.suggested-action:backdrop label, .selection-mode
-          headerbar button.suggested-action:backdrop,
-          headerbar.selection-mode button.suggested-action:backdrop label,
-          headerbar.selection-mode button.suggested-action:backdrop {
-            color: #888a8d; }
         .selection-mode .titlebar:not(headerbar) button.suggested-action:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop:disabled, .selection-mode
         headerbar button.suggested-action:backdrop:disabled,
         headerbar.selection-mode button.suggested-action:backdrop:disabled {
+          color: #43495a;
           border-color: #111217;
           background-image: image(#242731);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #00348d; }
-          .selection-mode .titlebar:not(headerbar) button.suggested-action:backdrop:disabled label, .selection-mode .titlebar:not(headerbar) button.suggested-action:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop:disabled label, .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop:disabled, .selection-mode
-          headerbar button.suggested-action:backdrop:disabled label, .selection-mode
-          headerbar button.suggested-action:backdrop:disabled,
-          headerbar.selection-mode button.suggested-action:backdrop:disabled label,
-          headerbar.selection-mode button.suggested-action:backdrop:disabled {
-            color: #43495a; }
     .selection-mode .titlebar:not(headerbar) .selection-menu:backdrop, .selection-mode .titlebar:not(headerbar) .selection-menu, .selection-mode.titlebar:not(headerbar) .selection-menu:backdrop, .selection-mode.titlebar:not(headerbar) .selection-menu, .selection-mode
     headerbar .selection-menu:backdrop, .selection-mode
     headerbar .selection-menu,
@@ -2421,16 +2287,10 @@ window.csd > .titlebar:not(headerbar) {
   background-color: #0d0e11; }
 
 window.devel headerbar.titlebar:not(.selection-mode) {
-  background: #23252e -gtk-icontheme("system-run-symbolic") 90% 0/256px 256px no-repeat, linear-gradient(to right, transparent 65%, rgba(39, 119, 255, 0.1)), linear-gradient(to top, #13151a 3px, #181a20);
-  color: rgba(238, 238, 236, 0.1); }
-  window.devel headerbar.titlebar:not(.selection-mode) label {
-    color: #eeeeec; }
+  background: #23252e cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat, linear-gradient(to right, transparent 65%, rgba(39, 119, 255, 0.1)), linear-gradient(to top, #13151a 3px, #181a20); }
   window.devel headerbar.titlebar:not(.selection-mode):backdrop {
-    background: #23252e -gtk-icontheme("system-run-symbolic") 90% 0/256px 256px no-repeat, image(#23252e);
-    /* background-color would flash */
-    color: rgba(238, 238, 236, 0.05); }
-    window.devel headerbar.titlebar:not(.selection-mode):backdrop label {
-      color: #888a8d; }
+    background: #23252e cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat, image(#23252e);
+    /* background-color would flash */ }
 
 /************
  * Pathbars *
@@ -2754,6 +2614,9 @@ popover.background {
   .csd popover.background, popover.background {
     border: 1px solid #0d0e11;
     border-radius: 9px; }
+  .csd popover.background {
+    background-clip: padding-box;
+    border-color: rgba(13, 14, 17, 0.9); }
   popover.background:backdrop {
     background-color: #23252e;
     box-shadow: none; }
@@ -3160,32 +3023,29 @@ switch {
   switch:checked slider {
     border: 1px solid #00348d; }
   switch:disabled slider {
+    color: #888a8d;
     border-color: #0d0e11;
     background-image: image(#242731);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    switch:disabled slider label, switch:disabled slider {
-      color: #888a8d; }
   switch:backdrop slider {
     transition: 200ms ease-out;
+    color: #888a8d;
     border-color: #111217;
     background-image: image(#23252e);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    switch:backdrop slider label, switch:backdrop slider {
-      color: #888a8d; }
   switch:backdrop:checked slider {
     border-color: #00348d; }
   switch:backdrop:disabled slider {
+    color: #43495a;
     border-color: #111217;
     background-image: image(#242731);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    switch:backdrop:disabled slider label, switch:backdrop:disabled slider {
-      color: #43495a; }
 
 /*************************
  * Check and Radio items *
@@ -3640,30 +3500,27 @@ scale {
     scale slider:active {
       border-color: #00348d; }
     scale slider:disabled {
+      color: #888a8d;
       border-color: #0d0e11;
       background-image: image(#242731);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      scale slider:disabled label, scale slider:disabled {
-        color: #888a8d; }
     scale slider:backdrop {
       transition: 200ms ease-out;
+      color: #888a8d;
       border-color: #111217;
       background-image: image(#23252e);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      scale slider:backdrop label, scale slider:backdrop {
-        color: #888a8d; }
       scale slider:backdrop:disabled {
+        color: #43495a;
         border-color: #111217;
         background-image: image(#242731);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        scale slider:backdrop:disabled label, scale slider:backdrop:disabled {
-          color: #43495a; }
     row:selected scale slider:disabled, row:selected scale slider {
       border-color: #00348d; }
     .osd scale slider {
@@ -4419,6 +4276,7 @@ list {
   background-color: #272a34;
   border-color: #0d0e11; }
   list:backdrop {
+    color: #d4d5d7;
     background-color: #292c37;
     border-color: #111217; }
   list row {
@@ -4530,13 +4388,28 @@ messagedialog.csd .dialog-action-area button {
   border-left-style: solid;
   border-right-style: none;
   border-bottom-style: none; }
-  messagedialog.csd .dialog-action-area button:first-child {
+  messagedialog.csd .dialog-action-area button:first-child:not(:only-child) {
     border-left-style: none;
     border-bottom-left-radius: 7px;
-    -gtk-outline-bottom-left-radius: 5px; }
-  messagedialog.csd .dialog-action-area button:last-child {
+    -gtk-outline-bottom-left-radius: 7px;
+    -gtk-outline-top-left-radius: 0px;
+    -gtk-outline-top-right-radius: 0px;
+    -gtk-outline-bottom-right-radius: 0px; }
+  messagedialog.csd .dialog-action-area button:last-child:not(:only-child) {
     border-bottom-right-radius: 7px;
-    -gtk-outline-bottom-right-radius: 5px; }
+    -gtk-outline-bottom-right-radius: 7px;
+    -gtk-outline-top-right-radius: 0px;
+    -gtk-outline-bottom-left-radius: 0px;
+    -gtk-outline-top-left-radius: 0px; }
+  messagedialog.csd .dialog-action-area button:only-child {
+    border-top-right-radius: 0;
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 7px;
+    border-bottom-right-radius: 7px;
+    -gtk-outline-top-right-radius: 0px;
+    -gtk-outline-top-left-radius: 0px;
+    -gtk-outline-bottom-left-radius: 7px;
+    -gtk-outline-bottom-right-radius: 7px; }
 
 filechooser .dialog-action-box {
   border-top: 1px solid #0d0e11; }
@@ -4717,6 +4590,9 @@ paned.vertical > separator {
  **************/
 infobar {
   border-style: none; }
+  infobar.action:hover > revealer > box {
+    background-color: #010101;
+    border-bottom: 1px solid #181a20; }
   infobar.info, infobar.question, infobar.warning, infobar.error {
     text-shadow: none; }
     infobar.info:backdrop > revealer > box, infobar.info > revealer > box, infobar.question:backdrop > revealer > box, infobar.question > revealer > box, infobar.warning:backdrop > revealer > box, infobar.warning > revealer > box, infobar.error:backdrop > revealer > box, infobar.error > revealer > box {
@@ -4753,31 +4629,28 @@ infobar {
         text-shadow: none;
         -gtk-icon-shadow: none; }
       infobar.info button:disabled, infobar.question button:disabled, infobar.warning button:disabled, infobar.error button:disabled {
+        color: #888a8d;
         border-color: #0d0e11;
         background-image: image(#242731);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        infobar.info button:disabled label, infobar.info button:disabled, infobar.question button:disabled label, infobar.question button:disabled, infobar.warning button:disabled label, infobar.warning button:disabled, infobar.error button:disabled label, infobar.error button:disabled {
-          color: #888a8d; }
       infobar.info button:backdrop, infobar.question button:backdrop, infobar.warning button:backdrop, infobar.error button:backdrop {
+        color: #888a8d;
         border-color: #111217;
         background-image: image(#23252e);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #0d0e11; }
-        infobar.info button:backdrop label, infobar.info button:backdrop, infobar.question button:backdrop label, infobar.question button:backdrop, infobar.warning button:backdrop label, infobar.warning button:backdrop, infobar.error button:backdrop label, infobar.error button:backdrop {
-          color: #888a8d; }
         infobar.info button:backdrop:disabled, infobar.question button:backdrop:disabled, infobar.warning button:backdrop:disabled, infobar.error button:backdrop:disabled {
+          color: #43495a;
           border-color: #111217;
           background-image: image(#242731);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #0d0e11; }
-          infobar.info button:backdrop:disabled label, infobar.info button:backdrop:disabled, infobar.question button:backdrop:disabled label, infobar.question button:backdrop:disabled, infobar.warning button:backdrop:disabled label, infobar.warning button:backdrop:disabled, infobar.error button:backdrop:disabled label, infobar.error button:backdrop:disabled {
-            color: #43495a; }
       infobar.info button:backdrop label, infobar.info button:backdrop, infobar.info button label, infobar.info button, infobar.question button:backdrop label, infobar.question button:backdrop, infobar.question button label, infobar.question button, infobar.warning button:backdrop label, infobar.warning button:backdrop, infobar.warning button label, infobar.warning button, infobar.error button:backdrop label, infobar.error button:backdrop, infobar.error button label, infobar.error button {
         color: #eeeeec; }
     infobar.info selection, infobar.question selection, infobar.warning selection, infobar.error selection {
@@ -4897,13 +4770,12 @@ colorswatch#add-color-button {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 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;
       border-color: #111217;
       background-image: image(#23252e);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      colorswatch#add-color-button overlay:backdrop label, colorswatch#add-color-button overlay:backdrop {
-        color: #888a8d; }
 
 colorswatch:disabled {
   opacity: 0.5; }
@@ -5013,28 +4885,28 @@ textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical
 entry selection, modelbutton.flat:selected,
 .menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected {
   background-color: #2777ff; }
-  row:selected label, label:selected, .selection-mode button.titlebutton, .view:selected:focus, .view:selected, iconview:selected, .view text:selected, iconview text:selected,
+  label:selected, .selection-mode button.titlebutton, .view:selected:focus, .view:selected, iconview:selected, .view text:selected, iconview text:selected,
   textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection,
   textview text selection:focus,
   textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical) selection,
   entry selection, modelbutton.flat:selected,
   .menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected {
     color: #ffffff; }
-    label:disabled selection, row:selected label:disabled, label:disabled:selected, .selection-mode button.titlebutton:disabled, iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected, iconview text:disabled:selected:focus,
+    label:disabled selection, label:disabled:selected, .selection-mode button.titlebutton:disabled, iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected, iconview text:disabled:selected:focus,
     textview text:disabled:selected:focus, .view text:disabled:selected, iconview text:disabled:selected,
     textview text:disabled:selected, iconview text selection:disabled:focus, .view text selection:disabled, iconview text selection:disabled,
     textview text selection:disabled, flowbox flowboxchild:disabled:selected, spinbutton:not(.vertical) selection:disabled,
     entry selection:disabled, modelbutton.flat:disabled:selected,
     .menuitem.button.flat:disabled:selected, row:disabled:selected, calendar:disabled:selected {
       color: #93bbff; }
-    label:backdrop selection, row:selected label:backdrop, label:backdrop:selected, .selection-mode button.titlebutton:backdrop, iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected, iconview text:backdrop:selected:focus,
+    label:backdrop selection, label:backdrop:selected, .selection-mode button.titlebutton:backdrop, iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected, iconview text:backdrop:selected:focus,
     textview text:backdrop:selected:focus, .view text:backdrop:selected, iconview text:backdrop:selected,
     textview text:backdrop:selected, iconview text selection:backdrop:focus, .view text selection:backdrop, iconview text selection:backdrop,
     textview text selection:backdrop, flowbox flowboxchild:backdrop:selected, spinbutton:not(.vertical) selection:backdrop,
     entry selection:backdrop, modelbutton.flat:backdrop:selected,
     .menuitem.button.flat:backdrop:selected, row:backdrop:selected, calendar:backdrop:selected {
       color: #d4d5d7; }
-      label:backdrop selection:disabled, row:selected label:backdrop:disabled, label:backdrop:disabled:selected, .selection-mode button.titlebutton:backdrop:disabled, .view:backdrop:disabled:selected, iconview:backdrop:disabled:selected, .view text:backdrop:disabled:selected, iconview text:backdrop:disabled:selected,
+      label:backdrop selection:disabled, label:backdrop:disabled:selected, .selection-mode button.titlebutton:backdrop:disabled, .view:backdrop:disabled:selected, iconview:backdrop:disabled:selected, .view text:backdrop:disabled:selected, iconview text:backdrop:disabled:selected,
       textview text:backdrop:disabled:selected, .view text selection:backdrop:disabled, iconview text selection:backdrop:disabled,
       textview text selection:backdrop:disabled, flowbox flowboxchild:backdrop:disabled:selected, spinbutton:not(.vertical) selection:backdrop:disabled,
       entry selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected,
@@ -5333,10 +5205,10 @@ infobar, infobar.info, infobar.question, infobar.warning, infobar.error {
   infobar *:link, infobar.info *:link, infobar.question *:link, infobar.warning *:link, infobar.error *:link {
     color: #8db7ff; }
 
-infobar.info:backdrop > revealer > box, infobar.info > revealer > box {
+infobar.info:backdrop > revealer > box, infobar.info > revealer > box, infobar.info.action:hover:backdrop > revealer > box, infobar.info.action:hover > revealer > box {
   background-color: #2777ff; }
 
-infobar.info button {
+infobar.info button, infobar.info.action:hover button {
   color: #ffffff;
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #005af3;
@@ -5345,7 +5217,7 @@ infobar.info button {
   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), 0 1px 2px rgba(0, 0, 0, 0.27); }
-  infobar.info button:hover {
+  infobar.info button:hover, infobar.info.action:hover button:hover {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #005af3;
@@ -5354,7 +5226,7 @@ infobar.info button {
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.490824);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.27);
     background-image: linear-gradient(to top, #2274ff, #2c7aff 1px); }
-  infobar.info button:active, infobar.info button:checked {
+  infobar.info button:active, infobar.info button:checked, infobar.info.action:hover button:active, infobar.info.action:hover button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #005af3;
@@ -5362,39 +5234,36 @@ infobar.info button {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none; }
-  infobar.info button:disabled {
+  infobar.info button:disabled, infobar.info.action:hover button:disabled {
+    color: #93b6f0;
     border-color: #005af3;
     background-image: image(#276ce1);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    infobar.info button:disabled label, infobar.info button:disabled {
-      color: #93b6f0; }
-  infobar.info button:backdrop {
+  infobar.info button:backdrop, infobar.info.action:hover button:backdrop {
+    color: #d4e4ff;
     border-color: #005af3;
     background-image: image(#2777ff);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     border-color: #005af3; }
-    infobar.info button:backdrop label, infobar.info button:backdrop {
-      color: #d4e4ff; }
-    infobar.info button:backdrop:disabled {
+    infobar.info button:backdrop:disabled, infobar.info.action:hover button:backdrop:disabled {
+      color: #739fec;
       border-color: #005af3;
       background-image: image(#276ce1);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #005af3; }
-      infobar.info button:backdrop:disabled label, infobar.info button:backdrop:disabled {
-        color: #739fec; }
-  infobar.info button:backdrop label, infobar.info button:backdrop, infobar.info button label, infobar.info button {
+  infobar.info button:backdrop label, infobar.info button:backdrop, infobar.info button label, infobar.info button, infobar.info.action:hover button:backdrop label, infobar.info.action:hover button:backdrop, infobar.info.action:hover button label, infobar.info.action:hover button {
     color: #ffffff; }
 
-infobar.question:backdrop > revealer > box, infobar.question > revealer > box, infobar.warning:backdrop > revealer > box, infobar.warning > revealer > box {
+infobar.question:backdrop > revealer > box, infobar.question > revealer > box, infobar.warning:backdrop > revealer > box, infobar.warning > revealer > box, infobar.question.action:hover:backdrop > revealer > box, infobar.question.action:hover > revealer > box, infobar.warning.action:hover:backdrop > revealer > box, infobar.warning.action:hover > revealer > box {
   background-color: #fd7d00; }
 
-infobar.question button, infobar.warning button {
+infobar.question button, infobar.warning button, infobar.question.action:hover button, infobar.warning.action:hover button {
   color: #ffffff;
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #ca6400;
@@ -5403,7 +5272,7 @@ infobar.question button, infobar.warning button {
   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), 0 1px 2px rgba(0, 0, 0, 0.27); }
-  infobar.question button:hover, infobar.warning button:hover {
+  infobar.question button:hover, infobar.warning button:hover, infobar.question.action:hover button:hover, infobar.warning.action:hover button:hover {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #ca6400;
@@ -5412,7 +5281,7 @@ infobar.question button, infobar.warning button {
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.555137);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.27);
     background-image: linear-gradient(to top, #f87a00, #ff8003 1px); }
-  infobar.question button:active, infobar.question button:checked, infobar.warning button:active, infobar.warning button:checked {
+  infobar.question button:active, infobar.question button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.question.action:hover button:active, infobar.question.action:hover button:checked, infobar.warning.action:hover button:active, infobar.warning.action:hover button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #ca6400;
@@ -5420,38 +5289,35 @@ infobar.question button, infobar.warning button {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none; }
-  infobar.question button:disabled, infobar.warning button:disabled {
+  infobar.question button:disabled, infobar.warning button:disabled, infobar.question.action:hover button:disabled, infobar.warning.action:hover button:disabled {
+    color: #eeb884;
     border-color: #ca6400;
     background-image: image(#dd7108);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    infobar.question button:disabled label, infobar.question button:disabled, infobar.warning button:disabled label, infobar.warning button:disabled {
-      color: #eeb884; }
-  infobar.question button:backdrop, infobar.warning button:backdrop {
+  infobar.question button:backdrop, infobar.warning button:backdrop, infobar.question.action:hover button:backdrop, infobar.warning.action:hover button:backdrop {
+    color: #ffe5cc;
     border-color: #ca6400;
     background-image: image(#fd7d00);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     border-color: #ca6400; }
-    infobar.question button:backdrop label, infobar.question button:backdrop, infobar.warning button:backdrop label, infobar.warning button:backdrop {
-      color: #ffe5cc; }
-    infobar.question button:backdrop:disabled, infobar.warning button:backdrop:disabled {
+    infobar.question button:backdrop:disabled, infobar.warning button:backdrop:disabled, infobar.question.action:hover button:backdrop:disabled, infobar.warning.action:hover button:backdrop:disabled {
+      color: #e9a35e;
       border-color: #ca6400;
       background-image: image(#dd7108);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #ca6400; }
-      infobar.question button:backdrop:disabled label, infobar.question button:backdrop:disabled, infobar.warning button:backdrop:disabled label, infobar.warning button:backdrop:disabled {
-        color: #e9a35e; }
-  infobar.question button:backdrop label, infobar.question button:backdrop, infobar.question button label, infobar.question button, infobar.warning button:backdrop label, infobar.warning button:backdrop, infobar.warning button label, infobar.warning button {
+  infobar.question button:backdrop label, infobar.question button:backdrop, infobar.question button label, infobar.question button, infobar.warning button:backdrop label, infobar.warning button:backdrop, infobar.warning button label, infobar.warning button, infobar.question.action:hover button:backdrop label, infobar.question.action:hover button:backdrop, infobar.question.action:hover button label, infobar.question.action:hover button, infobar.warning.action:hover button:backdrop label, infobar.warning.action:hover button:backdrop, infobar.warning.action:hover button label, infobar.warning.action:hover button {
     color: #ffffff; }
 
-infobar.error:backdrop > revealer > box, infobar.error > revealer > box {
+infobar.error:backdrop > revealer > box, infobar.error > revealer > box, infobar.error.action:hover:backdrop > revealer > box, infobar.error.action:hover > revealer > box {
   background-color: #bf1717; }
-  infobar.error:backdrop > revealer > box button, infobar.error > revealer > box button {
+  infobar.error:backdrop > revealer > box button, infobar.error > revealer > box button, infobar.error.action:hover:backdrop > revealer > box button, infobar.error.action:hover > revealer > box button {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #911212;
@@ -5460,7 +5326,7 @@ infobar.error:backdrop > revealer > box, infobar.error > revealer > box {
     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), 0 1px 2px rgba(0, 0, 0, 0.27); }
-    infobar.error:backdrop > revealer > box button:hover, infobar.error > revealer > box button:hover {
+    infobar.error:backdrop > revealer > box button:hover, infobar.error > revealer > box button:hover, infobar.error.action:hover:backdrop > revealer > box button:hover, infobar.error.action:hover > revealer > box button:hover {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #911212;
@@ -5469,7 +5335,7 @@ infobar.error:backdrop > revealer > box, infobar.error > revealer > box {
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.616314);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 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: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;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #911212;
@@ -5477,33 +5343,30 @@ infobar.error:backdrop > revealer > box, infobar.error > revealer > box {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       text-shadow: none;
       -gtk-icon-shadow: none; }
-    infobar.error:backdrop > revealer > box button:disabled, infobar.error > revealer > box button:disabled {
+    infobar.error:backdrop > revealer > box button:disabled, infobar.error > revealer > box button:disabled, infobar.error.action:hover:backdrop > revealer > box button:disabled, infobar.error.action:hover > revealer > box button:disabled {
+      color: #d48d8d;
       border-color: #911212;
       background-image: image(#a81a1b);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      infobar.error:backdrop > revealer > box button:disabled label, infobar.error:backdrop > revealer > box button:disabled, infobar.error > revealer > box button:disabled label, infobar.error > revealer > box button:disabled {
-        color: #d48d8d; }
-    infobar.error:backdrop > revealer > box button:backdrop, infobar.error > revealer > box button:backdrop {
+    infobar.error:backdrop > revealer > box button:backdrop, infobar.error > revealer > box button:backdrop, infobar.error.action:hover:backdrop > revealer > box button:backdrop, infobar.error.action:hover > revealer > box button:backdrop {
+      color: #f2d1d1;
       border-color: #911212;
       background-image: image(#bf1717);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #911212; }
-      infobar.error:backdrop > revealer > box button:backdrop label, infobar.error:backdrop > revealer > box button:backdrop, infobar.error > revealer > box button:backdrop label, infobar.error > revealer > box button:backdrop {
-        color: #f2d1d1; }
-      infobar.error:backdrop > revealer > box button:backdrop:disabled, infobar.error > revealer > box button:backdrop:disabled {
+      infobar.error:backdrop > revealer > box button:backdrop:disabled, infobar.error > revealer > box button:backdrop:disabled, infobar.error.action:hover:backdrop > revealer > box button:backdrop:disabled, infobar.error.action:hover > revealer > box button:backdrop:disabled {
+        color: #c66a6b;
         border-color: #911212;
         background-image: image(#a81a1b);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #911212; }
-        infobar.error:backdrop > revealer > box button:backdrop:disabled label, infobar.error:backdrop > revealer > box button:backdrop:disabled, infobar.error > revealer > box button:backdrop:disabled label, infobar.error > revealer > box button:backdrop:disabled {
-          color: #c66a6b; }
-    infobar.error:backdrop > revealer > box button:backdrop label, infobar.error:backdrop > revealer > box button:backdrop, infobar.error:backdrop > revealer > box button label, infobar.error:backdrop > revealer > box button, infobar.error > revealer > box button:backdrop label, infobar.error > revealer > box button:backdrop, infobar.error > revealer > box button label, infobar.error > revealer > box button {
+    infobar.error:backdrop > revealer > box button:backdrop label, infobar.error:backdrop > revealer > box button:backdrop, infobar.error:backdrop > revealer > box button label, infobar.error:backdrop > revealer > box button, infobar.error > revealer > box button:backdrop label, infobar.error > revealer > box button:backdrop, infobar.error > revealer > box button label, infobar.error > revealer > box button, infobar.error.action:hover:backdrop > revealer > box button:backdrop label, infobar.error.action:hover:backdrop > revealer > box button:backdrop, infobar.error.action:hover:backdrop > revealer > box button label, infobar.error.action:hover:backdrop > revealer > box button, infobar.error.action:hover > revealer > box button:backdrop label, infobar.error.action:hover > revealer > box button:backdrop, infobar.error.action:hover > revealer > box button label, infobar.error.action:hover > revealer > box button {
       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 404d4c52..298491cb 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
@@ -120,19 +120,17 @@ flowbox flowboxchild {
 
 label {
   caret-color: currentColor; }
-  label.separator {
-    color: #eeeeec; }
-    label.separator:backdrop {
-      color: #888a8d; }
   label selection {
     background-color: #2777ff;
     color: #ffffff; }
   label:disabled {
     color: #888a8d; }
+    button label:disabled {
+      color: inherit; }
     label:disabled:backdrop {
       color: #43495a; }
-  label:backdrop {
-    color: #888a8d; }
+      button label:disabled:backdrop {
+        color: inherit; }
 
 .dim-label, label.separator, .titlebar:not(headerbar) .subtitle,
 headerbar .subtitle {
@@ -188,6 +186,46 @@ spinner {
     spinner:checked:disabled {
       opacity: 0.5; }
 
+/**********************
+ * General Typography *
+ **********************/
+.large-title {
+  font-weight: 300;
+  font-size: 24pt;
+  letter-spacing: 0.2rem; }
+
+.title-1 {
+  font-weight: 800;
+  font-size: 20pt; }
+
+.title-2 {
+  font-weight: 800;
+  font-size: 15pt; }
+
+.title-3 {
+  font-weight: 700;
+  font-size: 15pt; }
+
+.title-4 {
+  font-weight: 700;
+  font-size: 13pt; }
+
+.heading {
+  font-weight: 700;
+  font-size: 11pt; }
+
+.body {
+  font-weight: 400;
+  font-size: 11pt; }
+
+.caption-heading {
+  font-weight: 700;
+  font-size: 9pt; }
+
+.caption {
+  font-weight: 400;
+  font-size: 9pt; }
+
 /****************
  * Text Entries *
  ****************/
@@ -542,6 +580,7 @@ button {
   notebook > header > tabs > arrow:backdrop.flat, button:backdrop.flat.titlebutton, notebook > header > tabs > arrow:backdrop, button.titlebutton:backdrop,
   button:backdrop.flat,
   button:backdrop {
+    color: #888a8d;
     border-color: #111217;
     background-image: image(#23252e);
     text-shadow: none;
@@ -549,59 +588,34 @@ button {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     transition: 200ms ease-out;
     -gtk-icon-effect: none; }
-    notebook > header > tabs > arrow:backdrop.flat label, button:backdrop.flat.titlebutton label, notebook > header > tabs > arrow:backdrop.flat, button:backdrop.flat.titlebutton, notebook > header > tabs > arrow:backdrop label, button.titlebutton:backdrop label, notebook > header > tabs > arrow:backdrop, button.titlebutton:backdrop,
-    button:backdrop.flat label,
-    button:backdrop.flat,
-    button:backdrop label,
-    button:backdrop {
-      color: #888a8d; }
     notebook > header > tabs > arrow:backdrop.flat:active, button:backdrop.flat.titlebutton:active, notebook > header > tabs > arrow:backdrop.flat:checked, button:backdrop.flat.titlebutton:checked, notebook > header > tabs > arrow:backdrop:active, button.titlebutton:backdrop:active, notebook > header > tabs > arrow:backdrop:checked, button.titlebutton:backdrop:checked,
     button:backdrop.flat:active,
     button:backdrop.flat:checked,
     button:backdrop:active,
     button:backdrop:checked {
+      color: #888a8d;
       border-color: #111217;
       background-image: image(#1a1d23);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      notebook > header > tabs > arrow:backdrop.flat:active label, button:backdrop.flat.titlebutton:active label, notebook > header > tabs > arrow:backdrop.flat:active, button:backdrop.flat.titlebutton:active, notebook > header > tabs > arrow:backdrop.flat:checked label, button:backdrop.flat.titlebutton:checked label, notebook > header > tabs > arrow:backdrop.flat:checked, button:backdrop.flat.titlebutton:checked, notebook > header > tabs > arrow:backdrop:active label, button.titlebutton:backdrop:active label, notebook > header > tabs > arrow:backdrop:active, button.titlebutton:backdrop:active, notebook > header > tabs > arrow:backdrop:checked label, button.titlebutton:backdrop:checked label, notebook > header > tabs > arrow:backdrop:checked, button.titlebutton:backdrop:checked,
-      button:backdrop.flat:active label,
-      button:backdrop.flat:active,
-      button:backdrop.flat:checked label,
-      button:backdrop.flat:checked,
-      button:backdrop:active label,
-      button:backdrop:active,
-      button:backdrop:checked label,
-      button:backdrop:checked {
-        color: #888a8d; }
     notebook > header > tabs > arrow:backdrop.flat:disabled, button:backdrop.flat.titlebutton:disabled, notebook > header > tabs > arrow:backdrop:disabled, button.titlebutton:backdrop:disabled,
     button:backdrop.flat:disabled,
     button:backdrop:disabled {
+      color: #43495a;
       border-color: #111217;
       background-image: image(#242731);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      notebook > header > tabs > arrow:backdrop.flat:disabled label, button:backdrop.flat.titlebutton:disabled label, notebook > header > tabs > arrow:backdrop.flat:disabled, button:backdrop.flat.titlebutton:disabled, notebook > header > tabs > arrow:backdrop:disabled label, button.titlebutton:backdrop:disabled label, notebook > header > tabs > arrow:backdrop:disabled, button.titlebutton:backdrop:disabled,
-      button:backdrop.flat:disabled label,
-      button:backdrop.flat:disabled,
-      button:backdrop:disabled label,
-      button:backdrop:disabled {
-        color: #43495a; }
       notebook > header > tabs > arrow:backdrop.flat:disabled:active, button:backdrop.flat.titlebutton:disabled:active, notebook > header > tabs > arrow:backdrop.flat:disabled:checked, button:backdrop.flat.titlebutton:disabled:checked, notebook > header > tabs > arrow:backdrop:disabled:active, button.titlebutton:backdrop:disabled:active, notebook > header > tabs > arrow:backdrop:disabled:checked, button.titlebutton:backdrop:disabled:checked,
       button:backdrop.flat:disabled:active,
       button:backdrop.flat:disabled:checked,
       button:backdrop:disabled:active,
       button:backdrop:disabled:checked {
+        color: #43495a;
         border-color: #111217;
         background-image: image(#1a1d23);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        notebook > header > tabs > arrow:backdrop.flat:disabled:active label, button:backdrop.flat.titlebutton:disabled:active label, notebook > header > tabs > arrow:backdrop.flat:disabled:checked label, button:backdrop.flat.titlebutton:disabled:checked label, notebook > header > tabs > arrow:backdrop:disabled:active label, button.titlebutton:backdrop:disabled:active label, notebook > header > tabs > arrow:backdrop:disabled:checked label, button.titlebutton:backdrop:disabled:checked label,
-        button:backdrop.flat:disabled:active label,
-        button:backdrop.flat:disabled:checked label,
-        button:backdrop:disabled:active label,
-        button:backdrop:disabled:checked label {
-          color: #43495a; }
-  notebook > header > tabs > arrow.flat:backdrop, button.flat.titlebutton:backdrop, notebook > header > tabs > arrow.flat:disabled, button.flat.titlebutton:disabled, notebook > header > tabs > arrow.flat:backdrop:disabled, button.flat.titlebutton:backdrop:disabled,
+  notebook > header > tabs > arrow:backdrop, button.sidebar-button:backdrop, button.titlebutton:backdrop, notebook > header > tabs > arrow:disabled, button.sidebar-button:disabled, button.titlebutton:disabled, notebook > header > tabs > arrow:backdrop:disabled, button.sidebar-button:backdrop:disabled, button.titlebutton:backdrop:disabled, notebook > header > tabs > arrow.flat:backdrop, button.flat.titlebutton:backdrop, notebook > header > tabs > arrow.flat:disabled, button.flat.titlebutton:disabled, notebook > header > tabs > arrow.flat:backdrop:disabled, button.flat.titlebutton:backdrop:disabled,
   button.flat:backdrop,
   button.flat:disabled,
   button.flat:backdrop:disabled {
@@ -613,27 +627,19 @@ button {
     -gtk-icon-shadow: none; }
   notebook > header > tabs > arrow:disabled, button.titlebutton:disabled,
   button:disabled {
+    color: #888a8d;
     border-color: #0d0e11;
     background-image: image(#242731);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    notebook > header > tabs > arrow:disabled label, button.titlebutton:disabled label, notebook > header > tabs > arrow:disabled, button.titlebutton:disabled,
-    button:disabled label,
-    button:disabled {
-      color: #888a8d; }
     notebook > header > tabs > arrow:disabled:active, button.titlebutton:disabled:active, notebook > header > tabs > arrow:disabled:checked, button.titlebutton:disabled:checked,
     button:disabled:active,
     button:disabled:checked {
+      color: #888a8d;
       border-color: #0d0e11;
       background-image: image(#16181d);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      notebook > header > tabs > arrow:disabled:active label, button.titlebutton:disabled:active label, notebook > header > tabs > arrow:disabled:active, button.titlebutton:disabled:active, notebook > header > tabs > arrow:disabled:checked label, button.titlebutton:disabled:checked label, notebook > header > tabs > arrow:disabled:checked, button.titlebutton:disabled:checked,
-      button:disabled:active label,
-      button:disabled:active,
-      button:disabled:checked label,
-      button:disabled:checked {
-        color: #888a8d; }
   notebook > header > tabs > arrow.image-button, button.image-button.titlebutton,
   button.image-button {
     min-width: 24px;
@@ -875,7 +881,7 @@ button.suggested-action {
   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), 0 1px 2px rgba(0, 0, 0, 0.27); }
-  .selection-mode button.titlebutton,
+  
   button.suggested-action.flat {
     border-color: transparent;
     background-color: transparent;
@@ -904,67 +910,43 @@ button.suggested-action {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none; }
-  .selection-mode button.titlebutton:backdrop,
+  
   button.suggested-action:backdrop,
   button.suggested-action.flat:backdrop {
+    color: #d4e4ff;
     border-color: #005af3;
     background-image: image(#2777ff);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    .selection-mode button.titlebutton:backdrop label, .selection-mode button.titlebutton:backdrop,
-    button.suggested-action:backdrop label,
-    button.suggested-action:backdrop,
-    button.suggested-action.flat:backdrop label,
-    button.suggested-action.flat:backdrop {
-      color: #d4e4ff; }
-    .selection-mode button.titlebutton:backdrop:active, .selection-mode button.titlebutton:backdrop:checked,
+    
     button.suggested-action:backdrop:active,
     button.suggested-action:backdrop:checked,
     button.suggested-action.flat:backdrop:active,
     button.suggested-action.flat:backdrop:checked {
+      color: #d2e0f7;
       border-color: #005af3;
       background-image: image(#1e62d6);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .selection-mode button.titlebutton:backdrop:active label, .selection-mode button.titlebutton:backdrop:active, .selection-mode button.titlebutton:backdrop:checked label, .selection-mode button.titlebutton:backdrop:checked,
-      button.suggested-action:backdrop:active label,
-      button.suggested-action:backdrop:active,
-      button.suggested-action:backdrop:checked label,
-      button.suggested-action:backdrop:checked,
-      button.suggested-action.flat:backdrop:active label,
-      button.suggested-action.flat:backdrop:active,
-      button.suggested-action.flat:backdrop:checked label,
-      button.suggested-action.flat:backdrop:checked {
-        color: #d2e0f7; }
-    .selection-mode button.titlebutton:backdrop:disabled,
+    
     button.suggested-action:backdrop:disabled,
     button.suggested-action.flat:backdrop:disabled {
+      color: #43495a;
       border-color: #111217;
       background-image: image(#242731);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .selection-mode button.titlebutton:backdrop:disabled label, .selection-mode button.titlebutton:backdrop:disabled,
-      button.suggested-action:backdrop:disabled label,
-      button.suggested-action:backdrop:disabled,
-      button.suggested-action.flat:backdrop:disabled label,
-      button.suggested-action.flat:backdrop:disabled {
-        color: #43495a; }
-      .selection-mode button.titlebutton:backdrop:disabled:active, .selection-mode button.titlebutton:backdrop:disabled:checked,
+      
       button.suggested-action:backdrop:disabled:active,
       button.suggested-action:backdrop:disabled:checked,
       button.suggested-action.flat:backdrop:disabled:active,
       button.suggested-action.flat:backdrop:disabled:checked {
+        color: #6d99e4;
         border-color: #005af3;
         background-image: image(#1e62d6);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        .selection-mode button.titlebutton:backdrop:disabled:active label, .selection-mode button.titlebutton:backdrop:disabled:checked label,
-        button.suggested-action:backdrop:disabled:active label,
-        button.suggested-action:backdrop:disabled:checked label,
-        button.suggested-action.flat:backdrop:disabled:active label,
-        button.suggested-action.flat:backdrop:disabled:checked label {
-          color: #6d99e4; }
-  .selection-mode button.titlebutton:backdrop, .selection-mode button.titlebutton:disabled, .selection-mode button.titlebutton:backdrop:disabled,
+  
   button.suggested-action.flat:backdrop,
   button.suggested-action.flat:disabled,
   button.suggested-action.flat:backdrop:disabled {
@@ -977,27 +959,19 @@ button.suggested-action {
     color: rgba(39, 119, 255, 0.8); }
   
   button.suggested-action:disabled {
+    color: #888a8d;
     border-color: #0d0e11;
     background-image: image(#242731);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     
-    button.suggested-action:disabled label,
-    button.suggested-action:disabled {
-      color: #888a8d; }
-    
     button.suggested-action:disabled:active,
     button.suggested-action:disabled:checked {
+      color: #a4bfeb;
       border-color: #005af3;
       background-image: image(#1c5ecd);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      
-      button.suggested-action:disabled:active label,
-      button.suggested-action:disabled:active,
-      button.suggested-action:disabled:checked label,
-      button.suggested-action:disabled:checked {
-        color: #a4bfeb; }
   .osd
   button.suggested-action {
     color: #eeeeec;
@@ -1098,63 +1072,39 @@ button.destructive-action {
   
   button.destructive-action:backdrop,
   button.destructive-action.flat:backdrop {
+    color: #edd0d0;
     border-color: #790e0e;
     background-image: image(#a61414);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     
-    button.destructive-action:backdrop label,
-    button.destructive-action:backdrop,
-    button.destructive-action.flat:backdrop label,
-    button.destructive-action.flat:backdrop {
-      color: #edd0d0; }
-    
     button.destructive-action:backdrop:active,
     button.destructive-action:backdrop:checked,
     button.destructive-action.flat:backdrop:active,
     button.destructive-action.flat:backdrop:checked {
+      color: #e6d0d0;
       border-color: #790e0e;
       background-image: image(#811415);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      
-      button.destructive-action:backdrop:active label,
-      button.destructive-action:backdrop:active,
-      button.destructive-action:backdrop:checked label,
-      button.destructive-action:backdrop:checked,
-      button.destructive-action.flat:backdrop:active label,
-      button.destructive-action.flat:backdrop:active,
-      button.destructive-action.flat:backdrop:checked label,
-      button.destructive-action.flat:backdrop:checked {
-        color: #e6d0d0; }
     
     button.destructive-action:backdrop:disabled,
     button.destructive-action.flat:backdrop:disabled {
+      color: #43495a;
       border-color: #111217;
       background-image: image(#242731);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       
-      button.destructive-action:backdrop:disabled label,
-      button.destructive-action:backdrop:disabled,
-      button.destructive-action.flat:backdrop:disabled label,
-      button.destructive-action.flat:backdrop:disabled {
-        color: #43495a; }
-      
       button.destructive-action:backdrop:disabled:active,
       button.destructive-action:backdrop:disabled:checked,
       button.destructive-action.flat:backdrop:disabled:active,
       button.destructive-action.flat:backdrop:disabled:checked {
+        color: #ad6667;
         border-color: #790e0e;
         background-image: image(#811415);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        
-        button.destructive-action:backdrop:disabled:active label,
-        button.destructive-action:backdrop:disabled:checked label,
-        button.destructive-action.flat:backdrop:disabled:active label,
-        button.destructive-action.flat:backdrop:disabled:checked label {
-          color: #ad6667; }
   
   button.destructive-action.flat:backdrop,
   button.destructive-action.flat:disabled,
@@ -1168,27 +1118,19 @@ button.destructive-action {
     color: rgba(166, 20, 20, 0.8); }
   
   button.destructive-action:disabled {
+    color: #888a8d;
     border-color: #0d0e11;
     background-image: image(#242731);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     
-    button.destructive-action:disabled label,
-    button.destructive-action:disabled {
-      color: #888a8d; }
-    
     button.destructive-action:disabled:active,
     button.destructive-action:disabled:checked {
+      color: #c9a1a1;
       border-color: #790e0e;
       background-image: image(#791314);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      
-      button.destructive-action:disabled:active label,
-      button.destructive-action:disabled:active,
-      button.destructive-action:disabled:checked label,
-      button.destructive-action:disabled:checked {
-        color: #c9a1a1; }
   .osd
   button.destructive-action {
     color: #eeeeec;
@@ -1374,47 +1316,41 @@ button.circular {
     text-shadow: none;
     -gtk-icon-shadow: none; }
   .inline-toolbar toolbutton > button:disabled {
+    color: #888a8d;
     border-color: #0d0e11;
     background-image: image(#242731);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
-      color: #888a8d; }
     .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked {
+      color: #888a8d;
       border-color: #0d0e11;
       background-image: image(#16181d);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .inline-toolbar toolbutton > button:disabled:active label, .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked label, .inline-toolbar toolbutton > button:disabled:checked {
-        color: #888a8d; }
   .inline-toolbar toolbutton > button:backdrop {
+    color: #888a8d;
     border-color: #111217;
     background-image: image(#23252e);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    .inline-toolbar toolbutton > button:backdrop label, .inline-toolbar toolbutton > button:backdrop {
-      color: #888a8d; }
     .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked {
+      color: #888a8d;
       border-color: #111217;
       background-image: image(#1a1d23);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .inline-toolbar toolbutton > button:backdrop:active label, .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked label, .inline-toolbar toolbutton > button:backdrop:checked {
-        color: #888a8d; }
     .inline-toolbar toolbutton > button:backdrop:disabled {
+      color: #43495a;
       border-color: #111217;
       background-image: image(#242731);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .inline-toolbar toolbutton > button:backdrop:disabled label, .inline-toolbar toolbutton > button:backdrop:disabled {
-        color: #43495a; }
       .inline-toolbar toolbutton > button:backdrop:disabled:active, .inline-toolbar toolbutton > button:backdrop:disabled:checked {
+        color: #43495a;
         border-color: #111217;
         background-image: image(#1a1d23);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        .inline-toolbar toolbutton > button:backdrop:disabled:active label, .inline-toolbar toolbutton > button:backdrop:disabled:checked label {
-          color: #43495a; }
 
 toolbar.inline-toolbar toolbutton > button.flat,
 toolbar.inline-toolbar toolbutton:backdrop > button.flat, .linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, .inline-toolbar button, .inline-toolbar button:backdrop, .linked > button,
@@ -1423,7 +1359,8 @@ toolbar.inline-toolbar toolbutton:backdrop > button.flat, .linked:not(.vertical)
 .linked > button:checked,
 .linked > button:backdrop, filechooser .path-bar.linked > button, .linked > combobox > box > button.combo:dir(ltr), .linked > combobox > box > button.combo:dir(rtl) {
   border-radius: 0;
-  border-right-style: none; }
+  border-right-style: none;
+  -gtk-outline-radius: 0; }
 
 toolbar.inline-toolbar toolbutton:first-child > button.flat,
 toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat, .linked:not(.vertical) > spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked > button:first-child, filechooser .path-bar.linked > button:first-child:dir(ltr), filechooser .path-bar.linked > button:last-child:dir(rtl), combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > button.combo {
@@ -1431,7 +1368,11 @@ toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat, .linked:no
   border-bottom-left-radius: 5px;
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
-  border-right-style: none; }
+  border-right-style: none;
+  -gtk-outline-bottom-left-radius: 5px;
+  -gtk-outline-top-left-radius: 5px;
+  -gtk-outline-top-right-radius: 0;
+  -gtk-outline-bottom-right-radius: 0; }
 
 toolbar.inline-toolbar toolbutton:last-child > button.flat,
 toolbar.inline-toolbar toolbutton:backdrop:last-child > button.flat, .linked:not(.vertical) > spinbutton:last-child:not(.vertical), .linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked > button:last-child, filechooser .path-bar.linked > button:last-child:dir(ltr), filechooser .path-bar.linked > button:first-child:dir(rtl), combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > box > button.combo {
@@ -1439,12 +1380,17 @@ toolbar.inline-toolbar toolbutton:backdrop:last-child > button.flat, .linked:not
   border-bottom-left-radius: 0;
   border-top-right-radius: 5px;
   border-bottom-right-radius: 5px;
-  border-right-style: solid; }
+  border-right-style: solid;
+  -gtk-outline-bottom-right-radius: 5px;
+  -gtk-outline-top-right-radius: 5px;
+  -gtk-outline-bottom-left-radius: 0;
+  -gtk-outline-top-left-radius: 0; }
 
 toolbar.inline-toolbar toolbutton:only-child > button.flat,
 toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat, .linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .linked > button:only-child, filechooser .path-bar.linked > button:only-child, .linked:not(.vertical) > combobox:only-child > box > button.combo {
   border-radius: 5px;
-  border-style: solid; }
+  border-style: solid;
+  -gtk-outline-radius: 5px; }
 
 .linked.vertical > spinbutton:not(.vertical), .linked.vertical > entry, .linked.vertical > button,
 .linked.vertical > button:hover,
@@ -1547,7 +1493,7 @@ button:visited > label,
     *:selected button:visited, *:selected button:link > label:visited,
     *:selected button:visited > label:visited, *:selected
     *:link:visited {
-      color: #a9c9ff; }
+      color: #bdd5ff; }
   button:hover:link,
   button:hover:visited, button:link > label:hover,
   button:visited > label:hover,
@@ -1557,7 +1503,7 @@ button:visited > label,
     *:selected button:hover:visited, *:selected button:link > label:hover,
     *:selected button:visited > label:hover, *:selected
     *:link:hover {
-      color: #e9f1ff; }
+      color: #f9fbff; }
   button:active:link,
   button:active:visited, button:link > label:active,
   button:visited > label:active,
@@ -1567,7 +1513,7 @@ button:visited > label,
     *:selected button:active:visited, *:selected button:link > label:active,
     *:selected button:visited > label:active, *:selected
     *:link:active {
-      color: #d4e4ff; }
+      color: #e8f1ff; }
   button:disabled:link,
   button:disabled:visited, button:link > label:disabled,
   button:visited > label:disabled, button:disabled:backdrop:link,
@@ -1586,7 +1532,7 @@ button:visited > label,
   *:link:backdrop:backdrop:hover,
   *:link:backdrop:backdrop:hover:selected,
   *:link:backdrop {
-    color: #2777ff; }
+    color: rgba(141, 183, 255, 0.9); }
   .selection-mode .titlebar:not(headerbar) .subtitle:link, .selection-mode.titlebar:not(headerbar) .subtitle:link, .selection-mode headerbar .subtitle:link,
   headerbar.selection-mode .subtitle:link, button:selected:link,
   button:selected:visited, button:link > label:selected,
@@ -1598,7 +1544,7 @@ button:visited > label,
   *:link:selected,
   *:selected
   *:link {
-    color: #d4e4ff; }
+    color: #e8f1ff; }
 
 button:link,
 button:visited {
@@ -1914,17 +1860,10 @@ headerbar {
     .titlebar:not(headerbar) button.toggle:checked:backdrop,
     headerbar stackswitcher button:checked:backdrop,
     headerbar button.toggle:checked:backdrop {
+      color: #888a8d;
       border-color: #111217;
       background-image: image(#1a1d23);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .titlebar:not(headerbar) stackswitcher button:checked:backdrop label, .titlebar:not(headerbar) stackswitcher button:checked:backdrop,
-      .titlebar:not(headerbar) button.toggle:checked:backdrop label,
-      .titlebar:not(headerbar) button.toggle:checked:backdrop,
-      headerbar stackswitcher button:checked:backdrop label,
-      headerbar stackswitcher button:checked:backdrop,
-      headerbar button.toggle:checked:backdrop label,
-      headerbar button.toggle:checked:backdrop {
-        color: #888a8d; }
   .selection-mode .titlebar:not(headerbar), .selection-mode.titlebar:not(headerbar), .selection-mode
   headerbar,
   headerbar.selection-mode {
@@ -1955,7 +1894,7 @@ headerbar {
       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), 0 1px 2px rgba(0, 0, 0, 0.27); }
-      .selection-mode .titlebar:not(headerbar) button.flat, .selection-mode.titlebar:not(headerbar) button.flat, .selection-mode
+      .selection-mode button.titlebutton, .selection-mode .titlebar:not(headerbar) button.flat, .selection-mode.titlebar:not(headerbar) button.flat, .selection-mode
       headerbar button.flat,
       headerbar.selection-mode button.flat {
         border-color: transparent;
@@ -1996,6 +1935,7 @@ headerbar {
       headerbar button:backdrop,
       headerbar.selection-mode button:backdrop.flat,
       headerbar.selection-mode button:backdrop {
+        color: #d4e4ff;
         border-color: #005af3;
         background-image: image(#2777ff);
         text-shadow: none;
@@ -2003,16 +1943,6 @@ headerbar {
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         -gtk-icon-effect: none;
         border-color: #00348d; }
-        .selection-mode .titlebar:not(headerbar) button:backdrop.flat label, .selection-mode .titlebar:not(headerbar) button:backdrop.flat, .selection-mode .titlebar:not(headerbar) button:backdrop label, .selection-mode .titlebar:not(headerbar) button:backdrop, .selection-mode.titlebar:not(headerbar) button:backdrop.flat label, .selection-mode.titlebar:not(headerbar) button:backdrop.flat, .selection-mode.titlebar:not(headerbar) button:backdrop label, .selection-mode.titlebar:not(headerbar) button:backdrop, .selection-mode
-        headerbar button:backdrop.flat label, .selection-mode
-        headerbar button:backdrop.flat, .selection-mode
-        headerbar button:backdrop label, .selection-mode
-        headerbar button:backdrop,
-        headerbar.selection-mode button:backdrop.flat label,
-        headerbar.selection-mode button:backdrop.flat,
-        headerbar.selection-mode button:backdrop label,
-        headerbar.selection-mode button:backdrop {
-          color: #d4e4ff; }
         .selection-mode .titlebar:not(headerbar) button:backdrop.flat:active, .selection-mode .titlebar:not(headerbar) button:backdrop.flat:checked, .selection-mode .titlebar:not(headerbar) button:backdrop:active, .selection-mode .titlebar:not(headerbar) button:backdrop:checked, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:active, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:active, .selection-mode.titlebar:not(headerbar) button:backdrop:checked, .selection-mode
         headerbar button:backdrop.flat:active, .selection-mode
         headerbar button:backdrop.flat:checked, .selection-mode
@@ -2022,49 +1952,23 @@ headerbar {
         headerbar.selection-mode button:backdrop.flat:checked,
         headerbar.selection-mode button:backdrop:active,
         headerbar.selection-mode button:backdrop:checked {
+          color: #d2e0f7;
           border-color: #005af3;
           background-image: image(#1e62d6);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #00348d; }
-          .selection-mode .titlebar:not(headerbar) button:backdrop.flat:active label, .selection-mode .titlebar:not(headerbar) button:backdrop.flat:active, .selection-mode .titlebar:not(headerbar) button:backdrop.flat:checked label, .selection-mode .titlebar:not(headerbar) button:backdrop.flat:checked, .selection-mode .titlebar:not(headerbar) button:backdrop:active label, .selection-mode .titlebar:not(headerbar) button:backdrop:active, .selection-mode .titlebar:not(headerbar) button:backdrop:checked label, .selection-mode .titlebar:not(headerbar) button:backdrop:checked, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:active label, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:active, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:checked label, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:active label, .selection-mode.titlebar:not(headerbar) button:backdrop:active, .selection-mode.titlebar:not(headerbar) button:backdrop:checked label, .selection-mode.titlebar:not(headerbar) button:backdrop:checked, .selection-mode
-          headerbar button:backdrop.flat:active label, .selection-mode
-          headerbar button:backdrop.flat:active, .selection-mode
-          headerbar button:backdrop.flat:checked label, .selection-mode
-          headerbar button:backdrop.flat:checked, .selection-mode
-          headerbar button:backdrop:active label, .selection-mode
-          headerbar button:backdrop:active, .selection-mode
-          headerbar button:backdrop:checked label, .selection-mode
-          headerbar button:backdrop:checked,
-          headerbar.selection-mode button:backdrop.flat:active label,
-          headerbar.selection-mode button:backdrop.flat:active,
-          headerbar.selection-mode button:backdrop.flat:checked label,
-          headerbar.selection-mode button:backdrop.flat:checked,
-          headerbar.selection-mode button:backdrop:active label,
-          headerbar.selection-mode button:backdrop:active,
-          headerbar.selection-mode button:backdrop:checked label,
-          headerbar.selection-mode button:backdrop:checked {
-            color: #d2e0f7; }
         .selection-mode .titlebar:not(headerbar) button:backdrop.flat:disabled, .selection-mode .titlebar:not(headerbar) button:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled, .selection-mode
         headerbar button:backdrop.flat:disabled, .selection-mode
         headerbar button:backdrop:disabled,
         headerbar.selection-mode button:backdrop.flat:disabled,
         headerbar.selection-mode button:backdrop:disabled {
+          color: #739fec;
           border-color: #005af3;
           background-image: image(#276ce1);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #00348d; }
-          .selection-mode .titlebar:not(headerbar) button:backdrop.flat:disabled label, .selection-mode .titlebar:not(headerbar) button:backdrop.flat:disabled, .selection-mode .titlebar:not(headerbar) button:backdrop:disabled label, .selection-mode .titlebar:not(headerbar) button:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled label, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled label, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled, .selection-mode
-          headerbar button:backdrop.flat:disabled label, .selection-mode
-          headerbar button:backdrop.flat:disabled, .selection-mode
-          headerbar button:backdrop:disabled label, .selection-mode
-          headerbar button:backdrop:disabled,
-          headerbar.selection-mode button:backdrop.flat:disabled label,
-          headerbar.selection-mode button:backdrop.flat:disabled,
-          headerbar.selection-mode button:backdrop:disabled label,
-          headerbar.selection-mode button:backdrop:disabled {
-            color: #739fec; }
           .selection-mode .titlebar:not(headerbar) button:backdrop.flat:disabled:active, .selection-mode .titlebar:not(headerbar) button:backdrop.flat:disabled:checked, .selection-mode .titlebar:not(headerbar) button:backdrop:disabled:active, .selection-mode .titlebar:not(headerbar) button:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled:active, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:checked, .selection-mode
           headerbar button:backdrop.flat:disabled:active, .selection-mode
           headerbar button:backdrop.flat:disabled:checked, .selection-mode
@@ -2074,21 +1978,12 @@ headerbar {
           headerbar.selection-mode button:backdrop.flat:disabled:checked,
           headerbar.selection-mode button:backdrop:disabled:active,
           headerbar.selection-mode button:backdrop:disabled:checked {
+            color: #6d99e4;
             border-color: #005af3;
             background-image: image(#1e62d6);
             box-shadow: inset 0 1px rgba(255, 255, 255, 0);
             border-color: #00348d; }
-            .selection-mode .titlebar:not(headerbar) button:backdrop.flat:disabled:active label, .selection-mode .titlebar:not(headerbar) button:backdrop.flat:disabled:checked label, .selection-mode .titlebar:not(headerbar) button:backdrop:disabled:active label, .selection-mode .titlebar:not(headerbar) button:backdrop:disabled:checked label, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled:active label, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled:checked label, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:active label, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:checked label, .selection-mode
-            headerbar button:backdrop.flat:disabled:active label, .selection-mode
-            headerbar button:backdrop.flat:disabled:checked label, .selection-mode
-            headerbar button:backdrop:disabled:active label, .selection-mode
-            headerbar button:backdrop:disabled:checked label,
-            headerbar.selection-mode button:backdrop.flat:disabled:active label,
-            headerbar.selection-mode button:backdrop.flat:disabled:checked label,
-            headerbar.selection-mode button:backdrop:disabled:active label,
-            headerbar.selection-mode button:backdrop:disabled:checked label {
-              color: #6d99e4; }
-      .selection-mode .titlebar:not(headerbar) button.flat:backdrop, .selection-mode .titlebar:not(headerbar) button.flat:disabled, .selection-mode .titlebar:not(headerbar) button.flat:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button.flat:backdrop, .selection-mode.titlebar:not(headerbar) button.flat:disabled, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled, .selection-mode
+      .selection-mode button.titlebutton:backdrop, .selection-mode button.titlebutton:disabled, .selection-mode button.titlebutton:backdrop:disabled, .selection-mode .titlebar:not(headerbar) button.flat:backdrop, .selection-mode .titlebar:not(headerbar) button.flat:disabled, .selection-mode .titlebar:not(headerbar) button.flat:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button.flat:backdrop, .selection-mode.titlebar:not(headerbar) button.flat:disabled, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled, .selection-mode
       headerbar button.flat:backdrop, .selection-mode
       headerbar button.flat:disabled, .selection-mode
       headerbar button.flat:backdrop:disabled,
@@ -2104,35 +1999,21 @@ headerbar {
       .selection-mode .titlebar:not(headerbar) button:disabled, .selection-mode.titlebar:not(headerbar) button:disabled, .selection-mode
       headerbar button:disabled,
       headerbar.selection-mode button:disabled {
+        color: #93b6f0;
         border-color: #005af3;
         background-image: image(#276ce1);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        .selection-mode .titlebar:not(headerbar) button:disabled label, .selection-mode .titlebar:not(headerbar) button:disabled, .selection-mode.titlebar:not(headerbar) button:disabled label, .selection-mode.titlebar:not(headerbar) button:disabled, .selection-mode
-        headerbar button:disabled label, .selection-mode
-        headerbar button:disabled,
-        headerbar.selection-mode button:disabled label,
-        headerbar.selection-mode button:disabled {
-          color: #93b6f0; }
         .selection-mode .titlebar:not(headerbar) button:disabled:active, .selection-mode .titlebar:not(headerbar) button:disabled:checked, .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked, .selection-mode
         headerbar button:disabled:active, .selection-mode
         headerbar button:disabled:checked,
         headerbar.selection-mode button:disabled:active,
         headerbar.selection-mode button:disabled:checked {
+          color: #a4bfeb;
           border-color: #005af3;
           background-image: image(#1c5ecd);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-          .selection-mode .titlebar:not(headerbar) button:disabled:active label, .selection-mode .titlebar:not(headerbar) button:disabled:active, .selection-mode .titlebar:not(headerbar) button:disabled:checked label, .selection-mode .titlebar:not(headerbar) button:disabled:checked, .selection-mode.titlebar:not(headerbar) button:disabled:active label, .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked label, .selection-mode.titlebar:not(headerbar) button:disabled:checked, .selection-mode
-          headerbar button:disabled:active label, .selection-mode
-          headerbar button:disabled:active, .selection-mode
-          headerbar button:disabled:checked label, .selection-mode
-          headerbar button:disabled:checked,
-          headerbar.selection-mode button:disabled:active label,
-          headerbar.selection-mode button:disabled:active,
-          headerbar.selection-mode button:disabled:checked label,
-          headerbar.selection-mode button:disabled:checked {
-            color: #a4bfeb; }
       .selection-mode .titlebar:not(headerbar) button.suggested-action, .selection-mode.titlebar:not(headerbar) button.suggested-action, .selection-mode
       headerbar button.suggested-action,
       headerbar.selection-mode button.suggested-action {
@@ -2171,48 +2052,33 @@ headerbar {
         .selection-mode .titlebar:not(headerbar) button.suggested-action:disabled, .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled, .selection-mode
         headerbar button.suggested-action:disabled,
         headerbar.selection-mode button.suggested-action:disabled {
+          color: #888a8d;
           border-color: #0d0e11;
           background-image: image(#242731);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #00348d; }
-          .selection-mode .titlebar:not(headerbar) button.suggested-action:disabled label, .selection-mode .titlebar:not(headerbar) button.suggested-action:disabled, .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled label, .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled, .selection-mode
-          headerbar button.suggested-action:disabled label, .selection-mode
-          headerbar button.suggested-action:disabled,
-          headerbar.selection-mode button.suggested-action:disabled label,
-          headerbar.selection-mode button.suggested-action:disabled {
-            color: #888a8d; }
         .selection-mode .titlebar:not(headerbar) button.suggested-action:backdrop, .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop, .selection-mode
         headerbar button.suggested-action:backdrop,
         headerbar.selection-mode button.suggested-action:backdrop {
+          color: #888a8d;
           border-color: #111217;
           background-image: image(#23252e);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #00348d; }
-          .selection-mode .titlebar:not(headerbar) button.suggested-action:backdrop label, .selection-mode .titlebar:not(headerbar) button.suggested-action:backdrop, .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop label, .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop, .selection-mode
-          headerbar button.suggested-action:backdrop label, .selection-mode
-          headerbar button.suggested-action:backdrop,
-          headerbar.selection-mode button.suggested-action:backdrop label,
-          headerbar.selection-mode button.suggested-action:backdrop {
-            color: #888a8d; }
         .selection-mode .titlebar:not(headerbar) button.suggested-action:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop:disabled, .selection-mode
         headerbar button.suggested-action:backdrop:disabled,
         headerbar.selection-mode button.suggested-action:backdrop:disabled {
+          color: #43495a;
           border-color: #111217;
           background-image: image(#242731);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #00348d; }
-          .selection-mode .titlebar:not(headerbar) button.suggested-action:backdrop:disabled label, .selection-mode .titlebar:not(headerbar) button.suggested-action:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop:disabled label, .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop:disabled, .selection-mode
-          headerbar button.suggested-action:backdrop:disabled label, .selection-mode
-          headerbar button.suggested-action:backdrop:disabled,
-          headerbar.selection-mode button.suggested-action:backdrop:disabled label,
-          headerbar.selection-mode button.suggested-action:backdrop:disabled {
-            color: #43495a; }
     .selection-mode .titlebar:not(headerbar) .selection-menu:backdrop, .selection-mode .titlebar:not(headerbar) .selection-menu, .selection-mode.titlebar:not(headerbar) .selection-menu:backdrop, .selection-mode.titlebar:not(headerbar) .selection-menu, .selection-mode
     headerbar .selection-menu:backdrop, .selection-mode
     headerbar .selection-menu,
@@ -2421,16 +2287,10 @@ window.csd > .titlebar:not(headerbar) {
   background-color: #0d0e11; }
 
 window.devel headerbar.titlebar:not(.selection-mode) {
-  background: #23252e -gtk-icontheme("system-run-symbolic") 90% 0/256px 256px no-repeat, linear-gradient(to right, transparent 65%, rgba(39, 119, 255, 0.1)), linear-gradient(to top, #13151a 3px, #181a20);
-  color: rgba(238, 238, 236, 0.1); }
-  window.devel headerbar.titlebar:not(.selection-mode) label {
-    color: #eeeeec; }
+  background: #23252e cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat, linear-gradient(to right, transparent 65%, rgba(39, 119, 255, 0.1)), linear-gradient(to top, #13151a 3px, #181a20); }
   window.devel headerbar.titlebar:not(.selection-mode):backdrop {
-    background: #23252e -gtk-icontheme("system-run-symbolic") 90% 0/256px 256px no-repeat, image(#23252e);
-    /* background-color would flash */
-    color: rgba(238, 238, 236, 0.05); }
-    window.devel headerbar.titlebar:not(.selection-mode):backdrop label {
-      color: #888a8d; }
+    background: #23252e cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat, image(#23252e);
+    /* background-color would flash */ }
 
 /************
  * Pathbars *
@@ -2754,6 +2614,9 @@ popover.background {
   .csd popover.background, popover.background {
     border: 1px solid #0d0e11;
     border-radius: 9px; }
+  .csd popover.background {
+    background-clip: padding-box;
+    border-color: rgba(13, 14, 17, 0.9); }
   popover.background:backdrop {
     background-color: #23252e;
     box-shadow: none; }
@@ -3160,32 +3023,29 @@ switch {
   switch:checked slider {
     border: 1px solid #00348d; }
   switch:disabled slider {
+    color: #888a8d;
     border-color: #0d0e11;
     background-image: image(#242731);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    switch:disabled slider label, switch:disabled slider {
-      color: #888a8d; }
   switch:backdrop slider {
     transition: 200ms ease-out;
+    color: #888a8d;
     border-color: #111217;
     background-image: image(#23252e);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    switch:backdrop slider label, switch:backdrop slider {
-      color: #888a8d; }
   switch:backdrop:checked slider {
     border-color: #00348d; }
   switch:backdrop:disabled slider {
+    color: #43495a;
     border-color: #111217;
     background-image: image(#242731);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    switch:backdrop:disabled slider label, switch:backdrop:disabled slider {
-      color: #43495a; }
 
 /*************************
  * Check and Radio items *
@@ -3640,30 +3500,27 @@ scale {
     scale slider:active {
       border-color: #00348d; }
     scale slider:disabled {
+      color: #888a8d;
       border-color: #0d0e11;
       background-image: image(#242731);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      scale slider:disabled label, scale slider:disabled {
-        color: #888a8d; }
     scale slider:backdrop {
       transition: 200ms ease-out;
+      color: #888a8d;
       border-color: #111217;
       background-image: image(#23252e);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      scale slider:backdrop label, scale slider:backdrop {
-        color: #888a8d; }
       scale slider:backdrop:disabled {
+        color: #43495a;
         border-color: #111217;
         background-image: image(#242731);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        scale slider:backdrop:disabled label, scale slider:backdrop:disabled {
-          color: #43495a; }
     row:selected scale slider:disabled, row:selected scale slider {
       border-color: #00348d; }
     .osd scale slider {
@@ -4419,6 +4276,7 @@ list {
   background-color: #272a34;
   border-color: #0d0e11; }
   list:backdrop {
+    color: #d4d5d7;
     background-color: #292c37;
     border-color: #111217; }
   list row {
@@ -4530,13 +4388,28 @@ messagedialog.csd .dialog-action-area button {
   border-left-style: solid;
   border-right-style: none;
   border-bottom-style: none; }
-  messagedialog.csd .dialog-action-area button:first-child {
+  messagedialog.csd .dialog-action-area button:first-child:not(:only-child) {
     border-left-style: none;
     border-bottom-left-radius: 7px;
-    -gtk-outline-bottom-left-radius: 5px; }
-  messagedialog.csd .dialog-action-area button:last-child {
+    -gtk-outline-bottom-left-radius: 7px;
+    -gtk-outline-top-left-radius: 0px;
+    -gtk-outline-top-right-radius: 0px;
+    -gtk-outline-bottom-right-radius: 0px; }
+  messagedialog.csd .dialog-action-area button:last-child:not(:only-child) {
     border-bottom-right-radius: 7px;
-    -gtk-outline-bottom-right-radius: 5px; }
+    -gtk-outline-bottom-right-radius: 7px;
+    -gtk-outline-top-right-radius: 0px;
+    -gtk-outline-bottom-left-radius: 0px;
+    -gtk-outline-top-left-radius: 0px; }
+  messagedialog.csd .dialog-action-area button:only-child {
+    border-top-right-radius: 0;
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 7px;
+    border-bottom-right-radius: 7px;
+    -gtk-outline-top-right-radius: 0px;
+    -gtk-outline-top-left-radius: 0px;
+    -gtk-outline-bottom-left-radius: 7px;
+    -gtk-outline-bottom-right-radius: 7px; }
 
 filechooser .dialog-action-box {
   border-top: 1px solid #0d0e11; }
@@ -4717,6 +4590,9 @@ paned.vertical > separator {
  **************/
 infobar {
   border-style: none; }
+  infobar.action:hover > revealer > box {
+    background-color: #010101;
+    border-bottom: 1px solid #181a20; }
   infobar.info, infobar.question, infobar.warning, infobar.error {
     text-shadow: none; }
     infobar.info:backdrop > revealer > box, infobar.info > revealer > box, infobar.question:backdrop > revealer > box, infobar.question > revealer > box, infobar.warning:backdrop > revealer > box, infobar.warning > revealer > box, infobar.error:backdrop > revealer > box, infobar.error > revealer > box {
@@ -4753,31 +4629,28 @@ infobar {
         text-shadow: none;
         -gtk-icon-shadow: none; }
       infobar.info button:disabled, infobar.question button:disabled, infobar.warning button:disabled, infobar.error button:disabled {
+        color: #888a8d;
         border-color: #0d0e11;
         background-image: image(#242731);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        infobar.info button:disabled label, infobar.info button:disabled, infobar.question button:disabled label, infobar.question button:disabled, infobar.warning button:disabled label, infobar.warning button:disabled, infobar.error button:disabled label, infobar.error button:disabled {
-          color: #888a8d; }
       infobar.info button:backdrop, infobar.question button:backdrop, infobar.warning button:backdrop, infobar.error button:backdrop {
+        color: #888a8d;
         border-color: #111217;
         background-image: image(#23252e);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #0d0e11; }
-        infobar.info button:backdrop label, infobar.info button:backdrop, infobar.question button:backdrop label, infobar.question button:backdrop, infobar.warning button:backdrop label, infobar.warning button:backdrop, infobar.error button:backdrop label, infobar.error button:backdrop {
-          color: #888a8d; }
         infobar.info button:backdrop:disabled, infobar.question button:backdrop:disabled, infobar.warning button:backdrop:disabled, infobar.error button:backdrop:disabled {
+          color: #43495a;
           border-color: #111217;
           background-image: image(#242731);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #0d0e11; }
-          infobar.info button:backdrop:disabled label, infobar.info button:backdrop:disabled, infobar.question button:backdrop:disabled label, infobar.question button:backdrop:disabled, infobar.warning button:backdrop:disabled label, infobar.warning button:backdrop:disabled, infobar.error button:backdrop:disabled label, infobar.error button:backdrop:disabled {
-            color: #43495a; }
       infobar.info button:backdrop label, infobar.info button:backdrop, infobar.info button label, infobar.info button, infobar.question button:backdrop label, infobar.question button:backdrop, infobar.question button label, infobar.question button, infobar.warning button:backdrop label, infobar.warning button:backdrop, infobar.warning button label, infobar.warning button, infobar.error button:backdrop label, infobar.error button:backdrop, infobar.error button label, infobar.error button {
         color: #eeeeec; }
     infobar.info selection, infobar.question selection, infobar.warning selection, infobar.error selection {
@@ -4897,13 +4770,12 @@ colorswatch#add-color-button {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 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;
       border-color: #111217;
       background-image: image(#23252e);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      colorswatch#add-color-button overlay:backdrop label, colorswatch#add-color-button overlay:backdrop {
-        color: #888a8d; }
 
 colorswatch:disabled {
   opacity: 0.5; }
@@ -5013,28 +4885,28 @@ textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical
 entry selection, modelbutton.flat:selected,
 .menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected {
   background-color: #2777ff; }
-  row:selected label, label:selected, .selection-mode button.titlebutton, .view:selected:focus, .view:selected, iconview:selected, .view text:selected, iconview text:selected,
+  label:selected, .selection-mode button.titlebutton, .view:selected:focus, .view:selected, iconview:selected, .view text:selected, iconview text:selected,
   textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection,
   textview text selection:focus,
   textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical) selection,
   entry selection, modelbutton.flat:selected,
   .menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected {
     color: #ffffff; }
-    label:disabled selection, row:selected label:disabled, label:disabled:selected, .selection-mode button.titlebutton:disabled, iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected, iconview text:disabled:selected:focus,
+    label:disabled selection, label:disabled:selected, .selection-mode button.titlebutton:disabled, iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected, iconview text:disabled:selected:focus,
     textview text:disabled:selected:focus, .view text:disabled:selected, iconview text:disabled:selected,
     textview text:disabled:selected, iconview text selection:disabled:focus, .view text selection:disabled, iconview text selection:disabled,
     textview text selection:disabled, flowbox flowboxchild:disabled:selected, spinbutton:not(.vertical) selection:disabled,
     entry selection:disabled, modelbutton.flat:disabled:selected,
     .menuitem.button.flat:disabled:selected, row:disabled:selected, calendar:disabled:selected {
       color: #93bbff; }
-    label:backdrop selection, row:selected label:backdrop, label:backdrop:selected, .selection-mode button.titlebutton:backdrop, iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected, iconview text:backdrop:selected:focus,
+    label:backdrop selection, label:backdrop:selected, .selection-mode button.titlebutton:backdrop, iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected, iconview text:backdrop:selected:focus,
     textview text:backdrop:selected:focus, .view text:backdrop:selected, iconview text:backdrop:selected,
     textview text:backdrop:selected, iconview text selection:backdrop:focus, .view text selection:backdrop, iconview text selection:backdrop,
     textview text selection:backdrop, flowbox flowboxchild:backdrop:selected, spinbutton:not(.vertical) selection:backdrop,
     entry selection:backdrop, modelbutton.flat:backdrop:selected,
     .menuitem.button.flat:backdrop:selected, row:backdrop:selected, calendar:backdrop:selected {
       color: #d4d5d7; }
-      label:backdrop selection:disabled, row:selected label:backdrop:disabled, label:backdrop:disabled:selected, .selection-mode button.titlebutton:backdrop:disabled, .view:backdrop:disabled:selected, iconview:backdrop:disabled:selected, .view text:backdrop:disabled:selected, iconview text:backdrop:disabled:selected,
+      label:backdrop selection:disabled, label:backdrop:disabled:selected, .selection-mode button.titlebutton:backdrop:disabled, .view:backdrop:disabled:selected, iconview:backdrop:disabled:selected, .view text:backdrop:disabled:selected, iconview text:backdrop:disabled:selected,
       textview text:backdrop:disabled:selected, .view text selection:backdrop:disabled, iconview text selection:backdrop:disabled,
       textview text selection:backdrop:disabled, flowbox flowboxchild:backdrop:disabled:selected, spinbutton:not(.vertical) selection:backdrop:disabled,
       entry selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected,
@@ -5333,10 +5205,10 @@ infobar, infobar.info, infobar.question, infobar.warning, infobar.error {
   infobar *:link, infobar.info *:link, infobar.question *:link, infobar.warning *:link, infobar.error *:link {
     color: #8db7ff; }
 
-infobar.info:backdrop > revealer > box, infobar.info > revealer > box {
+infobar.info:backdrop > revealer > box, infobar.info > revealer > box, infobar.info.action:hover:backdrop > revealer > box, infobar.info.action:hover > revealer > box {
   background-color: #2777ff; }
 
-infobar.info button {
+infobar.info button, infobar.info.action:hover button {
   color: #ffffff;
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #005af3;
@@ -5345,7 +5217,7 @@ infobar.info button {
   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), 0 1px 2px rgba(0, 0, 0, 0.27); }
-  infobar.info button:hover {
+  infobar.info button:hover, infobar.info.action:hover button:hover {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #005af3;
@@ -5354,7 +5226,7 @@ infobar.info button {
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.490824);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.27);
     background-image: linear-gradient(to top, #2274ff, #2c7aff 1px); }
-  infobar.info button:active, infobar.info button:checked {
+  infobar.info button:active, infobar.info button:checked, infobar.info.action:hover button:active, infobar.info.action:hover button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #005af3;
@@ -5362,39 +5234,36 @@ infobar.info button {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none; }
-  infobar.info button:disabled {
+  infobar.info button:disabled, infobar.info.action:hover button:disabled {
+    color: #93b6f0;
     border-color: #005af3;
     background-image: image(#276ce1);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    infobar.info button:disabled label, infobar.info button:disabled {
-      color: #93b6f0; }
-  infobar.info button:backdrop {
+  infobar.info button:backdrop, infobar.info.action:hover button:backdrop {
+    color: #d4e4ff;
     border-color: #005af3;
     background-image: image(#2777ff);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     border-color: #005af3; }
-    infobar.info button:backdrop label, infobar.info button:backdrop {
-      color: #d4e4ff; }
-    infobar.info button:backdrop:disabled {
+    infobar.info button:backdrop:disabled, infobar.info.action:hover button:backdrop:disabled {
+      color: #739fec;
       border-color: #005af3;
       background-image: image(#276ce1);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #005af3; }
-      infobar.info button:backdrop:disabled label, infobar.info button:backdrop:disabled {
-        color: #739fec; }
-  infobar.info button:backdrop label, infobar.info button:backdrop, infobar.info button label, infobar.info button {
+  infobar.info button:backdrop label, infobar.info button:backdrop, infobar.info button label, infobar.info button, infobar.info.action:hover button:backdrop label, infobar.info.action:hover button:backdrop, infobar.info.action:hover button label, infobar.info.action:hover button {
     color: #ffffff; }
 
-infobar.question:backdrop > revealer > box, infobar.question > revealer > box, infobar.warning:backdrop > revealer > box, infobar.warning > revealer > box {
+infobar.question:backdrop > revealer > box, infobar.question > revealer > box, infobar.warning:backdrop > revealer > box, infobar.warning > revealer > box, infobar.question.action:hover:backdrop > revealer > box, infobar.question.action:hover > revealer > box, infobar.warning.action:hover:backdrop > revealer > box, infobar.warning.action:hover > revealer > box {
   background-color: #fd7d00; }
 
-infobar.question button, infobar.warning button {
+infobar.question button, infobar.warning button, infobar.question.action:hover button, infobar.warning.action:hover button {
   color: #ffffff;
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #ca6400;
@@ -5403,7 +5272,7 @@ infobar.question button, infobar.warning button {
   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), 0 1px 2px rgba(0, 0, 0, 0.27); }
-  infobar.question button:hover, infobar.warning button:hover {
+  infobar.question button:hover, infobar.warning button:hover, infobar.question.action:hover button:hover, infobar.warning.action:hover button:hover {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #ca6400;
@@ -5412,7 +5281,7 @@ infobar.question button, infobar.warning button {
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.555137);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.27);
     background-image: linear-gradient(to top, #f87a00, #ff8003 1px); }
-  infobar.question button:active, infobar.question button:checked, infobar.warning button:active, infobar.warning button:checked {
+  infobar.question button:active, infobar.question button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.question.action:hover button:active, infobar.question.action:hover button:checked, infobar.warning.action:hover button:active, infobar.warning.action:hover button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #ca6400;
@@ -5420,38 +5289,35 @@ infobar.question button, infobar.warning button {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none; }
-  infobar.question button:disabled, infobar.warning button:disabled {
+  infobar.question button:disabled, infobar.warning button:disabled, infobar.question.action:hover button:disabled, infobar.warning.action:hover button:disabled {
+    color: #eeb884;
     border-color: #ca6400;
     background-image: image(#dd7108);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    infobar.question button:disabled label, infobar.question button:disabled, infobar.warning button:disabled label, infobar.warning button:disabled {
-      color: #eeb884; }
-  infobar.question button:backdrop, infobar.warning button:backdrop {
+  infobar.question button:backdrop, infobar.warning button:backdrop, infobar.question.action:hover button:backdrop, infobar.warning.action:hover button:backdrop {
+    color: #ffe5cc;
     border-color: #ca6400;
     background-image: image(#fd7d00);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     border-color: #ca6400; }
-    infobar.question button:backdrop label, infobar.question button:backdrop, infobar.warning button:backdrop label, infobar.warning button:backdrop {
-      color: #ffe5cc; }
-    infobar.question button:backdrop:disabled, infobar.warning button:backdrop:disabled {
+    infobar.question button:backdrop:disabled, infobar.warning button:backdrop:disabled, infobar.question.action:hover button:backdrop:disabled, infobar.warning.action:hover button:backdrop:disabled {
+      color: #e9a35e;
       border-color: #ca6400;
       background-image: image(#dd7108);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #ca6400; }
-      infobar.question button:backdrop:disabled label, infobar.question button:backdrop:disabled, infobar.warning button:backdrop:disabled label, infobar.warning button:backdrop:disabled {
-        color: #e9a35e; }
-  infobar.question button:backdrop label, infobar.question button:backdrop, infobar.question button label, infobar.question button, infobar.warning button:backdrop label, infobar.warning button:backdrop, infobar.warning button label, infobar.warning button {
+  infobar.question button:backdrop label, infobar.question button:backdrop, infobar.question button label, infobar.question button, infobar.warning button:backdrop label, infobar.warning button:backdrop, infobar.warning button label, infobar.warning button, infobar.question.action:hover button:backdrop label, infobar.question.action:hover button:backdrop, infobar.question.action:hover button label, infobar.question.action:hover button, infobar.warning.action:hover button:backdrop label, infobar.warning.action:hover button:backdrop, infobar.warning.action:hover button label, infobar.warning.action:hover button {
     color: #ffffff; }
 
-infobar.error:backdrop > revealer > box, infobar.error > revealer > box {
+infobar.error:backdrop > revealer > box, infobar.error > revealer > box, infobar.error.action:hover:backdrop > revealer > box, infobar.error.action:hover > revealer > box {
   background-color: #bf1717; }
-  infobar.error:backdrop > revealer > box button, infobar.error > revealer > box button {
+  infobar.error:backdrop > revealer > box button, infobar.error > revealer > box button, infobar.error.action:hover:backdrop > revealer > box button, infobar.error.action:hover > revealer > box button {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #911212;
@@ -5460,7 +5326,7 @@ infobar.error:backdrop > revealer > box, infobar.error > revealer > box {
     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), 0 1px 2px rgba(0, 0, 0, 0.27); }
-    infobar.error:backdrop > revealer > box button:hover, infobar.error > revealer > box button:hover {
+    infobar.error:backdrop > revealer > box button:hover, infobar.error > revealer > box button:hover, infobar.error.action:hover:backdrop > revealer > box button:hover, infobar.error.action:hover > revealer > box button:hover {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #911212;
@@ -5469,7 +5335,7 @@ infobar.error:backdrop > revealer > box, infobar.error > revealer > box {
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.616314);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 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: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;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #911212;
@@ -5477,33 +5343,30 @@ infobar.error:backdrop > revealer > box, infobar.error > revealer > box {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       text-shadow: none;
       -gtk-icon-shadow: none; }
-    infobar.error:backdrop > revealer > box button:disabled, infobar.error > revealer > box button:disabled {
+    infobar.error:backdrop > revealer > box button:disabled, infobar.error > revealer > box button:disabled, infobar.error.action:hover:backdrop > revealer > box button:disabled, infobar.error.action:hover > revealer > box button:disabled {
+      color: #d48d8d;
       border-color: #911212;
       background-image: image(#a81a1b);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      infobar.error:backdrop > revealer > box button:disabled label, infobar.error:backdrop > revealer > box button:disabled, infobar.error > revealer > box button:disabled label, infobar.error > revealer > box button:disabled {
-        color: #d48d8d; }
-    infobar.error:backdrop > revealer > box button:backdrop, infobar.error > revealer > box button:backdrop {
+    infobar.error:backdrop > revealer > box button:backdrop, infobar.error > revealer > box button:backdrop, infobar.error.action:hover:backdrop > revealer > box button:backdrop, infobar.error.action:hover > revealer > box button:backdrop {
+      color: #f2d1d1;
       border-color: #911212;
       background-image: image(#bf1717);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #911212; }
-      infobar.error:backdrop > revealer > box button:backdrop label, infobar.error:backdrop > revealer > box button:backdrop, infobar.error > revealer > box button:backdrop label, infobar.error > revealer > box button:backdrop {
-        color: #f2d1d1; }
-      infobar.error:backdrop > revealer > box button:backdrop:disabled, infobar.error > revealer > box button:backdrop:disabled {
+      infobar.error:backdrop > revealer > box button:backdrop:disabled, infobar.error > revealer > box button:backdrop:disabled, infobar.error.action:hover:backdrop > revealer > box button:backdrop:disabled, infobar.error.action:hover > revealer > box button:backdrop:disabled {
+        color: #c66a6b;
         border-color: #911212;
         background-image: image(#a81a1b);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #911212; }
-        infobar.error:backdrop > revealer > box button:backdrop:disabled label, infobar.error:backdrop > revealer > box button:backdrop:disabled, infobar.error > revealer > box button:backdrop:disabled label, infobar.error > revealer > box button:backdrop:disabled {
-          color: #c66a6b; }
-    infobar.error:backdrop > revealer > box button:backdrop label, infobar.error:backdrop > revealer > box button:backdrop, infobar.error:backdrop > revealer > box button label, infobar.error:backdrop > revealer > box button, infobar.error > revealer > box button:backdrop label, infobar.error > revealer > box button:backdrop, infobar.error > revealer > box button label, infobar.error > revealer > box button {
+    infobar.error:backdrop > revealer > box button:backdrop label, infobar.error:backdrop > revealer > box button:backdrop, infobar.error:backdrop > revealer > box button label, infobar.error:backdrop > revealer > box button, infobar.error > revealer > box button:backdrop label, infobar.error > revealer > box button:backdrop, infobar.error > revealer > box button label, infobar.error > revealer > box button, infobar.error.action:hover:backdrop > revealer > box button:backdrop label, infobar.error.action:hover:backdrop > revealer > box button:backdrop, infobar.error.action:hover:backdrop > revealer > box button label, infobar.error.action:hover:backdrop > revealer > box button, infobar.error.action:hover > revealer > box button:backdrop label, infobar.error.action:hover > revealer > box button:backdrop, infobar.error.action:hover > revealer > box button label, infobar.error.action:hover > revealer > box button {
       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 329be82d..2ee2ab82 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk.css
@@ -120,19 +120,17 @@ flowbox flowboxchild {
 
 label {
   caret-color: currentColor; }
-  label.separator {
-    color: #5c616c; }
-    label.separator:backdrop {
-      color: #aeb0b6; }
   label selection {
     background-color: #2777ff;
     color: #ffffff; }
   label:disabled {
     color: #aeb0b6; }
+    button label:disabled {
+      color: inherit; }
     label:disabled:backdrop {
       color: #d9d9d9; }
-  label:backdrop {
-    color: #aeb0b6; }
+      button label:disabled:backdrop {
+        color: inherit; }
 
 .dim-label, label.separator, .titlebar:not(headerbar) .subtitle,
 headerbar .subtitle {
@@ -188,6 +186,46 @@ spinner {
     spinner:checked:disabled {
       opacity: 0.5; }
 
+/**********************
+ * General Typography *
+ **********************/
+.large-title {
+  font-weight: 300;
+  font-size: 24pt;
+  letter-spacing: 0.2rem; }
+
+.title-1 {
+  font-weight: 800;
+  font-size: 20pt; }
+
+.title-2 {
+  font-weight: 800;
+  font-size: 15pt; }
+
+.title-3 {
+  font-weight: 700;
+  font-size: 15pt; }
+
+.title-4 {
+  font-weight: 700;
+  font-size: 13pt; }
+
+.heading {
+  font-weight: 700;
+  font-size: 11pt; }
+
+.body {
+  font-weight: 400;
+  font-size: 11pt; }
+
+.caption-heading {
+  font-weight: 700;
+  font-size: 9pt; }
+
+.caption {
+  font-weight: 400;
+  font-size: 9pt; }
+
 /****************
  * Text Entries *
  ****************/
@@ -542,6 +580,7 @@ button {
   notebook > header > tabs > arrow:backdrop.flat, button:backdrop.flat.titlebutton, notebook > header > tabs > arrow:backdrop, button.titlebutton:backdrop,
   button:backdrop.flat,
   button:backdrop {
+    color: #aeb0b6;
     border-color: #e0e0e0;
     background-image: image(#ffffff);
     text-shadow: none;
@@ -549,59 +588,34 @@ button {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     transition: 200ms ease-out;
     -gtk-icon-effect: none; }
-    notebook > header > tabs > arrow:backdrop.flat label, button:backdrop.flat.titlebutton label, notebook > header > tabs > arrow:backdrop.flat, button:backdrop.flat.titlebutton, notebook > header > tabs > arrow:backdrop label, button.titlebutton:backdrop label, notebook > header > tabs > arrow:backdrop, button.titlebutton:backdrop,
-    button:backdrop.flat label,
-    button:backdrop.flat,
-    button:backdrop label,
-    button:backdrop {
-      color: #aeb0b6; }
     notebook > header > tabs > arrow:backdrop.flat:active, button:backdrop.flat.titlebutton:active, notebook > header > tabs > arrow:backdrop.flat:checked, button:backdrop.flat.titlebutton:checked, notebook > header > tabs > arrow:backdrop:active, button.titlebutton:backdrop:active, notebook > header > tabs > arrow:backdrop:checked, button.titlebutton:backdrop:checked,
     button:backdrop.flat:active,
     button:backdrop.flat:checked,
     button:backdrop:active,
     button:backdrop:checked {
+      color: #aeb0b6;
       border-color: #e0e0e0;
       background-image: image(#eaeaea);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      notebook > header > tabs > arrow:backdrop.flat:active label, button:backdrop.flat.titlebutton:active label, notebook > header > tabs > arrow:backdrop.flat:active, button:backdrop.flat.titlebutton:active, notebook > header > tabs > arrow:backdrop.flat:checked label, button:backdrop.flat.titlebutton:checked label, notebook > header > tabs > arrow:backdrop.flat:checked, button:backdrop.flat.titlebutton:checked, notebook > header > tabs > arrow:backdrop:active label, button.titlebutton:backdrop:active label, notebook > header > tabs > arrow:backdrop:active, button.titlebutton:backdrop:active, notebook > header > tabs > arrow:backdrop:checked label, button.titlebutton:backdrop:checked label, notebook > header > tabs > arrow:backdrop:checked, button.titlebutton:backdrop:checked,
-      button:backdrop.flat:active label,
-      button:backdrop.flat:active,
-      button:backdrop.flat:checked label,
-      button:backdrop.flat:checked,
-      button:backdrop:active label,
-      button:backdrop:active,
-      button:backdrop:checked label,
-      button:backdrop:checked {
-        color: #aeb0b6; }
     notebook > header > tabs > arrow:backdrop.flat:disabled, button:backdrop.flat.titlebutton:disabled, notebook > header > tabs > arrow:backdrop:disabled, button.titlebutton:backdrop:disabled,
     button:backdrop.flat:disabled,
     button:backdrop:disabled {
+      color: #d9d9d9;
       border-color: #e0e0e0;
       background-image: image(#fdfdfd);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      notebook > header > tabs > arrow:backdrop.flat:disabled label, button:backdrop.flat.titlebutton:disabled label, notebook > header > tabs > arrow:backdrop.flat:disabled, button:backdrop.flat.titlebutton:disabled, notebook > header > tabs > arrow:backdrop:disabled label, button.titlebutton:backdrop:disabled label, notebook > header > tabs > arrow:backdrop:disabled, button.titlebutton:backdrop:disabled,
-      button:backdrop.flat:disabled label,
-      button:backdrop.flat:disabled,
-      button:backdrop:disabled label,
-      button:backdrop:disabled {
-        color: #d9d9d9; }
       notebook > header > tabs > arrow:backdrop.flat:disabled:active, button:backdrop.flat.titlebutton:disabled:active, notebook > header > tabs > arrow:backdrop.flat:disabled:checked, button:backdrop.flat.titlebutton:disabled:checked, notebook > header > tabs > arrow:backdrop:disabled:active, button.titlebutton:backdrop:disabled:active, notebook > header > tabs > arrow:backdrop:disabled:checked, button.titlebutton:backdrop:disabled:checked,
       button:backdrop.flat:disabled:active,
       button:backdrop.flat:disabled:checked,
       button:backdrop:disabled:active,
       button:backdrop:disabled:checked {
+        color: #d9d9d9;
         border-color: #e0e0e0;
         background-image: image(#eaeaea);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        notebook > header > tabs > arrow:backdrop.flat:disabled:active label, button:backdrop.flat.titlebutton:disabled:active label, notebook > header > tabs > arrow:backdrop.flat:disabled:checked label, button:backdrop.flat.titlebutton:disabled:checked label, notebook > header > tabs > arrow:backdrop:disabled:active label, button.titlebutton:backdrop:disabled:active label, notebook > header > tabs > arrow:backdrop:disabled:checked label, button.titlebutton:backdrop:disabled:checked label,
-        button:backdrop.flat:disabled:active label,
-        button:backdrop.flat:disabled:checked label,
-        button:backdrop:disabled:active label,
-        button:backdrop:disabled:checked label {
-          color: #d9d9d9; }
-  notebook > header > tabs > arrow.flat:backdrop, button.flat.titlebutton:backdrop, notebook > header > tabs > arrow.flat:disabled, button.flat.titlebutton:disabled, notebook > header > tabs > arrow.flat:backdrop:disabled, button.flat.titlebutton:backdrop:disabled,
+  notebook > header > tabs > arrow:backdrop, button.sidebar-button:backdrop, button.titlebutton:backdrop, notebook > header > tabs > arrow:disabled, button.sidebar-button:disabled, button.titlebutton:disabled, notebook > header > tabs > arrow:backdrop:disabled, button.sidebar-button:backdrop:disabled, button.titlebutton:backdrop:disabled, notebook > header > tabs > arrow.flat:backdrop, button.flat.titlebutton:backdrop, notebook > header > tabs > arrow.flat:disabled, button.flat.titlebutton:disabled, notebook > header > tabs > arrow.flat:backdrop:disabled, button.flat.titlebutton:backdrop:disabled,
   button.flat:backdrop,
   button.flat:disabled,
   button.flat:backdrop:disabled {
@@ -613,27 +627,19 @@ button {
     -gtk-icon-shadow: none; }
   notebook > header > tabs > arrow:disabled, button.titlebutton:disabled,
   button:disabled {
+    color: #aeb0b6;
     border-color: #d9d9d9;
     background-image: image(#fdfdfd);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    notebook > header > tabs > arrow:disabled label, button.titlebutton:disabled label, notebook > header > tabs > arrow:disabled, button.titlebutton:disabled,
-    button:disabled label,
-    button:disabled {
-      color: #aeb0b6; }
     notebook > header > tabs > arrow:disabled:active, button.titlebutton:disabled:active, notebook > header > tabs > arrow:disabled:checked, button.titlebutton:disabled:checked,
     button:disabled:active,
     button:disabled:checked {
+      color: #aeb0b6;
       border-color: #d9d9d9;
       background-image: image(#eaeaea);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      notebook > header > tabs > arrow:disabled:active label, button.titlebutton:disabled:active label, notebook > header > tabs > arrow:disabled:active, button.titlebutton:disabled:active, notebook > header > tabs > arrow:disabled:checked label, button.titlebutton:disabled:checked label, notebook > header > tabs > arrow:disabled:checked, button.titlebutton:disabled:checked,
-      button:disabled:active label,
-      button:disabled:active,
-      button:disabled:checked label,
-      button:disabled:checked {
-        color: #aeb0b6; }
   notebook > header > tabs > arrow.image-button, button.image-button.titlebutton,
   button.image-button {
     min-width: 24px;
@@ -660,13 +666,14 @@ button {
 row:selected
 button {
   border-color: #0051da; }
-  row:selected button.sidebar-button:not(:active):not(:checked):not(:hover):not(disabled), row:selected
-  button.flat:not(:active):not(:checked):not(:hover):not(disabled) {
-    color: #ffffff;
-    border-color: transparent; }
-    row:selected button.sidebar-button:not(:active):not(:checked):not(:hover):not(disabled):backdrop, row:selected
-    button.flat:not(:active):not(:checked):not(:hover):not(disabled):backdrop {
-      color: #f7f7f7; }
+
+row:selected button.sidebar-button:not(:active):not(:checked):not(:hover):not(disabled), row:selected
+button.flat:not(:active):not(:checked):not(:hover):not(disabled) {
+  color: #ffffff;
+  border-color: transparent; }
+  row:selected button.sidebar-button:not(:active):not(:checked):not(:hover):not(disabled):backdrop, row:selected
+  button.flat:not(:active):not(:checked):not(:hover):not(disabled):backdrop {
+    color: #f7f7f7; }
 
 
 button.osd {
@@ -878,7 +885,7 @@ button.suggested-action {
   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), 0 1px 2px rgba(0, 0, 0, 0.07); }
-  .selection-mode button.titlebutton,
+  
   button.suggested-action.flat {
     border-color: transparent;
     background-color: transparent;
@@ -907,67 +914,43 @@ button.suggested-action {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none; }
-  .selection-mode button.titlebutton:backdrop,
+  
   button.suggested-action:backdrop,
   button.suggested-action.flat:backdrop {
+    color: #d4e4ff;
     border-color: #2777ff;
     background-image: image(#2777ff);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    .selection-mode button.titlebutton:backdrop label, .selection-mode button.titlebutton:backdrop,
-    button.suggested-action:backdrop label,
-    button.suggested-action:backdrop,
-    button.suggested-action.flat:backdrop label,
-    button.suggested-action.flat:backdrop {
-      color: #d4e4ff; }
-    .selection-mode button.titlebutton:backdrop:active, .selection-mode button.titlebutton:backdrop:checked,
+    
     button.suggested-action:backdrop:active,
     button.suggested-action:backdrop:checked,
     button.suggested-action.flat:backdrop:active,
     button.suggested-action.flat:backdrop:checked {
+      color: #d2e3ff;
       border-color: #1e71fe;
       background-image: image(#1e71fe);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .selection-mode button.titlebutton:backdrop:active label, .selection-mode button.titlebutton:backdrop:active, .selection-mode button.titlebutton:backdrop:checked label, .selection-mode button.titlebutton:backdrop:checked,
-      button.suggested-action:backdrop:active label,
-      button.suggested-action:backdrop:active,
-      button.suggested-action:backdrop:checked label,
-      button.suggested-action:backdrop:checked,
-      button.suggested-action.flat:backdrop:active label,
-      button.suggested-action.flat:backdrop:active,
-      button.suggested-action.flat:backdrop:checked label,
-      button.suggested-action.flat:backdrop:checked {
-        color: #d2e3ff; }
-    .selection-mode button.titlebutton:backdrop:disabled,
+    
     button.suggested-action:backdrop:disabled,
     button.suggested-action.flat:backdrop:disabled {
+      color: #d9d9d9;
       border-color: #e0e0e0;
       background-image: image(#fdfdfd);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .selection-mode button.titlebutton:backdrop:disabled label, .selection-mode button.titlebutton:backdrop:disabled,
-      button.suggested-action:backdrop:disabled label,
-      button.suggested-action:backdrop:disabled,
-      button.suggested-action.flat:backdrop:disabled label,
-      button.suggested-action.flat:backdrop:disabled {
-        color: #d9d9d9; }
-      .selection-mode button.titlebutton:backdrop:disabled:active, .selection-mode button.titlebutton:backdrop:disabled:checked,
+      
       button.suggested-action:backdrop:disabled:active,
       button.suggested-action:backdrop:disabled:checked,
       button.suggested-action.flat:backdrop:disabled:active,
       button.suggested-action.flat:backdrop:disabled:checked {
+        color: #6da3fe;
         border-color: #1e71fe;
         background-image: image(#1e71fe);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        .selection-mode button.titlebutton:backdrop:disabled:active label, .selection-mode button.titlebutton:backdrop:disabled:checked label,
-        button.suggested-action:backdrop:disabled:active label,
-        button.suggested-action:backdrop:disabled:checked label,
-        button.suggested-action.flat:backdrop:disabled:active label,
-        button.suggested-action.flat:backdrop:disabled:checked label {
-          color: #6da3fe; }
-  .selection-mode button.titlebutton:backdrop, .selection-mode button.titlebutton:disabled, .selection-mode button.titlebutton:backdrop:disabled,
+  
   button.suggested-action.flat:backdrop,
   button.suggested-action.flat:disabled,
   button.suggested-action.flat:backdrop:disabled {
@@ -980,27 +963,19 @@ button.suggested-action {
     color: rgba(39, 119, 255, 0.8); }
   
   button.suggested-action:disabled {
+    color: #aeb0b6;
     border-color: #d9d9d9;
     background-image: image(#fdfdfd);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     
-    button.suggested-action:disabled label,
-    button.suggested-action:disabled {
-      color: #aeb0b6; }
-    
     button.suggested-action:disabled:active,
     button.suggested-action:disabled:checked {
+      color: #a5c6ff;
       border-color: #005af3;
       background-image: image(#1e71fe);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      
-      button.suggested-action:disabled:active label,
-      button.suggested-action:disabled:active,
-      button.suggested-action:disabled:checked label,
-      button.suggested-action:disabled:checked {
-        color: #a5c6ff; }
   .osd
   button.suggested-action {
     color: #eeeeec;
@@ -1101,63 +1076,39 @@ button.destructive-action {
   
   button.destructive-action:backdrop,
   button.destructive-action.flat:backdrop {
+    color: #f6d1d1;
     border-color: #d41919;
     background-image: image(#d41919);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     
-    button.destructive-action:backdrop label,
-    button.destructive-action:backdrop,
-    button.destructive-action.flat:backdrop label,
-    button.destructive-action.flat:backdrop {
-      color: #f6d1d1; }
-    
     button.destructive-action:backdrop:active,
     button.destructive-action:backdrop:checked,
     button.destructive-action.flat:backdrop:active,
     button.destructive-action.flat:backdrop:checked {
+      color: #f4d4d4;
       border-color: #c72626;
       background-image: image(#c72626);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      
-      button.destructive-action:backdrop:active label,
-      button.destructive-action:backdrop:active,
-      button.destructive-action:backdrop:checked label,
-      button.destructive-action:backdrop:checked,
-      button.destructive-action.flat:backdrop:active label,
-      button.destructive-action.flat:backdrop:active,
-      button.destructive-action.flat:backdrop:checked label,
-      button.destructive-action.flat:backdrop:checked {
-        color: #f4d4d4; }
     
     button.destructive-action:backdrop:disabled,
     button.destructive-action.flat:backdrop:disabled {
+      color: #d9d9d9;
       border-color: #e0e0e0;
       background-image: image(#fdfdfd);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
       
-      button.destructive-action:backdrop:disabled label,
-      button.destructive-action:backdrop:disabled,
-      button.destructive-action.flat:backdrop:disabled label,
-      button.destructive-action.flat:backdrop:disabled {
-        color: #d9d9d9; }
-      
       button.destructive-action:backdrop:disabled:active,
       button.destructive-action:backdrop:disabled:checked,
       button.destructive-action.flat:backdrop:disabled:active,
       button.destructive-action.flat:backdrop:disabled:checked {
+        color: #da7272;
         border-color: #c72626;
         background-image: image(#c72626);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        
-        button.destructive-action:backdrop:disabled:active label,
-        button.destructive-action:backdrop:disabled:checked label,
-        button.destructive-action.flat:backdrop:disabled:active label,
-        button.destructive-action.flat:backdrop:disabled:checked label {
-          color: #da7272; }
   
   button.destructive-action.flat:backdrop,
   button.destructive-action.flat:disabled,
@@ -1171,27 +1122,19 @@ button.destructive-action {
     color: rgba(212, 25, 25, 0.8); }
   
   button.destructive-action:disabled {
+    color: #aeb0b6;
     border-color: #d9d9d9;
     background-image: image(#fdfdfd);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     
-    button.destructive-action:disabled label,
-    button.destructive-action:disabled {
-      color: #aeb0b6; }
-    
     button.destructive-action:disabled:active,
     button.destructive-action:disabled:checked {
+      color: #e8a8a8;
       border-color: #a61414;
       background-image: image(#c72626);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      
-      button.destructive-action:disabled:active label,
-      button.destructive-action:disabled:active,
-      button.destructive-action:disabled:checked label,
-      button.destructive-action:disabled:checked {
-        color: #e8a8a8; }
   .osd
   button.destructive-action {
     color: #eeeeec;
@@ -1377,47 +1320,41 @@ button.circular {
     text-shadow: none;
     -gtk-icon-shadow: none; }
   .inline-toolbar toolbutton > button:disabled {
+    color: #aeb0b6;
     border-color: #d9d9d9;
     background-image: image(#fdfdfd);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    .inline-toolbar toolbutton > button:disabled label, .inline-toolbar toolbutton > button:disabled {
-      color: #aeb0b6; }
     .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked {
+      color: #aeb0b6;
       border-color: #d9d9d9;
       background-image: image(#eaeaea);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .inline-toolbar toolbutton > button:disabled:active label, .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked label, .inline-toolbar toolbutton > button:disabled:checked {
-        color: #aeb0b6; }
   .inline-toolbar toolbutton > button:backdrop {
+    color: #aeb0b6;
     border-color: #e0e0e0;
     background-image: image(#ffffff);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    .inline-toolbar toolbutton > button:backdrop label, .inline-toolbar toolbutton > button:backdrop {
-      color: #aeb0b6; }
     .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked {
+      color: #aeb0b6;
       border-color: #e0e0e0;
       background-image: image(#eaeaea);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .inline-toolbar toolbutton > button:backdrop:active label, .inline-toolbar toolbutton > button:backdrop:active, .inline-toolbar toolbutton > button:backdrop:checked label, .inline-toolbar toolbutton > button:backdrop:checked {
-        color: #aeb0b6; }
     .inline-toolbar toolbutton > button:backdrop:disabled {
+      color: #d9d9d9;
       border-color: #e0e0e0;
       background-image: image(#fdfdfd);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .inline-toolbar toolbutton > button:backdrop:disabled label, .inline-toolbar toolbutton > button:backdrop:disabled {
-        color: #d9d9d9; }
       .inline-toolbar toolbutton > button:backdrop:disabled:active, .inline-toolbar toolbutton > button:backdrop:disabled:checked {
+        color: #d9d9d9;
         border-color: #e0e0e0;
         background-image: image(#eaeaea);
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        .inline-toolbar toolbutton > button:backdrop:disabled:active label, .inline-toolbar toolbutton > button:backdrop:disabled:checked label {
-          color: #d9d9d9; }
 
 toolbar.inline-toolbar toolbutton > button.flat,
 toolbar.inline-toolbar toolbutton:backdrop > button.flat, .linked:not(.vertical) > spinbutton:not(.vertical), .linked:not(.vertical) > entry, .inline-toolbar button, .inline-toolbar button:backdrop, .linked > button,
@@ -1426,7 +1363,8 @@ toolbar.inline-toolbar toolbutton:backdrop > button.flat, .linked:not(.vertical)
 .linked > button:checked,
 .linked > button:backdrop, filechooser .path-bar.linked > button, .linked > combobox > box > button.combo:dir(ltr), .linked > combobox > box > button.combo:dir(rtl) {
   border-radius: 0;
-  border-right-style: none; }
+  border-right-style: none;
+  -gtk-outline-radius: 0; }
 
 toolbar.inline-toolbar toolbutton:first-child > button.flat,
 toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat, .linked:not(.vertical) > spinbutton:first-child:not(.vertical), .linked:not(.vertical) > entry:first-child, .inline-toolbar button:first-child, .linked > button:first-child, filechooser .path-bar.linked > button:first-child:dir(ltr), filechooser .path-bar.linked > button:last-child:dir(rtl), combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > box > button.combo {
@@ -1434,7 +1372,11 @@ toolbar.inline-toolbar toolbutton:backdrop:first-child > button.flat, .linked:no
   border-bottom-left-radius: 5px;
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
-  border-right-style: none; }
+  border-right-style: none;
+  -gtk-outline-bottom-left-radius: 5px;
+  -gtk-outline-top-left-radius: 5px;
+  -gtk-outline-top-right-radius: 0;
+  -gtk-outline-bottom-right-radius: 0; }
 
 toolbar.inline-toolbar toolbutton:last-child > button.flat,
 toolbar.inline-toolbar toolbutton:backdrop:last-child > button.flat, .linked:not(.vertical) > spinbutton:last-child:not(.vertical), .linked:not(.vertical) > entry:last-child, .inline-toolbar button:last-child, .linked > button:last-child, filechooser .path-bar.linked > button:last-child:dir(ltr), filechooser .path-bar.linked > button:first-child:dir(rtl), combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > box > button.combo {
@@ -1442,12 +1384,17 @@ toolbar.inline-toolbar toolbutton:backdrop:last-child > button.flat, .linked:not
   border-bottom-left-radius: 0;
   border-top-right-radius: 5px;
   border-bottom-right-radius: 5px;
-  border-right-style: solid; }
+  border-right-style: solid;
+  -gtk-outline-bottom-right-radius: 5px;
+  -gtk-outline-top-right-radius: 5px;
+  -gtk-outline-bottom-left-radius: 0;
+  -gtk-outline-top-left-radius: 0; }
 
 toolbar.inline-toolbar toolbutton:only-child > button.flat,
 toolbar.inline-toolbar toolbutton:backdrop:only-child > button.flat, .linked:not(.vertical) > spinbutton:only-child:not(.vertical), .linked:not(.vertical) > entry:only-child, .inline-toolbar button:only-child, .linked > button:only-child, filechooser .path-bar.linked > button:only-child, .linked:not(.vertical) > combobox:only-child > box > button.combo {
   border-radius: 5px;
-  border-style: solid; }
+  border-style: solid;
+  -gtk-outline-radius: 5px; }
 
 .linked.vertical > spinbutton:not(.vertical), .linked.vertical > entry, .linked.vertical > button,
 .linked.vertical > button:hover,
@@ -1556,7 +1503,7 @@ button:visited > label,
     *:selected button:visited, *:selected button:link > label:visited,
     *:selected button:visited > label:visited, *:selected
     *:link:visited {
-      color: #a9c9ff; }
+      color: #99b5e6; }
   button:hover:link,
   button:hover:visited, button:link > label:hover,
   button:visited > label:hover,
@@ -1576,7 +1523,7 @@ button:visited > label,
     *:selected button:active:visited, *:selected button:link > label:active,
     *:selected button:visited > label:active, *:selected
     *:link:active {
-      color: #d4e4ff; }
+      color: #ccdefd; }
   button:disabled:link,
   button:disabled:visited, button:link > label:disabled,
   button:visited > label:disabled, button:disabled:backdrop:link,
@@ -1595,7 +1542,7 @@ button:visited > label,
   *:link:backdrop:backdrop:hover,
   *:link:backdrop:backdrop:hover:selected,
   *:link:backdrop {
-    color: #2777ff; }
+    color: rgba(0, 90, 243, 0.9); }
   .selection-mode .titlebar:not(headerbar) .subtitle:link, .selection-mode.titlebar:not(headerbar) .subtitle:link, .selection-mode headerbar .subtitle:link,
   headerbar.selection-mode .subtitle:link, button:selected:link,
   button:selected:visited, button:link > label:selected,
@@ -1607,7 +1554,7 @@ button:visited > label,
   *:link:selected,
   *:selected
   *:link {
-    color: #d4e4ff; }
+    color: #ccdefd; }
 
 button:link,
 button:visited {
@@ -1923,17 +1870,10 @@ headerbar {
     .titlebar:not(headerbar) button.toggle:checked:backdrop,
     headerbar stackswitcher button:checked:backdrop,
     headerbar button.toggle:checked:backdrop {
+      color: #aeb0b6;
       border-color: #e0e0e0;
       background-image: image(#eaeaea);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .titlebar:not(headerbar) stackswitcher button:checked:backdrop label, .titlebar:not(headerbar) stackswitcher button:checked:backdrop,
-      .titlebar:not(headerbar) button.toggle:checked:backdrop label,
-      .titlebar:not(headerbar) button.toggle:checked:backdrop,
-      headerbar stackswitcher button:checked:backdrop label,
-      headerbar stackswitcher button:checked:backdrop,
-      headerbar button.toggle:checked:backdrop label,
-      headerbar button.toggle:checked:backdrop {
-        color: #aeb0b6; }
   .selection-mode .titlebar:not(headerbar), .selection-mode.titlebar:not(headerbar), .selection-mode
   headerbar,
   headerbar.selection-mode {
@@ -1964,7 +1904,7 @@ headerbar {
       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), 0 1px 2px rgba(0, 0, 0, 0.07); }
-      .selection-mode .titlebar:not(headerbar) button.flat, .selection-mode.titlebar:not(headerbar) button.flat, .selection-mode
+      .selection-mode button.titlebutton, .selection-mode .titlebar:not(headerbar) button.flat, .selection-mode.titlebar:not(headerbar) button.flat, .selection-mode
       headerbar button.flat,
       headerbar.selection-mode button.flat {
         border-color: transparent;
@@ -2005,6 +1945,7 @@ headerbar {
       headerbar button:backdrop,
       headerbar.selection-mode button:backdrop.flat,
       headerbar.selection-mode button:backdrop {
+        color: #d4e4ff;
         border-color: #2777ff;
         background-image: image(#2777ff);
         text-shadow: none;
@@ -2012,16 +1953,6 @@ headerbar {
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         -gtk-icon-effect: none;
         border-color: #0051da; }
-        .selection-mode .titlebar:not(headerbar) button:backdrop.flat label, .selection-mode .titlebar:not(headerbar) button:backdrop.flat, .selection-mode .titlebar:not(headerbar) button:backdrop label, .selection-mode .titlebar:not(headerbar) button:backdrop, .selection-mode.titlebar:not(headerbar) button:backdrop.flat label, .selection-mode.titlebar:not(headerbar) button:backdrop.flat, .selection-mode.titlebar:not(headerbar) button:backdrop label, .selection-mode.titlebar:not(headerbar) button:backdrop, .selection-mode
-        headerbar button:backdrop.flat label, .selection-mode
-        headerbar button:backdrop.flat, .selection-mode
-        headerbar button:backdrop label, .selection-mode
-        headerbar button:backdrop,
-        headerbar.selection-mode button:backdrop.flat label,
-        headerbar.selection-mode button:backdrop.flat,
-        headerbar.selection-mode button:backdrop label,
-        headerbar.selection-mode button:backdrop {
-          color: #d4e4ff; }
         .selection-mode .titlebar:not(headerbar) button:backdrop.flat:active, .selection-mode .titlebar:not(headerbar) button:backdrop.flat:checked, .selection-mode .titlebar:not(headerbar) button:backdrop:active, .selection-mode .titlebar:not(headerbar) button:backdrop:checked, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:active, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:active, .selection-mode.titlebar:not(headerbar) button:backdrop:checked, .selection-mode
         headerbar button:backdrop.flat:active, .selection-mode
         headerbar button:backdrop.flat:checked, .selection-mode
@@ -2031,49 +1962,23 @@ headerbar {
         headerbar.selection-mode button:backdrop.flat:checked,
         headerbar.selection-mode button:backdrop:active,
         headerbar.selection-mode button:backdrop:checked {
+          color: #d2e3ff;
           border-color: #1e71fe;
           background-image: image(#1e71fe);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #0051da; }
-          .selection-mode .titlebar:not(headerbar) button:backdrop.flat:active label, .selection-mode .titlebar:not(headerbar) button:backdrop.flat:active, .selection-mode .titlebar:not(headerbar) button:backdrop.flat:checked label, .selection-mode .titlebar:not(headerbar) button:backdrop.flat:checked, .selection-mode .titlebar:not(headerbar) button:backdrop:active label, .selection-mode .titlebar:not(headerbar) button:backdrop:active, .selection-mode .titlebar:not(headerbar) button:backdrop:checked label, .selection-mode .titlebar:not(headerbar) button:backdrop:checked, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:active label, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:active, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:checked label, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:active label, .selection-mode.titlebar:not(headerbar) button:backdrop:active, .selection-mode.titlebar:not(headerbar) button:backdrop:checked label, .selection-mode.titlebar:not(headerbar) button:backdrop:checked, .selection-mode
-          headerbar button:backdrop.flat:active label, .selection-mode
-          headerbar button:backdrop.flat:active, .selection-mode
-          headerbar button:backdrop.flat:checked label, .selection-mode
-          headerbar button:backdrop.flat:checked, .selection-mode
-          headerbar button:backdrop:active label, .selection-mode
-          headerbar button:backdrop:active, .selection-mode
-          headerbar button:backdrop:checked label, .selection-mode
-          headerbar button:backdrop:checked,
-          headerbar.selection-mode button:backdrop.flat:active label,
-          headerbar.selection-mode button:backdrop.flat:active,
-          headerbar.selection-mode button:backdrop.flat:checked label,
-          headerbar.selection-mode button:backdrop.flat:checked,
-          headerbar.selection-mode button:backdrop:active label,
-          headerbar.selection-mode button:backdrop:active,
-          headerbar.selection-mode button:backdrop:checked label,
-          headerbar.selection-mode button:backdrop:checked {
-            color: #d2e3ff; }
         .selection-mode .titlebar:not(headerbar) button:backdrop.flat:disabled, .selection-mode .titlebar:not(headerbar) button:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled, .selection-mode
         headerbar button:backdrop.flat:disabled, .selection-mode
         headerbar button:backdrop:disabled,
         headerbar.selection-mode button:backdrop.flat:disabled,
         headerbar.selection-mode button:backdrop:disabled {
+          color: #87b4fe;
           border-color: #478bfe;
           background-image: image(#478bfe);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #0051da; }
-          .selection-mode .titlebar:not(headerbar) button:backdrop.flat:disabled label, .selection-mode .titlebar:not(headerbar) button:backdrop.flat:disabled, .selection-mode .titlebar:not(headerbar) button:backdrop:disabled label, .selection-mode .titlebar:not(headerbar) button:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled label, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled label, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled, .selection-mode
-          headerbar button:backdrop.flat:disabled label, .selection-mode
-          headerbar button:backdrop.flat:disabled, .selection-mode
-          headerbar button:backdrop:disabled label, .selection-mode
-          headerbar button:backdrop:disabled,
-          headerbar.selection-mode button:backdrop.flat:disabled label,
-          headerbar.selection-mode button:backdrop.flat:disabled,
-          headerbar.selection-mode button:backdrop:disabled label,
-          headerbar.selection-mode button:backdrop:disabled {
-            color: #87b4fe; }
           .selection-mode .titlebar:not(headerbar) button:backdrop.flat:disabled:active, .selection-mode .titlebar:not(headerbar) button:backdrop.flat:disabled:checked, .selection-mode .titlebar:not(headerbar) button:backdrop:disabled:active, .selection-mode .titlebar:not(headerbar) button:backdrop:disabled:checked, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled:active, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled:checked, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:active, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:checked, .selection-mode
           headerbar button:backdrop.flat:disabled:active, .selection-mode
           headerbar button:backdrop.flat:disabled:checked, .selection-mode
@@ -2083,21 +1988,12 @@ headerbar {
           headerbar.selection-mode button:backdrop.flat:disabled:checked,
           headerbar.selection-mode button:backdrop:disabled:active,
           headerbar.selection-mode button:backdrop:disabled:checked {
+            color: #6da3fe;
             border-color: #1e71fe;
             background-image: image(#1e71fe);
             box-shadow: inset 0 1px rgba(255, 255, 255, 0);
             border-color: #0051da; }
-            .selection-mode .titlebar:not(headerbar) button:backdrop.flat:disabled:active label, .selection-mode .titlebar:not(headerbar) button:backdrop.flat:disabled:checked label, .selection-mode .titlebar:not(headerbar) button:backdrop:disabled:active label, .selection-mode .titlebar:not(headerbar) button:backdrop:disabled:checked label, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled:active label, .selection-mode.titlebar:not(headerbar) button:backdrop.flat:disabled:checked label, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:active label, .selection-mode.titlebar:not(headerbar) button:backdrop:disabled:checked label, .selection-mode
-            headerbar button:backdrop.flat:disabled:active label, .selection-mode
-            headerbar button:backdrop.flat:disabled:checked label, .selection-mode
-            headerbar button:backdrop:disabled:active label, .selection-mode
-            headerbar button:backdrop:disabled:checked label,
-            headerbar.selection-mode button:backdrop.flat:disabled:active label,
-            headerbar.selection-mode button:backdrop.flat:disabled:checked label,
-            headerbar.selection-mode button:backdrop:disabled:active label,
-            headerbar.selection-mode button:backdrop:disabled:checked label {
-              color: #6da3fe; }
-      .selection-mode .titlebar:not(headerbar) button.flat:backdrop, .selection-mode .titlebar:not(headerbar) button.flat:disabled, .selection-mode .titlebar:not(headerbar) button.flat:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button.flat:backdrop, .selection-mode.titlebar:not(headerbar) button.flat:disabled, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled, .selection-mode
+      .selection-mode button.titlebutton:backdrop, .selection-mode button.titlebutton:disabled, .selection-mode button.titlebutton:backdrop:disabled, .selection-mode .titlebar:not(headerbar) button.flat:backdrop, .selection-mode .titlebar:not(headerbar) button.flat:disabled, .selection-mode .titlebar:not(headerbar) button.flat:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button.flat:backdrop, .selection-mode.titlebar:not(headerbar) button.flat:disabled, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled, .selection-mode
       headerbar button.flat:backdrop, .selection-mode
       headerbar button.flat:disabled, .selection-mode
       headerbar button.flat:backdrop:disabled,
@@ -2113,35 +2009,21 @@ headerbar {
       .selection-mode .titlebar:not(headerbar) button:disabled, .selection-mode.titlebar:not(headerbar) button:disabled, .selection-mode
       headerbar button:disabled,
       headerbar.selection-mode button:disabled {
+        color: #a3c5ff;
         border-color: #005af3;
         background-image: image(#478bfe);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        .selection-mode .titlebar:not(headerbar) button:disabled label, .selection-mode .titlebar:not(headerbar) button:disabled, .selection-mode.titlebar:not(headerbar) button:disabled label, .selection-mode.titlebar:not(headerbar) button:disabled, .selection-mode
-        headerbar button:disabled label, .selection-mode
-        headerbar button:disabled,
-        headerbar.selection-mode button:disabled label,
-        headerbar.selection-mode button:disabled {
-          color: #a3c5ff; }
         .selection-mode .titlebar:not(headerbar) button:disabled:active, .selection-mode .titlebar:not(headerbar) button:disabled:checked, .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked, .selection-mode
         headerbar button:disabled:active, .selection-mode
         headerbar button:disabled:checked,
         headerbar.selection-mode button:disabled:active,
         headerbar.selection-mode button:disabled:checked {
+          color: #a5c6ff;
           border-color: #005af3;
           background-image: image(#1e71fe);
           box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-          .selection-mode .titlebar:not(headerbar) button:disabled:active label, .selection-mode .titlebar:not(headerbar) button:disabled:active, .selection-mode .titlebar:not(headerbar) button:disabled:checked label, .selection-mode .titlebar:not(headerbar) button:disabled:checked, .selection-mode.titlebar:not(headerbar) button:disabled:active label, .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked label, .selection-mode.titlebar:not(headerbar) button:disabled:checked, .selection-mode
-          headerbar button:disabled:active label, .selection-mode
-          headerbar button:disabled:active, .selection-mode
-          headerbar button:disabled:checked label, .selection-mode
-          headerbar button:disabled:checked,
-          headerbar.selection-mode button:disabled:active label,
-          headerbar.selection-mode button:disabled:active,
-          headerbar.selection-mode button:disabled:checked label,
-          headerbar.selection-mode button:disabled:checked {
-            color: #a5c6ff; }
       .selection-mode .titlebar:not(headerbar) button.suggested-action, .selection-mode.titlebar:not(headerbar) button.suggested-action, .selection-mode
       headerbar button.suggested-action,
       headerbar.selection-mode button.suggested-action {
@@ -2180,48 +2062,33 @@ headerbar {
         .selection-mode .titlebar:not(headerbar) button.suggested-action:disabled, .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled, .selection-mode
         headerbar button.suggested-action:disabled,
         headerbar.selection-mode button.suggested-action:disabled {
+          color: #aeb0b6;
           border-color: #d9d9d9;
           background-image: image(#fdfdfd);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #0051da; }
-          .selection-mode .titlebar:not(headerbar) button.suggested-action:disabled label, .selection-mode .titlebar:not(headerbar) button.suggested-action:disabled, .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled label, .selection-mode.titlebar:not(headerbar) button.suggested-action:disabled, .selection-mode
-          headerbar button.suggested-action:disabled label, .selection-mode
-          headerbar button.suggested-action:disabled,
-          headerbar.selection-mode button.suggested-action:disabled label,
-          headerbar.selection-mode button.suggested-action:disabled {
-            color: #aeb0b6; }
         .selection-mode .titlebar:not(headerbar) button.suggested-action:backdrop, .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop, .selection-mode
         headerbar button.suggested-action:backdrop,
         headerbar.selection-mode button.suggested-action:backdrop {
+          color: #aeb0b6;
           border-color: #e0e0e0;
           background-image: image(#ffffff);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #0051da; }
-          .selection-mode .titlebar:not(headerbar) button.suggested-action:backdrop label, .selection-mode .titlebar:not(headerbar) button.suggested-action:backdrop, .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop label, .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop, .selection-mode
-          headerbar button.suggested-action:backdrop label, .selection-mode
-          headerbar button.suggested-action:backdrop,
-          headerbar.selection-mode button.suggested-action:backdrop label,
-          headerbar.selection-mode button.suggested-action:backdrop {
-            color: #aeb0b6; }
         .selection-mode .titlebar:not(headerbar) button.suggested-action:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop:disabled, .selection-mode
         headerbar button.suggested-action:backdrop:disabled,
         headerbar.selection-mode button.suggested-action:backdrop:disabled {
+          color: #d9d9d9;
           border-color: #e0e0e0;
           background-image: image(#fdfdfd);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #0051da; }
-          .selection-mode .titlebar:not(headerbar) button.suggested-action:backdrop:disabled label, .selection-mode .titlebar:not(headerbar) button.suggested-action:backdrop:disabled, .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop:disabled label, .selection-mode.titlebar:not(headerbar) button.suggested-action:backdrop:disabled, .selection-mode
-          headerbar button.suggested-action:backdrop:disabled label, .selection-mode
-          headerbar button.suggested-action:backdrop:disabled,
-          headerbar.selection-mode button.suggested-action:backdrop:disabled label,
-          headerbar.selection-mode button.suggested-action:backdrop:disabled {
-            color: #d9d9d9; }
     .selection-mode .titlebar:not(headerbar) .selection-menu:backdrop, .selection-mode .titlebar:not(headerbar) .selection-menu, .selection-mode.titlebar:not(headerbar) .selection-menu:backdrop, .selection-mode.titlebar:not(headerbar) .selection-menu, .selection-mode
     headerbar .selection-menu:backdrop, .selection-mode
     headerbar .selection-menu,
@@ -2430,16 +2297,10 @@ window.csd > .titlebar:not(headerbar) {
   background-color: #d9d9d9; }
 
 window.devel headerbar.titlebar:not(.selection-mode) {
-  background: #ffffff -gtk-icontheme("system-run-symbolic") 90% 0/256px 256px no-repeat, linear-gradient(to right, transparent 65%, rgba(39, 119, 255, 0.2)), linear-gradient(to top, #dedede, #e6e6e6 3px, whitesmoke);
-  color: rgba(92, 97, 108, 0.1); }
-  window.devel headerbar.titlebar:not(.selection-mode) label {
-    color: #5c616c; }
+  background: #ffffff cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat, linear-gradient(to right, transparent 65%, rgba(39, 119, 255, 0.2)), linear-gradient(to top, #dedede, #e6e6e6 3px, whitesmoke); }
   window.devel headerbar.titlebar:not(.selection-mode):backdrop {
-    background: #ffffff -gtk-icontheme("system-run-symbolic") 90% 0/256px 256px no-repeat, image(#ffffff);
-    /* background-color would flash */
-    color: rgba(92, 97, 108, 0.05); }
-    window.devel headerbar.titlebar:not(.selection-mode):backdrop label {
-      color: #aeb0b6; }
+    background: #ffffff cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat, image(#ffffff);
+    /* background-color would flash */ }
 
 /************
  * Pathbars *
@@ -2765,6 +2626,9 @@ popover.background {
   .csd popover.background, popover.background {
     border: 1px solid #d9d9d9;
     border-radius: 9px; }
+  .csd popover.background {
+    background-clip: padding-box;
+    border-color: rgba(0, 0, 0, 0.23); }
   popover.background:backdrop {
     background-color: #ffffff;
     box-shadow: none; }
@@ -3172,32 +3036,29 @@ switch {
   switch:checked slider {
     border: 1px solid #0051da; }
   switch:disabled slider {
+    color: #aeb0b6;
     border-color: #d9d9d9;
     background-image: image(#fdfdfd);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    switch:disabled slider label, switch:disabled slider {
-      color: #aeb0b6; }
   switch:backdrop slider {
     transition: 200ms ease-out;
+    color: #aeb0b6;
     border-color: #e0e0e0;
     background-image: image(#ffffff);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    switch:backdrop slider label, switch:backdrop slider {
-      color: #aeb0b6; }
   switch:backdrop:checked slider {
     border-color: #2777ff; }
   switch:backdrop:disabled slider {
+    color: #d9d9d9;
     border-color: #e0e0e0;
     background-image: image(#fdfdfd);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    switch:backdrop:disabled slider label, switch:backdrop:disabled slider {
-      color: #d9d9d9; }
   row:selected switch {
     box-shadow: none;
     border-color: #0051da; }
@@ -3663,30 +3524,27 @@ scale {
     scale slider:active {
       border-color: #0051da; }
     scale slider:disabled {
+      color: #aeb0b6;
       border-color: #d9d9d9;
       background-image: image(#fdfdfd);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      scale slider:disabled label, scale slider:disabled {
-        color: #aeb0b6; }
     scale slider:backdrop {
       transition: 200ms ease-out;
+      color: #aeb0b6;
       border-color: #e0e0e0;
       background-image: image(#ffffff);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      scale slider:backdrop label, scale slider:backdrop {
-        color: #aeb0b6; }
       scale slider:backdrop:disabled {
+        color: #d9d9d9;
         border-color: #e0e0e0;
         background-image: image(#fdfdfd);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        scale slider:backdrop:disabled label, scale slider:backdrop:disabled {
-          color: #d9d9d9; }
     row:selected scale slider:disabled, row:selected scale slider {
       border-color: #0051da; }
     .osd scale slider {
@@ -4442,6 +4300,7 @@ list {
   background-color: #fafafa;
   border-color: #d9d9d9; }
   list:backdrop {
+    color: #313131;
     background-color: #f7f7f7;
     border-color: #e0e0e0; }
   list row {
@@ -4553,13 +4412,28 @@ messagedialog.csd .dialog-action-area button {
   border-left-style: solid;
   border-right-style: none;
   border-bottom-style: none; }
-  messagedialog.csd .dialog-action-area button:first-child {
+  messagedialog.csd .dialog-action-area button:first-child:not(:only-child) {
     border-left-style: none;
     border-bottom-left-radius: 7px;
-    -gtk-outline-bottom-left-radius: 5px; }
-  messagedialog.csd .dialog-action-area button:last-child {
+    -gtk-outline-bottom-left-radius: 7px;
+    -gtk-outline-top-left-radius: 0px;
+    -gtk-outline-top-right-radius: 0px;
+    -gtk-outline-bottom-right-radius: 0px; }
+  messagedialog.csd .dialog-action-area button:last-child:not(:only-child) {
     border-bottom-right-radius: 7px;
-    -gtk-outline-bottom-right-radius: 5px; }
+    -gtk-outline-bottom-right-radius: 7px;
+    -gtk-outline-top-right-radius: 0px;
+    -gtk-outline-bottom-left-radius: 0px;
+    -gtk-outline-top-left-radius: 0px; }
+  messagedialog.csd .dialog-action-area button:only-child {
+    border-top-right-radius: 0;
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 7px;
+    border-bottom-right-radius: 7px;
+    -gtk-outline-top-right-radius: 0px;
+    -gtk-outline-top-left-radius: 0px;
+    -gtk-outline-bottom-left-radius: 7px;
+    -gtk-outline-bottom-right-radius: 7px; }
 
 filechooser .dialog-action-box {
   border-top: 1px solid #d9d9d9; }
@@ -4740,6 +4614,9 @@ paned.vertical > separator {
  **************/
 infobar {
   border-style: none; }
+  infobar.action:hover > revealer > box {
+    background-color: #f7e9d1;
+    border-bottom: 1px solid #e6e6e6; }
   infobar.info, infobar.question, infobar.warning, infobar.error {
     text-shadow: none; }
     infobar.info:backdrop > revealer > box, infobar.info > revealer > box, infobar.question:backdrop > revealer > box, infobar.question > revealer > box, infobar.warning:backdrop > revealer > box, infobar.warning > revealer > box, infobar.error:backdrop > revealer > box, infobar.error > revealer > box {
@@ -4776,31 +4653,28 @@ infobar {
         text-shadow: none;
         -gtk-icon-shadow: none; }
       infobar.info button:disabled, infobar.question button:disabled, infobar.warning button:disabled, infobar.error button:disabled {
+        color: #aeb0b6;
         border-color: #d9d9d9;
         background-image: image(#fdfdfd);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-        infobar.info button:disabled label, infobar.info button:disabled, infobar.question button:disabled label, infobar.question button:disabled, infobar.warning button:disabled label, infobar.warning button:disabled, infobar.error button:disabled label, infobar.error button:disabled {
-          color: #aeb0b6; }
       infobar.info button:backdrop, infobar.question button:backdrop, infobar.warning button:backdrop, infobar.error button:backdrop {
+        color: #aeb0b6;
         border-color: #e0e0e0;
         background-image: image(#ffffff);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #e6e6e6; }
-        infobar.info button:backdrop label, infobar.info button:backdrop, infobar.question button:backdrop label, infobar.question button:backdrop, infobar.warning button:backdrop label, infobar.warning button:backdrop, infobar.error button:backdrop label, infobar.error button:backdrop {
-          color: #aeb0b6; }
         infobar.info button:backdrop:disabled, infobar.question button:backdrop:disabled, infobar.warning button:backdrop:disabled, infobar.error button:backdrop:disabled {
+          color: #d9d9d9;
           border-color: #e0e0e0;
           background-image: image(#fdfdfd);
           text-shadow: none;
           -gtk-icon-shadow: none;
           box-shadow: inset 0 1px rgba(255, 255, 255, 0);
           border-color: #e6e6e6; }
-          infobar.info button:backdrop:disabled label, infobar.info button:backdrop:disabled, infobar.question button:backdrop:disabled label, infobar.question button:backdrop:disabled, infobar.warning button:backdrop:disabled label, infobar.warning button:backdrop:disabled, infobar.error button:backdrop:disabled label, infobar.error button:backdrop:disabled {
-            color: #d9d9d9; }
       infobar.info button:backdrop label, infobar.info button:backdrop, infobar.info button label, infobar.info button, infobar.question button:backdrop label, infobar.question button:backdrop, infobar.question button label, infobar.question button, infobar.warning button:backdrop label, infobar.warning button:backdrop, infobar.warning button label, infobar.warning button, infobar.error button:backdrop label, infobar.error button:backdrop, infobar.error button label, infobar.error button {
         color: #5c616c; }
     infobar.info selection, infobar.question selection, infobar.warning selection, infobar.error selection {
@@ -4920,13 +4794,12 @@ colorswatch#add-color-button {
       box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0, 0.07);
       background-image: linear-gradient(to top, #ffffff, white 1px); }
     colorswatch#add-color-button overlay:backdrop {
+      color: #aeb0b6;
       border-color: #e0e0e0;
       background-image: image(#ffffff);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      colorswatch#add-color-button overlay:backdrop label, colorswatch#add-color-button overlay:backdrop {
-        color: #aeb0b6; }
 
 colorswatch:disabled {
   opacity: 0.5; }
@@ -5036,28 +4909,28 @@ textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical
 entry selection, modelbutton.flat:selected,
 .menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected {
   background-color: #2777ff; }
-  row:selected label, label:selected, .selection-mode button.titlebutton, .view:selected:focus, .view:selected, iconview:selected, .view text:selected, iconview text:selected,
+  label:selected, .selection-mode button.titlebutton, .view:selected:focus, .view:selected, iconview:selected, .view text:selected, iconview text:selected,
   textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection,
   textview text selection:focus,
   textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical) selection,
   entry selection, modelbutton.flat:selected,
   .menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected {
     color: #ffffff; }
-    label:disabled selection, row:selected label:disabled, label:disabled:selected, .selection-mode button.titlebutton:disabled, iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected, iconview text:disabled:selected:focus,
+    label:disabled selection, label:disabled:selected, .selection-mode button.titlebutton:disabled, iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected, iconview text:disabled:selected:focus,
     textview text:disabled:selected:focus, .view text:disabled:selected, iconview text:disabled:selected,
     textview text:disabled:selected, iconview text selection:disabled:focus, .view text selection:disabled, iconview text selection:disabled,
     textview text selection:disabled, flowbox flowboxchild:disabled:selected, spinbutton:not(.vertical) selection:disabled,
     entry selection:disabled, modelbutton.flat:disabled:selected,
     .menuitem.button.flat:disabled:selected, row:disabled:selected, calendar:disabled:selected {
       color: #93bbff; }
-    label:backdrop selection, row:selected label:backdrop, label:backdrop:selected, .selection-mode button.titlebutton:backdrop, iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected, iconview text:backdrop:selected:focus,
+    label:backdrop selection, label:backdrop:selected, .selection-mode button.titlebutton:backdrop, iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected, iconview text:backdrop:selected:focus,
     textview text:backdrop:selected:focus, .view text:backdrop:selected, iconview text:backdrop:selected,
     textview text:backdrop:selected, iconview text selection:backdrop:focus, .view text selection:backdrop, iconview text selection:backdrop,
     textview text selection:backdrop, flowbox flowboxchild:backdrop:selected, spinbutton:not(.vertical) selection:backdrop,
     entry selection:backdrop, modelbutton.flat:backdrop:selected,
     .menuitem.button.flat:backdrop:selected, row:backdrop:selected, calendar:backdrop:selected {
       color: #f7f7f7; }
-      label:backdrop selection:disabled, row:selected label:backdrop:disabled, label:backdrop:disabled:selected, .selection-mode button.titlebutton:backdrop:disabled, .view:backdrop:disabled:selected, iconview:backdrop:disabled:selected, .view text:backdrop:disabled:selected, iconview text:backdrop:disabled:selected,
+      label:backdrop selection:disabled, label:backdrop:disabled:selected, .selection-mode button.titlebutton:backdrop:disabled, .view:backdrop:disabled:selected, iconview:backdrop:disabled:selected, .view text:backdrop:disabled:selected, iconview text:backdrop:disabled:selected,
       textview text:backdrop:disabled:selected, .view text selection:backdrop:disabled, iconview text selection:backdrop:disabled,
       textview text selection:backdrop:disabled, flowbox flowboxchild:backdrop:disabled:selected, spinbutton:not(.vertical) selection:backdrop:disabled,
       entry selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected,
@@ -5356,10 +5229,10 @@ infobar, infobar.info, infobar.question, infobar.warning, infobar.error {
   infobar *:link, infobar.info *:link, infobar.question *:link, infobar.warning *:link, infobar.error *:link {
     color: #005af3; }
 
-infobar.info:backdrop > revealer > box, infobar.info > revealer > box {
+infobar.info:backdrop > revealer > box, infobar.info > revealer > box, infobar.info.action:hover:backdrop > revealer > box, infobar.info.action:hover > revealer > box {
   background-color: #2777ff; }
 
-infobar.info button {
+infobar.info button, infobar.info.action:hover button {
   color: #ffffff;
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #005af3;
@@ -5368,7 +5241,7 @@ infobar.info button {
   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), 0 1px 2px rgba(0, 0, 0, 0.07); }
-  infobar.info button:hover {
+  infobar.info button:hover, infobar.info.action:hover button:hover {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #005af3;
@@ -5377,7 +5250,7 @@ infobar.info button {
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.490824);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.07);
     background-image: linear-gradient(to top, #2777ff, #2c7aff 1px); }
-  infobar.info button:active, infobar.info button:checked {
+  infobar.info button:active, infobar.info button:checked, infobar.info.action:hover button:active, infobar.info.action:hover button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #005af3;
@@ -5385,39 +5258,36 @@ infobar.info button {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none; }
-  infobar.info button:disabled {
+  infobar.info button:disabled, infobar.info.action:hover button:disabled {
+    color: #a3c5ff;
     border-color: #005af3;
     background-image: image(#478bfe);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    infobar.info button:disabled label, infobar.info button:disabled {
-      color: #a3c5ff; }
-  infobar.info button:backdrop {
+  infobar.info button:backdrop, infobar.info.action:hover button:backdrop {
+    color: #d4e4ff;
     border-color: #2777ff;
     background-image: image(#2777ff);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     border-color: #005af3; }
-    infobar.info button:backdrop label, infobar.info button:backdrop {
-      color: #d4e4ff; }
-    infobar.info button:backdrop:disabled {
+    infobar.info button:backdrop:disabled, infobar.info.action:hover button:backdrop:disabled {
+      color: #87b4fe;
       border-color: #478bfe;
       background-image: image(#478bfe);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #005af3; }
-      infobar.info button:backdrop:disabled label, infobar.info button:backdrop:disabled {
-        color: #87b4fe; }
-  infobar.info button:backdrop label, infobar.info button:backdrop, infobar.info button label, infobar.info button {
+  infobar.info button:backdrop label, infobar.info button:backdrop, infobar.info button label, infobar.info button, infobar.info.action:hover button:backdrop label, infobar.info.action:hover button:backdrop, infobar.info.action:hover button label, infobar.info.action:hover button {
     color: #ffffff; }
 
-infobar.question:backdrop > revealer > box, infobar.question > revealer > box, infobar.warning:backdrop > revealer > box, infobar.warning > revealer > box {
+infobar.question:backdrop > revealer > box, infobar.question > revealer > box, infobar.warning:backdrop > revealer > box, infobar.warning > revealer > box, infobar.question.action:hover:backdrop > revealer > box, infobar.question.action:hover > revealer > box, infobar.warning.action:hover:backdrop > revealer > box, infobar.warning.action:hover > revealer > box {
   background-color: #fd7d00; }
 
-infobar.question button, infobar.warning button {
+infobar.question button, infobar.warning button, infobar.question.action:hover button, infobar.warning.action:hover button {
   color: #ffffff;
   outline-color: rgba(255, 255, 255, 0.3);
   border-color: #ca6400;
@@ -5426,7 +5296,7 @@ infobar.question button, infobar.warning button {
   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), 0 1px 2px rgba(0, 0, 0, 0.07); }
-  infobar.question button:hover, infobar.warning button:hover {
+  infobar.question button:hover, infobar.warning button:hover, infobar.question.action:hover button:hover, infobar.warning.action:hover button:hover {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #ca6400;
@@ -5435,7 +5305,7 @@ infobar.question button, infobar.warning button {
     -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.555137);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.07);
     background-image: linear-gradient(to top, #fd7d00, #ff8003 1px); }
-  infobar.question button:active, infobar.question button:checked, infobar.warning button:active, infobar.warning button:checked {
+  infobar.question button:active, infobar.question button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.question.action:hover button:active, infobar.question.action:hover button:checked, infobar.warning.action:hover button:active, infobar.warning.action:hover button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #ca6400;
@@ -5443,38 +5313,35 @@ infobar.question button, infobar.warning button {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none; }
-  infobar.question button:disabled, infobar.warning button:disabled {
+  infobar.question button:disabled, infobar.warning button:disabled, infobar.question.action:hover button:disabled, infobar.warning.action:hover button:disabled {
+    color: #fec892;
     border-color: #ca6400;
     background-image: image(#fd9025);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-    infobar.question button:disabled label, infobar.question button:disabled, infobar.warning button:disabled label, infobar.warning button:disabled {
-      color: #fec892; }
-  infobar.question button:backdrop, infobar.warning button:backdrop {
+  infobar.question button:backdrop, infobar.warning button:backdrop, infobar.question.action:hover button:backdrop, infobar.warning.action:hover button:backdrop {
+    color: #ffe5cc;
     border-color: #fd7d00;
     background-image: image(#fd7d00);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     border-color: #ca6400; }
-    infobar.question button:backdrop label, infobar.question button:backdrop, infobar.warning button:backdrop label, infobar.warning button:backdrop {
-      color: #ffe5cc; }
-    infobar.question button:backdrop:disabled, infobar.warning button:backdrop:disabled {
+    infobar.question button:backdrop:disabled, infobar.warning button:backdrop:disabled, infobar.question.action:hover button:backdrop:disabled, infobar.warning.action:hover button:backdrop:disabled {
+      color: #feb771;
       border-color: #fd9025;
       background-image: image(#fd9025);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #ca6400; }
-      infobar.question button:backdrop:disabled label, infobar.question button:backdrop:disabled, infobar.warning button:backdrop:disabled label, infobar.warning button:backdrop:disabled {
-        color: #feb771; }
-  infobar.question button:backdrop label, infobar.question button:backdrop, infobar.question button label, infobar.question button, infobar.warning button:backdrop label, infobar.warning button:backdrop, infobar.warning button label, infobar.warning button {
+  infobar.question button:backdrop label, infobar.question button:backdrop, infobar.question button label, infobar.question button, infobar.warning button:backdrop label, infobar.warning button:backdrop, infobar.warning button label, infobar.warning button, infobar.question.action:hover button:backdrop label, infobar.question.action:hover button:backdrop, infobar.question.action:hover button label, infobar.question.action:hover button, infobar.warning.action:hover button:backdrop label, infobar.warning.action:hover button:backdrop, infobar.warning.action:hover button label, infobar.warning.action:hover button {
     color: #ffffff; }
 
-infobar.error:backdrop > revealer > box, infobar.error > revealer > box {
+infobar.error:backdrop > revealer > box, infobar.error > revealer > box, infobar.error.action:hover:backdrop > revealer > box, infobar.error.action:hover > revealer > box {
   background-color: #bf1717; }
-  infobar.error:backdrop > revealer > box button, infobar.error > revealer > box button {
+  infobar.error:backdrop > revealer > box button, infobar.error > revealer > box button, infobar.error.action:hover:backdrop > revealer > box button, infobar.error.action:hover > revealer > box button {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #911212;
@@ -5483,7 +5350,7 @@ infobar.error:backdrop > revealer > box, infobar.error > revealer > box {
     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), 0 1px 2px rgba(0, 0, 0, 0.07); }
-    infobar.error:backdrop > revealer > box button:hover, infobar.error > revealer > box button:hover {
+    infobar.error:backdrop > revealer > box button:hover, infobar.error > revealer > box button:hover, infobar.error.action:hover:backdrop > revealer > box button:hover, infobar.error.action:hover > revealer > box button:hover {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #911212;
@@ -5492,7 +5359,7 @@ infobar.error:backdrop > revealer > box, infobar.error > revealer > box {
       -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.616314);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px 2px rgba(0, 0, 0, 0.07);
       background-image: linear-gradient(to top, #bf1717, #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: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;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #911212;
@@ -5500,33 +5367,30 @@ infobar.error:backdrop > revealer > box, infobar.error > revealer > box {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       text-shadow: none;
       -gtk-icon-shadow: none; }
-    infobar.error:backdrop > revealer > box button:disabled, infobar.error > revealer > box button:disabled {
+    infobar.error:backdrop > revealer > box button:disabled, infobar.error > revealer > box button:disabled, infobar.error.action:hover:backdrop > revealer > box button:disabled, infobar.error.action:hover > revealer > box button:disabled {
+      color: #e49c9c;
       border-color: #911212;
       background-image: image(#c83939);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      infobar.error:backdrop > revealer > box button:disabled label, infobar.error:backdrop > revealer > box button:disabled, infobar.error > revealer > box button:disabled label, infobar.error > revealer > box button:disabled {
-        color: #e49c9c; }
-    infobar.error:backdrop > revealer > box button:backdrop, infobar.error > revealer > box button:backdrop {
+    infobar.error:backdrop > revealer > box button:backdrop, infobar.error > revealer > box button:backdrop, infobar.error.action:hover:backdrop > revealer > box button:backdrop, infobar.error.action:hover > revealer > box button:backdrop {
+      color: #f2d1d1;
       border-color: #bf1717;
       background-image: image(#bf1717);
       text-shadow: none;
       -gtk-icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0);
       border-color: #911212; }
-      infobar.error:backdrop > revealer > box button:backdrop label, infobar.error:backdrop > revealer > box button:backdrop, infobar.error > revealer > box button:backdrop label, infobar.error > revealer > box button:backdrop {
-        color: #f2d1d1; }
-      infobar.error:backdrop > revealer > box button:backdrop:disabled, infobar.error > revealer > box button:backdrop:disabled {
+      infobar.error:backdrop > revealer > box button:backdrop:disabled, infobar.error > revealer > box button:backdrop:disabled, infobar.error.action:hover:backdrop > revealer > box button:backdrop:disabled, infobar.error.action:hover > revealer > box button:backdrop:disabled {
+        color: #db7e7e;
         border-color: #c83939;
         background-image: image(#c83939);
         text-shadow: none;
         -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #911212; }
-        infobar.error:backdrop > revealer > box button:backdrop:disabled label, infobar.error:backdrop > revealer > box button:backdrop:disabled, infobar.error > revealer > box button:backdrop:disabled label, infobar.error > revealer > box button:backdrop:disabled {
-          color: #db7e7e; }
-    infobar.error:backdrop > revealer > box button:backdrop label, infobar.error:backdrop > revealer > box button:backdrop, infobar.error:backdrop > revealer > box button label, infobar.error:backdrop > revealer > box button, infobar.error > revealer > box button:backdrop label, infobar.error > revealer > box button:backdrop, infobar.error > revealer > box button label, infobar.error > revealer > box button {
+    infobar.error:backdrop > revealer > box button:backdrop label, infobar.error:backdrop > revealer > box button:backdrop, infobar.error:backdrop > revealer > box button label, infobar.error:backdrop > revealer > box button, infobar.error > revealer > box button:backdrop label, infobar.error > revealer > box button:backdrop, infobar.error > revealer > box button label, infobar.error > revealer > box button, infobar.error.action:hover:backdrop > revealer > box button:backdrop label, infobar.error.action:hover:backdrop > revealer > box button:backdrop, infobar.error.action:hover:backdrop > revealer > box button label, infobar.error.action:hover:backdrop > revealer > box button, infobar.error.action:hover > revealer > box button:backdrop label, infobar.error.action:hover > revealer > box button:backdrop, infobar.error.action:hover > revealer > box button label, infobar.error.action:hover > revealer > box button {
       color: #ffffff; }
 
 /*********************
diff --git a/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss b/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
index 86e82705..ba4de8d3 100644
--- a/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
+++ b/src/themes/Kali/sass/gtk-sass/_common-tweaks.scss
@@ -186,8 +186,8 @@ infobar {
   &.warning,
   &.error {
 
-  border-style: none;
-  text-shadow: none;
+    border-style: none;
+    text-shadow: none;
 
     &:backdrop > revealer > box, & > revealer > box {
       label, & { color: $selected_fg_color; }
@@ -200,7 +200,7 @@ infobar {
     *:link { color: $link_color; }
   }
 
-  &.info {
+  &.info, &.info.action:hover {
     &:backdrop > revealer > box, & > revealer > box {
       background-color: $selected_bg_color;
     }
@@ -208,7 +208,7 @@ infobar {
     @include _infobar_button($selected_bg_color);
   }
 
-  &.question, &.warning {
+  &.question, &.warning, &.question.action:hover, &.warning.action:hover {
     &:backdrop > revealer > box, & > revealer > box {
       background-color: $warning_color;
     }
@@ -216,7 +216,7 @@ infobar {
     @include _infobar_button($warning_color);
   }
 
-  &.error {
+  &.error, &.error.action:hover {
     &:backdrop > revealer > box, & > revealer > box {
       background-color: $error_color;
 
diff --git a/src/themes/Kali/sass/gtk-sass/upstream/_common.scss b/src/themes/Kali/sass/gtk-sass/upstream/_common.scss
index d5349316..065e53c7 100644
--- a/src/themes/Kali/sass/gtk-sass/upstream/_common.scss
+++ b/src/themes/Kali/sass/gtk-sass/upstream/_common.scss
@@ -179,13 +179,8 @@ label {
 
   &.separator {
     @extend .dim-label;
-
-    color: $fg_color;
-
-    &:backdrop { color: $backdrop_fg_color; }
   }
 
-  row:selected &,
   &:selected { @extend %nobg_selected_items; }
 
   selection {
@@ -196,14 +191,18 @@ label {
   &:disabled {
     color: $insensitive_fg_color;
 
-    selection { @extend %selected_items_disabled; }
+    button & { color: inherit; }
 
-    &:backdrop { color: $backdrop_insensitive_color; }
+    &:backdrop {
+      color: $backdrop_insensitive_color;
+
+      button & { color: inherit; }
+    }
+
+    selection { @extend %selected_items_disabled; }
   }
 
   &:backdrop {
-    color: $backdrop_fg_color;
-
     selection { @extend %selected_items_backdrop; }
   }
 }
@@ -268,6 +267,47 @@ spinner {
   }
 }
 
+/**********************
+ * General Typography *
+ **********************/
+
+.large-title {
+   font-weight: 300;
+   font-size: 24pt;
+   letter-spacing: 0.2rem;
+}
+.title-1 {
+   font-weight: 800;
+   font-size: 20pt;
+}
+.title-2 {
+   font-weight: 800;
+   font-size: 15pt;
+}
+.title-3 {
+   font-weight: 700;
+   font-size: 15pt;
+}
+.title-4 {
+   font-weight: 700;
+   font-size: 13pt;
+}
+.heading {
+   font-weight: 700;
+   font-size: 11pt;
+}
+.body {
+   font-weight: 400;
+   font-size: 11pt;
+}
+.caption-heading {
+   font-weight: 700;
+   font-size: 9pt;
+}
+.caption {
+   font-weight: 400;
+   font-size: 9pt;
+}
 
 /****************
  * Text Entries *
@@ -591,6 +631,7 @@ button {
       }
     }
 
+    @at-root %button_basic_flat,
     &.flat { &:backdrop, &:disabled, &:backdrop:disabled { @include button(undecorated); }}
 
     &:disabled {
@@ -632,12 +673,16 @@ button {
   @at-root %button_selected, & {
     row:selected & {
       @if $variant == 'light' { border-color: $selected_borders_color; }
+    }
 
-      &.flat:not(:active):not(:checked):not(:hover):not(disabled) {
-        color: $selected_fg_color;
-        border-color: transparent;
+    @at-root %button_selected_flat, &.flat {
+      row:selected & {
+        &:not(:active):not(:checked):not(:hover):not(disabled) {
+          color: $selected_fg_color;
+          border-color: transparent;
 
-        &:backdrop { color: if($variant=='light', $backdrop_base_color, $backdrop_fg_color); }
+          &:backdrop { color: if($variant=='light', $backdrop_base_color, $backdrop_fg_color); }
+        }
       }
     }
   }
@@ -973,6 +1018,7 @@ toolbar.inline-toolbar toolbutton:backdrop {
 %linked_middle {
   border-radius: 0;
   border-right-style: none;
+  -gtk-outline-radius: 0;
 }
 
 %linked_left {
@@ -981,6 +1027,10 @@ toolbar.inline-toolbar toolbutton:backdrop {
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
     border-right-style: none;
+    -gtk-outline-bottom-left-radius: $button_radius;
+    -gtk-outline-top-left-radius: $button_radius;
+    -gtk-outline-top-right-radius: 0;
+    -gtk-outline-bottom-right-radius: 0;
 }
 
 %linked_right {
@@ -989,11 +1039,16 @@ toolbar.inline-toolbar toolbutton:backdrop {
     border-top-right-radius: $button_radius;
     border-bottom-right-radius: $button_radius;
     border-right-style: solid;
+    -gtk-outline-bottom-right-radius: $button_radius;
+    -gtk-outline-top-right-radius: $button_radius;
+    -gtk-outline-bottom-left-radius: 0;
+    -gtk-outline-top-left-radius: 0;
 }
 
 %linked_only_child {
     border-radius: $button_radius;
     border-style: solid;
+    -gtk-outline-radius: $button_radius;
 }
 
 // .linked assumes Box, which reverses nodes in RTL, so 1st child is always left
@@ -1137,28 +1192,29 @@ list row button.image-button:not(.flat) {
   &:visited {
     color: $link_visited_color;
 
-    *:selected & { color: mix($selected_fg_color, $selected_bg_color, 60%); }
+    *:selected & { color: mix($selected_fg_color, $link_visited_color, 60%); }
   }
 
   &:hover {
-    color: lighten($link_color,10%);
+    $_fg: lighten($link_color, 10%);
+    color: $_fg;
 
-    *:selected & { color: mix($selected_fg_color, $selected_bg_color, 90%); }
+    *:selected & { color: mix($selected_fg_color, $_fg, 90%); }
   }
 
   &:active {
     color: $link_color;
 
-    *:selected & { color: mix($selected_fg_color, $selected_bg_color, 80%); }
+    *:selected & { color: mix($selected_fg_color, $link_color, 80%); }
   }
 
-  &:disabled, &:disabled:backdrop { color: transparentize(desaturate($link_color,100%), 0.2); }
+  &:disabled, &:disabled:backdrop { color: transparentize(desaturate($link_color, 100%), 0.2); }
 
-  &:backdrop { &:backdrop:hover, &:backdrop:hover:selected, & { color: $selected_bg_color; }}
+  &:backdrop { &:backdrop:hover, &:backdrop:hover:selected, & { color: transparentize($link_color, 0.1); }}
 
   @at-root %link_selected,
   &:selected,
-  *:selected & { color: mix($selected_fg_color, $selected_bg_color, 80%); }
+  *:selected & { color: mix($selected_fg_color, $link_color, 80%); }
 }
 
 button:link,
@@ -1595,6 +1651,7 @@ headerbar {
     button {
       @include button(normal, $suggested_bg_color, $selected_fg_color);
 
+      @at-root %selection_mode_button_flat,
       &.flat { @include button(undecorated); }
 
       &:hover { @include button(hover, $suggested_bg_color, $selected_fg_color); }
@@ -1632,6 +1689,7 @@ headerbar {
         }
       }
 
+      @at-root %selection_mode_button_flat,
       &.flat { &:backdrop, &:disabled, &:backdrop:disabled { @include button(undecorated); }}
 
       &:disabled {
@@ -1841,26 +1899,20 @@ headerbar { // headerbar border rounding
 window.devel {
   headerbar.titlebar:not(.selection-mode) {
     $c: darken($bg_color, 10%);
-    $gradient: -gtk-icontheme("system-run-symbolic") 90% 0/256px 256px no-repeat,
+    $gradient: cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat,
                linear-gradient(to right, transparent 65%, transparentize($selected_bg_color, 0.8)),
                linear-gradient(to top, darken($c, 3%), $c 3px, lighten($c, 6%));
     @if $variant == 'dark' {
-      $gradient: -gtk-icontheme("system-run-symbolic") 90% 0/256px 256px no-repeat,
+      $gradient: cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat,
                  linear-gradient(to right, transparent 65%, transparentize($selected_bg_color, 0.9)),
                  linear-gradient(to top, lighten($c, 3%) 3px, lighten($c, 5%));
     }
 
     background: $bg_color $gradient;
-    color: transparentize($fg_color,.9);
-
-    label { color: $fg_color; }
 
     &:backdrop {
-      background: $bg_color -gtk-icontheme("system-run-symbolic") 90% 0/256px 256px no-repeat,
+      background: $bg_color cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px no-repeat,
                   image($bg_color); /* background-color would flash */
-      color: transparentize($fg_color,.95);
-
-      label { color: $backdrop_fg_color; }
     }
   }
 }
@@ -2282,6 +2334,13 @@ popover.background {
     border-radius: $popover_radius;
   }
 
+  .csd & {
+    $_popover_border: if($variant=='light', transparentize(black, 0.77), transparentize($borders_color, 0.1));
+
+    background-clip: padding-box;
+    border-color: $_popover_border;
+  }
+
   box-shadow: 0 1px 2px transparentize(black, 0.7);
 
   &:backdrop {
@@ -3778,6 +3837,7 @@ list {
   border-color: $borders_color;
 
   &:backdrop {
+    color: $backdrop_text_color;
     background-color: $backdrop_base_color;
     border-color: $backdrop_borders_color;
   }
@@ -3932,15 +3992,31 @@ messagedialog { // Message Dialog styling
       border-right-style: none;
       border-bottom-style: none;
 
-      &:first-child{
+      &:first-child:not(:only-child) {
         border-left-style: none;
-        border-bottom-left-radius: 7px;
-        -gtk-outline-bottom-left-radius: 5px;
+        border-bottom-left-radius: $button_radius + 2;
+        -gtk-outline-bottom-left-radius: $button_radius + 2;
+        -gtk-outline-top-left-radius: 0px;
+        -gtk-outline-top-right-radius: 0px;
+        -gtk-outline-bottom-right-radius: 0px;
       }
-
-      &:last-child {
-        border-bottom-right-radius: 7px;
-        -gtk-outline-bottom-right-radius: 5px;
+  
+      &:last-child:not(:only-child) {
+        border-bottom-right-radius: $button_radius + 2;
+        -gtk-outline-bottom-right-radius: $button_radius + 2;
+        -gtk-outline-top-right-radius: 0px;
+        -gtk-outline-bottom-left-radius: 0px;
+        -gtk-outline-top-left-radius: 0px;
+      }
+      &:only-child {
+        border-top-right-radius: 0;
+        border-top-left-radius: 0;
+        border-bottom-left-radius: $button_radius + 2;
+        border-bottom-right-radius: $button_radius + 2;
+        -gtk-outline-top-right-radius: 0px;
+        -gtk-outline-top-left-radius: 0px;
+        -gtk-outline-bottom-left-radius: $button_radius + 2;
+        -gtk-outline-bottom-right-radius: $button_radius + 2;
       }
     }
   }
@@ -4083,7 +4159,7 @@ placessidebar {
     @at-root button.sidebar-button {
       @extend %button_basic_flat;
 
-      @extend %button_selected.flat;
+      @extend %button_selected_flat;
 
       min-height: 26px;
       min-width: 26px;
@@ -4220,6 +4296,12 @@ paned {
 infobar {
   border-style: none;
 
+  &.action:hover > revealer > box {
+      background-color: if($variant == 'light', desaturate(lighten(invert($selected_bg_color), 47%), 30%), 
+                        desaturate(darken(invert($selected_bg_color),42%), 70%));
+      border-bottom: 1px solid lighten($borders_color, 5%);
+  }
+
   &.info,
   &.question,
   &.warning,
@@ -4571,7 +4653,7 @@ button.titlebutton {
   }
 
   .selection-mode & {
-    @extend %button.flat.suggested-action;
+    @extend %selection_mode_button_flat;
 
     @extend %nobg_selected_items;
   }
diff --git a/src/themes/Kali/sass/gtk-sass/upstream/_drawing.scss b/src/themes/Kali/sass/gtk-sass/upstream/_drawing.scss
index 5d57fd04..428b674a 100644
--- a/src/themes/Kali/sass/gtk-sass/upstream/_drawing.scss
+++ b/src/themes/Kali/sass/gtk-sass/upstream/_drawing.scss
@@ -285,8 +285,7 @@
   //
     $_bg: if($c != $bg_color, mix($c, $base_color, 85%), $insensitive_bg_color);
 
-    label, & { color: if($tc != $fg_color, mix($tc, $_bg, 50%), $insensitive_fg_color); }
-
+    color: if($tc != $fg_color, mix($tc, $_bg, 50%), $insensitive_fg_color);
     border-color: if($c != $bg_color, _border_color($c), $insensitive_borders_color);
     $button_fill: image($_bg) !global;
     background-image: $button_fill;
@@ -304,8 +303,7 @@
     $_bg: if($variant == 'light', darken(mix($c, $base_color, 85%), 8%), darken(mix($c, $base_color, 85%), 6%));
     $_bc: if($c != $bg_color, _border_color($c), $insensitive_borders_color);
 
-    label, & { color: if($c != $bg_color, mix($tc, $_bg, 60%), $insensitive_fg_color); }
-
+    color: if($c != $bg_color, mix($tc, $_bg, 60%), $insensitive_fg_color);
     border-color: $_bc;
     $button_fill: image($_bg) !global;
     background-image: $button_fill;
@@ -321,8 +319,7 @@
     $_bg: if($c != $bg_color, $c, $backdrop_bg_color);
     $_bc: if($variant == 'light', $c, _border_color($c));
 
-    label, & { color: if($tc != $fg_color, mix($tc, $_bg, 80%), $backdrop_fg_color); }
-
+    color: if($tc != $fg_color, mix($tc, $_bg, 80%), $backdrop_fg_color);
     border-color: if($c != $bg_color, $_bc, $backdrop_borders_color);
     $button_fill: image($_bg) !global;
     background-image: $button_fill;
@@ -338,8 +335,7 @@
     $_bg: if($variant == 'light', darken(mix($c, $base_color, 85%), 8%), darken(mix($c, $base_color, 85%), 4%));
     $_bc: if($variant == 'light', $_bg ,_border_color($c));
 
-    label, & { color: if($tc != $fg_color, mix($tc, $_bg, 80%), $backdrop_fg_color); }
-
+    color: if($tc != $fg_color, mix($tc, $_bg, 80%), $backdrop_fg_color);
     border-color: if($c != $bg_color, $_bc, $backdrop_borders_color);
     $button_fill: image($_bg) !global;
     background-image: $button_fill;
@@ -354,8 +350,7 @@
     $_bg: if($c != $bg_color, mix($c, $base_color, 85%), $insensitive_bg_color);
     $_bc: if($variant == 'light', $_bg,_border_color($c));
 
-    label, & { color: if($c != $bg_color, mix($tc, $_bg, 35%), $backdrop_insensitive_color); }
-
+    color: if($c != $bg_color, mix($tc, $_bg, 35%), $backdrop_insensitive_color);
     border-color: if($c != $bg_color, $_bc, $backdrop_borders_color);
     $button_fill: image($_bg) !global;
     background-image: $button_fill;
@@ -374,8 +369,7 @@
     $_bg: if($variant == 'light', darken(mix($c, $base_color, 85%), 8%), darken(mix($c, $base_color, 85%), 4%));
     $_bc: if($variant == 'light', $_bg, _border_color($c));
 
-    label { color: if($c != $bg_color, mix($tc, $_bg, 35%), $backdrop_insensitive_color); }
-
+    color: if($c != $bg_color, mix($tc, $_bg, 35%), $backdrop_insensitive_color);
     border-color: if($c != $bg_color, $_bc, $backdrop_borders_color);
     $button_fill: image($_bg) !global;
     background-image: $button_fill;
diff --git a/src/themes/Kali/sass/gtk-sass/upstream/sync.sh b/src/themes/Kali/sass/gtk-sass/upstream/sync.sh
index b27890e5..d0f69c53 100755
--- a/src/themes/Kali/sass/gtk-sass/upstream/sync.sh
+++ b/src/themes/Kali/sass/gtk-sass/upstream/sync.sh
@@ -1,23 +1,26 @@
 #!/bin/sh
 
-VERSION=3.24.13
+GREEN='\033[0;32m'
+YELLOW='\033[0;33m'
+RESET='\033[0m'
 
-echo "[+] Pulling version $VERSION"
+
+VERSION=3.24.14
+
+echo
+echo -e " [ $YELLOW"i"$RESET ] Upstream version $VERSION"
 echo
 
 while read file;
 do
 	echo
-	echo "[*] Downloading file $file"
-	echo
-	wget https://gitlab.gnome.org/GNOME/gtk/raw/$VERSION/gtk/theme/Adwaita/$file --timestamping
+	echo -e " [ $GREEN*$RESET ] Downloading file $file"
+	wget https://gitlab.gnome.org/GNOME/gtk/raw/$VERSION/gtk/theme/Adwaita/$file --timestamping --quiet
 
 	if [ -f $file.patch ]
 	then
-		echo "[+] Apply patch"
-		echo
-		patch $file $file.patch
-		echo
+		echo -e " [ $YELLOW~$RESET ] Apply patch"
+		patch $file $file.patch --quiet
 	fi
 done <<- EOF
 	_colors.scss